adhdev 0.8.5 → 0.8.7

package/dist/cli/index.js

@@ -6406,6 +6406,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") {
@@ -6587,11 +6590,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 "";
@@ -6749,11 +6785,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];
@@ -34166,6 +34206,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);
@@ -34203,8 +34245,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 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;
@@ -34255,12 +34326,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);
@@ -34269,15 +34342,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);
@@ -39153,7 +39230,7 @@ var init_adhdev_daemon = __esm({
     fs17 = __toESM(require("fs"));
     path21 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.8.5";
+    pkgVersion = "0.8.7";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -40734,6 +40811,52 @@ function getDefaultAutoFixReference(category, type, providers) {
   }
   return "antigravity";
 }
+function escapeRegex2(value) {
+  return String(value || "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function getCliAutoFixVerification(type, providerDir) {
+  if (type !== "codex-cli") return null;
+  const normalizedDir = providerDir.replace(/\\/g, "/");
+  const escapedDir = escapeRegex2(normalizedDir);
+  return {
+    fixtureName: "codex-cli-provider-fix",
+    request: {
+      type,
+      workingDir: providerDir,
+      freshSession: true,
+      autoLaunch: true,
+      autoResolveApprovals: true,
+      approvalButtonIndex: 0,
+      timeoutMs: 9e4,
+      traceLimit: 200,
+      text: "Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output."
+    },
+    inspectFields: [
+      "debug.messages",
+      "trace.entries[].payload.parsedLastAssistant",
+      "trace.entries[].payload.detectStatus",
+      "trace.entries[].payload.parsedStatus"
+    ],
+    lastAssistantMustContainAny: [
+      "Exact output:",
+      "1",
+      "4",
+      "9",
+      "16",
+      "25"
+    ],
+    lastAssistantMustMatchAny: [
+      escapedDir
+    ],
+    lastAssistantMustNotContainAny: [
+      "Do you trust the contents of this directory?",
+      "OpenAI Codex",
+      "Tip: New",
+      "Summarize recent commits"
+    ],
+    description: "Codex CLI must classify startup/trust screens correctly, transition idle -> generating -> idle, and preserve the exact stdout block in the final assistant transcript."
+  };
+}
 function hideCommand2(command) {
   command.hideHelp?.();
   return command;
@@ -41145,13 +41268,15 @@ function registerProviderCommands(program2) {
         console.log(import_chalk6.default.gray(`   \u{1F4AC} Comment: ${userComment}`));
       }
       try {
+        const verification = providerToFix.category === "cli" ? getCliAutoFixVerification(type, targetDir) : null;
         const postData = JSON.stringify({
           functions: functionsToFix,
           agent: agentName,
           providerDir: targetDir,
           ...modelName ? { model: modelName } : {},
           ...userComment ? { comment: userComment } : {},
-          reference
+          reference,
+          ...verification ? { verification } : {}
         });
         const startResult = await new Promise((resolve13, reject) => {
           const req = http3.request({
@@ -41182,6 +41307,14 @@ function registerProviderCommands(program2) {
             throw new Error(`Auto-Impl Failed: ${startResult.error}`);
           }
         }
+        if (startResult.skipped && startResult.verification?.pass) {
+          console.log(import_chalk6.default.green(`
+\u2705 Auto-Implement preflight already passes for ${type}.`));
+          console.log(import_chalk6.default.gray(`   Verification mode: ${startResult.verification.mode}`));
+          console.log(import_chalk6.default.gray(`   Provider dir: ${startResult.providerDir}`));
+          console.log();
+          return;
+        }
         if (!startResult.started || !startResult.sseUrl) {
           throw new Error(`Unexpected response: ${JSON.stringify(startResult)}`);
         }