@oxbit/cli 0.6.1 → 0.7.0

package/runtime/dist/index.js

@@ -5,7 +5,7 @@ import * as fs from "node:fs/promises";
 import path from "node:path";
 import { spawn, execFileSync } from "node:child_process";
 import { parseArgs } from "node:util";
-import http from "node:http";
+import http, { createServer } from "node:http";
 import os, { userInfo } from "node:os";
 import { createHash, randomUUID, randomBytes, timingSafeEqual } from "node:crypto";
 import { WebSocketServer, WebSocket } from "ws";
@@ -43,6 +43,13 @@ function workspaceDataDir(root, home = os.homedir()) {
   return path.join(home, ".oxbit", "workspaces", id);
 }
 const MAX_MESSAGE_BYTES = 2 * 1024 * 1024;
+const MAX_FILE_BYTES = 20 * 1024 * 1024;
+const MAX_FILE_WRITE_MESSAGE_BYTES = MAX_FILE_BYTES * 6 + MAX_MESSAGE_BYTES;
+const MAX_COLLABORATION_UPDATE_BYTES = Math.ceil(MAX_FILE_BYTES / 3) * 4 + MAX_MESSAGE_BYTES;
+const requestMessageLimit = (method) => method === "fs.write" || method === "collab.save" ? MAX_FILE_WRITE_MESSAGE_BYTES : method === "collab.update" ? MAX_COLLABORATION_UPDATE_BYTES + MAX_MESSAGE_BYTES : MAX_MESSAGE_BYTES;
+function operationEpoch(id) {
+  return /^op:([0-9a-f-]{36}):[0-9a-f-]{36}$/.exec(id)?.[1];
+}
 const MAX_BUFFER_BYTES = 1024 * 1024;
 const READ_CHUNK_BYTES = 512 * 1024;
 const RUNTIME_SERVICE_TYPE = "_oxbit._tcp";
@@ -57,8 +64,9 @@ class RpcError extends Error {
   data;
 }
 function parseClientMessage(raw) {
-  if (new TextEncoder().encode(raw).byteLength > MAX_MESSAGE_BYTES)
-    throw new RpcError("TOO_LARGE", "Message exceeds 2 MiB");
+  const bytes = new TextEncoder().encode(raw).byteLength;
+  if (bytes > MAX_FILE_WRITE_MESSAGE_BYTES)
+    throw new RpcError("TOO_LARGE", "Message exceeds the file save limit");
   let m;
   try {
     m = JSON.parse(raw);
@@ -67,6 +75,8 @@ function parseClientMessage(raw) {
   }
   if (!m || m.v !== 1 || !["request", "cancel", "ack"].includes(m.type))
     throw new RpcError("INVALID_MESSAGE", "Invalid protocol message");
+  if (bytes > (m.type === "request" ? requestMessageLimit(m.method) : MAX_MESSAGE_BYTES))
+    throw new RpcError("TOO_LARGE", "Message exceeds 2 MiB");
   if (m.type === "ack") {
     if (typeof m.stream !== "string" || !m.stream || m.stream.length > 256 || !Number.isSafeInteger(m.seq) || m.seq < 0)
       throw new RpcError("INVALID_MESSAGE", "Invalid acknowledgement");
@@ -224,6 +234,10 @@ class WorkspaceFiles {
   protected(candidate) {
     return [...this.protectedRoots].some((root) => candidate === root || candidate.startsWith(root + path.sep));
   }
+  protectDescendants(candidate) {
+    if ([...this.protectedRoots].some((root) => root.startsWith(candidate + path.sep)))
+      throw new RpcError("PATH_DENIED", "Directory contains protected files");
+  }
   inside(candidate) {
     const rel = path.relative(this.root, candidate);
     return rel === "" || !rel.startsWith(`..${path.sep}`) && rel !== ".." && !path.isAbsolute(rel);
@@ -311,7 +325,7 @@ class WorkspaceFiles {
     const stat = await fs.stat(full);
     if (!stat.isFile())
       throw new RpcError("NOT_FILE", "Path is not a regular file");
-    if (stat.size > 20 * 1024 * 1024)
+    if (stat.size > MAX_FILE_BYTES)
       throw new RpcError(
         "FILE_TOO_LARGE",
         "Files above 20 MiB must be opened outside this editor"
@@ -329,7 +343,7 @@ class WorkspaceFiles {
     const stat = await fs.stat(full);
     if (!stat.isFile())
       throw new RpcError("NOT_FILE", "Path is not a regular file");
-    if (stat.size > 20 * 1024 * 1024)
+    if (stat.size > MAX_FILE_BYTES)
       throw new RpcError(
         "FILE_TOO_LARGE",
         "Files above 20 MiB must be opened outside this editor"
@@ -393,7 +407,7 @@ class WorkspaceFiles {
           actualRevision: actual
         });
       const bytes = encode(text2, options2.encoding, options2.eol);
-      if (bytes.length > 20 * 1024 * 1024)
+      if (bytes.length > MAX_FILE_BYTES)
         throw new RpcError(
           "FILE_TOO_LARGE",
           "Files above 20 MiB are unsupported"
@@ -427,6 +441,8 @@ class WorkspaceFiles {
     const target = await this.resolve(to, true);
     if (from === this.root || target === this.root)
       throw new RpcError("PATH_DENIED", "Cannot rename workspace root");
+    this.protectDescendants(from);
+    this.protectDescendants(target);
     try {
       await fs.lstat(target);
       throw new RpcError("EXISTS", "Destination already exists");
@@ -439,9 +455,103 @@ class WorkspaceFiles {
     const full = await this.resolve(relative);
     if (full === this.root)
       throw new RpcError("PATH_DENIED", "Cannot delete workspace root");
+    this.protectDescendants(full);
     await fs.rm(path.resolve(this.root, relative), { recursive: true });
   }
 }
+const OPERATIONS_PER_EPOCH = 128;
+const MAX_RETAINED_OPERATIONS = OPERATIONS_PER_EPOCH * 2;
+const MAX_RUNNING_OPERATIONS = 64;
+const MAX_OPERATION_RESULT_BYTES = 1024 * 1024;
+class OperationHistory {
+  records = /* @__PURE__ */ new Map();
+  state;
+  constructor(state2, records2 = []) {
+    this.state = state2 ? { ...state2 } : { epoch: randomUUID(), admitted: 0 };
+    for (const record of records2) {
+      const operation = { ...record };
+      if (operation.status === "running") {
+        operation.status = "interrupted";
+        operation.error = { code: "INTERRUPTED", message: "Runtime stopped before operation completion was recorded; inspect state before retrying with a new request ID" };
+      }
+      this.records.set(this.key(operation.owner, operation.id), operation);
+    }
+    if (!state2 && this.records.size > OPERATIONS_PER_EPOCH || this.records.size > MAX_RETAINED_OPERATIONS + MAX_RUNNING_OPERATIONS) {
+      this.state = { epoch: randomUUID(), admitted: 0 };
+      while (this.records.size > OPERATIONS_PER_EPOCH) this.records.delete(this.records.keys().next().value);
+    } else if (!state2) this.state.admitted = this.records.size;
+    this.compactResults();
+  }
+  get epoch() {
+    return this.state.epoch;
+  }
+  checkpoint() {
+    return { ...this.state };
+  }
+  values() {
+    return this.records.values();
+  }
+  key(owner, id) {
+    return `${owner}:${id}`;
+  }
+  get(owner, id) {
+    return this.records.get(this.key(owner, id));
+  }
+  accepts(id) {
+    const epoch = operationEpoch(id);
+    return epoch === void 0 ? !id.startsWith("op:") : epoch === this.state.epoch || epoch === this.state.previousEpoch;
+  }
+  status(owner, id) {
+    return this.get(owner, id) ?? (this.accepts(id) ? { id, status: "unknown" } : { id, status: "expired", error: { code: "OPERATION_EXPIRED", message: "Operation history expired; inspect current state before submitting a new operation" } });
+  }
+  begin(owner, id, method) {
+    if (this.get(owner, id)) throw new RpcError("DUPLICATE_ID", "Operation already exists");
+    if (!this.accepts(id)) throw new RpcError("OPERATION_EXPIRED", "Operation ID expired; inspect current state before submitting a new operation");
+    if ([...this.records.values()].filter((operation2) => operation2.status === "running").length >= MAX_RUNNING_OPERATIONS)
+      throw new RpcError("BUSY", "Maximum 64 concurrent operations");
+    const operation = { id, owner, method, status: "running", startedAt: Date.now() };
+    this.records.set(this.key(owner, id), operation);
+    if (++this.state.admitted >= OPERATIONS_PER_EPOCH) {
+      this.state = { epoch: randomUUID(), previousEpoch: this.state.epoch, admitted: 0 };
+      let retained = 0;
+      for (const [key, record] of [...this.records].reverse())
+        if (record.status !== "running" && (!this.accepts(record.id) || ++retained > OPERATIONS_PER_EPOCH)) this.records.delete(key);
+    }
+    return operation;
+  }
+  complete(operation, result) {
+    operation.status = "completed";
+    operation.result = result;
+    this.compactResults();
+  }
+  fail(operation, error) {
+    operation.status = "failed";
+    operation.error = error;
+    delete operation.result;
+    this.compactResults();
+  }
+  compactResults() {
+    let remaining = MAX_OPERATION_RESULT_BYTES;
+    for (const operation of [...this.records.values()].reverse()) {
+      if (operation.error) {
+        operation.error.code = operation.error.code.slice(0, 128);
+        if (operation.error.message.length > 4096) {
+          operation.error.message = operation.error.message.slice(0, 4096);
+          operation.resultExpired = true;
+        }
+      }
+      const result = operation.result;
+      const largeText = (operation.method === "fs.write" || operation.method === "collab.save") && typeof result?.text === "string" && result.text.length > remaining;
+      const body = largeText ? void 0 : JSON.stringify({ result: operation.result, data: operation.error?.data });
+      const bytes = body === void 0 ? remaining + 1 : body === "{}" ? 0 : Buffer.byteLength(body);
+      if (bytes > remaining) {
+        delete operation.result;
+        if (operation.error) delete operation.error.data;
+        operation.resultExpired = true;
+      } else remaining -= bytes;
+    }
+  }
+}
 function killProcess(child) {
   if (child.exitCode !== null) return;
   try {
@@ -776,7 +886,7 @@ function validateJson(value, seen = /* @__PURE__ */ new Set(), depth = 0) {
   }
   seen.delete(value);
 }
-function object$2(value) {
+function object$3(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Expected a JSON object");
 }
 function strings$1(value) {
@@ -784,17 +894,17 @@ function strings$1(value) {
 }
 function validateFileAssociations(value) {
   validateJson(value);
-  object$2(value);
+  object$3(value);
   for (const [pattern, id] of Object.entries(value))
     if (!pattern || pattern.length > 1024 || typeof id !== "string" || !/^[\w+-]+$/.test(id)) throw new Error("File associations map glob patterns to language IDs");
 }
 function validateLanguageServers(value) {
   validateJson(value);
-  object$2(value);
+  object$3(value);
   const keys = ["enabled", "selectors", "rootMarkers", "executable", "args", "env", "initializationOptions", "settings", "priority"];
   for (const [id, config] of Object.entries(value)) {
     if (!/^[a-zA-Z0-9._-]+$/.test(id)) throw new Error("Invalid language server ID");
-    object$2(config);
+    object$3(config);
     for (const key of Object.keys(config)) if (!keys.includes(key)) throw new Error(`Unknown language server option: ${key}`);
     if (config.enabled !== void 0 && typeof config.enabled !== "boolean") throw new Error("enabled must be boolean");
     if (config.priority !== void 0 && (typeof config.priority !== "number" || !Number.isFinite(config.priority))) throw new Error("priority must be finite");
@@ -807,11 +917,11 @@ function validateLanguageServers(value) {
     if (config.selectors !== void 0) {
       if (!Array.isArray(config.selectors)) throw new Error("selectors must be an array");
       for (const selector of config.selectors) {
-        object$2(selector);
+        object$3(selector);
         if (Object.keys(selector).some((key) => !["language", "pattern", "scheme"].includes(key)) || !Object.keys(selector).length || Object.values(selector).some((item) => typeof item !== "string") || selector.scheme !== void 0 && selector.scheme !== "file") throw new Error("Invalid document selector");
       }
     }
-    for (const key of ["env", "settings", "initializationOptions"]) if (config[key] !== void 0) object$2(config[key]);
+    for (const key of ["env", "settings", "initializationOptions"]) if (config[key] !== void 0) object$3(config[key]);
     if (config.env && Object.entries(config.env).some(([key, item]) => !/^[A-Za-z_][A-Za-z0-9_]*$/.test(key) || typeof item !== "string" || item.includes("\0"))) throw new Error("Invalid environment override");
     const credentials = (item) => Boolean(item && typeof item === "object" && Object.entries(item).some(([key, child]) => /(?:^|[._-])licen[cs]e(?:[._-]?key)?$/i.test(key) || credentials(child)));
     if (credentials(config.initializationOptions) || credentials(config.settings) || credentials(config.env)) throw new Error("Store license credentials in the runtime-local language server credential file");
@@ -822,7 +932,7 @@ const $id$1 = "https://oxbit.dev/schemas/settings.v1.schema.json";
 const title$2 = "Oxbit Settings";
 const description$2 = "User, private workspace and repository settings. Literal dotted IDs; objects merge recursively, arrays and scalar values replace. Unrecognized extension settings are preserved. Null is a value, not a reset, and must be valid for its setting.";
 const type$2 = "object";
-const properties$2 = /* @__PURE__ */ JSON.parse(`{"$schema":{"type":"string","description":"JSON Schema URI. Ignored when merging effective preferences."},"agentACP.provider":{"title":"Default agent","type":"string","default":"codex","enum":["codex","cursor","amp"]},"agentACP.codex.command":{"title":"Codex ACP executable","type":"string","default":"npx"},"agentACP.codex.args":{"title":"Codex ACP arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"@agentclientprotocol/codex-acp@1.10.0\\"]"},"agentACP.cursor.command":{"title":"Cursor ACP executable","type":"string","default":"agent"},"agentACP.cursor.args":{"title":"Cursor ACP arguments (JSON array)","type":"string","default":"[\\"acp\\"]"},"agentACP.amp.command":{"title":"Amp Agent ACP executable","type":"string","default":"npx"},"agentACP.amp.args":{"title":"Amp Agent ACP arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"amp-acp@0.9.0\\"]"},"workbench.keymap":{"title":"Keymap","description":"Keyboard layout applied on top of the Oxbit defaults. User keybindings always win.","type":"string","default":"default","enum":["default","vscode","jetbrains","macos","sublime","atom","visual-studio","emacs"]},"runtime.keepAlive":{"title":"Keep Runtime Alive","description":"How long a runtime Oxbit started keeps running after the last client disconnects or its connection heartbeats stop. Terminals and tasks continue while it runs.","type":"string","default":"75s","enum":["75s","15m","1h","8h","untilStopped"]},"runtime.autoReconnect":{"title":"Reconnect Automatically","description":"Reconnect to the runtime after the connection drops, including when the iOS app returns to the foreground.","type":"boolean","default":true},"workbench.tooltipDelay":{"title":"Tooltip Delay","description":"Delay in milliseconds before showing a tooltip on hover. Keyboard focus shows tooltips immediately.","type":"number","default":400,"minimum":0,"maximum":5000},"workbench.colorTheme":{"title":"Color Theme","description":"Specifies the color theme used in the workbench.","type":"string","default":"Graphite (dark)"},"workbench.density":{"title":"Layout Density","description":"Controls row heights, padding and label sizes across the workbench.","type":"string","default":"compact","enum":["compact","comfortable"]},"workbench.sidebarLocation":{"title":"Sidebar Location","description":"Where the primary sidebar is docked.","type":"string","default":"left","enum":["left","right"]},"editor.fontFamily":{"title":"Font Family","description":"Controls the font family of the editor.","type":"string","default":"'JetBrains Mono', ui-monospace, monospace"},"editor.fontSize":{"title":"Font Size","description":"Font size in pixels.","type":"number","default":13,"minimum":8,"maximum":32},"editor.lineHeight":{"title":"Line Height","description":"Line height in pixels. 0 uses 1.55 × font size.","type":"number","default":20,"minimum":0,"maximum":60},"editor.fontLigatures":{"title":"Font Ligatures","description":"Enables font ligatures when the font supports them.","type":"boolean","default":false},"editor.tabSize":{"title":"Tab Size","description":"The number of spaces a tab is equal to.","type":"number","default":2,"minimum":1,"maximum":8},"editor.insertSpaces":{"title":"Insert Spaces","description":"Insert spaces when pressing Tab.","type":"boolean","default":true},"editor.detectIndentation":{"title":"Detect Indentation","description":"Detect Tab Size and Insert Spaces from file contents on open.","type":"boolean","default":true},"editor.renderIndentGuides":{"title":"Indentation Guides","description":"Render vertical guides for each indent level.","type":"boolean","default":true},"editor.wordWrap":{"title":"Word Wrap","description":"Controls how lines should wrap.","type":"string","default":"off","enum":["off","on","bounded"]},"editor.renderWhitespace":{"title":"Render Whitespace","description":"Controls how the editor renders whitespace characters.","type":"string","default":"selection","enum":["none","boundary","selection","all"]},"editor.cursorBlinking":{"title":"Cursor Blinking","description":"Cursor animation style.","type":"string","default":"blink","enum":["blink","smooth","phase","solid"]},"editor.minimap":{"title":"Minimap","description":"Show a minimap of the document.","type":"boolean","default":false},"files.autoSave":{"title":"Auto Save","description":"Controls auto save of editors that have unsaved changes.","type":"string","default":"off","enum":["off","afterDelay","onFocusChange","onWindowChange"]},"files.autoSaveDelay":{"title":"Auto Save Delay","description":"Delay in milliseconds after which an editor is saved automatically. Applies when Auto Save is afterDelay.","type":"number","default":1000,"minimum":100,"maximum":60000},"files.trimTrailingWhitespace":{"title":"Trim Trailing Whitespace","description":"Remove trailing whitespace when saving.","type":"boolean","default":true},"editor.formatOnSave":{"title":"Format On Save","description":"Format a file on save. A formatter must be available.","type":"boolean","default":false},"editor.defaultFormatter":{"title":"Default Formatter","description":"Formatter used when several are available.","type":"string","default":"oxbit.prettier","anyOf":[{"enum":["oxbit.prettier","oxbit.builtin-ts"]},{"type":"string"}]},"terminal.fontSize":{"title":"Terminal Font Size","description":"Font size in pixels for the terminal.","type":"number","default":12,"minimum":8,"maximum":32},"terminal.scrollback":{"title":"Scrollback","description":"Maximum number of lines kept in the terminal buffer.","type":"number","default":5000,"minimum":100,"maximum":100000},"terminal.confirmOnKill":{"title":"Confirm On Kill","description":"Ask before killing a terminal with a running process.","type":"boolean","default":true},"scm.autoFetch":{"title":"Auto Fetch","description":"Periodically fetch from the default remote.","type":"boolean","default":true},"scm.diffLayout":{"title":"Diff Layout","description":"Default layout for diff editors.","type":"string","default":"side-by-side","enum":["side-by-side","inline"]},"files.associations":{"title":"File Associations","description":"Map filename or workspace-relative glob patterns to language IDs. Explicit associations take precedence over built-in detection.","type":"object","default":{},"propertyNames":{"minLength":1,"maxLength":1024},"additionalProperties":{"type":"string","pattern":"^[\\\\w+-]+$"}},"languageServers":{"title":"Language Servers","description":"Configure enabled state, selectors, rootMarkers, executable, args, env, initializationOptions, settings, and priority by server ID. Servers install on first use in a trusted runtime. License keys belong in the runtime-local credential file.","type":"object","default":{},"propertyNames":{"pattern":"^[a-zA-Z0-9._-]+$"},"additionalProperties":{"type":"object","properties":{"enabled":{"type":"boolean","description":"Enable this language server."},"selectors":{"type":"array","items":{"type":"object","properties":{"language":{"type":"string"},"pattern":{"type":"string"},"scheme":{"const":"file"}},"additionalProperties":false,"minProperties":1}},"rootMarkers":{"type":"array","items":{"type":"string","pattern":"^(?!/)(?!.*\\\\\\\\)(?!.*(?:^|/)\\\\.\\\\.(?:/|$))[^\\\\u0000]+$","minLength":1}},"executable":{"type":"string","pattern":"^[^\\\\u0000]*$","minLength":1},"args":{"type":"array","items":{"type":"string","pattern":"^[^\\\\u0000]*$"}},"env":{"type":"object","propertyNames":{"pattern":"^[A-Za-z_][A-Za-z0-9_]*$"},"additionalProperties":{"type":"string","pattern":"^[^\\\\u0000]*$"}},"initializationOptions":{"type":"object","additionalProperties":true,"description":"Server-specific initialization options. Store license credentials in the runtime credential file."},"settings":{"type":"object","additionalProperties":true,"description":"Server-specific configuration; nested objects merge across files."},"priority":{"type":"number"}},"additionalProperties":false}},"ui.fontFamily":{"title":"UI Font Family","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":""},"ui.fontSize":{"title":"UI Font Size","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":12,"minimum":8,"maximum":72},"ui.fontWeight":{"title":"UI Font Weight","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":400,"minimum":100,"maximum":900},"ui.fontStyle":{"title":"UI Font Style","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":"normal","enum":["normal","italic","oblique"]},"ui.lineHeight":{"title":"UI Line Height","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":1.4,"minimum":1,"maximum":3},"ui.letterSpacing":{"title":"UI Letter Spacing","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":0,"minimum":-3,"maximum":10},"ui.fontLigatures":{"title":"UI Font Ligatures","description":"Overrides theme typography. Reset restores the theme value.","type":"boolean","default":false},"terminal.fontFamily":{"title":"Terminal Font Family","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":""},"terminal.fontWeight":{"title":"Terminal Font Weight","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":400,"minimum":100,"maximum":900},"terminal.fontStyle":{"title":"Terminal Font Style","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":"normal","enum":["normal","italic","oblique"]},"terminal.lineHeight":{"title":"Terminal Line Height","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":1,"minimum":1,"maximum":3},"terminal.letterSpacing":{"title":"Terminal Letter Spacing","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":0,"minimum":-3,"maximum":10},"terminal.fontLigatures":{"title":"Terminal Font Ligatures","description":"Overrides theme typography. Reset restores the theme value.","type":"boolean","default":false},"workbench.iconTheme":{"title":"File Icon Theme","description":"Select a locally installed icon theme. Unavailable selections use Oxbit defaults until restored.","type":"string","default":"oxbit.default"},"workbench.productIconTheme":{"title":"Product Icon Theme","description":"Select a locally installed icon theme. Unavailable selections use Oxbit defaults until restored.","type":"string","default":"oxbit.default"},"editor.semanticHighlighting":{"title":"Semantic Highlighting","description":"Color symbols using language server information.","type":"boolean","default":true},"editor.inlayHints.types":{"title":"Type Inlay Hints","description":"Show supported type hints in the visible editor.","type":"boolean","default":true},"editor.inlayHints.parameters":{"title":"Parameter Inlay Hints","description":"Show supported parameter hints in the visible editor.","type":"boolean","default":true},"editor.largeFileIntelligence":{"title":"Large File Intelligence","description":"Allow full semantic highlighting and inlay hints for files larger than 1 MiB.","type":"boolean","default":false},"workbench.locale":{"title":"Display Language","type":"string","default":"en","enum":["en","de","es","ja","zh"]},"workbench.reducedMotion":{"title":"Reduced Motion","type":"boolean","default":false},"desktop.projects.openBehavior":{"title":"Open projects","type":"string","default":"currentWindow","enum":["currentWindow","newWindow"]},"desktop.tools.gitPath":{"title":"git executable path","type":"string","default":""},"desktop.tools.ghPath":{"title":"gh executable path","type":"string","default":""},"project.intelligence":{"type":"object","properties":{"enabled":{"type":"boolean","default":true,"description":"Index project dependencies, imports and related files."},"exclude":{"type":"array","items":{"type":"string","maxLength":1024},"default":[]},"maxFiles":{"type":"integer","minimum":1,"maximum":100000,"default":20000},"maxFileBytes":{"type":"integer","minimum":1,"maximum":5242880,"default":1048576}},"additionalProperties":false,"title":"Project Intelligence","description":"Partial overrides of project.json intelligence. Objects merge across files."},"project.schemas":{"type":"object","properties":{"catalog":{"type":"boolean","default":true,"description":"Discover file schemas through SchemaStore. Bundled Oxbit settings support remains available."},"download":{"type":"boolean","default":true,"description":"Allow remote schema downloads; cached and bundled schemas work offline."},"associations":{"type":"array","maxItems":1000,"default":[],"items":{"type":"object","properties":{"url":{"type":"string","minLength":1,"description":"Schema URL or workspace file URI."},"fileMatch":{"type":"array","items":{"type":"string","maxLength":1024}},"schema":{"type":["object","boolean"],"description":"An inline JSON Schema."}},"additionalProperties":false,"anyOf":[{"required":["url"]},{"required":["schema"]}]}}},"additionalProperties":false,"title":"JSON Schemas","description":"Partial overrides of project.json schemas. Association arrays replace lower arrays."}}`);
+const properties$2 = /* @__PURE__ */ JSON.parse(`{"$schema":{"type":"string","description":"JSON Schema URI. Ignored when merging effective preferences."},"agentACP.provider":{"title":"Default agent","type":"string","default":"codex","enum":["codex","cursor","amp"]},"agentACP.codex.command":{"title":"Codex ACP executable","type":"string","default":"npx"},"agentACP.codex.args":{"title":"Codex ACP arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"@agentclientprotocol/codex-acp@2.2.2\\"]"},"agentACP.cursor.command":{"title":"Cursor ACP executable","type":"string","default":"agent"},"agentACP.cursor.args":{"title":"Cursor ACP arguments (JSON array)","type":"string","default":"[\\"acp\\"]"},"agentACP.amp.command":{"title":"Amp Agent ACP executable","type":"string","default":"npx"},"agentACP.amp.args":{"title":"Amp Agent ACP arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"amp-acp@0.10.0\\"]"},"workbench.keymap":{"title":"Keymap","description":"Keyboard layout applied on top of the Oxbit defaults. User keybindings always win.","type":"string","default":"default","enum":["default","vscode","jetbrains","macos","sublime","atom","visual-studio","emacs"]},"runtime.keepAlive":{"title":"Keep Runtime Alive","description":"How long a runtime Oxbit started keeps running after the last client disconnects or its connection heartbeats stop. Terminals and tasks continue while it runs.","type":"string","default":"75s","enum":["75s","15m","1h","8h","untilStopped"]},"runtime.autoReconnect":{"title":"Reconnect Automatically","description":"Reconnect to the runtime after the connection drops, including when the iOS app returns to the foreground.","type":"boolean","default":true},"workbench.tooltipDelay":{"title":"Tooltip Delay","description":"Delay in milliseconds before showing a tooltip on hover. Keyboard focus shows tooltips immediately.","type":"number","default":400,"minimum":0,"maximum":5000},"workbench.colorTheme":{"title":"Color Theme","description":"Specifies the color theme used in the workbench.","type":"string","default":"Graphite (dark)"},"workbench.density":{"title":"Layout Density","description":"Controls row heights, padding and label sizes across the workbench.","type":"string","default":"compact","enum":["compact","comfortable"]},"workbench.sidebarLocation":{"title":"Sidebar Location","description":"Where the primary sidebar is docked.","type":"string","default":"left","enum":["left","right"]},"editor.fontFamily":{"title":"Font Family","description":"Controls the font family of the editor.","type":"string","default":"'JetBrains Mono', ui-monospace, monospace"},"editor.fontSize":{"title":"Font Size","description":"Font size in pixels.","type":"number","default":13,"minimum":8,"maximum":32},"editor.lineHeight":{"title":"Line Height","description":"Line height in pixels. 0 uses 1.55 × font size.","type":"number","default":20,"minimum":0,"maximum":60},"editor.fontLigatures":{"title":"Font Ligatures","description":"Enables font ligatures when the font supports them.","type":"boolean","default":false},"editor.tabSize":{"title":"Tab Size","description":"The number of spaces a tab is equal to.","type":"number","default":2,"minimum":1,"maximum":8},"editor.insertSpaces":{"title":"Insert Spaces","description":"Insert spaces when pressing Tab.","type":"boolean","default":true},"editor.detectIndentation":{"title":"Detect Indentation","description":"Detect Tab Size and Insert Spaces from file contents on open.","type":"boolean","default":true},"editor.renderIndentGuides":{"title":"Indentation Guides","description":"Render vertical guides for each indent level.","type":"boolean","default":true},"editor.wordWrap":{"title":"Word Wrap","description":"Controls how lines should wrap.","type":"string","default":"off","enum":["off","on","bounded"]},"editor.renderWhitespace":{"title":"Render Whitespace","description":"Controls how the editor renders whitespace characters.","type":"string","default":"selection","enum":["none","boundary","selection","all"]},"editor.cursorBlinking":{"title":"Cursor Blinking","description":"Cursor animation style.","type":"string","default":"blink","enum":["blink","smooth","phase","solid"]},"editor.minimap":{"title":"Minimap","description":"Show a minimap of the document.","type":"boolean","default":false},"files.autoSave":{"title":"Auto Save","description":"Controls auto save of editors that have unsaved changes.","type":"string","default":"off","enum":["off","afterDelay","onFocusChange","onWindowChange"]},"files.autoSaveDelay":{"title":"Auto Save Delay","description":"Delay in milliseconds after which an editor is saved automatically. Applies when Auto Save is afterDelay.","type":"number","default":1000,"minimum":100,"maximum":60000},"files.trimTrailingWhitespace":{"title":"Trim Trailing Whitespace","description":"Remove trailing whitespace when saving.","type":"boolean","default":true},"editor.formatOnSave":{"title":"Format On Save","description":"Format a file on save. A formatter must be available.","type":"boolean","default":false},"editor.defaultFormatter":{"title":"Default Formatter","description":"Formatter used when several are available.","type":"string","default":"oxbit.prettier","anyOf":[{"enum":["oxbit.prettier","oxbit.builtin-ts"]},{"type":"string"}]},"terminal.fontSize":{"title":"Terminal Font Size","description":"Font size in pixels for the terminal.","type":"number","default":12,"minimum":8,"maximum":32},"terminal.scrollback":{"title":"Scrollback","description":"Maximum number of lines kept in the terminal buffer.","type":"number","default":5000,"minimum":100,"maximum":100000},"terminal.confirmOnKill":{"title":"Confirm On Kill","description":"Ask before killing a terminal with a running process.","type":"boolean","default":true},"scm.autoFetch":{"title":"Auto Fetch","description":"Periodically fetch from the default remote.","type":"boolean","default":true},"scm.diffLayout":{"title":"Diff Layout","description":"Default layout for diff editors.","type":"string","default":"side-by-side","enum":["side-by-side","inline"]},"files.associations":{"title":"File Associations","description":"Map filename or workspace-relative glob patterns to language IDs. Explicit associations take precedence over built-in detection.","type":"object","default":{},"propertyNames":{"minLength":1,"maxLength":1024},"additionalProperties":{"type":"string","pattern":"^[\\\\w+-]+$"}},"languageServers":{"title":"Language Servers","description":"Configure enabled state, selectors, rootMarkers, executable, args, env, initializationOptions, settings, and priority by server ID. Servers install on first use in a trusted runtime. License keys belong in the runtime-local credential file.","type":"object","default":{},"propertyNames":{"pattern":"^[a-zA-Z0-9._-]+$"},"additionalProperties":{"type":"object","properties":{"enabled":{"type":"boolean","description":"Enable this language server."},"selectors":{"type":"array","items":{"type":"object","properties":{"language":{"type":"string"},"pattern":{"type":"string"},"scheme":{"const":"file"}},"additionalProperties":false,"minProperties":1}},"rootMarkers":{"type":"array","items":{"type":"string","pattern":"^(?!/)(?!.*\\\\\\\\)(?!.*(?:^|/)\\\\.\\\\.(?:/|$))[^\\\\u0000]+$","minLength":1}},"executable":{"type":"string","pattern":"^[^\\\\u0000]*$","minLength":1},"args":{"type":"array","items":{"type":"string","pattern":"^[^\\\\u0000]*$"}},"env":{"type":"object","propertyNames":{"pattern":"^[A-Za-z_][A-Za-z0-9_]*$"},"additionalProperties":{"type":"string","pattern":"^[^\\\\u0000]*$"}},"initializationOptions":{"type":"object","additionalProperties":true,"description":"Server-specific initialization options. Store license credentials in the runtime credential file."},"settings":{"type":"object","additionalProperties":true,"description":"Server-specific configuration; nested objects merge across files."},"priority":{"type":"number"}},"additionalProperties":false}},"ui.fontFamily":{"title":"UI Font Family","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":""},"ui.fontSize":{"title":"UI Font Size","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":12,"minimum":8,"maximum":72},"ui.fontWeight":{"title":"UI Font Weight","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":400,"minimum":100,"maximum":900},"ui.fontStyle":{"title":"UI Font Style","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":"normal","enum":["normal","italic","oblique"]},"ui.lineHeight":{"title":"UI Line Height","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":1.4,"minimum":1,"maximum":3},"ui.letterSpacing":{"title":"UI Letter Spacing","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":0,"minimum":-3,"maximum":10},"ui.fontLigatures":{"title":"UI Font Ligatures","description":"Overrides theme typography. Reset restores the theme value.","type":"boolean","default":false},"terminal.fontFamily":{"title":"Terminal Font Family","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":""},"terminal.fontWeight":{"title":"Terminal Font Weight","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":400,"minimum":100,"maximum":900},"terminal.fontStyle":{"title":"Terminal Font Style","description":"Overrides theme typography. Reset restores the theme value.","type":"string","default":"normal","enum":["normal","italic","oblique"]},"terminal.lineHeight":{"title":"Terminal Line Height","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":1,"minimum":1,"maximum":3},"terminal.letterSpacing":{"title":"Terminal Letter Spacing","description":"Overrides theme typography. Reset restores the theme value.","type":"number","default":0,"minimum":-3,"maximum":10},"terminal.fontLigatures":{"title":"Terminal Font Ligatures","description":"Overrides theme typography. Reset restores the theme value.","type":"boolean","default":false},"workbench.iconTheme":{"title":"File Icon Theme","description":"Select a locally installed icon theme. Unavailable selections use Oxbit defaults until restored.","type":"string","default":"oxbit.default"},"workbench.productIconTheme":{"title":"Product Icon Theme","description":"Select a locally installed icon theme. Unavailable selections use Oxbit defaults until restored.","type":"string","default":"oxbit.default"},"editor.semanticHighlighting":{"title":"Semantic Highlighting","description":"Color symbols using language server information.","type":"boolean","default":true},"editor.inlayHints.types":{"title":"Type Inlay Hints","description":"Show supported type hints in the visible editor.","type":"boolean","default":true},"editor.inlayHints.parameters":{"title":"Parameter Inlay Hints","description":"Show supported parameter hints in the visible editor.","type":"boolean","default":true},"editor.largeFileIntelligence":{"title":"Large File Intelligence","description":"Allow full semantic highlighting and inlay hints for files larger than 1 MiB.","type":"boolean","default":false},"workbench.locale":{"title":"Display Language","type":"string","default":"en","enum":["en","de","es","ja","zh"]},"workbench.reducedMotion":{"title":"Reduced Motion","type":"boolean","default":false},"desktop.projects.openBehavior":{"title":"Open projects","type":"string","default":"currentWindow","enum":["currentWindow","newWindow"]},"desktop.tools.gitPath":{"title":"git executable path","type":"string","default":""},"desktop.tools.ghPath":{"title":"gh executable path","type":"string","default":""},"project.intelligence":{"type":"object","properties":{"enabled":{"type":"boolean","default":true,"description":"Index project dependencies, imports and related files."},"exclude":{"type":"array","items":{"type":"string","maxLength":1024},"default":[]},"maxFiles":{"type":"integer","minimum":1,"maximum":100000,"default":20000},"maxFileBytes":{"type":"integer","minimum":1,"maximum":5242880,"default":1048576}},"additionalProperties":false,"title":"Project Intelligence","description":"Partial overrides of project.json intelligence. Objects merge across files."},"project.schemas":{"type":"object","properties":{"catalog":{"type":"boolean","default":true,"description":"Discover file schemas through SchemaStore. Bundled Oxbit settings support remains available."},"download":{"type":"boolean","default":true,"description":"Allow remote schema downloads; cached and bundled schemas work offline."},"associations":{"type":"array","maxItems":1000,"default":[],"items":{"type":"object","properties":{"url":{"type":"string","minLength":1,"description":"Schema URL or workspace file URI."},"fileMatch":{"type":"array","items":{"type":"string","maxLength":1024}},"schema":{"type":["object","boolean"],"description":"An inline JSON Schema."}},"additionalProperties":false,"anyOf":[{"required":["url"]},{"required":["schema"]}]}}},"additionalProperties":false,"title":"JSON Schemas","description":"Partial overrides of project.json schemas. Association arrays replace lower arrays."}}`);
 const propertyNames = { "anyOf": [{ "not": { "pattern": "^\\[.*\\]$" } }, { "pattern": "^\\[[^\\[\\]]+\\]$" }] };
 const patternProperties = { "^\\[[^\\[\\]]+\\]$": { "$ref": "#/definitions/languageOverrides" } };
 const additionalProperties$1 = true;
@@ -1000,7 +1110,7 @@ const ACP_PROVIDERS = [
     id: "codex",
     name: "Codex ACP",
     command: "npx",
-    args: ["-y", "@agentclientprotocol/codex-acp@1.10.0"],
+    args: ["-y", "@agentclientprotocol/codex-acp@2.2.2"],
     setup: "Uses the Codex ACP adapter. Sign in through an advertised authentication method, or use your existing Codex credentials.",
     url: "https://github.com/agentclientprotocol/codex-acp"
   },
@@ -1016,7 +1126,7 @@ const ACP_PROVIDERS = [
     id: "amp",
     name: "Amp Agent ACP",
     command: "npx",
-    args: ["-y", "amp-acp@0.9.0"],
+    args: ["-y", "amp-acp@0.10.0"],
     setup: "Uses the community Amp ACP adapter. Install Amp CLI and run amp login first. Set AMP_CLI_PATH in the runtime environment if needed.",
     url: "https://github.com/tao12345666333/amp-acp"
   }
@@ -1060,7 +1170,7 @@ const SDK_VERSION = "1.0.0";
 function invalid(message) {
   throw new RpcError("INVALID_TASK_CONFIG", message);
 }
-function object$1(value, label) {
+function object$2(value, label) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     invalid(`${label} must be an object`);
   return value;
@@ -1071,7 +1181,7 @@ function taskName(value) {
   return value;
 }
 function stringMap(value, label) {
-  const record = object$1(value, label);
+  const record = object$2(value, label);
   for (const [key, item] of Object.entries(record))
     if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key) || ["__proto__", "constructor", "prototype"].includes(key) || typeof item !== "string" || item.length > 32768 || item.includes("\0"))
       invalid(`${label}: invalid environment entry ${key}`);
@@ -1087,13 +1197,13 @@ function port(value) {
     number(value, 1, 65535, "port");
     return value;
   }
-  const range2 = object$1(value, "port range");
+  const range2 = object$2(value, "port range");
   number(range2.min, 1, 65535, "port minimum");
   number(range2.max, range2.min, 65535, "port maximum");
   return { min: range2.min, max: range2.max };
 }
 function hooks(value) {
-  const data = object$1(value ?? {}, "worktree");
+  const data = object$2(value ?? {}, "worktree");
   for (const key of Object.keys(data))
     if (!taskPhases.includes(key))
       invalid(`Unknown worktree phase: ${key}`);
@@ -1110,7 +1220,7 @@ function hooks(value) {
   );
 }
 function definition(value) {
-  const data = object$1(value, "task");
+  const data = object$2(value, "task");
   const known = /* @__PURE__ */ new Set([
     "command",
     "type",
@@ -1152,7 +1262,7 @@ function definition(value) {
   if (data.env !== void 0) stringMap(data.env, "task.env");
   if (data.port !== void 0) port(data.port);
   if (data.ports !== void 0) {
-    const entries = Object.entries(object$1(data.ports, "ports"));
+    const entries = Object.entries(object$2(data.ports, "ports"));
     if (entries.length > 16) invalid("Maximum 16 named ports per task");
     for (const [key, value2] of entries) {
       if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(key) || key.toLowerCase() === "port")
@@ -1163,7 +1273,7 @@ function definition(value) {
       invalid("Port names must be unique ignoring case");
   }
   if (data.ready !== void 0) {
-    const ready = object$1(data.ready, "ready");
+    const ready = object$2(data.ready, "ready");
     for (const key of Object.keys(ready))
       if (!["pattern", "url", "timeoutMs", "intervalMs"].includes(key))
         invalid(`Unknown readiness field: ${key}`);
@@ -1179,7 +1289,7 @@ function definition(value) {
       number(ready.intervalMs, 100, 6e4, "ready.intervalMs");
   }
   if (data.restart !== void 0) {
-    const restart = object$1(data.restart, "restart");
+    const restart = object$2(data.restart, "restart");
     for (const key of Object.keys(restart))
       if (!["policy", "maxAttempts", "delayMs"].includes(key))
         invalid(`Unknown restart field: ${key}`);
@@ -1191,7 +1301,7 @@ function definition(value) {
       number(restart.delayMs, 100, 6e4, "restart.delayMs");
   }
   if (data.stop !== void 0) {
-    const stop2 = object$1(data.stop, "stop");
+    const stop2 = object$2(data.stop, "stop");
     for (const key of Object.keys(stop2))
       if (!["signal", "timeoutMs"].includes(key))
         invalid(`Unknown stop field: ${key}`);
@@ -1208,7 +1318,7 @@ function json(text2) {
   const errors = [];
   const result = parse$1(text2, errors, { allowTrailingComma: true });
   if (errors.length) invalid(`Invalid JSON near offset ${errors[0].offset}`);
-  return object$1(result, "configuration");
+  return object$2(result, "configuration");
 }
 function editJson(text2, location, value) {
   const tree = value === void 0 ? parseTree(text2) : void 0;
@@ -1410,7 +1520,7 @@ function readSource(kind, text2) {
     );
   } else {
     const data = json(text2);
-    const meta = object$1(data.oxbit ?? {}, "oxbit metadata");
+    const meta = object$2(data.oxbit ?? {}, "oxbit metadata");
     result.env = stringMap(
       (kind === "oxbit" ? data.env : meta.env) ?? {},
       "env"
@@ -1430,7 +1540,7 @@ function readSource(kind, text2) {
         ].includes(key))
           invalid(`Unknown Oxbit configuration field: ${key}`);
       for (const [name, task] of Object.entries(
-        object$1(data.tasks ?? {}, "tasks")
+        object$2(data.tasks ?? {}, "tasks")
       ))
         add(name, definition(task));
     } else if (kind === "paseo") {
@@ -1442,9 +1552,9 @@ function readSource(kind, text2) {
         ...result.worktree
       };
       for (const [name, value] of Object.entries(
-        object$1(data.scripts ?? {}, "scripts")
+        object$2(data.scripts ?? {}, "scripts")
       )) {
-        const script = object$1(value, name);
+        const script = object$2(value, name);
         add(
           name,
           definition({
@@ -1496,10 +1606,10 @@ function readSource(kind, text2) {
         invalid("Only VS Code tasks version 2.0.0 is supported");
       if (!Array.isArray(data.tasks)) invalid("VS Code tasks must be an array");
       for (const raw of data.tasks) {
-        const entry = object$1(raw, "VS Code task"), platform = process.platform === "darwin" ? "osx" : process.platform === "win32" ? "windows" : "linux";
+        const entry = object$2(raw, "VS Code task"), platform = process.platform === "darwin" ? "osx" : process.platform === "win32" ? "windows" : "linux";
         const item = { ...entry, ...entry[platform] };
         const args = (item.args ?? []).map(
-          (arg) => typeof arg === "string" ? arg : object$1(arg, "argument").value
+          (arg) => typeof arg === "string" ? arg : object$2(arg, "argument").value
         );
         const opts = { ...data.options, ...item.options };
         let command = item.command ?? data.command ?? "", execution = item.type === "process" ? "process" : "shell";
@@ -1538,7 +1648,7 @@ function readSource(kind, text2) {
       }
     } else {
       for (const [name, script] of Object.entries(
-        object$1(data.scripts ?? {}, "scripts")
+        object$2(data.scripts ?? {}, "scripts")
       )) {
         if (typeof script !== "string" && !(kind === "composer" && Array.isArray(script)))
           continue;
@@ -6527,8 +6637,8 @@ class Collaboration {
       )
     );
   }
-  bytes(encoded) {
-    if (!/^[A-Za-z0-9+/]*={0,2}$/.test(encoded) || encoded.length > 2 * 1024 * 1024)
+  bytes(encoded, limit2 = MAX_MESSAGE_BYTES) {
+    if (!/^[A-Za-z0-9+/]*={0,2}$/.test(encoded) || encoded.length > limit2)
       throw new RpcError("INVALID_PARAMS", "Invalid collaboration update");
     return Buffer.from(encoded, "base64");
   }
@@ -6564,14 +6674,14 @@ class Collaboration {
   }
   async update(relative, connection, encoded) {
     const room = await this.member(relative, connection);
-    const bytes = this.bytes(encoded);
+    const bytes = this.bytes(encoded, MAX_COLLABORATION_UPDATE_BYTES);
     try {
-      if (room.doc.getText("content").length + bytes.length > 20 * 1024 * 1024) {
+      if (room.doc.getText("content").length + bytes.length > MAX_FILE_BYTES) {
         const candidate = new Y.Doc();
         try {
           Y.applyUpdate(candidate, Y.encodeStateAsUpdate(room.doc));
           Y.applyUpdate(candidate, bytes);
-          if (candidate.getText("content").length > 20 * 1024 * 1024) throw new RpcError("FILE_TOO_LARGE", "Shared documents are limited to 20 MiB");
+          if (candidate.getText("content").length > MAX_FILE_BYTES) throw new RpcError("FILE_TOO_LARGE", "Shared documents are limited to 20 MiB");
         } finally {
           candidate.destroy();
         }
@@ -6740,7 +6850,7 @@ class Collaboration {
   }
 }
 const terminal = (state2) => !["pending", "running", "unknown"].includes(state2);
-const object = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
+const object$1 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 const str = (value, max = 4096) => typeof value === "string" ? value.slice(0, max) : void 0;
 const identity = (value) => typeof value === "string" && value.length > 0 && value.length <= 512 && !value.includes("\0");
 const preview = (value, max = 8192) => value === void 0 ? void 0 : (typeof value === "string" ? value : JSON.stringify(value)).slice(0, max);
@@ -6770,11 +6880,11 @@ ${item.newText ?? ""}` : JSON.stringify(item))
   ).join("\n");
 }
 function normalizeDelegation(provider, update) {
-  const raw = object(update.rawInput), meta = object(update._meta?.codex);
+  const raw = object$1(update.rawInput), meta = object$1(update._meta?.codex);
   const toolId = update.toolCallId;
   if (!identity(toolId)) return [];
   if (provider === "codex") {
-    const collab = object(meta.collaboration), sub = object(meta.subagent);
+    const collab = object$1(meta.collaboration), sub = object$1(meta.subagent);
     if (identity(sub.threadId))
       return [
         {
@@ -6788,7 +6898,7 @@ function normalizeDelegation(provider, update) {
       ];
     if (!identity(collab.tool)) return [];
     const receivers = Array.isArray(collab.receiverThreadIds) ? collab.receiverThreadIds.filter(identity) : [];
-    const states = object(raw.agentsStates);
+    const states = object$1(raw.agentsStates);
     const ids = [
       .../* @__PURE__ */ new Set([...receivers, ...Object.keys(states).filter(identity)])
     ];
@@ -6816,8 +6926,8 @@ function normalizeDelegation(provider, update) {
     }));
   }
   if (provider === "cursor" && update.taskMeta) {
-    const task = object(update.taskMeta), output = object(update.rawOutput);
-    const outcome = object(task.outcome ?? output.outcome);
+    const task = object$1(update.taskMeta), output = object$1(update.rawOutput);
+    const outcome = object$1(task.outcome ?? output.outcome);
     const outcomeName = typeof (task.outcome ?? output.outcome) === "string" ? task.outcome ?? output.outcome : outcome.outcome;
     return [
       {
@@ -7237,7 +7347,273 @@ class SubagentRegistry {
     }
   }
 }
+let cached;
+function runtimeVersion() {
+  if (cached) return cached;
+  return cached = "0.7.0";
+}
+const MAX_REQUEST_BYTES = 1024 * 1024;
+const MAX_CONCURRENT_REQUESTS = 16;
+const PROTOCOL_VERSIONS = ["2025-11-25", "2025-06-18", "2025-03-26"];
+const SERVER_NAME = "oxbit_workspace";
+const NATIVE_AGENT_TOOLS = [
+  {
+    name: "oxbit_get_workspace",
+    description: "Get the workspace, active editor, and current selection when an editor is connected.",
+    inputSchema: { type: "object", properties: {} }
+  },
+  {
+    name: "oxbit_list_files",
+    description: "List files in a workspace directory. Paths are workspace relative or absolute within the workspace.",
+    inputSchema: { type: "object", properties: { path: { type: "string", description: "Directory path; defaults to the workspace root." } } }
+  },
+  {
+    name: "oxbit_read_file",
+    description: "Read a bounded range of a workspace file, including live unsaved editor content. Paths are workspace relative or absolute within the workspace.",
+    inputSchema: { type: "object", properties: { path: { type: "string" }, line: { type: "integer", minimum: 1 }, limit: { type: "integer", minimum: 1 } }, required: ["path"] }
+  },
+  {
+    name: "oxbit_get_diagnostics",
+    description: "Get live editor diagnostics for a workspace file or the workspace. Requires a connected editor; headless runtimes have no diagnostics.",
+    inputSchema: { type: "object", properties: { path: { type: "string", description: "Optional workspace file path." } } }
+  },
+  {
+    name: "oxbit_open_file",
+    description: "Open a workspace file in the editor at an optional line.",
+    inputSchema: { type: "object", properties: { path: { type: "string" }, line: { type: "integer", minimum: 1 } }, required: ["path"] }
+  },
+  {
+    name: "oxbit_propose_edit",
+    description: "Propose replacement content for a workspace file. The tool waits for engineer review and returns the decision.",
+    inputSchema: { type: "object", properties: { path: { type: "string" }, content: { type: "string" } }, required: ["path", "content"] }
+  },
+  {
+    name: "oxbit_update_plan",
+    description: "Publish the current task plan with at most 50 entries.",
+    inputSchema: { type: "object", properties: { entries: { type: "array", maxItems: 50, items: { type: "object", properties: { content: { type: "string" }, status: { type: "string", enum: ["pending", "in_progress", "completed"] }, priority: { type: "string" } }, required: ["content", "status"] } } }, required: ["entries"] }
+  }
+];
+const STDIO_PROXY = String.raw`
+const readline = require('node:readline');
+const input = readline.createInterface({ input: process.stdin, crlfDelay: Infinity });
+const pending = new Set();
+let closing = false;
+const maxBytes = 1024 * 1024;
+const send = (message) => {
+  if (!closing) process.stdout.write(JSON.stringify(message) + '\n');
+};
+const fail = (id, message) => send({ jsonrpc: '2.0', id: id ?? null, error: { code: -32603, message } });
+input.on('line', (line) => {
+  if (Buffer.byteLength(line) > maxBytes) return fail(null, 'MCP input line is too large');
+  let message;
+  try { message = JSON.parse(line); }
+  catch { return send({ jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Invalid JSON' } }); }
+  const hasId = message !== null && typeof message === 'object' && Object.prototype.hasOwnProperty.call(message, 'id');
+  if (pending.size >= 16) {
+    if (hasId) fail(message.id, 'MCP proxy is busy');
+    return;
+  }
+  const controller = new AbortController();
+  pending.add(controller);
+  void (async () => {
+    try {
+      const response = await fetch(process.env.OXBIT_MCP_URL, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json', accept: 'application/json, text/event-stream', authorization: 'Bearer ' + process.env.OXBIT_MCP_TOKEN },
+        body: line,
+        signal: controller.signal,
+      });
+      if (!hasId) { await response.body?.cancel(); return; }
+      const length = Number(response.headers.get('content-length'));
+      if (length > maxBytes) throw new Error('MCP response is too large');
+      const reader = response.body?.getReader();
+      if (!reader) throw new Error(response.ok ? 'MCP proxy returned an empty response' : 'MCP proxy HTTP ' + response.status);
+      const chunks = [];
+      let size = 0;
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        size += value.byteLength;
+        if (size > maxBytes) { await reader.cancel(); throw new Error('MCP response is too large'); }
+        chunks.push(value);
+      }
+      let result;
+      try { result = JSON.parse(Buffer.concat(chunks, size).toString('utf8')); }
+      catch { throw new Error(response.ok ? 'MCP proxy returned invalid JSON' : 'MCP proxy HTTP ' + response.status); }
+      if (result?.jsonrpc !== '2.0' || result.id !== message.id || (!result.result && !result.error)) throw new Error(response.ok ? 'MCP proxy returned an invalid response' : 'MCP proxy HTTP ' + response.status);
+      if (!response.ok && !result.error) throw new Error('MCP proxy HTTP ' + response.status);
+      send(result);
+    } catch (error) {
+      if (hasId && !closing) fail(message.id, error instanceof Error ? error.message : String(error));
+    } finally {
+      pending.delete(controller);
+    }
+  })();
+});
+input.on('close', () => {
+  closing = true;
+  for (const controller of pending) controller.abort();
+});`;
+function object(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function validateArguments(name, args) {
+  if (!NATIVE_AGENT_TOOLS.some((tool) => tool.name === name)) return "Unknown tool";
+  const keys = Object.keys(args);
+  const allowed = {
+    oxbit_get_workspace: [],
+    oxbit_list_files: ["path"],
+    oxbit_read_file: ["path", "line", "limit"],
+    oxbit_get_diagnostics: ["path"],
+    oxbit_open_file: ["path", "line"],
+    oxbit_propose_edit: ["path", "content"],
+    oxbit_update_plan: ["entries"]
+  };
+  if (keys.some((key) => !allowed[name].includes(key))) return "Unknown tool argument";
+  if (["oxbit_read_file", "oxbit_open_file", "oxbit_propose_edit"].includes(name) && (typeof args.path !== "string" || !args.path)) return "path must be a nonempty string";
+  if (["oxbit_list_files", "oxbit_get_diagnostics"].includes(name) && args.path !== void 0 && typeof args.path !== "string") return "path must be a string";
+  if (args.line !== void 0 && (!Number.isSafeInteger(args.line) || args.line < 1)) return "line must be a positive integer";
+  if (args.limit !== void 0 && (!Number.isSafeInteger(args.limit) || args.limit < 1)) return "limit must be a positive integer";
+  if (name === "oxbit_propose_edit" && typeof args.content !== "string") return "content must be a string";
+  if (name === "oxbit_update_plan" && (!Array.isArray(args.entries) || args.entries.length > 50 || args.entries.some((entry) => !object(entry) || typeof entry.content !== "string" || !["pending", "in_progress", "completed"].includes(String(entry.status)) || entry.priority !== void 0 && typeof entry.priority !== "string"))) return "entries must contain plan content and status";
+  return void 0;
+}
+function reply(response, status2, body) {
+  response.statusCode = status2;
+  if (body === void 0) {
+    response.end();
+    return;
+  }
+  response.setHeader("content-type", "application/json; charset=utf-8");
+  response.end(JSON.stringify(body));
+}
+function rpcError(id, code, message) {
+  return { jsonrpc: "2.0", id: id ?? null, error: { code, message } };
+}
+class AgentMCP {
+  constructor(handler) {
+    this.handler = handler;
+  }
+  handler;
+  listener;
+  starting;
+  url;
+  tokens = /* @__PURE__ */ new Map();
+  activeRequests = 0;
+  async server(connectionId, httpSupported) {
+    if (!this.listener && !this.starting) this.starting = this.startListener();
+    if (this.starting) await this.starting;
+    let token = this.tokens.get(connectionId);
+    if (!token) {
+      token = randomBytes(32).toString("hex");
+      this.tokens.set(connectionId, token);
+    }
+    if (httpSupported) return { name: SERVER_NAME, type: "http", url: this.url, headers: [{ name: "Authorization", value: `Bearer ${token}` }] };
+    return { name: SERVER_NAME, command: process.execPath, args: ["-e", STDIO_PROXY], env: [
+      { name: "OXBIT_MCP_URL", value: this.url },
+      { name: "OXBIT_MCP_TOKEN", value: token },
+      ...process.versions.electron ? [{ name: "ELECTRON_RUN_AS_NODE", value: "1" }] : []
+    ] };
+  }
+  async startListener() {
+    const listener = createServer((request, response) => {
+      void this.handle(request, response);
+    });
+    try {
+      await new Promise((resolve, reject) => {
+        listener.once("error", reject);
+        listener.listen(0, "127.0.0.1", () => {
+          listener.off("error", reject);
+          resolve();
+        });
+      });
+      const address = listener.address();
+      if (!address || typeof address === "string") throw new Error("MCP listener has no TCP address");
+      this.listener = listener;
+      this.url = "http://127.0.0.1:" + address.port + "/mcp";
+    } catch (error) {
+      listener.close();
+      throw error;
+    } finally {
+      this.starting = void 0;
+    }
+  }
+  revoke(connectionId) {
+    this.tokens.delete(connectionId);
+  }
+  async close() {
+    this.tokens.clear();
+    if (this.starting) await this.starting.catch(() => {
+    });
+    const listener = this.listener;
+    this.listener = void 0;
+    this.url = void 0;
+    if (listener) await new Promise((resolve) => listener.close(() => resolve()));
+  }
+  async handle(request, response) {
+    const address = this.listener?.address();
+    if (!address || typeof address === "string") return reply(response, 503);
+    const origin = `http://127.0.0.1:${address.port}`;
+    if (request.headers.host !== `127.0.0.1:${address.port}` || request.headers.origin && request.headers.origin !== origin) return reply(response, 403);
+    if (request.url !== "/mcp") return reply(response, 404);
+    if (request.method !== "POST") return reply(response, 405);
+    const authorization = request.headers.authorization;
+    const token = authorization?.startsWith("Bearer ") ? authorization.slice(7) : void 0;
+    const connectionId = token && [...this.tokens].find(([, candidate]) => candidate === token)?.[0];
+    if (!connectionId) return reply(response, 401);
+    if (this.activeRequests >= MAX_CONCURRENT_REQUESTS) return reply(response, 429);
+    const contentLength = Number(request.headers["content-length"]);
+    if (contentLength > MAX_REQUEST_BYTES) return reply(response, 413);
+    this.activeRequests++;
+    try {
+      let length = 0;
+      const chunks = [];
+      for await (const chunk of request) {
+        length += chunk.length;
+        if (length > MAX_REQUEST_BYTES) return reply(response, 413);
+        chunks.push(chunk);
+      }
+      let message;
+      try {
+        message = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+      } catch {
+        return reply(response, 400, rpcError(null, -32700, "Invalid JSON"));
+      }
+      if (!object(message) || message.jsonrpc !== "2.0" || typeof message.method !== "string" || message.id !== void 0 && typeof message.id !== "string" && typeof message.id !== "number") return reply(response, 400, rpcError(object(message) ? message.id : null, -32600, "Invalid request"));
+      const version = request.headers["mcp-protocol-version"];
+      if (version && !PROTOCOL_VERSIONS.includes(version)) return reply(response, 400, rpcError(message.id, -32600, "Unsupported MCP protocol version"));
+      if (message.id === void 0) return reply(response, 202);
+      const id = message.id;
+      if (message.method === "initialize") {
+        const requested = object(message.params) && typeof message.params.protocolVersion === "string" ? message.params.protocolVersion : void 0;
+        return reply(response, 200, { jsonrpc: "2.0", id, result: { protocolVersion: requested && PROTOCOL_VERSIONS.includes(requested) ? requested : PROTOCOL_VERSIONS[0], capabilities: { tools: { listChanged: false } }, serverInfo: { name: "oxbit-workspace", version: runtimeVersion() } } });
+      }
+      if (message.method === "ping") return reply(response, 200, { jsonrpc: "2.0", id, result: {} });
+      if (message.method === "tools/list") return reply(response, 200, { jsonrpc: "2.0", id, result: { tools: NATIVE_AGENT_TOOLS } });
+      if (message.method !== "tools/call") return reply(response, 200, rpcError(id, -32601, "Method not found"));
+      const params = message.params;
+      if (!object(params) || typeof params.name !== "string" || !object(params.arguments ?? {})) return reply(response, 200, rpcError(id, -32602, "Invalid tool call"));
+      const args = params.arguments ?? {};
+      const invalid2 = validateArguments(params.name, args);
+      if (invalid2) return reply(response, 200, { jsonrpc: "2.0", id, result: { isError: true, content: [{ type: "text", text: invalid2 }] } });
+      try {
+        const value = await this.handler(connectionId, params.name, args);
+        if (this.tokens.get(connectionId) !== token) return reply(response, 401);
+        const structuredContent = object(value) ? value : { value: value ?? null };
+        return reply(response, 200, { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: JSON.stringify(value ?? null) }], structuredContent } });
+      } catch (error) {
+        if (this.tokens.get(connectionId) !== token) return reply(response, 401);
+        return reply(response, 200, { jsonrpc: "2.0", id, result: { isError: true, content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }] } });
+      }
+    } catch (error) {
+      if (!response.writableEnded) reply(response, 400, rpcError(null, -32600, error instanceof Error ? error.message : String(error)));
+    } finally {
+      this.activeRequests--;
+    }
+  }
+}
 const MAX_BYTES = 1024 * 1024;
+const EDITOR_UNSUPPORTED = "The connected editor does not support this tool; update Oxbit";
 function strings(value) {
   if (!Array.isArray(value) || value.length > 128 || value.some(
     (v) => typeof v !== "string" || v.length > 16384 || v.includes("\0")
@@ -7249,13 +7625,17 @@ function strings(value) {
   return value;
 }
 class AgentACP {
-  constructor(files, emit) {
+  constructor(files, emit, stateChanged = () => {
+  }) {
     this.files = files;
     this.emit = emit;
+    this.stateChanged = stateChanged;
   }
   files;
   emit;
+  stateChanged;
   agents = /* @__PURE__ */ new Map();
+  mcp = new AgentMCP((id, name, args) => this.tool(id, name, args));
   get(owner, id) {
     const agent = this.agents.get(id);
     if (!agent || agent.owner !== owner || agent.stopped)
@@ -7290,15 +7670,89 @@ class AgentACP {
     });
   }
   publish(agent, event, params) {
-    this.emit(agent.owner, event, { id: agent.connection.id, ...params });
+    const payload = { id: agent.connection.id, ...params, seq: ++agent.eventSequence };
+    if (["acp.update", "acp.subagent", "acp.terminal", "acp.turnStarted", "acp.turnEnded"].includes(event)) {
+      const entry = JSON.parse(JSON.stringify({ name: event, params: payload }));
+      agent.events.push(entry);
+      agent.eventBytes += Buffer.byteLength(JSON.stringify(entry));
+      while (agent.events.length > 2e3 || agent.eventBytes > 2 * MAX_BYTES) {
+        agent.eventBytes -= Buffer.byteLength(JSON.stringify(agent.events.shift()));
+        agent.truncated = true;
+      }
+    }
+    if (agent.client) this.emit(agent.client, event, payload);
+    this.stateChanged();
+  }
+  list(owner) {
+    return { sessions: [...this.agents.values()].filter((a) => a.owner === owner && !a.stopped).map((a) => ({
+      connection: a.connection,
+      busy: a.busy,
+      title: a.title,
+      pendingRequests: a.approvals.size,
+      queued: a.queue.length
+    })) };
+  }
+  control(owner, id, client) {
+    if (this.get(owner, id).client !== client)
+      throw new RpcError("BUSY", "Attach this agent session before controlling it");
+  }
+  attach(owner, id, client = owner, editorTools = false) {
+    const agent = this.get(owner, id);
+    if (agent.client && agent.client !== client)
+      this.emit(agent.client, "acp.attachedElsewhere", { id, reason: "This session was attached in another Oxbit window" });
+    this.detach(client, id);
+    agent.client = client;
+    agent.editorTools = editorTools;
+    if (!editorTools) this.rejectEditorRequests(agent, EDITOR_UNSUPPORTED);
+    return {
+      connection: agent.connection,
+      busy: agent.busy,
+      events: [...agent.events],
+      requests: [...agent.approvals].map(([requestId, request]) => this.requestEvent(agent, requestId, request)),
+      queue: [...agent.queue],
+      queuePaused: agent.queuePaused,
+      sequence: agent.eventSequence,
+      truncated: agent.truncated
+    };
   }
-  async start(owner, launch, signal) {
+  detach(client, exceptId) {
+    for (const agent of this.agents.values()) {
+      if (agent.client !== client || agent.connection.id === exceptId) continue;
+      agent.client = void 0;
+      for (const [id, request] of agent.approvals) {
+        if (request.method === "fs/read_text_file") {
+          agent.approvals.delete(id);
+          void this.readFile(request.params).then(request.resolve, request.reject);
+        }
+      }
+      this.rejectEditorRequests(agent, "The editor disconnected; attach an Oxbit window to use this tool");
+    }
+  }
+  rejectEditorRequests(agent, reason) {
+    for (const [id, request] of agent.approvals) {
+      if (!request.method.startsWith("oxbit/")) continue;
+      agent.approvals.delete(id);
+      request.reject(new Error(reason));
+    }
+  }
+  working(agent) {
+    return agent.busy || agent.queueRunning || !!agent.approvals.size || !!agent.subagents?.activeCount || !!agent.queue.length;
+  }
+  get hasWork() {
+    return [...this.agents.values()].some((a) => this.working(a));
+  }
+  async start(owner, launch, signal, client = owner) {
     const preset2 = ACP_PROVIDERS.find((p) => p.id === launch.provider);
     if (!preset2)
       throw new RpcError("INVALID_PARAMS", "Choose Codex, Cursor, or Amp");
     if (signal?.aborted) throw new Error("Agent connection cancelled");
-    if ([...this.agents.values()].filter((a) => a.owner === owner).length >= 3)
-      throw new RpcError("BUSY", "Disconnect an agent before starting another");
+    const owned = [...this.agents.values()].filter((a) => a.owner === owner);
+    if (owned.length >= 3) {
+      const idle = owned.find((a) => !a.client && !this.working(a));
+      if (!idle)
+        throw new RpcError("BUSY", "3 agents are running for this device; stop one in Runtime sessions");
+      this.stopAgent(idle, "Stopped to start another agent");
+    }
     const command = requireString(
       { command: launch.command ?? preset2.command },
       "command"
@@ -7316,6 +7770,8 @@ class AgentACP {
     trackChild(child);
     const agent = {
       owner,
+      client,
+      editorTools: launch.clientCapabilities?.editorTools === true,
       child,
       connection: {
         id: randomUUID(),
@@ -7330,7 +7786,15 @@ class AgentACP {
       busy: false,
       stopped: false,
       sequence: 0,
-      turn: 0
+      turn: 0,
+      events: [],
+      eventBytes: 0,
+      eventSequence: 0,
+      truncated: false,
+      title: "New conversation",
+      queue: [],
+      queuePaused: false,
+      queueRunning: false
     };
     this.agents.set(agent.connection.id, agent);
     const abort = () => this.stopAgent(agent, "Agent connection cancelled");
@@ -7390,7 +7854,7 @@ class AgentACP {
           terminal: true,
           ...preset2.id === "codex" ? { subagents: {} } : {}
         },
-        clientInfo: { name: "oxbit", title: "Oxbit", version: "0.1.0" }
+        clientInfo: { name: "oxbit", title: "Oxbit", version: runtimeVersion() }
       });
       if (initialized.protocolVersion !== 1)
         throw new Error("Agent does not support ACP version 1");
@@ -7460,12 +7924,23 @@ class AgentACP {
       const previous = { ...agent.connection };
       const previousRegistry = agent.subagents;
       const previousTerminals = agent.terminals;
+      const previousEvents = agent.events;
+      const previousBytes = agent.eventBytes;
+      const previousTitle = agent.title;
+      const previousTruncated = agent.truncated;
       const target = method === "session/new" ? void 0 : requireString(params, "sessionId");
       if (agent.approvals.size)
         throw new Error(
           "Resolve pending requests before changing conversations"
         );
+      if (agent.queue.length)
+        throw new Error("Remove queued messages before changing conversations");
       agent.busy = true;
+      agent.events = [];
+      agent.eventBytes = 0;
+      agent.truncated = false;
+      agent.title = "New conversation";
+      agent.queuePaused = false;
       agent.connection.sessionId = target;
       agent.subagents = target ? this.registry(agent, target, true) : void 0;
       agent.terminals = /* @__PURE__ */ new Map();
@@ -7473,7 +7948,7 @@ class AgentACP {
       try {
         const result = await this.request(agent, method, {
           cwd: this.files.root,
-          mcpServers: [],
+          mcpServers: [await this.mcp.server(agent.connection.id, !!agent.connection.capabilities?.mcpCapabilities?.http)],
           ...target ? { sessionId: target } : {}
         });
         const sessionId2 = target ?? result?.sessionId;
@@ -7498,6 +7973,10 @@ class AgentACP {
           killProcess(terminal2.child);
         agent.terminals = previousTerminals;
         agent.subagents = previousRegistry;
+        agent.events = previousEvents;
+        agent.eventBytes = previousBytes;
+        agent.title = previousTitle;
+        agent.truncated = previousTruncated;
         throw error;
       } finally {
         agent.newSessionUpdates = void 0;
@@ -7568,35 +8047,119 @@ ${content}`
       throw new Error("The message and attachments are too large");
     if (agent.busy || agent.stopped || agent.connection.sessionId !== sessionId)
       throw new Error("Agent connection is busy or ended");
+    const messageId = params.messageId === void 0 ? randomUUID() : requireString(params, "messageId", 256);
     agent.busy = true;
     agent.turn++;
+    if (agent.title === "New conversation") agent.title = text2.slice(0, 100);
+    this.publish(agent, "acp.turnStarted", { messageId, text: text2, context: params.context ?? [] });
     const abort = () => this.stopAgent(agent, "Agent request interrupted");
     signal?.addEventListener("abort", abort, { once: true });
+    let stopReason;
+    let failure2;
     try {
-      return await this.request(
+      const result = await this.request(
         agent,
         method,
         { sessionId, prompt },
         30 * 60 * 1e3
       );
+      stopReason = result?.stopReason;
+      if (stopReason !== "end_turn" && stopReason !== "cancelled") agent.queuePaused = true;
+      return result;
+    } catch (error) {
+      failure2 = error instanceof Error ? error.message : String(error);
+      agent.queuePaused = true;
+      throw error;
     } finally {
       this.expireRequests(agent, sessionId);
       agent.busy = false;
       signal?.removeEventListener("abort", abort);
+      if (!agent.stopped) {
+        this.publish(agent, "acp.turnEnded", { stopReason, error: failure2 });
+        this.publishQueue(agent);
+        queueMicrotask(() => this.runQueue(agent));
+      }
     }
   }
-  cancel(owner, id) {
+  publishQueue(agent) {
+    this.publish(agent, "acp.queue", { queue: agent.queue, paused: agent.queuePaused });
+    return { queue: [...agent.queue], paused: agent.queuePaused };
+  }
+  async enqueue(owner, id, params, interrupt = false) {
+    const agent = this.get(owner, id);
+    if (!agent.connection.sessionId) throw new Error("Start a conversation first");
+    const text2 = requireString(params, "text", MAX_BYTES).trim();
+    if (!text2) throw new Error("Enter a message");
+    const messageId = params.messageId === void 0 ? randomUUID() : requireString(params, "messageId", 256);
+    if (params.context !== void 0) {
+      if (!Array.isArray(params.context) || params.context.length > 8)
+        throw new Error("Attach up to eight context items");
+      for (const item of params.context) {
+        requireString(item, "text", 2e5);
+        await this.files.resolve(requireString(item, "path"));
+      }
+    }
+    if (agent.stopped) throw new Error("Agent connection has ended");
+    if (agent.queue.some((p) => p.id === messageId)) return this.publishQueue(agent);
+    const prompt = { id: messageId, text: text2, ...params.context ? { context: structuredClone(params.context) } : {} };
+    if (agent.queue.length >= 16 || Buffer.byteLength(JSON.stringify([...agent.queue, prompt])) > MAX_BYTES)
+      throw new Error("Queued messages exceed the limit; remove a message first");
+    if (interrupt) {
+      agent.queue.unshift(prompt);
+      agent.queuePaused = false;
+      if (agent.busy) this.cancel(owner, id, true);
+    } else agent.queue.push(prompt);
+    const result = this.publishQueue(agent);
+    queueMicrotask(() => this.runQueue(agent));
+    return result;
+  }
+  dequeue(owner, id, promptId) {
+    const agent = this.get(owner, id);
+    const index = agent.queue.findIndex((p) => p.id === promptId);
+    if (index < 0) throw new Error("The queued message has already started or was removed");
+    const [prompt] = agent.queue.splice(index, 1);
+    this.publishQueue(agent);
+    return { prompt };
+  }
+  resumeQueue(owner, id) {
     const agent = this.get(owner, id);
+    agent.queuePaused = false;
+    this.publishQueue(agent);
+    queueMicrotask(() => this.runQueue(agent));
+    return {};
+  }
+  runQueue(agent) {
+    if (agent.busy || agent.queueRunning || agent.stopped || agent.queuePaused || !agent.queue.length) return;
+    agent.queueRunning = true;
+    const prompt = agent.queue.shift();
+    this.publishQueue(agent);
+    void this.call(agent.owner, agent.connection.id, "session/prompt", {
+      text: prompt.text,
+      context: prompt.context,
+      messageId: prompt.id
+    }).catch(() => {
+      if (agent.stopped) return;
+      agent.queuePaused = true;
+      agent.queue.unshift(prompt);
+      this.publishQueue(agent);
+    }).finally(() => {
+      agent.queueRunning = false;
+      this.runQueue(agent);
+    });
+  }
+  cancel(owner, id, continueQueue = false) {
+    const agent = this.get(owner, id);
+    agent.queuePaused = !continueQueue;
+    this.publishQueue(agent);
     this.send(agent, {
       method: "session/cancel",
       params: { sessionId: agent.connection.sessionId }
     });
     for (const [requestId, request] of agent.approvals) {
       if (request.params.sessionId !== agent.connection.sessionId) continue;
-      this.send(agent, {
-        id: request.rpcId,
-        ...request.method === "session/request_permission" ? { result: { outcome: { outcome: "cancelled" } } } : { error: { code: -32800, message: "Cancelled" } }
-      });
+      if (request.method === "session/request_permission")
+        request.resolve({ outcome: { outcome: "cancelled" } });
+      else request.reject(new Error("Cancelled"));
       agent.approvals.delete(requestId);
       agent.subagents?.waiting(
         request.params.sessionId,
@@ -7634,6 +8197,8 @@ ${content}`
   routeUpdate(agent, sessionId, update) {
     if (!update || typeof update !== "object" || !agent.subagents?.observe(sessionId, update))
       return;
+    if (sessionId === agent.connection.sessionId && update.sessionUpdate === "session_info_update" && typeof update.title === "string")
+      agent.title = update.title.slice(0, 200);
     this.publish(agent, "acp.update", {
       rootSessionId: agent.subagents.root,
       sessionId,
@@ -7650,11 +8215,9 @@ ${content}`
     const requestIds = [];
     for (const [id, request] of agent.approvals) {
       if (request.params.sessionId !== sessionId) continue;
-      if (!agent.stopped)
-        this.send(agent, {
-          id: request.rpcId,
-          ...request.method === "session/request_permission" ? { result: { outcome: { outcome: "cancelled" } } } : { error: { code: -32800, message: "Session turn ended" } }
-        });
+      if (request.method === "session/request_permission")
+        request.resolve({ outcome: { outcome: "cancelled" } });
+      else request.reject(new Error("Session turn ended"));
       agent.approvals.delete(id);
       requestIds.push(id);
       agent.subagents?.waiting(
@@ -7677,6 +8240,136 @@ ${content}`
     await this.files.resolve(relative, missing2);
     return relative;
   }
+  requestEvent(agent, requestId, request) {
+    const sessionId = request.params.sessionId;
+    return {
+      id: agent.connection.id,
+      requestId,
+      sessionId,
+      rootSessionId: agent.subagents.root,
+      subagentId: agent.subagents.idForSession(sessionId) ?? agent.subagents.idForTool(sessionId, request.params.toolCallId ?? request.params.toolCall?.toolCallId),
+      method: request.method,
+      params: request.params
+    };
+  }
+  async readFile(params) {
+    const file = await this.files.read(params.path);
+    const start = (params.line ?? 1) - 1;
+    const content = params.line !== void 0 || params.limit !== void 0 ? file.text.split("\n").slice(start, params.limit ? start + params.limit : void 0).join("\n") : file.text;
+    if (Buffer.byteLength(content) > MAX_BYTES)
+      throw new Error("File content exceeds 1 MiB; request a smaller line range");
+    return { content };
+  }
+  async clientRequest(agent, method, params) {
+    const registry = agent.subagents;
+    const sessionId = params.sessionId;
+    if (!registry?.acceptsRequest(sessionId)) throw new Error("Unknown ACP session");
+    if (agent.approvals.size >= 32) throw new Error("Too many pending agent requests");
+    if (method.startsWith("fs/")) {
+      params.path = await this.relative(params.path, method === "fs/write_text_file");
+      for (const field of ["line", "limit"])
+        if (params[field] !== void 0 && (!Number.isSafeInteger(params[field]) || params[field] < 1))
+          throw new Error(`Invalid ${field}`);
+      if (method === "fs/write_text_file") requireString(params, "content", MAX_BYTES);
+    }
+    if (agent.stopped || registry !== agent.subagents || !registry.acceptsRequest(sessionId))
+      throw new Error("ACP session ended");
+    if (!agent.client && method === "fs/read_text_file") return this.readFile(params);
+    return new Promise((resolve, reject) => {
+      const requestId = randomUUID();
+      const request = { method, params, resolve, reject };
+      agent.approvals.set(requestId, request);
+      if (method !== "fs/read_text_file" && !method.startsWith("oxbit/"))
+        registry.waiting(sessionId, requestId, true, params.toolCallId ?? params.toolCall?.toolCallId);
+      this.publish(agent, "acp.request", this.requestEvent(agent, requestId, request));
+    });
+  }
+  async tool(id, name, args) {
+    const agent = this.agents.get(id);
+    const sessionId = agent?.connection.sessionId;
+    if (!agent || agent.stopped || !sessionId) throw new Error("Start an agent conversation first");
+    const registry = agent.subagents;
+    const toolCallId = `oxbit-${randomUUID()}`;
+    const write = name === "oxbit_propose_edit";
+    let relative;
+    if (args.path !== void 0) {
+      const input = requireString(args, "path");
+      relative = path.isAbsolute(input) ? await this.relative(input, write) : input;
+      await this.files.resolve(relative, write);
+    }
+    for (const key of ["line", "limit"])
+      if (args[key] !== void 0 && (!Number.isSafeInteger(args[key]) || args[key] < 1))
+        throw new Error(`Invalid ${key}`);
+    const publish = (update) => {
+      if (!agent.stopped && registry === agent.subagents)
+        this.routeUpdate(agent, sessionId, update);
+    };
+    const editor = () => {
+      if (agent.client && !agent.editorTools) throw new Error(EDITOR_UNSUPPORTED);
+      return !!agent.client;
+    };
+    publish({
+      sessionUpdate: "tool_call",
+      toolCallId,
+      title: name,
+      kind: write ? "edit" : "read",
+      status: "in_progress",
+      rawInput: args,
+      ...relative ? { locations: [{ path: path.join(this.files.root, relative), line: args.line }] } : {}
+    });
+    try {
+      let result;
+      const params = { ...args, path: relative, sessionId, toolCallId };
+      switch (name) {
+        case "oxbit_get_workspace":
+          result = {
+            root: this.files.root,
+            clientConnected: !!agent.client,
+            ...editor() ? await this.clientRequest(agent, "oxbit/workspace", params) : { activeFile: null, openFiles: [], selection: null, diagnostics: [] }
+          };
+          break;
+        case "oxbit_list_files": {
+          const entries = await this.files.list(relative ?? "");
+          result = { entries: entries.slice(0, 1e3), truncated: entries.length > 1e3 };
+          break;
+        }
+        case "oxbit_read_file":
+        case "oxbit_propose_edit":
+          if (relative === void 0) throw new Error("A workspace path is required");
+          result = await this.clientRequest(agent, write ? "fs/write_text_file" : "fs/read_text_file", {
+            ...params,
+            path: path.join(this.files.root, relative)
+          });
+          break;
+        case "oxbit_get_diagnostics":
+          result = editor() ? await this.clientRequest(agent, "oxbit/diagnostics", params) : { diagnostics: [], available: false, reason: "Attach an Oxbit editor for language diagnostics" };
+          break;
+        case "oxbit_open_file":
+          if (relative === void 0) throw new Error("A workspace path is required");
+          if (!editor()) throw new Error("Attach an Oxbit editor to open a file");
+          result = await this.clientRequest(agent, "oxbit/open_file", params);
+          break;
+        case "oxbit_update_plan": {
+          if (!Array.isArray(args.entries) || args.entries.length > 50) throw new Error("Provide up to 50 plan entries");
+          const entries = args.entries.map((entry) => {
+            const content = requireString(entry, "content", 2e3);
+            if (!["pending", "in_progress", "completed"].includes(entry.status)) throw new Error("Invalid plan status");
+            return { content, status: entry.status, ...typeof entry.priority === "string" ? { priority: entry.priority.slice(0, 40) } : {} };
+          });
+          publish({ sessionUpdate: "plan", entries });
+          result = { entries };
+          break;
+        }
+        default:
+          throw new Error("Unknown Oxbit tool");
+      }
+      publish({ sessionUpdate: "tool_call_update", toolCallId, status: "completed", rawOutput: JSON.stringify(result ?? {}).slice(0, 8e3) });
+      return result ?? {};
+    } catch (error) {
+      publish({ sessionUpdate: "tool_call_update", toolCallId, status: "failed", rawOutput: String(error) });
+      throw error;
+    }
+  }
   async message(agent, message) {
     if (agent.stopped) return;
     if (!message.method) {
@@ -7721,8 +8414,8 @@ ${content}`
         throw new Error("Unknown ACP session");
       params.sessionId = sessionId;
       if (message.method.startsWith("terminal/")) {
-        const result = await this.terminal(agent, message.method, params);
-        this.send(agent, { id: message.id, result });
+        const result2 = await this.terminal(agent, message.method, params);
+        this.send(agent, { id: message.id, result: result2 });
         return;
       }
       if (![
@@ -7738,46 +8431,8 @@ ${content}`
         });
         return;
       }
-      if (agent.approvals.size >= 32)
-        throw new Error("Too many pending agent requests");
-      if (message.method.startsWith("fs/")) {
-        params.path = await this.relative(
-          params.path,
-          message.method === "fs/write_text_file"
-        );
-        for (const field of ["line", "limit"])
-          if (params[field] !== void 0 && (!Number.isSafeInteger(params[field]) || params[field] < 1))
-            throw new Error(`Invalid ${field}`);
-        if (message.method === "fs/write_text_file")
-          requireString(params, "content", MAX_BYTES);
-      }
-      if (agent.stopped) return;
-      if (registry !== agent.subagents || !registry.acceptsRequest(sessionId))
-        throw new Error("ACP session ended");
-      const requestId = randomUUID();
-      agent.approvals.set(requestId, {
-        rpcId: message.id,
-        method: message.method,
-        params
-      });
-      if (message.method !== "fs/read_text_file")
-        registry.waiting(
-          sessionId,
-          requestId,
-          true,
-          params.toolCallId ?? params.toolCall?.toolCallId
-        );
-      this.publish(agent, "acp.request", {
-        sessionId,
-        rootSessionId: registry.root,
-        subagentId: registry.idForSession(sessionId) ?? registry.idForTool(
-          sessionId,
-          params.toolCallId ?? params.toolCall?.toolCallId
-        ),
-        requestId,
-        method: message.method,
-        params
-      });
+      const result = await this.clientRequest(agent, message.method, params);
+      if (!agent.stopped) this.send(agent, { id: message.id, result });
     } catch (error) {
       if (!agent.stopped)
         this.send(agent, {
@@ -7796,10 +8451,8 @@ ${content}`
       )))
         throw new Error("Invalid permission response");
     }
-    this.send(agent, {
-      id: request.rpcId,
-      ...error ? { error: { code: -32603, message: error.slice(0, 4096) } } : { result }
-    });
+    if (error) request.reject(new Error(error.slice(0, 4096)));
+    else request.resolve(result);
     agent.approvals.delete(requestId);
     agent.subagents?.waiting(
       request.params.sessionId,
@@ -7934,26 +8587,29 @@ ${content}`
       pending.reject(new Error(reason));
     }
     agent.pending.clear();
+    for (const approval of agent.approvals.values()) approval.reject(new Error(reason));
     agent.approvals.clear();
     for (const terminal2 of agent.terminals.values())
       killProcess(terminal2.child);
     agent.terminals.clear();
     killProcess(agent.child);
     this.agents.delete(agent.connection.id);
+    this.mcp.revoke(agent.connection.id);
     this.publish(agent, "acp.exit", { reason });
   }
   stop(owner, id) {
     this.stopAgent(this.get(owner, id), "Agent disconnected");
     return {};
   }
-  disconnect(owner) {
+  disconnect(owner, client) {
     for (const agent of this.agents.values())
-      if (agent.owner === owner)
+      if (agent.owner === owner && (client === void 0 || agent.client === client))
         this.stopAgent(agent, "Agent client disconnected");
   }
   dispose() {
     for (const agent of this.agents.values())
       this.stopAgent(agent, "Agent tooling stopped");
+    return this.mcp.close();
   }
 }
 var re = { exports: {} };
@@ -10150,12 +10806,12 @@ function createKernel({
     get(id, language) {
       return configuration.inspect(id, language).value;
     },
-    inspect(id, language) {
+    inspect(id, language, scope = "workspace") {
       const scopes = language ? [.../* @__PURE__ */ new Set([language, canonicalLanguageId(language), ...languages.find((item) => item.id === canonicalLanguageId(language))?.settingsAliases ?? []])] : [];
       const ordered = [
-        ...scopes.map((id2) => configurationData.workspaceLanguages[id2]),
+        ...scope === "workspace" ? scopes.map((id2) => configurationData.workspaceLanguages[id2]) : [],
         ...scopes.map((id2) => configurationData.userLanguages[id2]),
-        configurationData.workspace,
+        ...scope === "workspace" ? [configurationData.workspace] : [],
         configurationData.user
       ];
       let value = structuredClone(settings.get(id)?.default);
@@ -10942,11 +11598,6 @@ class RuntimeExtensions {
     this.watchers.clear();
   }
 }
-let cached;
-function runtimeVersion() {
-  if (cached) return cached;
-  return cached = "0.6.1";
-}
 const wildcardHost = (host) => host === "0.0.0.0" || host === "::";
 const localHost = (host) => wildcardHost(host) ? "127.0.0.1" : host;
 const localName = (hostname = os.hostname()) => hostname.split(".")[0];
@@ -10979,7 +11630,7 @@ function lanUrl(port2, interfaces = os.networkInterfaces()) {
   const address = lanAddresses$1(interfaces).v4[0];
   return address ? `http://${address}:${port2}` : void 0;
 }
-const MAX_SOCKET_BACKLOG_BYTES = 16 * MAX_BUFFER_BYTES;
+const MAX_SOCKET_BACKLOG_BYTES = MAX_FILE_WRITE_MESSAGE_BYTES;
 const allCapabilities = [
   "filesystem.read",
   "filesystem.write",
@@ -11024,7 +11675,8 @@ async function createRuntime(options2) {
   const dataDir = path.resolve(options2.dataDir ?? workspaceDataDir(root));
   await fs.mkdir(dataDir, { recursive: true, mode: 448 });
   const stateFile = path.join(dataDir, "runtime.json");
-  const files = new WorkspaceFiles(root, dataDir), sessions = /* @__PURE__ */ new Map(), operations = /* @__PURE__ */ new Map(), inflight = /* @__PURE__ */ new Map(), connections = /* @__PURE__ */ new Map();
+  const files = new WorkspaceFiles(root, dataDir), sessions = /* @__PURE__ */ new Map(), inflight = /* @__PURE__ */ new Map(), connections = /* @__PURE__ */ new Map();
+  let operations = new OperationHistory();
   let trusted = false, closed = false, runtimeId = randomUUID();
   try {
     const state2 = JSON.parse(await fs.readFile(stateFile, "utf8"));
@@ -11032,16 +11684,7 @@ async function createRuntime(options2) {
     if (typeof state2.id === "string" && /^[A-Za-z0-9-]{8,64}$/.test(state2.id)) runtimeId = state2.id;
     for (const session of state2.sessions ?? [])
       sessions.set(session.hash, session);
-    for (const operation of state2.operations ?? []) {
-      if (operation.status === "running") {
-        operation.status = "interrupted";
-        operation.error = {
-          code: "INTERRUPTED",
-          message: "Runtime stopped before operation completion was recorded; inspect state before retrying with a new request ID"
-        };
-      }
-      operations.set(`${operation.owner}:${operation.id}`, operation);
-    }
+    operations = new OperationHistory(state2.operationHistory, state2.operations ?? []);
   } catch (error) {
     if (error.code !== "ENOENT")
       throw new Error(`Cannot recover runtime state: ${String(error)}`);
@@ -11064,6 +11707,7 @@ async function createRuntime(options2) {
       id: runtimeId,
       trusted,
       sessions: [...sessions.values()],
+      operationHistory: operations.checkpoint(),
       operations: [...operations.values()]
     });
     persistence = persistence.catch(() => {
@@ -11130,7 +11774,7 @@ async function createRuntime(options2) {
   const agents = new AgentACP(files, (connectionId, name, params) => {
     const connection = connections.get(connectionId);
     if (connection?.session && !connection.session.revoked && trusted) event(connection, name, params);
-  });
+  }, () => updateIdle());
   const processEvent = ({ event: name, params, stream, seq }, ownerId) => {
     const cap = name.startsWith("terminal.") ? "terminal" : "tasks";
     for (const c of connections.values()) {
@@ -11220,7 +11864,8 @@ async function createRuntime(options2) {
     capabilities: session.capabilities,
     owner: session.owner,
     trusted,
-    sessionId: session.id
+    sessionId: session.id,
+    operationEpoch: operations.epoch
   });
   const createSession = async (isOwner, capabilities) => {
     const token = randomBytes(32).toString("base64url"), session = {
@@ -11239,6 +11884,7 @@ async function createRuntime(options2) {
     const session = [...sessions.values()].find((s) => s.id === id);
     if (!session) throw new RpcError("NOT_FOUND", "Grant does not exist");
     session.revoked = true;
+    agents.disconnect(session.id);
     processes.revoke(session.id);
     tasks.revoke(session.id);
     for (const c of connections.values())
@@ -11442,7 +12088,7 @@ async function createRuntime(options2) {
   });
   const websocket = new WebSocketServer({
     noServer: true,
-    maxPayload: MAX_MESSAGE_BYTES,
+    maxPayload: MAX_FILE_WRITE_MESSAGE_BYTES,
     perMessageDeflate: false
   });
   server.on("upgrade", (request, socket, head) => {
@@ -11502,7 +12148,11 @@ async function createRuntime(options2) {
     if (workspace !== "default")
       throw new RpcError("FORBIDDEN", "Workspace is not granted");
     const required = permission(method), session = authorized(connection, required.cap, required.trust);
-    if (method.startsWith("acp.")) owner(connection);
+    if (method.startsWith("acp.")) {
+      owner(connection);
+      if (!["acp.start", "acp.list", "acp.attach", "acp.disconnect"].includes(method))
+        agents.control(session.id, requireString(params, "id"), connection.id);
+    }
     if (method.startsWith("project.")) owner(connection);
     if (method.startsWith("settings.")) owner(connection);
     switch (method) {
@@ -11525,17 +12175,28 @@ async function createRuntime(options2) {
       case "project.relations":
         return project.relations(requireString(params, "path"));
       case "acp.start":
-        return agents.start(connection.id, params, signal);
+        return agents.start(session.id, params, signal, connection.id);
+      case "acp.list":
+        return agents.list(session.id);
+      case "acp.attach":
+        return agents.attach(session.id, requireString(params, "id"), connection.id, params.clientCapabilities?.editorTools === true);
+      case "acp.enqueue":
+      case "acp.interrupt":
+        return agents.enqueue(session.id, requireString(params, "id"), params, method === "acp.interrupt");
+      case "acp.dequeue":
+        return agents.dequeue(session.id, requireString(params, "id"), requireString(params, "promptId"));
+      case "acp.resumeQueue":
+        return agents.resumeQueue(session.id, requireString(params, "id"));
       case "acp.call":
-        return agents.call(connection.id, requireString(params, "id"), requireString(params, "method"), params.params ?? {}, signal);
+        return agents.call(session.id, requireString(params, "id"), requireString(params, "method"), params.params ?? {});
       case "acp.respond":
-        return agents.respond(connection.id, requireString(params, "id"), requireString(params, "requestId"), params.result, params.error === void 0 ? void 0 : requireString(params, "error"));
+        return agents.respond(session.id, requireString(params, "id"), requireString(params, "requestId"), params.result, params.error === void 0 ? void 0 : requireString(params, "error"));
       case "acp.cancel":
-        return agents.cancel(connection.id, requireString(params, "id"));
+        return agents.cancel(session.id, requireString(params, "id"));
       case "acp.stop":
-        return agents.stop(connection.id, requireString(params, "id"));
+        return agents.stop(session.id, requireString(params, "id"));
       case "acp.disconnect":
-        agents.disconnect(connection.id);
+        agents.disconnect(session.id, connection.id);
         return {};
       case "workspace.info":
         return sessionInfo(session);
@@ -11545,7 +12206,7 @@ async function createRuntime(options2) {
           throw new RpcError("INVALID_PARAMS", "trusted must be boolean");
         trusted = params.trusted;
         if (!trusted) {
-          agents.dispose();
+          await agents.dispose();
           await extensions.suspend();
           for (const c of connections.values()) for (const pending of c.pending.values()) pending.abort();
           for (const s of sessions.values()) {
@@ -11573,10 +12234,7 @@ async function createRuntime(options2) {
         owner(connection);
         return revoke(requireString(params, "id"));
       case "operation.status": {
-        const value = operations.get(
-          `${session.id}:${requireString(params, "id")}`
-        );
-        return value ?? { id: params.id, status: "unknown" };
+        return operations.status(session.id, requireString(params, "id"));
       }
       case "fs.list":
         return files.list(typeof params.path === "string" ? params.path : "");
@@ -11594,7 +12252,7 @@ async function createRuntime(options2) {
       case "fs.write": {
         const snapshot = await files.write(
           requireString(params, "path"),
-          requireString(params, "text", 20 * 1024 * 1024),
+          requireString(params, "text", MAX_FILE_BYTES),
           {
             expectedRevision: requireRevision(params),
             encoding: params.encoding,
@@ -11857,7 +12515,7 @@ async function createRuntime(options2) {
         return collaboration.update(
           requireString(params, "path"),
           connection.id,
-          requireString(params, "update", MAX_MESSAGE_BYTES)
+          requireString(params, "update", MAX_COLLABORATION_UPDATE_BYTES)
         );
       case "collab.awareness":
         return collaboration.awareness(
@@ -11967,7 +12625,7 @@ async function createRuntime(options2) {
   };
   let idleSince, idleTimer;
   const updateIdle = () => {
-    if ([...connections.values()].some((c) => c.session && !c.session.revoked)) {
+    if (agents.hasWork || [...connections.values()].some((c) => c.session && !c.session.revoked)) {
       idleSince = void 0;
       clearTimeout(idleTimer);
       return;
@@ -12057,7 +12715,7 @@ async function createRuntime(options2) {
           let result;
           if (durableMethods.has(method)) {
             const required = permission(method), session = authorized(connection, required.cap, required.trust);
-            const key = `${session.id}:${id}`, existing = operations.get(key);
+            const key = `${session.id}:${id}`, existing = operations.get(session.id, id);
             if (existing) {
               if (existing.method !== method)
                 throw new RpcError(
@@ -12065,6 +12723,8 @@ async function createRuntime(options2) {
                   "Request ID was used for another operation"
                 );
               if (inflight.has(key)) result = await inflight.get(key);
+              else if (existing.resultExpired)
+                throw new RpcError("OPERATION_RESULT_EXPIRED", "Operation result expired; inspect current state before submitting a new operation", { status: existing.status });
               else if (existing.status === "completed")
                 result = existing.result;
               else
@@ -12074,14 +12734,11 @@ async function createRuntime(options2) {
                   existing.error?.data
                 );
             } else {
-              const operation = {
-                id,
-                owner: session.id,
-                method,
-                status: "running",
-                startedAt: Date.now()
-              };
-              operations.set(key, operation);
+              const previousEpoch = operations.epoch;
+              const operation = operations.begin(session.id, id, method);
+              if (operations.epoch !== previousEpoch) {
+                for (const c of connections.values()) if (c.session && !c.session.revoked) event(c, "operation.epoch", { epoch: operations.epoch });
+              }
               const run2 = (async () => {
                 await persist();
                 try {
@@ -12092,13 +12749,11 @@ async function createRuntime(options2) {
                     controller.signal,
                     id
                   );
-                  operation.status = "completed";
-                  operation.result = value;
+                  operations.complete(operation, value);
                   await persist();
                   return value;
                 } catch (error) {
-                  operation.status = "failed";
-                  operation.error = errorShape(error);
+                  operations.fail(operation, errorShape(error));
                   await persist();
                   throw error;
                 }
@@ -12143,7 +12798,7 @@ async function createRuntime(options2) {
     });
     ws.on("close", () => {
       clearTimeout(authDeadline);
-      agents.disconnect(connection.id);
+      agents.detach(connection.id);
       lsp.detach(connection.id);
       connections.delete(connection.id);
       updateIdle();
@@ -12155,7 +12810,7 @@ async function createRuntime(options2) {
       processes.disconnect(connection.id);
       void collaboration.leave(connection.id);
       for (const [id, controller] of connection.pending) {
-        const operation = connection.session && operations.get(`${connection.session.id}:${id}`);
+        const operation = connection.session && operations.get(connection.session.id, id);
         if (!operation) controller.abort();
       }
     });
@@ -12285,7 +12940,7 @@ async function createRuntime(options2) {
         for (const controller of c.pending.values()) controller.abort();
         c.ws.terminate();
       }
-      agents.dispose();
+      await agents.dispose();
       extensions.dispose();
       processes.close();
       await tasks.close();
@@ -12535,17 +13190,17 @@ function advertise(ad, log = stderrLog) {
     try {
       const query = parseMessage(packet);
       if (query.flags & 32768) return;
-      const reply = answer(query.questions, current());
-      if (!reply) return;
-      if (from.port === PORT) return send(encodeMessage(reply));
+      const reply2 = answer(query.questions, current());
+      if (!reply2) return;
+      if (from.port === PORT) return send(encodeMessage(reply2));
       const legacy = (r) => ({ ...r, ttl: Math.min(r.ttl, 10), flush: false });
       send(
         encodeMessage({
           id: query.id,
           flags: FLAGS_RESPONSE,
           questions: query.questions,
-          answers: reply.answers.map(legacy),
-          additionals: reply.additionals.map(legacy)
+          answers: reply2.answers.map(legacy),
+          additionals: reply2.additionals.map(legacy)
         }),
         from.port,
         from.address