@adhdev/daemon-core 0.9.82-rc.187 → 0.9.82-rc.189

package/dist/index.mjs

@@ -270,6 +270,8 @@ async function getGitRepoStatus(workspace, options = {}) {
     if (includeSubmodules) {
       submodules = await getSubmoduleStatuses(repo, options);
     }
+    const submoduleDirty = (submodules || []).some((submodule) => submodule.dirty || submodule.outOfSync || !!submodule.error);
+    const dirty = parsed.staged + parsed.modified + parsed.untracked + parsed.deleted + parsed.renamed > 0 || parsed.conflictFiles.length > 0 || stashCount > 0 || submoduleDirty;
     return {
       workspace: repo.workspace,
       repoRoot: repo.repoRoot,
@@ -288,6 +290,7 @@ async function getGitRepoStatus(workspace, options = {}) {
       untracked: parsed.untracked,
       deleted: parsed.deleted,
       renamed: parsed.renamed,
+      dirty,
       hasConflicts: parsed.conflictFiles.length > 0,
       conflictFiles: parsed.conflictFiles,
       stashCount,
@@ -461,6 +464,7 @@ function emptyStatus(workspace, lastCheckedAt, error) {
     untracked: 0,
     deleted: 0,
     renamed: 0,
+    dirty: false,
     hasConflicts: false,
     conflictFiles: [],
     stashCount: 0,
@@ -473,17 +477,33 @@ async function getSubmoduleStatuses(repo, options) {
   if (!repo.repoRoot) return [];
   try {
     const result = await runGit(repo, ["submodule", "status", "--recursive"], options);
-    return parseSubmoduleStatusOutput(result.stdout, repo.repoRoot, options.submoduleIgnorePaths);
+    const submodules = parseSubmoduleStatusOutput(result.stdout, repo.repoRoot, options.submoduleIgnorePaths);
+    await Promise.all(submodules.map((submodule) => enrichSubmoduleWorktreeStatus(repo, submodule, options)));
+    return submodules;
   } catch {
     return [];
   }
 }
+async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
+  try {
+    const result = await runGit(repo, ["status", "--porcelain=v2", "--branch"], {
+      ...options,
+      cwd: submodule.repoPath
+    });
+    const parsed = parsePorcelainV2Status(result.stdout);
+    const dirty = parsed.staged + parsed.modified + parsed.untracked + parsed.deleted + parsed.renamed > 0 || parsed.conflictFiles.length > 0;
+    submodule.dirty = submodule.dirty || dirty;
+  } catch (error) {
+    submodule.dirty = true;
+    submodule.error = formatGitError(error);
+  }
+}
 function parseSubmoduleStatusOutput(output, repoRoot, ignorePaths) {
   const submodules = [];
   const ignoreSet = new Set(ignorePaths || []);
   for (const line of output.split("\n")) {
     if (!line.trim()) continue;
-    const match = line.match(/^([\-+\s])([0-9a-f]{40})\s+(\S+)(?:\s+\(([^)]+)\))?/);
+    const match = line.match(/^([\-+U\s])([0-9a-f]{40})\s+(\S+)(?:\s+\(([^)]+)\))?/);
     if (!match) continue;
     const prefix = match[1];
     const commit = match[2];
@@ -493,8 +513,8 @@ function parseSubmoduleStatusOutput(output, repoRoot, ignorePaths) {
       path: path40,
       commit,
       repoPath: repoRoot + "/" + path40,
-      dirty: prefix === "+",
-      outOfSync: prefix === "-",
+      dirty: prefix === "U",
+      outOfSync: prefix === "-" || prefix === "+",
       lastCheckedAt: Date.now()
     });
   }
@@ -5584,6 +5604,8 @@ function handleMeshForwardEvent(components, payload) {
   const nodeId = readNonEmptyString2(payload.nodeId);
   const workspace = readNonEmptyString2(payload.workspace);
   const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
+  const relayModalMessage = readNonEmptyString2(payload.modalMessage);
+  const relayModalButtons = Array.isArray(payload.modalButtons) ? payload.modalButtons.filter((b) => typeof b === "string" && b.trim().length > 0) : null;
   return injectMeshSystemMessage(components, {
     meshId,
     nodeId,
@@ -5601,6 +5623,8 @@ function handleMeshForwardEvent(components, payload) {
       startedAt: readNonEmptyString2(payload.startedAt),
       completedAt: readNonEmptyString2(payload.completedAt),
       retryOfJobId: readNonEmptyString2(payload.retryOfJobId),
+      ...relayModalMessage ? { modalMessage: relayModalMessage } : {},
+      ...relayModalButtons && relayModalButtons.length > 0 ? { modalButtons: relayModalButtons } : {},
       ...payload.result && typeof payload.result === "object" && !Array.isArray(payload.result) ? { result: payload.result } : {},
       ...payload.completionDiagnostic && typeof payload.completionDiagnostic === "object" && !Array.isArray(payload.completionDiagnostic) ? { completionDiagnostic: payload.completionDiagnostic } : {},
       ...payload.workerResult && typeof payload.workerResult === "object" && !Array.isArray(payload.workerResult) ? { workerResult: payload.workerResult } : {},
@@ -6150,6 +6174,52 @@ var init_provider_schema = __esm({
                   properties: { mode: { const: "env_var" }, name: { type: "string" } }
                 }
               ]
+            },
+            delegatedWorkerIsolation: {
+              description: "Provider-declared launch isolation for coordinator-spawned worker sessions. Keeps worker-only sessions from inheriting coordinator MCP/tools/config.",
+              type: "object",
+              additionalProperties: false,
+              properties: {
+                env: {
+                  type: "object",
+                  additionalProperties: false,
+                  properties: {
+                    unset: {
+                      type: "array",
+                      items: { type: "string", minLength: 1 }
+                    }
+                  }
+                },
+                args: {
+                  type: "array",
+                  items: {
+                    oneOf: [
+                      {
+                        type: "object",
+                        additionalProperties: false,
+                        required: ["mode", "flag"],
+                        properties: {
+                          mode: { const: "empty_mcp_config" },
+                          flag: { type: "string", minLength: 1 },
+                          strictFlag: { type: "string", minLength: 1 }
+                        }
+                      },
+                      {
+                        type: "object",
+                        additionalProperties: false,
+                        required: ["mode", "flag", "key", "value"],
+                        properties: {
+                          mode: { const: "config_override" },
+                          flag: { type: "string", minLength: 1 },
+                          key: { type: "string", minLength: 1 },
+                          value: { type: "string", minLength: 1 },
+                          dedupeKey: { type: "string", minLength: 1 }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
             }
           }
         },
@@ -12025,7 +12095,14 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
   switch (command) {
     case "git_status": {
       if (!services.getStatus) return serviceNotImplemented(command);
-      const status = await runService(() => services.getStatus({ workspace, refreshUpstream: optionalBoolean(args?.refreshUpstream) }));
+      const submoduleIgnorePaths = Array.isArray(args?.submoduleIgnorePaths) ? args.submoduleIgnorePaths.filter((value) => typeof value === "string" && value.trim().length > 0) : void 0;
+      const statusParams = { workspace };
+      const refreshUpstream = optionalBoolean(args?.refreshUpstream);
+      const includeSubmodules = optionalBoolean(args?.includeSubmodules);
+      if (refreshUpstream !== void 0) statusParams.refreshUpstream = refreshUpstream;
+      if (includeSubmodules !== void 0) statusParams.includeSubmodules = includeSubmodules;
+      if (submoduleIgnorePaths && submoduleIgnorePaths.length > 0) statusParams.submoduleIgnorePaths = submoduleIgnorePaths;
+      const status = await runService(() => services.getStatus(statusParams));
       return "success" in status ? status : { success: true, status };
     }
     case "git_diff_summary": {
@@ -12158,6 +12235,14 @@ async function gitCheckpoint(workspace, message, includeUntracked) {
   if (statusResult.hasConflicts) {
     throw new GitCommandError("conflict", "Repository has conflicts \u2014 resolve before checkpointing");
   }
+  const dirtySubmodules = (statusResult.submodules || []).filter((submodule) => submodule.dirty);
+  if (dirtySubmodules.length > 0) {
+    const paths = dirtySubmodules.map((submodule) => submodule.path).join(", ");
+    throw new GitCommandError(
+      "dirty_index_required",
+      `Repository has dirty submodules that must be checkpointed first: ${paths}. Checkpoint or commit each dirty submodule, then checkpoint this repository to record gitlink changes.`
+    );
+  }
   const addArgs = includeUntracked ? ["-A"] : ["-u"];
   await runGit(repo, ["add", ...addArgs], { cwd: repoRoot });
   const fullMsg = `adhdev: checkpoint ${message}`;
@@ -21479,6 +21564,14 @@ function hasVisibleAssistantMessage(messages) {
     return String(message.content || "").trim().length > 0;
   });
 }
+function hasFinalVisibleAssistantMessage(messages) {
+  if (!Array.isArray(messages)) return false;
+  const visible = filterUserFacingChatMessages(messages);
+  const last = visible[visible.length - 1];
+  const role = typeof last?.role === "string" ? last.role.trim().toLowerCase() : "";
+  const content = last ? flattenContent(last.content).trim() : "";
+  return (role === "assistant" || role === "model") && content.length > 0;
+}
 function shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus) {
   if (!isGeneratingLikeStatus(parsedStatus)) return false;
   if (hasNonEmptyModalButtons(activeModal)) return false;
@@ -22333,6 +22426,18 @@ async function handleReadChat(h, args) {
           });
         }
       }
+      if (isGeneratingLikeStatus(selectedStatus) && selectedTranscriptAuthority === "provider" && !hasNonEmptyModalButtons(activeModal) && hasFinalVisibleAssistantMessage(selectedMessages)) {
+        selectedStatus = "idle";
+        selectedMessages = finalizeStreamingMessagesWhenIdle(selectedMessages, selectedStatus);
+        messageSource = {
+          ...messageSource,
+          statusReconciled: {
+            from: returnedStatus,
+            to: "idle",
+            reason: "provider_native_final_assistant"
+          }
+        };
+      }
       LOG.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
       return buildReadChatCommandResult({
         messages: selectedMessages,
@@ -25549,6 +25654,13 @@ var TerminalAdapter = class {
   snapshot() {
     return this.lastScreen || this.computeScreen();
   }
+  getCursorPosition() {
+    const buf = this.term.buffer.active;
+    return {
+      row: Math.max(0, buf.cursorY ?? 0),
+      col: Math.max(0, buf.cursorX ?? 0)
+    };
+  }
   kill() {
     this.stopTimers();
     try {
@@ -25653,14 +25765,33 @@ function compileLinePattern(ref) {
   const flags = (ref.flags ?? "m").replace(/g/g, "");
   return new RegExp(ref.pattern, flags);
 }
-function matchState(state, sections, fullScreen, trace) {
+function matchState(state, sections, fullScreen, trace, cursor) {
   const haystack = sectionText(sections, state.when.section, fullScreen);
   const re = compileRegex(state.when);
   if (!re.test(haystack)) {
     trace.push({ kind: "state_skip", text: `state[${state.id}] when ${state.when.section ?? "*"}~/${state.when.regex}/ no match` });
     return { matched: false, title: null };
   }
-  trace.push({ kind: "state_match", text: `state[${state.id}] matched via ${state.when.section ?? "*"}~/${state.when.regex}/` });
+  if (cursor !== void 0) {
+    const w = state.when;
+    if (w.cursor_row_min !== void 0 && cursor.row < w.cursor_row_min) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor row ${cursor.row} < cursor_row_min ${w.cursor_row_min}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_row_max !== void 0 && cursor.row > w.cursor_row_max) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor row ${cursor.row} > cursor_row_max ${w.cursor_row_max}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_col_min !== void 0 && cursor.col < w.cursor_col_min) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor col ${cursor.col} < cursor_col_min ${w.cursor_col_min}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_col_max !== void 0 && cursor.col > w.cursor_col_max) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor col ${cursor.col} > cursor_col_max ${w.cursor_col_max}` });
+      return { matched: false, title: null };
+    }
+  }
+  trace.push({ kind: "state_match", text: `state[${state.id}] matched via ${state.when.section ?? "*"}~/${state.when.regex}/${cursor !== void 0 ? ` cursor=(${cursor.row},${cursor.col})` : ""}` });
   let title = null;
   if (state.extract_title) {
     const titleHay = sectionText(sections, state.extract_title.section, fullScreen);
@@ -25718,17 +25849,20 @@ function extractModal(state, sections, fullScreen, title, trace) {
   trace.push({ kind: "modal", text: `modal_buttons matched ${buttons.length} choices` });
   return { title, buttons };
 }
-function evaluate(spec, screenText) {
+function evaluate(spec, screenText, cursor) {
   const trace = [];
   const lines = screenText.split("\n");
   const sections = resolveSections(spec, lines);
   for (const s of sections) {
     trace.push({ kind: "section", text: `section[${s.id}] lines [${s.fromLine}, ${s.toLine}) (${s.toLine - s.fromLine} lines)` });
   }
+  if (cursor !== void 0) {
+    trace.push({ kind: "section", text: `cursor (${cursor.row}, ${cursor.col})` });
+  }
   let activeState = null;
   let modal = null;
   for (const st of spec.states) {
-    const { matched, title } = matchState(st, sections, screenText, trace);
+    const { matched, title } = matchState(st, sections, screenText, trace, cursor);
     if (!matched) continue;
     const extractedModal = extractModal(st, sections, screenText, title, trace);
     if (st.modal_buttons && !extractedModal) {
@@ -25919,7 +26053,18 @@ var SCHEMA = {
       "additionalProperties": false,
       "properties": {
         "busy_hold_ms": { "type": "integer", "minimum": 0 },
-        "startup_grace_ms": { "type": "integer", "minimum": 0 }
+        "startup_grace_ms": { "type": "integer", "minimum": 0 },
+        "completion_idle_after": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["regex", "hold_ms"],
+          "properties": {
+            "section": { "type": "string", "minLength": 1 },
+            "regex": { "type": "string", "minLength": 1 },
+            "flags": { "type": "string" },
+            "hold_ms": { "type": "integer", "minimum": 0 }
+          }
+        }
       }
     }
   },
@@ -25985,6 +26130,22 @@ var SCHEMA = {
         "flags": {
           "type": "string",
           "default": "i"
+        },
+        "cursor_row_min": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_row_max": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_col_min": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_col_max": {
+          "type": "integer",
+          "minimum": 0
         }
       }
     },
@@ -26399,6 +26560,30 @@ function resolveSubmitDelayMs(specBeforeSubmit, text) {
   const spec = typeof specBeforeSubmit === "number" && specBeforeSubmit > 0 ? specBeforeSubmit : 0;
   return Math.max(spec, SUBMIT_DELAY_FLOOR_MS + linesBonus);
 }
+function matchesCompletionIdleRule(spec, ev, screen) {
+  const rule = spec.debounce?.completion_idle_after;
+  if (!rule?.regex) return null;
+  const haystack = rule.section ? ev.sections.find((section) => section.id === rule.section)?.text ?? "" : screen;
+  if (!haystack) return null;
+  try {
+    const regex = new RegExp(rule.regex, rule.flags || "");
+    const match = haystack.match(regex);
+    return match?.[0] || null;
+  } catch {
+    return null;
+  }
+}
+function matchesCompletionIdleTargetState(spec, ev, screen) {
+  const target = spec.states.find((state) => state.id === spec.default_state) ?? spec.states.find((state) => state.id === "idle");
+  if (!target?.when?.regex) return false;
+  const haystack = target.when.section ? ev.sections.find((section) => section.id === target.when.section)?.text ?? "" : screen;
+  if (!haystack) return false;
+  try {
+    return new RegExp(target.when.regex, target.when.flags || "i").test(haystack);
+  } catch {
+    return false;
+  }
+}
 var SpecDriver = class {
   constructor(opts) {
     this.opts = opts;
@@ -26438,6 +26623,8 @@ var SpecDriver = class {
    *  because the evaluator already moved past busy by the time the hold
    *  kicks in. */
   lastBusyState = null;
+  completionIdleFirstSeenAt = 0;
+  completionIdleKey = "";
   /** Timer that re-runs evaluate() once the hold window expires. Needed
    *  because the PTY stops emitting once the agent finishes; without an
    *  explicit wake-up there's nothing to trigger the busy → idle
@@ -26488,6 +26675,9 @@ var SpecDriver = class {
   snapshot() {
     return this.adapter.snapshot();
   }
+  getCursorPosition() {
+    return this.adapter.getCursorPosition();
+  }
   shutdown() {
     for (const t of this.delegateTimers.values()) clearTimeout(t);
     this.delegateTimers.clear();
@@ -26552,7 +26742,8 @@ var SpecDriver = class {
   }
   reevaluate(forceEmit = false) {
     const screen = this.adapter.snapshot();
-    const ev = evaluate(this.spec, screen);
+    const cursor = this.adapter.getCursorPosition();
+    const ev = evaluate(this.spec, screen, cursor);
     let evState = ev.state;
     const busyHoldMs = this.spec.debounce?.busy_hold_ms ?? BUSY_HOLD_MS;
     if (this.currentStateId === "busy" && evState.id === "idle") {
@@ -26561,10 +26752,40 @@ var SpecDriver = class {
         evState = this.lastBusyState ?? evState;
       }
     }
+    const completionIdleRule = this.spec.debounce?.completion_idle_after;
+    let busyWakeMs = busyHoldMs;
+    if (evState.id === "busy" && completionIdleRule) {
+      const completionKey = matchesCompletionIdleRule(this.spec, ev, screen);
+      if (completionKey) {
+        const now = Date.now();
+        if (completionKey !== this.completionIdleKey) {
+          this.completionIdleKey = completionKey;
+          this.completionIdleFirstSeenAt = now;
+        }
+        const holdMs = Math.max(0, completionIdleRule.hold_ms || 0);
+        const ageMs = now - this.completionIdleFirstSeenAt;
+        if (ageMs >= holdMs) {
+          if (matchesCompletionIdleTargetState(this.spec, ev, screen)) {
+            const idle = this.spec.states.find((state) => state.id === this.spec.default_state) ?? this.spec.states.find((state) => state.id === "idle");
+            evState = idle ? { id: idle.id, label: idle.label, title: null } : { id: "idle", label: "Ready", title: null };
+          } else {
+            busyWakeMs = Math.min(busyWakeMs, 1e3);
+          }
+        } else {
+          busyWakeMs = Math.min(busyWakeMs, Math.max(holdMs - ageMs, 0));
+        }
+      } else {
+        this.completionIdleKey = "";
+        this.completionIdleFirstSeenAt = 0;
+      }
+    } else if (evState.id !== "busy") {
+      this.completionIdleKey = "";
+      this.completionIdleFirstSeenAt = 0;
+    }
     if (evState.id === "busy") {
       this.lastBusyAt = Date.now();
       this.lastBusyState = evState;
-      this.scheduleBusyExpiry(busyHoldMs);
+      this.scheduleBusyExpiry(busyWakeMs);
     }
     const changed = forceEmit || evState.id !== this.currentStateId || !shallowSameModal(ev, this.currentEval) || !shallowSameControls(ev, this.currentEval);
     if (this.pickerInProgress) this.tryAdvancePicker(screen);
@@ -27467,6 +27688,8 @@ var CliProviderInstance = class {
   historyWriter;
   runtimeMessages = [];
   lastPersistedHistoryMessages = [];
+  lastAcknowledgedUserInputAt = 0;
+  externalBusyIdleFingerprint = "";
   lastNativeSourceCanonicalCheckAt = 0;
   lastNativeSourceCanonicalCacheKey = void 0;
   cachedSqliteDb = null;
@@ -27595,7 +27818,11 @@ var CliProviderInstance = class {
       typeof adapterStatus?.providerSessionId === "string" ? adapterStatus.providerSessionId : ""
     );
     const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
-    const visibleStatus = parseErrorMessage || parsedStatus?.status === "error" ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
+    let visibleStatus = parseErrorMessage || parsedStatus?.status === "error" ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
+    const externalNativeFinal = this.getExternalNativeFinalReconciliation(parsedStatus?.messages, adapterStatus);
+    if (externalNativeFinal && isCliGeneratingLikeStatus(visibleStatus)) {
+      visibleStatus = "idle";
+    }
     const runtime = this.adapter.getRuntimeMetadata();
     this.maybeAppendRuntimeRecoveryMessage(runtime);
     let parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
@@ -27757,7 +27984,22 @@ var CliProviderInstance = class {
     };
   }
   updateSettings(newSettings) {
-    this.settings = { ...newSettings };
+    const runtimeMeshSettings = {};
+    for (const key of [
+      "meshNodeFor",
+      "meshNodeId",
+      "meshActiveTaskId",
+      "meshCoordinatorFor",
+      "meshCoordinatorDaemonId",
+      "meshCoordinatorNodeId",
+      "spawnedSessionVisibility",
+      "launchedByCoordinator"
+    ]) {
+      if (this.settings[key] !== void 0 && newSettings[key] === void 0) {
+        runtimeMeshSettings[key] = this.settings[key];
+      }
+    }
+    this.settings = { ...newSettings, ...runtimeMeshSettings };
     this.adapter.updateRuntimeSettings?.(this.settings);
     this.monitor.updateConfig({
       approvalAlert: this.settings.approvalAlert !== false,
@@ -27848,6 +28090,8 @@ var CliProviderInstance = class {
     const content = typeof input === "string" ? input.trim() : buildCliStructuredInputPrompt(input).trim();
     if (!content) return;
     const receivedAt = Date.now();
+    this.lastAcknowledgedUserInputAt = receivedAt;
+    this.externalBusyIdleFingerprint = "";
     const dedupKey = `user_input_ack:${crypto4.createHash("sha256").update(`${this.instanceId}:${content}:${receivedAt}`).digest("hex").slice(0, 24)}`;
     this.appendRuntimeMessage(buildChatMessage({
       role: "user",
@@ -27996,6 +28240,50 @@ var CliProviderInstance = class {
     const evidence = this.completionFinalAssistantEvidence(parsedMessages);
     return extractFinalSummaryFromMessages(evidence.messages);
   }
+  externalNativeFinalFingerprint(evidence) {
+    const messages = Array.isArray(evidence.messages) ? evidence.messages : [];
+    const visibleMessages = messages.filter((message) => isUserFacingChatMessage(message));
+    const lastVisible = visibleMessages[visibleMessages.length - 1];
+    const content = lastVisible ? flattenContent(lastVisible.content).trim() : "";
+    const receivedAt = lastVisible ? getMessageTime(lastVisible) : 0;
+    const probe = this.lastExternalCompletionProbe;
+    return crypto4.createHash("sha256").update([
+      this.type,
+      this.providerSessionId || "",
+      probe?.sourcePath || "",
+      String(probe?.sourceMtimeMs || 0),
+      String(receivedAt || 0),
+      content.slice(-500)
+    ].join("\0")).digest("hex").slice(0, 24);
+  }
+  getExternalNativeFinalReconciliation(parsedMessages, adapterStatus) {
+    const rawStatus = typeof adapterStatus?.status === "string" ? adapterStatus.status.trim() : "";
+    if (!isCliGeneratingLikeStatus(rawStatus)) return null;
+    if (hasNonEmptyCliModalButtons(adapterStatus?.activeModal ?? adapterStatus?.modal)) return null;
+    const evidence = this.completionFinalAssistantEvidence(parsedMessages);
+    if (evidence.source !== "external-native" || !evidence.present) return null;
+    const messages = Array.isArray(evidence.messages) ? evidence.messages : [];
+    const visibleMessages = messages.filter((message) => isUserFacingChatMessage(message));
+    const lastVisible = visibleMessages[visibleMessages.length - 1];
+    const lastMessageAt = lastVisible ? getMessageTime(lastVisible) : 0;
+    const sourceMtimeMs = Number(this.lastExternalCompletionProbe?.sourceMtimeMs || 0);
+    const minEvidenceAt = Math.max(
+      this.startedAt > 0 ? this.startedAt - 5e3 : 0,
+      this.generatingStartedAt > 0 ? this.generatingStartedAt - 5e3 : 0,
+      this.lastAcknowledgedUserInputAt > 0 ? this.lastAcknowledgedUserInputAt - 1e3 : 0
+    );
+    if (minEvidenceAt > 0 && lastMessageAt > 0 && lastMessageAt < minEvidenceAt && sourceMtimeMs < minEvidenceAt) {
+      return null;
+    }
+    const finalSummary = extractFinalSummaryFromMessages(evidence.messages);
+    if (!finalSummary) return null;
+    const fingerprint = this.externalNativeFinalFingerprint(evidence);
+    if (fingerprint === this.externalBusyIdleFingerprint) {
+      return { fingerprint, finalSummary, evidence };
+    }
+    this.externalBusyIdleFingerprint = fingerprint;
+    return { fingerprint, finalSummary, evidence };
+  }
   buildCompletedFinalizationDiagnostic(args) {
     let parsed = null;
     let parseError;
@@ -28066,17 +28354,18 @@ var CliProviderInstance = class {
     if (typeof adapterAny?.responseBuffer === "string" && adapterAny.responseBuffer.trim()) return false;
     return true;
   }
-  getCompletedFinalizationBlock(latestVisibleStatus, pending) {
+  getCompletedFinalizationBlock(latestVisibleStatus, pending, opts) {
     if (latestVisibleStatus !== "idle") return { reason: `status:${latestVisibleStatus}`, terminal: true };
     const adapterAny = this.adapter;
     const approvalResolvedIdle = pending.previousStatus === "waiting_approval";
-    if (!approvalResolvedIdle) {
+    const externalNativeFinal = opts?.externalNativeFinal || null;
+    if (!approvalResolvedIdle && !externalNativeFinal) {
       if (adapterAny?.isWaitingForResponse === true) return { reason: "adapter_waiting_for_response", terminal: true };
       if (adapterAny?.currentTurnScope) return { reason: "adapter_turn_scope_active", terminal: true };
       if (this.hasAdapterPendingResponse()) return { reason: "adapter_pending_response", terminal: true };
     }
     const partial = typeof this.adapter.getPartialResponse === "function" ? this.adapter.getPartialResponse() : "";
-    if (typeof partial === "string" && partial.trim()) return { reason: "partial_response_pending", terminal: true };
+    if (!externalNativeFinal && typeof partial === "string" && partial.trim()) return { reason: "partial_response_pending", terminal: true };
     let parsed;
     try {
       parsed = this.adapter.getScriptParsedStatus();
@@ -28086,6 +28375,7 @@ var CliProviderInstance = class {
     const parsedStatus = typeof parsed?.status === "string" ? parsed.status : "unknown";
     if (parsedStatus !== "idle") {
       const adapterStatus = this.adapter.getStatus({ allowParse: false });
+      if (externalNativeFinal && isCliGeneratingLikeStatus(parsedStatus)) return null;
       if (this.shouldSuppressStaleParsedBusyStatus(parsed, adapterStatus)) return null;
       return { reason: `parsed_status:${parsedStatus}`, terminal: isCliGeneratingLikeStatus(parsedStatus) };
     }
@@ -28138,14 +28428,15 @@ var CliProviderInstance = class {
     }
     const latestStatus = this.adapter.getStatus({ allowParse: false });
     const latestAutoApproveActive = latestStatus.status === "waiting_approval" && this.shouldAutoApprove();
-    const latestVisibleStatus = latestAutoApproveActive ? "generating" : latestStatus.status;
+    const externalNativeFinal = this.getExternalNativeFinalReconciliation(void 0, latestStatus);
+    const latestVisibleStatus = externalNativeFinal && isCliGeneratingLikeStatus(latestStatus.status) ? "idle" : latestAutoApproveActive ? "generating" : latestStatus.status;
     if (latestVisibleStatus !== "idle") {
       LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
       this.completedDebouncePending = null;
       this.completedDebounceTimer = null;
       return;
     }
-    const block2 = this.getCompletedFinalizationBlock(latestVisibleStatus, pending);
+    const block2 = this.getCompletedFinalizationBlock(latestVisibleStatus, pending, { externalNativeFinal });
     if (block2) {
       const blockReason = block2.reason;
       const waitedMs = Date.now() - pending.firstObservedAt;
@@ -28186,7 +28477,18 @@ var CliProviderInstance = class {
       chatTitle: pending.chatTitle,
       duration: pending.duration,
       timestamp: pending.timestamp,
-      finalSummary: this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages)
+      finalSummary: externalNativeFinal?.finalSummary || this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages),
+      ...externalNativeFinal ? {
+        completionDiagnostic: {
+          providerType: this.type,
+          sessionId: this.instanceId,
+          providerSessionId: this.providerSessionId || null,
+          reconciliationReason: "external_native_final_assistant_while_adapter_busy",
+          finalAssistantPresent: true,
+          finalAssistantEvidenceSource: externalNativeFinal.evidence.source,
+          externalFinalFingerprint: externalNativeFinal.fingerprint
+        }
+      } : {}
     });
     this.completedDebouncePending = null;
     this.completedDebounceTimer = null;
@@ -28242,7 +28544,8 @@ var CliProviderInstance = class {
     const parsedStatus = null;
     const rawStatus = adapterStatus.status;
     const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, now);
-    const newStatus = autoApproveActive ? "generating" : rawStatus;
+    const externalNativeFinal = this.getExternalNativeFinalReconciliation(void 0, adapterStatus);
+    const newStatus = externalNativeFinal && isCliGeneratingLikeStatus(rawStatus) ? "idle" : autoApproveActive ? "generating" : rawStatus;
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
     const partial = this.adapter.getPartialResponse();
@@ -30248,15 +30551,29 @@ function colorize(color, text) {
   const fn = chalkApi?.[color];
   return typeof fn === "function" ? fn(text) : text;
 }
-var COORDINATOR_DELEGATED_ENV_UNSETS = {
-  ADHDEV_INLINE_MESH: "",
-  ADHDEV_MCP_TRANSPORT: "",
-  ADHDEV_MESH_ID: "",
-  HERMES_EPHEMERAL_SYSTEM_PROMPT: ""
-};
+var DEFAULT_COORDINATOR_DELEGATED_ENV_UNSETS = [
+  "ADHDEV_INLINE_MESH",
+  "ADHDEV_MCP_TRANSPORT",
+  "ADHDEV_MESH_ID",
+  "HERMES_EPHEMERAL_SYSTEM_PROMPT"
+];
 function hasCliArg(args, flag) {
   return args.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
 }
+function hasConfigOverride(args, key) {
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+    const next = args[index + 1];
+    if ((arg === "-c" || arg === "--config") && typeof next === "string") {
+      if (next === key || next.startsWith(`${key}=`) || next.startsWith(`${key}.`)) return true;
+    }
+    if (arg.startsWith("--config=")) {
+      const value = arg.slice("--config=".length);
+      if (value === key || value.startsWith(`${key}=`) || value.startsWith(`${key}.`)) return true;
+    }
+  }
+  return false;
+}
 function ensureEmptyDelegatedMcpConfig(workspace) {
   const baseDir = path23.join(os17.tmpdir(), "adhdev-delegated-agent-empty-mcp");
   mkdirSync11(baseDir, { recursive: true });
@@ -30266,11 +30583,30 @@ function ensureEmptyDelegatedMcpConfig(workspace) {
   return filePath;
 }
 function buildCoordinatorDelegatedCliLaunchOptions(input) {
-  const cliType = String(input.cliType || "").trim();
   const cliArgs = Array.isArray(input.cliArgs) ? [...input.cliArgs] : [];
-  const env = { ...input.env || {}, ...COORDINATOR_DELEGATED_ENV_UNSETS };
-  if (cliType === "claude-cli" && !hasCliArg(cliArgs, "--mcp-config")) {
-    cliArgs.unshift("--mcp-config", ensureEmptyDelegatedMcpConfig(input.workspace));
+  const env = { ...input.env || {} };
+  const envUnsets = new Set(DEFAULT_COORDINATOR_DELEGATED_ENV_UNSETS);
+  for (const key of input.isolation?.env?.unset || []) {
+    if (typeof key === "string" && key.trim()) envUnsets.add(key.trim());
+  }
+  for (const key of envUnsets) env[key] = "";
+  for (const rule of input.isolation?.args || []) {
+    if (!rule || typeof rule !== "object") continue;
+    if (rule.mode === "empty_mcp_config") {
+      if (rule.flag && !hasCliArg(cliArgs, rule.flag)) {
+        cliArgs.unshift(rule.flag, ensureEmptyDelegatedMcpConfig(input.workspace));
+      }
+      if (rule.strictFlag && !hasCliArg(cliArgs, rule.strictFlag)) {
+        cliArgs.unshift(rule.strictFlag);
+      }
+      continue;
+    }
+    if (rule.mode === "config_override") {
+      const key = String(rule.dedupeKey || rule.key || "").trim();
+      const flag = String(rule.flag || "").trim();
+      if (!key || !flag || hasConfigOverride(cliArgs, key)) continue;
+      cliArgs.unshift(flag, `${rule.key}=${rule.value}`);
+    }
   }
   return { cliArgs, env };
 }
@@ -30933,22 +31269,25 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const dir = resolved.path;
         const launchSource = resolved.source;
         if (!cliType) throw new Error("cliType required");
+        const providerType = this.providerLoader.resolveAlias(cliType);
+        const provLookup = this.providerLoader.getMeta(providerType);
         const settingsOverride = args?.settings && typeof args.settings === "object" ? args.settings : void 0;
         const delegatedLaunch = settingsOverride?.launchedByCoordinator === true ? buildCoordinatorDelegatedCliLaunchOptions({
           cliType,
           workspace: dir,
           cliArgs: args?.cliArgs,
-          env: args?.env
+          env: args?.env,
+          isolation: provLookup?.meshCoordinator?.delegatedWorkerIsolation
         }) : null;
-        const provLookup = this.providerLoader.getMeta(this.providerLoader.resolveAlias(cliType));
-        const provTrust = provLookup?._sourceTrust;
+        const provMeta = provLookup;
+        const provTrust = provMeta?._sourceTrust;
         if (provTrust === "external-untrusted" && args?.confirmExternalUntrusted !== true) {
           return {
             success: false,
             error: "untrusted_external_provider",
             provider: {
               type: provLookup?.type ?? cliType,
-              sourceName: provLookup?._sourceName ?? null,
+              sourceName: provMeta?._sourceName ?? null,
               trust: provTrust
             },
             hint: "Resend launch_cli with confirmExternalUntrusted=true after the user explicitly approves running JavaScript from this 3rd-party source."
@@ -31420,7 +31759,10 @@ function validateMeshCoordinator(raw, errors) {
   if (meshCoordinator.reason !== void 0 && (typeof meshCoordinator.reason !== "string" || !meshCoordinator.reason.trim())) {
     errors.push("meshCoordinator.reason must be a non-empty string when provided");
   }
-  const mcpConfig = meshCoordinator.mcpConfig;
+  validateMeshCoordinatorMcpConfig(meshCoordinator.mcpConfig, errors);
+  validateMeshCoordinatorDelegatedWorkerIsolation(meshCoordinator.delegatedWorkerIsolation, errors);
+}
+function validateMeshCoordinatorMcpConfig(mcpConfig, errors) {
   if (mcpConfig === void 0) return;
   if (!mcpConfig || typeof mcpConfig !== "object" || Array.isArray(mcpConfig)) {
     errors.push("meshCoordinator.mcpConfig must be an object");
@@ -31461,6 +31803,56 @@ function validateMeshCoordinator(raw, errors) {
     }
   }
 }
+function validateMeshCoordinatorDelegatedWorkerIsolation(raw, errors) {
+  if (raw === void 0) return;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    errors.push("meshCoordinator.delegatedWorkerIsolation must be an object");
+    return;
+  }
+  const isolation = raw;
+  const env = isolation.env;
+  if (env !== void 0) {
+    if (!env || typeof env !== "object" || Array.isArray(env)) {
+      errors.push("meshCoordinator.delegatedWorkerIsolation.env must be an object");
+    } else {
+      const unset = env.unset;
+      if (unset !== void 0 && (!Array.isArray(unset) || unset.some((key) => typeof key !== "string" || !key.trim()))) {
+        errors.push("meshCoordinator.delegatedWorkerIsolation.env.unset must be an array of non-empty strings");
+      }
+    }
+  }
+  const args = isolation.args;
+  if (args === void 0) return;
+  if (!Array.isArray(args)) {
+    errors.push("meshCoordinator.delegatedWorkerIsolation.args must be an array");
+    return;
+  }
+  for (const [index, rule] of args.entries()) {
+    const prefix = `meshCoordinator.delegatedWorkerIsolation.args[${index}]`;
+    if (!rule || typeof rule !== "object" || Array.isArray(rule)) {
+      errors.push(`${prefix} must be an object`);
+      continue;
+    }
+    const item = rule;
+    const mode = item.mode;
+    if (mode !== "empty_mcp_config" && mode !== "config_override") {
+      errors.push(`${prefix}.mode must be one of: empty_mcp_config, config_override`);
+      continue;
+    }
+    for (const key of mode === "empty_mcp_config" ? ["flag"] : ["flag", "key", "value"]) {
+      const value = item[key];
+      if (typeof value !== "string" || !value.trim()) {
+        errors.push(`${prefix}.${key} must be a non-empty string`);
+      }
+    }
+    for (const key of ["strictFlag", "dedupeKey"]) {
+      const value = item[key];
+      if (value !== void 0 && (typeof value !== "string" || !value.trim())) {
+        errors.push(`${prefix}.${key} must be a non-empty string when provided`);
+      }
+    }
+  }
+}
 function validateControl(control, errors) {
   if (!control || typeof control !== "object") {
     errors.push("controls: each control must be an object");
@@ -37122,9 +37514,14 @@ function readCachedInlineMeshActiveSessionDetails(node) {
       node?.provider_type
     ),
     state: readStringValue(fallbackSession.status, fallbackSession.state, fallbackSession.lifecycle),
+    chatStatus: readStringValue(fallbackSession.chatStatus, fallbackSession.chat_status),
     lifecycle: readStringValue(fallbackSession.lifecycle),
     title: readStringValue(fallbackSession.title, fallbackSession.displayName, fallbackSession.display_name) ?? null,
     workspace: readStringValue(fallbackSession.workspace, node?.workspace) ?? null,
+    role: readStringValue(fallbackSession.role) ?? null,
+    isSelfCoordinator: fallbackSession.isSelfCoordinator === true || fallbackSession.is_self_coordinator === true,
+    createdAt: readStringValue(fallbackSession.createdAt, fallbackSession.created_at) ?? null,
+    startedAt: readStringValue(fallbackSession.startedAt, fallbackSession.started_at) ?? null,
     lastActivityAt: readStringValue(fallbackSession.lastActivityAt, fallbackSession.last_activity_at) ?? null,
     recoveryState: readStringValue(fallbackSession.recoveryState, fallbackSession.recovery_state) ?? null,
     isCached: true
@@ -37265,15 +37662,26 @@ async function hydrateInlineMeshDirectTruth(args) {
   };
 }
 function summarizeMeshSessionRecord(record) {
+  const meta = readObjectRecord(record?.meta);
+  const isSelfCoordinator = Boolean(readStringValue(meta.meshCoordinatorFor));
+  const chatStatus = readStringValue(record?.chatStatus, record?.activeChat?.status, meta.chatStatus, meta.sessionStatus);
+  const state = readLiveMeshSessionState(record);
+  const statusNote = isSelfCoordinator && (!chatStatus || chatStatus === "idle" || state === "idle") ? "Coordinator self status is sampled from the session host and may read idle while the coordinator is generating this response." : null;
   return {
     sessionId: readStringValue(record?.sessionId) || "unknown",
     providerType: readStringValue(record?.providerType),
-    state: readLiveMeshSessionState(record),
+    state,
+    chatStatus,
     lifecycle: readStringValue(record?.lifecycle),
     surfaceKind: getSessionHostSurfaceKind(record),
-    recoveryState: readStringValue(record?.meta?.runtimeRecoveryState) ?? null,
+    recoveryState: readStringValue(meta.runtimeRecoveryState) ?? null,
     workspace: readStringValue(record?.workspace) ?? null,
     title: readStringValue(record?.displayName, record?.workspaceLabel) ?? null,
+    role: isSelfCoordinator ? "coordinator" : readStringValue(meta.meshRole, meta.role) ?? null,
+    isSelfCoordinator,
+    statusNote,
+    createdAt: toIsoTimestamp(record?.createdAt ?? record?.created_at),
+    startedAt: toIsoTimestamp(record?.startedAt ?? record?.started_at ?? record?.spawnedAtMs ?? record?.spawned_at_ms),
     lastActivityAt: toIsoTimestamp(record?.updatedAt ?? record?.lastActivityAt ?? record?.last_activity_at),
     isCached: false
   };
@@ -38297,6 +38705,15 @@ var DaemonCommandRouter = class {
     this.aggregateMeshStatusCache.set(meshId, { builtAt, snapshot: this.cloneJsonValue(next), queueRevision: getMeshQueueRevision(meshId) });
     return next;
   }
+  getCachedInlineMeshNodes() {
+    const nodes = [];
+    for (const mesh of this.inlineMeshCache.values()) {
+      if (Array.isArray(mesh?.nodes)) {
+        nodes.push(...mesh.nodes);
+      }
+    }
+    return nodes;
+  }
   getCachedInlineMesh(meshId, inlineMesh) {
     if (inlineMesh && typeof inlineMesh === "object") {
       return this.warmInlineMeshCache(meshId, inlineMesh);
@@ -38345,6 +38762,7 @@ var DaemonCommandRouter = class {
   }
   invalidateAggregateMeshStatus(meshId) {
     this.aggregateMeshStatusCache.delete(meshId);
+    this.deps.onMeshStateChange?.(meshId);
   }
   async requireMeshHostMutationOwner(meshId, inlineMesh, operation) {
     const meshRecord = await this.getMeshForCommand(meshId, inlineMesh, { preferInline: true });
@@ -49837,6 +50255,7 @@ async function initDaemonComponents(config) {
     },
     onIdeConnected: () => poller?.start(),
     onStatusChange: config.onStatusChange,
+    onMeshStateChange: config.onMeshStateChange,
     onPostChatCommand: config.onPostChatCommand,
     sessionHostControl: config.sessionHostControl,
     statusInstanceId: config.statusInstanceId,
@@ -50429,6 +50848,7 @@ export {
   probeCdpPort,
   queuePendingMeshCoordinatorEvent,
   readSession3 as readAntigravityCliSession,
+  readCachedInlineMeshActiveSessionDetails,
   readChatHistory,
   readSession as readClaudeCliSession,
   readSession2 as readCodexCliSession,