@adhdev/daemon-core 0.6.50 → 0.6.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.6.50",
+  "version": "0.6.52",
   "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/providers/_builtin/registry.json

@@ -1,5 +1,5 @@
 {
-  "version": "2026.03.27",
+  "version": "2026.03.28",
   "providers": {
     "agentpool-acp": {
       "providerVersion": "0.0.0",

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/daemon/dev-server.ts

@@ -730,39 +730,7 @@ export class DevServer {
 
   /** Find the provider directory on disk */
   private findProviderDir(type: string): string | null {
-    const provider = this.providerLoader.getMeta(type);
-    if (!provider) return null;
-    const cat = provider.category;
-    const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
-    const userDir = path.join(os.homedir(), '.adhdev', 'providers');
-
-    // Direct match first
-    const directCandidates = [
-      path.join(userDir, type),
-      path.join(builtinDir, cat, type),
-      path.join(builtinDir, type),
-    ];
-    for (const d of directCandidates) {
-      if (fs.existsSync(path.join(d, 'provider.json'))) return d;
-    }
-
-    // Scan category dir for matching type field
-    const catDir = path.join(builtinDir, cat);
-    if (fs.existsSync(catDir)) {
-      try {
-        for (const entry of fs.readdirSync(catDir, { withFileTypes: true })) {
-          if (!entry.isDirectory()) continue;
-          const jsonPath = path.join(catDir, entry.name, 'provider.json');
-          if (fs.existsSync(jsonPath)) {
-            try {
-              const data = JSON.parse(fs.readFileSync(jsonPath, 'utf-8'));
-              if (data.type === type) return path.join(catDir, entry.name);
-            } catch { /* skip */ }
-          }
-        }
-      } catch { /* skip */ }
-    }
-    return null;
+    return this.providerLoader.findProviderDir(type);
   }
 
   /** GET /api/providers/:type/files — list all files in provider directory */
@@ -1140,10 +1108,9 @@ export class DevServer {
 
     let targetDir: string;
     if (location === 'user') {
-      targetDir = path.join(os.homedir(), '.adhdev', 'providers', type);
+      targetDir = this.providerLoader.getUserProviderDir(category, type);
     } else {
-      const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
-      targetDir = path.join(builtinDir, category, type);
+      targetDir = this.providerLoader.getBuiltinProviderDir(category, type);
     }
 
     const jsonPath = path.join(targetDir, 'provider.json');
@@ -1928,7 +1895,7 @@ export class DevServer {
       this.sendAutoImplSSE({ event: 'progress', data: { function: '_init', status: 'loading_reference', message: `레퍼런스 스크립트 로드 중 (${reference})...` } });
 
       let referenceScripts: Record<string, string> = {};
-      const builtinDir = (this.providerLoader as any).builtinDirs?.[0] || path.resolve(__dirname, '../providers/_builtin');
+      const builtinDir = this.providerLoader.getPrimaryBuiltinDir();
       const refDir = path.join(builtinDir, 'ide', reference);
       if (fs.existsSync(refDir)) {
         // Find latest versioned scripts dir

package/src/providers/provider-loader.ts

@@ -77,6 +77,87 @@ export class ProviderLoader {
 
  // ─── Public API ────────────────────────────────
 
+ /**
+ * Ordered builtin roots used for local fallback/reference data.
+ */
+  getBuiltinDirs(): string[] {
+    return [...this.builtinDirs];
+  }
+
+ /**
+ * Primary builtin root used for local scaffolding/reference flows.
+ */
+  getPrimaryBuiltinDir(): string {
+    return this.builtinDirs[0];
+  }
+
+ /**
+ * User override root (~/.adhdev/providers by default).
+ */
+  getUserDir(): string {
+    return this.userDir;
+  }
+
+ /**
+ * Auto-updated upstream root (~/.adhdev/providers/.upstream by default).
+ */
+  getUpstreamDir(): string {
+    return this.upstreamDir;
+  }
+
+ /**
+ * Provider search order for on-disk lookups.
+ * Highest-priority editable overrides come first.
+ */
+  getProviderRoots(): string[] {
+    return [this.userDir, this.upstreamDir, ...this.builtinDirs];
+  }
+
+ /**
+ * Canonical provider directory shape for a given root.
+ */
+  getProviderDir(root: string, category: ProviderCategory, type: string): string {
+    return path.join(root, category, type);
+  }
+
+ /**
+ * Canonical user override directory for a provider.
+ */
+  getUserProviderDir(category: ProviderCategory, type: string): string {
+    return this.getProviderDir(this.userDir, category, type);
+  }
+
+ /**
+ * Canonical upstream directory for a provider.
+ */
+  getUpstreamProviderDir(category: ProviderCategory, type: string): string {
+    return this.getProviderDir(this.upstreamDir, category, type);
+  }
+
+ /**
+ * Canonical builtin directory for a provider.
+ */
+  getBuiltinProviderDir(category: ProviderCategory, type: string): string {
+    return this.getProviderDir(this.getPrimaryBuiltinDir(), category, type);
+  }
+
+ /**
+ * Find the on-disk directory for a provider by type.
+ * Search order: user override → upstream → builtin fallback.
+ */
+  findProviderDir(type: string): string | null {
+    return this.findProviderDirInternal(type);
+  }
+
+ /**
+ * Resolve a file within a provider directory.
+ */
+  resolveProviderFile(type: string, ...segments: string[]): string | null {
+    const dir = this.findProviderDirInternal(type);
+    if (!dir) return null;
+    return path.join(dir, ...segments);
+  }
+
  /**
  * Load all providers (3-tier priority)
  * 1. .upstream/ (GitHub auto-download — primary source)
@@ -455,7 +536,7 @@ export class ProviderLoader {
   * Tries scripts.js first, then individual .js files.
   */
   private loadScriptsFromDir(type: string, scriptDir: string): Record<string, any> | null {
-    const providerDir = this.findProviderDir(type);
+    const providerDir = this.findProviderDirInternal(type);
     if (!providerDir) {
       this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
       return null;
@@ -857,18 +938,17 @@ export class ProviderLoader {
 
   /**
    * Find the on-disk directory for a provider by type.
-   * Checks builtinDir, upstreamDir, userDir in order.
+   * Preferred shape: root/category/type. Legacy flat root/type is kept temporarily for compatibility.
    */
-  private findProviderDir(type: string): string | null {
+  private findProviderDirInternal(type: string): string | null {
     const provider = this.providers.get(type);
     if (!provider) return null;
     const cat = provider.category;
 
-    const searchRoots = [this.userDir, this.upstreamDir, ...this.builtinDirs];
+    const searchRoots = this.getProviderRoots();
     for (const root of searchRoots) {
       if (!fs.existsSync(root)) continue;
-      // Direct: root/type or root/cat/type
-      for (const candidate of [path.join(root, type), path.join(root, cat, type)]) {
+      for (const candidate of [this.getProviderDir(root, cat, type), path.join(root, type)]) {
         if (fs.existsSync(path.join(candidate, 'provider.json'))) return candidate;
       }
       // Scan category dir for type match