psyclaw 0.30.4 → 0.30.5

package/README.md

@@ -4,7 +4,7 @@ PsyClaw 是面向社会科学研究的智能体工作台。它把研究项目、
 
 PsyClaw 自有代码使用 MIT 许可证；随 npm 包内置的 Academic Research Skills 位于 `vendor/ars`，保持上游署名并单独遵循 CC BY-NC 4.0，仅限非商业用途。
 
-当前版本：`0.30.4`。正式命令、用户配置目录和后续发布统一使用 `psyclaw`。
+当前版本：`0.30.5`。正式命令、用户配置目录和后续发布统一使用 `psyclaw`。
 
 ## 发布流程
 
@@ -21,19 +21,19 @@ RELEASE_MESSAGE="release: describe the change" pnpm release:push
 需要 Node.js `>=22.19.0`。官方 npm 源：
 
 ```powershell
-npm install -g psyclaw@0.30.4
+npm install -g psyclaw@0.30.5
 ```
 
 如果本机 npm 配置把 registry 误写成带有 `~/` 的地址，请显式指定官方源：
 
 ```bash
-npm install -g psyclaw@0.30.4 --registry=https://registry.npmjs.org/
+npm install -g psyclaw@0.30.5 --registry=https://registry.npmjs.org/
 ```
 
 中国大陆网络较慢或无法访问官方源时：
 
 ```powershell
-npm install -g psyclaw@0.30.4 --registry=https://registry.npmmirror.com
+npm install -g psyclaw@0.30.5 --registry=https://registry.npmmirror.com
 ```
 
 或安装脚本：
@@ -46,7 +46,7 @@ PSYCLAW_CN=1 curl -fsSL https://exekiel179.github.io/psyclaw/install.sh | sh
 ```powershell
 # Windows PowerShell
 irm https://exekiel179.github.io/psyclaw/install.ps1 | iex
-# 可选：$env:PSYCLAW_CN = "1"；$env:PSYCLAW_VERSION = "0.30.4"
+# 可选：$env:PSYCLAW_CN = "1"；$env:PSYCLAW_VERSION = "0.30.5"
 ```
 
 检测到国内 npm registry（如 npmmirror）、`PSYCLAW_CN=1` 或 `PSYCLAW_GITHUB_MIRROR` 时，内置路径统一走国内可用路由：
@@ -218,3 +218,4 @@ rm -rf ~/.psyclaw
 - 遥测默认开启（匿名产品使用与错误，不含研究正文）。首次启动会说明如何关闭：`psyclaw telemetry off`。详见 [docs/telemetry.md](docs/telemetry.md)。
 
 许可证：MIT。
+

package/dist/src/adapters/pi/extension.js

@@ -22,7 +22,8 @@ import { panelHub } from "../../panel/hub.js";
 import { appendChoiceRecord } from "../../research/choice.js";
 import { enabledLocalSkillPaths, enabledLocalPromptPaths, readUserSkillState, scanLocalSkills, setLocalSkillEnabled, setLocalSkillsEnabled, skillNamesInPaths, userSkillId, } from "../../skills/user-skills.js";
 import { RuntimeMcpRegistry, setUserMcpConfigEnabled, } from "../../integrations/mcp-runtime.js";
-import { SecretInputComponent, ProviderPickerComponent, } from "../../tui/provider-picker.js";
+import { SecretInputComponent, TextInputComponent, ProviderPickerComponent, } from "../../tui/provider-picker.js";
+import { resolveProviderBaseUrl } from "../../core/provider-endpoint.js";
 import { isArsPiActive, isArsPiTurn, psyclawArsPatch, setArsPiSessionActive, } from "../../ars/profile.js";
 import { buildArsDoctorReport, ensurePdfEngineForExport } from "../../ars/doctor.js";
 import { formatAcademicSoftRouteInvocation, rankAcademicSoftRoutes, resolveAcademicSoftRoute, } from "../../ars/academic-router.js";
@@ -131,6 +132,48 @@ async function promptProviderKey(ctx, providerName, envName) {
     const result = await ctx.ui.custom((tui, theme, keybindings, done) => new SecretInputComponent(`配置 ${providerName}`, envName, tui, theme, keybindings, done));
     return result.type === "submit" ? result.value.trim() : undefined;
 }
+async function promptProviderText(ctx, title, hint, initial = "") {
+    if (typeof ctx.ui.custom !== "function") {
+        throw new Error(`${title}：当前环境不支持交互输入。请在交互式终端运行 /provider。`);
+    }
+    const result = await ctx.ui.custom((tui, theme, keybindings, done) => new TextInputComponent(title, hint, tui, theme, keybindings, done, initial));
+    return result.type === "submit" ? result.value.trim() : undefined;
+}
+/** Interactive setup for the built-in `custom` OpenAI-compatible provider. */
+async function configureCustomProvider(ctx) {
+    const preset = PROVIDER_PRESETS.find((item) => item.id === "custom");
+    if (!preset)
+        throw new Error("内置 custom Provider 预设缺失");
+    if (!ctx.hasUI || typeof ctx.ui.custom !== "function") {
+        throw new Error("请在交互式终端运行 /provider，选择「自定义 OpenAI 兼容接口」，并填写 Base URL 与模型 ID");
+    }
+    const baseUrlRaw = await promptProviderText(ctx, "自定义 Provider · Base URL", "例如 https://api.example.com/v1（须为 http/https，不含凭据）");
+    if (baseUrlRaw === undefined)
+        return undefined;
+    let baseUrl = "";
+    try {
+        baseUrl = resolveProviderBaseUrl(baseUrlRaw);
+    }
+    catch (error) {
+        throw new Error(error instanceof Error ? error.message : "Base URL 无效");
+    }
+    if (!baseUrl)
+        throw new Error("自定义 Provider 必须填写 Base URL");
+    const modelId = await promptProviderText(ctx, "自定义 Provider · 模型 ID", "填写网关要求的模型名，例如 gpt-4o-mini 或 deepseek-chat");
+    if (modelId === undefined)
+        return undefined;
+    if (!modelId || !/^[A-Za-z0-9][A-Za-z0-9._:/-]{0,255}$/.test(modelId)) {
+        throw new Error("模型 ID 无效；请使用字母数字及 . _ : / -");
+    }
+    const key = await promptProviderKey(ctx, preset.name, preset.apiKeyEnv);
+    if (key === undefined)
+        return undefined;
+    const credential = await providerCredentialSource(preset);
+    if (!key && credential === "missing") {
+        throw new Error(`未找到 ${preset.apiKeyEnv}；请输入 API Key 后再继续`);
+    }
+    return { baseUrl, modelId, ...(key ? { apiKey: key } : {}) };
+}
 function parseModelRef(args) {
     const value = args.trim();
     const slash = value.indexOf("/");
@@ -1604,7 +1647,7 @@ export default function psyclawExtension(pi) {
         });
     if (!legacyTestApi)
         pi.registerCommand("provider", {
-            description: "查看或切换模型 Provider",
+            description: "查看、配置或切换 Provider（含自定义 OpenAI 兼容接口）",
             handler: async (args, ctx) => {
                 try {
                     let requested = args.trim();
@@ -1616,7 +1659,7 @@ export default function psyclawExtension(pi) {
                     }
                     if (!requested) {
                         const current = ctx.model?.provider ?? "none";
-                        const available = new Map(PROVIDER_PRESETS.filter((preset) => preset.models.length > 0).map((preset) => [preset.id, preset]));
+                        const available = new Map(PROVIDER_PRESETS.filter((preset) => preset.models.length > 0 || preset.id === "custom").map((preset) => [preset.id, preset]));
                         for (const id of providers.keys())
                             if (!available.has(id))
                                 available.set(id, {
@@ -1629,13 +1672,15 @@ export default function psyclawExtension(pi) {
                                 });
                         if (!ctx.hasUI || typeof ctx.ui.custom !== "function") {
                             const lines = [...available].map(([id, preset]) => `${id}${id === current ? " *" : ""} — ${preset.name}`);
-                            ctx.ui.notify([`当前 Provider: ${current}`, ...lines, "", "切换：/provider <id>"].join("\n"), "info");
+                            ctx.ui.notify([`当前 Provider: ${current}`, ...lines, "", "切换：/provider <id>（自定义：/provider custom）"].join("\n"), "info");
                             return;
                         }
                         const selectedProvider = await pickProviderItem(ctx, "选择模型 Provider", [...available].map(([id, preset]) => ({
                             id,
                             label: preset.name,
-                            description: `${id} · ${providers.get(id)?.length ?? preset.models.length} 个模型`,
+                            description: id === "custom"
+                                ? "自建/第三方 OpenAI 兼容网关：填写 Base URL、模型 ID 与 API Key"
+                                : `${id} · ${providers.get(id)?.length ?? preset.models.length} 个模型`,
                             current: id === current,
                         })));
                         if (!selectedProvider)
@@ -1644,6 +1689,35 @@ export default function psyclawExtension(pi) {
                     }
                     if (!/^[A-Za-z0-9._:-]+$/.test(requested))
                         throw new Error("请使用 /provider 打开选择，或 /provider <provider-id>");
+                    if (requested === "custom") {
+                        const custom = await configureCustomProvider(ctx);
+                        if (!custom)
+                            return;
+                        const preset = PROVIDER_PRESETS.find((item) => item.id === "custom");
+                        await saveProviderConfig({
+                            ...preset,
+                            baseUrl: custom.baseUrl,
+                            models: [{ id: custom.modelId, name: custom.modelId }],
+                            ...(custom.apiKey ? { apiKey: custom.apiKey } : {}),
+                        });
+                        const refreshed = await Promise.race([
+                            ctx.modelRegistry.refresh().then(() => true),
+                            new Promise((resolve) => setTimeout(() => resolve(false), 5_000)),
+                        ]);
+                        if (!refreshed) {
+                            ctx.ui.notify("自定义 Provider 已保存；模型目录刷新超时，请重新启动 PsyClaw 后使用。", "warning");
+                            return;
+                        }
+                        const selected = ctx.modelRegistry.getAll().find((model) => model.provider === "custom" && model.id === custom.modelId);
+                        if (!selected)
+                            throw new Error(`自定义模型未出现在目录中：custom/${custom.modelId}；请检查 Base URL 后重试`);
+                        const changed = await pi.setModel(selected);
+                        if (!changed)
+                            throw new Error("未找到 custom 的可用凭据；请重新运行 /provider custom 并输入 API Key");
+                        await saveDefaultModel("custom", selected.id);
+                        ctx.ui.notify(`已切换并设为默认模型：custom/${selected.id}（${custom.baseUrl}）`, "info");
+                        return;
+                    }
                     const preset = PROVIDER_PRESETS.find((item) => item.id === requested);
                     let models = providers.get(requested) ?? [];
                     const modelChoices = models.length > 0 ? models : (preset?.models ?? []);