@nowcrew/daemon 0.5.34 → 0.5.36

package/dist/serve.js

@@ -8,7 +8,7 @@ import { randomUUID } from "node:crypto";
 import { initSlog, dslog, setSlogDefaults, drainSpool, flushSlog } from "./slog.js";
 import { mergeRunAgentResults, reportScheduledStartFailure, runAgent } from "./runner.js";
 import { buildOriginDecisionRetryPrompt, buildScheduledPrompt } from "./prompt.js";
-import { collectMachineHello, DAEMON_CAPABILITIES, EXECUTION_PROTOCOL, } from "./machine-info.js";
+import { collectMachineHello, daemonCapabilities, EXECUTION_PROTOCOL, } from "./machine-info.js";
 import { listWorkspace, readWorkspaceFile } from "./workspace-fs.js";
 import { listSkills } from "./skills.js";
 import { inspectRaftWorkspace, importRaftWorkspace } from "./workspace-import.js";
@@ -35,26 +35,36 @@ import { detectDaemonUpdateEligibility, } from "./daemon-update-eligibility.js";
 import { createDaemonUpdateController } from "./daemon-update-controller.js";
 import { installExactDaemonUpdate } from "./daemon-updater.js";
 import { scheduleServiceRestart } from "./computer-service.js";
+import { createProjectRegistry } from "./project-skills/registry.js";
+import { createProjectSkillsController, } from "./project-skills/controller.js";
+import { PROJECT_SKILLS_CAPABILITY } from "./project-skills/types.js";
+import { createAgentProjectionCoordinator } from "./project-skills/agent-projection-coordinator.js";
+import { createProjectSkillsReconciler, ProjectProjectionError, } from "./project-skills/reconciler.js";
+import { parseMemoryPruneTraceId } from "./memory-prune-diagnostics.js";
 // normalize.ts 的活动种类 → activity 枚举
 const ACTIVITY_MAP = {
     init: "working", text: "thinking", reading: "reading", sending: "sending",
     checking: "checking", claiming: "claiming", crew: "working", tool: "working",
     tool_result: "working", done: "done", error: "error",
 };
-export function buildControlPlaneUrl(serverUrl, machineToken, runtimePlatform = process.platform, jobObjectProbe) {
+export function buildControlPlaneUrl(serverUrl, machineToken, runtimePlatform = process.platform, jobObjectProbe, projectSkillsAvailable = true) {
     const query = new URLSearchParams({ key: machineToken });
     if (executionBackendCapability(runtimePlatform, jobObjectProbe).supported) {
         query.set("execution_min", String(EXECUTION_PROTOCOL.min));
         query.set("execution_max", String(EXECUTION_PROTOCOL.max));
     }
-    for (const capability of DAEMON_CAPABILITIES)
-        query.append("capability", capability);
+    for (const capability of daemonCapabilities(runtimePlatform)) {
+        if (capability !== PROJECT_SKILLS_CAPABILITY || projectSkillsAvailable) {
+            query.append("capability", capability);
+        }
+    }
     return `${serverUrl.replace(/^http/, "ws").replace(/\/+$/, "")}/daemon/connect?${query.toString()}`;
 }
 export function serve(config, opts = {}) {
-    const wsUrl = buildControlPlaneUrl(config.serverUrl, config.machineToken);
     let stopped = false;
     let ws = null;
+    // 当前连接的 server 能力(ready 帧下发;重连后由新 ready 帧刷新)。
+    let serverCapabilities = new Set();
     let backoff = 1000;
     const maxBackoff = opts.maxBackoffMs ?? 30_000;
     const testShutdown = readTestShutdownConfiguration(process.env);
@@ -97,6 +107,82 @@ export function serve(config, opts = {}) {
             catch { /* reconnect/timeout reconciliation handles a lost status frame */ }
         },
     });
+    const projectionCoordinator = createAgentProjectionCoordinator();
+    let projectSkillsController;
+    const projectSkillsReconciler = opts.projectSkills?.reconciler ?? createProjectSkillsReconciler({
+        agentsRoot: config.agentsRoot,
+        coordinator: projectionCoordinator,
+        scannedProjects: () => projectSkillsController.scannedProjects(),
+    });
+    projectSkillsController = opts.projectSkills?.controller ?? createProjectSkillsController({
+        registry: createProjectRegistry(config.agentsRoot),
+        publish: (frame) => {
+            if (!serverCapabilities.has(PROJECT_SKILLS_CAPABILITY))
+                return;
+            try {
+                if (ws?.readyState === WebSocket.OPEN)
+                    ws.send(JSON.stringify(frame));
+            }
+            catch { /* 下一次 ready 或项目操作会重新发送完整快照 */ }
+        },
+        reconcile: (handle, bindings) => projectSkillsReconciler.reconcile(handle, bindings),
+    });
+    let projectSkillsStatus = "initializing";
+    let projectSkillsInitialization = null;
+    let latestMachineHello = null;
+    let latestHelloSocket = null;
+    const effectiveMachineHello = (hello) => ({
+        ...hello,
+        projectSkillsStatus,
+        capabilities: projectSkillsStatus === "ready"
+            ? hello.capabilities
+            : hello.capabilities.filter((capability) => capability !== PROJECT_SKILLS_CAPABILITY),
+    });
+    const sendEffectiveMachineHello = () => {
+        if (latestMachineHello === null || latestHelloSocket?.readyState !== WebSocket.OPEN)
+            return;
+        const hello = effectiveMachineHello(latestMachineHello);
+        try {
+            latestHelloSocket.send(JSON.stringify(hello));
+            log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`);
+        }
+        catch { /* 非 OPEN,忽略 */ }
+    };
+    const ensureProjectSkillsInitialized = () => {
+        if (projectSkillsStatus === "ready")
+            return Promise.resolve(true);
+        if (projectSkillsInitialization !== null)
+            return projectSkillsInitialization;
+        projectSkillsStatus = "initializing";
+        const attempt = projectSkillsController.initialize().then(() => {
+            projectSkillsStatus = "ready";
+            return true;
+        }, (error) => {
+            projectSkillsStatus = "unavailable";
+            dslog("project_skills.registry_failed", "本机项目注册表读取失败", {
+                level: "ERROR", error_code: error.code ?? "project_registry_corrupt",
+            });
+            return false;
+        }).finally(() => {
+            if (projectSkillsInitialization === attempt)
+                projectSkillsInitialization = null;
+            sendEffectiveMachineHello();
+        });
+        projectSkillsInitialization = attempt;
+        return attempt;
+    };
+    const initializedProjectSkillsReconciler = {
+        async reconcile(handle, bindings) {
+            return await ensureProjectSkillsInitialized()
+                ? projectSkillsReconciler.reconcile(handle, bindings)
+                : Promise.reject(new ProjectProjectionError("skill_projection_failed"));
+        },
+        async prepareAndLaunch(agentsRoot, handle, bindings, launch) {
+            return await ensureProjectSkillsInitialized()
+                ? projectSkillsReconciler.prepareAndLaunch(agentsRoot, handle, bindings, launch)
+                : Promise.reject(new ProjectProjectionError("skill_projection_failed"));
+        },
+    };
     const safeExecutionSend = (frame) => {
         try {
             if (ws?.readyState !== WebSocket.OPEN)
@@ -200,11 +286,13 @@ export function serve(config, opts = {}) {
     // scheduled 重复 run 仍由 running 去重;普通同线程 wake 用 legacyTaskTails 串成 FIFO。
     // 每 agent 超过并行上限的任务继续进入 sharedQueues(不丢)。
     const running = new Set();
+    const activeExecutionTaskKeys = new Map();
     const legacyTaskTails = new Map();
     const log = (s) => process.stdout.write(formatDaemonLogLine(s) + "\n");
     function connect() {
         if (stopped)
             return;
+        const wsUrl = buildControlPlaneUrl(config.serverUrl, config.machineToken, process.platform, undefined, projectSkillsStatus === "ready");
         ws = createWebSocket(wsUrl);
         ws.on("open", () => {
             const openedSocket = ws;
@@ -233,12 +321,12 @@ export function serve(config, opts = {}) {
             });
             void helloPromise
                 .then((hello) => {
+                if (ws !== openedSocket || openedSocket.readyState !== WebSocket.OPEN)
+                    return;
                 detectedExecutionRuntimes = hello.executionRuntimes;
-                try {
-                    ws?.send(JSON.stringify(hello));
-                    log(`📤 已上报机器信息: ${hello.hostname} · ${hello.os} · installed=[${hello.runtimes.join(",")}] · executable=[${hello.executionRuntimes.join(",")}] · agents=[${hello.agentHandles.join(",")}]`);
-                }
-                catch { /* 非 OPEN,忽略 */ }
+                latestMachineHello = hello;
+                latestHelloSocket = openedSocket;
+                sendEffectiveMachineHello();
             })
                 .catch(() => { });
             opts.onOpen?.(ws);
@@ -385,6 +473,18 @@ export function serve(config, opts = {}) {
                         }
                         return;
                     }
+                    const pruneTraceId = parseMemoryPruneTraceId(spec.instructions.wakePrompt);
+                    if (pruneTraceId !== null) {
+                        dslog("memory_prune.received", "Daemon 已收到长期记忆收尾 execution", {
+                            protocol: "execution_v1",
+                            prune_trace_id: pruneTraceId,
+                            execution_id: spec.executionId,
+                            agent_handle: spec.agent.handle,
+                            channel_id: spec.context.channelId,
+                            thread_id: spec.context.threadId ?? null,
+                            task_key: spec.workspace.taskKey,
+                        });
+                    }
                     const reservation = sharedSlots.reserve(spec.agent.handle, "execution");
                     if (!reservation.accepted) {
                         dslog("execution.machine_queue_rejected", "机器执行队列已满", {
@@ -410,9 +510,41 @@ export function serve(config, opts = {}) {
                         });
                     }
                     executionReservations.set(spec.executionId, reservation);
+                    const executionTaskKey = `${spec.agent.handle}:${spec.workspace.taskKey}`;
+                    let executionTaskKeyActive = false;
+                    let executionTaskKeyFinished = false;
+                    const markExecutionTaskKeyActive = () => {
+                        if (executionTaskKeyActive || executionTaskKeyFinished)
+                            return;
+                        executionTaskKeyActive = true;
+                        const activeSameTask = (activeExecutionTaskKeys.get(executionTaskKey) ?? 0) + 1;
+                        activeExecutionTaskKeys.set(executionTaskKey, activeSameTask);
+                        dslog(activeSameTask > 1 ? "execution.task_key_overlap_detected" : "execution.task_key_started", activeSameTask > 1 ? "同一 Agent 任务键存在重叠 execution" : "Agent 任务键 execution 已开始", {
+                            ...(activeSameTask > 1 ? { level: "WARN" } : {}),
+                            execution_id: spec.executionId,
+                            agent_handle: spec.agent.handle,
+                            task_key: spec.workspace.taskKey,
+                            active_same_task: activeSameTask,
+                            ...reservation.facts,
+                        });
+                    };
                     const cancellation = cancellationFor(spec.executionId);
                     const cleanupExecutionReservation = () => {
+                        executionTaskKeyFinished = true;
                         reservation.release();
+                        if (executionTaskKeyActive) {
+                            const remainingSameTask = Math.max(0, (activeExecutionTaskKeys.get(executionTaskKey) ?? 1) - 1);
+                            if (remainingSameTask === 0)
+                                activeExecutionTaskKeys.delete(executionTaskKey);
+                            else
+                                activeExecutionTaskKeys.set(executionTaskKey, remainingSameTask);
+                            dslog("execution.task_key_finished", "Agent 任务键 execution 已结束", {
+                                execution_id: spec.executionId,
+                                agent_handle: spec.agent.handle,
+                                task_key: spec.workspace.taskKey,
+                                active_same_task: remainingSameTask,
+                            });
+                        }
                         cancellations.delete(spec.executionId);
                         executionReservations.delete(spec.executionId);
                         knownExecutionHashes.delete(spec.executionId);
@@ -437,6 +569,7 @@ export function serve(config, opts = {}) {
                     }
                     const execution = executeProtocol(config, spec, {
                         ...opts.execution?.dependencies,
+                        projectSkills: opts.execution?.dependencies?.projectSkills ?? initializedProjectSkillsReconciler,
                         ...(agentMemory === undefined ? {} : { agentMemory }),
                         journal: executionJournal,
                         facts: {
@@ -450,6 +583,7 @@ export function serve(config, opts = {}) {
                             slot: {
                                 state: reservation.state,
                                 ready: reservation.ready.then(() => {
+                                    markExecutionTaskKeyActive();
                                     const snapshot = sharedSlots.snapshot();
                                     dslog("execution.machine_slot_ready", "execution 获得机器执行名额", {
                                         execution_id: spec.executionId,
@@ -506,6 +640,14 @@ export function serve(config, opts = {}) {
                 // ready 帧带 server 视角的 machineId/workspaceId → 作为后续所有日志的默认关联键
                 const r = msg;
                 setSlogDefaults({ machine_id: r.machineId, workspace_id: r.workspaceId });
+                // 旧 server 无此字段 → 空集合(daemon 保持全部旧行为)。
+                serverCapabilities = new Set(Array.isArray(r.serverCapabilities)
+                    ? r.serverCapabilities.filter((c) => typeof c === "string")
+                    : []);
+                if (serverCapabilities.has(PROJECT_SKILLS_CAPABILITY)) {
+                    if (await ensureProjectSkillsInitialized())
+                        await projectSkillsController.publishCurrent();
+                }
                 return;
             }
             if (msg.type === "error") {
@@ -517,6 +659,26 @@ export function serve(config, opts = {}) {
                 }
                 return;
             }
+            if (msg.type === "project:add"
+                || msg.type === "project:remove"
+                || msg.type === "project:rescan"
+                || msg.type === "agent:skills:sync") {
+                const request = msg;
+                if (typeof request.reqId !== "string")
+                    return;
+                const result = serverCapabilities.has(PROJECT_SKILLS_CAPABILITY)
+                    ? await projectSkillsController.handle(msg)
+                    : { ok: false, error: "capability_unavailable" };
+                if (result.ok && (msg.type === "project:remove"
+                    || msg.type === "project:rescan")) {
+                    void ensureProjectSkillsInitialized();
+                }
+                try {
+                    ws?.send(JSON.stringify({ type: "fs:result", reqId: request.reqId, ...result }));
+                }
+                catch { /* server 会按请求超时处理 */ }
+                return;
+            }
             // 导入 raft agent 工作区:inspect 反填 name/description;import 复制用户内容
             if (msg.type === "raft:inspect" || msg.type === "raft:import") {
                 const req = msg;
@@ -579,6 +741,9 @@ export function serve(config, opts = {}) {
                         : {}),
                 })
                 : null;
+            // 活取值:发报告的时刻按"当前连接"的 server 能力判定(滚动发布中 run 可能跨重连;
+            // 断线时集合被清空 → 回退为 daemon 自行发通知,方向安全)。
+            const serverOwnsFailureNotice = () => serverCapabilities.has("scheduled_failure_notice_v1");
             const threadId = msg.wake?.threadId;
             const taskKey = scheduled ? scheduled.runId : (threadId ?? msg.channelId);
             const key = `${msg.agentHandle}:${taskKey}`;
@@ -588,6 +753,14 @@ export function serve(config, opts = {}) {
                 run_id: runId, agent_handle: msg.agentHandle, channel_id: msg.channelId,
                 thread_id: threadId ?? null, task_key: taskKey,
             };
+            const pruneTraceId = parseMemoryPruneTraceId(msg.wake?.content ?? "");
+            if (pruneTraceId !== null) {
+                dslog("memory_prune.received", "Daemon 已收到长期记忆收尾唤醒", {
+                    ...runKeys,
+                    protocol: "legacy",
+                    prune_trace_id: pruneTraceId,
+                });
+            }
             dslog("run.wake_received", `收到唤醒 ${msg.agentHandle}`, {
                 ...runKeys, reason: msg.reason ?? "", sender: msg.wake?.senderHandle,
                 wake_origin: msg.wake?.origin ?? null,
@@ -744,6 +917,7 @@ export function serve(config, opts = {}) {
                                 title: scheduled.title,
                                 outputPolicy: scheduled.outputPolicy,
                                 externalNotificationPolicy: scheduled.externalNotificationPolicy,
+                                serverOwnsFailureNotice,
                             },
                         } : {}),
                         ...(wakeOrigin ? { wakeOrigin, originDecisionAttempt: attempt } : {}),
@@ -852,6 +1026,7 @@ export function serve(config, opts = {}) {
                             channelId: msg.channelId,
                             scheduled,
                             errorMessage: e.message,
+                            serverOwnsFailureNotice,
                         });
                     }
                     catch { /* token 也不可用时只能让 server 按 runtime failure 终态化 */ }
@@ -889,6 +1064,8 @@ export function serve(config, opts = {}) {
         ws.on("close", (code) => {
             if (stopped)
                 return;
+            // server 能力随连接失效;下个连接的 ready 帧重新声明(防降级重连后沿用过期能力)。
+            serverCapabilities = new Set();
             completionRetransmitter.pause();
             // 4001 = 控制面应用级「鉴权失败」关闭码(见 server control-plane.ts)。即使上面的
             // error 帧因 close 抢先而丢失,也能据关闭码识别这是凭证失效——退避拉满,不再每秒热循环。
@@ -926,6 +1103,7 @@ export function serve(config, opts = {}) {
             flush: flushSlog,
             writeStderr: (line) => process.stderr.write(line),
         });
+        void ensureProjectSkillsInitialized();
         connect();
     })();
     const stop = () => {

package/dist/skill-frontmatter.js

@@ -0,0 +1,23 @@
+export function parseSkillFrontmatter(markdown) {
+    const match = markdown.match(/^---[\t ]*\r?\n([\s\S]*?)\r?\n---(?:[\t ]*\r?\n|$)/u);
+    if (!match)
+        return Object.freeze({});
+    let name;
+    let description;
+    for (const line of match[1]?.split(/\r?\n/u) ?? []) {
+        const field = line.match(/^(name|description)[\t ]*:[\t ]*(.*?)[\t ]*$/u);
+        if (!field)
+            continue;
+        const value = (field[2] ?? "")
+            .replace(/^(?:"([\s\S]*)"|'([\s\S]*)')$/u, "$1$2")
+            .trim();
+        if (field[1] === "name")
+            name = value;
+        if (field[1] === "description")
+            description = value;
+    }
+    return Object.freeze({
+        ...(name === undefined ? {} : { name }),
+        ...(description === undefined ? {} : { description }),
+    });
+}

package/dist/skills.js

@@ -9,25 +9,8 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { homedir } from "node:os";
+import { parseSkillFrontmatter } from "./skill-frontmatter.js";
 const globalSkillsDir = () => process.env.CREW_GLOBAL_SKILLS_DIR ?? join(homedir(), ".claude", "skills");
-/** 从 SKILL.md 顶部 YAML frontmatter 取 name / description (简易解析,够用)。 */
-function parseFrontmatter(md) {
-    const m = md.match(/^---\s*\n([\s\S]*?)\n---/);
-    if (!m)
-        return {};
-    const out = {};
-    for (const line of m[1].split("\n")) {
-        const kv = line.match(/^(name|description)\s*:\s*(.+?)\s*$/);
-        if (kv) {
-            const val = kv[2].replace(/^["']|["']$/g, "");
-            if (kv[1] === "name")
-                out.name = val;
-            else
-                out.description = val;
-        }
-    }
-    return out;
-}
 async function readSkillsFrom(dir, scope) {
     const names = await readdir(dir).catch(() => []);
     const skills = [];
@@ -39,7 +22,7 @@ async function readSkillsFrom(dir, scope) {
         if (!s || !s.isFile())
             continue;
         const md = await readFile(skillMd, "utf8").catch(() => "");
-        const fm = parseFrontmatter(md);
+        const fm = parseSkillFrontmatter(md);
         skills.push({ scope, name: fm.name || name, description: fm.description ?? "" });
     }
     return skills;

package/dist/supervised-runtime.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { join } from "node:path";
 import { startDormantSupervisor, } from "./execution-supervisor.js";
 import { buildClaudeArgs } from "./runtimes/claude.js";
 import { RuntimeCancelledError } from "./runtime-cancellation.js";
@@ -19,6 +20,9 @@ export function supervisorLaunch(request) {
                 cwd: request.cwd,
                 env: request.env,
                 systemPromptPath: request.systemPromptPath,
+                ...(request.agentRoot === undefined ? {} : {
+                    projectSkillsDirectory: join(request.agentRoot, ".crew", "claude-skills"),
+                }),
                 ...(request.sessionId === undefined ? {} : {
                     sessionId: request.sessionId,
                     resume: request.resume,
@@ -45,6 +49,9 @@ export function supervisorLaunch(request) {
                 ...(request.reasoning === undefined ? {} : { reasoning: request.reasoning }),
                 ...(request.sessionId === undefined ? {} : { sessionId: request.sessionId }),
                 ...(request.imagePaths === undefined ? {} : { imagePaths: request.imagePaths }),
+                ...(request.agentRoot === undefined ? {} : {
+                    projectRootMarkers: [".git", ".nowwork-root"],
+                }),
                 resume: request.resume,
             }),
         };

package/package.json

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