@adhdev/daemon-core 0.9.82-rc.356 → 0.9.82-rc.358

package/dist/cli-adapter-types.d.ts

@@ -12,6 +12,15 @@ export interface CliAdapterStatus {
     activeModal?: {
         message: string;
         buttons: string[];
+        /**
+         * Semantic modal class, when the adapter knows it (spec/FSM path):
+         * 'approval' = tool/command/trust consent (auto-approve may fire);
+         * 'picker' = a selection menu the user opened (/model, /mode — must NOT
+         * be auto-answered); 'confirm' = a yes/no left to the user. Absent/null
+         * for adapters that don't classify modals — the auto-approve gate then
+         * falls back to its structural heuristic.
+         */
+        kind?: 'approval' | 'picker' | 'confirm' | null;
     } | null;
     activeInteractivePrompt?: InteractivePrompt | null;
     providerSessionId?: string;

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "91500e054cf2b6258f6041f90c18be03ad05a8ad" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "91500e05" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.356" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-22T22:47:29.082Z" : void 0);
+  const commit = readInjected(true ? "7210e80591d8d9ab378ee786ffb233027437461a" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "7210e805" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.358" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-23T01:40:53.249Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -12673,8 +12673,22 @@ function sweepExpiredRemoteIdleSessions() {
 }
 function getMeshWithCache(components, meshId) {
   const localMesh = getMesh(meshId);
-  if (localMesh) return localMesh;
-  return components.router?.getCachedInlineMesh(meshId);
+  const cachedMesh = components.router?.getCachedInlineMesh(meshId);
+  if (!localMesh) return cachedMesh;
+  if (!cachedMesh) return localMesh;
+  return mergeInlineCacheOnlyNodes(localMesh, cachedMesh);
+}
+function mergeInlineCacheOnlyNodes(localMesh, cachedMesh) {
+  const localNodes = Array.isArray(localMesh?.nodes) ? localMesh.nodes : [];
+  const cachedNodes = Array.isArray(cachedMesh?.nodes) ? cachedMesh.nodes : [];
+  if (!cachedNodes.length) return localMesh;
+  const cacheOnly = cachedNodes.filter((cachedNode) => {
+    const cachedId = readMeshNodeId(cachedNode);
+    if (!cachedId) return false;
+    return !localNodes.some((localNode) => meshNodeIdMatches(localNode, cachedId));
+  });
+  if (!cacheOnly.length) return localMesh;
+  return { ...localMesh, nodes: [...localNodes, ...cacheOnly] };
 }
 function isIntentionalCleanupStopMetadata(event) {
   return event.intentional === true || event.intentionalStop === true || event.operatorCleanup === true || event.reason === "operator_cleanup" || event.stopReason === "operator_cleanup" || event.cleanupReason === "operator_cleanup" || event.source === "mesh_cleanup_sessions" || event.source === "mesh_remove_node";
@@ -13737,7 +13751,7 @@ function injectMeshSystemMessage(components, args) {
       occurredAt: occurredAtMs != null ? new Date(occurredAtMs).toISOString() : void 0,
       taskId: eventTaskId
     });
-    const leaveDirectDispatchActive = !task && opts?.tentativeIfDirect === true;
+    const leaveDirectDispatchActive = !task && opts?.tentativeIfDirect === true || !eventTaskId && !sessionHasActiveAssignment(args.meshId, sessionId);
     if (!leaveDirectDispatchActive) {
       updateDirectDispatchStatus(args.meshId, sessionId, outcome, eventTaskId);
     }
@@ -13836,7 +13850,9 @@ function injectMeshSystemMessage(components, args) {
     }
     if (sessionId) {
       const startedTaskId = readNonEmptyString2(args.metadataEvent.taskId) || void 0;
-      updateDirectDispatchStatus(args.meshId, sessionId, "acked", startedTaskId);
+      if (startedTaskId || sessionHasActiveAssignment(args.meshId, sessionId)) {
+        updateDirectDispatchStatus(args.meshId, sessionId, "acked", startedTaskId);
+      }
       const activeDeliveries = (() => {
         try {
           return MeshRuntimeStore.getInstance().getActiveSessionDeliveries(args.meshId, sessionId);
@@ -14011,6 +14027,76 @@ function injectMeshSystemMessage(components, args) {
   }
   return { success: true, forwarded: 0 };
 }
+function buildRelayMetadataEvent(payload) {
+  const relayModalMessage = readNonEmptyString2(payload.modalMessage);
+  const relayModalButtons = Array.isArray(payload.modalButtons) ? payload.modalButtons.filter((b) => typeof b === "string" && b.trim().length > 0) : null;
+  return {
+    // Preserve the dispatch task id across the machine boundary. The `received` trace
+    // stage reads payload.taskId; without mirroring it here the rebuilt metadataEvent
+    // loses it, so injectMeshSystemMessage's traceCtx.taskId and the
+    // updateDirectDispatchStatus(eventTaskId) call go undefined — the EvtTrace
+    // queued/surfaced stages show task=- and the direct-dispatch ledger falls back to a
+    // session_id match (which can flip a sibling row). The local in-process forward path
+    // keeps event.taskId/meshActiveTaskId for free; this mirrors it for the remote relay.
+    // Same taskId/meshActiveTaskId ordering the local unroutable trace uses.
+    taskId: readNonEmptyString2(payload.taskId) || readNonEmptyString2(payload.meshActiveTaskId),
+    targetSessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId) || readNonEmptyString2(payload.instanceId),
+    providerType: readNonEmptyString2(payload.providerType),
+    providerSessionId: readNonEmptyString2(payload.providerSessionId),
+    // Preserve the originating coordinator SESSION id across the machine boundary so
+    // the completion routes back to the exact coordinator session (multi-coordinator).
+    // buildForwardPayloadFromPending spreads the worker event's metadata, so the id
+    // arrives as payload.meshCoordinatorSessionId; the top-level targetCoordinatorSessionId
+    // is also accepted as a fallback. injectMeshSystemMessage re-derives the routing
+    // anchors from this. Absent → daemon-level fallback (version-skew safe).
+    meshCoordinatorSessionId: readNonEmptyString2(payload.meshCoordinatorSessionId) || readNonEmptyString2(payload.targetCoordinatorSessionId),
+    // Carry the session identity fields the worker provider event emits so the
+    // coordinator's mirror (updateMeshOwnedSession) gets a real workspace/title/
+    // settings. Without these the remote-relay hop reconstructs metadataEvent with
+    // an empty workspace, and the dashboard flaps to the generic
+    // "Terminal (Mesh Node)" title (and degrades the provider label) between live
+    // events and the periodic get_status_metadata snapshot. The local in-process
+    // forward path (onMeshCoordinatorEventForwarded) already preserves these; this
+    // mirrors them for the remote-only relay path.
+    workspace: readNonEmptyString2(payload.workspace) || readNonEmptyString2(payload.workspaceName),
+    workspaceName: readNonEmptyString2(payload.workspaceName) || readNonEmptyString2(payload.workspace),
+    sessionTitle: readNonEmptyString2(payload.sessionTitle),
+    sessionStatus: readNonEmptyString2(payload.sessionStatus),
+    sessionChatStatus: readNonEmptyString2(payload.sessionChatStatus),
+    providerName: readNonEmptyString2(payload.providerName),
+    ...payload.sessionSettings && typeof payload.sessionSettings === "object" && !Array.isArray(payload.sessionSettings) ? { sessionSettings: payload.sessionSettings } : {},
+    finalSummary: readNonEmptyString2(payload.finalSummary) || readNonEmptyString2(payload.summary),
+    // T2: carry the worker's status-snapshot last-message preview across the machine
+    // boundary so a summary-less completion still surfaces the assistant reply in the
+    // coordinator's inbox mirror. resolveMeshSurfacedSessionPreview reads these
+    // (assistant-role only) when finalSummary is absent.
+    lastMessagePreview: readNonEmptyString2(payload.lastMessagePreview),
+    lastMessageRole: readNonEmptyString2(payload.lastMessageRole),
+    ...payload.lastMessageAt !== void 0 ? { lastMessageAt: payload.lastMessageAt } : {},
+    jobId: readNonEmptyString2(payload.jobId),
+    interactionId: readNonEmptyString2(payload.interactionId),
+    status: readNonEmptyString2(payload.status),
+    targetDaemonId: readNonEmptyString2(payload.targetDaemonId),
+    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 } : {},
+    ...payload.meshWorkerResult && typeof payload.meshWorkerResult === "object" && !Array.isArray(payload.meshWorkerResult) ? { meshWorkerResult: payload.meshWorkerResult } : {},
+    ...payload.structuredResult && typeof payload.structuredResult === "object" && !Array.isArray(payload.structuredResult) ? { structuredResult: payload.structuredResult } : {},
+    ...payload.timestamp !== void 0 ? { timestamp: payload.timestamp } : {},
+    intentional: payload.intentional === true,
+    intentionalStop: payload.intentionalStop === true,
+    operatorCleanup: payload.operatorCleanup === true,
+    reason: readNonEmptyString2(payload.reason),
+    stopReason: readNonEmptyString2(payload.stopReason),
+    cleanupReason: readNonEmptyString2(payload.cleanupReason),
+    source: readNonEmptyString2(payload.source)
+  };
+}
 function handleMeshForwardEvent(components, payload) {
   const eventName = readNonEmptyString2(payload.event);
   if (!isMeshCoordinatorEvent(eventName)) {
@@ -14036,70 +14122,12 @@ function handleMeshForwardEvent(components, payload) {
     event: eventName
   });
   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,
     nodeLabel,
     event: eventName,
-    metadataEvent: {
-      targetSessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId) || readNonEmptyString2(payload.instanceId),
-      providerType: readNonEmptyString2(payload.providerType),
-      providerSessionId: readNonEmptyString2(payload.providerSessionId),
-      // Preserve the originating coordinator SESSION id across the machine boundary so
-      // the completion routes back to the exact coordinator session (multi-coordinator).
-      // buildForwardPayloadFromPending spreads the worker event's metadata, so the id
-      // arrives as payload.meshCoordinatorSessionId; the top-level targetCoordinatorSessionId
-      // is also accepted as a fallback. injectMeshSystemMessage re-derives the routing
-      // anchors from this. Absent → daemon-level fallback (version-skew safe).
-      meshCoordinatorSessionId: readNonEmptyString2(payload.meshCoordinatorSessionId) || readNonEmptyString2(payload.targetCoordinatorSessionId),
-      // Carry the session identity fields the worker provider event emits so the
-      // coordinator's mirror (updateMeshOwnedSession) gets a real workspace/title/
-      // settings. Without these the remote-relay hop reconstructs metadataEvent with
-      // an empty workspace, and the dashboard flaps to the generic
-      // "Terminal (Mesh Node)" title (and degrades the provider label) between live
-      // events and the periodic get_status_metadata snapshot. The local in-process
-      // forward path (onMeshCoordinatorEventForwarded) already preserves these; this
-      // mirrors them for the remote-only relay path.
-      workspace: readNonEmptyString2(payload.workspace) || readNonEmptyString2(payload.workspaceName),
-      workspaceName: readNonEmptyString2(payload.workspaceName) || readNonEmptyString2(payload.workspace),
-      sessionTitle: readNonEmptyString2(payload.sessionTitle),
-      sessionStatus: readNonEmptyString2(payload.sessionStatus),
-      sessionChatStatus: readNonEmptyString2(payload.sessionChatStatus),
-      providerName: readNonEmptyString2(payload.providerName),
-      ...payload.sessionSettings && typeof payload.sessionSettings === "object" && !Array.isArray(payload.sessionSettings) ? { sessionSettings: payload.sessionSettings } : {},
-      finalSummary: readNonEmptyString2(payload.finalSummary) || readNonEmptyString2(payload.summary),
-      // T2: carry the worker's status-snapshot last-message preview across the machine
-      // boundary so a summary-less completion still surfaces the assistant reply in the
-      // coordinator's inbox mirror. resolveMeshSurfacedSessionPreview reads these
-      // (assistant-role only) when finalSummary is absent.
-      lastMessagePreview: readNonEmptyString2(payload.lastMessagePreview),
-      lastMessageRole: readNonEmptyString2(payload.lastMessageRole),
-      ...payload.lastMessageAt !== void 0 ? { lastMessageAt: payload.lastMessageAt } : {},
-      jobId: readNonEmptyString2(payload.jobId),
-      interactionId: readNonEmptyString2(payload.interactionId),
-      status: readNonEmptyString2(payload.status),
-      targetDaemonId: readNonEmptyString2(payload.targetDaemonId),
-      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 } : {},
-      ...payload.meshWorkerResult && typeof payload.meshWorkerResult === "object" && !Array.isArray(payload.meshWorkerResult) ? { meshWorkerResult: payload.meshWorkerResult } : {},
-      ...payload.structuredResult && typeof payload.structuredResult === "object" && !Array.isArray(payload.structuredResult) ? { structuredResult: payload.structuredResult } : {},
-      ...payload.timestamp !== void 0 ? { timestamp: payload.timestamp } : {},
-      intentional: payload.intentional === true,
-      intentionalStop: payload.intentionalStop === true,
-      operatorCleanup: payload.operatorCleanup === true,
-      reason: readNonEmptyString2(payload.reason),
-      stopReason: readNonEmptyString2(payload.stopReason),
-      cleanupReason: readNonEmptyString2(payload.cleanupReason),
-      source: readNonEmptyString2(payload.source)
-    }
+    metadataEvent: buildRelayMetadataEvent(payload)
   });
 }
 function forwardUnresolvedDelegateEvent(components, routing, event) {
@@ -19514,6 +19542,7 @@ __export(evaluator_exports, {
   evaluateCondition: () => evaluateCondition,
   extractButtonsFromRule: () => extractButtonsFromRule,
   extractTitle: () => extractTitle,
+  lastContiguousNumberedBlock: () => lastContiguousNumberedBlock,
   resolveSections: () => resolveSections,
   sectionText: () => sectionText
 });
@@ -19754,7 +19783,6 @@ function extractButtonsFromRule(rule, hay) {
         label += " " + next.trim();
         j += 1;
       }
-      if (buttons.some((b) => b.index === idx)) continue;
       const key = keyTemplate.replace(/\{index\}/g, String(idx));
       buttons.push({ index: idx, label, key, current });
       i = j - 1;
@@ -19766,13 +19794,22 @@ function extractButtonsFromRule(rule, hay) {
       const idx = Number(m[1]);
       const label = String(m[2] ?? "").trim();
       if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
-      if (buttons.some((b) => b.index === idx)) continue;
       const key = keyTemplate.replace(/\{index\}/g, String(idx));
       buttons.push({ index: idx, label, key, current: hasCursorMarker(m[0]) });
     }
   }
-  buttons.sort((a, b) => a.index - b.index);
-  return buttons;
+  const block2 = lastContiguousNumberedBlock(buttons);
+  block2.sort((a, b) => a.index - b.index);
+  return block2;
+}
+function lastContiguousNumberedBlock(entries) {
+  if (entries.length <= 1) return entries.slice();
+  let start = entries.length - 1;
+  for (let i = entries.length - 1; i > 0; i -= 1) {
+    if (entries[i - 1].index === entries[i].index - 1) start = i - 1;
+    else break;
+  }
+  return entries.slice(start);
 }
 function hasCursorMarker(text) {
   return /^\s*[❯›>]/.test(text);
@@ -19807,6 +19844,11 @@ function statusForState(state) {
   if (state.id === "busy" || state.id === "generating") return "generating";
   return "idle";
 }
+function modalKindForState(state) {
+  if (state.modal_kind) return state.modal_kind;
+  if (state.modal) return "approval";
+  return null;
+}
 var init_fsm_types = __esm({
   "src/providers/spec/fsm-types.ts"() {
     "use strict";
@@ -33698,7 +33740,12 @@ var FsmDriver = class {
       this.emit({
         kind: "state_changed",
         state: next.state,
-        modal: next.modal ? { title: next.modal.title, buttons: next.modal.buttons.map((b) => ({ index: b.index, label: b.label })) } : null,
+        // kind is the SEMANTIC modal class (approval vs picker/confirm)
+        // derived from the FSM state, NOT from the parsed buttons — the
+        // status field already collapsed it to 'approval' so the modal is
+        // surfaced. The auto-approve worker needs the distinction back to
+        // avoid answering a /model picker on the user's behalf.
+        modal: next.modal ? { title: next.modal.title, buttons: next.modal.buttons.map((b) => ({ index: b.index, label: b.label })), kind: modalKindForState(state) } : null,
         controls: next.controls.map((c) => ({ id: c.id, label: c.label, action_type: c.actionType }))
       });
       this.fireNotifications(state.id, title);
@@ -34180,6 +34227,9 @@ function collectStableSizes(when, sizes) {
   }
 }
 
+// src/providers/spec/cli-adapter.ts
+init_evaluator();
+
 // src/providers/spec/native-history-executor.ts
 var fs13 = __toESM(require("fs"));
 var os18 = __toESM(require("os"));
@@ -35118,7 +35168,9 @@ var SpecCliAdapter = class _SpecCliAdapter {
         messages: [],
         // Surface buttons when we have them; an approval state with no parsed
         // modal this frame still stays waiting_approval (no activeModal yet).
-        activeModal: modal ? { message: modal.title ?? state.label, buttons: modal.buttons.map((b) => b.label) } : null,
+        // `kind` carries the semantic modal class through to the auto-approve
+        // gate so a /model picker (kind='picker') is never auto-answered.
+        activeModal: modal ? { message: modal.title ?? state.label, buttons: modal.buttons.map((b) => b.label), kind: modal.kind ?? null } : null,
         activeInteractivePrompt: this.activeInteractivePrompt,
         ...sessionFields
       };
@@ -35392,21 +35444,19 @@ var SpecCliAdapter = class _SpecCliAdapter {
     const ec = action.extract_choices;
     if (!ec?.pattern) return [];
     const text = this.readScreenSectionText(ec.section);
-    const out = [];
-    const seen = /* @__PURE__ */ new Set();
+    const all = [];
     for (const rawLine of text.split("\n")) {
       const line = rawLine.replace(/\r$/, "");
       const m = new RegExp(ec.pattern, ec.flags ?? "").exec(line);
       if (!m) continue;
       const idx = Number(m[1]);
-      if (!Number.isFinite(idx) || seen.has(idx)) continue;
+      if (!Number.isFinite(idx) || idx <= 0) continue;
       const label = (m[2] ?? "").replace(/\s+/g, " ").trim();
       if (!label) continue;
       const current = /^\s*[❯›>]/.test(line) || /[✔✓●]\s*$/.test(label);
-      seen.add(idx);
-      out.push({ index: idx, label, current });
+      all.push({ index: idx, label, current });
     }
-    return out;
+    return lastContiguousNumberedBlock(all);
   }
   /** Live text of a named screen section (or the whole screen when no
    *  section is named), resolved from the driver's current sections. */
@@ -37085,8 +37135,12 @@ var CliProviderInstance = class _CliProviderInstance {
     if (!modal || buttons.length === 0) {
       return autoApproveActive;
     }
-    const { index: buttonIndex, label: buttonLabel } = pickAutoApprovalButton(buttons);
-    if (buttonIndex < 0) {
+    const modalKind = typeof modal?.kind === "string" ? modal.kind : "approval";
+    if (modalKind !== "approval") {
+      return autoApproveActive;
+    }
+    const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(buttons, this.provider);
+    if (buttonIndex < 0 || !hasNegativeApprovalOption(buttons)) {
       return autoApproveActive;
     }
     const modalSignature = [