@adhdev/daemon-standalone 0.9.82-rc.187 → 0.9.82-rc.188

package/dist/index.js

@@ -35030,6 +35030,8 @@ var require_dist3 = __commonJS({
         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,
@@ -35048,6 +35050,7 @@ var require_dist3 = __commonJS({
           untracked: parsed.untracked,
           deleted: parsed.deleted,
           renamed: parsed.renamed,
+          dirty,
           hasConflicts: parsed.conflictFiles.length > 0,
           conflictFiles: parsed.conflictFiles,
           stashCount,
@@ -35221,6 +35224,7 @@ var require_dist3 = __commonJS({
         untracked: 0,
         deleted: 0,
         renamed: 0,
+        dirty: false,
         hasConflicts: false,
         conflictFiles: [],
         stashCount: 0,
@@ -35233,17 +35237,33 @@ var require_dist3 = __commonJS({
       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 (error48) {
+        submodule.dirty = true;
+        submodule.error = formatGitError(error48);
+      }
+    }
     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];
@@ -35253,8 +35273,8 @@ var require_dist3 = __commonJS({
           path: path40,
           commit,
           repoPath: repoRoot + "/" + path40,
-          dirty: prefix === "+",
-          outOfSync: prefix === "-",
+          dirty: prefix === "U",
+          outOfSync: prefix === "-" || prefix === "+",
           lastCheckedAt: Date.now()
         });
       }
@@ -40975,6 +40995,52 @@ Next step: ${nextStep}`;
                       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 }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
                 }
               }
             },
@@ -46118,6 +46184,7 @@ ${lastSnapshot}`;
       probeCdpPort: () => probeCdpPort,
       queuePendingMeshCoordinatorEvent: () => queuePendingMeshCoordinatorEvent,
       readAntigravityCliSession: () => readSession3,
+      readCachedInlineMeshActiveSessionDetails: () => readCachedInlineMeshActiveSessionDetails2,
       readChatHistory: () => readChatHistory,
       readClaudeCliSession: () => readSession,
       readCodexCliSession: () => readSession2,
@@ -47146,7 +47213,14 @@ ${lastSnapshot}`;
       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": {
@@ -47279,6 +47353,14 @@ ${lastSnapshot}`;
       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}`;
@@ -56480,6 +56562,14 @@ ${effect.notification.body || ""}`.trim();
         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;
@@ -57334,6 +57424,18 @@ ${effect.notification.body || ""}`.trim();
               });
             }
           }
+          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"
+              }
+            };
+          }
           LOG2.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,
@@ -60890,7 +60992,18 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           "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 }
+              }
+            }
           }
         }
       },
@@ -61366,6 +61479,30 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       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;
@@ -61405,6 +61542,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
        *  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
@@ -61528,10 +61667,40 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             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);
@@ -62424,6 +62593,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       historyWriter;
       runtimeMessages = [];
       lastPersistedHistoryMessages = [];
+      lastAcknowledgedUserInputAt = 0;
+      externalBusyIdleFingerprint = "";
       lastNativeSourceCanonicalCheckAt = 0;
       lastNativeSourceCanonicalCacheKey = void 0;
       cachedSqliteDb = null;
@@ -62552,7 +62723,11 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           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 : [];
@@ -62714,7 +62889,22 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         };
       }
       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,
@@ -62805,6 +62995,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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",
@@ -62953,6 +63145,50 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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;
@@ -63023,17 +63259,18 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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 partial2 = typeof this.adapter.getPartialResponse === "function" ? this.adapter.getPartialResponse() : "";
-        if (typeof partial2 === "string" && partial2.trim()) return { reason: "partial_response_pending", terminal: true };
+        if (!externalNativeFinal && typeof partial2 === "string" && partial2.trim()) return { reason: "partial_response_pending", terminal: true };
         let parsed;
         try {
           parsed = this.adapter.getScriptParsedStatus();
@@ -63043,6 +63280,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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) };
         }
@@ -63095,14 +63333,15 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         }
         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") {
           LOG2.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;
@@ -63143,7 +63382,18 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           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;
@@ -63199,7 +63449,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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 partial2 = this.adapter.getPartialResponse();
@@ -65192,15 +65443,29 @@ ${rawInput}` : rawInput;
       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");
       (0, import_fs12.mkdirSync)(baseDir, { recursive: true });
@@ -65210,11 +65475,30 @@ ${rawInput}` : rawInput;
       return filePath;
     }
     function buildCoordinatorDelegatedCliLaunchOptions(input) {
-      const cliType = String(input.cliType || "").trim();
       const cliArgs = Array.isArray(input.cliArgs) ? [...input.cliArgs] : [];
-      const env2 = { ...input.env || {}, ...COORDINATOR_DELEGATED_ENV_UNSETS };
-      if (cliType === "claude-cli" && !hasCliArg(cliArgs, "--mcp-config")) {
-        cliArgs.unshift("--mcp-config", ensureEmptyDelegatedMcpConfig(input.workspace));
+      const env2 = { ...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) env2[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: env2 };
     }
@@ -65877,22 +66161,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."
@@ -66358,7 +66645,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       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");
@@ -66399,6 +66689,56 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
       }
     }
+    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 env2 = isolation.env;
+      if (env2 !== void 0) {
+        if (!env2 || typeof env2 !== "object" || Array.isArray(env2)) {
+          errors.push("meshCoordinator.delegatedWorkerIsolation.env must be an object");
+        } else {
+          const unset = env2.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");
@@ -71998,7 +72338,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const sessionId = readStringValue(fallbackSession.id, fallbackSession.sessionId, fallbackSession.session_id, node?.activeSessionId, node?.active_session_id, node?.sessionId, node?.session_id);
       return sessionId ? [sessionId] : [];
     }
-    function readCachedInlineMeshActiveSessionDetails(node) {
+    function readCachedInlineMeshActiveSessionDetails2(node) {
       const cachedStatus = readObjectRecord(node?.cachedStatus);
       const activeSession = readObjectRecord(cachedStatus.activeSession);
       const fallbackSession = Object.keys(activeSession).length ? activeSession : readObjectRecord(node?.activeSession ?? node?.active_session);
@@ -72024,9 +72364,14 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           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
@@ -72167,15 +72512,26 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       };
     }
     function summarizeMeshSessionRecord(record2) {
+      const meta3 = readObjectRecord(record2?.meta);
+      const isSelfCoordinator = Boolean(readStringValue(meta3.meshCoordinatorFor));
+      const chatStatus = readStringValue(record2?.chatStatus, record2?.activeChat?.status, meta3.chatStatus, meta3.sessionStatus);
+      const state = readLiveMeshSessionState(record2);
+      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(record2?.sessionId) || "unknown",
         providerType: readStringValue(record2?.providerType),
-        state: readLiveMeshSessionState(record2),
+        state,
+        chatStatus,
         lifecycle: readStringValue(record2?.lifecycle),
         surfaceKind: getSessionHostSurfaceKind(record2),
-        recoveryState: readStringValue(record2?.meta?.runtimeRecoveryState) ?? null,
+        recoveryState: readStringValue(meta3.runtimeRecoveryState) ?? null,
         workspace: readStringValue(record2?.workspace) ?? null,
         title: readStringValue(record2?.displayName, record2?.workspaceLabel) ?? null,
+        role: isSelfCoordinator ? "coordinator" : readStringValue(meta3.meshRole, meta3.role) ?? null,
+        isSelfCoordinator,
+        statusNote,
+        createdAt: toIsoTimestamp(record2?.createdAt ?? record2?.created_at),
+        startedAt: toIsoTimestamp(record2?.startedAt ?? record2?.started_at ?? record2?.spawnedAtMs ?? record2?.spawned_at_ms),
         lastActivityAt: toIsoTimestamp(record2?.updatedAt ?? record2?.lastActivityAt ?? record2?.last_activity_at),
         isCached: false
       };
@@ -72277,7 +72633,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const lastSeenAt = toIsoTimestamp(cachedStatus.lastSeenAt ?? cachedStatus.last_seen_at ?? node?.lastSeenAt ?? node?.last_seen_at);
       const updatedAt = toIsoTimestamp(cachedStatus.updatedAt ?? cachedStatus.updated_at ?? node?.updatedAt ?? node?.updated_at);
       const activeSessions = readCachedInlineMeshActiveSessions(node);
-      const activeSessionDetails = readCachedInlineMeshActiveSessionDetails(node);
+      const activeSessionDetails = readCachedInlineMeshActiveSessionDetails2(node);
       if (!git && !error48 && !health && !machineStatus && !lastSeenAt && !updatedAt && activeSessions.length === 0) return false;
       if (git) status.git = git;
       if (error48) status.error = error48;
@@ -73199,6 +73555,15 @@ ${e?.stderr || ""}`
         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);
@@ -73247,6 +73612,7 @@ ${e?.stderr || ""}`
       }
       invalidateAggregateMeshStatus(meshId) {
         this.aggregateMeshStatusCache.delete(meshId);
+        this.deps.onMeshStateChange?.(meshId);
       }
       async requireMeshHostMutationOwner(meshId, inlineMesh, operation) {
         const meshRecord = await this.getMeshForCommand(meshId, inlineMesh, { preferInline: true });
@@ -84672,6 +85038,7 @@ data: ${JSON.stringify(msg.data)}
         },
         onIdeConnected: () => poller?.start(),
         onStatusChange: config2.onStatusChange,
+        onMeshStateChange: config2.onMeshStateChange,
         onPostChatCommand: config2.onPostChatCommand,
         sessionHostControl: config2.sessionHostControl,
         statusInstanceId: config2.statusInstanceId,
@@ -86013,6 +86380,9 @@ var SESSION_TARGET_COMMANDS = /* @__PURE__ */ new Set([
   "restart_session",
   "agent_command"
 ]);
+function commandMayAffectMeshGraphStatus(type) {
+  return type.startsWith("mesh_") || type === "add_mesh_node" || type === "update_mesh_node" || type === "remove_mesh_node" || type === "clone_mesh_node" || type === "trigger_mesh_queue" || type === "get_mesh_queue" || type === "launch_cli" || type === "stop_cli" || type === "restart_session";
+}
 function standaloneIpcEnabled() {
   const value = String(process.env.ADHDEV_STANDALONE_ENABLE_IPC || "").trim().toLowerCase();
   return value === "1" || value === "true" || value === "yes";
@@ -87410,11 +87780,24 @@ var StandaloneServer = class {
     state.seq += 1;
     state.lastSentAt = now;
     const cfgSnap = (0, import_daemon_core2.loadConfig)();
+    const status = this.buildSharedSnapshot("metadata");
+    const includeSessions = state.request.params.includeSessions === true;
+    if (includeSessions) {
+      if (this.components?.router) {
+        const nodes = this.components.router.getCachedInlineMeshNodes();
+        for (const node of nodes) {
+          const meshSessions = (0, import_daemon_core2.readCachedInlineMeshActiveSessionDetails)(node);
+          for (const session of meshSessions) {
+            status.sessions.push(session);
+          }
+        }
+      }
+    }
     return {
       topic: "daemon.metadata",
       key,
       daemonId: `standalone_${cfgSnap.machineId || "standalone"}`,
-      status: this.buildSharedSnapshot("metadata"),
+      status,
       userName: cfgSnap.userName || void 0,
       seq: state.seq,
       timestamp: now
@@ -87589,10 +87972,11 @@ var StandaloneServer = class {
       return { success: false, error: "command type required" };
     }
     const result = await this.components.router.execute(type, args, "standalone");
-    if (type === "invoke_provider_script" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
+    const affectsMeshGraphStatus = commandMayAffectMeshGraphStatus(type);
+    if (type === "invoke_provider_script" || type.startsWith("workspace_") || type.startsWith("session_host_") || affectsMeshGraphStatus) {
       this.scheduleBroadcastStatus();
     }
-    if (type === "invoke_provider_script" || type === "get_status_metadata" || type === "set_user_name" || type === "set_machine_nickname" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
+    if (type === "invoke_provider_script" || type === "get_status_metadata" || type === "set_user_name" || type === "set_machine_nickname" || type.startsWith("workspace_") || type.startsWith("session_host_") || affectsMeshGraphStatus) {
       void this.flushWsDaemonMetadataSubscriptions();
     }
     if (type.startsWith("session_host_")) void this.flushWsSessionHostDiagnosticsSubscriptions();