@evandu/super-pi 0.1.14 → 0.1.15

package/dist/server/application/workspace-service.js

@@ -1,3 +1,4 @@
+import { assertModelAllowed } from "../model-filter.js";
 import { deleteConversationUploads } from "../upload.js";
 /**
  * Service managing workspaces: creation, rename, cascade deletion, and defaults configuration.
@@ -28,8 +29,9 @@ export class WorkspaceService {
      * Creates a new workspace.
      */
     async createWorkspace(name, path) {
-        await this.store.createWorkspace(name, path);
+        const created = await this.store.createWorkspace(name, path);
         this.broadcaster.broadcastState();
+        return created.id;
     }
     /**
      * Renames an existing workspace.
@@ -97,9 +99,15 @@ export class WorkspaceService {
                     const dirsLabel = Array.isArray(this.agentsDir) ? this.agentsDir.join(", ") : this.agentsDir;
                     throw new Error(`Agent ${JSON.stringify(settings.agentId)} 不存在或不是可用的 primary agent（目录：${dirsLabel}）`);
                 }
+                if (agent.model) {
+                    const catalog = await this.runtime.catalog();
+                    const model = catalog.models.find(item => item.provider === agent.model?.provider && item.modelId === agent.model?.modelId);
+                    assertModelAllowed(this.store.snapshot().modelFilterRules, workspace, model ?? { ...agent.model, label: agent.model.modelId });
+                }
                 agentToStore = agent.id;
             }
         }
+        assertModelAllowed(this.store.snapshot().modelFilterRules, workspace, selection ?? (await this.runtime.catalog()).defaultModel);
         await this.store.setWorkspaceDefaults(workspaceId, {
             model: selection,
             thinkingLevel: settings.thinkingLevel ?? undefined,

package/dist/server/command-handler.d.ts

@@ -18,5 +18,5 @@ export declare class CommandHandler {
     /**
      * Processes a client command.
      */
-    handleCommand(command: ClientCommand, sendToSocket?: SocketSender): Promise<void>;
+    handleCommand(command: ClientCommand, sendToSocket?: SocketSender): Promise<string | void>;
 }

package/dist/server/command-handler.js

@@ -18,10 +18,13 @@ export class CommandHandler {
      * Processes a client command.
      */
     async handleCommand(command, sendToSocket) {
-        if (command.type === "workspace.create") {
-            await this.workspaceService.createWorkspace(command.name, command.path);
+        if (command.type === "model.rules.set") {
+            await this.catalogService.setModelRules(command.rules);
             return;
         }
+        if (command.type === "workspace.create") {
+            return await this.workspaceService.createWorkspace(command.name, command.path);
+        }
         if (command.type === "workspace.rename") {
             await this.workspaceService.renameWorkspace(command.workspaceId, command.name);
             return;
@@ -39,12 +42,19 @@ export class CommandHandler {
             return;
         }
         if (command.type === "conversation.create") {
-            await this.conversationService.createConversation(command.workspaceId);
-            return;
+            return await this.conversationService.createConversation(command.workspaceId);
         }
         if (command.type === "conversation.select") {
-            if (sendToSocket)
-                sendToSocket({ type: "model.catalog", catalog: await this.conversationService.getConversationCatalog(command.conversationId), conversationId: command.conversationId });
+            if (sendToSocket) {
+                try {
+                    sendToSocket({ type: "model.catalog", catalog: await this.conversationService.getConversationCatalog(command.conversationId), conversationId: command.conversationId });
+                }
+                catch (error) {
+                    // Keep the permitted choices available so an existing invalid session can be corrected.
+                    sendToSocket({ type: "model.catalog", catalog: await this.catalogService.getCatalog(undefined, command.conversationId), conversationId: command.conversationId });
+                    throw error;
+                }
+            }
             else
                 await this.conversationService.selectConversation(command.conversationId);
             return;
@@ -143,9 +153,9 @@ export class CommandHandler {
         }
         if (command.type === "catalog.fetch") {
             if (sendToSocket)
-                sendToSocket({ type: "model.catalog", catalog: await this.catalogService.getCatalog() });
+                sendToSocket({ type: "model.catalog", conversationId: command.conversationId, catalog: await this.catalogService.getCatalog(undefined, command.conversationId) });
             else
-                await this.catalogService.broadcastCatalog();
+                await this.catalogService.broadcastCatalog(undefined, command.conversationId);
             return;
         }
         if (command.type === "agent.catalog.fetch") {

package/dist/server/index.js

@@ -1,3 +1,4 @@
+import { validateConversationModel } from "./model-filter.js";
 import { existsSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -60,6 +61,9 @@ const supervisor = new SubagentSupervisor(join(dataDir, "pi-sessions"), undefine
     dir: initialAgentDirs,
     promptDir: agentPromptDir,
 });
+const validateModel = (conversationId, selection) => validateConversationModel(store, runtime, conversationId, selection);
+runtime.setModelValidator?.(validateModel);
+supervisor.setModelValidator(validateModel);
 const subagents = new SubagentRunRecorder(supervisor, {
     store,
     broadcast: (event) => {

package/dist/server/model-filter.d.ts

@@ -0,0 +1,13 @@
+import type { AppState, ModelFilterRule, ModelSelection, Workspace } from "./types.js";
+export declare function applicableRules(rules: ModelFilterRule[] | undefined, workspace: Workspace): {
+    rule: ModelFilterRule;
+    modelRegex: RegExp;
+}[];
+export declare function assertModelAllowed(rules: ModelFilterRule[] | undefined, workspace: Workspace, model: ModelSelection | undefined): void;
+export declare function conversationWorkspace(state: AppState, conversationId: string): Workspace;
+/** Resolve Pi's actual global default when no model was selected; never guess a permitted replacement. */
+export declare function validateConversationModel(store: {
+    snapshot(): AppState;
+}, runtime: {
+    catalog(selection?: ModelSelection): Promise<import("./types.js").ModelCatalog>;
+}, conversationId: string, selection?: ModelSelection): Promise<void>;

package/dist/server/model-filter.js

@@ -0,0 +1,40 @@
+// Workspace names match case-insensitively. A model is allowed when either its label
+// or provider/modelId matches. All matching rules must allow it (intersection).
+// Invalid regexes are skipped with a diagnostic, never interpreted as deny-all.
+export function applicableRules(rules, workspace) {
+    return (rules ?? []).flatMap(rule => {
+        try {
+            const workspaceRegex = new RegExp(rule.workspacePattern, "i");
+            const modelRegex = new RegExp(rule.modelPattern, "i");
+            return workspaceRegex.test(workspace.name) ? [{ rule, modelRegex }] : [];
+        }
+        catch (error) {
+            console.warn(`模型过滤规则 ${rule.id} 无效，已跳过：${rule.workspacePattern} → ${rule.modelPattern}：${String(error)}`);
+            return [];
+        }
+    });
+}
+export function assertModelAllowed(rules, workspace, model) {
+    for (const { rule, modelRegex } of applicableRules(rules, workspace)) {
+        if (!model || (!modelRegex.test(model.label ?? "") && !modelRegex.test(`${model.provider}/${model.modelId}`))) {
+            throw new Error(`工作区「${workspace.name}」命中模型规则「${rule.label ?? rule.id}」：/${rule.workspacePattern}/i → /${rule.modelPattern}/i；当前模型「${model ? `${model.label} (${model.provider}/${model.modelId})` : "Pi 默认模型无法解析"}」不匹配允许的模型正则，拒绝使用。`);
+        }
+    }
+}
+export function conversationWorkspace(state, conversationId) {
+    const conversation = state.conversations.find(item => item.id === conversationId);
+    const workspace = state.workspaces.find(item => item.id === conversation?.workspaceId);
+    if (!workspace)
+        throw new Error("会话所属工作区不存在");
+    return workspace;
+}
+/** Resolve Pi's actual global default when no model was selected; never guess a permitted replacement. */
+export async function validateConversationModel(store, runtime, conversationId, selection) {
+    const state = store.snapshot();
+    const workspace = conversationWorkspace(state, conversationId);
+    if (!applicableRules(state.modelFilterRules, workspace).length)
+        return;
+    const catalog = await runtime.catalog();
+    const model = selection ? catalog.models.find(item => item.provider === selection.provider && item.modelId === selection.modelId) ?? selection : catalog.defaultModel;
+    assertModelAllowed(store.snapshot().modelFilterRules, conversationWorkspace(store.snapshot(), conversationId), model);
+}

package/dist/server/runtime.d.ts

@@ -201,6 +201,7 @@ export interface AgentRuntime {
      */
     fork?(request: ForkRequest): Promise<ForkOutcome>;
     /** Updates the active agent directory or directories to search. */
+    setModelValidator?(validator: (conversationId: string, model: ModelSelection | undefined) => Promise<void>): void;
     setAgentsDir?(dir: string | string[]): void;
 }
 /** Deterministic offline runtime used by tests and local UI development. */
@@ -625,6 +626,8 @@ export declare class PiRpcRuntime implements AgentRuntime {
      * spawning Pi so their prompt and tool restrictions cannot silently disappear.
      */
     agentFor(conversation: Pick<Conversation, "id" | "agentId">): Promise<AgentDefinition | undefined>;
+    private modelValidator?;
+    setModelValidator(validator: (conversationId: string, model: ModelSelection | undefined) => Promise<void>): void;
     setAgentsDir(dir: string | string[]): void;
     /**
      * The `--extension` argv for this turn, or `[]` when the task tool is not available.

package/dist/server/runtime.js

@@ -635,6 +635,8 @@ export class PiRpcRuntime {
         const dirLabel = Array.isArray(this.agents.dir) ? this.agents.dir.join(", ") : this.agents.dir;
         throw new Error(`Agent ${JSON.stringify(conversation.agentId)} 已失效或不是可用的 primary agent（目录：${dirLabel}）。请重新选择 Agent，或选择“跟随 Pi 默认”后重试。`);
     }
+    modelValidator;
+    setModelValidator(validator) { this.modelValidator = validator; }
     setAgentsDir(dir) {
         this.agents.dir = dir;
     }
@@ -710,6 +712,9 @@ export class PiRpcRuntime {
         // nothing to send after the process is already running. Fetched before the spawn so a definition
         // error fails the turn loudly instead of starting a Pi that silently ignores it.
         const agent = await this.agentFor(conversation);
+        if (agent?.model)
+            await this.modelValidator?.(conversation.id, { ...agent.model, label: agent.model.modelId });
+        await this.modelValidator?.(conversation.id, conversation.model);
         // Whether the `task` tool EXISTS is decided first, because that is what decides whether it belongs
         // on the allowlist. Naming a tool Pi has not registered is meaningless, and doing it anyway would
         // change the spawn line of a runtime that has no task tool - which is what
@@ -784,6 +789,13 @@ export class PiRpcRuntime {
                 if (response.success === false)
                     throw new Error(`Pi rejected ${command.type}: ${response.error ?? "no reason given"}`);
             }
+            // Resumed Pi sessions can carry a different model than the global default.
+            // Check the real get_state result as well, before any prompt reaches the model.
+            if (this.modelValidator) {
+                const actual = await channel.request({ id: "policy_state", type: "get_state" }, SESSION_COMMAND_TIMEOUT_MS);
+                const model = actual.data?.model;
+                await this.modelValidator(conversation.id, model?.provider && model.id ? { provider: model.provider, modelId: model.id, label: model.name ?? model.id } : undefined);
+            }
             const imagePayloads = this.options.uploadsDir && images?.length
                 ? await loadConversationImages(this.options.uploadsDir, conversation.id, images)
                 : undefined;
@@ -1405,9 +1417,8 @@ export class PiRpcRuntime {
                 source: "pi",
                 models: options,
                 levels: levelNames,
-                // Pi's own answer wins. The fallbacks only fire if get_state is missing the model, and they
-                // fall back to Pi's OWN ordering rather than to anything invented here.
-                defaultModel: pick(current) ?? pick(options[0]),
+                // Only get_state identifies Pi's default. Catalog order must never invent a default.
+                defaultModel: pick(current),
                 defaultThinkingLevel: text(state.data?.thinkingLevel) ?? levelNames[0],
                 fetchedAt: new Date().toISOString(),
             };

package/dist/server/store.d.ts

@@ -73,6 +73,7 @@ export declare class Store {
     private state;
     private constructor();
     static open(filePath: string): Promise<Store>;
+    setModelFilterRules(rules: import("./types.js").ModelFilterRule[]): Promise<void>;
     snapshot(): AppState;
     createWorkspace(name: string, path?: string): Promise<Workspace>;
     renameWorkspace(workspaceId: string, name: string): Promise<Workspace>;

package/dist/server/store.js

@@ -473,6 +473,19 @@ export class Store {
             return new Store(filePath, { workspaces: [{ id: "workspace_default", name: "Super Pi", path: process.cwd(), updatedAt: createdAt }], conversations: [], subagentRuns: [], queuedMessages: [], backgroundTasks: [] });
         }
     }
+    async setModelFilterRules(rules) {
+        if (!Array.isArray(rules) || rules.some(rule => !rule || typeof rule.id !== "string" || typeof rule.workspacePattern !== "string" || typeof rule.modelPattern !== "string" || (rule.label !== undefined && typeof rule.label !== "string")))
+            throw new Error("模型过滤规则格式不合法");
+        const previous = this.state.modelFilterRules;
+        this.state.modelFilterRules = structuredClone(rules);
+        try {
+            await this.persist();
+        }
+        catch (error) {
+            this.state.modelFilterRules = previous;
+            throw error;
+        }
+    }
     snapshot() { return structuredClone(this.state); }
     async createWorkspace(name, path) {
         const cleanName = name.trim();

package/dist/server/subagents.d.ts

@@ -146,6 +146,8 @@ export declare class SubagentSupervisor {
      * reachable. `Pi` is resolved once, because a resolution that could change mid-run would make one
      * child's spawn line depend on when it was started.
      */
+    private modelValidator?;
+    setModelValidator(validator: (conversationId: string, model: import("./types.js").ModelSelection | undefined) => Promise<void>): void;
     constructor(sessionDir: string, command?: string, agents?: {
         dir: string | string[];
         promptDir: string;

package/dist/server/subagents.js

@@ -177,6 +177,8 @@ export class SubagentSupervisor {
      * reachable. `Pi` is resolved once, because a resolution that could change mid-run would make one
      * child's spawn line depend on when it was started.
      */
+    modelValidator;
+    setModelValidator(validator) { this.modelValidator = validator; }
     constructor(sessionDir, command, agents = { dir: join(sessionDir, "agents"), promptDir: join(sessionDir, "agent-prompts") }) {
         this.sessionDir = sessionDir;
         this.agents = agents;
@@ -250,6 +252,9 @@ export class SubagentSupervisor {
         // default. "Omit the model and get what the parent is running on" is the default worth having, and it
         // is a spawn-time flag because there is no RPC command to change it later.
         const chosen = agent.model ?? (model?.provider && model.modelId ? { provider: model.provider, modelId: model.modelId } : undefined);
+        if (model)
+            await this.modelValidator?.(conversationId, model);
+        await this.modelValidator?.(conversationId, chosen ? { ...chosen, label: chosen.modelId } : undefined);
         if (chosen)
             args.push("--provider", chosen.provider, "--model", chosen.modelId);
         if (agent.thinkingLevel)

package/dist/server/types.d.ts

@@ -1,3 +1,9 @@
+export type ModelFilterRule = {
+    id: string;
+    workspacePattern: string;
+    modelPattern: string;
+    label?: string;
+};
 import type { WorkflowRun } from "./workflow.js";
 export type RunStatus = "idle" | "running" | "completed" | "stopped" | "failed";
 export type MessageRole = "user" | "assistant" | "tool" | "system";
@@ -499,6 +505,7 @@ export type BackgroundTaskSummary = {
  * construct them - the same relationship `SubagentRun` already has with `subagent-runs.ts`.
  */
 export type AppState = {
+    modelFilterRules?: ModelFilterRule[];
     workspaces: Workspace[];
     conversations: Conversation[];
     subagentRuns: SubagentRun[];
@@ -614,7 +621,13 @@ export type ExtensionUiAnswer = {
     confirmed?: boolean;
     cancelled?: true;
 };
-export type ClientCommand = {
+export type ClientCommand = ClientCommandBody & {
+    operationRequestId?: string;
+};
+export type ClientCommandBody = {
+    type: "model.rules.set";
+    rules: ModelFilterRule[];
+} | {
     type: "workspace.create";
     name: string;
     path?: string;
@@ -713,6 +726,7 @@ export type ClientCommand = {
 /** Asks for the model/thinking catalog. Answered by `model.catalog`, never by an `error`. */
  | {
     type: "catalog.fetch";
+    conversationId?: string;
 }
 /** Asks for the agent catalog read from disk. Answered by `agent.catalog`. */
  | {
@@ -839,6 +853,12 @@ export type ServerVersionInfo = {
     needsRestart: boolean;
 };
 export type ServerEvent = {
+    type: "operation.result";
+    requestId: string;
+    ok: boolean;
+    message?: string;
+    entityId?: string;
+} | {
     type: "server.version";
     version: ServerVersionInfo;
 } | {

package/dist/server/ws-server.js

@@ -99,15 +99,22 @@ export class WsServer {
                 this.broadcaster.unregister(socket);
             });
             socket.on("message", async (raw) => {
+                let command;
                 try {
-                    const command = JSON.parse(raw.toString());
-                    await this.commandHandler.handleCommand(command, (event) => {
+                    command = JSON.parse(raw.toString());
+                    const entityId = await this.commandHandler.handleCommand(command, (event) => {
                         if (socket.readyState === WebSocket.OPEN) {
                             socket.send(JSON.stringify(event));
                         }
                     });
+                    if (command.operationRequestId)
+                        socket.send(JSON.stringify({ type: "operation.result", requestId: command.operationRequestId, ok: true, entityId }));
                 }
                 catch (error) {
+                    if (command?.operationRequestId) {
+                        socket.send(JSON.stringify({ type: "operation.result", requestId: command.operationRequestId, ok: false, message: error instanceof Error ? error.message : String(error) }));
+                        return;
+                    }
                     socket.send(JSON.stringify({
                         type: "error",
                         message: error instanceof Error ? error.message : "command failed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evandu/super-pi",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Web control plane and companion for Pi",
   "license": "MIT",
   "type": "module",
@@ -74,7 +74,8 @@
     "scripts/fork-server.test.mjs",
     "scripts/styles-no-dangling.test.mjs",
     "scripts/theme-no-hardcoded-colours.test.mjs",
-    "scripts/agent-config-regression.test.mjs"
+    "scripts/agent-config-regression.test.mjs",
+    "scripts/model-filter.test.mjs"
   ],
   "check:browser": [
     "scripts/extension-ui-browser.test.mjs",
@@ -106,7 +107,8 @@
     "scripts/file-tab-selected-contrast.test.mjs",
     "scripts/help-window.test.mjs",
     "scripts/composer-regression-browser.test.mjs",
-    "scripts/workspace-picker-browser.test.mjs"
+    "scripts/workspace-picker-browser.test.mjs",
+    "scripts/optimistic-browser.test.mjs"
   ],
   "dependencies": {
     "ws": "latest"