@nowcrew/daemon 0.6.7 → 0.6.9

package/README.md

@@ -378,7 +378,7 @@ CREW_EXECUTION_MAX_QUEUED_TOTAL=128
 CREW_EXECUTION_MAX_STARTING_TOTAL=1
 CREW_EXECUTION_MAX_STARTING_PER_RUNTIME=1
 CREW_EXECUTION_START_GAP_MS=3000
-CREW_EXECUTION_STARTUP_TIMEOUT_MS=60000
+CREW_EXECUTION_STARTUP_TIMEOUT_MS=120000
 ```
 
 `MAX_PARALLEL_TOTAL` is the machine-wide process cap shared by protocol-v1 and legacy work.

package/dist/codex-startup-stage.js

@@ -0,0 +1,54 @@
+const STAGE_LINE_PREFIX_CAP = 512;
+const STAGE_PATTERN = /^\[codex-app-server\] stage=(spawn|initialize|thread_start|thread_resume|model_init) status=(start|ok|error|timeout) attempt=(\d+) elapsed_ms=(\d+)(?:\s|$)/;
+function parseBoundedStageLine(line) {
+    const match = STAGE_PATTERN.exec(line);
+    if (match === null)
+        return null;
+    const [, rawStage, status, rawAttempt, rawStageMs] = match;
+    const attempt = Number(rawAttempt);
+    const stageMs = Number(rawStageMs);
+    if (!Number.isSafeInteger(attempt) || attempt < 1
+        || !Number.isSafeInteger(stageMs) || stageMs < 0)
+        return null;
+    if (rawStage === "thread_resume") {
+        return { stage: "thread_start", status: status, attempt, stageMs, resumed: true };
+    }
+    return {
+        stage: rawStage,
+        status: status,
+        attempt,
+        stageMs,
+        ...(rawStage === "thread_start" ? { resumed: false } : {}),
+    };
+}
+export class CodexStartupStageParser {
+    onStage;
+    pendingPrefix = "";
+    constructor(onStage) {
+        this.onStage = onStage;
+    }
+    push(chunk) {
+        let remaining = chunk;
+        while (remaining.length > 0) {
+            const newline = remaining.indexOf("\n");
+            const segment = newline < 0 ? remaining : remaining.slice(0, newline);
+            const available = STAGE_LINE_PREFIX_CAP - this.pendingPrefix.length;
+            if (available > 0)
+                this.pendingPrefix += segment.slice(0, available);
+            if (newline < 0)
+                return;
+            this.emitPending();
+            remaining = remaining.slice(newline + 1);
+        }
+    }
+    finish() {
+        if (this.pendingPrefix.length > 0)
+            this.emitPending();
+    }
+    emitPending() {
+        const stage = parseBoundedStageLine(this.pendingPrefix.replace(/\r$/, ""));
+        this.pendingPrefix = "";
+        if (stage !== null)
+            this.onStage(stage);
+    }
+}

package/dist/config.js

@@ -17,7 +17,7 @@ export const DEFAULT_EXECUTION_LIMITS = Object.freeze({
     maxStartingTotal: 1,
     maxStartingPerRuntime: 1,
     startupGapMs: 3_000,
-    startupTimeoutMs: 60_000,
+    startupTimeoutMs: 120_000,
 });
 // Fits the largest mandatory v1 lifecycle envelope (UUID + timestamps + outcome facts) with margin.
 export const MIN_EXECUTION_EVENT_BYTES = 512;

package/dist/execution-supervisor.js

@@ -2,7 +2,8 @@ import { fork } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { executionBackendCapability, ownsRuntimeViaJobObject } from "./execution-backend.js";
 const DEFAULT_ABORT_TIMEOUT_MS = 5_000;
-const DEFAULT_HANDSHAKE_TIMEOUT_MS = 5_000;
+const DEFAULT_READY_HANDSHAKE_TIMEOUT_MS = 20_000;
+const DEFAULT_RELEASE_HANDSHAKE_TIMEOUT_MS = 5_000;
 const DEFAULT_TASKKILL_TIMEOUT_MS = 5_000;
 const PROCESS_GROUP_POLL_MS = 10;
 function messageError(error) {
@@ -153,9 +154,17 @@ export async function startDormantSupervisor(launch, options = {}) {
     const childEntry = options.childEntry
         ?? fileURLToPath(new URL("./execution-supervisor-child.js", import.meta.url));
     const abortTimeoutMs = options.abortTimeoutMs ?? DEFAULT_ABORT_TIMEOUT_MS;
-    const handshakeTimeoutMs = options.handshakeTimeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS;
-    if (!Number.isFinite(handshakeTimeoutMs) || handshakeTimeoutMs <= 0) {
-        throw new RangeError("handshakeTimeoutMs must be a positive finite number");
+    const readyHandshakeTimeoutMs = options.readyHandshakeTimeoutMs
+        ?? options.handshakeTimeoutMs
+        ?? DEFAULT_READY_HANDSHAKE_TIMEOUT_MS;
+    const releaseHandshakeTimeoutMs = options.releaseHandshakeTimeoutMs
+        ?? options.handshakeTimeoutMs
+        ?? DEFAULT_RELEASE_HANDSHAKE_TIMEOUT_MS;
+    if (!Number.isFinite(readyHandshakeTimeoutMs) || readyHandshakeTimeoutMs <= 0) {
+        throw new RangeError("readyHandshakeTimeoutMs must be a positive finite number");
+    }
+    if (!Number.isFinite(releaseHandshakeTimeoutMs) || releaseHandshakeTimeoutMs <= 0) {
+        throw new RangeError("releaseHandshakeTimeoutMs must be a positive finite number");
     }
     const env = Object.fromEntries(Object.entries(launch.env).filter((entry) => entry[1] !== undefined));
     const child = fork(childEntry, [], {
@@ -272,7 +281,7 @@ export async function startDormantSupervisor(launch, options = {}) {
                     reject(error);
             });
         });
-        await withTimeout(ready, handshakeTimeoutMs, "ready handshake");
+        await withTimeout(ready, readyHandshakeTimeoutMs, "ready handshake");
     }
     catch (error) {
         await abort().catch((abortError) => {
@@ -298,7 +307,7 @@ export async function startDormantSupervisor(launch, options = {}) {
                 });
             });
             try {
-                await withTimeout(acknowledgement, handshakeTimeoutMs, "release handshake");
+                await withTimeout(acknowledgement, releaseHandshakeTimeoutMs, "release handshake");
             }
             catch (error) {
                 await abort().catch((abortError) => {

package/dist/local-executor.js

@@ -20,6 +20,7 @@ import { isRuntimeReadyEvent, } from "./runtime-startup-gate.js";
 import { dslog } from "./slog.js";
 import { evaluateMemoryPrunePostcondition, inspectMemoryPruneFilesWithinDeadline, parseMemoryPruneTraceId, } from "./memory-prune-diagnostics.js";
 import { createLocalMemoryTelemetry, logLocalMemoryContextPrepareFailure, logLocalMemoryDiagnosticsFailure, } from "./local-memory-telemetry.js";
+import { CodexStartupStageParser } from "./codex-startup-stage.js";
 function memoryPruneSnapshotFields(snapshot) {
     const fields = {};
     for (const [label, fact] of Object.entries(snapshot)) {
@@ -615,10 +616,30 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                 callbacks.onConsole?.(chunk);
         });
         let stderrTail = "";
+        const codexStartupStageState = { last: null };
+        const codexStartupStageParser = runtime.name === "codex"
+            ? new CodexStartupStageParser((stage) => {
+                codexStartupStageState.last = stage;
+                dslog("runtime.start_stage", "Codex runtime 启动阶段更新", {
+                    level: stage.status === "error" || stage.status === "timeout" ? "ERROR" : "INFO",
+                    execution_id: input.executionId,
+                    runtime: runtime.name,
+                    stage: stage.stage,
+                    status: stage.status,
+                    attempt: stage.attempt,
+                    stage_ms: stage.stageMs,
+                    startup_ms: Date.now() - runtimeLaunchAt,
+                    ...(stage.stage === "thread_start" ? { resumed: stage.resumed } : {}),
+                });
+            })
+            : null;
         child.stderr.on("data", (data) => {
             process.stderr.write(data);
-            stderrTail = (stderrTail + String(data)).slice(-STDERR_TAIL_CAP);
+            const text = String(data);
+            stderrTail = (stderrTail + text).slice(-STDERR_TAIL_CAP);
+            codexStartupStageParser?.push(text);
         });
+        child.stderr.on("end", () => codexStartupStageParser?.finish());
         let runtimeExit;
         try {
             if (startupReservation !== null) {
@@ -629,7 +650,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                         runtimeReadySignal.then(() => ({ kind: "ready" })),
                         child.exit.then((exit) => ({ kind: "exit", exit })),
                         new Promise((resolve) => {
-                            startupTimer = setTimeout(() => resolve({ kind: "timeout" }), dependencies.startupTimeoutMs ?? 60_000);
+                            startupTimer = setTimeout(() => resolve({ kind: "timeout" }), dependencies.startupTimeoutMs ?? 120_000);
                         }),
                     ]), dependencies.cancellation);
                 }
@@ -639,11 +660,18 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                 }
                 if (startupOutcome.kind !== "ready") {
                     if (startupOutcome.kind === "timeout") {
+                        const lastCodexStartupStage = codexStartupStageState.last;
                         dslog("runtime.start_timeout", "runtime 启动超时", {
                             level: "ERROR",
                             execution_id: input.executionId,
                             runtime: runtime.name,
-                            startup_timeout_ms: dependencies.startupTimeoutMs ?? 60_000,
+                            startup_timeout_ms: dependencies.startupTimeoutMs ?? 120_000,
+                            ...(lastCodexStartupStage === null ? {} : {
+                                last_stage: lastCodexStartupStage.stage,
+                                last_stage_status: lastCodexStartupStage.status,
+                                last_stage_ms: lastCodexStartupStage.stageMs,
+                                attempt: lastCodexStartupStage.attempt,
+                            }),
                         });
                         await child.cancel?.();
                     }

package/dist/runtimes/codex-app-server-runner.js

@@ -468,7 +468,7 @@ async function runCodexAppServerAttempt(bin, input, attempt, initializeTimeoutMs
             completionReject(new Error("Codex produced no semantic progress within the startup window"));
             void cancel();
         });
-        activeStage = "turn_start";
+        activeStage = "model_init";
         stageStartedAt = Date.now();
         const started = await rpc.request("turn/start", {
             threadId,

package/dist/serve.js

@@ -741,7 +741,7 @@ export function serve(config, opts = {}) {
                 try {
                     const data2 = req.type === "fs:list" ? await listWorkspace(root, req.path)
                         : req.type === "fs:read" ? await readWorkspaceFile(root, req.path)
-                            : req.type === "skills:list" ? await listSkills(config.agentsRoot, req.handle)
+                            : req.type === "skills:list" ? await listSkills(req.runtime)
                                 : { models: await listRuntimeModels(req.type === "probe-models" ? (req.runtime ?? "") : "") };
                     reply({ ok: true, data: data2 });
                 }

package/dist/skills.js

@@ -1,17 +1,35 @@
 /**
- * 枚举某 agent 可用的 skill,供 Profile 的 SKILLS 区展示。两个来源:
- *  - workspace 私有:<agentsRoot>/<handle>/skills/<name>/SKILL.md
- *  - 全局共享:    ~/.claude/skills/<name>/SKILL.md (可经 CREW_GLOBAL_SKILLS_DIR 覆盖)
+ * 枚举某 agent 可用的全局 skill,供 Profile 的 SKILLS 区展示。
+ *
+ * 目录由 runtime 决定——各 runtime 的原生发现路径互不相同:
+ *  - codex:  $CODEX_HOME/skills (未设时 ~/.codex/skills) + ~/.agents/skills
+ *  - claude: ~/.claude/skills
+ * runtime 缺省(老 server 不下发)时按 claude 回落,与历史行为一致。
+ * CREW_GLOBAL_SKILLS_DIR 若设置则覆盖以上全部,只扫它。
  *
  * 每个 skill = 一个目录,内含 SKILL.md;从其 YAML frontmatter 取 name/description,
  * 缺失则回退到目录名。只读、容错(目录不存在/无 frontmatter 都不报错)。
+ *
+ * 不扫 agent 工作区:项目技能由 project-skills/reconciler 投影到
+ * <agentRoot>/.agents/skills 与 <agentRoot>/.crew/claude-skills/.claude/skills,
+ * 那两处是 reconciler 独占(每次整目录原子替换),且已由「项目技能」区单独展示。
  */
 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");
-async function readSkillsFrom(dir, scope) {
+/** 该 runtime 的原生全局 skill 目录;顺序即优先级(重名时靠前的胜出)。 */
+function globalSkillsDirs(runtime) {
+    const override = process.env.CREW_GLOBAL_SKILLS_DIR;
+    if (override)
+        return [override];
+    const home = homedir();
+    if (runtime === "codex") {
+        return [join(process.env.CODEX_HOME ?? join(home, ".codex"), "skills"), join(home, ".agents", "skills")];
+    }
+    return [join(home, ".claude", "skills")];
+}
+async function readSkillsFrom(dir) {
     const names = await readdir(dir).catch(() => []);
     const skills = [];
     for (const name of names) {
@@ -23,17 +41,20 @@ async function readSkillsFrom(dir, scope) {
             continue;
         const md = await readFile(skillMd, "utf8").catch(() => "");
         const fm = parseSkillFrontmatter(md);
-        skills.push({ scope, name: fm.name || name, description: fm.description ?? "" });
+        skills.push({ scope: "global", name: fm.name || name, description: fm.description ?? "" });
     }
     return skills;
 }
-/** 列出 agent 的 workspace 私有 + 全局 skill,按 name 排序。 */
-export async function listSkills(agentsRoot, handle) {
-    const [ws, global] = await Promise.all([
-        readSkillsFrom(join(agentsRoot, handle, "skills"), "workspace"),
-        readSkillsFrom(globalSkillsDir(), "global"),
-    ]);
-    const all = [...ws, ...global];
-    all.sort((a, b) => (a.scope !== b.scope ? (a.scope === "workspace" ? -1 : 1) : a.name.localeCompare(b.name)));
-    return all;
+/** 列出该 runtime 的全局 skill,按 name 去重后排序。 */
+export async function listSkills(runtime) {
+    const perDir = await Promise.all(globalSkillsDirs(runtime).map((dir) => readSkillsFrom(dir)));
+    // 同名 skill 可能同时存在于多个 root(如 ~/.codex/skills 与 ~/.agents/skills),
+    // 取先命中的:既符合 runtime 的目录优先级,也避免前端 key 冲突。
+    const byName = new Map();
+    for (const skills of perDir) {
+        for (const skill of skills)
+            if (!byName.has(skill.name))
+                byName.set(skill.name, skill);
+    }
+    return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -16,9 +16,16 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
+    "build": "tsc -p tsconfig.json",
+    "prepublishOnly": "pnpm build && node ../scripts/daemon-release-artifact.mjs --strict-registry",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.2.1",
-    "@nowcrew/cli": "^0.4.13",
+    "@nowcrew/cli": "^0.4.14",
     "cross-spawn": "^7.0.6",
     "ws": "^8",
     "yaml": "^2.8.1",
@@ -34,11 +41,5 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0"
-  },
-  "scripts": {
-    "daemon": "pnpm --filter @nowcrew/cli build && tsx src/main.ts",
-    "build": "tsc -p tsconfig.json",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit"
   }
-}
+}