@botiverse/raft-daemon 0.68.0 → 0.69.0-play.20260705140609

package/dist/{chunk-RXK2KSYW.js → chunk-HFYOYYZI.js}

@@ -2225,7 +2225,12 @@ var agentApiIntegrationLoginResponseSchema = passthroughObject({
   status: z2.enum(["logged_in", "already_logged_in", "approval_required"]),
   service: agentApiIntegrationServiceSchema,
   scopes: z2.array(z2.string()),
-  requestId: z2.string(),
+  requestId: z2.string().optional(),
+  session: passthroughObject({
+    status: z2.literal("stored"),
+    source: z2.enum(["cache", "fresh"]),
+    path: nullableStringSchema
+  }).optional(),
   approval: passthroughObject({
     requestId: z2.string(),
     target: nullableStringSchema,
@@ -3288,6 +3293,7 @@ var AGENT_ACTIVITY_DETAIL_KINDS = [
   "compaction_stale",
   "reviewing_changes",
   "review_finished",
+  "review_stale",
   "runtime_reconnecting",
   "runtime_error",
   "runtime_crashed",
@@ -3738,6 +3744,8 @@ var DISPLAY_PLAN_CONFIG = {
   }
 };
 var FREE_MONTHLY_FILE_UPLOAD_LIMIT_BYTES = 100 * 1024 * 1024;
+var FREE_SINGLE_FILE_UPLOAD_LIMIT_BYTES = 50 * 1024 * 1024;
+var PRO_SINGLE_FILE_UPLOAD_LIMIT_BYTES = 200 * 1024 * 1024;
 var TRIAL_START_DATE = /* @__PURE__ */ new Date("2026-04-18T00:00:00Z");
 var TRIAL_END_DATE = /* @__PURE__ */ new Date("2026-06-23T12:00:00Z");
 var TRIAL_DURATION_DAYS = (TRIAL_END_DATE.getTime() - TRIAL_START_DATE.getTime()) / (24 * 60 * 60 * 1e3);
@@ -4520,7 +4528,7 @@ function buildPrompt(config, opts) {
   const channelAwarenessSection = cliGuideSections.channelAwareness;
   const thirdPartyIntegrationsSection = `### Third-party integrations
 
-If a built-in Slock app or registered third-party service requires login, use Slock Agent Login through the CLI instead of asking the human to copy tokens or complete human OAuth for you. If a human asks you to sign into, open, use, or fetch identity from a third-party app or built-in Slock app, first run \`raft integration list\` and match the app to a listed service before browsing the app. Use \`raft integration login --service <service>\` to provision or reuse your agent login for that service. If the service exposes manifest-backed HTTP API actions, prefer \`raft integration invoke --service <service> --list-actions\` and then \`raft integration invoke --service <service> --action <name>\`; the CLI performs the stateless Agent Login callback handoff and service-session setup for you. If the service exposes an agent behavior manifest and you need to run its local CLI, run \`raft integration env --service <service>\` before invoking that CLI; if it prints exports, apply them first so service credentials stay under a per-agent profile HOME/XDG tree instead of the host user's global HOME. If it reports that no local env is required, do not invent HOME/XDG overrides; for HTTP API action services, use \`raft integration invoke\` instead. If it fails, do not run that local CLI with the host user's HOME; report that the service manifest is unsupported. Slock does not execute local commands from remote manifests automatically. If the CLI reports that the \`integration\` command is unknown, the local daemon/CLI is too old for Slock Agent Login; report that the machine must be upgraded/restarted instead of calling internal HTTP endpoints yourself. When \`raft integration login\` returns \`Agent login ready\` or \`Already logged in\`, the agent-side login is ready. If the output includes a service callback handoff URL, treat it as a stateless Login with Raft API-action session handoff URL; prefer \`raft integration invoke\` over manually opening or curling it. Do not crawl third-party routes looking for a session before trying the registered-service login path. Do not open the human \`Login with Slock\` browser flow, use internal request IDs as OAuth callback codes outside the documented CLI flow, call internal Slock integration endpoints directly, or call third-party exchange endpoints unless a human explicitly asks you to debug that server-to-server protocol. If the service or human asks for your Slock Agent identity card, use \`raft profile show\`. Third-party pages may show \`Login with Slock\`; for agent-facing access, prefer the listed service / Slock Agent Login path.`;
+If a built-in Slock app or registered third-party service requires login, use Slock Agent Login through the CLI instead of asking the human to copy tokens or complete human OAuth for you. If a human asks you to sign into, open, use, or fetch identity from a third-party app or built-in Slock app, first run \`raft integration list\` and match the app to a listed service before browsing the app. Use \`raft integration login --service <service>\` to provision or reuse your agent login for that service; the CLI consumes the one-time Agent Login handoff internally and stores the service-owned session for this agent, so the successful output should be \`Agent login ready\` / \`Already logged in\`, not a raw request code you need to keep. If the service exposes manifest-backed HTTP API actions, prefer \`raft integration invoke --service <service> --list-actions\` and then \`raft integration invoke --service <service> --action <name>\`; the CLI uses the stored service session or refreshes it internally. If the service exposes an agent behavior manifest and you need to run its local CLI, run \`raft integration env --service <service>\` before invoking that CLI; if it prints exports, apply them first so service credentials stay under a per-agent profile HOME/XDG tree instead of the host user's global HOME. If it reports that no local env is required, do not invent HOME/XDG overrides; for HTTP API action services, use \`raft integration invoke\` instead. If it fails, do not run that local CLI with the host user's HOME; report that the service manifest is unsupported. Slock does not execute local commands from remote manifests automatically. If the CLI reports that the \`integration\` command is unknown, the local daemon/CLI is too old for Slock Agent Login; report that the machine must be upgraded/restarted instead of calling internal HTTP endpoints yourself. Do not store or reuse raw \`oauth_access_request\` request codes; those are one-time compatibility handoffs for services to exchange once for their own session/token. Prefer \`raft integration invoke\` over manually opening or curling callback URLs. Do not crawl third-party routes looking for a session before trying the registered-service login path. Do not open the human \`Login with Slock\` browser flow, use internal request IDs as OAuth callback codes outside the documented CLI flow, call internal Slock integration endpoints directly, or call third-party exchange endpoints unless a human explicitly asks you to debug that server-to-server protocol. If the service or human asks for your Slock Agent identity card, use \`raft profile show\`. Third-party pages may show \`Login with Slock\`; for agent-facing access, prefer the listed service / Slock Agent Login path.`;
   const readingHistorySection = cliGuideSections.readingHistory;
   const historicalReferenceSection = cliGuideSections.historicalReferences;
   const tasksSection = cliGuideSections.tasks;
@@ -4708,6 +4716,19 @@ function listLegacySlockStatePaths(slockHome = resolveSlockHome(), homeDir = os.
   return candidates.filter((candidate) => existsSync(candidate.path));
 }
 
+// src/authEnv.ts
+var DAEMON_API_KEY_ENV = "SLOCK_MACHINE_API_KEY";
+var SLOCK_AGENT_TOKEN_ENV = "SLOCK_AGENT_TOKEN";
+function scrubDaemonAuthEnv(env) {
+  delete env[DAEMON_API_KEY_ENV];
+  return env;
+}
+function scrubDaemonChildEnv(env) {
+  delete env[DAEMON_API_KEY_ENV];
+  delete env[SLOCK_AGENT_TOKEN_ENV];
+  return env;
+}
+
 // src/agentCredentialProxy.ts
 import { randomBytes } from "crypto";
 import http from "http";
@@ -6282,7 +6303,9 @@ var LOOPBACK_NO_PROXY = "127.0.0.1,localhost";
 var CLI_TRANSPORT_TRACE_DIR_ENV = "SLOCK_CLI_TRANSPORT_TRACE_DIR";
 var safePathPart = (value) => value.replace(/[^a-zA-Z0-9_.-]/g, "_");
 var RAW_CREDENTIAL_ENV_DENYLIST = [
-  "SLOCK_AGENT_CREDENTIAL_KEY"
+  "SLOCK_AGENT_TOKEN",
+  "SLOCK_AGENT_CREDENTIAL_KEY",
+  "SLOCK_AGENT_CREDENTIAL_KEY_FILE"
 ];
 var WORKSPACE_CLI_TRANSPORT_FILENAMES = [
   "agent-token",
@@ -6637,7 +6660,7 @@ set "SLOCK_AGENT_ACTIVE_CAPABILITIES=${DEFAULT_ACTIVE_CAPABILITIES}"\r
     SLOCK_SERVER_URL: ctx.config.serverUrl,
     PATH: `${slockDir}${path2.delimiter}${process.env.PATH ?? ""}`
   };
-  delete spawnEnv.SLOCK_AGENT_TOKEN;
+  scrubDaemonChildEnv(spawnEnv);
   for (const key of RAW_CREDENTIAL_ENV_DENYLIST) {
     delete spawnEnv[key];
   }
@@ -7205,7 +7228,7 @@ function requiresWindowsShell(command, platform = process.platform) {
 }
 function resolveCommandOnPath(command, deps = {}) {
   const platform = deps.platform ?? process.platform;
-  const env = withWindowsUserEnvironment(deps.env ?? process.env, deps);
+  const env = scrubDaemonChildEnv({ ...withWindowsUserEnvironment(deps.env ?? process.env, deps) });
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync;
   const existsSyncFn = deps.existsSyncFn ?? existsSync3;
   if (platform === "win32") {
@@ -7231,7 +7254,7 @@ function firstExistingPath(candidates, deps = {}) {
   return null;
 }
 function readCommandVersion(command, args = [], deps = {}) {
-  const env = withWindowsUserEnvironment(deps.env ?? process.env, deps);
+  const env = scrubDaemonChildEnv({ ...withWindowsUserEnvironment(deps.env ?? process.env, deps) });
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync;
   try {
     const output = normalizeExecOutput(execFileSyncFn(command, [...args, "--version"], {
@@ -9315,11 +9338,11 @@ function detectCursorModels(runCommand = runCursorModelsCommand) {
   return parseCursorModelsOutput(String(result.stdout || ""));
 }
 function buildCursorModelProbeEnv(deps = {}) {
-  return withWindowsUserEnvironment({
+  return scrubDaemonChildEnv(withWindowsUserEnvironment({
     ...deps.env ?? process.env,
     FORCE_COLOR: "0",
     NO_COLOR: "1"
-  }, deps);
+  }, deps));
 }
 function runCursorModelsCommand() {
   return spawnSync("cursor-agent", ["models"], {
@@ -9375,7 +9398,7 @@ function resolveGeminiSpawn(commandArgs, deps = {}) {
   }
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync3;
   const existsSyncFn = deps.existsSyncFn ?? existsSync5;
-  const env = deps.env ?? process.env;
+  const env = scrubDaemonChildEnv({ ...deps.env ?? process.env });
   const winPath = path8.win32;
   let geminiEntry = null;
   try {
@@ -9512,12 +9535,15 @@ var GeminiDriver = class {
 // src/drivers/kimi.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { spawn as spawn7 } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync, existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
 import os4 from "os";
 import path9 from "path";
 var KIMI_WIRE_PROTOCOL_VERSION = "1.3";
 var KIMI_SYSTEM_PROMPT_FILE = ".slock-kimi-system.md";
 var KIMI_AGENT_FILE = ".slock-kimi-agent.yaml";
+var KIMI_GENERATED_CONFIG_FILE = ".slock-kimi-config.toml";
+var SLOCK_KIMI_CONFIG_CONTENT_ENV = "SLOCK_KIMI_CONFIG_CONTENT";
+var SLOCK_KIMI_CONFIG_FILE_ENV = "SLOCK_KIMI_CONFIG_FILE";
 function parseToolArguments(raw) {
   if (typeof raw !== "string") return raw;
   try {
@@ -9526,6 +9552,73 @@ function parseToolArguments(raw) {
     return raw;
   }
 }
+function readKimiConfigSource(home = os4.homedir(), env = process.env) {
+  const inlineConfig = env[SLOCK_KIMI_CONFIG_CONTENT_ENV];
+  if (inlineConfig && inlineConfig.trim()) {
+    return {
+      raw: inlineConfig,
+      explicitPath: null,
+      sourcePath: SLOCK_KIMI_CONFIG_CONTENT_ENV
+    };
+  }
+  const explicitPath = env[SLOCK_KIMI_CONFIG_FILE_ENV];
+  const configPath = explicitPath && explicitPath.trim() ? explicitPath : path9.join(home, ".kimi", "config.toml");
+  try {
+    return {
+      raw: readFileSync3(configPath, "utf8"),
+      explicitPath: explicitPath && explicitPath.trim() ? explicitPath : null,
+      sourcePath: configPath
+    };
+  } catch {
+    return {
+      raw: null,
+      explicitPath: explicitPath && explicitPath.trim() ? explicitPath : null,
+      sourcePath: configPath
+    };
+  }
+}
+function buildKimiSpawnEnv(env = process.env) {
+  const spawnEnv = { ...env, FORCE_COLOR: "0", NO_COLOR: "1" };
+  delete spawnEnv[SLOCK_KIMI_CONFIG_CONTENT_ENV];
+  delete spawnEnv[SLOCK_KIMI_CONFIG_FILE_ENV];
+  return scrubDaemonChildEnv(spawnEnv);
+}
+function buildKimiEffectiveEnv(ctx, overrideEnv) {
+  return {
+    ...process.env,
+    ...ctx.config.envVars || {},
+    ...overrideEnv || {}
+  };
+}
+function buildKimiLaunchOptions(ctx, opts = {}) {
+  const env = buildKimiEffectiveEnv(ctx, opts.env);
+  const source = readKimiConfigSource(opts.home ?? os4.homedir(), env);
+  const args = [];
+  let configFilePath = null;
+  let configContent = null;
+  if (source.explicitPath) {
+    configFilePath = source.explicitPath;
+  } else if (source.raw !== null && source.sourcePath === SLOCK_KIMI_CONFIG_CONTENT_ENV) {
+    configFilePath = path9.join(ctx.workingDirectory, KIMI_GENERATED_CONFIG_FILE);
+    configContent = source.raw;
+    if (opts.writeGeneratedConfig !== false) {
+      writeFileSync3(configFilePath, source.raw, { encoding: "utf8", mode: 384 });
+      chmodSync(configFilePath, 384);
+    }
+  }
+  if (configFilePath) {
+    args.push("--config-file", configFilePath);
+  }
+  if (ctx.config.model && ctx.config.model !== "default") {
+    args.push("--model", ctx.config.model);
+  }
+  return {
+    args,
+    env: buildKimiSpawnEnv(env),
+    configFilePath,
+    configContent
+  };
+}
 function resolveKimiSpawn(commandArgs, deps = {}) {
   return {
     command: resolveCommandOnPath("kimi", deps) ?? "kimi",
@@ -9549,7 +9642,25 @@ var KimiDriver = class {
   };
   model = {
     detectedModelsVerifiedAs: "launchable",
-    toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
+    toLaunchSpec: (modelId, ctx, opts) => {
+      if (!ctx) return { args: ["--model", modelId] };
+      const launchCtx = {
+        ...ctx,
+        config: {
+          ...ctx.config,
+          model: modelId
+        }
+      };
+      const launch = buildKimiLaunchOptions(launchCtx, {
+        home: opts?.home,
+        writeGeneratedConfig: false
+      });
+      return {
+        args: launch.args,
+        env: launch.env,
+        configFiles: launch.configFilePath ? [launch.configFilePath] : void 0
+      };
+    }
   };
   supportsStdinNotification = true;
   busyDeliveryMode = "direct";
@@ -9573,21 +9684,23 @@ var KimiDriver = class {
       `  system_prompt_path: ./${KIMI_SYSTEM_PROMPT_FILE}`,
       ""
     ].join("\n"), "utf8");
+    const launch = buildKimiLaunchOptions(ctx);
     const args = [
       "--wire",
       "--yolo",
       "--agent-file",
       agentFilePath,
       "--session",
-      this.sessionId
+      this.sessionId,
+      ...launch.args
     ];
     const launchRuntimeFields = runtimeConfigToLaunchFields(hydrateRuntimeConfig(ctx.config));
     if (launchRuntimeFields.model && launchRuntimeFields.model !== "default") {
       args.push("--model", launchRuntimeFields.model);
     }
     const spawnEnv = (await prepareCliTransport(ctx, { NO_COLOR: "1" })).spawnEnv;
-    const launch = resolveKimiSpawn(args);
-    const proc = spawn7(launch.command, launch.args, {
+    const spawnTarget = resolveKimiSpawn(args);
+    const proc = spawn7(spawnTarget.command, spawnTarget.args, {
       cwd: ctx.workingDirectory,
       stdio: ["pipe", "pipe", "pipe"],
       env: spawnEnv,
@@ -9595,7 +9708,7 @@ var KimiDriver = class {
       // and has an 8191-character command-line limit. Kimi's official
       // installer/uv entrypoint is an executable, so launch it directly and
       // keep prompts on stdin / files instead of routing through cmd.exe.
-      shell: launch.shell
+      shell: spawnTarget.shell
     });
     proc.stdin?.write(JSON.stringify({
       jsonrpc: "2.0",
@@ -9708,14 +9821,9 @@ var KimiDriver = class {
     return detectKimiModels();
   }
 };
-function detectKimiModels(home = os4.homedir()) {
-  const configPath = path9.join(home, ".kimi", "config.toml");
-  let raw;
-  try {
-    raw = readFileSync3(configPath, "utf8");
-  } catch {
-    return null;
-  }
+function detectKimiModels(home = os4.homedir(), opts = {}) {
+  const raw = readKimiConfigSource(home, opts.env).raw;
+  if (raw === null) return null;
   const models = [];
   const sectionRe = /^\s*\[models(?:\.([^\]]+)|"\.[^"]+"|\."[^"]+")\s*\]\s*$/gm;
   const lineRe = /^\s*\[models\.(.+?)\s*\]\s*$/gm;
@@ -10381,7 +10489,7 @@ function runOpenCodeModelsCommand(home, deps = {}) {
   const platform = deps.platform ?? process.platform;
   const spawnSyncFn = deps.spawnSyncFn ?? spawnSync2;
   const result = spawnSyncFn("opencode", ["models"], {
-    env: { ...process.env, HOME: home, FORCE_COLOR: "0", NO_COLOR: "1" },
+    env: scrubDaemonChildEnv({ ...process.env, HOME: home, FORCE_COLOR: "0", NO_COLOR: "1" }),
     encoding: "utf8",
     timeout: 5e3,
     shell: platform === "win32"
@@ -13370,24 +13478,38 @@ function safeSessionFilename(value) {
   const normalized = value.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
   return normalized || "unknown-session";
 }
-function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
+function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir, join, resolve) {
   try {
     const dir = path14.join(fallbackDir, ".slock", "runtime-sessions");
     mkdirSync4(dir, { recursive: true });
     const filePath = path14.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
+    const searchedPaths = resolve?.searchedPaths ?? [];
     writeFileSync4(filePath, JSON.stringify({
       type: "runtime_session_handoff",
       runtime,
       sessionId,
+      // Persisted L1<->L2 join keys (#460 V3): without these the
+      // session->launch mapping lives only in daemon memory and old L1
+      // transcripts can never re-join their launch after restart/adopt.
+      // ids-only, closed fields (no content payload).
+      launchId: join?.launchId ?? null,
+      processInstanceId: join?.processInstanceId ?? null,
+      // Negative-space (fruit#0 pt2): a resolve-miss is explicit evidence, not a
+      // silent "not found". Recording the lookup method + the directories checked
+      // makes "looked in the wrong place" distinguishable from "looked in the right
+      // place and it is genuinely absent". ids/paths only — no transcript content.
+      resolveStatus: "transcript_resolve_missing",
+      lookupMethod: resolve?.lookupMethod ?? "none",
+      searchedPaths,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      note: "The native runtime transcript file was not found on this machine; this daemon-created handoff records the runtime session identity for diagnostics."
+      note: "The native runtime transcript file was not found on this machine; this daemon-created handoff records the runtime session identity + the directories checked for diagnostics."
     }) + "\n", { mode: 384 });
     return {
       label: sessionId,
       path: filePath,
       runtime,
       reachable: true,
-      reason: "native session file path not found; using daemon handoff file"
+      reason: `native session file path not found; using daemon handoff file; searched=[${searchedPaths.join(", ")}]`
     };
   } catch {
     return null;
@@ -13412,12 +13534,16 @@ function ensureRuntimeHomeDir(config, defaultHomeDir, workspacePath, opts = {})
 function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), fallbackDir, opts) {
   let resolvedPath = null;
   let lookupMethod = "none";
+  const searchedPaths = [];
   if (runtime === "claude") {
     lookupMethod = "claude_jsonl";
-    resolvedPath = findSessionJsonl(path14.join(homeDir, ".claude", "projects"), (filename) => filename === `${sessionId}.jsonl`);
+    const claudeRoot = path14.join(homeDir, ".claude", "projects");
+    searchedPaths.push(claudeRoot);
+    resolvedPath = findSessionJsonl(claudeRoot, (filename) => filename === `${sessionId}.jsonl`);
   } else if (runtime === "codex") {
     lookupMethod = "codex_jsonl";
     for (const root of codexSessionRootCandidates(homeDir)) {
+      searchedPaths.push(root);
       resolvedPath = findSessionJsonl(root, (filename) => filename.endsWith(".jsonl") && filename.includes(sessionId));
       if (resolvedPath) break;
     }
@@ -13429,7 +13555,13 @@ function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), f
     resolvedPath = findPiSessionFile2(sessionId, opts?.workingDirectory, homeDir);
   }
   if (!resolvedPath && fallbackDir) {
-    const fallback = writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir);
+    const fallback = writeRuntimeSessionHandoff(
+      runtime,
+      sessionId,
+      fallbackDir,
+      { launchId: opts?.launchId, processInstanceId: opts?.processInstanceId },
+      { lookupMethod, searchedPaths }
+    );
     if (fallback) {
       return {
         ...fallback,
@@ -13444,7 +13576,7 @@ function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), f
     reachable: Boolean(resolvedPath)
   };
   if (!resolvedPath) {
-    ref.reason = `session file path not found; attempted_lookup=${lookupMethod}`;
+    ref.reason = `session file path not found; attempted_lookup=${lookupMethod}; searched=[${searchedPaths.join(", ")}]`;
   }
   return ref;
 }
@@ -13560,11 +13692,12 @@ var RUNTIME_ERROR_DELIVERY_BACKOFF_MAX_MS = 5 * 6e4;
 var RUNTIME_ERROR_FINGERPRINT_FENCE_THRESHOLD = 3;
 var SPAWN_FAIL_BACKOFF_BASE_MS = 1e3;
 var SPAWN_FAIL_BACKOFF_MAX_MS = 3e4;
-var SPAWN_FAIL_BACKOFF_THRESHOLD = 3;
+var SPAWN_FAIL_BACKOFF_THRESHOLD = 0;
 var RUNNER_CREDENTIAL_MINT_BACKOFF_BASE_MS = 6e4;
 var RUNNER_CREDENTIAL_MINT_BACKOFF_MAX_MS = 10 * 6e4;
 var RUNNER_CREDENTIAL_MINT_BACKOFF_THRESHOLD = 0;
 var COMPACTION_STALE_MS = 5 * 6e4;
+var REVIEW_STALE_MS = 10 * 6e4;
 var RUNTIME_PROGRESS_STALE_MS = 15 * 6e4;
 var DEFAULT_RUNTIME_START_TIMEOUT_MS = 2 * 6e4;
 var DEFAULT_STALLED_RECOVERY_SIGTERM_TIMEOUT_MS = 1e4;
@@ -14653,10 +14786,10 @@ var AgentProcessManager = class _AgentProcessManager {
   }
   // ----- SPAWN-FAIL BACKOFF (per-agent) ----------------------------------
   // Anchored at auto_restart_from_idle (apm:3596) + runtime_profile_auto_restart (apm:4137).
-  // Generic spawn errors keep a threshold > 1 so single-transient hiccups behave as today.
-  // Runner credential mint failures are different: one outer spawn failure already means the
-  // inner credential-mint loop exhausted RUNNER_CREDENTIAL_MINT_MAX_ATTEMPTS. Those enter a
-  // longer cooldown immediately so repeated wakes don't keep burning three network fetches.
+  // One outer spawn failure enters cooldown immediately so repeated wakes cannot burn one
+  // full spawn attempt per delivery. Runner credential mint failures keep a longer cooldown
+  // because one outer failure already means the inner credential-mint loop exhausted
+  // RUNNER_CREDENTIAL_MINT_MAX_ATTEMPTS.
   // Successful spawn resets state. State lives outside AgentProcess because spawn fails BEFORE
   // ap exists and the rate-window must persist across stop/respawn (else stop/start churn
   // bypasses the cap — CC1 lifecycle pattern). Never advances any consume cursor or model-seen
@@ -14809,14 +14942,22 @@ var AgentProcessManager = class _AgentProcessManager {
       this.sendStdinNotification(agentId);
     }, delayMs);
   }
-  flushAsyncRejectedIdleDelivery(agentId) {
+  scheduleIdleInboxDeliveryRetry(agentId, ap, notificationCount, source, traceName) {
+    if (notificationCount <= 0 || !ap.driver.supportsStdinNotification || !ap.sessionId) return false;
+    ap.notifications.add(notificationCount);
+    ap.notifications.clearTimer();
+    return ap.notifications.schedule(() => {
+      this.flushIdleInboxDeliveryRetry(agentId, source, traceName);
+    }, this.stdinNotificationRetryMs);
+  }
+  flushIdleInboxDeliveryRetry(agentId, source, traceName) {
     const ap = this.agents.get(agentId);
     if (!ap) return false;
     const count = ap.notifications.takePendingAndClearTimer();
     if (count === 0) return false;
     if (!ap.driver.supportsStdinNotification || !ap.sessionId || ap.inbox.length === 0) {
       ap.notifications.add(count);
-      this.recordDaemonTrace("daemon.agent.stdin_delivery.async_rejected.retry", {
+      this.recordDaemonTrace(traceName, {
         agentId,
         runtime: ap.config.runtime,
         model: ap.config.model,
@@ -14837,7 +14978,7 @@ var AgentProcessManager = class _AgentProcessManager {
     ap.notifications.pruneContributedToPending(ap.inbox, ap.sessionId);
     const messages = ap.notifications.filterUncontributedMessages(ap.inbox, ap.sessionId);
     if (messages.length === 0) {
-      this.recordDaemonTrace("daemon.agent.stdin_delivery.async_rejected.retry", {
+      this.recordDaemonTrace(traceName, {
         agentId,
         runtime: ap.config.runtime,
         model: ap.config.model,
@@ -14851,16 +14992,16 @@ var AgentProcessManager = class _AgentProcessManager {
       return false;
     }
     this.commitApmIdleState(agentId, ap, false);
-    this.startRuntimeTrace(agentId, ap, "async-rejected-idle-delivery-retry", messages);
+    this.startRuntimeTrace(agentId, ap, source.replaceAll("_", "-"), messages);
     this.broadcastMessageReceivedActivity(agentId);
     const accepted = this.deliverInboxUpdateViaStdin(
       agentId,
       ap,
       messages,
       "idle",
-      "async_rejected_idle_delivery_retry"
+      source
     );
-    this.recordDaemonTrace("daemon.agent.stdin_delivery.async_rejected.retry", {
+    this.recordDaemonTrace(traceName, {
       agentId,
       runtime: ap.config.runtime,
       model: ap.config.model,
@@ -14873,6 +15014,13 @@ var AgentProcessManager = class _AgentProcessManager {
     });
     return accepted;
   }
+  flushAsyncRejectedIdleDelivery(agentId) {
+    return this.flushIdleInboxDeliveryRetry(
+      agentId,
+      "async_rejected_idle_delivery_retry",
+      "daemon.agent.stdin_delivery.async_rejected.retry"
+    );
+  }
   isApmIdle(ap) {
     return ap.gatedSteering.isIdle;
   }
@@ -14936,6 +15084,7 @@ var AgentProcessManager = class _AgentProcessManager {
     if (options.includeCompactionWatchdog ?? true) {
       this.clearCompactionWatchdog(ap);
     }
+    this.clearReviewWatchdog(ap);
     this.clearStalledRecoverySigtermWatchdog(ap);
   }
   clearRuntimeErrorDeliveryBackoffWithTrace(agentId, ap, resetSource) {
@@ -15311,7 +15460,8 @@ var AgentProcessManager = class _AgentProcessManager {
       detailKind: activity.statusEntry.detailKind ?? "daemon_activity",
       entries: activity.entries,
       launchId: ap?.launchId || void 0,
-      clientSeq: ap ? this.nextActivityClientSeq(agentId) : void 0
+      clientSeq: ap ? this.nextActivityClientSeq(agentId) : void 0,
+      isHeartbeat: false
     });
   }
   recordRuntimeDiagnosticActivity(agentId, ap, event) {
@@ -15324,7 +15474,8 @@ var AgentProcessManager = class _AgentProcessManager {
       detailKind: ap.lastActivityDetailKind || "none",
       entries: [runtimeDiagnosticTrajectoryEntry(event)],
       launchId: ap.launchId || void 0,
-      clientSeq: this.nextActivityClientSeq(agentId)
+      clientSeq: this.nextActivityClientSeq(agentId),
+      isHeartbeat: false
     });
     this.recordDaemonTrace("daemon.runtime.diagnostic", {
       agentId,
@@ -15375,7 +15526,8 @@ var AgentProcessManager = class _AgentProcessManager {
       detailKind: ap.lastActivityDetailKind || "none",
       entries: [runtimeRecoveryTrajectoryEntry(event)],
       launchId: ap.launchId || void 0,
-      clientSeq: this.nextActivityClientSeq(agentId)
+      clientSeq: this.nextActivityClientSeq(agentId),
+      isHeartbeat: false
     });
     this.recordDaemonTrace("daemon.runtime.recovery.visible", {
       agentId,
@@ -15623,7 +15775,8 @@ var AgentProcessManager = class _AgentProcessManager {
     this.lifecycleRecords.setRestartSnapshot(agentId, {
       config: this.buildRestartSafeConfig(ap.config, nextConfigSessionId),
       sessionId: nextConfigSessionId,
-      launchId: nextLaunchId
+      launchId: nextLaunchId,
+      processInstanceId: ap.processInstanceId
     });
     this.recordStartRebind(agentId, start, reason, previousLaunchId, nextLaunchId, nextSessionId);
     this.sendAgentStatus(agentId, "active", nextLaunchId);
@@ -16054,6 +16207,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
           config: this.buildRestartSafeConfig(runtimeConfig, runtimeConfig.sessionId || null),
           sessionId: runtimeConfig.sessionId || null,
           launchId: effectiveLaunchId
+          // No live AgentProcess in this adoption branch — omit rather than
+          // fabricate; the marker's processInstanceId is nullable by contract.
         });
         this.sendAgentStatus(agentId, "active", effectiveLaunchId);
         this.broadcastActivity(agentId, "online", "Process idle", [], void 0, "idle");
@@ -16112,6 +16267,7 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
         readinessTransition: null,
         activation: { kind: "idle" },
         compaction: { kind: "none" },
+        review: { kind: "none" },
         runtimeProgress: new RuntimeProgressState(Date.now()),
         runtimeTraceSpan: null,
         runtimeTraceCounters: createRuntimeTraceCounters(),
@@ -16142,7 +16298,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
       this.lifecycleRecords.setRestartSnapshot(agentId, {
         config: this.buildRestartSafeConfig(runtimeConfig, restartSessionId),
         sessionId: restartSessionId,
-        launchId: effectiveLaunchId
+        launchId: effectiveLaunchId,
+        processInstanceId: agentProcess.processInstanceId
       });
       if (pendingStartRebind) {
         this.recordStartRebind(agentId, pendingStartRebind, "startup_registered", originalLaunchId, effectiveLaunchId, agentProcess.sessionId);
@@ -16344,7 +16501,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
               this.lifecycleRecords.setRestartSnapshot(agentId, {
                 config: nextConfig,
                 sessionId: ap.sessionId,
-                launchId: ap.launchId
+                launchId: ap.launchId,
+                processInstanceId: ap.processInstanceId
               });
               this.broadcastMessageReceivedActivity(agentId);
               this.lifecycleRecords.deleteRestartSnapshot(agentId);
@@ -16362,7 +16520,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
                   this.lifecycleRecords.setRestartSnapshot(agentId, {
                     config: nextConfig,
                     sessionId: ap.sessionId,
-                    launchId: ap.launchId
+                    launchId: ap.launchId,
+                    processInstanceId: ap.processInstanceId
                   });
                   const report = this.recordSpawnFailure(agentId, "runner_credential_mint");
                   this.assertStartPendingDeliveryInvariants("queued-continuation-runner-credential-mint-failure");
@@ -16382,7 +16541,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
                 this.lifecycleRecords.setRestartSnapshot(agentId, {
                   config: nextConfig,
                   sessionId: ap.sessionId,
-                  launchId: ap.launchId
+                  launchId: ap.launchId,
+                  processInstanceId: ap.processInstanceId
                 });
                 this.broadcastActivity(agentId, "online", "Process idle", [], void 0, "idle");
               });
@@ -16391,7 +16551,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
             this.lifecycleRecords.setRestartSnapshot(agentId, {
               config: this.buildRestartSafeConfig(ap.config, ap.sessionId),
               sessionId: ap.sessionId,
-              launchId: ap.launchId
+              launchId: ap.launchId,
+              processInstanceId: ap.processInstanceId
             });
             if (!ap.driver.supportsStdinNotification) {
               logger.info(`[Agent ${agentId}] Turn completed; cached idle state for future restart`);
@@ -16403,7 +16564,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
               this.lifecycleRecords.setRestartSnapshot(agentId, {
                 config: this.buildRestartSafeConfig(ap.config, ap.sessionId),
                 sessionId: ap.sessionId,
-                launchId: ap.launchId
+                launchId: ap.launchId,
+                processInstanceId: ap.processInstanceId
               });
               logger.warn(`[Agent ${agentId}] Recoverable provider stream failure (${reason}) \u2014 keeping agent wakeable`);
               this.sendAgentStatus(agentId, "active", ap.launchId);
@@ -16619,7 +16781,8 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
     this.lifecycleRecords.setRestartSnapshot(agentId, {
       config: retryConfig,
       sessionId: retrySessionId,
-      launchId: ap.launchId
+      launchId: ap.launchId,
+      processInstanceId: ap.processInstanceId
     });
     this.recordDaemonTrace("daemon.agent.startup_timeout.retry_config_cached", {
       agentId,
@@ -17533,7 +17696,7 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
     }
     return result;
   }
-  buildRuntimeProfileReport(agentId, config, sessionId, launchId, observedRuntimeHomeDir) {
+  buildRuntimeProfileReport(agentId, config, sessionId, launchId, observedRuntimeHomeDir, processInstanceId) {
     const workspacePath = path14.join(this.dataDir, agentId);
     const runtimeHomeDir = observedRuntimeHomeDir || resolveRuntimeHomeDir(config, this.runtimeSessionHomeDir, workspacePath, { agentId, slockHome: this.slockHome });
     return {
@@ -17549,7 +17712,16 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
           path: workspacePath,
           reachable: true
         },
-        sessionRef: sessionId ? resolveRuntimeSessionRef(config.runtime, sessionId, runtimeHomeDir, workspacePath, { agentId, workingDirectory: workspacePath }) : null
+        sessionRef: sessionId ? resolveRuntimeSessionRef(config.runtime, sessionId, runtimeHomeDir, workspacePath, {
+          agentId,
+          workingDirectory: workspacePath,
+          // Join keys come from the CALLER's context (running agent OR idle
+          // restart snapshot) — reading only live state here left the
+          // restart/adopt path writing launchId:null markers, exactly the
+          // V3 class this exists to close (Leiysky review on #3863).
+          launchId: launchId || void 0,
+          processInstanceId: processInstanceId ?? this.agents.get(agentId)?.processInstanceId
+        }) : null
       }
     };
   }
@@ -17561,12 +17733,13 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
         running.config,
         running.sessionId,
         running.launchId,
-        running.runtime.currentRuntimeHomeDir
+        running.runtime.currentRuntimeHomeDir,
+        running.processInstanceId
       );
     }
     const idle = this.lifecycleRecords.getRestartSnapshot(agentId);
     if (idle) {
-      return this.buildRuntimeProfileReport(agentId, idle.config, idle.sessionId, idle.launchId);
+      return this.buildRuntimeProfileReport(agentId, idle.config, idle.sessionId, idle.launchId, null, idle.processInstanceId);
     }
     return null;
   }
@@ -17964,7 +18137,9 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
     }
     const ref = resolveRuntimeSessionRef(runtime, actualSessionId, homeDir, workspaceDir, {
       agentId,
-      workingDirectory: workspaceDir
+      workingDirectory: workspaceDir,
+      launchId: this.agents.get(agentId)?.launchId || void 0,
+      processInstanceId: this.agents.get(agentId)?.processInstanceId
     });
     const tier = runtimeTier(runtime);
     const span = this.tracer.startSpan("daemon.session_transcript.read", {
@@ -18232,9 +18407,10 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
       entries,
       launchId,
       clientSeq,
-      producerFactId
+      producerFactId,
+      isHeartbeat: false
     });
-    this.recordActivityProducedTrace(agentId, activityKind, detail, detailKind, entries, ap, launchId, clientSeq, producerFactId);
+    this.recordActivityProducedTrace(agentId, activityKind, detail, detailKind, entries, ap, launchId, clientSeq, producerFactId, false);
     if (ap) {
       ap.lastActivityKind = activityKind;
       ap.lastActivity = activityDisplay;
@@ -18260,9 +18436,12 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
               detailKind: ap.lastActivityDetailKind,
               launchId: heartbeatLaunchId,
               clientSeq: heartbeatClientSeq,
-              producerFactId: heartbeatProducerFactId
+              producerFactId: heartbeatProducerFactId,
+              // The one knowing site: this timer re-broadcasts stale
+              // lastActivity, so it declares its replay provenance.
+              isHeartbeat: true
             });
-            this.recordActivityProducedTrace(agentId, ap.lastActivityKind, ap.lastActivityDetail, ap.lastActivityDetailKind, [], ap, heartbeatLaunchId, heartbeatClientSeq, heartbeatProducerFactId);
+            this.recordActivityProducedTrace(agentId, ap.lastActivityKind, ap.lastActivityDetail, ap.lastActivityDetailKind, [], ap, heartbeatLaunchId, heartbeatClientSeq, heartbeatProducerFactId, true);
           }, ACTIVITY_HEARTBEAT_MS);
           ap.activityHeartbeat = { kind: "active", timer };
         }
@@ -18271,7 +18450,7 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
       }
     }
   }
-  recordActivityProducedTrace(agentId, activityKind, detail, detailKind, entries, ap, launchId, clientSeq, producerFactId) {
+  recordActivityProducedTrace(agentId, activityKind, detail, detailKind, entries, ap, launchId, clientSeq, producerFactId, isHeartbeat) {
     const runtimeContext = ap?.config.runtimeContext;
     this.recordDaemonTrace("daemon.agent.activity.produced", {
       agentId,
@@ -18293,6 +18472,11 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
       client_seq_present: typeof clientSeq === "number",
       producerFactId,
       producer_fact_id: producerFactId,
+      // #460 V1: the wire's producer-declared replay-provenance bit must be
+      // independently verifiable from daemon-side evidence (L2<->L3 seam);
+      // closed boolean, mirrors the agent:activity isHeartbeat field exactly.
+      isHeartbeat,
+      is_heartbeat: isHeartbeat,
       correlation_id: `agent:${agentId}:daemonActivity:${launchId ?? "legacy"}:${clientSeq ?? "unsequenced"}`,
       session_id_present: Boolean(ap?.sessionId),
       runtime: ap?.config.runtime
@@ -18341,9 +18525,10 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
       launchId,
       probeId,
       clientSeq,
-      producerFactId
+      producerFactId,
+      isHeartbeat: false
     });
-    this.recordActivityProducedTrace(agentId, activityKind, detail, detailKind, [], ap, launchId, clientSeq, producerFactId);
+    this.recordActivityProducedTrace(agentId, activityKind, detail, detailKind, [], ap, launchId, clientSeq, producerFactId, false);
   }
   flushPendingTrajectory(agentId) {
     const ap = this.agents.get(agentId);
@@ -18489,6 +18674,29 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
     ap.compaction = { ...ap.compaction, watchdog: null };
     this.broadcastActivity(agentId, "working", "Context compaction still running; no finish event observed", [], void 0, "compaction_stale");
   }
+  startReviewWatchdog(agentId, ap) {
+    this.clearReviewWatchdog(ap);
+    const startedAt = Date.now();
+    const watchdog = setTimeout(() => {
+      this.markReviewStale(agentId, startedAt);
+    }, REVIEW_STALE_MS);
+    ap.review = { kind: "active", startedAt, watchdog };
+  }
+  clearReviewWatchdog(ap) {
+    if (ap.review.kind === "active" && ap.review.watchdog) {
+      clearTimeout(ap.review.watchdog);
+    }
+    ap.review = { kind: "none" };
+  }
+  markReviewStale(agentId, startedAt) {
+    const ap = this.agents.get(agentId);
+    if (!ap || ap.review.kind !== "active" || ap.review.startedAt !== startedAt) return;
+    ap.review = { ...ap.review, watchdog: null };
+    this.broadcastActivity(agentId, "working", "Review mode still active; no finish event observed", [], void 0, "review_stale");
+    const reduction = reduceApmGatedReview(ap.gatedSteering, { kind: "review_finished" });
+    this.commitGatedSteeringDecisionState(agentId, ap, reduction.nextState, { event: "review_finished", inferred: true });
+    this.flushReviewBoundaryMessages(agentId, ap);
+  }
   completeCompactionIfActive(agentId, detail = "Context compaction finished", options = {}) {
     const ap = this.agents.get(agentId);
     if (!ap || ap.compaction.kind !== "active") return;
@@ -19428,11 +19636,15 @@ Use \`raft message read\` to catch up on the channels listed above, then stop. R
         if (ap) {
           const reduction = reduceApmGatedReview(ap.gatedSteering, { kind: "review_started" });
           this.commitGatedSteeringDecisionState(agentId, ap, reduction.nextState, { event: "review_started" });
+          this.startReviewWatchdog(agentId, ap);
         }
         break;
       case "review_finished":
         this.flushPendingTrajectory(agentId);
-        if (ap) this.recordRuntimeTraceEvent(agentId, ap, "runtime.review_mode.finished");
+        if (ap) {
+          this.clearReviewWatchdog(ap);
+          this.recordRuntimeTraceEvent(agentId, ap, "runtime.review_mode.finished");
+        }
         this.broadcastActivity(agentId, "working", "Review finished", [], void 0, "review_finished");
         if (ap) {
           const reduction = reduceApmGatedReview(ap.gatedSteering, { kind: "review_finished" });
@@ -19953,6 +20165,15 @@ ${RESPONSE_TARGET_HINT}`;
       `${mode} inbox update`
     );
     if (!sendResult.ok) {
+      const retryNotificationCount = mode === "idle" && ap.driver.supportsStdinNotification && ap.sessionId ? messages.length : 0;
+      const retrySource = source.endsWith("_retry") ? source : `${source}_retry`;
+      const retryScheduled = mode === "idle" ? this.scheduleIdleInboxDeliveryRetry(
+        agentId,
+        ap,
+        retryNotificationCount,
+        retrySource,
+        "daemon.agent.stdin_delivery.idle_retry"
+      ) : false;
       if (mode === "idle") {
         this.commitApmIdleState(agentId, ap, true);
       }
@@ -19977,7 +20198,9 @@ ${RESPONSE_TARGET_HINT}`;
         outcome: runtimeSendFailureOutcome(sendResult),
         failure_reason: sendResult.reason,
         failure_error: sendResult.error,
-        requeued_messages_count: 0,
+        requeued_messages_count: retryNotificationCount,
+        retry_scheduled: retryScheduled,
+        notification_timer_present: ap.notifications.hasTimer,
         cursors_advanced: "none"
       }, "error");
       return false;
@@ -20162,6 +20385,14 @@ var systemClock = {
   clearTimeout: (timer) => clearTimeout(timer)
 };
 var INBOUND_WATCHDOG_MS = 7e4;
+function normalizeHandshakeReason(value) {
+  const raw = Array.isArray(value) ? value[0] : value;
+  if (typeof raw !== "string") return null;
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  if (!/^[a-z0-9_:-]{1,80}$/i.test(trimmed)) return "invalid_header";
+  return trimmed;
+}
 function durationMsBucket(ms) {
   if (ms == null || !Number.isFinite(ms) || ms < 0) return "unknown";
   if (ms === 0) return "0";
@@ -20254,6 +20485,7 @@ var DaemonConnection = class {
     });
     const ws = this.options.wsFactory ? this.options.wsFactory(wsUrl, wsOptions) : new WebSocket(wsUrl, wsOptions);
     this.ws = ws;
+    let handshakeRejected = false;
     ws.on("open", () => {
       if (this.ws !== ws) return;
       if (!this.shouldConnect) return;
@@ -20314,8 +20546,27 @@ var DaemonConnection = class {
       this.options.onDisconnect();
       this.scheduleReconnect();
     });
+    ws.on("unexpected-response", (_request, response) => {
+      if (this.ws !== ws) return;
+      handshakeRejected = true;
+      const reason = normalizeHandshakeReason(response.headers["slock-reason"]);
+      const statusCode = response.statusCode ?? 0;
+      const reasonText = reason ? `, slock_reason=${reason}` : "";
+      logger.error(`[Daemon] WebSocket handshake rejected (status=${statusCode}${reasonText})`);
+      this.trace("daemon.connection.handshake_rejected", {
+        status_code: statusCode,
+        slock_reason_present: Boolean(reason),
+        slock_reason: reason
+      }, "error");
+      response.resume();
+      try {
+        ws.terminate();
+      } catch {
+      }
+    });
     ws.on("error", (err) => {
       if (this.ws !== ws) return;
+      if (handshakeRejected) return;
       logger.error(`[Daemon] WebSocket error: ${err.message}`);
       this.trace("daemon.connection.error", {
         error_class: err.name || "Error"
@@ -21324,7 +21575,17 @@ var DAEMON_CORE_TRACE_ATTR_CONTRACTS = {
     spanAttrs: ["running_agents_count", "idle_agents_count"]
   },
   "daemon.agent.activity.produced": {
-    spanAttrs: ["agentId", "agent_id", "server_id", "machine_id", "activity", "detail_present", "entry_kinds", "ap_present", "launchId", "launch_id", "launch_id_present", "clientSeq", "client_seq", "client_seq_present", "correlation_id", "session_id_present", "runtime"]
+    // isHeartbeat/is_heartbeat (#460 V1) and process_instance_id (#460 V3)
+    // were emitted by agentProcessManager but scrubbed here (pilot violation
+    // V4): this list is a RUNTIME allowlist (SpanAttrContractTracer), so an
+    // emission-site key that is not added here silently dies before disk.
+    // Witness for the pair lives in agentProcessManager.builtin.e2e.test.ts
+    // behind a contract-wrapped tracer (production-isomorphic oracle).
+    // producerFactId/producer_fact_id and activity_kind/detail_kind are ALSO
+    // emitted-and-scrubbed today; deliberately NOT added here — banned-join-
+    // key discipline for the fact id (#460 classification ruling) means
+    // widening needs its own ruling, not a drive-by.
+    spanAttrs: ["agentId", "agent_id", "server_id", "machine_id", "activity", "detail_present", "entry_kinds", "ap_present", "launchId", "launch_id", "launch_id_present", "clientSeq", "client_seq", "client_seq_present", "correlation_id", "session_id_present", "runtime", "isHeartbeat", "is_heartbeat", "process_instance_id"]
   },
   "daemon.agent.activity.skipped": {
     spanAttrs: ["agentId", "event_kind", "reason", "text_length"]
@@ -21333,7 +21594,7 @@ var DAEMON_CORE_TRACE_ATTR_CONTRACTS = {
     spanAttrs: ["agentId", "event_kind", "runtime"]
   }
 };
-var DAEMON_CLI_USAGE = "Usage: slock-daemon --server-url <url> --api-key <key>";
+var DAEMON_CLI_USAGE = `Usage: slock-daemon --server-url <url> (--api-key <key> or ${DAEMON_API_KEY_ENV}=<key>)`;
 var RunnerCredentialMintError2 = class extends Error {
   code;
   retryable;
@@ -21369,9 +21630,9 @@ function runnerCredentialErrorDetail2(error) {
 async function waitForRunnerCredentialRetry2() {
   await new Promise((resolve) => setTimeout(resolve, RUNNER_CREDENTIAL_MINT_RETRY_DELAY_MS2));
 }
-function parseDaemonCliArgs(args) {
+function parseDaemonCliArgs(args, env = {}) {
   let serverUrl = "";
-  let apiKey = "";
+  let apiKey = env[DAEMON_API_KEY_ENV] ?? "";
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--server-url" && args[i + 1]) serverUrl = args[++i];
     if (args[i] === "--api-key" && args[i + 1]) apiKey = args[++i];
@@ -21408,7 +21669,7 @@ function resolveSlockCliPathOrEmpty(moduleUrl = import.meta.url) {
 }
 async function runBundledSlockCli(argv) {
   process.argv = [process.execPath, "slock", ...argv];
-  await import("./dist-Y3VRAU5E.js");
+  await import("./dist-RD3WLJSB.js");
 }
 function detectRuntimes(tracer = noopTracer) {
   const ids = [];
@@ -22350,6 +22611,8 @@ var DaemonCore = class {
 
 export {
   subscribeDaemonLogs,
+  DAEMON_API_KEY_ENV,
+  scrubDaemonAuthEnv,
   resolveWorkspaceDirectoryPath,
   scanWorkspaceDirectories,
   deleteWorkspaceDirectory,