@dreb/coding-agent 2.64.1 → 2.64.2

package/dist/core/tools/subagent.js

@@ -787,7 +787,7 @@ function makeProbeSignal(parentSignal, timeoutMs) {
     };
 }
 export async function probeModelAvailability(model, options = {}) {
-    const { signal, registry, timeoutMs = DEFAULT_MODEL_AVAILABILITY_PROBE_TIMEOUT_MS } = options;
+    const { signal, registry, timeoutMs = DEFAULT_MODEL_AVAILABILITY_PROBE_TIMEOUT_MS, sessionId } = options;
     if (signal?.aborted)
         return { ok: false, reason: "Aborted before spawn", aborted: true };
     const probeSignal = makeProbeSignal(signal, timeoutMs);
@@ -815,6 +815,7 @@ export async function probeModelAvailability(model, options = {}) {
                 maxRetryDelayMs: 0,
                 reasoning,
                 signal: probeSignal.signal,
+                ...(sessionId ? { sessionId } : {}),
             }),
             probeSignal.timeoutPromise,
         ]);
@@ -836,7 +837,9 @@ export async function probeModelAvailability(model, options = {}) {
 }
 export async function resolveModelForSubagentSpawn(models, parentProvider, registry, parentModel, signal, 
 /** Optional log prefix for warning messages (defaults to "[subagent]") */
-logPrefix = "[subagent]") {
+logPrefix = "[subagent]", 
+/** Stable conversation ID forwarded to availability probes (issue 500). */
+sessionId) {
     if (signal?.aborted)
         return { ok: false, error: "Aborted before spawn", skippedModels: [] };
     // Runtime probing only applies to agent definition fallback lists. Single
@@ -861,7 +864,7 @@ logPrefix = "[subagent]") {
         }
         const modelObj = resolved.provider ? registry.find(resolved.provider, resolved.modelId) : undefined;
         if (modelObj) {
-            const probe = await probeModelAvailability(modelObj, { signal, registry });
+            const probe = await probeModelAvailability(modelObj, { signal, registry, sessionId });
             if (!probe.ok && probe.aborted) {
                 return { ok: false, error: "Aborted before spawn", skippedModels };
             }
@@ -971,7 +974,9 @@ function clampCwd(defaultCwd, itemCwd) {
     }
     return { ok: true, cwd: resolved };
 }
-export async function executeSingle(agents, agentName, task, cwd, signal, onProgress, modelOverride, parentProvider, registry, sessionDir, parentModel, agentModels, parentSessionFile, onChildEvent, thinkingOverride, arbitration, onControlAvailable) {
+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) {
     let name = agentName || DEFAULT_AGENT;
     let config = agents.get(name);
     if (!config) {
@@ -1005,7 +1010,7 @@ export async function executeSingle(agents, agentName, task, cwd, signal, onProg
     let skippedModels = [];
     if (modelSpec) {
         const parentFallback = configuredModelSpec ? parentModel : undefined;
-        const resolved = await resolveModelForSubagentSpawn(modelSpec, parentProvider, registry, parentFallback, signal);
+        const resolved = await resolveModelForSubagentSpawn(modelSpec, parentProvider, registry, parentFallback, signal, "[subagent]", parentSessionId);
         skippedModels = resolved.skippedModels;
         if (!resolved.ok) {
             const skippedDetails = formatSkippedModelFailureDetails(skippedModels);
@@ -1213,7 +1218,9 @@ export async function executeSingle(agents, agentName, task, cwd, signal, onProg
     }
     return result;
 }
-async function executeChain(agents, chain, defaultCwd, signal, onProgress, parentProvider, registry, sessionBaseDir, defaultAgent, defaultModel, defaultThinking, parentModel, getAgentModelsForAgentFn, parentSessionFile, onChildEvent, arbitration, onControlAvailable) {
+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) {
     const results = [];
     let previousOutput = "";
     for (let i = 0; i < chain.length; i++) {
@@ -1250,7 +1257,7 @@ async function executeChain(agents, chain, defaultCwd, signal, onProgress, paren
         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);
+        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);
         results.push(result);
         if (result.exitCode !== 0) {
             break; // stop chain on error
@@ -1751,6 +1758,7 @@ export function createSubagentToolDefinition(cwd, options) {
     const getParentProvider = options?.parentProvider ?? (() => undefined);
     const getParentModel = options?.parentModel ?? (() => undefined);
     const getParentSessionFile = options?.parentSessionFile ?? (() => undefined);
+    const getParentSessionId = options?.parentSessionId ?? (() => undefined);
     const modelRegistry = options?.modelRegistry;
     const getAgentModelsForAgent = options?.getAgentModelsForAgent;
     const arbitrate = options?.arbitrate;
@@ -1970,7 +1978,7 @@ export function createSubagentToolDefinition(cwd, options) {
                             defaultThinkingLevel: getDefaultThinkingLevel?.(),
                             getAgentModelsForAgent,
                         }
-                        : undefined, onControlAvailable));
+                        : undefined, onControlAvailable, getParentSessionId()));
                 };
                 if (params.task) {
                     // Single background task
@@ -2043,7 +2051,7 @@ export function createSubagentToolDefinition(cwd, options) {
                                 defaultThinkingLevel: getDefaultThinkingLevel?.(),
                                 getAgentModelsForAgent,
                             }
-                            : undefined, onControlAvailable);
+                            : undefined, onControlAvailable, getParentSessionId());
                         const resultText = results
                             .map((r, i) => `### Step ${i + 1}\n${formatSingleResult(r)}`)
                             .join("\n\n---\n\n");