berget 2.2.7 → 2.2.9

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

@@ -1,205 +1,57 @@
-import type { FileStore } from "./ports/file-store";
-import type { Prompter } from "./ports/prompter";
-import type { AuthServicePort, ApiKeyServicePort } from "./ports/auth-services";
+import type { ApiKeyServicePort, AuthServicePort } from './ports/auth-services';
+import type { FileStore } from './ports/file-store';
+import type { Prompter } from './ports/prompter';
 
-export interface CliAuth {
-  access_token: string;
-  refresh_token: string;
-  expires_at: number;
+export interface AuthDeps {
+  apiKeyService: ApiKeyServicePort;
+  authService: AuthServicePort;
+  files: FileStore;
+  homeDir: string;
+  prompter: Prompter;
 }
 
 export interface AuthResult {
   authenticated: boolean;
 }
 
-export interface AuthDeps {
-  prompter: Prompter;
-  files: FileStore;
-  authService: AuthServicePort;
-  apiKeyService: ApiKeyServicePort;
-  homeDir: string;
+export interface CliAuth {
+  access_token: string;
+  expires_at: number;
+  refresh_token: string;
 }
 
-const CLI_AUTH_PATH = (homeDir: string) => homeDir + "/.berget/auth.json";
+const CLI_AUTH_PATH = (homeDir: string) => homeDir + '/.berget/auth.json';
 
 const TOOL_AUTH_PATHS = {
-  opencode: (homeDir: string) => homeDir + "/.local/share/opencode/auth.json",
-  pi: (homeDir: string) => homeDir + "/.pi/agent/auth.json",
+  opencode: (homeDir: string) => homeDir + '/.local/share/opencode/auth.json',
+  pi: (homeDir: string) => homeDir + '/.pi/agent/auth.json',
 } as const;
 
-const TOOL_API_KEY_TYPES: Record<"opencode" | "pi", string> = {
-  opencode: "api",
-  pi: "api_key",
+const TOOL_API_KEY_TYPES: Record<'opencode' | 'pi', string> = {
+  opencode: 'api',
+  pi: 'api_key',
 };
 
-function extractJwtExpiresAt(accessToken: string): number {
-  try {
-    const parts = accessToken.split(".");
-    if (parts.length !== 3) return 0;
-    const payload = Buffer.from(parts[1], "base64url").toString("utf8");
-    const decoded = JSON.parse(payload);
-    if (typeof decoded.exp === "number") {
-      return decoded.exp * 1000; // JWT exp is in seconds, convert to milliseconds
-    }
-  } catch {
-    // If decoding fails, return 0 (treated as expired)
-  }
-  return 0;
-}
-
-export async function readCliAuth(files: FileStore, homeDir: string): Promise<CliAuth | null> {
-  const content = await files.readFile(CLI_AUTH_PATH(homeDir));
-  if (!content) return null;
-  try {
-    const parsed = JSON.parse(content);
-    if (parsed.access_token && parsed.refresh_token) {
-      // Extract the actual expiry time from the JWT token instead of using the stored expires_at
-      const jwtExpiresAt = extractJwtExpiresAt(parsed.access_token);
-      if (jwtExpiresAt === 0) {
-        // Invalid token, return null
-        return null;
-      }
-      return {
-        access_token: parsed.access_token,
-        refresh_token: parsed.refresh_token,
-        expires_at: jwtExpiresAt,
-      };
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-export async function isToolAuthenticated(
-  files: FileStore,
-  homeDir: string,
-  tool: "opencode" | "pi"
-): Promise<boolean> {
-  const content = await files.readFile(TOOL_AUTH_PATHS[tool](homeDir));
-  if (!content) return false;
-  try {
-    const parsed = JSON.parse(content);
-    return typeof parsed.berget === "object" && parsed.berget !== null;
-  } catch {
-    return false;
-  }
-}
-
-export function decodeJwtPayload(token: string): unknown | null {
-  try {
-    const parts = token.split(".");
-    if (parts.length !== 3) return null;
-    const payload = Buffer.from(parts[1], "base64url").toString("utf8");
-    return JSON.parse(payload);
-  } catch {
-    return null;
-  }
-}
-
-export function hasBergetCodeSeat(accessToken: string): boolean {
-  const payload = decodeJwtPayload(accessToken);
-  if (!payload || typeof payload !== "object") return false;
-  const p = payload as Record<string, unknown>;
-  const realmAccess = p.realm_access as Record<string, unknown> | undefined;
-  if (!realmAccess) return false;
-  const roles = realmAccess.roles as string[] | undefined;
-  if (!Array.isArray(roles)) return false;
-  return roles.includes("berget_code_seat");
-}
-
-export async function syncOAuthToTool(
-  files: FileStore,
-  homeDir: string,
-  tool: "opencode" | "pi",
-  cliAuth: CliAuth
-): Promise<void> {
-  const authPath = TOOL_AUTH_PATHS[tool](homeDir);
-  let existing: Record<string, unknown> = {};
-
-  const content = await files.readFile(authPath);
-  if (content) {
-    try {
-      existing = JSON.parse(content) as Record<string, unknown>;
-    } catch {
-      existing = {};
-    }
-  }
-
-  // Use the JWT's actual expiry time for consistency
-  const jwtExpiresAt = extractJwtExpiresAt(cliAuth.access_token);
-
-  const updated = {
-    ...existing,
-    berget: {
-      type: "oauth",
-      access: cliAuth.access_token,
-      refresh: cliAuth.refresh_token,
-      expires: jwtExpiresAt,
-    },
-  };
-
-  await files.writeFile(authPath, JSON.stringify(updated, null, 2) + "\n");
-  await files.chmod(authPath, 0o600);
-}
-
-export async function syncApiKeyToTool(
-  files: FileStore,
-  homeDir: string,
-  tool: "opencode" | "pi",
-  apiKey: string
-): Promise<void> {
-  const authPath = TOOL_AUTH_PATHS[tool](homeDir);
-  let existing: Record<string, unknown> = {};
-
-  const content = await files.readFile(authPath);
-  if (content) {
-    try {
-      existing = JSON.parse(content) as Record<string, unknown>;
-    } catch {
-      existing = {};
-    }
-  }
-
-  const updated = {
-    ...existing,
-    berget: {
-      type: TOOL_API_KEY_TYPES[tool],
-      key: apiKey,
-    },
-  };
-
-  await files.writeFile(authPath, JSON.stringify(updated, null, 2) + "\n");
-  await files.chmod(authPath, 0o600);
-}
-
-export function isTokenExpired(expiresAt: number): boolean {
-  const now = Date.now();
-  const timeUntilExpiry = expiresAt - now;
-  const buffer = Math.min(30 * 1000, timeUntilExpiry * 0.1);
-  return now + buffer >= expiresAt;
-}
-
-export async function configureAuth(deps: AuthDeps, tool: "opencode" | "pi"): Promise<AuthResult> {
-  const { prompter, files, authService, apiKeyService, homeDir } = deps;
+export async function configureAuth(deps: AuthDeps, tool: 'opencode' | 'pi'): Promise<AuthResult> {
+  const { apiKeyService, authService, files, homeDir, prompter } = deps;
 
   const alreadyAuth = await isToolAuthenticated(files, homeDir, tool);
 
   if (alreadyAuth) {
-    const choice = await prompter.select<"keep" | "reconfigure">({
-      message: `Account is already connected to Berget AI (${tool === "opencode" ? "OpenCode" : "Pi"}). How do you want to proceed?`,
+    const choice = await prompter.select<'keep' | 'reconfigure'>({
+      message: `Account is already connected to Berget AI (${tool === 'opencode' ? 'OpenCode' : 'Pi'}). How do you want to proceed?`,
       options: [
-        { value: "keep", label: "Keep existing authentication" },
-        { value: "reconfigure", label: "Reconfigure — choose a different method" },
+        { label: 'Keep existing authentication', value: 'keep' },
+        { label: 'Reconfigure — choose a different method', value: 'reconfigure' },
       ],
     });
 
-    if (choice === "keep") {
+    if (choice === 'keep') {
       return { authenticated: true };
     }
     // Fall through to reconfigure
   } else {
-    prompter.note("Authentication required to use Berget AI.", "Connect your account");
+    prompter.note('Authentication required to use Berget AI.', 'Connect your account');
   }
 
   // Try to reuse existing CLI tokens (from ~/.berget/auth.json)
@@ -208,31 +60,31 @@ export async function configureAuth(deps: AuthDeps, tool: "opencode" | "pi"): Pr
   if (!cliAuth || isTokenExpired(cliAuth.expires_at)) {
     // No valid tokens → full browser login
     const s = prompter.spinner();
-    s.start("Waiting for browser login...");
+    s.start('Waiting for browser login...');
 
     const loginResult = await authService.loginInteractive();
     if (!loginResult.success) {
-      s.stop("Login failed.");
+      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.`,
-        "Authentication Failed"
+        `${loginResult.error || 'Login timed out or was cancelled.'}\n\nPlease run \`berget auth login\` manually, then run \`berget code setup\` again.`,
+        'Authentication Failed',
       );
       return { authenticated: false };
     }
 
-    s.stop("Successfully logged in to Berget.");
+    s.stop('Successfully logged in to Berget.');
 
     const jwtExpiresAt = extractJwtExpiresAt(loginResult.accessToken!);
     if (jwtExpiresAt === 0) {
-      s.stop("Login succeeded but received invalid token.");
-      prompter.note("Please try logging in again or contact support.", "Authentication Error");
+      s.stop('Login succeeded but received invalid token.');
+      prompter.note('Please try logging in again or contact support.', 'Authentication Error');
       return { authenticated: false };
     }
 
     cliAuth = {
       access_token: loginResult.accessToken!,
-      refresh_token: loginResult.refreshToken!,
       expires_at: jwtExpiresAt,
+      refresh_token: loginResult.refreshToken!,
     };
   }
 
@@ -244,50 +96,50 @@ export async function configureAuth(deps: AuthDeps, tool: "opencode" | "pi"): Pr
   // we can't verify the subscription role. Let the tool handle authorization.
   if (!jwtPayload) {
     const s = prompter.spinner();
-    s.start("Authenticating with Berget AI...");
+    s.start('Authenticating with Berget AI...');
     await syncOAuthToTool(files, homeDir, tool, cliAuth);
-    s.stop("Authenticated.");
+    s.stop('Authenticated.');
     prompter.note(
-      "Warning: Could not verify Berget Code subscription status.\nIf you do not have a subscription, the tool may show an authorization error.",
-      "Authentication"
+      'Warning: Could not verify Berget Code subscription status.\nIf you do not have a subscription, the tool may show an authorization error.',
+      'Authentication',
     );
     return { authenticated: true };
   }
 
   if (hasSeat) {
     // Case B: Has seat — ask how to authenticate
-    const method = await prompter.select<"subscription" | "api_key">({
-      message: "You have a Berget Code subscription. How do you want to authenticate?",
+    const method = await prompter.select<'api_key' | 'subscription'>({
+      message: 'You have a Berget Code subscription. How do you want to authenticate?',
       options: [
-        { value: "subscription", label: "Use my Berget Code subscription" },
-        { value: "api_key", label: "Use an API key instead" },
+        { label: 'Use my Berget Code subscription', value: 'subscription' },
+        { label: 'Use an API key instead', value: 'api_key' },
       ],
     });
 
-    if (method === "subscription") {
+    if (method === 'subscription') {
       const s = prompter.spinner();
-      s.start("Authenticating with Berget AI via subscription...");
+      s.start('Authenticating with Berget AI via subscription...');
       await syncOAuthToTool(files, homeDir, tool, cliAuth);
-      s.stop("Authenticated.");
+      s.stop('Authenticated.');
       return { authenticated: true };
     }
 
     // Create API key instead
     const s = prompter.spinner();
-    s.start("Creating API key...");
+    s.start('Creating API key...');
     try {
       const { key } = await apiKeyService.create({
-        name: `${tool === "opencode" ? "OpenCode" : "Pi"} (created by berget CLI)`,
-        description: "Created by berget code setup",
+        description: 'Created by berget code setup',
+        name: `${tool === 'opencode' ? 'OpenCode' : 'Pi'} (created by berget CLI)`,
       });
       await syncApiKeyToTool(files, homeDir, tool, key);
-      s.stop("API key created and saved.");
+      s.stop('API key created and saved.');
       return { authenticated: true };
     } catch {
-      s.stop("API key creation failed.");
+      s.stop('API key creation failed.');
       prompter.note(
-        "Could not create API key. Please create one manually with `berget api-keys create`.",
-        "Error"
+        'Could not create API key. Please create one manually with `berget api-keys create`.',
+        'Error',
       );
       return { authenticated: false };
     }
@@ -295,26 +147,26 @@ export async function configureAuth(deps: AuthDeps, tool: "opencode" | "pi"): Pr
 
   // No Berget Code seat — prompt for API key creation
   const shouldCreate = await prompter.confirm({
-    message: "You do not have a Berget Code subscription. Would you like to create a new API key?",
     initialValue: true,
+    message: 'You do not have a Berget Code subscription. Would you like to create a new API key?',
   });
 
   if (shouldCreate) {
     const s = prompter.spinner();
-    s.start("Creating API key...");
+    s.start('Creating API key...');
     try {
       const { key } = await apiKeyService.create({
-        name: `${tool === "opencode" ? "OpenCode" : "Pi"} (created by berget CLI)`,
-        description: "Created by berget code setup",
+        description: 'Created by berget code setup',
+        name: `${tool === 'opencode' ? 'OpenCode' : 'Pi'} (created by berget CLI)`,
       });
       await syncApiKeyToTool(files, homeDir, tool, key);
-      s.stop("API key created and saved.");
+      s.stop('API key created and saved.');
       return { authenticated: true };
     } catch {
-      s.stop("API key creation failed.");
+      s.stop('API key creation failed.');
       prompter.note(
-        "Could not create API key. Please create one manually with `berget api-keys create`.",
-        "Error"
+        'Could not create API key. Please create one manually with `berget api-keys create`.',
+        'Error',
       );
       return { authenticated: false };
     }
@@ -323,7 +175,155 @@ export async function configureAuth(deps: AuthDeps, tool: "opencode" | "pi"): Pr
   // Case D: Declined
   prompter.note(
     'Authentication skipped. You\'ll need to set up authentication manually:\n1. Run: berget api-keys create --name "My Key"\n2. Set BERGET_API_KEY environment variable, or\n3. Run `berget auth login` and try again',
-    "Authentication"
+    'Authentication',
   );
   return { authenticated: false };
 }
+
+export function decodeJwtPayload(token: string): null | unknown {
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) return null;
+    const payload = Buffer.from(parts[1], 'base64url').toString('utf8');
+    return JSON.parse(payload);
+  } catch {
+    return null;
+  }
+}
+
+export function hasBergetCodeSeat(accessToken: string): boolean {
+  const payload = decodeJwtPayload(accessToken);
+  if (!payload || typeof payload !== 'object') return false;
+  const p = payload as Record<string, unknown>;
+  const realmAccess = p.realm_access as Record<string, unknown> | undefined;
+  if (!realmAccess) return false;
+  const roles = realmAccess.roles as string[] | undefined;
+  if (!Array.isArray(roles)) return false;
+  return roles.includes('berget_code_seat');
+}
+
+export function isTokenExpired(expiresAt: number): boolean {
+  const now = Date.now();
+  const timeUntilExpiry = expiresAt - now;
+  const buffer = Math.min(30 * 1000, timeUntilExpiry * 0.1);
+  return now + buffer >= expiresAt;
+}
+
+export async function isToolAuthenticated(
+  files: FileStore,
+  homeDir: string,
+  tool: 'opencode' | 'pi',
+): Promise<boolean> {
+  const content = await files.readFile(TOOL_AUTH_PATHS[tool](homeDir));
+  if (!content) return false;
+  try {
+    const parsed = JSON.parse(content);
+    return typeof parsed.berget === 'object' && parsed.berget !== null;
+  } catch {
+    return false;
+  }
+}
+
+export async function readCliAuth(files: FileStore, homeDir: string): Promise<CliAuth | null> {
+  const content = await files.readFile(CLI_AUTH_PATH(homeDir));
+  if (!content) return null;
+  try {
+    const parsed = JSON.parse(content);
+    if (parsed.access_token && parsed.refresh_token) {
+      // Extract the actual expiry time from the JWT token instead of using the stored expires_at
+      const jwtExpiresAt = extractJwtExpiresAt(parsed.access_token);
+      if (jwtExpiresAt === 0) {
+        // Invalid token, return null
+        return null;
+      }
+      return {
+        access_token: parsed.access_token,
+        expires_at: jwtExpiresAt,
+        refresh_token: parsed.refresh_token,
+      };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+export async function syncApiKeyToTool(
+  files: FileStore,
+  homeDir: string,
+  tool: 'opencode' | 'pi',
+  apiKey: string,
+): Promise<void> {
+  const authPath = TOOL_AUTH_PATHS[tool](homeDir);
+  let existing: Record<string, unknown> = {};
+
+  const content = await files.readFile(authPath);
+  if (content) {
+    try {
+      existing = JSON.parse(content) as Record<string, unknown>;
+    } catch {
+      existing = {};
+    }
+  }
+
+  const updated = {
+    ...existing,
+    berget: {
+      key: apiKey,
+      type: TOOL_API_KEY_TYPES[tool],
+    },
+  };
+
+  await files.writeFile(authPath, JSON.stringify(updated, null, 2) + '\n');
+  await files.chmod(authPath, 0o600);
+}
+
+export async function syncOAuthToTool(
+  files: FileStore,
+  homeDir: string,
+  tool: 'opencode' | 'pi',
+  cliAuth: CliAuth,
+): Promise<void> {
+  const authPath = TOOL_AUTH_PATHS[tool](homeDir);
+  let existing: Record<string, unknown> = {};
+
+  const content = await files.readFile(authPath);
+  if (content) {
+    try {
+      existing = JSON.parse(content) as Record<string, unknown>;
+    } catch {
+      existing = {};
+    }
+  }
+
+  // Use the JWT's actual expiry time for consistency
+  const jwtExpiresAt = extractJwtExpiresAt(cliAuth.access_token);
+
+  const updated = {
+    ...existing,
+    berget: {
+      access: cliAuth.access_token,
+      expires: jwtExpiresAt,
+      refresh: cliAuth.refresh_token,
+      type: 'oauth',
+    },
+  };
+
+  await files.writeFile(authPath, JSON.stringify(updated, null, 2) + '\n');
+  await files.chmod(authPath, 0o600);
+}
+
+function extractJwtExpiresAt(accessToken: string): number {
+  try {
+    const parts = accessToken.split('.');
+    if (parts.length !== 3) return 0;
+    const payload = Buffer.from(parts[1], 'base64url').toString('utf8');
+    const decoded = JSON.parse(payload);
+    if (typeof decoded.exp === 'number') {
+      return decoded.exp * 1000; // JWT exp is in seconds, convert to milliseconds
+    }
+  } catch {
+    // If decoding fails, return 0 (treated as expired)
+  }
+  return 0;
+}

package/src/commands/code/errors.ts

@@ -1,23 +1,23 @@
-export class PrerequisiteError extends Error {
-  constructor(public readonly binary: string) {
-    super(`Required binary not found: ${binary}`);
-    this.name = "PrerequisiteError";
-  }
-}
-
 export class CancelledError extends Error {
   constructor() {
-    super("Wizard cancelled");
-    this.name = "CancelledError";
+    super('Wizard cancelled');
+    this.name = 'CancelledError';
   }
 }
 
 export class CommandFailedError extends Error {
   constructor(
     public readonly command: string,
-    public readonly exitCode: number
+    public readonly exitCode: number,
   ) {
     super(`Command "${command}" failed with exit code ${exitCode}`);
-    this.name = "CommandFailedError";
+    this.name = 'CommandFailedError';
+  }
+}
+
+export class PrerequisiteError extends Error {
+  constructor(public readonly binary: string) {
+    super(`Required binary not found: ${binary}`);
+    this.name = 'PrerequisiteError';
   }
 }

package/src/commands/code/ports/auth-services.ts

@@ -1,14 +1,14 @@
+export interface ApiKeyServicePort {
+  create(options: { description?: string; name: string }): Promise<{ key: string }>;
+}
+
 export interface AuthServicePort {
   login(): Promise<boolean>;
   loginInteractive(): Promise<{
-    success: boolean;
     accessToken?: string;
-    refreshToken?: string;
-    expiresIn?: number;
     error?: string;
+    expiresIn?: number;
+    refreshToken?: string;
+    success: boolean;
   }>;
 }
-
-export interface ApiKeyServicePort {
-  create(options: { name: string; description?: string }): Promise<{ key: string }>;
-}

package/src/commands/code/ports/command-runner.ts

@@ -2,9 +2,9 @@ export interface CommandRunner {
   checkInstalled(binary: string): Promise<boolean>;
   run(
     command: string,
-    args: readonly string[],
+    arguments_: readonly string[],
     options?: {
       cwd?: string;
-    }
+    },
   ): Promise<string>;
 }

package/src/commands/code/ports/file-store.ts

@@ -1,7 +1,7 @@
 export interface FileStore {
+  chmod(path: string, mode: number): Promise<void>;
   exists(path: string): Promise<boolean>;
-  readFile(path: string): Promise<string | null>;
-  writeFile(path: string, content: string): Promise<void>;
   mkdir(path: string): Promise<void>;
-  chmod(path: string, mode: number): Promise<void>;
+  readFile(path: string): Promise<null | string>;
+  writeFile(path: string, content: string): Promise<void>;
 }

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

@@ -1,26 +1,26 @@
 export interface Prompter {
+  confirm(options: { initialValue?: boolean; message: string }): Promise<boolean>;
   intro(message: string): void;
-  outro(message: string): void;
-  note(message: string, title?: string): void;
-  spinner(): Spinner;
-  select<T>(opts: {
+  multiselect<T>(options: {
     message: string;
     options: ReadonlyArray<{
-      value: T;
-      label: string;
       hint?: string;
+      label: string;
+      value: T;
     }>;
-  }): Promise<T>;
-  multiselect<T>(opts: {
+  }): Promise<T[]>;
+  note(message: string, title?: string): void;
+  outro(message: string): void;
+  select<T>(options: {
     message: string;
     options: ReadonlyArray<{
-      value: T;
-      label: string;
       hint?: string;
+      label: string;
+      value: T;
     }>;
-  }): Promise<T[]>;
-  confirm(opts: { message: string; initialValue?: boolean }): Promise<boolean>;
-  text(opts: { message: string; placeholder?: string }): Promise<string>;
+  }): Promise<T>;
+  spinner(): Spinner;
+  text(options: { message: string; placeholder?: string }): Promise<string>;
 }
 
 export interface Spinner {