@adhdev/daemon-core 0.9.82-rc.80 → 0.9.82-rc.82

package/dist/index.js

@@ -2560,6 +2560,29 @@ function hasPendingRefineTerminalEventDuplicate(event) {
     (pending) => pending.event === event.event && readRefineJobId(pending) === jobId
   );
 }
+function buildPendingEventFingerprint(event) {
+  const metadata = readRecord(event.metadataEvent) || {};
+  const sessionId = resolveEventSessionId(metadata);
+  const providerSessionId = readNonEmptyString2(metadata.providerSessionId);
+  const taskId = readNonEmptyString2(metadata.taskId) || readNonEmptyString2(readRecord(metadata.payload)?.taskId);
+  const jobId = readRefineJobId(event);
+  const timestamp = metadata.timestamp !== void 0 && metadata.timestamp !== null ? String(metadata.timestamp) : "";
+  return [
+    event.meshId,
+    event.event,
+    event.nodeId || "",
+    sessionId || "",
+    providerSessionId || "",
+    taskId || "",
+    jobId || "",
+    timestamp || ""
+  ].join("::");
+}
+function hasPendingCoordinatorEventDuplicate(event) {
+  const fingerprint = buildPendingEventFingerprint(event);
+  if (!fingerprint.trim()) return false;
+  return getPendingMeshCoordinatorEvents(event.meshId).some((pending) => buildPendingEventFingerprint(pending) === fingerprint);
+}
 function getPendingEventsPath(meshId) {
   const safe = meshId.replace(/[^a-zA-Z0-9_-]/g, "_");
   return (0, import_path6.join)(getLedgerDir(), `${safe}.pending-events.jsonl`);
@@ -2570,6 +2593,10 @@ function queuePendingMeshCoordinatorEvent(event) {
       LOG.info("MeshEvents", `Suppressed duplicate pending ${event.event} for refine job ${readRefineJobId(event)}`);
       return true;
     }
+    if (hasPendingCoordinatorEventDuplicate(event)) {
+      LOG.info("MeshEvents", `Suppressed duplicate pending ${event.event} for mesh ${event.meshId}`);
+      return true;
+    }
     (0, import_fs7.appendFileSync)(getPendingEventsPath(event.meshId), JSON.stringify(event) + "\n", "utf-8");
     return true;
   } catch (e) {
@@ -3346,6 +3373,7 @@ function injectMeshSystemMessage(components, args) {
     if (args.sourceInstanceId && instState.instanceId === args.sourceInstanceId) return false;
     return true;
   });
+  const isRefineTerminalEvent = REFINE_TERMINAL_EVENTS.has(args.event);
   if (coordinatorInstances.length === 0) {
     if (queuePendingMeshCoordinatorEvent({
       event: args.event,
@@ -3364,6 +3392,23 @@ function injectMeshSystemMessage(components, args) {
     }
     return { success: true, forwarded: 0 };
   }
+  if (!isRefineTerminalEvent) {
+    if (queuePendingMeshCoordinatorEvent({
+      event: args.event,
+      meshId: args.meshId,
+      nodeLabel: args.nodeLabel,
+      nodeId: args.nodeId || void 0,
+      workspace: readNonEmptyString2(args.metadataEvent.workspace),
+      metadataEvent: {
+        ...args.metadataEvent,
+        ...recoveryContext ? { recoveryContext } : {}
+      },
+      coordinatorMessage: messageText,
+      queuedAt: Date.now()
+    })) {
+      LOG.info("MeshEvents", `Queued ${args.event} for MCP coordinator (mesh ${args.meshId})`);
+    }
+  }
   for (const coord of coordinatorInstances) {
     const coordState = coord.getState();
     LOG.info("MeshEvents", `Forwarding mesh event to coordinator ${coordState.instanceId}`);
@@ -9391,6 +9436,7 @@ function buildMeshActiveWorkSummary(activeWork) {
     sourceCounts[item.source] += 1;
     statusCounts[item.status] += 1;
   }
+  const staleDirectCount = activeWork.filter((item) => item.source === "direct" && item.staleReason).length;
   return {
     totalActiveCount: activeWork.length,
     queueActiveCount: sourceCounts.queue,
@@ -9401,13 +9447,15 @@ function buildMeshActiveWorkSummary(activeWork) {
     idleCount: statusCounts.idle,
     sourceCounts,
     statusCounts,
-    staleDirectCount: activeWork.filter((item) => item.source === "direct" && item.staleReason).length
+    staleDirectCount,
+    ...staleDirectCount > 0 ? { staleDirectNote: "Stale direct records are orphaned ledger entries whose node/session no longer exists. They are historical recovery evidence only \u2014 not active or unresolved work. The queue (source: queue) is authoritative for pending/assigned tasks." } : {}
   };
 }
 function buildMeshActiveWork(opts) {
   const now = opts.now ?? Date.now();
   const records = [];
   const staleDirectWork = [];
+  const terminalDirectWork = [];
   for (const task of opts.queue || []) {
     if (task.status !== "pending" && task.status !== "assigned") continue;
     const { title, summary: summary2 } = summarizeMessage(task.message || "");
@@ -9436,7 +9484,6 @@ function buildMeshActiveWork(opts) {
     const live = sessionStatusFromNodes(opts.nodes, dispatch.nodeId, dispatch.sessionId);
     const status = terminalStatus || live.status || "assigned";
     const terminalRow = Boolean(terminal && terminal.kind !== "task_approval_needed");
-    if (terminalRow && opts.includeTerminalDirect !== true) continue;
     const message = readString2(dispatch.payload?.message) || readString2(dispatch.payload?.summary) || "";
     const { title, summary: summary2 } = summarizeMessage(message);
     const record = {
@@ -9459,6 +9506,10 @@ function buildMeshActiveWork(opts) {
       terminalAt: terminal?.timestamp,
       staleReason: live.staleReason
     };
+    if (terminalRow) {
+      terminalDirectWork.push(record);
+      if (opts.includeTerminalDirect !== true) continue;
+    }
     if (live.staleReason && !terminalRow) {
       staleDirectWork.push(record);
       continue;
@@ -9467,9 +9518,14 @@ function buildMeshActiveWork(opts) {
   }
   records.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
   staleDirectWork.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
+  terminalDirectWork.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
   const summary = buildMeshActiveWorkSummary(records);
   summary.staleDirectCount = staleDirectWork.length;
-  return { activeWork: records, staleDirectWork, summary };
+  const staleDirectWorkNote = staleDirectWork.length > 0 ? "These are orphaned ledger entries whose original node or session no longer exists in the live mesh. They are historical/recovery evidence only \u2014 not active or unresolved work. Do not treat staleDirectCount as a status mismatch; use the queue (source: queue) as authoritative for pending/assigned tasks." : void 0;
+  if (staleDirectWorkNote) {
+    summary.staleDirectNote = staleDirectWorkNote;
+  }
+  return { activeWork: records, staleDirectWork, staleDirectWorkNote, terminalDirectWork, summary };
 }
 
 // src/index.ts
@@ -13912,7 +13968,7 @@ ${effect.notification.body || ""}`.trim();
 init_logger();
 
 // src/providers/read-chat-contract.ts
-var VALID_STATUSES = ["idle", "generating", "waiting_approval", "error", "panel_hidden", "streaming", "long_generating"];
+var VALID_STATUSES = ["idle", "generating", "waiting_approval", "error", "panel_hidden", "starting", "streaming", "long_generating"];
 var VALID_ROLES = ["user", "assistant", "system", "human"];
 var VALID_BUBBLE_STATES = ["draft", "streaming", "final", "removed"];
 var VALID_TURN_STATUSES = ["open", "waiting_approval", "complete", "error"];
@@ -15885,7 +15941,8 @@ function buildSessionModalDeliverySignature(payload) {
 var RECENT_SEND_WINDOW_MS = 1200;
 var READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
 var HERMES_CLI_STARTING_SEND_SETTLE_MS = 2e3;
-var CODEX_NATIVE_HISTORY_FRESH_MS = 5 * 6e4;
+var CLI_NATIVE_HISTORY_FRESH_MS = 5 * 6e4;
+var CLI_NATIVE_TRANSCRIPT_PROVIDERS = /* @__PURE__ */ new Set(["codex-cli", "claude-cli"]);
 var recentSendByTarget = /* @__PURE__ */ new Map();
 function getCurrentProviderType(h, fallback = "") {
   return h.currentSession?.providerType || h.currentProviderType || fallback;
@@ -15973,7 +16030,13 @@ function getHistorySessionId(h, args) {
   const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
   const state = instance?.getState?.();
   const providerSessionId = typeof state?.providerSessionId === "string" ? state.providerSessionId.trim() : "";
-  return providerSessionId || targetSessionId;
+  if (providerSessionId) return providerSessionId;
+  const currentSession = h.currentSession;
+  if (currentSession?.sessionId === targetSessionId) {
+    const currentProviderSessionId = typeof currentSession.providerSessionId === "string" ? currentSession.providerSessionId.trim() : "";
+    if (currentProviderSessionId) return currentProviderSessionId;
+  }
+  return targetSessionId;
 }
 function getInteractionId(args) {
   return typeof args?._interactionId === "string" && args._interactionId.trim() ? args._interactionId.trim() : void 0;
@@ -16036,7 +16099,9 @@ function buildCliMessageSourceProvenance(args) {
   return {
     selected: args.selected,
     provider: args.provider,
+    providerType: args.provider,
     ...args.nativeHandle ? { nativeHandle: args.nativeHandle } : {},
+    ...args.nativeHandle ? { nativeSessionId: args.nativeHandle } : {},
     ...args.fallbackReason ? { fallbackReason: args.fallbackReason } : {},
     ...args.nativeSource ? { nativeSource: args.nativeSource } : {},
     ...args.sourcePath ? { sourcePath: args.sourcePath } : {},
@@ -16057,7 +16122,7 @@ function buildCliMessageSourceProvenance(args) {
   };
 }
 function buildNativeHistoryFallbackReason(args) {
-  if (args.providerType !== "codex-cli") return "provider_not_codex_cli";
+  if (!supportsCliNativeTranscript(args.providerType)) return "provider_native_transcript_not_supported";
   if (args.nativeSource === "native-unavailable") return "native_history_unavailable";
   if (args.nativeSource && args.nativeSource !== "provider-native") return `native_history_source_${args.nativeSource}`;
   if (args.nativeMessageCount <= 0) return "native_history_empty";
@@ -16065,8 +16130,8 @@ function buildNativeHistoryFallbackReason(args) {
   if (!args.freshEnough) return "native_history_stale";
   return "native_history_not_selected";
 }
-function isCodexCliProvider(providerType) {
-  return providerType === "codex-cli";
+function supportsCliNativeTranscript(providerType) {
+  return CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType);
 }
 function hasSafeNativeHistoryMapping(args) {
   const explicitSessionId = String(args.historySessionId || args.providerSessionId || "").trim();
@@ -16084,7 +16149,7 @@ function isNativeHistoryFreshEnough(args) {
   const ptyNewest = getMessageNewestReceivedAt(args.ptyMessages);
   if (nativeNewest > 0 && nativeNewest >= ptyNewest) return true;
   const sourceMtimeMs = Number(args.sourceMtimeMs || 0);
-  if (sourceMtimeMs > 0 && Date.now() - sourceMtimeMs <= CODEX_NATIVE_HISTORY_FRESH_MS) return true;
+  if (sourceMtimeMs > 0 && Date.now() - sourceMtimeMs <= CLI_NATIVE_HISTORY_FRESH_MS) return true;
   return ptyNewest === 0 && nativeNewest > 0;
 }
 function shouldPreserveReadChatPayloadField(key) {
@@ -16133,7 +16198,7 @@ function normalizeReadChatCommandStatus(status, activeModal) {
   }
   switch (raw) {
     case "starting":
-      return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "generating";
+      return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "starting";
     case "stopped":
     case "disconnected":
     case "not_monitored":
@@ -16153,7 +16218,11 @@ function shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter,
   if (typeof adapter.isProcessing === "function" && adapter.isProcessing()) return false;
   return true;
 }
-function normalizeCliReadChatStatus(parsedStatus, activeModal, adapter, adapterStatus) {
+function normalizeCliReadChatStatus(parsedStatus, activeModal, adapter, adapterStatus, parsedMessages) {
+  const adapterRawStatus = typeof adapterStatus?.status === "string" ? adapterStatus.status.trim() : "";
+  if (adapterRawStatus === "starting" && isGeneratingLikeStatus(parsedStatus) && !hasNonEmptyModalButtons(activeModal) && Array.isArray(parsedMessages) && parsedMessages.length === 0 && Array.isArray(adapterStatus?.messages) && adapterStatus.messages.length === 0 && !(typeof adapter.isProcessing === "function" && adapter.isProcessing())) {
+    return "starting";
+  }
   if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return "idle";
   return typeof parsedStatus === "string" && parsedStatus.trim() ? parsedStatus : "idle";
 }
@@ -16644,7 +16713,7 @@ async function handleReadChat(h, args) {
       const transcriptAuthority = parsedRecord.transcriptAuthority === "provider" || parsedRecord.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
       const coverage = parsedRecord.coverage === "full" || parsedRecord.coverage === "tail" || parsedRecord.coverage === "current-turn" ? parsedRecord.coverage : void 0;
       const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-      const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
+      const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus, parsedRecord.messages);
       const runtimeMessageMerger = getTargetInstance(h, args);
       const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages, returnedStatus);
       const returnedMessages = runtimeMessageMerger?.category === "cli" && runtimeMessageMerger.type === adapter.cliType && typeof runtimeMessageMerger.mergeRuntimeChatMessages === "function" ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages) : parsedMessages;
@@ -16657,12 +16726,12 @@ async function handleReadChat(h, args) {
       let messageSource = buildCliMessageSourceProvenance({
         selected: "pty-parser",
         provider: adapter.cliType,
-        fallbackReason: isCodexCliProvider(providerType) ? "native_history_not_checked" : "provider_not_codex_cli",
+        fallbackReason: supportsCliNativeTranscript(providerType) ? "native_history_not_checked" : "provider_native_transcript_not_supported",
         ptyMessages: returnedMessages,
         returnedMessages,
         ptyStatusApprovalOnly: false
       });
-      if (isCodexCliProvider(providerType)) {
+      if (supportsCliNativeTranscript(providerType)) {
         const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h, adapter.cliType);
         const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : typeof adapter.workingDir === "string" ? adapter.workingDir : void 0;
         const nativeHistoryLimit = Math.max(
@@ -16768,7 +16837,7 @@ async function handleReadChat(h, args) {
           returnedStatus: String(returnedStatus || ""),
           selectedMessageSource: messageSource.selected,
           messageSource,
-          shouldPreferAdapterMessages: messageSource.selected !== "native-history",
+          shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType) && messageSource.selected !== "native-history",
           parsedMsgCount: parsedRecord.messages.length,
           returnedMsgCount: selectedMessages.length
         },
@@ -16793,9 +16862,39 @@ async function handleReadChat(h, args) {
         scripts: provider?.scripts
       });
       const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : historySessionId;
+      const historyMessages = Array.isArray(history?.messages) ? normalizeChatMessages(history.messages) : [];
+      const safeMapping = supportsCliNativeTranscript(agentStr) ? hasSafeNativeHistoryMapping({
+        historySessionId,
+        providerSessionId: historyProviderSessionId,
+        workspace,
+        nativeMessages: historyMessages
+      }) : false;
+      const nativeSelected = supportsCliNativeTranscript(agentStr) && history.source === "provider-native" && historyMessages.length > 0 && safeMapping;
+      const messageSource = buildCliMessageSourceProvenance({
+        selected: nativeSelected ? "native-history" : "pty-parser",
+        provider: agentStr,
+        nativeHandle: historyProviderSessionId || historySessionId,
+        fallbackReason: nativeSelected ? void 0 : buildNativeHistoryFallbackReason({
+          providerType: agentStr,
+          nativeSource: history.source,
+          nativeMessageCount: historyMessages.length,
+          safeMapping,
+          freshEnough: true
+        }),
+        nativeSource: history.source,
+        sourcePath: history.sourcePath,
+        sourceMtimeMs: history.sourceMtimeMs,
+        nativeMessages: historyMessages,
+        returnedMessages: historyMessages,
+        safeMapping,
+        freshEnough: true,
+        ptyStatusApprovalOnly: false
+      });
       return buildReadChatCommandResult({
-        messages: Array.isArray(history?.messages) ? history.messages : [],
+        messages: historyMessages,
         status: "idle",
+        messageSource,
+        transcriptProvenance: messageSource,
         ...typeof history?.title === "string" ? { title: history.title } : {},
         ...historyProviderSessionId ? { providerSessionId: historyProviderSessionId } : {},
         ...provider?.historyBehavior?.transcriptAuthority === "provider" || provider?.historyBehavior?.transcriptAuthority === "daemon" ? { transcriptAuthority: (provider?.historyBehavior).transcriptAuthority } : {},
@@ -21664,6 +21763,7 @@ function commandExists(command) {
   }
 }
 var BUSY_AGENT_STATUSES = /* @__PURE__ */ new Set(["generating", "running", "streaming", "starting", "busy", "waiting", "waiting_approval", "long_generating"]);
+var ZERO_MESSAGE_STARTING_SEND_WAIT_MS = 2e3;
 function normalizeAgentStatus(value) {
   return typeof value === "string" ? value.trim().toLowerCase() : "";
 }
@@ -21685,6 +21785,20 @@ function hasAdapterPendingResponse(adapter) {
   }
   return false;
 }
+function countMessages(value) {
+  return Array.isArray(value) ? value.length : 0;
+}
+function hasZeroMessageStartingLaunch(adapter) {
+  const adapterStatus = adapter?.getStatus?.({ allowParse: false }) ?? adapter?.getStatus?.() ?? {};
+  const parsedStatus = typeof adapter?.getScriptParsedStatus === "function" ? adapter.getScriptParsedStatus() : {};
+  const adapterRawStatus = normalizeAgentStatus(adapterStatus?.status);
+  const parsedRawStatus = normalizeAgentStatus(parsedStatus?.status);
+  if (adapterRawStatus !== "starting") return false;
+  if (parsedRawStatus && parsedRawStatus !== "starting" && parsedRawStatus !== "generating") return false;
+  if (hasNonEmptyModalButtons2(adapterStatus?.activeModal ?? adapterStatus?.modal ?? parsedStatus?.activeModal ?? parsedStatus?.modal)) return false;
+  if (countMessages(adapterStatus?.messages) > 0 || countMessages(parsedStatus?.messages) > 0) return false;
+  return !hasAdapterPendingResponse(adapter);
+}
 function shouldSuppressStaleParsedBusyStatus(adapterStatus, parsedStatus, adapter) {
   const parsedRawStatus = normalizeAgentStatus(parsedStatus?.status);
   if (!BUSY_AGENT_STATUSES.has(parsedRawStatus)) return false;
@@ -21708,6 +21822,19 @@ function getEffectiveAgentSendStatus(adapter) {
   }
   return adapterStatus;
 }
+async function waitForZeroMessageStartingLaunch(adapter) {
+  try {
+    if (!hasZeroMessageStartingLaunch(adapter)) return false;
+  } catch {
+    return false;
+  }
+  await new Promise((resolve16) => setTimeout(resolve16, ZERO_MESSAGE_STARTING_SEND_WAIT_MS));
+  try {
+    return hasZeroMessageStartingLaunch(adapter);
+  } catch {
+    return false;
+  }
+}
 var chalkModule = import_chalk.default;
 var chalkApi = typeof chalkModule.yellow === "function" ? chalkModule : chalkModule.default || null;
 function colorize(color, text) {
@@ -22482,7 +22609,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (!found) throw new Error(`CLI agent not running: ${agentType}`);
         const { adapter, key } = found;
         if (action === "send_chat") {
-          const currentStatus = getEffectiveAgentSendStatus(adapter);
+          let currentStatus = getEffectiveAgentSendStatus(adapter);
+          if (currentStatus === "starting" && await waitForZeroMessageStartingLaunch(adapter)) {
+            currentStatus = "idle";
+          } else if (currentStatus === "starting") {
+            currentStatus = getEffectiveAgentSendStatus(adapter);
+          }
           if (BUSY_AGENT_STATUSES.has(currentStatus)) {
             return {
               success: false,