@raingor/pi-web-switch 0.3.1 → 0.3.3

package/src/store/config-store.ts

@@ -37,7 +37,7 @@ function getCustomProviders(modelsJson: PiModelsJson | null): Provider[] {
   if (!modelsJson) return [];
   return Object.entries(modelsJson.providers).map(([id, cfg]) => ({
     id,
-    name: id.charAt(0).toUpperCase() + id.slice(1),
+    name: cfg.name ?? (id.charAt(0).toUpperCase() + id.slice(1)),
     type: "custom" as const,
     baseUrl: cfg.baseUrl,
     api: cfg.api,
@@ -51,14 +51,37 @@ function getCustomProviders(modelsJson: PiModelsJson | null): Provider[] {
   }));
 }
 
-function mergeProviders(auth: PiAuth, customModels: PiModelsJson | null): Provider[] {
-  const builtins = BUILTIN_PROVIDERS.map((p) => ({
-    ...p,
-    hasAuth: p.hasAuth || !!auth[p.id],
-    authMethod: auth[p.id] ? "file" : p.authMethod,
-  }));
+function mergeProviders(
+  builtinProviders: Provider[],
+  auth: PiAuth,
+  customModels: PiModelsJson | null
+): Provider[] {
   const customs = getCustomProviders(customModels);
-  return [...builtins, ...customs];
+  // models.json entries whose id matches a builtin provider are overrides
+  // (e.g. models imported onto a builtin) — merge them into the builtin
+  // instead of listing a duplicate custom provider.
+  const builtinIds = new Set(builtinProviders.map((p) => p.id));
+  const overrides = new Map(customs.filter((c) => builtinIds.has(c.id)).map((c) => [c.id, c]));
+  const builtins = builtinProviders.map((p) => {
+    const override = overrides.get(p.id);
+    let models = p.models;
+    if (override) {
+      const byId = new Map(p.models.map((m) => [m.id, m]));
+      for (const m of override.models) byId.set(m.id, m);
+      models = [...byId.values()];
+    }
+    return {
+      ...p,
+      // A user-provided display name in models.json wins over the catalog name.
+      name: customModels?.providers?.[p.id]?.name ?? p.name,
+      // hasAuth = a key is actually saved (auth.json or models.json override) —
+      // the static builtin flag only means the provider supports auth.
+      hasAuth: !!auth[p.id] || !!override?.apiKey,
+      authMethod: auth[p.id] ? "file" : p.authMethod,
+      models,
+    };
+  });
+  return [...builtins, ...customs.filter((c) => !builtinIds.has(c.id))];
 }
 
 // ─── State Types ─────────────────────────────────────────
@@ -99,6 +122,9 @@ interface ConfigState {
   auth: PiAuth | null;
   modelsJson: PiModelsJson | null;
 
+  // Builtin provider catalog (live from the pi install, static fallback)
+  builtinProviders: Provider[];
+
   // Derived
   allProviders: Provider[];
   allModels: (Model & { providerId: string; providerName: string })[];
@@ -116,7 +142,7 @@ interface ConfigState {
   refreshUsage: () => Promise<void>;
 
   // Settings
-  updateSettings: (settings: Partial<PiSettings>) => Promise<void>;
+  updateSettings: (settings: Partial<PiSettings>) => Promise<boolean>;
   setDefaultProvider: (provider: string) => Promise<void>;
   setDefaultModel: (model: string) => Promise<void>;
   setTheme: (theme: PiSettings["theme"]) => Promise<void>;
@@ -126,8 +152,8 @@ interface ConfigState {
   removePackage: (pkg: string) => Promise<void>;
 
   // Auth
-  setProviderAuth: (providerId: string, key: string) => Promise<void>;
-  removeProviderAuth: (providerId: string) => Promise<void>;
+  setProviderAuth: (providerId: string, key: string) => Promise<boolean>;
+  removeProviderAuth: (providerId: string) => Promise<boolean>;
 
   // Model CRUD (for custom providers)
   toggleModel: (providerId: string, modelId: string) => void;
@@ -136,9 +162,9 @@ interface ConfigState {
   removeModel: (providerId: string, modelId: string) => void;
 
   // Custom provider CRUD
-  addCustomProvider: (id: string, cfg: CustomProviderConfig) => Promise<void>;
-  updateCustomProvider: (id: string, cfg: Partial<CustomProviderConfig>) => Promise<void>;
-  removeCustomProvider: (id: string) => Promise<void>;
+  addCustomProvider: (id: string, cfg: CustomProviderConfig) => Promise<boolean>;
+  updateCustomProvider: (id: string, cfg: Partial<CustomProviderConfig>) => Promise<boolean>;
+  removeCustomProvider: (id: string) => Promise<boolean>;
 
   // Import/Export (to localStorage for backup, writes back to pi files)
   importConfig: (config: PiConfig) => Promise<void>;
@@ -149,6 +175,7 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
   settings: null,
   auth: null,
   modelsJson: null,
+  builtinProviders: BUILTIN_PROVIDERS,
   allProviders: [],
   allModels: [],
   usage: null,
@@ -161,14 +188,17 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
   init: async () => {
     set({ loading: true, error: null });
     try {
-      const [settings, auth, modelsJson, usage] = await Promise.all([
+      const [settings, auth, modelsJson, usage, builtinsRes] = await Promise.all([
         apiGet<PiSettings>("/settings"),
         apiGet<PiAuth>("/auth"),
         apiGet<PiModelsJson>("/models"),
         apiGet<UsageData>("/usage"),
+        apiGet<Provider[]>("/builtin-providers").catch(() => null),
       ]);
 
-      const allProviders = mergeProviders(auth ?? {}, modelsJson);
+      const builtinProviders =
+        builtinsRes && builtinsRes.length > 0 ? builtinsRes : BUILTIN_PROVIDERS;
+      const allProviders = mergeProviders(builtinProviders, auth ?? {}, modelsJson);
       const allModels = allProviders.flatMap((p) =>
         p.models.map((m) => ({
           ...m,
@@ -181,6 +211,7 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
         settings,
         auth,
         modelsJson,
+        builtinProviders,
         allProviders,
         allModels,
         usage,
@@ -211,10 +242,11 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
 
   updateSettings: async (partial) => {
     const { settings } = get();
-    if (!settings) return;
+    if (!settings) return false;
     const updated = { ...settings, ...partial };
     const ok = await apiPost("/settings", updated);
     if (ok) set({ settings: updated });
+    return ok;
   },
 
   setDefaultProvider: async (provider) => {
@@ -270,21 +302,23 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     if (ok) {
       set({ auth: updated });
       // Recompute providers with updated auth state
-      const { modelsJson } = get();
-      set({ allProviders: mergeProviders(updated, modelsJson) });
+      const { modelsJson, builtinProviders } = get();
+      set({ allProviders: mergeProviders(builtinProviders, updated, modelsJson) });
     }
+    return ok;
   },
 
   removeProviderAuth: async (providerId) => {
     const { auth } = get();
-    if (!auth) return;
+    if (!auth) return false;
     const { [providerId]: _, ...rest } = auth;
     const ok = await apiPost("/auth", rest);
     if (ok) {
       set({ auth: rest });
-      const { modelsJson } = get();
-      set({ allProviders: mergeProviders(rest, modelsJson) });
+      const { modelsJson, builtinProviders } = get();
+      set({ allProviders: mergeProviders(builtinProviders, rest, modelsJson) });
     }
+    return ok;
   },
 
   // ─── Model CRUD (client-side only, stored in modelsJson) ─
@@ -306,8 +340,8 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     // Persist
     apiPost("/models", updated);
     // Recompute providers
-    const { auth } = get();
-    set({ allProviders: mergeProviders(auth ?? {}, updated) });
+    const { auth, builtinProviders } = get();
+    set({ allProviders: mergeProviders(builtinProviders, auth ?? {}, updated) });
   },
 
   updateModel: (providerId, modelId, updates) => {
@@ -336,8 +370,8 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     const updated = { providers: newProviders };
     set({ modelsJson: updated });
     apiPost("/models", updated);
-    const { auth } = get();
-    set({ allProviders: mergeProviders(auth ?? {}, updated) });
+    const { auth, builtinProviders } = get();
+    set({ allProviders: mergeProviders(builtinProviders, auth ?? {}, updated) });
   },
 
   addModel: (providerId, model) => {
@@ -354,8 +388,8 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     const updated = { providers: newProviders };
     set({ modelsJson: updated });
     apiPost("/models", updated);
-    const { auth } = get();
-    const newAllProviders = mergeProviders(auth ?? {}, updated);
+    const { auth, builtinProviders } = get();
+    const newAllProviders = mergeProviders(builtinProviders, auth ?? {}, updated);
     const newAllModels = newAllProviders.flatMap((p) =>
       p.models.map((m) => ({ ...m, providerId: p.id, providerName: p.name }))
     );
@@ -375,30 +409,31 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     const updated = { providers: newProviders };
     set({ modelsJson: updated });
     apiPost("/models", updated);
-    const { auth } = get();
-    set({ allProviders: mergeProviders(auth ?? {}, updated) });
+    const { auth, builtinProviders } = get();
+    set({ allProviders: mergeProviders(builtinProviders, auth ?? {}, updated) });
   },
 
   // ─── Custom Provider CRUD ──────────────────────────────
 
   addCustomProvider: async (id, cfg) => {
     const { modelsJson } = get();
-    if (!modelsJson) return;
+    if (!modelsJson) return false;
     const newProviders = { ...modelsJson.providers, [id]: cfg };
     const updated = { providers: newProviders };
     const ok = await apiPost("/models", updated);
     if (ok) {
       set({ modelsJson: updated });
-      const { auth } = get();
-      set({ allProviders: mergeProviders(auth ?? {}, updated) });
+      const { auth, builtinProviders } = get();
+      set({ allProviders: mergeProviders(builtinProviders, auth ?? {}, updated) });
     }
+    return ok;
   },
 
   updateCustomProvider: async (id, cfg) => {
     const { modelsJson } = get();
-    if (!modelsJson) return;
+    if (!modelsJson) return false;
     const existing = modelsJson.providers[id];
-    if (!existing) return;
+    if (!existing) return false;
     const newProviders = {
       ...modelsJson.providers,
       [id]: { ...existing, ...cfg },
@@ -407,26 +442,28 @@ export const useConfigStore = create<ConfigState>((set, get) => ({
     const ok = await apiPost("/models", updated);
     if (ok) {
       set({ modelsJson: updated });
-      const { auth } = get();
-      set({ allProviders: mergeProviders(auth ?? {}, updated) });
+      const { auth, builtinProviders } = get();
+      set({ allProviders: mergeProviders(builtinProviders, auth ?? {}, updated) });
     }
+    return ok;
   },
 
   removeCustomProvider: async (id) => {
     const { modelsJson } = get();
-    if (!modelsJson) return;
+    if (!modelsJson) return false;
     const { [id]: _, ...rest } = modelsJson.providers;
     const updated = { providers: rest };
     const ok = await apiPost("/models", updated);
     if (ok) {
       set({ modelsJson: updated });
-      const { auth } = get();
-      const newAllProviders = mergeProviders(auth ?? {}, updated);
+      const { auth, builtinProviders } = get();
+      const newAllProviders = mergeProviders(builtinProviders, auth ?? {}, updated);
       const newAllModels = newAllProviders.flatMap((p) =>
         p.models.map((m) => ({ ...m, providerId: p.id, providerName: p.name }))
       );
       set({ allProviders: newAllProviders, allModels: newAllModels });
     }
+    return ok;
   },
 
   // ─── Import/Export ─────────────────────────────────────

package/src/types/index.ts

@@ -116,6 +116,7 @@ export interface PiAuth {
 }
 
 export interface CustomProviderConfig {
+  name?: string;
   baseUrl?: string;
   api?: ApiType;
   apiKey?: string;
@@ -136,6 +137,20 @@ export interface PiConfig {
   modelsJson: PiModelsJson | null;
 }
 
+// pi core / extension update check (server queries the npm registry)
+export interface UpdateItem {
+  name: string;
+  installed: string;
+  latest: string | null; // null → registry lookup failed
+  hasUpdate: boolean;
+}
+
+export interface UpdateCheckResult {
+  pi: UpdateItem | null; // null → pi version unknown
+  extensions: UpdateItem[];
+  checkedAt: number;
+}
+
 // ─── Usage / Dashboard Types ──────────────────────────────
 
 export interface UsageRecord {
@@ -178,6 +193,57 @@ export interface ProviderUsageSummary {
   modelCount: number;
 }
 
+// ─── Subagents ───────────────────────────────────────────
+
+export interface AgentDef {
+  name: string;
+  fileName: string;
+  filePath: string;
+  package: string;
+  description: string;
+  model?: string;
+  tools?: string[];
+  thinking?: string;
+  systemPromptMode?: string;
+  inheritProjectContext?: boolean;
+  inheritSkills?: boolean;
+  input?: string[];
+  body: string;
+}
+
+export interface ChainStep {
+  agent: string;
+  phase?: string;
+  label?: string;
+  output?: string;
+  as?: string;
+  task?: string;
+}
+
+export interface ChainDef {
+  name: string;
+  fileName: string;
+  filePath: string;
+  description: string;
+  steps: ChainStep[];
+  body: string;
+}
+
+export interface RunRecord {
+  agent: string;
+  ts: number;
+  status: string;
+  duration?: number;
+  exit?: number;
+  taskHash?: string;
+}
+
+export interface SubagentsData {
+  agents: AgentDef[];
+  chains: ChainDef[];
+  runHistory: RunRecord[];
+}
+
 // ─── Config Import/Export ─────────────────────────────────
 
 export interface ExportPayload {

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/app.tsx","./src/main.tsx","./src/vite-env.d.ts","./src/components/dashboard/dashboardpage.tsx","./src/components/layout/appshell.tsx","./src/components/layout/sidebar.tsx","./src/components/providers/providersmodelspage.tsx","./src/components/sessions/memorypage.tsx","./src/components/sessions/sessionspage.tsx","./src/components/settings/settingspage.tsx","./src/components/subagents/subagentspage.tsx","./src/components/ui/badge.tsx","./src/components/ui/emptystate.tsx","./src/components/ui/modal.tsx","./src/components/ui/statcard.tsx","./src/data/builtin-providers.ts","./src/data/mock-config.ts","./src/data/mock-usage.ts","./src/lib/config.ts","./src/lib/currency.ts","./src/lib/i18n.tsx","./src/lib/utils.ts","./src/lib/translations/en.ts","./src/lib/translations/index.ts","./src/lib/translations/ja.ts","./src/lib/translations/zh-cn.ts","./src/lib/translations/zh-tw.ts","./src/store/config-store.ts","./src/types/index.ts"],"version":"5.8.3"}

package/vite.config.ts

@@ -63,7 +63,10 @@ function piApiPlugin(): Plugin {
         },
         "GET /api/pi/builtin-providers"(_, res) {
           res.setHeader("Content-Type", "application/json");
-          res.end(JSON.stringify(builtins.getBuiltinProviders()));
+          // Prefer the live catalog from the local pi install; fall back to
+          // the hand-written static list when pi isn't found on this machine.
+          const catalog = pi.readBuiltinCatalog();
+          res.end(JSON.stringify(catalog ?? builtins.getBuiltinProviders()));
         },
         "GET /api/pi/usage"(_, res) {
           const records = pi.readAllUsage();
@@ -87,6 +90,161 @@ function piApiPlugin(): Plugin {
           res.setHeader("Content-Type", "application/json");
           res.end(JSON.stringify(memory));
         },
+        "GET /api/pi/subagents"(_, res) {
+          const data = pi.readSubagents();
+          res.setHeader("Content-Type", "application/json");
+          res.end(JSON.stringify(data));
+        },
+        "POST /api/pi/memory/delete-entry"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { filename, text } = JSON.parse(body) as { filename: string; text: string };
+              const ok = pi.deleteMemoryEntry(filename, text);
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: ok }));
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: false, error: "Invalid request body" }));
+            }
+          });
+        },
+        "GET /api/pi/trash"(_, res) {
+          res.setHeader("Content-Type", "application/json");
+          res.end(JSON.stringify(pi.listTrash()));
+        },
+        "POST /api/pi/session/trash"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { path: p } = JSON.parse(body) as { path: string };
+              const ok = pi.trashSessionFile(p);
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: ok }));
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: false, error: "Invalid request body" }));
+            }
+          });
+        },
+        "POST /api/pi/session/restore"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { trashPath } = JSON.parse(body) as { trashPath: string };
+              const ok = pi.restoreFromTrash(trashPath);
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: ok }));
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: false, error: "Invalid request body" }));
+            }
+          });
+        },
+        "GET /api/pi/session-preview"(req, res) {
+          const parsedUrl = new URL(req.url!, "http://localhost");
+          const p = parsedUrl.searchParams.get("path") || "";
+          const preview = pi.readSessionPreview(decodeURIComponent(p));
+          if (!preview) {
+            res.statusCode = 404;
+            res.setHeader("Content-Type", "application/json");
+            return res.end(JSON.stringify({ error: "Session not found" }));
+          }
+          res.setHeader("Content-Type", "application/json");
+          res.end(JSON.stringify(preview));
+        },
+        "GET /api/pi/check-updates"(_, res) {
+          pi.checkUpdates()
+            .then((result) => {
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify(result));
+            })
+            .catch(() => {
+              res.statusCode = 500;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ error: "Update check failed" }));
+            });
+        },
+        "POST /api/pi/apply-updates"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { names } = JSON.parse(body) as { names: string[] };
+              const results = pi.applyExtensionUpdates(Array.isArray(names) ? names : []);
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ results }));
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ error: "Invalid request body" }));
+            }
+          });
+        },
+        "POST /api/pi/provider-models"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { baseUrl, apiKey, providerId } = JSON.parse(body) as {
+                baseUrl: string;
+                apiKey?: string;
+                providerId?: string;
+              };
+              if (!baseUrl) throw new Error("missing baseUrl");
+              pi.fetchProviderModels(baseUrl, apiKey, providerId).then((result) => {
+                res.setHeader("Content-Type", "application/json");
+                res.end(JSON.stringify(result));
+              });
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ models: [], error: "Invalid request body" }));
+            }
+          });
+        },
+        "POST /api/pi/model-test"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { baseUrl, modelId, apiKey, apiType } = JSON.parse(body) as { baseUrl: string; modelId: string; apiKey?: string; apiType?: string };
+              if (!baseUrl || !modelId) throw new Error("missing baseUrl or modelId");
+              pi.testModel(baseUrl, modelId, apiKey, apiType ?? "openai-completions").then((result) => {
+                res.setHeader("Content-Type", "application/json");
+                res.end(JSON.stringify(result));
+              });
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: false, message: "Invalid request body" }));
+            }
+          });
+        },
+        "POST /api/pi/provider-test"(req, res) {
+          let body = "";
+          req.on("data", (chunk: string) => (body += chunk));
+          req.on("end", () => {
+            try {
+              const { baseUrl, apiKey } = JSON.parse(body) as { baseUrl: string; apiKey?: string };
+              if (!baseUrl) throw new Error("missing baseUrl");
+              pi.testProviderConnection(baseUrl, apiKey).then((result) => {
+                res.setHeader("Content-Type", "application/json");
+                res.end(JSON.stringify(result));
+              });
+            } catch {
+              res.statusCode = 400;
+              res.setHeader("Content-Type", "application/json");
+              res.end(JSON.stringify({ success: false, message: "Invalid request body" }));
+            }
+          });
+        },
       };
 
       // Middleware: match API routes
@@ -99,8 +257,8 @@ function piApiPlugin(): Plugin {
         // Strip query string
         const pathOnly = url.split("?")[0];
 
-        // Handle DELETE /api/pi/session?path=...
-        if (method === "DELETE" && pathOnly === "/api/pi/session") {
+        // Handle DELETE /api/pi/session?path=... (move to trash) and /api/pi/trash?path=... (permanent)
+        if (method === "DELETE" && (pathOnly === "/api/pi/session" || pathOnly === "/api/pi/trash")) {
           const parsedUrl = new URL(url, "http://localhost");
           const filePath = parsedUrl.searchParams.get("path");
           if (!filePath) {
@@ -109,7 +267,9 @@ function piApiPlugin(): Plugin {
             return res.end(JSON.stringify({ success: false, error: "Missing path" }));
           }
           const decodedPath = decodeURIComponent(filePath);
-          const ok = pi.deleteSessionFile(decodedPath);
+          const ok = pathOnly === "/api/pi/session"
+            ? pi.trashSessionFile(decodedPath)
+            : pi.permanentlyDeleteTrash(decodedPath);
           res.setHeader("Content-Type", "application/json");
           return res.end(JSON.stringify({ success: ok }));
         }