@adhdev/daemon-core 0.9.82-rc.331 → 0.9.82-rc.332

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "a6ef3a58ea926c6fa42f5ec53fae14e0bd5cac1b" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "a6ef3a58" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.331" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-20T00:34:05.737Z" : void 0);
+  const commit = readInjected(true ? "2466d8b001000d509eb9058a0c51ec6f383741ed" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "2466d8b0" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.332" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-20T01:55:54.421Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -10669,6 +10669,21 @@ function handleMeshForwardEvent(components, payload) {
       targetSessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId) || readNonEmptyString2(payload.instanceId),
       providerType: readNonEmptyString2(payload.providerType),
       providerSessionId: readNonEmptyString2(payload.providerSessionId),
+      // 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),
       jobId: readNonEmptyString2(payload.jobId),
       interactionId: readNonEmptyString2(payload.interactionId),
@@ -11549,7 +11564,8 @@ function findLiveCoordinators(components) {
     const meshId = readNonEmptyString2(settings.meshCoordinatorFor);
     if (!meshId) continue;
     const status = readNonEmptyString2(state.status).toLowerCase();
-    out.push({ meshId, instance: inst, idle: status === "idle" });
+    const modalParked = status === "waiting_choice" || status === "waiting_approval";
+    out.push({ meshId, instance: inst, idle: status === "idle", modalParked });
   }
   return out;
 }
@@ -11638,9 +11654,16 @@ async function runMeshReconcileTick(components) {
   }
   for (const [meshId, meshCoordinators] of byMesh) {
     const idleCoordinators = meshCoordinators.filter((c) => c.idle);
-    const generatingCoordinators = meshCoordinators.filter((c) => !c.idle);
+    const generatingCoordinators = meshCoordinators.filter((c) => !c.idle && !c.modalParked);
+    const modalParkedCoordinators = meshCoordinators.filter((c) => !c.idle && c.modalParked);
     const targetCoordinators = idleCoordinators.length > 0 ? idleCoordinators : generatingCoordinators;
     const forceOnly = idleCoordinators.length === 0;
+    if (targetCoordinators.length === 0) {
+      if (modalParkedCoordinators.length > 0) {
+        LOG.info("MeshReconcile", `Reconcile skip \u2192 modal-parked: holding pending event(s) for mesh ${meshId} (${modalParkedCoordinators.length} coordinator(s) awaiting a modal answer; events left queued)`);
+      }
+      continue;
+    }
     if (store) {
       try {
         if (store.pendingEventCount(meshId) === 0) continue;
@@ -15957,6 +15980,10 @@ ${lastSnapshot}`;
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
         const content = String(text || "");
         if (!content.trim()) return;
+        if (this.engine.currentStatus === "waiting_approval" || this.engine.hasActionableApproval()) {
+          LOG.info("CLI", `[${this.cliType}] force-send held \u2014 session parked on approval modal (status=${this.engine.currentStatus})`);
+          return;
+        }
         LOG.info("CLI", `[${this.cliType}] force-sending prompt while status=${this.engine.currentStatus}`);
         await this.writeToPty(content + this.sendKey);
         this.onStatusChange?.();
@@ -34861,6 +34888,35 @@ var CliProviderInstance = class _CliProviderInstance {
     this.settings = rest;
     this.adapter.updateRuntimeSettings?.(this.settings);
   }
+  /**
+   * The resolved modal-park status of this session, or null when it is not
+   * parked on a modal awaiting a human answer. Mirrors the overlay logic in
+   * getState(): an active AskUserQuestion interactive prompt resolves to
+   * waiting_choice; otherwise the adapter's waiting_approval (tool consent)
+   * counts — UNLESS auto-approve will dismiss it, in which case the session is
+   * effectively generating and is NOT modal-parked. This is the single signal
+   * the mesh force-inject guard consults, and the same status string the
+   * reconcile loop reads off get_status_metadata. Lowercase literals only —
+   * the SessionStatus enum is forked across modules and waiting_choice is
+   * absent from some of them.
+   */
+  resolveModalParkStatus() {
+    if (this.activeInteractivePrompt) return "waiting_choice";
+    let adapterStatus;
+    try {
+      adapterStatus = this.adapter.getStatus({ allowParse: false });
+    } catch {
+      return null;
+    }
+    if (adapterStatus.status === "waiting_approval" && !this.shouldAutoApprove()) {
+      return "waiting_approval";
+    }
+    return null;
+  }
+  /** True when this session is parked on a modal awaiting a human answer. */
+  isModalParked() {
+    return this.resolveModalParkStatus() !== null;
+  }
   onEvent(event, data) {
     if (event === "send_message") {
       const input = normalizeInputEnvelope(data);
@@ -34868,6 +34924,10 @@ var CliProviderInstance = class _CliProviderInstance {
       const promptText = buildCliStructuredInputPrompt(input);
       if (promptText) {
         const force = data?.force === true;
+        if (force && this.isModalParked()) {
+          LOG.info("CLI", `[${this.type}] force send_message held \u2014 coordinator parked on modal (${this.resolveModalParkStatus()})`);
+          return;
+        }
         void this.adapter.sendMessage(promptText, force ? { force: true } : {}).catch((e) => {
           LOG.warn("CLI", `[${this.type}] send_message failed: ${e?.message || e}`);
         });