berget 2.2.11 → 2.2.13

package/src/commands/code/__tests__/setup-flow.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest';
 import type { ApiKeyServicePort, AuthServicePort } from '../ports/auth-services';
 
 import { CancelledError, CommandFailedError, PrerequisiteError } from '../errors';
-import { runSetup } from '../setup';
+import { runInit } from '../init';
 import { FakeApiKeyService } from './fake-api-key-service';
 import { FakeAuthService } from './fake-auth-service';
 import { FakeCommandRunner } from './fake-command-runner';
@@ -11,8 +11,8 @@ import { FakeFileStore } from './fake-file-store';
 import { CANCEL, confirm, FakePrompter, multiselect, select } from './fake-prompter';
 
 const makeDeps = (
-  overrides: Partial<Parameters<typeof runSetup>[0]> = {},
-): Parameters<typeof runSetup>[0] => {
+  overrides: Partial<Parameters<typeof runInit>[0]> = {},
+): Parameters<typeof runInit>[0] => {
   return {
     apiKeyService:
       (overrides.apiKeyService as ApiKeyServicePort) ?? new FakeApiKeyService('sk_ber_test'),
@@ -49,7 +49,7 @@ function makeJwt(payload: Record<string, unknown>): string {
   return `${header}.${body}.signature`;
 }
 
-describe('runSetup', () => {
+describe('runInit', () => {
   describe('happy path', () => {
     it('sets up opencode project without existing config', async () => {
       const deps = makeDeps({
@@ -61,13 +61,13 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
       expect(written.has('/home/user/project/opencode.json')).toBe(true);
       const config = JSON.parse(written.get('/home/user/project/opencode.json')!);
-      expect(config.plugin).toContain('@bergetai/opencode-auth');
+      expect(config.plugin).toContain('@bergetai/opencode-auth@1.0.22');
     });
 
     it('sets up opencode globally without existing config', async () => {
@@ -80,7 +80,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -101,7 +101,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const commands = deps.commands as FakeCommandRunner;
       expect(commands.calls.length).toBeGreaterThan(0);
@@ -121,7 +121,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -140,7 +140,7 @@ describe('runSetup', () => {
       });
 
       // Simulate opencode not being installed
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(PrerequisiteError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(PrerequisiteError);
     });
   });
 
@@ -150,7 +150,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([select(CANCEL)]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CancelledError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CancelledError);
     });
 
     it('throws CancelledError when user cancels at write confirmation', async () => {
@@ -162,7 +162,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CancelledError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CancelledError);
     });
 
     it('throws CancelledError when user cancels at agent write confirmation (opencode)', async () => {
@@ -176,7 +176,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CancelledError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CancelledError);
     });
 
     it('throws CancelledError when user cancels at agent write confirmation (pi)', async () => {
@@ -191,7 +191,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CancelledError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CancelledError);
     });
   });
 
@@ -215,13 +215,13 @@ describe('runSetup', () => {
         }),
       );
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const config = JSON.parse(written.get('/home/user/project/opencode.json')!);
       expect(config.customField).toBe('should-preserve');
       expect(config.plugin).toContain('other-plugin');
-      expect(config.plugin).toContain('@bergetai/opencode-auth');
+      expect(config.plugin).toContain('@bergetai/opencode-auth@1.0.22');
     });
 
     it('preserves jsonc comments when updating', async () => {
@@ -245,7 +245,7 @@ describe('runSetup', () => {
 }`,
       );
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const content = written.get('/home/user/project/opencode.jsonc')!;
@@ -267,20 +267,20 @@ describe('runSetup', () => {
         JSON.stringify(
           {
             $schema: 'https://opencode.ai/config.json',
-            plugin: ['@bergetai/opencode-auth'],
+            plugin: ['@bergetai/opencode-auth@1.0.22'],
           },
           null,
           2,
         ) + '\n',
       );
 
-      await runSetup(deps);
+      await 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);
-      expect(config.plugin).toEqual(['@bergetai/opencode-auth']);
+      expect(config.plugin).toEqual(['@bergetai/opencode-auth@1.0.22']);
       expect(content).toContain('$schema');
     });
 
@@ -305,7 +305,7 @@ describe('runSetup', () => {
         }),
       );
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const settings = JSON.parse(written.get('/home/user/project/.pi/settings.json')!);
@@ -324,7 +324,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -345,7 +345,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const commands = deps.commands as FakeCommandRunner;
       const installCall = commands.calls.find((c) => c.command === 'pi');
@@ -363,7 +363,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([select('pi'), select('project')]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CommandFailedError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CommandFailedError);
     });
   });
 
@@ -386,7 +386,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const prompter = deps.prompter as FakePrompter;
       const notes = prompter.calls.filter((c) => c.method === 'note');
@@ -409,7 +409,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const prompter = deps.prompter as FakePrompter;
       const notes = prompter.calls.filter((c) => c.method === 'note');
@@ -434,7 +434,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       expect(written.has('/home/user/.pi/agent/auth.json')).toBe(true);
@@ -465,7 +465,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const parsed = JSON.parse(written.get('/home/user/.local/share/opencode/auth.json')!);
@@ -485,7 +485,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -503,7 +503,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -523,7 +523,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -542,7 +542,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -561,7 +561,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -580,7 +580,7 @@ describe('runSetup', () => {
       });
 
       // First run writes the files
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const firstBackend = files
@@ -601,7 +601,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps2);
+      await runInit(deps2);
 
       // Content should be unchanged
       expect(files.getWrittenFiles().get('/home/user/project/.opencode/agents/backend.md')).toBe(
@@ -628,7 +628,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const content = written.get('/home/user/project/.pi/SYSTEM.md');

package/src/commands/code/auth-sync.ts

@@ -66,7 +66,7 @@ export async function configureAuth(deps: AuthDeps, tool: 'opencode' | 'pi'): Pr
     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.`,
+        `${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 };
@@ -129,7 +129,7 @@ export async function configureAuth(deps: AuthDeps, tool: 'opencode' | 'pi'): Pr
     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);
@@ -156,7 +156,7 @@ export async function configureAuth(deps: AuthDeps, tool: 'opencode' | 'pi'): Pr
     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/src/commands/code/{setup.ts → init.ts}

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import { applyEdits, modify, parse } from 'jsonc-parser';
 import * as os from 'node:os';
 
@@ -15,7 +16,7 @@ import { SpawnCommandRunner } from './adapters/spawn-command-runner.js';
 import { configureAuth } from './auth-sync.js';
 import { CancelledError, CommandFailedError, PrerequisiteError } from './errors';
 
-const OPENCODE_PLUGIN = '@bergetai/opencode-auth';
+const OPENCODE_PLUGIN = '@bergetai/opencode-auth@1.0.22';
 const PI_PROVIDER = 'npm:@bergetai/pi-provider';
 const OPENCODE_PLUGIN_NAME = '@bergetai/opencode-auth';
 const PI_PROVIDER_NAME = '@bergetai/pi-provider';
@@ -30,10 +31,14 @@ export interface WizardDeps {
   prompter: Prompter;
 }
 
-export async function runSetup(deps: WizardDeps): Promise<void> {
+export async function runInit(deps: WizardDeps): Promise<void> {
   const { apiKeyService, authService, commands, cwd, files, homeDir, prompter } = deps;
 
-  prompter.intro('\uD83D\uDD27 Berget Code Setup');
+  prompter.intro(`${chalk.bgGreen.black(' berget code ')}`);
+  prompter.note(
+    `Ask questions and report bugs on our GitHub repository:\n\n${chalk.cyan.underline('https://github.com/berget-ai/cli')}`,
+    'Need help?',
+  );
 
   const ocState = await getOpencodeState(files, homeDir, cwd);
   const piState = await getPiState(files, homeDir, cwd);
@@ -121,14 +126,14 @@ export async function runSetup(deps: WizardDeps): Promise<void> {
     }
   }
 
-  prompter.outro('Setup complete!');
+  prompter.outro('Initialization complete!');
 }
 
 // ─── OpenCode ────────────────────────────────────────────────────────────────
 
-export async function runSetupCommand(): Promise<void> {
+export async function runInitCommand(): Promise<void> {
   try {
-    await runSetup({
+    await runInit({
       apiKeyService: ApiKeyService.getInstance(),
       authService: AuthService.getInstance(),
       commands: new SpawnCommandRunner(),
@@ -154,24 +159,7 @@ export async function runSetupCommand(): Promise<void> {
   }
 }
 
-// ─── Pi ────────────────────────────────────────────────────────────────────────
-
-function generateDiff(oldText: string, newText: string, filePath: string): string {
-  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();
-}
+// ─── OpenCode Config Helpers ──────────────────────────────────────────────────
 
 function generateModifiedContent(existingContent: null | string, configPath: string): string {
   if (configPath.endsWith('.jsonc')) {
@@ -381,9 +369,9 @@ async function setupOpenCode(deps: {
   }
 
   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({