@nowcrew/daemon 0.5.11 → 0.5.13

package/dist/token.js

@@ -1,5 +1,5 @@
 /** 用机器令牌为某 agent 换取 per-launch 的 sk_agent_*。 */
-export async function mintAgentToken(serverUrl, machineToken, handle, displayName, wakeThreadRoot, fetchImpl = fetch) {
+export async function mintAgentToken(serverUrl, machineToken, handle, displayName, options = {}, fetchImpl = fetch) {
     const res = await fetchImpl(`${serverUrl}/daemon/agents/token`, {
         method: "POST",
         headers: {
@@ -10,7 +10,10 @@ export async function mintAgentToken(serverUrl, machineToken, handle, displayNam
         body: JSON.stringify({
             handle,
             ...(displayName ? { displayName } : {}),
-            ...(wakeThreadRoot ? { wakeThreadRoot } : {}),
+            ...(options.wakeThreadRoot ? { wakeThreadRoot: options.wakeThreadRoot } : {}),
+            ...(options.wakeContextUpToSeq !== undefined ? { wakeContextUpToSeq: options.wakeContextUpToSeq } : {}),
+            ...(options.agentRunId ? { agentRunId: options.agentRunId } : {}),
+            ...(options.executionId ? { executionId: options.executionId } : {}),
         }),
     });
     const body = (await res.json().catch(() => null));

package/dist/workspace.js

@@ -2,18 +2,27 @@
  * 准备 agent 在本机的工作区:
  *   <agentsRoot>/<handle>/
  *     ├── MEMORY.md                     长期记忆/角色 (首次创建种子)
- *     ├── .crew/system-prompt.md        注入 runtime 的系统提示词
+ *     ├── .crew/prompts/<execution>.md  按 execution 隔离的系统提示词
  *     └── .crew/crew                    注入 PATH 的 CLI wrapper (0755)
  *
  * spawn runtime 时把 <ws>/.crew 置于 PATH 最前,于是 agent 的 `crew ...` 命中 wrapper。
  */
 import { mkdir, writeFile, readFile, chmod, access } from "node:fs/promises";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { join } from "node:path";
 /** 文件系统安全的 taskKey:仅留 [\w.-],其余转 _,截断,避免路径穿越/超长。 */
 export function safeKey(key) {
     return key.replace(/[^\w.-]+/g, "_").replace(/^[-.]+/, "").slice(0, 80) || "default";
 }
+/** Stable, collision-resistant single path component for server-provided opaque identifiers. */
+export function opaqueKey(key) {
+    const readable = safeKey(key).slice(0, 40);
+    const digest = createHash("sha256").update(key, "utf8").digest("hex");
+    return `${readable}-${digest}`;
+}
+function workspaceKey(key, mode) {
+    return mode === "opaque" ? opaqueKey(key) : safeKey(key);
+}
 async function exists(p) {
     try {
         await access(p);
@@ -33,8 +42,10 @@ export async function prepareWorkspace(input) {
         await writeFile(memoryPath, memorySeed(input.handle, input.description), "utf8");
     }
     const memory = await readFile(memoryPath, "utf8");
-    // 系统提示词 (每次覆盖,保证最新);省略时由调用方在拿到 memory 后自行写入。
-    const systemPromptPath = join(crewDir, "system-prompt.md");
+    // 系统提示词按 execution 隔离;省略 identity 的兼容调用每次使用随机路径。
+    const promptDir = join(crewDir, "prompts");
+    await mkdir(promptDir, { recursive: true });
+    const systemPromptPath = join(promptDir, `${opaqueKey(input.executionId ?? randomUUID())}.md`);
     if (input.systemPrompt != null)
         await writeFile(systemPromptPath, input.systemPrompt, "utf8");
     // crew wrapper:exec 构建后的 CLI;凭证/地址经 env 注入,故 wrapper 极简
@@ -53,16 +64,21 @@ export async function prepareWorkspace(input) {
     let runDir = dir;
     let workLogPath = join(dir, "tasks", "default", "work-log.md");
     if (input.taskKey) {
-        runDir = join(dir, "tasks", safeKey(input.taskKey));
+        runDir = join(dir, "tasks", workspaceKey(input.taskKey, input.keyMode));
         await mkdir(runDir, { recursive: true });
         workLogPath = join(runDir, "work-log.md");
     }
     const workLog = (await exists(workLogPath)) ? await readFile(workLogPath, "utf8") : "";
-    // 一线程一会话:tasks/<taskKey>/.session 存底层会话 id。已存在→resume 续上;否则新建。
+    // resumeKey 可跨不同 task cwd 维持同一底层会话；协议键用 opaque 映射,legacy 保持 safeKey。
+    const sessionDir = input.resumeKey
+        ? join(crewDir, "sessions", workspaceKey(input.resumeKey, input.keyMode))
+        : runDir;
+    if (input.resumeKey)
+        await mkdir(sessionDir, { recursive: true });
     let agentSessionId = null;
     let sessionResume = false;
-    if (input.taskKey) {
-        const sessionPath = join(runDir, ".session");
+    if (input.taskKey || input.resumeKey) {
+        const sessionPath = join(sessionDir, ".session");
         if (await exists(sessionPath)) {
             agentSessionId = (await readFile(sessionPath, "utf8")).trim() || null;
             sessionResume = !!agentSessionId;
@@ -72,16 +88,28 @@ export async function prepareWorkspace(input) {
             await writeFile(sessionPath, agentSessionId, "utf8");
         }
     }
-    return { dir, crewDir, systemPromptPath, memory, homeDir, runDir, workLogPath, workLog, agentSessionId, sessionResume };
+    return {
+        dir,
+        crewDir,
+        systemPromptPath,
+        memory,
+        homeDir,
+        runDir,
+        workLogPath,
+        workLog,
+        agentSessionId,
+        sessionResume,
+        sessionDir,
+    };
 }
 /**
  * 冷启动时轮换会话 id:写入新 uuid 到 <runDir>/.session 并返回。
  * 已有会话但本轮决定不续用(warm 窗口过期 / CREW_RESUME=off)时调用——起一个全新会话,
  * 避免拿已存在的 id 走 `--session-id`(claude 会判定 id 冲突),同时保持「一线程一(当前)会话」。
  */
-export async function rotateAgentSession(runDir) {
+export async function rotateAgentSession(sessionDir) {
     const id = randomUUID();
-    await writeFile(join(runDir, ".session"), id, "utf8");
+    await writeFile(join(sessionDir, ".session"), id, "utf8");
     return id;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -19,7 +19,8 @@
   "dependencies": {
     "cross-spawn": "^7.0.6",
     "ws": "^8",
-    "@nowcrew/cli": "^0.4.3"
+    "zod": "^3.23.0",
+    "@nowcrew/cli": "^0.4.5"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",