psyclaw 0.29.11 → 0.29.13

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

@@ -18,8 +18,9 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { coreSkillNames, enabledRecommendedSkillPaths, normalizeRecommendedSkillId, readRecommendationState, readRecommendedCatalog, recommendedSkillTarget, saveRecommendationState, validateModelInstalledRecommendedSkill, } from "../../skills/recommended.js";
 import { SkillManagerComponent } from "../../tui/skill-manager.js";
 import { WakeOptionsComponent } from "../../tui/wake-options.js";
-import { applyWakeVerifySync, buildWakePrompt, formatWakeResult, labelsFor, waitForPanelWakeAnswer, } from "../../wake-options/runtime.js";
+import { applyWakeVerifySync, buildWakePrompt, createWakeVerifyChecklist, formatWakeResult, labelsFor, waitForPanelWakeAnswer, } from "../../wake-options/runtime.js";
 import { panelHub } from "../../panel/hub.js";
+import { appendChoiceRecord } from "../../research/choice.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, ProviderPickerComponent, } from "../../tui/provider-picker.js";
@@ -31,7 +32,8 @@ import { formatAnalysisPlanTakeover, resolveStatsIntent, } from "../../analysis/
 import { arsRoot } from "../../ars/pi-panel-executor.js";
 import { ArsModeEditor, isArsModeEditorText } from "../../ars/mode-editor.js";
 import { MODE_STATUS, nextSessionMode, parseSessionMode, sessionModePrompt, } from "../../session/modes.js";
-import { formatVerifyChecklist, isNaturalPlanConfirm, loadVerifyChecklist, markVerifyItem, skipUnverifiedItems } from "../../verify/checklist.js";
+import { continuouslyWorkWarningText, isContinuouslyWorkEnabled, } from "../../session/continuously-work.js";
+import { assertHumanVerifyGate, formatVerifyChecklist, isNaturalPlanConfirm, loadVerifyChecklist, markVerifyItem, skipUnverifiedItems } from "../../verify/checklist.js";
 import { formatSessionHelp, formatSessionHelpBrief } from "../../session/help.js";
 import { openResearchWorkbench } from "../../panel/workbench.js";
 const PARADIGMS = new Set([
@@ -1109,6 +1111,10 @@ export default function psyclawExtension(pi) {
     if (!legacyTestApi && typeof pi.on === "function")
         pi.on("session_start", (_event, ctx) => {
             arsUiContext = ctx;
+            if (isContinuouslyWorkEnabled() && ctx.hasUI) {
+                ctx.ui.setStatus("cw", "continuously-work");
+                ctx.ui.notify(continuouslyWorkWarningText(), "error");
+            }
             if (!ctx.hasUI || typeof ctx.ui.setEditorComponent !== "function")
                 return;
             ctx.ui.setEditorComponent((tui, theme, keybindings) => {
@@ -1285,40 +1291,48 @@ export default function psyclawExtension(pi) {
                 return;
             }
             if (parts[0] === "skip") {
-                ctx.ui.notify(formatVerifyChecklist(await skipUnverifiedItems(ctx.cwd)), "warning");
+                ctx.ui.notify(`${formatVerifyChecklist(await skipUnverifiedItems(ctx.cwd))}\n注意：skip 不解除 analysis/academic 人审硬门禁。`, "warning");
                 return;
             }
             if (parts[0] === "kind") {
                 const kind = (parts[1] ?? "general");
                 pi.sendUserMessage([
-                    "交叉核验任务：请作为助手主动提出核对项，不要等用户自己去「申请确认」。",
+                    "交叉核验任务：请作为助手主动提出核对项并执行字段核查，不要等用户自己去「申请确认」。",
                     `核验类别：${kind}（citations=引文，format=格式，requirements=研究要求，stats=统计结果，general=综合）。`,
-                    "输出可勾选清单，并建议用户打开 /panel 核对页逐项确认；若用户跳过，必须在产物中标注「未经核对」。",
+                    "核查完成后用 /crosscheck <id> verified 记为 AI 已核（ai-checked），不得自称已过人审。",
+                    "analysis / academic 模式下，全文或分析收尾前必须请人在 Panel「核实」或 /crosscheck <id> human；跳过不算通过。",
                     "分析前与分析后都要有清单，不能默认跳过。",
                 ].join("\n"), ctx.isIdle() ? {} : { deliverAs: "followUp" });
-                ctx.ui.notify(`已启动 ${kind} 交叉核验；也可 /panel 打开核对清单。`, "info");
+                ctx.ui.notify(`已启动 ${kind} 交叉核验；人审请打开 /panel → 核对清单。`, "info");
                 return;
             }
             const id = parts[0];
-            const status = (parts[1] ?? "verified");
-            if (status !== "verified" && status !== "unverified" && status !== "flagged" && status !== "skipped") {
-                ctx.ui.notify("Usage: /crosscheck list | skip | kind <citations|format|requirements|stats> | <id> verified|unverified|flagged|skipped [备注]", "info");
+            const statusRaw = (parts[1] ?? "verified").toLowerCase();
+            const allowed = new Set(["verified", "ai-checked", "unverified", "flagged", "skipped", "human"]);
+            if (!allowed.has(statusRaw)) {
+                ctx.ui.notify("Usage: /crosscheck list | skip | kind <citations|format|requirements|stats> | <id> verified|ai-checked|human|unverified|flagged|skipped [备注]", "info");
                 return;
             }
             const notes = parts.slice(2).join(" ") || undefined;
-            const checklist = await markVerifyItem(ctx.cwd, id, status, notes);
-            ctx.ui.notify(formatVerifyChecklist(checklist), "info");
+            const source = statusRaw === "human" ? "human" : "ai";
+            const checklist = await markVerifyItem(ctx.cwd, id, statusRaw, notes, undefined, { source });
+            const tip = statusRaw === "human" || (statusRaw === "verified" && source === "human")
+                ? "已记为人审通过。"
+                : statusRaw === "verified" || statusRaw === "ai-checked"
+                    ? "已记为 AI 已核；analysis/academic 收尾前仍须人在 Panel 点「核实」或 /crosscheck <id> human。"
+                    : undefined;
+            ctx.ui.notify(tip ? `${formatVerifyChecklist(checklist)}\n${tip}` : formatVerifyChecklist(checklist), "info");
         }
         catch (error) {
             await notifyError(ctx, error);
         }
     };
     pi.registerCommand("crosscheck", {
-        description: "交叉核验：/crosscheck list|skip|kind <类型>|<id> verified|…",
+        description: "AI 交叉核验 + 人审：/crosscheck list|skip|kind|<id> verified|human|…",
         handler: async (args, ctx) => handleCrosscheck(args, ctx),
     });
     pi.registerCommand("verify", {
-        description: "交叉核验（同 /crosscheck）：模型提出项，人勾选或 skip 标注未经核对",
+        description: "同 /crosscheck；AI 核查后 analysis/academic 须人审",
         handler: async (args, ctx) => handleCrosscheck(args, ctx),
     });
     pi.registerCommand("help", {
@@ -1430,6 +1444,11 @@ export default function psyclawExtension(pi) {
                     return;
                 }
                 if (cmd === "handoff") {
+                    const gate = await assertHumanVerifyGate(ctx.cwd, "analysis-complete");
+                    if (!gate.ok) {
+                        ctx.ui.notify(gate.message, "error");
+                        return;
+                    }
                     const path = await syncHandoffFromAnalysisPlan(ctx.cwd, plan);
                     if (plan.status === "running") {
                         plan = advanceAnalysisPlan(plan, plan.scriptEntrypoint
@@ -1488,6 +1507,19 @@ export default function psyclawExtension(pi) {
                 ctx.ui.notify("已启动学术追问。完成后会先展示文档更新建议，并询问是否写回。", "info");
             },
         });
+    if (!legacyTestApi)
+        pi.registerCommand("brainstorm", {
+            description: "显式启动研究方向头脑风暴（逐题澄清）",
+            handler: async (args, ctx) => {
+                const subject = args.trim();
+                pi.sendUserMessage([
+                    "使用 academic-grill Skill 的头脑风暴入口，先提出 2-4 个有理论意义、可回答的研究方向，比较价值、可行性与边界并推荐一个。",
+                    "随后按研究者需要逐题澄清，每轮只问一个实质问题，同时给出推荐答案和主要取舍；不要直接替用户执行完整研究或写论文。",
+                    subject ? `本次头脑风暴主题：${subject}` : "请根据当前对话和项目材料确定头脑风暴主题；已有信息不要重复询问。",
+                ].join("\n"), ctx.isIdle() ? {} : { deliverAs: "followUp" });
+                ctx.ui.notify("已启动研究方向头脑风暴。完成后可用 /grill 继续严格压力测试。", "info");
+            },
+        });
     if (!legacyTestApi)
         pi.registerCommand("review", {
             description: "并发运行多角色模拟同行评审",
@@ -2209,11 +2241,11 @@ export default function psyclawExtension(pi) {
             executionMode: "sequential",
             async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
                 try {
-                    // Soft gate: missing /init or verify does not hard-block results.
+                    // Soft gate for missing /init only. Analysis/academic completion still requires human verify.
                     const project = await readActiveProject(ctx.cwd);
                     const softNote = project
                         ? undefined
-                        : "尚未 /init（软门禁）：继续执行；关键字段请 AI 核查并由人 /verify。建议先 /init 建仓。";
+                        : "尚未 /init（软门禁）：继续执行；收尾前须 AI /crosscheck 后人审。建议先 /init 建仓。";
                     const request = params.request.trim();
                     const combined = `${request} ${params.identifier ?? ""}`;
                     const explicitWorkflow = params.workflow?.trim();
@@ -2246,6 +2278,13 @@ export default function psyclawExtension(pi) {
                     }
                     if (publishIntent) {
                         try {
+                            const gate = await assertHumanVerifyGate(ctx.cwd, "academic-finalize");
+                            if (!gate.ok) {
+                                return {
+                                    content: [{ type: "text", text: gate.message }],
+                                    details: { workflow: "publish-manuscript", blocked: true, reason: "human-verify-gate" },
+                                };
+                            }
                             const result = await exportAcademicDocument(ctx.cwd);
                             return {
                                 content: [{ type: "text", text: JSON.stringify({
@@ -2324,6 +2363,36 @@ export default function psyclawExtension(pi) {
                 }
             },
         });
+        pi.registerTool({
+            name: "psyclaw_record_choice",
+            label: "记录选择",
+            description: "记录研究者对选项的回应。结构化唤醒选项或直接文本回应都必须记录；直接回应需保留原文并填写解析后的选项。",
+            parameters: Type.Object({
+                prompt: Type.String({ minLength: 1, description: "当时向研究者提出的问题或选择提示" }),
+                originalResponse: Type.String({ minLength: 1, description: "研究者的原始回应，不能改写或省略" }),
+                selectedIds: Type.Array(Type.String(), { description: "解析后的选项 ID；无法明确解析时为空" }),
+                selectedLabels: Type.Array(Type.String(), { description: "解析后的选项名称" }),
+                source: Type.Union([Type.Literal("tool"), Type.Literal("free-text")]),
+                context: Type.Optional(Type.String({ description: "选择发生时的研究或任务上下文" })),
+            }),
+            executionMode: "sequential",
+            async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+                try {
+                    const record = await appendChoiceRecord(ctx.cwd, {
+                        prompt: params.prompt,
+                        originalResponse: params.originalResponse,
+                        selectedIds: params.selectedIds,
+                        selectedLabels: params.selectedLabels,
+                        source: params.source,
+                        ...(params.context === undefined ? {} : { context: params.context }),
+                    });
+                    return { content: [{ type: "text", text: JSON.stringify(record, null, 2) }], details: record };
+                }
+                catch (error) {
+                    return { content: [{ type: "text", text: `选择记录失败：${error instanceof Error ? error.message : String(error)}` }], details: { status: "failed" }, isError: true };
+                }
+            },
+        });
         pi.registerTool({
             name: "psyclaw_wake_options",
             label: "唤醒选项",
@@ -2363,6 +2432,9 @@ export default function psyclawExtension(pi) {
                         ...(params.syncVerify === undefined ? {} : { syncVerify: params.syncVerify }),
                         ...(params.timeoutMs === undefined ? {} : { timeoutMs: params.timeoutMs }),
                     });
+                    if (wakePrompt.mode === "checklist") {
+                        await createWakeVerifyChecklist(ctx.cwd, wakePrompt);
+                    }
                     const timeoutMs = Math.max(5_000, new Date(wakePrompt.expiresAt).getTime() - Date.now());
                     const panelClients = panelHub.subscriberCount();
                     if (ctx.hasUI) {