@adhdev/daemon-standalone 0.8.5 → 0.8.7

package/dist/index.js

@@ -28611,6 +28611,9 @@ var require_dist2 = __commonJS({
     function normalizeScreenSnapshot(text) {
       return sanitizeTerminalText(String(text || "")).replace(/\s+/g, " ").trim();
     }
+    function normalizeComparableMessageContent(text) {
+      return String(text || "").replace(/\s+/g, " ").trim();
+    }
     function parsePatternEntry(x) {
       if (x instanceof RegExp) return x;
       if (x && typeof x === "object" && typeof x.source === "string") {
@@ -28796,11 +28799,44 @@ var require_dist2 = __commonJS({
             this.structuredMessages = [...this.committedMessages];
           }
           normalizeParsedMessages(parsedMessages) {
-            return parsedMessages.filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message) => ({
-              role: message.role,
-              content: typeof message.content === "string" ? message.content : String(message.content || ""),
-              timestamp: typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : Date.now()
-            }));
+            const referenceMessages = [...this.committedMessages];
+            const usedReferenceIndexes = /* @__PURE__ */ new Set();
+            const now = Date.now();
+            const findReferenceTimestamp = (role, content, parsedIndex) => {
+              const normalizedContent = normalizeComparableMessageContent(content);
+              if (!normalizedContent) return void 0;
+              const sameIndex = referenceMessages[parsedIndex];
+              if (sameIndex && !usedReferenceIndexes.has(parsedIndex) && sameIndex.role === role && normalizeComparableMessageContent(sameIndex.content) === normalizedContent && typeof sameIndex.timestamp === "number" && Number.isFinite(sameIndex.timestamp)) {
+                usedReferenceIndexes.add(parsedIndex);
+                return sameIndex.timestamp;
+              }
+              for (let i = 0; i < referenceMessages.length; i++) {
+                if (usedReferenceIndexes.has(i)) continue;
+                const candidate = referenceMessages[i];
+                if (!candidate || candidate.role !== role) continue;
+                const candidateContent = normalizeComparableMessageContent(candidate.content);
+                if (!candidateContent) continue;
+                const exactMatch = candidateContent === normalizedContent;
+                const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
+                if (!exactMatch && !fuzzyMatch) continue;
+                if (typeof candidate.timestamp === "number" && Number.isFinite(candidate.timestamp)) {
+                  usedReferenceIndexes.add(i);
+                  return candidate.timestamp;
+                }
+              }
+              return void 0;
+            };
+            return parsedMessages.filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message, index) => {
+              const role = message.role;
+              const content = typeof message.content === "string" ? message.content : String(message.content || "");
+              const parsedTimestamp = typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : void 0;
+              const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
+              return {
+                role,
+                content,
+                timestamp: referenceTimestamp ?? now
+              };
+            });
           }
           sliceFromOffset(text, start) {
             if (!text) return "";
@@ -28958,11 +28994,15 @@ var require_dist2 = __commonJS({
             let shellCmd;
             let shellArgs;
             const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
-            const useShell = isWin ? !!spawnConfig.shell : useShellUnix;
+            const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
+            const useShell = isWin ? !!spawnConfig.shell || isCmdShim : useShellUnix;
             if (useShell) {
               if (!spawnConfig.shell && !isWin) {
                 LOG2.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
               }
+              if (isCmdShim) {
+                LOG2.info("CLI", `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
+              }
               shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
               if (isWin) {
                 shellArgs = ["/c", binaryPath, ...allArgs];
@@ -43524,6 +43564,8 @@ async (params) => {
         let approvalBuffer = "";
         let lastApprovalTime = 0;
         let completionSignalSeen = false;
+        let autoStopTimer = null;
+        let autoStopIssued = false;
         try {
           const { normalizeCliProviderForRuntime: normalizeCliProviderForRuntime2 } = await Promise.resolve().then(() => (init_provider_cli_adapter(), provider_cli_adapter_exports));
           const normalized = normalizeCliProviderForRuntime2(agentProvider);
@@ -43561,8 +43603,37 @@ async (params) => {
             lastApprovalTime = Date.now();
           }
         };
+        const clearAutoStopTimer = () => {
+          if (autoStopTimer) {
+            clearTimeout(autoStopTimer);
+            autoStopTimer = null;
+          }
+        };
+        const scheduleAutoStopForVerification = () => {
+          if (!verification || command !== "codex" || completionSignalSeen || autoStopIssued) return;
+          const elapsed = Date.now() - spawnedAt;
+          if (elapsed < 3e4) return;
+          clearAutoStopTimer();
+          autoStopTimer = setTimeout(() => {
+            if (!ctx.autoImplProcess || completionSignalSeen || autoStopIssued) return;
+            autoStopIssued = true;
+            ctx.log(`Auto-implement output quiet for 30s after ${Math.round((Date.now() - spawnedAt) / 1e3)}s. Interrupting agent and switching to daemon verification.`);
+            sendAutoImplSSE(ctx, {
+              event: "output",
+              data: {
+                chunk: "\n[\u{1F916} ADHDev Pipeline] Agent output quiet. Interrupting and running daemon verification...\n",
+                stream: "stdout"
+              }
+            });
+            try {
+              ctx.autoImplProcess.kill("SIGINT");
+            } catch {
+            }
+          }, 3e4);
+        };
         const finalizeCliAutoImpl = async (code) => {
           ctx.autoImplProcess = null;
+          clearAutoStopTimer();
           let success2 = completionSignalSeen || code === 0;
           let message = success2 ? completionSignalSeen && code !== 0 ? "\u2705 Auto-implement complete (completion signal)" : "\u2705 Auto-implement complete" : `\u274C Agent exited (code: ${code})`;
           let verificationSummary = null;
@@ -43613,12 +43684,14 @@ async (params) => {
         if (isPty) {
           child.onData((data) => {
             stdout += data;
+            clearAutoStopTimer();
             if (data.includes("\x1B[6n")) {
               child.write("\x1B[12;1R");
               ctx.log("Terminal CPR request (\\x1b[6n) intercepted in PTY, responding with dummy coordinates [12;1R]");
             }
             checkAutoApproval(data, (s15) => child.write(s15));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk: data, stream: "stdout" } });
+            scheduleAutoStopForVerification();
           });
           child.onExit(({ exitCode: code }) => {
             void finalizeCliAutoImpl(code);
@@ -43627,15 +43700,19 @@ async (params) => {
           child.stdout?.on("data", (d) => {
             const chunk = d.toString();
             stdout += chunk;
+            clearAutoStopTimer();
             if (chunk.includes("\x1B[6n")) child.stdin?.write("\x1B[1;1R");
             checkAutoApproval(chunk, (s15) => child.stdin?.write(s15));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stdout" } });
+            scheduleAutoStopForVerification();
           });
           child.stderr?.on("data", (d) => {
             const chunk = d.toString();
             stderr += chunk;
+            clearAutoStopTimer();
             checkAutoApproval(chunk, (s15) => child.stdin?.write(s15));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stderr" } });
+            scheduleAutoStopForVerification();
           });
           child.on("exit", (code) => {
             void finalizeCliAutoImpl(code);