@slock-ai/daemon 0.55.3-play.20260531155023 → 0.55.4

package/dist/{chunk-3EAZBKTI.js → chunk-S5AEBH3V.js}

@@ -12,7 +12,7 @@ import path17 from "path";
 import os7 from "os";
 import { createRequire as createRequire2 } from "module";
 import { accessSync } from "fs";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath } from "url";
 
 // ../shared/src/slockRefs.ts
 var SLOCK_REF_CHANNEL_NAME_PATTERN = String.raw`[\p{L}\p{N}_-]+`;
@@ -990,19 +990,24 @@ var RUNTIME_CONFIG_VERSION = 1;
 var RUNTIMES = [
   { id: "claude", displayName: "Claude Code", binary: "claude", supported: true },
   { id: "codex", displayName: "Codex CLI", binary: "codex", supported: true },
-  { id: "pi", displayName: "Pi", binary: "pi", supported: true },
   { id: "antigravity", displayName: "Antigravity CLI", binary: "agy", supported: true },
   { id: "kimi", displayName: "Kimi CLI", binary: "kimi", supported: true },
   { id: "copilot", displayName: "Copilot CLI", binary: "copilot", supported: true },
   { id: "cursor", displayName: "Cursor CLI", binary: "cursor-agent", supported: true },
   { id: "gemini", displayName: "Gemini CLI", binary: "gemini", supported: true },
-  { id: "opencode", displayName: "OpenCode", binary: "opencode", supported: true }
+  { id: "opencode", displayName: "OpenCode", binary: "opencode", supported: true },
+  { id: "pi", displayName: "Pi CLI", binary: "pi", supported: true }
 ];
 var RUNTIME_MODELS = {
   claude: [
-    { id: "opus", label: "Opus" },
-    { id: "sonnet", label: "Sonnet" },
-    { id: "haiku", label: "Haiku" }
+    { id: "opus", label: "Claude Opus" },
+    { id: "claude-opus-4-8", label: "Claude Opus 4.8" },
+    { id: "claude-opus-4-7", label: "Claude Opus 4.7" },
+    { id: "claude-opus-4-6", label: "Claude Opus 4.6" },
+    { id: "sonnet", label: "Claude Sonnet" },
+    { id: "claude-sonnet-4-6", label: "Claude Sonnet 4.6" },
+    { id: "haiku", label: "Claude Haiku" },
+    { id: "claude-haiku-4-5", label: "Claude Haiku 4.5" }
   ],
   codex: [
     { id: "gpt-5.5", label: "GPT-5.5" },
@@ -1044,11 +1049,9 @@ var RUNTIME_MODELS = {
     { id: "fusecode/opus[1m]", label: "Opus 1M via FuseCode", verified: "suggestion_only" }
   ],
   pi: [
-    { id: "deepseek/deepseek-v4-pro", label: "DeepSeek V4 Pro" },
-    { id: "deepseek/deepseek-v4-flash", label: "DeepSeek V4 Flash" },
-    { id: "kimi-coding/kimi-for-coding", label: "Kimi for Coding" },
-    { id: "zai/glm-5.1", label: "GLM-5.1" },
-    { id: "zai/glm-4.7", label: "GLM-4.7" }
+    { id: "default", label: "Configured Default / Auto", verified: "suggestion_only" },
+    { id: "deepseek/deepseek-v4-pro", label: "DeepSeek V4 Pro (Pi)", verified: "suggestion_only" },
+    { id: "deepseek/deepseek-v4-flash", label: "DeepSeek V4 Flash (Pi)", verified: "suggestion_only" }
   ],
   // Kimi CLI resolves model keys from each user's local config, so the safest
   // built-in option is to defer to whatever default model the CLI already uses.
@@ -1094,22 +1097,28 @@ function isPresetRuntimeModel(runtime, model) {
 function modelConfigFromLegacy(runtime, model) {
   return isPresetRuntimeModel(runtime, model) ? { kind: "preset", id: model } : { kind: "custom", name: model };
 }
-function parseProviderConfig(runtime, value) {
+function parseProviderConfig(runtime, value, legacyApiUrl, legacyApiKey) {
   if (runtime !== "claude") return void 0;
   if (!isPlainRecord(value)) return { kind: "default" };
   if (value.kind === "custom" && typeof value.apiUrl === "string" && value.apiUrl.trim() && typeof value.apiKey === "string" && value.apiKey.trim()) {
     return { kind: "custom", apiUrl: value.apiUrl.trim(), apiKey: value.apiKey.trim() };
   }
+  if (value.kind === "custom" && legacyApiUrl?.trim() && legacyApiKey?.trim()) {
+    return { kind: "custom", apiUrl: legacyApiUrl.trim(), apiKey: legacyApiKey.trim() };
+  }
   return { kind: "default" };
 }
-function parseModelConfig(runtime, value, fallback) {
+function parseModelConfig(runtime, value, fallback, provider, legacyCustomModel) {
   if (!isPlainRecord(value)) return modelConfigFromLegacy(runtime, fallback);
   if (value.kind === "custom" && typeof value.name === "string" && value.name.trim()) {
     return { kind: "custom", name: value.name.trim() };
   }
-  if (value.kind === "preset" && typeof value.id === "string" && value.id.trim()) {
+  if (value.kind === "preset" && typeof value.id === "string" && value.id.trim() && isPresetRuntimeModel(runtime, value.id.trim())) {
     return { kind: "preset", id: value.id.trim() };
   }
+  if (provider?.kind === "custom" && runtime === "claude" && legacyCustomModel?.trim()) {
+    return { kind: "custom", name: legacyCustomModel.trim() };
+  }
   return modelConfigFromLegacy(runtime, fallback);
 }
 function parseModeConfig(value) {
@@ -1125,12 +1134,13 @@ function hydrateRuntimeConfig(input) {
   const storedEnvVars = normalizeEnvVars(stored?.envVars);
   const legacyClaudeApiUrl = runtime === "claude" ? legacyEnvVars?.ANTHROPIC_BASE_URL : void 0;
   const legacyClaudeApiKey = runtime === "claude" ? legacyEnvVars?.ANTHROPIC_API_KEY : void 0;
-  const provider = stored ? parseProviderConfig(runtime, stored.provider) : runtime === "claude" && legacyClaudeApiUrl && legacyClaudeApiKey ? { kind: "custom", apiUrl: legacyClaudeApiUrl, apiKey: legacyClaudeApiKey } : runtime === "claude" ? { kind: "default" } : void 0;
+  const legacyClaudeCustomModel = runtime === "claude" ? legacyEnvVars?.ANTHROPIC_CUSTOM_MODEL_OPTION : void 0;
+  const provider = stored ? parseProviderConfig(runtime, stored.provider, legacyClaudeApiUrl, legacyClaudeApiKey) : runtime === "claude" && legacyClaudeApiUrl && legacyClaudeApiKey ? { kind: "custom", apiUrl: legacyClaudeApiUrl, apiKey: legacyClaudeApiKey } : runtime === "claude" ? { kind: "default" } : void 0;
   return {
     version: RUNTIME_CONFIG_VERSION,
     runtime,
     ...provider ? { provider } : {},
-    model: stored ? parseModelConfig(runtime, stored.model, fallbackModel) : modelConfigFromLegacy(runtime, fallbackModel),
+    model: stored ? parseModelConfig(runtime, stored.model, fallbackModel, provider, legacyClaudeCustomModel) : modelConfigFromLegacy(runtime, fallbackModel),
     mode: stored ? parseModeConfig(stored.mode) : { kind: "default" },
     reasoningEffort: stored?.reasoningEffort ?? input.reasoningEffort ?? null,
     envVars: stripControlledRuntimeEnvVars(runtime, stored ? storedEnvVars : legacyEnvVars)
@@ -1198,7 +1208,7 @@ var DISPLAY_PLAN_CONFIG = {
 };
 
 // src/agentProcessManager.ts
-import { mkdirSync as mkdirSync5, readdirSync, statSync, writeFileSync as writeFileSync8 } from "fs";
+import { mkdirSync as mkdirSync5, readdirSync, statSync, writeFileSync as writeFileSync7 } from "fs";
 import { mkdir, writeFile, access, readdir as readdir2, stat as stat2, readFile, rm as rm2 } from "fs/promises";
 import { createHash as createHash3 } from "crypto";
 import path13 from "path";
@@ -1382,19 +1392,19 @@ If Slock says a message was not sent and was saved as a draft, choose one path:
 
 Threads are sub-conversations attached to a specific message. They let you discuss a topic without cluttering the main channel.
 
-- **Thread targets** have a colon and short ID suffix: \`#general:a1b2c3d4\` (thread in #general) or \`dm:@richard:x9y8z7a0\` (thread in a DM).
+- **Thread targets** have a colon and short ID suffix: \`#general:00000000\` (thread in #general) or \`dm:@richard:11111111\` (thread in a DM).
 - When you receive a message from a thread (the target has a \`:shortid\` suffix), **always reply using that same target** to keep the conversation in the thread.
-- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=a1b2c3d4 ...]\`, reply with \`slock message send --target "#general:a1b2c3d4" <<'${messageHeredocDelimiter}'\` followed by the message body and \`${messageHeredocDelimiter}\`. The thread will be auto-created if it doesn't exist yet.
+- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=00000000 ...]\`, reply with \`slock message send --target "#general:00000000" <<'${messageHeredocDelimiter}'\` followed by the message body and \`${messageHeredocDelimiter}\`. The thread will be auto-created if it doesn't exist yet. Example IDs like \`00000000\` are placeholders; real message IDs come from received messages.
 - When you send a message, the response includes the message ID. You can use it to start a thread on your own message.
-- You can read thread history: \`slock message read --channel "#general:a1b2c3d4"\`
-- You can stop receiving ordinary delivery for a thread with \`slock thread unfollow --target "#general:a1b2c3d4"\`. Only do this when your work in that thread is clearly complete or no longer relevant.
+- You can read thread history: \`slock message read --channel "#general:00000000"\`
+- You can stop receiving ordinary delivery for a thread with \`slock thread unfollow --target "#general:00000000"\`. Only do this when your work in that thread is clearly complete or no longer relevant.
 - Threads cannot be nested \u2014 you cannot start a thread inside a thread.` : `### Threads
 
 Threads are sub-conversations attached to a specific message. They let you discuss a topic without cluttering the main channel.
 
-- **Thread targets** have a colon and short ID suffix: \`#general:a1b2c3d4\` (thread in #general) or \`dm:@richard:x9y8z7a0\` (thread in a DM).
+- **Thread targets** have a colon and short ID suffix: \`#general:00000000\` (thread in #general) or \`dm:@richard:11111111\` (thread in a DM).
 - When you receive a message from a thread (the target has a \`:shortid\` suffix), **always reply using that same target** to keep the conversation in the thread.
-- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=a1b2c3d4 ...]\`, call \`${t("send_message")}(target="#general:a1b2c3d4", content="...")\`. The thread will be auto-created if it doesn't exist yet.
+- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=00000000 ...]\`, call \`${t("send_message")}(target="#general:00000000", content="...")\`. The thread will be auto-created if it doesn't exist yet. Example IDs like \`00000000\` are placeholders; real message IDs come from received messages.
 - When you send a message, the response includes the message ID. You can use it to start a thread on your own message.
 - You can read thread history via ${readCmd} with the same thread target.
 - Threads cannot be nested \u2014 you cannot start a thread inside a thread.`;
@@ -1560,13 +1570,18 @@ ${opts.postStartupNotes.join("\n")}`;
 Messages you receive have a single RFC 5424-style structured data header followed by the sender and content:
 
 \`\`\`
-[target=#general msg=a1b2c3d4 time=2026-03-15T01:00:00 type=human] @richard: hello everyone
-[target=#general msg=e5f6a7b8 time=2026-03-15T01:00:01 type=agent] @Alice: hi there
-[target=dm:@richard msg=c9d0e1f2 time=2026-03-15T01:00:02 type=human] @richard: hey, can you help?
-[target=#general:a1b2c3d4 msg=f3a4b5c6 time=2026-03-15T01:00:03 type=human] @richard: thread reply
-[target=dm:@richard:x9y8z7a0 msg=d7e8f9a0 time=2026-03-15T01:00:04 type=human] @richard: DM thread reply
+[target=#general msg=00000000 time=2026-03-15T01:00:00 type=human] @richard: hello everyone
+[target=#general msg=11111111 time=2026-03-15T01:00:01 type=agent] @Alice: hi there
+[target=dm:@richard msg=22222222 time=2026-03-15T01:00:02 type=human] @richard: hey, can you help?
+[target=#general:00000000 msg=33333333 time=2026-03-15T01:00:03 type=human] @richard: thread reply
+[target=dm:@richard:22222222 msg=44444444 time=2026-03-15T01:00:04 type=human] @richard: DM thread reply
 \`\`\`
 
+Prompt examples use obvious placeholder IDs such as \`00000000\`, \`11111111\`,
+and \`22222222\`. They show the shape of a real message ID but are not actual
+messages. Do not cite them as evidence; use only IDs from messages you actually
+received or read.
+
 Header fields:
 - \`target=\` \u2014 where the message came from. Reuse as the \`target\` parameter when replying.
 - \`msg=\` \u2014 message short ID (first 8 chars of UUID). Use as thread suffix to start/reply in a thread.
@@ -1638,9 +1653,11 @@ Slock auto-renders these inline tokens as interactive links whenever they appear
 
 Write them inline as plain words in your sentence \u2014 the same way you'd type any other word \u2014 and Slock turns them into clickable references.
 
+Markdown markup expresses presentation semantics; do not mix markup delimiters into literal payloads. Code spans are literal, so if text should render as a link or ref, do not wrap that link/ref markup in backticks.
+
 ### Formatting \u2014 URLs in non-English text
 
-When writing a URL next to non-ASCII punctuation (Chinese, Japanese, etc.), always wrap the URL in angle brackets or use markdown link syntax. Otherwise the punctuation may be rendered as part of the URL.
+When writing a URL next to non-ASCII punctuation (Chinese, Japanese, etc.) and the URL should render as a link, wrap the URL in angle brackets or use markdown link syntax. Otherwise the punctuation may be rendered as part of the URL.
 
 - **Wrong**: \`\u6D4B\u8BD5\u73AF\u5883\uFF1Ahttp://localhost:3000\uFF0C\u8BF7\u67E5\u770B\` (the \`\uFF0C\` gets swallowed into the link)
 - **Correct**: \`\u6D4B\u8BD5\u73AF\u5883\uFF1A<http://localhost:3000>\uFF0C\u8BF7\u67E5\u770B\`
@@ -1720,12 +1737,12 @@ How to handle these:
 - Call ${checkCmd} at the next safe breakpoint to materialize the pending messages before taking side-effect actions that depend on current context.
 - If the new message is higher priority, pivot after reading it. If not, continue your current work.`;
     } else {
-      const notifyExample = isCli ? `\`[System notification: You have N new message(s) waiting. Call slock message check to read them when you're ready.]\`` : `\`[System notification: You have N new message(s) waiting. Call ${t("check_messages")} to read them when you're ready.]\``;
+      const notifyExample = isCli ? `\`[Slock inbox notice: You have N pending inbox message(s). Call slock message check to read them when you're ready.]\`` : `\`[Slock inbox notice: You have N pending inbox message(s). Call ${t("check_messages")} to read them when you're ready.]\``;
       prompt += `
 
 ## Message Notifications
 
-While you are busy (executing tools, thinking, etc.), new messages may arrive. When this happens, you will receive a system notification like:
+While you are busy (executing tools, thinking, etc.), new messages may arrive. When this happens, the daemon may write a Slock inbox notice like:
 
 ${notifyExample}
 
@@ -1786,19 +1803,6 @@ 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";
@@ -2851,9 +2855,7 @@ 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_TOKEN",
-  "SLOCK_AGENT_CREDENTIAL_KEY",
-  "SLOCK_AGENT_CREDENTIAL_KEY_FILE"
+  "SLOCK_AGENT_CREDENTIAL_KEY"
 ];
 var cachedOpencliBinPath;
 function resolveOpencliBinPath() {
@@ -3068,7 +3070,7 @@ exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(opencliBinPath)} "
     ...agentCredentialProxy ? {} : { SLOCK_AGENT_TOKEN_FILE: tokenFile },
     PATH: `${slockDir}${path2.delimiter}${process.env.PATH ?? ""}`
   };
-  scrubDaemonChildEnv(spawnEnv);
+  delete spawnEnv.SLOCK_AGENT_TOKEN;
   for (const key of RAW_CREDENTIAL_ENV_DENYLIST) {
     delete spawnEnv[key];
   }
@@ -3104,6 +3106,125 @@ function collectResultErrorDetail(message, fallback) {
 function isProviderApiFailureText(value, hasToolUse) {
   return !hasToolUse && /^\s*API Error:/i.test(value) && (/\b(?:ECONNRESET|EPIPE|ETIMEDOUT|ECONNREFUSED|ENOTFOUND|EAI_AGAIN)\b/i.test(value) || /\bUnable to connect to API\b/i.test(value) || /\b(?:timed out|timeout)\b/i.test(value) || /\b4\d{2}\b/.test(value) || /\b5\d{2}\b/.test(value));
 }
+function finiteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function finiteString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function withDefined(attrs) {
+  return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value !== void 0));
+}
+function collectNumericFields(value, fields) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  const attrs = {};
+  for (const [sourceKey, attrKey] of Object.entries(fields)) {
+    const numberValue = finiteNumber(value[sourceKey]);
+    if (numberValue !== void 0) attrs[attrKey] = numberValue;
+  }
+  return attrs;
+}
+function collectModelUsageAttrs(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  const sanitized = {};
+  const aggregate = {};
+  const knownNumericFields = [
+    "inputTokens",
+    "outputTokens",
+    "cacheReadInputTokens",
+    "cacheCreationInputTokens",
+    "webSearchRequests",
+    "costUSD",
+    "contextWindow",
+    "maxOutputTokens"
+  ];
+  for (const [modelName, rawUsage] of Object.entries(value)) {
+    if (!rawUsage || typeof rawUsage !== "object" || Array.isArray(rawUsage)) continue;
+    const modelUsage = {};
+    for (const field of knownNumericFields) {
+      const numberValue = finiteNumber(rawUsage[field]);
+      if (numberValue === void 0) continue;
+      modelUsage[field] = numberValue;
+      const aggregateKey = field === "costUSD" ? "costUsd" : field;
+      if (field === "contextWindow" || field === "maxOutputTokens") {
+        aggregate[aggregateKey] = Math.max(aggregate[aggregateKey] ?? 0, numberValue);
+      } else {
+        aggregate[aggregateKey] = (aggregate[aggregateKey] ?? 0) + numberValue;
+      }
+    }
+    if (Object.keys(modelUsage).length > 0) sanitized[modelName] = modelUsage;
+  }
+  const modelNames = Object.keys(sanitized).sort();
+  if (modelNames.length === 0) return {};
+  const orderedSanitized = Object.fromEntries(modelNames.map((modelName) => [modelName, sanitized[modelName]]));
+  return withDefined({
+    modelUsageModelCount: modelNames.length,
+    modelUsageModels: modelNames.join(","),
+    modelUsageJson: JSON.stringify(orderedSanitized),
+    modelUsageInputTokens: aggregate.inputTokens,
+    modelUsageOutputTokens: aggregate.outputTokens,
+    modelUsageCachedInputTokens: aggregate.cacheReadInputTokens,
+    modelUsageCacheCreationInputTokens: aggregate.cacheCreationInputTokens,
+    modelUsageWebSearchRequests: aggregate.webSearchRequests,
+    modelUsageCostUsd: aggregate.costUsd,
+    modelUsageMaxContextWindow: aggregate.contextWindow,
+    modelUsageMaxOutputTokens: aggregate.maxOutputTokens
+  });
+}
+function parseClaudeResultUsageTelemetry(event) {
+  const usage = event.usage && typeof event.usage === "object" ? event.usage : void 0;
+  const totalCostUsd = finiteNumber(event.total_cost_usd);
+  const modelUsageAttrs = collectModelUsageAttrs(event.modelUsage);
+  const hasTelemetrySource = usage !== void 0 || totalCostUsd !== void 0 || Object.keys(modelUsageAttrs).length > 0;
+  if (!hasTelemetrySource) return null;
+  const inputTokens = finiteNumber(usage?.input_tokens);
+  const outputTokens = finiteNumber(usage?.output_tokens);
+  const cachedInputTokens = finiteNumber(usage?.cache_read_input_tokens);
+  const cacheCreationInputTokens = finiteNumber(usage?.cache_creation_input_tokens);
+  const attrs = {
+    ...withDefined({
+      totalCostUsd,
+      durationMs: finiteNumber(event.duration_ms),
+      durationApiMs: finiteNumber(event.duration_api_ms),
+      numTurns: finiteNumber(event.num_turns),
+      resultSubtype: finiteString(event.subtype),
+      stopReason: finiteString(event.stop_reason),
+      resultIsError: typeof event.is_error === "boolean" ? event.is_error : void 0,
+      fastModeState: finiteString(event.fast_mode_state),
+      permissionDenialsCount: Array.isArray(event.permission_denials) ? event.permission_denials.length : void 0,
+      serviceTier: finiteString(usage?.service_tier),
+      inferenceGeo: finiteString(usage?.inference_geo),
+      usageSpeed: finiteString(usage?.speed),
+      usageIterationsCount: Array.isArray(usage?.iterations) ? usage.iterations.length : void 0
+    }),
+    ...collectNumericFields(usage?.server_tool_use, {
+      web_search_requests: "serverToolUseWebSearchRequests",
+      web_fetch_requests: "serverToolUseWebFetchRequests"
+    }),
+    ...collectNumericFields(usage?.cache_creation, {
+      ephemeral_1h_input_tokens: "cacheCreationEphemeral1hInputTokens",
+      ephemeral_5m_input_tokens: "cacheCreationEphemeral5mInputTokens"
+    }),
+    ...modelUsageAttrs
+  };
+  if (inputTokens !== void 0) attrs.inputTokens = inputTokens;
+  if (outputTokens !== void 0) attrs.outputTokens = outputTokens;
+  if (cachedInputTokens !== void 0) attrs.cachedInputTokens = cachedInputTokens;
+  if (cacheCreationInputTokens !== void 0) attrs.cacheCreationInputTokens = cacheCreationInputTokens;
+  const tokenComponents = [inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens];
+  const totalTokens = tokenComponents.reduce((sum, value) => sum + (value ?? 0), 0);
+  if (tokenComponents.some((value) => value !== void 0)) attrs.totalTokens = totalTokens;
+  if (Object.keys(attrs).length === 0) return null;
+  return {
+    kind: "telemetry",
+    name: "token_usage",
+    source: "claude_result_usage",
+    usageKind: "per_turn",
+    ...typeof event.session_id === "string" && event.session_id ? { sessionId: event.session_id } : {},
+    ...typeof event.uuid === "string" && event.uuid ? { runtimeResultId: event.uuid } : {},
+    attrs
+  };
+}
 var ClaudeEventNormalizer = class {
   normalizeLine(line) {
     let event;
@@ -3178,6 +3299,7 @@ var ClaudeEventNormalizer = class {
       case "result": {
         const subtype = typeof event.subtype === "string" ? event.subtype : "success";
         const stopReason = typeof event.stop_reason === "string" ? event.stop_reason : null;
+        const usageTelemetry = parseClaudeResultUsageTelemetry(event);
         switch (subtype) {
           case "success":
             if (event.is_error && stopReason !== "max_tokens") {
@@ -3199,6 +3321,7 @@ var ClaudeEventNormalizer = class {
             pushResultError(event, "Structured output retries exceeded");
             break;
         }
+        if (usageTelemetry) events.push(usageTelemetry);
         events.push({ kind: "turn_end", sessionId: event.session_id });
         break;
       }
@@ -3367,7 +3490,7 @@ function resolveCommandOnWindows(command, env, execFileSyncFn, existsSyncFn) {
 }
 function resolveCommandOnPath(command, deps = {}) {
   const platform = deps.platform ?? process.platform;
-  const env = scrubDaemonChildEnv({ ...withWindowsUserEnvironment(deps.env ?? process.env, deps) });
+  const env = withWindowsUserEnvironment(deps.env ?? process.env, deps);
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync;
   const existsSyncFn = deps.existsSyncFn ?? existsSync2;
   if (platform === "win32") {
@@ -3393,7 +3516,7 @@ function firstExistingPath(candidates, deps = {}) {
   return null;
 }
 function readCommandVersion(command, args = [], deps = {}) {
-  const env = scrubDaemonChildEnv({ ...withWindowsUserEnvironment(deps.env ?? process.env, deps) });
+  const env = withWindowsUserEnvironment(deps.env ?? process.env, deps);
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync;
   try {
     const output = normalizeExecOutput(execFileSyncFn(command, [...args, "--version"], {
@@ -3622,53 +3745,64 @@ var RuntimeTurnState = class {
 };
 
 // src/drivers/codexTelemetrySidecar.ts
-function finiteNumber(value) {
+function finiteNumber2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
-function finiteString(value) {
+function finiteString2(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 function ratio(numerator, denominator) {
   if (numerator === void 0 || denominator === void 0 || denominator <= 0) return void 0;
   return Number((numerator / denominator).toFixed(6));
 }
-function withDefined(attrs) {
+function withDefined2(attrs) {
   return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value !== void 0));
 }
 function parseTokenUsageTelemetry(message) {
   const usage = message.params?.tokenUsage;
   const total = usage?.total;
   if (!total || typeof total !== "object") return null;
-  const inputTokens = finiteNumber(total.inputTokens);
-  const cachedInputTokens = finiteNumber(total.cachedInputTokens);
-  const totalTokens = finiteNumber(total.totalTokens);
-  const modelContextWindow = finiteNumber(usage.modelContextWindow);
-  const attrs = withDefined({
+  const inputTokens = finiteNumber2(total.inputTokens);
+  const cachedInputTokens = finiteNumber2(total.cachedInputTokens);
+  const totalTokens = finiteNumber2(total.totalTokens);
+  const modelContextWindow = finiteNumber2(usage.modelContextWindow);
+  const attrs = withDefined2({
     totalTokens,
     inputTokens,
     cachedInputTokens,
-    outputTokens: finiteNumber(total.outputTokens),
-    reasoningOutputTokens: finiteNumber(total.reasoningOutputTokens),
+    outputTokens: finiteNumber2(total.outputTokens),
+    reasoningOutputTokens: finiteNumber2(total.reasoningOutputTokens),
     modelContextWindow,
     cachedInputRatio: ratio(cachedInputTokens, inputTokens),
     contextUtilization: ratio(totalTokens, modelContextWindow)
   });
   if (Object.keys(attrs).length === 0) return null;
-  return { kind: "telemetry", name: "token_usage", attrs };
+  return {
+    kind: "telemetry",
+    name: "token_usage",
+    source: "codex_thread_token_usage_updated",
+    usageKind: "cumulative_session",
+    attrs
+  };
 }
 function parseRateLimitTelemetry(message) {
   const rateLimits = message.params?.rateLimits;
   const primary = rateLimits?.primary;
   if (!rateLimits || typeof rateLimits !== "object" || !primary || typeof primary !== "object") return null;
-  const attrs = withDefined({
-    limitId: finiteString(rateLimits.limitId),
-    planType: finiteString(rateLimits.planType),
-    usedPercent: finiteNumber(primary.usedPercent),
-    windowDurationMins: finiteNumber(primary.windowDurationMins),
-    resetsAt: finiteNumber(primary.resetsAt)
+  const attrs = withDefined2({
+    limitId: finiteString2(rateLimits.limitId),
+    planType: finiteString2(rateLimits.planType),
+    usedPercent: finiteNumber2(primary.usedPercent),
+    windowDurationMins: finiteNumber2(primary.windowDurationMins),
+    resetsAt: finiteNumber2(primary.resetsAt)
   });
   if (Object.keys(attrs).length === 0) return null;
-  return { kind: "telemetry", name: "rate_limits", attrs };
+  return {
+    kind: "telemetry",
+    name: "rate_limits",
+    source: "codex_account_rate_limits_updated",
+    attrs
+  };
 }
 function parseCodexTelemetryEvent(message) {
   switch (message.method) {
@@ -3775,7 +3909,11 @@ var CodexEventNormalizer = class {
     }
     const telemetry = parseCodexTelemetryEvent(message);
     if (telemetry) {
-      events.push(telemetry);
+      events.push({
+        ...telemetry,
+        ...this.currentThreadId ? { sessionId: this.currentThreadId } : {},
+        ...this.turnState.activeTurnId ? { turnId: this.turnState.activeTurnId } : {}
+      });
       return { events };
     }
     const rawProgress = rawResponseItemProgressEvent(message);
@@ -4825,11 +4963,11 @@ function detectCursorModels(runCommand = runCursorModelsCommand) {
   return parseCursorModelsOutput(String(result.stdout || ""));
 }
 function buildCursorModelProbeEnv(deps = {}) {
-  return scrubDaemonChildEnv(withWindowsUserEnvironment({
+  return withWindowsUserEnvironment({
     ...deps.env ?? process.env,
     FORCE_COLOR: "0",
     NO_COLOR: "1"
-  }, deps));
+  }, deps);
 }
 function runCursorModelsCommand() {
   return spawnSync("cursor-agent", ["models"], {
@@ -4885,7 +5023,7 @@ function resolveGeminiSpawn(commandArgs, deps = {}) {
   }
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync3;
   const existsSyncFn = deps.existsSyncFn ?? existsSync5;
-  const env = scrubDaemonChildEnv({ ...deps.env ?? process.env });
+  const env = deps.env ?? process.env;
   const winPath = path8.win32;
   let geminiEntry = null;
   try {
@@ -5057,16 +5195,13 @@ var GeminiDriver = class {
 // src/drivers/kimi.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { spawn as spawn7 } from "child_process";
-import { chmodSync, existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync6 } from "fs";
 import os3 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_MCP_FILE = ".slock-kimi-mcp.json";
-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 {
@@ -5075,73 +5210,6 @@ function parseToolArguments(raw) {
     return raw;
   }
 }
-function readKimiConfigSource(home = os3.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 ?? os3.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) {
-      writeFileSync6(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",
@@ -5165,25 +5233,7 @@ var KimiDriver = class {
   };
   model = {
     detectedModelsVerifiedAs: "launchable",
-    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
-      };
-    }
+    toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
   supportsStdinNotification = true;
   mcpToolPrefix = "";
@@ -5237,7 +5287,6 @@ var KimiDriver = class {
         }
       }
     }), "utf8");
-    const launch = buildKimiLaunchOptions(ctx);
     const args = [
       "--wire",
       "--yolo",
@@ -5246,16 +5295,15 @@ var KimiDriver = class {
       "--mcp-config-file",
       mcpConfigPath,
       "--session",
-      this.sessionId,
-      ...launch.args
+      this.sessionId
     ];
     const launchRuntimeFields = runtimeConfigToLaunchFields(ctx.config);
     if (launchRuntimeFields.model && launchRuntimeFields.model !== "default") {
       args.push("--model", launchRuntimeFields.model);
     }
     const spawnEnv = (await prepareCliTransport(ctx, { NO_COLOR: "1" })).spawnEnv;
-    const spawnTarget = resolveKimiSpawn(args);
-    const proc = spawn7(spawnTarget.command, spawnTarget.args, {
+    const launch = resolveKimiSpawn(args);
+    const proc = spawn7(launch.command, launch.args, {
       cwd: ctx.workingDirectory,
       stdio: ["pipe", "pipe", "pipe"],
       env: spawnEnv,
@@ -5263,7 +5311,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: spawnTarget.shell
+      shell: launch.shell
     });
     proc.stdin?.write(JSON.stringify({
       jsonrpc: "2.0",
@@ -5377,9 +5425,14 @@ var KimiDriver = class {
     return detectKimiModels();
   }
 };
-function detectKimiModels(home = os3.homedir(), opts = {}) {
-  const raw = readKimiConfigSource(home, opts.env).raw;
-  if (raw === null) return null;
+function detectKimiModels(home = os3.homedir()) {
+  const configPath = path9.join(home, ".kimi", "config.toml");
+  let raw;
+  try {
+    raw = readFileSync3(configPath, "utf8");
+  } catch {
+    return null;
+  }
   const models = [];
   const sectionRe = /^\s*\[models(?:\.([^\]]+)|"\.[^"]+"|\."[^"]+")\s*\]\s*$/gm;
   const lineRe = /^\s*\[models\.(.+?)\s*\]\s*$/gm;
@@ -5643,7 +5696,7 @@ function runOpenCodeModelsCommand(home, deps = {}) {
   const platform = deps.platform ?? process.platform;
   const spawnSyncFn = deps.spawnSyncFn ?? spawnSync2;
   const result = spawnSyncFn("opencode", ["models"], {
-    env: scrubDaemonChildEnv({ ...process.env, HOME: home, FORCE_COLOR: "0", NO_COLOR: "1" }),
+    env: { ...process.env, HOME: home, FORCE_COLOR: "0", NO_COLOR: "1" },
     encoding: "utf8",
     timeout: 5e3,
     shell: platform === "win32"
@@ -5903,139 +5956,123 @@ var OpenCodeDriver = class {
 };
 
 // src/drivers/pi.ts
-import { spawn as spawn9 } from "child_process";
-import { existsSync as existsSync8, mkdirSync as mkdirSync4, writeFileSync as writeFileSync7 } from "fs";
+import { randomUUID as randomUUID3 } from "crypto";
+import { spawn as spawn9, spawnSync as spawnSync3 } from "child_process";
+import { mkdirSync as mkdirSync4 } from "fs";
 import path11 from "path";
-import { fileURLToPath } from "url";
-import { getAgentDir, VERSION as PI_SDK_VERSION } from "@earendil-works/pi-coding-agent";
-var CHAT_MCP_TOOL_PREFIX2 = "chat_";
-var NO_MESSAGE_PROMPT2 = "No new messages are pending. Stop now.";
-var FIRST_MESSAGE_TASK_PREFIX2 = "First message task (system-triggered):";
-var MIN_SUPPORTED_PI_VERSION = "0.74.0";
-function parseSemver2(version) {
-  const match = version.match(/(\d+)\.(\d+)\.(\d+)/);
-  if (!match) return null;
-  return [Number(match[1]), Number(match[2]), Number(match[3])];
+var PI_SESSION_DIR = ".pi-sessions";
+var PI_PROVIDER_LABELS = {
+  deepseek: "DeepSeek",
+  google: "Google",
+  openai: "OpenAI",
+  openrouter: "OpenRouter"
+};
+function buildPiSessionDir(workingDirectory) {
+  return path11.join(workingDirectory, PI_SESSION_DIR);
 }
-function isSupportedPiVersion(version) {
-  if (!version) return true;
-  const actual = parseSemver2(version);
-  const minimum = parseSemver2(MIN_SUPPORTED_PI_VERSION);
-  if (!actual || !minimum) return true;
-  for (let i = 0; i < 3; i += 1) {
-    if (actual[i] > minimum[i]) return true;
-    if (actual[i] < minimum[i]) return false;
+function buildPiRpcArgs(ctx, sessionId) {
+  const launchRuntimeFields = runtimeConfigToLaunchFields(ctx.config);
+  const args = [
+    "--mode",
+    "rpc",
+    "--session-dir",
+    buildPiSessionDir(ctx.workingDirectory),
+    "--system-prompt",
+    ctx.standingPrompt
+  ];
+  if (launchRuntimeFields.model && launchRuntimeFields.model !== "default") {
+    args.push("--model", launchRuntimeFields.model);
   }
-  return true;
-}
-function unsupportedPiVersionMessage(version) {
-  if (!version || isSupportedPiVersion(version)) return null;
-  return `Pi SDK ${version} is unsupported; requires @earendil-works/pi-coding-agent >= ${MIN_SUPPORTED_PI_VERSION}. Upgrade the daemon Pi dependency before starting this runtime.`;
-}
-function probePi(version = PI_SDK_VERSION) {
-  const unsupportedMessage = unsupportedPiVersionMessage(version);
-  if (unsupportedMessage) {
-    return {
-      available: false,
-      version: `${version} (requires @earendil-works/pi-coding-agent >= ${MIN_SUPPORTED_PI_VERSION})`
-    };
+  if (launchRuntimeFields.reasoningEffort) {
+    args.push("--thinking", launchRuntimeFields.reasoningEffort);
+  }
+  if (sessionId) {
+    args.push("--session-id", sessionId);
   }
-  return { available: true, version };
+  return args;
 }
-function resolvePiSdkRunnerPath(moduleUrl = import.meta.url) {
-  const moduleDir = path11.dirname(fileURLToPath(moduleUrl));
-  const sourceSibling = path11.join(moduleDir, "piSdkRunner.ts");
-  if (existsSync8(sourceSibling)) return sourceSibling;
-  const bundledEntry = path11.join(moduleDir, "drivers", "piSdkRunner.js");
-  if (existsSync8(bundledEntry)) return bundledEntry;
-  return path11.join(moduleDir, "piSdkRunner.js");
+async function buildPiSpawnEnv(ctx) {
+  return (await prepareCliTransport(ctx, { NO_COLOR: "1" })).spawnEnv;
 }
-function buildPiSdkNodeArgs(runnerPath = resolvePiSdkRunnerPath()) {
-  if (runnerPath.endsWith(".ts")) {
-    return [...process.execArgv, runnerPath];
+function parsePiModelsOutput(output) {
+  const stripAnsi = (value) => value.replace(/\u001b\[[0-9;]*m/g, "");
+  const models = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const rawLine of stripAnsi(output).split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || /^provider\s+model\s+/i.test(line) || /^[-\s]+$/.test(line)) continue;
+    const columns = line.split(/\s+/);
+    const provider = columns[0];
+    const model = columns[1];
+    if (!provider || !model || provider.startsWith("-") || model.startsWith("-")) continue;
+    if (/^(yes|no)$/i.test(model)) continue;
+    const id = `${provider}/${model}`;
+    if (seen.has(id)) continue;
+    seen.add(id);
+    models.push({
+      id,
+      label: `${humanizePiSegment(model)} \xB7 ${PI_PROVIDER_LABELS[provider] || humanizePiSegment(provider)}`,
+      verified: "launchable"
+    });
   }
-  return [runnerPath];
+  return models.length > 0 ? { models } : null;
 }
-async function buildPiLaunchOptions(ctx, opts = {}) {
-  const command = opts.command ?? process.execPath;
-  const piDir = path11.join(ctx.workingDirectory, ".slock", "pi");
-  const sessionDir = path11.join(piDir, "sessions");
-  mkdirSync4(sessionDir, { recursive: true });
-  const slock = await prepareCliTransport(ctx, { NO_COLOR: "1" });
-  const runnerPath = opts.runnerPath ?? resolvePiSdkRunnerPath();
-  const agentDir = opts.agentDir ?? getAgentDir();
-  const runnerConfigPath = path11.join(
-    piDir,
-    `sdk-run-${(ctx.launchId || "launch").replace(/[^a-zA-Z0-9_.-]/g, "_")}.json`
-  );
-  const turnPrompt = ctx.prompt === ctx.standingPrompt ? NO_MESSAGE_PROMPT2 : ctx.prompt;
-  const runnerConfig = {
-    cwd: ctx.workingDirectory,
-    agentDir,
-    sessionDir,
-    sessionId: ctx.config.sessionId || null,
-    standingPrompt: ctx.standingPrompt,
-    prompt: turnPrompt,
-    model: ctx.config.model && ctx.config.model !== "default" ? ctx.config.model : null
-  };
-  writeFileSync7(runnerConfigPath, `${JSON.stringify(runnerConfig)}
-`, { encoding: "utf8", mode: 384 });
-  const args = [
-    ...buildPiSdkNodeArgs(runnerPath),
-    "--config",
-    runnerConfigPath
-  ];
+function detectPiModels(runCommand = runPiModelsCommand) {
+  const result = runCommand();
+  if (result.error || result.status !== 0) return null;
+  return parsePiModelsOutput(result.stdout);
+}
+function runPiModelsCommand() {
+  const result = spawnSync3("pi", ["--list-models"], {
+    env: { ...process.env, FORCE_COLOR: "0", NO_COLOR: "1" },
+    encoding: "utf8",
+    timeout: 5e3
+  });
   return {
-    command,
-    args,
-    env: slock.spawnEnv,
-    sessionDir,
-    agentDir,
-    runnerConfigPath,
-    sdkVersion: PI_SDK_VERSION
+    status: result.status,
+    stdout: String(result.stdout || ""),
+    error: result.error
   };
 }
-function isSystemFirstMessageTask2(message) {
-  return message.sender_id === "system" && message.channel_type === "channel" && message.channel_name === "all" && message.content.trimStart().startsWith(FIRST_MESSAGE_TASK_PREFIX2);
+function humanizePiSegment(value) {
+  return value.split(/[-_/]/).filter(Boolean).map(formatPiLabelToken).join(" ");
 }
-function buildPiSystemPrompt(config) {
-  return buildCliTransportSystemPrompt(config, {
-    toolPrefix: CHAT_MCP_TOOL_PREFIX2,
-    extraCriticalRules: [
-      "- Runtime Profile migration controls are not available in the Pi runtime yet. If asked to acknowledge a runtime migration, explain the blocker instead of inventing a command."
-    ],
-    postStartupNotes: [
-      "**Pi runtime note:** Slock launches you as a per-turn process. Complete the current wake using `slock` CLI commands, then stop; the daemon will restart you when new messages arrive."
-    ],
-    includeStdinNotificationSection: false,
-    messageNotificationStyle: "poll"
-  });
+function formatPiLabelToken(token) {
+  const normalized = token.toLowerCase();
+  const specialCases = {
+    ai: "AI",
+    api: "API",
+    deepseek: "DeepSeek",
+    flash: "Flash",
+    gpt: "GPT",
+    pro: "Pro",
+    v4: "V4"
+  };
+  if (specialCases[normalized]) return specialCases[normalized];
+  if (/^v\d+(\.\d+)?$/.test(normalized)) return normalized.toUpperCase();
+  if (/^\d+[bk]$/i.test(token)) return token.toUpperCase();
+  if (/^\d/.test(token)) return token;
+  return normalized.charAt(0).toUpperCase() + normalized.slice(1);
 }
-function contentText(content) {
-  if (!content) return "";
-  const chunks = [];
-  for (const item of content) {
-    if (item.type === "text" && typeof item.text === "string") {
-      chunks.push(item.text);
+function piErrorMessage(error) {
+  if (typeof error === "string" && error.trim()) return error.trim();
+  if (error && typeof error === "object") {
+    const record = error;
+    if (typeof record.message === "string" && record.message.trim()) return record.message.trim();
+    try {
+      return JSON.stringify(error);
+    } catch {
     }
   }
-  return chunks.join("");
-}
-function apiKeyErrorMessage(line) {
-  const trimmed = line.trim();
-  if (!trimmed) return null;
-  if (/no api key found/i.test(trimmed)) return trimmed;
-  if (/api key.+required/i.test(trimmed)) return trimmed;
-  if (/no models available/i.test(trimmed)) return trimmed;
-  return null;
+  return "Unknown Pi error";
 }
 var PiDriver = class {
   id = "pi";
+  supportsNativeStandingPrompt = true;
   lifecycle = {
-    kind: "per_turn",
-    start: "defer_until_concrete_message",
-    exit: "terminate_on_turn_end",
-    inFlightWake: "coalesce_into_pending"
+    kind: "persistent",
+    stdin: "direct",
+    inFlightWake: "steer"
   };
   communication = {
     chat: "slock_cli",
@@ -6046,65 +6083,42 @@ var PiDriver = class {
   };
   model = {
     detectedModelsVerifiedAs: "launchable",
-    toLaunchSpec: async (modelId, ctx) => {
-      if (!ctx) return modelId && modelId !== "default" ? { args: ["--model", modelId] } : { args: [] };
-      const launchCtx = {
-        ...ctx,
-        config: {
-          ...ctx.config,
-          model: modelId
-        }
-      };
-      const launch = await buildPiLaunchOptions(launchCtx);
-      return {
-        args: launch.args,
-        env: launch.env,
-        configFiles: [launch.runnerConfigPath],
-        params: {
-          agentDir: launch.agentDir,
-          sessionDir: launch.sessionDir,
-          sdkVersion: launch.sdkVersion,
-          resources: "extensions/skills/prompt-templates/themes/context-files disabled by Slock policy"
-        }
-      };
-    }
+    toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
-  supportsStdinNotification = false;
-  mcpToolPrefix = CHAT_MCP_TOOL_PREFIX2;
-  busyDeliveryMode = "none";
-  terminateProcessOnTurnEnd = true;
-  deferSpawnUntilMessage = true;
+  supportsStdinNotification = true;
+  mcpToolPrefix = "";
+  busyDeliveryMode = "direct";
   usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
-  apiKeyErrorAnnounced = false;
-  turnEnded = false;
-  assistantTextByMessageId = /* @__PURE__ */ new Map();
-  shouldDeferWakeMessage(message) {
-    return isSystemFirstMessageTask2(message);
-  }
+  sawTextDelta = false;
+  requestId = 0;
+  process = null;
   probe() {
-    return probePi();
+    const command = resolveCommandOnPath("pi");
+    if (!command) return { available: false };
+    return {
+      available: true,
+      version: readCommandVersion(command) ?? void 0
+    };
   }
   async detectModels() {
-    return null;
+    return detectPiModels();
   }
   async spawn(ctx) {
-    this.sessionId = ctx.config.sessionId || null;
+    this.sessionId = ctx.config.sessionId || randomUUID3();
     this.sessionAnnounced = false;
-    this.apiKeyErrorAnnounced = false;
-    this.turnEnded = false;
-    this.assistantTextByMessageId.clear();
-    const unsupportedMessage = unsupportedPiVersionMessage(PI_SDK_VERSION);
-    if (unsupportedMessage) throw new Error(unsupportedMessage);
-    const launch = await buildPiLaunchOptions(ctx);
-    const proc = spawn9(launch.command, launch.args, {
+    this.sawTextDelta = false;
+    this.requestId = 0;
+    mkdirSync4(buildPiSessionDir(ctx.workingDirectory), { recursive: true });
+    const proc = spawn9(resolveCommandOnPath("pi") ?? "pi", buildPiRpcArgs(ctx, this.sessionId), {
       cwd: ctx.workingDirectory,
       stdio: ["pipe", "pipe", "pipe"],
-      env: launch.env,
-      shell: false
+      env: await buildPiSpawnEnv(ctx),
+      shell: process.platform === "win32"
     });
-    proc.stdin?.end();
+    this.process = proc;
+    this.sendRpcCommand("prompt", { message: ctx.prompt });
     return { process: proc };
   }
   parseLine(line) {
@@ -6112,84 +6126,103 @@ var PiDriver = class {
     try {
       event = JSON.parse(line);
     } catch {
-      if (this.apiKeyErrorAnnounced) return [];
-      const message = apiKeyErrorMessage(line);
-      if (!message) return [];
-      this.apiKeyErrorAnnounced = true;
-      this.turnEnded = true;
-      return [
-        { kind: "error", message },
-        { kind: "turn_end", sessionId: this.sessionId || void 0 }
-      ];
+      return [];
     }
     const events = [];
     if (event.type === "session" && event.id) {
       this.sessionId = event.id;
+      if (!this.sessionAnnounced) {
+        this.sessionAnnounced = true;
+        events.push({ kind: "session_init", sessionId: event.id });
+      }
+      return events;
     }
     if (!this.sessionAnnounced && this.sessionId) {
       events.push({ kind: "session_init", sessionId: this.sessionId });
       this.sessionAnnounced = true;
     }
-    switch (event.type) {
-      case "agent_start":
-      case "turn_start":
-        events.push({ kind: "thinking", text: "" });
-        break;
-      case "message_update":
-      case "message_end":
-        if (event.message?.role === "assistant") {
-          const key = event.message.id || "current";
-          const currentText = contentText(event.message.content);
-          const previousText = this.assistantTextByMessageId.get(key) ?? "";
-          if (currentText.length > previousText.length && currentText.startsWith(previousText)) {
-            events.push({ kind: "text", text: currentText.slice(previousText.length) });
-          } else if (currentText && currentText !== previousText) {
-            events.push({ kind: "text", text: currentText });
+    if (event.type === "response") {
+      if (event.data?.sessionId && event.data.sessionId !== this.sessionId) {
+        this.sessionId = event.data.sessionId;
+      }
+      if (event.success === false) {
+        events.push({ kind: "error", message: piErrorMessage(event.error) });
+      }
+      return events;
+    }
+    if (event.type === "message_start" && event.message?.role === "assistant") {
+      this.sawTextDelta = false;
+      return events;
+    }
+    const assistantEvent = event.assistantMessageEvent;
+    if (event.type === "message_update" && assistantEvent) {
+      switch (assistantEvent.type) {
+        case "thinking_delta":
+          if (typeof assistantEvent.delta === "string" && assistantEvent.delta.length > 0) {
+            events.push({ kind: "thinking", text: assistantEvent.delta });
           }
-          this.assistantTextByMessageId.set(key, currentText);
-          if (event.message.stopReason === "error" || event.message.stopReason === "aborted") {
-            events.push({ kind: "error", message: event.message.errorMessage || `Request ${event.message.stopReason}` });
+          break;
+        case "text_delta":
+          if (typeof assistantEvent.delta === "string" && assistantEvent.delta.length > 0) {
+            this.sawTextDelta = true;
+            events.push({ kind: "text", text: assistantEvent.delta });
           }
-        }
-        break;
-      case "tool_execution_start":
-        events.push({
-          kind: "tool_call",
-          name: event.toolName || "unknown_tool",
-          input: event.args
-        });
-        break;
-      case "tool_execution_end":
-        events.push({
-          kind: "tool_output",
-          name: event.toolName || "unknown_tool"
-        });
-        if (event.isError) {
-          events.push({ kind: "error", message: `Pi tool ${event.toolName || "unknown_tool"} failed` });
-        }
-        break;
-      case "compaction_start":
-        events.push({ kind: "compaction_started" });
-        break;
-      case "compaction_end":
-        events.push({ kind: "compaction_finished" });
-        if (event.errorMessage) events.push({ kind: "error", message: event.errorMessage });
-        break;
-      case "turn_end":
-      case "agent_end":
-        if (!this.turnEnded) {
-          events.push({ kind: "turn_end", sessionId: this.sessionId || void 0 });
-          this.turnEnded = true;
-        }
-        break;
+          break;
+        case "thinking_start":
+        case "text_start":
+          break;
+        case "tool_use":
+        case "tool_call":
+        case "tool_start":
+          events.push({
+            kind: "tool_call",
+            name: assistantEvent.name || assistantEvent.toolName || "unknown_tool",
+            input: assistantEvent.input ?? assistantEvent.parameters ?? {}
+          });
+          break;
+        case "text_end":
+          if (!this.sawTextDelta && typeof assistantEvent.content === "string" && assistantEvent.content.length > 0) {
+            events.push({ kind: "text", text: assistantEvent.content });
+          }
+          break;
+      }
+      return events;
+    }
+    if (event.type === "agent_end") {
+      events.push({ kind: "turn_end", sessionId: this.sessionId || void 0 });
+    } else if (event.type === "error") {
+      events.push({ kind: "error", message: piErrorMessage(event.error ?? event.message) });
     }
     return events;
   }
-  encodeStdinMessage(_text, _sessionId, _opts) {
-    return null;
+  encodeStdinMessage(text, _sessionId, opts) {
+    return JSON.stringify({
+      id: this.nextRequestId(),
+      type: opts?.mode === "idle" ? "prompt" : "steer",
+      message: text
+    });
   }
   buildSystemPrompt(config, _agentId) {
-    return buildPiSystemPrompt(config);
+    return buildCliTransportSystemPrompt(config, {
+      toolPrefix: "",
+      extraCriticalRules: [],
+      postStartupNotes: [
+        "**Pi runtime note:** Slock keeps Pi running in RPC mode. While you are working, Slock may send inbox-count notifications into the current turn; call `slock message check` at natural breakpoints."
+      ],
+      includeStdinNotificationSection: true,
+      messageNotificationStyle: "direct"
+    });
+  }
+  nextRequestId() {
+    this.requestId += 1;
+    return String(this.requestId);
+  }
+  sendRpcCommand(type, params) {
+    this.process?.stdin?.write(JSON.stringify({
+      id: this.nextRequestId(),
+      type,
+      ...params
+    }) + "\n");
   }
 };
 
@@ -6468,6 +6501,8 @@ function runtimeDisplayName(runtimeId) {
       return "Kimi CLI";
     case "opencode":
       return "OpenCode";
+    case "pi":
+      return "Pi CLI";
     default:
       return runtimeId || "This runtime";
   }
@@ -6753,7 +6788,7 @@ function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
     const dir = path13.join(fallbackDir, ".slock", "runtime-sessions");
     mkdirSync5(dir, { recursive: true });
     const filePath = path13.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
-    writeFileSync8(filePath, JSON.stringify({
+    writeFileSync7(filePath, JSON.stringify({
       type: "runtime_session_handoff",
       runtime,
       sessionId,
@@ -6870,7 +6905,7 @@ function dynamicClaimInstruction(driver) {
 }
 function formatIncomingMessage(message, driver) {
   const threadJoinPrefix = message.thread_join_context ? [
-    `[System: You were added to a new thread via @mention. Read this context before replying.]`,
+    `[Slock thread context: you were added to a new thread via @mention.]`,
     `parent: ${message.thread_join_context.parent_target}`,
     `thread: ${message.thread_join_context.thread_target}`,
     `suggested next step: ${driver?.usesSlockCliForCommunication ? `slock message read --channel "${message.thread_join_context.suggested_read_history_target}"` : `${communicationCommand(driver, "read_history")}(channel="${message.thread_join_context.suggested_read_history_target}")`}`,
@@ -7696,7 +7731,7 @@ function getBusyDeliveryNote(driver) {
   if (driver.busyDeliveryMode === "gated") {
     return "\n\nNote: While you are busy, the daemon may write batched inbox-count notifications into your active turn at runtime-observed safe boundaries. Call check_messages to read the pending messages before context-sensitive side effects.";
   }
-  return "\n\nNote: While you are busy, you may receive [System notification: ...] messages. Finish your current step, then call check_messages to check for messages.";
+  return "\n\nNote: While you are busy, you may receive [Slock inbox notice: ...] messages. Finish your current step, then call check_messages to check for messages.";
 }
 var NATIVE_STANDING_PROMPT_STARTUP_INPUT = (
   // Claude Code 2.1.114 treats "follow your system prompt" style user turns as
@@ -10419,15 +10454,23 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     }
   }
   recordRuntimeTelemetry(agentId, ap, event) {
+    const telemetryAttrs = {
+      ...event.attrs,
+      ...event.source ? { source: event.source } : {},
+      ...event.usageKind ? { usageKind: event.usageKind } : {},
+      ...event.sessionId ? { sessionId: event.sessionId } : {},
+      ...event.turnId ? { turnId: event.turnId } : {},
+      ...event.runtimeResultId ? { runtimeResultId: event.runtimeResultId } : {}
+    };
     const attrs = {
       agentId,
       launchId: ap.launchId || void 0,
       runtime: ap.config.runtime,
       model: ap.config.model,
       telemetry_name: event.name,
-      ...event.attrs
+      ...telemetryAttrs
     };
-    ap.runtimeTraceSpan?.addEvent(`runtime.telemetry.${event.name}`, event.attrs);
+    ap.runtimeTraceSpan?.addEvent(`runtime.telemetry.${event.name}`, telemetryAttrs);
     this.recordDaemonTrace(`daemon.runtime.telemetry.${event.name}`, attrs);
   }
   sendAgentStatus(agentId, status, launchId) {
@@ -10501,7 +10544,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     }
     const inboxCount = ap.inbox.length;
     if (inboxCount === 0) return false;
-    const notification = `[System notification: You have ${inboxCount} pending inbox message${inboxCount > 1 ? "s" : ""}. Call check_messages to read ${inboxCount > 1 ? "them" : "it"} when you're ready.]`;
+    const notification = `[Slock inbox notice: You have ${inboxCount} pending inbox message${inboxCount > 1 ? "s" : ""}. Call check_messages to read ${inboxCount > 1 ? "them" : "it"} when you're ready.]`;
     logger.info(`[Agent ${agentId}] Sending stdin notification: ${inboxCount} pending inbox message(s)`);
     const encoded = ap.driver.encodeStdinMessage(notification, ap.sessionId, { mode: "busy" });
     if (encoded) {
@@ -10953,8 +10996,8 @@ var ReminderCache = class {
 };
 
 // src/machineLock.ts
-import { createHash as createHash4, randomUUID as randomUUID3 } from "crypto";
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync9 } from "fs";
+import { createHash as createHash4, randomUUID as randomUUID4 } from "crypto";
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync8 } from "fs";
 import os6 from "os";
 import path14 from "path";
 var INCOMPLETE_LOCK_STALE_MS = 3e4;
@@ -11010,7 +11053,7 @@ function acquireDaemonMachineLock(options) {
   const lockId = getDaemonMachineLockId(options.apiKey);
   const machineDir = path14.join(rootDir, lockId);
   const lockDir = path14.join(machineDir, "daemon.lock");
-  const token = randomUUID3();
+  const token = randomUUID4();
   mkdirSync6(machineDir, { recursive: true });
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
@@ -11024,7 +11067,7 @@ function acquireDaemonMachineLock(options) {
         apiKeyFingerprint: fingerprint.slice(0, 16)
       };
       try {
-        writeFileSync9(ownerPath(lockDir), `${JSON.stringify(owner, null, 2)}
+        writeFileSync8(ownerPath(lockDir), `${JSON.stringify(owner, null, 2)}
 `, { mode: 384 });
       } catch (err) {
         rmSync3(lockDir, { recursive: true, force: true });
@@ -11037,7 +11080,15 @@ function acquireDaemonMachineLock(options) {
         release: () => {
           const currentOwner = readOwner(lockDir);
           if (currentOwner?.pid === process.pid && currentOwner.token === token) {
-            rmSync3(lockDir, { recursive: true, force: true });
+            const released = { ...currentOwner, pid: 0 };
+            try {
+              writeFileSync8(ownerPath(lockDir), `${JSON.stringify(released, null, 2)}
+`, {
+                mode: 384
+              });
+            } catch {
+              rmSync3(lockDir, { recursive: true, force: true });
+            }
           }
         }
       };
@@ -11061,7 +11112,7 @@ function acquireDaemonMachineLock(options) {
 }
 
 // src/localTraceSink.ts
-import { appendFileSync, mkdirSync as mkdirSync7, readdirSync as readdirSync2, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync10 } from "fs";
+import { appendFileSync, mkdirSync as mkdirSync7, readdirSync as readdirSync2, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync9 } from "fs";
 import path15 from "path";
 var DEFAULT_MAX_FILE_BYTES = 5 * 1024 * 1024;
 var DEFAULT_MAX_FILE_AGE_MS = 5 * 60 * 1e3;
@@ -11133,7 +11184,7 @@ var LocalRotatingTraceSink = class {
         this.traceDir,
         `daemon-trace-${safeTimestamp(nowMs)}-${process.pid}-${String(this.sequence++).padStart(4, "0")}.jsonl`
       );
-      writeFileSync10(this.currentFile, "", { flag: "a", mode: 384 });
+      writeFileSync9(this.currentFile, "", { flag: "a", mode: 384 });
       this.currentSize = statSync3(this.currentFile).size;
       this.currentFileOpenedAtMs = nowMs;
       this.pruneOldFiles();
@@ -11232,7 +11283,7 @@ function isDiagnosticErrorAttr(key) {
 }
 
 // src/traceBundleUpload.ts
-import { createHash as createHash6, randomUUID as randomUUID4 } from "crypto";
+import { createHash as createHash6, randomUUID as randomUUID5 } from "crypto";
 import { gzipSync } from "zlib";
 import { mkdir as mkdir2, readFile as readFile2, readdir as readdir3, stat as stat3, writeFile as writeFile2 } from "fs/promises";
 import path16 from "path";
@@ -11503,7 +11554,7 @@ var DaemonTraceBundleUploader = class {
       }
       const gzipped = gzipSync(raw);
       const bundleSha256 = sha256Hex(gzipped);
-      const bundleId = randomUUID4();
+      const bundleId = randomUUID5();
       await uploadWithSignedCapability({
         serverUrl: this.options.serverUrl,
         apiKey: this.options.apiKey,
@@ -11582,7 +11633,7 @@ var DEFAULT_TRACE_UPLOAD_URL = "https://slock-trace-upload.botiverse.dev";
 var RUNNER_CREDENTIAL_SCOPES = ["send", "read", "mentions", "tasks", "reactions", "server", "channels", "knowledge"];
 var RUNNER_CREDENTIAL_MINT_MAX_ATTEMPTS2 = 3;
 var RUNNER_CREDENTIAL_MINT_RETRY_DELAY_MS2 = 250;
-var DAEMON_CLI_USAGE = `Usage: slock-daemon --server-url <url> (--api-key <key> or ${DAEMON_API_KEY_ENV}=<key>)`;
+var DAEMON_CLI_USAGE = "Usage: slock-daemon --server-url <url> --api-key <key>";
 var RunnerCredentialMintError2 = class extends Error {
   code;
   retryable;
@@ -11618,9 +11669,9 @@ function runnerCredentialErrorDetail2(error) {
 async function waitForRunnerCredentialRetry2() {
   await new Promise((resolve) => setTimeout(resolve, RUNNER_CREDENTIAL_MINT_RETRY_DELAY_MS2));
 }
-function parseDaemonCliArgs(args, env = {}) {
+function parseDaemonCliArgs(args) {
   let serverUrl = "";
-  let apiKey = env[DAEMON_API_KEY_ENV] ?? "";
+  let apiKey = "";
   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];
@@ -11637,7 +11688,7 @@ function readDaemonVersion(moduleUrl = import.meta.url) {
   }
 }
 function resolveChatBridgePath(moduleUrl = import.meta.url) {
-  const dirname = path17.dirname(fileURLToPath2(moduleUrl));
+  const dirname = path17.dirname(fileURLToPath(moduleUrl));
   const jsPath = path17.resolve(dirname, "chat-bridge.js");
   try {
     accessSync(jsPath);
@@ -11647,7 +11698,7 @@ function resolveChatBridgePath(moduleUrl = import.meta.url) {
   }
 }
 function resolveSlockCliPath(moduleUrl = import.meta.url) {
-  const thisDir = path17.dirname(fileURLToPath2(moduleUrl));
+  const thisDir = path17.dirname(fileURLToPath(moduleUrl));
   const bundledDistPath = path17.resolve(thisDir, "cli", "index.js");
   try {
     accessSync(bundledDistPath);
@@ -12371,8 +12422,6 @@ var DaemonCore = class {
 };
 
 export {
-  DAEMON_API_KEY_ENV,
-  scrubDaemonAuthEnv,
   resolveWorkspaceDirectoryPath,
   scanWorkspaceDirectories,
   deleteWorkspaceDirectory,