@slock-ai/daemon 0.55.3 → 0.55.4

package/dist/{chunk-DLB2KVD7.js → chunk-S5AEBH3V.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-M2KQBJR3.js";
 
 // src/core.ts
-import path16 from "path";
+import path17 from "path";
 import os7 from "os";
 import { createRequire as createRequire2 } from "module";
 import { accessSync } from "fs";
@@ -995,13 +995,19 @@ var RUNTIMES = [
   { 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" },
@@ -1042,6 +1048,11 @@ var RUNTIME_MODELS = {
     { id: "openrouter/anthropic/claude-opus-4.5", label: "Claude Opus 4.5 via OpenRouter", verified: "suggestion_only" },
     { id: "fusecode/opus[1m]", label: "Opus 1M via FuseCode", verified: "suggestion_only" }
   ],
+  pi: [
+    { 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.
   kimi: [
@@ -1086,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) {
@@ -1117,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)
@@ -1190,10 +1208,10 @@ var DISPLAY_PLAN_CONFIG = {
 };
 
 // src/agentProcessManager.ts
-import { mkdirSync as mkdirSync4, readdirSync, statSync, writeFileSync as writeFileSync7 } 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 path12 from "path";
+import path13 from "path";
 import os5 from "os";
 
 // src/drivers/claude.ts
@@ -1374,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.`;
@@ -1552,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.
@@ -1630,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\`
@@ -1712,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}
 
@@ -3081,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;
@@ -3155,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") {
@@ -3176,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;
       }
@@ -3441,7 +3587,7 @@ function buildClaudeArgs(config, opts) {
     args.push("--effort", launchRuntimeFields.reasoningEffort);
   }
   if (launchRuntimeFields.mode.kind === "fast") {
-    args.push("--bare");
+    args.push("--settings", JSON.stringify({ fastMode: true }));
   }
   if (config.sessionId) {
     args.push("--resume", config.sessionId);
@@ -3599,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) {
@@ -3752,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);
@@ -5794,6 +5955,277 @@ var OpenCodeDriver = class {
   }
 };
 
+// src/drivers/pi.ts
+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";
+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 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);
+  }
+  if (launchRuntimeFields.reasoningEffort) {
+    args.push("--thinking", launchRuntimeFields.reasoningEffort);
+  }
+  if (sessionId) {
+    args.push("--session-id", sessionId);
+  }
+  return args;
+}
+async function buildPiSpawnEnv(ctx) {
+  return (await prepareCliTransport(ctx, { NO_COLOR: "1" })).spawnEnv;
+}
+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 models.length > 0 ? { models } : null;
+}
+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 {
+    status: result.status,
+    stdout: String(result.stdout || ""),
+    error: result.error
+  };
+}
+function humanizePiSegment(value) {
+  return value.split(/[-_/]/).filter(Boolean).map(formatPiLabelToken).join(" ");
+}
+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 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 "Unknown Pi error";
+}
+var PiDriver = class {
+  id = "pi";
+  supportsNativeStandingPrompt = true;
+  lifecycle = {
+    kind: "persistent",
+    stdin: "direct",
+    inFlightWake: "steer"
+  };
+  communication = {
+    chat: "slock_cli",
+    runtimeControl: "none"
+  };
+  session = {
+    recovery: "resume_or_fresh"
+  };
+  model = {
+    detectedModelsVerifiedAs: "launchable",
+    toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
+  };
+  supportsStdinNotification = true;
+  mcpToolPrefix = "";
+  busyDeliveryMode = "direct";
+  usesSlockCliForCommunication = true;
+  sessionId = null;
+  sessionAnnounced = false;
+  sawTextDelta = false;
+  requestId = 0;
+  process = null;
+  probe() {
+    const command = resolveCommandOnPath("pi");
+    if (!command) return { available: false };
+    return {
+      available: true,
+      version: readCommandVersion(command) ?? void 0
+    };
+  }
+  async detectModels() {
+    return detectPiModels();
+  }
+  async spawn(ctx) {
+    this.sessionId = ctx.config.sessionId || randomUUID3();
+    this.sessionAnnounced = false;
+    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: await buildPiSpawnEnv(ctx),
+      shell: process.platform === "win32"
+    });
+    this.process = proc;
+    this.sendRpcCommand("prompt", { message: ctx.prompt });
+    return { process: proc };
+  }
+  parseLine(line) {
+    let event;
+    try {
+      event = JSON.parse(line);
+    } catch {
+      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;
+    }
+    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 });
+          }
+          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 "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 JSON.stringify({
+      id: this.nextRequestId(),
+      type: opts?.mode === "idle" ? "prompt" : "steer",
+      message: text
+    });
+  }
+  buildSystemPrompt(config, _agentId) {
+    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");
+  }
+};
+
 // src/drivers/index.ts
 var driverFactories = {
   claude: () => new ClaudeDriver(),
@@ -5803,7 +6235,8 @@ var driverFactories = {
   cursor: () => new CursorDriver(),
   gemini: () => new GeminiDriver(),
   kimi: () => new KimiDriver(),
-  opencode: () => new OpenCodeDriver()
+  opencode: () => new OpenCodeDriver(),
+  pi: () => new PiDriver()
 };
 function getDriver(runtimeId) {
   const createDriver = driverFactories[runtimeId];
@@ -5816,7 +6249,7 @@ function getDriver(runtimeId) {
 
 // src/workspaces.ts
 import { readdir, rm, stat } from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 function isValidWorkspaceDirectoryName(directoryName) {
   return !directoryName.includes("/") && !directoryName.includes("\\") && !directoryName.includes("..");
 }
@@ -5824,7 +6257,7 @@ function resolveWorkspaceDirectoryPath(dataDir, directoryName) {
   if (!isValidWorkspaceDirectoryName(directoryName)) {
     return null;
   }
-  return path11.join(dataDir, directoryName);
+  return path12.join(dataDir, directoryName);
 }
 function emptyWorkspaceDirectorySummary(latestMtime = /* @__PURE__ */ new Date(0)) {
   return {
@@ -5873,7 +6306,7 @@ async function summarizeWorkspaceDirectory(dirPath) {
     return summary;
   }
   const childSummaries = await Promise.all(
-    entries.map((entry) => summarizeWorkspaceEntry(path11.join(dirPath, entry.name), entry))
+    entries.map((entry) => summarizeWorkspaceEntry(path12.join(dirPath, entry.name), entry))
   );
   for (const childSummary of childSummaries) {
     summary = mergeWorkspaceDirectorySummaries(summary, childSummary);
@@ -5892,7 +6325,7 @@ async function scanWorkspaceDirectories(dataDir) {
       if (!entry.isDirectory()) {
         return null;
       }
-      const dirPath = path11.join(dataDir, entry.name);
+      const dirPath = path12.join(dataDir, entry.name);
       try {
         const summary = await summarizeWorkspaceDirectory(dirPath);
         return {
@@ -6068,6 +6501,8 @@ function runtimeDisplayName(runtimeId) {
       return "Kimi CLI";
     case "opencode":
       return "OpenCode";
+    case "pi":
+      return "Pi CLI";
     default:
       return runtimeId || "This runtime";
   }
@@ -6332,12 +6767,12 @@ function findSessionJsonl(root, predicate) {
     for (const entry of entries) {
       if (++visited > maxEntries) return null;
       if (!entry.isFile() || !predicate(entry.name)) continue;
-      return path12.join(dir, entry.name);
+      return path13.join(dir, entry.name);
     }
     for (const entry of entries) {
       if (++visited > maxEntries) return null;
       if (!entry.isDirectory()) continue;
-      const found = visit(path12.join(dir, entry.name), depth - 1);
+      const found = visit(path13.join(dir, entry.name), depth - 1);
       if (found) return found;
     }
     return null;
@@ -6350,9 +6785,9 @@ function safeSessionFilename(value) {
 }
 function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
   try {
-    const dir = path12.join(fallbackDir, ".slock", "runtime-sessions");
-    mkdirSync4(dir, { recursive: true });
-    const filePath = path12.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
+    const dir = path13.join(fallbackDir, ".slock", "runtime-sessions");
+    mkdirSync5(dir, { recursive: true });
+    const filePath = path13.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
     writeFileSync7(filePath, JSON.stringify({
       type: "runtime_session_handoff",
       runtime,
@@ -6372,7 +6807,7 @@ function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
   }
 }
 function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os5.homedir(), fallbackDir) {
-  const directPath = path12.isAbsolute(sessionId) ? sessionId : null;
+  const directPath = path13.isAbsolute(sessionId) ? sessionId : null;
   if (directPath) {
     try {
       if (statSync(directPath).isFile()) {
@@ -6381,7 +6816,7 @@ function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os5.homedir(), f
     } catch {
     }
   }
-  const resolvedPath = runtime === "claude" ? findSessionJsonl(path12.join(homeDir, ".claude", "projects"), (filename) => filename === `${sessionId}.jsonl`) : runtime === "codex" ? findSessionJsonl(path12.join(homeDir, ".codex", "sessions"), (filename) => filename.endsWith(".jsonl") && filename.includes(sessionId)) : null;
+  const resolvedPath = runtime === "claude" ? findSessionJsonl(path13.join(homeDir, ".claude", "projects"), (filename) => filename === `${sessionId}.jsonl`) : runtime === "codex" ? findSessionJsonl(path13.join(homeDir, ".codex", "sessions"), (filename) => filename.endsWith(".jsonl") && filename.includes(sessionId)) : null;
   if (!resolvedPath && fallbackDir) {
     const fallback = writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir);
     if (fallback) return fallback;
@@ -6470,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}")`}`,
@@ -7296,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
@@ -7805,7 +8240,7 @@ var AgentProcessManager = class _AgentProcessManager {
         );
         wakeMessage = void 0;
       }
-      const agentDataDir = path12.join(this.dataDir, agentId);
+      const agentDataDir = path13.join(this.dataDir, agentId);
       await mkdir(agentDataDir, { recursive: true });
       let runtimeConfig = withLocalRuntimeContext(config, agentId, agentDataDir);
       const legacyRuntimeProfileControl = runtimeConfig.runtimeProfileControl?.kind === "migration" ? runtimeConfig.runtimeProfileControl : null;
@@ -7819,23 +8254,23 @@ var AgentProcessManager = class _AgentProcessManager {
         );
         runtimeConfig = { ...runtimeConfig, runtimeProfileControl: null };
       }
-      const memoryMdPath = path12.join(agentDataDir, "MEMORY.md");
+      const memoryMdPath = path13.join(agentDataDir, "MEMORY.md");
       try {
         await access(memoryMdPath);
       } catch {
         const initialMemoryMd = buildInitialMemoryMd(runtimeConfig);
         await writeFile(memoryMdPath, initialMemoryMd);
       }
-      const notesDir = path12.join(agentDataDir, "notes");
+      const notesDir = path13.join(agentDataDir, "notes");
       await mkdir(notesDir, { recursive: true });
       if (getOnboardingSeedMode(config) === FIRST_CINDY_SEED_MODE) {
         const seedFiles = buildOnboardingSeedFiles();
         for (const { relativePath, content } of seedFiles) {
-          const fullPath = path12.join(agentDataDir, relativePath);
+          const fullPath = path13.join(agentDataDir, relativePath);
           try {
             await access(fullPath);
           } catch {
-            await mkdir(path12.dirname(fullPath), { recursive: true });
+            await mkdir(path13.dirname(fullPath), { recursive: true });
             await writeFile(fullPath, content);
           }
         }
@@ -8707,7 +9142,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return true;
   }
   async resetWorkspace(agentId) {
-    const agentDataDir = path12.join(this.dataDir, agentId);
+    const agentDataDir = path13.join(this.dataDir, agentId);
     try {
       await rm2(agentDataDir, { recursive: true, force: true });
       logger.info(`[Agent ${agentId}] Workspace reset complete (${agentDataDir})`);
@@ -8768,7 +9203,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return result;
   }
   buildRuntimeProfileReport(agentId, config, sessionId, launchId) {
-    const workspacePath = path12.join(this.dataDir, agentId);
+    const workspacePath = path13.join(this.dataDir, agentId);
     return {
       agentId,
       launchId,
@@ -9025,7 +9460,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   }
   // Workspace file browsing
   async getFileTree(agentId, dirPath) {
-    const agentDir = path12.join(this.dataDir, agentId);
+    const agentDir = path13.join(this.dataDir, agentId);
     try {
       await stat2(agentDir);
     } catch {
@@ -9033,8 +9468,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     }
     let targetDir = agentDir;
     if (dirPath) {
-      const resolved = path12.resolve(agentDir, dirPath);
-      if (!resolved.startsWith(agentDir + path12.sep) && resolved !== agentDir) {
+      const resolved = path13.resolve(agentDir, dirPath);
+      if (!resolved.startsWith(agentDir + path13.sep) && resolved !== agentDir) {
         return [];
       }
       targetDir = resolved;
@@ -9042,14 +9477,14 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return this.listDirectoryChildren(targetDir, agentDir);
   }
   async readFile(agentId, filePath) {
-    const agentDir = path12.join(this.dataDir, agentId);
-    const resolved = path12.resolve(agentDir, filePath);
-    if (!resolved.startsWith(agentDir + path12.sep) && resolved !== agentDir) {
+    const agentDir = path13.join(this.dataDir, agentId);
+    const resolved = path13.resolve(agentDir, filePath);
+    if (!resolved.startsWith(agentDir + path13.sep) && resolved !== agentDir) {
       throw new Error("Access denied");
     }
     const info = await stat2(resolved);
     if (info.isDirectory()) throw new Error("Cannot read a directory");
-    const ext = path12.extname(resolved).toLowerCase();
+    const ext = path13.extname(resolved).toLowerCase();
     if (WORKSPACE_TEXT_EXTENSIONS.has(ext) || ext === "") {
       if (info.size > WORKSPACE_TEXT_FILE_MAX_BYTES) throw new Error("File too large");
       const content = await readFile(resolved, "utf-8");
@@ -9084,13 +9519,13 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const agent = this.agents.get(agentId);
     const runtime = runtimeHint || agent?.config.runtime || "claude";
     const home = os5.homedir();
-    const workspaceDir = path12.join(this.dataDir, agentId);
+    const workspaceDir = path13.join(this.dataDir, agentId);
     const paths = _AgentProcessManager.SKILL_PATHS[runtime] || _AgentProcessManager.SKILL_PATHS.claude;
     const globalResults = await Promise.all(
-      paths.global.map((p) => this.scanSkillsDir(path12.join(home, p)))
+      paths.global.map((p) => this.scanSkillsDir(path13.join(home, p)))
     );
     const workspaceResults = await Promise.all(
-      paths.workspace.map((p) => this.scanSkillsDir(path12.join(workspaceDir, p)))
+      paths.workspace.map((p) => this.scanSkillsDir(path13.join(workspaceDir, p)))
     );
     const dedup = (skills) => {
       const seen = /* @__PURE__ */ new Set();
@@ -9119,7 +9554,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const skills = [];
     for (const entry of entries) {
       if (entry.isDirectory() || entry.isSymbolicLink()) {
-        const skillMd = path12.join(dir, entry.name, "SKILL.md");
+        const skillMd = path13.join(dir, entry.name, "SKILL.md");
         try {
           const content = await readFile(skillMd, "utf-8");
           const skill = this.parseSkillMd(entry.name, content);
@@ -9130,7 +9565,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       } else if (entry.name.endsWith(".md")) {
         const cmdName = entry.name.replace(/\.md$/, "");
         try {
-          const content = await readFile(path12.join(dir, entry.name), "utf-8");
+          const content = await readFile(path13.join(dir, entry.name), "utf-8");
           const skill = this.parseSkillMd(cmdName, content);
           skill.sourcePath = dir;
           skills.push(skill);
@@ -10019,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) {
@@ -10101,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) {
@@ -10248,8 +10691,8 @@ ${RESPONSE_TARGET_HINT}`);
     const nodes = [];
     for (const entry of entries) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-      const fullPath = path12.join(dir, entry.name);
-      const relativePath = path12.relative(rootDir, fullPath);
+      const fullPath = path13.join(dir, entry.name);
+      const relativePath = path13.relative(rootDir, fullPath);
       let info;
       try {
         info = await stat2(fullPath);
@@ -10553,10 +10996,10 @@ var ReminderCache = class {
 };
 
 // src/machineLock.ts
-import { createHash as createHash4, randomUUID as randomUUID3 } from "crypto";
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync8 } 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 path13 from "path";
+import path14 from "path";
 var INCOMPLETE_LOCK_STALE_MS = 3e4;
 var DaemonMachineLockConflictError = class extends Error {
   code = "DAEMON_MACHINE_LOCK_HELD";
@@ -10578,7 +11021,7 @@ function resolveDefaultMachineStateRoot() {
   return resolveSlockHomePath("machines");
 }
 function ownerPath(lockDir) {
-  return path13.join(lockDir, "owner.json");
+  return path14.join(lockDir, "owner.json");
 }
 function readOwner(lockDir) {
   try {
@@ -10608,13 +11051,13 @@ function acquireDaemonMachineLock(options) {
   const rootDir = options.rootDir ?? resolveDefaultMachineStateRoot();
   const fingerprint = apiKeyFingerprint(options.apiKey);
   const lockId = getDaemonMachineLockId(options.apiKey);
-  const machineDir = path13.join(rootDir, lockId);
-  const lockDir = path13.join(machineDir, "daemon.lock");
-  const token = randomUUID3();
-  mkdirSync5(machineDir, { recursive: true });
+  const machineDir = path14.join(rootDir, lockId);
+  const lockDir = path14.join(machineDir, "daemon.lock");
+  const token = randomUUID4();
+  mkdirSync6(machineDir, { recursive: true });
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
-      mkdirSync5(lockDir);
+      mkdirSync6(lockDir);
       const owner = {
         pid: process.pid,
         token,
@@ -10637,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 });
+            }
           }
         }
       };
@@ -10661,8 +11112,8 @@ function acquireDaemonMachineLock(options) {
 }
 
 // src/localTraceSink.ts
-import { appendFileSync, mkdirSync as mkdirSync6, readdirSync as readdirSync2, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync9 } from "fs";
-import path14 from "path";
+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;
 var DEFAULT_MAX_FILES = 8;
@@ -10699,7 +11150,7 @@ var LocalRotatingTraceSink = class {
   currentSize = 0;
   sequence = 0;
   constructor(options) {
-    this.traceDir = path14.join(options.machineDir, "traces");
+    this.traceDir = path15.join(options.machineDir, "traces");
     this.maxFileBytes = Math.max(1024, Math.floor(options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES));
     const baseAgeMs = Math.max(1e3, Math.floor(options.maxFileAgeMs ?? DEFAULT_MAX_FILE_AGE_MS));
     const ageJitterMs = Math.max(0, Math.floor(options.maxFileAgeJitterMs ?? 0));
@@ -10725,11 +11176,11 @@ var LocalRotatingTraceSink = class {
     return this.currentFile;
   }
   ensureFile(nextBytes) {
-    mkdirSync6(this.traceDir, { recursive: true, mode: 448 });
+    mkdirSync7(this.traceDir, { recursive: true, mode: 448 });
     const nowMs = this.nowMsProvider();
     const shouldRotateForAge = this.currentFileOpenedAtMs !== null && nowMs - this.currentFileOpenedAtMs >= this.maxFileAgeMs;
     if (!this.currentFile || this.currentSize + nextBytes > this.maxFileBytes || shouldRotateForAge) {
-      this.currentFile = path14.join(
+      this.currentFile = path15.join(
         this.traceDir,
         `daemon-trace-${safeTimestamp(nowMs)}-${process.pid}-${String(this.sequence++).padStart(4, "0")}.jsonl`
       );
@@ -10744,7 +11195,7 @@ var LocalRotatingTraceSink = class {
     const excess = files.length - this.maxFiles;
     if (excess <= 0) return;
     for (const file of files.slice(0, excess)) {
-      rmSync4(path14.join(this.traceDir, file), { force: true });
+      rmSync4(path15.join(this.traceDir, file), { force: true });
     }
   }
 };
@@ -10832,14 +11283,14 @@ 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 path15 from "path";
+import path16 from "path";
 
 // src/directUploadCapability.ts
-function joinUrl(base, path17) {
-  return `${base.replace(/\/+$/, "")}${path17}`;
+function joinUrl(base, path18) {
+  return `${base.replace(/\/+$/, "")}${path18}`;
 }
 function jsonHeaders(apiKey) {
   return {
@@ -11058,7 +11509,7 @@ var DaemonTraceBundleUploader = class {
     }, nextMs);
   }
   async findUploadCandidates() {
-    const traceDir = path15.join(this.options.machineDir, "traces");
+    const traceDir = path16.join(this.options.machineDir, "traces");
     let names;
     try {
       names = await readdir3(traceDir);
@@ -11070,8 +11521,8 @@ var DaemonTraceBundleUploader = class {
     const currentFile = this.options.currentFileProvider?.();
     const candidates = [];
     for (const name of names.filter((entry) => entry.startsWith("daemon-trace-") && entry.endsWith(".jsonl")).sort()) {
-      const file = path15.join(traceDir, name);
-      if (currentFile && path15.resolve(file) === path15.resolve(currentFile)) continue;
+      const file = path16.join(traceDir, name);
+      if (currentFile && path16.resolve(file) === path16.resolve(currentFile)) continue;
       if (await this.isUploaded(file)) continue;
       try {
         const info = await stat3(file);
@@ -11103,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,
@@ -11145,8 +11596,8 @@ var DaemonTraceBundleUploader = class {
     }
   }
   uploadStatePath(file) {
-    const stateDir = path15.join(this.options.machineDir, "trace-uploads");
-    return path15.join(stateDir, `${path15.basename(file)}.uploaded.json`);
+    const stateDir = path16.join(this.options.machineDir, "trace-uploads");
+    return path16.join(stateDir, `${path16.basename(file)}.uploaded.json`);
   }
   async isUploaded(file) {
     try {
@@ -11158,9 +11609,9 @@ var DaemonTraceBundleUploader = class {
   }
   async markUploaded(file, metadata) {
     const stateFile = this.uploadStatePath(file);
-    await mkdir2(path15.dirname(stateFile), { recursive: true, mode: 448 });
+    await mkdir2(path16.dirname(stateFile), { recursive: true, mode: 448 });
     await writeFile2(stateFile, `${JSON.stringify({
-      file: path15.basename(file),
+      file: path16.basename(file),
       uploadedAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...metadata
     }, null, 2)}
@@ -11237,23 +11688,23 @@ function readDaemonVersion(moduleUrl = import.meta.url) {
   }
 }
 function resolveChatBridgePath(moduleUrl = import.meta.url) {
-  const dirname = path16.dirname(fileURLToPath(moduleUrl));
-  const jsPath = path16.resolve(dirname, "chat-bridge.js");
+  const dirname = path17.dirname(fileURLToPath(moduleUrl));
+  const jsPath = path17.resolve(dirname, "chat-bridge.js");
   try {
     accessSync(jsPath);
     return jsPath;
   } catch {
-    return path16.resolve(dirname, "chat-bridge.ts");
+    return path17.resolve(dirname, "chat-bridge.ts");
   }
 }
 function resolveSlockCliPath(moduleUrl = import.meta.url) {
-  const thisDir = path16.dirname(fileURLToPath(moduleUrl));
-  const bundledDistPath = path16.resolve(thisDir, "cli", "index.js");
+  const thisDir = path17.dirname(fileURLToPath(moduleUrl));
+  const bundledDistPath = path17.resolve(thisDir, "cli", "index.js");
   try {
     accessSync(bundledDistPath);
     return bundledDistPath;
   } catch {
-    const workspaceDistPath = path16.resolve(thisDir, "..", "..", "cli", "dist", "index.js");
+    const workspaceDistPath = path17.resolve(thisDir, "..", "..", "cli", "dist", "index.js");
     accessSync(workspaceDistPath);
     return workspaceDistPath;
   }
@@ -11383,6 +11834,11 @@ function summarizeIncomingMessage(msg) {
 var DaemonCore = class {
   options;
   daemonVersion;
+  // When this runner is launched by a managed Computer service, the
+  // service exports SLOCK_COMPUTER_VERSION (the `@slock-ai/computer`
+  // bundle version). Reported in `ready` so the server can surface the
+  // Computer's own version (distinct from the underlying daemonVersion).
+  computerVersion;
   chatBridgePath;
   slockCliPath;
   slockHome;
@@ -11398,6 +11854,7 @@ var DaemonCore = class {
   constructor(options) {
     this.options = options;
     this.daemonVersion = options.daemonVersion ?? readDaemonVersion();
+    this.computerVersion = (process.env.SLOCK_COMPUTER_VERSION || "").trim() || null;
     this.chatBridgePath = options.chatBridgePath ?? resolveChatBridgePath();
     this.slockCliPath = options.slockCliPath ?? resolveSlockCliPath();
     this.slockHome = resolveSlockHome();
@@ -11432,7 +11889,7 @@ var DaemonCore = class {
   }
   resolveMachineStateRoot() {
     if (this.options.machineStateDir) return this.options.machineStateDir;
-    if (this.options.dataDir) return path16.join(path16.dirname(this.options.dataDir), "machines");
+    if (this.options.dataDir) return path17.join(path17.dirname(this.options.dataDir), "machines");
     return resolveDefaultMachineStateRoot();
   }
   shouldEnableLocalTrace() {
@@ -11458,7 +11915,7 @@ var DaemonCore = class {
       sink: this.localTraceSink
     });
     this.agentManager.setTracer(this.tracer);
-    this.agentManager.setCliTransportTraceDir(path16.join(machineDir, "traces"));
+    this.agentManager.setCliTransportTraceDir(path17.join(machineDir, "traces"));
   }
   installTraceBundleUploader(machineDir) {
     if (!this.shouldEnableLocalTrace()) return;
@@ -11857,6 +12314,26 @@ var DaemonCore = class {
       case "ping":
         this.connection.send({ type: "pong" });
         break;
+      case "computer:restart":
+      case "computer:upgrade": {
+        const action = msg.type === "computer:restart" ? "restart" : "upgrade";
+        this.recordDaemonTrace("daemon.computer_control.received", {
+          action,
+          handled: Boolean(this.options.onComputerControl)
+        });
+        if (this.options.onComputerControl) {
+          try {
+            this.options.onComputerControl(action);
+          } catch (err) {
+            logger.error(
+              `[Daemon] computer:${action} control handler failed: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+        } else {
+          logger.info(`[Daemon] Ignoring computer:${action} \u2014 not launched by a Computer service.`);
+        }
+        break;
+      }
     }
   }
   onReminderFire(job) {
@@ -11883,7 +12360,8 @@ var DaemonCore = class {
       runningAgents: runningAgentIds,
       hostname: this.options.hostname ?? os7.hostname(),
       os: this.options.osDescription ?? `${os7.platform()} ${os7.arch()}`,
-      daemonVersion: this.daemonVersion
+      daemonVersion: this.daemonVersion,
+      ...this.computerVersion ? { computerVersion: this.computerVersion } : {}
     });
     this.recordDaemonTrace("daemon.ready.sent", {
       runtimes_count: runtimes.length,