@evandu/super-pi 0.1.123 → 0.1.125

package/dist/server/terminal.js

@@ -49,7 +49,8 @@
  * only way to get them. The cost is a native module, and it is paid only by operators who set
  */
 import { createRequire } from "node:module";
-import { existsSync } from "node:fs";
+import { existsSync, accessSync, constants } from "node:fs";
+import { delimiter, join } from "node:path";
 import { isLocalOrPrivateAddress } from "./http-server.js";
 let ptyModule;
 let ptyLoadFailure;
@@ -122,21 +123,69 @@ const MINIMUM_PTY_VERSION = "1.2.0-beta.15";
  * The ARGS differ by family and are not an arbitrary detail: `-l` is a bash/sh login flag, and passing it
  * to PowerShell would make the shell refuse to start.
  */
-function defaultShell(env = process.env) {
-    const override = env.SUPER_PI_TERMINAL_SHELL?.trim();
-    if (override) {
-        // Split on whitespace so an override can carry its own flags (`"C:\Program Files\Git\bin\bash.exe" -l`
-        // has both a spaced path and a flag). A quoted first token is honoured.
-        const parts = override.match(/"[^"]+"|\S+/g) ?? [];
-        const file = (parts.shift() ?? "").replace(/^"|"$/g, "");
-        if (file)
-            return { file, args: parts };
-    }
+export function parseShellCommand(command) {
+    const parts = command.match(/"[^"\\]*(?:\\.[^"\\]*)*"|'[^']*'|\S+/g) ?? [];
+    const file = (parts.shift() ?? "").replace(/^("|' )|("|' )$/g, "").replace(/^['"]|['"]$/g, "");
+    return file ? { file, args: parts.map((part) => part.replace(/^['"]|['"]$/g, "")) } : undefined;
+}
+function defaultPlatformShell(env = process.env) {
     if (process.platform === "win32") {
         return { file: env.COMSPEC?.toLowerCase().includes("pwsh") ? "pwsh.exe" : "powershell.exe", args: [] };
     }
     return { file: env.SHELL || "/bin/bash", args: ["-l"] };
 }
+export function defaultShell(env = process.env, configured) {
+    if (configured?.file)
+        return { file: configured.file, args: [...configured.args] };
+    const override = env.SUPER_PI_TERMINAL_SHELL?.trim();
+    if (override)
+        return parseShellCommand(override) ?? defaultPlatformShell(env);
+    return defaultPlatformShell(env);
+}
+export function shellSource(env = process.env, configured) {
+    return configured?.file ? "设置" : env.SUPER_PI_TERMINAL_SHELL?.trim() ? "环境变量" : "平台默认";
+}
+function commandOnPath(file, env) {
+    if (file.includes("/") || file.includes("\\"))
+        return existsSync(file);
+    for (const dir of (env.PATH ?? "").split(delimiter)) {
+        const names = process.platform === "win32" ? [file, ...(env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").map((ext) => file.endsWith(ext.toLowerCase()) ? file : file + ext.toLowerCase())] : [file];
+        if (names.some((name) => { try {
+            accessSync(join(dir, name), constants.X_OK);
+            return true;
+        }
+        catch {
+            return false;
+        } }))
+            return true;
+    }
+    return false;
+}
+export function validateShellCommand(command, env = process.env) {
+    const parsed = parseShellCommand(command);
+    if (!parsed)
+        return "请输入要启动的 shell 命令。";
+    if (!commandOnPath(parsed.file, env))
+        return `找不到 ${parsed.file}：既不在 PATH 上，也不是一个存在的路径`;
+    return undefined;
+}
+export function terminalShellCandidates(env = process.env) {
+    const items = [];
+    if (process.platform === "win32") {
+        items.push({ file: "powershell.exe", args: [], label: "PowerShell" }, { file: "cmd.exe", args: [], label: "命令提示符" });
+        const git = "C:\\Program Files\\Git\\bin\\bash.exe";
+        if (existsSync(git))
+            items.push({ file: git, args: [], label: "Git Bash" });
+        if (commandOnPath("wsl.exe", env))
+            items.push({ file: "wsl.exe", args: ["-e", "bash"], label: "WSL Bash" });
+    }
+    else {
+        for (const file of [env.SHELL, "bash", "zsh", "fish"])
+            if (file && commandOnPath(file, env) && !items.some((item) => item.file === file))
+                items.push({ file, args: ["-l"], label: file });
+    }
+    return items;
+}
 // ---------------------------------------------------------------------------------------------
 // Bounds
 // ---------------------------------------------------------------------------------------------
@@ -183,12 +232,32 @@ export class TerminalService {
     workspaceFor;
     /** Whether a command from this peer is allowed to touch a shell at all. */
     isTrustedPeer;
+    configuredShell;
+    saveConfiguredShell;
     constructor(options) {
         this.workspaceFor = options.workspaceFor;
         this.isTrustedPeer = options.isTrustedPeer;
+        this.configuredShell = options.configuredShell ?? (() => undefined);
+        this.saveConfiguredShell = options.saveConfiguredShell ?? (async () => { });
         this.enabled = options.enabled ?? isTerminalEnabled();
     }
     enabled;
+    async setShell(command, remoteAddress) {
+        if (!this.enabled || !this.isTrustedPeer(remoteAddress))
+            return false;
+        if (command === null) {
+            await this.saveConfiguredShell(undefined);
+            return true;
+        }
+        const error = validateShellCommand(command);
+        if (error)
+            throw new Error(error);
+        const shell = parseShellCommand(command);
+        if (!shell)
+            throw new Error("请输入要启动的 shell 命令。");
+        await this.saveConfiguredShell(shell);
+        return true;
+    }
     /**
      * WHY THE PEER CHECK LIVES ON EVERY COMMAND AND NOT ONLY ON `open`.
      *
@@ -243,7 +312,7 @@ export class TerminalService {
                 return;
             }
             const pty = loadPty();
-            const shell = defaultShell(process.env);
+            const shell = defaultShell(process.env, this.configuredShell());
             const child = pty.spawn(shell.file, shell.args, {
                 // `xterm-256color` is what makes a shell enable colour and line editing; the client understands
                 // the same terminfo name, so the two ends agree on what the escape sequences mean.

package/dist/server/types.d.ts

@@ -405,6 +405,23 @@ export type PublicProvider = {
     baseUrl: string;
     api: string;
     hasKey: boolean;
+    /**
+     * TRUE when the key lives in `models.json` itself (Pi's `"apiKey": "$MY_KEY"` form) rather than
+     * in `auth.json`. It is a credential all the same, so the panel must not report it as missing.
+     */
+    keyInModelsJson?: boolean;
+    /**
+     * TRUE when the provider is one of Pi's own, with no entry in `models.json`.
+     *
+     * Its models come from Pi's catalogue rather than from a file, so the panel can show it and switch
+     * it off but cannot offer an address to edit: there is no file field to edit.
+     */
+    builtin?: boolean;
+    /**
+     * TRUE when the provider is currently switched OFF: Pi does not offer it, and switching it back on
+     * restores the `models.json` entry and the credential exactly as they were.
+     */
+    disabled?: boolean;
     models: PublicProviderModel[];
 };
 export type DiscoveredModel = {
@@ -778,9 +795,14 @@ export type BackgroundTaskSummary = {
  * separate "default provider" anywhere in this state: a provider is not a thing this app can be
  * configured with, it is only the first half of a model id.
  */
+export type TerminalShell = {
+    file: string;
+    args: string[];
+};
 export type AppState = {
     modelFilterRules?: ModelFilterRule[];
     defaultModel?: ModelSelection;
+    terminalShell?: TerminalShell;
     workspaces: Workspace[];
     conversations: Conversation[];
     subagentRuns: SubagentRun[];
@@ -908,6 +930,9 @@ export type ClientCommandBody =
 } | {
     type: "terminal.close";
     sessionId: string;
+} | {
+    type: "terminal.shell.set";
+    command: string | null;
 } | {
     type: "model.rules.set";
     rules: ModelFilterRule[];
@@ -945,6 +970,24 @@ export type ClientCommandBody =
     type: "providers.remove";
     providerId: string;
 }
+/**
+ * Turns a provider OFF: takes its `models.json` entry and its `auth.json` credential out of Pi's
+ * configuration, remembering both so `providers.enable` can put them back.
+ *
+ * THE ONLY THING PI HONOURS. A provider's models are offered exactly when its auth is configured
+ * (`ModelRuntime.getAvailable()` filters on that), and a built-in provider such as `kimi-coding`
+ * has no `models.json` entry to remove at all - so the credential is the lever for every kind of
+ * provider, and taking it out is what "off" means for Pi itself, not just for this app.
+ */
+ | {
+    type: "providers.disable";
+    providerId: string;
+}
+/** Turns a previously disabled provider back on, restoring exactly what `disable` removed. */
+ | {
+    type: "providers.enable";
+    providerId: string;
+}
 /**
  * Removes ONE model from a provider, leaving the provider and its other models alone.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evandu/super-pi",
-  "version": "0.1.123",
+  "version": "0.1.125",
   "description": "Web control plane and companion for Pi",
   "license": "MIT",
   "type": "module",
@@ -126,6 +126,7 @@
     "scripts/shared-chrome.test.mjs"
   ],
   "check:browser": [
+    "scripts/interrupt-browser.test.mjs",
     "scripts/revert-browser.test.mjs",
     "scripts/extension-ui-browser.test.mjs",
     "scripts/inline-rename-blur.test.mjs",
@@ -170,6 +171,7 @@
     "scripts/optimistic-browser.test.mjs",
     "scripts/active-memory-browser.test.mjs",
     "scripts/knowledge-base-browser.test.mjs",
+    "scripts/terminal-browser.test.mjs",
     "scripts/ux-polish-browser.test.mjs"
   ],
   "dependencies": {