vigthoria-cli 1.8.15 → 1.9.2

package/dist/commands/chat.d.ts

@@ -38,6 +38,15 @@ export declare class ChatCommand {
     private workflowTarget;
     private savePlanToVigFlow;
     private jsonOutput;
+    private modelGovernanceFallback;
+    private isJwtExpirationError;
+    private isNetworkError;
+    private isTimeoutError;
+    private toUserFacingApiError;
+    private handleApiError;
+    private callApi;
+    private callSyncApi;
+    private applyNoAgentGovernance;
     private syncInteractiveModeModel;
     private hasOperatorAccess;
     private operatorAccessMessage;
@@ -118,8 +127,7 @@ export declare class ChatCommand {
     private runLocalAgentLoop;
     private tryDirectSingleFileFlow;
     private tryV3AgentWorkflow;
-    private isSaaSRescuePrompt;
-    private tryCommandLevelSaaSRescue;
+    private tryRecoverV3ServiceAndRetry;
     private startInteractiveChat;
     private showHelp;
     private showContext;

package/dist/commands/chat.js

@@ -48,6 +48,7 @@ const tools_js_1 = require("../utils/tools.js");
 const session_js_1 = require("../utils/session.js");
 const bridge_client_js_1 = require("../utils/bridge-client.js");
 const workspace_stream_js_1 = require("../utils/workspace-stream.js");
+const task_display_js_1 = require("../utils/task-display.js");
 const DEFAULT_V3_AGENT_TIMEOUT_MS = (() => {
     const rawValue = process.env.VIGTHORIA_AGENT_TIMEOUT_MS || process.env.V3_AGENT_TIMEOUT_MS;
     if (!rawValue) {
@@ -65,12 +66,9 @@ const DEFAULT_V3_AGENT_IDLE_TIMEOUT_MS = (() => {
     return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
 })();
 const DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS = (() => {
-    const rawValue = process.env.VIGTHORIA_AGENT_SOFT_TIMEOUT_MS || process.env.V3_AGENT_SOFT_TIMEOUT_MS;
-    if (!rawValue) {
-        return 0;
-    }
+    const rawValue = process.env.VIGTHORIA_AGENT_SOFT_TIMEOUT_MS || process.env.V3_AGENT_SOFT_TIMEOUT_MS || '300000';
     const parsed = Number.parseInt(rawValue, 10);
-    return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : 300000;
 })();
 class ChatCommand {
     config;
@@ -94,6 +92,140 @@ class ChatCommand {
     workflowTarget = null;
     savePlanToVigFlow = false;
     jsonOutput = false;
+    modelGovernanceFallback = null;
+    isJwtExpirationError(error) {
+        const candidate = error;
+        const message = `${candidate?.message || ''} ${typeof candidate?.details === 'string' ? candidate.details : ''}`.toLowerCase();
+        const code = String(candidate?.code || '').toLowerCase();
+        return candidate?.status === 401 && (code.includes('token_expired') ||
+            code.includes('jwt_expired') ||
+            message.includes('jwt expired') ||
+            message.includes('token expired') ||
+            message.includes('expired token') ||
+            message.includes('session expired'));
+    }
+    isNetworkError(error) {
+        const candidate = error;
+        const code = String(candidate?.code || candidate?.cause?.code || '').toUpperCase();
+        const name = String(candidate?.name || candidate?.cause?.name || '').toLowerCase();
+        const message = String(candidate?.message || candidate?.cause?.message || '').toLowerCase();
+        return [
+            'ECONNRESET',
+            'ECONNREFUSED',
+            'EHOSTUNREACH',
+            'ENETUNREACH',
+            'ENOTFOUND',
+            'EAI_AGAIN',
+            'UND_ERR_CONNECT_TIMEOUT',
+            'UND_ERR_HEADERS_TIMEOUT',
+            'UND_ERR_BODY_TIMEOUT',
+        ].includes(code) ||
+            name.includes('fetcherror') ||
+            message.includes('network') ||
+            message.includes('fetch failed') ||
+            message.includes('socket') ||
+            message.includes('connection');
+    }
+    isTimeoutError(error) {
+        const candidate = error;
+        const code = String(candidate?.code || candidate?.cause?.code || '').toUpperCase();
+        const name = String(candidate?.name || candidate?.cause?.name || '').toLowerCase();
+        const message = String(candidate?.message || candidate?.cause?.message || '').toLowerCase();
+        return code.includes('TIMEOUT') ||
+            code === 'ETIMEDOUT' ||
+            name.includes('timeout') ||
+            name === 'aborterror' ||
+            message.includes('timed out') ||
+            message.includes('timeout') ||
+            message.includes('aborted');
+    }
+    toUserFacingApiError(error, context) {
+        const classified = (0, api_js_1.classifyError)(error);
+        const status = classified.statusCode || (this.isJwtExpirationError(error) ? 401 : 500);
+        if (this.isJwtExpirationError(error)) {
+            return new api_js_1.CLIError('Your Vigthoria session has expired. Run `vigthoria login` to authenticate again.', 'auth', { statusCode: 401 });
+        }
+        if (this.isTimeoutError(error)) {
+            return new api_js_1.CLIError(`${context} timed out. Check your connection and try again.`, 'timeout', { statusCode: status });
+        }
+        if (this.isNetworkError(error)) {
+            return new api_js_1.CLIError(`${context} could not reach the Vigthoria API. Check your network connection and try again.`, 'network', { statusCode: status });
+        }
+        const message = (0, api_js_1.sanitizeUserFacingErrorText)(classified.message || `${context} failed`);
+        return new api_js_1.CLIError(message, status === 401 ? 'auth' : 'model_backend', { statusCode: status });
+    }
+    handleApiError(error, context) {
+        const userFacingError = this.toUserFacingApiError(error, context);
+        if (!this.jsonOutput) {
+            console.error(chalk_1.default.red(`${context} failed: ${userFacingError.message}`));
+        }
+        const original = error && typeof error === 'object' ? error : { message: String(error) };
+        (0, api_js_1.propagateError)({
+            ...original,
+            message: userFacingError.message,
+            statusCode: userFacingError.statusCode,
+            commandName: 'chat',
+            endpoint: original.endpoint || original?.config?.url || original?.details?.endpoint || context,
+            details: {
+                ...(original.details && typeof original.details === 'object' ? original.details : {}),
+                command: 'chat',
+                endpoint: original.endpoint || original?.config?.url || original?.details?.endpoint || context,
+                context,
+            },
+        });
+    }
+    async callApi(context, operation, retries = 1) {
+        let lastError;
+        for (let attempt = 0; attempt <= retries; attempt += 1) {
+            try {
+                return await operation();
+            }
+            catch (error) {
+                if (!this.jsonOutput) {
+                    const transient = this.isTimeoutError(error) ? 'timeout' : this.isNetworkError(error) ? 'network error' : 'API error';
+                    console.error(chalk_1.default.red(`${context} failed with ${transient}: ${this.toUserFacingApiError(error, context).message}`));
+                }
+                lastError = error;
+                if (this.isJwtExpirationError(error)) {
+                    this.handleApiError(error, context);
+                }
+                if (attempt >= retries || (!this.isNetworkError(error) && !this.isTimeoutError(error))) {
+                    this.handleApiError(error, context);
+                }
+                this.logger.warn(`${context} failed due to ${this.isTimeoutError(error) ? 'timeout' : 'network error'}; retrying (${attempt + 1}/${retries})...`);
+                await new Promise((resolve) => setTimeout(resolve, 500 * (attempt + 1)));
+            }
+        }
+        this.handleApiError(lastError, context);
+    }
+    callSyncApi(context, operation) {
+        try {
+            return operation();
+        }
+        catch (error) {
+            this.handleApiError(error, context);
+        }
+    }
+    applyNoAgentGovernance(requestedModel) {
+        const requested = String(requestedModel || '').trim().toLowerCase();
+        if (!requested || this.agentMode || this.operatorMode) {
+            this.modelGovernanceFallback = null;
+            return;
+        }
+        const blocked = new Set(['fast', 'mini', 'creative', 'creative-v3', 'creative-v4']);
+        if (blocked.has(requested)) {
+            const effectiveModel = 'code-35b';
+            this.modelGovernanceFallback = {
+                requestedModel,
+                effectiveModel,
+                reason: 'governance-blocked-model',
+            };
+            this.currentModel = effectiveModel;
+            this.logger.warn(`Model ${requestedModel} is not permitted for no-agent chat; using ${effectiveModel}`);
+            return;
+        }
+        this.modelGovernanceFallback = null;
+    }
     syncInteractiveModeModel(enabledMode) {
         if (enabledMode === 'agent') {
             if (!this.modelExplicitlySelected || this.currentModel === 'code' || !this.currentModel) {
@@ -102,12 +234,12 @@ class ChatCommand {
             return;
         }
         if (enabledMode === 'operator') {
-            if (this.currentModel === 'agent' || this.currentModel === 'code-8b' || !this.currentModel) {
+            if (this.currentModel === 'agent' || this.currentModel === 'code-8b' || this.currentModel === 'code-9b' || !this.currentModel) {
                 this.currentModel = 'code';
             }
             return;
         }
-        if (this.currentModel === 'agent' || this.currentModel === 'code-8b' || !this.currentModel) {
+        if (this.currentModel === 'agent' || this.currentModel === 'code-8b' || this.currentModel === 'code-9b' || !this.currentModel) {
             this.currentModel = 'code';
         }
     }
@@ -128,7 +260,7 @@ class ChatCommand {
     resolveInitialModel(options) {
         const requestedModel = String(options.model || '').trim();
         if (requestedModel) {
-            return options.operator === true && requestedModel === 'code-8b'
+            return options.operator === true && (requestedModel === 'code-8b' || requestedModel === 'code-9b')
                 ? 'code'
                 : requestedModel;
         }
@@ -297,7 +429,7 @@ class ChatCommand {
         if (!this.isBrowserTaskPrompt(prompt)) {
             return {};
         }
-        const bridgeStatus = await this.api.getDevtoolsBridgeStatus();
+        const bridgeStatus = await this.callApi('Checking DevTools Bridge status', () => this.api.getDevtoolsBridgeStatus(), 0);
         if (!this.jsonOutput && bridgeStatus.ok) {
             console.log(chalk_1.default.gray(`Browser task detected. DevTools Bridge is reachable at ${bridgeStatus.endpoint}.`));
         }
@@ -494,6 +626,43 @@ class ChatCommand {
             spinner.text = status === 'planning' ? 'Planning...' : 'Executing plan...';
             return;
         }
+        if (event.type === 'executor_start') {
+            if (spinner.isSpinning)
+                spinner.stop();
+            process.stderr.write(chalk_1.default.cyan('  [Executor] ') + `Starting ${event.task_id || 'task'}${event.title ? ` - ${event.title}` : ''}
+`);
+            spinner.start();
+            spinner.text = 'Vigthoria Executor running...';
+            return;
+        }
+        if (event.type === 'executor_error') {
+            if (spinner.isSpinning)
+                spinner.stop();
+            const msg = (0, api_js_1.sanitizeUserFacingErrorText)(String(event.error || 'Executor error')) || 'Executor error';
+            process.stderr.write(chalk_1.default.red('  [Executor] ') + `Vigthoria Executor encountered an issue: ${msg}
+`);
+            spinner.start();
+            spinner.text = 'Recovering executor...';
+            return;
+        }
+        if (event.type === 'executor_complete') {
+            if (spinner.isSpinning)
+                spinner.stop();
+            const summary = event.summary || {};
+            const status = String(summary.status || 'completed');
+            const changed = Array.isArray(summary.changed_files) ? summary.changed_files.length : 0;
+            if (status === 'failed') {
+                process.stderr.write(chalk_1.default.red('  [Executor] ') + `Vigthoria Executor task failed${summary.task_id ? ` (${summary.task_id})` : ''}.
+`);
+            }
+            else {
+                process.stderr.write(chalk_1.default.green('  [Executor] ') + `Task completed${summary.task_id ? ` (${summary.task_id})` : ''}${changed ? `, ${changed} files changed` : ''}.
+`);
+            }
+            spinner.start();
+            spinner.text = 'Continuing plan...';
+            return;
+        }
         if (event.type === 'file_mutation') {
             const rawPath = typeof event.path === 'string' ? this.sanitizeServerPath(event.path) : '';
             const filePath = rawPath ? rawPath.replace(/\\/g, '/').split('/').slice(-2).join('/') : '';
@@ -516,7 +685,18 @@ class ChatCommand {
             else {
                 if (spinner.isSpinning)
                     spinner.stop();
-                process.stderr.write(chalk_1.default.red('  [Error] ') + (event.message || 'Agent error') + '\n');
+                const message = (0, api_js_1.sanitizeUserFacingErrorText)(String(event.message || 'Agent error')) || 'Agent error';
+                const plannerLike = /plan|planner|dependency graph/i.test(message);
+                const executorLike = /executor|task failed|iteration/i.test(message);
+                if (plannerLike) {
+                    process.stderr.write(chalk_1.default.red('  [Planner] ') + `Vigthoria Planner encountered an issue: ${message}\n`);
+                }
+                else if (executorLike) {
+                    process.stderr.write(chalk_1.default.red('  [Executor] ') + `Vigthoria Executor encountered an issue: ${message}\n`);
+                }
+                else {
+                    process.stderr.write(chalk_1.default.red('  [Error] ') + message + '\n');
+                }
             }
             return;
         }
@@ -611,6 +791,7 @@ class ChatCommand {
         this.autoApprove = options.autoApprove === true || this.jsonOutput;
         this.modelExplicitlySelected = Boolean(String(options.model || '').trim());
         this.currentModel = this.resolveInitialModel(options);
+        this.applyNoAgentGovernance(String(options.model || this.currentModel || ''));
         this.currentProjectPath = this.resolveProjectPath(options);
         if (this.jsonOutput && !options.prompt) {
             throw new Error('--json is only supported together with --prompt.');
@@ -928,11 +1109,11 @@ class ChatCommand {
         const executionPrompt = this.buildExecutionPrompt(prompt);
         this.messages.push({ role: 'user', content: executionPrompt });
         const runtimeContext = await this.getPromptRuntimeContext(prompt);
-        const resolvedWorkflow = await this.api.resolveVigFlowWorkflow(selector);
+        const resolvedWorkflow = await this.callApi('Resolve VigFlow workflow', () => this.api.resolveVigFlowWorkflow(selector));
         const invocationMode = this.operatorMode ? 'operator' : this.agentMode ? 'agent' : 'chat';
         const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: `Running workflow ${resolvedWorkflow.name}...`, spinner: 'clock' }).start();
         try {
-            const execution = await this.api.runVigFlowWorkflow(resolvedWorkflow.id, {
+            const execution = await this.callApi('Run VigFlow workflow', () => this.api.runVigFlowWorkflow(resolvedWorkflow.id, {
                 data: {
                     request: executionPrompt,
                     prompt: executionPrompt,
@@ -960,7 +1141,7 @@ class ChatCommand {
                     clientSurface: 'cli',
                     model: this.currentModel,
                 },
-            });
+            }));
             const content = this.formatWorkflowTargetResult(execution.result);
             const assistantText = content || `Workflow ${resolvedWorkflow.name} completed with status ${execution.status}.`;
             this.messages.push({ role: 'assistant', content: assistantText });
@@ -1030,7 +1211,7 @@ class ChatCommand {
         const workflowType = 'full';
         const executionPrompt = this.buildExecutionPrompt(prompt);
         try {
-            const response = await this.api.runOperatorWorkflow(executionPrompt, {
+            const response = await this.callApi('Run operator workflow', () => this.api.runOperatorWorkflow(executionPrompt, {
                 workspacePath: this.currentProjectPath,
                 projectPath: this.currentProjectPath,
                 targetPath: this.currentProjectPath,
@@ -1043,7 +1224,7 @@ class ChatCommand {
                 savePlanToVigFlow: this.savePlanToVigFlow,
                 ...runtimeContext,
                 onStreamEvent: spinner ? (event) => this.updateOperatorSpinner(spinner, event) : undefined,
-            });
+            }));
             if (spinner) {
                 spinner.stop();
             }
@@ -1117,7 +1298,7 @@ class ChatCommand {
                 'If asked to produce exact output, produce exactly that output with no preamble.',
             ].join('\n');
             try {
-                const snapshot = this.api.getAgentWorkspaceSnapshot(this.currentProjectPath);
+                const snapshot = this.callSyncApi('Get agent workspace snapshot', () => this.api.getAgentWorkspaceSnapshot(this.currentProjectPath));
                 if (snapshot && snapshot.paths.length > 0) {
                     const listing = snapshot.paths.slice(0, 80).join('\n');
                     operatorGrounding += `\n\nProject file listing (${snapshot.fileCount} files):\n${listing}`;
@@ -1132,7 +1313,7 @@ class ChatCommand {
                 ...this.getMessagesForModel().filter(m => m.role !== 'system'),
                 { role: 'user', content: prompt },
             ];
-            const response = await this.api.chat(chatMessages, this.currentModel);
+            const response = await this.callApi('Send chat message', () => this.api.chat(chatMessages, this.currentModel));
             if (spinner)
                 spinner.stop();
             const content = (response.message || '').trim();
@@ -1191,17 +1372,14 @@ class ChatCommand {
                     'Do NOT acknowledge instructions. Do NOT say "provide your next instruction".',
                     'Produce a concrete, actionable answer grounded in the real project files.',
                 ].join('\n');
-                try {
-                    const snapshot = this.api.getAgentWorkspaceSnapshot(this.currentProjectPath);
-                    if (snapshot && snapshot.paths.length > 0) {
-                        const listing = snapshot.paths.slice(0, 80).join('\n');
-                        operatorGrounding += `\n\nProject file listing (${snapshot.fileCount} files):\n${listing}`;
-                        if (snapshot.fileCount > 80) {
-                            operatorGrounding += `\n... and ${snapshot.fileCount - 80} more files.`;
-                        }
+                const snapshot = this.callSyncApi('Get operator workspace snapshot', () => this.api.getAgentWorkspaceSnapshot(this.currentProjectPath));
+                if (snapshot && snapshot.paths.length > 0) {
+                    const listing = snapshot.paths.slice(0, 80).join('\n');
+                    operatorGrounding += `\n\nProject file listing (${snapshot.fileCount} files):\n${listing}`;
+                    if (snapshot.fileCount > 80) {
+                        operatorGrounding += `\n... and ${snapshot.fileCount - 80} more files.`;
                     }
                 }
-                catch { /* ignore */ }
                 this.messages.push({ role: 'system', content: operatorGrounding });
             }
             else {
@@ -1237,15 +1415,21 @@ class ChatCommand {
         (0, bridge_client_js_1.getBridgeClient)()?.emitPrompt({ prompt, mode: 'chat', model: this.currentModel });
         const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: 'Thinking...', spinner: 'clock' }).start();
         try {
-            const response = await this.api.chat(this.getMessagesForModel(), this.currentModel);
+            const response = await this.callApi('Send chat message', () => this.api.chat(this.getMessagesForModel(), this.currentModel));
             if (spinner)
                 spinner.stop();
             const finalText = (response.message || '').trim();
+            const effectiveModel = String(response.model || this.currentModel);
+            const metadata = this.modelGovernanceFallback
+                ? { modelFallback: this.modelGovernanceFallback }
+                : undefined;
             if (this.jsonOutput) {
                 console.log(JSON.stringify({
                     success: true,
                     mode: 'chat',
-                    model: this.currentModel,
+                    model: effectiveModel,
+                    requestedModel: this.modelGovernanceFallback?.requestedModel || this.currentModel,
+                    metadata,
                     content: finalText || 'The model returned an empty response. Try rephrasing or use --agent for grounded file analysis.',
                 }, null, 2));
             }
@@ -1324,7 +1508,7 @@ class ChatCommand {
             const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: turn === 0 ? 'Planning...' : 'Continuing...', spinner: 'clock' }).start();
             let response;
             try {
-                response = await this.api.chat(this.getMessagesForModel(), this.currentModel);
+                response = await this.callApi('Send agent chat message', () => this.api.chat(this.getMessagesForModel(), this.currentModel), 0);
             }
             catch (firstErr) {
                 // If we already gathered evidence and the model API fails on a
@@ -1333,7 +1517,7 @@ class ChatCommand {
                     this.logger.debug('Agent continuation API call failed, retrying once...');
                     try {
                         await new Promise(r => setTimeout(r, 2000));
-                        response = await this.api.chat(this.getMessagesForModel(), this.currentModel);
+                        response = await this.callApi('Retry agent chat message', () => this.api.chat(this.getMessagesForModel(), this.currentModel), 0);
                     }
                     catch (retryErr) {
                         // Retry also failed — synthesize an answer from evidence
@@ -1545,7 +1729,7 @@ class ChatCommand {
                     ].join('\n\n'),
                 },
             ];
-            const rewriteResponse = await this.api.chat(rewriteMessages, this.currentModel);
+            const rewriteResponse = await this.callApi('Rewrite target file', () => this.api.chat(rewriteMessages, this.currentModel));
             rewrittenContent = this.extractFinalFileContent(rewriteResponse.message, targetFile);
         }
         if (!rewrittenContent) {
@@ -1570,14 +1754,14 @@ class ChatCommand {
         if (!writeResult.success) {
             return false;
         }
-        const previewGate = await this.api.runTemplateServicePreviewGate(prompt, {
+        const previewGate = await this.callApi('Run Template Service preview gate', () => this.api.runTemplateServicePreviewGate(prompt, {
             workspacePath: this.currentProjectPath,
             projectPath: this.currentProjectPath,
             targetPath: this.currentProjectPath,
             rawPrompt: prompt,
             executionSurface: 'cli',
             clientSurface: 'cli',
-        });
+        }));
         const success = previewGate.required ? previewGate.passed === true : true;
         if (!success) {
             process.exitCode = 1;
@@ -1612,12 +1796,13 @@ class ChatCommand {
     async tryV3AgentWorkflow(prompt) {
         const runtimeContext = await this.getPromptRuntimeContext(prompt);
         const routingPolicy = this.resolveAgentExecutionPolicy(prompt);
-        const rescueEligible = this.isSaaSRescuePrompt(prompt);
         // Reset streaming counters for new workflow
         this.v3IterationCount = 0;
         this.v3ToolCallCount = 0;
         this.v3LastActivity = Date.now();
         this.v3StreamingStarted = false;
+        const taskDisplay = new task_display_js_1.TaskDisplay(['Analyse workspace', 'Execute tasks', 'Validate output', 'Self-heal'], !this.jsonOutput);
+        taskDisplay.start(0);
         const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({
             text: routingPolicy.cloudSelected ? 'Routing heavy task to Vigthoria Cloud...' : 'Routing to V3 Agent...',
             spinner: 'clock',
@@ -1651,6 +1836,7 @@ class ChatCommand {
                 localMachineCapable: true,
                 agentTimeoutMs: DEFAULT_V3_AGENT_TIMEOUT_MS,
                 agentIdleTimeoutMs: DEFAULT_V3_AGENT_IDLE_TIMEOUT_MS,
+                agentSoftTimeoutMs: DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS,
                 model: routingPolicy.selectedModel,
                 requestedModel: this.currentModel,
                 agentExecutionPolicy: routingPolicy,
@@ -1658,16 +1844,22 @@ class ChatCommand {
                 rawPrompt: prompt,
                 history: this.getMessagesForModel(),
                 ...runtimeContext,
-                onStreamEvent: spinner ? (event) => this.updateV3AgentSpinner(spinner, event) : undefined,
+                onStreamEvent: (event) => {
+                    if (event.type === 'plan') {
+                        taskDisplay.complete(0);
+                        taskDisplay.start(1);
+                    }
+                    else if (event.type === 'executor_start') {
+                        taskDisplay.start(1);
+                    }
+                    else if (event.type === 'complete') {
+                        taskDisplay.complete(1);
+                    }
+                    if (spinner)
+                        this.updateV3AgentSpinner(spinner, event);
+                },
             });
-            const response = await (rescueEligible && DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS > 0
-                ? Promise.race([
-                    workflowPromise,
-                    new Promise((_, reject) => {
-                        setTimeout(() => reject(new Error('V3_SAAS_SOFT_TIMEOUT')), DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS);
-                    }),
-                ])
-                : workflowPromise);
+            const response = await workflowPromise;
             if (spinner) {
                 spinner.stop();
             }
@@ -1767,15 +1959,50 @@ class ChatCommand {
                     console.log(chalk_1.default.gray(`Run ${chalk_1.default.cyan('vigthoria preview --diff')} for full visual diffs.`));
                 }
             }
+            // ── Self-healing validation ──────────────────────────────────────
+            if (this.currentProjectPath && !this.jsonOutput && success) {
+                try {
+                    taskDisplay.start(2, 'validating...');
+                    const healResult = await this.api.runSelfHealingCycle(executionPrompt, this.currentProjectPath, workspaceContext);
+                    if (healResult.healingAttempted) {
+                        taskDisplay.complete(2);
+                        if (healResult.passed) {
+                            taskDisplay.complete(3);
+                        }
+                        else {
+                            taskDisplay.fail(3, healResult.tool);
+                        }
+                        if (!this.directPromptMode) {
+                            const hs = healResult.passed ? chalk_1.default.green('passed') : chalk_1.default.yellow('partial');
+                            console.log(chalk_1.default.gray(`Self-healing: ${hs} (${healResult.tool})`));
+                        }
+                    }
+                    else {
+                        taskDisplay.skip(2);
+                        taskDisplay.skip(3);
+                    }
+                }
+                catch (error) {
+                    this.logger.debug(`Self-healing validation failed: ${error instanceof Error ? error.message : String(error)}`);
+                    taskDisplay.skip(2);
+                    taskDisplay.skip(3);
+                }
+            }
+            else {
+                taskDisplay.skip(2);
+                taskDisplay.skip(3);
+            }
+            taskDisplay.finalize();
+            // ────────────────────────────────────────────────────────────────
             this.messages.push({ role: 'assistant', content: response.content || 'V3 agent workflow completed.' });
             watcher?.stop();
             return true;
         }
         catch (error) {
             watcher?.stop();
-            if (rescueEligible && !this.api.hasAgentWorkspaceOutput(workspaceContext)) {
-                const rescued = await this.tryCommandLevelSaaSRescue(executionPrompt, prompt, workspaceContext, routingPolicy, spinner, error);
-                if (rescued) {
+            if (!this.api.hasAgentWorkspaceOutput(workspaceContext)) {
+                const recovered = await this.tryRecoverV3ServiceAndRetry(executionPrompt, prompt, workspaceContext, routingPolicy, spinner, error);
+                if (recovered) {
                     return true;
                 }
             }
@@ -1811,60 +2038,68 @@ class ChatCommand {
             return true;
         }
     }
-    isSaaSRescuePrompt(prompt) {
-        return /(saas|dashboard|analytics|billing|team management|activity feed|login screen)/i.test(prompt);
-    }
-    async tryCommandLevelSaaSRescue(executionPrompt, rawPrompt, workspaceContext, routingPolicy, spinner, error) {
-        const apiAny = this.api;
-        if (typeof apiAny.materializeEmergencySaaSWorkspace !== 'function') {
+    async tryRecoverV3ServiceAndRetry(executionPrompt, rawPrompt, workspaceContext, routingPolicy, spinner, error) {
+        const recovery = await this.api.attemptV3ServiceRecovery((error && error.message) || '');
+        if (!recovery.recovered) {
             return false;
         }
-        const appName = apiAny.materializeEmergencySaaSWorkspace(executionPrompt, workspaceContext);
-        if (!appName) {
-            return false;
-        }
-        if (typeof apiAny.ensureAgentFrontendPolish === 'function') {
-            await apiAny.ensureAgentFrontendPolish(executionPrompt, workspaceContext);
-        }
-        const previewGate = await this.api.runTemplateServicePreviewGate(executionPrompt, {
-            ...workspaceContext,
-            rawPrompt,
-        });
-        if (spinner) {
+        if (spinner && spinner.isSpinning) {
             spinner.stop();
         }
-        const rescueMessage = `Recovered a local SaaS workspace scaffold for ${appName} after the V3 workflow stalled without writing files.`;
-        if (this.jsonOutput) {
-            console.log(JSON.stringify({
-                success: true,
-                mode: 'agent',
-                model: routingPolicy.selectedModel,
-                routingPolicy,
-                taskId: null,
-                contextId: null,
-                partial: true,
-                content: rescueMessage,
-                metadata: {
-                    source: 'cli-saas-rescue',
-                    previewGate,
-                    rescueReason: error.message,
-                },
-            }, null, 2));
+        if (!this.jsonOutput) {
+            console.log(chalk_1.default.yellow(`V3 recovery: ${recovery.message} Retrying once...`));
         }
-        else {
-            console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
-            console.log(rescueMessage);
-            if (previewGate.required) {
-                if (previewGate.passed) {
-                    console.log(chalk_1.default.gray(`Template Service preview gate: passed via ${previewGate.backendUrl || 'unknown backend'}`));
-                }
-                else {
-                    console.log(chalk_1.default.yellow(`Template Service preview gate: failed${previewGate.error ? ` - ${previewGate.error}` : ''}`));
-                }
+        this.v3IterationCount = 0;
+        this.v3ToolCallCount = 0;
+        this.v3LastActivity = Date.now();
+        this.v3StreamingStarted = false;
+        try {
+            const retryResponse = await this.api.runV3AgentWorkflow(executionPrompt, {
+                workspace: { path: this.currentProjectPath },
+                ...workspaceContext,
+                executionSurface: 'cli',
+                clientSurface: 'cli',
+                localMachineCapable: true,
+                agentTimeoutMs: DEFAULT_V3_AGENT_TIMEOUT_MS,
+                agentIdleTimeoutMs: DEFAULT_V3_AGENT_IDLE_TIMEOUT_MS,
+                agentSoftTimeoutMs: DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS,
+                model: routingPolicy.selectedModel,
+                requestedModel: this.currentModel,
+                agentExecutionPolicy: routingPolicy,
+                legacyFallbackAllowed: this.isLegacyAgentFallbackAllowed(),
+                rawPrompt,
+                history: this.getMessagesForModel(),
+                onStreamEvent: spinner ? (event) => this.updateV3AgentSpinner(spinner, event) : undefined,
+            });
+            if (spinner && spinner.isSpinning) {
+                spinner.stop();
             }
+            if (this.v3StreamingStarted) {
+                process.stdout.write('\n');
+            }
+            if (this.jsonOutput) {
+                console.log(JSON.stringify({
+                    success: true,
+                    mode: 'agent',
+                    model: routingPolicy.selectedModel,
+                    routingPolicy,
+                    taskId: retryResponse.taskId || null,
+                    contextId: retryResponse.contextId || null,
+                    partial: retryResponse.partial === true,
+                    content: retryResponse.content || 'V3 agent workflow completed after recovery.',
+                    metadata: { ...(retryResponse.metadata || {}), recoveryAttempted: true },
+                }, null, 2));
+            }
+            else if (!this.v3StreamingStarted && retryResponse.content) {
+                console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
+                console.log(retryResponse.content);
+            }
+            this.messages.push({ role: 'assistant', content: retryResponse.content || 'V3 agent workflow completed after recovery.' });
+            return true;
+        }
+        catch {
+            return false;
         }
-        this.messages.push({ role: 'assistant', content: rescueMessage });
-        return true;
     }
     async startInteractiveChat() {
         const chatTitle = this.operatorMode