psyclaw 0.27.12 → 0.27.14

package/README.md

@@ -2,20 +2,26 @@
 
 PsyClaw 是面向社会科学研究的智能体工作台。它把研究项目、证据来源、Claim-Evidence 账本、完整性门禁、人工裁决、可恢复工作流和本地面板接到内置运行时上；它不替代统计软件，也不会把未经核验的引用、结果或审稿意见写成事实。
 
-当前版本：`0.27.12`。正式命令、用户配置目录和后续发布统一使用 `psyclaw`。
+当前版本：`0.27.14`。正式命令、用户配置目录和后续发布统一使用 `psyclaw`。
 
 ## 安装
 
 需要 Node.js `>=22.19.0`。官方 npm 源：
 
 ```powershell
-npm install -g psyclaw@0.27.12
+npm install -g psyclaw@0.27.14
+```
+
+如果本机 npm 配置把 registry 误写成带有 `~/` 的地址，请显式指定官方源：
+
+```bash
+npm install -g psyclaw@0.27.14 --registry=https://registry.npmjs.org/
 ```
 
 中国大陆网络较慢或无法访问官方源时：
 
 ```powershell
-npm install -g psyclaw@0.27.12 --registry=https://registry.npmmirror.com
+npm install -g psyclaw@0.27.14 --registry=https://registry.npmmirror.com
 ```
 
 确认命令入口：
@@ -63,7 +69,7 @@ psyclaw brief
 | 扫描本机其他 Agent | `psyclaw agents` |
 | 查看 PsyClaw 和内置运行时更新 | `psyclaw check-updates` |
 | 更新 PsyClaw 和内置运行时 | `psyclaw update` |
-| 导出完整使用路径 | 在对话中输入 `/export` |
+| 导出会话 | 使用 Pi 内置的 `/export` |
 | 打开科研面板 | 在对话中输入 `/panel` |
 | 查看或切换 Provider | 在对话中输入 `/provider` 或 `/provider <id>` |
 | 管理启动横幅宠物 | `/pet status`、`/pet on`、`/pet off`（默认关闭） |
@@ -82,7 +88,7 @@ psyclaw brief
 /export
 ```
 
-该斜杠命令直接在 PsyClaw 对话界面中使用，从当前项目的工作流日志和对应会话中生成 `outputs/psyclaw-export.otlp.json`，用于通过 OpenTelemetry Collector 导入 Langfuse 或 LangSmith。导出文件包含对话正文、工具参数、研究内容、原始 ID 与绝对路径，只写入本地，不会自动上传；不要将其提交到公开仓库。终端入口为 `psyclaw export`。Panel 不再读取实时 Trace，只展示 `outputs/` 下已经显式生成的 Export 文件。
+`/export` 由 Pi 内置命令提供。PsyClaw 不重复实现会话导出或 Trace 运行时。
 
 ## 开发者本地安装
 

package/dist/apps/panel/index.html

@@ -65,7 +65,7 @@ function selectTree(button){document.querySelectorAll(".tree-item").forEach(item
 async function openFile(path,button){selectTree(button);$("viewer-path").textContent=path;$("viewer-kind").textContent="读取中";$("viewer-body").className="viewer-body empty";$("viewer-body").textContent="读取中...";try{const file=await json(`/api/project-file?path=${encodeURIComponent(path)}`);$("viewer-kind").textContent=file.format;$("viewer-body").className="viewer-body";$("viewer-body").innerHTML=file.format==="markdown"?`<article class="markdown">${renderMarkdown(file.content)}</article>`:`<pre class="raw">${esc(file.format==="json"?JSON.stringify(JSON.parse(file.content),null,2):file.content)}</pre>`}catch(error){$("viewer-body").className="viewer-body empty";$("viewer-body").textContent=error.message}}
 async function loadProject(){const files=await json("/api/project-files");state.files=files.files||[];renderTree();const goal=document.querySelector('[data-file="notes/goal.md"]')||document.querySelector("[data-file]");if(goal)goal.click()}
 
-async function loadEcosystem(){try{const[skills,mcps,enabled]=await Promise.all([json("/api/recommended-skills"),json("/api/recommended-mcps"),json("/api/enabled-capabilities")]);const skillSet=new Set((enabled.skills||[]).map(item=>item.id)),mcpSet=new Set((enabled.mcp||[]).map(item=>item.id));state.eco=[...(enabled.coreSkills||[]).map(item=>({...item,kind:"core",description:"PsyClaw 内置 Skill",sourceRef:"bundled",enabled:item.enabled,installed:true})),...(skills.items||[]).map(item=>({...item,kind:"skill",enabled:skillSet.has(item.id),installed:skillSet.has(item.id)})),...(enabled.localSkills||[]).map(item=>({...item,kind:"local",sourceRef:item.path||"用户目录",installed:true})),...(mcps.items||[]).map(item=>({...item,kind:"mcp",enabled:mcpSet.has(item.id),installed:mcpSet.has(item.id)})),...(skills.externalTools||[]).map(item=>({...item,kind:"external",enabled:false,installed:false}))];renderEcosystem()}catch(error){$("ecosystem-body").innerHTML=`<tr><td colspan="5">${esc(error.message)}</td></tr>`}}
+async function loadEcosystem(){try{const[skills,mcps,enabled]=await Promise.all([json("/api/recommended-skills"),json("/api/recommended-mcps"),json("/api/enabled-capabilities")]);const skillSet=new Set((enabled.skills||[]).map(item=>item.id)),mcpSet=new Set((enabled.mcp||[]).map(item=>item.id));state.eco=[...(enabled.coreSkills||[]).map(item=>({...item,kind:"core",description:"PsyClaw 内置 Skill",sourceRef:"bundled",enabled:item.enabled,installed:true})),...(skills.items||[]).map(item=>({...item,kind:"skill",enabled:skillSet.has(item.id),installed:skillSet.has(item.id)})),...(skills.plugins||[]).map(item=>({...item,kind:"plugin",enabled:false,installed:false})),...(enabled.localSkills||[]).map(item=>({...item,kind:"local",sourceRef:item.path||"用户目录",installed:true})),...(mcps.items||[]).map(item=>({...item,kind:"mcp",enabled:mcpSet.has(item.id),installed:mcpSet.has(item.id)})),...(skills.externalTools||[]).map(item=>({...item,kind:"external",enabled:false,installed:false}))];renderEcosystem()}catch(error){$("ecosystem-body").innerHTML=`<tr><td colspan="5">${esc(error.message)}</td></tr>`}}
 function renderEcosystem(){const query=$("eco-search").value.trim().toLowerCase(),kind=$("eco-kind").value,status=$("eco-status").value;const items=state.eco.filter(item=>(kind==="all"||item.kind===kind)&&(status==="all"||(status==="enabled"?item.enabled:!item.enabled))&&`${item.name} ${item.description||""}`.toLowerCase().includes(query));$("ecosystem-body").innerHTML=items.map(item=>`<tr><td><div class="name">${esc(item.name)}</div><div class="subtle">${esc(item.description||"")}</div></td><td>${esc(item.kind==="core"?"Core Skill":item.kind==="local"?"用户 Skill":item.kind.toUpperCase())}</td><td>${/^https?:/.test(item.sourceRef||"")?`<a href="${esc(item.sourceRef)}" target="_blank" rel="noreferrer">来源</a>`:esc(item.sourceRef||"bundled")}</td><td><span class="tag ${item.enabled?"ok":""}">${item.enabled?"已启用":item.kind==="external"?"外部工具":"未启用"}</span></td><td>${item.kind==="external"?"—":item.enabled?`<button class="button small" onclick="toggleCapability('${item.kind}','${esc(item.id)}',false)">停用</button>`:item.kind==="local"?`<button class="button small primary" onclick="toggleCapability('local','${esc(item.id)}',true)">启用</button>`:`<button class="button small primary" onclick="installCapability('${item.kind}','${esc(item.id)}')">${item.kind==="core"?"启用":"安装"}</button>`}</td></tr>`).join("")||'<tr><td colspan="5">没有匹配项</td></tr>'}
 async function toggleCapability(kind,id,enabled){await json("/api/recommendation-state",{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({kind:kind==="core"?"core-skill":kind==="skill"?"skills":kind==="local"?"local-skill":kind,id,enabled})});await loadEcosystem()}
 async function installCapability(kind,id){if(kind==="core"){await toggleCapability(kind,id,true);return}const scope=kind==="skill"?(confirm("安装到系统目录？\n确定：所有项目使用；取消：仅当前项目使用。")?"user":"project"):undefined;if(!confirm(`确认安装 ${id}？安装完成后需要 /reload。`))return;const result=await json("/api/install/execute",{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({kind,id,scope,approved:true,actor:"researcher"})});alert(result.message||(result.ok?"安装任务已处理，请执行 /reload。":"安装未完成"));await loadEcosystem()}

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

@@ -1,6 +1,6 @@
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { appendApproval, approvalInputDigest, approvePrimaryDocument, asProject, bootstrapProject, DEFAULT_RUN_APPROVAL_NODES, exportTraces, PRIMARY_PLAN_DOCUMENTS, primaryPlanApprovalStatus, projectPaths, runOfflineBrief, runInstitutionalFulltext, runLiteratureReview, runExpertReview, runAnalysisDelegation, runWritingReview, runMetaAnalysis, createStageRunner, exportAcademicDocument, recordCitationUse, runParallelPeerReview, writeHandoff } from "../../index.js";
+import { appendApproval, approvalInputDigest, approvePrimaryDocument, asProject, bootstrapProject, DEFAULT_RUN_APPROVAL_NODES, PRIMARY_PLAN_DOCUMENTS, primaryPlanApprovalStatus, projectPaths, runOfflineBrief, runInstitutionalFulltext, runLiteratureReview, runExpertReview, runAnalysisDelegation, runWritingReview, runMetaAnalysis, createStageRunner, exportAcademicDocument, recordCitationUse, runParallelPeerReview, writeHandoff } from "../../index.js";
 import { runPlanWithPi } from "../../orchestration/pi-executor.js";
 import { atomicWriteFile } from "../../project/jsonl.js";
 import { RunEventLog } from "../../panel/events.js";
@@ -14,7 +14,7 @@ import { coreSkillNames, enabledRecommendedSkillPaths, normalizeRecommendedSkill
 import { SkillManagerComponent } from "../../tui/skill-manager.js";
 import { enabledLocalSkillPaths, enabledLocalPromptPaths, readUserSkillState, scanLocalSkills, setLocalSkillEnabled, setLocalSkillsEnabled, skillNamesInPaths, installLocalSkill, userSkillId, } from "../../skills/user-skills.js";
 import { RuntimeMcpRegistry, setUserMcpConfigEnabled, } from "../../integrations/mcp-runtime.js";
-import { SecretInputComponent, } from "../../tui/provider-picker.js";
+import { SecretInputComponent, ProviderPickerComponent, } from "../../tui/provider-picker.js";
 const PARADIGMS = new Set([
     "survey-observational",
     "qualitative-thematic",
@@ -56,7 +56,6 @@ async function runPluginCommand(args) {
         throw new Error(`不支持的 Plugin 操作：${args[0] ?? ""}`);
 }
 const activeAgentRuns = new Set();
-const pendingInitApprovals = new Set();
 const activeApprovalDialogs = new Set();
 const CORE_SKILLS = new Set(["academic-grill", "research-intake", "evidence-capture", "citation-audit", "research-brief"]);
 function coreSkillPath(name) {
@@ -120,10 +119,14 @@ async function saveDefaultModel(provider, model) {
     await atomicWriteFile(path, `${JSON.stringify({ ...settings, defaultProvider: provider, defaultModel: model }, null, 2)}\n`);
 }
 async function pickProviderItem(ctx, title, items) {
-    const labels = items.map((item) => `${item.current ? "* " : ""}${item.label} (${item.id})`);
-    const selected = await ctx.ui.select(title, labels, { timeout: 60_000 });
-    const index = selected === undefined ? -1 : labels.indexOf(selected);
-    return index < 0 ? undefined : items[index].id;
+    if (typeof ctx.ui.custom !== "function") {
+        const labels = items.map((item) => `${item.current ? "* " : ""}${item.label} (${item.id})`);
+        const selected = await ctx.ui.select(title, labels, { timeout: 60_000 });
+        const index = selected === undefined ? -1 : labels.indexOf(selected);
+        return index < 0 ? undefined : items[index].id;
+    }
+    const selected = await ctx.ui.custom((tui, theme, keybindings, done) => new ProviderPickerComponent(title, items, tui, theme, keybindings, done));
+    return selected.type === "select" ? selected.id : undefined;
 }
 async function promptProviderKey(ctx, providerName, envName) {
     const result = await ctx.ui.custom((tui, theme, keybindings, done) => new SecretInputComponent(`配置 ${providerName}`, envName, tui, theme, keybindings, done));
@@ -354,13 +357,14 @@ async function recommendedItems(kind) {
             const value = JSON.parse(await readFile(path, "utf8"));
             return {
                 items: Array.isArray(value.items) ? value.items.filter((item) => Boolean(item && typeof item === "object")) : [],
+                plugins: Array.isArray(value.plugins) ? value.plugins.filter((item) => Boolean(item && typeof item === "object")) : [],
                 externalTools: Array.isArray(value.externalTools) ? value.externalTools.filter((item) => Boolean(item && typeof item === "object")) : [],
                 installPrep: Array.isArray(value.installPrep) ? value.installPrep.filter((item) => Boolean(item && typeof item === "object")) : [],
             };
         }
         catch { /* try next candidate */ }
     }
-    return { items: [], externalTools: [], installPrep: [] };
+    return { items: [], plugins: [], externalTools: [], installPrep: [] };
 }
 function skillScopeLabel(scope) {
     if (scope === "local")
@@ -1000,13 +1004,6 @@ export default function psyclawExtension(pi) {
             });
             return approved ? undefined : { block: true, terminate: true, reason: "用户拒绝该执行步骤或审批超时" };
         });
-    if (!legacyTestApi && typeof pi.on === "function")
-        pi.on("agent_end", async (_event, ctx) => {
-            if (!pendingInitApprovals.has(ctx.cwd) || !(await planDocumentsReady(ctx.cwd)))
-                return;
-            pendingInitApprovals.delete(ctx.cwd);
-            await reviewPrimaryDocuments(ctx);
-        });
     pi.registerCommand("init", {
         description: "初始化可追溯的研究项目",
         handler: async (args, ctx) => {
@@ -1014,9 +1011,8 @@ export default function psyclawExtension(pi) {
                 const parsed = parseInitArgs(args);
                 const project = await bootstrapProject({ root: ctx.cwd, ...parsed });
                 if (typeof pi.sendUserMessage === "function") {
-                    pendingInitApprovals.add(ctx.cwd);
                     pi.sendUserMessage(academicGrillRequest(project.goal, "init"), ctx.isIdle() ? {} : { deliverAs: "followUp" });
-                    ctx.ui.notify(`研究项目已初始化：${project.id}（${project.paradigm}）。学术追问完成并生成主要计划文档后会进入审批；全部批准后才能 /run。`, "info");
+                    ctx.ui.notify(`研究项目已初始化：${project.id}（${project.paradigm}）。当前保持普通对话；如需进入受控研究流程，请明确运行 /run。`, "info");
                 }
                 else {
                     ctx.ui.notify(`研究项目已初始化：${project.id}（${project.paradigm}）。使用 /run 启动受控研究流程。`, "info");
@@ -1066,8 +1062,11 @@ export default function psyclawExtension(pi) {
                     const planApproval = await primaryPlanApprovalStatus(ctx.cwd);
                     if (!planApproval.ok) {
                         const missing = planApproval.documents.filter((item) => !item.approved).map((item) => item.path);
-                        ctx.ui.notify(`主要计划尚未批准或批准后已修改：${missing.join("、")}。请运行 /approve。`, "warning");
-                        return;
+                        // `/run` is the sole switch into the controlled workflow.  A plan
+                        // can still be incomplete when execution starts; keep the status
+                        // visible and let the model repair it through the normal workflow
+                        // instead of forcing a separate approval command first.
+                        ctx.ui.notify(`检测到计划尚未确认或已修改：${missing.join("、")}。将由受控流程继续处理；如需先人工确认，可运行 /approve。`, "warning");
                     }
                     const available = await selectableRunSkills(ctx.cwd);
                     let requestedSkills = parsed.requestedSkills;
@@ -1329,8 +1328,9 @@ export default function psyclawExtension(pi) {
                         const [skills, mcps] = await Promise.all([recommendedItems("skills"), recommendedItems("mcp")]);
                         const skillLines = skills.items.slice(0, 8).map((item) => `Skill: ${String(item.id)} — ${String(item.name)}`);
                         const mcpLines = mcps.items.slice(0, 8).map((item) => `MCP: ${String(item.id)} — ${String(item.name)}`);
+                        const pluginLines = skills.plugins.slice(0, 8).map((item) => `Plugin: ${String(item.name)} — ${String(item.sourceRef ?? "请查看项目文档")}`);
                         const toolLines = skills.externalTools.slice(0, 8).map((item) => `外部工具: ${String(item.name)} — ${String(item.sourceRef ?? "请查看项目文档")}`);
-                        ctx.ui.notify(["推荐安装入口", "", ...skillLines, ...mcpLines, "", ...toolLines, "", "安装：/install skill|mcp <id>", "管理：/skill 或 /mcp", "外部工具不通过 Skill 安装器安装", "也可以打开 /panel 查看推荐页面"].join("\n"), "info");
+                        ctx.ui.notify(["推荐安装入口", "", ...skillLines, ...pluginLines, ...mcpLines, "", ...toolLines, "", "安装：/install skill|mcp <id>", "Plugin：/plugin install <source>", "管理：/skill 或 /mcp", "外部工具不通过 Skill 安装器安装", "也可以打开 /panel 查看推荐页面"].join("\n"), "info");
                         return;
                     }
                     if (kind !== "skill" && kind !== "mcp")
@@ -1415,9 +1415,16 @@ export default function psyclawExtension(pi) {
                     }
                     if (preset && ctx.hasUI && typeof ctx.ui.custom === "function") {
                         const credential = await providerCredentialSource(preset);
-                        const key = credential === "missing" ? await promptProviderKey(ctx, preset.name, preset.apiKeyEnv) : "";
+                        // Always show the credential step when switching a built-in
+                        // provider. An empty submission deliberately keeps an existing
+                        // environment/auth-store credential; this makes the flow explicit
+                        // and avoids silently skipping the key screen on another machine.
+                        const key = await promptProviderKey(ctx, preset.name, preset.apiKeyEnv);
                         if (key === undefined)
                             return;
+                        if (!key && credential === "missing") {
+                            throw new Error(`未找到 ${preset.apiKeyEnv}；请输入 API Key 后再继续`);
+                        }
                         await saveProviderConfig({ ...preset, ...(key ? { apiKey: key } : {}) });
                         const refreshed = await Promise.race([
                             ctx.modelRegistry.refresh().then(() => true),
@@ -1460,27 +1467,6 @@ export default function psyclawExtension(pi) {
                 ctx.ui.notify(`启动横幅宠物已${action === "on" ? "开启" : "关闭"}，下次启动生效`, "info");
             },
         });
-    const traceCommand = {
-        description: "导出包含正文与工具参数的完整使用路径，供 Langfuse 或 LangSmith 分析",
-        handler: async (args, ctx) => {
-            try {
-                if (args.trim())
-                    throw new Error("Usage: /export");
-                const result = await exportTraces({ root: ctx.cwd });
-                ctx.ui.notify([
-                    "使用路径已导出（未上传）",
-                    `文件：${result.output}`,
-                    `轨迹：${result.traces}`,
-                    `步骤：${result.spans}`,
-                    "包含对话正文、工具参数、原始 ID 与绝对路径，便于排查各环节问题；请勿将导出文件提交到公开仓库。",
-                ].join("\n"), "info");
-            }
-            catch (error) {
-                await notifyError(ctx, error);
-            }
-        },
-    };
-    pi.registerCommand("export", traceCommand);
     if (typeof pi.registerTool === "function") {
         pi.registerTool({
             name: "psyclaw_mcp",