@nowcrew/daemon 0.6.2 → 0.6.4

package/dist/agent-ability/materializer.js

@@ -8,7 +8,7 @@ import { abilityWorkspaceProjectionPath, DaemonAbilityLockSchema, DaemonAbilityM
 import { loadAgentAbilityRuntimeContext } from "./runtime-context.js";
 import { parseSkillFrontmatter } from "../skill-frontmatter.js";
 import { isProjectSkillName, MAX_PROJECT_SKILL_DESCRIPTION_LENGTH, MAX_PROJECT_SKILL_FILE_BYTES, } from "../project-skills/types.js";
-import { createAgentProjectionCoordinator, } from "../project-skills/agent-projection-coordinator.js";
+import { createAgentProjectionCoordinator, runtimeProjectionLifetime, } from "../project-skills/agent-projection-coordinator.js";
 const exists = (path) => lstat(path).then(() => true, () => false);
 const repositoryKey = (url) => createHash("sha256").update(url).digest("hex");
 const posixPath = (value) => value.split(sep).join("/");
@@ -208,6 +208,16 @@ const verifyCache = async (agentsRoot, ability) => {
 };
 const layerRelativePath = (path, layer) => path.startsWith(`${layer}/`) ? path.slice(layer.length + 1) : path;
 const readManagedCatalog = async (trainingRoot) => JSON.parse(await readFile(join(trainingRoot, "ACTIVE_RELEASE.json"), "utf8"));
+const activeTrainingRoot = async (agentsRoot, handle, ability) => {
+    const trainingRoot = join(agentsRoot, handle, "training");
+    const catalog = await readManagedCatalog(trainingRoot).catch(() => null);
+    return catalog?.managedBy === "nowcrew-agent-training"
+        && catalog.releaseId === ability.releaseId
+        && catalog.rootCommit === ability.rootCommit
+        && catalog.artifactDigest === ability.artifactDigest
+        ? trainingRoot
+        : null;
+};
 const materializeWorkspaceTraining = async (agentsRoot, handle, ability) => {
     let verified;
     try {
@@ -372,11 +382,22 @@ export function createAgentAbilityMaterializer(expectedAgentsRoot, coordinator =
                 }
             });
         },
-        async prepareAndLaunch(agentsRoot, handle, ability, launch) {
-            return withAgentTurn(handle, async () => {
+        prepareAndLaunch(agentsRoot, handle, ability, launch) {
+            if (agentsRoot !== expectedAgentsRoot)
+                return Promise.reject(new Error("ability_agents_root_mismatch"));
+            return coordinator.runExclusiveUntil(expectedAgentsRoot, handle, async () => {
                 const started = Date.now();
                 try {
-                    const trainingRoot = await apply(agentsRoot, handle, ability).then(() => join(agentsRoot, handle, "training"));
+                    const existingTrainingRoot = await activeTrainingRoot(agentsRoot, handle, ability);
+                    let trainingRoot;
+                    if (existingTrainingRoot !== null) {
+                        trainingRoot = existingTrainingRoot;
+                        await projectWorkspaceTraining(agentsRoot, handle, ability, existingTrainingRoot);
+                    }
+                    else {
+                        await apply(agentsRoot, handle, ability);
+                        trainingRoot = join(agentsRoot, handle, "training");
+                    }
                     const context = await loadAgentAbilityRuntimeContext(join(agentsRoot, handle), trainingRoot, ability);
                     dslog("ability.execution.materialized", "Agent ability release materialized", {
                         level: "INFO", agent_handle: handle, release_id: ability.releaseId,
@@ -392,7 +413,7 @@ export function createAgentAbilityMaterializer(expectedAgentsRoot, coordinator =
                     });
                     throw error;
                 }
-            });
+            }, runtimeProjectionLifetime);
         },
     };
 }

package/dist/project-skills/agent-projection-coordinator.js

@@ -1,5 +1,11 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createKeyedPromiseTail } from "../promise-tail.js";
+export const runtimeProjectionLifetime = (value) => {
+    if (typeof value !== "object" || value === null || !("exit" in value))
+        return Promise.resolve();
+    const exit = value.exit;
+    return exit instanceof Promise ? exit.catch(() => undefined) : Promise.resolve();
+};
 export function createAgentProjectionCoordinator() {
     const tails = createKeyedPromiseTail();
     const heldKeys = new AsyncLocalStorage();
@@ -11,5 +17,30 @@ export function createAgentProjectionCoordinator() {
                 return operation();
             return tails.enqueue(key, () => heldKeys.run(new Set([...(held ?? []), key]), operation));
         },
+        runExclusiveUntil(agentsRoot, handle, operation, releaseWhen) {
+            const key = JSON.stringify([agentsRoot, handle]);
+            const held = heldKeys.getStore();
+            if (held?.has(key))
+                return operation();
+            let resolveStarted;
+            let rejectStarted;
+            const started = new Promise((resolve, reject) => {
+                resolveStarted = resolve;
+                rejectStarted = reject;
+            });
+            void tails.enqueue(key, () => heldKeys.run(new Set([...(held ?? []), key]), async () => {
+                let value;
+                try {
+                    value = await operation();
+                }
+                catch (error) {
+                    rejectStarted(error);
+                    throw error;
+                }
+                resolveStarted(value);
+                await releaseWhen(value);
+            })).catch(() => { });
+            return started;
+        },
     };
 }

package/dist/project-skills/reconciler.js

@@ -1,6 +1,7 @@
 import { cp, lstat, mkdir, readdir, readlink, rename, rm, stat, symlink, writeFile } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { dirname, join, resolve, sep } from "node:path";
+import { runtimeProjectionLifetime, } from "./agent-projection-coordinator.js";
 export class ProjectProjectionError extends Error {
     code;
     constructor(code) {
@@ -135,10 +136,10 @@ export function createProjectSkillsReconciler(deps) {
             if (agentsRoot !== deps.agentsRoot) {
                 return Promise.reject(new ProjectProjectionError("skill_projection_failed"));
             }
-            return deps.coordinator.runExclusive(deps.agentsRoot, handle, async () => {
+            return deps.coordinator.runExclusiveUntil(deps.agentsRoot, handle, async () => {
                 await reconcileUnlocked(handle, bindings);
                 return launch();
-            });
+            }, runtimeProjectionLifetime);
         },
     };
 }

package/package.json

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