@nowcrew/daemon 0.6.63 → 0.6.65

package/README.md

@@ -380,6 +380,7 @@ CREW_EXECUTION_MAX_STARTING_TOTAL=10
 CREW_EXECUTION_MAX_STARTING_PER_RUNTIME=10
 CREW_EXECUTION_START_GAP_MS=500
 CREW_EXECUTION_STARTUP_TIMEOUT_MS=120000
+# Retained for compatibility; accepted executions wait indefinitely for a slot.
 CREW_EXECUTION_MAX_QUEUE_WAIT_MS=300000
 CREW_EXECUTION_MAX_FIRST_OUTPUT_WAIT_MS=120000
 CREW_EXECUTION_FIRST_OUTPUT_GRACE_MS=180000
@@ -391,14 +392,14 @@ protocol-v1 and legacy work.
 Runtime startup is a separate FIFO gate: by default up to ten Claude, Codex, or Kimi processes may be
 initializing at a time, and launches are spaced by 500ms. A process leaves the startup gate
 only after its runtime-specific ready event; startup timeout cancels the owned process tree.
-An accepted execution may wait up to five minutes for a local and host slot. After runtime readiness,
-the daemon waits up to two minutes for the first model event, with a three-minute grace window for
-slow providers. When one of these local liveness limits expires, the supervisor is stopped and the
-terminal result is written to the execution journal before it is reported, so the execution remains
-replayable instead of being silently dropped. Queue and first-output timeouts are retried locally at
-most twice (three total attempts). Each retry releases its current machine/host slot and reserves a
-new one, which puts it behind work already waiting in the queue. A third timeout is terminal and is
-not requeued; other failures are not automatically retried.
+An accepted execution waits indefinitely for a local and host slot unless it is explicitly cancelled.
+After runtime readiness, the daemon waits up to two minutes for the first model event, with a
+three-minute grace window for slow providers. When the first-output liveness limit expires, the
+supervisor is stopped and the terminal result is written to the execution journal before it is
+reported, so the execution remains replayable instead of being silently dropped. First-output
+timeouts are retried locally at most twice (three total attempts). Each retry releases its current
+machine/host slot and reserves a new one, which puts it behind work already waiting in the queue. A
+third timeout is terminal and is not requeued; other failures are not automatically retried.
 
 Local policy can reduce server-requested access and limits; it cannot grant more access than requested.
 Provider credentials and configured environment are prepared locally and never carried in execution

package/dist/agent-ability/materializer.js

@@ -249,6 +249,23 @@ 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 projectedSkillExists = async (trainingRoot, name) => {
+    const root = join(trainingRoot, "skills", safeAbilityName(name));
+    if (!await isRealDirectory(root))
+        return false;
+    const direct = await lstat(join(root, "SKILL.md")).catch(() => null);
+    if (direct?.isFile() && !direct.isSymbolicLink())
+        return true;
+    for (const entry of await readdir(root, { withFileTypes: true })) {
+        if (!entry.isDirectory())
+            continue;
+        const skill = await lstat(join(root, entry.name, "SKILL.md")).catch(() => null);
+        if (skill?.isFile() && !skill.isSymbolicLink())
+            return true;
+    }
+    return false;
+};
+const projectedSkillsComplete = async (trainingRoot, skills) => (await Promise.all(skills.map((skill) => projectedSkillExists(trainingRoot, skill.name)))).every(Boolean);
 const trainingSwitchJournalPath = (agentRoot) => join(agentRoot, ".training-switch.json");
 const trainingRollbackRoot = (agentRoot) => join(agentRoot, ".training-rollback");
 const trainingDiscardRoot = (agentRoot) => join(agentRoot, ".training-discard");
@@ -422,6 +439,7 @@ const activeTrainingRoot = async (agentsRoot, handle, ability) => {
         && catalog.releaseId === ability.releaseId
         && catalog.rootCommit === ability.rootCommit
         && catalog.artifactDigest === ability.artifactDigest
+        && await projectedSkillsComplete(trainingRoot, ability.skills)
         ? trainingRoot
         : null;
 };
@@ -463,7 +481,8 @@ const materializeWorkspaceTraining = async (agentsRoot, handle, ability) => {
         }
         if (previousCatalog.releaseId === ability.releaseId
             && previousCatalog.artifactDigest === ability.artifactDigest
-            && previousCatalog.projectionDigest === projectionDigest)
+            && previousCatalog.projectionDigest === projectionDigest
+            && await projectedSkillsComplete(trainingRoot, ability.skills))
             return trainingRoot;
     }
     await mkdir(agentRoot, { recursive: true });

package/dist/agent-ability/runtime.js

@@ -32,6 +32,9 @@ export function createAgentAbilityRuntime(agentsRoot, options = {}) {
             else if (type === "agent:ability:resolve") {
                 result = await controller.handle(input);
             }
+            else if (options.isAdmissionClosed?.() === true) {
+                result = { ok: false, error: "storage_migration_quiescing" };
+            }
             else {
                 const parsed = AbilityApplyCommandSchema.safeParse(input);
                 if (!parsed.success)

package/dist/automatic-install-target.js

@@ -3,12 +3,12 @@ import { profileLayout, validateLocalInstanceName } from "./profile-layout.js";
 const PROFILE_NAME = /^[a-z0-9][a-z0-9_-]{0,47}$/;
 const KNOWN_TARGETS = {
     "nowwork-in.nowcoder.com": {
-        profile: "in",
+        environment: "production",
         daemonDirectory: "daemon",
         agentsDirectory: "agents",
     },
     "nowwork-dev.nowcoder.com": {
-        profile: "dev",
+        environment: "dev",
         daemonDirectory: "daemon-dev",
         agentsDirectory: "agents-dev",
     },
@@ -42,32 +42,37 @@ function requireCustomProfile(hostname, value) {
     if (!PROFILE_NAME.test(value)) {
         throw new Error("Invalid custom profile; expected a lowercase name of 1-48 letters, digits, '_' or '-'");
     }
-    if (value === "in" || value === "dev") {
+    if (value === "in" || value === "dev" || value === "production") {
         throw new Error(`Profile '${value}' is reserved for a known NowWork hostname`);
     }
     return value;
 }
 function knownTargetForProfile(environment, requestedProfile, input, parsed) {
     const paths = input.platform === "win32" ? win32 : posix;
-    const legacyProfile = environment;
+    // Keep the no-flag target readable by old daemons; any workspace-scoped profile below
+    // uses the canonical environment token (production, never in).
+    const legacyProfile = environment === "production" ? "in" : environment;
     if (requestedProfile === undefined || requestedProfile === legacyProfile) {
         return Object.freeze({
             kind: "known",
             profile: legacyProfile,
             serverUrl: normalizedServerUrl(parsed),
-            daemonHome: paths.join(input.userHome, ".crew", environment === "in" ? "daemon" : "daemon-dev"),
-            agentsRoot: paths.join(input.userHome, ".crew", environment === "in" ? "agents" : "agents-dev"),
+            daemonHome: paths.join(input.userHome, ".crew", environment === "production" ? "daemon" : "daemon-dev"),
+            agentsRoot: paths.join(input.userHome, ".crew", environment === "production" ? "agents" : "agents-dev"),
             npmPrefix: paths.join(input.userHome, ".crew", "daemon-runtimes", legacyProfile),
         });
     }
     if (requestedProfile === "in" || requestedProfile === "dev") {
-        throw new Error(`Server hostname '${new URL(input.serverUrl).hostname}' requires profile '${legacyProfile}'`);
+        throw new Error(`Server hostname '${new URL(input.serverUrl).hostname}' requires profile '${environment}'`);
     }
     const prefix = `nw-${environment}-`;
-    if (!requestedProfile.startsWith(prefix)) {
+    const legacyPrefix = environment === "production" ? "nw-in-" : prefix;
+    if (!requestedProfile.startsWith(prefix) && !requestedProfile.startsWith(legacyPrefix)) {
         throw new Error(`Server hostname '${new URL(input.serverUrl).hostname}' requires profile '${prefix}<local-name>'`);
     }
-    const localInstanceName = validateLocalInstanceName(requestedProfile.slice(prefix.length));
+    const localInstanceName = validateLocalInstanceName(requestedProfile.startsWith(prefix)
+        ? requestedProfile.slice(prefix.length)
+        : requestedProfile.slice(legacyPrefix.length));
     const layout = profileLayout({
         environment,
         localInstanceName,
@@ -91,7 +96,7 @@ export function resolveAutomaticInstallTarget(input) {
     const paths = input.platform === "win32" ? win32 : posix;
     const known = KNOWN_TARGETS[hostname];
     if (known !== undefined) {
-        return knownTargetForProfile(known.profile, input.requestedProfile, input, parsed);
+        return knownTargetForProfile(known.environment, input.requestedProfile, input, parsed);
     }
     const profile = requireCustomProfile(hostname, input.requestedProfile);
     return Object.freeze({

package/dist/computer-cli.js

@@ -82,6 +82,14 @@ function translatedError(error, td) {
     }
     return td(error.message);
 }
+function storageServiceEnvironment(env) {
+    return {
+        ...(env.NOWWORK_HOME === undefined ? {} : { NOWWORK_HOME: env.NOWWORK_HOME }),
+        ...(env.NOWWORK_ENV_TAG === undefined ? {} : { NOWWORK_ENV_TAG: env.NOWWORK_ENV_TAG }),
+        ...(env.NOWWORK_STORAGE_POLICY_PATH === undefined
+            ? {} : { NOWWORK_STORAGE_POLICY_PATH: env.NOWWORK_STORAGE_POLICY_PATH }),
+    };
+}
 export async function runComputerCommand(argv, overrides = {}) {
     const command = argv[0];
     if (!command || !COMPUTER_COMMANDS.has(command))
@@ -202,6 +210,7 @@ export async function runComputerCommand(argv, overrides = {}) {
                     ...deps,
                     profile: restartProfile.name,
                     profileHome: home,
+                    environment: storageServiceEnvironment(deps.env),
                 })
                 : null;
             if (spec && restartProfile) {
@@ -272,7 +281,7 @@ export async function runComputerCommand(argv, overrides = {}) {
             throw new Error(td("Service lifecycle requires the built daemon entry (.js), not a TypeScript development entry"));
         }
         const spec = buildServiceSpec({
-            ...deps, profile: name, profileHome: home,
+            ...deps, profile: name, profileHome: home, environment: storageServiceEnvironment(deps.env),
         });
         const installation = daemonGlobalInstallation(deps.entryPath, deps.platform);
         const managedRecord = installation !== null && spec.platform !== "win32"

package/dist/computer-service.js

@@ -53,6 +53,7 @@ export function windowsCommandArg(value) {
 }
 export function buildServiceSpec(input) {
     const { platform, profile, userHome } = input;
+    const environment = input.environment ?? process.env;
     if (platform !== "darwin" && platform !== "linux" && platform !== "win32") {
         throw new Error(`Computer services are not supported on platform '${platform}'`);
     }
@@ -72,6 +73,16 @@ export function buildServiceSpec(input) {
             throw new Error("Cannot install launchd service without a numeric uid");
         const id = `com.nowcrew.daemon.${profile}${identitySuffix}`;
         const args = daemonCommand.map((arg) => `      <string>${xml(arg)}</string>`).join("\n");
+        const environmentEntries = [
+            ["NOWWORK_HOME", environment.NOWWORK_HOME],
+            ["NOWWORK_ENV_TAG", environment.NOWWORK_ENV_TAG],
+            ["NOWWORK_STORAGE_POLICY_PATH", environment.NOWWORK_STORAGE_POLICY_PATH],
+        ].flatMap(([key, value]) => value === undefined
+            ? []
+            : [`    <key>${key}</key><string>${xml(assertSingleLine(value, key))}</string>`]);
+        const environmentBlock = environmentEntries.length === 0
+            ? ""
+            : `  <key>EnvironmentVariables</key>\n  <dict>\n${environmentEntries.join("\n")}\n  </dict>\n`;
         return {
             platform,
             profile,
@@ -79,7 +90,7 @@ export function buildServiceSpec(input) {
             descriptorPath: resolve(userHome, "Library", "LaunchAgents", `${id}.plist`),
             daemonCommand,
             managerDomain: `gui/${input.uid}`,
-            descriptor: `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n  <key>Label</key><string>${xml(id)}</string>\n  <key>ProgramArguments</key>\n  <array>\n${args}\n  </array>\n  <key>KeepAlive</key><true/>\n  <key>ProcessType</key><string>Background</string>\n</dict>\n</plist>\n`,
+            descriptor: `<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n  <key>Label</key><string>${xml(id)}</string>\n  <key>ProgramArguments</key>\n  <array>\n${args}\n  </array>\n${environmentBlock}  <key>KeepAlive</key><true/>\n  <key>ProcessType</key><string>Background</string>\n</dict>\n</plist>\n`,
         };
     }
     if (platform === "linux") {
@@ -266,6 +277,35 @@ export async function installService(spec, runner = systemCommandRunner) {
         throw error;
     }
 }
+export async function replaceInstalledServiceDescriptor(spec, previousDescriptor, runner = systemCommandRunner) {
+    if (spec.platform === "win32" || spec.descriptorPath === null || spec.descriptor === null) {
+        throw new Error("Installed service descriptor replacement requires launchd or systemd");
+    }
+    const current = await readServiceDescriptor(spec);
+    if (current !== previousDescriptor) {
+        throw new Error(`Installed descriptor for '${spec.id}' changed before replacement`);
+    }
+    const status = await serviceStatus(spec, runner);
+    if (!status.installed)
+        throw new Error(`Service '${spec.id}' is not installed`);
+    if (status.running || status.loaded)
+        await serviceAction(spec, "stop", runner);
+    try {
+        await writePrivateAtomic(spec.descriptorPath, spec.descriptor);
+        if (spec.platform === "linux") {
+            await checked(runner, "systemctl", ["--user", "daemon-reload"], "systemd reload");
+            await checked(runner, "systemctl", ["--user", "enable", spec.id], "systemd enable");
+        }
+        if (status.running)
+            await serviceAction(spec, "start", runner);
+    }
+    catch (error) {
+        await writePrivateAtomic(spec.descriptorPath, previousDescriptor).catch(() => undefined);
+        if (status.running)
+            await serviceAction(spec, "start", runner).catch(() => undefined);
+        throw error;
+    }
+}
 export async function ensureServiceEnabled(spec, runner = systemCommandRunner) {
     if (spec.platform === "linux") {
         if (spec.descriptorPath === null || !await pathExists(spec.descriptorPath)) {

package/dist/config.js

@@ -59,6 +59,40 @@ function defaultCliPath() {
         return resolve(here, "../../cli/dist/main.js");
     }
 }
+// 临时 dev 验收名单。测试完成后删除此常量，恢复未配置时默认关闭的行为。
+const TEMP_LOCAL_MEMORY_V2_TEST_HANDLES = [
+    "memory-v2-test-a",
+    "memory-v2-test-b",
+    "memory-v2-test-c",
+];
+function isTemporaryDevServer(serverUrl) {
+    try {
+        const hostname = new URL(serverUrl).hostname.toLowerCase();
+        return hostname === "localhost"
+            || hostname === "127.0.0.1"
+            || hostname === "::1"
+            || hostname === "nowwork-dev.nowcoder.com";
+    }
+    catch {
+        return false;
+    }
+}
+function localMemoryV2Handles(env, serverUrl) {
+    const configured = env.CREW_LOCAL_MEMORY_V2_HANDLES;
+    if (configured === undefined) {
+        return isTemporaryDevServer(serverUrl)
+            ? new Set(TEMP_LOCAL_MEMORY_V2_TEST_HANDLES)
+            : new Set();
+    }
+    const raw = configured.trim();
+    if (raw === "")
+        return new Set();
+    const handles = raw.split(",").map((value) => value.trim()).filter(Boolean);
+    if (handles.some((handle) => !/^[A-Za-z0-9][A-Za-z0-9._-]*$/u.test(handle))) {
+        throw new ConfigError("CREW_LOCAL_MEMORY_V2_HANDLES contains an invalid agent handle");
+    }
+    return new Set(handles);
+}
 export const DEFAULT_SERVER_URL = "http://127.0.0.1:3001";
 function codexHomeModeEnv(env) {
     const value = env.CREW_CODEX_HOME_MODE;
@@ -68,6 +102,14 @@ function codexHomeModeEnv(env) {
         return "private";
     throw new ConfigError("CREW_CODEX_HOME_MODE must be shared or private");
 }
+function codexCollaborationToolsEnv(env) {
+    const value = (env.CREW_CODEX_COLLABORATION_TOOLS ?? "").trim().toLowerCase();
+    if (value === "" || value === "0" || value === "false" || value === "off")
+        return false;
+    if (value === "1" || value === "true" || value === "on")
+        return true;
+    throw new ConfigError("CREW_CODEX_COLLABORATION_TOOLS must be one of 1/true/on/0/false/off");
+}
 export function loadConfig(env = process.env) {
     const serverUrl = (env.CREW_SERVER_URL ?? DEFAULT_SERVER_URL).replace(/\/+$/, "");
     const machineToken = env.CREW_MACHINE_TOKEN ?? "";
@@ -99,6 +141,7 @@ export function loadConfig(env = process.env) {
         cliPath: env.CREW_CLI_PATH ?? defaultCliPath(),
         runtimeBin: env.CREW_RUNTIME ?? "claude",
         codexHomeMode: codexHomeModeEnv(env),
+        codexCollaborationTools: codexCollaborationToolsEnv(env),
         dangerous: env.CREW_RUNTIME_SAFE !== "1", // 默认开启 (headless agent 在自有 workspace 内运行)
         resume: env.CREW_RESUME !== "off" && env.CREW_RESUME !== "0", // 默认开启;一键回退现状用 CREW_RESUME=off
         resumeWarmMs: env.CREW_RESUME_WARM_MS != null ? Number(env.CREW_RESUME_WARM_MS) : 3_600_000, // 默认 1h
@@ -108,6 +151,7 @@ export function loadConfig(env = process.env) {
         sessionMaxTurns: env.CREW_SESSION_MAX_TURNS != null ? Number(env.CREW_SESSION_MAX_TURNS) : 30,
         productName: env.CREW_PRODUCT_NAME ?? "nowwork",
         agentMemory: loadAgentMemoryConfig(env),
+        localMemoryV2Handles: localMemoryV2Handles(env, serverUrl),
         executionLimits,
     };
 }

package/dist/daemon-migration-controller.js

@@ -10,6 +10,7 @@ import { buildServiceSpec, captureExactService, serviceStatus, systemCommandRunn
 import { readManagedServiceRegistry } from "./managed-service-registry.js";
 import { uninstallManagedService } from "./managed-service-lifecycle.js";
 import { resolveAutomaticInstallTarget } from "./automatic-install-target.js";
+import { buildStorageMigrationMappings, createSafeServiceManifest, CredentialMaterialError, } from "./storage-migration-manifest.js";
 const MigrationMessageSchema = z.object({
     type: z.literal("daemon:migrate"),
     migrationId: z.string().uuid(),
@@ -47,33 +48,30 @@ async function hashedFiles(root, directory = root) {
     return files;
 }
 async function backupAndCopy(input, id, targetHome, targetAgents, service) {
+    // Validate and project service identity before creating any backup bytes. A descriptor containing
+    // a token must stop the migration before it can be copied into the local backup root.
+    const safeService = createSafeServiceManifest({
+        spec: service.spec,
+        snapshot: service.snapshot,
+        managedRecord: service.managedRecord,
+    });
     const backup = migrationBackupRoot(input, id);
     await mkdir(backup, { recursive: true, mode: 0o700 });
     await cp(input.currentDaemonHome, resolve(backup, "daemon-home"), { recursive: true, force: false });
     await cp(input.currentAgentsRoot, resolve(backup, "agents-root"), { recursive: true, force: false });
     await cp(input.currentDaemonHome, targetHome, { recursive: true, force: false });
     await cp(input.currentAgentsRoot, targetAgents, { recursive: true, force: false });
-    const files = [
-        ...(await hashedFiles(resolve(backup, "daemon-home"))).map((file) => ({ ...file, path: `daemon-home/${file.path}` })),
-        ...(await hashedFiles(resolve(backup, "agents-root"))).map((file) => ({ ...file, path: `agents-root/${file.path}` })),
-    ];
+    const daemonFiles = await hashedFiles(resolve(backup, "daemon-home"));
+    const agentFiles = await hashedFiles(resolve(backup, "agents-root"));
+    const mappings = buildStorageMigrationMappings({ daemonFiles, agentFiles });
     await writeFile(resolve(backup, "manifest.json"), `${JSON.stringify({
-        version: 1,
+        version: 2,
         migrationId: id,
         profile: input.profileName,
         daemonHome: input.currentDaemonHome,
         agentsRoot: input.currentAgentsRoot,
-        service: {
-            id: service.spec.id,
-            platform: service.spec.platform,
-            descriptorPath: service.spec.descriptorPath,
-            descriptor: service.spec.descriptor,
-            daemonCommand: service.spec.daemonCommand,
-            installed: service.snapshot.installed,
-            running: service.snapshot.running,
-            managedRecord: service.managedRecord,
-        },
-        files,
+        service: safeService,
+        mappings,
     }, null, 2)}\n`, { mode: 0o600 });
     return backup;
 }
@@ -147,7 +145,7 @@ export function createDaemonMigrationController(input) {
                 }
             }
             catch (error) {
-                sendFailure(message.migrationId, "target_conflict", error);
+                sendFailure(message.migrationId, error instanceof CredentialMaterialError ? "credential_material" : "target_conflict", error);
                 return;
             }
             input.sendStatus({ type: "daemon:migration-status", migrationId: message.migrationId, status: "backing_up" });
@@ -158,7 +156,7 @@ export function createDaemonMigrationController(input) {
             }
             catch (error) {
                 await Promise.allSettled([rm(targetPath, { recursive: true, force: true }), rm(targetAgents, { recursive: true, force: true })]);
-                sendFailure(message.migrationId, "backup_failed", error);
+                sendFailure(message.migrationId, error instanceof CredentialMaterialError ? "credential_material" : "backup_failed", error);
                 return;
             }
             const install = input.install ?? installDaemonAutomatically;

package/dist/execution-runner.js

@@ -299,12 +299,6 @@ class ExecutionCancelledError extends Error {
         this.name = "ExecutionCancelledError";
     }
 }
-class ExecutionQueueTimeoutError extends Error {
-    constructor(timeoutMs) {
-        super(`Execution queue wait exceeded ${timeoutMs}ms`);
-        this.name = "ExecutionQueueTimeoutError";
-    }
-}
 async function cancellable(promise, cancellation) {
     if (cancellation === undefined)
         return promise;
@@ -315,24 +309,9 @@ async function cancellable(promise, cancellation) {
         cancellation.requested.then(() => { throw new ExecutionCancelledError(); }),
     ]);
 }
-async function cancellableWithTimeout(promise, timeoutMs, cancellation, timeoutError) {
-    let timer;
-    try {
-        return await Promise.race([
-            cancellable(promise, cancellation),
-            new Promise((_resolve, reject) => {
-                timer = setTimeout(() => reject(timeoutError), timeoutMs);
-            }),
-        ]);
-    }
-    finally {
-        if (timer !== undefined)
-            clearTimeout(timer);
-    }
-}
 function failedCompletion(spec, error, startedAt, finishedAt) {
     const message = error instanceof Error ? error.message : String(error);
-    const errorCode = error instanceof ExecutionQueueTimeoutError || error instanceof HostReservationCancelledError
+    const errorCode = error instanceof HostReservationCancelledError
         ? "queue_timeout"
         : error instanceof ProjectContextUnavailableError
             ? error.code
@@ -519,7 +498,9 @@ export async function runExecution(config, input, dependencies) {
     });
     try {
         if (dependencies.slot !== undefined) {
-            await cancellableWithTimeout(dependencies.slot.ready, config.executionLimits.maxQueueWaitMs, dependencies.cancellation, new ExecutionQueueTimeoutError(config.executionLimits.maxQueueWaitMs));
+            // Queueing is not a liveness failure. Keep the execution durable until its
+            // machine/host slot is granted or the server explicitly cancels it.
+            await cancellable(dependencies.slot.ready, dependencies.cancellation);
         }
         let projectContext;
         let sessionContextFingerprint;
@@ -562,17 +543,15 @@ export async function runExecution(config, input, dependencies) {
                 if (cancel !== null && timeout === undefined && !dependencies.cancellation?.isRequested()) {
                     const firstOutputDeadline = config.executionLimits.maxFirstOutputWaitMs
                         + config.executionLimits.firstOutputGraceMs;
-                    if (effectiveTimeoutMs > firstOutputDeadline) {
-                        firstOutputTimer = setTimeout(() => {
-                            firstOutputTimedOut = true;
-                            try {
-                                void cancel().catch(rejectCancellationFailure);
-                            }
-                            catch (error) {
-                                rejectCancellationFailure(error);
-                            }
-                        }, firstOutputDeadline);
-                    }
+                    firstOutputTimer = setTimeout(() => {
+                        firstOutputTimedOut = true;
+                        try {
+                            void cancel().catch(rejectCancellationFailure);
+                        }
+                        catch (error) {
+                            rejectCancellationFailure(error);
+                        }
+                    }, firstOutputDeadline);
                     timeout = setTimeout(() => {
                         timedOut = true;
                         try {
@@ -796,7 +775,7 @@ export async function runExecution(config, input, dependencies) {
         const baseSystemPromptBudget = spec.agent.abilityRelease === undefined
             ? systemPromptBudget
             : Math.max(0, Math.min(systemPromptBudget, Math.max(32 * 1024, systemPromptBudget - 168 * 1024)));
-        const systemPromptWithLocalFacts = withLocalExecutionFacts(spec.instructions.systemPrompt, baseSystemPromptBudget);
+        const systemPromptWithLocalFacts = withLocalExecutionFacts(spec.instructions.systemPrompt, baseSystemPromptBudget, { collaborationTools: config.codexCollaborationTools && spec.runtime.name === "codex" });
         const boundedSystemPrompt = (context) => appendAgentMemoryContext(typeof systemPromptWithLocalFacts === "string"
             ? systemPromptWithLocalFacts
             : systemPromptWithLocalFacts(context), recalledMemory, baseSystemPromptBudget);
@@ -822,6 +801,7 @@ export async function runExecution(config, input, dependencies) {
                 name: spec.runtime.name,
                 ...(spec.runtime.model === undefined ? {} : { model: spec.runtime.model }),
                 ...(spec.runtime.reasoning === undefined ? {} : { reasoning: spec.runtime.reasoning }),
+                codexCollaborationTools: config.codexCollaborationTools,
             },
             effectivePermission: permission,
             captureFinal: spec.reporting.captureFinal,
@@ -847,6 +827,7 @@ export async function runExecution(config, input, dependencies) {
                 softTokens: config.sessionSoftTokens,
                 maxTurns: config.sessionMaxTurns,
             },
+            localMemoryV2Enabled: config.localMemoryV2Handles?.has(spec.agent.handle) === true,
         };
         const result = await Promise.race([
             execute(localInput, callbacks, localDependencies),

package/dist/local-execution-prompt.js

@@ -4,7 +4,7 @@
  * server 提示词是权威部分,绝不裁剪;项目工作区提示词是绑定执行的强制部分,放不下就直接失败;
  * 只有本机事实(CREW_HOME / work-log / MEMORY 注入)是可选增强,按整段丢弃或按字节截断。
  */
-import { buildRuntimeWorkspacePrompt, capMemoryForInject, capWorkLogForInject, } from "./prompt.js";
+import { buildCollaborationToolsPrompt, buildRuntimeWorkspacePrompt, capMemoryForInject, capWorkLogForInject, } from "./prompt.js";
 export function truncateUtf8(value, maxBytes) {
     if (maxBytes <= 0)
         return "";
@@ -30,10 +30,11 @@ function takeCompletePromptSections(sections, maxBytes) {
     }, { value: "", bytes: 0, full: true }).value;
 }
 /** v1 server instructions opt in to daemon-owned paths and bounded local workspace context. */
-export function withLocalExecutionFacts(serverPrompt, maxBytes) {
+export function withLocalExecutionFacts(serverPrompt, maxBytes, options = {}) {
     return ({ workspace, resuming, projectContext }) => {
         const memory = capMemoryForInject(workspace.memory);
         const workLog = resuming ? "" : capWorkLogForInject(workspace.workLog);
+        const collaborationPrompt = options.collaborationTools === true ? buildCollaborationToolsPrompt() : "";
         const mandatoryWorkspacePrompt = buildRuntimeWorkspacePrompt(projectContext);
         const localFactSections = [`\n\n## Local execution facts
 - $CREW_HOME: ${workspace.dir}
@@ -41,17 +42,21 @@ export function withLocalExecutionFacts(serverPrompt, maxBytes) {
             ...(memory ? [`\n\n## Injected MEMORY.md (bounded local context)\n${memory}`] : []),
             ...(workLog ? [`\n\n## Injected work-log (bounded local context)\n${workLog}`] : []),
         ];
-        const localFacts = localFactSections.join("");
+        const serverPromptBytes = Buffer.byteLength(serverPrompt, "utf8");
+        const collaborationBytes = Buffer.byteLength(collaborationPrompt, "utf8");
+        const mandatoryBytes = Buffer.byteLength(mandatoryWorkspacePrompt, "utf8");
+        const requiredBytes = serverPromptBytes + collaborationBytes + mandatoryBytes;
+        // 必需预算与 projectContext 无关:协作段落永远参与;无协作时与旧实现逐字节等价。
+        if (collaborationPrompt !== "" && requiredBytes > maxBytes) {
+            throw new Error("collaboration_tools_prompt_budget_exceeded");
+        }
         if (mandatoryWorkspacePrompt !== "") {
-            const serverPromptBytes = Buffer.byteLength(serverPrompt, "utf8");
-            const mandatoryBytes = Buffer.byteLength(mandatoryWorkspacePrompt, "utf8");
-            const requiredBytes = serverPromptBytes + mandatoryBytes;
             if (requiredBytes > maxBytes)
                 throw new Error("project_workspace_prompt_budget_exceeded");
             const optionalFacts = takeCompletePromptSections(localFactSections, maxBytes - requiredBytes);
-            return `${serverPrompt}${optionalFacts}${mandatoryWorkspacePrompt}`;
+            return `${serverPrompt}${collaborationPrompt}${optionalFacts}${mandatoryWorkspacePrompt}`;
         }
-        const remaining = maxBytes - Buffer.byteLength(serverPrompt, "utf8");
-        return `${serverPrompt}${truncateUtf8(localFacts, remaining)}`;
+        const remaining = maxBytes - requiredBytes;
+        return `${serverPrompt}${collaborationPrompt}${truncateUtf8(localFactSections.join(""), remaining)}`;
     };
 }