berget 2.2.10 → 2.2.11

package/dist/package.json

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

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

@@ -75,6 +75,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'), // Agent selection
                     (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
@@ -93,7 +94,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.select)('__skip__'), // Skip agent selection
+                    (0, fake_prompter_1.confirm)(false, 'Set up an agent for Pi?'),
                 ]),
             });
             await (0, setup_1.runSetup)(deps);
@@ -150,6 +151,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)(false, /Create|Overwrite/),
                 ]),
@@ -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'),
                 ]),
@@ -265,6 +268,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'),
                 ]),
@@ -316,6 +320,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'),
                 ]),
@@ -336,6 +341,7 @@ 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'),
                 ]),
@@ -424,6 +430,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'),
                 ]),
@@ -439,6 +446,7 @@ 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'),
                 ]),
@@ -467,13 +475,14 @@ 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);
@@ -490,8 +499,9 @@ 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);

package/dist/src/commands/code/setup.js

@@ -338,41 +338,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 +383,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 +395,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 +444,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 +482,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, '');

package/package.json

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

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

@@ -95,6 +95,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'), // Agent selection
           confirm(true, 'Create'),
         ]),
@@ -116,7 +117,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
-          select('__skip__'), // Skip agent selection
+          confirm(false, 'Set up an agent for Pi?'),
         ]),
       });
 
@@ -184,6 +185,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(false, /Create|Overwrite/),
         ]),
@@ -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'),
         ]),
@@ -336,6 +339,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
@@ -399,6 +403,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
@@ -423,6 +428,7 @@ 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'),
         ]),
@@ -530,6 +536,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('project'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('fullstack'),
           confirm(true, 'Create'),
         ]),
@@ -548,6 +555,7 @@ describe('runSetup', () => {
         prompter: new FakePrompter([
           select('pi'),
           select('global'),
+          confirm(true, 'Set up an agent for Pi?'),
           select('backend'),
           confirm(true, 'Create'),
         ]),
@@ -582,13 +590,14 @@ 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'),
         ]),
       });
 
@@ -613,8 +622,9 @@ 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'),
         ]),
       });
 

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;

package/src/commands/code/setup.ts

@@ -404,26 +404,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 +418,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 +471,8 @@ async function setupOpenCodeAgents(deps: {
     throw new CancelledError();
   }
 
+  await files.mkdir(agentsDir);
+
   const s = prompter.spinner();
   s.start('Writing agent configurations...');
 
@@ -484,6 +486,7 @@ async function setupOpenCodeAgents(deps: {
   }
 
   s.stop(`Wrote ${selectedAgents.length} agent(s) to ${agentsDir}`);
+  return true;
 }
 
 async function setupPi(deps: {
@@ -551,56 +554,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 +608,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 {