@dreb/coding-agent 2.64.6 → 2.66.0

package/dist/core/tools/subagent.js

@@ -976,7 +976,9 @@ function clampCwd(defaultCwd, itemCwd) {
 }
 export async function executeSingle(agents, agentName, task, cwd, signal, onProgress, modelOverride, parentProvider, registry, sessionDir, parentModel, agentModels, parentSessionFile, onChildEvent, thinkingOverride, arbitration, onControlAvailable, 
 /** Parent session UUID for spawn-time availability probes (issue 500). */
-parentSessionId) {
+parentSessionId, 
+/** Single-model mode (issue 517): the child runs on the parent session's model, ignoring model specs and the dispatch arbiter. */
+singleModelMode) {
     let name = agentName || DEFAULT_AGENT;
     let config = agents.get(name);
     if (!config) {
@@ -1008,7 +1010,45 @@ parentSessionId) {
     let resolvedModel;
     let warning;
     let skippedModels = [];
-    if (modelSpec) {
+    if (singleModelMode) {
+        // Single-model mode (issue 517): every child runs on the parent session's model.
+        // The per-call model override, per-agent model fallback list, agent-definition model
+        // spec, and dispatch arbiter are all bypassed; a requested spec is reported through
+        // the `warning` that is prepended to the child's output below.
+        if (!parentModel) {
+            return {
+                agent: name,
+                task,
+                exitCode: 1,
+                output: "",
+                stderr: "",
+                errorMessage: "Single model mode is enabled, but the parent session's model is unavailable, so subagent " +
+                    `"${name}" cannot be spawned. Disable singleModelMode or run the parent session with a model.`,
+            };
+        }
+        const parentResolution = resolveModelStringSingle(parentModel, parentProvider, registry);
+        if (!parentResolution.ok) {
+            return {
+                agent: name,
+                task,
+                exitCode: 1,
+                output: "",
+                stderr: "",
+                errorMessage: `Single model mode: ${parentResolution.error}`,
+            };
+        }
+        effectiveConfig = { ...effectiveConfig, model: parentResolution.modelId };
+        if (parentResolution.provider)
+            resolvedProvider = parentResolution.provider;
+        if (registry && resolvedProvider)
+            resolvedModel = registry.find(resolvedProvider, parentResolution.modelId);
+        if (configuredModelSpec) {
+            warning =
+                `The user has enabled "single model mode" in the settings, so the model selection for this subagent ` +
+                    `was ignored. Using parent model "${canonicalModelRef(resolvedProvider, parentResolution.modelId)}".`;
+        }
+    }
+    else if (modelSpec) {
         const parentFallback = configuredModelSpec ? parentModel : undefined;
         const resolved = await resolveModelForSubagentSpawn(modelSpec, parentProvider, registry, parentFallback, signal, "[subagent]", parentSessionId);
         skippedModels = resolved.skippedModels;
@@ -1044,7 +1084,9 @@ parentSessionId) {
     const proposalSelectedModel = proposalModelId ? canonicalModelRef(resolvedProvider, proposalModelId) : undefined;
     let finalThinking = thinkingOverride;
     let arbitrationEnabled = false;
-    if (arbitration) {
+    // Single-model mode (issue 517) bypasses the dispatch arbiter: the parent model is the
+    // final route, and the requested thinking is validated against it below like any other.
+    if (arbitration && !singleModelMode) {
         const proposed = {
             agent: name,
             model: proposalSelectedModel ?? "",
@@ -1220,7 +1262,13 @@ parentSessionId) {
 }
 async function executeChain(agents, chain, defaultCwd, signal, onProgress, parentProvider, registry, sessionBaseDir, defaultAgent, defaultModel, defaultThinking, parentModel, getAgentModelsForAgentFn, parentSessionFile, onChildEvent, arbitration, onControlAvailable, 
 /** Parent session UUID for spawn-time availability probes (issue 500). */
-parentSessionId) {
+parentSessionId, 
+/**
+ * Live single-model mode getter (issue 517): evaluated per step so each chain step
+ * runs on the parent session's model when enabled, matching the per-spawn semantics
+ * of single and parallel modes.
+ */
+getSingleModelMode) {
     const results = [];
     let previousOutput = "";
     for (let i = 0; i < chain.length; i++) {
@@ -1257,7 +1305,10 @@ parentSessionId) {
         const stepSessionDir = sessionBaseDir ? join(sessionBaseDir, `step-${i + 1}`) : undefined;
         const stepAgentName = step.agent || defaultAgent || DEFAULT_AGENT;
         const stepMach6Models = getAgentModelsForAgentFn?.(stepAgentName);
-        const result = await executeSingle(agents, step.agent || defaultAgent, task, cwdResult.cwd, signal, onProgress, step.model || defaultModel, parentProvider, registry, stepSessionDir, parentModel, stepMach6Models, parentSessionFile, onChildEvent, resolveSubagentThinkingOverride(step.thinking, defaultThinking), arbitration ? { ...arbitration, step: i + 1 } : undefined, onControlAvailable, parentSessionId);
+        // Single-model mode (issue 517) is re-read per step so a mid-chain settings
+        // change applies from the next step onward.
+        const singleModelMode = getSingleModelMode?.() ?? false;
+        const result = await executeSingle(agents, step.agent || defaultAgent, task, cwdResult.cwd, signal, onProgress, step.model || defaultModel, parentProvider, registry, stepSessionDir, parentModel, stepMach6Models, parentSessionFile, onChildEvent, resolveSubagentThinkingOverride(step.thinking, defaultThinking), arbitration ? { ...arbitration, step: i + 1 } : undefined, onControlAvailable, parentSessionId, singleModelMode);
         results.push(result);
         if (result.exitCode !== 0) {
             break; // stop chain on error
@@ -1759,6 +1810,7 @@ export function createSubagentToolDefinition(cwd, options) {
     const getParentModel = options?.parentModel ?? (() => undefined);
     const getParentSessionFile = options?.parentSessionFile ?? (() => undefined);
     const getParentSessionId = options?.parentSessionId ?? (() => undefined);
+    const getSingleModelMode = options?.singleModelMode ?? (() => false);
     const modelRegistry = options?.modelRegistry;
     const getAgentModelsForAgent = options?.getAgentModelsForAgent;
     const arbitrate = options?.arbitrate;
@@ -1978,7 +2030,7 @@ export function createSubagentToolDefinition(cwd, options) {
                             defaultThinkingLevel: getDefaultThinkingLevel?.(),
                             getAgentModelsForAgent,
                         }
-                        : undefined, onControlAvailable, getParentSessionId()));
+                        : undefined, onControlAvailable, getParentSessionId(), getSingleModelMode()));
                 };
                 if (params.task) {
                     // Single background task
@@ -2051,7 +2103,7 @@ export function createSubagentToolDefinition(cwd, options) {
                                 defaultThinkingLevel: getDefaultThinkingLevel?.(),
                                 getAgentModelsForAgent,
                             }
-                            : undefined, onControlAvailable, getParentSessionId());
+                            : undefined, onControlAvailable, getParentSessionId(), getSingleModelMode);
                         const resultText = results
                             .map((r, i) => `### Step ${i + 1}\n${formatSingleResult(r)}`)
                             .join("\n\n---\n\n");