sleep: 判斷式收尾與 sleeper 隔離
- sleeper 帶 --as-sleeper 就能在沒有 exclusive 鎖時做收尾 - sleeper 被 pin 在自己的人格上，讀寫其他人格（含主人格）一律攔下 - sleeper 只能走 CLI，不得用 Write 或 shell 重導向改人格檔案 - 主人格載入別的人格時，sleeper 仍以自己的 pin 為準 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
+43
-3
@@ -581,6 +581,20 @@ export function acquireSleepLease(slug, sessionId, { agentId = null } = {}) {
|
||||
return lease;
|
||||
}
|
||||
|
||||
/** 續租：收尾要跑好幾個指令（固化、日記、心智圖…），別讓租約在中途過期。 */
|
||||
export function heartbeatSleepLease(slug, sessionId, agentId = null) {
|
||||
const data = readJson(sleepersPath(slug), {}) ?? {};
|
||||
let touched = false;
|
||||
for (const lease of data.sleepers || []) {
|
||||
if (lease.session_id !== sessionId) continue;
|
||||
if (agentId !== null && lease.agent_id && lease.agent_id !== agentId) continue;
|
||||
lease.heartbeat_at = nowIso();
|
||||
touched = true;
|
||||
}
|
||||
if (touched) writeJson(sleepersPath(slug), data);
|
||||
return touched;
|
||||
}
|
||||
|
||||
export function dropSleepLease(slug, sessionId, agentId = null) {
|
||||
const data = readJson(sleepersPath(slug), {}) ?? {};
|
||||
data.sleepers = (data.sleepers || []).filter(
|
||||
@@ -1311,7 +1325,22 @@ export function upsertRelationNode(slug, node) {
|
||||
const data = loadRelations(slug);
|
||||
const nodeId = node.id || slugify(node.name || "");
|
||||
node.id = nodeId;
|
||||
const idx = data.nodes.findIndex((n) => n.id === nodeId);
|
||||
let idx = data.nodes.findIndex((n) => n.id === nodeId);
|
||||
// 同一個人不該因為換了 id（例如原本用名字當 id，後來改用人格編號 ASUNA-01）就多長一個節點：
|
||||
// 找不到 id 但找得到同名節點時，就地換 id，並把指向舊 id 的連線一起改過去。
|
||||
if (idx < 0 && node.name) {
|
||||
const byName = data.nodes.findIndex((n) => n.name === node.name);
|
||||
if (byName >= 0) {
|
||||
const oldId = data.nodes[byName].id;
|
||||
idx = byName;
|
||||
if (oldId !== nodeId) {
|
||||
for (const edge of data.edges) {
|
||||
if (edge.from === oldId) edge.from = nodeId;
|
||||
if (edge.to === oldId) edge.to = nodeId;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (idx >= 0) {
|
||||
for (const [k, v] of Object.entries(node)) if (v !== null && v !== undefined) data.nodes[idx][k] = v;
|
||||
data.nodes[idx].updated_at = nowIso();
|
||||
@@ -1691,6 +1720,7 @@ export function cliInvocation(command) {
|
||||
personas: [],
|
||||
session: null,
|
||||
asGuest: /--as-guest\b/.test(command),
|
||||
asSleeper: /--as-sleeper\b/.test(command),
|
||||
};
|
||||
const sub = command.match(/persona\.(?:mjs|js|py)['"]?\s+([a-z][a-z0-9-]*)/);
|
||||
if (sub) info.subcommand = sub[1];
|
||||
@@ -1804,13 +1834,17 @@ export function guardDecide(event) {
|
||||
}
|
||||
// first-touch pinning：第一個提到的人格就是它要睡的那個，之後不得換人
|
||||
if (!scope.allowed && agentId && info.personas.length) pinAgent(sessionId, agentId, info.personas[0]);
|
||||
}
|
||||
if (scope.role === "guest") {
|
||||
// sleeper 的範圍已經由它自己的 pin 決定，不能再套用 host 的判定
|
||||
// （否則主人格 load 著別人時，sleeper 連自己的收尾指令都會被擋）。
|
||||
} else if (scope.role === "guest") {
|
||||
if (!GUEST_SAFE_SUBCOMMANDS.has(sub)) {
|
||||
return deny(
|
||||
`guest 人格（sub agent）僅能執行 ${[...GUEST_SAFE_SUBCOMMANDS].sort().join("/")}，不得執行 \`${sub}\`。`,
|
||||
);
|
||||
}
|
||||
if (info.asSleeper) {
|
||||
return deny("`--as-sleeper` 只有 persona-sleeper 型的 sub agent 能用；guest 是來聊天的，不是來收尾的。");
|
||||
}
|
||||
for (const slug of info.personas) {
|
||||
if (scope.allowed.length && !scope.allowed.includes(slug)) {
|
||||
return deny(`guest 只能操作被邀請的人格 ${JSON.stringify(scope.allowed)}，不得碰 \`${slug}\`。`);
|
||||
@@ -1822,6 +1856,12 @@ export function guardDecide(event) {
|
||||
"`--as-guest` 只有 persona-guest 型的 sub agent 能用；主程序不得以受邀人格的身分存取它的資料。",
|
||||
);
|
||||
}
|
||||
if (info.asSleeper) {
|
||||
return deny(
|
||||
"`--as-sleeper` 只有 persona-sleeper 型的 sub agent 能用；" +
|
||||
"要請別的人格收尾請走 /jsc-persona:persona-sleep（它會替那個人格開一個 sleeper）。",
|
||||
);
|
||||
}
|
||||
for (const slug of info.personas) {
|
||||
if (OWNER_EXEMPT_SUBCOMMANDS.has(sub)) continue;
|
||||
if (scope.host && slug !== scope.host) {
|
||||
|
||||
+29
-3
@@ -22,6 +22,8 @@ const TEMPLATE_DIR = path.join(HERE, "..", "skills", "persona-create", "template
|
||||
const SELF = path.join(HERE, "persona.mjs");
|
||||
|
||||
let QUIET = false;
|
||||
// 本次呼叫的旗標（權限檢查要看 --as-sleeper／--agent-id，不想改十幾個 requireOwner 呼叫點）
|
||||
let CURRENT_FLAGS = {};
|
||||
|
||||
function die(message, code = 1) {
|
||||
process.stderr.write(`✖ ${message}\n`);
|
||||
@@ -49,7 +51,7 @@ function emit(payload, asJson, lines) {
|
||||
// --------------------------------------------------------------------------- //
|
||||
|
||||
const FLAGS = new Set([
|
||||
"json", "quiet", "force", "takeover", "as-guest", "on", "off", "with-meta", "all",
|
||||
"json", "quiet", "force", "takeover", "as-guest", "as-sleeper", "on", "off", "with-meta", "all",
|
||||
"with-journal", "gzip", "record", "load", "allow-repeat", "clear", "release", "keep-lock", "contact",
|
||||
"if-due", "no-gitea", "public", "rename", "from-source",
|
||||
]);
|
||||
@@ -110,11 +112,30 @@ function requireSession(flags) {
|
||||
// 權限檢查
|
||||
// --------------------------------------------------------------------------- //
|
||||
|
||||
/** 呼叫者必須是這個人格的 exclusive 持有者。 */
|
||||
/**
|
||||
* 睡眠 sub agent 的寫入權：它替某個人格收尾，手上沒有 exclusive 鎖，只有 5 分鐘的 sleeper 租約。
|
||||
* 第一個收尾指令會把租約取起來（`acquireSleepLease` 內含鎖檢查：目標正被別的程序載入著就拒絕），
|
||||
* 之後每個指令續租，最後由 `sleep` 還掉。`--as-sleeper` 由 PreToolUse hook 把關，
|
||||
* 只有 persona-sleeper 型的 sub agent 能用。
|
||||
*/
|
||||
function sleeperAccess(slug, sessionId, agentId) {
|
||||
const mine = pl.liveSleepers(slug).find((s) => s.session_id === sessionId);
|
||||
if (mine) {
|
||||
pl.heartbeatSleepLease(slug, sessionId, mine.agent_id ?? null);
|
||||
return mine;
|
||||
}
|
||||
return pl.acquireSleepLease(slug, sessionId, { agentId: agentId || null });
|
||||
}
|
||||
|
||||
/** 呼叫者必須是這個人格的 exclusive 持有者（或替它收尾的 sleeper）。 */
|
||||
function requireOwner(slug, sessionId) {
|
||||
if (!slug) die("未指定人格，且本 session 沒有載入人格。");
|
||||
if (!pl.personaExists(slug)) die(`人格 \`${slug}\` 不存在。可用：${pl.listPersonas().join(", ") || "（無）"}`);
|
||||
const data = pl.loadSession(sessionId);
|
||||
if (CURRENT_FLAGS["as-sleeper"]) {
|
||||
sleeperAccess(slug, sessionId, str(CURRENT_FLAGS["agent-id"]));
|
||||
return data;
|
||||
}
|
||||
if (data.host !== slug) {
|
||||
die(
|
||||
`本 session 的 host 人格是 \`${data.host || "（未載入）"}\`，不是 \`${slug}\`。` +
|
||||
@@ -826,7 +847,10 @@ commands.consolidate = ({ flags }) => {
|
||||
if (flags["body-file"]) body = fs.readFileSync(str(flags["body-file"]), "utf8");
|
||||
if (!body.trim()) die("需要 `--body` 或 `--body-file`。");
|
||||
const type = str(flags.type) || "fact";
|
||||
const VALID_TYPES = ["fact", "preference", "event", "promise", "relationship", "insight", "boundary", "canon"];
|
||||
// diary：睡眠時寫的第一人稱回顧（persona-sleep／persona-sleeper 都用這個型別）
|
||||
const VALID_TYPES = [
|
||||
"fact", "preference", "event", "promise", "relationship", "insight", "boundary", "canon", "diary",
|
||||
];
|
||||
if (!VALID_TYPES.includes(type)) die(`--type 只能是 ${VALID_TYPES.join("/")}。`);
|
||||
const front = [
|
||||
"---",
|
||||
@@ -1809,6 +1833,7 @@ const HELP = `persona.mjs — jsc-persona 人格 / 記憶 / 情緒 / 關係圖 C
|
||||
guard （內部）從 stdin 讀 hook event 測試隔離判斷
|
||||
|
||||
全域旗標：--json（機器可讀）、--quiet（成功時不輸出；劇場模式必用）
|
||||
--as-sleeper（睡眠 sub agent 專用：以 sleeper 租約代替 exclusive 鎖，hook 會驗身分）
|
||||
`;
|
||||
|
||||
async function main(argv) {
|
||||
@@ -1821,6 +1846,7 @@ async function main(argv) {
|
||||
if (!command) die(`未知子指令 \`${sub}\`。用 \`node persona.mjs --help\` 看清單。`);
|
||||
const parsed = parseArgs(argv.slice(1));
|
||||
QUIET = Boolean(parsed.flags.quiet);
|
||||
CURRENT_FLAGS = parsed.flags;
|
||||
try {
|
||||
await command({ flags: parsed.flags, positional: parsed._ });
|
||||
} catch (err) {
|
||||
|
||||
@@ -944,6 +944,45 @@ check("sleeper 不得 load／release／invite／export",
|
||||
check("sleeper 被 pin 住之後不得換人睡",
|
||||
guard(sleeperEvent({ tool_name: "Bash",
|
||||
tool_input: { command: `node persona.mjs sleep --persona alpha --session ${S_SLEEP2}` } })) === "deny");
|
||||
// 迴歸：主人格載入著 alpha 時請 epsilon 去睡——sleeper 的範圍看它自己的 pin，不看 host
|
||||
const hostSleeper = "agent-sleeper-host";
|
||||
pl.pinAgent(S_HOST, hostSleeper, "epsilon");
|
||||
const hostSleeperEvent = (extra) =>
|
||||
({ session_id: S_HOST, agent_id: hostSleeper, agent_type: "jsc-persona:persona-sleeper", ...extra });
|
||||
check("主人格已載入別的人格時，sleeper 仍能跑自己的判斷式收尾",
|
||||
["brief", "candidates", "consolidate", "mindmap", "relation"].every((sub) =>
|
||||
guard(hostSleeperEvent({ tool_name: "Bash",
|
||||
tool_input: { command: `node persona.mjs ${sub} --persona epsilon --session ${S_HOST} --name x --body y` } })) === "pass"));
|
||||
check("主人格已載入別的人格時，sleeper 仍不得碰主人格的資料",
|
||||
guard(hostSleeperEvent({ tool_name: "Bash",
|
||||
tool_input: { command: `node persona.mjs consolidate --persona alpha --session ${S_HOST} --name x --body y` } })) === "deny");
|
||||
check("sleeper 帶 --as-sleeper 就能做判斷式收尾（沒有 exclusive 鎖也可以）", (() => {
|
||||
const res = cli(["candidates", "--persona", "epsilon", "--session", S_SLEEP2, "--as-sleeper",
|
||||
"--agent-id", A_SLEEPER]);
|
||||
const held = pl.liveSleepers("epsilon").some((s) => s.session_id === S_SLEEP2);
|
||||
return res.status === 0 && held; // 第一個收尾指令會自己把租約取起來
|
||||
})());
|
||||
check("sleeper 可以寫 diary 型別的長期記憶", (() => {
|
||||
const res = cli(["consolidate", "--persona", "epsilon", "--session", S_SLEEP2, "--as-sleeper",
|
||||
"--name", "diary-2026-07-30", "--type", "diary", "--body", "今天把一天收起來了。",
|
||||
"--agent-id", A_SLEEPER]);
|
||||
pl.dropSleepLease("epsilon", S_SLEEP2, A_SLEEPER);
|
||||
return res.status === 0 &&
|
||||
fs.existsSync(path.join(H, "epsilon", "memory", "long-term", "diary-2026-07-30.md"));
|
||||
})());
|
||||
check("主程序自己帶 --as-sleeper → 攔下（那是 sub agent 的身分）",
|
||||
guard({ session_id: S_HOST, tool_name: "Bash",
|
||||
tool_input: { command: `node persona.mjs consolidate --persona beta --session ${S_HOST} --as-sleeper` } }) === "deny");
|
||||
check("關係節點換 id 不會長出同名的第二個節點", (() => {
|
||||
cli(["load", "--persona", "alpha", "--session", S_HOST, "--takeover"]);
|
||||
cli(["relation", "node", "--session", S_HOST, "--name", "水井管理員", "--closeness", "40"]);
|
||||
cli(["relation", "edge", "--session", S_HOST, "--to", pl.slugify("水井管理員"), "--label", "共事"]);
|
||||
cli(["relation", "node", "--session", S_HOST, "--name", "水井管理員", "--id", "WELL-01", "--trust", "55"]);
|
||||
const data = pl.loadRelations("alpha");
|
||||
const same = data.nodes.filter((n) => n.name === "水井管理員");
|
||||
return same.length === 1 && same[0].id === "WELL-01" && same[0].closeness === 40 && same[0].trust === 55 &&
|
||||
data.edges.some((e) => e.to === "WELL-01");
|
||||
})());
|
||||
check("sleeper 型別存在且宣告了唯讀工具限制", (() => {
|
||||
const md = fs.readFileSync(path.join(HERE, "..", "agents", "persona-sleeper.md"), "utf8");
|
||||
return md.includes("name: persona-sleeper") && md.includes("disallowedTools") &&
|
||||
|
||||
Reference in New Issue
Block a user