@orion-agents/orion-code 0.1.0 → 0.1.2

package/dist/commands/index.js

@@ -30,9 +30,8 @@ const tools_1 = require("../tools");
 const mcp_1 = require("../tools/mcp");
 const session_storage_1 = require("../services/session-storage");
 const session_index_1 = require("../services/session-index");
-const coordinator_1 = require("../runtime/goals/coordinator");
 const auto_compact_1 = require("../services/compact/auto-compact");
-const coordinator_2 = require("../services/compact/coordinator");
+const coordinator_1 = require("../services/compact/coordinator");
 const harness_1 = require("../harness");
 const skills_1 = require("../skills");
 const file_context_1 = require("../services/file-context");
@@ -99,10 +98,10 @@ function formatRendererStatus(ctx) {
     });
     const status = snapshot.renderer.status === 'deprecated'
         ? WARN('deprecated')
-        : snapshot.renderer.status === 'beta' || (0, config_1.isBetaUIRenderer)(snapshot.renderer.name)
-            ? WARN('beta')
-            : snapshot.renderer.status === 'stable'
-                ? SUCCESS('stable')
+        : snapshot.renderer.status === 'product'
+            ? SUCCESS('product')
+            : snapshot.renderer.status === 'technical'
+                ? DIM('technical')
                 : snapshot.renderer.status === 'non-interactive'
                     ? DIM('non-interactive')
                     : DIM('custom');
@@ -169,9 +168,9 @@ function formatLoopStatsLines(stats, detail = false) {
         ];
         lines.push(`Verify     ${verificationParts.join(' ')}`);
     }
-    if (typeof stats.loopBudgetMaxLlmRequests === 'number'
-        || typeof stats.loopBudgetMaxToolCalls === 'number'
-        || typeof stats.loopBudgetMaxModelVisibleBytes === 'number') {
+    if (typeof stats.loopBudgetMaxLlmRequests === 'number' ||
+        typeof stats.loopBudgetMaxToolCalls === 'number' ||
+        typeof stats.loopBudgetMaxModelVisibleBytes === 'number') {
         const caps = [
             typeof stats.loopBudgetMaxLlmRequests === 'number'
                 ? `${stats.llmRequests}/${stats.loopBudgetMaxLlmRequests} LLM`
@@ -247,6 +246,9 @@ function isAbortError(error, abortSignal) {
     }
     return false;
 }
+function hasCommandFlag(args, flag) {
+    return args.trim().split(/\s+/u).includes(flag);
+}
 // ============================================================================
 // 工具参数摘要
 // ============================================================================
@@ -254,11 +256,11 @@ function isAbortError(error, abortSignal) {
 // 命令实现
 // ============================================================================
 let taskManager = null;
-function showHelp() {
+function showHelp(ctx) {
     console.log();
     console.log(HEADER('Commands:'));
     console.log();
-    const visible = getVisibleCommands();
+    const visible = getVisibleCommands(ctx.uiRenderer);
     for (const category of CATEGORY_ORDER) {
         const items = visible.filter(cmd => commandCategory(cmd) === category);
         if (items.length === 0)
@@ -267,8 +269,16 @@ function showHelp() {
         for (const cmd of items) {
             const aliases = cmd.aliases ? ` (${cmd.aliases.join(', ')})` : '';
             const params = cmd.argumentHint || cmd.params?.map(p => `<${p.name}>`).join(' ') || '';
+            const lifecycle = cmd.deprecated
+                ? ` deprecated since ${cmd.deprecated.since}${cmd.deprecated.replacement ? `; use ${cmd.deprecated.replacement}` : ''}`
+                : '';
+            const risk = cmd.risk === 'destructive' ? ' destructive' : '';
+            const availability = cmd.availability?.(ctx);
+            const unavailable = availability && !availability.available
+                ? ` unavailable: ${availability.reason ?? 'requirements not met'}`
+                : '';
             console.log(`  ${ACCENT(`/${cmd.name}`)}${aliases} ${DIM(params)}`);
-            console.log(`    ${DIM(cmd.description)}`);
+            console.log(`    ${DIM(`${cmd.description}${lifecycle}${risk}${unavailable}`)}`);
         }
         console.log();
     }
@@ -376,7 +386,9 @@ function formatTraceEventLine(event) {
                 event.providerLastRetryErrorType
                     ? `last=${event.providerLastRetryErrorType}${event.providerLastRetryStatus ? `/${event.providerLastRetryStatus}` : ''}`
                     : '',
-                event.providerRetryErrorTypes?.length ? `types=${event.providerRetryErrorTypes.join(',')}` : '',
+                event.providerRetryErrorTypes?.length
+                    ? `types=${event.providerRetryErrorTypes.join(',')}`
+                    : '',
                 event.providerFinalModel ? `final=${event.providerFinalModel}` : '',
             ].filter(Boolean);
             return `${prefix} ${parts.join(' ')}`;
@@ -384,7 +396,7 @@ function formatTraceEventLine(event) {
         case 'provider_fallback': {
             const path = event.providerFallbackFromModel && event.providerFallbackToModel
                 ? `${event.providerFallbackFromModel}->${event.providerFallbackToModel}`
-                : event.providerFinalModel ?? 'active';
+                : (event.providerFinalModel ?? 'active');
             const parts = [
                 `count=${event.providerFallbackCount ?? 0}`,
                 `path=${path}`,
@@ -454,13 +466,13 @@ function formatTraceEventLine(event) {
                 `llm=${typeof event.llmRequests === 'number' ? event.llmRequests : 'unknown'}`,
                 `tools=${typeof event.toolCalls === 'number' ? event.toolCalls : 'unknown'}`,
             ];
-            if (event.loopBudgetSource
-                || typeof event.loopBudgetMaxLlmRequests === 'number'
-                || typeof event.loopBudgetMaxToolCalls === 'number'
-                || typeof event.loopBudgetMaxModelVisibleBytes === 'number') {
+            if (event.loopBudgetSource ||
+                typeof event.loopBudgetMaxLlmRequests === 'number' ||
+                typeof event.loopBudgetMaxToolCalls === 'number' ||
+                typeof event.loopBudgetMaxModelVisibleBytes === 'number') {
                 const source = event.loopBudgetSource === 'config' && event.loopBudgetBaseProfile
                     ? `config/${event.loopBudgetBaseProfile}`
-                    : event.loopBudgetSource ?? 'unknown';
+                    : (event.loopBudgetSource ?? 'unknown');
                 const caps = [
                     typeof event.loopBudgetMaxLlmRequests === 'number'
                         ? `${typeof event.llmRequests === 'number' ? event.llmRequests : '?'}/${event.loopBudgetMaxLlmRequests}llm`
@@ -493,7 +505,9 @@ function formatTraceEventLine(event) {
         case 'workspace_snapshot': {
             const state = event.workspaceGitAvailable === false
                 ? WARN('not-git')
-                : event.workspaceDirty ? WARN('dirty') : SUCCESS('clean');
+                : event.workspaceDirty
+                    ? WARN('dirty')
+                    : SUCCESS('clean');
             const files = event.workspaceFiles?.length
                 ? ` files=${event.workspaceFiles.slice(0, 6).join(', ')}${event.workspaceFiles.length > 6 ? ', ...' : ''}`
                 : '';
@@ -512,11 +526,21 @@ function formatTraceEventLine(event) {
                 `resolved=${resolved.length}`,
             ];
             const details = [
-                added.length ? `new: ${added.slice(0, 6).join(', ')}${added.length > 6 ? ', ...' : ''}` : '',
-                changed.length ? `changed: ${changed.slice(0, 6).join(', ')}${changed.length > 6 ? ', ...' : ''}` : '',
-                modifiedPreExisting.length ? `pre-existing modified: ${modifiedPreExisting.slice(0, 6).join(', ')}${modifiedPreExisting.length > 6 ? ', ...' : ''}` : '',
-                resolved.length ? `resolved: ${resolved.slice(0, 6).join(', ')}${resolved.length > 6 ? ', ...' : ''}` : '',
-            ].filter(Boolean).join(' | ');
+                added.length
+                    ? `new: ${added.slice(0, 6).join(', ')}${added.length > 6 ? ', ...' : ''}`
+                    : '',
+                changed.length
+                    ? `changed: ${changed.slice(0, 6).join(', ')}${changed.length > 6 ? ', ...' : ''}`
+                    : '',
+                modifiedPreExisting.length
+                    ? `pre-existing modified: ${modifiedPreExisting.slice(0, 6).join(', ')}${modifiedPreExisting.length > 6 ? ', ...' : ''}`
+                    : '',
+                resolved.length
+                    ? `resolved: ${resolved.slice(0, 6).join(', ')}${resolved.length > 6 ? ', ...' : ''}`
+                    : '',
+            ]
+                .filter(Boolean)
+                .join(' | ');
             return `${prefix} ${parts.join(' ')}${details ? ` ${DIM(details)}` : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
         }
         case 'verification_profile': {
@@ -607,7 +631,10 @@ function latestToolTrace(events) {
         const call = event.type === 'tool_call'
             ? event
             : callId
-                ? events.slice(0, index).reverse().find(candidate => candidate.type === 'tool_call' && candidate.callId === callId)
+                ? events
+                    .slice(0, index)
+                    .reverse()
+                    .find(candidate => candidate.type === 'tool_call' && candidate.callId === callId)
                 : undefined;
         return { call, result };
     }
@@ -766,9 +793,7 @@ function handleLastTool(ctx, args = '') {
         for (const pair of pairs.slice(-30)) {
             const source = pair.result ?? pair.call;
             const name = source?.name ?? 'tool';
-            const status = pair.result
-                ? (pair.result.success === false ? '✗' : '✓')
-                : '…';
+            const status = pair.result ? (pair.result.success === false ? '✗' : '✓') : '…';
             const duration = typeof pair.result?.duration === 'number'
                 ? ` (${formatDurationMs(pair.result.duration)})`
                 : '';
@@ -786,7 +811,11 @@ function handleLastTool(ctx, args = '') {
     const name = source?.name ?? 'tool';
     const inputLabel = lastToolInputLabel(name);
     const callId = source?.callId ?? call?.callId;
-    const status = result ? (result.success === false ? ERROR('error') : SUCCESS('ok')) : WARN('running');
+    const status = result
+        ? result.success === false
+            ? ERROR('error')
+            : SUCCESS('ok')
+        : WARN('running');
     // Resolve sequence number from the trace events
     let seqLabel = '';
     if (options.ref && /^#?\d+$/.test(options.ref)) {
@@ -948,7 +977,10 @@ function handleCheckpoint(ctx, args = '') {
         }
         for (const checkpoint of checkpoints.slice(0, 20)) {
             console.log(`${ACCENT(checkpoint.turnId)} ${DIM(formatDateTime(checkpoint.createdAt))}`);
-            const files = checkpoint.files.map(file => file.path).slice(0, 8).join(', ');
+            const files = checkpoint.files
+                .map(file => file.path)
+                .slice(0, 8)
+                .join(', ');
             console.log(`  ${DIM(`${checkpoint.files.length} file(s)${files ? `: ${files}` : ''}`)}`);
         }
         console.log();
@@ -967,9 +999,7 @@ function handleCheckpoint(ctx, args = '') {
     }
     const { checkpoint, ambiguous } = findCheckpointByRef(ctx, ref);
     if (!checkpoint) {
-        console.log(ERROR(ambiguous
-            ? `Checkpoint prefix is ambiguous: ${ref}`
-            : `Checkpoint not found: ${ref}`));
+        console.log(ERROR(ambiguous ? `Checkpoint prefix is ambiguous: ${ref}` : `Checkpoint not found: ${ref}`));
         console.log(DIM('Run /checkpoint to list available checkpoint ids.'));
         return { success: false };
     }
@@ -1407,7 +1437,10 @@ function normalizePermissionMode(raw) {
     const value = raw.trim().toLowerCase();
     if (!value)
         return null;
-    if (value === 'accept' || value === 'acceptedits' || value === 'accept-edits' || value === 'edit') {
+    if (value === 'accept' ||
+        value === 'acceptedits' ||
+        value === 'accept-edits' ||
+        value === 'edit') {
         return 'acceptEdits';
     }
     if (value === 'default' || value === 'ask')
@@ -1435,9 +1468,7 @@ function handleMode(ctx, args) {
         console.log();
         return { success: true };
     }
-    const next = trimmed === 'next'
-        ? (0, types_1.getNextPermissionMode)(current)
-        : normalizePermissionMode(trimmed);
+    const next = trimmed === 'next' ? (0, types_1.getNextPermissionMode)(current) : normalizePermissionMode(trimmed);
     if (!next || !types_1.PERMISSION_MODES.includes(next)) {
         return {
             success: false,
@@ -1471,10 +1502,14 @@ function handleTask(ctx, args) {
         if (tasks.length > 0) {
             console.log();
             for (const t of tasks) {
-                const statusIcon = t.status === 'completed' ? SUCCESS('✓')
-                    : t.status === 'failed' ? ERROR('✗')
-                        : t.status === 'running' ? WARN('◌')
-                            : t.status === 'cancelled' ? DIM('⊘')
+                const statusIcon = t.status === 'completed'
+                    ? SUCCESS('✓')
+                    : t.status === 'failed'
+                        ? ERROR('✗')
+                        : t.status === 'running'
+                            ? WARN('◌')
+                            : t.status === 'cancelled'
+                                ? DIM('⊘')
                                 : DIM('○');
                 console.log(`  ${statusIcon} ${ACCENT(t.name)} ${DIM(`(${t.id.slice(0, 8)})`)}`);
                 console.log(`    ${DIM(`[${t.priority}]`)} ${t.description.slice(0, 60)}`);
@@ -1573,7 +1608,9 @@ async function handleChat(ctx, input) {
         console.log();
         return { success: false };
     }
-    const activeSession = ctx.getSession?.() ?? ctx.ensureSession?.() ?? (ctx.sessionId ? (0, session_storage_1.loadSessionMeta)(ctx.sessionId) : null);
+    const activeSession = ctx.getSession?.() ??
+        ctx.ensureSession?.() ??
+        (ctx.sessionId ? (0, session_storage_1.loadSessionMeta)(ctx.sessionId) : null);
     const sessionId = activeSession?.id ?? ctx.sessionId;
     const runtimeTools = (0, tools_1.getRuntimeTools)();
     const skillResolution = (0, skills_1.resolveSkillsForTurn)({
@@ -1683,7 +1720,10 @@ async function handleChat(ctx, input) {
         },
     };
     try {
-        const messages = [{ role: 'system', content: systemPrompt }, ...snapshot.conversationHistory];
+        const messages = [
+            { role: 'system', content: systemPrompt },
+            ...snapshot.conversationHistory,
+        ];
         for await (const event of (0, framework_1.query)({
             messages,
             tools: skillResolution.tools,
@@ -1829,7 +1869,9 @@ async function handleChat(ctx, input) {
             const stats = [
                 finalUsage ? `tokens: ${finalUsage.promptTokens}+${finalUsage.completionTokens}` : '',
                 finalModel ? finalModel : '',
-            ].filter(Boolean).join('  ');
+            ]
+                .filter(Boolean)
+                .join('  ');
             if (stats) {
                 writeLine(DIM(stats));
             }
@@ -1865,9 +1907,10 @@ async function handleExit(ctx) {
         }
         (0, session_storage_1.endSession)(ctx.sessionId);
     }
+    ctx.requestShutdown?.('user request');
     await ctx.runtime.shutdown();
-    console.log(SUCCESS('Goodbye! 🐴'));
-    process.exit(0);
+    console.log(SUCCESS('Goodbye.'));
+    return { success: true };
 }
 function handleCost(ctx) {
     console.log();
@@ -1971,13 +2014,13 @@ function handleSkill(ctx, args) {
     const registry = (0, skills_1.getSkillsRegistry)();
     registry.initialize();
     if (!trimmed) {
-        const names = registry.getAllSkills().map(skill => skill.name).sort();
+        const names = registry
+            .getAllSkills()
+            .map(skill => skill.name)
+            .sort();
         return {
             success: false,
-            error: [
-                'Usage: /skill <name> <task>',
-                `Loaded skills: ${names.join(', ') || 'none'}`,
-            ].join('\n'),
+            error: ['Usage: /skill <name> <task>', `Loaded skills: ${names.join(', ') || 'none'}`].join('\n'),
         };
     }
     const parsed = (0, skills_1.parseSkillCommandInput)(`/skill ${trimmed}`);
@@ -1990,11 +2033,13 @@ function handleSkill(ctx, args) {
             error: `Invalid skill reference: ${parsed.skillPath}`,
         };
     }
-    const skill = referencedSkill || registry.getAllSkills()
-        .find(candidate => (0, skills_1.skillActivationNames)(candidate)
-        .some(name => (0, skills_1.normalizeRequestedSkillName)(name) === requestedName));
+    const skill = referencedSkill ||
+        registry
+            .getAllSkills()
+            .find(candidate => (0, skills_1.skillActivationNames)(candidate).some(name => (0, skills_1.normalizeRequestedSkillName)(name) === requestedName));
     if (!skill) {
-        const suggestions = registry.getAllSkills()
+        const suggestions = registry
+            .getAllSkills()
             .map(candidate => candidate.name)
             .filter(name => name.includes(requestedName) || requestedName.includes(name))
             .slice(0, 5);
@@ -2024,7 +2069,9 @@ function handleSkill(ctx, args) {
                 skillFile ? `SKILL.md ${skillFile}` : '',
                 resourceRoot ? `Root     ${resourceRoot}` : '',
                 `Use: /skill ${usageSelector} <task>`,
-            ].filter(Boolean).join('\n'),
+            ]
+                .filter(Boolean)
+                .join('\n'),
         };
     }
     return {
@@ -2069,36 +2116,103 @@ function handleDoctor(ctx) {
     return { success: !(0, doctor_1.hasDoctorFailures)(report) };
 }
 function handleStorage(_ctx, args) {
+    const usage = '/storage [doctor|status|repair [--dry-run|--yes] [--plan=<token>]|cleanup [--dry-run|--yes] [--plan=<token>]]';
     const trimmed = args.trim();
-    const [action = 'doctor'] = trimmed.split(/\s+/);
+    const tokens = trimmed ? trimmed.split(/\s+/u) : [];
+    const action = tokens[0] ?? 'doctor';
+    const flags = tokens.slice(1);
+    const acceptsMutationFlags = action === 'cleanup' || action === 'repair';
+    const planFlags = flags.filter(flag => flag.startsWith('--plan='));
+    const invalidTokens = flags.filter(flag => !acceptsMutationFlags ||
+        (flag !== '--dry-run' && flag !== '--yes' && !flag.startsWith('--plan=')) ||
+        (flag.startsWith('--plan=') && flag.length === '--plan='.length));
+    if (planFlags.length > 1)
+        invalidTokens.push(...planFlags.slice(1));
+    if (invalidTokens.length > 0) {
+        return {
+            success: false,
+            error: `Unknown /storage option: ${invalidTokens.join(', ')}. Usage: ${usage}`,
+        };
+    }
+    const confirmed = flags.includes('--yes');
+    const explicitDryRun = flags.includes('--dry-run');
+    const planToken = planFlags[0]?.slice('--plan='.length);
+    const decodedPlan = planToken ? (0, storage_maintenance_1.deserializeStorageMaintenancePlan)(planToken) : undefined;
+    if (planToken && !decodedPlan) {
+        return { success: false, error: `Invalid or corrupted storage plan token. Usage: ${usage}` };
+    }
     if (action === 'cleanup') {
-        const dryRun = /\b--dry-run\b/.test(trimmed);
-        const result = (0, storage_maintenance_1.cleanupStorage)({ dryRun });
+        if (decodedPlan && decodedPlan.kind !== 'cleanup') {
+            return { success: false, error: 'The supplied storage plan is not a cleanup plan.' };
+        }
+        const dryRun = explicitDryRun || !confirmed;
+        if (!dryRun && !decodedPlan) {
+            return {
+                success: false,
+                error: 'Cleanup requires the exact preview plan. Run /storage cleanup first.',
+            };
+        }
+        const consumedPlan = !dryRun && planToken ? (0, storage_maintenance_1.consumeStorageMaintenancePlan)(planToken) : undefined;
+        if (!dryRun && (!consumedPlan || consumedPlan.kind !== 'cleanup')) {
+            return {
+                success: false,
+                error: 'The storage cleanup plan expired, was already used, or is not valid in this process.',
+            };
+        }
+        const plan = dryRun
+            ? decodedPlan?.kind === 'cleanup'
+                ? decodedPlan.plan
+                : (0, storage_maintenance_1.collectStorageCleanupPlan)()
+            : consumedPlan
+                .plan;
+        const result = (0, storage_maintenance_1.cleanupStorage)({ dryRun }, plan);
         console.log();
         console.log((0, storage_maintenance_1.formatStorageCleanupResult)(result));
+        if (dryRun) {
+            const portablePlan = planToken ?? (0, storage_maintenance_1.serializeStorageMaintenancePlan)({ kind: 'cleanup', plan });
+            console.log(DIM(`Preview only. Run /storage cleanup --plan=${portablePlan} --yes to apply this plan.`));
+        }
         console.log();
         return { success: true };
     }
     if (action === 'repair') {
-        const result = (0, storage_maintenance_1.repairProjectMetadata)();
-        console.log();
-        console.log(HEADER('Orion Code Storage Repair'));
-        console.log(DIM('─'.repeat(40)));
-        console.log(`  Repaired ${ACCENT(String(result.repaired.length))}`);
-        console.log(`  Skipped  ${DIM(String(result.skipped.length))}`);
-        for (const project of result.repaired.slice(0, 12)) {
-            console.log(`  ${SUCCESS('✓')} ${DIM(project)}`);
+        if (decodedPlan && decodedPlan.kind !== 'repair') {
+            return { success: false, error: 'The supplied storage plan is not a repair plan.' };
+        }
+        const plan = decodedPlan?.kind === 'repair' ? decodedPlan.plan : (0, storage_maintenance_1.collectProjectMetadataRepairPlan)();
+        if (explicitDryRun || !confirmed) {
+            console.log();
+            console.log(HEADER('Orion Code Storage Repair Preview'));
+            console.log(DIM('─'.repeat(40)));
+            console.log(`  Repairable metadata entries ${ACCENT(String(plan.actions.length))}`);
+            for (const action of plan.actions.slice(0, 12)) {
+                console.log(`  ${DIM('•')} ${DIM(action.metadataPath)}`);
+            }
+            const portablePlan = planToken ?? (0, storage_maintenance_1.serializeStorageMaintenancePlan)({ kind: 'repair', plan });
+            console.log(DIM(`  Preview only. Writable repair is disabled; /storage repair --plan=${portablePlan} --yes will fail closed.`));
+            console.log();
+            return { success: true };
         }
-        if (result.repaired.length > 12) {
-            console.log(DIM(`  ... ${result.repaired.length - 12} more`));
+        if (!decodedPlan) {
+            return {
+                success: false,
+                error: 'Repair requires the exact preview plan. Run /storage repair first.',
+            };
         }
-        console.log();
-        return { success: true };
+        const consumedPlan = planToken ? (0, storage_maintenance_1.consumeStorageMaintenancePlan)(planToken) : undefined;
+        if (!consumedPlan || consumedPlan.kind !== 'repair') {
+            return {
+                success: false,
+                error: 'The storage repair plan expired, was already used, or is not valid in this process.',
+            };
+        }
+        const result = (0, storage_maintenance_1.repairProjectMetadata)(consumedPlan.plan);
+        return { success: false, error: result.blockedReason };
     }
     if (action !== 'doctor' && action !== 'status') {
         return {
             success: false,
-            error: 'Usage: /storage [doctor|status|repair|cleanup --dry-run]',
+            error: `Usage: ${usage}`,
         };
     }
     const report = (0, storage_maintenance_1.collectStorageReport)();
@@ -2107,80 +2221,6 @@ function handleStorage(_ctx, args) {
     console.log();
     return { success: true };
 }
-function handleTarget(ctx, args) {
-    const trimmed = args.trim();
-    // GoalCoordinator needs projectPath + sessionId — derive from context
-    const projectPath = ctx.cwd ?? process.cwd();
-    const sessionId = ctx.sessionId ?? 'default';
-    const coordinator = new coordinator_1.GoalCoordinator(projectPath, sessionId);
-    // /target (no args) — show current goal
-    if (!trimmed) {
-        const snap = coordinator.snapshot();
-        if (!snap) {
-            console.log(chalk_1.default.gray('No goal is currently set. Use /target <objective> to create one.'));
-            return { success: true };
-        }
-        console.log(chalk_1.default.bold('Goal: ') + snap.objective);
-        console.log(chalk_1.default.gray(`Status: ${snap.status}  |  Continuations: ${snap.continuationCount}`));
-        console.log(chalk_1.default.gray(`Tokens: ${snap.tokensUsed}  |  Time: ${snap.timeUsedMs}ms`));
-        return { success: true };
-    }
-    // Sub-commands
-    const subCommand = trimmed.split(/\s+/)[0].toLowerCase();
-    const rest = trimmed.slice(subCommand.length).trim();
-    switch (subCommand) {
-        case 'pause': {
-            const ok = coordinator.pause();
-            console.log(ok ? chalk_1.default.yellow('Goal paused.') : chalk_1.default.red('Cannot pause.'));
-            return { success: ok };
-        }
-        case 'resume': {
-            const ok = coordinator.resume();
-            console.log(ok ? chalk_1.default.green('Goal resumed.') : chalk_1.default.red('Cannot resume.'));
-            return { success: ok };
-        }
-        case 'clear': {
-            const ok = coordinator.clear();
-            console.log(ok ? chalk_1.default.gray('Goal cleared.') : chalk_1.default.gray('No goal to clear.'));
-            return { success: ok };
-        }
-        case 'status': {
-            const snap = coordinator.snapshot();
-            if (!snap) {
-                console.log(chalk_1.default.gray('No goal set.'));
-                return { success: true };
-            }
-            console.log(chalk_1.default.bold(`Status: ${snap.status}`));
-            console.log(`Objective: ${snap.objective}`);
-            console.log(`Continuations: ${snap.continuationCount}  |  Tokens: ${snap.tokensUsed}`);
-            return { success: true };
-        }
-        case 'edit': {
-            if (!rest) {
-                console.log(chalk_1.default.red('Usage: /target edit <new objective text>'));
-                return { success: false };
-            }
-            const ok = coordinator.edit(rest);
-            console.log(ok ? chalk_1.default.green('Goal objective updated.') : chalk_1.default.red('Cannot edit.'));
-            return { success: ok };
-        }
-        case 'replace': {
-            if (!rest) {
-                console.log(chalk_1.default.red('Usage: /target replace <new objective text>'));
-                return { success: false };
-            }
-            const ok = coordinator.replace(rest);
-            console.log(ok ? chalk_1.default.green('Goal replaced.') : chalk_1.default.red('Cannot replace.'));
-            return { success: ok };
-        }
-        default: {
-            // Treat as new objective
-            const result = coordinator.create(trimmed);
-            console.log(result.ok ? chalk_1.default.green('Goal created: ') + trimmed : chalk_1.default.red(result.error ?? 'Failed'));
-            return { success: result.ok };
-        }
-    }
-}
 function handleDiff(ctx, args) {
     const maxFilesMatch = args.match(/--max-files(?:=|\s+)(\d+)/);
     const maxFiles = maxFilesMatch ? Number(maxFilesMatch[1]) : 40;
@@ -2200,9 +2240,7 @@ function handleCommitPlan(ctx, args) {
     return { success: plan.diff.isGitRepo };
 }
 function handleTools(ctx) {
-    const tools = ctx.store.getSnapshot().tools.length > 0
-        ? ctx.store.getSnapshot().tools
-        : (0, tools_1.getRuntimeTools)();
+    const tools = ctx.store.getSnapshot().tools.length > 0 ? ctx.store.getSnapshot().tools : (0, tools_1.getRuntimeTools)();
     const staticTools = tools.filter(tool => !tool.name.startsWith('mcp__'));
     const mcpTools = tools.filter(tool => tool.name.startsWith('mcp__'));
     console.log();
@@ -2235,8 +2273,10 @@ function handleTodos(ctx) {
         return { success: true };
     }
     for (const todo of todos) {
-        const marker = todo.status === 'completed' ? SUCCESS('✓')
-            : todo.status === 'in_progress' ? WARN('›')
+        const marker = todo.status === 'completed'
+            ? SUCCESS('✓')
+            : todo.status === 'in_progress'
+                ? WARN('›')
                 : DIM('○');
         console.log(`  ${marker} ${todo.content}`);
         if (todo.activeForm && todo.activeForm !== todo.content) {
@@ -2246,17 +2286,27 @@ function handleTodos(ctx) {
     console.log();
     return { success: true };
 }
-function handleClearHistory(ctx) {
+function handleContextClear(ctx, args) {
     const history = ctx.store.getSnapshot().conversationHistory;
     if (history.length === 0) {
-        console.log(DIM('Conversation history is already empty'));
+        console.log(DIM('Current in-memory model context is already empty.'));
         console.log();
         return { success: true };
     }
+    if (!hasCommandFlag(args, '--yes')) {
+        return {
+            success: false,
+            error: [
+                `This will clear ${history.length} message(s) from the current in-memory model context.`,
+                'Saved session history will not be deleted and can still be restored with /resume.',
+                'Run /context-clear --yes to continue.',
+            ].join('\n'),
+        };
+    }
     ctx.store.resetConversation();
     (0, framework_1.resetToolState)();
-    console.log(SUCCESS(`✔ Cleared ${history.length} messages from conversation history`));
-    console.log(DIM('  Configuration and system state preserved'));
+    console.log(SUCCESS(`✔ Cleared ${history.length} messages from current model context`));
+    console.log(DIM('  Saved session history, configuration, and system state were preserved.'));
     console.log();
     return { success: true };
 }
@@ -2285,13 +2335,14 @@ async function handleCompact(ctx, args) {
     console.log(DIM((0, agent_status_1.compactStatus)()));
     try {
         const modelId = ctx.llm?.getModel() ?? ctx.store.getSnapshot().currentModel;
-        const coordinator = ctx.compactCoordinator ?? new coordinator_2.CompactCoordinator({
-            modelId,
-            llm: ctx.llm,
-            outputReserveTokens: ctx.llm?.getMaxTokens?.(),
-            getContextCapsule: () => ctx.store.getSnapshot().harnessState?.capsule,
-            getHarnessState: () => ctx.store.getSnapshot().harnessState,
-        });
+        const coordinator = ctx.compactCoordinator ??
+            new coordinator_1.CompactCoordinator({
+                modelId,
+                llm: ctx.llm,
+                outputReserveTokens: ctx.llm?.getMaxTokens?.(),
+                getContextCapsule: () => ctx.store.getSnapshot().harnessState?.capsule,
+                getHarnessState: () => ctx.store.getSnapshot().harnessState,
+            });
         coordinator.configure({
             modelId,
             llm: ctx.llm,
@@ -2505,9 +2556,7 @@ function handleSessions(ctx, args = '') {
     const query = scope.query?.trim();
     // If there's a search query, use the session index
     if (query && !query.startsWith('--')) {
-        const allSessions = scope.allProjects
-            ? (0, session_storage_1.listSessions)()
-            : (0, session_storage_1.listProjectSessions)(scope.projectPath);
+        const allSessions = scope.allProjects ? (0, session_storage_1.listSessions)() : (0, session_storage_1.listProjectSessions)(scope.projectPath);
         const matchedIds = (0, session_index_1.searchSessions)(query, allSessions.map(session => ({
             id: session.id,
             projectPath: session.projectPath,
@@ -2524,12 +2573,18 @@ function handleSessions(ctx, args = '') {
         }
         // Rebuild session list in matched order
         const sessionMap = new Map(allSessions.map(s => [s.id, s]));
-        const matchedSessions = matchedIds.map(id => sessionMap.get(id)).filter(Boolean);
+        const matchedSessions = matchedIds
+            .map(id => sessionMap.get(id))
+            .filter(Boolean);
         console.log();
         console.log(HEADER(`Sessions (search: "${query}") — ${matchedSessions.length} matches`));
         console.log(DIM('─'.repeat(40)));
         console.log();
-        printSessionRows(matchedSessions, { indexed: true, showProject: scope.allProjects, showIndexSummary: true });
+        printSessionRows(matchedSessions, {
+            indexed: true,
+            showProject: scope.allProjects,
+            showIndexSummary: true,
+        });
         console.log();
         console.log(DIM(`Searched ${allSessions.length} sessions, found ${matchedSessions.length} matches`));
         console.log(DIM('Use /resume <number|session-id|name> to restore a session'));
@@ -2560,8 +2615,7 @@ function handleResume(ctx, args) {
     const ui = commandUICapabilities(ctx);
     const scope = parseSessionScopeArgs(args, ctx.cwd);
     const sessionRef = scope.query;
-    const scopedSessions = (scope.allProjects ? (0, session_storage_1.listSessions)() : (0, session_storage_1.listProjectSessions)(scope.projectPath))
-        .filter(session => (session.messageCount ?? 0) > 0);
+    const scopedSessions = (scope.allProjects ? (0, session_storage_1.listSessions)() : (0, session_storage_1.listProjectSessions)(scope.projectPath)).filter(session => (session.messageCount ?? 0) > 0);
     if (!sessionRef) {
         const lastSession = scopedSessions[0];
         if (!lastSession) {
@@ -2599,14 +2653,18 @@ function handleResume(ctx, args) {
         return restoreSession(ctx, scopedSessions[pickerIndex], false);
     }
     // Resume specific session
-    const result = (0, session_storage_1.lookupSessionRef)(sessionRef, scope.projectPath, { allProjects: scope.allProjects });
+    const result = (0, session_storage_1.lookupSessionRef)(sessionRef, scope.projectPath, {
+        allProjects: scope.allProjects,
+    });
     if (result.status === 'ambiguous') {
         printSessionConflict(sessionRef, result.matches);
         return { success: false };
     }
     if (result.status === 'not_found') {
         console.log(ERROR(`Session not found: ${sessionRef}`));
-        console.log(DIM(scope.allProjects ? 'Use /sessions --all to list sessions' : 'Use /sessions to list project sessions, or /resume <id> --all'));
+        console.log(DIM(scope.allProjects
+            ? 'Use /sessions --all to list sessions'
+            : 'Use /sessions to list project sessions, or /resume <id> --all'));
         console.log();
         return { success: false };
     }
@@ -2631,7 +2689,9 @@ function restoreSession(ctx, session, isLast) {
     if (history.length > 0) {
         const eventSummary = checkpoint?.summary.text ?? generateRestoredSessionEventSummary(history);
         ctx.store.setState({ conversationHistory: history });
-        ctx.store.setState({ harnessState: (0, session_storage_1.loadSessionHarnessState)(resumed.id) ?? resumed.harnessState });
+        ctx.store.setState({
+            harnessState: (0, session_storage_1.loadSessionHarnessState)(resumed.id) ?? resumed.harnessState,
+        });
         (0, framework_1.resetToolState)();
         ctx.sessionRestored?.({
             sessionId: resumed.id,
@@ -2709,7 +2769,9 @@ function handleSessionRename(ctx, args) {
         console.log();
         return { success: false };
     }
-    const scopedSessions = scope.allProjects ? (0, session_storage_1.listSessions)() : (0, session_storage_1.listProjectSessions)(scope.projectPath);
+    const scopedSessions = scope.allProjects
+        ? (0, session_storage_1.listSessions)()
+        : (0, session_storage_1.listProjectSessions)(scope.projectPath);
     const pickerIndex = parsePickerIndex(ref, scopedSessions.length);
     let session = pickerIndex !== null ? scopedSessions[pickerIndex] : null;
     if (!session) {
@@ -2720,7 +2782,9 @@ function handleSessionRename(ctx, args) {
         }
         if (result.status === 'not_found') {
             console.log(ERROR(`Session not found: ${ref}`));
-            console.log(DIM(scope.allProjects ? 'Use /sessions --all to list sessions' : 'Use /sessions to list project sessions'));
+            console.log(DIM(scope.allProjects
+                ? 'Use /sessions --all to list sessions'
+                : 'Use /sessions to list project sessions'));
             console.log();
             return { success: false };
         }
@@ -2877,21 +2941,18 @@ const COMMANDS = [
     // Coding workflows
     {
         name: 'target',
+        aliases: ['goal'],
         description: 'Create, view, pause, resume, or clear a persistent goal target',
-        argumentHint: '[objective | pause | resume | clear | status | edit <text>]',
+        argumentHint: '[objective | pause | resume | clear --yes | status | edit <text> | replace <text> | confirm <criterion-id> | budget <tokens>]',
         category: 'workflow',
         priority: 3,
         type: 'builtin',
-        execute: (ctx, args) => handleTarget(ctx, args),
-    },
-    {
-        name: 'goal',
-        description: 'Alias for /target — manage a persistent goal target',
-        argumentHint: '[objective | pause | resume | clear | status | edit <text>]',
-        category: 'workflow',
-        priority: 2,
-        type: 'builtin',
-        execute: (ctx, args) => handleTarget(ctx, args),
+        execution: 'builtin',
+        risk: 'state-write',
+        execute: () => ({
+            success: false,
+            error: '/target must be routed through the shared AgentRuntimeController.',
+        }),
     },
     {
         name: 'diff',
@@ -2900,6 +2961,8 @@ const COMMANDS = [
         category: 'workflow',
         priority: 5,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleDiff(ctx, args),
     },
     {
@@ -2909,6 +2972,8 @@ const COMMANDS = [
         category: 'workflow',
         priority: 8,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleCommitPlan(ctx, args),
     },
     {
@@ -2918,6 +2983,8 @@ const COMMANDS = [
         category: 'workflow',
         priority: 10,
         type: 'chat',
+        execution: 'agent-workflow',
+        risk: 'read-only',
         execute: (_ctx, args) => continueAsSlashChat('review', args),
     },
     {
@@ -2928,6 +2995,8 @@ const COMMANDS = [
         category: 'workflow',
         priority: 20,
         type: 'chat',
+        execution: 'agent-workflow',
+        risk: 'read-only',
         execute: (_ctx, args) => continueAsSlashChat('security', args),
     },
     {
@@ -2938,6 +3007,8 @@ const COMMANDS = [
         category: 'workflow',
         priority: 30,
         type: 'chat',
+        execution: 'agent-workflow',
+        risk: 'state-write',
         execute: (_ctx, args) => continueAsSlashChat('test-gen', args),
     },
     {
@@ -2947,7 +3018,9 @@ const COMMANDS = [
         category: 'workflow',
         priority: 40,
         type: 'builtin',
-        execute: (ctx) => handleTodos(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleTodos(ctx),
     },
     // Sessions and context lifecycle
     {
@@ -2957,6 +3030,8 @@ const COMMANDS = [
         category: 'session',
         priority: 10,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleResume(ctx, args),
     },
     {
@@ -2966,6 +3041,8 @@ const COMMANDS = [
         category: 'session',
         priority: 20,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleSessions(ctx, args),
     },
     {
@@ -2976,6 +3053,8 @@ const COMMANDS = [
         category: 'session',
         priority: 30,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleSessionRename(ctx, args),
     },
     {
@@ -2985,16 +3064,34 @@ const COMMANDS = [
         category: 'session',
         priority: 40,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleCompact(ctx, args),
     },
+    {
+        name: 'context-clear',
+        description: 'Clear current in-memory model context; preserve saved session history',
+        argumentHint: '--yes',
+        category: 'session',
+        priority: 50,
+        type: 'builtin',
+        execution: 'builtin',
+        risk: 'destructive',
+        execute: (ctx, args) => handleContextClear(ctx, args),
+    },
     {
         name: 'clear-history',
         aliases: ['reset'],
-        description: 'Clear conversation history (keep config)',
-        category: 'session',
+        description: 'Deprecated alias for clearing only the current in-memory model context',
+        argumentHint: '--yes',
+        category: 'legacy',
         priority: 50,
         type: 'builtin',
-        execute: (ctx) => handleClearHistory(ctx),
+        isHidden: true,
+        execution: 'builtin',
+        risk: 'destructive',
+        deprecated: { since: 'v0.1.1', replacement: '/context-clear', removeIn: 'v0.3.0' },
+        execute: (ctx, args) => handleContextClear(ctx, args),
     },
     // Harness, memory, and skills
     {
@@ -3004,6 +3101,8 @@ const COMMANDS = [
         category: 'context',
         priority: 10,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => showHarness(ctx, args),
     },
     {
@@ -3012,7 +3111,9 @@ const COMMANDS = [
         category: 'context',
         priority: 20,
         type: 'builtin',
-        execute: (ctx) => handleSkills(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleSkills(ctx),
     },
     {
         name: 'skill',
@@ -3022,6 +3123,8 @@ const COMMANDS = [
         category: 'context',
         priority: 21,
         type: 'chat',
+        execution: 'agent-workflow',
+        risk: 'state-write',
         execute: (ctx, args) => handleSkill(ctx, args),
     },
     {
@@ -3031,6 +3134,8 @@ const COMMANDS = [
         category: 'context',
         priority: 30,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleMemory(ctx, args),
     },
     // Tools and safety
@@ -3041,7 +3146,9 @@ const COMMANDS = [
         category: 'tools',
         priority: 10,
         type: 'builtin',
-        execute: (ctx) => handleTools(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleTools(ctx),
     },
     {
         name: 'edit-preview',
@@ -3049,7 +3156,9 @@ const COMMANDS = [
         category: 'tools',
         priority: 15,
         type: 'builtin',
-        execute: (ctx) => handleEditPreview(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleEditPreview(ctx),
     },
     {
         name: 'mcp',
@@ -3057,7 +3166,9 @@ const COMMANDS = [
         category: 'tools',
         priority: 20,
         type: 'builtin',
-        execute: (ctx) => handleMcp(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleMcp(ctx),
     },
     {
         name: 'safety',
@@ -3065,7 +3176,9 @@ const COMMANDS = [
         category: 'tools',
         priority: 30,
         type: 'builtin',
-        execute: (ctx) => showSafety(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => showSafety(ctx),
     },
     // Model and runtime configuration
     {
@@ -3075,6 +3188,8 @@ const COMMANDS = [
         category: 'model',
         priority: 10,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleModel(ctx, args),
     },
     {
@@ -3085,6 +3200,8 @@ const COMMANDS = [
         category: 'model',
         priority: 20,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'state-write',
         execute: (ctx, args) => handleMode(ctx, args),
     },
     {
@@ -3093,7 +3210,9 @@ const COMMANDS = [
         category: 'model',
         priority: 30,
         type: 'builtin',
-        execute: (ctx) => showConfig(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => showConfig(ctx),
     },
     // System commands
     {
@@ -3103,7 +3222,9 @@ const COMMANDS = [
         category: 'system',
         priority: 10,
         type: 'builtin',
-        execute: () => showHelp(),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => showHelp(ctx),
     },
     {
         name: 'status',
@@ -3112,19 +3233,47 @@ const COMMANDS = [
         category: 'system',
         priority: 20,
         type: 'builtin',
-        execute: (ctx) => showStatus(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => showStatus(ctx),
     },
     {
         name: 'clear',
-        description: 'Clear the terminal screen',
+        description: 'Clear the current view without deleting session data',
         category: 'system',
         priority: 30,
         type: 'builtin',
-        execute: () => {
-            process.stdout.write('\x1Bc');
+        execution: 'renderer-local',
+        risk: 'read-only',
+        rendererScope: ['tui', 'terminal'],
+        execute: ctx => {
+            ctx.clearView?.();
             return { success: true };
         },
     },
+    {
+        name: 'tool-output',
+        description: 'Set the TUI tool output presentation mode',
+        argumentHint: '[adaptive|collapsed|full]',
+        category: 'system',
+        priority: 32,
+        type: 'builtin',
+        execution: 'renderer-local',
+        risk: 'read-only',
+        rendererScope: ['tui'],
+        execute: () => ({ success: true }),
+    },
+    {
+        name: 'redraw',
+        description: 'Redraw the TUI-owned live region',
+        category: 'system',
+        priority: 34,
+        type: 'builtin',
+        execution: 'renderer-local',
+        risk: 'read-only',
+        rendererScope: ['tui'],
+        execute: () => ({ success: true }),
+    },
     {
         name: 'exit',
         aliases: ['quit', 'q'],
@@ -3132,7 +3281,9 @@ const COMMANDS = [
         category: 'system',
         priority: 40,
         type: 'builtin',
-        execute: (ctx) => handleExit(ctx),
+        execution: 'builtin',
+        risk: 'state-write',
+        execute: ctx => handleExit(ctx),
     },
     // Diagnostics
     {
@@ -3142,15 +3293,19 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 5,
         type: 'builtin',
-        execute: (ctx) => handleDoctor(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleDoctor(ctx),
     },
     {
         name: 'storage',
         description: 'Inspect, repair, or clean Orion Code storage layout',
-        argumentHint: '[doctor|repair|cleanup --dry-run]',
+        argumentHint: '[doctor|repair [--dry-run|--yes] [--plan=<token>]|cleanup [--dry-run|--yes] [--plan=<token>]]',
         category: 'diagnostics',
         priority: 8,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'destructive',
         execute: (ctx, args) => handleStorage(ctx, args),
     },
     {
@@ -3160,7 +3315,9 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 10,
         type: 'builtin',
-        execute: (ctx) => handleUsage(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleUsage(ctx),
     },
     {
         name: 'loop-stats',
@@ -3169,7 +3326,9 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 12,
         type: 'builtin',
-        execute: (ctx) => handleLoopStats(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        execute: ctx => handleLoopStats(ctx),
     },
     {
         name: 'trace',
@@ -3178,6 +3337,8 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 14,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleTrace(ctx, args),
     },
     {
@@ -3187,6 +3348,8 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 15,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleLastTool(ctx, args),
     },
     {
@@ -3197,6 +3360,8 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 16,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'read-only',
         execute: (ctx, args) => handleArtifacts(ctx, args),
     },
     {
@@ -3207,6 +3372,8 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 18,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'destructive',
         execute: (ctx, args) => handleCheckpoint(ctx, args),
     },
     {
@@ -3215,7 +3382,10 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 20,
         type: 'builtin',
-        execute: (ctx) => handleCost(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        deprecated: { since: 'v0.1.1', replacement: '/usage', removeIn: 'v0.3.0' },
+        execute: ctx => handleCost(ctx),
     },
     {
         name: 'agents',
@@ -3223,18 +3393,23 @@ const COMMANDS = [
         category: 'diagnostics',
         priority: 30,
         type: 'builtin',
-        execute: (ctx) => showAgents(ctx),
+        execution: 'builtin',
+        risk: 'read-only',
+        isHidden: true,
+        execute: ctx => showAgents(ctx),
     },
     {
         name: 'migrate',
         description: 'Migrate data from OpenHorse to Orion Code',
-        argumentHint: 'openhorse [--dry-run] [--include-env] [--include-project-files]',
+        argumentHint: 'openhorse [--dry-run | --yes] [--include-env] [--include-project-files]',
         category: 'diagnostics',
         priority: 32,
         type: 'builtin',
+        execution: 'builtin',
+        risk: 'destructive',
         execute: (ctx, args) => (0, command_1.handleMigrateCommand)(ctx, args),
     },
-    // Legacy commands kept executable for compatibility, but not shown in Ink help/palette.
+    // Legacy commands kept executable for compatibility, but not shown in help/palette.
     {
         name: 'task',
         description: 'Submit or list tasks',
@@ -3242,6 +3417,9 @@ const COMMANDS = [
         category: 'legacy',
         type: 'builtin',
         isHidden: true,
+        execution: 'builtin',
+        risk: 'state-write',
+        deprecated: { since: 'v0.1.1', replacement: '/target', removeIn: 'v0.3.0' },
         execute: (ctx, args) => handleTask(ctx, args),
     },
     {
@@ -3251,6 +3429,9 @@ const COMMANDS = [
         category: 'legacy',
         type: 'builtin',
         isHidden: true,
+        execution: 'agent-workflow',
+        risk: 'state-write',
+        deprecated: { since: 'v0.1.1', replacement: '/target', removeIn: 'v0.3.0' },
         execute: (ctx, args) => handleRun(ctx, args),
     },
     {
@@ -3260,6 +3441,9 @@ const COMMANDS = [
         category: 'legacy',
         type: 'chat',
         isHidden: true,
+        execution: 'agent-workflow',
+        risk: 'state-write',
+        deprecated: { since: 'v0.1.1', removeIn: 'v0.3.0' },
         execute: (ctx, args) => ({ success: true, continueAsChat: true, chatInput: args }),
     },
 ];
@@ -3269,8 +3453,9 @@ const COMMANDS = [
 function getCommands() {
     return sortCommands(COMMANDS);
 }
-function getVisibleCommands() {
-    return sortCommands(COMMANDS.filter(command => !command.isHidden));
+function getVisibleCommands(renderer) {
+    return sortCommands(COMMANDS.filter(command => !command.isHidden &&
+        (!renderer || !command.rendererScope || command.rendererScope.includes(renderer))));
 }
 function findCommand(name) {
     return COMMANDS.find(c => c.name === name || c.aliases?.includes(name));