@nowcrew/daemon 0.5.39 → 0.5.41

package/README.md

@@ -95,23 +95,18 @@ crew-daemon doctor --profile work
 crew-daemon status --profile work
 ```
 
-For a non-default daemon home, the bootstrap release changes the native service ID to include the
-daemon-home fingerprint. Run the first command with the currently installed daemon: it upgrades and
-restarts the exact legacy service ID. Then use the upgraded CLI to migrate that profile instead of adopting
-the old ID:
+For a non-default daemon home, the daemon now recognizes the pre-registry service ID when its descriptor
+exactly matches the running profile's node path, package entry, profile name, and `--daemon-home`. No
+uninstall/reinstall migration is required. The first self-update uses that exact legacy service ID for the
+restart; future service lifecycle commands can continue to migrate it explicitly if desired:
 
 ```bash
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon upgrade --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon uninstall --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon install --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon start --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon doctor --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon status --profile work
+CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon doctor --profile dev
+CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon status --profile dev
 ```
 
-If migration is interrupted after `uninstall`, resume at `install` and `start`. If it is interrupted before
-`uninstall` completes, verify the exact legacy service with `status`, then repeat `uninstall`; identity checks
-prevent either path from removing a drifted descriptor.
+If the descriptor has drifted, the profile is stopped, or another host descriptor is not registered, the
+daemon fails closed and remains manually upgradeable.
 
 The daemon advertises `daemon_update_v1` only when all of these conditions hold:
 
@@ -120,7 +115,7 @@ The daemon advertises `daemon_update_v1` only when all of these conditions hold:
 | Platform | macOS LaunchAgent or Linux systemd user service |
 | Entrypoint | global `@nowcrew/daemon/dist/main.js`, not npx or source/tsx |
 | Startup | `crew-daemon serve --profile <name>` through the installed service |
-| Registry | every NowCrew descriptor on the OS user account is registered and conflict-free |
+| Registry | every other NowCrew descriptor on the OS user account is registered and conflict-free; the exact target legacy descriptor may be adopted once |
 | Identity | service ID, descriptor, daemon home, Agent root, entrypoint, package root, and npm prefix match |
 | Service | the selected profile is running and holds the installation lease |
 | Install root | a standard writable Unix global npm prefix can be derived from the running entrypoint |

package/dist/daemon-update-eligibility.js

@@ -53,9 +53,8 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
         entryPath: deps.entryPath,
         profileHome: deps.profileHome,
     });
-    const status = await deps.serviceStatus(spec);
-    if (!status.running)
-        return { eligible: false, reason: "service_not_running" };
+    let selectedSpec = spec;
+    let status = await deps.serviceStatus(spec);
     let services;
     try {
         services = await deps.readManagedServices();
@@ -65,34 +64,66 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
     }
     const registered = services.find((record) => record.serviceId === spec.id
         || (record.daemonHome === deps.profileHome && record.profile === profileName));
-    if (registered === undefined) {
-        return { eligible: false, reason: "managed_service_not_registered" };
-    }
-    try {
-        assertRegistryCoversDescriptors(services, await deps.listManagedDescriptorPaths());
-    }
-    catch {
-        return { eligible: false, reason: "managed_service_registry_incomplete" };
+    if (registered !== undefined) {
+        try {
+            assertRegistryCoversDescriptors(services, await deps.listManagedDescriptorPaths());
+        }
+        catch {
+            return { eligible: false, reason: "managed_service_registry_incomplete" };
+        }
+        const descriptor = await deps.readServiceDescriptor(spec).catch(() => null);
+        if (descriptor === null || spec.descriptorPath === null || spec.descriptor === null
+            || !managedServiceIdentityMatches(registered, {
+                version: 1,
+                platform: deps.platform,
+                serviceId: spec.id,
+                profile: profileName,
+                daemonHome: deps.profileHome,
+                agentsRoot: resolveAgentsRoot(profile.agentsRoot, deps.userHome, deps.platform),
+                nodePath: deps.nodePath,
+                entryPath: deps.entryPath,
+                packageRoot: installation.packageRoot,
+                npmPrefix: installation.npmPrefix,
+                descriptorPath: spec.descriptorPath,
+                descriptorSha256: serviceDescriptorSha256(descriptor),
+            })
+            || descriptor !== spec.descriptor) {
+            return { eligible: false, reason: "managed_service_identity_mismatch" };
+        }
     }
-    const descriptor = await deps.readServiceDescriptor(spec).catch(() => null);
-    if (descriptor === null || spec.descriptorPath === null || spec.descriptor === null
-        || !managedServiceIdentityMatches(registered, {
-            version: 1,
+    else {
+        // Releases before the managed-service registry used the unsuffixed service id.
+        // Adopt only an exact descriptor for this profile; never infer ownership from a
+        // running process or accept a descriptor with a different entry/home.
+        const legacySpec = buildServiceSpec({
             platform: deps.platform,
-            serviceId: spec.id,
             profile: profileName,
-            daemonHome: deps.profileHome,
-            agentsRoot: resolveAgentsRoot(profile.agentsRoot, deps.userHome, deps.platform),
+            userHome: deps.userHome,
+            uid: deps.uid,
             nodePath: deps.nodePath,
             entryPath: deps.entryPath,
-            packageRoot: installation.packageRoot,
-            npmPrefix: installation.npmPrefix,
-            descriptorPath: spec.descriptorPath,
-            descriptorSha256: serviceDescriptorSha256(descriptor),
-        })
-        || descriptor !== spec.descriptor) {
-        return { eligible: false, reason: "managed_service_identity_mismatch" };
+            profileHome: deps.profileHome,
+            legacyServiceId: true,
+        });
+        const legacyDescriptor = await deps.readServiceDescriptor(legacySpec).catch(() => null);
+        if (legacyDescriptor !== legacySpec.descriptor) {
+            return { eligible: false, reason: "managed_service_not_registered" };
+        }
+        try {
+            const descriptorPaths = await deps.listManagedDescriptorPaths();
+            const targetPath = legacySpec.descriptorPath;
+            assertRegistryCoversDescriptors(services, descriptorPaths.filter((descriptorPath) => descriptorPath !== targetPath));
+        }
+        catch {
+            return { eligible: false, reason: "managed_service_registry_incomplete" };
+        }
+        status = await deps.serviceStatus(legacySpec);
+        if (!status.running)
+            return { eligible: false, reason: "service_not_running" };
+        selectedSpec = legacySpec;
     }
+    if (!status.running)
+        return { eligible: false, reason: "service_not_running" };
     if (!deps.installationLeaseHeld(installation.npmPrefix)) {
         return { eligible: false, reason: "installation_lease_missing" };
     }
@@ -106,6 +137,6 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
         eligible: true,
         profileName,
         ...installation,
-        serviceSpec: spec,
+        serviceSpec: selectedSpec,
     };
 }

package/dist/local-executor.js

@@ -1,7 +1,7 @@
 import { createInterface } from "node:readline";
-import { rm, writeFile } from "node:fs/promises";
+import { readFile, rm, writeFile } from "node:fs/promises";
 import { delimiter, join } from "node:path";
-import { prepareWorkspace, rotateAgentSession, } from "./workspace.js";
+import { prepareWorkspace, rotateAgentSession, safeKey, } from "./workspace.js";
 import { spawnClaude } from "./runtimes/claude.js";
 import { spawnCodex } from "./runtimes/codex.js";
 import { DEEPSEEK_CODEX_MODEL, DEEPSEEK_CODEX_REASONING_LEVELS, materializeDeepSeekCodexHome, } from "./runtimes/codex-deepseek-config.js";
@@ -221,6 +221,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
     let memoryPruneRuntimeExitCode;
     let memoryPruneExecutorCompleted = false;
     let memoryPruneFailurePhase = "diagnostics_before";
+    let executionWorkspace = workspace;
     try {
         if (isDeepSeekCodex && !providerConfig.providerApiKey) {
             throw new Error("DeepSeek API key is not configured for this Agent");
@@ -230,24 +231,62 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         }
         const supportsNativeResume = runtime.name === "claude"
             || (dependencies.launchRuntime !== undefined && runtimeCapability(runtime.name).nativeResume);
-        const prior = input.session.enabled && supportsNativeResume
+        const currentPrior = input.session.enabled && supportsNativeResume
             ? await readSession(workspace.sessionDir)
             : null;
-        const resumeSessionId = supportsNativeResume && workspace.sessionResume
-            ? pickResumeId(prior, Date.now(), input.session.warmMs, currentModel, input.session.budgetTokens, input.session.maxTurns, providerFp)
+        // Interactive V1 uses collision-resistant session directories, while the
+        // older legacy path stored metadata under tasks/<safe thread key>. Import
+        // that metadata once so an existing thread can cross the protocol boundary
+        // without losing its native runtime conversation.
+        const legacyRunDir = input.session.enabled
+            && supportsNativeResume
+            && input.keyMode === "opaque"
+            && input.resumeKey !== undefined
+            ? join(input.launch.agentsRoot, input.handle, "tasks", safeKey(input.resumeKey))
+            : null;
+        const legacyCwdMarker = legacyRunDir === null
+            ? null
+            : join(workspace.sessionDir, ".legacy-runtime-cwd");
+        const legacyCwdPinned = legacyCwdMarker !== null
+            && await readFile(legacyCwdMarker, "utf8").then((value) => value === "1").catch(() => false);
+        const legacyPrior = legacyRunDir === null || (currentPrior !== null && !legacyCwdPinned)
+            ? null
+            : await readSession(legacyRunDir);
+        const prior = currentPrior ?? legacyPrior;
+        const sessionExists = workspace.sessionResume || legacyPrior !== null;
+        const usesLegacyCwd = legacyRunDir !== null
+            && (legacyCwdPinned || (currentPrior === null && legacyPrior !== null));
+        executionWorkspace = !usesLegacyCwd || legacyRunDir === null
+            ? workspace
+            : {
+                ...workspace,
+                runDir: legacyRunDir,
+                workLogPath: join(legacyRunDir, "work-log.md"),
+                workLog: await readFile(join(legacyRunDir, "work-log.md"), "utf8").catch(() => ""),
+            };
+        // Claude Code accepts --resume and --model together. Compare against the
+        // prior model only when this turn has an explicit model, so the remaining
+        // safety checks can still decide whether the same session is reusable.
+        // An omitted model stays model-sensitive because it cannot reliably switch
+        // a resumed session back to the runtime default.
+        const resumeComparisonModel = runtime.name === "claude" && currentModel !== null
+            ? prior?.model ?? currentModel
+            : currentModel;
+        const resumeSessionId = supportsNativeResume && sessionExists
+            ? pickResumeId(prior, Date.now(), input.session.warmMs, resumeComparisonModel, input.session.budgetTokens, input.session.maxTurns, providerFp)
             : null;
         const resuming = resumeSessionId !== null;
-        const rotatedForBudget = !resuming && supportsNativeResume && workspace.sessionResume
-            && pickResumeId(prior, Date.now(), input.session.warmMs, currentModel, 0, 0, providerFp) !== null;
+        const rotatedForBudget = !resuming && supportsNativeResume && sessionExists
+            && pickResumeId(prior, Date.now(), input.session.warmMs, resumeComparisonModel, 0, 0, providerFp) !== null;
         const nearBudget = resuming && isNearBudget(prior, input.session.softTokens);
-        const rotated = Boolean(workspace.agentSessionId && workspace.sessionResume && !resuming);
+        const rotated = Boolean(workspace.agentSessionId && sessionExists && !resuming);
         // Codex and Kimi choose their own id on a fresh start, so the native id persisted in
         // .crew-session.json can differ from the bootstrap id in .session. Resume the former.
         const launchSessionId = resumeSessionId ?? (rotated
             ? await rotateAgentSession(workspace.sessionDir)
             : workspace.agentSessionId);
         const promptContext = {
-            workspace,
+            workspace: executionWorkspace,
             resuming,
             rotatedForBudget,
             nearBudget,
@@ -256,12 +295,12 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         if (input.attachments && input.attachments.length > 0) {
             if (dependencies.cancellation?.isRequested())
                 throw new RuntimeCancelledError();
-            knownAttachmentDirectory = executionAttachmentDirectory(workspace.runDir, input.executionId);
+            knownAttachmentDirectory = executionAttachmentDirectory(executionWorkspace.runDir, input.executionId);
             const controller = new AbortController();
             const materialization = Promise.resolve().then(() => (dependencies.materializeAttachments ?? materializeAttachments)({
                 serverUrl: input.launch.serverUrl,
                 token: input.launch.token,
-                runDir: workspace.runDir,
+                runDir: executionWorkspace.runDir,
                 executionId: input.executionId,
                 attachments: input.attachments,
                 signal: controller.signal,
@@ -287,7 +326,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         const wakePrompt = `${resolvePrompt(input.wakePrompt, promptContext)}${attachmentPlan.promptSuffix}`;
         memoryPruneTraceId = parseMemoryPruneTraceId(wakePrompt);
         if (memoryPruneTraceId !== null) {
-            const snapshot = await inspectMemoryPruneFiles(workspace.dir, workspace.workLogPath);
+            const snapshot = await inspectMemoryPruneFiles(executionWorkspace.dir, executionWorkspace.workLogPath);
             dslog("memory_prune.files_before", "长期记忆收尾执行前文件指纹", {
                 execution_id: input.executionId,
                 agent_handle: input.handle,
@@ -313,7 +352,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             CREW_TOKEN: input.launch.token,
             CREW_CHANNEL: input.channelId,
             CREW_HOME: workspace.dir,
-            CREW_TASK_LOG: workspace.workLogPath,
+            CREW_TASK_LOG: executionWorkspace.workLogPath,
             ...(input.wakeMessageId ? { CREW_WAKE_MESSAGE_ID: input.wakeMessageId } : {}),
             XDG_CONFIG_HOME: join(workspace.homeDir, ".config"),
             XDG_DATA_HOME: join(workspace.homeDir, ".local", "share"),
@@ -355,7 +394,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         const launchRequest = {
             runtime: runtime.name,
             bin: runtime.name,
-            cwd: workspace.runDir,
+            cwd: executionWorkspace.runDir,
             ...(input.projectSkills === undefined ? {} : { agentRoot: workspace.dir }),
             systemPromptPath: workspace.systemPromptPath,
             systemPrompt,
@@ -516,10 +555,13 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
                 lastExitOk: exitCode === 0,
                 ...(contextTokens === undefined ? {} : { contextTokens }),
             });
+            if (exitCode === 0 && usesLegacyCwd && !legacyCwdPinned && legacyCwdMarker !== null) {
+                await writeFile(legacyCwdMarker, "1", "utf8");
+            }
         }
         memoryPruneExecutorCompleted = true;
         return {
-            workspaceRunDir: workspace.runDir,
+            workspaceRunDir: executionWorkspace.runDir,
             exitCode,
             ...(terminationSignal === undefined ? {} : { terminationSignal }),
             activities,
@@ -541,7 +583,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
     finally {
         startupReservation?.release();
         if (memoryPruneTraceId !== null) {
-            const snapshot = await inspectMemoryPruneFiles(workspace.dir, workspace.workLogPath);
+            const snapshot = await inspectMemoryPruneFiles(executionWorkspace.dir, executionWorkspace.workLogPath);
             dslog("memory_prune.files_after", "长期记忆收尾执行后文件指纹", {
                 execution_id: input.executionId,
                 agent_handle: input.handle,

package/dist/prompt.js

@@ -18,7 +18,8 @@ const EXTERNAL_RESULT_READABILITY = `
 - 前三行依次说清结论、影响和需要谁做什么;不要用背景铺垫或复述任务开场。
 - 除非用户明确要求完整明细,正文最多三个短小节、最多六个要点;总结日志、命令输出和长表格,不要整段粘贴。
 - 有足够重点时,只加粗三到五处真正决定性的数字、最终状态、风险、截止时间、负责人或行动项;不足三处时宁缺毋滥。加粗范围要短,不要整段加粗,不要把每个数字都加粗,不得强化未经验证的判断。
-- 使用标题、列表、引用和加粗形成无颜色也清楚的层级;不得输出 \`<font>\` 或其它未确认可用于企微流式消息的 HTML 标色标签。`;
+- 需要颜色层级时,只在确有对应语义的短加粗重点前使用一个彩色圆点:🟢 绿色圆点表示已验证成功或健康,🟠 橙色圆点表示风险、临期或需要关注,🔴 红色圆点表示失败、阻塞或严重异常,🔵 蓝色圆点表示负责人、行动项或关键中性数据。每个短加粗重点前最多放一个;不要给普通段落、标题或每个要点都加标记。
+- 使用标题、列表、引用、彩色圆点和加粗形成在企微原生流式消息中稳定可见的层级;不得输出 \`<font>\` 或其它 HTML 标色标签。`;
 export function capWorkLogForInject(workLog, cap = WORKLOG_INJECT_CAP) {
     if (workLog.length <= cap)
         return workLog;

package/package.json

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