@phuetz/code-buddy 1.6.1 → 2.0.0

package/dist/commands/dev/index.js

@@ -8,21 +8,49 @@
  *   buddy dev fix-ci [--log <file>]  → read CI logs + propose patch + re-test
  *   buddy dev explain                → summarise repo conventions + critical paths
  */
-/** Helper: create agent from env */
+import { logger } from '../../utils/logger.js';
+/** Create an agent through the shared OAuth/local/API provider resolver. */
 async function createAgent() {
     const dotenv = await import('dotenv');
     dotenv.config();
     const { CodeBuddyAgent } = await import('../../agent/codebuddy-agent.js');
-    const apiKey = process.env.GROK_API_KEY || process.env.XAI_API_KEY
-        || process.env.OPENAI_API_KEY || process.env.ANTHROPIC_API_KEY
-        || process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY;
-    if (!apiKey) {
-        console.error('Error: no API key found. Set GROK_API_KEY (or equivalent) environment variable.');
+    const { resolveCommandProvider } = await import('../llm-provider-resolution.js');
+    const provider = resolveCommandProvider();
+    if (!provider) {
+        logger.error('No provider found. Run `buddy login` (recommended) or start local Ollama.');
         process.exit(1);
     }
-    const baseURL = process.env.GROK_BASE_URL;
-    const model = process.env.GROK_MODEL;
-    return new CodeBuddyAgent(apiKey, baseURL, model);
+    return new CodeBuddyAgent(provider.apiKey, provider.baseURL, provider.model);
+}
+/** Release one-shot resources used by commands that stream a plan. */
+export async function disposePlanResources(agent) {
+    try {
+        agent.dispose({ skipSessionLearning: true });
+    }
+    catch (error) {
+        logger.debug('Failed to dispose dev plan agent', { error: String(error) });
+    }
+    try {
+        const { resetSkillRegistry } = await import('../../skills/registry.js');
+        resetSkillRegistry();
+    }
+    catch (error) {
+        logger.debug('Failed to dispose dev plan skill registry', { error: String(error) });
+    }
+    try {
+        const { resetMCPClient } = await import('../../mcp/mcp-client.js');
+        await resetMCPClient();
+    }
+    catch (error) {
+        logger.debug('Failed to dispose dev plan MCP client', { error: String(error) });
+    }
+    try {
+        const { getActiveRunStore } = await import('../../observability/run-store.js');
+        getActiveRunStore()?.dispose();
+    }
+    catch (error) {
+        logger.debug('Failed to dispose dev plan run store', { error: String(error) });
+    }
 }
 export function registerDevCommands(program) {
     const dev = program
@@ -35,12 +63,13 @@ export function registerDevCommands(program) {
         .action(async (objective) => {
         const { getRepoProfiler } = await import('../../agent/repo-profiler.js');
         const profiler = getRepoProfiler();
-        const profile = await profiler.getProfile();
+        const profile = await profiler.getProfile({ backgroundIndexing: false });
         console.log('\nRepo profile:');
         console.log(`  ${profile.contextPack}`);
         console.log('');
         const agent = await createAgent();
         await agent.systemPromptReady;
+        await agent.getSkillsReady();
         const prompt = `Repo context: ${profile.contextPack}
 
 Objective: ${objective}
@@ -51,23 +80,53 @@ Produce a numbered implementation plan. For each step list:
 - Any dependencies between steps
 
 Do NOT implement yet. Plan only.`;
-        console.log(`Planning: ${objective}\n`);
-        for await (const chunk of agent.processUserMessageStream(prompt)) {
-            if (chunk.type === 'content' && chunk.content) {
-                process.stdout.write(chunk.content);
+        try {
+            console.log(`Planning: ${objective}\n`);
+            const { isMeaningfulPlan, stripGuardNoise, writeDevPlan } = await import('./golden-path.js');
+            let planOutput = '';
+            let thinkingHint = false;
+            for await (const chunk of agent.processUserMessageStream(prompt)) {
+                if (chunk.type === 'reasoning' && !thinkingHint) {
+                    thinkingHint = true;
+                    process.stderr.write('Thinking…\n');
+                }
+                if (chunk.type === 'content' && chunk.content) {
+                    process.stdout.write(chunk.content);
+                    planOutput += chunk.content;
+                }
+            }
+            console.log('');
+            const cleaned = stripGuardNoise(planOutput);
+            if (!isMeaningfulPlan(cleaned)) {
+                console.error('Plan is empty — refusing to report success. No PLAN.md written.');
+                process.exitCode = 1;
+                return;
             }
+            const planPath = writeDevPlan(process.cwd(), objective, cleaned);
+            console.log(`Wrote plan: ${planPath}`);
+        }
+        finally {
+            await disposePlanResources(agent);
         }
-        console.log('');
-        agent.dispose?.();
     });
     // ── buddy dev run ──────────────────────────────────────────────
     dev
-        .command('run <objective>')
-        .description('Plan + implement + test + save artifacts in RunStore')
+        .command('run [objective]')
+        .description('Plan + implement + test + save artifacts in RunStore (resumes PLAN.md if objective omitted)')
         .option('-t, --type <type>', 'workflow type: add-feature|fix-tests|refactor|security-audit', 'add-feature')
         .option('-y, --yes', 'skip confirmation prompts (non-interactive)', false)
         .option('--write-policy <mode>', 'write policy: strict|confirm|off', 'strict')
         .action(async (objective, opts) => {
+        const { resolveRunObjective, workflowExitCode, buildConventionalCommitMessage, conventionalCommitNamedFiles, } = await import('./golden-path.js');
+        let resolved;
+        try {
+            resolved = resolveRunObjective(objective, process.cwd());
+        }
+        catch (err) {
+            console.error(err instanceof Error ? err.message : String(err));
+            process.exitCode = 1;
+            return;
+        }
         const { runWorkflow } = await import('./workflows.js');
         const validTypes = ['add-feature', 'fix-tests', 'refactor', 'security-audit'];
         const workflowType = validTypes.includes(opts.type)
@@ -79,71 +138,67 @@ Do NOT implement yet. Plan only.`;
             : 'strict';
         const agent = await createAgent();
         await agent.systemPromptReady;
-        const result = await runWorkflow(workflowType, objective, agent, {
-            nonInteractive: opts.yes,
-            writePolicyMode: policyMode,
-        });
-        console.log(`\nRun ${result.runId}: ${result.status}`);
-        if (result.artifactPaths.length > 0) {
-            console.log('Artifacts:');
-            for (const p of result.artifactPaths) {
-                console.log(`  ${p}`);
+        try {
+            const result = await runWorkflow(workflowType, resolved.objective, agent, {
+                nonInteractive: opts.yes,
+                writePolicyMode: policyMode,
+            });
+            console.log(`\nRun ${result.runId}: ${result.status}`);
+            if (resolved.source === 'plan') {
+                console.log(`Objective (from PLAN.md): ${resolved.objective}`);
+            }
+            if (result.artifactPaths.length > 0) {
+                console.log('Artifacts:');
+                for (const p of result.artifactPaths) {
+                    console.log(`  ${p}`);
+                }
             }
+            console.log(`\nView run: buddy run show ${result.runId}`);
+            if (result.status === 'completed') {
+                const commitType = workflowType === 'add-feature' ? 'feat' : 'fix';
+                const message = buildConventionalCommitMessage(commitType, resolved.objective);
+                const commit = conventionalCommitNamedFiles(process.cwd(), message);
+                if (commit.committed) {
+                    console.log(`Committed ${commit.hash}: ${message}`);
+                    console.log(`Files: ${commit.files.join(', ')}`);
+                }
+                else if (commit.error) {
+                    console.error(`Commit skipped: ${commit.error}`);
+                }
+                else {
+                    console.log('No named source files to commit.');
+                }
+            }
+            process.exitCode = workflowExitCode(result.status);
+        }
+        finally {
+            await disposePlanResources(agent);
         }
-        console.log(`\nView run: buddy run show ${result.runId}`);
-        agent.dispose?.();
     });
     // ── buddy dev pr ───────────────────────────────────────────────
     dev
-        .command('pr <objective>')
-        .description('Run a workflow then generate a PR summary')
-        .option('-t, --type <type>', 'workflow type', 'add-feature')
+        .command('pr [objective]')
+        .description('Print a PR title/body and create a PR (fail-closed without gh; local remotes are pushed)')
         .option('-y, --yes', 'skip confirmation prompts', false)
-        .action(async (objective, opts) => {
-        const { runWorkflow } = await import('./workflows.js');
-        const validTypes = ['add-feature', 'fix-tests', 'refactor', 'security-audit'];
-        const workflowType = validTypes.includes(opts.type)
-            ? opts.type
-            : 'add-feature';
-        const agent = await createAgent();
-        await agent.systemPromptReady;
-        const result = await runWorkflow(workflowType, objective, agent, {
-            nonInteractive: opts.yes,
-            tags: ['pr'],
-        });
-        if (result.status === 'completed') {
-            console.log('\n── PR Summary ──────────────────────────');
-            const prPrompt = `Based on what was just implemented, write a GitHub Pull Request description:
-- Title (max 70 chars)
-- Summary (bullet points of what changed)
-- Test plan (what to verify)
-Keep it concise and professional.`;
-            for await (const chunk of agent.processUserMessageStream(prPrompt)) {
-                if (chunk.type === 'content' && chunk.content) {
-                    process.stdout.write(chunk.content);
-                }
-            }
-            console.log('');
-            // Generate full PR description using LLM
-            try {
-                const { GitHubIntegration } = await import('../../integrations/github-integration.js');
-                const gh = new GitHubIntegration();
-                const prDescription = await gh.generatePRDescriptionWithLLM(undefined, async (prompt) => {
-                    let response = '';
-                    for await (const chunk of agent.processUserMessageStream(prompt)) {
-                        if (chunk.type === 'content' && chunk.content)
-                            response += chunk.content;
-                    }
-                    return response;
-                });
-                console.log('\n── Full PR Description ─────────────────');
-                console.log(prDescription);
-            }
-            catch {
-                // Non-critical: PR summary was already printed above
-            }
+        .action(async (objective) => {
+        const { buildPrTitleAndBody, attemptPullRequest } = await import('./golden-path.js');
+        const { title, body } = buildPrTitleAndBody(process.cwd(), objective);
+        console.log('\n── PR ──────────────────────────────────');
+        console.log(`Title: ${title}`);
+        console.log('');
+        console.log(body);
+        console.log('');
+        const attempt = attemptPullRequest(process.cwd(), title, body);
+        if (attempt.created) {
+            console.log(`PR created: ${attempt.url}`);
+            return;
         }
-        agent.dispose?.();
+        if (attempt.pushed) {
+            console.log('Pushed to local origin (no GitHub PR: gh is not authenticated).');
+            return;
+        }
+        console.error(`PR not created: ${attempt.error || 'gh not authenticated'}`);
+        process.exitCode = 1;
     });
     // ── buddy dev fix-ci ───────────────────────────────────────────
     dev
@@ -178,32 +233,19 @@ Keep it concise and professional.`;
                 failure = await pipeline.fetchGitHubActionsLog(opts.run);
                 if (!failure) {
                     console.error(`Could not fetch failed job from run ${opts.run}. Is 'gh' installed and authenticated?`);
-                    agent.dispose?.();
+                    await disposePlanResources(agent);
                     process.exit(1);
                 }
             }
             else {
-                // Read log from --log file or stdin
+                const { loadCiLogContent } = await import('./golden-path.js');
                 let logContent = '';
-                if (opts.log) {
-                    const fs = await import('fs');
-                    if (!fs.default.existsSync(opts.log)) {
-                        console.error(`Log file not found: ${opts.log}`);
-                        agent.dispose?.();
-                        process.exit(1);
-                    }
-                    logContent = fs.default.readFileSync(opts.log, 'utf-8');
-                }
-                else if (!process.stdin.isTTY) {
-                    const chunks = [];
-                    for await (const chunk of process.stdin) {
-                        chunks.push(chunk);
-                    }
-                    logContent = Buffer.concat(chunks).toString('utf-8');
+                try {
+                    logContent = await loadCiLogContent({ log: opts.log });
                 }
-                else {
-                    console.error('Auto-fix requires --run <id>, --log <file>, or piped CI output via stdin.');
-                    agent.dispose?.();
+                catch (err) {
+                    console.error(err instanceof Error ? err.message : String(err));
+                    await disposePlanResources(agent);
                     process.exit(1);
                 }
                 failure = {
@@ -251,34 +293,23 @@ Keep it concise and professional.`;
             if (result.prUrl) {
                 console.log(`\nPR created: ${result.prUrl}`);
             }
-            agent.dispose?.();
+            await disposePlanResources(agent);
             return;
         }
         // ── Original interactive path ────────────────────────────
+        const { loadCiLogContent, workflowExitCode } = await import('./golden-path.js');
         let logContent = '';
-        if (opts.log) {
-            const fs = await import('fs');
-            if (!fs.default.existsSync(opts.log)) {
-                console.error(`Log file not found: ${opts.log}`);
-                process.exit(1);
-            }
-            logContent = fs.default.readFileSync(opts.log, 'utf-8');
+        try {
+            logContent = await loadCiLogContent({ log: opts.log });
         }
-        else if (!process.stdin.isTTY) {
-            // Read from stdin
-            const chunks = [];
-            for await (const chunk of process.stdin) {
-                chunks.push(chunk);
-            }
-            logContent = Buffer.concat(chunks).toString('utf-8');
-        }
-        else {
-            console.error('Provide --log <file> or pipe CI output via stdin.');
-            process.exit(1);
+        catch (err) {
+            console.error(err instanceof Error ? err.message : String(err));
+            process.exitCode = 1;
+            return;
         }
         const { getRepoProfiler } = await import('../../agent/repo-profiler.js');
         const profiler = getRepoProfiler();
-        const profile = await profiler.getProfile();
+        const profile = await profiler.getProfile({ backgroundIndexing: false });
         const { runWorkflow } = await import('./workflows.js');
         const agent = await createAgent();
         await agent.systemPromptReady;
@@ -297,7 +328,8 @@ Repo context: ${profile.contextPack}`;
             nonInteractive: opts.yes,
         });
         console.log(`\nRun ${result.runId}: ${result.status}`);
-        agent.dispose?.();
+        process.exitCode = workflowExitCode(result.status);
+        await disposePlanResources(agent);
     });
     // ── buddy dev issue ───────────────────────────────────────
     dev
@@ -328,7 +360,7 @@ Repo context: ${profile.contextPack}`;
             console.error(`\nIssue #${result.issueNumber} failed: ${result.error || 'unknown error'}`);
             process.exit(1);
         }
-        agent.dispose?.();
+        await disposePlanResources(agent);
     });
     // ── buddy dev explain ──────────────────────────────────────────
     dev
@@ -377,7 +409,7 @@ Be concise — this is a quick orientation for a developer.`;
             }
         }
         console.log('');
-        agent.dispose?.();
+        await disposePlanResources(agent);
     });
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/dev/issue-pipeline.js

@@ -30,7 +30,7 @@ const LABEL_WORKFLOW_MAP = {
  * 5. Create PR with `Closes #<number>`
  */
 export async function runIssuePipeline(issueRef, agent, options = {}) {
-    const { execSync } = await import('child_process');
+    const { execSync, execFileSync } = await import('child_process');
     // ── Step 1: Fetch issue ──────────────────────────────────────
     const issue = await fetchIssue(issueRef, execSync);
     logger.info(`Issue #${issue.number}: ${issue.title}`);
@@ -40,13 +40,13 @@ export async function runIssuePipeline(issueRef, agent, options = {}) {
     const slug = slugify(issue.title);
     const branch = `feat/${issue.number}-${slug}`;
     try {
-        execSync(`git checkout -b ${branch}`, { stdio: 'pipe' });
+        execFileSync('git', ['checkout', '-b', branch], { stdio: 'pipe' });
         console.log(`Created branch: ${branch}`);
     }
     catch {
         // Branch might already exist
         try {
-            execSync(`git checkout ${branch}`, { stdio: 'pipe' });
+            execFileSync('git', ['checkout', branch], { stdio: 'pipe' });
             console.log(`Switched to existing branch: ${branch}`);
         }
         catch (err) {
@@ -97,11 +97,11 @@ export async function runIssuePipeline(issueRef, agent, options = {}) {
     let prUrl;
     try {
         // Stage and commit changes
-        execSync('git add -A', { stdio: 'pipe' });
+        execFileSync('git', ['add', '-A'], { stdio: 'pipe' });
         const commitMsg = `feat: resolve #${issue.number} — ${issue.title}`;
-        execSync(`git commit -m "${commitMsg.replace(/"/g, '\\"')}"`, { stdio: 'pipe' });
+        execFileSync('git', ['commit', '-m', commitMsg], { stdio: 'pipe' });
         // Push branch
-        execSync(`git push -u origin ${branch}`, { stdio: 'pipe' });
+        execFileSync('git', ['push', '-u', 'origin', branch], { stdio: 'pipe' });
         // Create PR
         const prBody = [
             `## Summary`,
@@ -115,7 +115,7 @@ export async function runIssuePipeline(issueRef, agent, options = {}) {
             `Closes #${issue.number}`,
         ].join('\n');
         const prTitle = `feat: ${issue.title}`.slice(0, 70);
-        const prOutput = execSync(`gh pr create --title "${prTitle.replace(/"/g, '\\"')}" --body "${prBody.replace(/"/g, '\\"')}"`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const prOutput = execFileSync('gh', ['pr', 'create', '--title', prTitle, '--body', prBody], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
         prUrl = prOutput;
         console.log(`\nPR created: ${prUrl}`);
     }

package/dist/commands/dev/workflows.d.ts

@@ -18,6 +18,8 @@ export interface WorkflowOptions {
     writePolicyMode?: 'strict' | 'confirm' | 'off';
     /** Extra tags for run metadata */
     tags?: string[];
+    /** How many times to feed a red test suite back to the agent and re-run (default: 1). 0 disables the fix loop. */
+    maxFixRounds?: number;
 }
 export interface WorkflowResult {
     runId: string;

package/dist/commands/dev/workflows.js

@@ -89,6 +89,14 @@ async function runTests(profile) {
         return `Tests failed.\n${out.slice(0, 2000)}`;
     }
 }
+/**
+ * A test run counts as "green" if it passed or if there is no test command to
+ * run. Anything else (a `Tests failed.` string from runTests) is a failure the
+ * workflow must NOT report as completed.
+ */
+function testsGreen(results) {
+    return results.startsWith('Tests passed') || results.startsWith('No test command');
+}
 // ──────────────────────────────────────────────────────────────────
 // Main workflow runner
 // ──────────────────────────────────────────────────────────────────
@@ -100,7 +108,7 @@ export async function runWorkflow(type, objective, agent, options = {}) {
     // ── Setup ─────────────────────────────────────────────────────
     const runStore = RunStore.getInstance();
     const profiler = getRepoProfiler();
-    const profile = await profiler.getProfile();
+    const profile = await profiler.getProfile({ backgroundIndexing: false });
     // Start a run for observability
     const runId = runStore.startRun(objective, {
         tags: [type, ...tags],
@@ -166,14 +174,36 @@ Start with PLAN only. List exactly what you will do.`;
             const patchPath = runStore.saveArtifact(runId, 'patch.diff', diffContent);
             artifactPaths.push(patchPath);
         }
-        // ── Step 4: Test ─────────────────────────────────────────────
+        // ── Step 4: Test (with a bounded fix loop) ───────────────────
         runStore.emit(runId, { type: 'step_start', data: { step: 'test' } });
         console.log('\n[Running tests…]');
-        const testResults = await runTests(profile);
+        let testResults = await runTests(profile);
         console.log(testResults.slice(0, 500));
+        // If the suite is red, feed the failure back to the agent for a bounded
+        // number of fix rounds and re-run. Previously the workflow ran tests once
+        // and reported 'completed' unconditionally — a red suite was silently
+        // reported as success (runTests swallows failure and never throws). This
+        // makes the "VERIFY: re-run tests to confirm they pass" the prompts promise
+        // actually happen. `No test command` is not treated as a failure.
+        const maxFixRounds = Math.max(0, options.maxFixRounds ?? 1);
+        let fixRound = 0;
+        while (!testsGreen(testResults) && fixRound < maxFixRounds) {
+            fixRound++;
+            runStore.emit(runId, { type: 'decision', data: { description: `Tests failing — fix round ${fixRound}/${maxFixRounds}` } });
+            console.log(`\n[Tests failing — attempting fix ${fixRound}/${maxFixRounds}…]`);
+            const fixPrompt = `The test suite is FAILING. Here is the output:\n\n${testResults.slice(0, 2000)}\n\nDiagnose the root cause and apply a fix using apply_patch with unified diffs. Then stop — the suite will be re-run automatically to verify.`;
+            for await (const chunk of agent.processUserMessageStream(fixPrompt)) {
+                if (chunk.type === 'content' && chunk.content) {
+                    process.stdout.write(chunk.content);
+                }
+            }
+            testResults = await runTests(profile);
+            console.log(testResults.slice(0, 500));
+        }
+        const testsPassed = testsGreen(testResults);
         const testLogPath = runStore.saveArtifact(runId, 'test-results.log', testResults);
         artifactPaths.push(testLogPath);
-        runStore.emit(runId, { type: 'step_end', data: { step: 'test', passed: testResults.startsWith('Tests passed') } });
+        runStore.emit(runId, { type: 'step_end', data: { step: 'test', passed: testsPassed } });
         // ── Step 5: Summary ──────────────────────────────────────────
         runStore.emit(runId, { type: 'step_start', data: { step: 'summary' } });
         const summaryPrompt = `Generate a brief summary of what was accomplished:
@@ -192,12 +222,15 @@ Keep it under 300 words.`;
         const summaryPath = runStore.saveArtifact(runId, 'summary.md', summaryContent);
         artifactPaths.push(summaryPath);
         runStore.emit(runId, { type: 'step_end', data: { step: 'summary' } });
-        runStore.endRun(runId, 'completed');
+        // Fail closed on a red suite: the workflow only reports 'completed' when the
+        // tests are actually green (or there are none to run).
+        const finalStatus = testsPassed ? 'completed' : 'failed';
+        runStore.endRun(runId, finalStatus);
         writePolicy.setMode(previousMode);
         agent.setRunId(undefined);
         return {
             runId,
-            status: 'completed',
+            status: finalStatus,
             artifactPaths,
             summary: summaryOutput,
         };

package/dist/commands/enhanced-command-handler.d.ts

@@ -9,6 +9,7 @@ export interface AgentContextProxy {
     getContextStats: () => unknown;
     formatContextStats: () => string;
     getCurrentModel: () => string;
+    getCurrentSessionId?: () => string | null;
     getContextMemoryMetrics?: () => {
         summaryCount: number;
         summaryTokens: number;
@@ -62,6 +63,8 @@ export declare class EnhancedCommandHandler {
      * Sets the CodeBuddy client instance for commands that require client access.
      */
     setCodeBuddyClient(client: CodeBuddyClient): void;
+    private createBatchChatFn;
+    private createBatchSpawnFn;
     /**
      * Handle /lint command using the multi-language lint runner.
      */

package/dist/commands/enhanced-command-handler.js

@@ -1,3 +1,5 @@
+import { handleGrillMe } from './handlers/grill-me-handler.js';
+import { handleDeepthink } from './handlers/deepthink-handler.js';
 // Import all handlers from modular files
 import { 
 // Branch handlers
@@ -53,7 +55,7 @@ handleThink,
 // Team handler (Agent Teams multi-agent coordination)
 handleTeam, 
 // Batch handler (CC13 — parallel task decomposition)
-handleBatchCommand, 
+handleBatchSlashCommand, createBatchChatFn, createDefaultBatchSpawnFn, 
 // Starter pack handler
 handleStarter, 
 // Fast mode handler (Enterprise-aligned)
@@ -63,7 +65,7 @@ handleBtw, setBtwClient,
 // Heartbeat handler (V4.x — wire user-facing activation of HeartbeatEngine)
 handleHeartbeat, 
 // Goal handler (Hermes Agent parity — Ralph loop)
-handleGoal, handleSubgoal, 
+handleGoal, handleLoop, handleSubgoal, 
 // Daily reset handler (audit OpenClaw heritage activation)
 handleDailyReset, 
 // Team session handler — slash /share (audit OpenClaw heritage activation, TeamSessionManager wake)
@@ -109,7 +111,9 @@ handleCloud,
 // Trigger handlers (event-driven webhook triggers)
 handleTrigger, 
 // Infra handlers (TurboQuant health dashboard)
-handleInfra, } from "./handlers/index.js";
+handleInfra, 
+// R5 handlers backed by existing services
+handleRedo, handleTimeline, handleKnowledgeGraph, handleApprovals, } from "./handlers/index.js";
 import { handleLessonsCommand } from "./handlers/index.js";
 import { handleContextStats } from "./handlers/extra-handlers.js";
 import { handleLogin, handleLogout, handleWhoami } from "./handlers/auth-handlers.js";
@@ -282,6 +286,10 @@ export class EnhancedCommandHandler {
         ['__COLAB__', (args) => handleColab(args)],
         ['__DIFF_CHECKPOINTS__', (args) => handleDiffCheckpoints(args)],
         // Extra UX commands
+        ['__REDO__', (args) => handleRedo(args)],
+        ['__TIMELINE__', (args) => handleTimeline(args, this.agentProxy?.getCurrentSessionId?.())],
+        ['__KNOWLEDGE_GRAPH__', (args) => handleKnowledgeGraph(args)],
+        ['__APPROVALS__', (args) => handleApprovals(args)],
         ['__UNDO__', (args) => handleUndo(args)],
         ['__DIFF__', (args) => args.length > 0 ? handleDiffCheckpoints(args) : handleDiff(args)],
         ['__SEARCH__', (args) => handleSearch(args)],
@@ -295,15 +303,7 @@ export class EnhancedCommandHandler {
         // Agent Teams multi-agent coordination
         ['__TEAM__', (args) => handleTeam(args)],
         // CC13: Batch parallel task decomposition
-        ['__BATCH__', (args) => {
-                const result = handleBatchCommand(args.join(' '));
-                // handleBatchCommand is async, wrap in a sync-compatible result
-                return {
-                    handled: true,
-                    entry: { type: 'assistant', content: 'Batch command initiated...', timestamp: new Date() },
-                    asyncAction: result,
-                };
-            }],
+        ['__BATCH__', (args) => handleBatchSlashCommand(args, this.createBatchChatFn(), this.createBatchSpawnFn())],
         // Commands previously handled inline in client-dispatcher
         ['__CLEAR_CHAT__', () => handleClearChat()],
         ['__CHANGE_MODEL__', (args) => handleChangeModel(args)],
@@ -337,10 +337,13 @@ export class EnhancedCommandHandler {
         ['__FAST_MODE__', (args) => handleFastMode(args)],
         // BTW side-question (Native Engine v2026.3.14 alignment)
         ['__BTW__', (args) => handleBtw(args)],
+        ['__GRILL_ME__', (args) => handleGrillMe(args)],
+        ['__DEEPTHINK__', (args) => handleDeepthink(args)],
         // Heartbeat engine activation (fleet AUTONOMOUS-FLEET-PROTOCOL v0.1)
         ['__HEARTBEAT__', (args) => handleHeartbeat(args)],
         // Standing goal — judge + auto-continue loop (Hermes Agent parity)
         ['__GOAL__', (args) => handleGoal(args, { client: this.codebuddyClient })],
+        ['__LOOP__', (args) => handleLoop(args, { client: this.codebuddyClient })],
         ['__SUBGOAL__', (args) => handleSubgoal(args)],
         // Daily reset scheduler (audit OpenClaw heritage activation)
         ['__DAILY_RESET__', (args) => handleDailyReset(args)],
@@ -412,6 +415,20 @@ export class EnhancedCommandHandler {
         this.codebuddyClient = client;
         setBtwClient(client);
     }
+    createBatchChatFn() {
+        return createBatchChatFn(this.codebuddyClient);
+    }
+    createBatchSpawnFn() {
+        const client = this.codebuddyClient;
+        if (!client)
+            return undefined;
+        return createDefaultBatchSpawnFn({
+            cwd: process.cwd(),
+            apiKey: client.getApiKey(),
+            baseURL: client.getBaseURL(),
+            model: client.getCurrentModel(),
+        });
+    }
     /**
      * Handle /lint command using the multi-language lint runner.
      */

package/dist/commands/exchange.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare function createExchangeCommand(): Command;