shariq-pi-extensions 0.2.24 → 0.2.25

package/extensions/factory-provider/API_KEYS.md

@@ -14,4 +14,4 @@ Alternatively choose Pi's top-level **Use an API key** authentication method to
 
 Use `/logout` to remove the active Factory authentication selection. The configured key file is intentionally not deleted by logout.
 
-Open `/factory` to inspect every account, its Standard/Core usage, and rotation status. For a smoke test, use the current `factory/kimi-k3` model.
+Open `/factory` to inspect every account, its Standard/Core usage, and rotation status. File-backed keys remain visible when disabled: select one and press `d` to enable/disable it, or press `x` and confirm to remove it permanently from `api-keys.json`. Environment-provided keys are read-only. For a smoke test, use the current `factory/kimi-k3` model.

package/extensions/factory-provider/README.md

@@ -59,7 +59,7 @@ There are no `-oauth` or `-api-key` model duplicates. The user-curated catalog e
 /factory
 ```
 
-`/factory` opens a full-width account dashboard combining provider status, authentication, Droid/model metadata, rotation cooldowns, and separate Standard and Droid Core usage for every credential. Percentages are explicitly labeled as **used**. Navigate with the arrow keys or `j`/`k`, press `r` to force-refresh every account, and press Escape to close.
+`/factory` opens a full-width account dashboard combining provider status, authentication, Droid/model metadata, rotation cooldowns, and separate Standard and Droid Core usage for every credential. Percentages are explicitly labeled as **used**. Navigate with the arrow keys or `j`/`k`, press `r` to force-refresh every account, use `d` to reversibly enable or disable a rotating file-backed key, use `x` plus confirmation to remove one permanently, and press Escape to close. Environment variables and single credentials managed by Pi auth remain read-only in this dashboard.
 
 Usage is never estimated from Pi token counts: Factory's API already applies model multipliers and cache-hit discounts. Cached records refresh at most every 15 minutes during normal sessions and after Factory runs; the manual command is the explicit force-refresh path.
 

package/extensions/factory-provider/factory/api-keys.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
 import { FACTORY_API_BASE_URL, FACTORY_STATE_DIR } from "./constants.ts";
@@ -25,6 +25,10 @@ export type FactoryApiKeyEntry = {
   disabled?: boolean;
 };
 
+type FactoryApiKeySourceEntry = FactoryApiKeyEntry & {
+  source: "environment" | "file";
+};
+
 type FactoryApiKeyConfig = {
   keys?: Array<string | Partial<FactoryApiKeyEntry>>;
 };
@@ -69,19 +73,19 @@ export function parseFactoryApiKeyFile(raw: string): { entries: FactoryApiKeyEnt
   }
 }
 
-export function loadFactoryApiKeys(): FactoryApiKeyEntry[] {
-  const entries: FactoryApiKeyEntry[] = [];
+function configuredFactoryApiKeys(): FactoryApiKeySourceEntry[] {
+  const entries: FactoryApiKeySourceEntry[] = [];
   const envKeys = (process.env.FACTORY_API_KEYS || process.env.FACTORY_API_KEY || "")
     .split(/[\n,]+/)
     .map((key) => key.trim())
     .filter(Boolean);
-  envKeys.forEach((key, index) => entries.push({ label: `env-${index + 1}`, key }));
+  envKeys.forEach((key, index) => entries.push({ label: `env-${index + 1}`, key, source: "environment" }));
 
   lastConfigurationWarning = undefined;
   if (existsSync(FACTORY_API_KEYS_PATH)) {
     try {
       const parsed = parseFactoryApiKeyFile(readFileSync(FACTORY_API_KEYS_PATH, "utf8"));
-      entries.push(...parsed.entries);
+      entries.push(...parsed.entries.map((entry) => ({ ...entry, source: "file" as const })));
       lastConfigurationWarning = parsed.warning;
     } catch {
       lastConfigurationWarning = "Factory rotating-key configuration could not be read.";
@@ -90,13 +94,63 @@ export function loadFactoryApiKeys(): FactoryApiKeyEntry[] {
 
   const seen = new Set<string>();
   return entries.filter((entry) => {
-    if (entry.disabled) return false;
     if (seen.has(entry.key)) return false;
     seen.add(entry.key);
     return true;
   });
 }
 
+export function loadFactoryApiKeys(): FactoryApiKeyEntry[] {
+  return configuredFactoryApiKeys().filter((entry) => !entry.disabled);
+}
+
+function editableFactoryApiKeyEntries(): FactoryApiKeyEntry[] {
+  if (!existsSync(FACTORY_API_KEYS_PATH)) return [];
+  const parsed = parseFactoryApiKeyFile(readFileSync(FACTORY_API_KEYS_PATH, "utf8"));
+  if (parsed.warning) throw new Error(parsed.warning);
+  return parsed.entries;
+}
+
+function saveFactoryApiKeyEntries(entries: FactoryApiKeyEntry[]) {
+  mkdirSync(FACTORY_STATE_DIR, { recursive: true, mode: 0o700 });
+  chmodSync(FACTORY_STATE_DIR, 0o700);
+  const temporary = `${FACTORY_API_KEYS_PATH}.${process.pid}.tmp`;
+  writeFileSync(temporary, `${JSON.stringify({ keys: entries }, null, 2)}\n`, { mode: 0o600 });
+  renameSync(temporary, FACTORY_API_KEYS_PATH);
+  chmodSync(FACTORY_API_KEYS_PATH, 0o600);
+}
+
+export function updateFactoryApiKeyEntries(
+  entries: FactoryApiKeyEntry[],
+  id: string,
+  action: { kind: "enabled"; enabled: boolean } | { kind: "remove" },
+) {
+  let changed = false;
+  const next = entries.flatMap((entry): FactoryApiKeyEntry[] => {
+    if (keyId(entry) !== id) return [entry];
+    changed = true;
+    if (action.kind === "remove") return [];
+    return [{ ...entry, disabled: !action.enabled }];
+  });
+  return { entries: next, changed };
+}
+
+export function setFactoryApiKeyEnabled(id: string, enabled: boolean) {
+  const result = updateFactoryApiKeyEntries(editableFactoryApiKeyEntries(), id, { kind: "enabled", enabled });
+  if (!result.changed) return false;
+  saveFactoryApiKeyEntries(result.entries);
+  return true;
+}
+
+export function removeFactoryApiKey(id: string) {
+  const result = updateFactoryApiKeyEntries(editableFactoryApiKeyEntries(), id, { kind: "remove" });
+  if (!result.changed) return false;
+  saveFactoryApiKeyEntries(result.entries);
+  state.delete(id);
+  organizationIdCache.delete(id);
+  return true;
+}
+
 export function sortFactoryApiKeysByLastUsed(
   entries: FactoryApiKeyEntry[],
   lastUsed = (entry: FactoryApiKeyEntry) => state.get(keyId(entry))?.lastUsedAt,
@@ -395,7 +449,7 @@ export function streamSimpleUnifiedFactoryResponses(model: any, context: any, op
 }
 
 export function factoryApiKeyStatus() {
-  const keys = loadFactoryApiKeys();
+  const keys = configuredFactoryApiKeys();
   const now = Date.now();
   return {
     configured: keys.length,
@@ -408,6 +462,8 @@ export function factoryApiKeyStatus() {
         id: keyId(entry),
         label: entry.label,
         key: maskKey(entry.key),
+        disabled: Boolean(entry.disabled),
+        editable: entry.source === "file",
         cooldownSeconds: runtime?.cooldownUntil && runtime.cooldownUntil > now ? Math.ceil((runtime.cooldownUntil - now) / 1000) : 0,
         lastError: runtime?.lastError ? runtime.lastError.slice(0, 200) : undefined,
         lastUsedAt: runtime?.lastUsedAt ? new Date(runtime.lastUsedAt).toISOString() : undefined,

package/extensions/factory-provider/factory/dashboard.ts

@@ -26,6 +26,8 @@ import { factoryWarmTheme } from "./warm-theme.ts";
 export interface FactoryDashboardAccount {
   id: string;
   label: string;
+  disabled?: boolean;
+  editable?: boolean;
   record?: FactoryLimitRecord;
   cooldownSeconds?: number;
   lastUsedAt?: string;
@@ -96,6 +98,7 @@ function compactPool(
 }
 
 function accountState(account: FactoryDashboardAccount) {
+  if (account.disabled) return "disabled";
   if (account.cooldownSeconds && account.cooldownSeconds > 0) return "cooldown";
   if (account.record?.error) return "refresh error";
   const observedAt = account.record?.fetchedAt ?? Date.now();
@@ -122,6 +125,8 @@ export class FactoryDashboard implements Component {
   private readonly keys: KeybindingsManager;
   private snapshot: FactoryDashboardSnapshot;
   private readonly refreshData: (force: boolean) => Promise<FactoryDashboardSnapshot>;
+  private readonly toggleAccount: (id: string, enabled: boolean) => Promise<FactoryDashboardSnapshot>;
+  private readonly removeAccount: (id: string, label: string) => Promise<FactoryDashboardSnapshot>;
   private readonly done: () => void;
 
   constructor(
@@ -130,6 +135,8 @@ export class FactoryDashboard implements Component {
     keys: KeybindingsManager,
     snapshot: FactoryDashboardSnapshot,
     refreshData: (force: boolean) => Promise<FactoryDashboardSnapshot>,
+    toggleAccount: (id: string, enabled: boolean) => Promise<FactoryDashboardSnapshot>,
+    removeAccount: (id: string, label: string) => Promise<FactoryDashboardSnapshot>,
     done: () => void,
   ) {
     this.tui = tui;
@@ -137,6 +144,8 @@ export class FactoryDashboard implements Component {
     this.keys = keys;
     this.snapshot = snapshot;
     this.refreshData = refreshData;
+    this.toggleAccount = toggleAccount;
+    this.removeAccount = removeAccount;
     this.done = done;
   }
 
@@ -145,17 +154,7 @@ export class FactoryDashboard implements Component {
     this.refreshing = true;
     this.tui.requestRender();
     void this.refreshData(force)
-      .then((snapshot) => {
-        if (this.closed) return;
-        const selectedId = this.snapshot.accounts[this.selected]?.id;
-        this.snapshot = snapshot;
-        const nextIndex = selectedId
-          ? snapshot.accounts.findIndex((account) => account.id === selectedId)
-          : -1;
-        this.selected = nextIndex >= 0
-          ? nextIndex
-          : Math.min(this.selected, Math.max(0, snapshot.accounts.length - 1));
-      })
+      .then((snapshot) => this.replaceSnapshot(snapshot))
       .catch((error) => {
         if (this.closed) return;
         this.snapshot = {
@@ -170,6 +169,18 @@ export class FactoryDashboard implements Component {
       });
   }
 
+  private replaceSnapshot(snapshot: FactoryDashboardSnapshot) {
+    if (this.closed) return;
+    const selectedId = this.snapshot.accounts[this.selected]?.id;
+    this.snapshot = snapshot;
+    const nextIndex = selectedId
+      ? snapshot.accounts.findIndex((account) => account.id === selectedId)
+      : -1;
+    this.selected = nextIndex >= 0
+      ? nextIndex
+      : Math.min(this.selected, Math.max(0, snapshot.accounts.length - 1));
+  }
+
   dispose() {
     this.closed = true;
   }
@@ -191,6 +202,23 @@ export class FactoryDashboard implements Component {
       if (accounts.length) this.selected = (this.selected + 1) % accounts.length;
     } else if (data === "r") {
       this.startRefresh(true);
+    } else if ((data === "d" || data === "x") && accounts[this.selected]?.editable && !this.refreshing) {
+      const account = accounts[this.selected]!;
+      this.refreshing = true;
+      const action = data === "x"
+        ? this.removeAccount(account.id, account.label)
+        : this.toggleAccount(account.id, account.disabled === true);
+      void action
+        .then((snapshot) => this.replaceSnapshot(snapshot))
+        .catch((error) => {
+          if (!this.closed) this.snapshot = { ...this.snapshot, warning: error instanceof Error ? error.message : String(error) };
+        })
+        .finally(() => {
+          if (!this.closed) {
+            this.refreshing = false;
+            this.tui.requestRender();
+          }
+        });
     }
     this.tui.requestRender();
   }
@@ -242,7 +270,7 @@ export class FactoryDashboard implements Component {
     lines.push(frameBottom(this.theme, width));
     lines.push(
       truncateToWidth(
-        `${this.theme.fg("accent", "  ↑↓ / j k")} ${this.theme.fg("dim", "select")}  ${this.theme.fg("accent", "r")} ${this.theme.fg("dim", "refresh all")}  ${this.theme.fg("accent", "esc")} ${this.theme.fg("dim", "close")}`,
+        `${this.theme.fg("accent", "  ↑↓ / j k")} ${this.theme.fg("dim", "select")}  ${this.theme.fg("accent", "r")} ${this.theme.fg("dim", "refresh all")}  ${this.theme.fg("accent", "d")} ${this.theme.fg("dim", "enable/disable")}  ${this.theme.fg("accent", "x")} ${this.theme.fg("dim", "remove")}  ${this.theme.fg("accent", "esc")} ${this.theme.fg("dim", "close")}`,
         width,
         "",
       ),
@@ -341,6 +369,8 @@ export async function openFactoryDashboard(
   ctx: ExtensionContext,
   initial: FactoryDashboardSnapshot,
   refresh: (force: boolean) => Promise<FactoryDashboardSnapshot>,
+  toggle: (id: string, enabled: boolean) => Promise<FactoryDashboardSnapshot>,
+  remove: (id: string, label: string) => Promise<FactoryDashboardSnapshot>,
 ) {
   await ctx.ui.custom<void>(
     (tui, theme, keys, done) => {
@@ -350,6 +380,8 @@ export async function openFactoryDashboard(
         keys,
         initial,
         refresh,
+        toggle,
+        remove,
         () => done(undefined),
       );
       queueMicrotask(() => dashboard.startRefresh(false));

package/extensions/factory-provider/index.ts

@@ -11,6 +11,8 @@ import {
   FACTORY_API_KEY_FILE_SENTINEL,
   factoryApiKeyStatus,
   loadFactoryApiKeys,
+  removeFactoryApiKey,
+  setFactoryApiKeyEnabled,
   streamSimpleUnifiedFactoryResponses,
 } from "./factory/api-keys.ts";
 import {
@@ -88,21 +90,35 @@ export default async function factoryExtension(pi: ExtensionAPI) {
     ctx: ExtensionContext,
   ): Promise<FactoryDashboardSnapshot> => {
     const credentials = await limitCredentials(ctx);
+    const resolved = await ctx.modelRegistry.getProviderAuth(PROVIDER_ID);
+    const fileBacked = resolved?.auth.apiKey?.trim() === FACTORY_API_KEY_FILE_SENTINEL;
     const auth = ctx.modelRegistry.getProviderAuthStatus(PROVIDER_ID);
     const apiKeys = factoryApiKeyStatus();
     const cache = loadFactoryLimitCache();
     const runtimeById = new Map(apiKeys.keys.map((key) => [key.id, key]));
-    const accounts = credentials.map((credential) => {
-      const id = factoryCredentialId(credential.secret);
-      const runtime = runtimeById.get(id);
-      return {
-        id,
-        label: credential.label,
-        record: cache.records.find((record) => record.id === id),
-        cooldownSeconds: runtime?.cooldownSeconds,
-        lastUsedAt: runtime?.lastUsedAt,
-      };
-    });
+    const accounts = fileBacked
+      ? apiKeys.keys.map((key) => ({
+          id: key.id,
+          label: key.label,
+          disabled: key.disabled,
+          editable: key.editable,
+          record: cache.records.find((record) => record.id === key.id),
+          cooldownSeconds: key.cooldownSeconds,
+          lastUsedAt: key.lastUsedAt,
+        }))
+      : credentials.map((credential) => {
+          const id = factoryCredentialId(credential.secret);
+          const runtime = runtimeById.get(id);
+          return {
+            id,
+            label: credential.label,
+            disabled: false,
+            editable: false,
+            record: cache.records.find((record) => record.id === id),
+            cooldownSeconds: runtime?.cooldownSeconds,
+            lastUsedAt: runtime?.lastUsedAt,
+          };
+        });
     return {
       version: clientVersion,
       modelCount: models.length,
@@ -110,7 +126,7 @@ export default async function factoryExtension(pi: ExtensionAPI) {
         ? auth.label || auth.source || "configured"
         : "not configured",
       configured: accounts.length,
-      active: accounts.filter((account) => !account.cooldownSeconds).length,
+      active: accounts.filter((account) => !account.disabled && !account.cooldownSeconds).length,
       warning: apiKeys.warning,
       accounts,
     };
@@ -195,10 +211,25 @@ export default async function factoryExtension(pi: ExtensionAPI) {
     description: "Open Factory account, rotation, and usage dashboard",
     handler: async (_args, ctx) => {
       const initial = await dashboardSnapshot(ctx);
-      await openFactoryDashboard(ctx, initial, async (force) => {
-        await refreshLimits(ctx, force);
-        return dashboardSnapshot(ctx);
-      });
+      await openFactoryDashboard(
+        ctx,
+        initial,
+        async (force) => {
+          await refreshLimits(ctx, force);
+          return dashboardSnapshot(ctx);
+        },
+        async (id, enabled) => {
+          if (!setFactoryApiKeyEnabled(id, enabled)) throw new Error("This Factory credential is not editable from the rotating-key file.");
+          if (enabled) await refreshLimits(ctx, true);
+          return dashboardSnapshot(ctx);
+        },
+        async (id, label) => {
+          const confirmed = await ctx.ui.confirm("Remove Factory account?", `Permanently remove ${label} from the rotating-key file?`);
+          if (!confirmed) return dashboardSnapshot(ctx);
+          if (!removeFactoryApiKey(id)) throw new Error("This Factory credential is not editable from the rotating-key file.");
+          return dashboardSnapshot(ctx);
+        },
+      );
     },
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shariq-pi-extensions",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "Cross-platform extension suite for the Pi coding agent.",
   "license": "MIT",
   "author": "Shariq Riaz",