Merge remote-tracking branch 'origin/master' into feature/subagent-policy-inheritance

# Conflicts: # examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl # packages/subagent/subagent-inprocess/README.i18n.yaml
2026-07-28 18:37:46 +08:00
parent d69e1ada97 6d107252aa
commit 2f93614efb
59 changed files with 362 additions and 95 deletions
@@ -93,9 +93,11 @@ export async function startInProcessRun(
  const parentHeader = parent.session.header
  const parentProvider = parent.options.provider
  const parentModel = parent.options.model
+  const parentMaxTokens = parent.options.maxTokens
  const agentOptions: AgentOptions = {
    ...parentProvider !== undefined ? { provider: parentProvider } : {},
    ...parentModel !== undefined ? { model: parentModel } : {},
+    ...parentMaxTokens !== undefined ? { maxTokens: parentMaxTokens } : {},
    ...request.agentOptions,
    subagentDepth: childDepth,
  }