berget 2.2.10 → 2.2.12

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.21');
     });
 
     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();
@@ -95,12 +95,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'), // Agent selection
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const commands = deps.commands as FakeCommandRunner;
       expect(commands.calls.length).toBeGreaterThan(0);
@@ -116,11 +117,11 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
-          select('__skip__'), // Skip agent selection
+          confirm(false, 'Set up an agent for Pi?'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -139,7 +140,7 @@ describe('runSetup', () => {
       });
 
       // Simulate opencode not being installed
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(PrerequisiteError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(PrerequisiteError);
     });
   });
 
@@ -149,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 () => {
@@ -161,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 () => {
@@ -175,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 () => {
@@ -184,12 +185,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(false, /Create|Overwrite/),
         ]),
       });
 
-      await expect(runSetup(deps)).rejects.toBeInstanceOf(CancelledError);
+      await expect(runInit(deps)).rejects.toBeInstanceOf(CancelledError);
     });
   });
 
@@ -213,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.21');
     });
 
     it('preserves jsonc comments when updating', async () => {
@@ -243,7 +245,7 @@ describe('runSetup', () => {
 }`,
       );
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       const content = written.get('/home/user/project/opencode.jsonc')!;
@@ -265,20 +267,20 @@ describe('runSetup', () => {
         JSON.stringify(
           {
             $schema: 'https://opencode.ai/config.json',
-            plugin: ['@bergetai/opencode-auth'],
+            plugin: ['@bergetai/opencode-auth@1.0.21'],
           },
           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.21']);
       expect(content).toContain('$schema');
     });
 
@@ -288,6 +290,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
@@ -302,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')!);
@@ -321,7 +324,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -336,12 +339,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const commands = deps.commands as FakeCommandRunner;
       const installCall = commands.calls.find((c) => c.command === 'pi');
@@ -359,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);
     });
   });
 
@@ -382,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');
@@ -399,12 +403,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const prompter = deps.prompter as FakePrompter;
       const notes = prompter.calls.filter((c) => c.method === 'note');
@@ -423,12 +428,13 @@ describe('runSetup', () => {
           select('pi'),
           select('project'),
           confirm(true), // API key creation prompt
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const written = files.getWrittenFiles();
       expect(written.has('/home/user/.pi/agent/auth.json')).toBe(true);
@@ -459,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')!);
@@ -479,7 +485,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -497,7 +503,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -517,7 +523,7 @@ describe('runSetup', () => {
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -530,12 +536,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -548,12 +555,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('global'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('backend'),
           confirm(true, 'Create'),
         ]),
       });
 
-      await runSetup(deps);
+      await runInit(deps);
 
       const files = deps.files as FakeFileStore;
       const written = files.getWrittenFiles();
@@ -572,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
@@ -582,17 +590,18 @@ describe('runSetup', () => {
         .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 FakePrompter([
           select('opencode'),
           select('project'),
           multiselect(['backend', 'frontend']),
+          confirm(true, 'Write'),
         ]),
       });
 
-      await runSetup(deps2);
+      await runInit(deps2);
 
       // Content should be unchanged
       expect(files.getWrittenFiles().get('/home/user/project/.opencode/agents/backend.md')).toBe(
@@ -613,12 +622,13 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
-          confirm(true, 'Overwrite'),
+          confirm(true, 'SYSTEM.md already exists'),
         ]),
       });
 
-      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);