@codelia/runtime 0.1.3 → 0.1.10

package/dist/index.js

@@ -1,7 +1,9 @@
 // src/runtime.ts
-import path13 from "path";
+import path15 from "path";
+import { SessionStateStoreImpl as SessionStateStoreImpl2 } from "@codelia/storage";
 
 // src/agent-factory.ts
+import { promises as fs14 } from "fs";
 import {
   Agent,
   ChatAnthropic,
@@ -840,10 +842,13 @@ var describeRpcMessage = (msg) => {
   }
   return "unknown";
 };
+var serializeMessage = (msg) => ({
+  payload: `${JSON.stringify(msg)}
+`,
+  label: describeRpcMessage(msg)
+});
 var send = (msg) => {
-  const payload = `${JSON.stringify(msg)}
-`;
-  const label = describeRpcMessage(msg);
+  const { payload, label } = serializeMessage(msg);
   const writable = process.stdout.write(payload, (error) => {
     if (error) {
       debugLog(`transport.write.error label=${label} message=${error.message}`);
@@ -853,6 +858,20 @@ var send = (msg) => {
     debugLog(`transport.backpressure label=${label} bytes=${payload.length}`);
   }
 };
+var sendAsync = async (msg) => new Promise((resolve) => {
+  const { payload, label } = serializeMessage(msg);
+  const writable = process.stdout.write(payload, (error) => {
+    if (error) {
+      debugLog(
+        `transport.write.error label=${label} message=${error.message}`
+      );
+    }
+    resolve();
+  });
+  if (!writable) {
+    debugLog(`transport.backpressure label=${label} bytes=${payload.length}`);
+  }
+});
 var sendError = (id, error) => {
   const response = { jsonrpc: "2.0", id, error };
   send(response);
@@ -876,6 +895,21 @@ var sendAgentEvent = (state, runId, event) => {
   send(notify);
   return seq;
 };
+var sendAgentEventAsync = async (state, runId, event) => {
+  if (state.shouldSuppressEvent(runId)) return null;
+  const seq = state.nextSequence(runId);
+  const notify = {
+    jsonrpc: "2.0",
+    method: "agent.event",
+    params: {
+      run_id: runId,
+      seq,
+      event
+    }
+  };
+  await sendAsync(notify);
+  return seq;
+};
 var sendRunStatus = (runId, status, message) => {
   const notify = {
     jsonrpc: "2.0",
@@ -888,6 +922,18 @@ var sendRunStatus = (runId, status, message) => {
   };
   send(notify);
 };
+var sendRunStatusAsync = async (runId, status, message) => {
+  const notify = {
+    jsonrpc: "2.0",
+    method: "run.status",
+    params: {
+      run_id: runId,
+      status,
+      message
+    }
+  };
+  await sendAsync(notify);
+};
 var sendRunContext = (runId, contextLeftPercent) => {
   const notify = {
     jsonrpc: "2.0",
@@ -966,10 +1012,15 @@ var AuthStore = class {
 };
 
 // src/auth/resolver.ts
-var SUPPORTED_PROVIDERS = ["openai", "anthropic"];
+var SUPPORTED_PROVIDERS = [
+  "openai",
+  "anthropic",
+  "openrouter"
+];
 var API_KEY_ENV = {
   openai: "OPENAI_API_KEY",
-  anthropic: "ANTHROPIC_API_KEY"
+  anthropic: "ANTHROPIC_API_KEY",
+  openrouter: "OPENROUTER_API_KEY"
 };
 var AuthResolver = class _AuthResolver {
   auth;
@@ -987,6 +1038,12 @@ var AuthResolver = class _AuthResolver {
     const auth = await store.load();
     return new _AuthResolver(state, log2, store, auth);
   }
+  hasAnyAvailableAuth() {
+    return SUPPORTED_PROVIDERS.some((provider) => {
+      if (this.auth.providers[provider]) return true;
+      return Boolean(readEnvValue(API_KEY_ENV[provider]));
+    });
+  }
   async resolveProvider(preferred) {
     const preferredProvider = preferred && SUPPORTED_PROVIDERS.includes(preferred) ? preferred : null;
     if (preferredProvider) return preferredProvider;
@@ -1005,10 +1062,11 @@ var AuthResolver = class _AuthResolver {
       return "openai";
     }
     const result = await requestUiPick(this.state, {
-      title: "Select provider",
+      title: "Welcome! Choose your provider to get started.",
       items: SUPPORTED_PROVIDERS.map((provider) => ({
         id: provider,
-        label: provider
+        label: provider,
+        detail: provider === "openai" ? "OAuth (ChatGPT Plus/Pro) or API key" : provider === "openrouter" ? "API key (OpenRouter)" : "API key"
       })),
       multi: false
     });
@@ -1031,7 +1089,17 @@ var AuthResolver = class _AuthResolver {
     if (provider === "openai") {
       return this.promptOpenAiAuth();
     }
-    return this.promptApiKey(provider, "Anthropic API key");
+    return this.promptApiKey(provider, this.getApiKeyPromptLabel(provider));
+  }
+  getApiKeyPromptLabel(provider) {
+    switch (provider) {
+      case "anthropic":
+        return "Anthropic API key";
+      case "openrouter":
+        return "OpenRouter API key";
+      default:
+        return "API key";
+    }
   }
   async getOpenAiAccessToken() {
     const entry = this.auth.providers.openai;
@@ -1060,10 +1128,18 @@ var AuthResolver = class _AuthResolver {
       throw new Error("UI does not support auth prompts");
     }
     const pick = await requestUiPick(this.state, {
-      title: "OpenAI auth method",
+      title: "How would you like to connect OpenAI?",
       items: [
-        { id: "oauth", label: "ChatGPT Plus/Pro (OAuth)" },
-        { id: "api_key", label: "Manually enter API key" }
+        {
+          id: "oauth",
+          label: "ChatGPT Plus/Pro (OAuth)",
+          detail: "Recommended if you use ChatGPT subscription access"
+        },
+        {
+          id: "api_key",
+          label: "OpenAI API key",
+          detail: "Use a standard OpenAI API key from platform settings"
+        }
       ],
       multi: false
     });
@@ -1087,7 +1163,7 @@ var AuthResolver = class _AuthResolver {
     const session = await createOAuthSession();
     const confirm = await requestUiConfirm(this.state, {
       title: "OpenAI OAuth",
-      message: `Open your browser to authenticate.
+      message: `You're almost done. Open your browser to continue sign in.
 
 ${session.authUrl}`,
       confirm_label: "Open browser",
@@ -1126,7 +1202,7 @@ ${session.authUrl}`,
     }
     const prompt = await requestUiPrompt(this.state, {
       title: label,
-      message: "Enter the API key.",
+      message: "Paste your API key to continue. You can change it later with /logout.",
       secret: true
     });
     const value = prompt?.value?.trim() ?? "";
@@ -1327,7 +1403,8 @@ var createMcpOAuthSession = async (params) => {
 import { applyModelMetadata, DEFAULT_MODEL_REGISTRY } from "@codelia/core";
 import { ModelMetadataServiceImpl } from "@codelia/model-metadata";
 import { StoragePathServiceImpl as StoragePathServiceImpl2 } from "@codelia/storage";
-var buildModelRegistry = async (llm) => {
+var buildModelRegistry = async (llm, options = {}) => {
+  const strict = options.strict ?? true;
   const metadataService = new ModelMetadataServiceImpl({
     storagePathService: new StoragePathServiceImpl2()
   });
@@ -1342,9 +1419,11 @@ var buildModelRegistry = async (llm) => {
     fullIdEntry = providerEntries?.[`${llm.provider}/${llm.model}`];
   }
   if (!directEntry && !fullIdEntry) {
-    throw new Error(
-      `Model metadata not found for ${llm.provider}/${llm.model} after refresh`
-    );
+    if (strict) {
+      throw new Error(
+        `Model metadata not found for ${llm.provider}/${llm.model} after refresh`
+      );
+    }
   }
   return applyModelMetadata(DEFAULT_MODEL_REGISTRY, { models: entries });
 };
@@ -1701,6 +1780,8 @@ var SYSTEM_TOOL_ALLOWLIST = [
   "agents_resolve",
   "skill_search",
   "skill_load",
+  "lane_list",
+  "lane_status",
   "done"
 ];
 var SYSTEM_BASH_ALLOWLIST = [
@@ -1792,7 +1873,27 @@ var PermissionService = class {
         message: `${skillName ? skillName : explicitPath || `skill_load ${rawArgs}`}${rememberPreview}`
       };
     }
-    return { title: "Run tool?", message: `${toolName} ${rawArgs}` };
+    if (toolName === "write") {
+      const parsed = parseRawArgsForPrompt(rawArgs);
+      const filePath = parsed && typeof parsed.file_path === "string" ? parsed.file_path.trim() : "";
+      const content = parsed && typeof parsed.content === "string" ? parsed.content : "";
+      const target = filePath || "(unknown path)";
+      return {
+        title: "Run tool?",
+        message: `write ${target} (${content.length} bytes)${rememberPreview}`
+      };
+    }
+    if (toolName === "edit") {
+      const parsed = parseRawArgsForPrompt(rawArgs);
+      const filePath = parsed && typeof parsed.file_path === "string" ? parsed.file_path.trim() : "";
+      const target = filePath || "(unknown path)";
+      const mode = parsed && typeof parsed.match_mode === "string" ? parsed.match_mode : "auto";
+      return {
+        title: "Run tool?",
+        message: `edit ${target} (match=${mode})${rememberPreview}`
+      };
+    }
+    return { title: "Run tool?", message: toolName };
   }
   evaluate(toolName, rawArgs) {
     if (toolName === "bash") {
@@ -3288,151 +3389,877 @@ var createGrepTool = (sandboxKey) => defineTool6({
   }
 });
 
-// src/tools/read.ts
-import { promises as fs10 } from "fs";
+// src/tools/lane.ts
 import { defineTool as defineTool7 } from "@codelia/core";
 import { z as z8 } from "zod";
-var DEFAULT_READ_LIMIT = 2e3;
-var MAX_LINE_LENGTH = 2e3;
-var MAX_BYTES = 50 * 1024;
-var createReadTool = (sandboxKey) => defineTool7({
-  name: "read",
-  description: "Read a text file with optional 0-based line offset and line limit.",
-  input: z8.object({
-    file_path: z8.string().describe("File path under the sandbox root."),
-    offset: z8.number().int().nonnegative().optional().describe("0-based start line. Default 0."),
-    limit: z8.number().int().positive().optional().describe("Max lines to read. Default 2000.")
-  }),
-  execute: async (input, ctx) => {
-    let resolved;
-    try {
-      const sandbox = await getSandboxContext(ctx, sandboxKey);
-      resolved = sandbox.resolvePath(input.file_path);
-    } catch (error) {
-      return `Security error: ${String(error)}`;
-    }
-    try {
-      const stat = await fs10.stat(resolved);
-      if (stat.isDirectory()) {
-        return `Path is a directory: ${input.file_path}`;
+
+// src/lanes/manager.ts
+import crypto4 from "crypto";
+import { promises as fs11 } from "fs";
+import os2 from "os";
+import path11 from "path";
+
+// src/lanes/command.ts
+import { spawn as spawn3 } from "child_process";
+var DEFAULT_TIMEOUT_MS = 3e4;
+var MAX_CAPTURE_BYTES = 512 * 1024;
+var truncate2 = (value) => {
+  if (value.length <= 8e3) return value;
+  return `${value.slice(0, 8e3)}...[truncated]`;
+};
+var runCommand = async (command, args, options = {}) => {
+  const timeoutMs = Math.max(1e3, options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+  return new Promise((resolve, reject) => {
+    const child = spawn3(command, args, {
+      cwd: options.cwd,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    let bytes = 0;
+    let done = false;
+    const finish = (fn) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      fn();
+    };
+    const consume = (chunk, kind) => {
+      const text = chunk.toString("utf8");
+      bytes += Buffer.byteLength(text, "utf8");
+      if (bytes > MAX_CAPTURE_BYTES) {
+        finish(
+          () => reject(
+            new Error(
+              `${command} output exceeded ${MAX_CAPTURE_BYTES} bytes while running ${args.join(" ")}`
+            )
+          )
+        );
+        try {
+          child.kill("SIGTERM");
+        } catch {
+        }
+        return;
       }
-    } catch {
-      return `File not found: ${input.file_path}`;
-    }
-    try {
-      const content = await fs10.readFile(resolved, "utf8");
-      const lines = content.split(/\r?\n/);
-      if (lines.length === 0) {
-        return "";
+      if (kind === "stdout") {
+        stdout += text;
+      } else {
+        stderr += text;
       }
-      const offset = input.offset ?? 0;
-      const limit = input.limit ?? DEFAULT_READ_LIMIT;
-      if (offset >= lines.length) {
-        return `Offset exceeds file length: ${input.file_path}`;
+    };
+    child.stdout?.on("data", (chunk) => consume(chunk, "stdout"));
+    child.stderr?.on("data", (chunk) => consume(chunk, "stderr"));
+    child.on("error", (error) => {
+      finish(() => reject(error));
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        finish(() => resolve({ stdout, stderr }));
+        return;
       }
-      const raw = [];
-      let bytes = 0;
-      let truncatedByBytes = false;
-      for (let index = offset; index < Math.min(lines.length, offset + limit); index += 1) {
-        const line = lines[index].length > MAX_LINE_LENGTH ? `${lines[index].slice(0, MAX_LINE_LENGTH)}...` : lines[index];
-        const size = Buffer.byteLength(line, "utf8") + (raw.length > 0 ? 1 : 0);
-        if (bytes + size > MAX_BYTES) {
-          truncatedByBytes = true;
-          break;
-        }
-        raw.push(line);
-        bytes += size;
+      const detail = `${stderr}
+${stdout}`.trim();
+      const message = detail ? `${command} ${args.join(" ")} failed (exit ${String(code)}): ${truncate2(detail)}` : `${command} ${args.join(" ")} failed (exit ${String(code)})`;
+      finish(() => reject(new Error(message)));
+    });
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGTERM");
+      } catch {
       }
-      const numbered = raw.map(
-        (line, index) => `${String(index + offset + 1).padStart(5, " ")}  ${line}`
+      finish(
+        () => reject(
+          new Error(
+            `${command} ${args.join(" ")} timed out after ${Math.floor(timeoutMs / 1e3)}s`
+          )
+        )
       );
-      const lastReadLine = offset + raw.length;
-      const hasMoreLines = lines.length > lastReadLine;
-      const truncated = truncatedByBytes || hasMoreLines;
-      let output = numbered.join("\n");
-      if (truncated) {
-        const reason = truncatedByBytes ? `Output truncated at ${MAX_BYTES} bytes.` : "File has more lines.";
-        output += `
+    }, timeoutMs);
+  });
+};
 
-${reason} Use offset to read beyond line ${lastReadLine}.`;
-      }
-      return output;
-    } catch (error) {
-      return `Error reading file: ${String(error)}`;
+// src/lanes/registry.ts
+import { promises as fs10 } from "fs";
+import path10 from "path";
+import { resolveStoragePaths as resolveStoragePaths2 } from "@codelia/storage";
+var REGISTRY_DIRNAME = "lanes";
+var REGISTRY_FILENAME = "registry.json";
+var nowIso = () => (/* @__PURE__ */ new Date()).toISOString();
+var sortByUpdatedDesc = (lanes) => [...lanes].sort((a, b) => b.updated_at.localeCompare(a.updated_at));
+var readJsonFile = async (filePath) => {
+  try {
+    const raw = await fs10.readFile(filePath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (!parsed || parsed.version !== 1 || !Array.isArray(parsed.lanes)) {
+      return null;
+    }
+    return {
+      version: 1,
+      lanes: parsed.lanes
+    };
+  } catch {
+    return null;
+  }
+};
+var atomicWrite = async (filePath, payload) => {
+  const dir = path10.dirname(filePath);
+  const base = path10.basename(filePath);
+  const tmp = path10.join(
+    dir,
+    `${base}.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`
+  );
+  await fs10.writeFile(tmp, payload, "utf8");
+  await fs10.rename(tmp, filePath);
+};
+var LaneRegistryStore = class {
+  registryPath;
+  constructor(registryPath) {
+    if (registryPath) {
+      this.registryPath = registryPath;
+      return;
     }
+    const root = resolveStoragePaths2().root;
+    this.registryPath = path10.join(root, REGISTRY_DIRNAME, REGISTRY_FILENAME);
   }
-});
+  async ensureDir() {
+    await fs10.mkdir(path10.dirname(this.registryPath), { recursive: true });
+  }
+  async readAll() {
+    await this.ensureDir();
+    const data = await readJsonFile(this.registryPath);
+    if (!data) return [];
+    return sortByUpdatedDesc(data.lanes);
+  }
+  async writeAll(lanes) {
+    await this.ensureDir();
+    const payload = {
+      version: 1,
+      lanes: sortByUpdatedDesc(lanes)
+    };
+    await atomicWrite(
+      this.registryPath,
+      `${JSON.stringify(payload, null, 2)}
+`
+    );
+  }
+  async list() {
+    return this.readAll();
+  }
+  async get(laneId) {
+    const lanes = await this.readAll();
+    return lanes.find((lane) => lane.lane_id === laneId) ?? null;
+  }
+  async upsert(record) {
+    const lanes = await this.readAll();
+    const idx = lanes.findIndex((lane) => lane.lane_id === record.lane_id);
+    const next = {
+      ...record,
+      updated_at: nowIso()
+    };
+    if (idx >= 0) {
+      lanes[idx] = next;
+    } else {
+      lanes.push(next);
+    }
+    await this.writeAll(lanes);
+  }
+  async patch(laneId, patch) {
+    const lanes = await this.readAll();
+    const idx = lanes.findIndex((lane) => lane.lane_id === laneId);
+    if (idx < 0) return null;
+    const current = lanes[idx];
+    const next = {
+      ...current,
+      ...patch,
+      lane_id: current.lane_id,
+      created_at: current.created_at,
+      updated_at: nowIso()
+    };
+    lanes[idx] = next;
+    await this.writeAll(lanes);
+    return next;
+  }
+};
 
-// src/tools/skill-load.ts
-import { defineTool as defineTool8 } from "@codelia/core";
-import { z as z9 } from "zod";
-var SkillLoadInputSchema = z9.object({
-  name: z9.string().min(1).optional().describe("Exact skill name to load."),
-  path: z9.string().min(1).optional().describe("Absolute or workspace-relative path to SKILL.md.")
-}).refine((value) => !!value.name || !!value.path, {
-  message: "name or path is required",
-  path: ["name"]
-});
-var createSkillLoadTool = (skillsResolverKey) => defineTool8({
-  name: "skill_load",
-  description: "Load full SKILL.md content by exact name or path.",
-  input: SkillLoadInputSchema,
-  execute: async (input, ctx) => {
+// src/lanes/manager.ts
+var nowIso2 = () => (/* @__PURE__ */ new Date()).toISOString();
+var INITIAL_MESSAGE_FLAG = "--initial-message";
+var toSlug = (value) => {
+  const normalized = value.trim().toLowerCase().replaceAll(/[^a-z0-9]+/g, "-").replaceAll(/^-+|-+$/g, "");
+  return normalized || "task";
+};
+var parseDate = (value) => {
+  const ts = Date.parse(value);
+  if (Number.isNaN(ts)) return 0;
+  return ts;
+};
+var isNotFoundError = (error) => {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("command not found") || message.includes("ENOENT") || message.includes("not found");
+};
+var isExitFailure = (error) => {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("failed (exit");
+};
+var LaneManagerError = class extends Error {
+  code;
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "LaneManagerError";
+  }
+};
+var LaneManager = class {
+  runner;
+  registry;
+  now;
+  randomId;
+  launchCommand;
+  defaultWorktreeRoot;
+  constructor(options = {}) {
+    this.runner = options.runner ?? runCommand;
+    this.registry = options.registry ?? new LaneRegistryStore();
+    this.now = options.now ?? nowIso2;
+    this.randomId = options.randomId ?? (() => crypto4.randomUUID());
+    this.launchCommand = options.launchCommand ?? process.env.CODELIA_LANE_LAUNCH_COMMAND?.trim() ?? "codelia";
+    this.defaultWorktreeRoot = options.defaultWorktreeRoot ?? path11.join(os2.homedir(), ".codelia", "worktrees");
+  }
+  async cmd(command, args, options) {
+    debugLog(`lane.cmd ${command} ${args.join(" ")}`);
+    return this.runner(command, args, options);
+  }
+  async resolveRepoRoot(workingDir) {
+    const { stdout } = await this.cmd(
+      "git",
+      ["-C", workingDir, "rev-parse", "--show-toplevel"],
+      { cwd: workingDir }
+    );
+    const root = stdout.trim();
+    if (!root) {
+      throw new LaneManagerError(
+        "backend_command_failed",
+        "Could not resolve git repository root."
+      );
+    }
+    return root;
+  }
+  async preflightBackend(backend) {
+    if (backend === "tmux") {
+      try {
+        await this.cmd("tmux", ["-V"]);
+        return;
+      } catch (error) {
+        if (isNotFoundError(error)) {
+          throw new LaneManagerError(
+            "backend_not_found",
+            "tmux not found in PATH."
+          );
+        }
+        throw new LaneManagerError(
+          "backend_command_failed",
+          `tmux preflight failed: ${String(error)}`
+        );
+      }
+    }
     try {
-      const resolver = await getSkillsResolver(ctx, skillsResolverKey);
-      const result = await resolver.load(input);
-      if (!result.ok) {
-        return {
-          ok: false,
-          error: result.message,
-          ambiguous_paths: result.ambiguous_paths ?? [],
-          already_loaded: null,
-          skill: null,
-          content: null,
-          files: [],
-          files_truncated: false
-        };
+      await this.cmd("zellij", ["--version"]);
+    } catch (error) {
+      if (isNotFoundError(error)) {
+        throw new LaneManagerError(
+          "backend_not_found",
+          "zellij not found in PATH."
+        );
       }
-      return {
-        ok: true,
-        error: null,
-        ambiguous_paths: [],
-        already_loaded: result.already_loaded,
-        skill: result.skill,
-        content: result.content,
-        files: result.files,
-        files_truncated: result.files_truncated
-      };
+      throw new LaneManagerError(
+        "backend_command_failed",
+        `zellij preflight failed: ${String(error)}`
+      );
+    }
+    throw new LaneManagerError(
+      "backend_command_failed",
+      "zellij backend is not supported yet in lane MVP. Use tmux."
+    );
+  }
+  async startTmuxLane(target, worktreePath, seedContext) {
+    const launchCommand = this.buildLaunchCommand(seedContext);
+    await this.cmd("tmux", [
+      "new-session",
+      "-d",
+      "-s",
+      target,
+      "-c",
+      worktreePath
+    ]);
+    const paneTarget = `${target}:0.0`;
+    await this.cmd("tmux", [
+      "send-keys",
+      "-t",
+      paneTarget,
+      "-l",
+      launchCommand
+    ]);
+    await this.cmd("tmux", ["send-keys", "-t", paneTarget, "Enter"]);
+  }
+  shellQuote(value) {
+    if (!value) return "''";
+    return `'${value.replaceAll("'", "'\\''")}'`;
+  }
+  buildLaunchCommand(seedContext) {
+    const seed = seedContext?.trim();
+    if (!seed) {
+      return this.launchCommand;
+    }
+    return `${this.launchCommand} ${INITIAL_MESSAGE_FLAG} ${this.shellQuote(seed)}`;
+  }
+  async isTmuxAlive(target) {
+    try {
+      await this.cmd("tmux", ["has-session", "-t", target], {
+        timeoutMs: 5e3
+      });
+      return true;
     } catch (error) {
-      return {
-        ok: false,
-        error: `Error loading skill: ${String(error)}`,
-        ambiguous_paths: [],
-        already_loaded: null,
-        skill: null,
-        content: null,
-        files: [],
-        files_truncated: false
-      };
+      if (isExitFailure(error)) return false;
+      throw new LaneManagerError(
+        "backend_command_failed",
+        `tmux status failed: ${String(error)}`
+      );
     }
   }
-});
-
-// src/tools/skill-search.ts
-import { defineTool as defineTool9 } from "@codelia/core";
-import { z as z10 } from "zod";
-var createSkillSearchTool = (skillsResolverKey) => defineTool9({
-  name: "skill_search",
-  description: "Search installed local skills by name, description, or path.",
-  input: z10.object({
-    query: z10.string().min(1).describe("Search query text."),
-    limit: z10.number().int().positive().optional().describe("Optional max result count (clamped by config)."),
-    scope: z10.enum(["repo", "user"]).optional().describe("Optional scope filter.")
-  }),
-  execute: async (input, ctx) => {
+  async stopTmuxLane(target) {
     try {
-      const resolver = await getSkillsResolver(ctx, skillsResolverKey);
-      const result = await resolver.search(input);
+      await this.cmd("tmux", ["kill-session", "-t", target], {
+        timeoutMs: 1e4
+      });
+    } catch (error) {
+      if (isExitFailure(error)) return;
+      throw new LaneManagerError(
+        "backend_command_failed",
+        `tmux close failed: ${String(error)}`
+      );
+    }
+  }
+  async resolveWorktreeMainRoot(worktreePath) {
+    const { stdout } = await this.cmd("git", [
+      "-C",
+      worktreePath,
+      "rev-parse",
+      "--git-common-dir"
+    ]);
+    const commonDir = path11.resolve(worktreePath, stdout.trim());
+    if (path11.basename(commonDir) === ".git") {
+      return path11.dirname(commonDir);
+    }
+    return await this.resolveRepoRoot(worktreePath);
+  }
+  async isWorktreeDirty(worktreePath) {
+    try {
+      await fs11.access(worktreePath);
+    } catch {
+      return false;
+    }
+    const { stdout } = await this.cmd("git", [
+      "-C",
+      worktreePath,
+      "status",
+      "--porcelain"
+    ]);
+    return stdout.trim().length > 0;
+  }
+  async removeWorktree(worktreePath, force) {
+    try {
+      await fs11.access(worktreePath);
+    } catch {
+      return;
+    }
+    const repoRoot = await this.resolveWorktreeMainRoot(worktreePath);
+    const args = ["-C", repoRoot, "worktree", "remove"];
+    if (force) args.push("--force");
+    args.push(worktreePath);
+    await this.cmd("git", args);
+  }
+  async create(input, options) {
+    const taskId = input.task_id.trim();
+    if (!taskId) {
+      throw new LaneManagerError(
+        "backend_command_failed",
+        "task_id is required."
+      );
+    }
+    const backend = input.mux_backend ?? "tmux";
+    await this.preflightBackend(backend);
+    const repoRoot = await this.resolveRepoRoot(options.workingDir);
+    const laneId = this.randomId();
+    const slug = toSlug(taskId);
+    const shortId = laneId.slice(0, 8);
+    const branchName = `lane/${slug}-${shortId}`;
+    const worktreePath = input.worktree_path ? path11.resolve(options.workingDir, input.worktree_path) : path11.join(this.defaultWorktreeRoot, `${slug}-${shortId}`);
+    const muxTarget = `codelia-lane-${shortId}`;
+    const createdAt = this.now();
+    const record = {
+      lane_id: laneId,
+      task_id: taskId,
+      state: "creating",
+      mux_backend: backend,
+      mux_target: muxTarget,
+      worktree_path: worktreePath,
+      branch_name: branchName,
+      session_id: crypto4.randomUUID(),
+      created_at: createdAt,
+      updated_at: createdAt,
+      last_activity_at: createdAt
+    };
+    await this.registry.upsert(record);
+    try {
+      await fs11.mkdir(path11.dirname(worktreePath), { recursive: true });
+      await this.cmd("git", [
+        "-C",
+        repoRoot,
+        "worktree",
+        "add",
+        "-b",
+        branchName,
+        worktreePath,
+        input.base_ref?.trim() || "HEAD"
+      ]);
+      if (backend === "tmux") {
+        await this.startTmuxLane(muxTarget, worktreePath, input.seed_context);
+      }
+      const running = await this.registry.patch(laneId, {
+        state: "running",
+        last_activity_at: this.now(),
+        last_error: void 0
+      });
+      if (!running) {
+        throw new Error("lane record disappeared during create");
+      }
+      return running;
+    } catch (error) {
+      await this.registry.patch(laneId, {
+        state: "error",
+        last_error: String(error),
+        last_activity_at: this.now()
+      });
+      throw new LaneManagerError(
+        "backend_command_failed",
+        `lane.create failed (${laneId}): ${String(error)}`
+      );
+    }
+  }
+  async list(input) {
+    const all = await this.registry.list();
+    if (input?.include_closed) return all;
+    return all.filter((lane) => lane.state !== "closed");
+  }
+  async status(laneId) {
+    const lane = await this.registry.get(laneId);
+    if (!lane) {
+      throw new LaneManagerError("lane_not_found", `Lane not found: ${laneId}`);
+    }
+    let alive = false;
+    if (lane.state !== "closed") {
+      if (lane.mux_backend === "tmux") {
+        alive = await this.isTmuxAlive(lane.mux_target);
+      }
+      if (lane.state === "running" && !alive) {
+        const patched = await this.registry.patch(lane.lane_id, {
+          state: "finished",
+          last_activity_at: this.now()
+        });
+        if (patched) {
+          return { lane: patched, backend_alive: false };
+        }
+      }
+    }
+    return { lane, backend_alive: alive };
+  }
+  async close(input) {
+    const lane = await this.registry.get(input.lane_id);
+    if (!lane) {
+      throw new LaneManagerError(
+        "lane_not_found",
+        `Lane not found: ${input.lane_id}`
+      );
+    }
+    if (lane.state === "closed") {
+      return lane;
+    }
+    const force = input.force === true;
+    const removeWorktree = input.remove_worktree !== false;
+    const status = await this.status(lane.lane_id);
+    const refreshed = status.lane;
+    if (status.backend_alive && !force) {
+      throw new LaneManagerError(
+        "lane_running",
+        `Lane is still running: ${lane.lane_id}`
+      );
+    }
+    if (status.backend_alive && refreshed.mux_backend === "tmux") {
+      await this.stopTmuxLane(refreshed.mux_target);
+    }
+    if (removeWorktree) {
+      const dirty = await this.isWorktreeDirty(refreshed.worktree_path);
+      if (dirty && !force) {
+        throw new LaneManagerError(
+          "worktree_dirty",
+          `Worktree has uncommitted changes: ${refreshed.worktree_path}`
+        );
+      }
+      await this.removeWorktree(refreshed.worktree_path, force);
+    }
+    const closed = await this.registry.patch(refreshed.lane_id, {
+      state: "closed",
+      last_activity_at: this.now()
+    });
+    if (!closed) {
+      throw new LaneManagerError(
+        "backend_command_failed",
+        "Failed to persist lane close state."
+      );
+    }
+    return closed;
+  }
+  async gc(input) {
+    const ttlMs = Math.max(1, input.idle_ttl_minutes) * 6e4;
+    const now = Date.now();
+    const lanes = await this.registry.list();
+    let closed = 0;
+    let skipped = 0;
+    const errors = [];
+    for (const lane of lanes) {
+      try {
+        const status = await this.status(lane.lane_id);
+        const current = status.lane;
+        if (current.state === "running" || current.state === "closed") {
+          skipped += 1;
+          continue;
+        }
+        if (current.state !== "finished" && current.state !== "error") {
+          skipped += 1;
+          continue;
+        }
+        const idleSince = parseDate(current.last_activity_at) || parseDate(current.updated_at);
+        if (idleSince <= 0 || now - idleSince < ttlMs) {
+          skipped += 1;
+          continue;
+        }
+        await this.close({
+          lane_id: current.lane_id,
+          remove_worktree: input.remove_worktree,
+          force: input.force
+        });
+        closed += 1;
+      } catch (error) {
+        errors.push(`${lane.lane_id}: ${String(error)}`);
+      }
+    }
+    return {
+      checked: lanes.length,
+      closed,
+      skipped,
+      errors
+    };
+  }
+};
+
+// src/tools/lane.ts
+var laneManager = new LaneManager();
+var backendSchema = z8.enum(["tmux", "zellij"]);
+var formatError = (error) => {
+  if (error instanceof LaneManagerError) {
+    return new Error(`${error.code}: ${error.message}`);
+  }
+  if (error instanceof Error) return error;
+  return new Error(String(error));
+};
+var shQuote = (value) => {
+  if (!value) return "''";
+  return `'${value.replaceAll("'", "'\\''")}'`;
+};
+var buildLaneHints = (lane) => {
+  const attachCommand = lane.mux_backend === "tmux" ? `tmux attach -t ${shQuote(lane.mux_target)}` : lane.mux_backend === "zellij" ? `zellij attach ${shQuote(lane.mux_target)}` : null;
+  return {
+    attach_command: attachCommand,
+    enter_worktree_command: `cd ${shQuote(lane.worktree_path)}`,
+    status_tool: {
+      name: "lane_status",
+      args: { lane_id: lane.lane_id }
+    },
+    close_tool: {
+      name: "lane_close",
+      args: { lane_id: lane.lane_id }
+    }
+  };
+};
+var createLaneCreateTool = (sandboxKey) => defineTool7({
+  name: "lane_create",
+  description: "Create a Task lane (worktree slot) and start autonomous execution in tmux/zellij.",
+  input: z8.object({
+    task_id: z8.string().describe("Task identifier."),
+    base_ref: z8.string().optional().describe("Base git ref. Default: HEAD."),
+    worktree_path: z8.string().optional().describe(
+      "Optional worktree path override. Default: ~/.codelia/worktrees/<task-slug>-<lane-id8>."
+    ),
+    mux_backend: backendSchema.optional().describe("Multiplexer backend. Default: tmux."),
+    seed_context: z8.string().optional().describe("Optional initial text context.")
+  }),
+  execute: async (input, ctx) => {
+    const sandbox = await getSandboxContext(ctx, sandboxKey);
+    try {
+      const lane = await laneManager.create(
+        {
+          task_id: input.task_id,
+          base_ref: input.base_ref,
+          worktree_path: input.worktree_path,
+          mux_backend: input.mux_backend,
+          seed_context: input.seed_context
+        },
+        { workingDir: sandbox.workingDir }
+      );
+      return {
+        ok: true,
+        lane,
+        hints: buildLaneHints(lane)
+      };
+    } catch (error) {
+      throw formatError(error);
+    }
+  }
+});
+var createLaneListTool = (sandboxKey) => defineTool7({
+  name: "lane_list",
+  description: "List Task lanes (worktree slots) and current states.",
+  input: z8.object({
+    include_closed: z8.boolean().optional().describe("Include closed lanes. Default: false.")
+  }),
+  execute: async (input, ctx) => {
+    await getSandboxContext(ctx, sandboxKey);
+    try {
+      const lanes = await laneManager.list({
+        include_closed: input.include_closed
+      });
+      return {
+        lanes,
+        hints: lanes.map((lane) => ({
+          lane_id: lane.lane_id,
+          ...buildLaneHints(lane)
+        }))
+      };
+    } catch (error) {
+      throw formatError(error);
+    }
+  }
+});
+var createLaneStatusTool = (sandboxKey) => defineTool7({
+  name: "lane_status",
+  description: "Get Task lane status and backend liveness.",
+  input: z8.object({
+    lane_id: z8.string().describe("Lane id.")
+  }),
+  execute: async (input, ctx) => {
+    await getSandboxContext(ctx, sandboxKey);
+    try {
+      const result = await laneManager.status(input.lane_id);
+      return {
+        ...result,
+        hints: buildLaneHints(result.lane)
+      };
+    } catch (error) {
+      throw formatError(error);
+    }
+  }
+});
+var createLaneCloseTool = (sandboxKey) => defineTool7({
+  name: "lane_close",
+  description: "Close a Task lane and optionally remove its worktree.",
+  input: z8.object({
+    lane_id: z8.string().describe("Lane id."),
+    remove_worktree: z8.boolean().optional().describe("Remove worktree. Default: true."),
+    force: z8.boolean().optional().describe("Force close/cleanup. Default: false.")
+  }),
+  execute: async (input, ctx) => {
+    await getSandboxContext(ctx, sandboxKey);
+    try {
+      const lane = await laneManager.close({
+        lane_id: input.lane_id,
+        remove_worktree: input.remove_worktree,
+        force: input.force
+      });
+      return {
+        ok: true,
+        lane
+      };
+    } catch (error) {
+      throw formatError(error);
+    }
+  }
+});
+var createLaneGcTool = (sandboxKey) => defineTool7({
+  name: "lane_gc",
+  description: "Close stale finished/error lanes after idle TTL.",
+  input: z8.object({
+    idle_ttl_minutes: z8.number().int().positive().describe("Idle TTL in minutes."),
+    remove_worktree: z8.boolean().optional().describe("Remove worktree on close. Default: false."),
+    force: z8.boolean().optional().describe("Force cleanup for dirty worktrees. Default: false.")
+  }),
+  execute: async (input, ctx) => {
+    await getSandboxContext(ctx, sandboxKey);
+    try {
+      return await laneManager.gc({
+        idle_ttl_minutes: input.idle_ttl_minutes,
+        remove_worktree: input.remove_worktree,
+        force: input.force
+      });
+    } catch (error) {
+      throw formatError(error);
+    }
+  }
+});
+
+// src/tools/read.ts
+import { promises as fs12 } from "fs";
+import { defineTool as defineTool8 } from "@codelia/core";
+import { z as z9 } from "zod";
+var DEFAULT_READ_LIMIT = 2e3;
+var MAX_LINE_LENGTH = 2e3;
+var MAX_BYTES = 50 * 1024;
+var createReadTool = (sandboxKey) => defineTool8({
+  name: "read",
+  description: "Read a text file with optional 0-based line offset and line limit.",
+  input: z9.object({
+    file_path: z9.string().describe("File path under the sandbox root."),
+    offset: z9.number().int().nonnegative().optional().describe("0-based start line. Default 0."),
+    limit: z9.number().int().positive().optional().describe("Max lines to read. Default 2000.")
+  }),
+  execute: async (input, ctx) => {
+    let resolved;
+    try {
+      const sandbox = await getSandboxContext(ctx, sandboxKey);
+      resolved = sandbox.resolvePath(input.file_path);
+    } catch (error) {
+      return `Security error: ${String(error)}`;
+    }
+    try {
+      const stat = await fs12.stat(resolved);
+      if (stat.isDirectory()) {
+        return `Path is a directory: ${input.file_path}`;
+      }
+    } catch {
+      return `File not found: ${input.file_path}`;
+    }
+    try {
+      const content = await fs12.readFile(resolved, "utf8");
+      const lines = content.split(/\r?\n/);
+      if (lines.length === 0) {
+        return "";
+      }
+      const offset = input.offset ?? 0;
+      const limit = input.limit ?? DEFAULT_READ_LIMIT;
+      if (offset >= lines.length) {
+        return `Offset exceeds file length: ${input.file_path}`;
+      }
+      const raw = [];
+      let bytes = 0;
+      let truncatedByBytes = false;
+      for (let index = offset; index < Math.min(lines.length, offset + limit); index += 1) {
+        const line = lines[index].length > MAX_LINE_LENGTH ? `${lines[index].slice(0, MAX_LINE_LENGTH)}...` : lines[index];
+        const size = Buffer.byteLength(line, "utf8") + (raw.length > 0 ? 1 : 0);
+        if (bytes + size > MAX_BYTES) {
+          truncatedByBytes = true;
+          break;
+        }
+        raw.push(line);
+        bytes += size;
+      }
+      const numbered = raw.map(
+        (line, index) => `${String(index + offset + 1).padStart(5, " ")}  ${line}`
+      );
+      const lastReadLine = offset + raw.length;
+      const hasMoreLines = lines.length > lastReadLine;
+      const truncated = truncatedByBytes || hasMoreLines;
+      let output = numbered.join("\n");
+      if (truncated) {
+        const reason = truncatedByBytes ? `Output truncated at ${MAX_BYTES} bytes.` : "File has more lines.";
+        output += `
+
+${reason} Use offset to read beyond line ${lastReadLine}.`;
+      }
+      return output;
+    } catch (error) {
+      return `Error reading file: ${String(error)}`;
+    }
+  }
+});
+
+// src/tools/skill-load.ts
+import { defineTool as defineTool9 } from "@codelia/core";
+import { z as z10 } from "zod";
+var SkillLoadInputSchema = z10.object({
+  name: z10.string().min(1).optional().describe("Exact skill name to load."),
+  path: z10.string().min(1).optional().describe("Absolute or workspace-relative path to SKILL.md.")
+}).refine((value) => !!value.name || !!value.path, {
+  message: "name or path is required",
+  path: ["name"]
+});
+var createSkillLoadTool = (skillsResolverKey) => defineTool9({
+  name: "skill_load",
+  description: "Load full SKILL.md content by exact name or path.",
+  input: SkillLoadInputSchema,
+  execute: async (input, ctx) => {
+    try {
+      const resolver = await getSkillsResolver(ctx, skillsResolverKey);
+      const result = await resolver.load(input);
+      if (!result.ok) {
+        return {
+          ok: false,
+          error: result.message,
+          ambiguous_paths: result.ambiguous_paths ?? [],
+          already_loaded: null,
+          skill: null,
+          content: null,
+          files: [],
+          files_truncated: false
+        };
+      }
+      return {
+        ok: true,
+        error: null,
+        ambiguous_paths: [],
+        already_loaded: result.already_loaded,
+        skill: result.skill,
+        content: result.content,
+        files: result.files,
+        files_truncated: result.files_truncated
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: `Error loading skill: ${String(error)}`,
+        ambiguous_paths: [],
+        already_loaded: null,
+        skill: null,
+        content: null,
+        files: [],
+        files_truncated: false
+      };
+    }
+  }
+});
+
+// src/tools/skill-search.ts
+import { defineTool as defineTool10 } from "@codelia/core";
+import { z as z11 } from "zod";
+var createSkillSearchTool = (skillsResolverKey) => defineTool10({
+  name: "skill_search",
+  description: "Search installed local skills by name, description, or path.",
+  input: z11.object({
+    query: z11.string().min(1).describe("Search query text."),
+    limit: z11.number().int().positive().optional().describe("Optional max result count (clamped by config)."),
+    scope: z11.enum(["repo", "user"]).optional().describe("Optional scope filter.")
+  }),
+  execute: async (input, ctx) => {
+    try {
+      const resolver = await getSkillsResolver(ctx, skillsResolverKey);
+      const result = await resolver.search(input);
       return {
         query: input.query,
         count: result.results.length,
@@ -3450,17 +4277,17 @@ var createSkillSearchTool = (skillsResolverKey) => defineTool9({
 });
 
 // src/tools/todo-read.ts
-import { defineTool as defineTool10 } from "@codelia/core";
-import { z as z11 } from "zod";
+import { defineTool as defineTool11 } from "@codelia/core";
+import { z as z12 } from "zod";
 
 // src/tools/todo-store.ts
 var todoStore = /* @__PURE__ */ new Map();
 
 // src/tools/todo-read.ts
-var createTodoReadTool = (sandboxKey) => defineTool10({
+var createTodoReadTool = (sandboxKey) => defineTool11({
   name: "todo_read",
   description: "Read the in-session todo list.",
-  input: z11.object({}),
+  input: z12.object({}),
   execute: async (_input, ctx) => {
     const sandbox = await getSandboxContext(ctx, sandboxKey);
     const todos = todoStore.get(sandbox.sessionId) ?? [];
@@ -3473,17 +4300,17 @@ var createTodoReadTool = (sandboxKey) => defineTool10({
 });
 
 // src/tools/todo-write.ts
-import { defineTool as defineTool11 } from "@codelia/core";
-import { z as z12 } from "zod";
-var createTodoWriteTool = (sandboxKey) => defineTool11({
+import { defineTool as defineTool12 } from "@codelia/core";
+import { z as z13 } from "zod";
+var createTodoWriteTool = (sandboxKey) => defineTool12({
   name: "todo_write",
   description: "Replace the in-session todo list.",
-  input: z12.object({
-    todos: z12.array(
-      z12.object({
-        content: z12.string().describe("Todo item text."),
-        status: z12.enum(["pending", "in_progress", "completed"]).describe("Todo status."),
-        activeForm: z12.string().optional().describe("Optional in-progress phrasing for UI display.")
+  input: z13.object({
+    todos: z13.array(
+      z13.object({
+        content: z13.string().describe("Todo item text."),
+        status: z13.enum(["pending", "in_progress", "completed"]).describe("Todo status."),
+        activeForm: z13.string().optional().describe("Optional in-progress phrasing for UI display.")
       })
     )
   }),
@@ -3500,15 +4327,15 @@ var createTodoWriteTool = (sandboxKey) => defineTool11({
 });
 
 // src/tools/tool-output-cache.ts
-import { defineTool as defineTool12 } from "@codelia/core";
-import { z as z13 } from "zod";
-var createToolOutputCacheTool = (store) => defineTool12({
+import { defineTool as defineTool13 } from "@codelia/core";
+import { z as z14 } from "zod";
+var createToolOutputCacheTool = (store) => defineTool13({
   name: "tool_output_cache",
   description: "Read cached tool output by ref_id.",
-  input: z13.object({
-    ref_id: z13.string().describe("Tool output reference ID."),
-    offset: z13.number().int().nonnegative().optional().describe("Optional 0-based line offset."),
-    limit: z13.number().int().positive().optional().describe("Optional max number of lines to return.")
+  input: z14.object({
+    ref_id: z14.string().describe("Tool output reference ID."),
+    offset: z14.number().int().nonnegative().optional().describe("Optional 0-based line offset."),
+    limit: z14.number().int().positive().optional().describe("Optional max number of lines to return.")
   }),
   execute: async (input) => {
     if (!store.read) {
@@ -3524,16 +4351,16 @@ var createToolOutputCacheTool = (store) => defineTool12({
     }
   }
 });
-var createToolOutputCacheGrepTool = (store) => defineTool12({
+var createToolOutputCacheGrepTool = (store) => defineTool13({
   name: "tool_output_cache_grep",
   description: "Search cached tool output by ref_id.",
-  input: z13.object({
-    ref_id: z13.string().describe("Tool output reference ID."),
-    pattern: z13.string().describe("Text or regex pattern to search for."),
-    regex: z13.boolean().optional().describe("Interpret pattern as regex when true. Default false."),
-    before: z13.number().int().nonnegative().optional().describe("Context lines before each match. Default 0."),
-    after: z13.number().int().nonnegative().optional().describe("Context lines after each match. Default 0."),
-    max_matches: z13.number().int().positive().optional().describe("Maximum number of matches to return.")
+  input: z14.object({
+    ref_id: z14.string().describe("Tool output reference ID."),
+    pattern: z14.string().describe("Text or regex pattern to search for."),
+    regex: z14.boolean().optional().describe("Interpret pattern as regex when true. Default false."),
+    before: z14.number().int().nonnegative().optional().describe("Context lines before each match. Default 0."),
+    after: z14.number().int().nonnegative().optional().describe("Context lines after each match. Default 0."),
+    max_matches: z14.number().int().positive().optional().describe("Maximum number of matches to return.")
   }),
   execute: async (input) => {
     if (!store.grep) {
@@ -3554,16 +4381,16 @@ var createToolOutputCacheGrepTool = (store) => defineTool12({
 });
 
 // src/tools/write.ts
-import { promises as fs11 } from "fs";
-import path10 from "path";
-import { defineTool as defineTool13 } from "@codelia/core";
-import { z as z14 } from "zod";
-var createWriteTool = (sandboxKey) => defineTool13({
+import { promises as fs13 } from "fs";
+import path12 from "path";
+import { defineTool as defineTool14 } from "@codelia/core";
+import { z as z15 } from "zod";
+var createWriteTool = (sandboxKey) => defineTool14({
   name: "write",
   description: "Write text to a file, creating parent directories if needed.",
-  input: z14.object({
-    file_path: z14.string().describe("File path under the sandbox root."),
-    content: z14.string().describe("UTF-8 text content to write.")
+  input: z15.object({
+    file_path: z15.string().describe("File path under the sandbox root."),
+    content: z15.string().describe("UTF-8 text content to write.")
   }),
   execute: async (input, ctx) => {
     let resolved;
@@ -3574,8 +4401,8 @@ var createWriteTool = (sandboxKey) => defineTool13({
       return `Security error: ${String(error)}`;
     }
     try {
-      await fs11.mkdir(path10.dirname(resolved), { recursive: true });
-      await fs11.writeFile(resolved, input.content, "utf8");
+      await fs13.mkdir(path12.dirname(resolved), { recursive: true });
+      await fs13.writeFile(resolved, input.content, "utf8");
       return `Wrote ${input.content.length} bytes to ${input.file_path}`;
     } catch (error) {
       return `Error writing file: ${String(error)}`;
@@ -3600,9 +4427,106 @@ var createTools = (sandboxKey, agentsResolverKey, skillsResolverKey, options = {
   ] : [],
   createTodoReadTool(sandboxKey),
   createTodoWriteTool(sandboxKey),
+  createLaneCreateTool(sandboxKey),
+  createLaneListTool(sandboxKey),
+  createLaneStatusTool(sandboxKey),
+  createLaneCloseTool(sandboxKey),
+  createLaneGcTool(sandboxKey),
   createDoneTool()
 ];
 
+// src/utils/language.ts
+var normalizeLanguage = (value) => {
+  const token = value.trim().toLowerCase();
+  if (!token) return "";
+  switch (token) {
+    case "yml":
+      return "yaml";
+    case "mjs":
+    case "cjs":
+    case "node":
+      return "javascript";
+    case "mts":
+    case "cts":
+    case "ts-node":
+    case "deno":
+      return "typescript";
+    case "py":
+    case "python3":
+      return "python";
+    case "rb":
+      return "ruby";
+    case "zsh":
+    case "sh":
+      return "bash";
+    case "ps1":
+      return "powershell";
+    default:
+      return token;
+  }
+};
+var languageFromFilePath = (filePath) => {
+  if (!filePath) return void 0;
+  const path16 = filePath.trim().replace(/^["']|["']$/g, "");
+  if (!path16 || path16 === "/dev/null") return void 0;
+  const normalizedPath = path16.replace(/^a\//, "").replace(/^b\//, "");
+  const lastSlash = Math.max(
+    normalizedPath.lastIndexOf("/"),
+    normalizedPath.lastIndexOf("\\")
+  );
+  const basename = lastSlash >= 0 ? normalizedPath.slice(lastSlash + 1) : normalizedPath;
+  if (!basename) return void 0;
+  const dotIndex = basename.lastIndexOf(".");
+  if (dotIndex > 0 && dotIndex < basename.length - 1) {
+    return normalizeLanguage(basename.slice(dotIndex + 1));
+  }
+  if (basename === "Dockerfile") return "dockerfile";
+  if (/^Makefile(\..+)?$/i.test(basename)) return "makefile";
+  return void 0;
+};
+var languageFromDiffHeaders = (diff) => {
+  if (!diff) return void 0;
+  for (const line of diff.split("\n")) {
+    if (!line.startsWith("--- ") && !line.startsWith("+++ ")) continue;
+    const rawPath = line.slice(4).trim().split(/\s+/)[0] ?? "";
+    const language = languageFromFilePath(rawPath);
+    if (language) return language;
+  }
+  return void 0;
+};
+var languageFromShebang = (content) => {
+  if (!content) return void 0;
+  const firstLine = content.split("\n", 1)[0]?.trim() ?? "";
+  if (!firstLine.startsWith("#!")) return void 0;
+  const body = firstLine.slice(2).trim();
+  if (!body) return void 0;
+  const parts = body.split(/\s+/).filter(Boolean);
+  if (!parts.length) return void 0;
+  let command = parts[0];
+  if (command.endsWith("/env")) {
+    let index = 1;
+    if (parts[index] === "-S") index += 1;
+    while (index < parts.length && parts[index].includes("=")) {
+      index += 1;
+    }
+    command = parts[index] ?? "";
+  }
+  if (!command) return void 0;
+  const last = command.split("/").pop() ?? command;
+  const simplified = last.replace(/[0-9.]+$/g, "");
+  const normalized = normalizeLanguage(simplified);
+  return normalized || void 0;
+};
+var resolvePreviewLanguageHint = (input) => {
+  const explicit = input.language ? normalizeLanguage(input.language) : "";
+  if (explicit) return explicit;
+  const shebang = languageFromShebang(input.content);
+  if (shebang) return shebang;
+  const fromDiff = languageFromDiffHeaders(input.diff);
+  if (fromDiff) return fromDiff;
+  return languageFromFilePath(input.filePath);
+};
+
 // src/agent-factory.ts
 var requireApiKeyAuth = (provider, auth) => {
   if (auth.method !== "api_key") {
@@ -3615,6 +4539,7 @@ var envTruthy = (value) => {
   const normalized = value.trim().toLowerCase();
   return normalized === "1" || normalized === "true";
 };
+var OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
 var buildOpenAiClientOptions = (authResolver, auth) => {
   if (auth.method === "api_key") {
     return { apiKey: auth.api_key };
@@ -3658,6 +4583,22 @@ var buildOpenAiClientOptions = (authResolver, auth) => {
     fetch: fetchWithAccount
   };
 };
+var buildOpenRouterClientOptions = (auth) => {
+  const headers = {};
+  const referer = readEnvValue("OPENROUTER_HTTP_REFERER");
+  if (referer) {
+    headers["HTTP-Referer"] = referer;
+  }
+  const title = readEnvValue("OPENROUTER_X_TITLE");
+  if (title) {
+    headers["X-Title"] = title;
+  }
+  return {
+    apiKey: requireApiKeyAuth("OpenRouter", auth),
+    baseURL: OPENROUTER_BASE_URL,
+    ...Object.keys(headers).length ? { defaultHeaders: headers } : {}
+  };
+};
 var sleep = (ms) => new Promise((resolve) => {
   setTimeout(resolve, ms);
 });
@@ -3671,6 +4612,41 @@ var waitForUiConfirmSupport = async (state, timeoutMs = 5e3) => {
   }
   return !!state.uiCapabilities?.supports_confirm;
 };
+var MAX_CONFIRM_PREVIEW_LINES = 120;
+var splitLines = (value) => value.split("\n").map((line) => line.replace(/\r$/, ""));
+var buildBoundedDiffPreview = (diff, maxLines = MAX_CONFIRM_PREVIEW_LINES) => {
+  if (!diff.trim()) return { diff: null, truncated: false };
+  const lines = splitLines(diff);
+  if (!lines.length) return { diff: null, truncated: false };
+  if (lines.length <= maxLines) {
+    return { diff: lines.join("\n"), truncated: false };
+  }
+  return {
+    diff: lines.slice(0, maxLines).join("\n"),
+    truncated: true
+  };
+};
+var parseToolArgsObject = (rawArgs) => {
+  try {
+    const parsed = JSON.parse(rawArgs);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+};
+var unwrapToolJsonObject = (result) => {
+  if (!result || typeof result !== "object") return null;
+  const typed = result;
+  if (typed.type !== "json") return null;
+  const value = typed.value;
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  return value;
+};
 var requestMcpOAuthTokens = async (state, serverId, oauth2, errorMessage) => {
   const canConfirm = state.uiCapabilities?.supports_confirm ? true : await waitForUiConfirmSupport(state);
   if (!canConfirm) {
@@ -3808,6 +4784,9 @@ var createAgentFactory = (state, options = {}) => {
           toolOutputCacheStore
         }
       );
+      const editTool = localTools.find(
+        (tool) => tool.definition.name === "edit"
+      );
       let mcpTools = [];
       if (options.mcpManager) {
         try {
@@ -3829,6 +4808,7 @@ var createAgentFactory = (state, options = {}) => {
         }
       }
       const tools = [...localTools, ...mcpTools];
+      state.tools = tools;
       state.toolDefinitions = tools.map((tool) => tool.definition);
       const baseSystemPrompt = await loadSystemPrompt(ctx.workingDir);
       const withAgentsContext = appendInitialAgentsContext(
@@ -3878,6 +4858,17 @@ var createAgentFactory = (state, options = {}) => {
           });
           break;
         }
+        case "openrouter": {
+          const reasoningEffort = resolveReasoningEffort(modelConfig.reasoning);
+          const textVerbosity = resolveTextVerbosity(modelConfig.verbosity);
+          llm = new ChatOpenAI({
+            clientOptions: buildOpenRouterClientOptions(providerAuth),
+            ...modelConfig.name ? { model: modelConfig.name } : {},
+            ...reasoningEffort ? { reasoningEffort } : {},
+            ...textVerbosity ? { textVerbosity } : {}
+          });
+          break;
+        }
         case "anthropic": {
           llm = new ChatAnthropic({
             clientOptions: {
@@ -3890,14 +4881,16 @@ var createAgentFactory = (state, options = {}) => {
         default:
           throw new Error(`Unsupported model.provider: ${provider}`);
       }
-      const modelRegistry = await buildModelRegistry(llm);
+      const modelRegistry = await buildModelRegistry(llm, {
+        strict: provider !== "openrouter"
+      });
       const agent = new Agent({
         llm,
         tools,
         systemPrompt,
         modelRegistry: modelRegistry ?? DEFAULT_MODEL_REGISTRY2,
         services: { toolOutputCacheStore },
-        canExecuteTool: async (call, rawArgs) => {
+        canExecuteTool: async (call, rawArgs, toolCtx) => {
           const decision = permissionService.evaluate(
             call.function.name,
             rawArgs
@@ -3919,12 +4912,129 @@ var createAgentFactory = (state, options = {}) => {
             };
           }
           const runId = state.activeRunId ?? void 0;
+          debugLog(
+            `permission.request tool=${call.function.name} args=${rawArgs}`
+          );
           const prompt = permissionService.getConfirmPrompt(
             call.function.name,
             rawArgs
           );
+          let previewDiff = null;
+          let previewSummary = null;
+          let previewTruncated = false;
+          let previewFilePath = null;
+          let previewLanguage = null;
+          if (call.function.name === "write") {
+            const parsed = parseToolArgsObject(rawArgs);
+            const filePath = typeof parsed?.file_path === "string" ? parsed.file_path : "";
+            const content = typeof parsed?.content === "string" ? parsed.content : "";
+            const language = typeof parsed?.language === "string" ? parsed.language : "";
+            if (filePath) {
+              previewFilePath = filePath;
+              previewLanguage = resolvePreviewLanguageHint({
+                language,
+                filePath,
+                content
+              }) ?? previewLanguage;
+              try {
+                const sandbox = await getSandboxContext(toolCtx, sandboxKey);
+                const resolved = sandbox.resolvePath(filePath);
+                let before = "";
+                try {
+                  const stat = await fs14.stat(resolved);
+                  if (!stat.isDirectory()) {
+                    before = await fs14.readFile(resolved, "utf8");
+                  }
+                } catch {
+                  before = "";
+                }
+                const preview = buildBoundedDiffPreview(
+                  createUnifiedDiff(filePath, before, content)
+                );
+                previewDiff = preview.diff;
+                previewTruncated = preview.truncated;
+              } catch {
+                previewDiff = null;
+                previewSummary = null;
+                previewTruncated = false;
+              }
+            }
+          } else if (call.function.name === "edit" && editTool) {
+            const parsed = parseToolArgsObject(rawArgs);
+            if (parsed) {
+              const filePath = typeof parsed.file_path === "string" ? parsed.file_path : "";
+              const language = typeof parsed.language === "string" ? parsed.language : "";
+              if (filePath) {
+                previewFilePath = filePath;
+              }
+              previewLanguage = resolvePreviewLanguageHint({
+                language,
+                filePath
+              }) ?? previewLanguage;
+              const dryRunInput = { ...parsed, dry_run: true };
+              try {
+                const result = await editTool.executeRaw(
+                  JSON.stringify(dryRunInput),
+                  toolCtx
+                );
+                if (result && typeof result === "object") {
+                  const obj = unwrapToolJsonObject(result);
+                  if (!obj) {
+                    previewSummary = "Preview unavailable: unexpected dry-run output";
+                  } else {
+                    const resultFilePath = typeof obj.file_path === "string" ? obj.file_path : "";
+                    const resultLanguage = typeof obj.language === "string" ? obj.language : "";
+                    if (!previewFilePath && resultFilePath) {
+                      previewFilePath = resultFilePath;
+                    }
+                    const diff = typeof obj.diff === "string" ? obj.diff : "";
+                    const summary = typeof obj.summary === "string" ? obj.summary : "";
+                    previewLanguage = resolvePreviewLanguageHint({
+                      language: resultLanguage || previewLanguage,
+                      filePath: previewFilePath || resultFilePath,
+                      diff
+                    }) ?? previewLanguage;
+                    const preview = buildBoundedDiffPreview(diff);
+                    previewDiff = preview.diff;
+                    previewTruncated = preview.truncated;
+                    if (!previewDiff) {
+                      previewSummary = summary || "Preview: no diff content";
+                    }
+                  }
+                }
+              } catch {
+                previewSummary = "Preview unavailable: dry-run failed";
+              }
+            }
+          }
           if (runId) {
-            sendRunStatus(runId, "awaiting_ui", "waiting for confirmation");
+            if (previewDiff || previewSummary) {
+              previewLanguage = resolvePreviewLanguageHint({
+                language: previewLanguage,
+                filePath: previewFilePath,
+                diff: previewDiff
+              }) ?? previewLanguage;
+              await sendAgentEventAsync(state, runId, {
+                type: "permission.preview",
+                tool: call.function.name,
+                tool_call_id: call.id,
+                ...previewFilePath ? { file_path: previewFilePath } : {},
+                ...previewLanguage ? { language: previewLanguage } : {},
+                ...previewDiff ? { diff: previewDiff } : {},
+                ...previewSummary ? { summary: previewSummary } : {},
+                ...previewTruncated ? { truncated: true } : {}
+              });
+            }
+            await sendAgentEventAsync(state, runId, {
+              type: "permission.ready",
+              tool: call.function.name,
+              tool_call_id: call.id
+            });
+            await sendRunStatusAsync(
+              runId,
+              "awaiting_ui",
+              "waiting for confirmation"
+            );
           }
           const confirmResult = await requestUiConfirm(state, {
             run_id: runId,
@@ -4270,7 +5380,7 @@ var HttpMcpClient = class {
 };
 
 // src/mcp/stdio-client.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { createInterface } from "readline";
 var StdioMcpClient = class {
   constructor(options) {
@@ -4279,7 +5389,7 @@ var StdioMcpClient = class {
       ...process.env,
       ...options.env ?? {}
     };
-    this.child = spawn3(options.command, options.args, {
+    this.child = spawn4(options.command, options.args, {
       cwd: options.cwd,
       env,
       stdio: ["pipe", "pipe", "pipe"]
@@ -4489,8 +5599,8 @@ var parseAuthorizationServerMetadata = (value) => {
 var buildAuthorizationServerMetadataUrl = (issuer) => {
   try {
     const parsed = new URL(issuer);
-    const path14 = parsed.pathname === "/" ? "" : parsed.pathname;
-    const basePath = path14.startsWith("/") ? path14 : `/${path14}`;
+    const path16 = parsed.pathname === "/" ? "" : parsed.pathname;
+    const basePath = path16.startsWith("/") ? path16 : `/${path16}`;
     const metadataPath = `/.well-known/oauth-authorization-server${basePath}`;
     return new URL(metadataPath, `${parsed.origin}/`).toString();
   } catch {
@@ -4587,24 +5697,24 @@ var fetchDiscoveredOAuthConfig = async (serverUrl) => {
 };
 
 // src/mcp/tooling.ts
-import crypto4 from "crypto";
+import crypto5 from "crypto";
 var MAX_SCHEMA_SIZE_BYTES = 64 * 1024;
 var MAX_TOOL_OUTPUT_CHARS = 1e5;
 var MAX_TOOLS_LIST_PAGES = 100;
 var isRecord4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isMcpToolDescriptor = (value) => isRecord4(value) && typeof value.name === "string";
-var toSlug = (value) => {
+var toSlug2 = (value) => {
   const slug = value.toLowerCase().replace(/[^a-z0-9_]+/g, "_").replace(/^_+|_+$/g, "");
   return slug || "tool";
 };
-var hash8 = (value) => crypto4.createHash("sha256").update(value).digest("hex").slice(0, 8);
+var hash8 = (value) => crypto5.createHash("sha256").update(value).digest("hex").slice(0, 8);
 var clampToolName = (value) => {
   if (value.length <= 63) return value;
   return value.slice(0, 63);
 };
 var buildToolName = (serverId, toolName) => {
-  const serverSlug = toSlug(serverId);
-  const toolSlug = toSlug(toolName);
+  const serverSlug = toSlug2(serverId);
+  const toolSlug = toSlug2(toolName);
   const fingerprint = hash8(`${serverId}:${toolName}`);
   const maxPrefixLength = 63 - (fingerprint.length + 1);
   const prefix = `mcp_${serverSlug}_${toolSlug}`.slice(0, maxPrefixLength);
@@ -4762,7 +5872,7 @@ var createMcpToolAdapter = (params) => {
 
 // src/mcp/manager.ts
 var OAUTH_TOKEN_EXPIRY_SKEW_MS = 6e4;
-var nowIso = () => (/* @__PURE__ */ new Date()).toISOString();
+var nowIso3 = () => (/* @__PURE__ */ new Date()).toISOString();
 var describeError2 = (error) => error instanceof Error ? error.message : String(error);
 var toListServer = (id, runtime) => ({
   id,
@@ -4894,7 +6004,7 @@ var McpManager = class {
         runtime.tools_count = runtime.toolAdapters.length;
         runtime.state = "ready";
         runtime.last_error = void 0;
-        runtime.last_connected_at = nowIso();
+        runtime.last_connected_at = nowIso3();
         connectOptions?.onStatus?.(
           `MCP server ready: ${serverId} (${runtime.tools_count ?? 0} tools)`
         );
@@ -5147,6 +6257,10 @@ var McpManager = class {
 };
 
 // src/rpc/handlers.ts
+import { updateModelConfig as updateModelConfig2 } from "@codelia/config-loader";
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE7
+} from "@codelia/protocol";
 import {
   RunEventStoreFactoryImpl,
   SessionStateStoreImpl
@@ -5158,6 +6272,9 @@ var SERVER_VERSION = "0.1.0";
 var PROTOCOL_VERSION = "0";
 
 // src/rpc/context.ts
+import {
+  RPC_ERROR_CODE
+} from "@codelia/protocol";
 var createContextHandlers = ({
   state,
   log: log2
@@ -5247,7 +6364,7 @@ var createContextHandlers = ({
       sendResult(id, result);
     } catch (error) {
       sendError(id, {
-        code: -32e3,
+        code: RPC_ERROR_CODE.RUNTIME_INTERNAL,
         message: `context.inspect failed: ${String(error)}`
       });
     }
@@ -5256,12 +6373,50 @@ var createContextHandlers = ({
 };
 
 // src/rpc/history.ts
-import { createReadStream, promises as fs12 } from "fs";
-import path11 from "path";
+import { createReadStream, promises as fs15 } from "fs";
+import path13 from "path";
 import { createInterface as createInterface2 } from "readline";
-import { resolveStoragePaths as resolveStoragePaths2 } from "@codelia/storage";
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE2
+} from "@codelia/protocol";
+import { resolveStoragePaths as resolveStoragePaths3 } from "@codelia/storage";
 var DEFAULT_HISTORY_RUNS = 20;
 var DEFAULT_HISTORY_EVENTS = 1500;
+var runStartInputToHiddenMessage = (input) => {
+  if (!input) {
+    return "";
+  }
+  if (input.type === "text") {
+    return input.text;
+  }
+  if (!Array.isArray(input.parts)) {
+    return "";
+  }
+  let message = "";
+  for (const part of input.parts) {
+    if (!part || typeof part !== "object") {
+      continue;
+    }
+    if (part.type === "text") {
+      message += part.text;
+      continue;
+    }
+    if (part.type === "image_url") {
+      message += "[image]";
+    }
+  }
+  return message;
+};
+var parseRunHeader = (headerLine) => {
+  try {
+    const header = JSON.parse(headerLine);
+    if (!header || typeof header !== "object") return null;
+    if (header.type !== "header") return null;
+    return header;
+  } catch {
+    return null;
+  }
+};
 var readFirstLine = async (filePath) => {
   const stream = createReadStream(filePath, { encoding: "utf8" });
   const reader = createInterface2({
@@ -5278,12 +6433,12 @@ var readFirstLine = async (filePath) => {
     stream.destroy();
   }
 };
-var collectSessionRuns = async (sessionId, maxRuns, log2) => {
-  const paths = resolveStoragePaths2();
+var collectRunCandidates = async (log2) => {
+  const paths = resolveStoragePaths3();
   const sessionsDir = paths.sessionsDir;
   let yearEntries;
   try {
-    yearEntries = await fs12.readdir(sessionsDir, {
+    yearEntries = await fs15.readdir(sessionsDir, {
       withFileTypes: true,
       encoding: "utf8"
     });
@@ -5295,10 +6450,10 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
   for (const yearEntry of yearEntries) {
     if (!yearEntry.isDirectory()) continue;
     if (!/^\d{4}$/.test(yearEntry.name)) continue;
-    const yearPath = path11.join(sessionsDir, yearEntry.name);
+    const yearPath = path13.join(sessionsDir, yearEntry.name);
     let monthEntries;
     try {
-      monthEntries = await fs12.readdir(yearPath, {
+      monthEntries = await fs15.readdir(yearPath, {
         withFileTypes: true,
         encoding: "utf8"
       });
@@ -5308,10 +6463,10 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
     for (const monthEntry of monthEntries) {
       if (!monthEntry.isDirectory()) continue;
       if (!/^\d{2}$/.test(monthEntry.name)) continue;
-      const monthPath = path11.join(yearPath, monthEntry.name);
+      const monthPath = path13.join(yearPath, monthEntry.name);
       let dayEntries;
       try {
-        dayEntries = await fs12.readdir(monthPath, {
+        dayEntries = await fs15.readdir(monthPath, {
           withFileTypes: true,
           encoding: "utf8"
         });
@@ -5321,10 +6476,10 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
       for (const dayEntry of dayEntries) {
         if (!dayEntry.isDirectory()) continue;
         if (!/^\d{2}$/.test(dayEntry.name)) continue;
-        const dayPath = path11.join(monthPath, dayEntry.name);
+        const dayPath = path13.join(monthPath, dayEntry.name);
         let files;
         try {
-          files = await fs12.readdir(dayPath, {
+          files = await fs15.readdir(dayPath, {
             withFileTypes: true,
             encoding: "utf8"
           });
@@ -5334,9 +6489,9 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
         for (const file of files) {
           if (!file.isFile()) continue;
           if (!file.name.endsWith(".jsonl")) continue;
-          const filePath = path11.join(dayPath, file.name);
+          const filePath = path13.join(dayPath, file.name);
           try {
-            const stat = await fs12.stat(filePath);
+            const stat = await fs15.stat(filePath);
             candidates.push({ path: filePath, mtimeMs: stat.mtimeMs });
           } catch {
           }
@@ -5345,6 +6500,10 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
     }
   }
   candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
+  return candidates;
+};
+var collectSessionRuns = async (sessionId, maxRuns, log2) => {
+  const candidates = await collectRunCandidates(log2);
   const runs = [];
   for (const candidate of candidates) {
     if (runs.length >= maxRuns) break;
@@ -5355,19 +6514,16 @@ var collectSessionRuns = async (sessionId, maxRuns, log2) => {
       continue;
     }
     if (!headerLine) continue;
-    try {
-      const header = JSON.parse(headerLine);
-      if (header.type !== "header") continue;
-      if (header.session_id !== sessionId) continue;
-      const runId = header.run_id ?? path11.basename(candidate.path, ".jsonl");
-      const startedAt = header.started_at ?? new Date(candidate.mtimeMs).toISOString();
-      runs.push({
-        path: candidate.path,
-        run_id: runId,
-        started_at: startedAt
-      });
-    } catch {
-    }
+    const header = parseRunHeader(headerLine);
+    if (!header) continue;
+    if (header.session_id !== sessionId) continue;
+    const runId = header.run_id ?? path13.basename(candidate.path, ".jsonl");
+    const startedAt = header.started_at ?? new Date(candidate.mtimeMs).toISOString();
+    runs.push({
+      path: candidate.path,
+      run_id: runId,
+      started_at: startedAt
+    });
   }
   runs.sort((a, b) => a.started_at.localeCompare(b.started_at));
   return runs;
@@ -5415,7 +6571,7 @@ var createHistoryHandlers = ({
       sessions = await sessionStateStore.list();
     } catch (error) {
       sendError(id, {
-        code: -32006,
+        code: RPC_ERROR_CODE2.SESSION_LIST_FAILED,
         message: `session list failed: ${String(error)}`
       });
       return;
@@ -5430,7 +6586,7 @@ var createHistoryHandlers = ({
   const handleSessionHistory = async (id, params) => {
     const sessionId = params?.session_id?.trim();
     if (!sessionId) {
-      sendError(id, { code: -32602, message: "session_id is required" });
+      sendError(id, { code: RPC_ERROR_CODE2.INVALID_PARAMS, message: "session_id is required" });
       return;
     }
     const maxRuns = Math.max(0, params?.max_runs ?? DEFAULT_HISTORY_RUNS);
@@ -5460,7 +6616,7 @@ var createHistoryHandlers = ({
         }
         if (!record || typeof record !== "object") continue;
         if (record.type === "run.start") {
-          const input = record.input?.type === "text" ? record.input.text : "";
+          const input = runStartInputToHiddenMessage(record.input);
           if (input) {
             sendHistoryEvent(record.run_id, -1, {
               type: "hidden_user_message",
@@ -5484,17 +6640,279 @@ var createHistoryHandlers = ({
     };
     sendResult(id, result);
   };
-  return { handleSessionList, handleSessionHistory };
+  return { handleSessionList, handleSessionHistory };
+};
+
+// src/rpc/model.ts
+import { updateModelConfig } from "@codelia/config-loader";
+import {
+  DEFAULT_MODEL_REGISTRY as DEFAULT_MODEL_REGISTRY3,
+  listModels,
+  resolveModel
+} from "@codelia/core";
+import { ModelMetadataServiceImpl as ModelMetadataServiceImpl2 } from "@codelia/model-metadata";
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE3
+} from "@codelia/protocol";
+var isSupportedProvider = (provider) => provider === "openai" || provider === "anthropic" || provider === "openrouter";
+var resolveProviderModelEntry = (providerEntries, provider, model) => {
+  if (!providerEntries) return null;
+  return providerEntries[model] ?? providerEntries[`${provider}/${model}`] ?? null;
+};
+var parseReleaseTimestamp = (entry) => {
+  const releaseDate = entry?.releaseDate?.trim();
+  if (!releaseDate) return null;
+  const timestamp = Date.parse(releaseDate);
+  if (Number.isNaN(timestamp)) return null;
+  return timestamp;
+};
+var normalizeUsdPer1M = (value) => {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return void 0;
+  }
+  return value;
+};
+var buildModelListDetail = (entry) => {
+  if (!entry) return null;
+  const detail = {};
+  if (entry.releaseDate?.trim()) {
+    detail.release_date = entry.releaseDate.trim();
+  }
+  const limits = entry.limits;
+  if (typeof limits?.contextWindow === "number" && Number.isFinite(limits.contextWindow) && limits.contextWindow > 0) {
+    detail.context_window = limits.contextWindow;
+  }
+  if (typeof limits?.inputTokens === "number" && Number.isFinite(limits.inputTokens) && limits.inputTokens > 0) {
+    detail.max_input_tokens = limits.inputTokens;
+  }
+  if (typeof limits?.outputTokens === "number" && Number.isFinite(limits.outputTokens) && limits.outputTokens > 0) {
+    detail.max_output_tokens = limits.outputTokens;
+  }
+  const inputCost = normalizeUsdPer1M(entry.cost?.input);
+  if (inputCost !== void 0) {
+    detail.cost_per_1m_input_tokens_usd = inputCost;
+  }
+  const outputCost = normalizeUsdPer1M(entry.cost?.output);
+  if (outputCost !== void 0) {
+    detail.cost_per_1m_output_tokens_usd = outputCost;
+  }
+  return Object.keys(detail).length ? detail : null;
+};
+var sortModelsByReleaseDate = (models, provider, providerEntries) => {
+  const sortable = models.map((model, index) => ({
+    model,
+    index,
+    releaseTimestamp: parseReleaseTimestamp(
+      resolveProviderModelEntry(providerEntries, provider, model)
+    )
+  }));
+  sortable.sort((left, right) => {
+    if (left.releaseTimestamp !== null && right.releaseTimestamp !== null && left.releaseTimestamp !== right.releaseTimestamp) {
+      return right.releaseTimestamp - left.releaseTimestamp;
+    }
+    if (left.releaseTimestamp !== null && right.releaseTimestamp === null) {
+      return -1;
+    }
+    if (left.releaseTimestamp === null && right.releaseTimestamp !== null) {
+      return 1;
+    }
+    return left.index - right.index;
+  });
+  return sortable.map((item) => item.model);
+};
+var loadProviderModelEntries = async (provider) => {
+  const metadataService = new ModelMetadataServiceImpl2();
+  const allEntries = await metadataService.getAllModelEntries();
+  return allEntries[provider] ?? null;
+};
+var OPENROUTER_BASE_URL2 = "https://openrouter.ai/api/v1";
+var parseUnixSecondsToDate = (value) => {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+    return void 0;
+  }
+  const date = new Date(Math.floor(value) * 1e3);
+  const timestamp = date.getTime();
+  if (!Number.isFinite(timestamp)) {
+    return void 0;
+  }
+  return date.toISOString().slice(0, 10);
+};
+var parsePositiveNumber = (value) => {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+    return void 0;
+  }
+  return value;
+};
+var buildOpenRouterHeaders = (apiKey) => {
+  const headers = new Headers();
+  headers.set("Authorization", `Bearer ${apiKey}`);
+  const referer = readEnvValue("OPENROUTER_HTTP_REFERER");
+  if (referer) {
+    headers.set("HTTP-Referer", referer);
+  }
+  const title = readEnvValue("OPENROUTER_X_TITLE");
+  if (title) {
+    headers.set("X-Title", title);
+  }
+  return headers;
+};
+var resolveOpenRouterApiKey = async () => {
+  const envKey = readEnvValue("OPENROUTER_API_KEY");
+  if (envKey) {
+    return envKey;
+  }
+  const store = new AuthStore();
+  const auth = await store.load();
+  const providerAuth = auth.providers.openrouter;
+  if (providerAuth?.method !== "api_key") {
+    return null;
+  }
+  const value = providerAuth.api_key.trim();
+  return value ? value : null;
+};
+var resolveOpenRouterApiKeyWithPrompt = async ({
+  state,
+  log: log2
+}) => {
+  const existing = await resolveOpenRouterApiKey();
+  if (existing) {
+    return existing;
+  }
+  if (!state) {
+    throw new Error("OpenRouter API key is required");
+  }
+  const authResolver = await AuthResolver.create(state, log2);
+  const auth = await authResolver.resolveProviderAuth("openrouter");
+  if (auth.method !== "api_key") {
+    throw new Error("OpenRouter API key is required");
+  }
+  const value = auth.api_key.trim();
+  if (!value) {
+    throw new Error("OpenRouter API key is required");
+  }
+  return value;
+};
+var parseOpenRouterModel = (value) => {
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+  const entry = value;
+  const id = typeof entry.id === "string" ? entry.id.trim() : "";
+  if (!id) {
+    return null;
+  }
+  const topProvider = entry.top_provider && typeof entry.top_provider === "object" ? entry.top_provider : null;
+  return {
+    id,
+    created: typeof entry.created === "number" && Number.isFinite(entry.created) ? entry.created : void 0,
+    context_length: parsePositiveNumber(entry.context_length),
+    top_provider: topProvider ? {
+      context_length: parsePositiveNumber(topProvider.context_length),
+      max_completion_tokens: parsePositiveNumber(
+        topProvider.max_completion_tokens
+      )
+    } : void 0
+  };
+};
+var fetchOpenRouterModels = async (apiKey) => {
+  const response = await fetch(`${OPENROUTER_BASE_URL2}/models`, {
+    headers: buildOpenRouterHeaders(apiKey)
+  });
+  if (!response.ok) {
+    const body = await response.text().catch(() => "");
+    const snippet = body ? body.slice(0, 300) : "(empty)";
+    throw new Error(
+      `OpenRouter models request failed (${response.status}): ${snippet}`
+    );
+  }
+  const payload = await response.json();
+  if (!payload || typeof payload !== "object") {
+    throw new Error("OpenRouter models response is not an object");
+  }
+  const data = payload.data;
+  if (!Array.isArray(data)) {
+    throw new Error("OpenRouter models response has no data array");
+  }
+  const models = data.map((entry) => parseOpenRouterModel(entry)).filter((entry) => !!entry);
+  models.sort((left, right) => {
+    const leftCreated = left.created ?? 0;
+    const rightCreated = right.created ?? 0;
+    if (leftCreated !== rightCreated) {
+      return rightCreated - leftCreated;
+    }
+    return left.id.localeCompare(right.id);
+  });
+  return models;
+};
+var buildOpenRouterModelList = async ({
+  includeDetails,
+  state,
+  log: log2
+}) => {
+  const apiKey = await resolveOpenRouterApiKeyWithPrompt({ state, log: log2 });
+  const models = await fetchOpenRouterModels(apiKey);
+  const ids = models.map((model) => model.id);
+  if (!includeDetails) {
+    return { models: ids };
+  }
+  const details = {};
+  for (const model of models) {
+    const detail = {};
+    const releaseDate = parseUnixSecondsToDate(model.created);
+    if (releaseDate) {
+      detail.release_date = releaseDate;
+    }
+    const contextWindow = model.context_length ?? model.top_provider?.context_length;
+    if (contextWindow && contextWindow > 0) {
+      detail.context_window = contextWindow;
+      detail.max_input_tokens = contextWindow;
+    }
+    const maxOutputTokens = model.top_provider?.max_completion_tokens;
+    if (maxOutputTokens && maxOutputTokens > 0) {
+      detail.max_output_tokens = maxOutputTokens;
+    }
+    if (Object.keys(detail).length) {
+      details[model.id] = detail;
+    }
+  }
+  return Object.keys(details).length ? { models: ids, details } : { models: ids };
+};
+var buildProviderModelList = async ({
+  provider,
+  includeDetails,
+  state,
+  log: log2
+}) => {
+  if (provider === "openrouter") {
+    return buildOpenRouterModelList({ includeDetails, state, log: log2 });
+  }
+  let providerEntries = null;
+  try {
+    providerEntries = await loadProviderModelEntries(provider);
+  } catch (error) {
+    if (includeDetails) {
+      log2(`model.list details error: ${error}`);
+    }
+  }
+  const models = sortModelsByReleaseDate(
+    listModels(DEFAULT_MODEL_REGISTRY3, provider).map((model) => model.id),
+    provider,
+    providerEntries
+  );
+  if (!includeDetails || !providerEntries) {
+    return { models };
+  }
+  const details = {};
+  for (const model of models) {
+    const detail = buildModelListDetail(
+      resolveProviderModelEntry(providerEntries, provider, model)
+    );
+    if (detail) {
+      details[model] = detail;
+    }
+  }
+  return Object.keys(details).length ? { models, details } : { models };
 };
-
-// src/rpc/model.ts
-import { updateModelConfig } from "@codelia/config-loader";
-import {
-  DEFAULT_MODEL_REGISTRY as DEFAULT_MODEL_REGISTRY3,
-  listModels,
-  resolveModel
-} from "@codelia/core";
-import { ModelMetadataServiceImpl as ModelMetadataServiceImpl2 } from "@codelia/model-metadata";
 var createModelHandlers = ({
   state,
   log: log2
@@ -5502,9 +6920,9 @@ var createModelHandlers = ({
   const handleModelList = async (id, params) => {
     const requestedProvider = params?.provider;
     const includeDetails = params?.include_details ?? false;
-    if (requestedProvider && requestedProvider !== "openai" && requestedProvider !== "anthropic") {
+    if (requestedProvider && !isSupportedProvider(requestedProvider)) {
       sendError(id, {
-        code: -32602,
+        code: RPC_ERROR_CODE3.INVALID_PARAMS,
         message: `unsupported provider: ${requestedProvider}`
       });
       return;
@@ -5518,54 +6936,35 @@ var createModelHandlers = ({
         current = config.name;
       }
     } catch (error) {
-      sendError(id, { code: -32e3, message: String(error) });
+      sendError(id, { code: RPC_ERROR_CODE3.RUNTIME_INTERNAL, message: String(error) });
       return;
     }
     const provider = requestedProvider ?? configuredProvider ?? "openai";
-    if (provider !== "openai" && provider !== "anthropic") {
+    if (!isSupportedProvider(provider)) {
       sendError(id, {
-        code: -32602,
+        code: RPC_ERROR_CODE3.INVALID_PARAMS,
         message: `unsupported provider: ${provider}`
       });
       return;
     }
-    const models = listModels(DEFAULT_MODEL_REGISTRY3, provider).map((model) => model.id).sort();
+    let models;
+    let details;
+    try {
+      const result2 = await buildProviderModelList({
+        provider,
+        includeDetails,
+        state,
+        log: log2
+      });
+      models = result2.models;
+      details = result2.details;
+    } catch (error) {
+      sendError(id, { code: RPC_ERROR_CODE3.RUNTIME_INTERNAL, message: String(error) });
+      return;
+    }
     if (current && !models.includes(current)) {
       current = void 0;
     }
-    let details;
-    if (includeDetails) {
-      try {
-        const metadataService = new ModelMetadataServiceImpl2();
-        const entries = await metadataService.getAllModelEntries();
-        const providerEntries = entries[provider];
-        if (providerEntries) {
-          const nextDetails = {};
-          for (const model of models) {
-            const limits = providerEntries[model]?.limits;
-            if (!limits) continue;
-            const detail = {};
-            if (typeof limits.contextWindow === "number" && limits.contextWindow > 0) {
-              detail.context_window = limits.contextWindow;
-            }
-            if (typeof limits.inputTokens === "number" && limits.inputTokens > 0) {
-              detail.max_input_tokens = limits.inputTokens;
-            }
-            if (typeof limits.outputTokens === "number" && limits.outputTokens > 0) {
-              detail.max_output_tokens = limits.outputTokens;
-            }
-            if (Object.keys(detail).length > 0) {
-              nextDetails[model] = detail;
-            }
-          }
-          if (Object.keys(nextDetails).length > 0) {
-            details = nextDetails;
-          }
-        }
-      } catch (error) {
-        log2(`model.list details error: ${error}`);
-      }
-    }
     const result = {
       provider,
       models,
@@ -5576,26 +6975,28 @@ var createModelHandlers = ({
   };
   const handleModelSet = async (id, params) => {
     if (state.activeRunId) {
-      sendError(id, { code: -32001, message: "runtime busy" });
+      sendError(id, { code: RPC_ERROR_CODE3.RUNTIME_BUSY, message: "runtime busy" });
       return;
     }
     const provider = params?.provider ?? "openai";
     const name = params?.name?.trim();
     if (!name) {
-      sendError(id, { code: -32602, message: "model name is required" });
+      sendError(id, { code: RPC_ERROR_CODE3.INVALID_PARAMS, message: "model name is required" });
       return;
     }
-    if (provider !== "openai" && provider !== "anthropic") {
+    if (provider !== "openai" && provider !== "anthropic" && provider !== "openrouter") {
       sendError(id, {
-        code: -32602,
+        code: RPC_ERROR_CODE3.INVALID_PARAMS,
         message: `unsupported provider: ${provider}`
       });
       return;
     }
-    const spec = resolveModel(DEFAULT_MODEL_REGISTRY3, name, provider);
-    if (!spec) {
-      sendError(id, { code: -32602, message: `unknown model: ${name}` });
-      return;
+    if (provider !== "openrouter") {
+      const spec = resolveModel(DEFAULT_MODEL_REGISTRY3, name, provider);
+      if (!spec) {
+        sendError(id, { code: RPC_ERROR_CODE3.INVALID_PARAMS, message: `unknown model: ${name}` });
+        return;
+      }
     }
     try {
       const configPath = resolveConfigPath();
@@ -5605,17 +7006,23 @@ var createModelHandlers = ({
       sendResult(id, result);
       log2(`model.set ${provider}/${name}`);
     } catch (error) {
-      sendError(id, { code: -32e3, message: String(error) });
+      sendError(id, { code: RPC_ERROR_CODE3.RUNTIME_INTERNAL, message: String(error) });
     }
   };
   return { handleModelList, handleModelSet };
 };
 
+// src/rpc/run.ts
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE4
+} from "@codelia/protocol";
+
 // src/rpc/run-debug.ts
 import { stringifyContent } from "@codelia/core";
 var DEBUG_MAX_CONTENT_CHARS = 2e3;
 var DEBUG_MAX_LOG_CHARS = 2e4;
 var DEBUG_MAX_EVENT_RESULT_CHARS = 500;
+var DEBUG_MAX_EVENT_ARGS_CHARS = 2e3;
 var truncateText2 = (value, maxChars) => {
   if (value.length <= maxChars) return value;
   return `${value.slice(0, maxChars)}...[truncated]`;
@@ -5687,7 +7094,9 @@ var summarizeRunEvent = (event) => {
     case "tool_call": {
       const tool = typeof event.tool === "string" ? event.tool : "unknown";
       const toolCallId = typeof event.tool_call_id === "string" ? event.tool_call_id : "unknown";
-      return `type=tool_call tool=${tool} tool_call_id=${toolCallId}`;
+      const rawArgs = typeof event.raw_args === "string" ? event.raw_args : stringifyUnknown(event.args);
+      const rawArgsSnippet = truncateText2(rawArgs, DEBUG_MAX_EVENT_ARGS_CHARS);
+      return `type=tool_call tool=${tool} tool_call_id=${toolCallId} raw_args=${stringifyUnknown(rawArgsSnippet)}`;
     }
     case "tool_result": {
       const tool = typeof event.tool === "string" ? event.tool : "unknown";
@@ -5722,7 +7131,7 @@ var logRunDebug = (log2, runId, message) => {
   if (!isDebugEnabled()) return;
   log2(`run debug run_id=${runId} ${message}`);
 };
-var normalizeCancelledHistory = (messages) => {
+var normalizeToolCallHistory = (messages) => {
   const assistantCallIds = /* @__PURE__ */ new Set();
   const toolOutputCallIds = /* @__PURE__ */ new Set();
   for (const message of messages) {
@@ -5806,8 +7215,92 @@ var prepareRunInputText = (inputText) => {
   return `${inputText}${buildSkillMentionHint(mentions)}`;
 };
 
+// src/rpc/run-input.ts
+var isRunInputImageMediaType = (value) => value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
+var isRunInputImageDetail = (value) => value === "auto" || value === "low" || value === "high";
+var normalizeRunInputTextPart = (part) => {
+  if (typeof part.text !== "string") {
+    throw new Error("run.start input.parts[text].text must be a string");
+  }
+  return {
+    type: "text",
+    text: prepareRunInputText(part.text)
+  };
+};
+var normalizeRunInputImagePart = (part) => {
+  const imageUrl = part.image_url;
+  if (!imageUrl || typeof imageUrl !== "object") {
+    throw new Error("run.start input.parts[image_url].image_url is required");
+  }
+  if (typeof imageUrl.url !== "string" || imageUrl.url.length === 0) {
+    throw new Error(
+      "run.start input.parts[image_url].image_url.url must be a non-empty string"
+    );
+  }
+  if (imageUrl.media_type !== void 0 && !isRunInputImageMediaType(imageUrl.media_type)) {
+    throw new Error(
+      "run.start input.parts[image_url].image_url.media_type must be png/jpeg/webp/gif"
+    );
+  }
+  if (imageUrl.detail !== void 0 && !isRunInputImageDetail(imageUrl.detail)) {
+    throw new Error(
+      "run.start input.parts[image_url].image_url.detail must be auto/low/high"
+    );
+  }
+  return {
+    type: "image_url",
+    image_url: {
+      url: imageUrl.url,
+      ...imageUrl.media_type ? { media_type: imageUrl.media_type } : {},
+      ...imageUrl.detail ? { detail: imageUrl.detail } : {}
+    }
+  };
+};
+var normalizeRunInput = (input) => {
+  if (input.type === "text") {
+    if (typeof input.text !== "string") {
+      throw new Error("run.start input.text must be a string");
+    }
+    return prepareRunInputText(input.text);
+  }
+  if (!Array.isArray(input.parts)) {
+    throw new Error("run.start input.parts must be an array");
+  }
+  return input.parts.map((part) => {
+    if (!part || typeof part !== "object") {
+      throw new Error("run.start input.parts entry must be an object");
+    }
+    if (part.type === "text") {
+      return normalizeRunInputTextPart(part);
+    }
+    if (part.type === "image_url") {
+      return normalizeRunInputImagePart(part);
+    }
+    throw new Error(
+      `run.start input.parts type is not supported: ${String(part.type)}`
+    );
+  });
+};
+var runInputLengthForDebug = (input) => {
+  if (typeof input === "string") {
+    return input.length;
+  }
+  let total = 0;
+  for (const part of input) {
+    if (part.type === "text") {
+      total += part.text.length;
+      continue;
+    }
+    if (part.type === "image_url") {
+      total += part.image_url.url.length;
+    }
+  }
+  return total;
+};
+
 // src/rpc/run.ts
-var nowIso2 = () => (/* @__PURE__ */ new Date()).toISOString();
+var nowIso4 = () => (/* @__PURE__ */ new Date()).toISOString();
+var SESSION_STATE_SAVE_DEBOUNCE_MS = 1500;
 var createSessionAppender = (store, onError) => {
   let chain = Promise.resolve();
   return (record) => {
@@ -5819,7 +7312,7 @@ var createSessionAppender = (store, onError) => {
 var buildSessionState = (sessionId, runId, messages, invokeSeq) => ({
   schema_version: 1,
   session_id: sessionId,
-  updated_at: nowIso2(),
+  updated_at: nowIso4(),
   run_id: runId,
   invoke_seq: invokeSeq,
   messages
@@ -5830,18 +7323,26 @@ var createRunHandlers = ({
   log: log2,
   runEventStoreFactory,
   sessionStateStore,
-  appendSession
+  appendSession,
+  beforeRunStart
 }) => {
   let activeRunAbort = null;
   let runStartQueue = Promise.resolve();
   const normalizeRunHistoryAfterCancel = (runId, runtimeAgent) => {
     const currentMessages = runtimeAgent.getHistoryMessages();
-    const normalizedMessages = normalizeCancelledHistory(currentMessages);
+    const normalizedMessages = normalizeToolCallHistory(currentMessages);
     if (normalizedMessages !== currentMessages) {
       runtimeAgent.replaceHistoryMessages(normalizedMessages);
       log2(`run.cancel normalized history ${runId}`);
     }
   };
+  const normalizeRestoredSessionMessages = (messages, sessionId) => {
+    const normalizedMessages = normalizeToolCallHistory(messages);
+    if (normalizedMessages !== messages) {
+      log2(`session restore normalized history ${sessionId}`);
+    }
+    return normalizedMessages;
+  };
   const emitRunStatus = (runId, status, message) => {
     sendRunStatus(runId, status, message);
     const suffix = message ? ` message=${message}` : "";
@@ -5849,7 +7350,7 @@ var createRunHandlers = ({
     appendSession({
       type: "run.status",
       run_id: runId,
-      ts: nowIso2(),
+      ts: nowIso4(),
       status,
       ...message ? { message } : {}
     });
@@ -5858,22 +7359,43 @@ var createRunHandlers = ({
     appendSession({
       type: "run.end",
       run_id: runId,
-      ts: nowIso2(),
+      ts: nowIso4(),
       outcome,
       ...final !== void 0 ? { final } : {}
     });
   };
   const handleRunStart = (id, params) => {
     const run = async () => {
+      let normalizedInput;
+      try {
+        normalizedInput = normalizeRunInput(params.input);
+      } catch (error) {
+        sendError(id, {
+          code: RPC_ERROR_CODE4.INVALID_PARAMS,
+          message: String(error)
+        });
+        return;
+      }
+      if (beforeRunStart) {
+        try {
+          await beforeRunStart();
+        } catch (error) {
+          sendError(id, {
+            code: RPC_ERROR_CODE4.RUNTIME_INTERNAL,
+            message: `startup onboarding failed: ${String(error)}`
+          });
+          return;
+        }
+      }
       if (state.activeRunId) {
-        sendError(id, { code: -32001, message: "runtime busy" });
+        sendError(id, { code: RPC_ERROR_CODE4.RUNTIME_BUSY, message: "runtime busy" });
         return;
       }
       let runtimeAgent;
       try {
         runtimeAgent = await getAgent();
       } catch (error) {
-        sendError(id, { code: -32e3, message: String(error) });
+        sendError(id, { code: RPC_ERROR_CODE4.RUNTIME_INTERNAL, message: String(error) });
         return;
       }
       const requestedSessionId = params.session_id?.trim() || void 0;
@@ -5884,16 +7406,20 @@ var createRunHandlers = ({
           resumeState = await sessionStateStore.load(requestedSessionId);
         } catch (error) {
           sendError(id, {
-            code: -32005,
+            code: RPC_ERROR_CODE4.SESSION_LOAD_FAILED,
             message: `session load failed: ${String(error)}`
           });
           return;
         }
         if (!resumeState) {
-          sendError(id, { code: -32004, message: "session not found" });
+          sendError(id, { code: RPC_ERROR_CODE4.SESSION_NOT_FOUND, message: "session not found" });
           return;
         }
-        const messages = Array.isArray(resumeState.messages) ? resumeState.messages : [];
+        const restoredMessages = Array.isArray(resumeState.messages) ? resumeState.messages : [];
+        const messages = normalizeRestoredSessionMessages(
+          restoredMessages,
+          requestedSessionId
+        );
         runtimeAgent.replaceHistoryMessages(messages);
         sessionId = requestedSessionId;
         state.sessionId = sessionId;
@@ -5901,17 +7427,25 @@ var createRunHandlers = ({
         try {
           resumeState = await sessionStateStore.load(state.sessionId);
         } catch (error) {
-          log2(`session state reload error: ${String(error)}`);
+          sendError(id, {
+            code: RPC_ERROR_CODE4.SESSION_LOAD_FAILED,
+            message: `session reload failed: ${String(error)}`
+          });
+          return;
         }
         if (resumeState) {
-          const messages = Array.isArray(resumeState.messages) ? resumeState.messages : [];
+          const restoredMessages = Array.isArray(resumeState.messages) ? resumeState.messages : [];
+          const messages = normalizeRestoredSessionMessages(
+            restoredMessages,
+            state.sessionId
+          );
           runtimeAgent.replaceHistoryMessages(messages);
         }
       } else if (!state.sessionId) {
         state.sessionId = sessionId;
       }
       const runId = state.nextRunId();
-      const startedAt = nowIso2();
+      const startedAt = nowIso4();
       state.beginRun(runId, params.ui_context ?? state.lastUiContext);
       const runAbortController = new AbortController();
       activeRunAbort = { runId, controller: runAbortController };
@@ -5961,7 +7495,7 @@ var createRunHandlers = ({
         type: "run.start",
         run_id: runId,
         session_id: sessionId,
-        ts: nowIso2(),
+        ts: nowIso4(),
         input: params.input,
         ui_context: params.ui_context,
         meta: params.meta
@@ -5972,25 +7506,58 @@ var createRunHandlers = ({
       emitRunStatus(runId, "running");
       void (async () => {
         let finalResponse;
-        let cancelledWhileStreaming = false;
-        const preparedInputText = prepareRunInputText(params.input.text);
+        let sessionSaveChain = Promise.resolve();
+        let lastSessionSaveAt = 0;
+        const queueSessionSave = async (reason) => {
+          sessionSaveChain = sessionSaveChain.then(async () => {
+            if (!sessionId) return;
+            const messages = runtimeAgent.getHistoryMessages();
+            const snapshotMessages = normalizeToolCallHistory(messages);
+            if (snapshotMessages !== messages) {
+              logRunDebug(
+                log2,
+                runId,
+                `session.save normalized reason=${reason}`
+              );
+            }
+            const snapshot = buildSessionState(
+              sessionId,
+              runId,
+              snapshotMessages,
+              session.invoke_seq
+            );
+            await sessionStateStore.save(snapshot);
+            logRunDebug(log2, runId, `session.save ${reason}`);
+          }).catch((error) => {
+            log2(`Error: session-state save failed: ${String(error)}`);
+          });
+          await sessionSaveChain;
+        };
+        const maybeDebouncedSessionSave = () => {
+          const now = Date.now();
+          if (now - lastSessionSaveAt < SESSION_STATE_SAVE_DEBOUNCE_MS) {
+            return;
+          }
+          lastSessionSaveAt = now;
+          void queueSessionSave("debounced");
+        };
         try {
           logRunDebug(
             log2,
             runId,
-            `stream.start input_chars=${preparedInputText.length}`
+            `stream.start input_chars=${runInputLengthForDebug(normalizedInput)}`
           );
-          for await (const event of runtimeAgent.runStream(preparedInputText, {
+          for await (const event of runtimeAgent.runStream(normalizedInput, {
             session,
             signal: runAbortController.signal,
             forceCompaction: params.force_compaction
           })) {
             if (state.cancelRequested) {
-              cancelledWhileStreaming = true;
               break;
             }
             if (event.type === "final") {
               finalResponse = event.content;
+              await queueSessionSave("final");
             }
             if (event.type === "compaction_complete") {
               logCompactionSnapshot(log2, runId, runtimeAgent, event.compacted);
@@ -6014,7 +7581,7 @@ var createRunHandlers = ({
               appendSession({
                 type: "agent.event",
                 run_id: runId,
-                ts: nowIso2(),
+                ts: nowIso4(),
                 seq,
                 event
               });
@@ -6025,14 +7592,16 @@ var createRunHandlers = ({
               appendSession({
                 type: "run.context",
                 run_id: runId,
-                ts: nowIso2(),
+                ts: nowIso4(),
                 context_left_percent: contextLeftPercent
               });
             }
+            maybeDebouncedSessionSave();
           }
-          if (cancelledWhileStreaming) {
+          if (state.cancelRequested) {
             normalizeRunHistoryAfterCancel(runId, runtimeAgent);
           }
+          await queueSessionSave("terminal");
           const status = state.cancelRequested ? "cancelled" : "completed";
           emitRunStatus(runId, status);
           emitRunEnd(
@@ -6044,15 +7613,17 @@ var createRunHandlers = ({
           const err = error instanceof Error ? error : new Error(String(error));
           if (state.cancelRequested || isAbortLikeError(err)) {
             normalizeRunHistoryAfterCancel(runId, runtimeAgent);
+            await queueSessionSave("cancelled");
             emitRunStatus(runId, "cancelled", err.message || "cancelled");
             emitRunEnd(runId, "cancelled", finalResponse);
             return;
           }
+          await queueSessionSave("error");
           emitRunStatus(runId, "error", err.message);
           appendSession({
             type: "run.error",
             run_id: runId,
-            ts: nowIso2(),
+            ts: nowIso4(),
             error: {
               name: err.name,
               message: err.message,
@@ -6062,18 +7633,10 @@ var createRunHandlers = ({
           emitRunEnd(runId, "error");
         } finally {
           logRunDebug(log2, runId, "stream.finally");
-          if (state.sessionId) {
-            const messages = runtimeAgent.getHistoryMessages();
-            const snapshot = buildSessionState(
-              sessionId,
-              runId,
-              messages,
-              session.invoke_seq
-            );
-            void sessionStateStore.save(snapshot).catch((error) => {
-              log2(`session-state error: ${String(error)}`);
-            });
+          if (state.cancelRequested) {
+            normalizeRunHistoryAfterCancel(runId, runtimeAgent);
           }
+          await queueSessionSave("finally");
           if (activeRunAbort?.runId === runId) {
             activeRunAbort = null;
           }
@@ -6099,19 +7662,22 @@ var createRunHandlers = ({
       log2(`run.cancel ${params.run_id} (${params.reason ?? "no reason"})`);
       return;
     }
-    sendError(id, { code: -32002, message: "run not found" });
+    sendError(id, { code: RPC_ERROR_CODE4.RUN_NOT_FOUND, message: "run not found" });
   };
   return { handleRunStart, handleRunCancel };
 };
 
 // src/rpc/skills.ts
-import path12 from "path";
+import path14 from "path";
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE5
+} from "@codelia/protocol";
 var createSkillsHandlers = ({
   state,
   log: log2
 }) => {
   const handleSkillsList = async (id, params) => {
-    const requestedCwd = params?.cwd ? path12.resolve(params.cwd) : void 0;
+    const requestedCwd = params?.cwd ? path14.resolve(params.cwd) : void 0;
     const workingDir = requestedCwd ?? state.runtimeWorkingDir ?? state.lastUiContext?.cwd ?? process.cwd();
     const forceReload = params?.force_reload ?? false;
     if (!forceReload) {
@@ -6135,7 +7701,7 @@ var createSkillsHandlers = ({
         });
       } catch (error) {
         sendError(id, {
-          code: -32e3,
+          code: RPC_ERROR_CODE5.RUNTIME_INTERNAL,
           message: `skills resolver init failed: ${String(error)}`
         });
         return;
@@ -6157,7 +7723,7 @@ var createSkillsHandlers = ({
     } catch (error) {
       log2(`skills.list error: ${String(error)}`);
       sendError(id, {
-        code: -32e3,
+        code: RPC_ERROR_CODE5.RUNTIME_INTERNAL,
         message: `skills list failed: ${String(error)}`
       });
     }
@@ -6165,6 +7731,77 @@ var createSkillsHandlers = ({
   return { handleSkillsList };
 };
 
+// src/rpc/tool.ts
+import {
+  RPC_ERROR_CODE as RPC_ERROR_CODE6
+} from "@codelia/protocol";
+var normalizeToolResult = (result) => {
+  switch (result.type) {
+    case "json":
+      return result.value;
+    case "text":
+      return result.text;
+    case "parts":
+      return result.parts;
+  }
+};
+var createToolContext = () => {
+  const deps = /* @__PURE__ */ Object.create(null);
+  const cache = /* @__PURE__ */ new Map();
+  const resolve = async (key) => {
+    if (cache.has(key.id)) {
+      return cache.get(key.id);
+    }
+    const value = await key.create();
+    cache.set(key.id, value);
+    return value;
+  };
+  return {
+    deps,
+    resolve,
+    now: () => /* @__PURE__ */ new Date()
+  };
+};
+var createToolHandlers = ({
+  state,
+  getAgent
+}) => {
+  const handleToolCall = async (id, params) => {
+    const toolName = params?.name;
+    if (!toolName) {
+      sendError(id, { code: RPC_ERROR_CODE6.INVALID_PARAMS, message: "tool name is required" });
+      return;
+    }
+    if (!state.tools) {
+      await getAgent();
+    }
+    const tool = state.tools?.find((entry) => entry.name === toolName);
+    if (!tool) {
+      sendError(id, { code: RPC_ERROR_CODE6.INVALID_PARAMS, message: `unknown tool: ${toolName}` });
+      return;
+    }
+    try {
+      const result = await tool.executeRaw(
+        JSON.stringify(params?.arguments ?? {}),
+        createToolContext()
+      );
+      const response = {
+        ok: true,
+        result: normalizeToolResult(result)
+      };
+      sendResult(id, response);
+    } catch (error) {
+      sendError(id, {
+        code: RPC_ERROR_CODE6.RUNTIME_INTERNAL,
+        message: `tool call failed: ${String(error)}`
+      });
+    }
+  };
+  return {
+    handleToolCall
+  };
+};
+
 // src/rpc/handlers.ts
 var createRuntimeHandlers = ({
   state,
@@ -6172,7 +7809,8 @@ var createRuntimeHandlers = ({
   log: log2,
   mcpManager: injectedMcpManager,
   sessionStateStore: injectedSessionStateStore,
-  runEventStoreFactory: injectedRunEventStoreFactory
+  runEventStoreFactory: injectedRunEventStoreFactory,
+  buildProviderModelList: injectedBuildProviderModelList
 }) => {
   const sessionStateStore = injectedSessionStateStore ?? new SessionStateStoreImpl({
     onError: (error, context) => {
@@ -6186,17 +7824,117 @@ var createRuntimeHandlers = ({
     start: async () => void 0,
     list: () => ({ servers: [] })
   };
+  const buildProviderModelList2 = injectedBuildProviderModelList ?? buildProviderModelList;
+  let startupOnboardingPromise = null;
+  let startupOnboardingStarted = false;
   const appendSession = (record) => {
     if (!state.sessionAppend) return;
     state.sessionAppend(record);
   };
+  const formatUsdPer1M = (value) => {
+    if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+      return null;
+    }
+    const fixed = value.toFixed(4);
+    return fixed.replace(/\.?0+$/, "");
+  };
+  const buildModelPickDetail = (details) => {
+    const parts = [];
+    if (details?.release_date) {
+      parts.push(`released ${details.release_date}`);
+    }
+    const inputCost = formatUsdPer1M(details?.cost_per_1m_input_tokens_usd);
+    const outputCost = formatUsdPer1M(details?.cost_per_1m_output_tokens_usd);
+    if (inputCost !== null || outputCost !== null) {
+      parts.push(
+        `cost in/out ${inputCost ?? "-"}/${outputCost ?? "-"} USD per 1M`
+      );
+    }
+    return parts.join(" \u2022 ");
+  };
+  const runStartupOnboarding = async () => {
+    const supportsPick = !!state.uiCapabilities?.supports_pick;
+    const supportsPrompt = !!state.uiCapabilities?.supports_prompt;
+    if (!supportsPick || !supportsPrompt) {
+      return;
+    }
+    const authResolver = await AuthResolver.create(state, log2);
+    if (authResolver.hasAnyAvailableAuth()) {
+      return;
+    }
+    const providerPick = await requestUiPick(state, {
+      title: "Let's set up your provider to get started.",
+      items: SUPPORTED_PROVIDERS.map((provider2) => ({
+        id: provider2,
+        label: provider2,
+        detail: provider2 === "openai" ? "OAuth (ChatGPT Plus/Pro) or API key" : provider2 === "openrouter" ? "API key (OpenRouter)" : "API key"
+      })),
+      multi: false
+    });
+    const pickedProvider = providerPick?.ids?.[0];
+    if (!pickedProvider || !SUPPORTED_PROVIDERS.includes(pickedProvider)) {
+      log2("startup onboarding skipped (provider not selected)");
+      return;
+    }
+    const provider = pickedProvider;
+    try {
+      await authResolver.resolveProviderAuth(provider);
+    } catch (error) {
+      log2(`startup onboarding auth failed: ${String(error)}`);
+      return;
+    }
+    const { models, details } = await buildProviderModelList2({
+      provider,
+      includeDetails: true,
+      state,
+      log: log2
+    });
+    if (!models.length) {
+      log2(`startup onboarding model list returned no models for ${provider}`);
+      return;
+    }
+    const modelPick = await requestUiPick(state, {
+      title: `Select model (${provider})`,
+      items: models.map((model) => ({
+        id: model,
+        label: model,
+        detail: buildModelPickDetail(details?.[model]) || void 0
+      })),
+      multi: false
+    });
+    const selectedModel = modelPick?.ids?.[0];
+    if (!selectedModel || !models.includes(selectedModel)) {
+      log2("startup onboarding skipped (model not selected)");
+      return;
+    }
+    const configPath = resolveConfigPath();
+    await updateModelConfig2(configPath, { provider, name: selectedModel });
+    state.agent = null;
+    log2(`startup onboarding completed: ${provider}/${selectedModel}`);
+  };
+  const launchStartupOnboarding = () => {
+    if (startupOnboardingStarted) {
+      return;
+    }
+    startupOnboardingStarted = true;
+    startupOnboardingPromise = runStartupOnboarding().catch((error) => {
+      log2(`startup onboarding failed: ${String(error)}`);
+    }).finally(() => {
+      startupOnboardingPromise = null;
+    });
+  };
+  const waitForStartupOnboarding = async () => {
+    if (!startupOnboardingPromise) return;
+    await startupOnboardingPromise;
+  };
   const { handleRunStart, handleRunCancel } = createRunHandlers({
     state,
     getAgent,
     log: log2,
     runEventStoreFactory,
     sessionStateStore,
-    appendSession
+    appendSession,
+    beforeRunStart: waitForStartupOnboarding
   });
   const { handleSessionList, handleSessionHistory } = createHistoryHandlers({
     sessionStateStore,
@@ -6214,6 +7952,10 @@ var createRuntimeHandlers = ({
     state,
     log: log2
   });
+  const { handleToolCall } = createToolHandlers({
+    state,
+    getAgent
+  });
   const handleInitialize = (id, params) => {
     const result = {
       protocol_version: PROTOCOL_VERSION,
@@ -6223,13 +7965,16 @@ var createRuntimeHandlers = ({
         supports_ui_requests: true,
         supports_mcp_list: true,
         supports_skills_list: true,
-        supports_context_inspect: true
+        supports_context_inspect: true,
+        supports_tool_call: true,
+        supports_permission_preflight_events: true
       }
     };
     sendResult(id, result);
     log2(`initialize from ${params.client?.name ?? "unknown"}`);
     state.lastClientInfo = params.client ?? null;
     state.setUiCapabilities(params.ui_capabilities);
+    launchStartupOnboarding();
   };
   const handleUiContextUpdate = (params) => {
     state.updateUiContext(params);
@@ -6239,7 +7984,7 @@ var createRuntimeHandlers = ({
   };
   const handleAuthLogout = async (id, params) => {
     if (state.activeRunId) {
-      sendError(id, { code: -32001, message: "runtime busy" });
+      sendError(id, { code: RPC_ERROR_CODE7.RUNTIME_BUSY, message: "runtime busy" });
       return;
     }
     const clearSession = params?.clear_session ?? true;
@@ -6247,7 +7992,7 @@ var createRuntimeHandlers = ({
       const supportsConfirm = !!state.uiCapabilities?.supports_confirm;
       if (!supportsConfirm) {
         sendError(id, {
-          code: -32e3,
+          code: RPC_ERROR_CODE7.RUNTIME_INTERNAL,
           message: "UI confirmation is required for logout"
         });
         return;
@@ -6289,7 +8034,7 @@ var createRuntimeHandlers = ({
       log2(`auth.logout session_cleared=${clearSession}`);
     } catch (error) {
       sendError(id, {
-        code: -32e3,
+        code: RPC_ERROR_CODE7.RUNTIME_INTERNAL,
         message: `auth logout failed: ${String(error)}`
       });
     }
@@ -6312,6 +8057,8 @@ var createRuntimeHandlers = ({
         return handleModelList(req.id, req.params);
       case "model.set":
         return handleModelSet(req.id, req.params);
+      case "tool.call":
+        return handleToolCall(req.id, req.params);
       case "mcp.list":
         await mcpManager.start?.();
         return sendResult(
@@ -6323,7 +8070,7 @@ var createRuntimeHandlers = ({
       case "context.inspect":
         return handleContextInspect(req.id, req.params);
       default:
-        return sendError(req.id, { code: -32601, message: "method not found" });
+        return sendError(req.id, { code: RPC_ERROR_CODE7.METHOD_NOT_FOUND, message: "method not found" });
     }
   };
   const handleNotification = (note) => {
@@ -6350,7 +8097,7 @@ var createRuntimeHandlers = ({
 };
 
 // src/runtime-state.ts
-import crypto5 from "crypto";
+import crypto6 from "crypto";
 var RuntimeState = class {
   runSeq = /* @__PURE__ */ new Map();
   uiRequestCounter = 0;
@@ -6363,6 +8110,7 @@ var RuntimeState = class {
   uiCapabilities = null;
   systemPrompt = null;
   toolDefinitions = null;
+  tools = null;
   sessionId = null;
   sessionAppend = null;
   agent = null;
@@ -6373,10 +8121,10 @@ var RuntimeState = class {
   runtimeWorkingDir = null;
   runtimeSandboxRoot = null;
   nextRunId() {
-    return crypto5.randomUUID();
+    return crypto6.randomUUID();
   }
   nextSessionId() {
-    return crypto5.randomUUID();
+    return crypto6.randomUUID();
   }
   beginRun(runId, uiContext) {
     this.activeRunId = runId;
@@ -6466,42 +8214,59 @@ var RuntimeState = class {
 
 // src/runtime.ts
 var startRuntime = () => {
-  const state = new RuntimeState();
-  const workingDir = process.env.CODELIA_SANDBOX_ROOT ? path13.resolve(process.env.CODELIA_SANDBOX_ROOT) : process.cwd();
-  state.runtimeWorkingDir = workingDir;
-  state.runtimeSandboxRoot = workingDir;
-  const mcpManager = new McpManager({ workingDir, log });
-  void mcpManager.start({
-    onStatus: (message) => log(`mcp: ${message}`),
-    requestOAuthTokens: ({ server_id, oauth: oauth2, error }) => requestMcpOAuthTokensWithRunStatus(state, server_id, oauth2, error)
-  });
-  const getAgent = createAgentFactory(state, { mcpManager });
-  const { processMessage } = createRuntimeHandlers({
-    state,
-    getAgent,
-    log,
-    mcpManager
-  });
-  log("runtime started");
-  process.stdin.setEncoding("utf8");
-  let buffer = "";
-  process.stdin.on("data", (chunk) => {
-    buffer += chunk;
-    let index = buffer.indexOf("\n");
-    while (index >= 0) {
-      const line = buffer.slice(0, index).trim();
-      buffer = buffer.slice(index + 1);
-      if (line) {
-        try {
-          const msg = JSON.parse(line);
-          processMessage(msg);
-        } catch (error) {
-          log(`invalid json: ${String(error)}`);
-        }
+  void (async () => {
+    const state = new RuntimeState();
+    const workingDir = process.env.CODELIA_SANDBOX_ROOT ? path15.resolve(process.env.CODELIA_SANDBOX_ROOT) : process.cwd();
+    state.runtimeWorkingDir = workingDir;
+    state.runtimeSandboxRoot = workingDir;
+    const sessionStateStore = new SessionStateStoreImpl2({
+      onError: (error, context) => {
+        log(
+          `Error: session-state ${context.action} error${context.detail ? ` (${context.detail})` : ""}: ${String(error)}`
+        );
       }
-      index = buffer.indexOf("\n");
+    });
+    try {
+      await sessionStateStore.list();
+    } catch (error) {
+      log(`Error: session index database is not available: ${String(error)}`);
+      process.exit(1);
+      return;
     }
-  });
+    const mcpManager = new McpManager({ workingDir, log });
+    void mcpManager.start({
+      onStatus: (message) => log(`mcp: ${message}`),
+      requestOAuthTokens: ({ server_id, oauth: oauth2, error }) => requestMcpOAuthTokensWithRunStatus(state, server_id, oauth2, error)
+    });
+    const getAgent = createAgentFactory(state, { mcpManager });
+    const { processMessage } = createRuntimeHandlers({
+      state,
+      getAgent,
+      log,
+      mcpManager,
+      sessionStateStore
+    });
+    log("runtime started");
+    process.stdin.setEncoding("utf8");
+    let buffer = "";
+    process.stdin.on("data", (chunk) => {
+      buffer += chunk;
+      let index = buffer.indexOf("\n");
+      while (index >= 0) {
+        const line = buffer.slice(0, index).trim();
+        buffer = buffer.slice(index + 1);
+        if (line) {
+          try {
+            const msg = JSON.parse(line);
+            processMessage(msg);
+          } catch (error) {
+            log(`invalid json: ${String(error)}`);
+          }
+        }
+        index = buffer.indexOf("\n");
+      }
+    });
+  })();
 };
 
 // src/index.ts