@adhdev/daemon-core 0.6.53 → 0.6.56

package/src/cli-adapters/terminal-screen.ts

@@ -0,0 +1,95 @@
+/**
+ * PTY screen snapshot backed by xterm's parser.
+ *
+ * Claude Code and similar CLIs use a real terminal UI. A handwritten ANSI
+ * parser quickly drifts from reality, so we reuse xterm's terminal model and
+ * expose only the current visible viewport as plain text for provider scripts.
+ */
+
+type XtermBufferLine = {
+    translateToString(trimRight?: boolean): string;
+};
+
+type XtermBuffer = {
+    length: number;
+    viewportY: number;
+    getLine(index: number): XtermBufferLine | undefined;
+};
+
+type XtermTerminal = {
+    buffer: { active: XtermBuffer };
+    write(data: string, callback?: () => void): void;
+    resize(cols: number, rows: number): void;
+    dispose(): void;
+};
+
+let TerminalCtor: (new (options: { cols: number; rows: number; scrollback: number }) => XtermTerminal) | null = null;
+
+function loadTerminalCtor(): new (options: { cols: number; rows: number; scrollback: number }) => XtermTerminal {
+    if (!TerminalCtor) {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const mod = require('@xterm/xterm');
+        TerminalCtor = mod.Terminal || mod.default?.Terminal || mod.default;
+        if (!TerminalCtor) {
+            throw new Error('@xterm/xterm Terminal export not found');
+        }
+    }
+    return TerminalCtor;
+}
+
+export class TerminalScreen {
+    private rows: number;
+    private cols: number;
+    private terminal: XtermTerminal;
+
+    constructor(rows = 40, cols = 120) {
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal = this.createTerminal();
+    }
+
+    reset(rows = this.rows, cols = this.cols): void {
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal.dispose();
+        this.terminal = this.createTerminal();
+    }
+
+    resize(rows: number, cols: number): void {
+        this.rows = Math.max(1, rows | 0);
+        this.cols = Math.max(1, cols | 0);
+        this.terminal.resize(this.cols, this.rows);
+    }
+
+    write(data: string): void {
+        if (!data) return;
+        this.terminal.write(data);
+    }
+
+    getText(): string {
+        const buffer = this.terminal.buffer.active;
+        const start = Math.max(0, buffer.viewportY || 0);
+        const end = Math.max(start, Math.min(buffer.length || 0, start + this.rows));
+        const lines: string[] = [];
+
+        for (let i = start; i < end; i++) {
+            const line = buffer.getLine(i);
+            lines.push(line ? line.translateToString(true) : '');
+        }
+
+        let first = 0;
+        let last = lines.length;
+        while (first < last && !lines[first]?.trim()) first++;
+        while (last > first && !lines[last - 1]?.trim()) last--;
+        return lines.slice(first, last).join('\n');
+    }
+
+    private createTerminal(): XtermTerminal {
+        const Terminal = loadTerminalCtor();
+        return new Terminal({
+            cols: this.cols,
+            rows: this.rows,
+            scrollback: 2000,
+        });
+    }
+}

package/src/commands/chat-commands.ts

@@ -7,6 +7,10 @@ import type { CommandResult, CommandHelpers } from './handler.js';
 import { readChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 
+function getTargetedCliAdapter(h: CommandHelpers, args: any, providerType?: string) {
+    return h.getCliAdapter(args?._targetInstance || h.currentIdeType || providerType);
+}
+
 export async function handleChatHistory(h: CommandHelpers, args: any): Promise<CommandResult> {
     const { agentType, offset, limit, instanceId } = args;
     try {
@@ -20,13 +24,13 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 }
 
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
 
     const _log = (msg: string) => LOG.debug('Command', `[read_chat] ${msg}`);
 
     // CLI / ACP category: read from adapter
     if (provider?.category === 'cli' || provider?.category === 'acp') {
-        const adapter = h.getCliAdapter(provider.type);
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
         if (adapter) {
             _log(`${provider.category} adapter: ${(adapter as any).cliType}`);
             const status = (adapter as any).getStatus?.();
@@ -140,7 +144,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
     const text = args?.text || args?.message;
     if (!text) return { success: false, error: 'text required' };
     const _log = (msg: string) => LOG.debug('Command', `[send_chat] ${msg}`);
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
 
     const _logSendSuccess = (method: string, targetAgent?: string) => {
         h.historyWriter.appendNewMessages(
@@ -154,7 +158,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
 
     // CLI / ACP category: transmit via adapter
     if (provider?.category === 'cli' || provider?.category === 'acp') {
-        const adapter = h.getCliAdapter(provider.type);
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
         if (adapter) {
             _log(`${provider.category} adapter: ${(adapter as any).cliType}`);
             try {
@@ -305,7 +309,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
 }
 
 export async function handleListChats(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
 
     // Extension: via AgentStreamManager
     if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
@@ -355,7 +359,17 @@ export async function handleListChats(h: CommandHelpers, args: any): Promise<Com
 }
 
 export async function handleNewChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
+
+    if (provider?.category === 'cli') {
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
+        if (!adapter) return { success: false, error: 'CLI adapter not running' };
+        if (typeof (adapter as any).clearHistory === 'function') {
+            (adapter as any).clearHistory();
+            return { success: true, cleared: true };
+        }
+        return { success: false, error: 'new_chat not supported by this CLI provider' };
+    }
 
     if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
         const ok = await h.agentStream.newAgentSession(h.getCdp()!, provider.type, h.currentIdeType);
@@ -386,7 +400,7 @@ export async function handleNewChat(h: CommandHelpers, args: any): Promise<Comma
 }
 
 export async function handleSwitchChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
     const ideType = h.currentIdeType;
     const sessionId = args?.sessionId || args?.id || args?.chatId;
     if (!sessionId) return { success: false, error: 'sessionId required' };
@@ -473,12 +487,12 @@ export async function handleSwitchChat(h: CommandHelpers, args: any): Promise<Co
 }
 
 export async function handleSetMode(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
     const mode = args?.mode || 'agent';
 
     // ACP provider
     if (provider?.category === 'acp') {
-        const adapter = h.getCliAdapter(provider.type);
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
         if (adapter) {
             const acpInstance = (adapter as any)._acpInstance;
             if (acpInstance && typeof acpInstance.onEvent === 'function') {
@@ -526,14 +540,14 @@ export async function handleSetMode(h: CommandHelpers, args: any): Promise<Comma
 }
 
 export async function handleChangeModel(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
     const model = args?.model;
 
     LOG.info('Command', `[change_model] model=${model} provider=${provider?.type} category=${provider?.category} ideType=${h.currentIdeType} providerType=${h.currentProviderType}`);
 
     // ACP provider
     if (provider?.category === 'acp') {
-        const adapter = h.getCliAdapter(provider.type);
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
         LOG.info('Command', `[change_model] ACP adapter found: ${!!adapter}, type=${(adapter as any)?.cliType}, hasAcpInstance=${!!(adapter as any)?._acpInstance}`);
         if (adapter) {
             const acpInstance = (adapter as any)._acpInstance;
@@ -587,11 +601,11 @@ export async function handleSetThoughtLevel(h: CommandHelpers, args: any): Promi
     const value = args?.value;
     if (!configId || !value) return { success: false, error: 'configId and value required' };
 
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
     if (!provider || provider.category !== 'acp') {
         return { success: false, error: 'set_thought_level only for ACP providers' };
     }
-    const adapter = h.getCliAdapter(provider.type);
+    const adapter = getTargetedCliAdapter(h, args, provider.type);
     const acpInstance = adapter?._acpInstance;
     if (!acpInstance) return { success: false, error: 'ACP instance not found' };
 
@@ -605,7 +619,7 @@ export async function handleSetThoughtLevel(h: CommandHelpers, args: any): Promi
 }
 
 export async function handleResolveAction(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider();
+    const provider = h.getProvider(args?.agentType);
     const action = args?.action || 'approve';
     const button = args?.button || args?.buttonText
         || (action === 'approve' ? 'Accept' : action === 'reject' ? 'Reject' : 'Accept');
@@ -614,8 +628,20 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
 
     // 0. CLI / ACP category: navigate approval dialog via PTY arrow keys + Enter
     if (provider?.category === 'cli') {
-        const adapter = h.getCliAdapter(provider.type);
+        const adapter = getTargetedCliAdapter(h, args, provider.type);
         if (!adapter) return { success: false, error: 'CLI adapter not running' };
+
+        // Handle data-driven resolve actions (like from the dashboard 'Fix' button)
+        if (args?.data && typeof (adapter as any).resolveAction === 'function') {
+            try {
+                await (adapter as any).resolveAction(args.data);
+                LOG.info('Command', `[resolveAction] CLI PTY → resolveAction triggered with data payload`);
+                return { success: true, method: 'cli-resolve-action' };
+            } catch (e: any) {
+                return { success: false, error: `CLI resolveAction failed: ${e.message}` };
+            }
+        }
+
         const status = (adapter as any).getStatus?.();
         if (status?.status !== 'waiting_approval') {
             return { success: false, error: 'Not in approval state' };

package/src/commands/cli-manager.ts

@@ -83,7 +83,8 @@ export class DaemonCliManager {
         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})`));
-            return new ProviderCliAdapter(provider as any, workingDir, cliArgs);
+            const resolvedProvider = this.providerLoader.resolve(normalizedType) || provider;
+            return new ProviderCliAdapter(resolvedProvider as any, workingDir, cliArgs);
         }
 
         throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);
@@ -182,7 +183,8 @@ export class DaemonCliManager {
  // If InstanceManager exists, manage as CliProviderInstance unified
         const instanceManager = this.deps.getInstanceManager();
         if (provider && instanceManager) {
-            const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key);
+            const resolvedProvider = this.providerLoader.resolve(cliType, { version: cliInfo.version }) || provider;
+            const cliInstance = new CliProviderInstance(resolvedProvider, resolvedDir, cliArgs, key);
             try {
                 await instanceManager.addInstance(key, cliInstance, {
                     serverConn: this.deps.getServerConn(),