adhdev 0.9.82-rc.56 → 0.9.82-rc.58

package/dist/cli/index.js

@@ -7976,10 +7976,15 @@ function isMeshCoordinatorEvent(eventName) {
   return typeof eventName === "string" && MESH_COORDINATOR_EVENTS.has(eventName);
 }
 function formatCompletionMetadata(event) {
+  const completionDiagnostic = event.completionDiagnostic && typeof event.completionDiagnostic === "object" ? event.completionDiagnostic : null;
+  const diagnosticReason = completionDiagnostic ? readNonEmptyString(completionDiagnostic.blockReason) || "present" : "";
+  const finalAssistantPresent = typeof completionDiagnostic?.finalAssistantPresent === "boolean" ? String(completionDiagnostic.finalAssistantPresent) : "";
   const parts = [
     readNonEmptyString(event.targetSessionId) ? `session_id=${readNonEmptyString(event.targetSessionId)}` : "",
     readNonEmptyString(event.providerType) ? `provider=${readNonEmptyString(event.providerType)}` : "",
-    readNonEmptyString(event.providerSessionId) ? `provider_session_id=${readNonEmptyString(event.providerSessionId)}` : ""
+    readNonEmptyString(event.providerSessionId) ? `provider_session_id=${readNonEmptyString(event.providerSessionId)}` : "",
+    diagnosticReason ? `completion_diagnostic=${diagnosticReason}` : "",
+    finalAssistantPresent ? `final_assistant=${finalAssistantPresent}` : ""
   ].filter(Boolean);
   return parts.length > 0 ? ` (${parts.join("; ")})` : "";
 }
@@ -8523,6 +8528,7 @@ function injectMeshSystemMessage(components, args) {
           taskId: completedTaskForLedger?.id || void 0,
           providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
           finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0,
+          completionDiagnostic: args.metadataEvent.completionDiagnostic && typeof args.metadataEvent.completionDiagnostic === "object" ? args.metadataEvent.completionDiagnostic : void 0,
           evidence: completionEvidence
         }
       });
@@ -20482,7 +20488,9 @@ function resolveCliSpawnPlan(options) {
   const configuredCommand = typeof runtimeSettings.executablePath === "string" && runtimeSettings.executablePath.trim() ? runtimeSettings.executablePath.trim() : spawnConfig.command;
   const binaryPath = findBinary(configuredCommand);
   const isWin = os13.platform() === "win32";
-  const allArgs = [...spawnConfig.args, ...extraArgs];
+  const allArgs = [...spawnConfig.args, ...extraArgs].map(
+    (arg) => typeof arg === "string" ? arg.replace(/\{\{workingDir\}\}/g, workingDir) : arg
+  );
   let shellCmd;
   let shellArgs;
   const useShellUnix = !isWin && (!!spawnConfig.shell || !path16.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
@@ -23256,6 +23264,44 @@ var init_cli_provider_instance = __esm({
         const content = lastVisible ? flattenContent(lastVisible.content).trim() : "";
         return role === "assistant" && !!content;
       }
+      buildCompletedFinalizationDiagnostic(args) {
+        let parsed = null;
+        let parseError;
+        try {
+          parsed = this.adapter.getScriptParsedStatus();
+        } catch (error48) {
+          parseError = error48?.message || String(error48);
+        }
+        const visibleMessages = (Array.isArray(parsed?.messages) ? parsed.messages : []).filter((message) => isUserFacingChatMessage(message));
+        const lastVisible = visibleMessages[visibleMessages.length - 1];
+        const lastVisibleRole = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null;
+        const lastVisibleKind = typeof lastVisible?.kind === "string" ? lastVisible.kind : null;
+        const lastVisibleContentLength = lastVisible ? flattenContent(lastVisible.content).trim().length : 0;
+        return {
+          providerType: this.type,
+          sessionId: this.instanceId,
+          providerSessionId: this.providerSessionId || null,
+          workspace: this.workingDir,
+          blockReason: args.blockReason,
+          emittedAfterFinalizationTimeout: args.emittedAfterFinalizationTimeout,
+          waitedMs: args.waitedMs,
+          maxWaitMs: COMPLETED_FINALIZATION_MAX_WAIT_MS,
+          adapterStatus: typeof args.latestStatus?.status === "string" ? args.latestStatus.status : null,
+          latestVisibleStatus: args.latestVisibleStatus,
+          parsedStatus: typeof parsed?.status === "string" ? parsed.status : parseError ? "parse_error" : "unknown",
+          parseError: parseError || void 0,
+          finalAssistantPresent: this.completionHasFinalAssistantMessage(parsed?.messages),
+          visibleMessageCount: visibleMessages.length,
+          lastVisibleRole,
+          lastVisibleKind,
+          lastVisibleContentLength,
+          pendingStartedAt: this.generatingStartedAt || null,
+          pendingFirstObservedAt: args.pending.firstObservedAt,
+          pendingTimestamp: args.pending.timestamp,
+          pendingDurationSec: args.pending.duration,
+          previousBlockReason: args.pending.loggedBlockReason || null
+        };
+      }
       hasAdapterPendingResponse() {
         const adapterAny = this.adapter;
         if (adapterAny?.isWaitingForResponse === true) return true;
@@ -23328,7 +23374,23 @@ var init_cli_provider_instance = __esm({
             this.scheduleCompletedDebounceFlush(COMPLETED_FINALIZATION_RETRY_MS);
             return;
           }
-          LOG.warn("CLI", `[${this.type}] suppressed completed event after ${waitedMs}ms without finalized assistant turn (${blockReason})`);
+          const completionDiagnostic = this.buildCompletedFinalizationDiagnostic({
+            blockReason,
+            latestStatus,
+            latestVisibleStatus,
+            waitedMs,
+            pending,
+            emittedAfterFinalizationTimeout: true
+          });
+          LOG.warn("CLI", `[${this.type}] emitting completed event after ${waitedMs}ms without finalized assistant turn (${blockReason})`);
+          this.pushEvent({
+            event: "agent:generating_completed",
+            chatTitle: pending.chatTitle,
+            duration: pending.duration,
+            timestamp: pending.timestamp,
+            finalSummary: extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages),
+            completionDiagnostic
+          });
           this.completedDebouncePending = null;
           this.completedDebounceTimer = null;
           this.generatingStartedAt = 0;
@@ -47779,15 +47841,15 @@ function reconcileInlineMeshCache(cached2, incoming) {
   const cachedNodes = Array.isArray(cached2.nodes) ? cached2.nodes : [];
   const incomingNodes = Array.isArray(incoming.nodes) ? incoming.nodes : [];
   if (!cachedNodes.length || !incomingNodes.length) return { ...cached2, ...incoming };
-  const incomingById = /* @__PURE__ */ new Map();
-  for (const node of incomingNodes) {
+  const cachedById = /* @__PURE__ */ new Map();
+  for (const node of cachedNodes) {
     const nodeId = readInlineMeshNodeId(node);
-    if (nodeId) incomingById.set(nodeId, node);
+    if (nodeId) cachedById.set(nodeId, node);
   }
-  const nodes = cachedNodes.map((cachedNode) => {
-    const nodeId = readInlineMeshNodeId(cachedNode);
-    const incomingNode = nodeId ? incomingById.get(nodeId) : void 0;
-    if (!incomingNode) return cachedNode;
+  const nodes = incomingNodes.map((incomingNode) => {
+    const nodeId = readInlineMeshNodeId(incomingNode);
+    const cachedNode = nodeId ? cachedById.get(nodeId) : void 0;
+    if (!cachedNode) return incomingNode;
     if (hasInlineMeshTransientNodeState(incomingNode)) {
       return { ...cachedNode, ...incomingNode };
     }
@@ -47942,7 +48004,7 @@ async function hydrateInlineMeshDirectTruth(args) {
       if (!isSelfNode && daemonId) unavailableNodeIds.push(nodeId);
       continue;
     }
-    if (isSelfNode && fs10.existsSync(workspace)) {
+    if (fs10.existsSync(workspace)) {
       try {
         const localGit = await getGitRepoStatus(workspace, { timeoutMs: 1e4, refreshUpstream: true });
         if (localGit?.isGitRepo) {
@@ -60102,7 +60164,7 @@ var require_yoctocolors_cjs = __commonJS({
   }
 });
 
-// ../../node_modules/@inquirer/figures/dist/esm/index.mjs
+// ../../node_modules/@inquirer/figures/dist/esm/index.js
 function isUnicodeSupported() {
   if (import_node_process3.default.platform !== "win32") {
     return import_node_process3.default.env["TERM"] !== "linux";
@@ -60114,7 +60176,7 @@ function isUnicodeSupported() {
 }
 var import_node_process3, common2, specialMainSymbols, specialFallbackSymbols, mainSymbols, fallbackSymbols, shouldUseMain, figures, esm_default, replacements;
 var init_esm3 = __esm({
-  "../../node_modules/@inquirer/figures/dist/esm/index.mjs"() {
+  "../../node_modules/@inquirer/figures/dist/esm/index.js"() {
     "use strict";
     import_node_process3 = __toESM(require("process"), 1);
     common2 = {
@@ -60385,7 +60447,10 @@ var init_esm3 = __esm({
       oneNinth: "1/9",
       oneTenth: "1/10"
     };
-    mainSymbols = { ...common2, ...specialMainSymbols };
+    mainSymbols = {
+      ...common2,
+      ...specialMainSymbols
+    };
     fallbackSymbols = {
       ...common2,
       ...specialFallbackSymbols
@@ -100514,7 +100579,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.56" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.58" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;