@dreb/coding-agent 2.23.0 → 2.25.0

package/dist/core/tools/subagent.js

@@ -65,7 +65,7 @@ export function parseAgentFrontmatter(content) {
         },
     };
 }
-function discoverAgentTypes(cwd) {
+export function discoverAgentTypes(cwd) {
     const agents = new Map();
     // Package-bundled agents (shipped with dreb — the canonical source of truth for built-in agents)
     const packageAgentsDir = join(getPackageDir(), "agents");
@@ -321,6 +321,12 @@ async function spawnSubagent(agentConfig, task, cwd, signal, onProgress, parentP
                 }
             }
             const output = outputParts.join("\n\n");
+            // Inspect the final assistant message's stopReason to detect truncation
+            // ("length") or a loud truncation failure ("error") from the core agent loop.
+            // stopReason is present at runtime even though collectedMessages is loosely typed.
+            const lastMsg = collectedMessages.length > 0 ? collectedMessages[collectedMessages.length - 1] : undefined;
+            const lastStopReason = lastMsg ? lastMsg.stopReason : undefined;
+            const lastErrorMessage = lastMsg ? lastMsg.errorMessage : undefined;
             // Build error message from best available source: stderr, plain stdout lines, or generic
             let errorMessage = null;
             if (exitCode !== 0) {
@@ -329,6 +335,29 @@ async function spawnSubagent(agentConfig, task, cwd, signal, onProgress, parentP
                 errorMessage =
                     stderrTrimmed.slice(0, 500) || plainOutput.slice(0, 500) || `Subagent exited with code ${exitCode}`;
             }
+            else if (output.trim() === "") {
+                // Clean exit but no output — surface why instead of returning a silent empty result.
+                if (lastStopReason === "length") {
+                    errorMessage = "Subagent response was truncated at the model's token limit before producing any output.";
+                }
+                else if (lastStopReason === "error" && lastErrorMessage) {
+                    errorMessage = String(lastErrorMessage).slice(0, 500);
+                }
+                else {
+                    errorMessage = "Subagent completed with no output.";
+                }
+            }
+            else if (lastStopReason === "length") {
+                // Clean exit with partial output — keep the output but make the truncation loud.
+                errorMessage = "Subagent response was truncated at the model's token limit; output may be incomplete.";
+            }
+            else if (lastStopReason === "error" && lastErrorMessage) {
+                // Clean exit with partial output but a loud failure (e.g. length retries
+                // exhausted → the core agent loop converts the truncation to stopReason
+                // "error" while preserving the partial text). Surface the error instead of
+                // letting the partial output masquerade as a clean success.
+                errorMessage = String(lastErrorMessage).slice(0, 500);
+            }
             // Discover the session file written by the child process
             const sessionFile = sessionDir ? discoverSessionFile(sessionDir, agentConfig.name) : undefined;
             resolvePromise({
@@ -681,7 +710,7 @@ function clampCwd(defaultCwd, itemCwd) {
     }
     return { ok: true, cwd: resolved };
 }
-export async function executeSingle(agents, agentName, task, cwd, signal, onProgress, modelOverride, parentProvider, registry, sessionDir, parentModel) {
+export async function executeSingle(agents, agentName, task, cwd, signal, onProgress, modelOverride, parentProvider, registry, sessionDir, parentModel, agentModels) {
     const name = agentName || DEFAULT_AGENT;
     const config = agents.get(name);
     if (!config) {
@@ -705,9 +734,9 @@ export async function executeSingle(agents, agentName, task, cwd, signal, onProg
             errorMessage: `Task prompt too long (${task.length} chars, max ${MAX_TASK_LENGTH}). Shorten the prompt.`,
         };
     }
-    // Per-invocation model override takes precedence over agent definition model.
-    // Override is always a single string; agent config may be a string or fallback list.
-    const modelSpec = modelOverride || config.model;
+    // Per-invocation model override takes precedence over agent settings, which take precedence over agent definition model.
+    // Override is always a single string; agentModels and agent config may be arrays.
+    const modelSpec = modelOverride || (agentModels && agentModels.length > 0 ? agentModels : undefined) || config.model;
     let effectiveConfig = modelOverride ? { ...config, model: modelOverride } : config;
     let resolvedProvider = parentProvider;
     let warning;
@@ -738,15 +767,16 @@ export async function executeSingle(agents, agentName, task, cwd, signal, onProg
         }
         warning = resolved.warning;
     }
-    onProgress?.(`Running ${name} agent...`);
+    const usedModel = effectiveConfig.model?.toString();
+    onProgress?.(`Running ${name} agent${usedModel ? ` (${usedModel})` : ""}...`);
     const result = await spawnSubagent(effectiveConfig, task, cwd, signal, onProgress, resolvedProvider, sessionDir);
-    result.output = prependModelFallbackSummary(result.output, skippedModels, result.model ?? effectiveConfig.model?.toString());
+    result.output = prependModelFallbackSummary(result.output, skippedModels, result.model ?? usedModel);
     if (warning) {
         result.output = `[WARNING: ${warning}]\n\n${result.output}`;
     }
     return result;
 }
-async function executeChain(agents, chain, defaultCwd, signal, onProgress, parentProvider, registry, sessionBaseDir, defaultAgent, defaultModel, parentModel) {
+async function executeChain(agents, chain, defaultCwd, signal, onProgress, parentProvider, registry, sessionBaseDir, defaultAgent, defaultModel, parentModel, getAgentModelsForAgentFn) {
     const results = [];
     let previousOutput = "";
     for (let i = 0; i < chain.length; i++) {
@@ -781,7 +811,9 @@ async function executeChain(agents, chain, defaultCwd, signal, onProgress, paren
         }
         // Each chain step gets its own session subdirectory
         const stepSessionDir = sessionBaseDir ? join(sessionBaseDir, `step-${i + 1}`) : undefined;
-        const result = await executeSingle(agents, step.agent || defaultAgent, task, cwdResult.cwd, signal, onProgress, step.model || defaultModel, parentProvider, registry, stepSessionDir, parentModel);
+        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);
         results.push(result);
         if (result.exitCode !== 0) {
             break; // stop chain on error
@@ -918,7 +950,7 @@ function formatSubagentResult(result, options, theme, showImages) {
     }
     return text;
 }
-function formatSingleResult(result) {
+export function formatSingleResult(result) {
     let text = `## Agent: ${result.agent}${result.model ? ` (model: ${result.model})` : ""}\n`;
     if (result.exitCode !== 0) {
         text += `**Error** (exit ${result.exitCode}): ${result.errorMessage || "Unknown error"}\n`;
@@ -926,10 +958,14 @@ function formatSingleResult(result) {
             text += `\nStderr:\n${result.stderr}\n`;
         }
     }
+    else if (result.errorMessage) {
+        // Clean exit but an error was surfaced (e.g. truncation at the token limit).
+        text += `**Error**: ${result.errorMessage}\n`;
+    }
     if (result.output) {
         text += `\n${result.output}`;
     }
-    else if (result.exitCode === 0) {
+    else if (result.exitCode === 0 && !result.errorMessage) {
         text += "\n(No output)";
     }
     if (result.sessionFile) {
@@ -943,6 +979,7 @@ export function createSubagentToolDefinition(cwd, options) {
     const getParentProvider = options?.parentProvider ?? (() => undefined);
     const getParentModel = options?.parentModel ?? (() => undefined);
     const modelRegistry = options?.modelRegistry;
+    const getAgentModelsForAgent = options?.getAgentModelsForAgent;
     // Discover agents at definition time to build the prompt guidelines.
     // This is cheap (reads .md files) and the same call happens on every execute().
     const knownAgents = discoverAgentTypes(cwd);
@@ -1095,7 +1132,8 @@ export function createSubagentToolDefinition(cwd, options) {
                     // Each background agent gets its own session subdirectory
                     const sessionId = generateAgentId();
                     const sessionDir = join(subagentSessionsBase, sessionId);
-                    return launchBackgroundLifecycle(agentName, taskLabel, (signal) => executeSingle(agents, agentName === DEFAULT_AGENT ? undefined : agentName, task, resolvedCwd, signal, undefined, modelOverride, getParentProvider(), modelRegistry, sessionDir, getParentModel()));
+                    const agentModels = getAgentModelsForAgent?.(agentName || DEFAULT_AGENT);
+                    return launchBackgroundLifecycle(agentName, taskLabel, (signal) => executeSingle(agents, agentName === DEFAULT_AGENT ? undefined : agentName, task, resolvedCwd, signal, undefined, modelOverride, getParentProvider(), modelRegistry, sessionDir, getParentModel(), agentModels));
                 };
                 if (params.task) {
                     // Single background task
@@ -1161,7 +1199,7 @@ export function createSubagentToolDefinition(cwd, options) {
                     const chainSteps = params.chain;
                     const chainSessionDir = join(subagentSessionsBase, `chain-${generateAgentId()}`);
                     const agentId = launchBackgroundLifecycle(agentName, taskSummary, async (signal) => {
-                        const results = await executeChain(agents, chainSteps, cwd, signal, undefined, getParentProvider(), modelRegistry, chainSessionDir, params.agent, params.model, getParentModel());
+                        const results = await executeChain(agents, chainSteps, cwd, signal, undefined, getParentProvider(), modelRegistry, chainSessionDir, params.agent, params.model, getParentModel(), getAgentModelsForAgent);
                         const resultText = results
                             .map((r, i) => `### Step ${i + 1}\n${formatSingleResult(r)}`)
                             .join("\n\n---\n\n");