@adhdev/daemon-core 0.8.5 → 0.8.7

package/dist/index.js

@@ -877,6 +877,9 @@ function promptLikelyVisible(screenText, promptSnippet) {
 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") {
@@ -1058,11 +1061,44 @@ var init_provider_cli_adapter = __esm({
         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 "";
@@ -1220,11 +1256,15 @@ var init_provider_cli_adapter = __esm({
         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) {
             LOG.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
           }
+          if (isCmdShim) {
+            LOG.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];
@@ -15896,6 +15936,8 @@ async function handleAutoImplement(ctx, type, req, res) {
     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);
@@ -15933,8 +15975,37 @@ async function handleAutoImplement(ctx, type, req, res) {
         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 success = completionSignalSeen || code === 0;
       let message = success ? completionSignalSeen && code !== 0 ? "\u2705 Auto-implement complete (completion signal)" : "\u2705 Auto-implement complete" : `\u274C Agent exited (code: ${code})`;
       let verificationSummary = null;
@@ -15985,12 +16056,14 @@ async function handleAutoImplement(ctx, type, req, res) {
     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, (s) => child.write(s));
         sendAutoImplSSE(ctx, { event: "output", data: { chunk: data, stream: "stdout" } });
+        scheduleAutoStopForVerification();
       });
       child.onExit(({ exitCode: code }) => {
         void finalizeCliAutoImpl(code);
@@ -15999,15 +16072,19 @@ async function handleAutoImplement(ctx, type, req, res) {
       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, (s) => child.stdin?.write(s));
         sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stdout" } });
+        scheduleAutoStopForVerification();
       });
       child.stderr?.on("data", (d) => {
         const chunk = d.toString();
         stderr += chunk;
+        clearAutoStopTimer();
         checkAutoApproval(chunk, (s) => child.stdin?.write(s));
         sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stderr" } });
+        scheduleAutoStopForVerification();
       });
       child.on("exit", (code) => {
         void finalizeCliAutoImpl(code);