psyclaw 0.29.3 → 0.29.4

package/README.md

@@ -4,7 +4,7 @@ PsyClaw 是面向社会科学研究的智能体工作台。它把研究项目、
 
 PsyClaw 自有代码使用 MIT 许可证；随 npm 包内置的 Academic Research Skills 位于 `vendor/ars`，保持上游署名并单独遵循 CC BY-NC 4.0，仅限非商业用途。
 
-当前版本：`0.29.3`。正式命令、用户配置目录和后续发布统一使用 `psyclaw`。
+当前版本：`0.29.4`。正式命令、用户配置目录和后续发布统一使用 `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.29.3
+npm install -g psyclaw@0.29.4
 ```
 
 如果本机 npm 配置把 registry 误写成带有 `~/` 的地址，请显式指定官方源：
 
 ```bash
-npm install -g psyclaw@0.29.3 --registry=https://registry.npmjs.org/
+npm install -g psyclaw@0.29.4 --registry=https://registry.npmjs.org/
 ```
 
 中国大陆网络较慢或无法访问官方源时：
 
 ```powershell
-npm install -g psyclaw@0.29.3 --registry=https://registry.npmmirror.com
+npm install -g psyclaw@0.29.4 --registry=https://registry.npmmirror.com
 ```
 
 PsyClaw 的 npm 发布包直接携带 Windows x64/arm64 版 `ripgrep` 和 `fd`，Windows 启动时直接使用包内可执行文件，不再联网下载。其他平台缺少这两个工具时仍由锁定的 Pi 原生工具管理器处理：代理环境走 GitHub 官方 API 与 Release，国内 npm registry 环境统一走国内镜像。

package/dist/apps/panel/index.html

@@ -1174,10 +1174,18 @@
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/></svg>
           模型与成本
         </button>
+        <button data-view="checklist">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>
+          核对清单
+        </button>
+        <button data-view="chat">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/></svg>
+          对话
+        </button>
       </div>
       <div class="nav-footer">
         <div style="font-weight:600;margin-bottom:2px;color:var(--text-secondary)">PsyClaw 运行提示</div>
-        终端按 <code>Shift+Tab</code> 可在 <strong>chat ⇄ analysis ⇄ academic</strong> 模式间无缝推进。
+        终端 <code>Shift+Tab</code> 切换模式；Thinking 用 <code>Ctrl+Shift+T</code>。
       </div>
     </nav>
 
@@ -1373,6 +1381,39 @@
           </div>
         </div>
       </section>
+
+      <section id="view-checklist" class="view">
+        <div class="page-head">
+          <div>
+            <h1>交叉核验清单</h1>
+            <p>分析前/后由模型提出项，人在此勾选。可跳过，但会标注「未经核对」。本地写入 <code>.psyclaw/verify-checklist.json</code>。</p>
+          </div>
+          <div style="display:flex;gap:8px">
+            <button id="refresh-checklist" class="button">刷新</button>
+            <button id="skip-checklist" class="button" title="其余未核项标为跳过/未经核对">跳过未核项</button>
+          </div>
+        </div>
+        <div class="panel section">
+          <table>
+            <thead>
+              <tr><th>状态</th><th>ID</th><th>类别</th><th>阶段</th><th>说明</th><th>操作</th></tr>
+            </thead>
+            <tbody id="checklist-body">
+              <tr><td colspan="6" class="empty">正在读取核对清单...</td></tr>
+            </tbody>
+          </table>
+        </div>
+      </section>
+
+      <section id="view-chat" class="view">
+        <div class="page-head">
+          <div>
+            <h1>交互对话</h1>
+            <p>整页对话视图（不再只依赖右下角抽屉）。打开本页时会把控制台嵌到此处。</p>
+          </div>
+        </div>
+        <div id="chat-console-host" class="panel section" style="min-height:62vh;padding:0;overflow:hidden;display:flex;flex-direction:column"></div>
+      </section>
     </main>
   </div>
 </div>
@@ -1500,8 +1541,87 @@ function setView(view) {
   });
   if (view === "ecosystem") loadEcosystem();
   if (view === "provider") loadProvider();
+  if (view === "checklist") loadChecklist();
+  if (view === "chat") mountConsoleInChat();
+  else restoreConsoleDrawer();
+}
+
+function mountConsoleInChat() {
+  const host = $("chat-console-host");
+  const drawer = $("console-drawer");
+  if (!host || !drawer) return;
+  host.appendChild(drawer);
+  drawer.classList.add("open");
+  drawer.style.position = "relative";
+  drawer.style.inset = "auto";
+  drawer.style.width = "100%";
+  drawer.style.height = "100%";
+  drawer.style.minHeight = "58vh";
+  drawer.style.boxShadow = "none";
+  drawer.style.borderRadius = "0";
+}
+
+function restoreConsoleDrawer() {
+  const drawer = $("console-drawer");
+  if (!drawer || drawer.parentElement === document.body) return;
+  document.body.appendChild(drawer);
+  drawer.style.position = "";
+  drawer.style.inset = "";
+  drawer.style.width = "";
+  drawer.style.height = "";
+  drawer.style.minHeight = "";
+  drawer.style.boxShadow = "";
+  drawer.style.borderRadius = "";
+}
+
+async function loadChecklist() {
+  const body = $("checklist-body");
+  if (!body) return;
+  body.innerHTML = `<tr><td colspan="6" class="empty">正在读取核对清单...</td></tr>`;
+  try {
+    const data = await json("/api/crosscheck");
+    const items = data.checklist?.items || [];
+    body.innerHTML = items.map(item => {
+      const status = item.status || "unverified";
+      return `<tr>
+        <td>${esc(status)}</td>
+        <td><code>${esc(item.id)}</code></td>
+        <td>${esc(item.kind || "general")}</td>
+        <td>${esc(item.phase || "general")}</td>
+        <td>${esc(item.label)}${item.notes ? `<div style="color:var(--text-muted);font-size:11px">${esc(item.notes)}</div>` : ""}</td>
+        <td style="white-space:nowrap">
+          <button class="button" data-check-id="${esc(item.id)}" data-check-status="verified">核实</button>
+          <button class="button" data-check-id="${esc(item.id)}" data-check-status="flagged">存疑</button>
+          <button class="button" data-check-id="${esc(item.id)}" data-check-status="skipped">跳过</button>
+        </td>
+      </tr>`;
+    }).join("") || `<tr><td colspan="6" class="empty">清单为空</td></tr>`;
+    body.querySelectorAll("[data-check-id]").forEach(btn => {
+      btn.addEventListener("click", async () => {
+        await json("/api/crosscheck", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ id: btn.dataset.checkId, status: btn.dataset.checkStatus }),
+        });
+        await loadChecklist();
+      });
+    });
+  } catch (error) {
+    body.innerHTML = `<tr><td colspan="6" class="empty">加载失败: ${esc(error.message)}</td></tr>`;
+  }
 }
 
+$("refresh-checklist")?.addEventListener("click", loadChecklist);
+$("skip-checklist")?.addEventListener("click", async () => {
+  if (!confirm("将把所有未核项标为跳过，并写入「未经核对」。继续？")) return;
+  await json("/api/crosscheck", {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ action: "skip" }),
+  });
+  await loadChecklist();
+});
+
 document.querySelectorAll(".nav button").forEach(button => {
   button.addEventListener("click", () => setView(button.dataset.view));
 });
@@ -2105,8 +2225,10 @@ $("cmd-plan-btn").addEventListener("click", async () => {
 });
 
 $("cmd-verify-btn").addEventListener("click", async () => {
+  setView("checklist");
+  await loadChecklist();
   openConsole();
-  await sendConsoleMessage("/verify list");
+  await sendConsoleMessage("/crosscheck list");
 });
 
 /* --- 加载项目状态并更新 Stepper 状态 --- */

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

@@ -28,7 +28,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, loadVerifyChecklist, markVerifyItem } from "../../verify/checklist.js";
+import { formatVerifyChecklist, isNaturalPlanConfirm, loadVerifyChecklist, markVerifyItem, skipUnverifiedItems } from "../../verify/checklist.js";
+import { formatSessionHelp } from "../../session/help.js";
 const PARADIGMS = new Set([
     "survey-observational",
     "qualitative-thematic",
@@ -1128,14 +1129,67 @@ export default function psyclawExtension(pi) {
             });
         });
     if (!legacyTestApi && typeof pi.on === "function")
-        pi.on("input", (event, ctx) => {
+        pi.on("input", async (event, ctx) => {
             if (event.source === "extension")
                 return;
             if (/^\/(?:login|logout)(?:\s|$)/i.test(event.text.trim())) {
                 ctx.ui.notify("PsyClaw 已统一隐藏底层登录命令。请使用 /provider 配置、切换或更新模型凭据。", "info");
                 return { action: "handled" };
             }
+            if (/^\/help(?:\s|$)/i.test(event.text.trim())) {
+                ctx.ui.notify(formatSessionHelp(), "info");
+                return { action: "handled" };
+            }
             const mode = arsModeEditor?.getMode() ?? sessionMode;
+            const trimmed = event.text.trim();
+            // Natural-language plan confirm: reply「可以」instead of forcing /plan confirm.
+            if (mode === "analysis" && isNaturalPlanConfirm(trimmed)) {
+                const plan = await readActiveAnalysisPlan(ctx.cwd);
+                if (plan && (plan.status === "awaiting-confirm" || plan.status === "ready" || plan.status === "reviewing")) {
+                    const method = plan.confirmedMethod || plan.primaryAnalysis || plan.proposedMethods[0] || "按当前方案执行";
+                    let next = plan.status === "awaiting-confirm"
+                        ? advanceAnalysisPlan(plan, { type: "confirm", method, backend: "local-script" })
+                        : plan;
+                    if (next.status === "reviewing" || next.status === "awaiting-confirm") {
+                        next = advanceAnalysisPlan(next, { type: "review" });
+                    }
+                    next = advanceAnalysisPlan(next, { type: "run-now" });
+                    next = await writeAnalysisPlan(ctx.cwd, next);
+                    ctx.ui.notify(`${formatAnalysisPlanStatus(next)}\n已按自然语言确认并开始执行。`, "info");
+                    return {
+                        action: "transform",
+                        text: [
+                            "/skill:analysis-plan",
+                            "",
+                            `User confirmed with natural language ("${trimmed}"). Execute plan ${next.id} now.`,
+                            `Confirmed method: ${next.confirmedMethod ?? method}`,
+                            next.approvalMode === "auto" ? "approvalMode=auto: label outputs as 未经人审批." : "Human confirmed this step.",
+                            "Before and after analysis, open Panel checklist or /crosscheck; skipping must mark 未经核对.",
+                        ].join("\n"),
+                    };
+                }
+            }
+            const wantsStats = mode === "analysis" && Boolean(resolveStatsIntent(trimmed));
+            const wantsAcademic = mode === "academic" && Boolean(resolveAcademicSoftRoute(trimmed));
+            if ((wantsStats || wantsAcademic) && !(await readActiveProject(ctx.cwd))) {
+                if (!ctx.hasUI) {
+                    return {
+                        action: "transform",
+                        text: [
+                            "尚未 /init。请先提醒用户初始化工作区；若用户确认可无仓继续，再处理其请求。",
+                            "User request:",
+                            trimmed,
+                        ].join("\n"),
+                    };
+                }
+                const choice = await ctx.ui.select("尚未 /init。统计/写作建议先建仓，否则交接与核对清单不完整。", ["先执行 /init", "本次继续（稍后 init）", "取消"], { timeout: 120_000 });
+                if (choice === "取消" || choice === undefined)
+                    return { action: "handled" };
+                if (choice === "先执行 /init") {
+                    return { action: "transform", text: `/init\n\n（用户选择先初始化，完成后再继续：${trimmed}）` };
+                }
+                ctx.ui.notify("继续本次请求；建议随后 /init。关键结果请做交叉核验。", "warning");
+            }
             if (mode === "academic") {
                 const match = resolveAcademicSoftRoute(event.text);
                 if (!match)
@@ -1199,7 +1253,8 @@ export default function psyclawExtension(pi) {
                     `工作仓库已初始化：${project.id}`,
                     "已创建 data/raw|clean、analysis/、literature/、paper/、psyclaw.md、.psyclaw/",
                     "Shift+Tab：chat → analysis → academic",
-                    "澄清与分析请切到 analysis；写作审稿请切到 academic。",
+                    "Thinking：Ctrl+Shift+T",
+                    "澄清与分析请切到 analysis；写作审稿请切到 academic。输入 /help 查看速览。",
                 ].join("\n"), "info");
             }
             catch (error) {
@@ -1207,29 +1262,54 @@ export default function psyclawExtension(pi) {
             }
         },
     });
-    pi.registerCommand("verify", {
-        description: "人确认关键字段：/verify list | /verify <id> verified|unverified|flagged",
-        handler: async (args, ctx) => {
-            try {
-                const parts = args.trim().split(/\s+/).filter(Boolean);
-                if (parts.length === 0 || parts[0] === "list") {
-                    const checklist = await loadVerifyChecklist(ctx.cwd);
-                    ctx.ui.notify(formatVerifyChecklist(checklist), "info");
-                    return;
-                }
-                const id = parts[0];
-                const status = (parts[1] ?? "verified");
-                if (status !== "verified" && status !== "unverified" && status !== "flagged") {
-                    ctx.ui.notify("Usage: /verify list | /verify <id> verified|unverified|flagged [备注]", "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 handleCrosscheck = async (args, ctx) => {
+        try {
+            const parts = args.trim().split(/\s+/).filter(Boolean);
+            if (parts.length === 0 || parts[0] === "list") {
+                ctx.ui.notify(formatVerifyChecklist(await loadVerifyChecklist(ctx.cwd)), "info");
+                return;
             }
-            catch (error) {
-                await notifyError(ctx, error);
+            if (parts[0] === "skip") {
+                ctx.ui.notify(formatVerifyChecklist(await skipUnverifiedItems(ctx.cwd)), "warning");
+                return;
+            }
+            if (parts[0] === "kind") {
+                const kind = (parts[1] ?? "general");
+                pi.sendUserMessage([
+                    "交叉核验任务：请作为助手主动提出核对项，不要等用户自己去「申请确认」。",
+                    `核验类别：${kind}（citations=引文，format=格式，requirements=研究要求，stats=统计结果，general=综合）。`,
+                    "输出可勾选清单，并建议用户打开 /panel 核对页逐项确认；若用户跳过，必须在产物中标注「未经核对」。",
+                    "分析前与分析后都要有清单，不能默认跳过。",
+                ].join("\n"), ctx.isIdle() ? {} : { deliverAs: "followUp" });
+                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");
+                return;
             }
+            const notes = parts.slice(2).join(" ") || undefined;
+            const checklist = await markVerifyItem(ctx.cwd, id, status, notes);
+            ctx.ui.notify(formatVerifyChecklist(checklist), "info");
+        }
+        catch (error) {
+            await notifyError(ctx, error);
+        }
+    };
+    pi.registerCommand("crosscheck", {
+        description: "交叉核验：/crosscheck list|skip|kind <类型>|<id> verified|…",
+        handler: async (args, ctx) => handleCrosscheck(args, ctx),
+    });
+    pi.registerCommand("verify", {
+        description: "交叉核验（同 /crosscheck）：模型提出项，人勾选或 skip 标注未经核对",
+        handler: async (args, ctx) => handleCrosscheck(args, ctx),
+    });
+    pi.registerCommand("help", {
+        description: "三种模式速览与常用命令",
+        handler: async (_args, ctx) => {
+            ctx.ui.notify(formatSessionHelp(), "info");
         },
     });
     pi.registerCommand("plan", {
@@ -1239,11 +1319,33 @@ export default function psyclawExtension(pi) {
                 const trimmed = args.trim();
                 const [cmdRaw, ...rest] = trimmed.split(/\s+/).filter(Boolean);
                 const cmd = (cmdRaw ?? "status").toLowerCase();
-                const usage = "Usage: /plan new [目标] | status | list | confirm [方法] | review | run | defer | handoff | reject [原因]";
+                const usage = "Usage: /plan new|status|list|confirm|auto|human|review|run|defer|handoff|reject";
                 if (cmd === "new") {
                     const goal = rest.join(" ").trim() || "从当前对话澄清的分析目标";
                     const plan = await writeAnalysisPlan(ctx.cwd, createAnalysisPlan({ goal }));
-                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n已创建。继续澄清/EDA，完成后用 /plan confirm。`, "info");
+                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n已创建。模型会按分析项逐一请你选择；回复「可以」即可确认执行。`, "info");
+                    return;
+                }
+                if (cmd === "auto") {
+                    let plan = await readActiveAnalysisPlan(ctx.cwd);
+                    if (!plan) {
+                        ctx.ui.notify("没有活跃 Plan。先 /plan new 或在 analysis 模式触发 soft takeover。", "warning");
+                        return;
+                    }
+                    plan = advanceAnalysisPlan(plan, { type: "set-approval-mode", mode: "auto" });
+                    plan = await writeAnalysisPlan(ctx.cwd, plan);
+                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n已启用 auto：后续结果必须标注「未经人审批」。`, "warning");
+                    return;
+                }
+                if (cmd === "human") {
+                    let plan = await readActiveAnalysisPlan(ctx.cwd);
+                    if (!plan) {
+                        ctx.ui.notify("没有活跃 Plan。", "warning");
+                        return;
+                    }
+                    plan = advanceAnalysisPlan(plan, { type: "set-approval-mode", mode: "human" });
+                    plan = await writeAnalysisPlan(ctx.cwd, plan);
+                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n已恢复人工确认。`, "info");
                     return;
                 }
                 if (cmd === "list") {
@@ -1273,7 +1375,7 @@ export default function psyclawExtension(pi) {
                     plan = advanceAnalysisPlan(plan, { type: "confirm", method, backend: "local-script" });
                     plan = advanceAnalysisPlan(plan, { type: "review" });
                     plan = await writeAnalysisPlan(ctx.cwd, plan);
-                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n软确认完成并已审查。接着 /plan run 或 /plan defer。`, "info");
+                    ctx.ui.notify(`${formatAnalysisPlanStatus(plan)}\n软确认完成并已审查。回复「可以」或 /plan run 开始执行。`, "info");
                     return;
                 }
                 if (cmd === "review") {
@@ -1516,9 +1618,9 @@ export default function psyclawExtension(pi) {
                         ctx.ui.notify([
                             `PsyClaw ARS profile v${PSYCLAW_ARS_PROFILE_VERSION}`,
                             `当前模式：${arsModeEditor?.getMode() ?? sessionMode}（Shift+Tab：chat → analysis → academic）`,
-                            "Thinking：Ctrl+Shift+Tab",
+                            "Thinking：Ctrl+Shift+T",
                             `来源：${ARS_REPOSITORY_URL} @ ${ARS_UPSTREAM_REF} (${ARS_UPSTREAM_COMMIT.slice(0, 12)})`,
-                            "入口：Shift+Tab，/ars doctor，/ars start，/ars full <task>，/ars stop，/verify",
+                            "入口：Shift+Tab，/ars doctor，/ars start，/ars full <task>，/ars stop，/crosscheck，/help",
                             formatNatureArsFillerStatus(natureFillersFromCommandContext(ctx)),
                         ].join("\n"), "info");
                         return;