vigthoria-cli 1.9.10 → 1.9.20

package/dist/commands/chat.js

@@ -1,54 +1,16 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatCommand = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
-const readline = __importStar(require("readline"));
-const logger_js_1 = require("../utils/logger.js");
-const api_js_1 = require("../utils/api.js");
-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");
+import chalk from 'chalk';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import * as readline from 'readline';
+import { createSpinner } from '../utils/logger.js';
+import { APIClient, CLIError, classifyError, formatCLIError, sanitizeUserFacingErrorText, sanitizeUserFacingPathText, propagateError } from '../utils/api.js';
+import { AgenticTools, robustifyStreamResponse } from '../utils/tools.js';
+import { SessionManager } from '../utils/session.js';
+import { BridgeClient, getBridgeClient } from '../utils/bridge-client.js';
+import { WorkspaceWatcher } from '../utils/workspace-stream.js';
+import { TaskDisplay } from '../utils/task-display.js';
+import { ProjectMemoryService } from '../utils/project-memory.js';
 const DEFAULT_V3_AGENT_TIMEOUT_MS = (() => {
     const rawValue = process.env.VIGTHORIA_AGENT_TIMEOUT_MS || process.env.V3_AGENT_TIMEOUT_MS;
     if (!rawValue) {
@@ -73,13 +35,14 @@ const DEFAULT_V3_AGENT_SOFT_TIMEOUT_MS = (() => {
     const parsed = Number.parseInt(rawValue, 10);
     return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
 })();
-class ChatCommand {
+export class ChatCommand {
     config;
     logger;
     api;
     messages = [];
     tools = null;
     sessionManager;
+    projectMemory = null;
     currentSession = null;
     agentMode = false;
     currentProjectPath = process.cwd();
@@ -96,6 +59,8 @@ class ChatCommand {
     savePlanToVigFlow = false;
     jsonOutput = false;
     modelGovernanceFallback = null;
+    // Last completed Agent run — used by /retry, /continue, and the final summary block.
+    lastAgentRunOutcome = null;
     isJwtExpirationError(error) {
         const candidate = error;
         const message = `${candidate?.message || ''} ${typeof candidate?.details === 'string' ? candidate.details : ''}`.toLowerCase();
@@ -143,27 +108,27 @@ class ChatCommand {
             message.includes('aborted');
     }
     toUserFacingApiError(error, context) {
-        const classified = (0, api_js_1.classifyError)(error);
+        const classified = 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 });
+            return new 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 });
+            return new 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 });
+            return new 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 });
+        const message = sanitizeUserFacingErrorText(classified.message || `${context} failed`);
+        return new 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}`));
+            console.error(chalk.red(`${context} failed: ${userFacingError.message}`));
         }
         const original = error && typeof error === 'object' ? error : { message: String(error) };
-        (0, api_js_1.propagateError)({
+        propagateError({
             ...original,
             message: userFacingError.message,
             statusCode: userFacingError.statusCode,
@@ -186,7 +151,7 @@ class ChatCommand {
             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}`));
+                    console.error(chalk.red(`${context} failed with ${transient}: ${this.toUserFacingApiError(error, context).message}`));
                 }
                 lastError = error;
                 if (this.isJwtExpirationError(error)) {
@@ -329,25 +294,28 @@ class ChatCommand {
         };
     }
     getMessagesForModel() {
-        const memoryContext = this.sessionManager.buildMemoryContext(this.currentSession);
         const messages = [...this.messages];
-        if (!memoryContext) {
-            return messages;
-        }
-        const alreadyInjected = messages.some((message) => message.role === 'system' && message.content.includes('Session memory summary from earlier conversation turns.'));
-        if (alreadyInjected) {
-            return messages;
-        }
-        const insertionIndex = messages.findIndex((message) => message.role !== 'system');
-        const memoryMessage = {
-            role: 'system',
-            content: memoryContext,
-        };
-        if (insertionIndex === -1) {
-            messages.push(memoryMessage);
-            return messages;
+        const memoryContexts = [
+            this.sessionManager.buildMemoryContext(this.currentSession),
+            this.projectMemory?.buildContextForPrompt(this.getLastUserPrompt()) || '',
+        ].filter((entry) => entry && entry.trim());
+        for (const memoryContext of memoryContexts) {
+            const marker = memoryContext.includes('Vigthoria project brain memory.')
+                ? 'Vigthoria project brain memory.'
+                : 'Session memory summary from earlier conversation turns.';
+            const alreadyInjected = messages.some((message) => message.role === 'system' && message.content.includes(marker));
+            if (alreadyInjected) {
+                continue;
+            }
+            const insertionIndex = messages.findIndex((message) => message.role !== 'system');
+            const memoryMessage = { role: 'system', content: memoryContext };
+            if (insertionIndex === -1) {
+                messages.push(memoryMessage);
+            }
+            else {
+                messages.splice(insertionIndex, 0, memoryMessage);
+            }
         }
-        messages.splice(insertionIndex, 0, memoryMessage);
         return messages;
     }
     isDiagnosticPrompt(prompt) {
@@ -432,18 +400,67 @@ class ChatCommand {
         const shaping = this.buildTaskShapingInstructions(prompt);
         return shaping ? `${prompt}\n\n${shaping}` : prompt;
     }
+    isProjectBrainRuntimeDisabled() {
+        return /^(1|true|yes)$/i.test(String(process.env.VIGTHORIA_NO_BRAIN || process.env.VIGTHORIA_BRAIN_DISABLED || ''));
+    }
+    buildProjectBrainRuntimeContext(prompt, source) {
+        if (this.isProjectBrainRuntimeDisabled()) {
+            return undefined;
+        }
+        try {
+            if (!this.projectMemory) {
+                this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
+            }
+            const status = this.projectMemory.getStatus();
+            const context = this.projectMemory.buildContextForPrompt(prompt);
+            if (!context && status.itemCount === 0) {
+                return undefined;
+            }
+            return {
+                schema: 'vigthoria.project-brain.v1',
+                source,
+                memoryDir: status.memoryDir,
+                itemCount: status.itemCount,
+                updatedAt: status.updatedAt,
+                context,
+            };
+        }
+        catch {
+            return undefined;
+        }
+    }
+    rememberBrainEvent(type, text, mode) {
+        if (this.isProjectBrainRuntimeDisabled()) {
+            return;
+        }
+        try {
+            if (!this.projectMemory) {
+                this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
+            }
+            this.projectMemory.remember(type, text, { source: 'vigthoria-cli', mode, model: this.currentModel });
+        }
+        catch {
+            // Project Brain memory must not break chat, GoA, or operator execution.
+        }
+    }
     async getPromptRuntimeContext(prompt) {
+        const runtimeContext = {};
+        const brainContext = this.buildProjectBrainRuntimeContext(prompt, this.operatorMode ? 'vigthoria-cli.operator' : this.agentMode ? 'vigthoria-cli.agent' : 'vigthoria-cli.chat');
+        if (brainContext) {
+            runtimeContext.vigthoriaBrain = brainContext;
+        }
         if (!this.isBrowserTaskPrompt(prompt)) {
-            return {};
+            return runtimeContext;
         }
         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}.`));
+            console.log(chalk.gray(`Browser task detected. DevTools Bridge is reachable at ${bridgeStatus.endpoint}.`));
         }
         else if (!this.jsonOutput) {
-            console.log(chalk_1.default.yellow(`Browser task detected. DevTools Bridge is not running at ${bridgeStatus.endpoint}.`));
+            console.log(chalk.yellow(`Browser task detected. DevTools Bridge is not running at ${bridgeStatus.endpoint}.`));
         }
         return {
+            ...runtimeContext,
             browserTask: true,
             devtoolsBridgeAvailable: bridgeStatus.ok,
             devtoolsBridgeEndpoint: bridgeStatus.endpoint,
@@ -460,12 +477,7 @@ class ChatCommand {
     sanitizeServerPath(text) {
         if (!text)
             return text;
-        // Strip common server path prefixes from output
-        return text
-            .replace(/\/var\/www\/V3-Code-Agent\//g, '')
-            .replace(/\/var\/www\/[a-zA-Z0-9_-]+\//g, '')
-            .replace(/\/tmp\/vig-remote-[a-zA-Z0-9_-]+\//g, '')
-            .replace(/\/opt\/vigthoria[a-zA-Z0-9_/-]*\//g, '');
+        return sanitizeUserFacingPathText(text);
     }
     describeV3AgentTool(toolName) {
         const normalized = String(toolName || '').toLowerCase();
@@ -498,12 +510,12 @@ class ChatCommand {
             const source = (event && typeof event === 'object' && !Buffer.isBuffer(event) && !(event instanceof Uint8Array))
                 ? (event.body ?? event.stream ?? event.response ?? event)
                 : event;
-            for await (const chunk of (0, tools_js_1.robustifyStreamResponse)(source)) {
+            for await (const chunk of robustifyStreamResponse(source)) {
                 this.v3LastActivity = Date.now();
                 if (chunk.type === 'error') {
                     if (spinner.isSpinning)
                         spinner.stop();
-                    process.stderr.write(chalk_1.default.red(`\nStream error: ${chunk.content}\n`));
+                    process.stderr.write(chalk.red(`\nStream error: ${chunk.content}\n`));
                     continue;
                 }
                 if (chunk.content) {
@@ -515,11 +527,12 @@ class ChatCommand {
             const message = error instanceof Error ? error.message : String(error);
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.red(`\nStream error: ${message}\n`));
+            process.stderr.write(chalk.red(`\nStream error: ${message}\n`));
         }
     }
     writeV3StreamText(spinner, text) {
-        if (!text) {
+        const safeText = this.sanitizeServerPath(text);
+        if (!safeText) {
             return;
         }
         if (!this.v3StreamingStarted) {
@@ -532,7 +545,7 @@ class ChatCommand {
         else {
             spinner.stop();
         }
-        process.stdout.write(text);
+        process.stdout.write(safeText);
     }
     updateV3AgentSpinner(spinner, event) {
         if (this.isRawV3StreamPayload(event)) {
@@ -540,7 +553,7 @@ class ChatCommand {
                 const message = error instanceof Error ? error.message : String(error);
                 if (spinner.isSpinning)
                     spinner.stop();
-                process.stderr.write(chalk_1.default.red(`\nStream error: ${message}\n`));
+                process.stderr.write(chalk.red(`\nStream error: ${message}\n`));
             });
             return;
         }
@@ -554,7 +567,7 @@ class ChatCommand {
             const toolTarget = event.arguments?.path || event.arguments?.file_path || event.arguments?.pattern || '';
             const sanitizedTarget = this.sanitizeServerPath(String(toolTarget));
             const shortTarget = sanitizedTarget ? ` → ${sanitizedTarget.replace(/\\/g, '/').split('/').slice(-2).join('/')}` : '';
-            const stepLabel = chalk_1.default.cyan(`  [${this.v3IterationCount}/${this.v3ToolCallCount}]`) + ` ${toolDesc}${shortTarget}`;
+            const stepLabel = chalk.cyan(`  [${this.v3IterationCount}/${this.v3ToolCallCount}]`) + ` ${toolDesc}${shortTarget}`;
             if (spinner.isSpinning)
                 spinner.stop();
             process.stderr.write(stepLabel + '\n');
@@ -563,10 +576,11 @@ class ChatCommand {
             const toolName = event.name || event.tool || '';
             if ((toolName === 'write_file' || toolName === 'edit_file') && typeof args.content === 'string') {
                 const len = args.content.length;
-                process.stderr.write(chalk_1.default.gray(`      ${len > 1000 ? Math.round(len / 1024) + ' KB' : len + ' bytes'} content\n`));
+                process.stderr.write(chalk.gray(`      ${len > 1000 ? Math.round(len / 1024) + ' KB' : len + ' bytes'} content\n`));
             }
             else if (toolName === 'bash' && typeof args.command === 'string') {
-                process.stderr.write(chalk_1.default.gray(`      $ ${args.command.slice(0, 120)}${args.command.length > 120 ? '…' : ''}\n`));
+                const command = this.sanitizeServerPath(args.command);
+                process.stderr.write(chalk.gray(`      $ ${command.slice(0, 120)}${command.length > 120 ? '…' : ''}\n`));
             }
             spinner.start();
             spinner.text = `Running ${toolDesc}...`;
@@ -575,7 +589,7 @@ class ChatCommand {
         if (event.type === 'tool_result') {
             const success = event.success !== false;
             const toolName = event.name || event.tool || '';
-            const indicator = success ? chalk_1.default.green('  ✓') : chalk_1.default.red('  ✗');
+            const indicator = success ? chalk.green('  ✓') : chalk.red('  ✗');
             if (spinner.isSpinning)
                 spinner.stop();
             process.stderr.write(`${indicator} ${toolName}\n`);
@@ -585,11 +599,11 @@ class ChatCommand {
             if (!success && output) {
                 const sanitizedError = this.sanitizeServerPath(typeof event.error === 'string' ? event.error : output);
                 const lines = sanitizedError.split('\n').slice(0, 4);
-                process.stderr.write(chalk_1.default.red(`      ${lines.join('\n      ')}\n`));
+                process.stderr.write(chalk.red(`      ${lines.join('\n      ')}\n`));
             }
             else if (success && output && output.length > 0) {
                 const brief = output.split('\n')[0].slice(0, 120);
-                process.stderr.write(chalk_1.default.gray(`      ${brief}${output.length > 120 ? '…' : ''}\n`));
+                process.stderr.write(chalk.gray(`      ${brief}${output.length > 120 ? '…' : ''}\n`));
             }
             spinner.start();
             spinner.text = 'Next step...';
@@ -597,10 +611,10 @@ class ChatCommand {
         }
         if (event.type === 'thinking') {
             this.v3IterationCount += 1;
-            const iterText = event.content || '';
+            const iterText = this.sanitizeServerPath(event.content || '');
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan(`\n── ${iterText || `Iteration ${this.v3IterationCount}`} ──\n`));
+            process.stderr.write(chalk.cyan(`\n── ${iterText || `Iteration ${this.v3IterationCount}`} ──\n`));
             spinner.start();
             spinner.text = 'Analyzing...';
             return;
@@ -614,7 +628,7 @@ class ChatCommand {
                 this.writeV3StreamText(spinner, text);
             }
             else {
-                spinner.text = chalk_1.default.cyan('[Response] ') + 'Writing response...';
+                spinner.text = chalk.cyan('[Response] ') + 'Writing response...';
             }
             return;
         }
@@ -632,53 +646,53 @@ class ChatCommand {
                 const fail = event.tasks_failed ?? 0;
                 statLine += ` — ${ok} tasks done`;
                 if (fail > 0)
-                    statLine += chalk_1.default.yellow(`, ${fail} failed`);
+                    statLine += chalk.yellow(`, ${fail} failed`);
             }
-            process.stderr.write(chalk_1.default.green(`\n✓ Complete`) + ` — ${statLine}\n`);
+            process.stderr.write(chalk.green(`\n✓ Complete`) + ` — ${statLine}\n`);
             // Show seal quality score if available
             if (event.seal_score && typeof event.seal_score.overall === 'number') {
                 const score = event.seal_score.overall;
                 const tier = event.seal_score.tier || '';
-                const scoreColor = score >= 7 ? chalk_1.default.green : score >= 5 ? chalk_1.default.yellow : chalk_1.default.red;
-                process.stderr.write(chalk_1.default.cyan('  [Quality] ') + scoreColor(`${score}/10`) + (tier ? chalk_1.default.gray(` (${tier})`) : '') + '\n');
+                const scoreColor = score >= 7 ? chalk.green : score >= 5 ? chalk.yellow : chalk.red;
+                process.stderr.write(chalk.cyan('  [Quality] ') + scoreColor(`${score}/10`) + (tier ? chalk.gray(` (${tier})`) : '') + '\n');
             }
             return;
         }
         if (event.type === 'plan') {
             const plan = event.plan || {};
-            const planKind = plan.task_kind || event.task_kind || '';
-            const quality = plan.quality_profile || '';
+            const planKind = this.sanitizeServerPath(plan.task_kind || event.task_kind || '');
+            const quality = this.sanitizeServerPath(plan.quality_profile || '');
             const status = typeof plan.status === 'string' ? plan.status : '';
-            const summary = typeof plan.summary === 'string' ? plan.summary : '';
+            const summary = typeof plan.summary === 'string' ? this.sanitizeServerPath(plan.summary) : '';
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan(`  [Plan] `) + `Task: ${planKind || 'analyzing'}`);
+            process.stderr.write(chalk.cyan(`  [Plan] `) + `Task: ${planKind || 'analyzing'}`);
             if (quality)
-                process.stderr.write(chalk_1.default.gray(` (${quality})`));
+                process.stderr.write(chalk.gray(` (${quality})`));
             process.stderr.write('\n');
             if (summary) {
-                process.stderr.write(chalk_1.default.gray(`      ${summary}\n`));
+                process.stderr.write(chalk.gray(`      ${summary}\n`));
             }
             if (status === 'planning' && Number.isFinite(Number(plan.elapsed_seconds))) {
-                process.stderr.write(chalk_1.default.gray(`      elapsed: ${plan.elapsed_seconds}s\n`));
+                process.stderr.write(chalk.gray(`      elapsed: ${plan.elapsed_seconds}s\n`));
             }
             if (Array.isArray(plan.tasks) && plan.tasks.length > 0) {
-                process.stderr.write(chalk_1.default.gray(`      ${plan.total_tasks || plan.tasks.length} tasks:\n`));
+                process.stderr.write(chalk.gray(`      ${plan.total_tasks || plan.tasks.length} tasks:\n`));
                 for (const t of plan.tasks.slice(0, 10)) {
-                    const targets = Array.isArray(t.targets) && t.targets.length ? ` → ${t.targets.join(', ')}` : '';
-                    process.stderr.write(chalk_1.default.gray(`        • ${t.title || t.id}${targets}\n`));
+                    const targets = Array.isArray(t.targets) && t.targets.length ? ` → ${t.targets.map((target) => this.sanitizeServerPath(String(target))).join(', ')}` : '';
+                    process.stderr.write(chalk.gray(`        • ${this.sanitizeServerPath(String(t.title || t.id))}${targets}\n`));
                 }
                 if (plan.tasks.length > 10) {
-                    process.stderr.write(chalk_1.default.gray(`        ... and ${plan.tasks.length - 10} more\n`));
+                    process.stderr.write(chalk.gray(`        ... and ${plan.tasks.length - 10} more\n`));
                 }
             }
             if (Array.isArray(plan.notes) && plan.notes.length > 0) {
                 for (const note of plan.notes.slice(0, 3)) {
-                    process.stderr.write(chalk_1.default.gray(`      note: ${note}\n`));
+                    process.stderr.write(chalk.gray(`      note: ${this.sanitizeServerPath(String(note))}\n`));
                 }
             }
             if (Array.isArray(plan.target_files) && plan.target_files.length > 0) {
-                process.stderr.write(chalk_1.default.gray(`      Files: ${plan.target_files.join(', ')}\n`));
+                process.stderr.write(chalk.gray(`      Files: ${plan.target_files.map((filePath) => this.sanitizeServerPath(String(filePath))).join(', ')}\n`));
             }
             spinner.start();
             spinner.text = status === 'planning' ? 'Planning...' : 'Executing plan...';
@@ -687,7 +701,7 @@ class ChatCommand {
         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}` : ''}
+            process.stderr.write(chalk.cyan('  [Executor] ') + `Starting ${this.sanitizeServerPath(String(event.task_id || 'task'))}${event.title ? ` - ${this.sanitizeServerPath(String(event.title))}` : ''}
 `);
             spinner.start();
             spinner.text = 'Vigthoria Executor running...';
@@ -696,8 +710,8 @@ class ChatCommand {
         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}
+            const msg = sanitizeUserFacingErrorText(String(event.error || 'Executor error')) || 'Executor error';
+            process.stderr.write(chalk.red('  [Executor] ') + `Vigthoria Executor encountered an issue: ${msg}
 `);
             spinner.start();
             spinner.text = 'Recovering executor...';
@@ -710,11 +724,11 @@ class ChatCommand {
             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})` : ''}.
+                process.stderr.write(chalk.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` : ''}.
+                process.stderr.write(chalk.green('  [Executor] ') + `Task completed${summary.task_id ? ` (${summary.task_id})` : ''}${changed ? `, ${changed} files changed` : ''}.
 `);
             }
             spinner.start();
@@ -724,11 +738,11 @@ class ChatCommand {
         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('/') : '';
-            const action = event.action === 'delete' ? chalk_1.default.red('deleted') : chalk_1.default.green('wrote');
+            const action = event.action === 'delete' ? chalk.red('deleted') : chalk.green('wrote');
             if (filePath) {
                 if (spinner.isSpinning)
                     spinner.stop();
-                process.stderr.write(chalk_1.default.cyan('  [File] ') + `${action} ${filePath}\n`);
+                process.stderr.write(chalk.cyan('  [File] ') + `${action} ${filePath}\n`);
                 spinner.start();
             }
             return;
@@ -737,23 +751,23 @@ class ChatCommand {
             if (event.checkpointed) {
                 if (spinner.isSpinning)
                     spinner.stop();
-                process.stderr.write(chalk_1.default.yellow('  [Checkpoint] ') + 'Budget reached — auto-continuing...\n');
+                process.stderr.write(chalk.yellow('  [Checkpoint] ') + 'Budget reached — auto-continuing...\n');
                 spinner.start();
             }
             else {
                 if (spinner.isSpinning)
                     spinner.stop();
-                const message = (0, api_js_1.sanitizeUserFacingErrorText)(String(event.message || 'Agent error')) || 'Agent error';
+                const message = 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`);
+                    process.stderr.write(chalk.red('  [Planner] ') + `Vigthoria Planner encountered an issue: ${this.sanitizeServerPath(message)}\n`);
                 }
                 else if (executorLike) {
-                    process.stderr.write(chalk_1.default.red('  [Executor] ') + `Vigthoria Executor encountered an issue: ${message}\n`);
+                    process.stderr.write(chalk.red('  [Executor] ') + `Vigthoria Executor encountered an issue: ${this.sanitizeServerPath(message)}\n`);
                 }
                 else {
-                    process.stderr.write(chalk_1.default.red('  [Error] ') + message + '\n');
+                    process.stderr.write(chalk.red('  [Error] ') + this.sanitizeServerPath(message) + '\n');
                 }
             }
             return;
@@ -761,7 +775,7 @@ class ChatCommand {
         if (event.type === 'context') {
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan('  [Context] ') + 'Workspace bound\n');
+            process.stderr.write(chalk.cyan('  [Context] ') + 'Workspace bound\n');
             spinner.start();
             spinner.text = 'Starting agent...';
             return;
@@ -771,7 +785,7 @@ class ChatCommand {
             this.v3ToolCallCount = 0;
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan('  [Start] ') + 'Agent initialized\n');
+            process.stderr.write(chalk.cyan('  [Start] ') + 'Agent initialized\n');
             spinner.start();
             spinner.text = 'Working...';
         }
@@ -783,7 +797,7 @@ class ChatCommand {
         if (event.type === 'started') {
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan('  [Operator] ') + 'Starting BMAD workflow...\n');
+            process.stderr.write(chalk.cyan('  [Operator] ') + 'Starting BMAD workflow...\n');
             spinner.start();
             spinner.text = 'Connecting...';
             return;
@@ -791,7 +805,7 @@ class ChatCommand {
         if (event.type === 'connected') {
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.green('  ✓') + ' Connected to BMAD stream\n');
+            process.stderr.write(chalk.green('  ✓') + ' Connected to BMAD stream\n');
             spinner.start();
             spinner.text = 'Working...';
             return;
@@ -800,7 +814,7 @@ class ChatCommand {
             const agentName = event.agent || 'BMAD agent';
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan(`  [Agent] `) + agentName + '\n');
+            process.stderr.write(chalk.cyan(`  [Agent] `) + agentName + '\n');
             spinner.start();
             spinner.text = `Running ${agentName}...`;
             return;
@@ -810,7 +824,7 @@ class ChatCommand {
             const statusText = `${event.status || 'Working'}${progress}`;
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.cyan('  [Status] ') + statusText + '\n');
+            process.stderr.write(chalk.cyan('  [Status] ') + statusText + '\n');
             spinner.start();
             spinner.text = statusText;
             return;
@@ -818,15 +832,15 @@ class ChatCommand {
         if (event.type === 'result') {
             if (spinner.isSpinning)
                 spinner.stop();
-            process.stderr.write(chalk_1.default.green('\n  ✓ Operator workflow complete\n'));
+            process.stderr.write(chalk.green('\n  ✓ Operator workflow complete\n'));
             return;
         }
     }
     constructor(config, logger) {
         this.config = config;
         this.logger = logger;
-        this.api = new api_js_1.APIClient(config, logger);
-        this.sessionManager = new session_js_1.SessionManager();
+        this.api = new APIClient(config, logger);
+        this.sessionManager = new SessionManager();
     }
     async run(options) {
         if (!this.config.isAuthenticated()) {
@@ -857,11 +871,11 @@ class ChatCommand {
         this.ensureProjectWorkspace();
         this.directPromptMode = Boolean(options.prompt);
         this.directToolContinuationCount = 0;
-        this.tools = new tools_js_1.AgenticTools(this.logger, this.currentProjectPath, async (action) => this.requestPermission(action), this.autoApprove);
+        this.tools = new AgenticTools(this.logger, this.currentProjectPath, async (action) => this.requestPermission(action), this.autoApprove);
         this.initializeSession(options.resume === true);
         // ── Commando Bridge: connect if --bridge was specified ──────────
         if (options.bridge) {
-            const bridgeClient = new bridge_client_js_1.BridgeClient({
+            const bridgeClient = new BridgeClient({
                 bridgeUrl: options.bridge,
                 apiKey: this.config.get('authToken'),
                 onAdminCommand: (cmd) => this.handleAdminCommand(cmd),
@@ -896,7 +910,7 @@ class ChatCommand {
             const timeoutId = options.bridge && bridgePromptTimeoutMs > 0
                 ? setTimeout(() => {
                     timedOut = true;
-                    const b = (0, bridge_client_js_1.getBridgeClient)();
+                    const b = getBridgeClient();
                     if (b) {
                         b.emitEnd({ reason: 'timeout' });
                         b.destroy();
@@ -911,7 +925,7 @@ class ChatCommand {
             if (timeoutId)
                 clearTimeout(timeoutId);
             if (!timedOut) {
-                const bridge = (0, bridge_client_js_1.getBridgeClient)();
+                const bridge = getBridgeClient();
                 if (bridge) {
                     bridge.emitEnd({ reason: 'prompt-complete' });
                     bridge.destroy();
@@ -920,7 +934,7 @@ class ChatCommand {
             return;
         }
         await this.startInteractiveChat();
-        const bridge = (0, bridge_client_js_1.getBridgeClient)();
+        const bridge = getBridgeClient();
         if (bridge) {
             bridge.emitEnd({ reason: 'interactive-exit' });
             bridge.destroy();
@@ -930,24 +944,24 @@ class ChatCommand {
     handleAdminCommand(cmd) {
         switch (cmd.action) {
             case 'ping':
-                (0, bridge_client_js_1.getBridgeClient)()?.emitModelResponse({ model: this.currentModel, chars: 0, hasToolCalls: false, preview: 'pong' });
+                getBridgeClient()?.emitModelResponse({ model: this.currentModel, chars: 0, hasToolCalls: false, preview: 'pong' });
                 break;
             case 'set-model':
                 if (cmd.params?.value && typeof cmd.params.value === 'string') {
                     this.currentModel = cmd.params.value;
-                    (0, bridge_client_js_1.getBridgeClient)()?.emitModeChange({ mode: this.operatorMode ? 'operator' : this.agentMode ? 'agent' : 'chat', model: this.currentModel });
+                    getBridgeClient()?.emitModeChange({ mode: this.operatorMode ? 'operator' : this.agentMode ? 'agent' : 'chat', model: this.currentModel });
                     if (!this.jsonOutput)
-                        console.log(chalk_1.default.yellow(`[bridge] Model changed to: ${this.currentModel}`));
+                        console.log(chalk.yellow(`[bridge] Model changed to: ${this.currentModel}`));
                 }
                 break;
             case 'abort':
                 if (!this.jsonOutput)
-                    console.log(chalk_1.default.red(`[bridge] Abort requested by admin`));
-                (0, bridge_client_js_1.getBridgeClient)()?.emitEnd({ reason: 'admin-abort' });
+                    console.log(chalk.red(`[bridge] Abort requested by admin`));
+                getBridgeClient()?.emitEnd({ reason: 'admin-abort' });
                 process.exit(0);
                 break;
             default:
-                (0, bridge_client_js_1.getBridgeClient)()?.emitError({ message: `Unknown admin command: ${cmd.action}` });
+                getBridgeClient()?.emitError({ message: `Unknown admin command: ${cmd.action}` });
         }
     }
     ensureProjectWorkspace() {
@@ -1061,6 +1075,7 @@ class ChatCommand {
         return path.join(rootPath, `${folderName}-${Date.now()}`);
     }
     initializeSession(resume) {
+        this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
         if (resume) {
             this.currentSession = this.sessionManager.getLatest(this.currentProjectPath);
             if (this.currentSession) {
@@ -1106,11 +1121,11 @@ class ChatCommand {
         // Suppress all setup banners in direct-prompt mode so only the final
         // answer reaches stdout.  Interactive (REPL) mode still shows them.
         if (!this.jsonOutput) {
-            console.log(chalk_1.default.cyan('Running single prompt in direct mode.'));
-            console.log(chalk_1.default.gray(`Model: ${this.currentModel}`));
-            console.log(chalk_1.default.gray(`Project: ${this.currentProjectPath}`));
+            console.log(chalk.cyan('Running single prompt in direct mode.'));
+            console.log(chalk.gray(`Model: ${this.currentModel}`));
+            console.log(chalk.gray(`Project: ${this.currentProjectPath}`));
             if (this.workflowTarget) {
-                console.log(chalk_1.default.gray(`Workflow target: ${this.workflowTarget}`));
+                console.log(chalk.gray(`Workflow target: ${this.workflowTarget}`));
             }
             console.log();
         }
@@ -1174,7 +1189,7 @@ class ChatCommand {
         const runtimeContext = await this.getPromptRuntimeContext(prompt);
         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();
+        const spinner = this.jsonOutput ? null : createSpinner({ text: `Running workflow ${resolvedWorkflow.name}...`, spinner: 'clock' }).start();
         try {
             const execution = await this.callApi('Run VigFlow workflow', () => this.api.runVigFlowWorkflow(resolvedWorkflow.id, {
                 data: {
@@ -1223,9 +1238,9 @@ class ChatCommand {
                 return;
             }
             this.logger.success(`Workflow target ${resolvedWorkflow.name} ${execution.status}`);
-            console.log(chalk_1.default.gray(`Workflow ID: ${resolvedWorkflow.id}`));
-            console.log(chalk_1.default.gray(`Execution ID: ${execution.executionId}`));
-            console.log(chalk_1.default.gray(`Mode: ${invocationMode}`));
+            console.log(chalk.gray(`Workflow ID: ${resolvedWorkflow.id}`));
+            console.log(chalk.gray(`Execution ID: ${execution.executionId}`));
+            console.log(chalk.gray(`Mode: ${invocationMode}`));
             if (content) {
                 console.log(content);
             }
@@ -1268,12 +1283,13 @@ class ChatCommand {
             await this.runLocalAgentLoop(prompt);
             return;
         }
-        (0, bridge_client_js_1.getBridgeClient)()?.emitPrompt({ prompt, mode: 'operator', model: this.currentModel });
+        getBridgeClient()?.emitPrompt({ prompt, mode: 'operator', model: this.currentModel });
         const runtimeContext = await this.getPromptRuntimeContext(prompt);
-        const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: 'Thinking like an operator...', spinner: 'clock' }).start();
+        const spinner = this.jsonOutput ? null : createSpinner({ text: 'Thinking like an operator...', spinner: 'clock' }).start();
         const workflowType = 'full';
         const executionPrompt = this.buildExecutionPrompt(prompt);
         try {
+            this.rememberBrainEvent('task', `GoA operator workflow started for prompt: ${prompt.slice(0, 220)}`, 'operator');
             const response = await this.callApi('Run operator workflow', () => this.api.runOperatorWorkflow(executionPrompt, {
                 workspacePath: this.currentProjectPath,
                 projectPath: this.currentProjectPath,
@@ -1297,7 +1313,7 @@ class ChatCommand {
             const isPolicyAck = /^(i will follow|i understand|i('ll| will) adhere|understood[.,!]|sure[.,!]|provide your|waiting for|i('ll| will) proceed)/i.test(responseText)
                 || (responseText.length < 200 && /follow the instructions|next instruction|ready to assist/i.test(responseText));
             if (isPolicyAck) {
-                throw new api_js_1.CLIError('Operator workflow returned a non-actionable acknowledgement instead of a grounded result.', 'model_backend');
+                throw new CLIError('Operator workflow returned a non-actionable acknowledgement instead of a grounded result.', 'model_backend');
             }
             if (this.jsonOutput) {
                 console.log(JSON.stringify({
@@ -1313,9 +1329,10 @@ class ChatCommand {
             else {
                 console.log(response.content || 'Operator workflow completed.');
                 if (response.savedWorkflow?.id) {
-                    console.log(chalk_1.default.gray(`Saved VigFlow workflow: ${response.savedWorkflow.id}${response.savedWorkflow.name ? ` (${response.savedWorkflow.name})` : ''}`));
+                    console.log(chalk.gray(`Saved VigFlow workflow: ${response.savedWorkflow.id}${response.savedWorkflow.name ? ` (${response.savedWorkflow.name})` : ''}`));
                 }
             }
+            this.rememberBrainEvent('validation', `GoA operator workflow completed${response.workflowId ? ` workflow ${response.workflowId}` : ''}${response.savedWorkflow?.id ? ` saved VigFlow ${response.savedWorkflow.id}` : ''}.`, 'operator');
             this.messages.push({ role: 'assistant', content: response.content || 'Operator workflow completed.' });
             this.saveSession();
         }
@@ -1323,11 +1340,12 @@ class ChatCommand {
             if (spinner) {
                 spinner.stop();
             }
-            const cliErr = error instanceof api_js_1.CLIError ? error : (0, api_js_1.classifyError)(error);
-            const errorMsg = (0, api_js_1.formatCLIError)(cliErr);
+            const cliErr = error instanceof CLIError ? error : classifyError(error);
+            const errorMsg = formatCLIError(cliErr);
             if (!this.jsonOutput) {
                 this.logger.error('Operator workflow failed');
             }
+            this.rememberBrainEvent('issue', `GoA operator workflow failed: ${errorMsg}`, 'operator');
             if (this.jsonOutput) {
                 process.exitCode = 1;
                 console.log(JSON.stringify({
@@ -1350,8 +1368,8 @@ class ChatCommand {
      * BMAD orchestrator to scan the workspace.
      */
     async runOperatorDirectAnswer(prompt) {
-        (0, bridge_client_js_1.getBridgeClient)()?.emitPrompt({ prompt, mode: 'operator-direct', model: this.currentModel });
-        const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: 'Operator (direct)...', spinner: 'clock' }).start();
+        getBridgeClient()?.emitPrompt({ prompt, mode: 'operator-direct', model: this.currentModel });
+        const spinner = this.jsonOutput ? null : createSpinner({ text: 'Operator (direct)...', spinner: 'clock' }).start();
         try {
             let operatorGrounding = [
                 'You are Vigthoria Operator, a DevOps and infrastructure analysis assistant.',
@@ -1383,7 +1401,7 @@ class ChatCommand {
             const isPolicyAck = /^(i will follow|i understand|i('ll| will) adhere|understood[.,!]|sure[.,!]|provide your|waiting for|i('ll| will) proceed)/i.test(content)
                 || (content.length < 200 && /follow the instructions|next instruction|ready to assist/i.test(content));
             if (isPolicyAck || !content) {
-                throw new api_js_1.CLIError('Operator returned a non-actionable acknowledgement instead of a grounded result.', 'model_backend');
+                throw new CLIError('Operator returned a non-actionable acknowledgement instead of a grounded result.', 'model_backend');
             }
             if (this.jsonOutput) {
                 console.log(JSON.stringify({
@@ -1396,14 +1414,15 @@ class ChatCommand {
             else {
                 console.log(content);
             }
+            this.rememberBrainEvent('validation', `GoA operator direct answer completed for prompt: ${prompt.slice(0, 220)}`, 'operator');
             this.messages.push({ role: 'assistant', content });
             this.saveSession();
         }
         catch (error) {
             if (spinner)
                 spinner.stop();
-            const cliErr = error instanceof api_js_1.CLIError ? error : (0, api_js_1.classifyError)(error);
-            const errorMsg = (0, api_js_1.formatCLIError)(cliErr);
+            const cliErr = error instanceof CLIError ? error : classifyError(error);
+            const errorMsg = formatCLIError(cliErr);
             if (this.jsonOutput) {
                 process.exitCode = 1;
                 console.log(JSON.stringify({
@@ -1475,8 +1494,8 @@ class ChatCommand {
             }
         }
         this.messages.push({ role: 'user', content: this.buildExecutionPrompt(prompt) });
-        (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();
+        getBridgeClient()?.emitPrompt({ prompt, mode: 'chat', model: this.currentModel });
+        const spinner = this.jsonOutput ? null : createSpinner({ text: 'Thinking...', spinner: 'clock' }).start();
         try {
             const response = await this.callApi('Send chat message', () => this.api.chat(this.getMessagesForModel(), this.currentModel));
             if (spinner)
@@ -1500,7 +1519,7 @@ class ChatCommand {
                 console.log(finalText);
             }
             else {
-                console.log(chalk_1.default.yellow('The model returned an empty response. Try rephrasing your question, or use --agent mode for grounded repo analysis.'));
+                console.log(chalk.yellow('The model returned an empty response. Try rephrasing your question, or use --agent mode for grounded repo analysis.'));
             }
             this.messages.push({ role: 'assistant', content: response.message || '' });
             this.saveSession();
@@ -1508,8 +1527,8 @@ class ChatCommand {
         catch (error) {
             if (spinner)
                 spinner.stop();
-            const cliErr = error instanceof api_js_1.CLIError ? error : (0, api_js_1.classifyError)(error);
-            const errorMsg = (0, api_js_1.formatCLIError)(cliErr);
+            const cliErr = error instanceof CLIError ? error : classifyError(error);
+            const errorMsg = formatCLIError(cliErr);
             if (this.jsonOutput) {
                 process.exitCode = 1;
                 console.log(JSON.stringify({
@@ -1562,13 +1581,13 @@ class ChatCommand {
         this.directToolContinuationCount = 0;
         this.agentToolEvidence = { discovery: 0, mutation: 0, searchFailed: 0 };
         this.tools.clearSessionApprovals();
-        (0, bridge_client_js_1.getBridgeClient)()?.emitPrompt({ prompt, mode: this.operatorMode ? 'operator' : 'agent', model: this.currentModel });
+        getBridgeClient()?.emitPrompt({ prompt, mode: this.operatorMode ? 'operator' : 'agent', model: this.currentModel });
         this.ensureAgentSystemPrompt();
         this.messages.push({ role: 'user', content: this.buildScopedUserPrompt(prompt) });
         this.saveSession();
         const maxTurns = 10;
         for (let turn = 0; turn < maxTurns; turn += 1) {
-            const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({ text: turn === 0 ? 'Planning...' : 'Continuing...', spinner: 'clock' }).start();
+            const spinner = this.jsonOutput ? null : createSpinner({ text: turn === 0 ? 'Planning...' : 'Continuing...', spinner: 'clock' }).start();
             let response;
             try {
                 response = await this.callApi('Send agent chat message', () => this.api.chat(this.getMessagesForModel(), this.currentModel), 0);
@@ -1619,7 +1638,7 @@ class ChatCommand {
                 this.messages.push({ role: 'assistant', content: assistantMessage });
                 const toolCalls = this.extractToolCalls(assistantMessage);
                 const visibleText = this.stripToolPayloads(assistantMessage).trim();
-                (0, bridge_client_js_1.getBridgeClient)()?.emitModelResponse({
+                getBridgeClient()?.emitModelResponse({
                     model: this.currentModel,
                     chars: assistantMessage.length,
                     hasToolCalls: toolCalls.length > 0,
@@ -1700,8 +1719,9 @@ class ChatCommand {
             catch (error) {
                 if (spinner)
                     spinner.stop();
-                const cliErr = error instanceof api_js_1.CLIError ? error : (0, api_js_1.classifyError)(error);
-                const errorMsg = (0, api_js_1.formatCLIError)(cliErr);
+                const cliErr = error instanceof CLIError ? error : classifyError(error);
+                const errorMsg = formatCLIError(cliErr);
+                this.rememberBrainEvent('issue', `Agent turn failed: ${errorMsg}`, 'agent');
                 if (this.jsonOutput) {
                     process.exitCode = 1;
                     console.log(JSON.stringify({
@@ -1758,12 +1778,12 @@ class ChatCommand {
             args: { path: targetFile },
         };
         if (!this.jsonOutput) {
-            console.log(chalk_1.default.cyan(`⚙ Executing: ${readCall.tool}`));
+            console.log(chalk.cyan(`⚙ Executing: ${readCall.tool}`));
         }
         const readResult = await this.tools.execute(readCall);
         const readSummary = this.formatToolResult(readCall, readResult);
         if (!this.jsonOutput) {
-            console.log(readResult.success ? chalk_1.default.gray(readSummary) : chalk_1.default.red(readSummary));
+            console.log(readResult.success ? chalk.gray(readSummary) : chalk.red(readSummary));
         }
         this.messages.push({ role: 'system', content: readSummary });
         if (!readResult.success || !readResult.output) {
@@ -1806,12 +1826,12 @@ class ChatCommand {
             },
         };
         if (!this.jsonOutput) {
-            console.log(chalk_1.default.cyan(`⚙ Executing: ${writeCall.tool}`));
+            console.log(chalk.cyan(`⚙ Executing: ${writeCall.tool}`));
         }
         const writeResult = await this.tools.execute(writeCall);
         const writeSummary = this.formatToolResult(writeCall, writeResult);
         if (!this.jsonOutput) {
-            console.log(writeResult.success ? chalk_1.default.gray(writeSummary) : chalk_1.default.red(writeSummary));
+            console.log(writeResult.success ? chalk.gray(writeSummary) : chalk.red(writeSummary));
         }
         this.messages.push({ role: 'system', content: writeSummary });
         if (!writeResult.success) {
@@ -1847,31 +1867,131 @@ class ChatCommand {
             console.log(`Updated ${targetFile}.`);
             if (previewGate.required) {
                 if (previewGate.passed) {
-                    console.log(chalk_1.default.gray(`Template Service preview gate: passed via ${previewGate.backendUrl || 'unknown backend'}`));
+                    console.log(chalk.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}` : ''}`));
+                    console.log(chalk.yellow(`Template Service preview gate: failed${previewGate.error ? ` - ${previewGate.error}` : ''}`));
                 }
             }
         }
         return true;
     }
+    isConfirmationFollowUp(prompt) {
+        const normalized = prompt.trim().toLowerCase().replace(/[.!?]+$/g, '').replace(/\s+/g, ' ');
+        return /^(ja|ja bitte|ja bitte mach das|mach das|bitte mach das|genau|ok|okay|yes|yes please|please do|do it|go ahead|continue|proceed|make it so)$/.test(normalized);
+    }
+    getPreviousActionablePrompt() {
+        if (this.lastActionableUserInput && !this.isConfirmationFollowUp(this.lastActionableUserInput)) {
+            return this.lastActionableUserInput;
+        }
+        for (let i = this.messages.length - 1; i >= 0; i -= 1) {
+            const message = this.messages[i];
+            if (message.role !== 'user')
+                continue;
+            const content = (message.content || '').trim();
+            if (!content || this.isConfirmationFollowUp(content))
+                continue;
+            return content
+                .replace(/\n\nProject root:[\s\S]*$/i, '')
+                .replace(/\n\nStay within this project root[\s\S]*$/i, '')
+                .trim();
+        }
+        return '';
+    }
+    buildContextualAgentPrompt(prompt) {
+        if (!this.isConfirmationFollowUp(prompt)) {
+            return prompt;
+        }
+        const previousPrompt = this.getPreviousActionablePrompt();
+        if (!previousPrompt) {
+            return prompt;
+        }
+        return [
+            'The user confirmed the previous agent task. Continue and execute that original task now.',
+            '',
+            'Original task:',
+            previousPrompt,
+            '',
+            `Latest confirmation: ${prompt}`,
+            '',
+            'Do not reinterpret this confirmation as a new website, landing page, template, or index.html task.',
+        ].join('\n');
+    }
     async tryV3AgentWorkflow(prompt) {
-        const runtimeContext = await this.getPromptRuntimeContext(prompt);
-        const routingPolicy = this.resolveAgentExecutionPolicy(prompt);
+        const contextualPrompt = this.buildContextualAgentPrompt(prompt);
+        if (contextualPrompt === prompt && !this.isConfirmationFollowUp(prompt)) {
+            this.lastActionableUserInput = prompt;
+        }
+        this.messages.push({ role: 'user', content: contextualPrompt });
+        const runtimeContext = await this.getPromptRuntimeContext(contextualPrompt);
+        const routingPolicy = this.resolveAgentExecutionPolicy(contextualPrompt);
         // 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);
+        const taskDisplay = new TaskDisplay(['Analyse workspace', 'Execute tasks', 'Validate output', 'Self-heal'], !this.jsonOutput);
         taskDisplay.start(0);
-        const spinner = this.jsonOutput ? null : (0, logger_js_1.createSpinner)({
+        const spinner = this.jsonOutput ? null : createSpinner({
             text: routingPolicy.cloudSelected ? 'Routing heavy task to Vigthoria Cloud...' : 'Routing to V3 Agent...',
             spinner: 'clock',
         }).start();
-        const executionPrompt = this.buildExecutionPrompt(prompt);
-        const agentTaskType = this.inferAgentTaskType(prompt);
+        // Live run telemetry, used both for the final summary block and for /retry, /continue.
+        const liveOutcome = {
+            tasksSucceeded: 0,
+            tasksTotal: 0,
+            failedTaskIds: new Set(),
+            unfinishedTaskIds: new Set(),
+            qualityScore: null,
+            qualityMissing: [],
+            qualityBlockers: [],
+            plannerError: null,
+            executorError: null,
+            executorFailed: false,
+        };
+        const parsePlannerSummary = (raw) => {
+            if (!raw || typeof raw !== 'string')
+                return;
+            const succ = raw.match(/(\d+)\s*\/\s*(\d+)\s+tasks?\s+succeeded/i);
+            if (succ) {
+                liveOutcome.tasksSucceeded = Number(succ[1]) || 0;
+                liveOutcome.tasksTotal = Number(succ[2]) || 0;
+            }
+            const failed = raw.match(/Failed\s+tasks?:\s*([^.\n]+)/i);
+            if (failed) {
+                failed[1].split(/[,\s]+/).map(s => s.trim()).filter(Boolean)
+                    .forEach(t => liveOutcome.failedTaskIds.add(t));
+            }
+            const unfinished = raw.match(/Unfinished\s+tasks?:\s*([^.\n]+)/i);
+            if (unfinished) {
+                unfinished[1].split(/[,\s]+/).map(s => s.trim()).filter(Boolean)
+                    .forEach(t => liveOutcome.unfinishedTaskIds.add(t));
+            }
+            const qScore = raw.match(/Quality\s+audit:\s*([0-9.]+)\s*\/\s*100/i);
+            if (qScore) {
+                const n = Number(qScore[1]);
+                if (Number.isFinite(n))
+                    liveOutcome.qualityScore = n;
+            }
+            const blockers = raw.match(/Quality\s+blockers?:\s*([^\n]+?)(?:\s+Quality\s+audit|$)/i);
+            if (blockers) {
+                blockers[1].split(/;/).map(s => s.trim()).filter(Boolean)
+                    .forEach(b => {
+                    if (!liveOutcome.qualityBlockers.includes(b))
+                        liveOutcome.qualityBlockers.push(b);
+                });
+            }
+            const missingFeatures = raw.match(/Missing\s+features?:\s*([^\n]+)/i);
+            if (missingFeatures) {
+                missingFeatures[1].split(/[,;]/).map(s => s.trim()).filter(Boolean)
+                    .forEach(m => {
+                    if (!liveOutcome.qualityMissing.includes(m))
+                        liveOutcome.qualityMissing.push(m);
+                });
+            }
+        };
+        const executionPrompt = this.buildExecutionPrompt(contextualPrompt);
+        const agentTaskType = this.inferAgentTaskType(contextualPrompt);
         const workspaceContext = {
             workspacePath: this.currentProjectPath,
             projectPath: this.currentProjectPath,
@@ -1881,7 +2001,7 @@ class ChatCommand {
         // Start workspace watcher for bidirectional real-time sync
         let watcher = null;
         if (this.currentProjectPath && fs.existsSync(this.currentProjectPath)) {
-            watcher = new workspace_stream_js_1.WorkspaceWatcher({
+            watcher = new WorkspaceWatcher({
                 workspaceRoot: this.currentProjectPath,
                 onFileChange: (relativePath, content, action) => {
                     this.logger.debug(`Local change detected: ${action} ${relativePath}`);
@@ -1905,16 +2025,52 @@ class ChatCommand {
                 agentExecutionPolicy: routingPolicy,
                 legacyFallbackAllowed: this.isLegacyAgentFallbackAllowed(),
                 rawPrompt: prompt,
+                contextualPrompt,
                 history: this.getMessagesForModel(),
                 ...runtimeContext,
                 onStreamEvent: (event) => {
                     if (event.type === 'plan') {
                         taskDisplay.complete(0);
                         taskDisplay.start(1);
+                        const tasks = event?.plan?.tasks;
+                        if (Array.isArray(tasks))
+                            liveOutcome.tasksTotal = tasks.length;
                     }
                     else if (event.type === 'executor_start') {
                         taskDisplay.start(1);
                     }
+                    else if (event.type === 'executor_complete') {
+                        const summary = event.summary || {};
+                        const tid = summary.task_id || summary.id;
+                        if (summary.status === 'failed') {
+                            if (tid)
+                                liveOutcome.failedTaskIds.add(String(tid));
+                            liveOutcome.executorFailed = true;
+                        }
+                        else if (summary.status === 'completed' || summary.status === 'success') {
+                            if (tid)
+                                liveOutcome.failedTaskIds.delete(String(tid));
+                            liveOutcome.tasksSucceeded += 1;
+                        }
+                    }
+                    else if (event.type === 'executor_error') {
+                        const msg = typeof event.error === 'string' ? event.error : '';
+                        if (msg)
+                            liveOutcome.executorError = msg;
+                    }
+                    else if (event.type === 'error') {
+                        const msg = typeof event.message === 'string' ? event.message : '';
+                        if (/plan|planner|dependency graph/i.test(msg)) {
+                            if (!liveOutcome.plannerError)
+                                liveOutcome.plannerError = msg;
+                            parsePlannerSummary(msg);
+                        }
+                        else if (/executor|task failed|iteration/i.test(msg)) {
+                            if (!liveOutcome.executorError)
+                                liveOutcome.executorError = msg;
+                            parsePlannerSummary(msg);
+                        }
+                    }
                     else if (event.type === 'complete') {
                         taskDisplay.complete(1);
                     }
@@ -1967,7 +2123,7 @@ class ChatCommand {
                 return true;
             }
             if (!this.jsonOutput && previewGate?.required && previewGate?.passed !== true && workspaceHasOutput) {
-                console.log(chalk_1.default.yellow(`Template Service preview gate did not fully validate this output, but generated workspace files were preserved${previewGate?.error ? `: ${previewGate.error}` : '.'}`));
+                console.log(chalk.yellow(`Template Service preview gate did not fully validate this output, but generated workspace files were preserved${previewGate?.error ? `: ${previewGate.error}` : '.'}`));
             }
             if (this.jsonOutput) {
                 console.log(JSON.stringify({
@@ -1985,45 +2141,63 @@ class ChatCommand {
             else if (this.v3StreamingStarted) {
                 // Content was already streamed to stdout in real-time; skip duplicate print.
                 if (!this.jsonOutput) {
-                    console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
+                    console.log(chalk.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
                 }
             }
             else if (response.content) {
                 if (!this.directPromptMode) {
-                    console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
+                    console.log(chalk.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
                 }
                 console.log(response.content);
             }
             else {
                 if (!this.directPromptMode) {
-                    console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
+                    console.log(chalk.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
                 }
                 console.log('V3 agent workflow completed.');
             }
             if (!this.jsonOutput && previewGate?.required) {
                 if (previewGate.passed) {
-                    console.log(chalk_1.default.gray(`Template Service preview gate: passed via ${previewGate.backendUrl || 'unknown backend'}`));
+                    console.log(chalk.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}` : ''}`));
+                    console.log(chalk.yellow(`Template Service preview gate: failed${previewGate.error ? ` - ${previewGate.error}` : ''}`));
                 }
             }
             // Show change summary for files touched by the agent
             if (!this.jsonOutput && !this.directPromptMode && response.changedFiles) {
                 const fileCount = Object.keys(response.changedFiles).length;
                 if (fileCount > 0) {
-                    console.log(chalk_1.default.gray(`\nFiles changed: ${fileCount}`));
+                    console.log(chalk.gray(`\nFiles changed: ${fileCount}`));
                     for (const relPath of Object.keys(response.changedFiles).slice(0, 15)) {
-                        console.log(chalk_1.default.gray(`  ${chalk_1.default.green('+')} ${relPath}`));
+                        console.log(chalk.gray(`  ${chalk.green('+')} ${relPath}`));
                     }
                     if (fileCount > 15) {
-                        console.log(chalk_1.default.gray(`  ... and ${fileCount - 15} more`));
+                        console.log(chalk.gray(`  ... and ${fileCount - 15} more`));
                     }
-                    console.log(chalk_1.default.gray(`Run ${chalk_1.default.cyan('vigthoria preview --diff')} for full visual diffs.`));
+                    console.log(chalk.gray(`Run ${chalk.cyan('vigthoria preview --diff')} for full visual diffs.`));
                 }
             }
+            // Resolve the Execute-tasks spinner: only mark it ✓ when the run actually
+            // produced real, validated output. Otherwise the user just saw a wall of
+            // executor errors and the spinner needs to clearly say "failed", not "✓".
+            let selfHealStatus = null;
+            let selfHealTool = null;
+            const executorSucceeded = !liveOutcome.executorFailed
+                && !liveOutcome.plannerError
+                && !liveOutcome.executorError
+                && workspaceHasOutput;
+            if (executorSucceeded) {
+                taskDisplay.complete(1);
+            }
+            else {
+                const failDetail = liveOutcome.failedTaskIds.size > 0
+                    ? `failed: ${[...liveOutcome.failedTaskIds].slice(0, 4).join(', ')}`
+                    : (liveOutcome.executorError ? 'executor error' : (liveOutcome.plannerError ? 'planner error' : 'incomplete'));
+                taskDisplay.fail(1, failDetail);
+            }
             // ── Self-healing validation ──────────────────────────────────────
-            if (this.currentProjectPath && !this.jsonOutput && success) {
+            if (this.currentProjectPath && !this.jsonOutput && success && executorSucceeded) {
                 try {
                     taskDisplay.start(2, 'validating...');
                     const healResult = await this.api.runSelfHealingCycle(executionPrompt, this.currentProjectPath, workspaceContext);
@@ -2031,32 +2205,60 @@ class ChatCommand {
                         taskDisplay.complete(2);
                         if (healResult.passed) {
                             taskDisplay.complete(3);
+                            selfHealStatus = 'passed';
                         }
                         else {
                             taskDisplay.fail(3, healResult.tool);
+                            selfHealStatus = 'partial';
                         }
+                        selfHealTool = healResult.tool || null;
                         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})`));
+                            const hs = healResult.passed ? chalk.green('passed') : chalk.yellow('partial');
+                            console.log(chalk.gray(`Self-healing: ${hs} (${healResult.tool})`));
                         }
                     }
                     else {
                         taskDisplay.skip(2);
                         taskDisplay.skip(3);
+                        selfHealStatus = 'skipped';
                     }
                 }
                 catch (error) {
                     this.logger.debug(`Self-healing validation failed: ${error instanceof Error ? error.message : String(error)}`);
                     taskDisplay.skip(2);
                     taskDisplay.skip(3);
+                    selfHealStatus = 'failed';
                 }
             }
             else {
                 taskDisplay.skip(2);
                 taskDisplay.skip(3);
+                selfHealStatus = 'skipped';
             }
             taskDisplay.finalize();
             // ────────────────────────────────────────────────────────────────
+            this.lastAgentRunOutcome = {
+                prompt,
+                taskId: response.taskId || null,
+                contextId: response.contextId || null,
+                tasksSucceeded: liveOutcome.tasksSucceeded,
+                tasksTotal: liveOutcome.tasksTotal,
+                failedTaskIds: [...liveOutcome.failedTaskIds],
+                unfinishedTaskIds: [...liveOutcome.unfinishedTaskIds],
+                qualityScore: liveOutcome.qualityScore,
+                qualityMissing: liveOutcome.qualityMissing,
+                qualityBlockers: liveOutcome.qualityBlockers,
+                hasOutput: workspaceHasOutput,
+                selfHealStatus,
+                selfHealTool,
+                plannerError: liveOutcome.plannerError ? sanitizeUserFacingErrorText(liveOutcome.plannerError) : null,
+                executorError: liveOutcome.executorError ? sanitizeUserFacingErrorText(liveOutcome.executorError) : null,
+                finishedAt: Date.now(),
+            };
+            if (!this.jsonOutput && !this.directPromptMode) {
+                const changedFileCount = response.changedFiles ? Object.keys(response.changedFiles).length : 0;
+                this.printAgentRunSummary(this.lastAgentRunOutcome, executorSucceeded, changedFileCount);
+            }
             this.messages.push({ role: 'assistant', content: response.content || 'V3 agent workflow completed.' });
             watcher?.stop();
             return true;
@@ -2074,18 +2276,45 @@ class ChatCommand {
                     spinner.stop();
                 }
                 this.logger.warn('Falling back to legacy CLI agent loop');
-                this.logger.debug(`V3 agent workflow unavailable: ${(0, api_js_1.sanitizeUserFacingErrorText)(error.message || '')}`);
+                this.logger.debug(`V3 agent workflow unavailable: ${sanitizeUserFacingErrorText(error.message || '')}`);
                 return false;
             }
             if (spinner) {
                 spinner.stop();
             }
-            const safeDetail = (0, api_js_1.sanitizeUserFacingErrorText)(error.message || '');
+            const safeDetail = sanitizeUserFacingErrorText(error.message || '');
             const errorMessage = safeDetail
                 ? `Agent mode is unavailable right now. ${safeDetail}`
                 : 'Agent mode is unavailable right now. Please retry shortly or run vigthoria login if the issue persists.';
             this.logger.error(errorMessage);
             this.messages.push({ role: 'assistant', content: errorMessage });
+            // Resolve any half-rendered TaskDisplay spinners before the prompt
+            // comes back, otherwise the user sees `⟳ Execute tasks` next to `>`.
+            try {
+                taskDisplay.fail(1, 'agent unavailable');
+                taskDisplay.skip(2);
+                taskDisplay.skip(3);
+                taskDisplay.finalize();
+            }
+            catch (_) { /* render is best-effort */ }
+            this.lastAgentRunOutcome = {
+                prompt,
+                taskId: null,
+                contextId: null,
+                tasksSucceeded: liveOutcome.tasksSucceeded,
+                tasksTotal: liveOutcome.tasksTotal,
+                failedTaskIds: [...liveOutcome.failedTaskIds],
+                unfinishedTaskIds: [...liveOutcome.unfinishedTaskIds],
+                qualityScore: liveOutcome.qualityScore,
+                qualityMissing: liveOutcome.qualityMissing,
+                qualityBlockers: liveOutcome.qualityBlockers,
+                hasOutput: this.api.hasAgentWorkspaceOutput(workspaceContext),
+                selfHealStatus: 'skipped',
+                selfHealTool: null,
+                plannerError: liveOutcome.plannerError ? sanitizeUserFacingErrorText(liveOutcome.plannerError) : null,
+                executorError: liveOutcome.executorError ? sanitizeUserFacingErrorText(liveOutcome.executorError) : safeDetail || null,
+                finishedAt: Date.now(),
+            };
             if (this.jsonOutput) {
                 process.exitCode = 1;
                 console.log(JSON.stringify({
@@ -2098,6 +2327,9 @@ class ChatCommand {
                     metadata: { executionPath: 'v3-agent' },
                 }, null, 2));
             }
+            else if (!this.directPromptMode) {
+                this.printAgentRunSummary(this.lastAgentRunOutcome, false, 0);
+            }
             return true;
         }
     }
@@ -2110,7 +2342,7 @@ class ChatCommand {
             spinner.stop();
         }
         if (!this.jsonOutput) {
-            console.log(chalk_1.default.yellow(`V3 recovery: ${recovery.message} Retrying once...`));
+            console.log(chalk.yellow(`V3 recovery: ${recovery.message} Retrying once...`));
         }
         this.v3IterationCount = 0;
         this.v3ToolCallCount = 0;
@@ -2154,7 +2386,7 @@ class ChatCommand {
                 }, null, 2));
             }
             else if (!this.v3StreamingStarted && retryResponse.content) {
-                console.log(chalk_1.default.gray(`Agent routing: ${routingPolicy.cloudSelected ? 'Vigthoria Cloud' : 'V3 Agent'}`));
+                console.log(chalk.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.' });
@@ -2171,10 +2403,10 @@ class ChatCommand {
                 ? 'Interactive Agent Chat'
                 : 'Interactive Chat';
         this.logger.section(this.workflowTarget ? `${chatTitle} Via Workflow Target` : chatTitle);
-        console.log(chalk_1.default.gray('Type /help for commands. Type /exit to quit.'));
-        console.log(chalk_1.default.gray('Multi-line: end a line with \\ or start a block with {{{ and end with }}}'));
+        console.log(chalk.gray('Type /help for commands. Type /exit to quit.'));
+        console.log(chalk.gray('Multi-line: end a line with \\ or start a block with {{{ and end with }}}'));
         if (this.workflowTarget) {
-            console.log(chalk_1.default.gray(`Workflow target: ${this.workflowTarget}`));
+            console.log(chalk.gray(`Workflow target: ${this.workflowTarget}`));
         }
         const rl = readline.createInterface({
             input: process.stdin,
@@ -2184,17 +2416,17 @@ class ChatCommand {
         const readMultiLineInput = async () => {
             const lines = [];
             let firstLine = await new Promise((resolve) => {
-                rl.question(chalk_1.default.blue('> '), resolve);
+                rl.question(chalk.blue('> '), resolve);
             });
             // Check for {{{ block mode
             if (firstLine.trim() === '{{{' || firstLine.trim().endsWith('{{{')) {
                 if (firstLine.trim() !== '{{{') {
                     lines.push(firstLine.trim().replace(/\{\{\{$/, '').trim());
                 }
-                console.log(chalk_1.default.gray('  (multi-line mode: type }}} on its own line to finish)'));
+                console.log(chalk.gray('  (multi-line mode: type }}} on its own line to finish)'));
                 while (true) {
                     const line = await new Promise((resolve) => {
-                        rl.question(chalk_1.default.gray('  '), resolve);
+                        rl.question(chalk.gray('  '), resolve);
                     });
                     if (line.trim() === '}}}')
                         break;
@@ -2206,7 +2438,7 @@ class ChatCommand {
             while (firstLine.endsWith('\\')) {
                 lines.push(firstLine.slice(0, -1));
                 firstLine = await new Promise((resolve) => {
-                    rl.question(chalk_1.default.gray('  '), resolve);
+                    rl.question(chalk.gray('  '), resolve);
                 });
             }
             lines.push(firstLine);
@@ -2230,6 +2462,10 @@ class ChatCommand {
                 this.showContext();
                 continue;
             }
+            if (trimmed === '/memory') {
+                this.showProjectMemory();
+                continue;
+            }
             if (trimmed === '/compact') {
                 this.compactCurrentSession();
                 continue;
@@ -2243,8 +2479,8 @@ class ChatCommand {
                 else {
                     this.syncInteractiveModeModel('chat');
                 }
-                console.log(chalk_1.default.yellow(`Agent mode: ${this.agentMode ? 'ON' : 'OFF'}`));
-                console.log(chalk_1.default.gray(`Model: ${this.currentModel}`));
+                console.log(chalk.yellow(`Agent mode: ${this.agentMode ? 'ON' : 'OFF'}`));
+                console.log(chalk.gray(`Model: ${this.currentModel}`));
                 if (this.currentSession) {
                     this.currentSession.agentMode = this.agentMode;
                     this.currentSession.operatorMode = this.operatorMode;
@@ -2266,8 +2502,8 @@ class ChatCommand {
                 else {
                     this.syncInteractiveModeModel('chat');
                 }
-                console.log(chalk_1.default.yellow(`Operator mode: ${this.operatorMode ? 'ON' : 'OFF'}`));
-                console.log(chalk_1.default.gray(`Model: ${this.currentModel}`));
+                console.log(chalk.yellow(`Operator mode: ${this.operatorMode ? 'ON' : 'OFF'}`));
+                console.log(chalk.gray(`Model: ${this.currentModel}`));
                 if (this.currentSession) {
                     this.currentSession.agentMode = this.agentMode;
                     this.currentSession.operatorMode = this.operatorMode;
@@ -2278,18 +2514,50 @@ class ChatCommand {
             }
             if (trimmed === '/clear') {
                 this.messages = [];
-                console.log(chalk_1.default.yellow('Conversation cleared.'));
+                console.log(chalk.yellow('Conversation cleared.'));
+                continue;
+            }
+            if (trimmed === '/status') {
+                this.showAgentRunStatus();
+                continue;
+            }
+            if (trimmed === '/retry') {
+                const followUp = this.buildRetryPrompt();
+                if (!followUp) {
+                    console.log(chalk.yellow('Nothing to retry — run an agent task first.'));
+                    continue;
+                }
+                if (!this.agentMode) {
+                    this.agentMode = true;
+                    this.syncInteractiveModeModel('agent');
+                    console.log(chalk.gray('Agent mode re-enabled for retry.'));
+                }
+                await this.runAgentTurn(followUp);
+                continue;
+            }
+            if (trimmed === '/continue') {
+                const followUp = this.buildContinuePrompt();
+                if (!followUp) {
+                    console.log(chalk.yellow('Nothing to continue — run an agent task first.'));
+                    continue;
+                }
+                if (!this.agentMode) {
+                    this.agentMode = true;
+                    this.syncInteractiveModeModel('agent');
+                    console.log(chalk.gray('Agent mode re-enabled for continuation.'));
+                }
+                await this.runAgentTurn(followUp);
                 continue;
             }
             if (trimmed === '/save') {
                 this.saveSession();
-                console.log(chalk_1.default.green('Session saved.'));
+                console.log(chalk.green('Session saved.'));
                 continue;
             }
             if (trimmed.startsWith('/model ')) {
                 this.currentModel = trimmed.slice(7).trim() || this.currentModel;
                 this.modelExplicitlySelected = true;
-                console.log(chalk_1.default.yellow(`Model changed to: ${this.currentModel}`));
+                console.log(chalk.yellow(`Model changed to: ${this.currentModel}`));
                 if (this.currentSession) {
                     this.currentSession.model = this.currentModel;
                     this.saveSession();
@@ -2313,42 +2581,203 @@ class ChatCommand {
     showHelp() {
         console.log('');
         console.log('Commands:');
-        console.log('  /help   Show this help');
-        console.log('  /exit   Exit chat');
-        console.log('  /agent  Toggle agent mode');
-        console.log('  /operator  Toggle BMAD operator mode');
-        console.log('  /context  Show current session memory');
-        console.log('  /compact  Compact current session into memory summary');
-        console.log('  /clear  Clear conversation');
-        console.log('  /save   Save session');
+        console.log('  /help          Show this help');
+        console.log('  /exit          Exit chat');
+        console.log('  /agent         Toggle agent mode');
+        console.log('  /operator      Toggle BMAD operator mode');
+        console.log('  /context       Show current session and project memory');
+        console.log('  /memory        Show Vigthoria project brain status');
+        console.log('  /compact       Compact current session into memory summary');
+        console.log('  /clear         Clear conversation');
+        console.log('  /save          Save session');
         console.log('  /model <name>  Change model');
+        console.log('  /status        Show the last agent run outcome');
+        console.log('  /retry         Re-run the last failed agent task');
+        console.log('  /continue      Ask the agent to keep working on unfinished tasks');
+        console.log('');
+    }
+    /**
+     * Print a clear, opinionated end-of-run summary after every agent workflow.
+     *
+     * Goals:
+     *   - User can answer "Did it succeed?" in one glance.
+     *   - User can answer "What do I type next?" without reading 200 scrollback lines.
+     *   - Never leave the spinners (`⟳`, `–`) ambiguous when the prompt returns.
+     */
+    printAgentRunSummary(outcome, executorSucceeded, changedFileCount) {
+        const bar = chalk.gray('─'.repeat(63));
+        const ok = chalk.green('✓');
+        const warn = chalk.yellow('⚠');
+        const bad = chalk.red('✗');
+        const failedList = outcome.failedTaskIds.slice(0, 8);
+        const unfinishedList = outcome.unfinishedTaskIds.slice(0, 8);
+        const hasTaskInfo = outcome.tasksTotal > 0 || failedList.length > 0 || unfinishedList.length > 0;
+        console.log('');
+        console.log(bar);
+        if (executorSucceeded && outcome.selfHealStatus !== 'partial' && outcome.selfHealStatus !== 'failed' && failedList.length === 0) {
+            console.log(`${ok} ${chalk.bold('Agent run finished')}${changedFileCount ? chalk.gray(` — ${changedFileCount} file${changedFileCount === 1 ? '' : 's'} changed`) : ''}`);
+        }
+        else if (executorSucceeded) {
+            console.log(`${warn} ${chalk.bold('Agent run finished with warnings')}${changedFileCount ? chalk.gray(` — ${changedFileCount} file${changedFileCount === 1 ? '' : 's'} changed`) : ''}`);
+        }
+        else {
+            console.log(`${bad} ${chalk.bold('Agent run did not complete')}${changedFileCount ? chalk.gray(` — ${changedFileCount} file${changedFileCount === 1 ? '' : 's'} changed`) : ''}`);
+        }
+        if (hasTaskInfo) {
+            const succ = outcome.tasksTotal > 0 ? `${outcome.tasksSucceeded}/${outcome.tasksTotal}` : `${outcome.tasksSucceeded}`;
+            console.log(chalk.gray(`  Tasks completed: ${succ}`));
+            if (failedList.length > 0) {
+                const more = outcome.failedTaskIds.length > failedList.length ? chalk.gray(` (+${outcome.failedTaskIds.length - failedList.length} more)`) : '';
+                console.log(chalk.gray('  Failed:   ') + chalk.red(failedList.join(', ')) + more);
+            }
+            if (unfinishedList.length > 0) {
+                const more = outcome.unfinishedTaskIds.length > unfinishedList.length ? chalk.gray(` (+${outcome.unfinishedTaskIds.length - unfinishedList.length} more)`) : '';
+                console.log(chalk.gray('  Pending:  ') + chalk.yellow(unfinishedList.join(', ')) + more);
+            }
+        }
+        if (typeof outcome.qualityScore === 'number') {
+            const score = outcome.qualityScore.toFixed(1);
+            const colour = outcome.qualityScore >= 70 ? chalk.green : outcome.qualityScore >= 30 ? chalk.yellow : chalk.red;
+            console.log(chalk.gray('  Quality:  ') + colour(`${score}/100`));
+        }
+        if (outcome.qualityBlockers.length > 0) {
+            const list = outcome.qualityBlockers.slice(0, 3).join('; ');
+            const more = outcome.qualityBlockers.length > 3 ? chalk.gray(` (+${outcome.qualityBlockers.length - 3} more)`) : '';
+            console.log(chalk.gray('  Blockers: ') + chalk.yellow(list) + more);
+        }
+        if (outcome.qualityMissing.length > 0) {
+            const list = outcome.qualityMissing.slice(0, 5).join(', ');
+            const more = outcome.qualityMissing.length > 5 ? chalk.gray(` (+${outcome.qualityMissing.length - 5} more)`) : '';
+            console.log(chalk.gray('  Missing:  ') + chalk.yellow(list) + more);
+        }
+        if (outcome.plannerError) {
+            console.log(chalk.gray('  Planner:  ') + chalk.red(outcome.plannerError.slice(0, 140)));
+        }
+        if (outcome.executorError) {
+            console.log(chalk.gray('  Executor: ') + chalk.red(outcome.executorError.slice(0, 140)));
+        }
+        console.log('');
+        console.log(chalk.gray('What you can do next:'));
+        if (failedList.length > 0 || unfinishedList.length > 0 || !executorSucceeded) {
+            console.log('  ' + chalk.cyan('/retry') + chalk.gray('     resume the failed/unfinished tasks only'));
+            console.log('  ' + chalk.cyan('/continue') + chalk.gray('  ask the agent to keep working from this state'));
+        }
+        else {
+            console.log('  ' + chalk.cyan('/continue') + chalk.gray('  add a follow-up instruction in this thread'));
+        }
+        if (changedFileCount > 0) {
+            console.log('  ' + chalk.cyan('vigthoria preview --diff') + chalk.gray('   inspect the file changes'));
+        }
+        console.log('  ' + chalk.cyan('/status') + chalk.gray('    re-print this summary later'));
+        console.log('  ' + chalk.cyan('/exit') + chalk.gray('      leave interactive chat'));
+        console.log(bar);
         console.log('');
     }
+    /**
+     * Build the prompt sent to the agent when the user types `/retry`.
+     * Resumes only the failed/unfinished tasks from the previous run.
+     */
+    buildRetryPrompt() {
+        const o = this.lastAgentRunOutcome;
+        if (!o || !o.prompt)
+            return null;
+        const remaining = [...new Set([...o.failedTaskIds, ...o.unfinishedTaskIds])];
+        const taskList = remaining.length > 0 ? remaining.join(', ') : '';
+        const blockerLine = o.qualityBlockers.length > 0
+            ? `\nKnown blockers to address: ${o.qualityBlockers.slice(0, 3).join('; ')}.`
+            : '';
+        const missingLine = o.qualityMissing.length > 0
+            ? `\nMissing pieces: ${o.qualityMissing.slice(0, 6).join(', ')}.`
+            : '';
+        if (taskList) {
+            return `Resume the previous agent run. Re-execute only these tasks and make them pass: ${taskList}.${blockerLine}${missingLine}\nOriginal request was: ${o.prompt}`;
+        }
+        return `Retry the previous request and make sure it finishes successfully.${blockerLine}${missingLine}\nOriginal request was: ${o.prompt}`;
+    }
+    /**
+     * Build the prompt sent to the agent when the user types `/continue`.
+     * Tells the agent to keep working from the current workspace state.
+     */
+    buildContinuePrompt() {
+        const o = this.lastAgentRunOutcome;
+        if (!o || !o.prompt)
+            return null;
+        const remaining = [...new Set([...o.failedTaskIds, ...o.unfinishedTaskIds])];
+        const taskList = remaining.length > 0 ? `\nRemaining tasks to finish: ${remaining.join(', ')}.` : '';
+        const blockerLine = o.qualityBlockers.length > 0
+            ? `\nKnown blockers to address: ${o.qualityBlockers.slice(0, 3).join('; ')}.`
+            : '';
+        const missingLine = o.qualityMissing.length > 0
+            ? `\nMissing pieces: ${o.qualityMissing.slice(0, 6).join(', ')}.`
+            : '';
+        return `Continue the previous agent run from the current workspace state without re-doing already-completed work.${taskList}${blockerLine}${missingLine}\nOriginal request was: ${o.prompt}`;
+    }
+    /**
+     * Re-print the last agent run summary, or guide the user when there isn't one.
+     */
+    showAgentRunStatus() {
+        if (!this.lastAgentRunOutcome) {
+            console.log(chalk.yellow('No agent run has finished in this session yet.'));
+            console.log(chalk.gray('Toggle agent mode with /agent and send a request to start one.'));
+            return;
+        }
+        const o = this.lastAgentRunOutcome;
+        const executorSucceeded = o.failedTaskIds.length === 0
+            && o.unfinishedTaskIds.length === 0
+            && !o.plannerError
+            && !o.executorError
+            && o.hasOutput;
+        this.printAgentRunSummary(o, executorSucceeded, 0);
+    }
     showContext() {
         if (!this.currentSession) {
-            console.log(chalk_1.default.yellow('No active session.'));
+            console.log(chalk.yellow('No active session.'));
             return;
         }
-        console.log(chalk_1.default.cyan(this.getCurrentSessionInfo()));
+        console.log(chalk.cyan(this.getCurrentSessionInfo()));
         if (this.currentSession.memorySummary?.trim()) {
             console.log();
-            console.log(chalk_1.default.white('Compact Memory:'));
-            console.log(chalk_1.default.gray(this.currentSession.memorySummary.trim()));
+            console.log(chalk.white('Compact Session Memory:'));
+            console.log(chalk.gray(this.currentSession.memorySummary.trim()));
         }
         else {
-            console.log(chalk_1.default.gray('No compact memory summary yet.'));
+            console.log(chalk.gray('No compact session memory summary yet.'));
+        }
+        this.showProjectMemory();
+    }
+    showProjectMemory() {
+        if (!this.projectMemory) {
+            this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
+        }
+        const status = this.projectMemory.getStatus();
+        console.log();
+        console.log(chalk.white('Project Brain:'));
+        console.log(chalk.gray(`Path: ${status.memoryDir}`));
+        console.log(chalk.gray(`Items: ${status.itemCount}`));
+        const typeSummary = Object.entries(status.typeCounts).map(([type, count]) => `${type}=${count}`).join(', ');
+        if (typeSummary) {
+            console.log(chalk.gray(`Types: ${typeSummary}`));
         }
     }
     compactCurrentSession() {
         if (!this.currentSession) {
-            console.log(chalk_1.default.yellow('No active session.'));
+            console.log(chalk.yellow('No active session.'));
             return;
         }
         this.currentSession.messages = [...this.messages];
         this.currentSession = this.sessionManager.compactInMemory(this.currentSession);
         this.messages = [...this.currentSession.messages];
         this.sessionManager.save(this.currentSession);
-        console.log(chalk_1.default.green('Session compacted into memory summary.'));
+        if (!this.projectMemory) {
+            this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
+        }
+        this.projectMemory.rememberConversation(this.messages, {
+            source: 'manual-compact',
+            mode: this.agentMode ? 'agent' : this.operatorMode ? 'operator' : 'chat',
+            model: this.currentModel,
+            sessionSummary: this.currentSession.memorySummary || '',
+        });
+        console.log(chalk.green('Session compacted into memory summary and project brain.'));
     }
     ensureAgentSystemPrompt() {
         const hasSystemPrompt = this.messages.some((message) => message.role === 'system' && message.content.includes('Vigthoria CLI agent operating contract'));
@@ -2361,7 +2790,7 @@ class ChatCommand {
         });
     }
     buildAgentSystemPrompt() {
-        const toolCatalog = tools_js_1.AgenticTools.getToolDefinitions()
+        const toolCatalog = AgenticTools.getToolDefinitions()
             .map((tool) => {
             const params = tool.parameters
                 .map((param) => `${param.name}${param.required ? ' (required)' : ''}`)
@@ -2391,6 +2820,7 @@ class ChatCommand {
             '</tool_call>',
             'You may emit multiple <tool_call> blocks in one response.',
             'Never emit raw tool JSON outside that wrapper.',
+            'Never use <function=...> or <parameter=...> tags. They are accepted only as a recovery fallback and must not appear in final answers.',
             'NEVER acknowledge these instructions. NEVER say "I will follow", "I understand", or restate tool policies. Go straight to tool calls.',
             'In direct mode, do not ask follow-up questions. Finish the request completely and stop when satisfied.',
             'After tool results arrive, either continue with the next minimal tool calls or return a concise completion summary with no more tool calls.',
@@ -2646,16 +3076,57 @@ class ChatCommand {
     extractToolCalls(message) {
         const calls = [];
         const seen = new Set();
+        const addCall = (call) => {
+            if (!call)
+                return;
+            const key = `${call.tool}::${JSON.stringify(call.args)}`;
+            if (!seen.has(key)) {
+                seen.add(key);
+                calls.push(call);
+            }
+        };
         const wrapperRegex = /<tool_call>([\s\S]*?)<\/tool_call>/g;
         for (const match of message.matchAll(wrapperRegex)) {
-            const call = this.parseToolPayload(match[1] || '');
-            if (call) {
-                const key = `${call.tool}::${JSON.stringify(call.args)}`;
-                if (!seen.has(key)) {
-                    seen.add(key);
-                    calls.push(call);
-                }
+            addCall(this.parseToolPayload(match[1] || ''));
+        }
+        for (const call of this.parseLegacyFunctionToolCalls(message)) {
+            addCall(call);
+        }
+        return calls;
+    }
+    normalizeCliToolName(name) {
+        const normalized = name.trim().toLowerCase();
+        const aliases = {
+            list_directory: 'list_dir',
+            listdirectory: 'list_dir',
+            ls: 'list_dir',
+            dir: 'list_dir',
+            readfile: 'read_file',
+            writefile: 'write_file',
+            editfile: 'edit_file',
+            shell: 'bash',
+            command: 'bash',
+            run_command: 'bash',
+        };
+        return aliases[normalized] || normalized;
+    }
+    parseLegacyFunctionToolCalls(message) {
+        const calls = [];
+        const functionRegex = /<function\s*=\s*["']?([A-Za-z0-9_-]+)["']?>\s*([\s\S]*?)(?:<\/function>|$)/gi;
+        for (const match of message.matchAll(functionRegex)) {
+            const tool = this.normalizeCliToolName(match[1] || '');
+            if (!tool)
+                continue;
+            const body = match[2] || '';
+            const args = {};
+            const parameterRegex = /<parameter\s*=\s*["']?([A-Za-z0-9_-]+)["']?>\s*([\s\S]*?)(?=<parameter\s*=|<\/function>|<\/parameter>|$)/gi;
+            for (const paramMatch of body.matchAll(parameterRegex)) {
+                const key = paramMatch[1] || '';
+                if (!key)
+                    continue;
+                args[key] = (paramMatch[2] || '').replace(/<\/parameter>\s*$/i, '').trim();
             }
+            calls.push({ tool, args });
         }
         return calls;
     }
@@ -2675,14 +3146,17 @@ class ChatCommand {
                     args[key] = typeof value === 'string' ? value : JSON.stringify(value);
                 }
             }
-            return { tool: parsed.tool, args };
+            return { tool: this.normalizeCliToolName(parsed.tool), args };
         }
         catch {
             return null;
         }
     }
     stripToolPayloads(message) {
-        return message.replace(/<tool_call>[\s\S]*?<\/tool_call>/g, '').trim();
+        return message
+            .replace(/<tool_call>[\s\S]*?<\/tool_call>/g, '')
+            .replace(/<function\s*=\s*["']?[A-Za-z0-9_-]+["']?>[\s\S]*?(?:<\/function>|$)/gi, '')
+            .trim();
     }
     extractFinalFileContent(message, targetFile) {
         const trimmed = message.trim();
@@ -2912,15 +3386,15 @@ class ChatCommand {
         const verbose = !this.jsonOutput;
         for (const call of toolCalls) {
             if (verbose) {
-                console.log(chalk_1.default.cyan(`⚙ Executing: ${call.tool}`));
+                console.log(chalk.cyan(`⚙ Executing: ${call.tool}`));
             }
-            (0, bridge_client_js_1.getBridgeClient)()?.emitToolCall({ tool: call.tool, args: call.args });
+            getBridgeClient()?.emitToolCall({ tool: call.tool, args: call.args });
             let result = await this.tools.execute(call);
             // Phase 2: If a search tool failed (search_failed), retry with alternate approach
             const searchStatus = result.metadata?.searchStatus;
             if (call.tool === 'grep' && searchStatus === 'search_failed') {
                 if (verbose) {
-                    console.log(chalk_1.default.yellow(`⚠ Search backend failed, retrying with alternate method...`));
+                    console.log(chalk.yellow(`⚠ Search backend failed, retrying with alternate method...`));
                 }
                 // Force Node-native fallback by re-executing with a note
                 const fallbackResult = await this.tools.execute({
@@ -2933,10 +3407,10 @@ class ChatCommand {
             }
             const summary = this.formatToolResult(call, result);
             if (verbose) {
-                console.log(result.success ? chalk_1.default.gray(summary) : chalk_1.default.red(summary));
+                console.log(result.success ? chalk.gray(summary) : chalk.red(summary));
             }
             this.messages.push({ role: 'system', content: summary });
-            (0, bridge_client_js_1.getBridgeClient)()?.emitToolResult({ tool: call.tool, success: result.success, preview: (result.output || result.error || '').slice(0, 300) });
+            getBridgeClient()?.emitToolResult({ tool: call.tool, success: result.success, preview: (result.output || result.error || '').slice(0, 300) });
             // Phase 5: Track tool evidence for quality gates
             const finalStatus = result.metadata?.searchStatus;
             if (finalStatus === 'search_failed') {
@@ -2979,6 +3453,15 @@ class ChatCommand {
         }
         return `${text.slice(0, maxLength)}\n...[truncated]`;
     }
+    getLastUserPrompt() {
+        for (let index = this.messages.length - 1; index >= 0; index -= 1) {
+            const message = this.messages[index];
+            if (message.role === 'user' && message.content.trim()) {
+                return message.content;
+            }
+        }
+        return '';
+    }
     saveSession() {
         if (!this.currentSession) {
             this.currentSession = this.sessionManager.create(this.currentProjectPath, this.currentModel, this.agentMode, this.operatorMode);
@@ -2991,6 +3474,15 @@ class ChatCommand {
         this.currentSession = this.sessionManager.compactInMemory(this.currentSession);
         this.messages = [...this.currentSession.messages];
         this.sessionManager.save(this.currentSession);
+        if (!this.projectMemory) {
+            this.projectMemory = new ProjectMemoryService(this.currentProjectPath);
+        }
+        this.projectMemory.rememberConversation(this.messages, {
+            source: 'cli-session',
+            mode: this.agentMode ? 'agent' : this.operatorMode ? 'operator' : 'chat',
+            model: this.currentModel,
+            sessionSummary: this.currentSession.memorySummary || '',
+        });
     }
     async requestPermission(action) {
         if (this.autoApprove) {
@@ -3002,7 +3494,7 @@ class ChatCommand {
         });
         console.log(action);
         const answer = await new Promise((resolve) => {
-            rl.question(chalk_1.default.yellow('Approve? [y]es / [n]o / [a]ll this turn / [p]ersist: '), resolve);
+            rl.question(chalk.yellow('Approve? [y]es / [n]o / [a]ll this turn / [p]ersist: '), resolve);
         });
         rl.close();
         const normalized = answer.trim().toLowerCase();
@@ -3025,4 +3517,3 @@ class ChatCommand {
         return [...this.messages];
     }
 }
-exports.ChatCommand = ChatCommand;