@chanlerdev/scorel 0.0.3 → 0.0.5

package/dist/index.js

@@ -261,7 +261,7 @@ var init_src2 = __esm({
         this.#assertDaemonConnected();
         return this.#request("remove_model_provider", input);
       }
-      async getMemorySettings(input) {
+      async getMemorySettings(input = {}) {
         this.#assertDaemonConnected();
         return (await this.#request("get_memory_settings", input)).memory;
       }
@@ -273,6 +273,14 @@ var init_src2 = __esm({
         this.#assertDaemonConnected();
         return (await this.#request("upsert_memory_settings", input)).memory;
       }
+      async getRuntimeSettings(input = {}) {
+        this.#assertDaemonConnected();
+        return (await this.#request("get_runtime_settings", input)).runtime;
+      }
+      async upsertRuntimeSettings(input) {
+        this.#assertDaemonConnected();
+        return (await this.#request("upsert_runtime_settings", input)).runtime;
+      }
       async getExtensionSettings(input) {
         this.#assertDaemonConnected();
         return (await this.#request("get_extension_settings", input)).extension;
@@ -807,7 +815,7 @@ var init_sessions = __esm({
 // packages/core/src/config/index.ts
 import { readFile as readFile3 } from "node:fs/promises";
 import { join as join4 } from "node:path";
-var SCOREL_CONFIG_SCHEMA, scorelUserRoot, scorelUserConfigPath, scorelSessionsDir, scorelProjectConfigPath, loadScorelConfig, loadScorelConfigProfile, listProviderConnections, listAvailableModels, listProviderModels, resolveModelSelection, renderModelProfileConfig, removeProvider, renderMemoryConfig, renderExtensionConfig, DEFAULT_MEMORY_CONFIG, loadMemory, loadExtensions, loadProviders, loadProviderProfiles, loadProviderModels, loadAvailableModels, loadRoles, readConfigText, parseToml, parseEditableConfig, renderRawConfig, emptyRawConfig, stripComment, requireString, normalizeProviderName, requireProviderCredential, resolveProviderApiKey, providerCredentialSummary, requireNumber, requireNonNegativeNumber, requireCompactThreshold, requireBoolean, requireCustomApi, requireProviderType, requireSection, ensureSection, setConfigValue, assertKnownKey, setValue, parseTomlValue, stripTrailingSlashes, requireIdentifier, tomlString, renderTomlValue, requireModelRole, modelRoles;
+var SCOREL_CONFIG_SCHEMA, scorelUserRoot, scorelUserConfigPath, scorelSessionsDir, loadScorelConfig, loadScorelConfigProfile, listProviderConnections, listAvailableModels, listProviderModels, resolveModelSelection, renderModelProfileConfig, removeProvider, renderMemoryConfig, renderRuntimeConfig, renderExtensionConfig, DEFAULT_MEMORY_CONFIG, DEFAULT_RUNTIME_CONFIG, loadMemory, loadRuntime, loadExtensions, loadProviders, loadProviderProfiles, loadProviderModels, loadAvailableModels, loadRoles, readConfigText, configPathForDevice, parseToml, parseEditableConfig, renderRawConfig, emptyRawConfig, stripComment, requireString, normalizeProviderName, requireProviderCredential, resolveProviderApiKey, providerCredentialSummary, requireNumber, requireNonNegativeNumber, requireCompactThreshold, requireBoolean, requireCustomApi, requireProviderType, requireSection, ensureSection, setConfigValue, assertKnownKey, setValue, parseTomlValue, stripTrailingSlashes, requireIdentifier, tomlString, renderTomlValue, isNodeErrorCode, requireModelRole, modelRoles;
 var init_config = __esm({
   "packages/core/src/config/index.ts"() {
     "use strict";
@@ -815,8 +823,7 @@ var init_config = __esm({
       fixedPaths: {
         userRoot: "~/.scorel",
         userConfig: "~/.scorel/config.toml",
-        sessionsDir: "~/.scorel/sessions",
-        projectConfig: ".scorel/config.toml"
+        sessionsDir: "~/.scorel/sessions"
       },
       sections: {
         root: {
@@ -837,6 +844,9 @@ var init_config = __esm({
         memory: {
           keys: ["enabled", "daily", "sessionMemory", "autoDream", "promoteRoot", "dreamIdleMinutes", "autoCompactThreshold"]
         },
+        runtime: {
+          keys: ["tokenSavingRtk"]
+        },
         extension: {
           keys: ["enabled", "kind"]
         },
@@ -848,7 +858,6 @@ var init_config = __esm({
     scorelUserRoot = (homeDir) => join4(homeDir, ".scorel");
     scorelUserConfigPath = (homeDir) => join4(scorelUserRoot(homeDir), "config.toml");
     scorelSessionsDir = (homeDir) => join4(scorelUserRoot(homeDir), "sessions");
-    scorelProjectConfigPath = (cwd) => join4(cwd, ".scorel", "config.toml");
     loadScorelConfig = async (options) => {
       const env = options.env ?? process.env;
       const raw = parseToml(await readConfigText(options));
@@ -862,6 +871,7 @@ var init_config = __esm({
         models,
         modelProfile: { roles },
         memory: loadMemory(raw),
+        runtime: loadRuntime(raw),
         extensions: loadExtensions(raw)
       };
     };
@@ -878,6 +888,7 @@ var init_config = __esm({
         models,
         modelProfile: { roles },
         memory: loadMemory(raw),
+        runtime: loadRuntime(raw),
         extensions: loadExtensions(raw)
       };
     };
@@ -1134,6 +1145,14 @@ var init_config = __esm({
       };
       return renderRawConfig(raw);
     };
+    renderRuntimeConfig = (input) => {
+      const raw = parseEditableConfig(input.existingConfigText);
+      raw.runtime = {
+        ...loadRuntime(raw),
+        ...input.tokenSavingRtk !== void 0 ? { tokenSavingRtk: requireBoolean(input.tokenSavingRtk, "runtime.tokenSavingRtk") } : {}
+      };
+      return renderRawConfig(raw);
+    };
     renderExtensionConfig = (input) => {
       const raw = parseEditableConfig(input.existingConfigText);
       const extensionId = requireIdentifier(input.extensionId, "extensionId");
@@ -1165,6 +1184,9 @@ var init_config = __esm({
       dreamIdleMinutes: 60,
       autoCompactThreshold: 0.8
     };
+    DEFAULT_RUNTIME_CONFIG = {
+      tokenSavingRtk: false
+    };
     loadMemory = (raw) => ({
       enabled: raw.memory?.enabled ?? DEFAULT_MEMORY_CONFIG.enabled,
       daily: raw.memory?.daily ?? DEFAULT_MEMORY_CONFIG.daily,
@@ -1174,6 +1196,9 @@ var init_config = __esm({
       dreamIdleMinutes: requireNonNegativeNumber(raw.memory?.dreamIdleMinutes ?? DEFAULT_MEMORY_CONFIG.dreamIdleMinutes, "memory.dreamIdleMinutes"),
       autoCompactThreshold: requireCompactThreshold(raw.memory?.autoCompactThreshold ?? DEFAULT_MEMORY_CONFIG.autoCompactThreshold)
     });
+    loadRuntime = (raw) => ({
+      tokenSavingRtk: raw.runtime?.tokenSavingRtk ?? DEFAULT_RUNTIME_CONFIG.tokenSavingRtk
+    });
     loadExtensions = (raw) => {
       const extensions = {};
       for (const [extensionId, extension] of Object.entries(raw.extensions)) {
@@ -1336,21 +1361,25 @@ var init_config = __esm({
       };
     };
     readConfigText = async (options) => {
-      const projectPath = scorelProjectConfigPath(options.cwd);
+      const userPath = configPathForDevice(options);
       try {
-        return await readFile3(projectPath, "utf8");
-      } catch {
-        const home = options.homeDir ?? process.env.HOME;
-        if (!home) {
-          throw new Error(`Scorel config not found: ${projectPath}`);
-        }
-        const userPath = scorelUserConfigPath(home);
-        try {
-          return await readFile3(userPath, "utf8");
-        } catch {
-          throw new Error(`Scorel config not found: ${projectPath} or ${userPath}`);
+        return await readFile3(userPath, "utf8");
+      } catch (cause) {
+        if (isNodeErrorCode(cause, "ENOENT")) {
+          throw new Error(`Scorel config not found: ${userPath}`);
         }
+        throw cause;
+      }
+    };
+    configPathForDevice = (options) => {
+      if (options.scorelHomeDir) {
+        return join4(options.scorelHomeDir, "config.toml");
+      }
+      const home = options.homeDir ?? process.env.HOME;
+      if (!home) {
+        throw new Error("Scorel config not found: HOME is not set");
       }
+      return scorelUserConfigPath(home);
     };
     parseToml = (text) => {
       const result = emptyRawConfig();
@@ -1453,6 +1482,12 @@ var init_config = __esm({
         lines.push(`autoCompactThreshold = ${memory.autoCompactThreshold}`);
         lines.push("");
       }
+      if (raw.runtime) {
+        const runtime = loadRuntime(raw);
+        lines.push("[runtime]");
+        lines.push(`tokenSavingRtk = ${runtime.tokenSavingRtk}`);
+        lines.push("");
+      }
       for (const [extensionId, extension] of Object.entries(raw.extensions).sort(([left], [right]) => left.localeCompare(right))) {
         lines.push(`[extensions.${extensionId}]`);
         lines.push(`enabled = ${extension.enabled === true}`);
@@ -1584,6 +1619,9 @@ var init_config = __esm({
       if (section2 === "memory") {
         return { kind: "memory" };
       }
+      if (section2 === "runtime") {
+        return { kind: "runtime" };
+      }
       const extensionConfigMatch = /^extensions\.([A-Za-z0-9_-]+)\.config$/.exec(section2);
       if (extensionConfigMatch?.[1]) {
         return { kind: "extensionConfig", id: extensionConfigMatch[1] };
@@ -1606,6 +1644,8 @@ var init_config = __esm({
         config.modelProfile.roles ??= {};
       } else if (section2.kind === "memory") {
         config.memory ??= {};
+      } else if (section2.kind === "runtime") {
+        config.runtime ??= {};
       } else if (section2.kind === "extension") {
         config.extensions[section2.id] ??= {};
       } else if (section2.kind === "extensionConfig") {
@@ -1631,6 +1671,9 @@ var init_config = __esm({
       } else if (section2.kind === "memory") {
         config.memory ??= {};
         setValue(config.memory, key, value);
+      } else if (section2.kind === "runtime") {
+        config.runtime ??= {};
+        setValue(config.runtime, key, value);
       } else if (section2.kind === "extension") {
         config.extensions[section2.id] ??= {};
         setValue(config.extensions[section2.id], key, value);
@@ -1684,6 +1727,7 @@ var init_config = __esm({
     };
     tomlString = (value) => `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
     renderTomlValue = (value) => typeof value === "string" ? tomlString(value) : String(value);
+    isNodeErrorCode = (cause, code) => typeof cause === "object" && cause !== null && "code" in cause && cause.code === code;
     requireModelRole = (value, role, models) => {
       const modelId = requireString(value, `model_profile.roles.${role}`);
       if (!models[modelId]) {
@@ -1699,9 +1743,10 @@ var init_config = __esm({
 import { createHash, randomUUID as randomUUID2 } from "node:crypto";
 import { execFile } from "node:child_process";
 import { mkdir as mkdir2, readFile as readFile4, rename as rename2, rm, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname3, extname, isAbsolute, relative, resolve } from "node:path";
+import { userInfo } from "node:os";
+import { basename as basename2, dirname as dirname3, extname, isAbsolute, relative, resolve } from "node:path";
 import { promisify } from "node:util";
-var execFileAsync, DEFAULT_SEARCH_LIMIT, DEFAULT_GREP_LIMIT, DEFAULT_READ_LIMIT, DEFAULT_CONTEXT_WINDOW, READ_TOKEN_BUDGET_RATIO, FULL_READ_TOKEN_BUDGET_RATIO, createCodingTools, parseReadArgs, parseWriteArgs, parseEditArgs, parseBashArgs, parseGlobArgs, parseGrepArgs, parseTodoWriteArgs, parseTodoItem, expectRecord, expectPath, expectString, optionalString, optionalNumber, optionalBoolean, snapshotFile, sameSnapshot, exists, isWithin, linesOf, IMAGE_EXTENSIONS, DOCUMENT_EXTENSIONS, BINARY_EXTENSIONS, assertReadableFileKind, assertTextBuffer, selectCompleteLinesWithinBudget, estimateTokens, renderReadLines, readTokenBudget, completeRanges, hasCompleteCoverage, mergeRanges, countOccurrences, atomicWriteFile, bashResult, truncate, textResult, byteLength, isTimeoutError, isExecError, runRipgrep, splitOutput, vcsExcludes, grepArgs, splitGlobPatterns, paginate, toWorkspaceRelative, relativizeGrepLine, relativizeCountLine, sortPathsByMtime, formatPaginatedText, formatLimitSuffix, parseCountLines;
+var execFileAsync, DEFAULT_SEARCH_LIMIT, DEFAULT_GREP_LIMIT, DEFAULT_READ_LIMIT, DEFAULT_CONTEXT_WINDOW, READ_TOKEN_BUDGET_RATIO, FULL_READ_TOKEN_BUDGET_RATIO, createCodingTools, parseReadArgs, parseWriteArgs, parseEditArgs, parseBashArgs, parseGlobArgs, parseGrepArgs, parseTodoWriteArgs, parseTodoItem, expectRecord, expectPath, expectString, optionalString, optionalNumber, optionalBoolean, snapshotFile, sameSnapshot, exists, isWithin, linesOf, IMAGE_EXTENSIONS, DOCUMENT_EXTENSIONS, BINARY_EXTENSIONS, assertReadableFileKind, assertTextBuffer, selectCompleteLinesWithinBudget, estimateTokens, renderReadLines, readTokenBudget, completeRanges, hasCompleteCoverage, mergeRanges, countOccurrences, atomicWriteFile, bashResult, renderFullBashResult, writeBashArtifact, safeArtifactSegment, projectBashStreams, projectOutputStream, resolveDefaultShell, resolveRtkCommand, rtkRewriteResult, executableRewriteCommand, readRtkGain, rtkSavedTokenDelta, withRtkSavings, nonNegativeInteger, isRecord3, shellQuote, shellCommandArgs, userShell, truncate, sliceBytes, textResult, byteLength, isTimeoutError, isExecError, runRipgrep, splitOutput, vcsExcludes, grepArgs, splitGlobPatterns, paginate, toWorkspaceRelative, relativizeGrepLine, relativizeCountLine, sortPathsByMtime, formatPaginatedText, formatLimitSuffix, parseCountLines;
 var init_coding_tools = __esm({
   "packages/core/src/tools/coding-tools.ts"() {
     "use strict";
@@ -1721,6 +1766,7 @@ var init_coding_tools = __esm({
       const maxOutputBytes = options.maxOutputBytes ?? 16e3;
       const normalReadTokens = options.maxReadTokens ?? readTokenBudget(options.contextWindow, READ_TOKEN_BUDGET_RATIO);
       const fullReadTokens = options.maxReadTokens ?? readTokenBudget(options.contextWindow, FULL_READ_TOKEN_BUDGET_RATIO);
+      const defaultShell = resolveDefaultShell(options.defaultShell);
       const resolveWorkspacePath = (input) => {
         if (input.length === 0) {
           throw new Error("path must not be empty");
@@ -1868,30 +1914,61 @@ String: ${input.old_string}`
         defineTool({
           name: "Bash",
           description: "Execute a shell command in the workspace with timeout and output truncation.",
-          execute: async (_toolCallId, args, signal) => {
+          execute: async (toolCallId, args, signal) => {
             const input = parseBashArgs(args);
             const commandCwd = input.cwd ? resolveWorkspacePath(input.cwd) : root;
             const timeoutMs = Math.min(input.timeoutMs ?? defaultTimeoutMs, maxTimeoutMs);
             const outputLimit = input.maxOutputBytes ?? maxOutputBytes;
+            const rtk = options.tokenSaving?.rtk;
+            const rtkCommand = await resolveRtkCommand(rtk, input.command);
+            const command = rtkCommand.rewrittenCommand ?? input.command;
+            const executionCommand = rtkCommand.executionCommand ?? input.command;
+            const executable = defaultShell;
+            const argv = shellCommandArgs(defaultShell, executionCommand);
+            const rtkGainBefore = rtkCommand.applied && rtk?.executable ? await readRtkGain(rtk.executable, commandCwd) : void 0;
+            const rtkResult = {
+              enabled: rtk?.enabled === true,
+              applied: rtkCommand.applied,
+              ...rtk?.executable ? { executable: rtk.executable } : {},
+              ...rtkCommand.rewrittenCommand ? { rewrittenCommand: rtkCommand.rewrittenCommand } : {}
+            };
             try {
-              const result = await execFileAsync("/bin/bash", ["-lc", input.command], {
+              const result = await execFileAsync(executable, argv, {
                 cwd: commandCwd,
                 timeout: timeoutMs,
                 signal,
                 maxBuffer: Math.max(outputLimit * 4, 1024 * 1024)
               });
-              return bashResult({ exitCode: 0, stdout: result.stdout, stderr: result.stderr, cwd: commandCwd, outputLimit });
+              const rtkSavedTokens = rtk?.executable ? await rtkSavedTokenDelta(rtk.executable, commandCwd, rtkGainBefore) : void 0;
+              return await bashResult({
+                exitCode: 0,
+                stdout: result.stdout,
+                stderr: result.stderr,
+                cwd: commandCwd,
+                outputLimit,
+                artifactDir: options.toolResultArtifacts?.dir,
+                toolCallId,
+                shell: defaultShell,
+                command,
+                rtk: withRtkSavings(rtkResult, rtkSavedTokens)
+              });
             } catch (cause) {
               if (isTimeoutError(cause)) {
                 throw new Error(`Bash command timed out after ${timeoutMs}ms`);
               }
               if (isExecError(cause)) {
-                return bashResult({
+                const rtkSavedTokens = rtk?.executable ? await rtkSavedTokenDelta(rtk.executable, commandCwd, rtkGainBefore) : void 0;
+                return await bashResult({
                   exitCode: typeof cause.code === "number" ? cause.code : 1,
                   stdout: String(cause.stdout ?? ""),
                   stderr: String(cause.stderr ?? cause.message),
                   cwd: commandCwd,
-                  outputLimit
+                  outputLimit,
+                  artifactDir: options.toolResultArtifacts?.dir,
+                  toolCallId,
+                  shell: defaultShell,
+                  command,
+                  rtk: withRtkSavings(rtkResult, rtkSavedTokens)
                 });
               }
               throw cause;
@@ -1905,7 +1982,7 @@ String: ${input.old_string}`
             const input = parseGlobArgs(args);
             const limit = input.head_limit ?? DEFAULT_SEARCH_LIMIT;
             const offset = input.offset ?? 0;
-            const all = await runRipgrep(["--files", "--hidden", "--glob", input.pattern, ...vcsExcludes()], workspaceTarget(input.path), root, signal);
+            const all = (await runRipgrep(["--files", "--hidden", "--glob", input.pattern, ...vcsExcludes()], workspaceTarget(input.path), root, signal)).sort((left, right) => toWorkspaceRelative(root)(left).localeCompare(toWorkspaceRelative(root)(right)));
             const selected = paginate(all, limit, offset);
             const text = selected.items.map(toWorkspaceRelative(root)).join("\n");
             return textResult(text || "No files found", {
@@ -2256,28 +2333,191 @@ ${filenames.join("\n")}`,
         throw cause;
       }
     };
-    bashResult = (input) => {
-      const stdout = truncate(input.stdout, input.outputLimit, "stdout");
-      const stderr = truncate(input.stderr, input.outputLimit, "stderr");
-      return textResult(`exitCode: ${input.exitCode}
+    bashResult = async (input) => {
+      const stdoutBytes = Buffer.byteLength(input.stdout);
+      const stderrBytes = Buffer.byteLength(input.stderr);
+      const fullResult = renderFullBashResult(input);
+      const resultBytes = Buffer.byteLength(fullResult);
+      const shouldArchive = Boolean(input.artifactDir) && resultBytes > input.outputLimit;
+      const artifactPath = shouldArchive && input.artifactDir ? await writeBashArtifact(input.artifactDir, input.toolCallId, fullResult) : void 0;
+      const projection = artifactPath ? projectBashStreams(input.stdout, input.stderr, input.outputLimit) : void 0;
+      const stdout = projection?.stdout ?? truncate(input.stdout, input.outputLimit, "stdout");
+      const stderr = projection?.stderr ?? truncate(input.stderr, input.outputLimit, "stderr");
+      const text = artifactPath ? [
+        `exitCode: ${input.exitCode}`,
+        `cwd: ${input.cwd}`,
+        `artifact: ${artifactPath}`,
+        `resultBytes: ${resultBytes}`,
+        `stdoutBytes: ${stdoutBytes}`,
+        `stderrBytes: ${stderrBytes}`,
+        ...projection?.lines ?? []
+      ].join("\n") : `exitCode: ${input.exitCode}
 cwd: ${input.cwd}
 stdout:
 ${stdout}
 stderr:
-${stderr}`, {
+${stderr}`;
+      return textResult(text, {
         exitCode: input.exitCode,
-        cwd: input.cwd
+        cwd: input.cwd,
+        ...artifactPath ? {
+          artifact: {
+            path: artifactPath,
+            resultBytes,
+            stdoutBytes,
+            stderrBytes
+          }
+        } : {},
+        ...input.shell ? { shell: input.shell } : {},
+        ...input.command ? { command: input.command } : {},
+        ...input.rtk ? {
+          rtk: {
+            ...input.rtk,
+            estimatedOutputTokens: estimateTokens(`${stdout}
+${stderr}`)
+          }
+        } : {}
       });
     };
+    renderFullBashResult = (input) => `exitCode: ${input.exitCode}
+cwd: ${input.cwd}
+stdout:
+${input.stdout}
+stderr:
+${input.stderr}`;
+    writeBashArtifact = async (artifactDir, toolCallId, content) => {
+      const directory = resolve(artifactDir, safeArtifactSegment(toolCallId));
+      await mkdir2(directory, { recursive: true });
+      const path = resolve(directory, "result.txt");
+      await writeFile2(path, content, { encoding: "utf8", mode: 384 });
+      return path;
+    };
+    safeArtifactSegment = (value) => value.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 120) || "tool_call";
+    projectBashStreams = (stdout, stderr, maxBytes) => {
+      const streams = [
+        { label: "stdout", value: stdout },
+        { label: "stderr", value: stderr }
+      ].filter((stream) => Buffer.byteLength(stream.value) > 0);
+      if (streams.length === 0) {
+        return { lines: ["stdout:", "", "stderr:", ""], stdout: "", stderr: "" };
+      }
+      const perStreamBudget = Math.max(1, Math.floor(maxBytes / streams.length));
+      const projected = streams.map((stream) => projectOutputStream(stream.value, perStreamBudget, stream.label));
+      const stdoutText = projected.find((stream) => stream.label === "stdout")?.text ?? "stdout:\n";
+      const stderrText = projected.find((stream) => stream.label === "stderr")?.text ?? "stderr:\n";
+      return {
+        lines: projected.map((stream) => stream.text),
+        stdout: stdoutText,
+        stderr: stderrText
+      };
+    };
+    projectOutputStream = (value, maxBytes, label) => {
+      const bytes = Buffer.byteLength(value);
+      if (bytes <= maxBytes) {
+        return { label, text: `${label}:
+${value}` };
+      }
+      const headBytes = Math.max(1, Math.floor(maxBytes / 2));
+      const tailBytes = Math.max(1, maxBytes - headBytes);
+      return {
+        label,
+        text: [
+          `${label} head:`,
+          sliceBytes(value, 0, headBytes),
+          `${label} tail:`,
+          sliceBytes(value, Math.max(0, bytes - tailBytes), bytes),
+          `[${label} archived: ${bytes} bytes; projection budget ${maxBytes} bytes]`
+        ].join("\n")
+      };
+    };
+    resolveDefaultShell = (input) => {
+      const shell = input || process.env.SHELL || userShell() || "/bin/sh";
+      return shell.trim() || "/bin/sh";
+    };
+    resolveRtkCommand = async (rtk, command) => {
+      if (rtk?.enabled !== true || typeof rtk.executable !== "string" || rtk.executable.length === 0) {
+        return { applied: false };
+      }
+      try {
+        const result = await execFileAsync(rtk.executable, ["rewrite", command], {
+          timeout: 5e3,
+          maxBuffer: 1024 * 1024
+        });
+        return rtkRewriteResult(result.stdout, rtk.executable);
+      } catch (cause) {
+        if (isExecError(cause) && typeof cause.stdout === "string") {
+          return rtkRewriteResult(cause.stdout, rtk.executable);
+        }
+        return { applied: false };
+      }
+    };
+    rtkRewriteResult = (stdout, executable) => {
+      const rewrittenCommand = stdout.trim();
+      return rewrittenCommand ? { applied: true, rewrittenCommand, executionCommand: executableRewriteCommand(rewrittenCommand, executable) } : { applied: false };
+    };
+    executableRewriteCommand = (command, executable) => command.replace(/^rtk(?=\s|$)/, shellQuote(executable));
+    readRtkGain = async (rtkExecutable, cwd) => {
+      try {
+        const { stdout } = await execFileAsync(rtkExecutable, ["gain", "--project", "--format", "json"], {
+          cwd,
+          timeout: 5e3,
+          maxBuffer: 5e6
+        });
+        const parsed = JSON.parse(stdout);
+        if (!isRecord3(parsed) || !isRecord3(parsed.summary)) {
+          return void 0;
+        }
+        return { savedTokens: nonNegativeInteger(parsed.summary.total_saved) };
+      } catch {
+        return void 0;
+      }
+    };
+    rtkSavedTokenDelta = async (rtkExecutable, cwd, before) => {
+      if (!before) {
+        return void 0;
+      }
+      const after = await readRtkGain(rtkExecutable, cwd);
+      if (!after) {
+        return void 0;
+      }
+      return Math.max(0, after.savedTokens - before.savedTokens);
+    };
+    withRtkSavings = (rtk, savedTokens) => ({
+      ...rtk,
+      ...rtk.applied && savedTokens !== void 0 ? { estimatedSavedTokens: savedTokens } : {}
+    });
+    nonNegativeInteger = (value) => {
+      if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+        return 0;
+      }
+      return Math.floor(value);
+    };
+    isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    shellQuote = (value) => `'${value.replace(/'/g, "'\\''")}'`;
+    shellCommandArgs = (shell, command) => {
+      const name = basename2(shell).toLowerCase();
+      if (name === "csh" || name === "tcsh" || name === "fish") {
+        return ["-c", command];
+      }
+      return ["-lc", command];
+    };
+    userShell = () => {
+      try {
+        return userInfo().shell ?? void 0;
+      } catch {
+        return void 0;
+      }
+    };
     truncate = (value, maxBytes, label) => {
       const bytes = Buffer.byteLength(value);
       if (bytes <= maxBytes) {
         return value;
       }
-      const truncated = Buffer.from(value).subarray(0, maxBytes).toString("utf8");
+      const truncated = sliceBytes(value, 0, maxBytes);
       return `${truncated}
 [${label} truncated: ${bytes} bytes > ${maxBytes} bytes]`;
     };
+    sliceBytes = (value, start, end) => Buffer.from(value).subarray(start, end).toString("utf8");
     textResult = (text, details) => ({
       content: [{ type: "text", text }],
       details
@@ -2452,7 +2692,7 @@ var init_tools = __esm({
 });
 
 // packages/core/src/channel/index.ts
-var createSendChannelMessageTool, parseSendChannelMessageInput, parseAttachments, optionalString2, isRecord3;
+var createSendChannelMessageTool, parseSendChannelMessageInput, parseAttachments, optionalString2, isRecord4;
 var init_channel = __esm({
   "packages/core/src/channel/index.ts"() {
     "use strict";
@@ -2470,7 +2710,7 @@ var init_channel = __esm({
       }
     });
     parseSendChannelMessageInput = (value) => {
-      if (!isRecord3(value)) {
+      if (!isRecord4(value)) {
         throw new Error("SendChannelMessage args must be an object");
       }
       const text = typeof value.text === "string" && value.text.trim().length > 0 ? value.text : void 0;
@@ -2499,7 +2739,7 @@ var init_channel = __esm({
         throw new Error("SendChannelMessage.attachments must be an array");
       }
       return value.map((item, index) => {
-        if (!isRecord3(item)) {
+        if (!isRecord4(item)) {
           throw new Error(`SendChannelMessage.attachments.${index} must be an object`);
         }
         if (item.type !== "image" && item.type !== "file") {
@@ -2528,14 +2768,14 @@ var init_channel = __esm({
       }
       return value;
     };
-    isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    isRecord4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   }
 });
 
 // packages/core/src/extensions/index.ts
 import { readFile as readFile5 } from "node:fs/promises";
 import { dirname as dirname4, resolve as resolve2 } from "node:path";
-var loadExtensionManifest, parseExtensionManifest, requireString2, requireIdentifier2, requireKind, requireRelativePath, optionalRelativePaths, isRecord4;
+var loadExtensionManifest, parseExtensionManifest, requireString2, requireIdentifier2, requireKind, requireRelativePath, optionalRelativePaths, isRecord5;
 var init_extensions = __esm({
   "packages/core/src/extensions/index.ts"() {
     "use strict";
@@ -2548,7 +2788,7 @@ var init_extensions = __esm({
         const message = cause instanceof Error ? cause.message : String(cause);
         throw new Error(`Invalid extension manifest JSON at ${manifestPath}: ${message}`);
       }
-      if (!isRecord4(value)) {
+      if (!isRecord5(value)) {
         throw new Error(`Extension manifest at ${manifestPath} must be an object`);
       }
       const rootDir = dirname4(resolve2(manifestPath));
@@ -2604,7 +2844,7 @@ var init_extensions = __esm({
       }
       return value.map((item, index) => requireRelativePath(item, `${name}.${index}`, manifestPath));
     };
-    isRecord4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    isRecord5 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   }
 });
 
@@ -2613,7 +2853,7 @@ import { existsSync } from "node:fs";
 import { readdir as readdir4, readFile as readFile6 } from "node:fs/promises";
 import { homedir as homedir2, platform, release } from "node:os";
 import { dirname as dirname5, join as join5, resolve as resolve3 } from "node:path";
-var BASELINE_PROMPT, buildInstructionSnapshot, renderSystemPrompt, section, discoverAgentsSources, projectAgentsPaths, findGitRoot, renderAgentsBlock, renderWorkspaceBlock, renderEnvironmentBlock, renderTimeBlock, isNodeErrorCode;
+var BASELINE_PROMPT, buildInstructionSnapshot, renderSystemPrompt, section, discoverAgentsSources, projectAgentsPaths, findGitRoot, renderAgentsBlock, renderWorkspaceBlock, renderEnvironmentBlock, renderTimeBlock, isNodeErrorCode2;
 var init_instructions = __esm({
   "packages/core/src/instructions/index.ts"() {
     "use strict";
@@ -2677,7 +2917,7 @@ var init_instructions = __esm({
             content
           });
         } catch (cause) {
-          if (!isNodeErrorCode(cause, "ENOENT") && !isNodeErrorCode(cause, "ENOTDIR")) {
+          if (!isNodeErrorCode2(cause, "ENOENT") && !isNodeErrorCode2(cause, "ENOTDIR")) {
             throw cause;
           }
         }
@@ -2740,7 +2980,7 @@ var init_instructions = __esm({
     };
     renderEnvironmentBlock = (env) => [`Platform: ${platform()} ${release()}`, `Shell: ${env.SHELL ?? "unknown"}`].join("\n");
     renderTimeBlock = (timestamp) => [`Session started at: ${new Date(timestamp).toISOString()}`, `Timezone: ${Intl.DateTimeFormat().resolvedOptions().timeZone}`].join("\n");
-    isNodeErrorCode = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
+    isNodeErrorCode2 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
   }
 });
 
@@ -2748,7 +2988,7 @@ var init_instructions = __esm({
 import { appendFile, mkdir as mkdir3, readFile as readFile7, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
 import { join as join6 } from "node:path";
-var memoryDate, scorelMemoryPaths, scorelSessionMemoryPaths, buildMemoryContext, renderMemoryHarness, appendDailyEntry, createAppendDailyTool, renderDailyEntry, readMemoryDreamState, writeMemoryDreamState, readSessionMemory, writeSessionMemory, renderSessionMemory, ensureMemoryFiles, ensureFile, readOptional, trimForContext, compactLine, renderList, renderBullets, normalizeMarkdownFile, parseAppendDailyInput, validateAppendDailyInput, isLowSignalSummary, containsNormalizedDailyEntry, normalizeDailyText, requireString3, optionalStringArray, optionalNumber2, optionalString3, parseLastFailure, isRecord5, safeProjectId, isNodeErrorCode2;
+var memoryDate, scorelMemoryPaths, scorelSessionMemoryPaths, buildMemoryContext, renderMemoryHarness, appendDailyEntry, createAppendDailyTool, renderDailyEntry, readMemoryDreamState, writeMemoryDreamState, readSessionMemory, writeSessionMemory, renderSessionMemory, ensureMemoryFiles, ensureFile, readOptional, trimForContext, compactLine, renderList, renderBullets, normalizeMarkdownFile, parseAppendDailyInput, validateAppendDailyInput, isLowSignalSummary, containsNormalizedDailyEntry, normalizeDailyText, requireString3, optionalStringArray, optionalNumber2, optionalString3, parseLastFailure, isRecord6, safeProjectId, isNodeErrorCode3;
 var init_memory = __esm({
   "packages/core/src/memory/index.ts"() {
     "use strict";
@@ -2950,7 +3190,7 @@ var init_memory = __esm({
       try {
         await writeFile3(path, content, { encoding: "utf8", flag: "wx", mode: 384 });
       } catch (cause) {
-        if (!isNodeErrorCode2(cause, "EEXIST")) {
+        if (!isNodeErrorCode3(cause, "EEXIST")) {
           throw cause;
         }
       }
@@ -2959,7 +3199,7 @@ var init_memory = __esm({
       try {
         return await readFile7(path, "utf8");
       } catch (cause) {
-        if (isNodeErrorCode2(cause, "ENOENT")) {
+        if (isNodeErrorCode3(cause, "ENOENT")) {
           return "";
         }
         throw cause;
@@ -2980,7 +3220,7 @@ var init_memory = __esm({
     normalizeMarkdownFile = (value) => `${value.trimEnd()}
 `;
     parseAppendDailyInput = (value) => {
-      if (!isRecord5(value)) {
+      if (!isRecord6(value)) {
         throw new Error("AppendDaily args must be an object");
       }
       const summary = requireString3(value.summary, "summary");
@@ -3046,19 +3286,19 @@ var init_memory = __esm({
     optionalNumber2 = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
     optionalString3 = (value) => typeof value === "string" && value.trim() ? value : void 0;
     parseLastFailure = (value) => {
-      if (!isRecord5(value)) return void 0;
+      if (!isRecord6(value)) return void 0;
       const at = optionalNumber2(value.at);
       const message = optionalString3(value.message);
       return at !== void 0 && message ? { at, message } : void 0;
     };
-    isRecord5 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    isRecord6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
     safeProjectId = (projectId) => {
       if (!/^[A-Za-z0-9_-]+$/.test(projectId)) {
         throw new Error("projectId must contain only letters, numbers, underscores, or hyphens");
       }
       return projectId;
     };
-    isNodeErrorCode2 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
+    isNodeErrorCode3 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
   }
 });
 
@@ -3347,7 +3587,7 @@ var init_pi_ai = __esm({
 });
 
 // packages/core/src/runtime/index.ts
-var ScorelRuntime, normalizeAssistantMessage, isAssistantMessage, partialAssistantMessage;
+var ScorelRuntime, toolResultForContext, normalizeAssistantMessage, isAssistantMessage, partialAssistantMessage;
 var init_runtime = __esm({
   "packages/core/src/runtime/index.ts"() {
     "use strict";
@@ -3496,7 +3736,7 @@ var init_runtime = __esm({
           type: "tool_result",
           toolCallId: toolCall.toolCallId,
           toolName: toolCall.toolName,
-          result,
+          result: toolResultForContext(result),
           isError
         };
         return {
@@ -3505,6 +3745,9 @@ var init_runtime = __esm({
         };
       }
     };
+    toolResultForContext = (result) => ({
+      content: result.content
+    });
     normalizeAssistantMessage = (value, streamed, fallbackStopReason) => {
       if (value) {
         if (!isAssistantMessage(value)) {
@@ -3536,7 +3779,7 @@ var init_runtime = __esm({
 import { appendFile as appendFile2, mkdir as mkdir4, readFile as readFile8, writeFile as writeFile4 } from "node:fs/promises";
 import { dirname as dirname6, join as join7 } from "node:path";
 function assertTreeEvent(value) {
-  if (!isRecord6(value)) {
+  if (!isRecord7(value)) {
     throw new SessionStoreError("invalid_event", "Event must be an object");
   }
   if (value.type === "session_header") {
@@ -3548,7 +3791,7 @@ function assertTreeEvent(value) {
   if (typeof value.id !== "string" || value.parentId !== null && typeof value.parentId !== "string" || typeof value.seq !== "number" || typeof value.clientId !== "string" || typeof value.ts !== "number") {
     throw new SessionStoreError("invalid_event", "Event is missing required base fields");
   }
-  if ((value.type === "user_message" || value.type === "assistant_message" || value.type === "tool_result") && !isRecord6(value.message)) {
+  if ((value.type === "user_message" || value.type === "assistant_message" || value.type === "tool_result") && !isRecord7(value.message)) {
     throw new SessionStoreError("invalid_event", "Message event is missing message payload");
   }
   if (value.type === "session_title_updated" && !isSessionTitleUpdated(value)) {
@@ -3573,7 +3816,7 @@ function assertTreeEvent(value) {
     throw new SessionStoreError("invalid_event", "skill_index_delta is missing delta payload");
   }
 }
-var SessionStoreError, SessionTree, JsonlSession, sessionFilePath, sessionLogFilePath, createSession, loadSession, buildContext, retainedMessagesBeforeCompact, isRetainedContextStart, parseJsonLine, parseHeader, parseSessionEvent, validateSessionMatch, isConversationEvent, isInstructionSnapshot, isHarnessItem, isCompactEvent, isQueueUpdate, isSessionTitleUpdated, isSkillIndexSnapshot, isSkillIndexDelta, isSkillIndexEntry, appendHarnessItemToContext, appendReminderToToolResult, isToolResultWithContent, renderSystemReminder, compactSummaryMessage, cloneMessage, isRecord6;
+var SessionStoreError, SessionTree, JsonlSession, sessionFilePath, sessionLogFilePath, sessionArtifactsDirPath, createSession, loadSession, buildContext, retainedMessagesBeforeCompact, isRetainedContextStart, parseJsonLine, parseHeader, parseSessionEvent, validateSessionMatch, isConversationEvent, isInstructionSnapshot, isHarnessItem, isCompactEvent, isQueueUpdate, isSessionTitleUpdated, isSkillIndexSnapshot, isSkillIndexDelta, isSkillIndexEntry, appendHarnessItemToContext, appendReminderToToolResult, isToolResultWithContent, renderSystemReminder, compactSummaryMessage, cloneMessage, isRecord7;
 var init_session = __esm({
   "packages/core/src/session/index.ts"() {
     "use strict";
@@ -3754,6 +3997,7 @@ var init_session = __esm({
     };
     sessionFilePath = (sessionsDir, sessionId) => join7(sessionsDir, `${sessionId}.jsonl`);
     sessionLogFilePath = (sessionsDir, sessionId) => join7(sessionsDir, `${sessionId}.log`);
+    sessionArtifactsDirPath = (sessionsDir, sessionId) => join7(sessionsDir, `${sessionId}.artifacts`);
     createSession = async ({ sessionsDir, header }) => {
       const validHeader = parseHeader(header);
       await mkdir4(sessionsDir, { recursive: true });
@@ -3841,13 +4085,13 @@ var init_session = __esm({
       }
     };
     parseHeader = (value) => {
-      if (!isRecord6(value)) {
+      if (!isRecord7(value)) {
         throw new SessionStoreError("invalid_header", "Session header must be an object");
       }
       if (value.version !== 1 || typeof value.sessionId !== "string" || typeof value.deviceId !== "string") {
         throw new SessionStoreError("invalid_header", "Session header is missing required identity fields");
       }
-      if (typeof value.createdAt !== "number" || !isRecord6(value.meta)) {
+      if (typeof value.createdAt !== "number" || !isRecord7(value.meta)) {
         throw new SessionStoreError("invalid_header", "Session header is missing createdAt or meta");
       }
       if (typeof value.meta.projectId !== "string" || value.meta.projectId.length === 0) {
@@ -3861,7 +4105,7 @@ var init_session = __esm({
       return value;
     };
     validateSessionMatch = (header, value) => {
-      if (!isRecord6(value) || typeof value.sessionId !== "string") {
+      if (!isRecord7(value) || typeof value.sessionId !== "string") {
         throw new SessionStoreError("invalid_header", "Event must be an object with a sessionId");
       }
       if (value.sessionId !== header.sessionId) {
@@ -3870,24 +4114,24 @@ var init_session = __esm({
     };
     isConversationEvent = (event) => event.type === "user_message" || event.type === "assistant_message" || event.type === "tool_result" || event.type === "harness_item" || event.type === "compact";
     isInstructionSnapshot = (value) => {
-      if (!isRecord6(value) || value.version !== 1 || typeof value.cwd !== "string" || !Array.isArray(value.sections)) {
+      if (!isRecord7(value) || value.version !== 1 || typeof value.cwd !== "string" || !Array.isArray(value.sections)) {
         return false;
       }
       return value.sections.every(
-        (section2) => isRecord6(section2) && typeof section2.kind === "string" && typeof section2.frozenAt === "number" && typeof section2.renderedBlock === "string"
+        (section2) => isRecord7(section2) && typeof section2.kind === "string" && typeof section2.frozenAt === "number" && typeof section2.renderedBlock === "string"
       );
     };
-    isHarnessItem = (value) => isRecord6(value) && typeof value.kind === "string" && typeof value.origin === "string" && typeof value.content === "string" && (value.visibility === "display" || value.visibility === "hidden" || value.visibility === "compact");
+    isHarnessItem = (value) => isRecord7(value) && typeof value.kind === "string" && typeof value.origin === "string" && typeof value.content === "string" && (value.visibility === "display" || value.visibility === "hidden" || value.visibility === "compact");
     isCompactEvent = (value) => typeof value.summary === "string" && typeof value.compactedThrough === "string" && typeof value.tokensBefore === "number" && typeof value.tokensAfter === "number" && typeof value.retainedEventCount === "number";
     isQueueUpdate = (value) => (value.queue === "follow_up" || value.queue === "steer") && value.operation === "rewrite" && Array.isArray(value.items) && (value.anchorEventId === null || typeof value.anchorEventId === "string") && value.items.every(
-      (item) => isRecord6(item) && typeof item.id === "string" && Array.isArray(item.content) && typeof item.createdAt === "number" && typeof item.updatedAt === "number" && typeof item.clientId === "string"
+      (item) => isRecord7(item) && typeof item.id === "string" && Array.isArray(item.content) && typeof item.createdAt === "number" && typeof item.updatedAt === "number" && typeof item.clientId === "string"
     );
-    isSessionTitleUpdated = (value) => typeof value.title === "string" && value.title.length > 0 && (value.source === "model" || value.source === "user") && (value.derivedFrom === void 0 || isRecord6(value.derivedFrom) && typeof value.derivedFrom.eventId === "string" && typeof value.derivedFrom.seq === "number");
+    isSessionTitleUpdated = (value) => typeof value.title === "string" && value.title.length > 0 && (value.source === "model" || value.source === "user") && (value.derivedFrom === void 0 || isRecord7(value.derivedFrom) && typeof value.derivedFrom.eventId === "string" && typeof value.derivedFrom.seq === "number");
     isSkillIndexSnapshot = (value) => (value.anchorEventId === null || typeof value.anchorEventId === "string") && Array.isArray(value.entries) && value.entries.every(isSkillIndexEntry);
     isSkillIndexDelta = (value) => (value.anchorEventId === null || typeof value.anchorEventId === "string") && Array.isArray(value.added) && Array.isArray(value.changed) && Array.isArray(value.removed) && value.added.every(isSkillIndexEntry) && value.changed.every(isSkillIndexEntry) && value.removed.every(
-      (item) => isRecord6(item) && typeof item.name === "string" && typeof item.previousPath === "string"
+      (item) => isRecord7(item) && typeof item.name === "string" && typeof item.previousPath === "string"
     );
-    isSkillIndexEntry = (value) => isRecord6(value) && typeof value.name === "string" && typeof value.path === "string" && (value.scope === "user" || value.scope === "project" || value.scope === "extension") && typeof value.description === "string" && typeof value.mtimeMs === "number" && typeof value.size === "number" && typeof value.contentHash === "string" && typeof value.priority === "number";
+    isSkillIndexEntry = (value) => isRecord7(value) && typeof value.name === "string" && typeof value.path === "string" && (value.scope === "user" || value.scope === "project" || value.scope === "extension") && typeof value.description === "string" && typeof value.mtimeMs === "number" && typeof value.size === "number" && typeof value.contentHash === "string" && typeof value.priority === "number";
     appendHarnessItemToContext = (messages, event) => {
       const reminder = renderSystemReminder(event.item.content);
       const last = messages.at(-1);
@@ -3924,7 +4168,7 @@ ${reminder}` }]
       }
       return false;
     };
-    isToolResultWithContent = (value) => isRecord6(value) && Array.isArray(value.content);
+    isToolResultWithContent = (value) => isRecord7(value) && Array.isArray(value.content);
     renderSystemReminder = (content) => `<system-reminder>
 ${content}
 </system-reminder>`;
@@ -3948,21 +4192,20 @@ ${content}
     cloneMessage = (message) => ({
       ...message,
       content: message.content.map((block) => {
-        if (block.type !== "tool_result" || !isRecord6(block.result)) {
+        if (block.type !== "tool_result" || !isRecord7(block.result)) {
           return { ...block };
         }
-        const content = Array.isArray(block.result.content) ? { content: block.result.content.map((item) => isRecord6(item) ? { ...item } : item) } : {};
+        const content = Array.isArray(block.result.content) ? { content: block.result.content.map((item) => isRecord7(item) ? { ...item } : item) } : {};
         return {
           ...block,
           result: {
-            ...block.result,
-            ...content
+            content: content.content ?? []
           }
         };
       }),
       ...message.meta ? { meta: { ...message.meta } } : {}
     });
-    isRecord6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   }
 });
 
@@ -3972,7 +4215,7 @@ import { existsSync as existsSync2 } from "node:fs";
 import { readdir as readdir5, readFile as readFile9, stat as stat4 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
 import { dirname as dirname7, join as join8, resolve as resolve4 } from "node:path";
-var scanSkillIndex, diffSkillIndex, hasSkillIndexDelta, renderSkillListing, renderSkillDelta, createSkillTool, projectSkillRoots, readSkillEntry, parseSkillMetadata, firstParagraph, parseSkillArgs, findGitRoot2, isNodeErrorCode3;
+var scanSkillIndex, diffSkillIndex, hasSkillIndexDelta, renderSkillListing, renderSkillDelta, createSkillTool, projectSkillRoots, readSkillEntry, parseSkillMetadata, firstParagraph, parseSkillArgs, findGitRoot2, isNodeErrorCode4;
 var init_skills = __esm({
   "packages/core/src/skills/index.ts"() {
     "use strict";
@@ -3995,7 +4238,7 @@ var init_skills = __esm({
         try {
           children = await readdir5(root.path);
         } catch (cause) {
-          if (isNodeErrorCode3(cause, "ENOENT") || isNodeErrorCode3(cause, "ENOTDIR")) {
+          if (isNodeErrorCode4(cause, "ENOENT") || isNodeErrorCode4(cause, "ENOTDIR")) {
             continue;
           }
           throw cause;
@@ -4108,7 +4351,7 @@ var init_skills = __esm({
       try {
         [fileStat, content] = await Promise.all([stat4(options.skillPath), readFile9(options.skillPath, "utf8")]);
       } catch (cause) {
-        if (isNodeErrorCode3(cause, "ENOENT") || isNodeErrorCode3(cause, "ENOTDIR")) {
+        if (isNodeErrorCode4(cause, "ENOENT") || isNodeErrorCode4(cause, "ENOTDIR")) {
           return void 0;
         }
         throw cause;
@@ -4188,7 +4431,7 @@ var init_skills = __esm({
         current = next;
       }
     };
-    isNodeErrorCode3 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
+    isNodeErrorCode4 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
   }
 });
 
@@ -4534,12 +4777,15 @@ var init_host_client = __esm({
 });
 
 // packages/daemon/src/index.ts
+import { execFile as execFile2 } from "node:child_process";
 import { existsSync as existsSync3 } from "node:fs";
-import { appendFile as appendFile3, mkdir as mkdir6, readFile as readFile11, readdir as readdir6, rm as rm2, writeFile as writeFile6 } from "node:fs/promises";
-import { dirname as dirname8, join as join10, resolve as resolve5 } from "node:path";
+import { appendFile as appendFile3, mkdir as mkdir6, readFile as readFile11, readdir as readdir6, rename as rename3, rm as rm2, writeFile as writeFile6 } from "node:fs/promises";
+import { userInfo as userInfo2 } from "node:os";
+import { basename as basename3, dirname as dirname8, join as join10, resolve as resolve5 } from "node:path";
 import { pathToFileURL } from "node:url";
+import { promisify as promisify2 } from "node:util";
 import { WebSocketServer } from "ws";
-var daemonPackageName, SESSION_MEMORY_COMPACT_WAIT_MS, AUTO_COMPACT_RETAINED_EVENTS, localDaemonStateFile, createLocalDaemonState, readLocalDaemonState, removeLocalDaemonState, markDaemonStopped, daemonStateLiveness, defaultIsPidAlive, startRemoteDaemonWebSocketServer, startScorelHostWebSocketServer, closeWebSocketServer, createRealRuntime, ScorelHost, isMissingConfigError, createEmbeddedTransport, isNodeErrorCode4, wireErrorCode, hasContinuousCoverage, countContentBlocks, normalizeContent, inputText, assistantText, messageText, estimateScorelMessagesTokens, estimateTextTokens, compactLine2, parseSessionMemoryJson, stringArray, disabledMemorySettings, runtimeChannelContextFromWire, parseQueuedChannelContext, imBindingKey, defaultBuiltinExtensionsDir, runtimeModuleDir, findBuiltinExtensionsDir, isSteerMessage, stripImCommandPrefix, isRecord7, parseMemoryUpdate, normalizeMarkdownFile2, sanitizeSessionTitle, shortStack, formatDiagnosticLine, formatDiagnosticValue;
+var daemonPackageName, SESSION_MEMORY_COMPACT_WAIT_MS, AUTO_COMPACT_RETAINED_EVENTS, execFileAsync2, localDaemonStateFile, createLocalDaemonState, readLocalDaemonState, removeLocalDaemonState, markDaemonStopped, daemonStateLiveness, defaultIsPidAlive, startRemoteDaemonWebSocketServer, startScorelHostWebSocketServer, closeWebSocketServer, createRealRuntime, ScorelHost, isMissingConfigError, createEmbeddedTransport, isNodeErrorCode5, wireErrorCode, hasContinuousCoverage, countContentBlocks, normalizeContent, inputText, assistantText, messageText, estimateScorelMessagesTokens, estimateTextTokens, compactLine2, parseSessionMemoryJson, stringArray, disabledMemorySettings, detectRtk, ensureRtkAvailable, emptyRuntimeStats, readRuntimeStats, writeRuntimeStats, parseRuntimeStats, parseRuntimeStatsBuckets, addRtkSavings, addRuntimeStatsBucket, rtkSavingsFromToolResult, nonNegativeInteger2, resolveDefaultShell2, shellCommandArgs2, userShell2, runtimeChannelContextFromWire, parseQueuedChannelContext, parseQueuedModelSelection, imBindingKey, defaultBuiltinExtensionsDir, runtimeModuleDir, findBuiltinExtensionsDir, isSteerMessage, stripImCommandPrefix, isRecord8, parseMemoryUpdate, normalizeMarkdownFile2, sanitizeSessionTitle, shortStack, formatDiagnosticLine, formatDiagnosticValue;
 var init_src4 = __esm({
   "packages/daemon/src/index.ts"() {
     "use strict";
@@ -4554,6 +4800,7 @@ var init_src4 = __esm({
     daemonPackageName = "@scorel/daemon";
     SESSION_MEMORY_COMPACT_WAIT_MS = 5e3;
     AUTO_COMPACT_RETAINED_EVENTS = 8;
+    execFileAsync2 = promisify2(execFile2);
     localDaemonStateFile = (stateDir) => join10(stateDir, "daemon.json");
     createLocalDaemonState = async (options) => {
       const state = {
@@ -4765,9 +5012,10 @@ var init_src4 = __esm({
       }
       server.close((error) => error ? reject(error) : resolve7());
     });
-    createRealRuntime = (options) => {
+    createRealRuntime = async (options) => {
       const selection = resolveModelSelection(options.config, options.modelSelection);
       const model = resolvePiAiModel(selection.config);
+      const rtkExecutable = options.rtkExecutable ?? (options.config.runtime.tokenSavingRtk ? (await detectRtk()).executable : void 0);
       const runtime = new ScorelRuntime({
         provider: createPiAiProvider({
           model,
@@ -4775,7 +5023,17 @@ var init_src4 = __esm({
         })
       });
       if (options.includeTools !== false) {
-        for (const tool of createCodingTools({ cwd: options.cwd, contextWindow: model.contextWindow })) {
+        for (const tool of createCodingTools({
+          cwd: options.cwd,
+          contextWindow: model.contextWindow,
+          ...options.sessionsDir && options.sessionId ? { toolResultArtifacts: { dir: sessionArtifactsDirPath(options.sessionsDir, options.sessionId) } } : {},
+          tokenSaving: {
+            rtk: {
+              enabled: options.config.runtime.tokenSavingRtk,
+              executable: rtkExecutable
+            }
+          }
+        })) {
           runtime.registerTool(tool);
         }
       }
@@ -4794,6 +5052,8 @@ var init_src4 = __esm({
       #createRuntime;
       #memoryHomeDir;
       #onSessionListChanged;
+      #idleShutdownMs;
+      #onIdleShutdown;
       #now;
       #createId;
       #sessions = /* @__PURE__ */ new Map();
@@ -4805,6 +5065,9 @@ var init_src4 = __esm({
       #imExtensions = /* @__PURE__ */ new Map();
       #imBindings = /* @__PURE__ */ new Map();
       #registry;
+      #runtimeStatsQueue = Promise.resolve();
+      #idleShutdownTimer;
+      #lastActiveWorkAt;
       #started = false;
       constructor(options) {
         this.#sessionsDir = options.sessionsDir;
@@ -4819,8 +5082,11 @@ var init_src4 = __esm({
         this.#createRuntime = options.createRuntime;
         this.#memoryHomeDir = options.memoryHomeDir;
         this.#onSessionListChanged = options.onSessionListChanged;
+        this.#idleShutdownMs = options.idleShutdownMs;
+        this.#onIdleShutdown = options.onIdleShutdown;
         this.#now = options.now ?? Date.now;
         this.#createId = options.createId ?? (() => crypto.randomUUID());
+        this.#lastActiveWorkAt = this.#now();
         this.#registry = new ProjectRegistry({
           sessionsDir: this.#sessionsDir,
           projectsPath: options.projectsPath,
@@ -4833,8 +5099,10 @@ var init_src4 = __esm({
         await mkdir6(this.#scorelHomeDir, { recursive: true });
         await this.#loadImBindings();
         await this.#startEnabledImExtensions();
+        this.#scheduleIdleShutdownCheck();
       }
       async shutdown() {
+        this.#clearIdleShutdownTimer();
         for (const schedule of this.#memoryDreams.values()) {
           if (schedule.timer) {
             clearTimeout(schedule.timer);
@@ -4849,9 +5117,11 @@ var init_src4 = __esm({
         this.#assertStarted();
         await this.#stopImExtensions();
         await this.#startEnabledImExtensions();
+        this.#scheduleIdleShutdownCheck();
       }
       connect(connection, sessionId) {
         this.#assertStarted();
+        this.#clearIdleShutdownTimer();
         connection.sessionId = sessionId;
         this.#connections.add(connection);
         if (sessionId) {
@@ -4876,10 +5146,18 @@ var init_src4 = __esm({
           });
         }
         this.#connections.delete(connection);
+        this.#scheduleIdleShutdownCheck();
       }
       releaseSessionEventBuffer(sessionId) {
         this.#events.delete(sessionId);
       }
+      activityStatus() {
+        const activeWork = this.#hasActiveWork();
+        if (activeWork) {
+          this.#lastActiveWorkAt = this.#now();
+        }
+        return { activeWork, lastActiveWorkAt: this.#lastActiveWorkAt };
+      }
       async handleMessage(connection, message) {
         this.#assertStarted();
         try {
@@ -4896,6 +5174,8 @@ var init_src4 = __esm({
             return;
           }
           throw cause;
+        } finally {
+          this.#scheduleIdleShutdownCheck();
         }
       }
       async listDirectories(path) {
@@ -5004,7 +5284,7 @@ var init_src4 = __esm({
             break;
           }
           case "get_memory_settings": {
-            this.#respond(connection, message, { memory: await this.#memorySettingsForProject(message.projectId) });
+            this.#respond(connection, message, { memory: await this.#memorySettings(message.projectId) });
             break;
           }
           case "get_memory_status": {
@@ -5015,6 +5295,14 @@ var init_src4 = __esm({
             this.#respond(connection, message, { memory: await this.#handleUpsertMemorySettings(message) });
             break;
           }
+          case "get_runtime_settings": {
+            this.#respond(connection, message, { runtime: await this.#runtimeSettings(message.projectId) });
+            break;
+          }
+          case "upsert_runtime_settings": {
+            this.#respond(connection, message, { runtime: await this.#handleUpsertRuntimeSettings(message) });
+            break;
+          }
           case "get_extension_settings": {
             this.#respond(connection, message, { extension: await this.#extensionSettings(message.extensionId) });
             break;
@@ -5043,6 +5331,39 @@ var init_src4 = __esm({
             break;
         }
       }
+      #scheduleIdleShutdownCheck() {
+        this.#clearIdleShutdownTimer();
+        if (!this.#shouldIdleShutdown()) {
+          return;
+        }
+        this.#idleShutdownTimer = setTimeout(() => {
+          this.#idleShutdownTimer = void 0;
+          if (this.#shouldIdleShutdown()) {
+            this.#onIdleShutdown?.();
+          }
+        }, this.#idleShutdownMs);
+      }
+      #clearIdleShutdownTimer() {
+        if (!this.#idleShutdownTimer) {
+          return;
+        }
+        clearTimeout(this.#idleShutdownTimer);
+        this.#idleShutdownTimer = void 0;
+      }
+      #shouldIdleShutdown() {
+        return this.#started && this.#idleShutdownMs !== void 0 && this.#idleShutdownMs > 0 && this.#connections.size === 0 && this.#imExtensions.size === 0 && !this.#hasActiveWork();
+      }
+      #hasActiveWork() {
+        for (const lane of this.#sessions.values()) {
+          if (lane.runtime.running) {
+            return true;
+          }
+          if (lane.session.tree.controlState.queues.follow_up.length > 0 || lane.session.tree.controlState.queues.steer.length > 0) {
+            return true;
+          }
+        }
+        return false;
+      }
       async #handleCreateSession(connection, request) {
         const sessionId = request.sessionId ?? asSessionId(`ses_${this.#createId()}`);
         const project = await this.#resolveProject(sessionId, request.meta.projectId);
@@ -5059,7 +5380,7 @@ var init_src4 = __esm({
         try {
           lane = await this.#createLane(sessionId, request.meta, project);
         } catch (cause) {
-          if (!request.sessionId || !isNodeErrorCode4(cause, "EEXIST")) {
+          if (!request.sessionId || !isNodeErrorCode5(cause, "EEXIST")) {
             throw cause;
           }
           lane = await this.#getLane(sessionId);
@@ -5125,6 +5446,7 @@ var init_src4 = __esm({
             content: normalizeContent(request.content),
             parentId: request.options?.parentId,
             source: "user",
+            modelSelection: request.options?.modelSelection,
             channelContext: request.options?.channelContext ? runtimeChannelContextFromWire(request.options.channelContext) : void 0,
             onComplete: (result) => this.#respond(connection, request, { ...result, status: "completed" })
           });
@@ -5150,11 +5472,14 @@ var init_src4 = __esm({
         });
       }
       async #runUserTurn(lane, clientId, input) {
+        this.#lastActiveWorkAt = this.#now();
         const sessionId = lane.session.header.sessionId;
+        await this.#selectChatRuntime(lane, input.modelSelection);
         await this.#appendDiagnostic(sessionId, "send_message_started", {
           clientId,
           activeLeafId: lane.session.activeLeafId,
-          source: input.source
+          source: input.source,
+          selectedModelId: lane.selectedModel?.modelId
         });
         const instructionSnapshot = await this.#ensureInstructionSnapshot(lane, clientId);
         await this.#syncSkillIndex(lane, clientId);
@@ -5358,7 +5683,7 @@ var init_src4 = __esm({
           createdAt: now,
           updatedAt: now,
           clientId: connection.clientId,
-          ...request.options?.channelContext ? { data: { channelContext: request.options.channelContext } } : {}
+          ...request.options?.channelContext || request.options?.modelSelection ? { data: { channelContext: request.options.channelContext, modelSelection: request.options.modelSelection } } : {}
         };
         lane.followUpWaiters.set(item.id, { connection, request });
         await this.#appendQueueRewrite(lane, "follow_up", [...lane.session.tree.controlState.queues.follow_up, item], {
@@ -5411,6 +5736,7 @@ var init_src4 = __esm({
             parentId: lane.session.activeLeafId,
             source: "follow_up",
             queueItemId: item.id,
+            modelSelection: parseQueuedModelSelection(item.data?.modelSelection),
             channelContext: parseQueuedChannelContext(item.data?.channelContext),
             onComplete: waiter ? (result) => this.#respond(waiter.connection, waiter.request, { ...result, status: "completed" }) : void 0
           });
@@ -5578,6 +5904,18 @@ var init_src4 = __esm({
                 ]
               }
             });
+            const rtkSavings = rtkSavingsFromToolResult(rawEvent.result);
+            if (rtkSavings) {
+              await this.#recordRtkSavings({
+                projectId: lane.project.projectId,
+                sessionId: lane.session.header.sessionId,
+                savings: rtkSavings
+              }).catch(
+                (cause) => this.#appendDiagnostic(lane.session.header.sessionId, "runtime_stats_update_failed", {
+                  message: cause instanceof Error ? cause.message : String(cause)
+                })
+              );
+            }
             state.parentId = toolResultId;
             break;
           }
@@ -6381,6 +6719,7 @@ var init_src4 = __esm({
           session: loaded,
           project,
           runtime,
+          ...selectedModel ? { selectedModel } : {},
           queue: Promise.resolve(),
           appendQueue: Promise.resolve(),
           followUpWaiters: /* @__PURE__ */ new Map()
@@ -6398,7 +6737,7 @@ var init_src4 = __esm({
           await this.#getLane(sessionId);
           return true;
         } catch (cause) {
-          if (isNodeErrorCode4(cause, "ENOENT")) {
+          if (isNodeErrorCode5(cause, "ENOENT")) {
             return false;
           }
           throw cause;
@@ -6432,6 +6771,7 @@ var init_src4 = __esm({
           session,
           project,
           runtime,
+          ...selectedModel ? { selectedModel } : {},
           queue: Promise.resolve(),
           appendQueue: Promise.resolve(),
           followUpWaiters: /* @__PURE__ */ new Map()
@@ -6447,6 +6787,32 @@ var init_src4 = __esm({
           })
         );
       }
+      async #selectChatRuntime(lane, modelSelection) {
+        if (!modelSelection) {
+          return;
+        }
+        const selectedModel = await this.#selectedModelFromMeta(
+          { projectId: lane.project.projectId, modelSelection },
+          lane.project
+        );
+        if (!selectedModel || lane.selectedModel?.modelId === selectedModel.modelId) {
+          return;
+        }
+        lane.runtime = await this.#createRuntime({
+          sessionId: lane.session.header.sessionId,
+          project: lane.project,
+          selectedModel,
+          purpose: "chat"
+        });
+        lane.selectedModel = selectedModel;
+        this.#registerLaneTools(lane);
+        await this.#appendDiagnostic(lane.session.header.sessionId, "chat_model_selected", {
+          projectId: lane.project.projectId,
+          workDir: lane.project.workDir,
+          selectedModelId: selectedModel.modelId,
+          role: selectedModel.role
+        });
+      }
       #syncChannelTool(lane, channelContext) {
         if (!channelContext) {
           lane.runtime.unregisterTool("SendChannelMessage");
@@ -6556,7 +6922,7 @@ var init_src4 = __esm({
           try {
             children = await readdir6(root);
           } catch (cause) {
-            if (isNodeErrorCode4(cause, "ENOENT") || isNodeErrorCode4(cause, "ENOTDIR")) {
+            if (isNodeErrorCode5(cause, "ENOENT") || isNodeErrorCode5(cause, "ENOTDIR")) {
               continue;
             }
             throw cause;
@@ -6666,7 +7032,7 @@ var init_src4 = __esm({
             this.#imBindings.set(imBindingKey(binding.extensionId, binding.externalConversationId), binding);
           }
         } catch (cause) {
-          if (!isNodeErrorCode4(cause, "ENOENT")) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
             throw cause;
           }
         }
@@ -6680,9 +7046,13 @@ var init_src4 = __esm({
       #imBindingsPath() {
         return join10(this.#scorelHomeDir, "channels", "im-bindings.json");
       }
-      async #loadUserConfigProfile() {
+      async #loadUserConfigProfile(options = {}) {
         try {
-          return await loadScorelConfigProfile({ cwd: this.#userHomeDir, homeDir: this.#userHomeDir });
+          return await loadScorelConfigProfile({
+            cwd: this.#userHomeDir,
+            scorelHomeDir: this.#scorelHomeDir,
+            includeSecrets: options.includeSecrets ?? false
+          });
         } catch (cause) {
           if (isMissingConfigError(cause)) {
             return void 0;
@@ -6690,16 +7060,24 @@ var init_src4 = __esm({
           throw cause;
         }
       }
+      #configWriteTarget() {
+        return {
+          configDir: this.#scorelHomeDir,
+          configPath: join10(this.#scorelHomeDir, "config.toml"),
+          workDir: this.#userHomeDir
+        };
+      }
       async #listModels(projectId) {
         let config;
         try {
-          config = await this.#configProfileForProject(projectId);
+          config = projectId ? await this.#configProfileForProject(projectId) : await this.#loadUserConfigProfile();
         } catch (cause) {
           if (!isMissingConfigError(cause)) {
             throw cause;
           }
           config = void 0;
         }
+        config ??= projectId ? void 0 : this.#modelProfile;
         if (!config) {
           return {
             providers: [],
@@ -6722,19 +7100,18 @@ var init_src4 = __esm({
         };
       }
       async #handleUpsertModelProfile(request) {
-        const project = await this.#registry.require(request.projectId);
-        const configPath = join10(project.workDir, ".scorel", "config.toml");
+        const target = this.#configWriteTarget();
         let existingConfigText;
         try {
-          existingConfigText = await readFile11(configPath, "utf8");
+          existingConfigText = await readFile11(target.configPath, "utf8");
         } catch (cause) {
-          if (!isNodeErrorCode4(cause, "ENOENT")) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
             throw cause;
           }
         }
-        await mkdir6(join10(project.workDir, ".scorel"), { recursive: true });
+        await mkdir6(target.configDir, { recursive: true });
         await writeFile6(
-          configPath,
+          target.configPath,
           renderModelProfileConfig({
             providerId: request.providerId,
             providerType: request.providerType,
@@ -6761,38 +7138,41 @@ var init_src4 = __esm({
           "utf8"
         );
         await this.#appendHostDiagnostic("model_profile_upserted", {
-          projectId: project.projectId,
-          workDir: project.workDir,
+          ...request.projectId ? { ignoredProjectId: request.projectId } : {},
+          scope: "device",
+          workDir: target.workDir,
           providerId: request.providerId,
           modelId: request.modelId
         });
-        return this.#listModels(project.projectId);
+        return this.#listModels();
       }
       async #handleRemoveModelProvider(request) {
-        const project = await this.#registry.require(request.projectId);
-        const configPath = join10(project.workDir, ".scorel", "config.toml");
+        const target = this.#configWriteTarget();
         let existingConfigText;
         try {
-          existingConfigText = await readFile11(configPath, "utf8");
+          existingConfigText = await readFile11(target.configPath, "utf8");
         } catch (cause) {
-          if (!isNodeErrorCode4(cause, "ENOENT")) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
             throw cause;
           }
         }
-        await mkdir6(join10(project.workDir, ".scorel"), { recursive: true });
+        await mkdir6(target.configDir, { recursive: true });
         await writeFile6(
-          configPath,
+          target.configPath,
           renderModelProfileConfig({
             removeProviderId: request.providerId,
             existingConfigText
           }),
           "utf8"
         );
-        const profile = await this.#listModels(project.projectId);
+        const profile = await this.#listModels();
         return { ...profile, removed: true };
       }
       async #memorySettingsForProject(projectId) {
-        const config = await this.#configProfileForProject(projectId).catch((cause) => {
+        return this.#memorySettings(projectId);
+      }
+      async #memorySettings(projectId) {
+        const config = await (projectId ? this.#configProfileForProject(projectId) : this.#loadUserConfigProfile()).catch((cause) => {
           if (isMissingConfigError(cause)) {
             return void 0;
           }
@@ -6814,19 +7194,18 @@ var init_src4 = __esm({
         }
       }
       async #handleUpsertMemorySettings(request) {
-        const project = await this.#registry.require(request.projectId);
-        const configPath = join10(project.workDir, ".scorel", "config.toml");
+        const target = this.#configWriteTarget();
         let existingConfigText;
         try {
-          existingConfigText = await readFile11(configPath, "utf8");
+          existingConfigText = await readFile11(target.configPath, "utf8");
         } catch (cause) {
-          if (!isNodeErrorCode4(cause, "ENOENT")) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
             throw cause;
           }
         }
-        await mkdir6(join10(project.workDir, ".scorel"), { recursive: true });
+        await mkdir6(target.configDir, { recursive: true });
         await writeFile6(
-          configPath,
+          target.configPath,
           renderMemoryConfig({
             enabled: request.enabled,
             daily: request.daily,
@@ -6840,10 +7219,66 @@ var init_src4 = __esm({
           "utf8"
         );
         await this.#appendHostDiagnostic("memory_settings_upserted", {
-          projectId: project.projectId,
-          workDir: project.workDir
+          ...request.projectId ? { ignoredProjectId: request.projectId } : {},
+          scope: "device",
+          workDir: target.workDir
+        });
+        return this.#memorySettings();
+      }
+      async #runtimeSettingsForProject(projectId, installStatus) {
+        return this.#runtimeSettings(projectId, installStatus);
+      }
+      async #runtimeSettings(projectId, installStatus) {
+        const config = await (projectId ? this.#configProfileForProject(projectId) : this.#loadUserConfigProfile()).catch((cause) => {
+          if (isMissingConfigError(cause)) {
+            return void 0;
+          }
+          throw cause;
+        });
+        const detected = await detectRtk();
+        const savings = await readRuntimeStats(this.#runtimeStatsPath());
+        return {
+          tokenSavingRtk: config?.runtime.tokenSavingRtk ?? false,
+          rtkAvailable: detected.available,
+          ...detected.executable ? { rtkExecutable: detected.executable } : {},
+          ...detected.version ? { rtkVersion: detected.version } : {},
+          ...installStatus?.installStatus ? { installStatus: installStatus.installStatus } : {},
+          ...installStatus?.installMessage ? { installMessage: installStatus.installMessage } : {},
+          estimatedOutputTokens: savings.rtk.outputTokens,
+          estimatedSavedTokens: savings.rtk.savedTokens
+        };
+      }
+      async #handleUpsertRuntimeSettings(request) {
+        const target = this.#configWriteTarget();
+        let existingConfigText;
+        try {
+          existingConfigText = await readFile11(target.configPath, "utf8");
+        } catch (cause) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
+            throw cause;
+          }
+        }
+        await mkdir6(target.configDir, { recursive: true });
+        await writeFile6(
+          target.configPath,
+          renderRuntimeConfig({
+            tokenSavingRtk: request.tokenSavingRtk,
+            existingConfigText
+          }),
+          "utf8"
+        );
+        const installResult = request.tokenSavingRtk === true ? await ensureRtkAvailable() : { status: "idle" };
+        await this.#appendHostDiagnostic("runtime_settings_upserted", {
+          ...request.projectId ? { ignoredProjectId: request.projectId } : {},
+          scope: "device",
+          workDir: target.workDir,
+          tokenSavingRtk: request.tokenSavingRtk,
+          installStatus: installResult.status
+        });
+        return this.#runtimeSettings(void 0, {
+          installStatus: installResult.status,
+          ...installResult.message ? { installMessage: installResult.message } : {}
         });
-        return this.#memorySettingsForProject(project.projectId);
       }
       async #extensionSettings(extensionId) {
         const config = await this.#loadUserConfigProfile().catch((cause) => {
@@ -6867,7 +7302,7 @@ var init_src4 = __esm({
         try {
           existingConfigText = await readFile11(configPath, "utf8");
         } catch (cause) {
-          if (!isNodeErrorCode4(cause, "ENOENT")) {
+          if (!isNodeErrorCode5(cause, "ENOENT")) {
             throw cause;
           }
         }
@@ -6891,8 +7326,11 @@ var init_src4 = __esm({
         return this.#extensionSettings(request.extensionId);
       }
       async #fetchProviderModels(projectId, providerId) {
-        const project = await this.#registry.require(projectId);
-        const config = await loadScorelConfigProfile({ cwd: project.workDir, includeSecrets: true });
+        const config = projectId ? await loadScorelConfigProfile({
+          cwd: (await this.#registry.require(projectId)).workDir,
+          scorelHomeDir: this.#scorelHomeDir,
+          includeSecrets: true
+        }) : await this.#loadUserConfigProfile({ includeSecrets: true });
         if (!config) {
           throw new Error("Model profile config is not configured");
         }
@@ -6935,9 +7373,10 @@ var init_src4 = __esm({
         }
         const persistedSelection = "selectedModel" in meta ? meta.selectedModel : void 0;
         const requestedSelection = "modelSelection" in meta ? meta.modelSelection : void 0;
+        const selectionInput = persistedSelection ? config.models[persistedSelection.modelId] ? { modelId: persistedSelection.modelId, role: persistedSelection.role } : persistedSelection.role ? { role: persistedSelection.role } : void 0 : requestedSelection;
         const selection = resolveModelSelection(
           config,
-          persistedSelection ? { modelId: persistedSelection.modelId, role: persistedSelection.role } : requestedSelection
+          selectionInput
         );
         const model = resolvePiAiModel(selection.config);
         return {
@@ -6977,7 +7416,7 @@ var init_src4 = __esm({
           }
           const project = await this.#registry.require(projectId);
           try {
-            return await loadScorelConfigProfile({ cwd: project.workDir });
+            return await loadScorelConfigProfile({ cwd: project.workDir, scorelHomeDir: this.#scorelHomeDir });
           } catch (cause) {
             if (!isMissingConfigError(cause)) {
               throw cause;
@@ -7018,6 +7457,20 @@ var init_src4 = __esm({
         await appendFile3(join10(this.#sessionsDir, "host.log"), `${line}
 `, "utf8");
       }
+      #runtimeStatsPath() {
+        return join10(this.#scorelHomeDir, "runtime-stats.json");
+      }
+      async #recordRtkSavings(input) {
+        const updateTask = this.#runtimeStatsQueue.then(async () => {
+          const path = this.#runtimeStatsPath();
+          const stats = await readRuntimeStats(path);
+          addRtkSavings(stats, String(input.projectId), String(input.sessionId), input.savings);
+          await writeRuntimeStats(path, stats);
+        });
+        this.#runtimeStatsQueue = updateTask.catch(() => {
+        });
+        await updateTask;
+      }
       async #resolveProject(sessionId, projectId) {
         const project = await this.#registry.require(projectId);
         await this.#appendDiagnostic(sessionId, "project_resolved", {
@@ -7073,7 +7526,7 @@ var init_src4 = __esm({
         }
       };
     };
-    isNodeErrorCode4 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
+    isNodeErrorCode5 = (cause, code) => cause instanceof Error && "code" in cause && cause.code === code;
     wireErrorCode = (cause) => {
       if (!(cause instanceof ProjectRegistryError)) {
         return "internal_error";
@@ -7124,7 +7577,7 @@ var init_src4 = __esm({
         return void 0;
       }
       const parsed = JSON.parse(text);
-      if (!isRecord7(parsed)) {
+      if (!isRecord8(parsed)) {
         return void 0;
       }
       return {
@@ -7144,6 +7597,147 @@ var init_src4 = __esm({
       dreamIdleMinutes: 60,
       autoCompactThreshold: 0.8
     });
+    detectRtk = async () => {
+      try {
+        const shell = resolveDefaultShell2();
+        const path = (await execFileAsync2(shell, shellCommandArgs2(shell, "command -v rtk"), { timeout: 5e3 })).stdout.trim();
+        if (!path) {
+          return { available: false };
+        }
+        const version = await execFileAsync2(path, ["--version"], { timeout: 5e3 }).then((result) => result.stdout.trim() || result.stderr.trim()).catch(() => void 0);
+        return {
+          available: true,
+          executable: path,
+          ...version ? { version } : {}
+        };
+      } catch {
+        return { available: false };
+      }
+    };
+    ensureRtkAvailable = async () => {
+      const existing = await detectRtk();
+      if (existing.available) {
+        return { status: "installed", message: existing.version ?? existing.executable };
+      }
+      const shell = resolveDefaultShell2();
+      const brew = await execFileAsync2(shell, shellCommandArgs2(shell, "command -v brew"), { timeout: 5e3 }).then((result) => result.stdout.trim()).catch(() => "");
+      if (!brew) {
+        return { status: "failed", message: "Homebrew is not available; install RTK manually with `brew install rtk`." };
+      }
+      try {
+        await execFileAsync2(brew, ["install", "rtk"], { timeout: 12e4, maxBuffer: 2e7 });
+        const installed = await detectRtk();
+        return installed.available ? { status: "installed", message: installed.version ?? installed.executable } : { status: "failed", message: "RTK install finished but `rtk` is still not on PATH." };
+      } catch (cause) {
+        const message = cause instanceof Error ? cause.message : String(cause);
+        return { status: "failed", message };
+      }
+    };
+    emptyRuntimeStats = () => ({
+      version: 1,
+      rtk: {
+        outputTokens: 0,
+        savedTokens: 0,
+        byProject: {},
+        bySession: {}
+      }
+    });
+    readRuntimeStats = async (path) => {
+      try {
+        return parseRuntimeStats(JSON.parse(await readFile11(path, "utf8")));
+      } catch (cause) {
+        if (isNodeErrorCode5(cause, "ENOENT")) {
+          return emptyRuntimeStats();
+        }
+        return emptyRuntimeStats();
+      }
+    };
+    writeRuntimeStats = async (path, stats) => {
+      await mkdir6(dirname8(path), { recursive: true });
+      const tempPath = join10(dirname8(path), `.runtime-stats-${process.pid}-${Date.now()}.tmp`);
+      try {
+        await writeFile6(tempPath, `${JSON.stringify(stats, null, 2)}
+`, "utf8");
+        await rename3(tempPath, path);
+      } catch (cause) {
+        await rm2(tempPath, { force: true }).catch(() => void 0);
+        throw cause;
+      }
+    };
+    parseRuntimeStats = (value) => {
+      if (!isRecord8(value) || !isRecord8(value.rtk)) {
+        return emptyRuntimeStats();
+      }
+      return {
+        version: 1,
+        rtk: {
+          outputTokens: nonNegativeInteger2(value.rtk.outputTokens),
+          savedTokens: nonNegativeInteger2(value.rtk.savedTokens),
+          byProject: parseRuntimeStatsBuckets(value.rtk.byProject),
+          bySession: parseRuntimeStatsBuckets(value.rtk.bySession)
+        }
+      };
+    };
+    parseRuntimeStatsBuckets = (value) => {
+      if (!isRecord8(value)) {
+        return {};
+      }
+      return Object.fromEntries(
+        Object.entries(value).map(([key, bucket]) => [
+          key,
+          isRecord8(bucket) ? {
+            outputTokens: nonNegativeInteger2(bucket.outputTokens),
+            savedTokens: nonNegativeInteger2(bucket.savedTokens)
+          } : { outputTokens: 0, savedTokens: 0 }
+        ])
+      );
+    };
+    addRtkSavings = (stats, projectId, sessionId, savings) => {
+      addRuntimeStatsBucket(stats.rtk, savings);
+      stats.rtk.byProject[projectId] = addRuntimeStatsBucket(stats.rtk.byProject[projectId] ?? { outputTokens: 0, savedTokens: 0 }, savings);
+      stats.rtk.bySession[sessionId] = addRuntimeStatsBucket(stats.rtk.bySession[sessionId] ?? { outputTokens: 0, savedTokens: 0 }, savings);
+    };
+    addRuntimeStatsBucket = (bucket, savings) => {
+      bucket.outputTokens += savings.outputTokens;
+      bucket.savedTokens += savings.savedTokens;
+      return bucket;
+    };
+    rtkSavingsFromToolResult = (result) => {
+      if (!isRecord8(result) || !isRecord8(result.details)) {
+        return void 0;
+      }
+      const rtk = result.details.rtk;
+      if (!isRecord8(rtk) || rtk.applied !== true) {
+        return void 0;
+      }
+      const outputTokens = nonNegativeInteger2(rtk.estimatedOutputTokens);
+      const savedTokens = nonNegativeInteger2(rtk.estimatedSavedTokens);
+      return outputTokens > 0 || savedTokens > 0 ? { outputTokens, savedTokens } : void 0;
+    };
+    nonNegativeInteger2 = (value) => {
+      if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+        return 0;
+      }
+      return Math.floor(value);
+    };
+    resolveDefaultShell2 = () => {
+      const shell = process.env.SHELL || userShell2() || "/bin/sh";
+      return shell.trim() || "/bin/sh";
+    };
+    shellCommandArgs2 = (shell, command) => {
+      const name = basename3(shell).toLowerCase();
+      if (name === "csh" || name === "tcsh" || name === "fish") {
+        return ["-c", command];
+      }
+      return ["-lc", command];
+    };
+    userShell2 = () => {
+      try {
+        return userInfo2().shell ?? void 0;
+      } catch {
+        return void 0;
+      }
+    };
     runtimeChannelContextFromWire = (context) => ({
       extensionId: context.channel,
       channel: context.channel,
@@ -7158,7 +7752,7 @@ var init_src4 = __esm({
       ...context.data ? { data: context.data } : {}
     });
     parseQueuedChannelContext = (value) => {
-      if (!isRecord7(value)) {
+      if (!isRecord8(value)) {
         return void 0;
       }
       if (typeof value.channel !== "string" || typeof value.externalConversationId !== "string") {
@@ -7170,9 +7764,22 @@ var init_src4 = __esm({
         ...typeof value.conversationType === "string" ? { conversationType: value.conversationType } : {},
         ...typeof value.senderDisplayName === "string" ? { senderDisplayName: value.senderDisplayName } : {},
         ...typeof value.mentionedBot === "boolean" ? { mentionedBot: value.mentionedBot } : {},
-        ...isRecord7(value.data) ? { data: value.data } : {}
+        ...isRecord8(value.data) ? { data: value.data } : {}
       });
     };
+    parseQueuedModelSelection = (value) => {
+      if (!isRecord8(value)) {
+        return void 0;
+      }
+      const selection = {};
+      if (typeof value.modelId === "string") {
+        selection.modelId = value.modelId;
+      }
+      if (value.role === "primary" || value.role === "standard" || value.role === "auxiliary") {
+        selection.role = value.role;
+      }
+      return selection.modelId || selection.role ? selection : void 0;
+    };
     imBindingKey = (extensionId, externalConversationId) => `${extensionId}:${externalConversationId}`;
     defaultBuiltinExtensionsDir = () => findBuiltinExtensionsDir([
       runtimeModuleDir(),
@@ -7203,7 +7810,7 @@ var init_src4 = __esm({
     };
     isSteerMessage = (text) => /^\/(?:steer|interrupt)\b/i.test(text.trim());
     stripImCommandPrefix = (text) => text.trim().replace(/^\/(?:steer|interrupt)\s*/i, "").trim() || text;
-    isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
     parseMemoryUpdate = (raw) => {
       const text = raw.trim().replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/, "").trim();
       if (!text) {
@@ -7308,27 +7915,139 @@ var init_relay_cli = __esm({
   }
 });
 
+// apps/cli/src/update-cli.ts
+import { execFile as execFileCallback } from "node:child_process";
+import { readFile as readFile12 } from "node:fs/promises";
+import { dirname as dirname9, join as join12 } from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify as promisify3 } from "node:util";
+var SCOREL_PACKAGE_NAME, AUTO_UPDATE_INTERVAL_MS, ACTIVE_WORK_STALE_MS, execFileAsync3, compareSemver, shouldRunAutoUpdate, createNpmPackageUpdater, readInstalledScorelVersion, runCliUpdate, writeUpdateUsage, parseSemver;
+var init_update_cli = __esm({
+  "apps/cli/src/update-cli.ts"() {
+    "use strict";
+    SCOREL_PACKAGE_NAME = "@chanlerdev/scorel";
+    AUTO_UPDATE_INTERVAL_MS = 60 * 60 * 1e3;
+    ACTIVE_WORK_STALE_MS = 3 * 60 * 60 * 1e3;
+    execFileAsync3 = promisify3(execFileCallback);
+    compareSemver = (a, b) => {
+      const left = parseSemver(a);
+      const right = parseSemver(b);
+      for (let index = 0; index < 3; index += 1) {
+        const delta = left[index] - right[index];
+        if (delta !== 0) return delta;
+      }
+      return 0;
+    };
+    shouldRunAutoUpdate = (activity) => !activity.activeWork || activity.now - activity.lastActiveWorkAt >= ACTIVE_WORK_STALE_MS;
+    createNpmPackageUpdater = (options) => {
+      const packageName = options.packageName ?? SCOREL_PACKAGE_NAME;
+      const execFile3 = options.execFile ?? ((command, argv) => execFileAsync3(command, argv));
+      return {
+        async checkLatest() {
+          const result = await execFile3("npm", ["view", packageName, "version"]);
+          const latest = result.stdout.trim();
+          if (!latest) {
+            throw new Error(`npm did not return a latest version for ${packageName}`);
+          }
+          parseSemver(latest);
+          return latest;
+        },
+        async update() {
+          const latestVersion = await this.checkLatest();
+          if (compareSemver(options.currentVersion, latestVersion) >= 0) {
+            return { status: "current", currentVersion: options.currentVersion, latestVersion };
+          }
+          await execFile3("npm", ["install", "-g", `${packageName}@${latestVersion}`]);
+          return { status: "updated", currentVersion: options.currentVersion, latestVersion };
+        }
+      };
+    };
+    readInstalledScorelVersion = async () => {
+      const here = dirname9(fileURLToPath(import.meta.url));
+      for (const candidate of [
+        join12(here, "..", "package.json"),
+        join12(here, "..", "..", "package.json"),
+        join12(process.cwd(), "package.json")
+      ]) {
+        try {
+          const parsed = JSON.parse(await readFile12(candidate, "utf8"));
+          if (typeof parsed.version === "string" && (parsed.name === SCOREL_PACKAGE_NAME || parsed.name === "@scorel/app-cli")) {
+            return parsed.version;
+          }
+        } catch {
+        }
+      }
+      return "0.0.0";
+    };
+    runCliUpdate = async (argv, io, options = {}) => {
+      if (argv.includes("--help") || argv.includes("-h")) {
+        writeUpdateUsage(io.output);
+        return 0;
+      }
+      if (argv.length > 0) {
+        writeUpdateUsage(io.error);
+        return 1;
+      }
+      const currentVersion = options.currentVersion ?? await readInstalledScorelVersion();
+      const updater = options.updater ?? createNpmPackageUpdater({ currentVersion });
+      try {
+        const result = await updater.update();
+        if (result.status === "current") {
+          io.output.write(`scorel is current (${result.currentVersion})
+`);
+        } else {
+          io.output.write(`updated scorel ${result.currentVersion} -> ${result.latestVersion}
+`);
+        }
+        return 0;
+      } catch (cause) {
+        io.error.write(`scorel update error: ${cause instanceof Error ? cause.message : String(cause)}
+`);
+        return 1;
+      }
+    };
+    writeUpdateUsage = (output) => {
+      output.write("Usage: scorel update\n       scorel upgrade\n");
+    };
+    parseSemver = (version) => {
+      const match = /^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/.exec(version);
+      if (!match) {
+        throw new Error(`Invalid semver version: ${version}`);
+      }
+      return [Number(match[1]), Number(match[2]), Number(match[3])];
+    };
+  }
+});
+
 // apps/cli/src/daemon-cli.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
+import { spawn } from "node:child_process";
 import { homedir as homedir6 } from "node:os";
-import { join as join12 } from "node:path";
-var DEFAULT_HOST, DEFAULT_PORT, STOP_POLL_INTERVAL_MS, STOP_GRACE_MS, defaultStateDir2, isLoopbackHost, formatTimestamp, runCliDaemon, runServeCommand, stopRunningDaemon, runStatusCommand, runStopCommand, runResetCommand, formatStatusLine, parseServeFlags, parseStatusFlags, requireValue2, sleep, writeDaemonUsage;
+import { dirname as dirname10, join as join13 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var DEFAULT_HOST, DEFAULT_PORT, STOP_POLL_INTERVAL_MS, STOP_GRACE_MS, START_READY_TIMEOUT_MS, AUTO_STARTED_IDLE_SHUTDOWN_MS, FOREGROUND_IDLE_SHUTDOWN_MS, defaultStateDir2, isLoopbackHost, formatTimestamp, runCliDaemon, runStartCommand, runServeCommand, startAutoUpdateLoop, stopRunningDaemon, runStatusCommand, runStopCommand, runResetCommand, formatStatusLine, parseServeFlags, parseStatusFlags, requireValue2, sleep, waitForDaemonReady, detachBackgroundDaemon, nodeEntrypointArgs, writeDaemonUsage;
 var init_daemon_cli = __esm({
   "apps/cli/src/daemon-cli.ts"() {
     "use strict";
     init_src4();
     init_relay_cli();
+    init_update_cli();
     DEFAULT_HOST = "127.0.0.1";
     DEFAULT_PORT = 7777;
     STOP_POLL_INTERVAL_MS = 200;
     STOP_GRACE_MS = 5e3;
-    defaultStateDir2 = () => join12(homedir6(), ".scorel");
+    START_READY_TIMEOUT_MS = 1e4;
+    AUTO_STARTED_IDLE_SHUTDOWN_MS = 15 * 60 * 1e3;
+    FOREGROUND_IDLE_SHUTDOWN_MS = 0;
+    defaultStateDir2 = () => join13(homedir6(), ".scorel");
     isLoopbackHost = (host) => host === "127.0.0.1" || host === "::1" || host === "localhost";
     formatTimestamp = (epochMs) => new Date(epochMs).toISOString();
     runCliDaemon = async (argv, options) => {
       const [command, ...rest] = argv;
       const stateDir = options.stateDir ?? defaultStateDir2();
       switch (command) {
+        case "start":
+          return runStartCommand(rest, { ...options, stateDir });
         case "serve":
           return runServeCommand(rest, { ...options, stateDir });
         case "status":
@@ -7346,10 +8065,67 @@ var init_daemon_cli = __esm({
           return 1;
       }
     };
+    runStartCommand = async (argv, options) => {
+      let flags;
+      try {
+        flags = parseServeFlags(argv, options.cwd ?? process.cwd(), options.env ?? process.env, FOREGROUND_IDLE_SHUTDOWN_MS);
+      } catch (cause) {
+        options.error.write(`scorel daemon start error: ${cause.message}
+`);
+        return 1;
+      }
+      const readState = options.readState ?? ((stateDir) => readLocalDaemonState({ stateDir }));
+      const existing = await readState(options.stateDir);
+      if (existing && daemonStateLiveness(existing) === "running") {
+        options.output.write(`scorel host already running url=${existing.wsUrl} pid=${existing.pid}
+`);
+        return 0;
+      }
+      const cliEntrypoint = options.cliEntrypoint ?? fileURLToPath2(import.meta.url).replace(/daemon-cli\.ts$/, "index.ts");
+      const child = (options.spawn ?? spawn)(process.execPath, [
+        ...nodeEntrypointArgs(cliEntrypoint),
+        "host",
+        "serve",
+        "--host",
+        flags.host,
+        "--port",
+        String(flags.port),
+        "--cwd",
+        flags.cwd,
+        "--idle-timeout-ms",
+        String(flags.idleShutdownMs),
+        ...flags.token ? ["--token", flags.token] : [],
+        ...flags.relayUrl ? ["--relay", flags.relayUrl] : ["--no-relay"],
+        ...flags.replace ? ["--replace"] : []
+      ], {
+        cwd: dirname10(cliEntrypoint),
+        env: { ...process.env, ...options.env ?? {} },
+        detached: true,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      try {
+        await waitForDaemonReady(child, options.daemonReadyTimeoutMs ?? START_READY_TIMEOUT_MS);
+      } catch (cause) {
+        options.error.write(`scorel daemon start error: ${cause.message}
+`);
+        child.kill("SIGTERM");
+        return 1;
+      }
+      const state = await readState(options.stateDir);
+      if (!state || daemonStateLiveness(state) !== "running") {
+        options.error.write("scorel daemon start error: daemon state missing after start\n");
+        child.kill("SIGTERM");
+        return 1;
+      }
+      detachBackgroundDaemon(child);
+      options.output.write(`scorel host started url=${state.wsUrl} pid=${state.pid}
+`);
+      return 0;
+    };
     runServeCommand = async (argv, options) => {
       let flags;
       try {
-        flags = parseServeFlags(argv, options.cwd ?? process.cwd(), options.env ?? process.env);
+        flags = parseServeFlags(argv, options.cwd ?? process.cwd(), options.env ?? process.env, FOREGROUND_IDLE_SHUTDOWN_MS);
       } catch (cause) {
         options.error.write(`scorel daemon serve error: ${cause.message}
 `);
@@ -7373,22 +8149,45 @@ Use --replace to stop it and start a new one.
       }
       const token = flags.token ?? existing?.token ?? randomUUID4();
       const identity = await loadOrCreateHostDeviceIdentity({ stateDir: options.stateDir });
+      const configScope = { scorelHomeDir: options.stateDir };
+      let signalReason = "natural";
+      let resolveStopWaiter;
+      let stopRequested = false;
+      const requestStop = (reason) => {
+        signalReason = reason;
+        stopRequested = true;
+        resolveStopWaiter?.();
+      };
+      const sessionsDir = options.sessionsDir ?? scorelSessionsDir(homedir6());
       const daemon = new ScorelHost({
-        sessionsDir: options.sessionsDir ?? scorelSessionsDir(homedir6()),
-        projectsPath: join12(options.stateDir, "projects.json"),
+        sessionsDir,
+        projectsPath: join13(options.stateDir, "projects.json"),
         deviceId: identity.deviceId,
         deviceDisplayName: identity.displayName,
-        loadConfig: async ({ project }) => loadScorelConfig({ cwd: project.workDir }),
-        loadConfigProfile: async ({ project }) => loadScorelConfigProfile({ cwd: project.workDir }),
-        createRuntime: async ({ project, selectedModel, purpose }) => createRealRuntime({
+        idleShutdownMs: flags.idleShutdownMs,
+        onIdleShutdown: () => requestStop("idle"),
+        scorelHomeDir: options.stateDir,
+        loadConfig: async ({ project }) => loadScorelConfig({ cwd: project.workDir, ...configScope }),
+        loadConfigProfile: async ({ project }) => loadScorelConfigProfile({ cwd: project.workDir, ...configScope }),
+        createRuntime: async ({ sessionId, project, selectedModel, purpose }) => createRealRuntime({
           cwd: project.workDir,
-          config: await loadScorelConfig({ cwd: project.workDir }),
+          config: await loadScorelConfig({ cwd: project.workDir, ...configScope }),
+          sessionsDir,
+          sessionId,
           modelSelection: selectedModel ? { modelId: selectedModel.modelId, role: selectedModel.role } : void 0,
           includeTools: purpose === "chat"
         })
       });
       await daemon.start();
       await daemon.registerProject(flags.cwd);
+      const autoUpdater = await startAutoUpdateLoop({
+        host: daemon,
+        requestStop,
+        output: options.output,
+        error: options.error,
+        updater: options.packageUpdater,
+        intervalMs: options.autoUpdateIntervalMs ?? AUTO_UPDATE_INTERVAL_MS
+      });
       const server = await startScorelHostWebSocketServer({
         hostService: daemon,
         host: flags.host,
@@ -7434,6 +8233,7 @@ Use --replace to stop it and start a new one.
       }
       const shutdown = async () => {
         try {
+          autoUpdater.stop();
           relayClient?.close();
           await server.close();
         } finally {
@@ -7441,20 +8241,22 @@ Use --replace to stop it and start a new one.
           await markDaemonStopped({ stateDir: options.stateDir, stoppedAt: Date.now() });
         }
       };
-      let signalReason = "natural";
       const signalHandlers = /* @__PURE__ */ new Map();
       const stopWaiter = new Promise((resolve7) => {
+        resolveStopWaiter = resolve7;
+        if (stopRequested) {
+          resolve7();
+          return;
+        }
         if (options.serveSignal) {
           if (options.serveSignal.aborted) {
-            signalReason = "abort";
-            resolve7();
+            requestStop("abort");
             return;
           }
           options.serveSignal.addEventListener(
             "abort",
             () => {
-              signalReason = "abort";
-              resolve7();
+              requestStop("abort");
             },
             { once: true }
           );
@@ -7462,8 +8264,7 @@ Use --replace to stop it and start a new one.
         }
         const installSignal = (signal) => {
           const handler = () => {
-            signalReason = signal;
-            resolve7();
+            requestStop(signal);
           };
           signalHandlers.set(signal, handler);
           process.once(signal, handler);
@@ -7483,6 +8284,42 @@ Use --replace to stop it and start a new one.
 `);
       return 0;
     };
+    startAutoUpdateLoop = async (options) => {
+      const updater = options.updater ?? createNpmPackageUpdater({ currentVersion: await readInstalledScorelVersion() });
+      let timer;
+      let running = false;
+      const tick = async () => {
+        if (running) return;
+        running = true;
+        try {
+          const activity = options.host.activityStatus();
+          if (!shouldRunAutoUpdate({ ...activity, now: Date.now() })) {
+            return;
+          }
+          const result = await updater.update();
+          if (result.status === "updated") {
+            options.output.write(`scorel auto-updated ${result.currentVersion} -> ${result.latestVersion}; restarting host
+`);
+            options.requestStop("auto-update");
+          }
+        } catch (cause) {
+          options.error.write(`scorel auto-update error: ${cause instanceof Error ? cause.message : String(cause)}
+`);
+        } finally {
+          running = false;
+        }
+      };
+      timer = setInterval(() => void tick(), options.intervalMs);
+      timer.unref?.();
+      return {
+        stop() {
+          if (timer) {
+            clearInterval(timer);
+            timer = void 0;
+          }
+        }
+      };
+    };
     stopRunningDaemon = async (state, options) => {
       try {
         process.kill(state.pid, "SIGTERM");
@@ -7586,13 +8423,14 @@ Use --replace to stop it and start a new one.
       const stoppedAt = state.stoppedAt !== null ? formatTimestamp(state.stoppedAt) : "unknown";
       return `stopped url=${state.wsUrl} last-pid=${state.pid} stoppedAt=${stoppedAt} liveness=${liveness}`;
     };
-    parseServeFlags = (argv, defaultCwd, env) => {
+    parseServeFlags = (argv, defaultCwd, env, defaultIdleShutdownMs) => {
       let host = DEFAULT_HOST;
       let port = DEFAULT_PORT;
       let cwd = defaultCwd;
       let token;
       let relayUrl = resolveDefaultRelayUrl(env);
       let replace = false;
+      let idleShutdownMs = defaultIdleShutdownMs;
       for (let index = 0; index < argv.length; index += 1) {
         const arg = argv[index];
         if (arg === "--host") {
@@ -7636,9 +8474,17 @@ Use --replace to stop it and start a new one.
           replace = true;
           continue;
         }
+        if (arg === "--idle-timeout-ms") {
+          idleShutdownMs = Number(requireValue2(argv, index, "--idle-timeout-ms"));
+          if (!Number.isInteger(idleShutdownMs) || idleShutdownMs < 0) {
+            throw new Error("--idle-timeout-ms must be a non-negative integer");
+          }
+          index += 1;
+          continue;
+        }
         throw new Error(`Unknown serve option: ${arg}`);
       }
-      return { host, port, token, cwd, relayUrl, replace };
+      return { host, port, token, cwd, relayUrl, replace, idleShutdownMs };
     };
     parseStatusFlags = (argv) => {
       let showToken = false;
@@ -7661,11 +8507,66 @@ Use --replace to stop it and start a new one.
     sleep = (ms) => new Promise((resolve7) => {
       setTimeout(resolve7, ms);
     });
+    waitForDaemonReady = (child, timeoutMs) => new Promise((resolveReady, rejectReady) => {
+      if (!child.stdout) {
+        rejectReady(new Error("daemon child has no stdout stream"));
+        return;
+      }
+      let buffer = "";
+      let stderrBuffer = "";
+      let settled = false;
+      const timer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        rejectReady(new Error("timed out waiting for daemon ready line"));
+      }, timeoutMs);
+      const onData = (chunk) => {
+        buffer += chunk.toString();
+        if (!buffer.includes("\n")) return;
+        if (buffer.includes("scorel daemon serving url=") || buffer.includes("scorel host serving url=")) {
+          if (settled) return;
+          settled = true;
+          cleanup();
+          resolveReady();
+        }
+        const newlineIndex = buffer.lastIndexOf("\n");
+        buffer = newlineIndex >= 0 ? buffer.slice(newlineIndex + 1) : buffer;
+      };
+      const onStderr = (chunk) => {
+        stderrBuffer += chunk.toString();
+      };
+      const onExit = (code) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        const trimmed = stderrBuffer.trim();
+        const detail = trimmed ? `: ${trimmed}` : "";
+        rejectReady(new Error(`daemon exited before ready code=${code}${detail}`));
+      };
+      const cleanup = () => {
+        clearTimeout(timer);
+        child.stdout?.off("data", onData);
+        child.stderr?.off("data", onStderr);
+        child.off("exit", onExit);
+      };
+      child.stdout.on("data", onData);
+      child.stderr?.on("data", onStderr);
+      child.once("exit", onExit);
+    });
+    detachBackgroundDaemon = (child) => {
+      child.stdout?.destroy();
+      child.stderr?.destroy();
+      child.unref();
+    };
+    nodeEntrypointArgs = (entrypoint) => entrypoint.endsWith(".ts") ? ["--import", "tsx", entrypoint] : [entrypoint];
     writeDaemonUsage = (output) => {
       output.write(
         [
           "Usage: scorel host serve [--host <h>] [--port <p>] [--token <t>] [--project <dir>]",
-          "                        [--relay <relay-url> | --no-relay] [--replace]",
+          "                        [--relay <relay-url> | --no-relay] [--replace] [--idle-timeout-ms <ms>]",
+          "       scorel host start [--host <h>] [--port <p>] [--token <t>] [--project <dir>]",
+          "                        [--relay <relay-url> | --no-relay] [--replace] [--idle-timeout-ms <ms>]",
           "       scorel host status [--show-token]",
           "       scorel host stop",
           "       scorel host reset",
@@ -7866,8 +8767,8 @@ var init_routing = __esm({
 });
 
 // apps/relay/src/store.ts
-import { mkdir as mkdir7, readFile as readFile12, writeFile as writeFile7 } from "node:fs/promises";
-import { join as join13 } from "node:path";
+import { mkdir as mkdir7, readFile as readFile13, writeFile as writeFile7 } from "node:fs/promises";
+import { join as join14 } from "node:path";
 var FileRelayStore, emptyStoreFile;
 var init_store = __esm({
   "apps/relay/src/store.ts"() {
@@ -7877,7 +8778,7 @@ var init_store = __esm({
       #now;
       #queue = Promise.resolve();
       constructor(options) {
-        this.#filePath = join13(options.dataDir, "relay-store.json");
+        this.#filePath = join14(options.dataDir, "relay-store.json");
         this.#now = options.now ?? Date.now;
       }
       async upsertDevice(record) {
@@ -7920,7 +8821,7 @@ var init_store = __esm({
         this.#queue = this.#queue.then(async () => {
           const file = await this.#read();
           mutator(file);
-          await mkdir7(join13(this.#filePath, ".."), { recursive: true });
+          await mkdir7(join14(this.#filePath, ".."), { recursive: true });
           await writeFile7(this.#filePath, `${JSON.stringify(file, null, 2)}
 `);
         });
@@ -7928,7 +8829,7 @@ var init_store = __esm({
       }
       async #read() {
         try {
-          const raw = JSON.parse(await readFile12(this.#filePath, "utf8"));
+          const raw = JSON.parse(await readFile13(this.#filePath, "utf8"));
           if (raw.version !== 1 || !Array.isArray(raw.devices) || !Array.isArray(raw.clients) || !Array.isArray(raw.bindings)) {
             return emptyStoreFile();
           }
@@ -8181,7 +9082,7 @@ var init_library = __esm({
 
 // apps/cli/src/relay-server-cli.ts
 import { homedir as homedir7 } from "node:os";
-import { join as join14 } from "node:path";
+import { join as join15 } from "node:path";
 var DEFAULT_HOST2, DEFAULT_PORT2, runCliRelay, runRelayServe, parseRelayServeFlags, waitForStop, requireValue3, writeRelayUsage;
 var init_relay_server_cli = __esm({
   "apps/cli/src/relay-server-cli.ts"() {
@@ -8233,7 +9134,7 @@ var init_relay_server_cli = __esm({
     parseRelayServeFlags = (argv) => {
       let host = DEFAULT_HOST2;
       let port = DEFAULT_PORT2;
-      let dataDir = join14(homedir7(), ".scorel", "relay");
+      let dataDir = join15(homedir7(), ".scorel", "relay");
       for (let index = 0; index < argv.length; index += 1) {
         const arg = argv[index];
         if (arg === "--host") {
@@ -8289,19 +9190,20 @@ var init_relay_server_cli = __esm({
 });
 
 // apps/cli/src/up-cli.ts
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { homedir as homedir8 } from "node:os";
-import { join as join15 } from "node:path";
-import { fileURLToPath } from "node:url";
-var DEFAULT_DAEMON_PORT, DEFAULT_WEBUI_PORT, DEFAULT_DAEMON_READY_TIMEOUT_MS, defaultStateDir3, defaultAttachSigint, runCliUp, parseUpFlags, requireValue4, waitForDaemonReady, pipeWithPrefix, pipeStreamLines, once;
+import { dirname as dirname11, join as join16 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
+var DEFAULT_DAEMON_PORT, DEFAULT_WEBUI_PORT, DEFAULT_DAEMON_READY_TIMEOUT_MS, defaultStateDir3, defaultAttachSigint, runCliUp, parseUpFlags, requireValue4, waitForDaemonReady2, pipeWithPrefix, detachBackgroundDaemon2, nodeEntrypointArgs2, pipeStreamLines, once;
 var init_up_cli = __esm({
   "apps/cli/src/up-cli.ts"() {
     "use strict";
     init_src4();
+    init_daemon_cli();
     DEFAULT_DAEMON_PORT = 7777;
     DEFAULT_WEBUI_PORT = 3e3;
     DEFAULT_DAEMON_READY_TIMEOUT_MS = 1e4;
-    defaultStateDir3 = () => join15(homedir8(), ".scorel");
+    defaultStateDir3 = () => join16(homedir8(), ".scorel");
     defaultAttachSigint = (listener) => {
       process.on("SIGINT", listener);
       return () => process.off("SIGINT", listener);
@@ -8316,8 +9218,8 @@ var init_up_cli = __esm({
         return 1;
       }
       const stateDir = options.stateDir ?? defaultStateDir3();
-      const cliEntrypoint = options.cliEntrypoint ?? fileURLToPath(import.meta.url).replace(/up-cli\.ts$/, "index.ts");
-      const spawnFn = options.spawn ?? spawn;
+      const cliEntrypoint = options.cliEntrypoint ?? fileURLToPath3(import.meta.url).replace(/up-cli\.ts$/, "index.ts");
+      const spawnFn = options.spawn ?? spawn2;
       const readState = options.readState ?? ((dir) => readLocalDaemonState({ stateDir: dir }));
       const attachSigint = options.attachSigint ?? defaultAttachSigint;
       const readyTimeout = options.daemonReadyTimeoutMs ?? DEFAULT_DAEMON_READY_TIMEOUT_MS;
@@ -8328,31 +9230,31 @@ var init_up_cli = __esm({
       let daemonState = existingState;
       if (!reuseDaemon) {
         const daemonArgs = [
-          "--import",
-          "tsx",
-          cliEntrypoint,
+          ...nodeEntrypointArgs2(cliEntrypoint),
           "daemon",
           "serve",
           "--port",
           String(flags.daemonPort),
           "--cwd",
           flags.cwd,
+          "--idle-timeout-ms",
+          String(AUTO_STARTED_IDLE_SHUTDOWN_MS),
           "--no-relay"
         ];
         daemonChild = spawnFn(process.execPath, daemonArgs, {
-          cwd: flags.cwd,
+          cwd: dirname11(cliEntrypoint),
           env: { ...process.env },
+          detached: true,
           stdio: ["ignore", "pipe", "pipe"]
         });
         try {
-          await waitForDaemonReady(daemonChild, readyTimeout);
+          await waitForDaemonReady2(daemonChild, readyTimeout);
         } catch (cause) {
           options.error.write(`scorel up error: ${cause.message}
 `);
           daemonChild.kill("SIGTERM");
           return 1;
         }
-        pipeWithPrefix(daemonChild, "[daemon]", options.output, options.error);
         daemonState = await readState(stateDir);
       }
       if (!daemonState) {
@@ -8360,16 +9262,17 @@ var init_up_cli = __esm({
         daemonChild?.kill("SIGTERM");
         return 1;
       }
+      if (daemonChild) {
+        detachBackgroundDaemon2(daemonChild);
+      }
       const webuiArgs = [
-        "--import",
-        "tsx",
-        cliEntrypoint,
+        ...nodeEntrypointArgs2(cliEntrypoint),
         "webui",
         "--port",
         String(flags.webuiPort)
       ];
       const webuiChild = spawnFn(process.execPath, webuiArgs, {
-        cwd: flags.cwd,
+        cwd: dirname11(cliEntrypoint),
         env: { ...process.env },
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -8386,33 +9289,21 @@ var init_up_cli = __esm({
           return;
         }
         shuttingDown = true;
-        daemonChild?.kill("SIGTERM");
         webuiChild.kill("SIGTERM");
       });
-      const daemonExit = daemonChild ? once(daemonChild) : Promise.resolve(0);
       const webuiExit = once(webuiChild);
-      const daemonDeathWatcher = daemonChild ? daemonExit.then((code) => {
-        if (!shuttingDown) {
-          shuttingDown = true;
-          options.error.write(`scorel up daemon exited code=${code}
-`);
-          webuiChild.kill("SIGTERM");
-        }
-        return code;
-      }) : Promise.resolve(0);
       const webuiDeathWatcher = webuiExit.then((code) => {
         if (!shuttingDown) {
           shuttingDown = true;
           options.error.write(`scorel up webui exited code=${code}
 `);
-          daemonChild?.kill("SIGTERM");
         }
         return code;
       });
-      const [daemonCode, webuiCode] = await Promise.all([daemonDeathWatcher, webuiDeathWatcher]);
+      const webuiCode = await webuiDeathWatcher;
       detachSigint();
       options.output.write("scorel up stopped\n");
-      return daemonCode === 0 && webuiCode === 0 ? 0 : 1;
+      return webuiCode === 0 ? 0 : 1;
     };
     parseUpFlags = (argv, defaultCwd) => {
       let daemonPort = DEFAULT_DAEMON_PORT;
@@ -8452,7 +9343,7 @@ var init_up_cli = __esm({
       }
       return value;
     };
-    waitForDaemonReady = (child, timeoutMs) => new Promise((resolveReady, rejectReady) => {
+    waitForDaemonReady2 = (child, timeoutMs) => new Promise((resolveReady, rejectReady) => {
       if (!child.stdout) {
         rejectReady(new Error("daemon child has no stdout stream"));
         return;
@@ -8509,6 +9400,12 @@ var init_up_cli = __esm({
         pipeStreamLines(child.stderr, prefix, error);
       }
     };
+    detachBackgroundDaemon2 = (child) => {
+      child.stdout?.destroy();
+      child.stderr?.destroy();
+      child.unref();
+    };
+    nodeEntrypointArgs2 = (entrypoint) => entrypoint.endsWith(".ts") ? ["--import", "tsx", entrypoint] : [entrypoint];
     pipeStreamLines = (stream, prefix, destination) => {
       let buffer = "";
       stream.setEncoding?.("utf8");
@@ -8538,10 +9435,10 @@ var init_up_cli = __esm({
 });
 
 // apps/cli/src/webui-cli.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 import { existsSync as existsSync4 } from "node:fs";
-import { dirname as dirname9, resolve as resolve6 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { dirname as dirname12, resolve as resolve6 } from "node:path";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 var DEFAULT_PORT3, DEFAULT_HOST3, runCliWebUi, findWebuiAppDir, buildWebUiSpawnPlan, parseWebUiFlags, requireValue5, waitForChildExit;
 var init_webui_cli = __esm({
   "apps/cli/src/webui-cli.ts"() {
@@ -8563,7 +9460,7 @@ var init_webui_cli = __esm({
         return 1;
       }
       const plan = buildWebUiSpawnPlan(flags, webuiAppDir);
-      const spawnFn = options.spawn ?? spawn2;
+      const spawnFn = options.spawn ?? spawn3;
       const child = spawnFn(plan.command, plan.argv, {
         cwd: plan.cwd,
         env: plan.env,
@@ -8572,7 +9469,7 @@ var init_webui_cli = __esm({
       return await waitForChildExit(child, options);
     };
     findWebuiAppDir = () => {
-      let cursor = dirname9(fileURLToPath2(import.meta.url));
+      let cursor = dirname12(fileURLToPath4(import.meta.url));
       for (let depth = 0; depth < 8; depth += 1) {
         const candidate = resolve6(cursor, "apps/webui/package.json");
         if (existsSync4(candidate)) {
@@ -8661,11 +9558,11 @@ __export(index_exports, {
   runCli: () => runCli
 });
 import { createHash as createHash3 } from "node:crypto";
-import { appendFile as appendFile4, mkdir as mkdir8, readFile as readFile13, realpath as realpath3, readdir as readdir7, writeFile as writeFile8 } from "node:fs/promises";
+import { appendFile as appendFile4, mkdir as mkdir8, readFile as readFile14, realpath as realpath3, readdir as readdir7, writeFile as writeFile8 } from "node:fs/promises";
 import { createInterface } from "node:readline/promises";
 import { homedir as homedir9 } from "node:os";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { basename as basename2, dirname as dirname10, join as join16 } from "node:path";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { basename as basename4, dirname as dirname13, join as join17 } from "node:path";
 var cliAppName, cliClientDependency, cliDaemonDependency, defaultSessionsDir, defaultStateDir4, runCli, runProject, runLogs, runAttach, attachCacheScope, attachCacheFilePath, attachDiagnosticsFilePath, findAttachDiagnosticsFilePath, stateDirFromSessionsDir, AttachDiagnostics, readAttachCache, writeAttachCache, emptyAttachCacheSnapshot, mergePersistentEvents, highestSeq, highestCachedStreamSeq, updateAttachCacheSnapshot, removeCompletedTransients, isCachedTransientMessage, AsyncInputQueue, parseAttachOptions, parseLogsOptions, runChat, createSigintHandler, loadOrCreateSession, parseChatOptions, requireValue6, promptIfInteractive, writeUsage, writeProjectUsage, writeEventError, writeToolResult, redactDiagnosticFields, formatDiagnosticLine2, formatDiagnosticValue2, AttachEventRenderer, blocksToText, isCliEntrypoint;
 var init_index = __esm({
   async "apps/cli/src/index.ts"() {
@@ -8678,13 +9575,19 @@ var init_index = __esm({
     init_relay_server_cli();
     init_up_cli();
     init_webui_cli();
+    init_update_cli();
     cliAppName = "@scorel/app-cli";
     cliClientDependency = clientPackageName;
     cliDaemonDependency = daemonPackageName;
     defaultSessionsDir = () => scorelSessionsDir(homedir9());
-    defaultStateDir4 = () => join16(homedir9(), ".scorel");
+    defaultStateDir4 = () => join17(homedir9(), ".scorel");
     runCli = async (argv, io = { input: process.stdin, output: process.stdout, error: process.stderr }, runOptions = {}) => {
       const [command, ...rest] = argv;
+      if (command === "--version" || command === "-v" || command === "version") {
+        io.output.write(`${await readInstalledScorelVersion()}
+`);
+        return 0;
+      }
       if (!command || command === "chat") {
         if (rest.includes("--help") || rest.includes("-h")) {
           writeUsage(io.output);
@@ -8730,6 +9633,9 @@ var init_index = __esm({
           error: io.error
         });
       }
+      if (command === "update" || command === "upgrade") {
+        return runCliUpdate(rest, { output: io.output, error: io.error });
+      }
       if (command === "attach") {
         try {
           return runAttach(parseAttachOptions(rest), {
@@ -8817,10 +9723,10 @@ var init_index = __esm({
       }
     };
     runLogs = async (options, io) => {
-      const filePath = options.attach ? await findAttachDiagnosticsFilePath(io.stateDir, options.sessionId, options.remoteUrl) : join16(io.sessionsDir, `${options.sessionId}.log`);
+      const filePath = options.attach ? await findAttachDiagnosticsFilePath(io.stateDir, options.sessionId, options.remoteUrl) : join17(io.sessionsDir, `${options.sessionId}.log`);
       let content;
       try {
-        content = await readFile13(filePath, "utf8");
+        content = await readFile14(filePath, "utf8");
       } catch (cause) {
         io.error.write(`scorel logs error: ${cause instanceof Error ? cause.message : String(cause)}
 `);
@@ -8974,31 +9880,31 @@ var init_index = __esm({
     };
     attachCacheFilePath = (stateDir, scope, sessionId) => {
       const scopeKey = createHash3("sha256").update(`${scope.kind}\0${scope.locator}`).digest("hex").slice(0, 24);
-      return join16(stateDir, "attach-cache", scopeKey, `${sessionId}.json`);
+      return join17(stateDir, "attach-cache", scopeKey, `${sessionId}.json`);
     };
     attachDiagnosticsFilePath = (stateDir, scope, sessionId) => {
       const scopeKey = createHash3("sha256").update(`${scope.kind}\0${scope.locator}`).digest("hex").slice(0, 24);
-      return join16(stateDir, "attach-cache", scopeKey, `${sessionId}.log`);
+      return join17(stateDir, "attach-cache", scopeKey, `${sessionId}.log`);
     };
     findAttachDiagnosticsFilePath = async (stateDir, sessionId, _remoteUrl) => {
-      const root = join16(stateDir, "attach-cache");
+      const root = join17(stateDir, "attach-cache");
       const scopes = await readdir7(root).catch(() => []);
       for (const scope of scopes) {
-        const candidate = join16(root, scope, `${sessionId}.log`);
+        const candidate = join17(root, scope, `${sessionId}.log`);
         try {
-          await readFile13(candidate, "utf8");
+          await readFile14(candidate, "utf8");
           return candidate;
         } catch {
           continue;
         }
       }
-      return join16(root, "__missing__", `${sessionId}.log`);
+      return join17(root, "__missing__", `${sessionId}.log`);
     };
     stateDirFromSessionsDir = (sessionsDir) => {
       if (!sessionsDir) {
         return defaultStateDir4();
       }
-      return basename2(sessionsDir) === "sessions" ? dirname10(sessionsDir) : sessionsDir;
+      return basename4(sessionsDir) === "sessions" ? dirname13(sessionsDir) : sessionsDir;
     };
     AttachDiagnostics = class {
       #stateDir;
@@ -9050,14 +9956,14 @@ var init_index = __esm({
         }
         const filePath = attachDiagnosticsFilePath(this.#stateDir, this.#scope, this.#sessionId);
         this.#writes.push(
-          mkdir8(dirname10(filePath), { recursive: true }).then(() => appendFile4(filePath, `${line}
+          mkdir8(dirname13(filePath), { recursive: true }).then(() => appendFile4(filePath, `${line}
 `, "utf8"))
         );
       }
     };
     readAttachCache = async (stateDir, scope, sessionId) => {
       try {
-        const raw = JSON.parse(await readFile13(attachCacheFilePath(stateDir, scope, sessionId), "utf8"));
+        const raw = JSON.parse(await readFile14(attachCacheFilePath(stateDir, scope, sessionId), "utf8"));
         if (raw.version !== 1 || raw.sessionId !== String(sessionId) || raw.scope.kind !== scope.kind || raw.scope.locator !== scope.locator || !Array.isArray(raw.events)) {
           return emptyAttachCacheSnapshot();
         }
@@ -9080,7 +9986,7 @@ var init_index = __esm({
       const filePath = attachCacheFilePath(stateDir, scope, sessionId);
       const uniqueEvents = mergePersistentEvents(snapshot.events);
       const transients = removeCompletedTransients(snapshot.transients, uniqueEvents);
-      await mkdir8(dirname10(filePath), { recursive: true });
+      await mkdir8(dirname13(filePath), { recursive: true });
       await writeFile8(
         filePath,
         `${JSON.stringify({ version: 1, scope, sessionId: String(sessionId), events: uniqueEvents, transients }, null, 2)}
@@ -9217,17 +10123,21 @@ var init_index = __esm({
       return { sessionId, tail, attach, remoteUrl };
     };
     runChat = async (options, io) => {
-      const loadProjectConfig = async (project2) => options.config ?? await loadScorelConfig({ cwd: project2.workDir });
-      const loadProjectConfigProfile = async (project2) => options.config ?? await loadScorelConfigProfile({ cwd: project2.workDir });
+      const configScope = { scorelHomeDir: options.stateDir };
+      const loadProjectConfig = async (project2) => options.config ?? await loadScorelConfig({ cwd: project2.workDir, ...configScope });
+      const loadProjectConfigProfile = async (project2) => options.config ?? await loadScorelConfigProfile({ cwd: project2.workDir, ...configScope });
       const daemon = new ScorelHost({
         sessionsDir: options.sessionsDir,
-        projectsPath: join16(options.stateDir, "projects.json"),
+        projectsPath: join17(options.stateDir, "projects.json"),
         deviceId: asDeviceId("device_local"),
+        scorelHomeDir: options.stateDir,
         loadConfig: async ({ project: project2 }) => loadProjectConfig(project2),
         loadConfigProfile: async ({ project: project2 }) => loadProjectConfigProfile(project2),
-        createRuntime: async ({ project: project2, selectedModel, purpose }) => createRealRuntime({
+        createRuntime: async ({ sessionId, project: project2, selectedModel, purpose }) => createRealRuntime({
           cwd: project2.workDir,
           config: await loadProjectConfig(project2),
+          sessionsDir: options.sessionsDir,
+          sessionId,
           modelSelection: selectedModel ? { modelId: selectedModel.modelId, role: selectedModel.role } : void 0,
           includeTools: purpose === "chat"
         })
@@ -9356,8 +10266,10 @@ var init_index = __esm({
           "Usage: scorel chat [--session <id>] [--cwd <dir>]",
           "       scorel [--session <id>] [--cwd <dir>]",
           "       scorel attach --session <id> --remote <ws-url> --token <token>",
+          "       scorel host start [--host <h>] [--port <p>] [--token <t>] [--project <dir>]",
+          "                        [--relay <relay-url> | --no-relay] [--replace] [--idle-timeout-ms <ms>]",
           "       scorel host serve [--host <h>] [--port <p>] [--token <t>] [--project <dir>]",
-          "                        [--relay <relay-url> | --no-relay] [--replace]",
+          "                        [--relay <relay-url> | --no-relay] [--replace] [--idle-timeout-ms <ms>]",
           "       scorel host status [--show-token]",
           "       scorel host stop",
           "       scorel host reset",
@@ -9365,6 +10277,9 @@ var init_index = __esm({
           "       scorel relay serve [--host <h>] [--port <p>] [--data-dir <dir>]",
           "       scorel webui [--port <p>] [--host <h>]",
           "       scorel up [--daemon-port <p>] [--webui-port <p>] [--cwd <d>]",
+          "       scorel update",
+          "       scorel upgrade",
+          "       scorel version",
           "       scorel logs [--attach] --session <id> [--remote <ws-url>] [--tail <n>]",
           "       scorel project list",
           "       scorel project add <dir>",
@@ -9496,7 +10411,7 @@ ${text}
       if (!process.argv[1]) return false;
       const [argvPath, modulePath] = await Promise.all([
         realpath3(process.argv[1]).catch(() => process.argv[1]),
-        realpath3(fileURLToPath3(import.meta.url)).catch(() => fileURLToPath3(import.meta.url))
+        realpath3(fileURLToPath5(import.meta.url)).catch(() => fileURLToPath5(import.meta.url))
       ]);
       return argvPath === modulePath;
     };