berget 2.2.10 → 2.2.12

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "berget",
-    "version": "2.2.10",
+    "version": "2.2.12",
     "main": "dist/index.js",
     "bin": {
         "berget": "dist/index.js"

package/dist/src/commands/code/__tests__/setup-flow.test.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const errors_1 = require("../errors");
-const setup_1 = require("../setup");
+const init_1 = require("../init");
 const fake_api_key_service_1 = require("./fake-api-key-service");
 const fake_auth_service_1 = require("./fake-auth-service");
 const fake_command_runner_1 = require("./fake-command-runner");
@@ -35,7 +35,7 @@ function makeJwt(payload) {
     const body = base64urlEncode(JSON.stringify(payload));
     return `${header}.${body}.signature`;
 }
-(0, vitest_1.describe)('runSetup', () => {
+(0, vitest_1.describe)('runInit', () => {
     (0, vitest_1.describe)('happy path', () => {
         (0, vitest_1.it)('sets up opencode project without existing config', async () => {
             const deps = makeDeps({
@@ -46,12 +46,12 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]), // No agents selected
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/project/opencode.json')).toBe(true);
             const config = JSON.parse(written.get('/home/user/project/opencode.json'));
-            (0, vitest_1.expect)(config.plugin).toContain('@bergetai/opencode-auth');
+            (0, vitest_1.expect)(config.plugin).toContain('@bergetai/opencode-auth@1.0.21');
         });
         (0, vitest_1.it)('sets up opencode globally without existing config', async () => {
             const deps = makeDeps({
@@ -62,7 +62,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]), // No agents selected
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/.config/opencode/opencode.json')).toBe(true);
@@ -75,11 +75,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'), // Agent selection
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const commands = deps.commands;
             (0, vitest_1.expect)(commands.calls.length).toBeGreaterThan(0);
             const installCall = commands.calls.find((c) => c.command === 'pi');
@@ -93,10 +94,10 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
-                    (0, fake_prompter_1.select)('__skip__'), // Skip agent selection
+                    (0, fake_prompter_1.confirm)(false, 'Set up an agent for Pi?'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             // Should not create any agent files
@@ -112,7 +113,7 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)('opencode'), (0, fake_prompter_1.select)('project')]),
             });
             // Simulate opencode not being installed
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.PrerequisiteError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.PrerequisiteError);
         });
     });
     (0, vitest_1.describe)('cancellation', () => {
@@ -120,7 +121,7 @@ function makeJwt(payload) {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)(fake_prompter_1.CANCEL)]),
             });
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
         });
         (0, vitest_1.it)('throws CancelledError when user cancels at write confirmation', async () => {
             const deps = makeDeps({
@@ -130,7 +131,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.confirm)(false, 'Create'),
                 ]),
             });
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
         });
         (0, vitest_1.it)('throws CancelledError when user cancels at agent write confirmation (opencode)', async () => {
             const deps = makeDeps({
@@ -142,7 +143,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.confirm)(false, 'agent'),
                 ]),
             });
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
         });
         (0, vitest_1.it)('throws CancelledError when user cancels at agent write confirmation (pi)', async () => {
             const deps = makeDeps({
@@ -150,11 +151,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(false, /Create|Overwrite/),
                 ]),
             });
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
         });
     });
     (0, vitest_1.describe)('file operations', () => {
@@ -172,12 +174,12 @@ function makeJwt(payload) {
                 customField: 'should-preserve',
                 plugin: ['other-plugin'],
             }));
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             const config = JSON.parse(written.get('/home/user/project/opencode.json'));
             (0, vitest_1.expect)(config.customField).toBe('should-preserve');
             (0, vitest_1.expect)(config.plugin).toContain('other-plugin');
-            (0, vitest_1.expect)(config.plugin).toContain('@bergetai/opencode-auth');
+            (0, vitest_1.expect)(config.plugin).toContain('@bergetai/opencode-auth@1.0.21');
         });
         (0, vitest_1.it)('preserves jsonc comments when updating', async () => {
             const deps = makeDeps({
@@ -195,7 +197,7 @@ function makeJwt(payload) {
   /* block comment explaining plugin */
   "plugin": ["other-plugin"]
 }`);
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             const content = written.get('/home/user/project/opencode.jsonc');
             (0, vitest_1.expect)(content).toContain('// This is my custom config');
@@ -211,14 +213,14 @@ function makeJwt(payload) {
             // Already has the exact same plugin version
             files.seed('/home/user/project/opencode.json', JSON.stringify({
                 $schema: 'https://opencode.ai/config.json',
-                plugin: ['@bergetai/opencode-auth'],
+                plugin: ['@bergetai/opencode-auth@1.0.21'],
             }, null, 2) + '\n');
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             // Check that no write happened — content should be unchanged
             const written = files.getWrittenFiles();
             const content = written.get('/home/user/project/opencode.json');
             const config = JSON.parse(content);
-            (0, vitest_1.expect)(config.plugin).toEqual(['@bergetai/opencode-auth']);
+            (0, vitest_1.expect)(config.plugin).toEqual(['@bergetai/opencode-auth@1.0.21']);
             (0, vitest_1.expect)(content).toContain('$schema');
         });
         (0, vitest_1.it)('preserves existing Pi settings when setting defaultProvider', async () => {
@@ -227,6 +229,7 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
@@ -236,7 +239,7 @@ function makeJwt(payload) {
                 anotherSetting: true,
                 existingKey: 'should-preserve',
             }));
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             const settings = JSON.parse(written.get('/home/user/project/.pi/settings.json'));
             (0, vitest_1.expect)(settings.existingKey).toBe('should-preserve');
@@ -252,7 +255,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/.config/opencode/opencode.json')).toBe(true);
@@ -265,11 +268,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const commands = deps.commands;
             const installCall = commands.calls.find((c) => c.command === 'pi');
             (0, vitest_1.expect)(installCall?.args).toContain('npm:@bergetai/pi-provider');
@@ -284,7 +288,7 @@ function makeJwt(payload) {
                     .handle('pi install', new Error('npm error')),
                 prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)('pi'), (0, fake_prompter_1.select)('project')]),
             });
-            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CommandFailedError);
+            await (0, vitest_1.expect)((0, init_1.runInit)(deps)).rejects.toBeInstanceOf(errors_1.CommandFailedError);
         });
     });
     (0, vitest_1.describe)('auth integration', () => {
@@ -301,7 +305,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const prompter = deps.prompter;
             const notes = prompter.calls.filter((c) => c.method === 'note');
             const lastNote = notes.at(-1);
@@ -316,11 +320,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const prompter = deps.prompter;
             const notes = prompter.calls.filter((c) => c.method === 'note');
             const lastNote = notes.at(-1);
@@ -336,11 +341,12 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
                     (0, fake_prompter_1.confirm)(true), // API key creation prompt
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/.pi/agent/auth.json')).toBe(true);
             const parsed = JSON.parse(written.get('/home/user/.pi/agent/auth.json'));
@@ -364,7 +370,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             const parsed = JSON.parse(written.get('/home/user/.local/share/opencode/auth.json'));
             (0, vitest_1.expect)(parsed.berget.type).toBe('oauth');
@@ -381,7 +387,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.confirm)(true, 'agent'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/project/.opencode/agents/backend.md')).toBe(true);
@@ -396,7 +402,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             for (const path of written.keys()) {
@@ -413,7 +419,7 @@ function makeJwt(payload) {
                     (0, fake_prompter_1.confirm)(true, 'agent'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/.config/opencode/agents/fullstack.md')).toBe(true);
@@ -424,11 +430,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/project/.pi/SYSTEM.md')).toBe(true);
@@ -439,11 +446,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('global'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('backend'),
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             (0, vitest_1.expect)(written.has('/home/user/.pi/agent/SYSTEM.md')).toBe(true);
@@ -459,7 +467,7 @@ function makeJwt(payload) {
                 ]),
             });
             // First run writes the files
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const files = deps.files;
             const firstBackend = files
                 .getWrittenFiles()
@@ -467,16 +475,17 @@ function makeJwt(payload) {
             const firstFrontend = files
                 .getWrittenFiles()
                 .get('/home/user/project/.opencode/agents/frontend.md');
-            // Second run with exact same content should not prompt for overwrite
+            // Second run with exact same content should prompt for confirmation
             const deps2 = makeDeps({
                 files,
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('opencode'),
                     (0, fake_prompter_1.select)('project'),
                     (0, fake_prompter_1.multiselect)(['backend', 'frontend']),
+                    (0, fake_prompter_1.confirm)(true, 'Write'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps2);
+            await (0, init_1.runInit)(deps2);
             // Content should be unchanged
             (0, vitest_1.expect)(files.getWrittenFiles().get('/home/user/project/.opencode/agents/backend.md')).toBe(firstBackend);
             (0, vitest_1.expect)(files.getWrittenFiles().get('/home/user/project/.opencode/agents/frontend.md')).toBe(firstFrontend);
@@ -490,11 +499,12 @@ function makeJwt(payload) {
                 prompter: new fake_prompter_1.FakePrompter([
                     (0, fake_prompter_1.select)('pi'),
                     (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Set up an agent for Pi?'),
                     (0, fake_prompter_1.select)('fullstack'),
-                    (0, fake_prompter_1.confirm)(true, 'Overwrite'),
+                    (0, fake_prompter_1.confirm)(true, 'SYSTEM.md already exists'),
                 ]),
             });
-            await (0, setup_1.runSetup)(deps);
+            await (0, init_1.runInit)(deps);
             const written = files.getWrittenFiles();
             const content = written.get('/home/user/project/.pi/SYSTEM.md');
             (0, vitest_1.expect)(content).not.toBe('old agent content');

package/dist/src/commands/code/auth-sync.js

@@ -38,7 +38,7 @@ async function configureAuth(deps, tool) {
         const loginResult = await authService.loginInteractive();
         if (!loginResult.success) {
             s.stop('Login failed.');
-            prompter.note(`${loginResult.error || 'Login timed out or was cancelled.'}\n\nPlease run \`berget auth login\` manually, then run \`berget code setup\` again.`, 'Authentication Failed');
+            prompter.note(`${loginResult.error || 'Login timed out or was cancelled.'}\n\nPlease run \`berget auth login\` manually, then run \`berget code init\` again.`, 'Authentication Failed');
             return { authenticated: false };
         }
         s.stop('Successfully logged in to Berget.');
@@ -88,7 +88,7 @@ async function configureAuth(deps, tool) {
         s.start('Creating API key...');
         try {
             const { key } = await apiKeyService.create({
-                description: 'Created by berget code setup',
+                description: 'Created by berget code init',
                 name: `${tool === 'opencode' ? 'OpenCode' : 'Pi'} (created by berget CLI)`,
             });
             await syncApiKeyToTool(files, homeDir, tool, key);
@@ -111,7 +111,7 @@ async function configureAuth(deps, tool) {
         s.start('Creating API key...');
         try {
             const { key } = await apiKeyService.create({
-                description: 'Created by berget code setup',
+                description: 'Created by berget code init',
                 name: `${tool === 'opencode' ? 'OpenCode' : 'Pi'} (created by berget CLI)`,
             });
             await syncApiKeyToTool(files, homeDir, tool, key);

package/dist/src/commands/code/{setup.js → init.js}

@@ -22,8 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runSetupCommand = exports.runSetup = void 0;
+exports.runInitCommand = exports.runInit = void 0;
+const chalk_1 = __importDefault(require("chalk"));
 const jsonc_parser_1 = require("jsonc-parser");
 const os = __importStar(require("node:os"));
 const index_js_1 = require("../../agents/index.js");
@@ -34,13 +38,14 @@ const fs_file_store_js_1 = require("./adapters/fs-file-store.js");
 const spawn_command_runner_js_1 = require("./adapters/spawn-command-runner.js");
 const auth_sync_js_1 = require("./auth-sync.js");
 const errors_1 = require("./errors");
-const OPENCODE_PLUGIN = '@bergetai/opencode-auth';
+const OPENCODE_PLUGIN = '@bergetai/opencode-auth@1.0.21';
 const PI_PROVIDER = 'npm:@bergetai/pi-provider';
 const OPENCODE_PLUGIN_NAME = '@bergetai/opencode-auth';
 const PI_PROVIDER_NAME = '@bergetai/pi-provider';
-async function runSetup(deps) {
+async function runInit(deps) {
     const { apiKeyService, authService, commands, cwd, files, homeDir, prompter } = deps;
-    prompter.intro('\uD83D\uDD27 Berget Code Setup');
+    prompter.intro(`${chalk_1.default.bgGreen.black(' berget code ')}`);
+    prompter.note(`Ask questions and report bugs on our GitHub repository:\n\n${chalk_1.default.cyan.underline('https://github.com/berget-ai/cli')}`, 'Need help?');
     const ocState = await getOpencodeState(files, homeDir, cwd);
     const piState = await getPiState(files, homeDir, cwd);
     const tool = await prompter.select({
@@ -106,13 +111,13 @@ async function runSetup(deps) {
             prompter.note(`Next steps:\n\n1. Restart Pi or run /reload\n2. Type: /login\n3. Choose your auth method:\n   • "Use a subscription" → Berget AI\n   • (or set BERGET_API_KEY env var)\n4. Select model: /model\n\nFor more information, see official docs:\n\nhttps://github.com/berget-ai/pi-provider`, 'Successfully configured Berget AI for Pi');
         }
     }
-    prompter.outro('Setup complete!');
+    prompter.outro('Initialization complete!');
 }
-exports.runSetup = runSetup;
+exports.runInit = runInit;
 // ─── OpenCode ────────────────────────────────────────────────────────────────
-async function runSetupCommand() {
+async function runInitCommand() {
     try {
-        await runSetup({
+        await runInit({
             apiKeyService: api_key_service_js_1.ApiKeyService.getInstance(),
             authService: auth_service_js_1.AuthService.getInstance(),
             commands: new spawn_command_runner_js_1.SpawnCommandRunner(),
@@ -138,25 +143,8 @@ async function runSetupCommand() {
         throw error;
     }
 }
-exports.runSetupCommand = runSetupCommand;
-// ─── Pi ────────────────────────────────────────────────────────────────────────
-function generateDiff(oldText, newText, filePath) {
-    const oldLines = oldText.split('\n');
-    const newLines = newText.split('\n');
-    let result = `--- ${filePath}\n+++ ${filePath}\n`;
-    const maxLength = Math.max(oldLines.length, newLines.length);
-    for (let index = 0; index < maxLength; index++) {
-        const oldLine = oldLines[index];
-        const newLine = newLines[index];
-        if (oldLine !== newLine) {
-            if (oldLine !== undefined)
-                result += `- ${oldLine}\n`;
-            if (newLine !== undefined)
-                result += `+ ${newLine}\n`;
-        }
-    }
-    return result.trimEnd();
-}
+exports.runInitCommand = runInitCommand;
+// ─── OpenCode Config Helpers ──────────────────────────────────────────────────
 function generateModifiedContent(existingContent, configPath) {
     if (configPath.endsWith('.jsonc')) {
         const content = existingContent || '{}';
@@ -318,10 +306,10 @@ async function setupOpenCode(deps) {
         return;
     }
     if (existingContent) {
-        prompter.note(generateDiff(existingContent, newContent, configPath), 'Changes to be written');
+        prompter.note(`OpenCode config will be updated at:\n  ${configPath}`, 'Config update');
     }
     else {
-        prompter.note(`New config at ${configPath}:\n\n${newContent}`, 'Config preview');
+        prompter.note(`OpenCode config will be created at:\n  ${configPath}`, 'Config update');
     }
     const shouldWrite = await prompter.confirm({
         initialValue: true,
@@ -338,41 +326,43 @@ async function setupOpenCodeAgents(deps) {
     const { cwd, files, homeDir, prompter, scope } = deps;
     const agents = (0, index_js_1.getAllAgents)().filter((a) => a.config.mode === 'primary');
     if (agents.length === 0) {
-        return;
+        return false;
     }
-    const selectedAgents = await prompter.multiselect({
-        message: 'Select agents to set up (optional - press enter to skip):',
-        options: agents.map((agent) => ({
-            hint: agent.config.description,
+    const agentsDir = scope === 'project'
+        ? pathJoin(cwd, '.opencode', 'agents')
+        : pathJoin(homeDir, '.config', 'opencode', 'agents');
+    prompter.note('Space to toggle, Enter to confirm.', 'Agent Setup');
+    const agentOptions = await Promise.all(agents.map(async (agent) => {
+        const agentPath = pathJoin(agentsDir, `${agent.config.name}.md`);
+        const exists = await files.exists(agentPath);
+        return {
+            hint: exists ? 'already configured' : agent.config.description,
             label: agent.config.name,
             value: agent.config.name,
-        })),
+        };
+    }));
+    const selectedAgents = await prompter.multiselect({
+        message: 'Select agents to set up:',
+        options: agentOptions,
+        required: false,
     });
     if (selectedAgents.length === 0) {
-        return;
+        return false;
     }
-    const agentsDir = scope === 'project'
-        ? pathJoin(cwd, '.opencode', 'agents')
-        : pathJoin(homeDir, '.config', 'opencode', 'agents');
-    await files.mkdir(agentsDir);
-    const hasChanges = await Promise.all(selectedAgents.map(async (agentName) => {
-        const agent = agents.find((a) => a.config.name === agentName);
-        if (!agent)
-            return false;
+    const newAgents = [];
+    const existingAgents = [];
+    await Promise.all(selectedAgents.map(async (agentName) => {
         const agentPath = pathJoin(agentsDir, `${agentName}.md`);
-        const existing = await files.readFile(agentPath);
-        const newContent = (0, index_js_1.toMarkdown)(agent);
-        if (existing === newContent) {
-            return false;
-        }
-        if (existing) {
-            prompter.note(generateDiff(existing, newContent, agentPath), `Changes to ${agentName} agent`);
-        }
-        return true;
+        const exists = await files.exists(agentPath);
+        (exists ? existingAgents : newAgents).push(agentName);
     }));
-    if (!hasChanges.some(Boolean)) {
-        prompter.note('Agent files are already up to date.', 'No changes needed');
-        return;
+    const summaryParts = [];
+    if (newAgents.length > 0)
+        summaryParts.push(`New: ${newAgents.join(', ')}`);
+    if (existingAgents.length > 0)
+        summaryParts.push(`Replaced: ${existingAgents.join(', ')}`);
+    if (summaryParts.length > 0) {
+        prompter.note(`  Agent Setup Summary:\n${summaryParts.map((part) => `  ${part}`).join('\n')}`, 'Agent Setup');
     }
     const shouldWrite = await prompter.confirm({
         initialValue: true,
@@ -381,6 +371,7 @@ async function setupOpenCodeAgents(deps) {
     if (!shouldWrite) {
         throw new errors_1.CancelledError();
     }
+    await files.mkdir(agentsDir);
     const s = prompter.spinner();
     s.start('Writing agent configurations...');
     for (const agentName of selectedAgents) {
@@ -392,6 +383,7 @@ async function setupOpenCodeAgents(deps) {
         await files.writeFile(agentPath, content);
     }
     s.stop(`Wrote ${selectedAgents.length} agent(s) to ${agentsDir}`);
+    return true;
 }
 async function setupPi(deps) {
     const { commands, cwd, files, homeDir, prompter, scope } = deps;
@@ -440,43 +432,36 @@ async function setupPiAgent(deps) {
     const { cwd, files, homeDir, prompter, scope } = deps;
     const agents = (0, index_js_1.getAllAgents)().filter((a) => a.config.mode === 'primary');
     if (agents.length === 0) {
-        return;
+        return false;
     }
+    const systemPath = scope === 'project'
+        ? pathJoin(cwd, '.pi', 'SYSTEM.md')
+        : pathJoin(homeDir, '.pi', 'agent', 'SYSTEM.md');
+    prompter.note('Pi uses a single system prompt.', 'Agent Setup');
+    const setupAgent = await prompter.confirm({
+        initialValue: false,
+        message: 'Set up an agent for Pi?',
+    });
+    if (!setupAgent)
+        return false;
     const selectedAgentName = await prompter.select({
-        message: 'Select an agent (optional - press enter to skip):',
-        options: [
-            { label: 'Skip agent setup', value: '__skip__' },
-            ...agents.map((agent) => ({
-                hint: agent.config.description,
-                label: agent.config.name,
-                value: agent.config.name,
-            })),
-        ],
+        message: 'Choose an agent:',
+        options: agents.map((agent) => ({
+            hint: agent.config.description,
+            label: agent.config.name,
+            value: agent.config.name,
+        })),
     });
-    if (selectedAgentName === '__skip__') {
-        return;
-    }
     const agent = agents.find((a) => a.config.name === selectedAgentName);
     if (!agent)
-        return;
-    const systemPath = scope === 'project'
-        ? pathJoin(cwd, '.pi', 'SYSTEM.md')
-        : pathJoin(homeDir, '.pi', 'agent', 'SYSTEM.md');
-    const existing = await files.readFile(systemPath);
-    const newContent = (0, index_js_1.toPiPrompt)(agent);
-    if (existing === newContent) {
-        prompter.note('Agent configuration is already up to date.', 'No changes needed');
-        return;
-    }
-    if (existing) {
-        prompter.note(generateDiff(existing, newContent, systemPath), 'Changes to agent configuration');
-    }
-    else {
-        prompter.note(newContent, 'New agent configuration');
-    }
+        return false;
+    const systemExists = await files.exists(systemPath);
+    const confirmMsg = systemExists
+        ? `SYSTEM.md already exists. Replace with ${agent.config.name}?`
+        : 'Create agent configuration?';
     const shouldWrite = await prompter.confirm({
         initialValue: true,
-        message: existing ? 'Overwrite existing agent configuration?' : 'Create agent configuration?',
+        message: confirmMsg,
     });
     if (!shouldWrite) {
         throw new errors_1.CancelledError();
@@ -485,8 +470,9 @@ async function setupPiAgent(deps) {
     s.start('Writing agent configuration...');
     const systemDir = scope === 'project' ? pathJoin(cwd, '.pi') : pathJoin(homeDir, '.pi', 'agent');
     await files.mkdir(systemDir);
-    await files.writeFile(systemPath, newContent);
+    await files.writeFile(systemPath, (0, index_js_1.toPiPrompt)(agent));
     s.stop(`Wrote agent configuration to ${systemPath}`);
+    return true;
 }
 function stripJsoncComments(content) {
     content = content.replaceAll(/\/\/.*$/gm, '');