@nowcrew/daemon 0.6.96 → 0.6.97-beta.2

package/dist/serve.js

@@ -14,6 +14,7 @@ import { reconcileExecutionJournal } from "./execution-recovery.js";
 import { initReleaseSlog, reportDaemonConnectionClose, reportReleaseError } from "./release-channel-guard.js";
 import { handleWorkspaceControlRequest } from "./workspace-control-handler.js";
 import { inspectRaftWorkspace, importRaftWorkspace } from "./workspace-import.js";
+import { withMemoryAccess } from "./local-memory/migration-access.js";
 import { normalizeScheduledContext } from "./scheduled-report.js";
 import { formatDaemonLogLine } from "./log-format.js";
 import { reportAgentRunComplete } from "./scheduled-run-report.js";
@@ -50,6 +51,8 @@ import { probeRuntimeHealth } from "./runtime-health.js";
 import { createServeMarketplace } from "./marketplace-serve.js";
 import { buildControlPlaneUrl } from "./control-plane-url.js";
 import { resolveDaemonLocalStateRootFromEnv } from "./daemon-local-home.js";
+import { createMemoryMigrationController } from "./memory-migration-controller.js";
+import { createMemoryMigrationJournal, replayExecutionJournals } from "./memory-migration-journal.js";
 import { bindStorageServerIdentity, createStorageIdentityAdmission, } from "./storage-serve-adapter.js";
 export { buildControlPlaneUrl } from "./control-plane-url.js";
 // normalize.ts 的活动种类 → activity 枚举
@@ -75,6 +78,8 @@ export function serve(config, opts = {}) {
     let reconnectTimer = null;
     let stopPromise = null;
     let executionJournal;
+    let migrationExecutionJournal;
+    let migrationJournalReady = false;
     const injectedExecutionJournal = opts.execution?.journal;
     const agentMemory = opts.execution?.dependencies?.agentMemory
         ?? (config.agentMemory === null ? undefined : createAgentMemoryBridge(config.agentMemory));
@@ -89,6 +94,15 @@ export function serve(config, opts = {}) {
             startupGapMs: config.executionLimits.startupGapMs,
         });
     const localSlots = createSharedSlotManager(config.executionLimits);
+    const memoryMigrations = createMemoryMigrationController({ config, coordinator: hostCoordinator,
+        isAdmissionClosed: () => stopped || storageIdentityAdmission.isAdmissionClosed(),
+        journal: () => { if (!migrationJournalReady)
+            throw new Error("memory_migration_journal_unavailable"); return migrationExecutionJournal; }, send: frame => {
+            if (frame.type === "execution:completed")
+                completionRetransmitter.track(frame);
+            else if (ws?.readyState === WebSocket.OPEN)
+                ws.send(JSON.stringify(frame));
+        } });
     const sharedSlots = hostCoordinatedSlotManager(localSlots, hostCoordinator);
     const concurrencyTelemetry = createExecutionConcurrencyTelemetry(sharedSlots, {
         ...(opts.execution?.concurrencySnapshotIntervalMs === undefined
@@ -270,7 +284,7 @@ export function serve(config, opts = {}) {
         return null;
     };
     const sendSnapshot = async (reqId) => {
-        const entries = (await executionJournal.replay()).map(snapshotEntry).filter((entry) => entry !== null);
+        const entries = (await replayExecutionJournals(executionJournal, migrationExecutionJournal)).map(snapshotEntry).filter((entry) => entry !== null);
         safeExecutionSend(ExecutionSnapshotSchema.parse({
             type: "execution:snapshot", protocolVersion: 1, reqId, entries,
         }));
@@ -352,6 +366,12 @@ export function serve(config, opts = {}) {
             machineRuntime.open(openedSocket, { capabilities: capabilities.machineHello, beforePublish: Promise.resolve(), connectionId });
             opts.onOpen?.(ws);
             void sendSnapshot(`reconnect-${randomUUID()}`);
+            // 普通回执不等待维护日志IO；两类记录分别重放到同一发送器。
+            void migrationExecutionJournal.replay().then(entries => {
+                for (const entry of entries)
+                    if (entry.completion && !entry.completionAcknowledged)
+                        completionRetransmitter.track(entry.completion);
+            }).catch(() => dslog("memory_migration.journal_unavailable", "维护回执重放失败，普通回执继续", { level: "ERROR" }));
             void executionJournal.replay()
                 .then((entries) => {
                 for (const entry of entries) {
@@ -431,7 +451,8 @@ export function serve(config, opts = {}) {
                         return;
                     if (frame.type === "execution:completion-ack") {
                         try {
-                            await executionJournal.acknowledgeCompletion(frame.executionId);
+                            const journal = await executionJournal.get(frame.executionId) ? executionJournal : migrationExecutionJournal;
+                            await journal.acknowledgeCompletion(frame.executionId);
                             const attempts = completionRetransmitter.acknowledge(frame.executionId);
                             dslog("execution.completion_acknowledged", "execution completion ACK 已持久化", {
                                 execution_id: frame.executionId,
@@ -457,6 +478,8 @@ export function serve(config, opts = {}) {
                         return;
                     }
                     if (frame.type === "execution:cancel") {
+                        if (memoryMigrations.cancel(frame.executionId))
+                            return;
                         if (!knownExecutionHashes.has(frame.executionId)
                             && !executionRuns.has(frame.executionId)
                             && await executionJournal.get(frame.executionId) === null)
@@ -689,6 +712,7 @@ export function serve(config, opts = {}) {
                     const execution = executeProtocol(config, spec, {
                         ...opts.execution?.dependencies,
                         machineEnvironment: machineRuntime.provider,
+                        ...(memoryMigrations.getIdentity() === null ? {} : { controlIdentity: memoryMigrations.getIdentity() }),
                         capabilities: capabilities.executionRunner,
                         projectSkills: opts.execution?.dependencies?.projectSkills ?? initializedProjectSkills,
                         abilityRelease: opts.execution?.dependencies?.abilityRelease ?? agentAbilityRuntime.materializer,
@@ -779,6 +803,8 @@ export function serve(config, opts = {}) {
                 // ready 帧带 server 视角的 machineId/workspaceId → 作为后续所有日志的默认关联键
                 const r = msg;
                 setSlogDefaults({ machine_id: r.machineId, workspace_id: r.workspaceId });
+                if (r.workspaceId && r.machineId)
+                    memoryMigrations.setIdentity({ workspaceId: r.workspaceId, machineId: r.machineId });
                 // 旧 server 无此字段 → 空集合(daemon 保持全部旧行为)。ackSupported() 依赖它判断是否重试,
                 // 必须在任何 republish() 之前就位;否则本轮 republish 看到空集合→不排重试→整套 ack/重连机制哑火。
                 serverCapabilities = new Set(Array.isArray(r.serverCapabilities)
@@ -847,6 +873,8 @@ export function serve(config, opts = {}) {
             }
             catch { /* server 会按请求超时处理 */ } }))
                 return;
+            if (await memoryMigrations.handle(msg))
+                return;
             if (await agentAbilityRuntime.tryHandleControlMessage(msg, serverCapabilities, (frame) => ws?.send(JSON.stringify(frame))))
                 return;
             // 导入 raft agent 工作区:inspect 反填 name/description;import 复制用户内容
@@ -861,7 +889,7 @@ export function serve(config, opts = {}) {
                 try {
                     const data2 = req.type === "raft:inspect"
                         ? await inspectRaftWorkspace(req.path)
-                        : await importRaftWorkspace(req.path, join(config.agentsRoot, req.handle));
+                        : await withMemoryAccess(join(config.agentsRoot, req.handle), () => importRaftWorkspace(req.path, join(config.agentsRoot, req.handle)), { create: true });
                     if (req.type === "raft:import") {
                         log(`📦 已导入 raft 工作区 → ${req.handle}: 复制 ${data2.copied.length} 项`);
                     }
@@ -1254,6 +1282,7 @@ export function serve(config, opts = {}) {
                 return;
             // server 能力随连接失效;下个连接的 ready 帧重新声明(防降级重连后沿用过期能力)。
             serverCapabilities = new Set();
+            memoryMigrations.clearIdentity();
             completionRetransmitter.pause();
             // 4001 = 控制面应用级「鉴权失败」关闭码(见 server control-plane.ts)。即使上面的
             // error 帧因 close 抢先而丢失,也能据关闭码识别这是凭证失效——退避拉满,不再每秒热循环。
@@ -1306,6 +1335,9 @@ export function serve(config, opts = {}) {
             writeStderr: (line) => process.stderr.write(line),
         });
         await runProjectSkillStartupCleanup(config.agentsRoot, executionJournal, dslog);
+        migrationExecutionJournal = createMemoryMigrationJournal(config.agentsRoot);
+        await migrationExecutionJournal.reconcileAfterRestart().then(() => { migrationJournalReady = true; })
+            .catch(() => dslog("memory_migration.journal_unavailable", "迁移日志恢复失败，普通执行继续，迁移请求单独报错", { level: "ERROR" }));
         await connect();
     })();
     const stop = () => {
@@ -1323,6 +1355,7 @@ export function serve(config, opts = {}) {
             const webSocketClosed = closeWebSocketWithinDeadline(ws, deadline.signal);
             const pending = [
                 machineRuntime.stop(),
+                memoryMigrations.stop(),
                 webSocketClosed,
                 updateController.drain(),
                 marketplace.stop(),
@@ -1341,6 +1374,8 @@ export function serve(config, opts = {}) {
                 if (executionJournal !== undefined) {
                     await executionJournal.close({ signal: deadline.signal });
                 }
+                if (migrationExecutionJournal !== undefined)
+                    await migrationExecutionJournal.close({ signal: deadline.signal });
             }
             finally {
                 deadline.dispose();

package/dist/token.js

@@ -7,6 +7,7 @@ export async function mintAgentToken(serverUrl, machineToken, handle, displayNam
         },
         // 把本轮唤醒的线程根钉到 per-launch 令牌:服务端据此让 task/消息默认绑/回当前线程。
         body: JSON.stringify({
+            memoryStateGuardVersion: 1,
             handle,
             ...(displayName ? { displayName } : {}),
             ...(options.wakeThreadRoot ? { wakeThreadRoot: options.wakeThreadRoot } : {}),

package/dist/workspace-control-handler.js

@@ -1,9 +1,22 @@
 /** 控制面文件/技能查看的按需处理，独立于执行生命周期。 */
-import { join } from "node:path";
+import { lstat } from "node:fs/promises";
+import { join, resolve } from "node:path";
 import { readSharedMessageFile } from "./message-file-preview.js";
 import { listWorkspace, readWorkspaceFile } from "./workspace-fs.js";
 import { listSkills } from "./skills.js";
 import { listRuntimeModels } from "./list-models.js";
+import { withMemoryAccess } from "./local-memory/migration-access.js";
+async function listProtectedWorkspace(root, path) {
+    try {
+        await lstat(root);
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+        return { root: resolve(root), path: path.replace(/^\/+/, ""), entries: [] };
+    }
+    return withMemoryAccess(root, () => listWorkspace(root, path));
+}
 export async function handleWorkspaceControlRequest(raw, agentsRoot, registry, models = listRuntimeModels) {
     if (!raw || typeof raw !== "object")
         return null;
@@ -15,8 +28,8 @@ export async function handleWorkspaceControlRequest(raw, agentsRoot, registry, m
     try {
         const root = join(agentsRoot, request.handle);
         const data = request.type === "fs:read-shared" ? await readSharedMessageFile(agentsRoot, raw, registry)
-            : request.type === "fs:list" ? await listWorkspace(root, request.path)
-                : request.type === "fs:read" ? await readWorkspaceFile(root, request.path)
+            : request.type === "fs:list" ? await listProtectedWorkspace(root, request.path)
+                : request.type === "fs:read" ? await withMemoryAccess(root, () => readWorkspaceFile(root, request.path))
                     : request.type === "skills:list" ? await listSkills(request.runtime)
                         : { models: await models(request.runtime ?? "") };
         return { type: "fs:result", reqId: request.reqId, ok: true, data };

package/dist/workspace.js

@@ -8,12 +8,15 @@
  *
  * spawn runtime 时把 <ws>/.crew 置于 PATH 最前,于是 agent 的 `crew ...` 命中 wrapper。
  */
-import { mkdir, writeFile, readFile, chmod, access, lstat } from "node:fs/promises";
+import { mkdir, writeFile, readFile, chmod, access, lstat, realpath } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createRequire } from "node:module";
 import { dslog } from "./slog.js";
+import { MigrationStateSchema } from "./local-memory/migration-schema.js";
+import { assertMigrationStateIntegrity } from "./local-memory/migration-state-invariants.js";
+import { detectLocalMemoryStorageVersion } from "./local-memory/storage-format.js";
 /** 文件系统安全的 taskKey:仅留 [\w.-],其余转 _,截断,避免路径穿越/超长。 */
 export function safeKey(key) {
     return key.replace(/[^\w.-]+/g, "_").replace(/^[-.]+/, "").slice(0, 80) || "default";
@@ -49,7 +52,15 @@ async function hasLocalMemoryV2Marker(agentDir) {
         const stat = await lstat(markerPath);
         if (!stat.isFile() || stat.isSymbolicLink())
             return false;
-        return (await readFile(markerPath, "utf8")) === "1\n";
+        if ((await readFile(markerPath, "utf8")) !== "1\n")
+            return false;
+        const root = await realpath(agentDir);
+        const state = MigrationStateSchema.parse(JSON.parse(await readFile(join(memoryDir, "migration.v1.json"), "utf8")));
+        assertMigrationStateIntegrity(state, state.identity);
+        return state.phase === "committed" && state.storageVersion === 2
+            && state.identity.rootFingerprint === createHash("sha256").update(root).digest("hex")
+            && state.identity.ownerIdentity === String((await lstat(root)).uid)
+            && detectLocalMemoryStorageVersion(await readFile(join(root, "MEMORY.md"), "utf8")) === 2;
     }
     catch {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.96",
+  "version": "0.6.97-beta.2",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",