@adhdev/daemon-core 0.8.5 → 0.8.7

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "ADHDev local session host core — session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -357,6 +357,12 @@ function normalizeScreenSnapshot(text: string): string {
         .trim();
 }
 
+function normalizeComparableMessageContent(text: string): string {
+    return String(text || '')
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+
 /**
  * Normalize provider.json for auto-implement approval detection.
  * Kept for backward compat with dev-server auto-impl pipeline only.
@@ -486,15 +492,60 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     private normalizeParsedMessages(parsedMessages: any[]): CliChatMessage[] {
+        const referenceMessages = [...this.committedMessages];
+        const usedReferenceIndexes = new Set<number>();
+        const now = Date.now();
+
+        const findReferenceTimestamp = (role: 'user' | 'assistant', content: string, parsedIndex: number): number | undefined => {
+            const normalizedContent = normalizeComparableMessageContent(content);
+            if (!normalizedContent) return undefined;
+
+            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 undefined;
+        };
+
         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)
+            .map((message, index) => {
+                const role = message.role as 'user' | 'assistant';
+                const content = typeof message.content === 'string' ? message.content : String(message.content || '');
+                const parsedTimestamp = typeof message.timestamp === 'number' && Number.isFinite(message.timestamp)
                     ? message.timestamp
-                    : Date.now(),
-            }));
+                    : undefined;
+                const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
+                return {
+                    role,
+                    content,
+                    timestamp: referenceTimestamp ?? now,
+                };
+            });
     }
 
     private sliceFromOffset(text: string, start: number): string {
@@ -749,12 +800,17 @@ export class ProviderCliAdapter implements CliAdapter {
             || isScriptBinary(binaryPath)
             || !looksLikeMachOOrElf(binaryPath)
         );
-        const useShell = isWin ? !!spawnConfig.shell : useShellUnix;
+        // On Windows, .cmd/.bat shims cannot be spawned directly — must go through cmd.exe
+        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) {
                 // On Windows, pass binaryPath and args as separate items so node-pty's

package/src/daemon/dev-auto-implement.ts

@@ -516,6 +516,8 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
     let approvalBuffer = '';
     let lastApprovalTime = 0;
     let completionSignalSeen = false;
+    let autoStopTimer: ReturnType<typeof setTimeout> | null = null;
+    let autoStopIssued = false;
     
     try {
       const { normalizeCliProviderForRuntime } = await import('../cli-adapters/provider-cli-adapter.js');
@@ -566,8 +568,40 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
       }
     };
 
+    const clearAutoStopTimer = () => {
+      if (autoStopTimer) {
+        clearTimeout(autoStopTimer);
+        autoStopTimer = null;
+      }
+    };
+
+    const scheduleAutoStopForVerification = () => {
+      if (!verification || command !== 'codex' || completionSignalSeen || autoStopIssued) return;
+      const elapsed = Date.now() - spawnedAt;
+      if (elapsed < 30000) 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) / 1000)}s. Interrupting agent and switching to daemon verification.`);
+        sendAutoImplSSE(ctx, {
+          event: 'output',
+          data: {
+            chunk: '\n[🤖 ADHDev Pipeline] Agent output quiet. Interrupting and running daemon verification...\n',
+            stream: 'stdout',
+          },
+        });
+        try {
+          (ctx.autoImplProcess as any).kill('SIGINT');
+        } catch {
+          // ignore
+        }
+      }, 30000);
+    };
+
     const finalizeCliAutoImpl = async (code: number | null) => {
       ctx.autoImplProcess = null;
+      clearAutoStopTimer();
       let success = completionSignalSeen || code === 0;
       let message = success
         ? (completionSignalSeen && code !== 0 ? '✅ Auto-implement complete (completion signal)' : '✅ Auto-implement complete')
@@ -620,12 +654,14 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
     if (isPty) {
       child.onData((data: string) => {
         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 }: { exitCode: number }) => {
         void finalizeCliAutoImpl(code);
@@ -634,15 +670,19 @@ export async function handleAutoImplement(ctx: DevServerContext, type: string, r
       child.stdout?.on('data', (d: Buffer) => {
         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: Buffer) => {
         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: number) => {
         void finalizeCliAutoImpl(code);