@qwen-code/qwen-code 0.21.13 → 0.21.14-nightly.20260822.7a4566cb3b

package/chunks/{workflow-ISQJHPG2.js → workflow-BN2ZEJMK.js}

@@ -9,111 +9,113 @@ import {
   generateAgentWorktreeSlug,
   isTerminalWorkflowStatus,
   rebuildToolRegistryOnOverride,
+  resolveExternalWorktreeDir,
   resolveSavedWorkflowScript,
   toModelVisibleSubagentResult,
   writeWorkflowSnapshot,
   writeWorktreeSessionMarker
-} from "./chunk-4S5337WV.js";
+} from "./chunk-SVU5KGR7.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
-import "./chunk-DGZEMW5R.js";
-import "./chunk-WSH6GRKG.js";
-import "./chunk-CKSJECTU.js";
-import "./chunk-OVZPVYZB.js";
+import "./chunk-5M6IDOMF.js";
+import "./chunk-KVGR4MCF.js";
+import "./chunk-XZJKSETB.js";
+import "./chunk-YMVFIYHV.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-5EYKMUUY.js";
+import "./chunk-OTXXOZKW.js";
+import "./chunk-DJEHYM4H.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-Y3YCSWG5.js";
-import "./chunk-UPDOZBWO.js";
+import "./chunk-AZF6SME3.js";
+import "./chunk-TBVSALA3.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
-import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-VUMLT7E5.js";
+import "./chunk-ISJMN3ML.js";
+import "./chunk-2TRNCJK4.js";
+import "./chunk-NUGZAFR2.js";
+import "./chunk-LDGWX737.js";
 import {
   SUBAGENT_PLAN_LIFECYCLE_TOOLS
-} from "./chunk-RWDNJBWN.js";
-import "./chunk-25EYDK42.js";
-import "./chunk-MIPFDQAF.js";
+} from "./chunk-VLRBJ24J.js";
+import "./chunk-ZPJWUGCS.js";
 import "./chunk-MLXTMF7H.js";
-import "./chunk-KV27IEHM.js";
-import "./chunk-E3DYKPYZ.js";
-import "./chunk-OMLJNPBE.js";
-import "./chunk-OXCMMLED.js";
-import "./chunk-TIGA2IVL.js";
+import "./chunk-O5BDEWBC.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-WRT324N6.js";
+import "./chunk-YDJRMQU4.js";
+import "./chunk-KM73TBQ4.js";
+import "./chunk-E63A23D7.js";
+import "./chunk-6NJIPX6W.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-6S2OXVJT.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-XLLKYULU.js";
+import "./chunk-VSNPOSDN.js";
 import {
   runWithAgentContext
-} from "./chunk-PT4I7NBA.js";
+} from "./chunk-I432KXWD.js";
 import "./chunk-S6LOFUVP.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-SG7ZP5PG.js";
-import "./chunk-K623ENWT.js";
-import "./chunk-AQ37AY7B.js";
-import {
-  WorkspaceContext
-} from "./chunk-KBXKR5R2.js";
-import "./chunk-GMIEIY3Y.js";
-import "./chunk-NAVJD2PQ.js";
-import "./chunk-ROIYNTHJ.js";
-import "./chunk-2B2BF7P7.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-YZHRN3CF.js";
-import "./chunk-FAAUPSY2.js";
-import "./chunk-KM73TBQ4.js";
-import "./chunk-MPHPFVKK.js";
+import "./chunk-7IV52LTO.js";
 import "./chunk-AXMWHKXA.js";
-import "./chunk-GLCZKT5V.js";
 import {
   createAbortController,
   createChildAbortController
 } from "./chunk-DJ2GSRLV.js";
-import "./chunk-QFJ5JHQR.js";
+import "./chunk-2J3OJGTL.js";
+import "./chunk-LI4YHTQK.js";
+import "./chunk-GLCZKT5V.js";
+import "./chunk-C72BXMJ5.js";
 import {
   WorkflowRunEvent,
   logWorkflowRun,
   read,
   writeLine
-} from "./chunk-RVOJ2FBP.js";
+} from "./chunk-RPJOOK6N.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-CHHABXPE.js";
-import "./chunk-MA2HEDVP.js";
+import "./chunk-IWOWEENB.js";
+import "./chunk-HIK2OF33.js";
+import "./chunk-ZRYQMWEP.js";
+import "./chunk-7JDGSJQH.js";
+import "./chunk-F6WFNA7U.js";
+import "./chunk-WZAD4ZNJ.js";
+import "./chunk-FPGTNKCP.js";
+import "./chunk-YHC2EYYG.js";
+import "./chunk-PZRUV52H.js";
+import "./chunk-JGUBDRBC.js";
+import "./chunk-HDKCKCYO.js";
+import "./chunk-HHJLM3WQ.js";
+import {
+  stripAnsiAndControl
+} from "./chunk-32CHFLGV.js";
+import "./chunk-74TONY4F.js";
 import {
   SyntheticOutputTool
-} from "./chunk-XUJNK7Y6.js";
+} from "./chunk-XL5K4SVK.js";
+import "./chunk-WZDM44SB.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
+import {
+  WorkspaceContext
+} from "./chunk-K52PZNU4.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6HY6IF3Z.js";
-import "./chunk-4PKCUT7F.js";
-import "./chunk-F6WFNA7U.js";
-import "./chunk-46UV252V.js";
-import "./chunk-FPGTNKCP.js";
-import "./chunk-CPHEPGAO.js";
-import "./chunk-P7MPQI75.js";
-import "./chunk-FDGGZIYW.js";
-import {
-  stripAnsiAndControl
-} from "./chunk-EL5SXY3T.js";
-import "./chunk-HHJLM3WQ.js";
-import "./chunk-K5IDV3PC.js";
+} from "./chunk-6NFAEG54.js";
 import {
   createDebugLogger
-} from "./chunk-BUQDLC2G.js";
-import "./chunk-VOQXFAY5.js";
+} from "./chunk-A5F2YNO6.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
 import "./chunk-AMDSOFFV.js";
-import "./chunk-QUGAUQGJ.js";
+import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -127,6 +129,7 @@ init_esbuild_shims();
 // packages/core/src/agents/runtime/workflow-orchestrator.ts
 init_esbuild_shims();
 import { randomBytes } from "node:crypto";
+import { AsyncLocalStorage } from "node:async_hooks";
 import * as os from "node:os";
 
 // packages/core/src/agents/runtime/workflow-sandbox.ts
@@ -405,22 +408,27 @@ __name(validateArgs, "validateArgs");
 function createWorkflowSandbox(opts) {
   const phases = [];
   const logs = [];
-  const safeLog = /* @__PURE__ */ __name((msg) => {
+  const emitLog = /* @__PURE__ */ __name((line) => {
+    try {
+      opts.emitter?.logAppended?.(line);
+    } catch (e) {
+      debugLogger.warn("emitter.logAppended threw:", e);
+    }
+  }, "emitLog");
+  const safeLog = /* @__PURE__ */ __name((msg, notify = true) => {
     if (logs.length < MAX_LOG_LINES) {
       const line = String(msg);
       logs.push(line);
-      try {
-        opts.emitter?.logAppended?.(line);
-      } catch (e) {
-        debugLogger.warn("emitter.logAppended threw:", e);
-      }
+      if (notify) emitLog(line);
     } else if (logs.length === MAX_LOG_LINES) {
-      logs.push(`[workflow log truncated at ${MAX_LOG_LINES} lines]`);
+      const line = `[workflow log truncated at ${MAX_LOG_LINES} lines]`;
+      logs.push(line);
+      if (notify) emitLog(line);
     }
   }, "safeLog");
   const safePhase = /* @__PURE__ */ __name((title) => {
     if (phases.length < MAX_PHASE_ENTRIES) {
-      const t = String(title);
+      const t = stripAnsiAndControl(String(title)).slice(0, 200) || "phase";
       if (phases[phases.length - 1] === t) return;
       phases.push(t);
       try {
@@ -915,7 +923,7 @@ function createWorkflowSandbox(opts) {
       // FIX-Round1-T13: throw on any opts key not in the allowlist \u2014 catches
       // typos like { scema: ... } that previously slipped through the
       // [key:string]: unknown index signature.
-      const KNOWN_AGENT_OPTS = ['label', 'phase', 'schema', 'model', 'isolation', 'agentType', 'stallMs'];
+      const KNOWN_AGENT_OPTS = ['label', 'phase', 'schema', 'model', 'isolation', 'agentType', 'stallMs', 'workingDir'];
       globalThis.agent = vmAsync(function (prompt, agentOpts) {
         agentOpts = agentOpts || {};
         const keys = Object.keys(agentOpts);
@@ -945,6 +953,34 @@ function createWorkflowSandbox(opts) {
             "Known modes are: 'worktree', 'remote'."
           );
         }
+        // NOTE: this init script is a host-side template literal \u2014 no
+        // backticks anywhere below, in code or comments.
+        //
+        // A non-number stallMs is silently dropped downstream and the
+        // default watchdog applies, contradicting "0 disables the watchdog"
+        // \u2014 refuse it loudly like the other option gates.
+        if (agentOpts.stallMs !== undefined && (typeof agentOpts.stallMs !== 'number' || !Number.isFinite(agentOpts.stallMs))) {
+          throw new Error("agent({stallMs}): must be a finite number of milliseconds (0 disables the watchdog).");
+        }
+        // workingDir pins the agent to a worktree the CALLER already owns;
+        // isolation creates and reaps one. Asking for both is a contradiction
+        // about who owns the directory's lifetime, so name it here rather than
+        // silently letting one win.
+        if (agentOpts.workingDir !== undefined) {
+          if (typeof agentOpts.workingDir !== 'string' || agentOpts.workingDir.trim().length === 0) {
+            throw new Error(
+              "agent({workingDir}): must be a non-empty string naming an existing " +
+              "git worktree of this repository."
+            );
+          }
+          if (agentOpts.isolation !== undefined) {
+            throw new Error(
+              "agent({workingDir, isolation}): incompatible options. workingDir " +
+              "pins the agent to a worktree you already own; isolation creates " +
+              "a fresh one and removes it afterwards. Pass one."
+            );
+          }
+        }
         if (typeof agentOpts.phase === 'string' && agentOpts.phase.length > 0) {
           if (__b.lastPhase() !== agentOpts.phase) {
             __b.pushPhase(agentOpts.phase);
@@ -1297,7 +1333,7 @@ ${stripped}
     },
     getPhases: /* @__PURE__ */ __name(() => [...phases], "getPhases"),
     getLogs: /* @__PURE__ */ __name(() => [...logs], "getLogs"),
-    appendLog: /* @__PURE__ */ __name((line) => safeLog(line), "appendLog"),
+    appendLog: /* @__PURE__ */ __name((line) => safeLog(line, false), "appendLog"),
     getMeta: /* @__PURE__ */ __name(() => extractedMeta, "getMeta")
   };
 }
@@ -1529,7 +1565,13 @@ var debugLogger4 = createDebugLogger("WORKFLOW_JOURNAL");
 var JOURNAL_KEY_VERSION = "v2";
 function canonicalizeAgentOpts(opts) {
   const projected = {};
-  for (const k of ["schema", "model", "isolation", "agentType"]) {
+  for (const k of [
+    "schema",
+    "model",
+    "isolation",
+    "agentType",
+    "workingDir"
+  ]) {
     const v = opts[k];
     if (v === void 0 || typeof v === "function") continue;
     projected[k] = v;
@@ -1598,6 +1640,7 @@ var WorkflowJournal = class {
   static {
     __name(this, "WorkflowJournal");
   }
+  pending = Promise.resolve();
   /** Load + parse all entries into replay maps. Empty maps if no file. */
   async load() {
     try {
@@ -1610,7 +1653,13 @@ var WorkflowJournal = class {
   }
   /** Append one entry. Rejects only on I/O error (callers `.catch`). */
   append(entry) {
-    return writeLine(this.path, entry);
+    const operation = this.pending.then(() => writeLine(this.path, entry));
+    this.pending = operation.catch(() => void 0);
+    return operation;
+  }
+  /** Wait until every append issued so far has settled. */
+  drain() {
+    return this.pending;
   }
 };
 
@@ -1783,8 +1832,49 @@ function resolveConcurrencyLimit(env = process.env) {
   return Math.max(1, Math.min(16, os.cpus().length - 2));
 }
 __name(resolveConcurrencyLimit, "resolveConcurrencyLimit");
-var WORKFLOW_SUBAGENT_MAX_TURNS = 50;
-var WORKFLOW_SUBAGENT_MAX_TIME_MINUTES = 10;
+var DEFAULT_WORKFLOW_SUBAGENT_MAX_TURNS = 50;
+var DEFAULT_WORKFLOW_SUBAGENT_MAX_TIME_MINUTES = 10;
+var WORKFLOW_SUBAGENT_MAX_TURNS_ENV = "QWEN_CODE_WORKFLOW_AGENT_MAX_TURNS";
+var WORKFLOW_SUBAGENT_MAX_MINUTES_ENV = "QWEN_CODE_WORKFLOW_AGENT_MAX_MINUTES";
+var HARD_WORKFLOW_SUBAGENT_MAX_TURNS_CEILING = 500;
+var HARD_WORKFLOW_SUBAGENT_MAX_MINUTES_CEILING = 100;
+function resolveSubagentBound(envName, defaultValue, ceiling, env) {
+  const raw = env[envName];
+  if (raw === void 0 || raw.trim() === "") return defaultValue;
+  const parsed = parsePositiveIntegerEnv(raw, 0);
+  if (parsed < 1) {
+    debugLogger.warn(
+      `Invalid ${envName}=${JSON.stringify(raw)}, using default (${defaultValue})`
+    );
+    return defaultValue;
+  }
+  if (parsed > ceiling) {
+    debugLogger.warn(
+      `${envName}=${parsed} exceeds hard ceiling (${ceiling}); clamping.`
+    );
+    return ceiling;
+  }
+  return parsed;
+}
+__name(resolveSubagentBound, "resolveSubagentBound");
+function resolveSubagentMaxTurns(env = process.env) {
+  return resolveSubagentBound(
+    WORKFLOW_SUBAGENT_MAX_TURNS_ENV,
+    DEFAULT_WORKFLOW_SUBAGENT_MAX_TURNS,
+    HARD_WORKFLOW_SUBAGENT_MAX_TURNS_CEILING,
+    env
+  );
+}
+__name(resolveSubagentMaxTurns, "resolveSubagentMaxTurns");
+function resolveSubagentMaxTimeMinutes(env = process.env) {
+  return resolveSubagentBound(
+    WORKFLOW_SUBAGENT_MAX_MINUTES_ENV,
+    DEFAULT_WORKFLOW_SUBAGENT_MAX_TIME_MINUTES,
+    HARD_WORKFLOW_SUBAGENT_MAX_MINUTES_CEILING,
+    env
+  );
+}
+__name(resolveSubagentMaxTimeMinutes, "resolveSubagentMaxTimeMinutes");
 var WORKFLOW_SUBAGENT_DISALLOWED_TOOLS = [
   ToolNames.ASK_USER_QUESTION,
   ToolNames.SEND_MESSAGE,
@@ -1819,7 +1909,7 @@ function sanitizeForErrorMessage(value) {
 }
 __name(sanitizeForErrorMessage, "sanitizeForErrorMessage");
 function createProductionDispatch(config, signal, onTokens, bridgeApprovalEvents) {
-  return async (prompt, opts) => {
+  return async (prompt, opts, dispatchId) => {
     if (typeof prompt !== "string" || prompt.length === 0) {
       throw new Error("agent() requires a non-empty string prompt.");
     }
@@ -1832,7 +1922,10 @@ function createProductionDispatch(config, signal, onTokens, bridgeApprovalEvents
     return runStallResilient(
       async (attemptSignal, emitter) => {
         attempt += 1;
-        const cleanupApprovalBridge = bridgeApprovalEvents?.(emitter);
+        const cleanupApprovalBridge = bridgeApprovalEvents?.(
+          emitter,
+          dispatchId
+        );
         const cleanupTranscript = attachDispatchTranscript(
           config,
           workflowAgentId,
@@ -1907,11 +2000,11 @@ function attachDispatchTranscript(config, agentId, prompt, agentName, emitter, a
 }
 __name(attachDispatchTranscript, "attachDispatchTranscript");
 async function runSingleDispatch(config, prompt, opts, attemptSignal, emitter, workflowAgentId, agentIdentity, onTokens) {
-  const { AgentHeadless, ContextState } = await import("./agent-headless-GJCQMURW.js");
+  const { AgentHeadless, ContextState } = await import("./agent-headless-AVFYIRPV.js");
   const ctx = new ContextState();
   ctx.set("task_prompt", prompt);
   debugLogger.debug(`[workflow] Dispatch ${workflowAgentId}`);
-  if (opts.agentType === void 0 && opts.model === void 0 && opts.isolation === void 0 && opts.schema === void 0) {
+  if (opts.agentType === void 0 && opts.model === void 0 && opts.isolation === void 0 && opts.schema === void 0 && opts.workingDir === void 0) {
     const subagent = await AgentHeadless.create(
       agentIdentity.name,
       config,
@@ -1924,8 +2017,8 @@ async function runSingleDispatch(config, prompt, opts, attemptSignal, emitter, w
       // and the loop guards never tripped — combined with the cancellation
       // bug below, workflows were effectively unkillable.
       {
-        max_turns: WORKFLOW_SUBAGENT_MAX_TURNS,
-        max_time_minutes: WORKFLOW_SUBAGENT_MAX_TIME_MINUTES
+        max_turns: resolveSubagentMaxTurns(),
+        max_time_minutes: resolveSubagentMaxTimeMinutes()
       },
       // T11 (PR #4732 R1): disallow SendMessage / ExitPlanMode to align with
       // upstream Tg8 — closes the back-channel that would let a subagent
@@ -2023,12 +2116,34 @@ ${WORKFLOW_SUBAGENT_SYSTEM_PROMPT_WITH_SCHEMA}` : WORKFLOW_SUBAGENT_SYSTEM_PROMP
   };
   let worktreeIsolation = null;
   let effectiveContext = config;
+  if (opts.isolation !== void 0 && opts.workingDir !== void 0) {
+    throw new Error(
+      "agent({workingDir, isolation}): incompatible options. workingDir pins the agent to a worktree you already own; isolation creates a fresh one and removes it afterwards. Pass one."
+    );
+  }
   if (opts.isolation === "worktree") {
     worktreeIsolation = await provisionWorkflowWorktree(config);
-    effectiveContext = createWorktreeConfigOverride(
+    effectiveContext = createDirScopedConfigOverride(
       config,
       worktreeIsolation.path
     );
+  } else if (opts.workingDir !== void 0) {
+    if (typeof opts.workingDir !== "string" || opts.workingDir.trim().length === 0) {
+      throw new Error(
+        "agent({workingDir}): must be a non-empty string naming an existing git worktree of this repository."
+      );
+    }
+    const resolved = await resolveExternalWorktreeDir(
+      config,
+      opts.workingDir,
+      "workingDir"
+    );
+    if ("error" in resolved) {
+      throw new Error(
+        `agent({workingDir: ${sanitizeForErrorMessage(JSON.stringify(opts.workingDir))}}): ${sanitizeForErrorMessage(resolved.error)}`
+      );
+    }
+    effectiveContext = createDirScopedConfigOverride(config, resolved.path);
   }
   let onParentAbort;
   try {
@@ -2066,8 +2181,8 @@ ${WORKFLOW_SUBAGENT_SYSTEM_PROMPT_WITH_SCHEMA}` : WORKFLOW_SUBAGENT_SYSTEM_PROMP
         // own runConfig / maxTurns — these are workflow-level safety bounds,
         // not subagent-level preferences. P5 will refine via budget.
         runConfigOverrides: {
-          max_turns: WORKFLOW_SUBAGENT_MAX_TURNS,
-          max_time_minutes: WORKFLOW_SUBAGENT_MAX_TIME_MINUTES
+          max_turns: resolveSubagentMaxTurns(),
+          max_time_minutes: resolveSubagentMaxTimeMinutes()
         },
         eventEmitter
       }
@@ -2221,7 +2336,7 @@ async function provisionWorkflowWorktree(config) {
   };
 }
 __name(provisionWorkflowWorktree, "provisionWorkflowWorktree");
-function createWorktreeConfigOverride(base, wtPath) {
+function createDirScopedConfigOverride(base, wtPath) {
   const ov = Object.create(base);
   ov.targetDir = wtPath;
   ov.cwd = wtPath;
@@ -2229,7 +2344,10 @@ function createWorktreeConfigOverride(base, wtPath) {
   ov.getCwd = () => wtPath;
   ov.getWorkingDir = () => wtPath;
   ov.getProjectRoot = () => wtPath;
-  const wtFileService = new FileDiscoveryService(wtPath);
+  const wtFileService = new FileDiscoveryService(
+    wtPath,
+    base.getFileFilteringOptions().customIgnoreFiles
+  );
   ov.fileDiscoveryService = wtFileService;
   ov.getFileService = () => wtFileService;
   const wtWorkspace = new WorkspaceContext(wtPath);
@@ -2237,7 +2355,7 @@ function createWorktreeConfigOverride(base, wtPath) {
   ov.getWorkspaceContext = () => wtWorkspace;
   return ov;
 }
-__name(createWorktreeConfigOverride, "createWorktreeConfigOverride");
+__name(createDirScopedConfigOverride, "createDirScopedConfigOverride");
 async function cleanupWorkflowWorktree(isolation) {
   const wtService = new GitWorktreeService(isolation.repoRoot);
   const [hasChanges, hasUnmerged] = await Promise.all([
@@ -2355,8 +2473,29 @@ var WorkflowOrchestrator = class {
       }
     ), "rejectThroughPauseGate");
     let agentCount = 0;
+    let dispatchTraceCount = 0;
     const emitter = req.emitter;
     const budget = req.budget;
+    const dependencyContext = new AsyncLocalStorage();
+    const issueDispatchTrace = /* @__PURE__ */ __name((prompt, opts, cached = false) => {
+      const id = `dispatch-${dispatchTraceCount += 1}`;
+      const store = dependencyContext.getStore();
+      const dependsOn = Array.from(new Set(store?.tails ?? []));
+      if (store) store.tails = [id];
+      try {
+        emitter?.dispatchQueued?.({
+          id,
+          ...typeof opts.label === "string" ? { label: opts.label } : {},
+          prompt,
+          dependsOn,
+          queuedAt: Date.now(),
+          ...cached ? { cached: true } : {}
+        });
+      } catch (e) {
+        debugLogger.warn("emitter.dispatchQueued threw:", e);
+      }
+      return id;
+    }, "issueDispatchTrace");
     const journal = req.journal;
     const replay = req.resumeReplay;
     let prefixHash = deriveArgsSeed(req.args);
@@ -2383,6 +2522,7 @@ var WorkflowOrchestrator = class {
               );
             }
             const label2 = typeof opts.label === "string" ? opts.label : void 0;
+            const dispatchId2 = issueDispatchTrace(prompt, opts, true);
             try {
               emitter?.agentDispatched?.(label2);
             } catch (e) {
@@ -2393,6 +2533,11 @@ var WorkflowOrchestrator = class {
             } catch (e) {
               debugLogger.warn("emitter.agentCompleted threw:", e);
             }
+            try {
+              emitter?.dispatchSettled?.(dispatchId2, void 0, Date.now());
+            } catch (e) {
+              debugLogger.warn("emitter.dispatchSettled threw:", e);
+            }
             return scheduler.waitUntilRunning().then(
               () => cached.result,
               () => cached.result
@@ -2422,6 +2567,7 @@ var WorkflowOrchestrator = class {
         );
       }
       const label = typeof opts.label === "string" ? opts.label : void 0;
+      const dispatchId = issueDispatchTrace(prompt, opts);
       try {
         emitter?.agentDispatched?.(label);
       } catch (e) {
@@ -2437,9 +2583,19 @@ var WorkflowOrchestrator = class {
         } catch (e) {
           debugLogger.warn("emitter.agentCompleted threw:", e);
         }
+        try {
+          emitter?.dispatchSettled?.(dispatchId, message, Date.now());
+        } catch (e) {
+          debugLogger.warn("emitter.dispatchSettled threw:", e);
+        }
       }, "emitCompletion");
       return scheduler.run(async () => {
         try {
+          try {
+            emitter?.dispatchStarted?.(dispatchId, Date.now());
+          } catch (e) {
+            debugLogger.warn("emitter.dispatchStarted threw:", e);
+          }
           if (budget && budget.total !== null && budget.remaining() <= 0) {
             debugLogger.warn(
               `[Workflow] budget gate refused dispatch at slot-acquire: runId=${runId} spent=${budget.spent()} total=${budget.total}`
@@ -2450,7 +2606,7 @@ var WorkflowOrchestrator = class {
               budget.spent()
             );
           }
-          const result = await this.dispatch(prompt, opts);
+          const result = await this.dispatch(prompt, opts, dispatchId);
           emitCompletion();
           if (journal && journalKey !== void 0) {
             journal.append({
@@ -2504,8 +2660,8 @@ var WorkflowOrchestrator = class {
         }
       );
     }, "countedDispatch");
-    const parallelImpl = makeParallelImpl(signal);
-    const pipelineImpl = makePipelineImpl(signal);
+    const parallelImpl = makeParallelImpl(signal, dependencyContext);
+    const pipelineImpl = makePipelineImpl(signal, dependencyContext);
     const resolveSavedWorkflow = req.resolveSavedWorkflow;
     const parentSandboxRef = {
       current: void 0
@@ -2546,7 +2702,10 @@ var WorkflowOrchestrator = class {
     });
     parentSandboxRef.current = sandbox;
     try {
-      const result = await sandbox.run(req.script);
+      const result = await dependencyContext.run(
+        { tails: [] },
+        () => sandbox.run(req.script)
+      );
       return {
         runId,
         result,
@@ -2591,7 +2750,7 @@ async function settleToNullArray(thunks, signal, kind = "parallel") {
   return result;
 }
 __name(settleToNullArray, "settleToNullArray");
-function makeParallelImpl(signal) {
+function makeParallelImpl(signal, dependencyContext) {
   return (thunks) => {
     if (!Array.isArray(thunks)) {
       return Promise.reject(
@@ -2609,11 +2768,32 @@ function makeParallelImpl(signal) {
         );
       }
     }
-    return settleToNullArray(thunks, signal);
+    const parent = dependencyContext.getStore();
+    const inheritedTails = parent?.tails ?? [];
+    const branches = thunks.map((thunk) => {
+      const store = { tails: [...inheritedTails] };
+      return {
+        store,
+        thunk: /* @__PURE__ */ __name(() => dependencyContext.run(store, thunk), "thunk")
+      };
+    });
+    return settleToNullArray(
+      branches.map(({ thunk }) => thunk),
+      signal
+    ).then((result) => {
+      if (parent && branches.length > 0) {
+        parent.tails = mergeFanoutTails(
+          parent.tails,
+          inheritedTails,
+          branches.flatMap(({ store }) => store.tails)
+        );
+      }
+      return result;
+    });
   };
 }
 __name(makeParallelImpl, "makeParallelImpl");
-function makePipelineImpl(signal) {
+function makePipelineImpl(signal, dependencyContext) {
   return (items, ...stages) => {
     if (!Array.isArray(items)) {
       return Promise.reject(
@@ -2631,13 +2811,45 @@ function makePipelineImpl(signal) {
         );
       }
     }
-    const chains = items.map(
-      (item, idx) => () => runPipelineChain(item, idx, stages)
-    );
-    return settleToNullArray(chains, signal, "pipeline");
+    const parent = dependencyContext.getStore();
+    const inheritedTails = parent?.tails ?? [];
+    const branches = items.map((item, idx) => {
+      const store = { tails: [...inheritedTails] };
+      return {
+        store,
+        thunk: /* @__PURE__ */ __name(() => dependencyContext.run(
+          store,
+          () => runPipelineChain(item, idx, stages)
+        ), "thunk")
+      };
+    });
+    return settleToNullArray(
+      branches.map(({ thunk }) => thunk),
+      signal,
+      "pipeline"
+    ).then((result) => {
+      if (parent && branches.length > 0) {
+        parent.tails = mergeFanoutTails(
+          parent.tails,
+          inheritedTails,
+          branches.flatMap(({ store }) => store.tails)
+        );
+      }
+      return result;
+    });
   };
 }
 __name(makePipelineImpl, "makePipelineImpl");
+function mergeFanoutTails(currentParentTails, inheritedTails, branchTails) {
+  const inherited = new Set(inheritedTails);
+  const newBranchTails = branchTails.filter((tail) => !inherited.has(tail));
+  const merged = newBranchTails.length > 0 ? [
+    ...newBranchTails,
+    ...currentParentTails.filter((tail) => !inherited.has(tail))
+  ] : currentParentTails;
+  return Array.from(new Set(merged));
+}
+__name(mergeFanoutTails, "mergeFanoutTails");
 async function runPipelineChain(item, idx, stages) {
   let prev = item;
   for (const stage of stages) {
@@ -2705,19 +2917,26 @@ var WorkflowRunner = class {
       throw new Error("Background workflow start was cancelled.");
     }
     const callerWasAbortedBeforeStart = options.signal.aborted;
-    const controller = runInBackground ? createAbortController() : createChildAbortController(options.signal);
     const registry = config.getWorkflowRunRegistry?.();
+    let entry;
+    const isCurrentEntry = /* @__PURE__ */ __name(() => registry === void 0 || entry !== void 0 && registry.get(runId) === entry, "isCurrentEntry");
+    const controller = runInBackground ? createAbortController() : createChildAbortController(options.signal);
     const dispatch = options.dispatch ?? createProductionDispatch(
       config,
       controller.signal,
       (outputTokens) => budget.recordSpent(outputTokens),
-      registry ? (emitter2) => registry.bridgeApprovalEvents(runId, emitter2) : void 0
+      registry ? (emitter2, dispatchId) => isCurrentEntry() ? registry.bridgeApprovalEvents(
+        runId,
+        emitter2,
+        dispatchId,
+        entry
+      ) : () => void 0 : void 0
     );
     const orchestrator = new WorkflowOrchestrator(dispatch);
-    let entry;
     try {
       entry = registry?.register({
         runId,
+        toolUseId: options.toolUseId,
         meta: null,
         status: "running",
         startTime: Date.now(),
@@ -2726,6 +2945,11 @@ var WorkflowRunner = class {
         tokenBudgetTotal: budget.total,
         script,
         scriptPath,
+        args: options.args,
+        ...options.resumeFromRunId ? {
+          sourceRunId: options.resumeFromRunId,
+          startMode: "retry"
+        } : {},
         isBackgrounded: runInBackground
       });
     } catch (error) {
@@ -2733,7 +2957,7 @@ var WorkflowRunner = class {
       throw error;
     }
     const emitUpdate = /* @__PURE__ */ __name(() => {
-      if (!entry || !options.onUpdate) return;
+      if (!entry || !options.onUpdate || !isCurrentEntry()) return;
       try {
         options.onUpdate(entry);
       } catch {
@@ -2741,21 +2965,48 @@ var WorkflowRunner = class {
     }, "emitUpdate");
     const emitter = {
       phaseStarted: /* @__PURE__ */ __name((title) => {
+        if (!isCurrentEntry()) return;
         registry?.onPhaseStarted(runId, title);
         emitUpdate();
       }, "phaseStarted"),
       agentDispatched: /* @__PURE__ */ __name(() => {
+        if (!isCurrentEntry()) return;
         registry?.onAgentDispatched(runId);
         emitUpdate();
       }, "agentDispatched"),
       agentCompleted: /* @__PURE__ */ __name(() => {
+        if (!isCurrentEntry()) return;
         registry?.onAgentCompleted(runId);
       }, "agentCompleted"),
-      // Deliberate no-op: logs are snapshotted at terminal via
-      // setRecentLogs; per-line emit would cause up to 10k TUI redraws.
-      logAppended: /* @__PURE__ */ __name(() => {
+      dispatchQueued: /* @__PURE__ */ __name((event) => {
+        if (!isCurrentEntry()) return;
+        registry?.onDispatchQueued(runId, event);
+        emitUpdate();
+      }, "dispatchQueued"),
+      dispatchStarted: /* @__PURE__ */ __name((dispatchId, startedAt) => {
+        if (!isCurrentEntry()) return;
+        registry?.onDispatchStarted(runId, dispatchId, startedAt);
+        emitUpdate();
+      }, "dispatchStarted"),
+      dispatchSettled: /* @__PURE__ */ __name((dispatchId, error, endedAt) => {
+        if (!isCurrentEntry()) return;
+        registry?.onDispatchSettled(
+          runId,
+          dispatchId,
+          error,
+          endedAt,
+          !runInBackground && options.signal.aborted
+        );
+        emitUpdate();
+      }, "dispatchSettled"),
+      // The registry records this without firing a status update, avoiding a
+      // TUI redraw per line while retaining the real replay timestamp.
+      logAppended: /* @__PURE__ */ __name((line) => {
+        if (!isCurrentEntry()) return;
+        registry?.onLogAppended(runId, line);
       }, "logAppended"),
       budgetUpdated: /* @__PURE__ */ __name((spent, total) => {
+        if (!isCurrentEntry()) return;
         registry?.onBudgetUpdated(runId, spent, total);
         emitUpdate();
       }, "budgetUpdated")
@@ -2763,7 +3014,10 @@ var WorkflowRunner = class {
     const scheduler = new WorkflowDispatchScheduler(
       resolveConcurrencyLimit(),
       controller.signal,
-      ({ state }) => registry?.onDispatchStateChange(runId, state)
+      ({ state }) => {
+        if (!isCurrentEntry()) return;
+        registry?.onDispatchStateChange(runId, state);
+      }
     );
     const handle = new WorkflowRunHandle(
       runId,
@@ -2823,6 +3077,7 @@ var WorkflowRunner = class {
               duration_ms: (entry.endTime ?? entry.startTime) - entry.startTime
             });
             await writeWorkflowSnapshot(config, entry);
+            await journal?.drain();
             try {
               logWorkflowRun(config, telemetryEvent);
             } catch {
@@ -2853,7 +3108,7 @@ var WORKFLOW_PARAM_SCHEMA = {
   properties: {
     script: {
       type: "string",
-      description: `JavaScript source of the workflow. Wrapped as an async IIFE. May call the injected globals \`phase(title)\`, \`log(msg)\`, \`agent(prompt, opts?)\`, and read \`args\`. agent() opts: \`{ label?, phase?, schema?, model?, agentType?, isolation? }\`. \`schema\` (JSON Schema object): the subagent must deliver its result by calling \`structured_output\` with arguments matching the schema; agent() resolves to the validated object. Two failed attempts produce a terminal error "subagent completed without calling StructuredOutput (after 2 in-conversation nudges)". \`agentType\` (string): resolves against the declarative-agents registry (\`.qwen/agents/<name>.md\`, project then user then built-in). Unresolved names throw "agent({agentType}): agent type 'X' not found". \`model\` (string): per-call model override; routes provider correctly via the subagent runtime view. \`isolation\`: \`'worktree'\` provisions a fresh git worktree under \`<projectRoot>/.qwen/worktrees/agent-<7hex>\`; the worktree is auto-removed if no changes, otherwise the path and branch are returned alongside the result. \`'remote'\` throws "agent({isolation:'remote'}) is not available in this build" (parity with upstream). isolation=worktree refuses to run when the parent working tree has uncommitted changes (the subagent would see a stale HEAD). Workflow subagents always have SendMessage / Monitor / EnterPlanMode / ExitPlanMode in their disallowed-tool floor regardless of agentType. Concurrency: \`parallel([() => agent(...), ...])\` runs thunks through a shared per-run window (default \`max(1, min(16, cpus-2))\` agents in flight; override via \`${MAX_WORKFLOW_CONCURRENCY_ENV}\`) and resolves to a position-aligned array \u2014 a thunk that throws, or resolves to a non-JSON-serializable value, becomes \`null\` at its index (errors-as-data); parallel() itself rejects only on invalid arguments or abort. \`pipeline(items, ...stages)\` runs each item through the stages (staggered, no inter-stage barrier); a stage that throws, returns \`null\`, or returns a non-JSON-serializable value drops that item to \`null\`. Pass THUNKS to parallel, not eager calls: \`parallel([() => agent(...)])\`, not \`parallel([agent(...)])\`. At most ${DEFAULT_MAX_AGENTS_PER_RUN} agent() calls per run (override via \`${MAX_WORKFLOW_AGENTS_ENV}\`). \`Date.now()\` and \`Math.random()\` both throw \u2014 workflow scripts must be deterministic for resume. \`export const meta = {...}\` declarations are stripped before execution.`
+      description: `JavaScript source of the workflow. Wrapped as an async IIFE. May call the injected globals \`phase(title)\`, \`log(msg)\`, \`agent(prompt, opts?)\`, and read \`args\`. agent() opts: \`{ label?, phase?, schema?, model?, agentType?, isolation?, workingDir?, stallMs? }\`. \`schema\` (JSON Schema object): the subagent must deliver its result by calling \`structured_output\` with arguments matching the schema; agent() resolves to the validated object. Two failed attempts produce a terminal error "subagent completed without calling StructuredOutput (after 2 in-conversation nudges)". \`agentType\` (string): resolves against the declarative-agents registry (\`.qwen/agents/<name>.md\`, project then user then built-in). Unresolved names throw "agent({agentType}): agent type 'X' not found". \`model\` (string): per-call model override; routes provider correctly via the subagent runtime view. \`isolation\`: \`'worktree'\` provisions a fresh git worktree under \`<projectRoot>/.qwen/worktrees/agent-<7hex>\`; the worktree is auto-removed if no changes, otherwise the path and branch are returned alongside the result. \`'remote'\` throws "agent({isolation:'remote'}) is not available in this build" (parity with upstream). isolation=worktree refuses to run when the parent working tree has uncommitted changes (the subagent would see a stale HEAD). \`workingDir\` (string): pin the subagent to an EXISTING git worktree of this repository that the caller owns \u2014 nothing is created and nothing is removed. Use it when the directory the agent must work in already exists and its uncommitted state is the point (a review worktree, a checkout a previous step provisioned) \u2014 exactly the case isolation cannot serve. Mutually exclusive with \`isolation\`. The path must be a linked worktree of this repository registered via \`git worktree add\` (it may live anywhere on disk) \u2014 the main checkout is not eligible. \`stallMs\` (number, ms): a no-progress watchdog, not a wall-clock cap. The dispatch is aborted and retried (up to ${MAX_STALL_ATTEMPTS} attempts total) after this many milliseconds with no observable subagent progress once progress has begun (a dispatch that produces no first response is bounded by the subagent time cap, not this watchdog); the timer is suspended while a tool is in flight, so a legitimately slow tool is not a stall. Default ${DEFAULT_STALL_MS} (override via \`${MAX_WORKFLOW_STALL_MS_ENV}\`, whole seconds); \`0\` disables the watchdog. Wall time per attempt is bounded separately. Workflow subagents always have SendMessage / Monitor / EnterPlanMode / ExitPlanMode in their disallowed-tool floor regardless of agentType. Concurrency: \`parallel([() => agent(...), ...])\` runs thunks through a shared per-run window (default \`max(1, min(16, cpus-2))\` agents in flight; override via \`${MAX_WORKFLOW_CONCURRENCY_ENV}\`) and resolves to a position-aligned array \u2014 a thunk that throws, or resolves to a non-JSON-serializable value, becomes \`null\` at its index (errors-as-data); parallel() itself rejects only on invalid arguments or abort. \`pipeline(items, ...stages)\` runs each item through the stages (staggered, no inter-stage barrier); a stage that throws, returns \`null\`, or returns a non-JSON-serializable value drops that item to \`null\`. Pass THUNKS to parallel, not eager calls: \`parallel([() => agent(...)])\`, not \`parallel([agent(...)])\`. At most ${DEFAULT_MAX_AGENTS_PER_RUN} agent() calls per run (override via \`${MAX_WORKFLOW_AGENTS_ENV}\`). \`Date.now()\` and \`Math.random()\` both throw \u2014 workflow scripts must be deterministic for resume. \`export const meta = {...}\` declarations are stripped before execution.`
     },
     scriptPath: {
       type: "string",
@@ -2886,6 +3141,10 @@ var WorkflowToolInvocation = class extends BaseToolInvocation {
   static {
     __name(this, "WorkflowToolInvocation");
   }
+  callId;
+  setCallId(callId) {
+    this.callId = callId;
+  }
   getDescription() {
     if (this.params.scriptPath && this.params.script === void 0) {
       return `Run saved workflow (${path.basename(this.params.scriptPath)})`;
@@ -2908,6 +3167,7 @@ var WorkflowToolInvocation = class extends BaseToolInvocation {
       handle = await WorkflowRunner.start({
         config: this.config,
         signal,
+        toolUseId: this.callId,
         script: this.params.script,
         scriptPath: this.params.scriptPath,
         args: this.params.args,
@@ -2930,6 +3190,7 @@ var WorkflowToolInvocation = class extends BaseToolInvocation {
         handle.budget.total
       );
       return {
+        workflowRunId: handle.runId,
         llmContent: [
           {
             text: `Workflow started in background.
@@ -3090,7 +3351,7 @@ Reach for one to be comprehensive (decompose the work and cover every part in pa
 
 **Runtime** \u2014 see the \`script\` parameter for the detailed authoring contract.
 
-\`phase(title)\`, \`log(msg)\`, \`agent(prompt, opts?)\`, \`parallel(thunks)\`, \`pipeline(items, ...stages)\`, \`workflow(nameOrRef, args?)\`, plus the \`args\` and \`budget\` globals. \`workflow()\` runs a saved workflow inline under this run's caps and nests one level only \u2014 a workflow reached through \`workflow()\` cannot call \`workflow()\` itself, and doing so throws. Saved workflows are \`<name>.js\` files under \`<projectRoot>/.qwen/workflows\` (project scope, also surfaced as \`/<name>\` slash commands) or \`~/.qwen/workflows\` (user scope, lower precedence when both define the same name); \`workflow('<name>')\` resolves against those two directories, while \`scriptPath\` takes an absolute path to a script anywhere. Default \`max(1, min(16, cpus-2))\` agents in flight per run (\`${MAX_WORKFLOW_CONCURRENCY_ENV}\`), up to ${DEFAULT_MAX_AGENTS_PER_RUN} agents total (\`${MAX_WORKFLOW_AGENTS_ENV}\`), under a 30-minute wall-clock cap per run (\`QWEN_CODE_MAX_WORKFLOW_SECONDS\`) \u2014 a fan-out near the agent cap will not fit inside the default cap. A per-run output-token cap may also be in effect: read \`budget.total\` (\`null\` = uncapped) before committing to a large fan-out, because once the cap is reached every further \`agent()\` call is refused \u2014 a bare sequential \`await agent()\` sees the rejection, while inside \`parallel()\`/\`pipeline()\` the refused slot becomes \`null\` and the script keeps running on partial results. Per-call \`agent({ schema, agentType, model, isolation: 'worktree' })\` covers structured-output contracts, declarative-agent selection, model override, and git-worktree-isolated subagents. \`resumeFromRunId\` resumes a prior run \u2014 agent() calls whose rolling prefix-hash matches the journal are served from cache for the longest unchanged prefix. Runs appear in the background-tasks view and the \`/workflows\` dialog (live phase tree, token usage, cooperative pause/resume, cancel); \`run_in_background: true\` returns a run handle immediately in the interactive TUI and delivers completion through the conversation. Scripts run in a node:vm sandbox with no filesystem or shell access \u2014 all I/O happens through the spawned agents.
+\`phase(title)\`, \`log(msg)\`, \`agent(prompt, opts?)\`, \`parallel(thunks)\`, \`pipeline(items, ...stages)\`, \`workflow(nameOrRef, args?)\`, plus the \`args\` and \`budget\` globals. \`workflow()\` runs a saved workflow inline under this run's caps and nests one level only \u2014 a workflow reached through \`workflow()\` cannot call \`workflow()\` itself, and doing so throws. Saved workflows are \`<name>.js\` files under \`<projectRoot>/.qwen/workflows\` (project scope, also surfaced as \`/<name>\` slash commands) or \`~/.qwen/workflows\` (user scope, lower precedence when both define the same name); \`workflow('<name>')\` resolves against those two directories, while \`scriptPath\` takes an absolute path to a script anywhere. Default \`max(1, min(16, cpus-2))\` agents in flight per run (\`${MAX_WORKFLOW_CONCURRENCY_ENV}\`), up to ${DEFAULT_MAX_AGENTS_PER_RUN} agents total (\`${MAX_WORKFLOW_AGENTS_ENV}\`), under a 30-minute wall-clock cap per run (\`QWEN_CODE_MAX_WORKFLOW_SECONDS\`) \u2014 a fan-out near the agent cap will not fit inside the default cap. Each subagent attempt is separately capped at ${DEFAULT_WORKFLOW_SUBAGENT_MAX_TURNS} turns (\`${WORKFLOW_SUBAGENT_MAX_TURNS_ENV}\`) and ${DEFAULT_WORKFLOW_SUBAGENT_MAX_TIME_MINUTES} minutes (\`${WORKFLOW_SUBAGENT_MAX_MINUTES_ENV}\`) \u2014 an attempt that hits either becomes \`null\` in \`parallel()\`/\`pipeline()\`, indistinguishable from a missing agent, so raise them for legitimately long work. A per-run output-token cap may also be in effect: read \`budget.total\` (\`null\` = uncapped) before committing to a large fan-out, because once the cap is reached every further \`agent()\` call is refused \u2014 a bare sequential \`await agent()\` sees the rejection, while inside \`parallel()\`/\`pipeline()\` the refused slot becomes \`null\` and the script keeps running on partial results. Per-call \`agent({ schema, agentType, model, isolation: 'worktree', workingDir, stallMs })\` covers structured-output contracts, declarative-agent selection, model override, git-worktree-isolated subagents, pinning an agent to a caller-owned worktree, and the no-progress stall watchdog (\`stallMs: 0\` disables it). \`resumeFromRunId\` resumes a prior run \u2014 agent() calls whose rolling prefix-hash matches the journal are served from cache for the longest unchanged prefix. Runs appear in the background-tasks view and the \`/workflows\` dialog (live phase tree, token usage, cooperative pause/resume, cancel); \`run_in_background: true\` returns a run handle immediately in the interactive TUI and delivers completion through the conversation. Scripts run in a node:vm sandbox with no filesystem or shell access \u2014 all I/O happens through the spawned agents.
 
 **Scout first, then orchestrate**