berget 2.2.10 → 2.2.12

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.21';
 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({
@@ -404,26 +392,13 @@ async function setupOpenCodeAgents(deps: {
   homeDir: string;
   prompter: Prompter;
   scope: 'global' | 'project';
-}): Promise<void> {
+}): Promise<boolean> {
   const { cwd, files, homeDir, prompter, scope } = deps;
 
   const agents = getAllAgents().filter((a) => a.config.mode === 'primary');
 
   if (agents.length === 0) {
-    return;
-  }
-
-  const selectedAgents = await prompter.multiselect({
-    message: 'Select agents to set up (optional - press enter to skip):',
-    options: agents.map((agent) => ({
-      hint: agent.config.description,
-      label: agent.config.name,
-      value: agent.config.name,
-    })),
-  });
-
-  if (selectedAgents.length === 0) {
-    return;
+    return false;
   }
 
   const agentsDir =
@@ -431,35 +406,48 @@ async function setupOpenCodeAgents(deps: {
       ? 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;
+  prompter.note('Space to toggle, Enter to confirm.', 'Agent Setup');
 
-      const agentPath = pathJoin(agentsDir, `${agentName}.md`);
-      const existing = await files.readFile(agentPath);
-      const newContent = toMarkdown(agent);
+  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,
+      };
+    }),
+  );
 
-      if (existing === newContent) {
-        return false;
-      }
+  const selectedAgents = await prompter.multiselect({
+    message: 'Select agents to set up:',
+    options: agentOptions,
+    required: false,
+  });
 
-      if (existing) {
-        prompter.note(
-          generateDiff(existing, newContent, agentPath),
-          `Changes to ${agentName} agent`,
-        );
-      }
+  if (selectedAgents.length === 0) {
+    return false;
+  }
 
-      return true;
+  const newAgents: string[] = [];
+  const existingAgents: string[] = [];
+  await Promise.all(
+    selectedAgents.map(async (agentName) => {
+      const agentPath = pathJoin(agentsDir, `${agentName}.md`);
+      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: string[] = [];
+  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({
@@ -471,6 +459,8 @@ async function setupOpenCodeAgents(deps: {
     throw new CancelledError();
   }
 
+  await files.mkdir(agentsDir);
+
   const s = prompter.spinner();
   s.start('Writing agent configurations...');
 
@@ -484,6 +474,7 @@ async function setupOpenCodeAgents(deps: {
   }
 
   s.stop(`Wrote ${selectedAgents.length} agent(s) to ${agentsDir}`);
+  return true;
 }
 
 async function setupPi(deps: {
@@ -551,56 +542,49 @@ async function setupPiAgent(deps: {
   homeDir: string;
   prompter: Prompter;
   scope: 'global' | 'project';
-}): Promise<void> {
+}): Promise<boolean> {
   const { cwd, files, homeDir, prompter, scope } = deps;
 
   const agents = getAllAgents().filter((a) => a.config.mode === 'primary');
 
   if (agents.length === 0) {
-    return;
-  }
-
-  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,
-      })),
-    ],
-  });
-
-  if (selectedAgentName === '__skip__') {
-    return;
+    return false;
   }
 
-  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 = toPiPrompt(agent);
+  prompter.note('Pi uses a single system prompt.', 'Agent Setup');
 
-  if (existing === newContent) {
-    prompter.note('Agent configuration is already up to date.', 'No changes needed');
-    return;
-  }
+  const setupAgent = await prompter.confirm({
+    initialValue: false,
+    message: 'Set up an agent for Pi?',
+  });
 
-  if (existing) {
-    prompter.note(generateDiff(existing, newContent, systemPath), 'Changes to agent configuration');
-  } else {
-    prompter.note(newContent, 'New agent configuration');
-  }
+  if (!setupAgent) return false;
+
+  const selectedAgentName = await prompter.select({
+    message: 'Choose an agent:',
+    options: agents.map((agent) => ({
+      hint: agent.config.description,
+      label: agent.config.name,
+      value: agent.config.name,
+    })),
+  });
+
+  const agent = agents.find((a) => a.config.name === selectedAgentName);
+  if (!agent) 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) {
@@ -612,9 +596,10 @@ async function setupPiAgent(deps: {
 
   const systemDir = scope === 'project' ? pathJoin(cwd, '.pi') : pathJoin(homeDir, '.pi', 'agent');
   await files.mkdir(systemDir);
-  await files.writeFile(systemPath, newContent);
+  await files.writeFile(systemPath, toPiPrompt(agent));
 
   s.stop(`Wrote agent configuration to ${systemPath}`);
+  return true;
 }
 
 function stripJsoncComments(content: string): string {

package/src/commands/code/ports/prompter.ts

@@ -8,6 +8,7 @@ export interface Prompter {
       label: string;
       value: T;
     }>;
+    required?: boolean;
   }): Promise<T[]>;
   note(message: string, title?: string): void;
   outro(message: string): void;