@adhdev/daemon-core 0.6.49 → 0.6.51

package/package.json

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

package/providers/_builtin/cli/claude-cli/provider.json

@@ -13,8 +13,8 @@
       "type": "select",
       "default": "terminal",
       "public": true,
-      "label": "표시 모드",
-      "description": "terminal: PTY 터미널 뷰, chat: 파싱된 대화 뷰",
+      "label": "Display Mode",
+      "description": "terminal: Native PTY view, chat: Parsed message view",
       "options": [
         "terminal",
         "chat"
@@ -24,15 +24,15 @@
       "type": "boolean",
       "default": true,
       "public": true,
-      "label": "알림",
-      "description": "상태 변경 시 알림을 표시합니다"
+      "label": "Notifications",
+      "description": "Display notifications on state changes"
     },
     "autoApprove": {
       "type": "boolean",
       "default": false,
       "public": true,
-      "label": "자동 승인",
-      "description": "도구 실행 승인을 자동으로 허용합니다"
+      "label": "Auto Approve",
+      "description": "Automatically approve tool execution without prompt"
     },
     "approvalAlert": {
       "type": "boolean",

package/providers/_builtin/cli/codex-cli/provider.json

@@ -12,7 +12,8 @@
       "type": "select",
       "default": "terminal",
       "public": true,
-      "label": "표시 모드",
+      "label": "Display Mode",
+      "description": "terminal: Native PTY view, chat: Parsed message view",
       "options": [
         "terminal",
         "chat"
@@ -22,7 +23,8 @@
       "type": "boolean",
       "default": true,
       "public": true,
-      "label": "알림"
+      "label": "Notifications",
+      "description": "Display notifications on state changes"
     },
     "autoApprove": {
       "type": "boolean",

package/providers/_builtin/cli/gemini-cli/provider.json

@@ -12,7 +12,8 @@
       "type": "select",
       "default": "terminal",
       "public": true,
-      "label": "표시 모드",
+      "label": "Display Mode",
+      "description": "terminal: Native PTY view, chat: Parsed message view",
       "options": [
         "terminal",
         "chat"
@@ -22,7 +23,8 @@
       "type": "boolean",
       "default": true,
       "public": true,
-      "label": "알림"
+      "label": "Notifications",
+      "description": "Display notifications on state changes"
     },
     "autoApprove": {
       "type": "boolean",

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

@@ -10,7 +10,7 @@
  * 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
  */
@@ -253,6 +253,9 @@ export class ProviderCliAdapter implements CliAdapter {
     private idleTimeout: NodeJS.Timeout | null = null;
     private ready = false;
     private startupBuffer = '';
+    /** After spawn: briefly skip generating/settle so splash/redraw does not flip status; not used to gate sendMessage */
+    private startupParseGate = false;
+    private spawnAt = 0;
 
  // PTY I/O
     private onPtyDataCallback: ((data: string) => void) | null = null;
@@ -421,10 +424,16 @@ export class ProviderCliAdapter implements CliAdapter {
             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?.();
     }
 
@@ -449,12 +458,11 @@ export class ProviderCliAdapter implements CliAdapter {
  // Rolling buffer (recent 1000 chars)
         this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1000);
 
- // ─── Phase 1: Startup — ready status wait
-        if (!this.ready) {
+ // ─── Startup window: first-run dialogs + avoid false generating during splash (sendMessage is not gated on prompt text)
+        if (this.startupParseGate) {
             this.startupBuffer += cleanData;
             LOG.info('CLI', `[${this.cliType}] startup chunk (${cleanData.length} chars): ${cleanData.slice(0, 200).replace(/\n/g, '\\n')}`);
 
- // Startup dialog auto-proceed (Enter)
             const dialogPatterns = [
                 /Do you want to connect/i,
                 /Do you trust the files/i,
@@ -468,14 +476,19 @@ export class ProviderCliAdapter implements CliAdapter {
                 return;
             }
 
- // Prompt → ready
-            if (patterns.prompt.some(p => p.test(this.startupBuffer))) {
-                this.ready = true;
-                this.setStatus('idle', 'prompt_matched');
-                LOG.info('CLI', `[${this.cliType}] ✓ Ready`);
-                this.onStatusChange?.();
+            const elapsed = Date.now() - this.spawnAt;
+            const bufCap = this.startupBuffer.length > 12000;
+            const promptMatched = patterns.prompt.some(p => p.test(this.startupBuffer));
+            if (promptMatched || elapsed > 8000 || bufCap) {
+                this.startupParseGate = false;
+                if (promptMatched) {
+                    LOG.info('CLI', `[${this.cliType}] ✓ 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) {
@@ -695,6 +708,8 @@ export class ProviderCliAdapter implements CliAdapter {
                 this.ptyProcess = null;
                 this.setStatus('stopped', 'stop_cmd');
                 this.ready = false;
+                this.startupParseGate = false;
+                this.spawnAt = 0;
                 this.onStatusChange?.();
             }, this.timeouts.shutdownGrace);
         }
@@ -747,16 +762,29 @@ export class ProviderCliAdapter implements CliAdapter {
  * Used by DevServer /api/cli/debug endpoint.
  */
     getDebugState(): Record<string, any> {
+        const sb = this.startupBuffer;
+        const testOnStartup = (p: RegExp): boolean => {
+            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(-4000),
+            startupBufferLength: sb.length,
+            promptDiagnostics,
             recentOutputBuffer: this.recentOutputBuffer.slice(-500),
             settledBuffer: this.settledBuffer.slice(-500),
             responseBuffer: this.responseBuffer.slice(-500),

package/src/commands/cli-manager.ts

@@ -165,7 +165,7 @@ export class DaemonCliManager {
                 }
             }
 
-            try { addCliHistory({ cliType: normalizedType, dir: resolvedDir, cliArgs }); } catch (e) { LOG.warn('CLI', `ACP history save failed: ${(e as Error)?.message}`); }
+            try { addCliHistory({ category: 'acp', cliType: normalizedType, dir: resolvedDir, workspace: resolvedDir, cliArgs, model: initialModel }); } catch (e) { LOG.warn('CLI', `ACP history save failed: ${(e as Error)?.message}`); }
             this.deps.onStatusChange();
             return;
         }
@@ -261,7 +261,7 @@ export class DaemonCliManager {
             console.log(chalk.green(`  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
         }
 
-        try { addCliHistory({ cliType, dir: resolvedDir, cliArgs }); } catch (e) { LOG.warn('CLI', `CLI history save failed: ${(e as Error)?.message}`); }
+        try { addCliHistory({ category: 'cli', cliType, dir: resolvedDir, workspace: resolvedDir, cliArgs, model: initialModel }); } catch (e) { LOG.warn('CLI', `CLI history save failed: ${(e as Error)?.message}`); }
 
         this.deps.onStatusChange();
     }

package/src/commands/router.ts

@@ -20,6 +20,7 @@ import { launchWithCdp, killIdeProcess, isIdeRunning } from '../launch.js';
 import { loadConfig, saveConfig, updateConfig } from '../config/config.js';
 import { resolveIdeLaunchWorkspace } from '../config/workspaces.js';
 import { appendWorkspaceActivity } from '../config/workspace-activity.js';
+import { addCliHistory } from '../config/config.js';
 import { detectIDEs } from '../detection/ide-detector.js';
 import { LOG } from '../logging/logger.js';
 import { logCommand } from '../logging/command-log.js';
@@ -207,6 +208,17 @@ export class DaemonCommandRouter {
                 };
                 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 { /* ignore history failure */ }
+                }
 
                 if (result.success && result.port && result.ideId && !this.deps.cdpManagers.has(result.ideId)) {
                     const logFn = this.deps.getCdpLogFn

package/src/config/config.ts

@@ -87,9 +87,13 @@ export interface ADHDevConfig {
 }
 
 export interface CliHistoryEntry {
+    category?: 'ide' | 'cli' | 'acp';
     cliType: string;
     dir: string;
     cliArgs?: string[];
+    workspace?: string;
+    newWindow?: boolean;
+    model?: string;
     timestamp: number;
     label?: string;
 }
@@ -255,24 +259,43 @@ export function generateConnectionToken(): string {
     return token;
 }
 /**
- * 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)
  */
 export function addCliHistory(entry: Omit<CliHistoryEntry, 'timestamp'>): void {
     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 || '';
     
- // Remove duplicate (same cliType + dir + args)
+ // Remove duplicate (same category + type + dir + args + workspace + 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
+        );
     });
     
  // Add to front
     filtered.unshift({
         ...entry,
+        category,
         timestamp: Date.now(),
-        label: entry.label || `${entry.cliType} · ${entry.dir.split('/').filter(Boolean).pop() || 'root'}${argsKey ? ` (${argsKey})` : ''}`,
+        label: entry.label || (() => {
+            const base = `${entry.cliType} · ${entry.dir.split('/').filter(Boolean).pop() || 'root'}`;
+            const suffix: string[] = [];
+            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(' · ')})` : base;
+        })(),
     });
     
  // Keep max 20