@hieplp/pi-account-switcher 0.2.1 → 0.2.3

package/src/commands/base.ts

@@ -1,7 +1,7 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountConfig, AccountSwitcherContext, ProviderConfig } from "@/types";
-import { providerUtil, uiUtil } from "@/utils";
+import { commandUtil, providerUtil, uiUtil } from "@/utils";
 
 function deduplicateLabels(labels: string[]): string[] {
   const seen = new Map<string, number>();
@@ -31,7 +31,7 @@ export abstract class BaseCommand implements Command {
     protected readonly runtime: AccountSwitcher,
     meta: CommandMeta,
   ) {
-    this.name = meta.name;
+    this.name = commandUtil.name(meta.name);
     this.description = meta.description;
   }
 
@@ -73,8 +73,14 @@ export abstract class BaseCommand implements Command {
     return providerUtil.normalizeProvider(active?.provider ?? "") === provider.id;
   }
 
-  protected isActiveModel(ctx: AccountSwitcherContext, modelId: string): boolean {
-    return ctx.model?.id === modelId;
+  protected isActiveModel(ctx: AccountSwitcherContext, modelId: string, provider?: string): boolean {
+    if (ctx.model?.id !== modelId) return false;
+    if (!provider) return true;
+    const providers = this.runtime.getProviders();
+    return (
+      providerUtil.normalizeProviderWithCustom(ctx.model.provider, providers) ===
+      providerUtil.normalizeProviderWithCustom(provider, providers)
+    );
   }
 
   abstract handler(ctx: AccountSwitcherContext, args?: string): Promise<void>;

package/src/commands/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import useProviderCommands from "./providers";
 import useAccountCommands from "./accounts";

package/src/commands/models/add.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";

package/src/commands/models/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { useListModelsCommand } from "./list";
 import { useAddModelCommand } from "./add";

package/src/commands/models/list.ts

@@ -1,8 +1,8 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";
-import { errorUtil } from "@/utils";
+import { errorUtil, providerUtil } from "@/utils";
 import { ModelCommand } from "./shared";
 
 export const useListModelsCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
@@ -18,9 +18,16 @@ class ListModelsCommand extends ModelCommand {
     try {
       await this.runtime.load();
 
-      const provider = ctx.model?.provider;
+      const providers = this.runtime.getProviders();
+      const activeAccount = this.runtime.getActiveAccount();
+      const activeProvider =
+        activeAccount?.piAuth?.provider ??
+        (activeAccount
+          ? (providerUtil.findProvider(activeAccount.provider, providers)?.piAuthProvider ?? activeAccount.provider)
+          : undefined);
+      const provider = activeProvider ?? ctx.model?.provider;
       if (!provider) {
-        ctx.ui.notify("No active model.", "info");
+        ctx.ui.notify("No active account or model.", "info");
         return;
       }
 
@@ -30,8 +37,11 @@ class ListModelsCommand extends ModelCommand {
         return;
       }
 
-      const currentId = ctx.model?.id;
-      const model = await this.pick(ctx, `Models (${provider})`, models, (m) =>
+      const normalizedProvider = providerUtil.normalizeProviderWithCustom(provider, providers);
+      const currentBelongsToProvider =
+        ctx.model && providerUtil.normalizeProviderWithCustom(ctx.model.provider, providers) === normalizedProvider;
+      const currentId = currentBelongsToProvider ? ctx.model?.id : undefined;
+      const model = await this.pick(ctx, `Models (${normalizedProvider})`, models, (m) =>
         m.id === currentId ? `${m.id} ✓` : m.id,
       );
       if (!model) return;

package/src/commands/models/remove.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";
@@ -19,7 +19,7 @@ class RemoveModelCommand extends ModelCommand {
       const providerConfig = await this.loadProvider(ctx);
       if (!providerConfig) return;
 
-      const removable = (providerConfig.models ?? []).filter((m) => !this.isActiveModel(ctx, m.id));
+      const removable = (providerConfig.models ?? []).filter((m) => !this.isActiveModel(ctx, m.id, providerConfig.id));
       if (removable.length === 0) {
         ctx.ui.notify(`Provider "${providerConfig.id}" has no removable model configs.`, "info");
         return;

package/src/commands/models/shared/base.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountSwitcherContext, ProviderConfig } from "@/types";
 import { BaseCommand, type CommandMeta } from "../../base";
@@ -13,13 +13,17 @@ export abstract class ModelCommand extends BaseCommand {
   protected async loadProvider(ctx: AccountSwitcherContext): Promise<ProviderConfig | undefined> {
     await this.runtime.load();
 
-    const provider = ctx.model?.provider;
+    // Prefer the active account's provider so that switching to an account whose
+    // provider has no models yet still targets the correct (new) provider.
+    const activeAccount = this.runtime.getActiveAccount();
+    const providers = this.runtime.getProviders();
+    const provider = activeAccount?.provider ?? ctx.model?.provider;
     if (!provider) {
       ctx.ui.notify("No active model. Use models:list to select one first.", "info");
       return undefined;
     }
 
-    const config = providerUtil.findProvider(provider, this.runtime.getProviders());
+    const config = providerUtil.findProvider(provider, providers);
     if (!config) {
       ctx.ui.notify(`"${provider}" is a built-in provider. This command only works with custom providers.`, "info");
       return undefined;

package/src/commands/models/shared/prompts.ts

@@ -1,4 +1,4 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import type { ProviderModelConfig } from "@/types";
 import { uiUtil } from "@/utils";
 

package/src/commands/models/shared/select.ts

@@ -1,4 +1,4 @@
-import type { Api, Model } from "@mariozechner/pi-ai";
+import type { Api, Model } from "@earendil-works/pi-ai";
 import type { ProviderConfig } from "@/types";
 import { providerUtil } from "@/utils";
 

package/src/commands/providers/add.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { COMMANDS } from "@/constants";
 import type { AccountSwitcherContext } from "@/types";

package/src/commands/providers/edit.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { COMMANDS } from "@/constants";
 import type { AccountSwitcherContext } from "@/types";

package/src/commands/providers/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { useAddProviderCommand } from "./add";
 import { useEditProviderCommand } from "./edit";

package/src/commands/providers/list.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { COMMANDS } from "@/constants";
 import { ProviderCommand } from "./shared";
@@ -18,7 +18,10 @@ class ListProvidersCommand extends ProviderCommand {
     try {
       const providers = await this.loadProviders(ctx);
       if (!providers) return;
-      await ctx.ui.select("Providers", providers.map((p) => this.format(p)));
+      await ctx.ui.select(
+        "Providers",
+        providers.map((p) => this.format(p)),
+      );
     } catch (e) {
       ctx.ui.notify(`Failed to list providers: ${errorUtil.format(e)}`, "error");
     }

package/src/commands/providers/remove.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { COMMANDS } from "@/constants";
 import type { AccountSwitcherContext } from "@/types";

package/src/commands/providers/shared/base.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountSwitcherContext, ProviderConfig } from "@/types";
 import { BaseCommand, type CommandMeta } from "../../base";

package/src/commands/providers/shared/prompts.ts

@@ -1,4 +1,4 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import type { ProviderApi, ProviderConfig } from "@/types";
 import { PROVIDER_API_TYPES } from "@/constants";
 import { providerUtil, uiUtil } from "@/utils";
@@ -48,22 +48,22 @@ export class ProviderConfigBuilder {
 
   async withId(): Promise<this> {
     const raw = await this.prompt("Provider id", this.defaults.id).asText();
-    if (!raw) throw new Error("Provider id is required");
-    this.config.id = providerUtil.normalizeProvider(raw);
+    this.config.id = providerUtil.normalizeProvider(raw || this.defaults.id);
+    if (!this.config.id) throw new Error("Provider id is required");
     return this;
   }
 
   async withLabel(): Promise<this> {
     const id = this.config.id ?? "";
-    this.config.label = await this.prompt("Provider label", this.defaults.label ?? id).asText();
+    const hint = this.defaults.label ?? id;
+    this.config.label = (await this.prompt("Provider label", hint).asText()) ?? hint;
     return this;
   }
 
   async withBaseUrl(): Promise<this> {
-    this.config.baseUrl = await this.prompt(
-      "Base URL (blank for account-only provider)",
-      this.defaults.baseUrl,
-    ).asText();
+    this.config.baseUrl =
+      (await this.prompt("Base URL (blank for account-only provider)", this.defaults.baseUrl).asText()) ??
+      this.defaults.baseUrl;
     return this;
   }
 
@@ -78,26 +78,23 @@ export class ProviderConfigBuilder {
 
   async withApiKey(): Promise<this> {
     const id = this.config.id ?? "";
-    this.config.apiKey = await this.prompt(
-      "Pi apiKey env var/name or raw key",
-      this.defaults.apiKey ?? `${id.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`,
-    ).asText();
+    const hint = this.defaults.apiKey ?? `${id.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
+    this.config.apiKey =
+      (await this.prompt("Pi apiKey env var/name or raw key", hint).asText()) ?? this.defaults.apiKey;
     return this;
   }
 
   async withEnvKeys(): Promise<this> {
     const { apiKey } = this.config;
-    this.config.envKeys = await this.prompt(
-      "Env key suggestions (comma-separated)",
-      (this.defaults.envKeys ?? (apiKey ? [apiKey] : [DEFAULTS.envKey])).join(", "),
-    ).asCsv();
+    const defaultKeys = this.defaults.envKeys ?? (apiKey ? [apiKey] : [DEFAULTS.envKey]);
+    const csv = await this.prompt("Env key suggestions (comma-separated)", defaultKeys.join(", ")).asCsv();
+    this.config.envKeys = csv.length > 0 ? csv : defaultKeys;
     return this;
   }
 
   async withAliases(): Promise<this> {
-    this.config.aliases = (
-      await this.prompt("Aliases (comma-separated, optional)", this.defaults.aliases.join(", ")).asCsv()
-    ).map(providerUtil.normalizeProvider);
+    const csv = await this.prompt("Aliases (comma-separated, optional)", this.defaults.aliases.join(", ")).asCsv();
+    this.config.aliases = csv.length > 0 ? csv.map(providerUtil.normalizeProvider) : this.defaults.aliases;
     return this;
   }
 
@@ -109,15 +106,16 @@ export class ProviderConfigBuilder {
     if (rawModels?.some((item) => typeof item !== "object" || item === null || Array.isArray(item))) {
       throw new Error("models must be an array of objects");
     }
-    this.config.models = rawModels as ProviderConfig["models"];
+    this.config.models = (rawModels as ProviderConfig["models"]) ?? this.defaults.models;
     return this;
   }
 
   async withCompat(): Promise<this> {
-    this.config.compat = await this.prompt(
-      "Compat JSON object (optional)",
-      this.defaults.compat ? JSON.stringify(this.defaults.compat) : "",
-    ).asJsonRecord("compat");
+    this.config.compat =
+      (await this.prompt(
+        "Compat JSON object (optional)",
+        this.defaults.compat ? JSON.stringify(this.defaults.compat) : "",
+      ).asJsonRecord("compat")) ?? this.defaults.compat;
     return this;
   }
 
@@ -127,7 +125,8 @@ export class ProviderConfigBuilder {
       "Configure Pi OAuth provider id?",
       "Only choose yes if this provider maps to a Pi /login auth entry.",
     ))
-      ? await this.prompt("Pi auth provider id", this.defaults.piAuthProvider ?? id).asText()
+      ? ((await this.prompt("Pi auth provider id", this.defaults.piAuthProvider ?? id).asText()) ??
+        this.defaults.piAuthProvider)
       : this.defaults.piAuthProvider;
     return this;
   }

package/src/commands/providers/shared/select.ts

@@ -1,4 +1,4 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import type { ProviderConfig } from "@/types";
 
 export async function selectProvider(

package/src/commands/system/export.ts

@@ -1,12 +1,11 @@
 import { readFile } from "node:fs/promises";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { COMMANDS, DEFAULT_EXPORT_PATH, STATE_PATH } from "@/constants";
 import type { AccountSwitcherContext } from "@/types";
 import { BaseCommand } from "../base";
 import { errorUtil, fileUtil } from "@/utils";
 
-
 export const useExportCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
   new ExportCommand(pi, runtime).register();
 };

package/src/commands/system/import.ts

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import z from "zod";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { ACCOUNTS_PATH, COMMANDS, DEFAULT_EXPORT_PATH, PROVIDERS_PATH, STATE_PATH } from "@/constants";
 import { accountSchema, providerSchema } from "@/schemas";
@@ -78,8 +78,14 @@ class ImportCommand extends BaseCommand {
 
 function parseImportBundle(raw: unknown): ImportBundle {
   const parsed = exportBundleSchema.parse(raw);
-  assertNoDuplicateIds("account", parsed.accounts.map((account) => account.id));
-  assertNoDuplicateIds("provider", parsed.providers.map((provider) => provider.id));
+  assertNoDuplicateIds(
+    "account",
+    parsed.accounts.map((account) => account.id),
+  );
+  assertNoDuplicateIds(
+    "provider",
+    parsed.providers.map((provider) => provider.id),
+  );
   return parsed;
 }
 

package/src/commands/system/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { useExportCommand } from "./export";
 import { useImportCommand } from "./import";

package/src/commands/system/reset.ts

@@ -1,5 +1,5 @@
 import { rm } from "node:fs/promises";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { ACCOUNTS_PATH, COMMANDS, PROVIDERS_PATH, STATE_PATH } from "@/constants";
 import type { AccountSwitcherContext } from "@/types";

package/src/constants/commands.ts

@@ -24,6 +24,11 @@ export const COMMANDS = {
       name: "accounts:oauth",
       description: "Import Pi /login OAuth credentials as a switchable account",
     },
+    verify: {
+      name: "accounts:verify",
+      description:
+        "Verify secrets for one or all accounts without activating them (pass 'all'; add 'ping' to send a test request)",
+    },
   },
   providers: {
     add: {

package/src/constants/env.ts

@@ -0,0 +1 @@
+export const COMMAND_PREFIX_ENV = "PI_ACCOUNT_SWITCHER_COMMAND_PREFIX";

package/src/constants/index.ts

@@ -1,4 +1,5 @@
 export * from "./commands";
 export * from "./config";
+export * from "./env";
 export * from "./paths";
 export * from "./providers";

package/src/constants/paths.ts

@@ -6,4 +6,4 @@ export const ACCOUNTS_PATH = join(APP_DIR, "accounts.json");
 export const PROVIDERS_PATH = join(APP_DIR, "providers.json");
 export const STATE_PATH = join(APP_DIR, "state.json");
 export const PI_AUTH_PATH = join(homedir(), ".pi", "agent", "auth.json");
-export const DEFAULT_EXPORT_PATH = "~/pi-account-switcher-export.json";
+export const DEFAULT_EXPORT_PATH = "~/pi-account-switcher-export.json";

package/src/extension.ts

@@ -1,5 +1,5 @@
 import { createJiti } from "@mariozechner/jiti";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -11,9 +11,7 @@ export default async function accountSwitcherBootstrap(pi: ExtensionAPI) {
     },
   });
 
-  const extension = await jiti.import<
-    (pi: ExtensionAPI) => void | Promise<void>
-  >("./index", {
+  const extension = await jiti.import<(pi: ExtensionAPI) => void | Promise<void>>("./index", {
     default: true,
   });
 

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcherContext } from "@/types";
 import { useAccountSwitcher, type AccountSwitcher } from "./runtime";
 import { registerAllCommands } from "./commands";

package/src/runtime/account-switcher-runtime.ts

@@ -1,7 +1,7 @@
 import AccountSwitcher from "./account-switcher";
 import { ACCOUNTS_PATH, PROVIDERS_PATH, STATE_PATH } from "@/constants";
-import type { Api, Model } from "@mariozechner/pi-ai";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { Api, Model } from "@earendil-works/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountConfig, AccountSwitcherContext, PiAuthEntry, ProviderConfig } from "@/types";
 import type { AccountService, ModelService, PiAuthService, ProviderService } from "@/services";
 import { useAccountService, useModelService, usePiAuthService, useProviderService } from "@/services";
@@ -13,6 +13,10 @@ function resolveAuthProvider(account: AccountConfig, providers: ProviderConfig[]
   return provider?.piAuthProvider ?? providerUtil.normalizeProvider(account.provider);
 }
 
+function resolveAccountProvider(account: AccountConfig, providers: ProviderConfig[]): string {
+  return providerUtil.normalizeProviderWithCustom(resolveAuthProvider(account, providers), providers);
+}
+
 export default class AccountSwitcherRuntime implements AccountSwitcher {
   private accountService: AccountService;
   private modelService: ModelService;
@@ -49,8 +53,16 @@ export default class AccountSwitcherRuntime implements AccountSwitcher {
     // leave Pi's default model selection untouched.
     const modelState = this.accountService.getActiveModelState();
     if (modelState) {
-      const model = ctx.modelRegistry.find(modelState.provider, modelState.id);
-      if (model) await this.modelService.applyModel(model, ctx);
+      const providers = this.providerService.getProviders();
+      const activeProvider = active ? resolveAccountProvider(active, providers) : undefined;
+      const savedProvider = providerUtil.normalizeProviderWithCustom(modelState.provider, providers);
+
+      // Only restore a saved model when it belongs to the active account's provider.
+      // Otherwise Pi can start with credentials for one provider and a model from another.
+      if (!activeProvider || savedProvider === activeProvider) {
+        const model = ctx.modelRegistry.find(modelState.provider, modelState.id);
+        if (model) await this.modelService.applyModel(model, ctx);
+      }
     }
   }
 
@@ -94,10 +106,7 @@ export default class AccountSwitcherRuntime implements AccountSwitcher {
   findAccountsByProvider(provider: string): AccountConfig[] {
     const providers = this.providerService.getProviders();
     const normalized = providerUtil.normalizeProviderWithCustom(provider, providers);
-    return this.accountService.getAccounts().filter((a) => {
-      const accountProvider = providerUtil.normalizeProviderWithCustom(resolveAuthProvider(a, providers), providers);
-      return accountProvider === normalized;
-    });
+    return this.accountService.getAccounts().filter((a) => resolveAccountProvider(a, providers) === normalized);
   }
 
   getActiveAccount(): AccountConfig | undefined {
@@ -123,17 +132,14 @@ export default class AccountSwitcherRuntime implements AccountSwitcher {
 
     // piAuth accounts authenticate via a separate provider (e.g. github-copilot),
     // so use that for model lookup rather than the account's own provider field.
-    const accountProvider = providerUtil.normalizeProviderWithCustom(
-      resolveAuthProvider(account, providers),
-      providers,
-    );
+    const accountProvider = resolveAccountProvider(account, providers);
     const currentProvider = ctx.model
       ? providerUtil.normalizeProviderWithCustom(ctx.model.provider, providers)
       : undefined;
 
     // Skip model selection if the active model already belongs to the same provider.
     if (accountProvider !== currentProvider) {
-      const model = await modelUtil.pickModel(ctx, account, providers);
+      const model = await modelUtil.pickModel(ctx, account, providers, accountProvider);
       if (model) await this.applyModel(model, ctx);
     }
 
@@ -174,6 +180,10 @@ export default class AccountSwitcherRuntime implements AccountSwitcher {
     return this.providerService.getProviders();
   }
 
+  registerProvider(provider: ProviderConfig): void {
+    this.providerService.registerProvider(provider);
+  }
+
   async addProvider(provider: ProviderConfig): Promise<void> {
     return this.providerService.addProvider(provider);
   }

package/src/runtime/account-switcher.ts

@@ -1,4 +1,4 @@
-import type { Api, Model } from "@mariozechner/pi-ai";
+import type { Api, Model } from "@earendil-works/pi-ai";
 import type { AccountConfig, AccountSwitcherContext, PiAuthEntry, ProviderConfig } from "@/types";
 
 export default interface AccountSwitcher {
@@ -26,6 +26,7 @@ export default interface AccountSwitcher {
 
   // Provider
   getProviders(): ProviderConfig[];
+  registerProvider(provider: ProviderConfig): void;
   addProvider(config: ProviderConfig): Promise<void>;
   editProvider(original: ProviderConfig, updated: ProviderConfig): Promise<void>;
   removeProvider(provider: ProviderConfig): Promise<void>;

package/src/runtime/index.ts

@@ -1,10 +1,8 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type AccountSwitcher from "./account-switcher";
 import AccountSwitcherRuntime from "./account-switcher-runtime";
 
-function useAccountSwitcher(
-  pi: Pick<ExtensionAPI, "registerProvider" | "setModel">,
-): AccountSwitcher {
+function useAccountSwitcher(pi: Pick<ExtensionAPI, "registerProvider" | "setModel">): AccountSwitcher {
   return new AccountSwitcherRuntime(pi);
 }
 

package/src/schemas/accounts.ts

@@ -44,7 +44,6 @@ export const accountSchema = z
       account.usesProviderApiKey ||
       account.piAuth,
     {
-      message:
-        "Account must define env credentials, providerApiKey, provider apiKey, or piAuth credentials",
+      message: "Account must define env credentials, providerApiKey, provider apiKey, or piAuth credentials",
     },
   );

package/src/schemas/providers.ts

@@ -20,9 +20,7 @@ export const providerModelSchema = z
       })
       .optional(),
     compat: jsonRecordSchema.optional(),
-    thinkingLevelMap: z
-      .record(z.string(), z.union([z.string(), z.null()]))
-      .optional(),
+    thinkingLevelMap: z.record(z.string(), z.union([z.string(), z.null()])).optional(),
     headers: z.record(z.string(), z.string()).optional(),
   })
   .passthrough();
@@ -42,9 +40,7 @@ export const providerSchema = z
     authHeader: z.boolean().optional(),
     compat: jsonRecordSchema.optional(),
     models: z.array(providerModelSchema).optional(),
-    modelOverrides: z
-      .record(z.string(), providerModelSchema.partial())
-      .optional(),
+    modelOverrides: z.record(z.string(), providerModelSchema.partial()).optional(),
   })
   .passthrough();
 

package/src/services/models.ts

@@ -1,5 +1,5 @@
-import type { Api, Model } from "@mariozechner/pi-ai";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { Api, Model } from "@earendil-works/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcherContext } from "@/types";
 
 type ProviderModel = Model<Api>;

package/src/services/providers.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { type ProviderStore, useProviderStore } from "@/storage";
 import type { ProviderConfig, ProviderModelConfig } from "@/types";
 import { commonUtil } from "@/utils";
@@ -72,10 +72,7 @@ class ProviderServiceImpl implements ProviderService {
   registerProvider(provider: ProviderConfig): void {
     const config = this.toPiProvider(provider);
     if (!config) return;
-    this.pi.registerProvider(
-      provider.id,
-      config as Parameters<ExtensionAPI["registerProvider"]>[1],
-    );
+    this.pi.registerProvider(provider.id, config as Parameters<ExtensionAPI["registerProvider"]>[1]);
   }
 
   private toPiProvider(provider: ProviderConfig): Record<string, unknown> | undefined {
@@ -104,10 +101,7 @@ class ProviderServiceImpl implements ProviderService {
     });
   }
 
-  private toPiModel(
-    provider: ProviderConfig,
-    model: ProviderModelConfig,
-  ): Record<string, unknown> | undefined {
+  private toPiModel(provider: ProviderConfig, model: ProviderModelConfig): Record<string, unknown> | undefined {
     return commonUtil.omitUndefined({
       ...model,
       api: model.api ?? provider.api,

package/src/types/context.ts

@@ -1,3 +1,3 @@
-import type { ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
 export type AccountSwitcherContext = ExtensionCommandContext;

package/src/types/index.ts

@@ -1,4 +1,4 @@
 export * from "./config";
 export * from "./accounts";
 export * from "./providers";
-export * from "./context";
+export * from "./context";