berget 2.2.7 → 2.2.9

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

@@ -1,505 +1,505 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
-const setup_1 = require("../setup");
 const errors_1 = require("../errors");
-const fake_prompter_1 = require("./fake-prompter");
-const fake_file_store_1 = require("./fake-file-store");
-const fake_command_runner_1 = require("./fake-command-runner");
-const fake_auth_service_1 = require("./fake-auth-service");
+const setup_1 = require("../setup");
 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");
+const fake_file_store_1 = require("./fake-file-store");
+const fake_prompter_1 = require("./fake-prompter");
 const makeDeps = (overrides = {}) => {
-    var _a, _b, _c, _d, _e;
-    return Object.assign({ prompter: (_a = overrides.prompter) !== null && _a !== void 0 ? _a : new fake_prompter_1.FakePrompter([]), files: (_b = overrides.files) !== null && _b !== void 0 ? _b : new fake_file_store_1.FakeFileStore(), commands: (_c = overrides.commands) !== null && _c !== void 0 ? _c : new fake_command_runner_1.FakeCommandRunner()
-            .handle("opencode --version", "mocked")
-            .handle("pi --version", "mocked"), authService: (_d = overrides.authService) !== null && _d !== void 0 ? _d : new fake_auth_service_1.FakeAuthService(false), apiKeyService: (_e = overrides.apiKeyService) !== null && _e !== void 0 ? _e : new fake_api_key_service_1.FakeApiKeyService("sk_ber_test"), homeDir: "/home/user", cwd: "/home/user/project" }, Object.fromEntries(Object.entries(overrides).filter(([k]) => k !== "prompter" &&
-        k !== "files" &&
-        k !== "commands" &&
-        k !== "authService" &&
-        k !== "apiKeyService")));
+    return {
+        apiKeyService: overrides.apiKeyService ?? new fake_api_key_service_1.FakeApiKeyService('sk_ber_test'),
+        authService: overrides.authService ?? new fake_auth_service_1.FakeAuthService(false),
+        commands: overrides.commands ??
+            new fake_command_runner_1.FakeCommandRunner()
+                .handle('opencode --version', 'mocked')
+                .handle('pi --version', 'mocked'),
+        cwd: '/home/user/project',
+        files: overrides.files ?? new fake_file_store_1.FakeFileStore(),
+        homeDir: '/home/user',
+        prompter: overrides.prompter ?? new fake_prompter_1.FakePrompter([]),
+        ...Object.fromEntries(Object.entries(overrides).filter(([k]) => k !== 'prompter' &&
+            k !== 'files' &&
+            k !== 'commands' &&
+            k !== 'authService' &&
+            k !== 'apiKeyService')),
+    };
 };
 function base64urlEncode(data) {
-    return Buffer.from(data).toString("base64url");
+    return Buffer.from(data).toString('base64url');
 }
 function makeJwt(payload) {
-    const header = base64urlEncode(JSON.stringify({ alg: "none", typ: "JWT" }));
+    const header = base64urlEncode(JSON.stringify({ alg: 'none', typ: 'JWT' }));
     const body = base64urlEncode(JSON.stringify(payload));
     return `${header}.${body}.signature`;
 }
-(0, vitest_1.describe)("runSetup", () => {
-    (0, vitest_1.describe)("happy path", () => {
-        (0, vitest_1.it)("sets up opencode project without existing config", () => __awaiter(void 0, void 0, void 0, function* () {
+(0, vitest_1.describe)('runSetup', () => {
+    (0, vitest_1.describe)('happy path', () => {
+        (0, vitest_1.it)('sets up opencode project without existing config', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Create"), // Config write
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'), // Config write
                     (0, fake_prompter_1.multiselect)([]), // No agents selected
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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@1.0.16");
-        }));
-        (0, vitest_1.it)("sets up opencode globally without existing config", () => __awaiter(void 0, void 0, void 0, function* () {
+            (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.it)('sets up opencode globally without existing config', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("global"),
-                    (0, fake_prompter_1.confirm)(true, "Create"), // Config write
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('global'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'), // Config write
                     (0, fake_prompter_1.multiselect)([]), // No agents selected
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/.config/opencode/opencode.json")).toBe(true);
-        }));
-        (0, vitest_1.it)("sets up pi project with fresh install", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(written.has('/home/user/.config/opencode/opencode.json')).toBe(true);
+        });
+        (0, vitest_1.it)('sets up pi project with fresh install', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner()
+                    .handle('pi --version', 'mocked') // For checkInstalled
+                    .handle('pi install', ''), // For actual install
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"), // Agent selection
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'), // Agent selection
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner()
-                    .handle("pi --version", "mocked") // For checkInstalled
-                    .handle("pi install", ""), // For actual install
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const commands = deps.commands;
             (0, vitest_1.expect)(commands.calls.length).toBeGreaterThan(0);
-            const installCall = commands.calls.find(c => c.command === "pi");
-            (0, vitest_1.expect)(installCall === null || installCall === void 0 ? void 0 : installCall.args).toContain("npm:@bergetai/pi-provider");
-        }));
-        (0, vitest_1.it)("skips agent selection for pi project", () => __awaiter(void 0, void 0, void 0, function* () {
+            const installCall = commands.calls.find((c) => c.command === 'pi');
+            (0, vitest_1.expect)(installCall?.args).toContain('npm:@bergetai/pi-provider');
+        });
+        (0, vitest_1.it)('skips agent selection for pi project', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner()
+                    .handle('pi --version', 'mocked') // For checkInstalled
+                    .handle('pi install', ''), // For actual install
                 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.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('__skip__'), // Skip agent selection
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner()
-                    .handle("pi --version", "mocked") // For checkInstalled
-                    .handle("pi install", ""), // For actual install
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             // Should not create any agent files
             for (const path of written.keys()) {
-                (0, vitest_1.expect)(path).not.toContain("SYSTEM.md");
+                (0, vitest_1.expect)(path).not.toContain('SYSTEM.md');
             }
-        }));
+        });
     });
-    (0, vitest_1.describe)("prerequisites", () => {
-        (0, vitest_1.it)("throws PrerequisiteError when opencode is not installed", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('prerequisites', () => {
+        (0, vitest_1.it)('throws PrerequisiteError when opencode is not installed', async () => {
             const deps = makeDeps({
-                prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)("opencode"), (0, fake_prompter_1.select)("project")]),
                 commands: new fake_command_runner_1.FakeCommandRunner(),
+                prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)('opencode'), (0, fake_prompter_1.select)('project')]),
             });
             // Simulate opencode not being installed
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.PrerequisiteError);
-        }));
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.PrerequisiteError);
+        });
     });
-    (0, vitest_1.describe)("cancellation", () => {
-        (0, vitest_1.it)("throws CancelledError when user cancels at tool selection", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('cancellation', () => {
+        (0, vitest_1.it)('throws CancelledError when user cancels at tool selection', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)(fake_prompter_1.CANCEL)]),
             });
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
-        }));
-        (0, vitest_1.it)("throws CancelledError when user cancels at write confirmation", () => __awaiter(void 0, void 0, void 0, function* () {
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+        });
+        (0, vitest_1.it)('throws CancelledError when user cancels at write confirmation', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(false, "Create"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(false, 'Create'),
                 ]),
             });
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
-        }));
-        (0, vitest_1.it)("throws CancelledError when user cancels at agent write confirmation (opencode)", () => __awaiter(void 0, void 0, void 0, function* () {
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+        });
+        (0, vitest_1.it)('throws CancelledError when user cancels at agent write confirmation (opencode)', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
-                    (0, fake_prompter_1.multiselect)(["backend", "frontend"]),
-                    (0, fake_prompter_1.confirm)(false, "agent"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
+                    (0, fake_prompter_1.multiselect)(['backend', 'frontend']),
+                    (0, fake_prompter_1.confirm)(false, 'agent'),
                 ]),
             });
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
-        }));
-        (0, vitest_1.it)("throws CancelledError when user cancels at agent write confirmation (pi)", () => __awaiter(void 0, void 0, void 0, function* () {
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+        });
+        (0, vitest_1.it)('throws CancelledError when user cancels at agent write confirmation (pi)', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
                     (0, fake_prompter_1.confirm)(false, /Create|Overwrite/),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
-        }));
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CancelledError);
+        });
     });
-    (0, vitest_1.describe)("file operations", () => {
-        (0, vitest_1.it)("preserves existing configuration keys when updating", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('file operations', () => {
+        (0, vitest_1.it)('preserves existing configuration keys when updating', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Write"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Write'),
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
             const files = deps.files;
-            files.seed("/home/user/project/opencode.json", JSON.stringify({
-                customField: "should-preserve",
-                plugin: ["other-plugin"],
+            files.seed('/home/user/project/opencode.json', JSON.stringify({
+                customField: 'should-preserve',
+                plugin: ['other-plugin'],
             }));
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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@1.0.16");
-        }));
-        (0, vitest_1.it)("preserves jsonc comments when updating", () => __awaiter(void 0, void 0, void 0, function* () {
+            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.it)('preserves jsonc comments when updating', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Write"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Write'),
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
             const files = deps.files;
-            files.seed("/home/user/project/opencode.jsonc", `{
+            files.seed('/home/user/project/opencode.jsonc', `{
   // This is my custom config
   "customField": "should-preserve",
   /* block comment explaining plugin */
   "plugin": ["other-plugin"]
 }`);
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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");
-            (0, vitest_1.expect)(content).toContain("/* block comment explaining plugin */");
+            const content = written.get('/home/user/project/opencode.jsonc');
+            (0, vitest_1.expect)(content).toContain('// This is my custom config');
+            (0, vitest_1.expect)(content).toContain('/* block comment explaining plugin */');
             (0, vitest_1.expect)(content).toContain('"customField": "should-preserve"');
-            (0, vitest_1.expect)(content).toContain("@bergetai/opencode-auth@1.0.16");
-        }));
-        (0, vitest_1.it)("shows no changes needed when config is already up to date", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(content).toContain('@bergetai/opencode-auth');
+        });
+        (0, vitest_1.it)('shows no changes needed when config is already up to date', async () => {
             const deps = makeDeps({
-                prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)("opencode"), (0, fake_prompter_1.select)("project"), (0, fake_prompter_1.multiselect)([])]),
+                prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)('opencode'), (0, fake_prompter_1.select)('project'), (0, fake_prompter_1.multiselect)([])]),
             });
             const files = deps.files;
             // 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@1.0.16"],
-            }, null, 2) + "\n");
-            yield (0, setup_1.runSetup)(deps);
+            files.seed('/home/user/project/opencode.json', JSON.stringify({
+                $schema: 'https://opencode.ai/config.json',
+                plugin: ['@bergetai/opencode-auth'],
+            }, null, 2) + '\n');
+            await (0, setup_1.runSetup)(deps);
             // Check that no write happened — content should be unchanged
             const written = files.getWrittenFiles();
-            const content = written.get("/home/user/project/opencode.json");
+            const content = written.get('/home/user/project/opencode.json');
             const config = JSON.parse(content);
-            (0, vitest_1.expect)(config.plugin).toEqual(["@bergetai/opencode-auth@1.0.16"]);
-            (0, vitest_1.expect)(content).toContain("$schema");
-        }));
-        (0, vitest_1.it)("preserves existing Pi settings when setting defaultProvider", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(config.plugin).toEqual(['@bergetai/opencode-auth']);
+            (0, vitest_1.expect)(content).toContain('$schema');
+        });
+        (0, vitest_1.it)('preserves existing Pi settings when setting defaultProvider', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
             const files = deps.files;
-            files.seed("/home/user/project/.pi/settings.json", JSON.stringify({
-                existingKey: "should-preserve",
+            files.seed('/home/user/project/.pi/settings.json', JSON.stringify({
                 anotherSetting: true,
+                existingKey: 'should-preserve',
             }));
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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");
+            const settings = JSON.parse(written.get('/home/user/project/.pi/settings.json'));
+            (0, vitest_1.expect)(settings.existingKey).toBe('should-preserve');
             (0, vitest_1.expect)(settings.anotherSetting).toBe(true);
-            (0, vitest_1.expect)(settings.defaultProvider).toBe("berget");
-        }));
-        (0, vitest_1.it)("creates parent directories when writing files", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(settings.defaultProvider).toBe('berget');
+        });
+        (0, vitest_1.it)('creates parent directories when writing files', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("global"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('global'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/.config/opencode/opencode.json")).toBe(true);
-        }));
+            (0, vitest_1.expect)(written.has('/home/user/.config/opencode/opencode.json')).toBe(true);
+        });
     });
-    (0, vitest_1.describe)("command execution", () => {
-        (0, vitest_1.it)("passes arguments as array (no shell injection)", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('command execution', () => {
+        (0, vitest_1.it)('passes arguments as array (no shell injection)', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const commands = deps.commands;
-            const installCall = commands.calls.find(c => c.command === "pi");
-            (0, vitest_1.expect)(installCall === null || installCall === void 0 ? void 0 : installCall.args).toContain("npm:@bergetai/pi-provider");
-            (0, vitest_1.expect)(installCall === null || installCall === void 0 ? void 0 : installCall.args).toContain("-l");
-        }));
+            const installCall = commands.calls.find((c) => c.command === 'pi');
+            (0, vitest_1.expect)(installCall?.args).toContain('npm:@bergetai/pi-provider');
+            (0, vitest_1.expect)(installCall?.args).toContain('-l');
+        });
     });
-    (0, vitest_1.describe)("error handling", () => {
-        (0, vitest_1.it)("throws CommandFailedError when pi install fails", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('error handling', () => {
+        (0, vitest_1.it)('throws CommandFailedError when pi install fails', async () => {
             const deps = makeDeps({
-                prompter: new fake_prompter_1.FakePrompter([(0, fake_prompter_1.select)("pi"), (0, fake_prompter_1.select)("project")]),
                 commands: new fake_command_runner_1.FakeCommandRunner()
-                    .handle("pi --version", "mocked")
-                    .handle("pi install", new Error("npm error")),
+                    .handle('pi --version', 'mocked')
+                    .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')]),
             });
-            yield (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CommandFailedError);
-        }));
+            await (0, vitest_1.expect)((0, setup_1.runSetup)(deps)).rejects.toBeInstanceOf(errors_1.CommandFailedError);
+        });
     });
-    (0, vitest_1.describe)("auth integration", () => {
-        (0, vitest_1.it)("already authenticated shows simplified message", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('auth integration', () => {
+        (0, vitest_1.it)('already authenticated shows simplified message', async () => {
             const files = new fake_file_store_1.FakeFileStore();
-            files.seed("/home/user/.local/share/opencode/auth.json", JSON.stringify({ berget: { type: "oauth" } }));
+            files.seed('/home/user/.local/share/opencode/auth.json', JSON.stringify({ berget: { type: 'oauth' } }));
             const deps = makeDeps({
+                files,
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("keep"), // New: keep existing auth
-                    (0, fake_prompter_1.confirm)(true, "Create"), // Config write
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('keep'), // New: keep existing auth
+                    (0, fake_prompter_1.confirm)(true, 'Create'), // Config write
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
-                files,
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const prompter = deps.prompter;
-            const notes = prompter.calls.filter(c => c.method === "note");
-            const lastNote = notes[notes.length - 1];
-            (0, vitest_1.expect)(JSON.stringify(lastNote)).toContain("Run: opencode");
-            (0, vitest_1.expect)(JSON.stringify(lastNote)).not.toContain("/connect");
-        }));
-        (0, vitest_1.it)("login failure shows manual auth instructions", () => __awaiter(void 0, void 0, void 0, function* () {
+            const notes = prompter.calls.filter((c) => c.method === 'note');
+            const lastNote = notes.at(-1);
+            (0, vitest_1.expect)(JSON.stringify(lastNote)).toContain('Run: opencode');
+            (0, vitest_1.expect)(JSON.stringify(lastNote)).not.toContain('/connect');
+        });
+        (0, vitest_1.it)('login failure shows manual auth instructions', async () => {
             const deps = makeDeps({
-                prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
-                ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
                 authService: new fake_auth_service_1.FakeAuthService(false),
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 files: new fake_file_store_1.FakeFileStore(), // No pre-seeded auth → auth flow runs
+                prompter: new fake_prompter_1.FakePrompter([
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
+                ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const prompter = deps.prompter;
-            const notes = prompter.calls.filter(c => c.method === "note");
-            const lastNote = notes[notes.length - 1];
-            (0, vitest_1.expect)(JSON.stringify(lastNote)).toContain("/login");
-        }));
-        (0, vitest_1.it)("creates api key for pi when no seat", () => __awaiter(void 0, void 0, void 0, function* () {
+            const notes = prompter.calls.filter((c) => c.method === 'note');
+            const lastNote = notes.at(-1);
+            (0, vitest_1.expect)(JSON.stringify(lastNote)).toContain('/login');
+        });
+        (0, vitest_1.it)('creates api key for pi when no seat', async () => {
             const files = new fake_file_store_1.FakeFileStore();
             const deps = makeDeps({
+                authService: new fake_auth_service_1.FakeAuthService(true, false), // succeed, no seat
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
+                files,
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
+                    (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.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
-                authService: new fake_auth_service_1.FakeAuthService(true, false), // succeed, no seat
-                files,
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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"));
-            (0, vitest_1.expect)(parsed.berget.type).toBe("api_key");
-        }));
-        (0, vitest_1.it)("uses subscription when berget_code_seat present", () => __awaiter(void 0, void 0, void 0, function* () {
+            (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'));
+            (0, vitest_1.expect)(parsed.berget.type).toBe('api_key');
+        });
+        (0, vitest_1.it)('uses subscription when berget_code_seat present', async () => {
             const files = new fake_file_store_1.FakeFileStore();
             const farFuture = Math.floor(Date.now() / 1000) + 3600 * 24 * 365; // 1 year from now in seconds
-            files.seed("/home/user/.berget/auth.json", JSON.stringify({
-                access_token: makeJwt({ realm_access: { roles: ["berget_code_seat"] }, exp: farFuture }),
-                refresh_token: "ref",
+            files.seed('/home/user/.berget/auth.json', JSON.stringify({
+                access_token: makeJwt({ exp: farFuture, realm_access: { roles: ['berget_code_seat'] } }),
                 expires_at: farFuture * 1000,
+                refresh_token: 'ref',
             }));
             const deps = makeDeps({
+                files,
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("subscription"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('subscription'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
-                files,
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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");
-        }));
+            const parsed = JSON.parse(written.get('/home/user/.local/share/opencode/auth.json'));
+            (0, vitest_1.expect)(parsed.berget.type).toBe('oauth');
+        });
     });
-    (0, vitest_1.describe)("agent configuration", () => {
-        (0, vitest_1.it)("sets up multiple agents for opencode project", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)('agent configuration', () => {
+        (0, vitest_1.it)('sets up multiple agents for opencode project', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
-                    (0, fake_prompter_1.multiselect)(["backend", "frontend"]),
-                    (0, fake_prompter_1.confirm)(true, "agent"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
+                    (0, fake_prompter_1.multiselect)(['backend', 'frontend']),
+                    (0, fake_prompter_1.confirm)(true, 'agent'),
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/project/.opencode/agents/backend.md")).toBe(true);
-            (0, vitest_1.expect)(written.has("/home/user/project/.opencode/agents/frontend.md")).toBe(true);
-        }));
-        (0, vitest_1.it)("sets up no agents for opencode when none selected", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(written.has('/home/user/project/.opencode/agents/backend.md')).toBe(true);
+            (0, vitest_1.expect)(written.has('/home/user/project/.opencode/agents/frontend.md')).toBe(true);
+        });
+        (0, vitest_1.it)('sets up no agents for opencode when none selected', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                     (0, fake_prompter_1.multiselect)([]),
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
             for (const path of written.keys()) {
                 (0, vitest_1.expect)(path).not.toMatch(/agents\/\w+\.md$/);
             }
-        }));
-        (0, vitest_1.it)("sets up agent globally for opencode", () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        (0, vitest_1.it)('sets up agent globally for opencode', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("global"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
-                    (0, fake_prompter_1.multiselect)(["fullstack"]),
-                    (0, fake_prompter_1.confirm)(true, "agent"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('global'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
+                    (0, fake_prompter_1.multiselect)(['fullstack']),
+                    (0, fake_prompter_1.confirm)(true, 'agent'),
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/.config/opencode/agents/fullstack.md")).toBe(true);
-        }));
-        (0, vitest_1.it)("sets up agent for pi project", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(written.has('/home/user/.config/opencode/agents/fullstack.md')).toBe(true);
+        });
+        (0, vitest_1.it)('sets up agent for pi project', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/project/.pi/SYSTEM.md")).toBe(true);
-        }));
-        (0, vitest_1.it)("sets up agent for pi globally", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(written.has('/home/user/project/.pi/SYSTEM.md')).toBe(true);
+        });
+        (0, vitest_1.it)('sets up agent for pi globally', async () => {
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("global"),
-                    (0, fake_prompter_1.select)("backend"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('global'),
+                    (0, fake_prompter_1.select)('backend'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
                 ]),
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const written = files.getWrittenFiles();
-            (0, vitest_1.expect)(written.has("/home/user/.pi/agent/SYSTEM.md")).toBe(true);
-        }));
-        (0, vitest_1.it)("skips writing identical opencode agent files", () => __awaiter(void 0, void 0, void 0, function* () {
+            (0, vitest_1.expect)(written.has('/home/user/.pi/agent/SYSTEM.md')).toBe(true);
+        });
+        (0, vitest_1.it)('skips writing identical opencode agent files', async () => {
             const deps = makeDeps({
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("opencode"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.confirm)(true, "Create"),
-                    (0, fake_prompter_1.multiselect)(["backend", "frontend"]),
-                    (0, fake_prompter_1.confirm)(true, "agent"),
+                    (0, fake_prompter_1.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.confirm)(true, 'Create'),
+                    (0, fake_prompter_1.multiselect)(['backend', 'frontend']),
+                    (0, fake_prompter_1.confirm)(true, 'agent'),
                 ]),
             });
             // First run writes the files
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(deps);
             const files = deps.files;
             const firstBackend = files
                 .getWrittenFiles()
-                .get("/home/user/project/.opencode/agents/backend.md");
+                .get('/home/user/project/.opencode/agents/backend.md');
             const firstFrontend = files
                 .getWrittenFiles()
-                .get("/home/user/project/.opencode/agents/frontend.md");
+                .get('/home/user/project/.opencode/agents/frontend.md');
             // Second run with exact same content should not prompt for overwrite
             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.select)('opencode'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.multiselect)(['backend', 'frontend']),
                 ]),
             });
-            yield (0, setup_1.runSetup)(deps2);
+            await (0, setup_1.runSetup)(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);
-        }));
-        (0, vitest_1.it)("overwrites pi SYSTEM.md when content differs", () => __awaiter(void 0, void 0, void 0, function* () {
+            (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);
+        });
+        (0, vitest_1.it)('overwrites pi SYSTEM.md when content differs', async () => {
             const files = new fake_file_store_1.FakeFileStore();
-            files.seed("/home/user/project/.pi/SYSTEM.md", "old agent content");
+            files.seed('/home/user/project/.pi/SYSTEM.md', 'old agent content');
             const deps = makeDeps({
+                commands: new fake_command_runner_1.FakeCommandRunner().handle('pi --version', 'mocked').handle('pi install', ''),
+                files,
                 prompter: new fake_prompter_1.FakePrompter([
-                    (0, fake_prompter_1.select)("pi"),
-                    (0, fake_prompter_1.select)("project"),
-                    (0, fake_prompter_1.select)("fullstack"),
-                    (0, fake_prompter_1.confirm)(true, "Overwrite"),
+                    (0, fake_prompter_1.select)('pi'),
+                    (0, fake_prompter_1.select)('project'),
+                    (0, fake_prompter_1.select)('fullstack'),
+                    (0, fake_prompter_1.confirm)(true, 'Overwrite'),
                 ]),
-                files,
-                commands: new fake_command_runner_1.FakeCommandRunner().handle("pi --version", "mocked").handle("pi install", ""),
             });
-            yield (0, setup_1.runSetup)(deps);
+            await (0, setup_1.runSetup)(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");
+            const content = written.get('/home/user/project/.pi/SYSTEM.md');
+            (0, vitest_1.expect)(content).not.toBe('old agent content');
             // Pi doesn't use front matter, so check for system prompt content
-            (0, vitest_1.expect)(content).toContain("Fullstack Agent");
-        }));
+            (0, vitest_1.expect)(content).toContain('Fullstack Agent');
+        });
     });
 });