惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

The GitHub Blog
The GitHub Blog
S
SegmentFault 最新的问题
MyScale Blog
MyScale Blog
有赞技术团队
有赞技术团队
V
Visual Studio Blog
T
The Blog of Author Tim Ferriss
爱范儿
爱范儿
Vercel News
Vercel News
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
Y
Y Combinator Blog
Blog — PlanetScale
Blog — PlanetScale
D
DataBreaches.Net
美团技术团队
Microsoft Security Blog
Microsoft Security Blog
大猫的无限游戏
大猫的无限游戏
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
酷 壳 – CoolShell
酷 壳 – CoolShell
GbyAI
GbyAI
A
About on SuperTechFans
云风的 BLOG
云风的 BLOG
The Cloudflare Blog
宝玉的分享
宝玉的分享
V
V2EX
Microsoft Azure Blog
Microsoft Azure Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix: apply ACP spawn model defaults · openclaw/openclaw@f...
steipete · 2026-05-31 · via Recent Commits to openclaw:main

@@ -17,6 +17,7 @@ import {

1717

} from "../acp/control-plane/spawn.js";

1818

import { isAcpEnabledByPolicy, resolveAcpAgentPolicyError } from "../acp/policy.js";

1919

import { DEFAULT_HEARTBEAT_EVERY } from "../auto-reply/heartbeat.js";

20+

import { formatThinkingLevels } from "../auto-reply/thinking.js";

2021

import {

2122

resolveChannelDefaultBindingPlacement,

2223

resolveInboundConversationResolution,

@@ -82,6 +83,10 @@ import {

8283

inheritedToolDenyPatch,

8384

} from "./inherited-tool-deny.js";

8485

import { AGENT_LANE_SUBAGENT } from "./lanes.js";

86+

import {

87+

resolveConfiguredSubagentSpawnModelSelection,

88+

resolveThinkingDefault,

89+

} from "./model-selection.js";

8590

import { resolveSandboxRuntimeStatus } from "./sandbox/runtime-status.js";

8691

import { resolveRequesterOriginForChild } from "./spawn-requester-origin.js";

8792

import { resolveSpawnedWorkspaceInheritance } from "./spawned-context.js";

@@ -93,6 +98,8 @@ import {

9398

} from "./subagent-capabilities.js";

9499

import { getSubagentDepthFromSessionStore } from "./subagent-depth.js";

95100

import { countActiveRunsForSession, getSubagentRunByChildSessionKey } from "./subagent-registry.js";

101+

import { splitModelRef } from "./subagent-spawn-plan.js";

102+

import { resolveSubagentThinkingOverride } from "./subagent-spawn-thinking.js";

96103

import { resolveSubagentTargetPolicy } from "./subagent-target-policy.js";

97104

import { resolveInternalSessionKey, resolveMainSessionAlias } from "./tools/sessions-helpers.js";

98105

@@ -437,7 +444,7 @@ function hasSessionLocalHeartbeatRelayRoute(params: {

437444

function resolveTargetAcpAgentId(params: {

438445

requestedAgentId?: string;

439446

cfg: OpenClawConfig;

440-

}): { ok: true; agentId: string } | { ok: false; error: string } {

447+

}): { ok: true; agentId: string; configAgentId?: string } | { ok: false; error: string } {

441448

const requested = normalizeOptionalAgentId(params.requestedAgentId);

442449

if (requested) {

443450

const configuredAgent = params.cfg.agents?.list?.find(

@@ -447,6 +454,7 @@ function resolveTargetAcpAgentId(params: {

447454

return {

448455

ok: true,

449456

agentId: normalizeOptionalAgentId(configuredAgent.runtime.acp?.agent) ?? requested,

457+

configAgentId: requested,

450458

};

451459

}

452460

if (configuredAgent && !isExplicitlyAllowedAcpAgent(params.cfg, requested)) {

@@ -458,7 +466,11 @@ function resolveTargetAcpAgentId(params: {

458466

'Use runtime="acp" only with external ACP harness ids such as codex, claude, droid, gemini, or opencode, or configure agents.list[].runtime.type="acp" with runtime.acp.agent.',

459467

};

460468

}

461-

return { ok: true, agentId: requested };

469+

return {

470+

ok: true,

471+

agentId: requested,

472+

...(configuredAgent ? { configAgentId: requested } : {}),

473+

};

462474

}

463475464476

const configuredDefault = normalizeOptionalAgentId(params.cfg.acp?.defaultAgent);

@@ -975,15 +987,71 @@ function validateAcpResumeSessionOwnership(params: {

975987

};

976988

}

977989990+

type AcpSpawnRuntimeOptions = {

991+

model?: string;

992+

thinking?: string;

993+

timeoutSeconds?: number;

994+

};

995+996+

function resolveAcpSpawnRuntimeOptions(params: {

997+

cfg: OpenClawConfig;

998+

targetAgentId: string;

999+

configAgentId?: string;

1000+

model?: string;

1001+

thinking?: string;

1002+

runTimeoutSeconds?: number;

1003+

}): { ok: true; runtimeOptions?: AcpSpawnRuntimeOptions } | { ok: false; error: string } {

1004+

const policyAgentId = params.configAgentId ?? params.targetAgentId;

1005+

const model = resolveConfiguredSubagentSpawnModelSelection({

1006+

cfg: params.cfg,

1007+

agentId: policyAgentId,

1008+

modelOverride: params.model,

1009+

includeAgentPrimary: false,

1010+

});

1011+

const targetAgentConfig = resolveAgentConfig(params.cfg, policyAgentId);

1012+

const thinkingPlan = resolveSubagentThinkingOverride({

1013+

cfg: params.cfg,

1014+

targetAgentConfig,

1015+

thinkingOverrideRaw: params.thinking,

1016+

});

1017+

if (thinkingPlan.status === "error") {

1018+

const { provider, model: modelId } = splitModelRef(model);

1019+

return {

1020+

ok: false,

1021+

error: `Invalid thinking level "${thinkingPlan.thinkingCandidateRaw}". Use one of: ${formatThinkingLevels(provider, modelId)}.`,

1022+

};

1023+

}

1024+1025+

let thinking = thinkingPlan.thinkingOverride;

1026+

if (!thinking && model) {

1027+

const { provider, model: modelId } = splitModelRef(model);

1028+

if (provider && modelId) {

1029+

thinking = resolveThinkingDefault({

1030+

cfg: params.cfg,

1031+

provider,

1032+

model: modelId,

1033+

});

1034+

}

1035+

}

1036+1037+

const runtimeOptions =

1038+

model || thinking || params.runTimeoutSeconds

1039+

? {

1040+

...(model ? { model } : {}),

1041+

...(thinking ? { thinking } : {}),

1042+

...(params.runTimeoutSeconds ? { timeoutSeconds: params.runTimeoutSeconds } : {}),

1043+

}

1044+

: undefined;

1045+

return { ok: true, runtimeOptions };

1046+

}

1047+9781048

async function initializeAcpSpawnRuntime(params: {

9791049

cfg: OpenClawConfig;

9801050

sessionKey: string;

9811051

targetAgentId: string;

9821052

runtimeMode: AcpRuntimeSessionMode;

9831053

resumeSessionId?: string;

984-

model?: string;

985-

thinking?: string;

986-

runTimeoutSeconds?: number;

1054+

runtimeOptions?: AcpSpawnRuntimeOptions;

9871055

cwd?: string;

9881056

}): Promise<AcpSpawnInitializedRuntime> {

9891057

const storePath = resolveStorePath(params.cfg.session?.store, { agentId: params.targetAgentId });

@@ -1008,14 +1076,7 @@ async function initializeAcpSpawnRuntime(params: {

10081076

agent: params.targetAgentId,

10091077

mode: params.runtimeMode,

10101078

resumeSessionId: params.resumeSessionId,

1011-

runtimeOptions:

1012-

params.model || params.thinking || params.runTimeoutSeconds

1013-

? {

1014-

...(params.model ? { model: params.model } : {}),

1015-

...(params.thinking ? { thinking: params.thinking } : {}),

1016-

...(params.runTimeoutSeconds ? { timeoutSeconds: params.runTimeoutSeconds } : {}),

1017-

}

1018-

: undefined,

1079+

runtimeOptions: params.runtimeOptions,

10191080

cwd: params.cwd,

10201081

backendId: params.cfg.acp?.backend,

10211082

});

@@ -1320,6 +1381,21 @@ export async function spawnAcpDirect(

13201381

error: resumeAuthorization.error,

13211382

});

13221383

}

1384+

const runtimeOptionsResult = resolveAcpSpawnRuntimeOptions({

1385+

cfg,

1386+

targetAgentId,

1387+

configAgentId: targetAgentResult.configAgentId,

1388+

model: params.model,

1389+

thinking: params.thinking,

1390+

runTimeoutSeconds: params.runTimeoutSeconds,

1391+

});

1392+

if (!runtimeOptionsResult.ok) {

1393+

return createAcpSpawnFailure({

1394+

status: "error",

1395+

errorCode: "spawn_failed",

1396+

error: runtimeOptionsResult.error,

1397+

});

1398+

}

13231399

const { effectiveStreamToParent } = resolveAcpSpawnStreamPlan({

13241400

spawnMode,

13251401

requestThreadBinding,

@@ -1392,9 +1468,7 @@ export async function spawnAcpDirect(

13921468

targetAgentId,

13931469

runtimeMode,

13941470

resumeSessionId: params.resumeSessionId,

1395-

model: params.model,

1396-

thinking: params.thinking,

1397-

runTimeoutSeconds: params.runTimeoutSeconds,

1471+

runtimeOptions: runtimeOptionsResult.runtimeOptions,

13981472

cwd: runtimeCwd,

13991473

});

14001474

initializedRuntime = initializedSession.runtimeCloseHandle;