@adhdev/daemon-core 0.6.57 → 0.6.58

package/providers/_builtin/ide/vscode/scripts/1.0/set_model.js

@@ -0,0 +1 @@
+module.exports = async function(args, context) { return { error: "Not implemented" }; };

package/providers/_builtin/ide/vscode/scripts/1.0/switch_session.js

@@ -0,0 +1 @@
+module.exports = async function(args, context) { return { error: "Not implemented" }; };

package/providers/_builtin/registry.json

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

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

@@ -57,6 +57,7 @@ export interface CliSessionStatus {
     messages: CliChatMessage[];
     workingDir: string;
     activeModal: { message: string; buttons: string[] } | null;
+    terminalHistory?: string;
 }
 
 /**
@@ -82,10 +83,19 @@ export interface CliScriptInput {
     rawBuffer: string;       // Raw PTY output (with ANSI)
     recentBuffer: string;    // Recent 1000 chars (ANSI-stripped)
     screenText: string;      // Current visible screen snapshot
+    terminalHistory?: string; // Rolling append-only terminal transcript
     messages: CliChatMessage[];  // Previously parsed messages
     partialResponse: string; // Current partial response being generated
 }
 
+interface TurnParseScope {
+    prompt: string;
+    startedAt: number;
+    bufferStart: number;
+    rawBufferStart: number;
+    terminalHistoryStart: number;
+}
+
 export interface CliProviderModule {
     type: string;
     name: string;
@@ -93,6 +103,7 @@ export interface CliProviderModule {
     binary: string;
     sendDelayMs?: number;
     sendKey?: string;
+    submitStrategy?: 'wait_for_echo' | 'immediate';
     spawn: {
         command: string;
         args: string[];
@@ -243,6 +254,44 @@ function promptLikelyVisible(screenText: string, promptSnippet: string): boolean
     return matched >= required;
 }
 
+function splitHistoryLines(text: string): string[] {
+    return String(text || '')
+        .split('\n')
+        .map(line => line.replace(/\s+$/, ''));
+}
+
+function normalizeHistoryLine(line: string): string {
+    return String(line || '').replace(/\s+/g, ' ').trim();
+}
+
+function mergeTerminalHistory(existing: string, snapshot: string): string {
+    const next = String(snapshot || '').trim();
+    if (!next) return existing;
+    const prev = String(existing || '').trim();
+    if (!prev) return next;
+    if (prev === next || prev.endsWith(next)) return prev;
+
+    const prevLines = splitHistoryLines(prev);
+    const nextLines = splitHistoryLines(next);
+    const prevNorm = prevLines.map(normalizeHistoryLine);
+    const nextNorm = nextLines.map(normalizeHistoryLine);
+
+    const maxOverlap = Math.min(prevLines.length, nextLines.length);
+    for (let overlap = maxOverlap; overlap >= 1; overlap -= 1) {
+        const prevTail = prevNorm.slice(prevNorm.length - overlap);
+        const nextHead = nextNorm.slice(0, overlap);
+        if (prevTail.every((line, index) => line === nextHead[index])) {
+            return [...prevLines, ...nextLines.slice(overlap)].join('\n').trim();
+        }
+    }
+
+    const compactPrev = prevNorm.join('\n');
+    const compactNext = nextNorm.join('\n');
+    if (compactPrev.includes(compactNext)) return prev;
+
+    return `${prev}\n${next}`.trim();
+}
+
 /**
  * Normalize provider.json for auto-implement approval detection.
  * Kept for backward compat with dev-server auto-impl pipeline only.
@@ -288,6 +337,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private provider: CliProviderModule;
     private ptyProcess: any = null;
     private messages: CliChatMessage[] = [];
+    private committedMessages: CliChatMessage[] = [];
     private structuredMessages: CliChatMessage[] = [];
     private currentStatus: CliSessionStatus['status'] = 'starting';
     private onStatusChange: (() => void) | null = null;
@@ -343,8 +393,47 @@ export class ProviderCliAdapter implements CliAdapter {
     private accumulatedRawBuffer: string = '';
     /** Current visible terminal screen snapshot */
     private terminalScreen = new TerminalScreen(40, 120);
+    /** Rolling append-only terminal transcript built from screen snapshots */
+    private terminalHistory: string = '';
     /** Max accumulated buffer size (last 50KB) */
     private static readonly MAX_ACCUMULATED_BUFFER = 50000;
+    private currentTurnScope: TurnParseScope | null = null;
+
+    private syncMessageViews(): void {
+        this.messages = [...this.committedMessages];
+        this.structuredMessages = [...this.committedMessages];
+    }
+
+    private sliceFromOffset(text: string, start: number): string {
+        if (!text) return '';
+        if (!Number.isFinite(start) || start <= 0) return text;
+        if (start >= text.length) return '';
+        return text.slice(start);
+    }
+
+    private buildParseInput(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null): CliScriptInput {
+        const buffer = scope
+            ? (this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart)
+                || this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart)
+                || this.accumulatedBuffer)
+            : this.accumulatedBuffer;
+        const rawBuffer = scope
+            ? (this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer)
+            : this.accumulatedRawBuffer;
+        const terminalHistory = scope
+            ? (this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart) || this.terminalHistory)
+            : this.terminalHistory;
+
+        return {
+            buffer,
+            rawBuffer,
+            recentBuffer: buffer.slice(-1000) || this.recentOutputBuffer,
+            screenText: this.terminalScreen.getText(),
+            terminalHistory,
+            messages: [...baseMessages],
+            partialResponse,
+        };
+    }
 
     private setStatus(status: CliSessionStatus['status'], trigger?: string): void {
         const prev = this.currentStatus;
@@ -362,6 +451,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private readonly approvalKeys: Record<number, string>;
     private readonly sendDelayMs: number;
     private readonly sendKey: string;
+    private readonly submitStrategy: 'wait_for_echo' | 'immediate';
 
     constructor(provider: CliProviderModule, workingDir: string, private extraArgs: string[] = []) {
         this.provider = provider;
@@ -389,6 +479,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.sendKey = typeof (provider as any).sendKey === 'string' && (provider as any).sendKey.length > 0
             ? (provider as any).sendKey
             : '\r';
+        this.submitStrategy = (provider as any).submitStrategy === 'immediate' ? 'immediate' : 'wait_for_echo';
 
         // Scripts are required — loaded by ProviderLoader via compatibility array
         this.cliScripts = (provider as any).scripts || {};
@@ -514,6 +605,8 @@ export class ProviderCliAdapter implements CliAdapter {
         this.startupParseGate = true;
         this.startupBuffer = '';
         this.terminalScreen.reset(40, 120);
+        this.terminalHistory = '';
+        this.currentTurnScope = null;
         this.ready = false;
         this.setStatus('idle', 'pty_ready');
         this.onStatusChange?.();
@@ -530,6 +623,7 @@ export class ProviderCliAdapter implements CliAdapter {
         }
 
         this.terminalScreen.write(rawData);
+        this.terminalHistory = mergeTerminalHistory(this.terminalHistory, this.terminalScreen.getText());
         const cleanData = stripAnsi(rawData);
 
         if (this.isWaitingForResponse && cleanData) {
@@ -697,6 +791,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private finishResponse(): void {
         if (this.submitPendingUntil > Date.now()) return;
         if (this.responseSettleIgnoreUntil > Date.now()) return;
+        this.commitCurrentTranscript();
         if (this.responseTimeout) { clearTimeout(this.responseTimeout); this.responseTimeout = null; }
         if (this.idleTimeout) { clearTimeout(this.idleTimeout); this.idleTimeout = null; }
         if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
@@ -707,11 +802,65 @@ export class ProviderCliAdapter implements CliAdapter {
         this.responseSettleIgnoreUntil = 0;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = '';
+        this.currentTurnScope = null;
         this.activeModal = null;
         this.setStatus('idle', 'response_finished');
         this.onStatusChange?.();
     }
 
+    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();
+    }
+
  // ─── Script Execution ──────────────────────────
 
     private runDetectStatus(text: string): string | null {
@@ -745,26 +894,12 @@ export class ProviderCliAdapter implements CliAdapter {
  // ─── Public API (CliAdapter) ───────────────────
 
     getStatus(): CliSessionStatus {
-        // Use parseOutput script for full result when available
-        const scriptResult = this.getScriptParsedStatus();
-        if (scriptResult) {
-            return {
-                status: this.currentStatus,
-                messages: (scriptResult.messages || []).map((m: any) => ({
-                    role: m.role,
-                    content: m.content,
-                    timestamp: m.timestamp,
-                })),
-                workingDir: this.workingDir,
-                activeModal: this.activeModal,
-            };
-        }
-
         return {
             status: this.currentStatus,
-            messages: [...this.messages],
+            messages: [...this.committedMessages],
             workingDir: this.workingDir,
             activeModal: this.activeModal,
+            terminalHistory: this.terminalHistory,
         };
     }
 
@@ -773,31 +908,33 @@ export class ProviderCliAdapter implements CliAdapter {
      * Called by command handler / dashboard for rich content rendering.
      */
     getScriptParsedStatus(): any {
+        const messages = [...this.committedMessages];
+        return {
+            id: 'cli_session',
+            status: this.currentStatus,
+            title: this.cliName,
+            terminalHistory: this.terminalHistory,
+            messages: messages.slice(-50).map((message, index) => ({
+                id: `msg_${index}`,
+                role: message.role,
+                content: message.content,
+                timestamp: message.timestamp,
+                index,
+                kind: 'standard',
+            })),
+            activeModal: this.activeModal,
+        };
+    }
+
+    private parseCurrentTranscript(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null): any {
         if (!this.cliScripts?.parseOutput) return null;
         try {
-            const input: CliScriptInput = {
-                buffer: this.accumulatedBuffer,
-                rawBuffer: this.accumulatedRawBuffer,
-                recentBuffer: this.recentOutputBuffer,
-                screenText: this.terminalScreen.getText(),
-                messages: [...(this.structuredMessages.length > 0 ? this.structuredMessages : this.messages)],
-                partialResponse: this.responseBuffer,
-            };
-            const result = this.cliScripts.parseOutput(input);
-            if (result && typeof result === 'object') {
-                if (Array.isArray((result as any).messages)) {
-                    this.structuredMessages = (result as any).messages.map((m: any) => ({
-                        role: m.role,
-                        content: m.content,
-                        timestamp: m.timestamp,
-                    }));
-                }
-                return result;
-            }
+            const input = this.buildParseInput(baseMessages, partialResponse, scope);
+            return this.cliScripts.parseOutput(input);
         } catch (e: any) {
             LOG.warn('CLI', `[${this.cliType}] parseOutput error: ${e.message}`);
+            return null;
         }
-        return null;
     }
 
     /** Whether this adapter has CLI scripts loaded */
@@ -838,10 +975,18 @@ export class ProviderCliAdapter implements CliAdapter {
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
         if (this.isWaitingForResponse) return;
 
-        this.messages.push({ role: 'user', content: text, timestamp: Date.now() });
-        this.structuredMessages.push({ role: 'user', content: text, timestamp: Date.now() });
+        this.committedMessages.push({ role: 'user', content: text, timestamp: Date.now() });
+        this.syncMessageViews();
         this.isWaitingForResponse = true;
         this.responseBuffer = '';
+        this.currentTurnScope = {
+            prompt: text,
+            startedAt: Date.now(),
+            bufferStart: this.accumulatedBuffer.length,
+            rawBufferStart: this.accumulatedRawBuffer.length,
+            terminalHistoryStart: this.terminalHistory.length,
+        };
+        LOG.info('CLI', `[${this.cliType}] sendMessage turn scope buffer=${this.currentTurnScope.bufferStart} raw=${this.currentTurnScope.rawBufferStart} terminal=${this.currentTurnScope.terminalHistoryStart} prompt=${JSON.stringify(text).slice(0, 120)}`);
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = extractPromptRetrySnippet(text);
         const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet);
@@ -861,10 +1006,12 @@ export class ProviderCliAdapter implements CliAdapter {
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
         this.setStatus('generating', 'sendMessage');
         this.onStatusChange?.();
-        if (submitDelayMs > 0) {
-            this.submitPendingUntil = Date.now() + submitDelayMs;
-        }
-        this.ptyProcess.write(text);
+        const startResponseTimeout = () => {
+            if (this.responseTimeout) clearTimeout(this.responseTimeout);
+            this.responseTimeout = setTimeout(() => {
+                if (this.isWaitingForResponse) this.finishResponse();
+            }, this.timeouts.maxResponse);
+        };
 
         const submit = () => {
             if (!this.ptyProcess) return;
@@ -888,10 +1035,32 @@ export class ProviderCliAdapter implements CliAdapter {
                 this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
             };
             this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-            this.responseTimeout = setTimeout(() => {
-                if (this.isWaitingForResponse) this.finishResponse();
-            }, this.timeouts.maxResponse);
+            startResponseTimeout();
         };
+
+        if (this.submitStrategy === 'immediate') {
+            this.submitPendingUntil = 0;
+            this.ptyProcess.write(text + this.sendKey);
+            this.submitRetryTimer = setTimeout(() => {
+                this.submitRetryTimer = null;
+                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+                if (this.currentStatus !== 'generating') return;
+                if ((this.responseBuffer || '').trim()) return;
+                const screenText = this.terminalScreen.getText();
+                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+                LOG.info('CLI', `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                this.ptyProcess.write(this.sendKey);
+                this.submitRetryUsed = true;
+            }, retryDelayMs);
+            startResponseTimeout();
+            return;
+        }
+
+        if (submitDelayMs > 0) {
+            this.submitPendingUntil = Date.now() + submitDelayMs;
+        }
+        this.ptyProcess.write(text);
         const submitStartedAt = Date.now();
         let lastNormalizedScreen = '';
         let lastScreenChangeAt = submitStartedAt;
@@ -951,10 +1120,12 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     clearHistory(): void {
-        this.messages = [];
-        this.structuredMessages = [];
+        this.committedMessages = [];
+        this.syncMessageViews();
         this.accumulatedBuffer = '';
         this.accumulatedRawBuffer = '';
+        this.terminalHistory = '';
+        this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = '';
         this.terminalScreen.reset();
@@ -1008,9 +1179,12 @@ export class ProviderCliAdapter implements CliAdapter {
             spawnAt: this.spawnAt,
             workingDir: this.workingDir,
             messages: this.messages.slice(-20),
+            committedMessages: this.committedMessages.slice(-20),
             structuredMessages: this.structuredMessages.slice(-20),
-            messageCount: this.messages.length,
+            messageCount: this.committedMessages.length,
             screenText: this.terminalScreen.getText().slice(-4000),
+            terminalHistory: this.terminalHistory.slice(-8000),
+            currentTurnScope: this.currentTurnScope,
             startupBuffer: this.startupBuffer.slice(-4000),
             recentOutputBuffer: this.recentOutputBuffer.slice(-500),
             settledBuffer: this.settledBuffer.slice(-500),
@@ -1023,6 +1197,7 @@ export class ProviderCliAdapter implements CliAdapter {
             lastApprovalResolvedAt: this.lastApprovalResolvedAt,
             sendDelayMs: this.sendDelayMs,
             sendKey: this.sendKey,
+            submitStrategy: this.submitStrategy,
             submitPendingUntil: this.submitPendingUntil,
             responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
             resizeSuppressUntil: this.resizeSuppressUntil,

package/src/commands/chat-commands.ts

@@ -35,7 +35,13 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             _log(`${provider.category} adapter: ${(adapter as any).cliType}`);
             const status = (adapter as any).getStatus?.();
             if (status) {
-                return { success: true, messages: status.messages || [], status: status.status, activeModal: status.activeModal };
+                return {
+                    success: true,
+                    messages: status.messages || [],
+                    status: status.status,
+                    activeModal: status.activeModal,
+                    terminalHistory: status.terminalHistory || '',
+                };
             }
         }
         return { success: false, error: `${provider.category} adapter not found` };

package/src/config/chat-history.ts

@@ -31,6 +31,8 @@ export class ChatHistoryWriter {
     private lastSeenCounts = new Map<string, number>();
  /** Last seen message hash per agent (deduplication) */
     private lastSeenHashes = new Map<string, Set<string>>();
+ /** Last seen append-only terminal transcript per agent */
+    private lastSeenTerminal = new Map<string, string>();
     private rotated = false;
 
  /**
@@ -107,10 +109,60 @@ export class ChatHistoryWriter {
         }
     }
 
+    appendTerminalHistory(
+        agentType: string,
+        terminalHistory: string,
+        sessionTitle?: string,
+        instanceId?: string,
+    ): void {
+        const next = String(terminalHistory || '');
+        if (!next.trim()) return;
+
+        try {
+            const dedupKey = instanceId ? `${agentType}:${instanceId}:terminal` : `${agentType}:terminal`;
+            const prev = this.lastSeenTerminal.get(dedupKey) || '';
+            if (prev === next) return;
+
+            let delta = '';
+            if (!prev) {
+                delta = next;
+            } else if (next.startsWith(prev)) {
+                delta = next.slice(prev.length);
+            } else if (prev.includes(next)) {
+                this.lastSeenTerminal.set(dedupKey, next);
+                return;
+            } else {
+                delta = `\n\n[terminal snapshot reset ${new Date().toISOString()} | ${sessionTitle || agentType}]\n${next}`;
+            }
+
+            if (!delta) {
+                this.lastSeenTerminal.set(dedupKey, next);
+                return;
+            }
+
+            const dir = path.join(HISTORY_DIR, this.sanitize(agentType));
+            fs.mkdirSync(dir, { recursive: true });
+
+            const date = new Date().toISOString().slice(0, 10);
+            const filePrefix = instanceId ? `${this.sanitize(instanceId)}_` : '';
+            const filePath = path.join(dir, `${filePrefix}${date}.terminal.log`);
+            fs.appendFileSync(filePath, delta, 'utf-8');
+            this.lastSeenTerminal.set(dedupKey, next);
+
+            if (!this.rotated) {
+                this.rotated = true;
+                this.rotateOldFiles().catch(() => {});
+            }
+        } catch {
+            // Ignore terminal history save failures
+        }
+    }
+
  /** Called when agent session is explicitly changed */
     onSessionChange(agentType: string): void {
         this.lastSeenHashes.delete(agentType);
         this.lastSeenCounts.delete(agentType);
+        this.lastSeenTerminal.delete(`${agentType}:terminal`);
     }
 
  /** Delete history files older than 30 days */
@@ -125,7 +177,7 @@ export class ChatHistoryWriter {
             for (const dir of agentDirs) {
                 const dirPath = path.join(HISTORY_DIR, dir.name);
                 const files = fs.readdirSync(dirPath)
-                    .filter(f => f.endsWith('.jsonl'));
+                    .filter(f => f.endsWith('.jsonl') || f.endsWith('.terminal.log'));
 
                 for (const file of files) {
                     const filePath = path.join(dirPath, file);

package/src/daemon/dev-server.ts

@@ -19,6 +19,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import type { ProviderLoader } from '../providers/provider-loader.js';
+import type { ProviderCategory } from '../providers/contracts.js';
 import type { ChildProcess } from 'child_process';
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
@@ -1107,11 +1108,7 @@ export class DevServer {
     }
 
     let targetDir: string;
-    if (location === 'user') {
-      targetDir = this.providerLoader.getUserProviderDir(category, type);
-    } else {
-      targetDir = this.providerLoader.getBuiltinProviderDir(category, type);
-    }
+    targetDir = this.providerLoader.getUserProviderDir(category, type);
 
     const jsonPath = path.join(targetDir, 'provider.json');
     if (fs.existsSync(jsonPath)) {
@@ -1883,11 +1880,10 @@ export class DevServer {
     return fallback?.type || null;
   }
 
-  private loadAutoImplReferenceScripts(category: string, referenceType: string | null): Record<string, string> {
+  private loadAutoImplReferenceScripts(category: ProviderCategory, referenceType: string | null): Record<string, string> {
     if (!referenceType) return {};
 
-    const builtinDir = this.providerLoader.getPrimaryBuiltinDir();
-    const refDir = path.join(builtinDir, category, referenceType);
+    const refDir = this.providerLoader.getUpstreamProviderDir(category, referenceType);
     if (!fs.existsSync(refDir)) return {};
 
     const referenceScripts: Record<string, string> = {};
@@ -2138,7 +2134,7 @@ export class DevServer {
         }
         if (model) args.push('--model', model);
         const escapedArgs = args.map(a => `'${a.replace(/'/g, "'\\''")}'`).join(' ');
-        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions recursively. You have full authority to implement ALL required script files, update provider.json configurations based on the reference patterns, and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
+        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions strictly. DO NOT spend time exploring the filesystem or other providers. You have full authority to implement ALL required script files and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
         shellCmd = `${command} ${escapedArgs} "${metaPrompt}"`;
       } else {
         // Generic fallback: pipe prompt via stdin
@@ -2423,6 +2419,8 @@ export class DevServer {
     lines.push('5. Do NOT modify `scripts.js` router — only edit individual `*.js` files');
     lines.push('6. All scripts run in the browser (CDP evaluate) — use DOM APIs only');
     lines.push('7. **Cross-Platform Compatibility**: If you use ARIA labels that contain keyboard shortcuts (e.g., `Cascade (⌘L)`), you MUST use substring matches (`aria-label*="Cascade"`) or handle both macOS (`⌘`, `Cmd`) and Windows (`Ctrl`) so the script does not break on other operating systems.');
+    lines.push('8. **CRITICAL: DO NOT explore the filesystem or read other providers.** The reference implementation pattern is already provided below. Do not run `find`, `rg`, or `cat` on upstream providers. Doing so wastes context tokens and will crash the agent session. Focus entirely on modifying the target files.');
+    lines.push('9. Do NOT delete any files. Implement the logic by replacing the empty stubs.');
     lines.push('');
 
     // ── Output contracts ──

package/src/providers/cli-provider-instance.ts

@@ -81,15 +81,7 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     getState(): ProviderState {
-        const rawStatus = this.adapter.getStatus();
-        const parsedStatus = this.adapter.getScriptParsedStatus();
-        
-        // Prefer rich script parsed status if available
-        const adapterStatus = parsedStatus ? {
-            ...rawStatus,
-            messages: parsedStatus.messages || rawStatus.messages,
-            activeModal: parsedStatus.activeModal || rawStatus.activeModal,
-        } : rawStatus;
+        const adapterStatus = this.adapter.getStatus();
 
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
 
@@ -102,20 +94,6 @@ export class CliProviderInstance implements ProviderInstance {
         });
 
  // generating during partial response add
-        const partial = this.adapter.getPartialResponse();
-        const shouldAppendRawPartial = !parsedStatus;
-        if (shouldAppendRawPartial && adapterStatus.status === 'generating' && partial) {
-            const cleaned = partial.trim();
-            if (cleaned && cleaned !== '(generating...)') {
-                recentMessages.push({
-                    role: 'assistant',
-                    content: (cleaned.length > 8000 ? cleaned.slice(0, 8000) + '...' : cleaned) + '...',
-                    timestamp: Date.now(),
-                    meta: { streaming: true },
-                });
-            }
-        }
-
  // Save history
         if (recentMessages.length > 0) {
             const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
@@ -126,6 +104,14 @@ export class CliProviderInstance implements ProviderInstance {
                 this.instanceId,
             );
         }
+        if (adapterStatus.terminalHistory?.trim()) {
+            this.historyWriter.appendTerminalHistory(
+                this.type,
+                adapterStatus.terminalHistory,
+                `${this.provider.name} · ${dirName}`,
+                this.instanceId,
+            );
+        }
 
         return {
             type: this.type,
@@ -139,6 +125,7 @@ export class CliProviderInstance implements ProviderInstance {
                 status: adapterStatus.status,
                 messages: recentMessages,
                 activeModal: adapterStatus.activeModal,
+                terminalHistory: adapterStatus.terminalHistory,
                 inputContent: '',
             },
             workspace: this.workingDir,

package/src/providers/provider-instance.ts

@@ -22,6 +22,7 @@ export interface ActiveChatData {
     status: string;
     messages: ChatMessage[];
     activeModal: { message: string; buttons: string[] } | null;
+    terminalHistory?: string;
     inputContent?: string;
 }
 

package/src/providers/version-archive.ts

@@ -200,7 +200,10 @@ export async function detectAllVersions(
       detectedAt: new Date().toISOString(),
     };
 
-    const versionCommand = (provider as any).versionCommand;
+    const verCmdConfig = (provider as any).versionCommand;
+    const versionCommand = typeof verCmdConfig === 'object' && verCmdConfig !== null 
+      ? verCmdConfig[currentOs] 
+      : verCmdConfig;
 
     if (provider.category === 'ide') {
       // IDE: check app path + CLI