psyclaw 0.27.23 → 0.28.1

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

@@ -2,7 +2,12 @@ import { DefaultPackageManager, getAgentDir, SettingsManager } from "@earendil-w
 import { Type } from "typebox";
 import { appendApproval, approvalInputDigest, asProject, assertResearchDecision, bootstrapProject, projectPaths, readApprovals, resolveResearchDecision, runOfflineBrief, runInstitutionalFulltext, runLiteratureReview, runExpertReview, runAnalysisDelegation, runWritingReview, runMetaAnalysis, createStageRunner, exportAcademicDocument, recordCitationUse, runParallelPeerReview, writeHandoff } from "../../index.js";
 import { runPlanWithPi } from "../../orchestration/pi-executor.js";
+import { customPersonaPlan, parseAgentsRequest } from "../../orchestration/personas.js";
+import { elevatedEffects, formatEffects, hasElevatedEffects, normalizeEffects, toolsForEffects } from "../../orchestration/effects.js";
+import { agentManagerRows, loadSelectablePersonas } from "../../agents/recommended-personas.js";
 import { atomicWriteFile } from "../../project/jsonl.js";
+import { applyCreation, previewCreation, runArsMultiAgentBridge } from "../../index.js";
+import { loadUserRules, userRulesPrompt } from "../../rules/user-rules.js";
 import { RunEventLog } from "../../panel/events.js";
 import { readProject } from "../../research/ledger.js";
 import { join } from "node:path";
@@ -15,6 +20,7 @@ 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, ProviderPickerComponent, } from "../../tui/provider-picker.js";
+import { ARS_REPOSITORY_URL, ARS_UPSTREAM_COMMIT, ARS_UPSTREAM_REF, PSYCLAW_ARS_PROFILE_VERSION, detectNatureArsFillers, formatNatureArsFillerStatus, isArsPiActive, isArsPiTurn, psyclawArsPatch, } from "../../ars/profile.js";
 const PARADIGMS = new Set([
     "survey-observational",
     "qualitative-thematic",
@@ -167,6 +173,14 @@ function researchTaskPlan(runId, objective) {
         horizon: { strategy: "hierarchical-plan-act-reflect", maxIterations: 12, reflectionEvery: 1 },
     };
 }
+function creationCommandPrompt(kind, request) {
+    return [
+        `The user explicitly requested /create-${kind}.`,
+        "Call the psyclaw_create tool exactly once. Convert the request into the narrow structured fields accepted by that tool.",
+        "Do not add permissions, shell commands, network access, credential access, gate bypasses, or external publication authority.",
+        `Requested ${kind}: ${request || "Ask the user for the missing name, description, and instructions."}`,
+    ].join("\n");
+}
 function academicGrillRequest(subject, mode) {
     return [
         "先调用 psyclaw_skill 工具加载 PsyClaw 内置的 academic-grill Skill，然后严格遵循该 Skill 对我的学术研究进行追问。",
@@ -255,6 +269,10 @@ function parseRunArgs(args) {
         mode: auto ? "auto" : "human",
     };
 }
+function contextProjectTrusted(ctx) {
+    const candidate = ctx;
+    return typeof candidate.isProjectTrusted === "function" && candidate.isProjectTrusted();
+}
 function toolApprovalSummary(toolName, input) {
     const record = input && typeof input === "object" && !Array.isArray(input) ? input : {};
     const target = [record.path, record.file_path, record.command, record.action, record.server, record.tool]
@@ -267,16 +285,6 @@ function toolNeedsApproval(toolName, input) {
     const action = input && typeof input === "object" && !Array.isArray(input) ? input.action : undefined;
     return typeof action === "string" && /write|save|publish|install|download|execute|call/i.test(action);
 }
-function autoApprovalBlocked(toolName, input) {
-    const text = JSON.stringify(input ?? {}).toLocaleLowerCase();
-    const mutatingTool = ["write", "edit", "bash", "powershell"].includes(toolName);
-    if (mutatingTool && /(?:data[\\/]raw|credential|secret|auth\.json|api[_ -]?key)/.test(text))
-        return "该操作可能覆盖原始数据或接触凭据，不能纳入 /run 的常规授权";
-    if (["bash", "powershell"].includes(toolName) && /\b(rm|rmdir|del|remove-item|format|shutdown|reboot|git\s+reset\s+--hard)\b/i.test(text)) {
-        return "破坏性命令不能纳入 /run 的常规授权";
-    }
-    return undefined;
-}
 function requiresSeparateOperationConfirmation(toolName, input) {
     const text = `${toolName} ${JSON.stringify(input ?? {})}`;
     return /submit\s+(?:manuscript|paper|form)|投稿(?:到|至)|发布到(?:外部|期刊|会议|网站)|send\s+(?:email|message)|邮件发送/i.test(text);
@@ -340,7 +348,14 @@ async function recommendedItems(kind) {
     return { items: [], plugins: [], externalTools: [], installPrep: [] };
 }
 function pluginSourceIdentity(source) {
-    return source.trim().replace(/^git:/, "").replace(/\.git$/i, "").replace(/\/$/, "").toLocaleLowerCase();
+    return source.trim()
+        .replace(/^git:/, "")
+        .replace(/^https?:\/\//i, "")
+        .replace(/^git@([^:]+):/i, "$1/")
+        .replace(/@[^/]+$/, "")
+        .replace(/\.git$/i, "")
+        .replace(/\/$/, "")
+        .toLocaleLowerCase();
 }
 function nativePluginManager(ctx) {
     const settingsManager = SettingsManager.create(ctx.cwd, getAgentDir(), { projectTrusted: ctx.isProjectTrusted() });
@@ -432,7 +447,7 @@ async function skillManagerRows(root, state) {
             // A managed target that exists on disk but fails validation (e.g. a URL
             // install whose manifest/hash does not match the pinned catalog) is still
             // shown as installed so the user sees it; enabling it only takes effect
-            // once the install is repaired through /install.
+            // once the install is repaired through /skill.
             let onDisk = false;
             try {
                 const target = recommendedSkillTarget(root, id, scope);
@@ -626,24 +641,57 @@ async function openPluginManager(ctx, rows) {
         footer: "↑/↓ 移动 · Enter 安装或重新安装 · Esc 关闭",
         enterAction: "install",
         toggleEnabled: false,
-        enabledText: "已安装；Enter 可重新安装",
-        missingMessage: "按 Enter 选择项目目录或系统目录并安装。",
+        enabledText: "已由 Pi 原生 Plugin 管理器安装；Enter 可重新安装",
+        missingMessage: "按 Enter 安装到当前项目。",
     })));
 }
+function agentManagerItems(rows) {
+    return rows.map((row) => ({
+        id: row.id,
+        name: row.name,
+        description: row.description,
+        status: row.status,
+        sourceRef: row.sourceRef,
+        details: [
+            `类别：${row.stage}`,
+            `角色：${row.role}`,
+            `来源：${row.source === "bundled" ? "内置 Subagent（类似 Claude Explore/Plan）" : "项目 .psyclaw/agents/custom"}`,
+            `运行：/agents --agent ${row.id} <只读研究任务>`,
+        ],
+    }));
+}
+async function openAgentManager(ctx, rows) {
+    return ctx.ui.custom((tui, theme, keybindings, done) => (new SkillManagerComponent(agentManagerItems(rows), tui, theme, keybindings, done, {
+        title: "Subagent（对齐 Claude Code）",
+        itemLabel: "Subagent",
+        footer: "↑/↓ 移动 · Enter 查看用法 · Esc 关闭 · 运行: /agents --agent <id> <任务>",
+        enterAction: "details",
+        toggleEnabled: false,
+        enabledText: "已可选用",
+        lockedMessage: "内置 Subagent 始终可用。运行：/agents --agent <id> <只读研究任务>",
+    })));
+}
+async function showAgentManager(ctx, statusOnly = false) {
+    const rows = await agentManagerRows(ctx.cwd);
+    if (!ctx.hasUI || typeof ctx.ui.custom !== "function" || statusOnly) {
+        ctx.ui.notify(rows.map((row) => `${row.status === "core" ? "◆" : "●"} ${row.id} — ${row.name}（${row.stage}）`).join("\n")
+            || "暂无 Subagent。可用 /create-subagent 创建（类似 Claude Code）。", "info");
+        return;
+    }
+    while (true) {
+        const action = await openAgentManager(ctx, await agentManagerRows(ctx.cwd));
+        if (action.type === "close")
+            return;
+        // Enter/Space only show inline notices; keep the manager open.
+    }
+}
 async function installRecommendedPlugin(ctx, row) {
     if (!row.installable)
         throw new Error(row.reason ?? `${row.name} 尚未提供可安装的 Plugin package`);
     if (!row.sourceRef)
         throw new Error(`推荐 Plugin 没有来源网址: ${row.id}`);
-    const location = await ctx.ui.select("选择 Plugin 安装位置", ["项目目录（仅当前项目）", "系统目录（所有项目）"]);
-    if (!location)
-        return;
-    const local = location.startsWith("项目目录");
-    const approved = await ctx.ui.confirm(`安装 Plugin “${row.name}”？`, `来源：${row.sourceRef}\n安装位置：${location}\n安装完成后需要执行 /reload。`);
-    if (!approved)
-        return;
-    await nativePluginManager(ctx).installAndPersist(row.sourceRef, { local });
-    ctx.ui.notify(`${row.name} 已安装到${location}。请执行 /reload 载入 Plugin。`, "info");
+    await nativePluginManager(ctx).installAndPersist(row.sourceRef, { local: true });
+    ctx.ui.notify(`${row.name} 已安装到项目目录（仅当前项目）。请执行 /reload 载入 Plugin。`, "info");
 }
 async function showPluginManager(args, ctx) {
     const [verb, id] = args.trim().split(/\s+/).filter(Boolean);
@@ -705,16 +753,6 @@ function modelMcpInstallTask(root, row, plan) {
         `成功后确保 .psyclaw/recommendations.json 的 mcp 列表包含 ${JSON.stringify(row.id)}，说明写入了哪些配置，并提醒用户执行 /reload。若安装命令本身失败，直接诊断并修复；只有遇到必须由用户提供的凭据或外部软件许可证时才向用户说明。`,
     ].join("\n");
 }
-function modelExternalToolInstallTask(root, item) {
-    return [
-        `安装推荐外部工具：${String(item.name ?? item.id ?? "external tool")}。`,
-        `官方来源：${String(item.sourceRef ?? "未提供；请停止并告知用户")}`,
-        `当前工作目录：${root}`,
-        String(item.installHint ?? "读取官方最新安装说明，选择适合当前操作系统的安装方式。"),
-        "用户已通过 /install 明确请求安装。直接读取官方说明、执行安装并验证版本或最小命令，不要再次请求安装许可。不要读取或输出凭据。",
-        "这是外部工具，不要将它宣称为来源仓库提供的 Skill 或 Pi Plugin。完成后报告实际安装位置、版本和验证结果；只有需要凭据、商业许可证或管理员提权时再请用户处理。",
-    ].join("\n");
-}
 async function queueModelMcpInstall(pi, ctx, row, plan) {
     if (!row.sourceRef)
         throw new Error(`推荐 MCP 没有来源网址: ${row.id}`);
@@ -1069,6 +1107,12 @@ const WORKFLOW_RUNNERS = {
     "writing-review": runWritingReview,
     "expert-review": runExpertReview,
 };
+function natureFillersFromCommandContext(ctx) {
+    return detectNatureArsFillers({
+        skills: ctx.getSystemPromptOptions?.()?.skills,
+        systemPrompt: ctx.getSystemPrompt?.(),
+    });
+}
 export default function psyclawExtension(pi) {
     const developerCommands = process.env.PSYCLAW_DEVELOPER_COMMANDS === "1";
     const legacyTestApi = typeof pi.registerTool !== "function";
@@ -1089,6 +1133,25 @@ export default function psyclawExtension(pi) {
         });
     if (!legacyTestApi && typeof pi.on === "function")
         pi.on("session_shutdown", () => runtimeMcps.close());
+    if (!legacyTestApi && typeof pi.on === "function")
+        pi.on("before_agent_start", async (event, ctx) => {
+            if (!(await readControlledRun(ctx?.cwd ?? process.cwd())))
+                return;
+            const prompt = userRulesPrompt(await loadUserRules(ctx?.cwd ?? process.cwd()));
+            if (prompt)
+                return { systemPrompt: `${event.systemPrompt}\n\n${prompt}` };
+        });
+    if (!legacyTestApi && typeof pi.on === "function")
+        pi.on("before_agent_start", (event, ctx) => {
+            if (!isArsPiTurn(event.systemPrompt) && !isArsPiActive(ctx?.sessionManager))
+                return;
+            return {
+                systemPrompt: `${event.systemPrompt}\n\n${psyclawArsPatch({
+                    skills: event.systemPromptOptions?.skills,
+                    systemPrompt: event.systemPrompt,
+                })}`,
+            };
+        });
     if (!legacyTestApi && typeof pi.on === "function")
         pi.on("input", (event, ctx) => {
             if (event.source === "extension")
@@ -1098,25 +1161,24 @@ export default function psyclawExtension(pi) {
             ctx.ui.notify("PsyClaw 已统一隐藏底层登录命令。请使用 /provider 配置、切换或更新模型凭据。", "info");
             return { action: "handled" };
         });
+    if (!legacyTestApi && typeof pi.on === "function")
+        pi.on("input", async (event, ctx) => {
+            if (event.source === "extension" || isArsPiActive(ctx.sessionManager))
+                return;
+            if (!/^\/(?:ars-[a-z0-9-]+|skill:(?:deep-research|academic-paper|academic-paper-reviewer|academic-pipeline))(?:\s|$)/i.test(event.text.trim()))
+                return;
+            if (!ctx.hasUI)
+                return { action: "handled" };
+            const approved = await ctx.ui.confirm("启用 ARS？", `来源：${ARS_REPOSITORY_URL} @ ${ARS_UPSTREAM_REF}\n许可：CC BY-NC 4.0，仅限非商业用途。关键研究阶段仍会请求确认。`);
+            if (!approved)
+                return { action: "handled" };
+        });
     if (!legacyTestApi && typeof pi.on === "function")
         pi.on("tool_call", async (event, ctx) => {
             const run = await readControlledRun(ctx.cwd);
             if (!run || !toolNeedsApproval(event.toolName, event.input))
                 return;
             const summary = toolApprovalSummary(event.toolName, event.input);
-            const blockedReason = autoApprovalBlocked(event.toolName, event.input);
-            if (blockedReason) {
-                await appendApproval(ctx.cwd, {
-                    kind: "tool",
-                    nodeId: event.toolCallId,
-                    decision: "rejected",
-                    actor: "auto",
-                    runId: run.runId,
-                    sha256: approvalInputDigest({ toolName: event.toolName, input: event.input }),
-                    summary: blockedReason,
-                });
-                return { block: true, terminate: true, reason: blockedReason };
-            }
             if (requiresSeparateOperationConfirmation(event.toolName, event.input)) {
                 if (!ctx.hasUI)
                     return { block: true, terminate: true, reason: "外部发布需要用户在交互界面中明确确认" };
@@ -1333,6 +1395,19 @@ export default function psyclawExtension(pi) {
                 ctx.ui.notify("已启动有界研究循环；使用 /loop stop 可请求中止", "info");
             },
         });
+    for (const kind of ["skill", "hook", "rule", "subagent"]) {
+        if (!legacyTestApi)
+            pi.registerCommand(`create-${kind}`, {
+                description: `预览并创建项目级 ${kind}`,
+                handler: async (args, ctx) => {
+                    if (!args.trim()) {
+                        ctx.ui.notify(`Usage: /create-${kind} <name and requirements>`, "info");
+                        return;
+                    }
+                    pi.sendUserMessage(creationCommandPrompt(kind, args.trim()), ctx.isIdle() ? {} : { deliverAs: "followUp" });
+                },
+            });
+    }
     if (!legacyTestApi)
         pi.registerCommand("skill", {
             description: "管理和安装 Skill",
@@ -1374,6 +1449,61 @@ export default function psyclawExtension(pi) {
                 ctx.ui.notify("Usage: /skill [status|enable <id>|disable <id>|enable-all|disable-all|install <local-directory>]", "info");
             },
         });
+    if (!legacyTestApi)
+        pi.registerCommand("ars", {
+            description: "启动或管理 PsyClaw ARS 模式",
+            handler: async (args, ctx) => {
+                try {
+                    const [action = "status", ...rest] = args.trim().split(/\s+/).filter(Boolean);
+                    if (action === "status") {
+                        ctx.ui.notify([
+                            `PsyClaw ARS profile v${PSYCLAW_ARS_PROFILE_VERSION}`,
+                            "模式：轻量 ARS（不要求 /init 或 /run）",
+                            `来源：${ARS_REPOSITORY_URL} @ ${ARS_UPSTREAM_REF} (${ARS_UPSTREAM_COMMIT.slice(0, 12)})`,
+                            "入口：/ars doctor，/ars start，/ars full <task>，/ars stop",
+                            formatNatureArsFillerStatus(natureFillersFromCommandContext(ctx)),
+                        ].join("\n"), "info");
+                        return;
+                    }
+                    if (action === "install") {
+                        ctx.ui.notify("ARS 可直接使用：运行 /ars start 或 /ars full <task>。", "info");
+                        return;
+                    }
+                    if ((action === "start" || action === "full") && !isArsPiActive(ctx.sessionManager)) {
+                        const approved = await ctx.ui.confirm("启用 ARS？", `来源：${ARS_REPOSITORY_URL} @ ${ARS_UPSTREAM_REF}\n许可：CC BY-NC 4.0，仅限非商业用途。关键研究阶段仍会请求确认。`);
+                        if (!approved)
+                            return;
+                    }
+                    const upstreamCommand = action === "doctor"
+                        ? "/ars-pi-doctor"
+                        : action === "start"
+                            ? "/ars-pi-start"
+                            : action === "stop"
+                                ? "/ars-pi-stop"
+                                : action === "full"
+                                    ? `/ars-full${rest.length > 0 ? ` ${rest.join(" ")}` : ""}`
+                                    : undefined;
+                    if (!upstreamCommand) {
+                        ctx.ui.notify("Usage: /ars [status|doctor|start|full <task>|stop]", "info");
+                        return;
+                    }
+                    if (action === "doctor" || action === "full" || action === "start") {
+                        ctx.ui.notify(formatNatureArsFillerStatus(natureFillersFromCommandContext(ctx)), "info");
+                    }
+                    // A queued prompt does not get a fresh system prompt in Pi. Wait so the
+                    // upstream wrapper can activate ARS and inject its compatibility note.
+                    if (action === "full" && !ctx.isIdle())
+                        await ctx.waitForIdle();
+                    pi.sendUserMessage(upstreamCommand, {
+                        ...(!ctx.isIdle() ? { deliverAs: "followUp" } : {}),
+                        expandPromptTemplates: true,
+                    });
+                }
+                catch (error) {
+                    await notifyError(ctx, error);
+                }
+            },
+        });
     if (!legacyTestApi)
         pi.registerCommand("plugin", {
             description: "浏览推荐并管理 Plugin / Extension",
@@ -1428,50 +1558,6 @@ export default function psyclawExtension(pi) {
                 }
             },
         });
-    if (!legacyTestApi)
-        pi.registerCommand("install", {
-            description: "查看推荐 Skill/MCP，或交给当前模型安装",
-            handler: async (args, ctx) => {
-                try {
-                    const [kind, id] = args.trim().split(/\s+/, 2);
-                    if (!kind) {
-                        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.id)} — ${String(item.name)}`);
-                        const toolLines = skills.externalTools.slice(0, 8).map((item) => `外部工具: ${String(item.id)} — ${String(item.name)}`);
-                        ctx.ui.notify(["推荐安装入口", "", ...skillLines, ...pluginLines, ...mcpLines, "", ...toolLines, "", "告诉我需要安装的推荐项，我会自动完成安装与配置；有影响同权限的变更时才暂停确认。也可以打开 /panel 选择推荐项。"].join("\n"), "info");
-                        return;
-                    }
-                    if (kind !== "skill" && kind !== "mcp" && kind !== "external")
-                        throw new Error("Usage: /install skill|mcp|external <id>");
-                    if (!id) {
-                        if (kind === "skill")
-                            await showSkillManager(pi, "", ctx);
-                        else if (kind === "mcp")
-                            await showMcpManager(pi, "", ctx, runtimeMcps);
-                        else
-                            ctx.ui.notify("Usage: /install external <id>", "info");
-                        return;
-                    }
-                    if (kind === "skill")
-                        await showSkillManager(pi, `install ${id}`, ctx);
-                    else if (kind === "mcp")
-                        await showMcpManager(pi, `install ${id}`, ctx, runtimeMcps);
-                    else {
-                        const skills = await recommendedItems("skills");
-                        const item = skills.externalTools.find((candidate) => candidate.id === id && candidate.installable !== false);
-                        if (!item)
-                            throw new Error(`未找到可安装的推荐外部工具: ${id}`);
-                        pi.sendUserMessage(modelExternalToolInstallTask(ctx.cwd, item), ctx.isIdle() ? {} : { deliverAs: "followUp" });
-                        ctx.ui.notify(`已将 ${String(item.name ?? id)} 的安装任务交给当前模型；完成后会报告版本与验证结果。`, "info");
-                    }
-                }
-                catch (error) {
-                    await notifyError(ctx, error);
-                }
-            },
-        });
     if (!legacyTestApi)
         pi.registerCommand("provider", {
             description: "查看或切换模型 Provider",
@@ -1759,6 +1845,98 @@ export default function psyclawExtension(pi) {
                 }
             },
         });
+        pi.registerTool({
+            name: "psyclaw_ars_multi_agent",
+            label: "ARS multi-agent review bridge",
+            description: "Run ARS reviewer_full Stage 3 as five process-separated read-only reviewer seats, or Stage 3 re-review as three ordered fenced calls. This is a parallel-agent capability; it preserves ARS checkpoints and never claims independent error processes.",
+            parameters: Type.Object({
+                mode: Type.Union([Type.Literal("reviewer_full"), Type.Literal("reviewer_re_review")]),
+                manuscriptPath: Type.Optional(Type.String()),
+                originalManuscriptPath: Type.Optional(Type.String()),
+                roadmapPath: Type.Optional(Type.String()),
+                authorAdjudicationPath: Type.Optional(Type.String()),
+                revisionEvidenceBundlePath: Type.Optional(Type.String()),
+                responseLetterPath: Type.Optional(Type.String()),
+                editorialDecisionPath: Type.Optional(Type.String()),
+                round1FindingsPath: Type.Optional(Type.String()),
+                reviewerCardsPath: Type.Optional(Type.String()),
+                revisionPatchPaths: Type.Optional(Type.Array(Type.String(), { maxItems: 50 })),
+                applyReportPaths: Type.Optional(Type.Array(Type.String(), { maxItems: 50 })),
+                resumeRunId: Type.Optional(Type.String()),
+                reviewerCards: Type.Optional(Type.String({ maxLength: 40000 })),
+                title: Type.Optional(Type.String()), field: Type.Optional(Type.String()), passportDigest: Type.Optional(Type.String()),
+            }),
+            executionMode: "sequential",
+            async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+                try {
+                    if (!isArsPiActive(ctx.sessionManager))
+                        throw new Error("ARS mode is not active");
+                    if (!contextProjectTrusted(ctx))
+                        throw new Error("project is not trusted");
+                    if (!ctx.hasUI || typeof ctx.ui?.confirm !== "function")
+                        throw new Error("ARS external model dispatch requires interactive confirmation");
+                    const paths = [params.manuscriptPath, params.originalManuscriptPath, params.roadmapPath, params.authorAdjudicationPath, params.revisionEvidenceBundlePath, params.responseLetterPath, params.editorialDecisionPath, params.round1FindingsPath, params.reviewerCardsPath, ...(params.revisionPatchPaths ?? []), ...(params.applyReportPaths ?? [])].filter((value) => typeof value === "string");
+                    const approved = await ctx.ui.confirm("将研究材料发送给当前模型 Provider？", `模式：${params.mode}\nProvider/Model：${ctx.model?.provider ?? "unknown"}/${ctx.model?.id ?? "unknown"}\n文件：\n${paths.map((path) => `- ${path}`).join("\n")}\n\nStage 3 可能至少产生 11 次模型调用；进程隔离不代表误差独立。`);
+                    if (!approved)
+                        throw new Error("ARS dispatch cancelled; no material was sent");
+                    const result = await runArsMultiAgentBridge(params, { root: ctx.cwd, ...(ctx.model?.provider ? { provider: ctx.model.provider } : {}), ...(ctx.model?.id ? { model: ctx.model.id } : {}), env: providerEnvironment(ctx.model?.provider), agentDir: join(ctx.cwd, ".psyclaw", "ars-agent") });
+                    return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }], details: result, ...(result.status === "blocked" ? { isError: true } : {}) };
+                }
+                catch (error) {
+                    return { content: [{ type: "text", text: `ARS multi-agent bridge failed: ${error instanceof Error ? error.message : String(error)}` }], details: { status: "blocked" }, isError: true };
+                }
+            },
+        });
+        pi.registerTool({
+            name: "psyclaw_create",
+            label: "Create project capability",
+            description: "Preview and, after an explicit UI confirmation, create one PsyClaw-native project Skill, declarative analysis Hook, additive Rule, or Subagent (Claude-style). Elevated subagent effects require confirmation at create and again at each /agents run.",
+            parameters: Type.Object({
+                kind: Type.Union([Type.Literal("skill"), Type.Literal("hook"), Type.Literal("rule"), Type.Literal("subagent")]),
+                id: Type.String({ minLength: 1, maxLength: 64 }),
+                description: Type.String({ minLength: 1, maxLength: 1024 }),
+                instructions: Type.Optional(Type.String({ maxLength: 8000 })),
+                event: Type.Optional(Type.Union([Type.Literal("before-plan"), Type.Literal("before-analysis"), Type.Literal("before-delegation"), Type.Literal("before-write"), Type.Literal("after-analysis"), Type.Literal("before-report"), Type.Literal("after-report")])),
+                severity: Type.Optional(Type.Union([Type.Literal("warn"), Type.Literal("block")])),
+                pattern: Type.Optional(Type.String({ maxLength: 500 })),
+                pathPrefix: Type.Optional(Type.String({ maxLength: 200 })),
+                role: Type.Optional(Type.Union([Type.Literal("planner"), Type.Literal("researcher"), Type.Literal("analyst"), Type.Literal("critic"), Type.Literal("writer"), Type.Literal("verifier")])),
+                allowedEffects: Type.Optional(Type.Array(Type.Union([
+                    Type.Literal("read"),
+                    Type.Literal("write"),
+                    Type.Literal("network"),
+                    Type.Literal("destructive"),
+                ]), { maxItems: 4 })),
+            }),
+            executionMode: "sequential",
+            async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+                try {
+                    if (!contextProjectTrusted(ctx))
+                        throw new Error("project is not trusted");
+                    const request = params;
+                    const preview = await previewCreation(ctx.cwd, request);
+                    if (!ctx.hasUI || typeof ctx.ui?.confirm !== "function") {
+                        return { content: [{ type: "text", text: JSON.stringify({ ...preview, status: "preview-only", reason: "interactive confirmation unavailable" }, null, 2) }], details: preview };
+                    }
+                    const effects = request.kind === "subagent" ? normalizeEffects(request.allowedEffects) : ["read"];
+                    const elevated = request.kind === "subagent" && hasElevatedEffects(effects);
+                    const title = elevated
+                        ? `创建 Subagent “${preview.id}”（含提升权限）？`
+                        : `创建 ${params.kind} “${preview.id}”？`;
+                    const body = elevated
+                        ? `目标：${preview.path}\n声明 effects：${formatEffects(effects)}\n将开放工具：${toolsForEffects(effects).join(", ")}\nSHA-256：${preview.sha256}\n\n每次 /agents 运行仍会再次确认。凭据读取与绕过门禁仍被禁止。\n\n${preview.contents}`
+                        : `目标：${preview.path}\nSHA-256：${preview.sha256}\n\n${preview.contents}`;
+                    const approved = await ctx.ui.confirm(title, body);
+                    if (!approved)
+                        return { content: [{ type: "text", text: "Creation cancelled; no file was written." }], details: { status: "cancelled", preview } };
+                    const result = await applyCreation(ctx.cwd, request, preview.sha256, true);
+                    return { content: [{ type: "text", text: JSON.stringify({ status: "created", path: result.preview.path, sha256: result.preview.sha256, receipt: result.receipt }, null, 2) }], details: result };
+                }
+                catch (error) {
+                    return { content: [{ type: "text", text: `Creation failed: ${error instanceof Error ? error.message : String(error)}` }], details: { status: "failed" }, isError: true };
+                }
+            },
+        });
         pi.registerTool({
             name: "psyclaw_skill",
             label: "Research skill",
@@ -1999,11 +2177,22 @@ export default function psyclawExtension(pi) {
     // runner behind PSYCLAW_DEVELOPER_COMMANDS in published builds.
     if (!legacyTestApi)
         pi.registerCommand("agents", {
-            description: "运行经批准的只读研究 Agent",
+            description: "浏览或运行 Subagent（对齐 Claude Code）",
             handler: async (args, ctx) => {
-                const objective = args.trim();
+                const trimmed = args.trim();
+                if (!trimmed || trimmed === "status" || trimmed === "list") {
+                    try {
+                        await showAgentManager(ctx, trimmed === "status" || trimmed === "list");
+                    }
+                    catch (error) {
+                        await notifyError(ctx, error);
+                    }
+                    return;
+                }
+                const requested = parseAgentsRequest(args);
+                const objective = requested.objective;
                 if (!objective) {
-                    ctx.ui.notify("Usage: /agents <bounded read-only research task>", "info");
+                    ctx.ui.notify("Usage: /agents [--agent <id>|--agents <id,...>] <task>\n无任务时直接运行 /agents 打开 Subagent 管理页。", "info");
                     return;
                 }
                 if (objective.length > 4_000) {
@@ -2026,7 +2215,63 @@ export default function psyclawExtension(pi) {
                 activeAgentRuns.add(ctx.cwd);
                 try {
                     const runId = `pi_agent_${Date.now()}`;
-                    const plan = researchTaskPlan(runId, objective);
+                    let plan = researchTaskPlan(runId, objective);
+                    if (requested.ids.length > 0) {
+                        const available = await loadSelectablePersonas(ctx.cwd);
+                        const byId = new Map(available.map((persona) => [persona.id, persona]));
+                        const selected = requested.ids.map((id) => byId.get(id));
+                        const missing = requested.ids.filter((_id, index) => !selected[index]);
+                        if (missing.length > 0)
+                            throw new Error(`Unknown or invalid subagent: ${missing.join(", ")}. Run /agents to list bundled and custom subagents.`);
+                        const personas = selected.filter((persona) => persona !== undefined);
+                        const unionEffects = normalizeEffects(personas.flatMap((persona) => persona.allowedEffects));
+                        const elevated = elevatedEffects(unionEffects);
+                        if (elevated.length > 0) {
+                            if (!ctx.hasUI || typeof ctx.ui.confirm !== "function") {
+                                throw new Error(`Subagent effects [${formatEffects(elevated)}] require interactive confirmation`);
+                            }
+                            const approved = await ctx.ui.confirm("批准 Subagent 提升权限？", `将启用：${formatEffects(elevated)}\n对应工具：${toolsForEffects(unionEffects).join(", ")}\n任务：${objective.slice(0, 400)}\n\n凭据读取、绕过门禁与外部发布仍被禁止。`);
+                            if (!approved) {
+                                ctx.ui.notify("已取消：未批准提升权限，未启动 Subagent。", "warning");
+                                return;
+                            }
+                        }
+                        plan = customPersonaPlan(runId, objective, personas);
+                        await mkdir(join(ctx.cwd, ".psyclaw", "plans"), { recursive: true });
+                        await atomicWriteFile(join(ctx.cwd, ".psyclaw", "plans", `${runId}.json`), `${JSON.stringify(plan, null, 2)}\n`);
+                        const eventLog = new RunEventLog(ctx.cwd, runId);
+                        const result = await runPlanWithPi(plan, {
+                            cwd: ctx.cwd,
+                            agentDir: join(ctx.cwd, ".psyclaw", "pi-agent"),
+                            ...(ctx.model?.provider === undefined ? {} : { provider: ctx.model.provider }),
+                            ...(ctx.model?.id === undefined ? {} : { model: ctx.model.id }),
+                            env: providerEnvironment(ctx.model?.provider),
+                            ...(elevated.length === 0 ? { tools: [] } : {}),
+                            allowWrites: unionEffects.includes("write"),
+                            allowNetwork: unionEffects.includes("network"),
+                            allowDestructive: unionEffects.includes("destructive"),
+                            root: ctx.cwd,
+                            pauseRequested: async () => {
+                                try {
+                                    await import("node:fs/promises").then(({ access }) => access(join(ctx.cwd, ".psyclaw", "runs", `${runId}.pause`)));
+                                    return true;
+                                }
+                                catch {
+                                    return false;
+                                }
+                            },
+                            onEvent: async (event) => { await eventLog.append(event); },
+                        });
+                        pi.appendEntry("psyclaw:agent-run", {
+                            runId,
+                            status: result.status,
+                            diagnostics: result.diagnostics,
+                            effects: unionEffects,
+                            recordedAt: new Date().toISOString(),
+                        });
+                        ctx.ui.notify(`Agent run ${result.status}: ${result.diagnostics.join("; ") || "verified"}`, result.status === "completed" ? "info" : "warning");
+                        return;
+                    }
                     await mkdir(join(ctx.cwd, ".psyclaw", "plans"), { recursive: true });
                     await atomicWriteFile(join(ctx.cwd, ".psyclaw", "plans", `${runId}.json`), `${JSON.stringify(plan, null, 2)}\n`);
                     const eventLog = new RunEventLog(ctx.cwd, runId);