@hieplp/pi-account-switcher 0.2.1 → 0.2.3

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,129 @@
-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 { Container, fuzzyFilter, getKeybindings, Input, Spacer, Text, type Focusable, type Component } from "@earendil-works/pi-tui";
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
+
+/**
+ * Local implementation of DynamicBorder to avoid a hard runtime dependency
+ * on @earendil-works/pi-coding-agent (which is a peer dep not available in
+ * the pi agent's npm node_modules at extension load time).
+ */
+class DynamicBorder implements Component {
+  private color: (str: string) => string;
+  constructor(color: (str: string) => string = (str) => str) {
+    this.color = color;
+  }
+  invalidate() {}
+  render(width: number): string[] {
+    return [this.color("─".repeat(Math.max(1, width)))];
+  }
+}
 
 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";
@@ -10,8 +10,10 @@ export const modelUtil = {
     ctx: AccountSwitcherContext,
     account: AccountConfig,
     providers: ProviderConfig[],
+    resolvedProvider?: string,
   ): Promise<ProviderModel | undefined> => {
-    const accountProvider = normalizeProvider(account.piAuth?.provider ?? account.provider, providers);
+    const accountProvider =
+      resolvedProvider ?? normalizeProvider(account.piAuth?.provider ?? account.provider, providers);
     const candidates = getProviderModels(ctx, providers, accountProvider);
 
     if (candidates.length === 0) {

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);
+  },
 };