suzi-cli 0.1.22 → 0.1.24

package/dist/commands/agent.js

@@ -47,6 +47,14 @@ exports.executeAgentCommand = executeAgentCommand;
 exports.logsAgentCommand = logsAgentCommand;
 exports.codeAgentCommand = codeAgentCommand;
 exports.deleteAgentCommand = deleteAgentCommand;
+exports.historyCommand = historyCommand;
+exports.diffCommand = diffCommand;
+exports.versionCommand = versionCommand;
+exports.checkoutCommand = checkoutCommand;
+exports.forkCommand = forkCommand;
+exports.upstreamCommand = upstreamCommand;
+exports.pullCommand = pullCommand;
+exports.listForksCommand = listForksCommand;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
@@ -54,11 +62,47 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const api_1 = require("../lib/api");
+const api_errors_1 = require("../lib/api-errors");
 const ui_1 = require("../utils/ui");
 const memory_1 = require("../lib/memory");
 const tty_1 = require("../utils/tty");
 const agent_picker_1 = require("../utils/agent-picker");
 const session_registry_1 = require("../lib/session-registry");
+function outputCliApiErrorJson(summary, raw) {
+    (0, tty_1.outputJson)({
+        success: false,
+        error: summary,
+        data: {
+            error: raw,
+        },
+    });
+}
+function printCliApiIssues(issues, heading = '  Issues:') {
+    if (issues.length === 0) {
+        return;
+    }
+    console.log();
+    console.log(ui_1.colors.error(heading));
+    for (const issue of issues) {
+        console.log(`    ${ui_1.colors.error('✕')} ${(0, api_errors_1.formatCliApiErrorIssue)(issue)}`);
+    }
+}
+function handleCliApiFailure(raw, options) {
+    const parsed = (0, api_errors_1.parseCliApiError)(raw);
+    const summary = options.fallbackSummary || parsed.summary || 'Unknown error';
+    if (options.jsonMode) {
+        outputCliApiErrorJson(summary, parsed.raw);
+        return summary;
+    }
+    (0, ui_1.error)(`${options.prefix || ''}${summary}`);
+    if (parsed.issues.length > 0) {
+        printCliApiIssues(parsed.issues, options.heading);
+    }
+    else if (parsed.detailsText) {
+        console.log(ui_1.colors.muted(`  ${parsed.detailsText}`));
+    }
+    return summary;
+}
 function registerAgentCommand(program) {
     const agent = program
         .command('agents')
@@ -175,6 +219,72 @@ function registerAgentCommand(program) {
         .action(async (id, opts) => {
         await deleteAgentCommand(id, opts);
     });
+    // ── Git-based version control ──
+    // suzi agents history [id]
+    agent
+        .command('history [id]')
+        .description('View agent commit history')
+        .option('-n, --limit <n>', 'Number of commits to show', '20')
+        .option('--json', 'Output as JSON')
+        .action(async (id, opts) => {
+        await historyCommand(id, opts);
+    });
+    // suzi agents diff [id] [sha]
+    agent
+        .command('diff [id] [sha]')
+        .description('View diff for a specific commit')
+        .option('--json', 'Output as JSON')
+        .action(async (id, sha, opts) => {
+        await diffCommand(id, sha, opts);
+    });
+    // suzi agents version [id] [sha]
+    agent
+        .command('version [id] [sha]')
+        .description('View source code at a specific commit')
+        .option('--json', 'Output as JSON')
+        .action(async (id, sha, opts) => {
+        await versionCommand(id, sha, opts);
+    });
+    // suzi agents checkout [id] [sha]
+    agent
+        .command('checkout [id] [sha]')
+        .description('Revert agent to a previous commit')
+        .option('--json', 'Output as JSON')
+        .action(async (id, sha, opts) => {
+        await checkoutCommand(id, sha, opts);
+    });
+    // suzi agents fork [id]
+    agent
+        .command('fork [id]')
+        .description('Fork an agent (creates your own copy)')
+        .option('--json', 'Output as JSON')
+        .action(async (id, opts) => {
+        await forkCommand(id, opts);
+    });
+    // suzi agents upstream [id]
+    agent
+        .command('upstream [id]')
+        .description('Check if upstream has new changes (for forked agents)')
+        .option('--json', 'Output as JSON')
+        .action(async (id, opts) => {
+        await upstreamCommand(id, opts);
+    });
+    // suzi agents pull [id]
+    agent
+        .command('pull [id]')
+        .description('Pull upstream changes into a forked agent')
+        .option('--json', 'Output as JSON')
+        .action(async (id, opts) => {
+        await pullCommand(id, opts);
+    });
+    // suzi agents forks [id]
+    agent
+        .command('forks [id]')
+        .description('List all forks of an agent')
+        .option('--json', 'Output as JSON')
+        .action(async (id, opts) => {
+        await listForksCommand(id, opts);
+    });
 }
 // ============================================================================
 // Command Implementations
@@ -414,17 +524,10 @@ async function deployAgentCommand(file, opts) {
         }
         if (!resp.ok) {
             spinner?.fail();
-            const errorMsg = resp.data?.error || resp.data?.message || 'Unknown error';
-            const details = resp.data?.details;
-            if (jsonMode) {
-                (0, tty_1.outputJson)({ success: false, error: errorMsg, data: { details } });
-            }
-            else {
-                (0, ui_1.error)(`Deploy failed: ${errorMsg}`);
-                if (details) {
-                    console.log(ui_1.colors.muted(`  ${details}`));
-                }
-            }
+            const errorMsg = handleCliApiFailure(resp.data, {
+                jsonMode,
+                prefix: 'Deploy failed: ',
+            });
             (0, memory_1.appendLearning)({ category: 'error', message: `Deploy failed: ${errorMsg}`, command: 'agent deploy' });
             return;
         }
@@ -438,12 +541,35 @@ async function deployAgentCommand(file, opts) {
                 agentData.status = 'active';
             }
             else {
-                const activateError = activateResp.data?.error || activateResp.data?.message || 'Unknown error';
+                const parsedError = (0, api_errors_1.parseCliApiError)(activateResp.data);
+                const activateError = parsedError.summary;
                 if (jsonMode) {
-                    (0, tty_1.outputJson)({ success: true, data: { agent: agentData, activationError: activateError } });
+                    (0, tty_1.outputJson)({
+                        success: false,
+                        error: activateError,
+                        data: {
+                            agent: agentData,
+                            activationError: {
+                                summary: activateError,
+                                error: parsedError.raw,
+                            },
+                        },
+                    });
                 }
                 else {
-                    spinner?.warn(`Agent deployed but activation failed: ${activateError}`);
+                    if (spinner) {
+                        spinner.fail(`Agent deployed but activation failed: ${activateError}`);
+                        process.exitCode = 1;
+                    }
+                    else {
+                        (0, ui_1.error)(`Agent deployed but activation failed: ${activateError}`);
+                    }
+                    if (parsedError.issues.length > 0) {
+                        printCliApiIssues(parsedError.issues);
+                    }
+                    else if (parsedError.detailsText) {
+                        console.log(ui_1.colors.muted(`  ${parsedError.detailsText}`));
+                    }
                 }
                 (0, memory_1.appendLearning)({ category: 'error', message: `Post-deploy activation failed: ${activateError}`, command: 'agent deploy --activate', agentId: agentData.id });
                 return;
@@ -605,18 +731,10 @@ async function validateAgentCommand(file, opts) {
         const resp = await (0, api_1.post)('/api/agent/validate', { code: source });
         if (!resp.ok) {
             spinner?.fail();
-            const errorData = resp.data;
-            const msg = errorData?.message || 'Compilation error';
-            const details = errorData?.details;
-            if (jsonMode) {
-                (0, tty_1.outputJson)({ success: false, error: msg, data: { details } });
-            }
-            else {
-                (0, ui_1.error)(msg);
-                if (details) {
-                    console.log(ui_1.colors.muted(`  ${details}`));
-                }
-            }
+            handleCliApiFailure(resp.data, {
+                jsonMode,
+                fallbackSummary: 'Compilation error',
+            });
             return;
         }
         const data = resp.data;
@@ -678,6 +796,10 @@ async function validateAgentCommand(file, opts) {
                 }
             }
         }
+        const triggerIssues = data.triggers?.issues || [];
+        if (triggerIssues.length > 0) {
+            printCliApiIssues(triggerIssues, '  Trigger issues:');
+        }
         console.log();
         (0, ui_1.divider)();
         if (data.valid) {
@@ -710,13 +832,10 @@ async function activateAgentCommand(idOrName, opts) {
     const resp = await (0, api_1.post)(`/api/agent/${agent.id}/activate`);
     if (!resp.ok) {
         spinner?.fail();
-        const errorMsg = resp.data?.error || resp.data?.message || 'Unknown error';
-        if (jsonMode) {
-            (0, tty_1.outputJson)({ success: false, error: errorMsg });
-        }
-        else {
-            (0, ui_1.error)(`Failed to activate: ${errorMsg}`);
-        }
+        const errorMsg = handleCliApiFailure(resp.data, {
+            jsonMode,
+            prefix: 'Failed to activate: ',
+        });
         (0, memory_1.appendLearning)({ category: 'error', message: `Activate failed: ${errorMsg}`, command: 'agent activate', agentId: agent.id });
         return;
     }
@@ -755,13 +874,10 @@ async function deactivateAgentCommand(idOrName, opts) {
     const resp = await (0, api_1.post)(`/api/agent/${agent.id}/deactivate`);
     if (!resp.ok) {
         spinner?.fail();
-        const errorMsg = resp.data?.error || resp.data?.message || 'Unknown error';
-        if (jsonMode) {
-            (0, tty_1.outputJson)({ success: false, error: errorMsg });
-        }
-        else {
-            (0, ui_1.error)(`Failed to deactivate: ${errorMsg}`);
-        }
+        const errorMsg = handleCliApiFailure(resp.data, {
+            jsonMode,
+            prefix: 'Failed to deactivate: ',
+        });
         (0, memory_1.appendLearning)({ category: 'error', message: `Deactivate failed: ${errorMsg}`, command: 'agent deactivate', agentId: agent.id });
         return;
     }
@@ -841,13 +957,10 @@ async function executeAgentCommand(idOrName, trigger, opts) {
     });
     if (!resp.ok) {
         spinner?.fail();
-        const errorMsg = resp.data?.error || resp.data?.message || 'Unknown error';
-        if (jsonMode) {
-            (0, tty_1.outputJson)({ success: false, error: errorMsg });
-        }
-        else {
-            (0, ui_1.error)(`Execution failed: ${errorMsg}`);
-        }
+        const errorMsg = handleCliApiFailure(resp.data, {
+            jsonMode,
+            prefix: 'Execution failed: ',
+        });
         (0, memory_1.appendLearning)({ category: 'error', message: `Execution failed: ${errorMsg}`, command: 'agent execute', agentId: agent.id });
         return;
     }
@@ -997,4 +1110,514 @@ async function deleteAgentCommand(idOrName, opts) {
         (0, ui_1.success)(`Agent ${agent.id.slice(0, 8)}... deleted.`);
     }
 }
+// ============================================================================
+// Git Version Control Commands
+// ============================================================================
+async function historyCommand(idOrName, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    const limit = opts?.limit || '20';
+    const spinner = (0, tty_1.createSpinner)('Loading commit history...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.get)(`/api/agent/${agent.id}/history?limit=${limit}`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to load history';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    const commits = resp.data.commits || [];
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { commits, count: commits.length, agentId: agent.id } });
+        return;
+    }
+    if (commits.length === 0) {
+        (0, ui_1.header)('Commit History');
+        console.log();
+        (0, ui_1.info)('No commits found for this agent.');
+        return;
+    }
+    (0, ui_1.header)(`Commit History — ${agent.title || 'Untitled'}`);
+    console.log();
+    for (const commit of commits) {
+        const sha = ui_1.colors.highlight(commit.sha.substring(0, 7));
+        const date = ui_1.colors.muted(new Date(commit.timestamp || commit.createdAt).toLocaleString());
+        const msg = commit.message || 'No message';
+        console.log(`  ${sha}  ${msg}  ${date}`);
+    }
+    console.log();
+    console.log(ui_1.colors.muted(`  ${commits.length} commit(s)`));
+}
+async function diffCommand(idOrName, sha, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    // If no sha, pick from history
+    if (!sha) {
+        if (!(0, tty_1.shouldUseInteractive)()) {
+            const msg = 'Commit SHA is required in non-interactive mode.';
+            if (jsonMode) {
+                (0, tty_1.outputJson)({ success: false, error: msg });
+            }
+            else {
+                (0, ui_1.error)(msg);
+            }
+            return;
+        }
+        const histResp = await (0, api_1.get)(`/api/agent/${agent.id}/history?limit=20`);
+        if (!histResp.ok || !histResp.data?.commits?.length) {
+            (0, ui_1.error)('No commits found to diff.');
+            return;
+        }
+        const { selected } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'selected',
+                message: 'Select a commit to view diff:',
+                choices: histResp.data.commits.map((c) => ({
+                    name: `${c.sha.substring(0, 7)}  ${c.message || 'No message'}  ${ui_1.colors.muted(new Date(c.timestamp || '').toLocaleString())}`,
+                    value: c.sha,
+                })),
+            },
+        ]);
+        sha = selected;
+    }
+    const spinner = (0, tty_1.createSpinner)('Loading diff...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.get)(`/api/agent/${agent.id}/diff/${sha}`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to load diff';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { sha, patch: resp.data.patch, additions: resp.data.additions, deletions: resp.data.deletions, agentId: agent.id } });
+        return;
+    }
+    (0, ui_1.header)(`Diff — ${sha.substring(0, 7)}`);
+    console.log();
+    const patch = resp.data.patch || '';
+    if (!patch) {
+        (0, ui_1.info)('No changes in this commit.');
+        return;
+    }
+    if (resp.data.additions !== undefined || resp.data.deletions !== undefined) {
+        console.log(ui_1.colors.muted(`  ${chalk_1.default.green(`+${resp.data.additions || 0}`)} ${chalk_1.default.red(`-${resp.data.deletions || 0}`)}`));
+        console.log();
+    }
+    // Colorize diff output
+    for (const line of patch.split('\n')) {
+        if (line.startsWith('+++') || line.startsWith('---')) {
+            console.log(chalk_1.default.bold(line));
+        }
+        else if (line.startsWith('+')) {
+            console.log(chalk_1.default.green(line));
+        }
+        else if (line.startsWith('-')) {
+            console.log(chalk_1.default.red(line));
+        }
+        else if (line.startsWith('@@')) {
+            console.log(chalk_1.default.cyan(line));
+        }
+        else {
+            console.log(line);
+        }
+    }
+}
+async function versionCommand(idOrName, sha, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    // If no sha, pick from history
+    if (!sha) {
+        if (!(0, tty_1.shouldUseInteractive)()) {
+            const msg = 'Commit SHA is required in non-interactive mode.';
+            if (jsonMode) {
+                (0, tty_1.outputJson)({ success: false, error: msg });
+            }
+            else {
+                (0, ui_1.error)(msg);
+            }
+            return;
+        }
+        const histResp = await (0, api_1.get)(`/api/agent/${agent.id}/history?limit=20`);
+        if (!histResp.ok || !histResp.data?.commits?.length) {
+            (0, ui_1.error)('No commits found.');
+            return;
+        }
+        const { selected } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'selected',
+                message: 'Select a commit to view source:',
+                choices: histResp.data.commits.map((c) => ({
+                    name: `${c.sha.substring(0, 7)}  ${c.message || 'No message'}  ${ui_1.colors.muted(new Date(c.timestamp || '').toLocaleString())}`,
+                    value: c.sha,
+                })),
+            },
+        ]);
+        sha = selected;
+    }
+    const spinner = (0, tty_1.createSpinner)('Loading version...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.get)(`/api/agent/${agent.id}/version/${sha}`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to load version';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    const source = resp.data.source || '';
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { sha, source, agentId: agent.id } });
+        return;
+    }
+    (0, ui_1.header)(`Version — ${sha.substring(0, 7)}`);
+    console.log();
+    if (!source) {
+        (0, ui_1.info)('No source code at this commit.');
+        return;
+    }
+    const lines = source.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        const lineNum = ui_1.colors.muted(String(i + 1).padStart(4));
+        console.log(`${lineNum}  ${lines[i]}`);
+    }
+    console.log();
+    console.log(ui_1.colors.muted(`  ${lines.length} lines`));
+}
+async function checkoutCommand(idOrName, sha, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    // If no sha, pick from history
+    if (!sha) {
+        if (!(0, tty_1.shouldUseInteractive)()) {
+            const msg = 'Commit SHA is required in non-interactive mode.';
+            if (jsonMode) {
+                (0, tty_1.outputJson)({ success: false, error: msg });
+            }
+            else {
+                (0, ui_1.error)(msg);
+            }
+            return;
+        }
+        const histResp = await (0, api_1.get)(`/api/agent/${agent.id}/history?limit=20`);
+        if (!histResp.ok || !histResp.data?.commits?.length) {
+            (0, ui_1.error)('No commits found.');
+            return;
+        }
+        const { selected } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'selected',
+                message: 'Select a commit to revert to:',
+                choices: histResp.data.commits.map((c) => ({
+                    name: `${c.sha.substring(0, 7)}  ${c.message || 'No message'}  ${ui_1.colors.muted(new Date(c.timestamp || '').toLocaleString())}`,
+                    value: c.sha,
+                })),
+            },
+        ]);
+        sha = selected;
+    }
+    // Confirm destructive action
+    if (!jsonMode && (0, tty_1.shouldUseInteractive)()) {
+        const { confirm } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: `Revert "${agent.title || 'Untitled'}" to commit ${sha.substring(0, 7)}? This will overwrite the current code.`,
+                default: false,
+            },
+        ]);
+        if (!confirm) {
+            (0, ui_1.info)('Cancelled.');
+            return;
+        }
+    }
+    const spinner = (0, tty_1.createSpinner)('Reverting agent...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.post)(`/api/agent/${agent.id}/checkout/${sha}`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to checkout';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.succeed();
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { agentId: agent.id, commitSha: resp.data.commitSha, revertedTo: sha } });
+    }
+    else {
+        (0, ui_1.success)(`Agent reverted to ${sha.substring(0, 7)}. New commit: ${resp.data.commitSha?.substring(0, 7) || 'N/A'}`);
+    }
+}
+async function forkCommand(idOrName, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    const spinner = (0, tty_1.createSpinner)('Forking agent...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.post)(`/api/agent/${agent.id}/fork`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to fork agent';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.succeed();
+    const forkData = resp.data;
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { fork: forkData, upstreamId: agent.id } });
+        return;
+    }
+    (0, ui_1.success)('Agent forked!');
+    console.log();
+    (0, ui_1.label)('Fork ID', forkData.agent?.id || forkData.id || 'N/A');
+    (0, ui_1.label)('Title', forkData.agent?.title || 'N/A');
+    (0, ui_1.label)('Upstream', `${agent.id.slice(0, 8)}... (${agent.title || 'Untitled'})`);
+    if (forkData.commitSha) {
+        (0, ui_1.label)('Commit', forkData.commitSha.substring(0, 7));
+    }
+    console.log();
+    (0, ui_1.divider)();
+}
+async function upstreamCommand(idOrName, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    const spinner = (0, tty_1.createSpinner)('Checking upstream...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.get)(`/api/agent/${agent.id}/upstream`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to check upstream';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    const status = resp.data;
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { agentId: agent.id, ...status } });
+        return;
+    }
+    (0, ui_1.header)(`Upstream Status — ${agent.title || 'Untitled'}`);
+    console.log();
+    const commits = status.newCommits || status.commits || [];
+    if (status.hasUpdates) {
+        (0, ui_1.warn)('Upstream has new changes available.');
+        (0, ui_1.label)('New commits', String(commits.length));
+        if (commits.length) {
+            console.log();
+            console.log(ui_1.colors.muted('  Recent upstream commits:'));
+            for (const c of commits.slice(0, 5)) {
+                console.log(`    ${ui_1.colors.highlight(c.sha.substring(0, 7))}  ${c.message || 'No message'}`);
+            }
+        }
+        console.log();
+        (0, ui_1.info)(`Pull changes with: suzi agents pull ${agent.id}`);
+    }
+    else {
+        (0, ui_1.success)('Up to date with upstream.');
+    }
+}
+async function pullCommand(idOrName, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    const spinner = (0, tty_1.createSpinner)('Pulling upstream changes...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.post)(`/api/agent/${agent.id}/pull`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to pull upstream';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    const result = resp.data;
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { agentId: agent.id, ...result } });
+        return;
+    }
+    if (result.status === 'up-to-date') {
+        (0, ui_1.success)('Already up to date.');
+        return;
+    }
+    if (result.status === 'clean') {
+        (0, ui_1.success)('Merged upstream changes cleanly!');
+        if (result.commitSha) {
+            (0, ui_1.label)('Commit', result.commitSha.substring(0, 7));
+        }
+        return;
+    }
+    if (result.status === 'conflict') {
+        (0, ui_1.warn)('Merge conflicts detected!');
+        console.log();
+        const conflicts = result.conflicts || [];
+        console.log(chalk_1.default.bold(`  ${conflicts.length} conflict region(s):`));
+        console.log();
+        for (let i = 0; i < conflicts.length; i++) {
+            const c = conflicts[i];
+            console.log(chalk_1.default.bold(`  Conflict ${i + 1}:`));
+            if (c.ours) {
+                console.log(chalk_1.default.green('  <<<< Your version:'));
+                for (const line of c.ours.split('\n')) {
+                    console.log(chalk_1.default.green(`    ${line}`));
+                }
+            }
+            if (c.theirs) {
+                console.log(chalk_1.default.red('  >>>> Upstream version:'));
+                for (const line of c.theirs.split('\n')) {
+                    console.log(chalk_1.default.red(`    ${line}`));
+                }
+            }
+            console.log();
+        }
+        if (result.merged) {
+            console.log(ui_1.colors.muted('  Merged source with conflict markers:'));
+            console.log(ui_1.colors.muted('  ─'.repeat(40)));
+            const lines = result.merged.split('\n');
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (line.startsWith('<<<<<<<')) {
+                    console.log(chalk_1.default.green(`  ${line}`));
+                }
+                else if (line.startsWith('=======')) {
+                    console.log(chalk_1.default.yellow(`  ${line}`));
+                }
+                else if (line.startsWith('>>>>>>>')) {
+                    console.log(chalk_1.default.red(`  ${line}`));
+                }
+                else {
+                    console.log(`  ${line}`);
+                }
+            }
+        }
+        console.log();
+        (0, ui_1.info)('Resolve conflicts and use the API to submit resolved source.');
+        if (result.upstreamHead) {
+            (0, ui_1.label)('Upstream HEAD', result.upstreamHead.substring(0, 7));
+        }
+        return;
+    }
+    // Unknown status
+    (0, ui_1.info)(`Pull result: ${result.status || 'unknown'}`);
+}
+async function listForksCommand(idOrName, opts) {
+    if (!(0, ui_1.requireAuth)())
+        return;
+    const jsonMode = opts?.json || false;
+    const agent = await (0, agent_picker_1.fetchAndPickAgent)(idOrName, jsonMode);
+    if (!agent)
+        return;
+    const spinner = (0, tty_1.createSpinner)('Loading forks...', jsonMode);
+    spinner?.start();
+    const resp = await (0, api_1.get)(`/api/agent/${agent.id}/forks`);
+    if (!resp.ok) {
+        spinner?.fail();
+        const msg = resp.data?.message || resp.data?.error || 'Failed to load forks';
+        if (jsonMode) {
+            (0, tty_1.outputJson)({ success: false, error: msg });
+        }
+        else {
+            (0, ui_1.error)(msg);
+        }
+        return;
+    }
+    spinner?.stop();
+    const forks = resp.data.forks || [];
+    if (jsonMode) {
+        (0, tty_1.outputJson)({ success: true, data: { forks, count: forks.length, agentId: agent.id } });
+        return;
+    }
+    if (forks.length === 0) {
+        (0, ui_1.header)('Forks');
+        console.log();
+        (0, ui_1.info)('No forks found for this agent.');
+        return;
+    }
+    (0, ui_1.header)(`Forks of ${agent.title || 'Untitled'} (${forks.length})`);
+    console.log();
+    const table = new cli_table3_1.default({
+        head: [
+            chalk_1.default.gray('#'),
+            chalk_1.default.gray('Agent ID'),
+            chalk_1.default.gray('Last Synced'),
+            chalk_1.default.gray('Created'),
+        ],
+        style: { head: [], border: ['gray'] },
+    });
+    for (let i = 0; i < forks.length; i++) {
+        const f = forks[i];
+        table.push([
+            ui_1.colors.muted(String(i + 1)),
+            f.childAgentId || f.agentId || 'N/A',
+            f.lastSyncedSha ? f.lastSyncedSha.substring(0, 7) : ui_1.colors.muted('N/A'),
+            f.createdAt ? ui_1.colors.muted(new Date(f.createdAt).toLocaleDateString()) : ui_1.colors.muted('N/A'),
+        ]);
+    }
+    console.log(table.toString());
+}
 //# sourceMappingURL=agent.js.map