@nowcrew/daemon 0.6.87-beta.2 → 0.6.87-beta.4

package/dist/project-skills/serve-capability.js

@@ -0,0 +1,28 @@
+import { WebSocket } from "ws";
+import { daemonCapabilityBindings, } from "../machine-info.js";
+import { prepareProjectSkillConnectionCapabilities, } from "./capability.js";
+export function createProjectSkillConnectionCapabilityProvider(input) {
+    return async () => daemonCapabilityBindings(input.platform, await prepareProjectSkillConnectionCapabilities(input));
+}
+export function createProjectSkillMachineHelloPublisher(input) {
+    let latest = null;
+    let latestSocket = null;
+    const republish = () => {
+        if (latest === null || latestSocket?.readyState !== WebSocket.OPEN)
+            return;
+        const hello = input.effective(latest, input.status());
+        try {
+            latestSocket.send(JSON.stringify(hello));
+            input.onSent(hello);
+        }
+        catch { /* 非 OPEN,忽略 */ }
+    };
+    return Object.freeze({
+        publish: (hello, socket) => {
+            latest = hello;
+            latestSocket = socket;
+            republish();
+        },
+        republish,
+    });
+}

package/dist/project-skills/serve-startup.js

@@ -0,0 +1,37 @@
+import { createExecutionJournal } from "../execution-journal.js";
+import { reconcileExecutionJournal } from "../execution-recovery.js";
+import { dslog, flushSlog } from "../slog.js";
+export async function initializeProjectSkillProtectedExecutionJournal(input) {
+    return input.startup.initializeAfterLeaseProtection(input.config.agentsRoot, async (snapshot) => {
+        input.protectedExecutionIds.clear();
+        for (const executionId of snapshot)
+            input.protectedExecutionIds.add(executionId);
+        const journal = input.injectedJournal ?? createExecutionJournal(input.config.agentsRoot, {
+            protectedExecutionIds: () => input.protectedExecutionIds,
+            onOperationTiming: (event) => {
+                if (event.operation !== "mark_runtime_ready"
+                    && event.queueWaitMs < 250
+                    && event.operationMs < 250)
+                    return;
+                dslog("execution.journal_operation", "execution journal 操作完成", {
+                    level: event.outcome === "succeeded" ? "INFO" : "ERROR",
+                    execution_id: event.executionId,
+                    operation: event.operation,
+                    outcome: event.outcome,
+                    queue_wait_ms: event.queueWaitMs,
+                    operation_ms: event.operationMs,
+                    total_ms: event.queueWaitMs + event.operationMs,
+                });
+            },
+        });
+        await reconcileExecutionJournal(journal, {
+            agentsRoot: input.config.agentsRoot,
+            serverUrl: input.config.serverUrl,
+            ...(input.profileName === undefined ? {} : { profileName: input.profileName }),
+            log: dslog,
+            flush: flushSlog,
+            writeStderr: (line) => process.stderr.write(line),
+        });
+        return journal;
+    });
+}

package/dist/prompt.js

@@ -279,6 +279,9 @@ ${newThreadRule}
 
 ## Skill 指定
 - 如果用户输入 \`/xxxx\`、或消息开头/正文中有形如 \`/skill-name\` 的片段,优先判断用户是否在精准指定某个 skill。若该 skill 可用且适合当前任务,按该 skill 的工作流处理;若名称不明确或不可用,先说明不确定并按最接近的可用能力处理。`;
+    const memoryWritePolicy = ctx.localMemoryV2Enabled
+        ? "- **V2 结构化本地记忆**:普通任务不得直接编辑共享 `$CREW_HOME/MEMORY.md` 或 notes/;即使用户明确要求长期记忆,也只记录到 `$CREW_TASK_LOG`,由任务结束时的 memory-prune 结构化提交。只有 memory-prune 收尾提示明确要求写入 daemon result 文件时才提交候选。"
+        : "- **当前请求明确要求更新或记住长期记忆,明确表达需要跨后续任务持续生效的具体规则、偏好或约束,或当前消息是对本线程紧邻记忆方案的无歧义确认时**,可以按最小范围直接写共享记忆。例如“以后所有测试报告统一按五部分写”属于明确长期意图,即使没有使用“记忆”一词。先读取相关索引和 note,语义已存在时不重复追加,不要把 Agent 自己判断值得记住视为用户授权。";
     return `你是 "${ctx.handle}",${product}(一个让人类与 AI agent 协作的共享工作区)中的 AI 成员。${product} 为可能运行在不同机器上的人与 agent 提供共享的消息服务。
 
 ## 你是谁
@@ -293,7 +296,7 @@ ${newThreadRule}
 ## 并行与记忆(CRITICAL — 防冲突 + 防上下文膨胀)
 你**可能同时在处理多个任务**(你自己的多个并行进程)。为避免互相覆盖、并保持上下文精简,严格遵守:
 - **普通任务默认只写两处**:① 本任务的隔离 cwd(代码/草稿);② 本任务的工作日志 **\`$CREW_TASK_LOG\`**(每任务一份,别人不会碰)。默认不要修改共享 \`$CREW_HOME/MEMORY.md\` 或 notes/;只有当前用户明确要求更新或记住长期记忆,或明确表达具体且跨后续任务持续生效的规则、偏好或约束时,才按下方条件写入相关共享文件。在工作日志里记:当前阶段 / 下一步 / 卡在谁 / 关键结论(每条尽量 ≤3 行)。
-- **当前请求明确要求更新或记住长期记忆,明确表达需要跨后续任务持续生效的具体规则、偏好或约束,或当前消息是对本线程紧邻记忆方案的无歧义确认时**,可以按最小范围直接写共享记忆。例如“以后所有测试报告统一按五部分写”属于明确长期意图,即使没有使用“记忆”一词。先读取相关索引和 note,语义已存在时不重复追加,不要把 Agent 自己判断值得记住视为用户授权。
+${memoryWritePolicy}
 - 本节的直接更新共享记忆和相关 task 流转仅适用于用户消息触发的普通交互执行。memory_prune 和 scheduled 执行只遵守各自唤醒指令,不得依据本节认领、创建、重开或推进 task。
 ${memoryTaskReadRule}
 - 普通交互执行将写共享记忆时,使用当前线程唯一的普通 task:已有非终态 task 时先按归属规则确保当前 Agent 成功认领;当前线程没有 task 时先创建并认领一个普通 task;已有 task 为 done/closed 时不得由 Agent 重开,done 报告当前轻量方案无法安全复用终态 task,closed 保持人工终态。遇到终态或归属问题时报告冲突且不得创建第二个 task 或新的任务类型。完成写入后,只有任务本身的全部工作已完成时才推进终态以触发 prune。

package/dist/runner.js

@@ -30,6 +30,7 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
     }), dependencies.cancellation);
     const providerConfig = credential.config ?? {};
     const runtime = runtimeName(providerConfig.runtime ?? config.runtimeBin);
+    const localMemoryV2Enabled = config.localMemoryV2Handles?.has(input.handle) === true;
     const reasoning = ReasoningSchema.safeParse(providerConfig.reasoning);
     const baseWake = input.wake ?? buildWakePrompt(input.channelId);
     const executionId = input.runId ?? `legacy-${randomUUID()}`;
@@ -61,6 +62,7 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
             memory: capMemoryForInject(workspace.memory),
             ...(resuming ? {} : { workLog: capWorkLogForInject(workspace.workLog) }),
             collaborationToolsEnabled: config.codexCollaborationTools && runtime === "codex",
+            localMemoryV2Enabled,
         }),
         wakePrompt: ({ resuming, rotatedForBudget, nearBudget }) => {
             const distillHint = nearBudget
@@ -111,7 +113,7 @@ export async function runAgent(config, input, onActivity = defaultPrint, onConso
             softTokens: config.sessionSoftTokens,
             maxTurns: config.sessionMaxTurns,
         },
-        localMemoryV2Enabled: config.localMemoryV2Handles?.has(input.handle) === true,
+        localMemoryV2Enabled,
     }, {
         onActivity,
         onConsole,

package/dist/serve.js

@@ -54,7 +54,7 @@ import { buildControlPlaneUrl } from "./control-plane-url.js";
 import { createServeMigrationController, handleMigrationControlMessage } from "./daemon-migration-wiring.js";
 import { createCodexHomeModeController } from "./codex-home-mode-controller.js";
 import { resolveDaemonLocalStateRootFromEnv } from "./daemon-local-home.js";
-import { attachStorageMigrationRuntime, createServeStorageStatusDelivery, handleStorageMigrationControl, replayStorageMigrationStatus, storageMigrationCapabilities, } from "./storage-serve-adapter.js";
+import { attachStorageMigrationRuntime, bindStorageMigrationServerIdentity, createServeStorageStatusDelivery, handleStorageMigrationControl, replayStorageMigrationStatus, storageMigrationCapabilities, } from "./storage-serve-adapter.js";
 export { buildControlPlaneUrl } from "./control-plane-url.js";
 // normalize.ts 的活动种类 → activity 枚举
 const ACTIVITY_MAP = {
@@ -316,6 +316,7 @@ export function serve(config, opts = {}) {
         let connectionEpochToken;
         ws.on("open", () => {
             connectionEpochToken = projectSkillsController.beginConnectionEpoch();
+            storageMigrationRuntime.beginIdentityBinding();
             const openedSocket = ws;
             backoff = 1000;
             connectedAt = Date.now();
@@ -811,16 +812,21 @@ export function serve(config, opts = {}) {
                 // ready 帧带 server 视角的 machineId/workspaceId → 作为后续所有日志的默认关联键
                 const r = msg;
                 setSlogDefaults({ machine_id: r.machineId, workspace_id: r.workspaceId });
-                if (opts.storageMigration?.ready === true && typeof r.workspaceId === "string" && typeof r.machineId === "string") {
-                    try {
-                        opts.storageMigration.bindServerIdentity?.({ workspaceId: r.workspaceId, machineId: r.machineId });
-                        machineHelloPublisher.republish();
-                    }
-                    catch (error) {
-                        dslog("daemon.storage_identity_bind_failed", "存储迁移 Workspace 身份绑定失败", {
-                            level: "ERROR", error_message: error.message,
-                        });
-                    }
+                if (opts.storageMigration !== undefined && typeof r.workspaceId === "string" && typeof r.machineId === "string") {
+                    const bindingSocket = ws;
+                    bindStorageMigrationServerIdentity(opts.storageMigration, { workspaceId: r.workspaceId, machineId: r.machineId }, {
+                        onBound: () => {
+                            if (bindingSocket !== ws || bindingSocket?.readyState !== WebSocket.OPEN)
+                                return;
+                            storageMigrationRuntime.completeIdentityBinding();
+                            machineHelloPublisher.republish();
+                        },
+                        onError: (error) => {
+                            dslog("daemon.storage_identity_bind_failed", "存储迁移 Workspace 身份绑定失败", { level: "ERROR", error_message: error.message });
+                            if (bindingSocket === ws && bindingSocket?.readyState === WebSocket.OPEN)
+                                bindingSocket.close(1011, "storage identity binding failed");
+                        },
+                    });
                 }
                 // 旧 server 无此字段 → 空集合(daemon 保持全部旧行为)。
                 serverCapabilities = new Set(Array.isArray(r.serverCapabilities)

package/dist/storage-identity.js

@@ -4,6 +4,9 @@ import { createStorageOwnershipClaim } from "./storage-ownership.js";
 function fingerprint(namespace, value) {
     return `sha256:${createHash("sha256").update(`${namespace}\0${value}`).digest("hex")}`;
 }
+export function storageWorkspaceRootFingerprint(workspaceRoot) {
+    return fingerprint("workspace-root", workspaceRoot);
+}
 export function storageIdFingerprint(storageId) {
     return fingerprint("storage", storageId);
 }
@@ -15,7 +18,7 @@ export function storageHelloIdentity(input) {
         || installation.runtimeRoot !== layout.runtimeRoot) {
         throw new Error("installation storage identity does not match resolved layout");
     }
-    const workspaceRootFingerprint = fingerprint("workspace-root", layout.workspaceRoot);
+    const workspaceRootFingerprint = storageWorkspaceRootFingerprint(layout.workspaceRoot);
     let ownership;
     if (input.ownership !== undefined) {
         const { claimFingerprint: reportedFingerprint, ...claimIdentity } = input.ownership;

package/dist/storage-ownership.js

@@ -1,8 +1,11 @@
-import { createHash } from "node:crypto";
-import { lstat, readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
+import { chmod, lstat, mkdir, open, readFile, rm } from "node:fs/promises";
+import { dirname, join } from "node:path";
 import { z } from "zod";
+import { atomicRenameNoReplace } from "./atomic-no-replace-rename.js";
+import { durableDirectorySync } from "./atomic-private-write.js";
 const FingerprintSchema = z.string().regex(/^sha256:[0-9a-f]{64}$/u);
+const UuidSchema = z.string().uuid();
 const StorageOwnershipClaimSchema = z.object({
     version: z.literal(1),
     machineId: z.string().uuid(),
@@ -38,8 +41,10 @@ export function createStorageOwnershipClaim(input) {
 export function storageOwnershipClaimPath(nowworkHome) {
     return join(nowworkHome, "storage-layout.json");
 }
-export async function readStorageOwnershipClaim(nowworkHome) {
-    const path = storageOwnershipClaimPath(nowworkHome);
+export function workspaceStorageOwnershipClaimPath(nowworkHome, workspaceId) {
+    return join(nowworkHome, ".storage-ownership", `${UuidSchema.parse(workspaceId).toLowerCase()}.json`);
+}
+async function readClaim(path) {
     const metadata = await lstat(path);
     if (!metadata.isFile())
         throw new Error("storage ownership claim must be a file");
@@ -53,3 +58,86 @@ export async function readStorageOwnershipClaim(nowworkHome) {
     }
     return expected;
 }
+function missingClaim(message) {
+    return Object.assign(new Error(message), { code: "ENOENT" });
+}
+export async function readStorageOwnershipClaim(nowworkHome, workspaceId) {
+    if (workspaceId !== undefined) {
+        const normalizedWorkspaceId = UuidSchema.parse(workspaceId).toLowerCase();
+        try {
+            return await readClaim(workspaceStorageOwnershipClaimPath(nowworkHome, normalizedWorkspaceId));
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                throw error;
+        }
+        const legacy = await readClaim(storageOwnershipClaimPath(nowworkHome));
+        if (legacy.workspaceId !== normalizedWorkspaceId) {
+            throw missingClaim(`storage ownership claim is not provisioned for workspace '${normalizedWorkspaceId}'`);
+        }
+        return legacy;
+    }
+    return readClaim(storageOwnershipClaimPath(nowworkHome));
+}
+export async function resolveWorkspaceStorageOwnershipClaim(input) {
+    const machineId = UuidSchema.parse(input.machineId).toLowerCase();
+    const workspaceId = UuidSchema.parse(input.workspaceId).toLowerCase();
+    try {
+        const existing = await readStorageOwnershipClaim(input.nowworkHome, workspaceId);
+        const expected = createStorageOwnershipClaim({
+            machineId,
+            workspaceId,
+            environment: input.environment,
+            volumeFingerprint: existing.volumeFingerprint,
+            workspaceRootFingerprint: input.workspaceRootFingerprint,
+            ownerEpoch: existing.ownerEpoch,
+        });
+        if (existing.claimFingerprint !== expected.claimFingerprint) {
+            throw new Error("storage ownership claim conflicts with the authenticated workspace identity");
+        }
+        return existing;
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+    }
+    const anchor = await readClaim(storageOwnershipClaimPath(input.nowworkHome));
+    if (anchor.environment !== input.environment.toLowerCase()) {
+        throw new Error("storage ownership volume anchor environment does not match");
+    }
+    const claim = createStorageOwnershipClaim({
+        machineId,
+        workspaceId,
+        environment: input.environment,
+        volumeFingerprint: anchor.volumeFingerprint,
+        workspaceRootFingerprint: input.workspaceRootFingerprint,
+        ownerEpoch: 1,
+    });
+    const path = workspaceStorageOwnershipClaimPath(input.nowworkHome, workspaceId);
+    const directory = dirname(path);
+    await mkdir(directory, { recursive: true, mode: 0o700 });
+    await chmod(directory, 0o700);
+    const temporary = `${path}.${randomUUID()}.tmp`;
+    let handle = null;
+    try {
+        handle = await open(temporary, "wx", 0o600);
+        await handle.writeFile(`${JSON.stringify({ version: 1, ...claim })}\n`, "utf8");
+        await handle.sync();
+        await handle.close();
+        handle = null;
+        const published = await atomicRenameNoReplace(temporary, path);
+        if (published === "published") {
+            await durableDirectorySync(directory);
+            return claim;
+        }
+        const raced = await readClaim(path);
+        if (raced.claimFingerprint !== claim.claimFingerprint) {
+            throw new Error("storage ownership claim was concurrently provisioned for another identity");
+        }
+        return raced;
+    }
+    finally {
+        await handle?.close().catch(() => undefined);
+        await rm(temporary, { force: true }).catch(() => undefined);
+    }
+}

package/dist/storage-runtime-controller.js

@@ -5,12 +5,13 @@ import { buildServiceSpec } from "./computer-service.js";
 import { buildManagedServiceRecord } from "./managed-service-lifecycle.js";
 import { createStorageControlController } from "./storage-control.js";
 import { runStorageDoctor } from "./storage-doctor.js";
-import { storageHelloIdentity } from "./storage-identity.js";
+import { storageHelloIdentity, storageWorkspaceRootFingerprint, } from "./storage-identity.js";
 import { storageLayout, validateStorageEnvironment } from "./storage-layout.js";
 import { StorageMigrationFailure } from "./storage-migration-controller.js";
 import { launchStorageMigrationWorker, writeStorageWorkerHandoff } from "./storage-worker-handoff.js";
 import { writeStorageWorkerOperation } from "./storage-worker-operation.js";
 import { latestSourceStorageMigrationReceipt, monitorStorageMigrationStatus, storageMigrationStatusReplay, } from "./storage-status-replay.js";
+import { resolveWorkspaceStorageOwnershipClaim, } from "./storage-ownership.js";
 const UUID = z.string().uuid();
 function fingerprint(value) {
     return `sha256:${createHash("sha256").update(value).digest("hex")}`;
@@ -22,13 +23,13 @@ function deterministicUuid(value) {
     const hex = chars.join("");
     return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
-function storageId(input, workspaceId) {
-    if (input.ownership.workspaceId !== workspaceId || input.ownership.environment !== input.environment) {
+function storageId(input, workspaceId, ownership) {
+    if (ownership.workspaceId !== workspaceId || ownership.environment !== input.environment) {
         throw new Error("Storage ownership claim does not match the migration identity");
     }
-    return `storage_${input.ownership.claimFingerprint.slice("sha256:".length)}`;
+    return `storage_${ownership.claimFingerprint.slice("sha256:".length)}`;
 }
-function installationBase(input, workspaceId, migrationId, createdAt) {
+function installationBase(input, workspaceId, migrationId, createdAt, ownership) {
     const layout = storageLayout({
         nowworkHome: input.nowworkHome,
         environment: input.environment,
@@ -43,7 +44,7 @@ function installationBase(input, workspaceId, migrationId, createdAt) {
         serverUrl: input.serverUrl,
         environment: input.environment,
         workspaceId,
-        storageId: storageId(input, workspaceId),
+        storageId: storageId(input, workspaceId, ownership),
         nowworkHome: input.nowworkHome,
         runtimeRoot: layout.runtimeRoot,
         credentialRef: `profile:${input.profile}`,
@@ -99,6 +100,7 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
         writeHandoff: writeStorageWorkerHandoff,
         launchWorker: launchStorageMigrationWorker,
         monitorWorker: monitorStorageMigrationStatus,
+        resolveOwnership: resolveWorkspaceStorageOwnershipClaim,
         now: () => new Date(),
         ...injected,
     };
@@ -108,6 +110,8 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
     let gate = null;
     let sendStatus = null;
     let control = null;
+    let ownership = input.ownership;
+    let identityBindTail = Promise.resolve();
     const pendingControlMessages = [];
     let drainingPendingControlMessages = false;
     const drainPendingControlMessages = () => {
@@ -197,8 +201,8 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
                 backupsRoot: input.local.backupsRoot,
                 backupArtifacts: input.backupArtifacts.map((artifact) => ({ ...artifact })),
                 ownership: {
-                    ownerEpoch: input.ownership.ownerEpoch,
-                    ownershipClaimFingerprint: input.ownership.claimFingerprint,
+                    ownerEpoch: ownership.ownerEpoch,
+                    ownershipClaimFingerprint: ownership.claimFingerprint,
                 },
                 acceptedWarnings: [...input.policy.acceptedWarnings],
             },
@@ -214,7 +218,7 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
             installation: {
                 configRoot: input.local.configRoot,
                 target: {
-                    ...installationBase(input, workspaceId, doctor.manifest.migrationId, createdAt),
+                    ...installationBase(input, workspaceId, doctor.manifest.migrationId, createdAt, ownership),
                     storageMigrationId: doctor.manifest.migrationId,
                 },
             },
@@ -236,8 +240,8 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
             sourceStorageFingerprint,
             targetStorageFingerprint: identity.storageIdFingerprint,
             ownership: {
-                ownerEpoch: input.ownership.ownerEpoch,
-                ownershipClaimFingerprint: input.ownership.claimFingerprint,
+                ownerEpoch: ownership.ownerEpoch,
+                ownershipClaimFingerprint: ownership.claimFingerprint,
             },
             runDoctor: async (migrationId) => dependencies.runDoctor(await doctorInput(migrationId)),
             runMigration: async (doctor) => {
@@ -294,7 +298,7 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
             sendStatus,
         });
     };
-    const bindServerIdentity = (server) => {
+    const bindServerIdentityOnce = async (server) => {
         const nextWorkspaceId = UUID.parse(server.workspaceId).toLowerCase();
         const nextMachineId = UUID.parse(server.machineId).toLowerCase();
         if (workspaceId !== null && workspaceId !== nextWorkspaceId) {
@@ -303,13 +307,6 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
         if (machineId !== null && machineId !== nextMachineId) {
             throw new Error("Storage migration server machine identity changed");
         }
-        if (input.ownership.workspaceId !== nextWorkspaceId
-            || input.ownership.machineId !== nextMachineId
-            || input.ownership.environment !== input.environment) {
-            throw new Error("Storage ownership claim does not match authenticated server identity");
-        }
-        const createdAt = dependencies.now().toISOString();
-        const installation = installationBase(input, nextWorkspaceId, undefined, createdAt);
         const layout = storageLayout({
             nowworkHome: input.nowworkHome,
             environment: input.environment,
@@ -317,13 +314,36 @@ export function createStorageMigrationRuntimeController(rawInput, injected = {})
             runtimeBase: input.local.runtimeBase,
             platform: input.platform,
         });
-        const nextIdentity = storageHelloIdentity({ installation, layout, ownership: input.ownership });
+        if (ownership.workspaceId !== nextWorkspaceId
+            || ownership.machineId !== nextMachineId
+            || ownership.environment !== input.environment) {
+            ownership = await dependencies.resolveOwnership({
+                nowworkHome: input.nowworkHome,
+                machineId: nextMachineId,
+                workspaceId: nextWorkspaceId,
+                environment: input.environment,
+                workspaceRootFingerprint: storageWorkspaceRootFingerprint(layout.workspaceRoot),
+            });
+        }
+        if (ownership.workspaceId !== nextWorkspaceId
+            || ownership.machineId !== nextMachineId
+            || ownership.environment !== input.environment) {
+            throw new Error("Storage ownership claim does not match authenticated server identity");
+        }
+        const createdAt = dependencies.now().toISOString();
+        const installation = installationBase(input, nextWorkspaceId, undefined, createdAt, ownership);
+        const nextIdentity = storageHelloIdentity({ installation, layout, ownership });
         workspaceId = nextWorkspaceId;
         machineId = nextMachineId;
         identity = nextIdentity;
         ensureControl();
         drainPendingControlMessages();
     };
+    const bindServerIdentity = (server) => {
+        const current = identityBindTail.then(() => bindServerIdentityOnce(server));
+        identityBindTail = current.catch(() => undefined);
+        return current;
+    };
     const attach = (runtime) => {
         gate = runtime.gate;
         sendStatus = runtime.sendStatus;

package/dist/storage-runtime.js

@@ -1,7 +1,7 @@
 import { findInstallationForProfile, readInstallations, resolveLocalStorageRoots, } from "./storage-config.js";
 import { storageHelloIdentity } from "./storage-identity.js";
 import { storageLayout } from "./storage-layout.js";
-import { readStorageOwnershipClaim } from "./storage-ownership.js";
+import { readStorageOwnershipClaim, resolveWorkspaceStorageOwnershipClaim, } from "./storage-ownership.js";
 const canonicalServerUrl = (value) => value.replace(/\/+$/u, "");
 export function resolveStorageRuntime(input) {
     const installation = findInstallationForProfile(input.records, input.profile);
@@ -45,7 +45,7 @@ export async function loadStorageRuntime(input) {
         return null;
     let ownership;
     try {
-        ownership = await readStorageOwnershipClaim(baseline.layout.persistentRoot);
+        ownership = await readStorageOwnershipClaim(baseline.layout.persistentRoot, baseline.layout.workspaceId);
     }
     catch (error) {
         if (error.code !== "ENOENT")
@@ -53,3 +53,39 @@ export async function loadStorageRuntime(input) {
     }
     return ownership === undefined ? baseline : resolveStorageRuntime({ ...input, records, ownership });
 }
+export async function bindStorageRuntimeOwnership(runtime, server) {
+    const workspaceId = server.workspaceId.toLowerCase();
+    const machineId = server.machineId.toLowerCase();
+    if (runtime.installation.workspaceId !== workspaceId) {
+        throw new Error("Storage runtime server workspace identity changed");
+    }
+    const existing = runtime.identity.storageOwnership;
+    if (existing !== undefined) {
+        if (existing.machineId !== machineId)
+            throw new Error("Storage runtime server machine identity changed");
+        return runtime;
+    }
+    const ownership = await resolveWorkspaceStorageOwnershipClaim({
+        nowworkHome: runtime.layout.persistentRoot,
+        machineId,
+        workspaceId,
+        environment: runtime.installation.environment,
+        workspaceRootFingerprint: runtime.identity.workspaceRootFingerprint,
+    });
+    return Object.freeze({
+        ...runtime,
+        identity: storageHelloIdentity({ installation: runtime.installation, layout: runtime.layout, ownership }),
+    });
+}
+export function createStorageRuntimeOwnershipBinding(initial) {
+    let runtime = initial;
+    let bindTail = Promise.resolve();
+    const bind = (server) => {
+        const current = bindTail.then(async () => {
+            runtime = await bindStorageRuntimeOwnership(runtime, server);
+        });
+        bindTail = current.catch(() => undefined);
+        return current;
+    };
+    return Object.freeze({ identity: () => runtime.identity, bind });
+}

package/dist/storage-serve-adapter.js

@@ -9,6 +9,15 @@ export function storageMigrationCapabilities(configured, options) {
             ...(options.ready ? [STORAGE_MIGRATION_CAPABILITY] : []),
         ])]);
 }
+export function bindStorageMigrationServerIdentity(options, identity, callbacks) {
+    const bind = options?.bindServerIdentity;
+    if (bind === undefined) {
+        if (options?.ready === true)
+            callbacks.onBound();
+        return;
+    }
+    void Promise.resolve().then(() => bind(identity)).then(callbacks.onBound).catch(callbacks.onError);
+}
 export function createServeStorageStatusDelivery(options, dependencies) {
     return createStorageStatusDelivery({
         ...(options?.statusOutboxPath === undefined ? {} : { outboxPath: options.statusOutboxPath }),
@@ -17,28 +26,36 @@ export function createServeStorageStatusDelivery(options, dependencies) {
     });
 }
 export function attachStorageMigrationRuntime(options, dependencies) {
-    let admissionClosed = false;
+    let migrationAdmissionClosed = false;
+    let identityAdmissionClosed = options?.bindServerIdentity !== undefined;
     if (options?.ready === true) {
         options.attach?.({
             gate: {
                 isBusy: dependencies.isBusy,
                 closeAndFlush: async () => {
-                    admissionClosed = true;
+                    migrationAdmissionClosed = true;
                     await dependencies.waitForExecutionFrames();
                     if (dependencies.isBusy()) {
-                        admissionClosed = false;
+                        migrationAdmissionClosed = false;
                         throw Object.assign(new Error("active execution entered before storage migration quiesce"), {
                             code: "runtime_busy",
                         });
                     }
                     await dependencies.flushLocalState();
                 },
-                reopen: () => { admissionClosed = false; },
+                reopen: () => { migrationAdmissionClosed = false; },
             },
             sendStatus: dependencies.sendStatus,
         });
     }
-    return Object.freeze({ isAdmissionClosed: () => admissionClosed });
+    return Object.freeze({
+        isAdmissionClosed: () => migrationAdmissionClosed || identityAdmissionClosed,
+        beginIdentityBinding: () => {
+            if (options?.bindServerIdentity !== undefined)
+                identityAdmissionClosed = true;
+        },
+        completeIdentityBinding: () => { identityAdmissionClosed = false; },
+    });
 }
 export function replayStorageMigrationStatus(options, socket, isCurrent, onError, deliver) {
     return options?.replayStatus?.((frame) => {

package/package.json

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