@adhdev/daemon-core 0.6.49 → 0.6.51

package/dist/index.d.ts

@@ -179,9 +179,13 @@ interface ADHDevConfig {
     disableUpstream?: boolean;
 }
 interface CliHistoryEntry {
+    category?: 'ide' | 'cli' | 'acp';
     cliType: string;
     dir: string;
     cliArgs?: string[];
+    workspace?: string;
+    newWindow?: boolean;
+    model?: string;
     timestamp: number;
     label?: string;
 }
@@ -210,7 +214,7 @@ declare function isSetupComplete(): boolean;
  */
 declare function resetConfig(): void;
 /**
- * Add CLI launch to history (max 20, dedup by cliType+dir+args)
+ * Add launch to history (max 20, dedup by category+type+dir+args+workspace+model)
  */
 declare function addCliHistory(entry: Omit<CliHistoryEntry, 'timestamp'>): void;
 
@@ -2496,7 +2500,7 @@ declare const DAEMON_WS_PATH = "/ipc";
  * category: 'cli'
  * binary: string — binary name
  * spawn: { command, args, shell, env }
- * patterns: { prompt, generating, approval, ready }
+ * patterns: { prompt, generating, approval, ready } — prompt helps end startup splash-gate early; sendMessage does not wait for it
  * timeouts?: { idleFinish, generatingIdle, maxResponse, approvalCooldown, outputSettle, ... }
  * cleanOutput(raw, lastUserInput): string
  */
@@ -2570,6 +2574,9 @@ declare class ProviderCliAdapter implements CliAdapter {
     private idleTimeout;
     private ready;
     private startupBuffer;
+    /** After spawn: briefly skip generating/settle so splash/redraw does not flip status; not used to gate sendMessage */
+    private startupParseGate;
+    private spawnAt;
     private onPtyDataCallback;
     private ptyOutputBuffer;
     private ptyOutputFlushTimer;

package/dist/index.js

@@ -320,14 +320,26 @@ function addCliHistory(entry) {
   const config = loadConfig();
   const history = config.cliHistory || [];
   const argsKey = (entry.cliArgs || []).join(" ");
+  const category = entry.category || "cli";
+  const workspaceKey = entry.workspace || "";
+  const modelKey = entry.model || "";
   const filtered = history.filter((h) => {
     const hArgsKey = (h.cliArgs || []).join(" ");
-    return !(h.cliType === entry.cliType && h.dir === entry.dir && hArgsKey === argsKey);
+    return !((h.category || "cli") === category && h.cliType === entry.cliType && h.dir === entry.dir && hArgsKey === argsKey && (h.workspace || "") === workspaceKey && (h.model || "") === modelKey);
   });
   filtered.unshift({
     ...entry,
+    category,
     timestamp: Date.now(),
-    label: entry.label || `${entry.cliType} \xB7 ${entry.dir.split("/").filter(Boolean).pop() || "root"}${argsKey ? ` (${argsKey})` : ""}`
+    label: entry.label || (() => {
+      const base = `${entry.cliType} \xB7 ${entry.dir.split("/").filter(Boolean).pop() || "root"}`;
+      const suffix = [];
+      if (entry.workspace && entry.workspace !== entry.dir) suffix.push(entry.workspace.split("/").filter(Boolean).pop() || entry.workspace);
+      if (entry.model) suffix.push(`model=${entry.model}`);
+      if (argsKey) suffix.push(argsKey);
+      if (entry.newWindow) suffix.push("new window");
+      return suffix.length > 0 ? `${base} (${suffix.join(" \xB7 ")})` : base;
+    })()
   });
   config.cliHistory = filtered.slice(0, 20);
   saveConfig(config);
@@ -768,6 +780,9 @@ var init_provider_cli_adapter = __esm({
       idleTimeout = null;
       ready = false;
       startupBuffer = "";
+      /** After spawn: briefly skip generating/settle so splash/redraw does not flip status; not used to gate sendMessage */
+      startupParseGate = false;
+      spawnAt = 0;
       // PTY I/O
       onPtyDataCallback = null;
       ptyOutputBuffer = "";
@@ -881,9 +896,15 @@ var init_provider_cli_adapter = __esm({
           this.ptyProcess = null;
           this.setStatus("stopped", "pty_exit");
           this.ready = false;
+          this.startupParseGate = false;
+          this.spawnAt = 0;
           this.onStatusChange?.();
         });
-        this.setStatus("starting", "spawn");
+        this.spawnAt = Date.now();
+        this.startupParseGate = true;
+        this.startupBuffer = "";
+        this.ready = true;
+        this.setStatus("idle", "pty_ready");
         this.onStatusChange?.();
       }
       // ─── Output state machine ────────────────────────────
@@ -899,7 +920,7 @@ var init_provider_cli_adapter = __esm({
           }
         }
         this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
-        if (!this.ready) {
+        if (this.startupParseGate) {
           this.startupBuffer += cleanData;
           LOG.info("CLI", `[${this.cliType}] startup chunk (${cleanData.length} chars): ${cleanData.slice(0, 200).replace(/\n/g, "\\n")}`);
           const dialogPatterns = [
@@ -914,13 +935,19 @@ var init_provider_cli_adapter = __esm({
             this.startupBuffer = "";
             return;
           }
-          if (patterns.prompt.some((p) => p.test(this.startupBuffer))) {
-            this.ready = true;
-            this.setStatus("idle", "prompt_matched");
-            LOG.info("CLI", `[${this.cliType}] \u2713 Ready`);
-            this.onStatusChange?.();
+          const elapsed = Date.now() - this.spawnAt;
+          const bufCap = this.startupBuffer.length > 12e3;
+          const promptMatched = patterns.prompt.some((p) => p.test(this.startupBuffer));
+          if (promptMatched || elapsed > 8e3 || bufCap) {
+            this.startupParseGate = false;
+            if (promptMatched) {
+              LOG.info("CLI", `[${this.cliType}] \u2713 Startup gate end (prompt matched)`);
+            } else {
+              LOG.info("CLI", `[${this.cliType}] startup gate end (${elapsed}ms, cap=${bufCap}, prompt=${promptMatched})`);
+            }
+          } else {
+            return;
           }
-          return;
         }
         if (cleanData.trim().length > 5) {
           LOG.debug("CLI", `[${this.cliType}] output chunk (${cleanData.length}): ${cleanData.slice(0, 300).replace(/\n/g, "\\n")}`);
@@ -1128,6 +1155,8 @@ var init_provider_cli_adapter = __esm({
             this.ptyProcess = null;
             this.setStatus("stopped", "stop_cmd");
             this.ready = false;
+            this.startupParseGate = false;
+            this.spawnAt = 0;
             this.onStatusChange?.();
           }, this.timeouts.shutdownGrace);
         }
@@ -1174,16 +1203,29 @@ var init_provider_cli_adapter = __esm({
       * Used by DevServer /api/cli/debug endpoint.
       */
       getDebugState() {
+        const sb = this.startupBuffer;
+        const testOnStartup = (p) => {
+          const flags = p.flags.includes("g") ? p.flags.replace(/g/g, "") : p.flags;
+          return new RegExp(p.source, flags).test(sb);
+        };
+        const promptDiagnostics = this.provider.patterns.prompt.map((p) => ({
+          pattern: p.toString(),
+          matchedAgainstStartupBuffer: testOnStartup(p)
+        }));
         return {
           type: this.cliType,
           name: this.cliName,
           status: this.currentStatus,
           ready: this.ready,
+          startupParseGate: this.startupParseGate,
+          spawnAt: this.spawnAt,
           workingDir: this.workingDir,
           messages: this.messages.slice(-20),
           messageCount: this.messages.length,
-          // Buffers
-          startupBuffer: this.startupBuffer.slice(-500),
+          // Buffers (longer tails here than in periodic logs — for matching provider.json patterns)
+          startupBuffer: sb.slice(-4e3),
+          startupBufferLength: sb.length,
+          promptDiagnostics,
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
           settledBuffer: this.settledBuffer.slice(-500),
           responseBuffer: this.responseBuffer.slice(-500),
@@ -7041,6 +7083,7 @@ function getAvailableIdeIds() {
 // src/commands/router.ts
 init_config();
 init_workspaces();
+init_config();
 init_logger();
 
 // src/logging/command-log.ts
@@ -7307,6 +7350,18 @@ var DaemonCommandRouter = class {
         };
         LOG.info("LaunchIDE", `target=${ideKey || "auto"}`);
         const result = await launchWithCdp(launchArgs);
+        if (result.success && (result.ideId || ideKey)) {
+          try {
+            addCliHistory({
+              category: "ide",
+              cliType: result.ideId || ideKey,
+              dir: resolvedWorkspace || "",
+              workspace: resolvedWorkspace || "",
+              newWindow: args?.newWindow === true
+            });
+          } catch {
+          }
+        }
         if (result.success && result.port && result.ideId && !this.deps.cdpManagers.has(result.ideId)) {
           const logFn = this.deps.getCdpLogFn ? this.deps.getCdpLogFn(result.ideId) : LOG.forComponent(`CDP:${result.ideId}`).asLogFn();
           const provider = this.deps.providerLoader.getMeta(result.ideId);
@@ -8924,7 +8979,7 @@ ${installInfo}`
         }
       }
       try {
-        addCliHistory({ cliType: normalizedType, dir: resolvedDir, cliArgs });
+        addCliHistory({ category: "acp", cliType: normalizedType, dir: resolvedDir, workspace: resolvedDir, cliArgs, model: initialModel });
       } catch (e) {
         LOG.warn("CLI", `ACP history save failed: ${e?.message}`);
       }
@@ -9013,7 +9068,7 @@ ${installInfo}`
       console.log(import_chalk.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
     }
     try {
-      addCliHistory({ cliType, dir: resolvedDir, cliArgs });
+      addCliHistory({ category: "cli", cliType, dir: resolvedDir, workspace: resolvedDir, cliArgs, model: initialModel });
     } catch (e) {
       LOG.warn("CLI", `CLI history save failed: ${e?.message}`);
     }