@staticpayload/zai-code 1.2.15 → 1.4.0

package/dist/commands.js

@@ -44,12 +44,17 @@ const history_1 = require("./history");
 const settings_menu_1 = require("./settings_menu");
 const shell_1 = require("./shell");
 const workspace_model_1 = require("./workspace_model");
+const auth_1 = require("./auth");
+const runtime_1 = require("./runtime");
+const workspace_1 = require("./workspace");
 const apply_1 = require("./apply");
 const ui_1 = require("./ui");
 const planner_1 = require("./planner");
 const task_runner_1 = require("./task_runner");
 const rollback_1 = require("./rollback");
+const mode_prompts_1 = require("./mode_prompts");
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 // Parse input to detect slash commands
 function parseInput(input) {
     const trimmed = input.trim();
@@ -68,19 +73,541 @@ function parseInput(input) {
 }
 // Stub handlers for all commands
 const handlers = {
-    help: () => {
-        console.log('Navigation:');
-        console.log('  /help /context /files /open /workspace');
-        console.log('Execution:');
-        console.log('  /plan /generate /diff /apply /undo');
-        console.log('Modes:');
-        console.log('  /ask /mode /model /dry-run /profile');
-        console.log('Tasks:');
-        console.log('  /decompose /step /next /skip /progress');
-        console.log('System:');
-        console.log('  /settings /git /exec /history /doctor');
-        console.log('Session:');
-        console.log('  /reset /exit');
+    help: (ctx) => {
+        const topic = ctx.args[0]?.toLowerCase();
+        if (topic === 'modes') {
+            console.log('');
+            console.log((0, ui_1.info)('Available Modes:'));
+            console.log('');
+            console.log('  auto    ⚡ YOLO mode: execute tasks directly without confirmation');
+            console.log('  edit    ✏️  Default: plan → generate → review → apply workflow');
+            console.log('  ask     ❓ Read-only: answer questions, no file changes');
+            console.log('  explain 📖 Read-only: explain code concepts');
+            console.log('  review  👁  Read-only: code review and analysis');
+            console.log('  debug   🔧 Investigate and fix issues');
+            console.log('');
+            console.log((0, ui_1.hint)('/mode <name> to switch'));
+            return;
+        }
+        if (topic === 'workflow') {
+            console.log('');
+            console.log((0, ui_1.info)('Standard Workflow:'));
+            console.log('');
+            console.log('  1. Type a task (e.g., "add error handling to auth.ts")');
+            console.log('  2. /plan    - Generate execution plan');
+            console.log('  3. /generate - Create file changes');
+            console.log('  4. /diff    - Review changes');
+            console.log('  5. /apply   - Apply changes');
+            console.log('  6. /undo    - Rollback if needed');
+            console.log('');
+            console.log((0, ui_1.info)('Quick Workflow:'));
+            console.log('');
+            console.log('  /do <task>  - Plan + generate in one step');
+            console.log('  /run <task> - Plan + generate + apply (YOLO)');
+            console.log('');
+            return;
+        }
+        if (topic === 'shortcuts') {
+            console.log('');
+            console.log((0, ui_1.info)('Keyboard Shortcuts:'));
+            console.log('');
+            console.log('  Ctrl+D    /do <task>   - Quick execute');
+            console.log('  Ctrl+R    /run <task>  - Auto mode run');
+            console.log('  Ctrl+P    /plan        - Generate plan');
+            console.log('  Ctrl+G    /generate    - Create changes');
+            console.log('  Ctrl+Z    /undo        - Rollback');
+            console.log('  Ctrl+A    /ask <q>     - Quick question');
+            console.log('  Ctrl+F    /fix <desc>  - Quick debug');
+            console.log('  Ctrl+C    Exit');
+            console.log('');
+            console.log((0, ui_1.info)('Command Aliases:'));
+            console.log('');
+            console.log('  /h = /help    /p = /plan    /g = /generate');
+            console.log('  /d = /diff    /a = /apply   /u = /undo');
+            console.log('  /s = /status  /c = /context /f = /files');
+            console.log('');
+            return;
+        }
+        if (topic === 'quick') {
+            console.log('');
+            console.log((0, ui_1.info)('Quick Commands:'));
+            console.log('');
+            console.log('  /do <task>   Plan + generate in one step');
+            console.log('               Example: /do add input validation to login form');
+            console.log('');
+            console.log('  /run <task>  Plan + generate + apply automatically');
+            console.log('               Example: /run fix the typo in README.md');
+            console.log('');
+            console.log('  /ask <q>     Quick question without changing mode');
+            console.log('               Example: /ask what does this function do?');
+            console.log('');
+            console.log('  /fix <desc>  Quick debug mode task');
+            console.log('               Example: /fix login button not working');
+            console.log('');
+            console.log('  /commit      Generate AI commit message');
+            console.log('               Example: /commit (auto) or /commit feat: add login');
+            console.log('');
+            return;
+        }
+        // Default help
+        console.log('');
+        console.log((0, ui_1.info)('zai·code Commands'));
+        console.log('');
+        console.log((0, ui_1.dim)('Quick Actions:'));
+        console.log('  /do <task>     Plan + generate in one step');
+        console.log('  /run <task>    Plan + generate + apply (YOLO)');
+        console.log('  /ask <q>       Quick question');
+        console.log('  /fix <desc>    Quick debug task');
+        console.log('');
+        console.log((0, ui_1.dim)('Workflow:'));
+        console.log('  /plan          Generate execution plan');
+        console.log('  /generate      Create file changes');
+        console.log('  /diff [full]   Review pending changes');
+        console.log('  /apply [-f]    Apply changes');
+        console.log('  /undo [n]      Rollback operations');
+        console.log('  /retry         Retry last failed operation');
+        console.log('  /clear         Clear current task');
+        console.log('');
+        console.log((0, ui_1.dim)('Files:'));
+        console.log('  /open <path>   Add file to context');
+        console.log('  /close <path>  Remove from context');
+        console.log('  /files         List open files');
+        console.log('  /search <q>    Search files');
+        console.log('  /read <path>   View file contents');
+        console.log('  /tree [depth]  Show file tree');
+        console.log('');
+        console.log((0, ui_1.dim)('Modes & Settings:'));
+        console.log('  /mode [name]   Set mode (edit/ask/auto/debug/review/explain)');
+        console.log('  /model [id]    Select AI model');
+        console.log('  /settings      Open settings menu');
+        console.log('  /dry-run       Toggle dry-run mode');
+        console.log('');
+        console.log((0, ui_1.dim)('Git:'));
+        console.log('  /git [cmd]     Git operations (status/log/diff/stash/pop)');
+        console.log('  /commit [msg]  AI-powered commit');
+        console.log('');
+        console.log((0, ui_1.dim)('System:'));
+        console.log('  /status        Show session status');
+        console.log('  /doctor        System health check');
+        console.log('  /version       Show version');
+        console.log('  /reset         Reset session');
+        console.log('  /exit          Exit zcode');
+        console.log('');
+        console.log((0, ui_1.hint)('/help <topic> for details: modes, workflow, shortcuts, quick'));
+    },
+    // Quick execute - plan + generate in one step
+    do: async (ctx) => {
+        const task = ctx.args.join(' ');
+        if (!task) {
+            console.log('Usage: /do <task>');
+            console.log('Example: /do add input validation to login form');
+            return;
+        }
+        // Set intent
+        (0, session_1.setIntent)(task);
+        console.log((0, ui_1.info)(`Task: ${task}`));
+        // Plan
+        console.log((0, ui_1.dim)('Planning...'));
+        const planResult = await (0, planner_1.runPlannerLoop)();
+        if (!planResult.success) {
+            console.log((0, ui_1.error)(planResult.message));
+            return;
+        }
+        console.log((0, ui_1.success)(`Plan: ${planResult.plan?.length || 0} steps`));
+        // Generate
+        console.log((0, ui_1.dim)('Generating...'));
+        const genResult = await (0, planner_1.runGenerateLoop)();
+        if (!genResult.success) {
+            console.log((0, ui_1.error)(genResult.message));
+            return;
+        }
+        const fileCount = (genResult.changes?.files?.length || 0) + (genResult.changes?.diffs?.length || 0);
+        console.log((0, ui_1.success)(`Generated ${fileCount} file change(s)`));
+        console.log((0, ui_1.hint)('/diff to review, /apply to execute'));
+    },
+    // Full auto run - plan + generate + apply
+    run: async (ctx) => {
+        const task = ctx.args.join(' ');
+        if (!task) {
+            console.log('Usage: /run <task>');
+            console.log('Warning: This will apply changes automatically!');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        if (session.dryRun) {
+            console.log((0, ui_1.error)('Dry-run mode enabled. Use /dry-run off first.'));
+            return;
+        }
+        // Set intent
+        (0, session_1.setIntent)(task);
+        console.log((0, ui_1.info)(`Task: ${task}`));
+        // Plan
+        console.log((0, ui_1.dim)('Planning...'));
+        const planResult = await (0, planner_1.runPlannerLoop)();
+        if (!planResult.success) {
+            console.log((0, ui_1.error)(planResult.message));
+            return;
+        }
+        console.log((0, ui_1.success)(`Plan: ${planResult.plan?.length || 0} steps`));
+        // Generate
+        console.log((0, ui_1.dim)('Generating...'));
+        const genResult = await (0, planner_1.runGenerateLoop)();
+        if (!genResult.success) {
+            console.log((0, ui_1.error)(genResult.message));
+            return;
+        }
+        // Apply
+        console.log((0, ui_1.dim)('Applying...'));
+        const actions = session.pendingActions;
+        if (!actions || ((!actions.files || actions.files.length === 0) && (!actions.diffs || actions.diffs.length === 0))) {
+            console.log('No changes to apply.');
+            return;
+        }
+        const result = (0, apply_1.applyResponse)(actions, {
+            basePath: session.workingDirectory,
+            dryRun: false,
+        });
+        if (!result.success) {
+            for (const failed of result.failed) {
+                console.log((0, ui_1.error)(`Failed: ${failed.path}: ${failed.error}`));
+            }
+            return;
+        }
+        (0, session_1.setPendingActions)(null);
+        console.log((0, ui_1.success)(`Applied ${result.applied.length} change(s)`));
+        console.log((0, ui_1.hint)('/undo to rollback'));
+    },
+    // Retry last failed operation
+    retry: async () => {
+        const session = (0, session_1.getSession)();
+        if (session.lastPlan && session.lastPlan.length > 0 && !session.lastDiff) {
+            // Have plan but no diff - retry generate
+            console.log((0, ui_1.dim)('Retrying generation...'));
+            const result = await (0, planner_1.runGenerateLoop)();
+            if (result.success) {
+                console.log((0, ui_1.success)('Generation succeeded on retry'));
+                console.log((0, ui_1.hint)('/diff to review'));
+            }
+            else {
+                console.log((0, ui_1.error)(result.message));
+            }
+            return;
+        }
+        if ((0, session_1.getIntent)() && (!session.lastPlan || session.lastPlan.length === 0)) {
+            // Have intent but no plan - retry plan
+            console.log((0, ui_1.dim)('Retrying planning...'));
+            const result = await (0, planner_1.runPlannerLoop)();
+            if (result.success) {
+                console.log((0, ui_1.success)('Planning succeeded on retry'));
+                console.log((0, ui_1.hint)('/generate to create changes'));
+            }
+            else {
+                console.log((0, ui_1.error)(result.message));
+            }
+            return;
+        }
+        console.log('Nothing to retry.');
+    },
+    // Clear current task
+    clear: () => {
+        (0, session_1.clearIntent)();
+        (0, session_1.setLastPlan)(null);
+        (0, session_1.setLastDiff)(null);
+        (0, session_1.setPendingActions)(null);
+        console.log('Task cleared.');
+    },
+    // Close/remove file from context
+    close: (ctx) => {
+        const filePath = ctx.args[0];
+        if (!filePath) {
+            console.log('Usage: /close <path> or /close all');
+            return;
+        }
+        if (filePath === 'all') {
+            (0, session_1.clearOpenFiles)();
+            console.log('All files removed from context.');
+            return;
+        }
+        (0, session_1.removeOpenFile)(filePath);
+        console.log(`Removed: ${filePath}`);
+    },
+    // Search files in workspace
+    search: (ctx) => {
+        const query = ctx.args.join(' ');
+        if (!query) {
+            console.log('Usage: /search <pattern>');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const ws = (0, workspace_model_1.getWorkspace)(session.workingDirectory);
+        ws.indexFileTree();
+        const files = ws.getFileIndex();
+        const pattern = query.toLowerCase();
+        const matches = files.filter(f => f.path.toLowerCase().includes(pattern));
+        if (matches.length === 0) {
+            console.log(`No files matching "${query}"`);
+            return;
+        }
+        console.log(`Found ${matches.length} file(s):`);
+        for (const m of matches.slice(0, 20)) {
+            console.log(`  ${m.path}`);
+        }
+        if (matches.length > 20) {
+            console.log((0, ui_1.dim)(`  ... and ${matches.length - 20} more`));
+        }
+    },
+    // Quick ask without changing mode
+    'ask-quick': async (ctx) => {
+        const question = ctx.args.join(' ');
+        if (!question) {
+            console.log('Usage: /ask <question>');
+            return;
+        }
+        let apiKey;
+        try {
+            apiKey = await (0, auth_1.ensureAuthenticated)();
+            if (!apiKey) {
+                console.log((0, ui_1.error)('No API key configured.'));
+                return;
+            }
+        }
+        catch (e) {
+            console.log((0, ui_1.error)(`Auth failed: ${e?.message}`));
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const modePrompt = (0, mode_prompts_1.buildSystemPrompt)('ask', session.workingDirectory);
+        console.log((0, ui_1.dim)('Thinking...'));
+        const result = await (0, runtime_1.execute)({
+            instruction: `${modePrompt}\n\nQuestion: ${question}\n\nAnswer concisely.`,
+            enforceSchema: false,
+        }, apiKey);
+        if (result.success && result.output) {
+            const text = typeof result.output === 'string' ? result.output : JSON.stringify(result.output, null, 2);
+            console.log(text);
+        }
+        else {
+            console.log((0, ui_1.error)(result.error || 'Failed'));
+        }
+    },
+    // Quick fix/debug
+    fix: async (ctx) => {
+        const description = ctx.args.join(' ');
+        if (!description) {
+            console.log('Usage: /fix <problem description>');
+            return;
+        }
+        (0, session_1.setMode)('debug');
+        (0, session_1.setIntent)(`Fix: ${description}`);
+        console.log((0, ui_1.info)(`Debug task: ${description}`));
+        console.log((0, ui_1.hint)('/plan to start debugging'));
+    },
+    // Save session to disk
+    save: () => {
+        const session = (0, session_1.getSession)();
+        const ws = (0, workspace_model_1.getWorkspace)(session.workingDirectory);
+        const saved = ws.saveState();
+        if (saved) {
+            console.log((0, ui_1.success)('Session saved to .zai/workspace.json'));
+        }
+        else {
+            console.log((0, ui_1.error)('Failed to save session'));
+        }
+    },
+    // Load session from disk
+    load: () => {
+        const session = (0, session_1.getSession)();
+        const ws = (0, workspace_model_1.getWorkspace)(session.workingDirectory);
+        const restored = ws.restoreState();
+        if (restored) {
+            console.log((0, ui_1.success)('Session restored'));
+            console.log(`Mode: ${session.mode}`);
+            console.log(`Intent: ${session.currentIntent || 'none'}`);
+            console.log(`Files: ${session.openFiles.length}`);
+        }
+        else {
+            console.log('No saved session found.');
+        }
+    },
+    // Git commit helper
+    commit: async (ctx) => {
+        const message = ctx.args.join(' ');
+        const session = (0, session_1.getSession)();
+        const gitInfo = (0, git_1.getGitInfo)(session.workingDirectory);
+        if (!gitInfo.isRepo) {
+            console.log((0, ui_1.error)('Not a git repository.'));
+            return;
+        }
+        if (!gitInfo.isDirty) {
+            console.log('Nothing to commit (working tree clean).');
+            return;
+        }
+        if (!message) {
+            // Generate commit message
+            let apiKey;
+            try {
+                apiKey = await (0, auth_1.ensureAuthenticated)();
+                if (!apiKey) {
+                    console.log('Usage: /commit <message>');
+                    return;
+                }
+            }
+            catch {
+                console.log('Usage: /commit <message>');
+                return;
+            }
+            console.log((0, ui_1.dim)('Generating commit message...'));
+            // Get git diff
+            const { execSync } = require('child_process');
+            let diff = '';
+            try {
+                diff = execSync('git diff --staged', { cwd: session.workingDirectory, encoding: 'utf-8', maxBuffer: 50000 });
+                if (!diff) {
+                    diff = execSync('git diff', { cwd: session.workingDirectory, encoding: 'utf-8', maxBuffer: 50000 });
+                }
+            }
+            catch {
+                console.log((0, ui_1.error)('Failed to get git diff'));
+                return;
+            }
+            if (!diff) {
+                console.log('No changes to commit.');
+                return;
+            }
+            const result = await (0, runtime_1.execute)({
+                instruction: `Generate a concise git commit message for these changes. Use conventional commit format (feat/fix/docs/refactor/etc). Output ONLY the commit message, nothing else.\n\nDiff:\n${diff.substring(0, 5000)}`,
+                enforceSchema: false,
+            }, apiKey);
+            if (result.success && result.output) {
+                const msg = typeof result.output === 'string' ? result.output.trim() : String(result.output);
+                console.log(`Suggested: ${msg}`);
+                console.log((0, ui_1.hint)(`/commit ${msg}`));
+            }
+            else {
+                console.log('Usage: /commit <message>');
+            }
+            return;
+        }
+        // Execute commit
+        const { execSync } = require('child_process');
+        try {
+            execSync('git add -A', { cwd: session.workingDirectory, stdio: 'pipe' });
+            execSync(`git commit -m "${message.replace(/"/g, '\\"')}"`, { cwd: session.workingDirectory, stdio: 'pipe' });
+            console.log((0, ui_1.success)(`Committed: ${message}`));
+        }
+        catch (e) {
+            console.log((0, ui_1.error)(`Commit failed: ${e?.message || e}`));
+        }
+    },
+    // Version info
+    version: () => {
+        try {
+            const pkg = require('../package.json');
+            console.log(`zai-code v${pkg.version}`);
+            console.log(`Node.js ${process.version}`);
+            console.log(`Platform: ${process.platform} ${process.arch}`);
+        }
+        catch {
+            console.log('zai-code');
+        }
+    },
+    // Status - comprehensive overview
+    status: () => {
+        const session = (0, session_1.getSession)();
+        const gitInfo = (0, git_1.getGitInfo)(session.workingDirectory);
+        const undoCount = (0, rollback_1.getUndoCount)();
+        console.log('');
+        console.log((0, ui_1.info)('Session Status'));
+        console.log('');
+        // Mode with icon
+        const modeIcons = {
+            'auto': '⚡', 'edit': '✏️', 'ask': '❓', 'debug': '🔧', 'review': '👁', 'explain': '📖'
+        };
+        const modeIcon = modeIcons[session.mode] || '';
+        console.log(`  Mode:      ${modeIcon} ${session.mode}${session.dryRun ? ' (dry-run)' : ''}`);
+        console.log(`  Model:     ${(0, settings_1.getModel)()}`);
+        console.log(`  Directory: ${session.workingDirectory}`);
+        console.log('');
+        // Git status
+        if (gitInfo.isRepo) {
+            const status = gitInfo.isDirty ? `${gitInfo.uncommittedFiles} uncommitted` : 'clean';
+            console.log(`  Git:       ${gitInfo.branch}${gitInfo.isDirty ? '*' : ''} (${status})`);
+        }
+        else {
+            console.log('  Git:       not a repository');
+        }
+        console.log('');
+        // Session state
+        console.log(`  Files:     ${session.openFiles.length} in context`);
+        // Current task
+        if (session.currentIntent) {
+            const truncated = session.currentIntent.length > 50
+                ? session.currentIntent.substring(0, 50) + '...'
+                : session.currentIntent;
+            console.log(`  Task:      ${truncated}`);
+        }
+        else {
+            console.log(`  Task:      none`);
+        }
+        // Plan status
+        if (session.lastPlan && session.lastPlan.length > 0) {
+            console.log(`  Plan:      ${session.lastPlan.length} step(s)`);
+        }
+        else {
+            console.log(`  Plan:      none`);
+        }
+        // Pending changes
+        if (session.pendingActions) {
+            const fileCount = (session.pendingActions.files?.length || 0);
+            const diffCount = (session.pendingActions.diffs?.length || 0);
+            console.log(`  Pending:   ${fileCount + diffCount} change(s)`);
+        }
+        else {
+            console.log(`  Pending:   none`);
+        }
+        console.log(`  Undo:      ${undoCount} operation(s) in stack`);
+        console.log('');
+        // Suggestions based on state
+        if (session.pendingActions || session.lastDiff) {
+            console.log((0, ui_1.hint)('/diff to review, /apply to execute'));
+        }
+        else if (session.lastPlan && session.lastPlan.length > 0) {
+            console.log((0, ui_1.hint)('/generate to create changes'));
+        }
+        else if (session.currentIntent) {
+            console.log((0, ui_1.hint)('/plan to create execution plan'));
+        }
+        else {
+            console.log((0, ui_1.hint)('Type a task to get started'));
+        }
+    },
+    // YOLO mode shortcut
+    yolo: () => {
+        (0, session_1.setMode)('auto');
+        console.log((0, ui_1.success)('⚡ YOLO mode activated!'));
+        console.log((0, ui_1.dim)('Tasks will execute directly without confirmation.'));
+        console.log((0, ui_1.hint)('Type a task or use /run <task>'));
+    },
+    // Quick mode switches
+    edit: () => {
+        (0, session_1.setMode)('edit');
+        console.log((0, ui_1.success)('Edit mode activated'));
+        console.log((0, ui_1.hint)('Type a task, then /plan → /generate → /diff → /apply'));
+    },
+    debug: () => {
+        (0, session_1.setMode)('debug');
+        console.log((0, ui_1.success)('🔧 Debug mode activated'));
+        console.log((0, ui_1.hint)('Describe the bug or use /fix <description>'));
+    },
+    review: () => {
+        (0, session_1.setMode)('review');
+        console.log((0, ui_1.success)('👁 Review mode activated'));
+        console.log((0, ui_1.hint)('Ask for code review or analysis'));
+    },
+    explain: () => {
+        (0, session_1.setMode)('explain');
+        console.log((0, ui_1.success)('📖 Explain mode activated'));
+        console.log((0, ui_1.hint)('Ask about code concepts'));
     },
     reset: () => {
         (0, session_1.resetSession)();
@@ -142,13 +669,68 @@ const handlers = {
         }
     },
     open: (ctx) => {
-        const path = ctx.args[0];
-        if (!path) {
+        const filePath = ctx.args[0];
+        if (!filePath) {
             console.log('Usage: /open <path>');
             return;
         }
-        (0, session_1.addOpenFile)(path);
-        console.log(`Added: ${path}`);
+        const session = (0, session_1.getSession)();
+        const fullPath = path.isAbsolute(filePath) ? filePath : path.join(session.workingDirectory, filePath);
+        if (!fs.existsSync(fullPath)) {
+            console.log((0, ui_1.error)(`File not found: ${filePath}`));
+            return;
+        }
+        (0, session_1.addOpenFile)(filePath);
+        console.log((0, ui_1.success)(`Added to context: ${filePath}`));
+    },
+    // Read/view file contents
+    read: (ctx) => {
+        const filePath = ctx.args[0];
+        if (!filePath) {
+            console.log('Usage: /read <path> [lines]');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const fullPath = path.isAbsolute(filePath) ? filePath : path.join(session.workingDirectory, filePath);
+        if (!fs.existsSync(fullPath)) {
+            console.log((0, ui_1.error)(`File not found: ${filePath}`));
+            return;
+        }
+        const maxLines = ctx.args[1] ? parseInt(ctx.args[1], 10) : 50;
+        const content = (0, workspace_1.getFileContent)(fullPath, 100000);
+        if (!content) {
+            console.log((0, ui_1.error)('File too large or unreadable'));
+            return;
+        }
+        const lines = content.split('\n');
+        const displayLines = lines.slice(0, maxLines);
+        console.log((0, ui_1.dim)(`--- ${filePath} (${lines.length} lines) ---`));
+        displayLines.forEach((line, i) => {
+            console.log(`${String(i + 1).padStart(4)} | ${line}`);
+        });
+        if (lines.length > maxLines) {
+            console.log((0, ui_1.dim)(`... ${lines.length - maxLines} more lines`));
+        }
+    },
+    // Cat file (alias for read, full content)
+    cat: (ctx) => {
+        const filePath = ctx.args[0];
+        if (!filePath) {
+            console.log('Usage: /cat <path>');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const fullPath = path.isAbsolute(filePath) ? filePath : path.join(session.workingDirectory, filePath);
+        if (!fs.existsSync(fullPath)) {
+            console.log((0, ui_1.error)(`File not found: ${filePath}`));
+            return;
+        }
+        const content = (0, workspace_1.getFileContent)(fullPath, 500000);
+        if (!content) {
+            console.log((0, ui_1.error)('File too large or unreadable'));
+            return;
+        }
+        console.log(content);
     },
     mode: (ctx) => {
         const newMode = ctx.args[0]?.toLowerCase();
@@ -272,7 +854,7 @@ const handlers = {
             console.log((0, ui_1.error)(`Generation failed: ${e?.message || e}`));
         }
     },
-    diff: () => {
+    diff: (ctx) => {
         const session = (0, session_1.getSession)();
         // Check if there's a diff to display
         if (!session.lastDiff) {
@@ -280,12 +862,25 @@ const handlers = {
             return;
         }
         const response = session.lastDiff;
+        const showFull = ctx.args[0] === 'full';
         // Display file operations if present
         if (response.files && response.files.length > 0) {
             for (const file of response.files) {
-                console.log(`--- ${file.operation}: ${file.path} ---`);
+                const opColor = file.operation === 'create' ? '\x1b[32m' :
+                    file.operation === 'delete' ? '\x1b[31m' : '\x1b[33m';
+                const reset = '\x1b[0m';
+                console.log(`${opColor}--- ${file.operation.toUpperCase()}: ${file.path} ---${reset}`);
                 if (file.content && file.operation !== 'delete') {
-                    console.log(file.content);
+                    const lines = file.content.split('\n');
+                    const maxLines = showFull ? lines.length : 50;
+                    for (let i = 0; i < Math.min(lines.length, maxLines); i++) {
+                        const lineNum = String(i + 1).padStart(4);
+                        const prefix = file.operation === 'create' ? '\x1b[32m+' : ' ';
+                        console.log(`${prefix}${lineNum} | ${lines[i]}${reset}`);
+                    }
+                    if (lines.length > maxLines) {
+                        console.log((0, ui_1.dim)(`... ${lines.length - maxLines} more lines (use /diff full to see all)`));
+                    }
                 }
                 console.log('');
             }
@@ -293,33 +888,49 @@ const handlers = {
         // Display diffs if present
         if (response.diffs && response.diffs.length > 0) {
             for (const diff of response.diffs) {
-                console.log(`--- ${diff.file} ---`);
+                console.log(`\x1b[33m--- MODIFY: ${diff.file} ---\x1b[0m`);
                 for (const hunk of diff.hunks) {
-                    console.log(`@@ -${hunk.start},${hunk.end - hunk.start + 1} @@`);
-                    console.log(hunk.content);
+                    console.log(`\x1b[36m@@ lines ${hunk.start}-${hunk.end} @@\x1b[0m`);
+                    const lines = hunk.content.split('\n');
+                    for (const line of lines) {
+                        if (line.startsWith('+')) {
+                            console.log(`\x1b[32m${line}\x1b[0m`);
+                        }
+                        else if (line.startsWith('-')) {
+                            console.log(`\x1b[31m${line}\x1b[0m`);
+                        }
+                        else {
+                            console.log(line);
+                        }
+                    }
                 }
                 console.log('');
             }
         }
-        // If neither files nor diffs present
-        if ((!response.files || response.files.length === 0) &&
-            (!response.diffs || response.diffs.length === 0)) {
+        // Summary
+        const fileCount = (response.files?.length || 0);
+        const diffCount = (response.diffs?.length || 0);
+        if (fileCount === 0 && diffCount === 0) {
             console.log('No file changes in last response.');
             return;
         }
+        console.log((0, ui_1.dim)(`Total: ${fileCount} file operation(s), ${diffCount} diff(s)`));
+        console.log((0, ui_1.hint)('/apply to execute changes'));
     },
-    apply: () => {
+    apply: (ctx) => {
         const session = (0, session_1.getSession)();
+        const force = ctx.args[0] === '--force' || ctx.args[0] === '-f';
         // Check dry run mode
-        if (session.dryRun) {
+        if (session.dryRun && !force) {
             console.log((0, ui_1.error)('Dry-run mode. Apply blocked.'));
-            console.log((0, ui_1.hint)('/dry-run off'));
+            console.log((0, ui_1.hint)('/dry-run off or /apply --force'));
             return;
         }
         // Warn on dirty git
         const gitInfo = (0, git_1.getGitInfo)(session.workingDirectory);
-        if (gitInfo.isRepo && gitInfo.isDirty) {
-            console.log((0, ui_1.info)('Warning: uncommitted changes exist.'));
+        if (gitInfo.isRepo && gitInfo.isDirty && !force) {
+            console.log((0, ui_1.info)('Warning: uncommitted git changes exist.'));
+            console.log((0, ui_1.hint)('Consider committing first, or use /apply --force'));
         }
         // Check if there are pending actions
         if (!session.pendingActions) {
@@ -333,26 +944,49 @@ const handlers = {
         }
         const actions = session.pendingActions;
         // Check if there are actual file operations
-        if ((!actions.files || actions.files.length === 0) &&
-            (!actions.diffs || actions.diffs.length === 0)) {
+        const fileCount = (actions.files?.length || 0);
+        const diffCount = (actions.diffs?.length || 0);
+        if (fileCount === 0 && diffCount === 0) {
             console.log('No file changes to apply.');
             return;
         }
+        console.log((0, ui_1.info)(`Applying ${fileCount + diffCount} change(s)...`));
         // Apply using the apply engine
         const result = (0, apply_1.applyResponse)(actions, {
             basePath: session.workingDirectory,
             dryRun: false,
         });
+        // Show results
+        for (const applied of result.applied) {
+            console.log((0, ui_1.success)(`  ${applied}`));
+        }
+        for (const failed of result.failed) {
+            console.log((0, ui_1.error)(`  Failed: ${failed.path}: ${failed.error}`));
+        }
         if (!result.success) {
-            for (const failed of result.failed) {
-                console.log((0, ui_1.error)(`Failed: ${failed.path}: ${failed.error}`));
-            }
+            console.log((0, ui_1.error)(`\nSome operations failed. Use /undo to rollback.`));
             return;
         }
         // Clear pending actions after success
         (0, session_1.setPendingActions)(null);
-        console.log('Applied.');
-        console.log('Session clean.');
+        (0, session_1.setLastDiff)(null);
+        (0, session_1.clearIntent)();
+        (0, session_1.setLastPlan)(null);
+        console.log('');
+        console.log((0, ui_1.success)(`Applied ${result.applied.length} change(s) successfully.`));
+        console.log((0, ui_1.hint)('/undo to rollback'));
+        // Log to history
+        if (session.currentIntent) {
+            (0, history_1.logTask)({
+                timestamp: new Date().toISOString(),
+                intent: session.currentIntent,
+                intentType: session.intentType || 'COMMAND',
+                mode: session.mode,
+                model: (0, settings_1.getModel)(),
+                filesCount: result.applied.length,
+                outcome: 'success',
+            });
+        }
     },
     workspace: () => {
         const ws = (0, workspace_model_1.getWorkspace)();
@@ -360,6 +994,54 @@ const handlers = {
         console.log(ws.printTreeSummary());
         console.log(`Root: ${ws.getRoot()}`);
     },
+    // Tree view of workspace
+    tree: (ctx) => {
+        const maxDepth = ctx.args[0] ? parseInt(ctx.args[0], 10) : 3;
+        const session = (0, session_1.getSession)();
+        const ws = (0, workspace_model_1.getWorkspace)(session.workingDirectory);
+        const tree = ws.indexFileTree(maxDepth);
+        function printTree(node, prefix = '', isLast = true) {
+            const connector = isLast ? '└── ' : '├── ';
+            const extension = isLast ? '    ' : '│   ';
+            if (node.path !== '.') {
+                const icon = node.type === 'directory' ? '📁' : '📄';
+                console.log(`${prefix}${connector}${icon} ${node.name}`);
+            }
+            if (node.children) {
+                const children = node.children;
+                children.forEach((child, index) => {
+                    const childIsLast = index === children.length - 1;
+                    const newPrefix = node.path === '.' ? '' : prefix + extension;
+                    printTree(child, newPrefix, childIsLast);
+                });
+            }
+        }
+        console.log((0, ui_1.dim)(`${session.workingDirectory}`));
+        printTree(tree);
+    },
+    // List files matching pattern
+    ls: (ctx) => {
+        const pattern = ctx.args[0] || '.';
+        const session = (0, session_1.getSession)();
+        const targetPath = path.isAbsolute(pattern) ? pattern : path.join(session.workingDirectory, pattern);
+        try {
+            const stats = fs.statSync(targetPath);
+            if (stats.isDirectory()) {
+                const entries = fs.readdirSync(targetPath, { withFileTypes: true });
+                for (const entry of entries) {
+                    const icon = entry.isDirectory() ? '📁' : '📄';
+                    const size = entry.isFile() ? ` (${fs.statSync(path.join(targetPath, entry.name)).size} bytes)` : '';
+                    console.log(`${icon} ${entry.name}${size}`);
+                }
+            }
+            else {
+                console.log(`${pattern}: ${stats.size} bytes`);
+            }
+        }
+        catch (e) {
+            console.log((0, ui_1.error)(`Cannot access: ${pattern}`));
+        }
+    },
     doctor: async () => {
         const { runDiagnostics, formatDiagnostics } = await Promise.resolve().then(() => __importStar(require('./doctor')));
         const results = await runDiagnostics();
@@ -573,29 +1255,321 @@ const handlers = {
             console.log('Usage: /dry-run [on | off]');
         }
     },
-    git: () => {
+    git: (ctx) => {
         const session = (0, session_1.getSession)();
-        const info = (0, git_1.getGitInfo)(session.workingDirectory);
-        if (!info.isRepo) {
+        const gitInfo = (0, git_1.getGitInfo)(session.workingDirectory);
+        const subcommand = ctx.args[0];
+        if (!gitInfo.isRepo) {
             console.log('Not a git repository.');
             return;
         }
-        console.log(`Repository: ${info.repoName}`);
-        console.log(`Branch: ${info.branch}`);
-        console.log(`Status: ${info.isDirty ? 'dirty' : 'clean'}`);
-        if (info.uncommittedFiles > 0) {
-            console.log(`Uncommitted files: ${info.uncommittedFiles}`);
+        // /git status (default)
+        if (!subcommand || subcommand === 'status') {
+            console.log(`Repository: ${gitInfo.repoName}`);
+            console.log(`Branch: ${gitInfo.branch}`);
+            console.log(`Status: ${gitInfo.isDirty ? 'dirty' : 'clean'}`);
+            if (gitInfo.uncommittedFiles > 0) {
+                console.log(`Uncommitted files: ${gitInfo.uncommittedFiles}`);
+                // Show changed files
+                try {
+                    const { execSync } = require('child_process');
+                    const status = execSync('git status --porcelain', {
+                        cwd: session.workingDirectory,
+                        encoding: 'utf-8',
+                        stdio: ['pipe', 'pipe', 'pipe']
+                    });
+                    const lines = status.trim().split('\n').filter((l) => l);
+                    for (const line of lines.slice(0, 10)) {
+                        const status = line.substring(0, 2);
+                        const file = line.substring(3);
+                        const statusColor = status.includes('M') ? '\x1b[33m' :
+                            status.includes('A') ? '\x1b[32m' :
+                                status.includes('D') ? '\x1b[31m' : '\x1b[36m';
+                        console.log(`  ${statusColor}${status}\x1b[0m ${file}`);
+                    }
+                    if (lines.length > 10) {
+                        console.log((0, ui_1.dim)(`  ... and ${lines.length - 10} more`));
+                    }
+                }
+                catch {
+                    // Ignore
+                }
+            }
+            return;
+        }
+        // /git log
+        if (subcommand === 'log') {
+            try {
+                const { execSync } = require('child_process');
+                const log = execSync('git log --oneline -10', {
+                    cwd: session.workingDirectory,
+                    encoding: 'utf-8'
+                });
+                console.log('Recent commits:');
+                console.log(log);
+            }
+            catch (e) {
+                console.log((0, ui_1.error)('Failed to get git log'));
+            }
+            return;
+        }
+        // /git diff
+        if (subcommand === 'diff') {
+            try {
+                const { execSync } = require('child_process');
+                const diff = execSync('git diff --stat', {
+                    cwd: session.workingDirectory,
+                    encoding: 'utf-8'
+                });
+                if (diff.trim()) {
+                    console.log(diff);
+                }
+                else {
+                    console.log('No unstaged changes.');
+                }
+            }
+            catch (e) {
+                console.log((0, ui_1.error)('Failed to get git diff'));
+            }
+            return;
+        }
+        // /git stash
+        if (subcommand === 'stash') {
+            try {
+                const { execSync } = require('child_process');
+                execSync('git stash', { cwd: session.workingDirectory, stdio: 'pipe' });
+                console.log((0, ui_1.success)('Changes stashed'));
+            }
+            catch (e) {
+                console.log((0, ui_1.error)('Failed to stash'));
+            }
+            return;
+        }
+        // /git pop
+        if (subcommand === 'pop') {
+            try {
+                const { execSync } = require('child_process');
+                execSync('git stash pop', { cwd: session.workingDirectory, stdio: 'pipe' });
+                console.log((0, ui_1.success)('Stash popped'));
+            }
+            catch (e) {
+                console.log((0, ui_1.error)('Failed to pop stash'));
+            }
+            return;
+        }
+        console.log('Usage: /git [status|log|diff|stash|pop]');
+    },
+    // Create new file
+    touch: (ctx) => {
+        const filePath = ctx.args[0];
+        if (!filePath) {
+            console.log('Usage: /touch <path>');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const fullPath = path.isAbsolute(filePath) ? filePath : path.join(session.workingDirectory, filePath);
+        if (fs.existsSync(fullPath)) {
+            console.log((0, ui_1.error)(`File already exists: ${filePath}`));
+            return;
+        }
+        try {
+            const dir = path.dirname(fullPath);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            fs.writeFileSync(fullPath, '', 'utf-8');
+            console.log((0, ui_1.success)(`Created: ${filePath}`));
+            (0, session_1.addOpenFile)(filePath);
+        }
+        catch (e) {
+            console.log((0, ui_1.error)(`Failed to create: ${e?.message}`));
+        }
+    },
+    // Make directory
+    mkdir: (ctx) => {
+        const dirPath = ctx.args[0];
+        if (!dirPath) {
+            console.log('Usage: /mkdir <path>');
+            return;
+        }
+        const session = (0, session_1.getSession)();
+        const fullPath = path.isAbsolute(dirPath) ? dirPath : path.join(session.workingDirectory, dirPath);
+        if (fs.existsSync(fullPath)) {
+            console.log((0, ui_1.error)(`Already exists: ${dirPath}`));
+            return;
+        }
+        try {
+            fs.mkdirSync(fullPath, { recursive: true });
+            console.log((0, ui_1.success)(`Created directory: ${dirPath}`));
+        }
+        catch (e) {
+            console.log((0, ui_1.error)(`Failed to create: ${e?.message}`));
+        }
+    },
+    // What now - contextual suggestions
+    whatnow: () => {
+        const session = (0, session_1.getSession)();
+        const gitInfo = (0, git_1.getGitInfo)(session.workingDirectory);
+        console.log('');
+        console.log((0, ui_1.info)('What to do next:'));
+        console.log('');
+        // Based on current state
+        if (session.pendingActions || session.lastDiff) {
+            const count = (session.pendingActions?.files?.length || 0) + (session.pendingActions?.diffs?.length || 0);
+            console.log(`  You have ${count} pending change(s).`);
+            console.log('');
+            console.log('  /diff       Review the changes');
+            console.log('  /diff full  See full file contents');
+            console.log('  /apply      Apply the changes');
+            console.log('  /apply -f   Force apply (skip warnings)');
+            console.log('  /clear      Discard and start over');
+            console.log('');
+        }
+        else if (session.lastPlan && session.lastPlan.length > 0) {
+            console.log(`  You have a plan with ${session.lastPlan.length} step(s).`);
+            console.log('');
+            console.log('  /generate   Create file changes from plan');
+            console.log('  /plan       Regenerate the plan');
+            console.log('  /clear      Discard and start over');
+            console.log('');
+        }
+        else if (session.currentIntent) {
+            console.log(`  Task: "${session.currentIntent.substring(0, 50)}..."`);
+            console.log('');
+            console.log('  /plan       Create execution plan');
+            console.log('  /do         Plan + generate in one step');
+            console.log('  /run        Plan + generate + apply (YOLO)');
+            console.log('  /clear      Clear task and start over');
+            console.log('');
         }
+        else {
+            console.log('  No active task. Here are some ideas:');
+            console.log('');
+            console.log('  Type a task naturally:');
+            console.log('    "add error handling to auth.ts"');
+            console.log('    "create a new React component for user profile"');
+            console.log('    "fix the bug in the login function"');
+            console.log('');
+            console.log('  Or use quick commands:');
+            console.log('    /do <task>   Plan + generate');
+            console.log('    /run <task>  Full auto execution');
+            console.log('    /ask <q>     Ask a question');
+            console.log('    /fix <desc>  Debug an issue');
+            console.log('');
+        }
+        // Git suggestions
+        if (gitInfo.isRepo && gitInfo.isDirty) {
+            console.log((0, ui_1.dim)(`  Git: ${gitInfo.uncommittedFiles} uncommitted file(s)`));
+            console.log('  /commit     Generate AI commit message');
+            console.log('  /git stash  Stash changes');
+            console.log('');
+        }
+        // Mode suggestion
+        if (session.mode === 'edit') {
+            console.log((0, ui_1.dim)('  Tip: Use /yolo for autonomous execution'));
+        }
+    },
+    // Alias for whatnow
+    whatsnext: () => {
+        handlers.whatnow({ args: [], rawInput: '/whatnow' });
     },
+    // Quick examples
+    examples: () => {
+        console.log('');
+        console.log((0, ui_1.info)('Example Tasks:'));
+        console.log('');
+        console.log((0, ui_1.dim)('Code Generation:'));
+        console.log('  "create a REST API endpoint for user registration"');
+        console.log('  "add a new React component for displaying user cards"');
+        console.log('  "implement a binary search function in TypeScript"');
+        console.log('');
+        console.log((0, ui_1.dim)('Bug Fixes:'));
+        console.log('  "fix the null pointer exception in auth.ts line 42"');
+        console.log('  "the login button doesn\'t work, fix it"');
+        console.log('  "users can\'t logout, investigate and fix"');
+        console.log('');
+        console.log((0, ui_1.dim)('Refactoring:'));
+        console.log('  "refactor the database module to use async/await"');
+        console.log('  "split the UserService into smaller modules"');
+        console.log('  "add TypeScript types to the utils folder"');
+        console.log('');
+        console.log((0, ui_1.dim)('Documentation:'));
+        console.log('  "add JSDoc comments to all exported functions"');
+        console.log('  "create a README for the project"');
+        console.log('  "document the API endpoints"');
+        console.log('');
+        console.log((0, ui_1.hint)('Just type naturally - zai·code understands context'));
+    },
+};
+// Command aliases for convenience
+const COMMAND_ALIASES = {
+    // Single letter shortcuts
+    'h': 'help',
+    '?': 'help',
+    'q': 'exit',
+    'quit': 'exit',
+    's': 'status',
+    'p': 'plan',
+    'g': 'generate',
+    'd': 'diff',
+    'a': 'apply',
+    'u': 'undo',
+    'c': 'context',
+    'f': 'files',
+    'm': 'mode',
+    'r': 'run',
+    'x': 'exec',
+    'o': 'open',
+    't': 'tree',
+    'v': 'version',
+    // Word aliases
+    'gen': 'generate',
+    'show': 'diff',
+    'view': 'read',
+    'cat': 'read',
+    'ls': 'tree',
+    'list': 'files',
+    'add': 'open',
+    'rm': 'close',
+    'remove': 'close',
+    'find': 'search',
+    'grep': 'search',
+    'auto': 'yolo',
+    'quick': 'do',
+    'execute': 'run',
+    'rollback': 'undo',
+    'revert': 'undo',
+    'info': 'status',
+    'state': 'status',
+    'check': 'doctor',
+    'health': 'doctor',
+    'cfg': 'settings',
+    'config': 'settings',
+    'prefs': 'settings',
+    'preferences': 'settings',
 };
 // Execute a parsed slash command
 async function executeCommand(parsed) {
     if (!parsed.isSlashCommand || !parsed.command) {
         return false;
     }
-    const handler = handlers[parsed.command];
+    // Resolve alias
+    const command = COMMAND_ALIASES[parsed.command] || parsed.command;
+    const handler = handlers[command];
     if (!handler) {
+        // Check for partial match
+        const matches = Object.keys(handlers).filter(h => h.startsWith(parsed.command));
+        if (matches.length === 1) {
+            await handlers[matches[0]]({ args: parsed.args || [], rawInput: parsed.rawInput });
+            return true;
+        }
+        else if (matches.length > 1) {
+            console.log(`Ambiguous command: /${parsed.command}`);
+            console.log(`Did you mean: ${matches.map(m => '/' + m).join(', ')}?`);
+            return true;
+        }
         console.log(`Unknown command: /${parsed.command}`);
+        console.log((0, ui_1.dim)('Run /help for available commands'));
         return true;
     }
     await handler({ args: parsed.args || [], rawInput: parsed.rawInput });