@hieplp/pi-account-switcher 0.2.1 → 0.2.2

package/README.md

@@ -48,45 +48,55 @@ After installing, reload Pi and add your first account:
 /accounts:add
 ```
 
+### Local development command prefix
+
+If you have the npm package installed and also run a local checkout, set `PI_ACCOUNT_SWITCHER_COMMAND_PREFIX` before launching Pi to avoid command-name collisions:
+
+```bash
+PI_ACCOUNT_SWITCHER_COMMAND_PREFIX=dev pi -e ./src/extension.ts
+```
+
+The local commands will be registered as `/dev:accounts:list`, `/dev:accounts:add`, etc. The prefix may include the trailing colon (`dev:`) or omit it (`dev`).
+
 ---
 
 ## Commands
 
 ### Accounts
 
-| Command | Description |
-|---|---|
-| `/accounts:add` | Add a new account interactively |
-| `/accounts:list` | List all accounts and activate the selected one |
-| `/accounts:switch` | Switch to another account within the current provider |
-| `/accounts:edit` | Edit label, provider, id, or credential source |
-| `/accounts:remove` | Delete an account |
-| `/accounts:oauth` | Import the current Pi `/login` OAuth session as a named account |
+| Command            | Description                                                     |
+| ------------------ | --------------------------------------------------------------- |
+| `/accounts:add`    | Add a new account interactively                                 |
+| `/accounts:list`   | List all accounts and activate the selected one                 |
+| `/accounts:switch` | Switch to another account within the current provider           |
+| `/accounts:edit`   | Edit label, provider, id, or credential source                  |
+| `/accounts:remove` | Delete an account                                               |
+| `/accounts:oauth`  | Import the current Pi `/login` OAuth session as a named account |
 
 ### Providers
 
-| Command | Description |
-|---|---|
-| `/providers:add` | Add a reusable custom provider |
-| `/providers:list` | List custom providers |
-| `/providers:edit` | Edit a custom provider |
+| Command             | Description                      |
+| ------------------- | -------------------------------- |
+| `/providers:add`    | Add a reusable custom provider   |
+| `/providers:list`   | List custom providers            |
+| `/providers:edit`   | Edit a custom provider           |
 | `/providers:remove` | Remove an unused custom provider |
 
 ### Models
 
-| Command | Description |
-|---|---|
-| `/models:list` | List all available models and switch to the selected one |
-| `/models:add` | Add a custom model config to the current provider |
-| `/models:remove` | Remove a custom model config |
+| Command          | Description                                              |
+| ---------------- | -------------------------------------------------------- |
+| `/models:list`   | List all available models and switch to the selected one |
+| `/models:add`    | Add a custom model config to the current provider        |
+| `/models:remove` | Remove a custom model config                             |
 
 ### System
 
-| Command | Description |
-|---|---|
-| `/system:reset` | Delete all accounts, providers, and state |
+| Command          | Description                                              |
+| ---------------- | -------------------------------------------------------- |
+| `/system:reset`  | Delete all accounts, providers, and state                |
 | `/system:export` | Export all accounts, providers, and state to a JSON file |
-| `/system:import` | Import accounts, providers, and state from a JSON file |
+| `/system:import` | Import accounts, providers, and state from a JSON file   |
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hieplp/pi-account-switcher",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "description": "Pi extension for quickly switching between multiple accounts/API keys per provider.",
   "license": "MIT",
@@ -27,21 +27,24 @@
   ],
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "test": "vitest run"
+    "test": "vitest run",
+    "format": "prettier --write .",
+    "format:check": "prettier --check ."
   },
   "dependencies": {
+    "@earendil-works/pi-tui": "^0.74.0",
     "@mariozechner/jiti": "^2.6.5",
-    "@mariozechner/pi-tui": "^0.73.1",
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@mariozechner/pi-ai": "*",
-    "@mariozechner/pi-coding-agent": "*"
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*"
   },
   "devDependencies": {
-    "@mariozechner/pi-ai": "latest",
-    "@mariozechner/pi-coding-agent": "latest",
+    "@earendil-works/pi-ai": "latest",
+    "@earendil-works/pi-coding-agent": "latest",
     "@types/node": "latest",
+    "prettier": "^3.8.3",
     "typescript": "latest",
     "vitest": "latest"
   },

package/src/commands/accounts/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 { AccountConfig, AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";

package/src/commands/accounts/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 type { AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";

package/src/commands/accounts/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 { useAddAccountCommand } from "./add";
 import { useEditAccountCommand } from "./edit";
@@ -6,6 +6,7 @@ import { useListAccountsCommand } from "./list";
 import { useOAuthImportCommand } from "./oauth";
 import { useRemoveAccountCommand } from "./remove";
 import { useSwitchAccountCommand } from "./switch";
+import { useVerifyAccountsCommand } from "./verify";
 
 const useAccountCommands = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
   useAddAccountCommand(pi, runtime);
@@ -14,6 +15,7 @@ const useAccountCommands = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
   useOAuthImportCommand(pi, runtime);
   useRemoveAccountCommand(pi, runtime);
   useSwitchAccountCommand(pi, runtime);
+  useVerifyAccountsCommand(pi, runtime);
 };
 
 export default useAccountCommands;

package/src/commands/accounts/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 type { AccountSwitcherContext } from "@/types";
 import { COMMANDS } from "@/constants";

package/src/commands/accounts/oauth.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 { AccountConfig, AccountSwitcherContext } from "@/types";
 import { COMMANDS, OAUTH_PROVIDER_IDS, PI_AUTH_PATH } from "@/constants";

package/src/commands/accounts/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";

package/src/commands/accounts/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 { AccountConfig, AccountSwitcherContext } from "@/types";
 import { uiUtil } from "@/utils";
@@ -69,6 +69,31 @@ export abstract class AccountCommand extends BaseCommand {
     accounts: AccountConfig[],
     label = "Pick account",
   ): Promise<AccountConfig | undefined> {
+    const { labels, values } = this.buildGroupedAccountSelectItems(accounts, true);
+    return this.pickGrouped(ctx, label, labels, values);
+  }
+
+  protected async pickGroupedAccounts(
+    ctx: AccountSwitcherContext,
+    accounts: AccountConfig[],
+    label = "Pick accounts",
+  ): Promise<AccountConfig[] | undefined> {
+    const activeId = this.runtime.getActiveAccount()?.id;
+    const { labels, values } = this.buildGroupedAccountSelectItems(accounts, false);
+    const firstAccountIndex = values.findIndex((value) => value !== null);
+    const initialChecked = values.map((value, index) =>
+      activeId ? value?.id === activeId : firstAccountIndex !== -1 && index === firstAccountIndex,
+    );
+    return uiUtil.multiGroupedSelect(ctx.ui, label, labels, values, initialChecked);
+  }
+
+  private buildGroupedAccountSelectItems(
+    accounts: AccountConfig[],
+    includeActiveMarker: boolean,
+  ): {
+    labels: string[];
+    values: Array<AccountConfig | null>;
+  } {
     const items = buildGroupedItems(accounts, this.runtime.getProviders(), this.runtime.getActiveAccount()?.id);
 
     const labels: string[] = [];
@@ -79,10 +104,16 @@ export abstract class AccountCommand extends BaseCommand {
         values.push(null);
         continue;
       }
-      labels.push(formatAccountItem(item));
+      labels.push(includeActiveMarker ? formatAccountItem(item) : this.formatMultiAccountItem(item));
       values.push(item.account);
     }
 
-    return this.pickGrouped(ctx, label, labels, values);
+    return { labels, values };
+  }
+
+  private formatMultiAccountItem(
+    item: Extract<ReturnType<typeof buildGroupedItems>[number], { type: "account" }>,
+  ): string {
+    return item.active ? `${item.account.label} (active)` : item.account.label;
   }
 }

package/src/commands/accounts/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 { AccountConfig, ProviderConfig, SecretSource } from "@/types";
 import { commonUtil, providerUtil, uiUtil } from "@/utils";
 import { ACCOUNTS_PATH } from "@/constants";

package/src/commands/accounts/switch.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, providerUtil } from "@/utils";
+import { commandUtil, errorUtil, providerUtil } from "@/utils";
 import { AccountCommand } from "./shared";
 
 export const useSwitchAccountCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
@@ -20,7 +20,10 @@ class SwitchAccountCommand extends AccountCommand {
 
       const active = this.runtime.getActiveAccount();
       if (!active) {
-        ctx.ui.notify("No active account. Use accounts:list to activate one first.", "info");
+        ctx.ui.notify(
+          `No active account. Use ${commandUtil.name(COMMANDS.accounts.list.name)} to activate one first.`,
+          "info",
+        );
         return;
       }
 

package/src/commands/accounts/verify.ts

@@ -0,0 +1,298 @@
+import { completeSimple, type Api, type Model } from "@earendil-works/pi-ai";
+import type { AuthCredential, ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { AccountSwitcher } from "@/runtime";
+import type { AccountConfig, AccountSwitcherContext, ProviderConfig, SecretSource } from "@/types";
+import { COMMANDS } from "@/constants";
+import { accountUtil, commonUtil, errorUtil, providerUtil, uiUtil } from "@/utils";
+import { AccountCommand } from "./shared";
+
+export const useVerifyAccountsCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
+  new VerifyAccountsCommand(pi, runtime).register();
+};
+
+type VerifyTestPlan = {
+  secrets: boolean;
+  ping: boolean;
+};
+
+type CheckResult = {
+  ok: boolean;
+  line: string;
+};
+
+type AccountVerifyReport = {
+  account: AccountConfig;
+  ok: boolean;
+  lines: string[];
+};
+
+const TEST_OPTIONS = {
+  secrets: "Verify secrets",
+  ping: "Send ping",
+} as const;
+
+const MAX_PARALLEL_VERIFY = 3;
+
+class VerifyAccountsCommand extends AccountCommand {
+  constructor(pi: ExtensionAPI, runtime: AccountSwitcher) {
+    super(pi, runtime, COMMANDS.accounts.verify);
+  }
+
+  async handler(ctx: AccountSwitcherContext, args?: string): Promise<void> {
+    try {
+      const accounts = await this.loadAccounts(ctx);
+      if (!accounts) return;
+
+      const parts = (args ?? "").trim().toLowerCase().split(/\s+/).filter(Boolean);
+      const verifyAll = parts.includes("all");
+      const pingArg = parts.includes("ping") || parts.includes("probe") || parts.includes("connect");
+      const targets = verifyAll
+        ? accounts
+        : await this.pickGroupedAccounts(ctx, accounts, pingArg ? "Verify and ping accounts" : "Verify accounts");
+
+      if (!targets || targets.length === 0) return;
+
+      const plan = pingArg ? { secrets: true, ping: true } : await this.pickTestPlan(ctx);
+      if (!plan) return;
+
+      const selectedTests = this.formatSelectedTests(plan);
+      ctx.ui.notify(
+        `Testing ${targets.length} account${targets.length === 1 ? "" : "s"} (${selectedTests})...`,
+        "info",
+      );
+
+      const concurrency = plan.ping ? 1 : MAX_PARALLEL_VERIFY;
+      const reports = await commonUtil.runWithConcurrency(targets, concurrency, (account) =>
+        this.verifyAccount(ctx, account, plan),
+      );
+      const failed = reports.filter((report) => !report.ok).length;
+
+      ctx.ui.setEditorText(this.formatReport(plan, reports));
+      ctx.ui.notify(
+        `Finished testing ${targets.length} account${targets.length === 1 ? "" : "s"}${
+          failed ? ` — ${failed} failed` : " — all checks passed"
+        }.`,
+        failed ? "warning" : "info",
+      );
+    } catch (error) {
+      ctx.ui.notify(`accounts:verify failed: ${errorUtil.format(error)}`, "error");
+    }
+  }
+
+  private async pickTestPlan(ctx: AccountSwitcherContext): Promise<VerifyTestPlan | undefined> {
+    const selected = await uiUtil.multiSelect(
+      ctx.ui,
+      "What should be tested?",
+      [TEST_OPTIONS.secrets, TEST_OPTIONS.ping],
+      [true, false],
+    );
+
+    if (!selected) return undefined;
+
+    const plan = {
+      secrets: selected.includes(TEST_OPTIONS.secrets),
+      ping: selected.includes(TEST_OPTIONS.ping),
+    };
+
+    if (!plan.secrets && !plan.ping) {
+      ctx.ui.notify("No tests selected.", "info");
+      return undefined;
+    }
+
+    return plan;
+  }
+
+  private async verifyAccount(
+    ctx: AccountSwitcherContext,
+    account: AccountConfig,
+    plan: VerifyTestPlan,
+  ): Promise<AccountVerifyReport> {
+    const lines: string[] = [];
+    let ok = true;
+
+    if (plan.secrets) {
+      let anyChecked = false;
+
+      if (account.piAuth) {
+        lines.push("✓ secrets: using stored OAuth/piAuth credentials");
+      }
+
+      if (account.usesProviderApiKey && !account.providerApiKey) {
+        lines.push("✓ secrets: using provider config apiKey");
+      }
+
+      const secretChecks: Array<[string, SecretSource]> = [];
+      if (account.providerApiKey) secretChecks.push(["providerApiKey", account.providerApiKey]);
+      if (!account.piAuth && account.env) {
+        for (const [envName, source] of Object.entries(account.env)) secretChecks.push([envName, source]);
+      }
+
+      if (secretChecks.length > 0) {
+        const results = await Promise.all(secretChecks.map(([key, source]) => this.verifySecret(key, source)));
+        for (const result of results) {
+          lines.push(result.line);
+          ok &&= result.ok;
+        }
+      } else if (!account.piAuth && !account.usesProviderApiKey) {
+        lines.push("ℹ secrets: no secrets configured");
+      }
+    }
+
+    if (plan.ping) {
+      const result = await this.pingAccount(ctx, account);
+      lines.push(result.line);
+      ok &&= result.ok;
+    }
+
+    return { account, ok, lines };
+  }
+
+  private async pingAccount(ctx: AccountSwitcherContext, account: AccountConfig): Promise<CheckResult> {
+    const prefix = `[${account.label}]`;
+    const authProvider = this.resolveAuthProvider(account);
+    const model = this.resolveProbeModel(ctx, account, authProvider);
+    if (!model) {
+      return { ok: false, line: `✗ ping: skipped — no model found for provider ${authProvider}` };
+    }
+
+    const envBackup = new Map<string, string | undefined>();
+    let authBackup: AuthCredential | undefined;
+    let hadAuth = false;
+    let providerToRestore: ProviderConfig | undefined;
+
+    let requestAuth!: Awaited<ReturnType<typeof ctx.modelRegistry.getApiKeyAndHeaders>>;
+    try {
+      if (!account.piAuth && account.env) {
+        const resolved = await accountUtil.resolveAccountEnv(account);
+        for (const [envName, value] of resolved) {
+          envBackup.set(envName, process.env[envName]);
+          process.env[envName] = value;
+        }
+      }
+
+      if (account.piAuth) {
+        hadAuth = ctx.modelRegistry.authStorage.has(authProvider);
+        authBackup = ctx.modelRegistry.authStorage.get(authProvider);
+        ctx.modelRegistry.authStorage.set(authProvider, account.piAuth.entry);
+        ctx.modelRegistry.authStorage.reload();
+      }
+
+      if (account.providerApiKey) {
+        const provider = providerUtil.findProvider(account.provider, this.runtime.getProviders());
+        if (provider) {
+          providerToRestore = provider;
+          const apiKey = await accountUtil.resolveSecret(account.providerApiKey);
+          if (!apiKey) throw new Error("Resolved empty providerApiKey for ping");
+          this.runtime.registerProvider({ ...provider, apiKey });
+        }
+      }
+
+      requestAuth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
+      if (!requestAuth.ok) throw new Error(requestAuth.error);
+    } catch (err) {
+      return { ok: false, line: `✗ ping: unable to prepare credentials — ${errorUtil.format(err)}` };
+    } finally {
+      for (const [envName, previous] of envBackup) {
+        if (previous === undefined) delete process.env[envName];
+        else process.env[envName] = previous;
+      }
+      if (account.piAuth) {
+        if (hadAuth && authBackup) ctx.modelRegistry.authStorage.set(authProvider, authBackup);
+        else ctx.modelRegistry.authStorage.remove(authProvider);
+        ctx.modelRegistry.authStorage.reload();
+      }
+      if (providerToRestore) {
+        this.runtime.registerProvider(providerToRestore);
+      }
+    }
+
+    try {
+      ctx.ui.notify(`${prefix} ping: sending request via ${model.provider}/${model.id}...`, "info");
+
+      const response = await completeSimple(
+        model,
+        {
+          systemPrompt: "You are a health-check endpoint. Follow the user instruction exactly.",
+          messages: [
+            {
+              role: "user",
+              content: "Health check: reply with exactly OK.",
+              timestamp: Date.now(),
+            },
+          ],
+        },
+        {
+          apiKey: requestAuth.apiKey,
+          headers: requestAuth.headers,
+          maxTokens: 16,
+          timeoutMs: 30_000,
+          maxRetries: 0,
+          reasoning: "minimal",
+        },
+      );
+
+      if (response.stopReason === "error") throw new Error(response.errorMessage ?? "model returned an error");
+      const text = response.content.find((block) => block.type === "text")?.text?.trim();
+      return { ok: true, line: `✓ ping: OK via ${model.provider}/${model.id}${text ? ` — ${text}` : ""}` };
+    } catch (err) {
+      return { ok: false, line: `✗ ping: failed — ${errorUtil.format(err)}` };
+    }
+  }
+
+  private resolveAuthProvider(account: AccountConfig): string {
+    if (account.piAuth?.provider) return account.piAuth.provider;
+    const provider = providerUtil.findProvider(account.provider, this.runtime.getProviders());
+    return provider?.piAuthProvider ?? providerUtil.normalizeProvider(account.provider);
+  }
+
+  private resolveProbeModel(
+    ctx: AccountSwitcherContext,
+    account: AccountConfig,
+    authProvider: string,
+  ): Model<Api> | undefined {
+    const providers = this.runtime.getProviders();
+    const normalized = providerUtil.normalizeProviderWithCustom(authProvider, providers);
+    if (account.model) {
+      const configured = ctx.modelRegistry.find(authProvider, account.model);
+      if (configured) return configured;
+    }
+    if (ctx.model && providerUtil.normalizeProviderWithCustom(ctx.model.provider, providers) === normalized) {
+      return ctx.model;
+    }
+    return ctx.modelRegistry
+      .getAll()
+      .find((model) => providerUtil.normalizeProviderWithCustom(model.provider, providers) === normalized);
+  }
+
+  private async verifySecret(key: string, source: SecretSource): Promise<CheckResult> {
+    try {
+      const value = await accountUtil.resolveSecret(source);
+      if (!value) throw new Error("resolved to empty value");
+      return { ok: true, line: `✓ secrets: ${key} OK` };
+    } catch (err) {
+      return { ok: false, line: `✗ secrets: ${key} failed — ${errorUtil.format(err)}` };
+    }
+  }
+
+  private formatReport(plan: VerifyTestPlan, reports: AccountVerifyReport[]): string {
+    const selectedTests = this.formatSelectedTests(plan);
+    const passed = reports.filter((report) => report.ok).length;
+
+    return [
+      "Account verify results",
+      "",
+      `Tests: ${selectedTests}`,
+      `Accounts: ${reports.length} (${passed} passed, ${reports.length - passed} failed)`,
+      "",
+      ...reports.flatMap((report) => [
+        `${report.ok ? "✓" : "✗"} ${report.account.label}`,
+        ...report.lines.map((line) => `  ${line}`),
+        "",
+      ]),
+    ].join("\n");
+  }
+
+  private formatSelectedTests(plan: VerifyTestPlan): string {
+    return [plan.secrets ? "secrets" : undefined, plan.ping ? "ping" : undefined].filter(Boolean).join(" + ");
+  }
+}

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;
   }
 

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,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/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";

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";

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";

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";
@@ -174,6 +174,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";

package/src/utils/accounts.ts

@@ -1,6 +1,6 @@
-import * as piAi from "@mariozechner/pi-ai";
+import * as piAi from "@earendil-works/pi-ai";
 import { readFile } from "node:fs/promises";
-import type { ModelRegistry } from "@mariozechner/pi-coding-agent";
+import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
 import type { AccountConfig, SecretSource } from "@/types";
 import { commonUtil } from "./common";
 import { fileUtil } from "./files";

package/src/utils/commands.ts

@@ -0,0 +1,10 @@
+import { COMMAND_PREFIX_ENV } from "@/constants";
+
+export const commandUtil = {
+  name: (name: string): string => {
+    const prefix = process.env[COMMAND_PREFIX_ENV]?.trim();
+    if (!prefix) return name;
+
+    return `${prefix.endsWith(":") ? prefix : `${prefix}:`}${name}`;
+  },
+};

package/src/utils/common.ts

@@ -71,4 +71,19 @@ export const commonUtil = {
     });
     return stdout.trim();
   },
+
+  runWithConcurrency: async <T, R>(items: T[], concurrency: number, worker: (item: T) => Promise<R>): Promise<R[]> => {
+    const results = new Array<R>(items.length);
+    let nextIndex = 0;
+
+    const runNext = async (): Promise<void> => {
+      const index = nextIndex++;
+      if (index >= items.length) return;
+      results[index] = await worker(items[index]);
+      await runNext();
+    };
+
+    await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, runNext));
+    return results;
+  },
 };

package/src/utils/errors.ts

@@ -3,9 +3,7 @@ import z from "zod";
 export const errorUtil = {
   format: (error: unknown): string => {
     if (error instanceof z.ZodError) {
-      return error.issues
-        .map((issue) => `${errorUtil.formatPath(issue.path)}: ${issue.message}`)
-        .join("; ");
+      return error.issues.map((issue) => `${errorUtil.formatPath(issue.path)}: ${issue.message}`).join("; ");
     }
     return error instanceof Error ? error.message : String(error);
   },

package/src/utils/filterable-selector.ts

@@ -1,9 +1,114 @@
-import { DynamicBorder } from "@mariozechner/pi-coding-agent";
-import { Container, fuzzyFilter, getKeybindings, Input, Spacer, Text, type Focusable } from "@mariozechner/pi-tui";
-import type { ThemeColor } from "@mariozechner/pi-coding-agent";
+import { DynamicBorder } from "@earendil-works/pi-coding-agent";
+import { Container, fuzzyFilter, getKeybindings, Input, Spacer, Text, type Focusable } from "@earendil-works/pi-tui";
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 
 type Theme = { fg: (color: ThemeColor, text: string) => string; bold: (text: string) => string };
 
+export class FilterableMultiSelectComponent extends Container implements Focusable {
+  private readonly listContainer: Container;
+  private readonly theme: Theme;
+  private selectedIndex = 0;
+  private checked: boolean[];
+
+  _focused = false;
+  get focused() {
+    return this._focused;
+  }
+  set focused(value: boolean) {
+    this._focused = value;
+  }
+
+  constructor(
+    title: string,
+    private readonly options: string[],
+    initialChecked: boolean[],
+    private readonly onDone: (selected: string[] | undefined) => void,
+    theme: Theme,
+    private readonly disabled: boolean[] = [],
+  ) {
+    super();
+    this.theme = theme;
+    this.checked = options.map((_, i) => !this.disabled[i] && (initialChecked[i] ?? false));
+    this.selectedIndex = Math.max(
+      0,
+      this.disabled.findIndex((value) => !value),
+    );
+
+    const borderColor = (str: string) => theme.fg("border", str);
+    this.addChild(new DynamicBorder(borderColor));
+    this.addChild(new Spacer(1));
+    this.addChild(new Text(theme.fg("accent", theme.bold(title)), 1, 0));
+    this.addChild(new Spacer(1));
+
+    this.listContainer = new Container();
+    this.addChild(this.listContainer);
+    this.addChild(new Spacer(1));
+
+    const hint = (key: string, desc: string) => theme.fg("dim", key) + theme.fg("muted", ` ${desc}`);
+    this.addChild(
+      new Text(
+        hint("↑↓", "navigate") +
+          "  " +
+          hint("Space", "toggle") +
+          "  " +
+          hint("Enter", "run") +
+          "  " +
+          hint("Esc", "cancel"),
+        1,
+        0,
+      ),
+    );
+    this.addChild(new Spacer(1));
+    this.addChild(new DynamicBorder(borderColor));
+
+    this.updateList();
+  }
+
+  handleInput(keyData: string) {
+    const kb = getKeybindings();
+    if (kb.matches(keyData, "tui.select.up")) {
+      this.moveSelection(-1);
+    } else if (kb.matches(keyData, "tui.select.down")) {
+      this.moveSelection(1);
+    } else if (keyData === " ") {
+      this.toggleSelected();
+    } else if (kb.matches(keyData, "tui.select.confirm")) {
+      this.onDone(this.options.filter((_, i) => this.checked[i] && !this.disabled[i]));
+    } else if (kb.matches(keyData, "tui.select.cancel")) {
+      this.onDone(undefined);
+    }
+  }
+
+  private moveSelection(delta: number) {
+    if (this.options.length === 0) return;
+    for (let step = 0; step < this.options.length; step++) {
+      this.selectedIndex = (this.selectedIndex + delta + this.options.length) % this.options.length;
+      if (!this.disabled[this.selectedIndex]) break;
+    }
+    this.updateList();
+  }
+
+  private toggleSelected() {
+    if (this.disabled[this.selectedIndex]) return;
+    this.checked[this.selectedIndex] = !this.checked[this.selectedIndex];
+    this.updateList();
+  }
+
+  private updateList() {
+    this.listContainer.clear();
+    for (let i = 0; i < this.options.length; i++) {
+      const isSelected = i === this.selectedIndex;
+      if (this.disabled[i]) {
+        this.listContainer.addChild(new Text(this.theme.fg("muted", `  ${this.options[i]}`), 0, 0));
+        continue;
+      }
+      const marker = this.checked[i] ? "[x]" : "[ ]";
+      const line = `${isSelected ? "›" : " "} ${marker} ${this.options[i]}`;
+      this.listContainer.addChild(new Text(isSelected ? this.theme.fg("accent", line) : line, 0, 0));
+    }
+  }
+}
+
 export class FilterableExtensionSelectorComponent extends Container implements Focusable {
   private readonly searchInput: Input;
   private readonly listContainer: Container;

package/src/utils/index.ts

@@ -1,6 +1,7 @@
 export * from "./files";
 export * from "./errors";
 export * from "./common";
+export * from "./commands";
 export * from "./models";
 export * from "./providers";
 export * from "./ui";

package/src/utils/models.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, ProviderConfig } from "@/types";
 import { providerUtil } from "./providers";
 import { uiUtil } from "./ui";

package/src/utils/ui.ts

@@ -1,6 +1,6 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import { commonUtil } from "./common.js";
-import { FilterableExtensionSelectorComponent } from "./filterable-selector.js";
+import { FilterableExtensionSelectorComponent, FilterableMultiSelectComponent } from "./filterable-selector.js";
 
 function deduplicateLabels(labels: string[]): string[] {
   const seen = new Map<string, number>();
@@ -46,4 +46,38 @@ export const uiUtil = {
       (_tui, theme, _keybindings, done) => new FilterableExtensionSelectorComponent(title, options, done, theme),
     );
   },
+
+  /** Show a checkbox-style multi-select component. */
+  multiSelect: (
+    ui: ExtensionUIContext,
+    title: string,
+    options: string[],
+    initialChecked: boolean[] = [],
+    disabled: boolean[] = [],
+  ): Promise<string[] | undefined> => {
+    return ui.custom<string[] | undefined>(
+      (_tui, theme, _keybindings, done) =>
+        new FilterableMultiSelectComponent(title, options, initialChecked, done, theme, disabled),
+    );
+  },
+
+  /** Like multiSelect but skips items where the corresponding value is null (used for group headers). */
+  multiGroupedSelect: async <T>(
+    ui: ExtensionUIContext,
+    title: string,
+    labels: string[],
+    values: Array<T | null>,
+    initialChecked: boolean[] = [],
+  ): Promise<T[] | undefined> => {
+    const deduped = deduplicateLabels(labels);
+    const selected = await uiUtil.multiSelect(
+      ui,
+      title,
+      deduped,
+      initialChecked,
+      values.map((value) => value === null),
+    );
+    if (!selected) return undefined;
+    return selected.map((label) => values[deduped.indexOf(label)]).filter((value): value is T => value !== null);
+  },
 };