@adhdev/daemon-standalone 0.9.82-rc.355 → 0.9.82-rc.357

package/dist/index.js

@@ -30036,10 +30036,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "a45106605e2ae1c10c0bc6cbe48c2cac4e862ded" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "a4510660" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.355" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-22T15:22:12.689Z" : void 0);
+      const commit = readInjected(true ? "37b9d1d9e10336707dbc0861a96d5bcc55cc015e" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "37b9d1d9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.357" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-23T00:25:47.104Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -42462,8 +42462,22 @@ ${cleanBody}`;
     }
     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";
@@ -43800,6 +43814,76 @@ ${cleanBody}`;
       }
       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)) {
@@ -43825,70 +43909,12 @@ ${cleanBody}`;
         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) {
@@ -49545,6 +49571,7 @@ ${lastSnapshot}`;
           const idx = Number(m[1]);
           let label = String(m[2] ?? "").trim();
           if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
+          const current = hasCursorMarker(lines[i]);
           let j = i + 1;
           while (j < lines.length) {
             const next = lines[j];
@@ -49556,7 +49583,7 @@ ${lastSnapshot}`;
           }
           if (buttons.some((b) => b.index === idx)) continue;
           const key = keyTemplate.replace(/\{index\}/g, String(idx));
-          buttons.push({ index: idx, label, key });
+          buttons.push({ index: idx, label, key, current });
           i = j - 1;
         }
       } else {
@@ -49568,12 +49595,15 @@ ${lastSnapshot}`;
           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 });
+          buttons.push({ index: idx, label, key, current: hasCursorMarker(m[0]) });
         }
       }
       buttons.sort((a, b) => a.index - b.index);
       return buttons;
     }
+    function hasCursorMarker(text) {
+      return /^\s*[❯›>]/.test(text);
+    }
     var init_evaluator = __esm2({
       "src/providers/spec/evaluator.ts"() {
         "use strict";
@@ -49602,6 +49632,11 @@ ${lastSnapshot}`;
       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 = __esm2({
       "src/providers/spec/fsm-types.ts"() {
         "use strict";
@@ -63364,7 +63399,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           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);
@@ -63719,6 +63759,19 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (!m) return;
         const btn = m.buttons.find((b) => b.index === index);
         if (!btn) return;
+        const rule = stateById(this.spec, this.currentStateId)?.extract?.buttons;
+        if (rule?.select_mode === "arrow_keys") {
+          const from = m.buttons.find((b) => b.current)?.index ?? 1;
+          const up = rule.cursor_keys?.up ?? "\x1B[A";
+          const down = rule.cursor_keys?.down ?? "\x1B[B";
+          const delta = btn.index - from;
+          const step = delta >= 0 ? down : up;
+          const nav = step.repeat(Math.abs(delta));
+          const confirm = (rule.key_for_index || "\r").replace(/\{index\}/g, "") || "\r";
+          if (nav) this.adapter.send_keys(nav);
+          this.adapter.send_keys(confirm);
+          return;
+        }
         this.adapter.send_keys(btn.key);
       }
       handleAttachImage(blob, mime) {
@@ -64767,7 +64820,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             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
           };
@@ -64952,9 +65007,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
        * — not this code — decides how a selection is keyed for each CLI.
        */
       async selectPickerChoice(ctl, action, choiceIndex, choiceLabel) {
-        this.driver.dispatch({ kind: "click_control", control_id: ctl.id });
-        await this.waitForPickerRendered(action);
-        const options = this.extractPickerChoices(action);
+        let options = this.extractPickerChoicesIfRendered(action);
+        if (!options) {
+          this.driver.dispatch({ kind: "click_control", control_id: ctl.id });
+          await this.waitForPickerRendered(action);
+          options = this.extractPickerChoices(action);
+        }
         let index = choiceIndex;
         if ((index == null || !Number.isFinite(index)) && choiceLabel) {
           const needle = choiceLabel.trim().toLowerCase();
@@ -64967,8 +65025,27 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (index == null || !Number.isFinite(index)) {
           return { ok: false, error: "choiceIndex or choiceLabel required to select" };
         }
-        const keys = (action.submit_key || "{index}\r").replace(/\{index\}/g, String(index));
-        this.driver.dispatch({ kind: "pty_write", data: keys });
+        if (action.select_mode === "arrow_keys") {
+          const current = options.find((o) => o.current);
+          if (current == null) {
+            return {
+              ok: false,
+              error: "arrow-nav picker: current cursor row not detected on screen",
+              controlResult: { options: options.map((o) => ({ value: o.label, label: o.label, current: o.current })) }
+            };
+          }
+          const up = action.cursor_keys?.up ?? "\x1B[A";
+          const down = action.cursor_keys?.down ?? "\x1B[B";
+          const delta = index - current.index;
+          const step = delta >= 0 ? down : up;
+          const nav = step.repeat(Math.abs(delta));
+          const confirm = (action.submit_key || "\r").replace(/\{index\}/g, "") || "\r";
+          if (nav) this.driver.dispatch({ kind: "pty_write", data: nav });
+          this.driver.dispatch({ kind: "pty_write", data: confirm });
+        } else {
+          const keys = (action.submit_key || "{index}\r").replace(/\{index\}/g, String(index));
+          this.driver.dispatch({ kind: "pty_write", data: keys });
+        }
         const selected = options.find((o) => o.index === index);
         return {
           ok: true,
@@ -64980,6 +65057,20 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           }
         };
       }
+      /** Parse the picker choices only if the picker already appears rendered on
+       *  the live screen (its `wait_for` condition currently matches and at least
+       *  one choice parses). Returns the parsed choices when open, else null so
+       *  the caller knows it must send the trigger to open it. Used to de-dup the
+       *  picker open in {@link selectPickerChoice}. */
+      extractPickerChoicesIfRendered(action) {
+        const wf = action.wait_for;
+        if (wf?.regex) {
+          const re = new RegExp(wf.regex, wf.flags ?? "i");
+          if (!re.test(this.readScreenSectionText(wf.section))) return null;
+        }
+        const options = this.extractPickerChoices(action);
+        return options.length > 0 ? options : null;
+      }
       /** Poll the live screen until the picker's `wait_for` condition matches,
        *  up to a short budget. Returns true if it rendered, false on timeout. */
       async waitForPickerRendered(action) {
@@ -66686,8 +66777,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         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 = [
@@ -66991,6 +67086,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           workspace: typeof event.workspace === "string" && event.workspace.trim() ? event.workspace : this.workingDir,
           providerSessionId: typeof event.providerSessionId === "string" && event.providerSessionId.trim() ? event.providerSessionId : this.providerSessionId
         };
+        if (this.isMeshWorkerSession() && this.settings.meshActiveTaskId) {
+          const existingTaskId = typeof enrichedEvent.taskId === "string" && enrichedEvent.taskId.trim() ? enrichedEvent.taskId : void 0;
+          if (!existingTaskId) {
+            enrichedEvent.taskId = this.settings.meshActiveTaskId;
+          }
+        }
         if (this.context?.emitProviderEvent) {
           this.context.emitProviderEvent(enrichedEvent);
         } else {