@adhdev/daemon-standalone 0.8.6 → 0.8.8

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];