@adhdev/daemon-core 0.7.15 → 0.7.17

package/package.json

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

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

@@ -702,40 +702,23 @@ export class ProviderCliAdapter implements CliAdapter {
         this.accumulatedBuffer = (this.accumulatedBuffer + cleanData).slice(-ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
         this.accumulatedRawBuffer = (this.accumulatedRawBuffer + rawData).slice(-ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
 
-        // ─── Startup window: auto-proceed first-run dialogs
+        // ─── Startup: detect CLI readiness (no auto-proceed)
         if (this.startupParseGate) {
             this.startupBuffer += cleanData;
-
-            const dialogPatterns = [
-                /Do you want to connect/i,
-                /Do you trust the files/i,
-                /Quick safety check/i,
-                /Is this a project/i,
-                /Enter to confirm/i,
-                /be able to read, edit, and execute/i,
-                /Security guide/i,
-            ];
-            if (dialogPatterns.some(p => p.test(this.startupBuffer))) {
-                setTimeout(() => this.ptyProcess?.write('\r'), this.timeouts.dialogAccept);
-                this.startupBuffer = '';
-                return;
-            }
-
             const elapsed = Date.now() - this.spawnAt;
-            const bufCap = this.startupBuffer.length > 12000;
-
-            // Use detectStatus script to check if CLI is ready (shows a prompt)
             const scriptStatus = this.runDetectStatus(this.startupBuffer);
-            const isReady = scriptStatus === 'idle' || elapsed > 8000 || bufCap;
+            const isReady = scriptStatus === 'idle'
+                || scriptStatus === 'waiting_approval'
+                || elapsed > 8000
+                || this.startupBuffer.length > 12000;
 
             if (isReady) {
                 this.startupParseGate = false;
                 this.ready = true;
-                LOG.info('CLI', `[${this.cliType}] Startup gate end (${elapsed}ms, scriptStatus=${scriptStatus})`);
+                LOG.info('CLI', `[${this.cliType}] Startup ready (${elapsed}ms, scriptStatus=${scriptStatus})`);
                 this.onStatusChange?.();
-            } else {
-                return;
             }
+            // No early return — status detection runs from the start
         }
 
         // ─── Script-based status detection
@@ -957,56 +940,8 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     private commitCurrentTranscript(): void {
-        const baseMessages = [...this.committedMessages];
-        const parsed = this.parseCurrentTranscript(baseMessages, '', this.currentTurnScope);
-        if (parsed && Array.isArray(parsed.messages) && parsed.messages.length > 0) {
-            const parsedMessages = parsed.messages
-                .filter((m: any) => m && (m.role === 'user' || m.role === 'assistant'))
-                .map((m: any) => ({
-                    role: m.role,
-                    content: typeof m.content === 'string' ? m.content : String(m.content || ''),
-                    timestamp: m.timestamp,
-                }));
-            const latestAssistant = [...parsedMessages]
-                .reverse()
-                .find((m: CliChatMessage) => m.role === 'assistant' && m.content.trim());
-            if (latestAssistant) {
-                LOG.info('CLI', `[${this.cliType}] commitCurrentTranscript parsed assistant len=${latestAssistant.content.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || '').slice(0, 120)}`);
-                const nextMessages = [...baseMessages];
-                const last = nextMessages[nextMessages.length - 1];
-                if (last?.role === 'assistant') {
-                    last.content = latestAssistant.content;
-                    last.timestamp = latestAssistant.timestamp || last.timestamp;
-                } else if (last?.role === 'user') {
-                    nextMessages.push({
-                        role: 'assistant',
-                        content: latestAssistant.content,
-                        timestamp: latestAssistant.timestamp || Date.now(),
-                    });
-                } else {
-                    nextMessages.push({
-                        role: 'assistant',
-                        content: latestAssistant.content,
-                        timestamp: latestAssistant.timestamp || Date.now(),
-                    });
-                }
-                this.committedMessages = nextMessages;
-                this.syncMessageViews();
-                return;
-            }
-        }
-
-        const fallback = String(this.responseBuffer || '').trim();
-        LOG.info('CLI', `[${this.cliType}] commitCurrentTranscript fallback len=${fallback.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || '').slice(0, 120)}`);
-        if (!fallback) return;
-        const last = baseMessages[baseMessages.length - 1];
-        if (last?.role === 'assistant') {
-            last.content = fallback;
-        } else {
-            baseMessages.push({ role: 'assistant', content: fallback, timestamp: Date.now() });
-        }
-        this.committedMessages = baseMessages;
-        this.syncMessageViews();
+        // No-op: terminal output is the canonical display for CLI providers.
+        // Assistant text extraction from PTY output has been removed.
     }
 
  // ─── Script Execution ──────────────────────────

package/src/commands/cli-manager.ts

@@ -62,6 +62,15 @@ export interface HostedCliRuntimeDescriptor {
     cliArgs?: string[];
 }
 
+const chalkApi: any = (chalk as any)?.yellow
+    ? (chalk as any)
+    : (chalk as any)?.default || null;
+
+function colorize(color: 'red' | 'green' | 'yellow' | 'cyan', text: string): string {
+    const fn = chalkApi?.[color];
+    return typeof fn === 'function' ? fn(text) : text;
+}
+
 // ─── DaemonCliManager ────────────────────────────
 
 export class DaemonCliManager {
@@ -87,16 +96,16 @@ export class DaemonCliManager {
             const provider = this.providerLoader.getByAlias(cliType);
             const actKind = provider?.category === 'acp' ? 'acp' : 'cli';
             let next = loadConfig();
-            console.log(chalk.cyan(`  📂 Saving recent workspace: ${dir}`));
+            console.log(colorize('cyan', `  📂 Saving recent workspace: ${dir}`));
             const recent = next.recentCliWorkspaces || [];
             if (!recent.includes(dir)) {
                 next = { ...next, recentCliWorkspaces: [dir, ...recent].slice(0, 10) };
             }
             next = appendWorkspaceActivity(next, dir, { kind: actKind, agentType: normalizedType });
             saveConfig(next);
-            console.log(chalk.green(`  ✓ Recent workspace saved: ${dir}`));
+            console.log(colorize('green', `  ✓ Recent workspace saved: ${dir}`));
         } catch (e) {
-            console.error(chalk.red(`  ✗ Failed to save recent workspace: ${e}`));
+            console.error(colorize('red', `  ✗ Failed to save recent workspace: ${e}`));
         }
     }
 
@@ -129,7 +138,7 @@ export class DaemonCliManager {
  // Load CLI config from provider.js
         const provider = this.providerLoader.getMeta(normalizedType);
         if (provider && provider.category === 'cli' && provider.patterns && provider.spawn) {
-            console.log(chalk.cyan(`  📦 Using provider: ${provider.name} (${provider.type})`));
+            console.log(colorize('cyan', `  📦 Using provider: ${provider.name} (${provider.type})`));
             const resolvedProvider = this.providerLoader.resolve(normalizedType) || provider;
             const transportFactory = this.getTransportFactory(runtimeId, normalizedType, workingDir, cliArgs, attachExisting);
             return new ProviderCliAdapter(resolvedProvider as any, workingDir, cliArgs, transportFactory);
@@ -243,7 +252,7 @@ export class DaemonCliManager {
                 }
             }
 
-            console.log(chalk.cyan(`  🔌 Starting ACP agent: ${provider.name} (${provider.type}) in ${resolvedDir}`));
+            console.log(colorize('cyan', `  🔌 Starting ACP agent: ${provider.name} (${provider.type}) in ${resolvedDir}`));
 
             const acpInstance = new AcpProviderInstance(provider, resolvedDir, cliArgs);
             await instanceManager.addInstance(key, acpInstance, {
@@ -280,13 +289,13 @@ export class DaemonCliManager {
                 setOnPtyData: () => {},
             } as any);
 
-            console.log(chalk.green(`  ✓ ACP agent started: ${provider.name} in ${resolvedDir}`));
+            console.log(colorize('green', `  ✓ ACP agent started: ${provider.name} in ${resolvedDir}`));
 
  // If initialModel exists, change model after session start
             if (initialModel) {
                 try {
                     await acpInstance.setConfigOption('model', initialModel);
-                    console.log(chalk.green(`  🤖 Initial model set: ${initialModel}`));
+                    console.log(colorize('green', `  🤖 Initial model set: ${initialModel}`));
                 } catch (e: any) {
                     LOG.warn('CLI', `[ACP] Initial model set failed: ${e?.message}`);
                 }
@@ -301,9 +310,9 @@ export class DaemonCliManager {
         const cliInfo = await detectCLI(cliType, this.providerLoader);
         if (!cliInfo) throw new Error(`${cliType} not found`);
 
-        console.log(chalk.yellow(`  ⚡ Starting CLI ${cliType} in ${resolvedDir}...`));
+        console.log(colorize('yellow', `  ⚡ Starting CLI ${cliType} in ${resolvedDir}...`));
         if (provider) {
-            console.log(chalk.cyan(`  📦 Using provider: ${provider.name} (${provider.type})`));
+            console.log(colorize('cyan', `  📦 Using provider: ${provider.name} (${provider.type})`));
         }
 
  // If InstanceManager exists, manage as CliProviderInstance unified
@@ -320,7 +329,7 @@ export class DaemonCliManager {
                 {},
                 false,
             );
-            console.log(chalk.green(`  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
+            console.log(colorize('green', `  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
         } else {
  // Fallback: InstanceManager without directly adapter manage
             const adapter = this.createAdapter(cliType, resolvedDir, cliArgs, key, false);
@@ -357,7 +366,7 @@ export class DaemonCliManager {
             }
 
             this.adapters.set(key, adapter);
-            console.log(chalk.green(`  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
+            console.log(colorize('green', `  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
         }
 
         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}`); }
@@ -541,7 +550,7 @@ export class DaemonCliManager {
                 if (found) {
                     await this.stopSessionWithMode(found.key, mode);
                 } else {
-                    console.log(chalk.yellow(`  ⚠ No adapter found for ${cliType}`));
+                    console.log(colorize('yellow', `  ⚠ No adapter found for ${cliType}`));
                 }
                 return { success: true, cliType, dir, stopped: true, mode };
             }