@adhdev/daemon-core 0.9.82-rc.173 → 0.9.82-rc.175

package/dist/index.js

@@ -11385,13 +11385,15 @@ function executeJsonl(src, input) {
     try {
       stat2 = fs13.statSync(resolved);
     } catch {
-      return null;
     }
-    if (stat2.isFile()) {
+    if (stat2 && stat2.isFile()) {
       sourcePath = resolved;
-    } else if (stat2.isDirectory()) {
+    } else if (stat2 && stat2.isDirectory()) {
       sourcePath = newestRecentFile(resolved, filePat, windowMs, sessionFloor);
     }
+    if (!sourcePath && hasDateTemplateSegment(src.path)) {
+      sourcePath = newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor);
+    }
   }
   if (!sourcePath) return null;
   const mtime = safeMtimeMs(sourcePath);
@@ -11614,6 +11616,69 @@ function newestRecentFileAcrossGlob(template, pattern, windowMs, sessionFloorMs
   }
   return best ? best.p : null;
 }
+function hasDateTemplateSegment(template) {
+  return /\{yyyy\}|\{mm\}|\{dd\}/.test(template);
+}
+function newestRecentFileAcrossDateWindow(template, input, pattern, windowMs, sessionFloorMs) {
+  const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs);
+  let best = null;
+  for (let dayOffset = 0; dayOffset < 3; dayOffset += 1) {
+    const dayMs = Date.now() - dayOffset * 24 * 60 * 60 * 1e3;
+    const dayInput = { ...input, sessionStartedAtMs: sessionFloorMs };
+    const resolved = expandPathForDate(template, dayInput, new Date(dayMs));
+    if (!resolved) continue;
+    let entries;
+    try {
+      entries = fs13.readdirSync(resolved, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const e of entries) {
+      if (!e.isFile() || !pattern.test(e.name)) continue;
+      const p = path25.join(resolved, e.name);
+      const mtime = safeMtimeMs(p);
+      if (mtime < cutoff) continue;
+      if (!best || mtime > best.mtime) best = { p, mtime };
+    }
+  }
+  return best ? best.p : null;
+}
+function expandPathForDate(template, input, day) {
+  if (!template) return null;
+  let out = template;
+  if (out.startsWith("~/") || out === "~") {
+    out = path25.join(os18.homedir(), out.slice(2));
+  }
+  out = out.replace(/\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}/g, (_m, name, fallback) => {
+    const v = input.envOverrides?.[name] ?? process.env[name];
+    return v != null && v !== "" ? v : fallback ?? "";
+  });
+  if (out.startsWith("~/")) out = path25.join(os18.homedir(), out.slice(2));
+  const workspaceRaw = input.workspace ?? "";
+  let workspaceResolved = workspaceRaw;
+  if (workspaceRaw) {
+    try {
+      workspaceResolved = fs13.realpathSync(workspaceRaw);
+    } catch {
+    }
+  }
+  const vars = {
+    cwd: workspaceResolved,
+    cwd_dashed: workspaceResolved.replace(/\//g, "-"),
+    session_id: input.providerSessionId || input.sessionId || input.historySessionId || "",
+    yyyy: String(day.getUTCFullYear()),
+    mm: String(day.getUTCMonth() + 1).padStart(2, "0"),
+    dd: String(day.getUTCDate()).padStart(2, "0")
+  };
+  let missing = false;
+  out = out.replace(/\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g, (_m, name) => {
+    const v = vars[name] ?? "";
+    if (!v) missing = true;
+    return v;
+  });
+  if (missing) return null;
+  return out;
+}
 function newestRecentFile(dir, pattern, windowMs, sessionFloorMs = 0) {
   let entries;
   try {
@@ -27646,6 +27711,18 @@ function interpolate(template, state, sections) {
 init_loader();
 var STARTUP_GRACE_MS = 2500;
 var BUSY_HOLD_MS = 6e3;
+var SUBMIT_DELAY_FLOOR_MS = 200;
+function countNewlines(s) {
+  let n = 0;
+  for (let i = 0; i < s.length; i += 1) if (s.charCodeAt(i) === 10) n += 1;
+  return n;
+}
+function resolveSubmitDelayMs(specBeforeSubmit, text) {
+  const lines = countNewlines(text);
+  const linesBonus = Math.min(800, lines * 80);
+  const spec = typeof specBeforeSubmit === "number" && specBeforeSubmit > 0 ? specBeforeSubmit : 0;
+  return Math.max(spec, SUBMIT_DELAY_FLOOR_MS + linesBonus);
+}
 var SpecDriver = class {
   constructor(opts) {
     this.opts = opts;
@@ -27873,7 +27950,7 @@ var SpecDriver = class {
   actuallySendMessage(text) {
     const sm = this.spec.send_message;
     const perChar = sm.delay_ms_per_char ?? 0;
-    const beforeSubmit = sm.delay_ms_before_submit ?? 0;
+    const beforeSubmit = resolveSubmitDelayMs(sm.delay_ms_before_submit, text);
     if (perChar === 0) {
       this.adapter.send_keys(text);
       if (beforeSubmit > 0) setTimeout(() => this.adapter.send_keys(sm.submit_key), beforeSubmit);
@@ -29023,6 +29100,50 @@ var CliProviderInstance = class {
     if (looksLikeActiveApprovalPromptText(content)) return false;
     return true;
   }
+  readExternalCompletionMessages() {
+    const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
+    if (!adapterOwnsMessagesElsewhere) return null;
+    if (!this.providerSessionId) return null;
+    if (!isNativeSourceCanonicalHistory(this.provider.nativeHistory)) return null;
+    const restoredHistory = readProviderChatHistory(this.type, {
+      canonicalHistory: this.provider.nativeHistory,
+      historySessionId: this.providerSessionId,
+      workspace: this.workingDir,
+      offset: 0,
+      limit: Number.MAX_SAFE_INTEGER,
+      historyBehavior: this.provider.historyBehavior,
+      scripts: this.provider.scripts,
+      sessionStartedAtMs: this.startedAt
+    });
+    if (restoredHistory.source !== "provider-native") return null;
+    return restoredHistory.messages;
+  }
+  completionFinalAssistantEvidence(parsedMessages) {
+    if (this.completionHasFinalAssistantMessage(parsedMessages)) {
+      return {
+        present: true,
+        messages: Array.isArray(parsedMessages) ? parsedMessages : [],
+        source: "parsed"
+      };
+    }
+    const externalMessages = this.readExternalCompletionMessages();
+    if (externalMessages) {
+      return {
+        present: this.completionHasFinalAssistantMessage(externalMessages),
+        messages: externalMessages,
+        source: "external-native"
+      };
+    }
+    return {
+      present: false,
+      messages: Array.isArray(parsedMessages) ? parsedMessages : [],
+      source: "unavailable"
+    };
+  }
+  completionFinalSummary(parsedMessages) {
+    const evidence = this.completionFinalAssistantEvidence(parsedMessages);
+    return extractFinalSummaryFromMessages(evidence.messages);
+  }
   buildCompletedFinalizationDiagnostic(args) {
     let parsed = null;
     let parseError;
@@ -29031,7 +29152,8 @@ var CliProviderInstance = class {
     } catch (error) {
       parseError = error?.message || String(error);
     }
-    const visibleMessages = (Array.isArray(parsed?.messages) ? parsed.messages : []).filter((message) => isUserFacingChatMessage(message));
+    const evidence = this.completionFinalAssistantEvidence(parsed?.messages);
+    const visibleMessages = (Array.isArray(evidence.messages) ? evidence.messages : []).filter((message) => isUserFacingChatMessage(message));
     const lastVisible = visibleMessages[visibleMessages.length - 1];
     const lastVisibleRole = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null;
     const lastVisibleKind = typeof lastVisible?.kind === "string" ? lastVisible.kind : null;
@@ -29049,7 +29171,8 @@ var CliProviderInstance = class {
       latestVisibleStatus: args.latestVisibleStatus,
       parsedStatus: typeof parsed?.status === "string" ? parsed.status : parseError ? "parse_error" : "unknown",
       parseError: parseError || void 0,
-      finalAssistantPresent: this.completionHasFinalAssistantMessage(parsed?.messages),
+      finalAssistantPresent: evidence.present,
+      finalAssistantEvidenceSource: evidence.source,
       visibleMessageCount: visibleMessages.length,
       lastVisibleRole,
       lastVisibleKind,
@@ -29112,8 +29235,21 @@ var CliProviderInstance = class {
     }
     if (parsed?.activeModal || parsed?.modal) return { reason: "parsed_modal_active", terminal: true };
     const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
-    if (!adapterOwnsMessagesElsewhere && !this.completionHasFinalAssistantMessage(parsed?.messages)) {
-      return { reason: "missing_final_assistant" };
+    const finalAssistantEvidence = this.completionFinalAssistantEvidence(parsed?.messages);
+    if (!finalAssistantEvidence.present) {
+      if (adapterOwnsMessagesElsewhere) {
+        if (finalAssistantEvidence.source === "external-native") {
+          return { reason: "missing_final_assistant", terminal: true };
+        }
+        if (this.provider.requiresFinalAssistantBeforeIdle === true) {
+          return { reason: "missing_final_assistant", terminal: true };
+        }
+      } else {
+        return {
+          reason: "missing_final_assistant",
+          terminal: this.provider.requiresFinalAssistantBeforeIdle === true
+        };
+      }
     }
     try {
       const screenText = typeof this.adapter.getScreenText === "function" ? String(this.adapter.getScreenText() || "") : "";
@@ -29172,7 +29308,7 @@ var CliProviderInstance = class {
         chatTitle: pending.chatTitle,
         duration: pending.duration,
         timestamp: pending.timestamp,
-        finalSummary: blockReason.startsWith("parsed_status:") ? "" : extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages),
+        finalSummary: blockReason.startsWith("parsed_status:") ? "" : this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages),
         completionDiagnostic
       });
       this.completedDebouncePending = null;
@@ -29187,7 +29323,7 @@ var CliProviderInstance = class {
       chatTitle: pending.chatTitle,
       duration: pending.duration,
       timestamp: pending.timestamp,
-      finalSummary: extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages)
+      finalSummary: this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages)
     });
     this.completedDebouncePending = null;
     this.completedDebounceTimer = null;
@@ -29320,11 +29456,15 @@ var CliProviderInstance = class {
           this.generatingDebouncePending = null;
           this.generatingStartedAt = 0;
           let shortFinalSummary;
+          let shortEvidenceSource = "unavailable";
           try {
-            shortFinalSummary = extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages);
+            const parsedMessages = this.adapter?.getScriptParsedStatus()?.messages;
+            const evidence = this.completionFinalAssistantEvidence(parsedMessages);
+            shortEvidenceSource = evidence.source;
+            shortFinalSummary = extractFinalSummaryFromMessages(evidence.messages);
           } catch {
           }
-          if (this.provider.requiresFinalAssistantBeforeIdle === true && !shortFinalSummary) {
+          if ((this.provider.requiresFinalAssistantBeforeIdle === true || shortEvidenceSource === "external-native") && !shortFinalSummary) {
             LOG.info("CLI", `[${this.type}] suppressed short completion without final assistant evidence`);
           } else {
             this.pushEvent({
@@ -29335,7 +29475,8 @@ var CliProviderInstance = class {
               finalSummary: shortFinalSummary,
               completionDiagnostic: {
                 reason: "short_generating_suppressed",
-                shortDurationMs
+                shortDurationMs,
+                finalAssistantEvidenceSource: shortEvidenceSource
               }
             });
           }