psyclaw 0.29.11 → 0.29.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/apps/panel/index.html +849 -337
- package/dist/src/adapters/pi/extension.js +87 -15
- package/dist/src/adapters/pi/extension.js.map +1 -1
- package/dist/src/adapters/pi/rpc.js +1 -1
- package/dist/src/adapters/pi/rpc.js.map +1 -1
- package/dist/src/analysis/stats-router.js +1 -1
- package/dist/src/analysis/stats-router.js.map +1 -1
- package/dist/src/ars/mode-editor.d.ts +1 -5
- package/dist/src/ars/mode-editor.js +1 -9
- package/dist/src/ars/mode-editor.js.map +1 -1
- package/dist/src/branding.d.ts +4 -3
- package/dist/src/branding.js +10 -9
- package/dist/src/branding.js.map +1 -1
- package/dist/src/chat.d.ts +7 -0
- package/dist/src/chat.js +19 -1
- package/dist/src/chat.js.map +1 -1
- package/dist/src/cli-args.d.ts +1 -0
- package/dist/src/cli-args.js +1 -0
- package/dist/src/cli-args.js.map +1 -1
- package/dist/src/cli.js +39 -7
- package/dist/src/cli.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/literature/knowledge-map.d.ts +4 -0
- package/dist/src/literature/knowledge-map.js +4 -0
- package/dist/src/literature/knowledge-map.js.map +1 -1
- package/dist/src/panel/server.js +9 -109
- package/dist/src/panel/server.js.map +1 -1
- package/dist/src/project/bootstrap.js +0 -2
- package/dist/src/project/bootstrap.js.map +1 -1
- package/dist/src/project/workspace.js +3 -3
- package/dist/src/project/workspace.js.map +1 -1
- package/dist/src/research/choice.d.ts +16 -0
- package/dist/src/research/choice.js +25 -0
- package/dist/src/research/choice.js.map +1 -0
- package/dist/src/session/continuously-work.d.ts +16 -0
- package/dist/src/session/continuously-work.js +44 -0
- package/dist/src/session/continuously-work.js.map +1 -0
- package/dist/src/session/help.d.ts +3 -0
- package/dist/src/session/help.js +68 -26
- package/dist/src/session/help.js.map +1 -1
- package/dist/src/session/modes.js +7 -7
- package/dist/src/session/modes.js.map +1 -1
- package/dist/src/style/cli-ui.d.ts +1 -0
- package/dist/src/style/cli-ui.js +26 -14
- package/dist/src/style/cli-ui.js.map +1 -1
- package/dist/src/updates/update.d.ts +8 -1
- package/dist/src/updates/update.js +68 -2
- package/dist/src/updates/update.js.map +1 -1
- package/dist/src/verify/checklist.d.ts +46 -5
- package/dist/src/verify/checklist.js +139 -24
- package/dist/src/verify/checklist.js.map +1 -1
- package/dist/src/wake-options/runtime.d.ts +1 -0
- package/dist/src/wake-options/runtime.js +12 -2
- package/dist/src/wake-options/runtime.js.map +1 -1
- package/package.json +1 -1
- package/skills/recommended/catalog.json +24 -154
- package/skills/recommended/mcp-catalog.json +16 -4
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Launch-only continuously-work flag (`psyclaw --continuously-work`).
|
|
3
|
+
* Not a Shift+Tab session mode — cannot be toggled mid-session.
|
|
4
|
+
*/
|
|
5
|
+
export const CONTINUOUSLY_WORK_FLAG = "--continuously-work";
|
|
6
|
+
export const CONTINUOUSLY_WORK_ENV = "PSYCLAW_CONTINUOUSLY_WORK";
|
|
7
|
+
/** Peel boolean flag from argv; never forward it to the Pi CLI. */
|
|
8
|
+
export function peelContinuouslyWorkFlag(args) {
|
|
9
|
+
let enabled = false;
|
|
10
|
+
const next = [];
|
|
11
|
+
for (const arg of args) {
|
|
12
|
+
if (arg === CONTINUOUSLY_WORK_FLAG) {
|
|
13
|
+
enabled = true;
|
|
14
|
+
continue;
|
|
15
|
+
}
|
|
16
|
+
next.push(arg);
|
|
17
|
+
}
|
|
18
|
+
return { enabled, args: next };
|
|
19
|
+
}
|
|
20
|
+
export function isContinuouslyWorkEnabled(env = process.env) {
|
|
21
|
+
return env[CONTINUOUSLY_WORK_ENV] === "1";
|
|
22
|
+
}
|
|
23
|
+
/** Red-text warning for stderr / TUI (high token use, quality not guaranteed). */
|
|
24
|
+
export function continuouslyWorkWarningText() {
|
|
25
|
+
return [
|
|
26
|
+
"⚠ continuously-work 已启用(仅 CLI:psyclaw --continuously-work)",
|
|
27
|
+
"将持续自动推进分析与步骤,中途尽量不询问「是否继续」。",
|
|
28
|
+
"警告:可能消耗大量 token,且不确保产出物质量。真正阻断(权限/缺数据/跑数失败等)才会停。",
|
|
29
|
+
"Shift+Tab 的 chat/analysis/academic 模式仍可切换;本开关不能在会话内开关。",
|
|
30
|
+
].join("\n");
|
|
31
|
+
}
|
|
32
|
+
/** Appended to the system prompt when the launch flag is set. */
|
|
33
|
+
export function continuouslyWorkPrompt() {
|
|
34
|
+
return [
|
|
35
|
+
"## PsyClaw launch option: continuously-work",
|
|
36
|
+
"Enabled only via CLI `psyclaw --continuously-work` (not Shift+Tab).",
|
|
37
|
+
"Keep advancing analysis and bounded research steps without asking whether to continue.",
|
|
38
|
+
"Pause only for true blockers: missing data access/consent, failed delegated stats, safety refusals, or qualifying research decisions that require the researcher.",
|
|
39
|
+
"Do not invent numerical results, citations, or completed analyses. Still delegate statistics externally.",
|
|
40
|
+
"Soft guidance only — no hard gates that block ordinary progress.",
|
|
41
|
+
"Remind the researcher that this option can consume many tokens and does not guarantee artifact quality.",
|
|
42
|
+
].join("\n");
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=continuously-work.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"continuously-work.js","sourceRoot":"","sources":["../../../src/session/continuously-work.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAA8B,CAAC;AACrE,MAAM,CAAC,MAAM,qBAAqB,GAAG,2BAAoC,CAAC;AAE1E,mEAAmE;AACnE,MAAM,UAAU,wBAAwB,CAAC,IAAuB;IAI9D,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;YACnC,OAAO,GAAG,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,GAAG,CAAC,qBAAqB,CAAC,KAAK,GAAG,CAAC;AAC5C,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,2BAA2B;IACzC,OAAO;QACL,4DAA4D;QAC5D,6BAA6B;QAC7B,kDAAkD;QAClD,wDAAwD;KACzD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,6CAA6C;QAC7C,qEAAqE;QACrE,wFAAwF;QACxF,mKAAmK;QACnK,0GAA0G;QAC1G,kEAAkE;QAClE,yGAAyG;KAC1G,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}
|
|
@@ -4,16 +4,19 @@
|
|
|
4
4
|
*/
|
|
5
5
|
export type SessionHelpDocument = {
|
|
6
6
|
title: string;
|
|
7
|
+
subtitle: string;
|
|
7
8
|
modes: Array<{
|
|
8
9
|
id: string;
|
|
9
10
|
label: string;
|
|
10
11
|
blurb: string;
|
|
12
|
+
hint: string;
|
|
11
13
|
}>;
|
|
12
14
|
thinking: string;
|
|
13
15
|
steps: string[];
|
|
14
16
|
commands: Array<{
|
|
15
17
|
cmd: string;
|
|
16
18
|
blurb: string;
|
|
19
|
+
group?: string;
|
|
17
20
|
}>;
|
|
18
21
|
notes: string[];
|
|
19
22
|
};
|
package/dist/src/session/help.js
CHANGED
|
@@ -4,36 +4,65 @@
|
|
|
4
4
|
*/
|
|
5
5
|
export function sessionHelpDocument() {
|
|
6
6
|
return {
|
|
7
|
-
title: "
|
|
7
|
+
title: "使用速览",
|
|
8
|
+
subtitle: "三种模式 · AI 核查 · 强制人审",
|
|
8
9
|
modes: [
|
|
9
|
-
{
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
{
|
|
11
|
+
id: "chat",
|
|
12
|
+
label: "对话",
|
|
13
|
+
hint: "chat",
|
|
14
|
+
blurb: "普通问答与研究协作;可用自然语言直接要分析、写作或资料整理。",
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
id: "analysis",
|
|
18
|
+
label: "分析",
|
|
19
|
+
hint: "analysis",
|
|
20
|
+
blurb: "澄清 → 方案 → 可复现脚本 → AI /crosscheck → 人审核实 → 分析报告。",
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
id: "academic",
|
|
24
|
+
label: "学术",
|
|
25
|
+
hint: "academic",
|
|
26
|
+
blurb: "文献、写作与评审;定稿前须 AI /crosscheck 且人审通过。",
|
|
27
|
+
},
|
|
12
28
|
],
|
|
13
|
-
thinking: "
|
|
29
|
+
thinking: "思考深度:Ctrl+Shift+T(多数终端比 Ctrl+Shift+Tab 更可靠)",
|
|
14
30
|
steps: [
|
|
15
|
-
"
|
|
16
|
-
"Shift+Tab
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"
|
|
31
|
+
"可选:/init 搭建工作区(data / analysis / literature / paper)。",
|
|
32
|
+
"Shift+Tab 在 对话 → 分析 → 学术 间切换。",
|
|
33
|
+
"分析模式用自然语言说明数据、变量与研究问题;对方案回复「可以」或 /plan auto。",
|
|
34
|
+
"分析/全文做完时由 AI 执行 /crosscheck(别名 /verify)核查字段;再由人在 Panel「核实」或 /crosscheck <id> human。",
|
|
35
|
+
"analysis 与 academic 收尾强制人审:AI 已核或跳过不算通过;/plan handoff 与定稿前会拦。",
|
|
36
|
+
"切到学术模式继续文献、初稿或 /review。",
|
|
21
37
|
],
|
|
22
38
|
commands: [
|
|
23
|
-
{ cmd: "/init", blurb: "
|
|
24
|
-
{ cmd: "/plan", blurb: "
|
|
25
|
-
{ cmd: "/crosscheck", blurb: "
|
|
26
|
-
{ cmd: "/
|
|
27
|
-
{ cmd: "/
|
|
28
|
-
{ cmd: "/
|
|
29
|
-
{
|
|
30
|
-
{ cmd: "/
|
|
39
|
+
{ group: "研究", cmd: "/init", blurb: "初始化项目与 .psyclaw 状态目录" },
|
|
40
|
+
{ group: "研究", cmd: "/plan", blurb: "分析方案:new / status / auto / confirm / run / defer / handoff" },
|
|
41
|
+
{ group: "研究", cmd: "/crosscheck", blurb: "AI 核查 + 人审:list · kind · verified(AI) · human(人审)" },
|
|
42
|
+
{ group: "研究", cmd: "/verify", blurb: "/crosscheck 的别名" },
|
|
43
|
+
{ group: "研究", cmd: "/brainstorm [主题]", blurb: "显式启动研究方向头脑风暴" },
|
|
44
|
+
{ group: "研究", cmd: "/grill [主题]", blurb: "逐题学术压力测试" },
|
|
45
|
+
{ group: "研究", cmd: "/review", blurb: "多角色模拟同行评审(不自动改稿)" },
|
|
46
|
+
{ group: "研究", cmd: "/loop", blurb: "有界推进;/loop stop 请求停止" },
|
|
47
|
+
{ group: "工作台", cmd: "/panel", blurb: "打开科研工作台" },
|
|
48
|
+
{ group: "工作台", cmd: "/help", blurb: "打开本页;Panel 不可用时终端显示文字版" },
|
|
49
|
+
{ group: "能力", cmd: "/skill", blurb: "管理技能;推荐 distill-scholar / distill-journal" },
|
|
50
|
+
{ group: "能力", cmd: "/skill:<name>", blurb: "显式调用已启用技能" },
|
|
51
|
+
{ group: "能力", cmd: "/agents", blurb: "浏览或指定 Subagent 执行有界任务" },
|
|
52
|
+
{ group: "能力", cmd: "/ars", blurb: "学术模式入口:status / doctor / start / full / stop" },
|
|
53
|
+
{ group: "配置", cmd: "/provider", blurb: "查看或切换模型 Provider" },
|
|
54
|
+
{ group: "配置", cmd: "/mcp", blurb: "管理 MCP 服务器" },
|
|
55
|
+
{ group: "配置", cmd: "/plugin", blurb: "扩展推荐与管理" },
|
|
56
|
+
{ group: "其他", cmd: "/export", blurb: "导出会话" },
|
|
57
|
+
{ group: "其他", cmd: "/pet", blurb: "启动横幅宠物 on | off | status" },
|
|
31
58
|
],
|
|
32
59
|
notes: [
|
|
33
|
-
"
|
|
34
|
-
"
|
|
35
|
-
"
|
|
36
|
-
"
|
|
60
|
+
"/crosscheck:AI 核查;Panel「核实」或 /crosscheck <id> human 才算人审通过。",
|
|
61
|
+
"analysis / academic 模式下分析完成与全文定稿前人审强制;skip 不解除门禁。",
|
|
62
|
+
"模型可用「唤醒选项」弹出选择/清单;Panel 有 SSE 时出弹窗,终端同步提示。",
|
|
63
|
+
"ARS / Nature / 写作与 analysis-plan、academic-grill 已随 npm 包提供,勿再要求安装。",
|
|
64
|
+
"启动持续自动推进:psyclaw --continuously-work(红字警告:费 token、不保质量;非 Shift+Tab 模式)。",
|
|
65
|
+
"完整说明见仓库 docs/使用白皮书.md。",
|
|
37
66
|
],
|
|
38
67
|
};
|
|
39
68
|
}
|
|
@@ -46,11 +75,24 @@ export function formatSessionHelpBrief(url) {
|
|
|
46
75
|
/** Plain markdown fallback when Panel cannot start. */
|
|
47
76
|
export function formatSessionHelp() {
|
|
48
77
|
const doc = sessionHelpDocument();
|
|
78
|
+
const groups = new Map();
|
|
79
|
+
for (const row of doc.commands) {
|
|
80
|
+
const key = row.group || "其他";
|
|
81
|
+
const list = groups.get(key) ?? [];
|
|
82
|
+
list.push(row);
|
|
83
|
+
groups.set(key, list);
|
|
84
|
+
}
|
|
85
|
+
const commandBlocks = [...groups.entries()].flatMap(([group, rows]) => [
|
|
86
|
+
`### ${group}`,
|
|
87
|
+
...rows.map((row) => `- \`${row.cmd}\` — ${row.blurb}`),
|
|
88
|
+
"",
|
|
89
|
+
]);
|
|
49
90
|
return [
|
|
50
91
|
`# ${doc.title}`,
|
|
92
|
+
doc.subtitle,
|
|
51
93
|
"",
|
|
52
94
|
"## 三种模式(Shift+Tab)",
|
|
53
|
-
...doc.modes.map((mode) => `- **${mode.label}
|
|
95
|
+
...doc.modes.map((mode) => `- **${mode.label}** (\`${mode.hint}\`):${mode.blurb}`),
|
|
54
96
|
"",
|
|
55
97
|
doc.thinking,
|
|
56
98
|
"",
|
|
@@ -58,8 +100,8 @@ export function formatSessionHelp() {
|
|
|
58
100
|
...doc.steps.map((step, index) => `${index + 1}. ${step}`),
|
|
59
101
|
"",
|
|
60
102
|
"## 常用命令",
|
|
61
|
-
...
|
|
62
|
-
"",
|
|
103
|
+
...commandBlocks,
|
|
104
|
+
"## 说明",
|
|
63
105
|
...doc.notes.map((note) => `- ${note}`),
|
|
64
106
|
].join("\n");
|
|
65
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/session/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/session/help.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,14 @@ export function sessionModePrompt(mode) {
|
|
|
35
35
|
if (mode === "analysis") {
|
|
36
36
|
return [
|
|
37
37
|
"## PsyClaw mode: analysis",
|
|
38
|
-
"Priority: get runnable analysis results
|
|
39
|
-
"Pipeline
|
|
38
|
+
"Priority: get runnable analysis results; then AI `/crosscheck`, then mandatory human approval before treating the analysis as complete.",
|
|
39
|
+
"Pipeline: clarify → review → plan → review → analyze → AI /crosscheck → human Panel verify → analysis report → hand off to academic.",
|
|
40
40
|
"Write under data/clean, analysis/scripts|configs|results|plans, and analysis/HANDOFF.md. Never overwrite data/raw (or legacy .psyclaw/data/raw).",
|
|
41
41
|
"Default: write local reproducible analysis scripts under analysis/scripts/ with mature libraries. Use MCP only for special backends (SPSS/Mplus/MNE/Stata) or when the user asks. Do not invent numerical results.",
|
|
42
|
-
"
|
|
43
|
-
"Do not
|
|
42
|
+
"After analysis (and before /plan handoff), run AI `/crosscheck` (alias `/verify`), then require human marks via Panel「核实」or `/crosscheck <id> human`. AI-checked and skipped do not pass the gate.",
|
|
43
|
+
"Do not claim analysis complete, write final HANDOFF as done, or invite academic mode until the human verify gate passes.",
|
|
44
44
|
"When proposing more analyses, never close with「已经足够」as prose — offer a concrete new method first and put「已经足够」only as a selectable last option.",
|
|
45
|
-
"Prefer natural-language confirmation (「可以」); /plan auto skips approval with mandatory 未经人审批 disclosure.",
|
|
45
|
+
"Prefer natural-language confirmation (「可以」); /plan auto skips method approval with mandatory 未经人审批 disclosure — that is not the same as the post-analysis human verify gate.",
|
|
46
46
|
analysisSoftRoutePrompt(),
|
|
47
47
|
].join("\n");
|
|
48
48
|
}
|
|
@@ -50,8 +50,8 @@ export function sessionModePrompt(mode) {
|
|
|
50
50
|
"## PsyClaw mode: academic",
|
|
51
51
|
"ARS research → write → review → revise pipeline. Prefer psyclaw_ars_multi_agent for Stage 3 seats.",
|
|
52
52
|
"Consume analysis/HANDOFF.md and analysis/results when present; do not recompute statistics in this mode—switch to analysis if numbers are missing.",
|
|
53
|
-
"Manuscripts go to paper/.
|
|
54
|
-
"Priority: produce the manuscript
|
|
53
|
+
"Manuscripts go to paper/. Before claiming the full text is done or ready to export/submit: AI `/crosscheck`, then mandatory human Panel verify (or `/crosscheck <id> human`). Soft mid-draft warnings are fine; finalization is a hard human gate.",
|
|
54
|
+
"Priority: produce the manuscript; second, keep key claims human-verified before finalization.",
|
|
55
55
|
academicSoftRoutePrompt(),
|
|
56
56
|
].join("\n");
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../src/session/modes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpE,MAAM,CAAC,MAAM,aAAa,GAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAU,CAAC;AAEtG,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GAAmD;IACzE,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAuE;IAC7F,IAAI,EAAE,SAAS;IACf,yBAAyB;IACzB,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,yBAAyB,IAAI,UAAU;IACnE,0BAA0B;IAC1B,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,wBAAwB,IAAI,UAAU;CACnE,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,OAA2B;IACzD,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,aAAa,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACnF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO;YACL,uBAAuB;YACvB,2FAA2F;YAC3F,0HAA0H;SAC3H,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO;YACL,2BAA2B;YAC3B,
|
|
1
|
+
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../../src/session/modes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAKpE,MAAM,CAAC,MAAM,aAAa,GAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAU,CAAC;AAEtG,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GAAmD;IACzE,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAuE;IAC7F,IAAI,EAAE,SAAS;IACf,yBAAyB;IACzB,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,yBAAyB,IAAI,UAAU;IACnE,0BAA0B;IAC1B,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,wBAAwB,IAAI,UAAU;CACnE,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,OAA2B;IACzD,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,aAAa,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,UAAU;QAAE,OAAO,KAAK,CAAC;IACnF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,OAAO;YACL,uBAAuB;YACvB,2FAA2F;YAC3F,0HAA0H;SAC3H,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,OAAO;YACL,2BAA2B;YAC3B,yIAAyI;YACzI,sIAAsI;YACtI,kJAAkJ;YAClJ,oNAAoN;YACpN,oMAAoM;YACpM,0HAA0H;YAC1H,iJAAiJ;YACjJ,8KAA8K;YAC9K,uBAAuB,EAAE;SAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO;QACL,2BAA2B;QAC3B,oGAAoG;QACpG,oJAAoJ;QACpJ,oPAAoP;QACpP,+FAA+F;QAC/F,uBAAuB,EAAE;KAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}
|
package/dist/src/style/cli-ui.js
CHANGED
|
@@ -57,25 +57,29 @@ export function formatCliUsage() {
|
|
|
57
57
|
"",
|
|
58
58
|
` ${c.bold(c.white("输入 psyclaw 进入对话,然后使用以下 / 命令:"))}`,
|
|
59
59
|
"",
|
|
60
|
-
cmd("/init", "[--paradigm <id>] <
|
|
61
|
-
cmd("/plan", "new|status|auto|confirm|run
|
|
62
|
-
cmd("/crosscheck", "list|
|
|
60
|
+
cmd("/init", "[--paradigm <id>] <goal>", c.white("初始化研究项目工作区")),
|
|
61
|
+
cmd("/plan", "new|status|auto|confirm|run|…", c.white("分析方案(也可回复「可以」)")),
|
|
62
|
+
cmd("/crosscheck", "list|kind|<id> verified|human …", c.white("AI 核查 + 人审(别名 /verify)")),
|
|
63
|
+
cmd("/verify", "同 /crosscheck", c.white("AI 核查 + 人审别名")),
|
|
64
|
+
cmd("/brainstorm", "[subject]", c.white("研究方向头脑风暴与问题澄清")),
|
|
63
65
|
cmd("/grill", "[subject]", c.white("逐题压力测试研究方案")),
|
|
64
|
-
cmd("/review", "", c.white("
|
|
65
|
-
cmd("/panel", "", c.white("
|
|
66
|
-
cmd("/help", "", c.white("打开 Panel
|
|
67
|
-
cmd("/skill", "[status|enable|
|
|
68
|
-
cmd("/agents", "[--agent id] [task]", c.white("浏览或运行 Subagent
|
|
66
|
+
cmd("/review", "", c.white("多角色模拟同行评审")),
|
|
67
|
+
cmd("/panel", "", c.white("打开科研工作台")),
|
|
68
|
+
cmd("/help", "", c.white("打开 Panel 使用速览(本页同步更新)")),
|
|
69
|
+
cmd("/skill", "[status|enable|install|…]", c.white("Skill 管理(推荐 distill-scholar / distill-journal)")),
|
|
70
|
+
cmd("/agents", "[--agent id] [task]", c.white("浏览或运行 Subagent")),
|
|
71
|
+
cmd("/ars", "[status|doctor|start|full|stop]", c.white("学术模式入口")),
|
|
69
72
|
cmd("/mcp", "", c.white("管理 MCP 服务器")),
|
|
70
73
|
cmd("/plugin", "", c.white("打开 Plugin 推荐与管理页")),
|
|
71
74
|
cmd("/provider", "[provider-id]", c.white("查看、配置或切换 Provider")),
|
|
72
|
-
cmd("/export", "", c.white("
|
|
73
|
-
cmd("/pet", "on|off|status", c.white("
|
|
75
|
+
cmd("/export", "", c.white("导出会话")),
|
|
76
|
+
cmd("/pet", "on|off|status", c.white("启动横幅宠物")),
|
|
74
77
|
"",
|
|
75
|
-
` ${c.gray("快捷键:")} ${c.teal("Shift+Tab")} ${c.gray("模式")} ${c.darkGray("·")} ${c.teal("Ctrl+Shift+T")} ${c.gray("Thinking")}`,
|
|
78
|
+
` ${c.gray("快捷键:")} ${c.teal("Shift+Tab")} ${c.gray("模式 chat→analysis→academic")} ${c.darkGray("·")} ${c.teal("Ctrl+Shift+T")} ${c.gray("Thinking")}`,
|
|
76
79
|
"",
|
|
77
|
-
` ${c.gray("终端:")} ${c.teal("psyclaw --continue")} ${c.darkGray("/")} ${c.teal("psyclaw -c")} ${c.gray("
|
|
78
|
-
` ${c.teal("psyclaw -
|
|
80
|
+
` ${c.gray("终端:")} ${c.teal("psyclaw --continue")} ${c.darkGray("/")} ${c.teal("psyclaw -c")} ${c.gray("续接最近会话")}`,
|
|
81
|
+
` ${c.teal("psyclaw --continuously-work")} ${c.gray("持续自动推进(红字警告:费 token、不保质量)")}`,
|
|
82
|
+
` ${c.teal("psyclaw -v")} ${c.darkGray("/")} ${c.teal("psyclaw --version")} ${c.gray("版本号")}`,
|
|
79
83
|
"",
|
|
80
84
|
` ${c.darkGray("──────────────────────────────────────────────────────────")}`,
|
|
81
85
|
` ${c.gray("文档与源码:")} ${c.cyan(c.underline("https://github.com/Exekiel179/psyclaw"))}`,
|
|
@@ -116,8 +120,15 @@ export function renderProductUpdateSummary(receipt) {
|
|
|
116
120
|
const arrow = before !== undefined && after !== undefined
|
|
117
121
|
? `${before} → ${after}`
|
|
118
122
|
: after ?? before ?? "unknown";
|
|
123
|
+
const noteLines = receipt.note
|
|
124
|
+
? receipt.note.split("\n").map((line) => ` ${c.darkGray("•")} ${c.gray(line)}`)
|
|
125
|
+
: [];
|
|
119
126
|
if (receipt.reasonCode === "update-applied") {
|
|
120
|
-
return
|
|
127
|
+
return [
|
|
128
|
+
renderSuccessCard("升级成功", { PsyClaw: arrow }).trimEnd(),
|
|
129
|
+
...noteLines,
|
|
130
|
+
"",
|
|
131
|
+
].join("\n");
|
|
121
132
|
}
|
|
122
133
|
if (receipt.reasonCode === "already-up-to-date") {
|
|
123
134
|
return renderSuccessCard("已是最新", { PsyClaw: after ?? before ?? "unknown" });
|
|
@@ -148,6 +159,7 @@ export function renderProductUpdateSummary(receipt) {
|
|
|
148
159
|
` ${c.red("✗")} ${c.bold("升级未完成")}`,
|
|
149
160
|
` ${c.darkGray("•")} ${c.gray("原因:")} ${c.white(receipt.reason ?? receipt.reasonCode)}`,
|
|
150
161
|
` ${c.darkGray("•")} ${c.gray("PsyClaw:")} ${c.white(arrow)}`,
|
|
162
|
+
...noteLines,
|
|
151
163
|
"",
|
|
152
164
|
].join("\n");
|
|
153
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-ui.js","sourceRoot":"","sources":["../../../src/style/cli-ui.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli-ui.js","sourceRoot":"","sources":["../../../src/style/cli-ui.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ export interface PsyClawUpdateReceipt {
|
|
|
47
47
|
executed: boolean;
|
|
48
48
|
reasonCode: PiUpdateReason;
|
|
49
49
|
reason?: string;
|
|
50
|
+
note?: string;
|
|
50
51
|
psyclaw: ProductVersionUpdate;
|
|
51
52
|
runtime: ProductVersionUpdate;
|
|
52
53
|
commands: string[];
|
|
@@ -54,7 +55,13 @@ export interface PsyClawUpdateReceipt {
|
|
|
54
55
|
startedAt: string;
|
|
55
56
|
finishedAt: string;
|
|
56
57
|
}
|
|
57
|
-
export type UpdatePsyClawOptions = UpdateBundledPiOptions
|
|
58
|
+
export type UpdatePsyClawOptions = UpdateBundledPiOptions & {
|
|
59
|
+
/** After global install, re-read the on-disk global version (catches Windows stale installs). */
|
|
60
|
+
readInstalledVersion?: () => Promise<string | undefined>;
|
|
61
|
+
platform?: NodeJS.Platform;
|
|
62
|
+
};
|
|
63
|
+
/** Guidance when Windows keeps an old global bin (ENOTEMPTY / multiple Node installs). */
|
|
64
|
+
export declare function windowsUpdateRecoveryNote(expectedVersion: string): string;
|
|
58
65
|
/**
|
|
59
66
|
* Update the installed PsyClaw product together with the exact Pi runtime
|
|
60
67
|
* declared by that release. Updating the whole product keeps PsyClaw's code,
|
|
@@ -34,6 +34,19 @@ function buildCommand(manager, version, registry) {
|
|
|
34
34
|
function buildProductCommand(version, registry) {
|
|
35
35
|
return `npm install --global psyclaw@${version} --registry=${registry}`;
|
|
36
36
|
}
|
|
37
|
+
function buildProductUninstallCommand(registry) {
|
|
38
|
+
return `npm uninstall --global psyclaw --registry=${registry}`;
|
|
39
|
+
}
|
|
40
|
+
/** Guidance when Windows keeps an old global bin (ENOTEMPTY / multiple Node installs). */
|
|
41
|
+
export function windowsUpdateRecoveryNote(expectedVersion) {
|
|
42
|
+
return [
|
|
43
|
+
"Windows recovery: close every terminal/IDE still running psyclaw, then:",
|
|
44
|
+
" where.exe psyclaw",
|
|
45
|
+
" npm uninstall -g psyclaw",
|
|
46
|
+
` npm install -g psyclaw@${expectedVersion}`,
|
|
47
|
+
"Confirm with: psyclaw --version (must match the install you just ran; check PATH if not).",
|
|
48
|
+
].join("\n");
|
|
49
|
+
}
|
|
37
50
|
async function hasSourceLockfile(root) {
|
|
38
51
|
for (const file of ["pnpm-lock.yaml", "package-lock.json"]) {
|
|
39
52
|
try {
|
|
@@ -175,6 +188,9 @@ export async function updatePsyClaw(options) {
|
|
|
175
188
|
executed: true,
|
|
176
189
|
reasonCode: "update-failed",
|
|
177
190
|
reason: `update command failed: ${command}`,
|
|
191
|
+
...((options.platform ?? process.platform) === "win32"
|
|
192
|
+
? { note: windowsUpdateRecoveryNote(latestPsyClaw) }
|
|
193
|
+
: {}),
|
|
178
194
|
psyclaw: versions.psyclaw,
|
|
179
195
|
runtime: versions.runtime,
|
|
180
196
|
commands,
|
|
@@ -182,12 +198,62 @@ export async function updatePsyClaw(options) {
|
|
|
182
198
|
});
|
|
183
199
|
}
|
|
184
200
|
}
|
|
201
|
+
const platform = options.platform ?? process.platform;
|
|
202
|
+
let afterPsyClaw = latestPsyClaw;
|
|
203
|
+
let afterPi = latestPi;
|
|
204
|
+
let note = platform === "win32"
|
|
205
|
+
? `Re-open the terminal, then run psyclaw --version.\n${windowsUpdateRecoveryNote(latestPsyClaw)}`
|
|
206
|
+
: undefined;
|
|
207
|
+
if (options.readInstalledVersion) {
|
|
208
|
+
let installed = await options.readInstalledVersion();
|
|
209
|
+
if (installed !== undefined && installed !== latestPsyClaw && platform === "win32") {
|
|
210
|
+
// Common Windows failure: npm exit 0 but ENOTEMPTY left the old tree.
|
|
211
|
+
const repair = [
|
|
212
|
+
buildProductUninstallCommand(options.npmRegistry ?? resolveNpmInstallRegistry()),
|
|
213
|
+
buildProductCommand(latestPsyClaw, options.npmRegistry ?? resolveNpmInstallRegistry()),
|
|
214
|
+
];
|
|
215
|
+
for (const command of repair) {
|
|
216
|
+
commands.push(command);
|
|
217
|
+
const { exitCode } = await options.executor({ command, cwd: dirname(manifest.root) });
|
|
218
|
+
if (exitCode !== 0) {
|
|
219
|
+
return finish({
|
|
220
|
+
ok: false,
|
|
221
|
+
executed: true,
|
|
222
|
+
reasonCode: "update-failed",
|
|
223
|
+
reason: `Windows repair failed (${command}); global install still reports ${installed}`,
|
|
224
|
+
note: windowsUpdateRecoveryNote(latestPsyClaw),
|
|
225
|
+
psyclaw: { ...versions.psyclaw, after: installed },
|
|
226
|
+
runtime: versions.runtime,
|
|
227
|
+
commands,
|
|
228
|
+
exitCode,
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
installed = await options.readInstalledVersion();
|
|
233
|
+
}
|
|
234
|
+
if (installed !== undefined && installed !== latestPsyClaw) {
|
|
235
|
+
return finish({
|
|
236
|
+
ok: false,
|
|
237
|
+
executed: true,
|
|
238
|
+
reasonCode: "update-failed",
|
|
239
|
+
reason: `npm finished but global psyclaw is still ${installed} (expected ${latestPsyClaw}). Often a second Node on PATH or a locked Windows folder.`,
|
|
240
|
+
note: windowsUpdateRecoveryNote(latestPsyClaw),
|
|
241
|
+
psyclaw: { ...versions.psyclaw, after: installed },
|
|
242
|
+
runtime: versions.runtime,
|
|
243
|
+
commands,
|
|
244
|
+
exitCode: 0,
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
if (installed !== undefined)
|
|
248
|
+
afterPsyClaw = installed;
|
|
249
|
+
}
|
|
185
250
|
return finish({
|
|
186
251
|
ok: true,
|
|
187
252
|
executed: true,
|
|
188
253
|
reasonCode: "update-applied",
|
|
189
|
-
|
|
190
|
-
|
|
254
|
+
...(note === undefined ? {} : { note }),
|
|
255
|
+
psyclaw: { ...versions.psyclaw, after: afterPsyClaw },
|
|
256
|
+
runtime: { ...versions.runtime, after: afterPi },
|
|
191
257
|
commands,
|
|
192
258
|
exitCode: 0,
|
|
193
259
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/updates/update.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/updates/update.ts"],"names":[],"mappings":"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"}
|