@oxbit/cli 0.7.1 → 0.9.0

package/runtime/dist/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { realpathSync, constants as constants$1, watch } from "node:fs";
+import { realpathSync, constants as constants$1, watch, createWriteStream } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 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 { spawn, execFile, execFileSync } from "node:child_process";
+import { promisify, parseArgs } from "node:util";
 import http, { createServer } from "node:http";
 import os, { userInfo } from "node:os";
 import { createHash, randomUUID, randomBytes, timingSafeEqual } from "node:crypto";
@@ -24,6 +24,7 @@ import ts from "typescript";
 import ignore from "ignore";
 import * as Y from "yjs";
 import { Awareness, encodeAwarenessUpdate, applyAwarenessUpdate, removeAwarenessStates } from "y-protocols/awareness";
+import { pipeline } from "node:stream/promises";
 import { createSocket } from "node:dgram";
 const REQUIRED_NODE_MAJOR = 24;
 function nodeVersionError(version = process.versions.node) {
@@ -35,8 +36,8 @@ if (failure) {
   process.stderr.write(failure + "\n");
   process.exit(1);
 }
-function setting(name, env = process.env) {
-  return env[`OXBIT_${name}`];
+function setting(name, env2 = process.env) {
+  return env2[`OXBIT_${name}`];
 }
 function workspaceDataDir(root, home = os.homedir()) {
   const id = createHash("sha256").update(root).digest("hex").slice(0, 24);
@@ -54,8 +55,8 @@ const MAX_BUFFER_BYTES = 1024 * 1024;
 const READ_CHUNK_BYTES = 512 * 1024;
 const RUNTIME_SERVICE_TYPE = "_oxbit._tcp";
 class RpcError extends Error {
-  constructor(code, message, data) {
-    super(message);
+  constructor(code, message2, data) {
+    super(message2);
     this.code = code;
     this.data = data;
     this.name = "RpcError";
@@ -275,14 +276,14 @@ class WorkspaceFiles {
     const full = await this.resolve(relative);
     const entries = await fs.readdir(full, { withFileTypes: true });
     const result = [];
-    for (const entry of entries) {
-      if (entry.name === ".git" || entry.name.startsWith(".oxbit-tmp-"))
+    for (const entry2 of entries) {
+      if (entry2.name === ".git" || entry2.name.startsWith(".oxbit-tmp-"))
         continue;
-      const child = path.posix.join(relative, entry.name);
+      const child = path.posix.join(relative, entry2.name);
       try {
         const target = await this.resolve(child);
         const stat = await fs.stat(target);
-        if (entry.isSymbolicLink() && stat.isDirectory()) {
+        if (entry2.isSymbolicLink() && stat.isDirectory()) {
           let ancestor = path.resolve(this.root, relative || "."), cycle = false;
           while (this.inside(ancestor)) {
             if (await fs.realpath(ancestor) === target) {
@@ -297,7 +298,7 @@ class WorkspaceFiles {
         if (stat.isFile() || stat.isDirectory())
           result.push({
             path: child,
-            name: entry.name,
+            name: entry2.name,
             kind: stat.isDirectory() ? "directory" : "file",
             size: stat.size,
             readonly: await this.readonly(target)
@@ -586,8 +587,8 @@ function trackProcess(pid, onExit) {
 function trackChild(child) {
   trackProcess(child.pid, (done) => child.once("close", done));
 }
-function resolveTerminalShell(env = process.env, platform = process.platform) {
-  let shell = env.SHELL;
+function resolveTerminalShell(env2 = process.env, platform = process.platform) {
+  let shell = env2.SHELL;
   if (!shell && platform !== "win32") {
     try {
       shell = userInfo().shell || void 0;
@@ -932,11 +933,11 @@ 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@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 properties$2 = /* @__PURE__ */ JSON.parse(`{"$schema":{"type":"string","description":"JSON Schema URI. Ignored when merging effective preferences."},"agentACP.provider":{"title":"Default agent","description":"A built-in agent ID, an ACP Registry agent ID, or custom.","type":"string","default":"codex"},"agentACP.useModifierToSend":{"title":"Send with Ctrl/Cmd+Enter only","description":"Enter inserts a new line and Ctrl/Cmd+Enter sends the message.","type":"boolean","default":false},"agentACP.notifications":{"title":"Agent desktop notifications","description":"Show a system notification when the agent needs input or finishes while Oxbit is in the background.","type":"string","default":"whenHidden","enum":["whenHidden","never"]},"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.claude.command":{"title":"Claude Agent executable","type":"string","default":"npx"},"agentACP.claude.args":{"title":"Claude Agent arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"@agentclientprotocol/claude-agent-acp@0.89.1\\"]"},"agentACP.gemini.command":{"title":"Gemini CLI executable","type":"string","default":"npx"},"agentACP.gemini.args":{"title":"Gemini CLI arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"@google/gemini-cli@0.63.0\\",\\"--acp\\"]"},"agentACP.copilot.command":{"title":"GitHub Copilot executable","type":"string","default":"npx"},"agentACP.copilot.args":{"title":"GitHub Copilot arguments (JSON array)","type":"string","default":"[\\"-y\\",\\"@github/copilot@1.0.95\\",\\"--acp\\"]"},"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\\"]"},"agentACP.custom.name":{"title":"Custom agent name","type":"string","default":""},"agentACP.custom.command":{"title":"Custom agent executable","type":"string","default":""},"agentACP.custom.args":{"title":"Custom agent arguments (JSON array)","type":"string","default":"[]"},"agentACP.oxbit.api":{"title":"Oxbit Agent API","description":"openai uses the Responses API, anthropic the Messages API, and openai-compatible Chat Completions at the base URL.","type":"string","default":"openai","enum":["openai","anthropic","openai-compatible"]},"agentACP.oxbit.baseUrl":{"title":"Oxbit Agent base URL","description":"Origin and path prefix for openai-compatible, for example https://openrouter.ai/api.","type":"string","default":""},"agentACP.oxbit.model":{"title":"Oxbit Agent model","description":"Model ID for new conversations.","type":"string","default":""},"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;
-const definitions$1 = { "languageOverrides": { "type": "object", "properties": { "agentACP.provider": { "$ref": "#/properties/agentACP.provider" }, "agentACP.codex.command": { "$ref": "#/properties/agentACP.codex.command" }, "agentACP.codex.args": { "$ref": "#/properties/agentACP.codex.args" }, "agentACP.cursor.command": { "$ref": "#/properties/agentACP.cursor.command" }, "agentACP.cursor.args": { "$ref": "#/properties/agentACP.cursor.args" }, "agentACP.amp.command": { "$ref": "#/properties/agentACP.amp.command" }, "agentACP.amp.args": { "$ref": "#/properties/agentACP.amp.args" }, "workbench.keymap": { "$ref": "#/properties/workbench.keymap" }, "runtime.keepAlive": { "$ref": "#/properties/runtime.keepAlive" }, "runtime.autoReconnect": { "$ref": "#/properties/runtime.autoReconnect" }, "workbench.tooltipDelay": { "$ref": "#/properties/workbench.tooltipDelay" }, "workbench.colorTheme": { "$ref": "#/properties/workbench.colorTheme" }, "workbench.density": { "$ref": "#/properties/workbench.density" }, "workbench.sidebarLocation": { "$ref": "#/properties/workbench.sidebarLocation" }, "editor.fontFamily": { "$ref": "#/properties/editor.fontFamily" }, "editor.fontSize": { "$ref": "#/properties/editor.fontSize" }, "editor.lineHeight": { "$ref": "#/properties/editor.lineHeight" }, "editor.fontLigatures": { "$ref": "#/properties/editor.fontLigatures" }, "editor.tabSize": { "$ref": "#/properties/editor.tabSize" }, "editor.insertSpaces": { "$ref": "#/properties/editor.insertSpaces" }, "editor.detectIndentation": { "$ref": "#/properties/editor.detectIndentation" }, "editor.renderIndentGuides": { "$ref": "#/properties/editor.renderIndentGuides" }, "editor.wordWrap": { "$ref": "#/properties/editor.wordWrap" }, "editor.renderWhitespace": { "$ref": "#/properties/editor.renderWhitespace" }, "editor.cursorBlinking": { "$ref": "#/properties/editor.cursorBlinking" }, "editor.minimap": { "$ref": "#/properties/editor.minimap" }, "files.autoSave": { "$ref": "#/properties/files.autoSave" }, "files.autoSaveDelay": { "$ref": "#/properties/files.autoSaveDelay" }, "files.trimTrailingWhitespace": { "$ref": "#/properties/files.trimTrailingWhitespace" }, "editor.formatOnSave": { "$ref": "#/properties/editor.formatOnSave" }, "editor.defaultFormatter": { "$ref": "#/properties/editor.defaultFormatter" }, "terminal.fontSize": { "$ref": "#/properties/terminal.fontSize" }, "terminal.scrollback": { "$ref": "#/properties/terminal.scrollback" }, "terminal.confirmOnKill": { "$ref": "#/properties/terminal.confirmOnKill" }, "scm.autoFetch": { "$ref": "#/properties/scm.autoFetch" }, "scm.diffLayout": { "$ref": "#/properties/scm.diffLayout" }, "files.associations": { "$ref": "#/properties/files.associations" }, "languageServers": { "$ref": "#/properties/languageServers" }, "ui.fontFamily": { "$ref": "#/properties/ui.fontFamily" }, "ui.fontSize": { "$ref": "#/properties/ui.fontSize" }, "ui.fontWeight": { "$ref": "#/properties/ui.fontWeight" }, "ui.fontStyle": { "$ref": "#/properties/ui.fontStyle" }, "ui.lineHeight": { "$ref": "#/properties/ui.lineHeight" }, "ui.letterSpacing": { "$ref": "#/properties/ui.letterSpacing" }, "ui.fontLigatures": { "$ref": "#/properties/ui.fontLigatures" }, "terminal.fontFamily": { "$ref": "#/properties/terminal.fontFamily" }, "terminal.fontWeight": { "$ref": "#/properties/terminal.fontWeight" }, "terminal.fontStyle": { "$ref": "#/properties/terminal.fontStyle" }, "terminal.lineHeight": { "$ref": "#/properties/terminal.lineHeight" }, "terminal.letterSpacing": { "$ref": "#/properties/terminal.letterSpacing" }, "terminal.fontLigatures": { "$ref": "#/properties/terminal.fontLigatures" }, "workbench.iconTheme": { "$ref": "#/properties/workbench.iconTheme" }, "workbench.productIconTheme": { "$ref": "#/properties/workbench.productIconTheme" }, "editor.semanticHighlighting": { "$ref": "#/properties/editor.semanticHighlighting" }, "editor.inlayHints.types": { "$ref": "#/properties/editor.inlayHints.types" }, "editor.inlayHints.parameters": { "$ref": "#/properties/editor.inlayHints.parameters" }, "editor.largeFileIntelligence": { "$ref": "#/properties/editor.largeFileIntelligence" }, "workbench.locale": { "$ref": "#/properties/workbench.locale" }, "workbench.reducedMotion": { "$ref": "#/properties/workbench.reducedMotion" }, "desktop.projects.openBehavior": { "$ref": "#/properties/desktop.projects.openBehavior" }, "desktop.tools.gitPath": { "$ref": "#/properties/desktop.tools.gitPath" }, "desktop.tools.ghPath": { "$ref": "#/properties/desktop.tools.ghPath" }, "project.intelligence": false, "project.schemas": false }, "additionalProperties": true, "description": "Settings for a language ID, such as [mdx] or [php]. Runtime project options belong at the top level.", "propertyNames": { "not": { "pattern": "^\\[.*\\]$" } } } };
+const definitions$1 = { "languageOverrides": { "type": "object", "properties": { "agentACP.provider": { "$ref": "#/properties/agentACP.provider" }, "agentACP.useModifierToSend": { "$ref": "#/properties/agentACP.useModifierToSend" }, "agentACP.notifications": { "$ref": "#/properties/agentACP.notifications" }, "agentACP.codex.command": { "$ref": "#/properties/agentACP.codex.command" }, "agentACP.codex.args": { "$ref": "#/properties/agentACP.codex.args" }, "agentACP.claude.command": { "$ref": "#/properties/agentACP.claude.command" }, "agentACP.claude.args": { "$ref": "#/properties/agentACP.claude.args" }, "agentACP.gemini.command": { "$ref": "#/properties/agentACP.gemini.command" }, "agentACP.gemini.args": { "$ref": "#/properties/agentACP.gemini.args" }, "agentACP.copilot.command": { "$ref": "#/properties/agentACP.copilot.command" }, "agentACP.copilot.args": { "$ref": "#/properties/agentACP.copilot.args" }, "agentACP.cursor.command": { "$ref": "#/properties/agentACP.cursor.command" }, "agentACP.cursor.args": { "$ref": "#/properties/agentACP.cursor.args" }, "agentACP.amp.command": { "$ref": "#/properties/agentACP.amp.command" }, "agentACP.amp.args": { "$ref": "#/properties/agentACP.amp.args" }, "agentACP.custom.name": { "$ref": "#/properties/agentACP.custom.name" }, "agentACP.custom.command": { "$ref": "#/properties/agentACP.custom.command" }, "agentACP.custom.args": { "$ref": "#/properties/agentACP.custom.args" }, "agentACP.oxbit.api": { "$ref": "#/properties/agentACP.oxbit.api" }, "agentACP.oxbit.baseUrl": { "$ref": "#/properties/agentACP.oxbit.baseUrl" }, "agentACP.oxbit.model": { "$ref": "#/properties/agentACP.oxbit.model" }, "workbench.keymap": { "$ref": "#/properties/workbench.keymap" }, "runtime.keepAlive": { "$ref": "#/properties/runtime.keepAlive" }, "runtime.autoReconnect": { "$ref": "#/properties/runtime.autoReconnect" }, "workbench.tooltipDelay": { "$ref": "#/properties/workbench.tooltipDelay" }, "workbench.colorTheme": { "$ref": "#/properties/workbench.colorTheme" }, "workbench.density": { "$ref": "#/properties/workbench.density" }, "workbench.sidebarLocation": { "$ref": "#/properties/workbench.sidebarLocation" }, "editor.fontFamily": { "$ref": "#/properties/editor.fontFamily" }, "editor.fontSize": { "$ref": "#/properties/editor.fontSize" }, "editor.lineHeight": { "$ref": "#/properties/editor.lineHeight" }, "editor.fontLigatures": { "$ref": "#/properties/editor.fontLigatures" }, "editor.tabSize": { "$ref": "#/properties/editor.tabSize" }, "editor.insertSpaces": { "$ref": "#/properties/editor.insertSpaces" }, "editor.detectIndentation": { "$ref": "#/properties/editor.detectIndentation" }, "editor.renderIndentGuides": { "$ref": "#/properties/editor.renderIndentGuides" }, "editor.wordWrap": { "$ref": "#/properties/editor.wordWrap" }, "editor.renderWhitespace": { "$ref": "#/properties/editor.renderWhitespace" }, "editor.cursorBlinking": { "$ref": "#/properties/editor.cursorBlinking" }, "editor.minimap": { "$ref": "#/properties/editor.minimap" }, "files.autoSave": { "$ref": "#/properties/files.autoSave" }, "files.autoSaveDelay": { "$ref": "#/properties/files.autoSaveDelay" }, "files.trimTrailingWhitespace": { "$ref": "#/properties/files.trimTrailingWhitespace" }, "editor.formatOnSave": { "$ref": "#/properties/editor.formatOnSave" }, "editor.defaultFormatter": { "$ref": "#/properties/editor.defaultFormatter" }, "terminal.fontSize": { "$ref": "#/properties/terminal.fontSize" }, "terminal.scrollback": { "$ref": "#/properties/terminal.scrollback" }, "terminal.confirmOnKill": { "$ref": "#/properties/terminal.confirmOnKill" }, "scm.autoFetch": { "$ref": "#/properties/scm.autoFetch" }, "scm.diffLayout": { "$ref": "#/properties/scm.diffLayout" }, "files.associations": { "$ref": "#/properties/files.associations" }, "languageServers": { "$ref": "#/properties/languageServers" }, "ui.fontFamily": { "$ref": "#/properties/ui.fontFamily" }, "ui.fontSize": { "$ref": "#/properties/ui.fontSize" }, "ui.fontWeight": { "$ref": "#/properties/ui.fontWeight" }, "ui.fontStyle": { "$ref": "#/properties/ui.fontStyle" }, "ui.lineHeight": { "$ref": "#/properties/ui.lineHeight" }, "ui.letterSpacing": { "$ref": "#/properties/ui.letterSpacing" }, "ui.fontLigatures": { "$ref": "#/properties/ui.fontLigatures" }, "terminal.fontFamily": { "$ref": "#/properties/terminal.fontFamily" }, "terminal.fontWeight": { "$ref": "#/properties/terminal.fontWeight" }, "terminal.fontStyle": { "$ref": "#/properties/terminal.fontStyle" }, "terminal.lineHeight": { "$ref": "#/properties/terminal.lineHeight" }, "terminal.letterSpacing": { "$ref": "#/properties/terminal.letterSpacing" }, "terminal.fontLigatures": { "$ref": "#/properties/terminal.fontLigatures" }, "workbench.iconTheme": { "$ref": "#/properties/workbench.iconTheme" }, "workbench.productIconTheme": { "$ref": "#/properties/workbench.productIconTheme" }, "editor.semanticHighlighting": { "$ref": "#/properties/editor.semanticHighlighting" }, "editor.inlayHints.types": { "$ref": "#/properties/editor.inlayHints.types" }, "editor.inlayHints.parameters": { "$ref": "#/properties/editor.inlayHints.parameters" }, "editor.largeFileIntelligence": { "$ref": "#/properties/editor.largeFileIntelligence" }, "workbench.locale": { "$ref": "#/properties/workbench.locale" }, "workbench.reducedMotion": { "$ref": "#/properties/workbench.reducedMotion" }, "desktop.projects.openBehavior": { "$ref": "#/properties/desktop.projects.openBehavior" }, "desktop.tools.gitPath": { "$ref": "#/properties/desktop.tools.gitPath" }, "desktop.tools.ghPath": { "$ref": "#/properties/desktop.tools.ghPath" }, "project.intelligence": false, "project.schemas": false }, "additionalProperties": true, "description": "Settings for a language ID, such as [mdx] or [php]. Runtime project options belong at the top level.", "propertyNames": { "not": { "pattern": "^\\[.*\\]$" } } } };
 const schema = {
   $schema: $schema$2,
   $id: $id$1,
@@ -1041,9 +1042,9 @@ function lspWatchPattern(glob, rootUri) {
       pattern = glob.pattern;
       const uri = typeof glob.baseUri === "string" ? glob.baseUri : glob.baseUri?.uri;
       if (!uri) return;
-      const url = new URL(uri);
-      if (url.protocol !== "file:" || url.host || url.search || url.hash) return;
-      base = decodeURIComponent(url.pathname).replace(/\/$/, "");
+      const url2 = new URL(uri);
+      if (url2.protocol !== "file:" || url2.host || url2.search || url2.hash) return;
+      base = decodeURIComponent(url2.pathname).replace(/\/$/, "");
       if (pattern.startsWith("/")) return;
     } else return;
     if (base !== root && !base.startsWith(root + "/")) return;
@@ -1112,7 +1113,35 @@ const ACP_PROVIDERS = [
     command: "npx",
     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"
+    url: "https://github.com/agentclientprotocol/codex-acp",
+    registryId: "codex-acp"
+  },
+  {
+    id: "claude",
+    name: "Claude Agent",
+    command: "npx",
+    args: ["-y", "@agentclientprotocol/claude-agent-acp@0.89.1"],
+    setup: "Uses the Claude Agent ACP adapter. Sign in through an advertised authentication method, or use your existing Claude Code credentials.",
+    url: "https://github.com/agentclientprotocol/claude-agent-acp",
+    registryId: "claude-acp"
+  },
+  {
+    id: "gemini",
+    name: "Gemini CLI",
+    command: "npx",
+    args: ["-y", "@google/gemini-cli@0.63.0", "--acp"],
+    setup: "Runs Gemini CLI in ACP mode. Sign in through an advertised authentication method, or set GEMINI_API_KEY in the runtime environment.",
+    url: "https://github.com/google-gemini/gemini-cli",
+    registryId: "gemini"
+  },
+  {
+    id: "copilot",
+    name: "GitHub Copilot",
+    command: "npx",
+    args: ["-y", "@github/copilot@1.0.95", "--acp"],
+    setup: "Runs GitHub Copilot CLI in ACP mode. Sign in through an advertised authentication method, or run copilot and use /login first.",
+    url: "https://github.com/github/copilot-cli",
+    registryId: "github-copilot-cli"
   },
   {
     id: "cursor",
@@ -1120,7 +1149,8 @@ const ACP_PROVIDERS = [
     command: "agent",
     args: ["acp"],
     setup: "Install Cursor CLI and run agent login first. If your executable is cursor-agent, change the command below.",
-    url: "https://cursor.com/docs/cli/acp"
+    url: "https://cursor.com/docs/cli/acp",
+    registryId: "cursor"
   },
   {
     id: "amp",
@@ -1128,9 +1158,15 @@ const ACP_PROVIDERS = [
     command: "npx",
     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"
+    url: "https://github.com/tao12345666333/amp-acp",
+    registryId: "amp-acp"
   }
 ];
+const ACP_CUSTOM_PROVIDER = "custom";
+const ACP_REGISTRY_URL = "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json";
+const acpPreset = (id) => ACP_PROVIDERS.find((provider) => provider.id === id);
+const acpBuiltinForRegistry = (registryId) => ACP_PROVIDERS.find((provider) => provider.registryId === registryId);
+const PUSH_RELAY_URL = "https://oxbit-push.ryanyannelli.workers.dev";
 const taskPhases = [
   "preinit",
   "init",
@@ -1167,29 +1203,29 @@ function settingsFile(layers, scope) {
   return { ...structuredClone(layers[scope]), ...Object.fromEntries(Object.entries(layers[scope === "user" ? "userLanguages" : "workspaceLanguages"]).filter(([, value]) => Object.keys(value).length).map(([language, value]) => [`[${language}]`, structuredClone(value)])) };
 }
 const SDK_VERSION = "1.0.0";
-function invalid(message) {
-  throw new RpcError("INVALID_TASK_CONFIG", message);
+function invalid$1(message2) {
+  throw new RpcError("INVALID_TASK_CONFIG", message2);
 }
 function object$2(value, label) {
   if (!value || typeof value !== "object" || Array.isArray(value))
-    invalid(`${label} must be an object`);
+    invalid$1(`${label} must be an object`);
   return value;
 }
 function taskName(value) {
   if (typeof value !== "string" || !value.trim() || value.length > 120 || /[\x00-\x1f\x7f]/.test(value) || ["__proto__", "constructor", "prototype"].includes(value))
-    invalid("Task name must contain 1–120 printable characters");
+    invalid$1("Task name must contain 1–120 printable characters");
   return value;
 }
 function stringMap(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}`);
+      invalid$1(`${label}: invalid environment entry ${key}`);
   return record;
 }
 function number(value, min, max, label) {
   if (!Number.isSafeInteger(value) || Number(value) < min || Number(value) > max)
-    invalid(`${label} must be an integer between ${min} and ${max}`);
+    invalid$1(`${label} must be an integer between ${min} and ${max}`);
 }
 function port(value) {
   if (value === "auto") return value;
@@ -1206,14 +1242,14 @@ function hooks(value) {
   const data = object$2(value ?? {}, "worktree");
   for (const key of Object.keys(data))
     if (!taskPhases.includes(key))
-      invalid(`Unknown worktree phase: ${key}`);
+      invalid$1(`Unknown worktree phase: ${key}`);
   for (const phase of taskPhases)
     if (data[phase] !== void 0) {
       const lines = Array.isArray(data[phase]) ? data[phase] : [data[phase]];
       if (lines.length > 128 || lines.some(
         (line) => typeof line !== "string" || line.length > 32768 || line.includes("\0")
       ))
-        invalid(`worktree.${phase} must be a script or array of scripts`);
+        invalid$1(`worktree.${phase} must be a script or array of scripts`);
     }
   return Object.fromEntries(
     taskPhases.filter((phase) => data[phase] !== void 0).map((phase) => [phase, data[phase]])
@@ -1240,9 +1276,9 @@ function definition(value) {
     "stop"
   ]);
   for (const key of Object.keys(data))
-    if (!known.has(key)) invalid(`Unknown task field: ${key}`);
+    if (!known.has(key)) invalid$1(`Unknown task field: ${key}`);
   if (typeof data.command !== "string" || data.command.length > 32768 || data.command.includes("\0") || !data.command.trim() && !data.dependsOn?.length)
-    invalid("A task needs a command or dependencies");
+    invalid$1("A task needs a command or dependencies");
   for (const [key, choices] of Object.entries({
     type: ["command", "service"],
     execution: ["shell", "process"],
@@ -1250,39 +1286,39 @@ function definition(value) {
     group: ["build", "test"]
   }))
     if (data[key] !== void 0 && !choices.includes(data[key]))
-      invalid(`Invalid ${key}`);
+      invalid$1(`Invalid ${key}`);
   for (const key of ["args", "dependsOn"])
     if (data[key] !== void 0 && (!Array.isArray(data[key]) || data[key].length > 128 || data[key].some(
       (v) => typeof v !== "string" || v.length > 32768 || v.includes("\0")
     )))
-      invalid(`${key} must be an array of strings`);
+      invalid$1(`${key} must be an array of strings`);
   for (const key of ["cwd", "host", "hostname"])
     if (data[key] !== void 0 && (typeof data[key] !== "string" || data[key].length > 4096 || /[\x00-\x1f]/.test(data[key])))
-      invalid(`Invalid ${key}`);
+      invalid$1(`Invalid ${key}`);
   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$2(data.ports, "ports"));
-    if (entries.length > 16) invalid("Maximum 16 named ports per task");
+    if (entries.length > 16) invalid$1("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")
-        invalid("Port names must be identifiers other than 'port'");
+        invalid$1("Port names must be identifiers other than 'port'");
       port(value2);
     }
     if (new Set(entries.map(([key]) => key.toUpperCase())).size !== entries.length)
-      invalid("Port names must be unique ignoring case");
+      invalid$1("Port names must be unique ignoring case");
   }
   if (data.ready !== void 0) {
     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}`);
+        invalid$1(`Unknown readiness field: ${key}`);
     if (ready.pattern !== void 0) {
       if (typeof ready.pattern !== "string" || !ready.pattern.length || ready.pattern.length > 256)
-        invalid("ready.pattern must be 1–256 characters");
+        invalid$1("ready.pattern must be 1–256 characters");
     }
     if (ready.url !== void 0 && (typeof ready.url !== "string" || ready.url.length > 4096))
-      invalid("Invalid readiness URL");
+      invalid$1("Invalid readiness URL");
     if (ready.timeoutMs !== void 0)
       number(ready.timeoutMs, 100, 36e5, "ready.timeoutMs");
     if (ready.intervalMs !== void 0)
@@ -1292,9 +1328,9 @@ function definition(value) {
     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}`);
+        invalid$1(`Unknown restart field: ${key}`);
     if (!["never", "on-failure"].includes(restart.policy))
-      invalid("Invalid restart policy");
+      invalid$1("Invalid restart policy");
     if (restart.maxAttempts !== void 0)
       number(restart.maxAttempts, 0, 10, "restart.maxAttempts");
     if (restart.delayMs !== void 0)
@@ -1304,9 +1340,9 @@ function definition(value) {
     const stop2 = object$2(data.stop, "stop");
     for (const key of Object.keys(stop2))
       if (!["signal", "timeoutMs"].includes(key))
-        invalid(`Unknown stop field: ${key}`);
+        invalid$1(`Unknown stop field: ${key}`);
     if (stop2.signal !== void 0 && !["SIGTERM", "SIGINT"].includes(stop2.signal))
-      invalid("Invalid stop signal");
+      invalid$1("Invalid stop signal");
     if (stop2.timeoutMs !== void 0)
       number(stop2.timeoutMs, 100, 6e4, "stop.timeoutMs");
   }
@@ -1317,7 +1353,7 @@ const shellQuote = (value) => `'${value.replaceAll("'", `'"'"'`)}'`;
 function json(text2) {
   const errors = [];
   const result = parse$1(text2, errors, { allowTrailingComma: true });
-  if (errors.length) invalid(`Invalid JSON near offset ${errors[0].offset}`);
+  if (errors.length) invalid$1(`Invalid JSON near offset ${errors[0].offset}`);
   return object$2(result, "configuration");
 }
 function editJson(text2, location, value) {
@@ -1369,11 +1405,11 @@ function quotePath(value) {
 }
 function xml(text2) {
   if (/<!DOCTYPE|<!ENTITY/i.test(text2))
-    invalid("XML document types and entities are not supported");
+    invalid$1("XML document types and entities are not supported");
   return new DOMParser({
-    onError: (level, message) => {
+    onError: (level, message2) => {
       if (level !== "warning")
-        invalid(`Invalid run configuration XML: ${message}`);
+        invalid$1(`Invalid run configuration XML: ${message2}`);
     }
   }).parseFromString(text2, "application/xml");
 }
@@ -1406,7 +1442,7 @@ function jetbrains(element) {
   const setting2 = (name2, nativeName = name2) => values[name2] ?? element.getAttribute(nativeName) ?? children(element, nativeName)[0]?.getAttribute("value") ?? "";
   let task = { command: "" }, disabledReason;
   const envs = Array.from(element.getElementsByTagName("env"));
-  const env = Object.fromEntries(
+  const env2 = Object.fromEntries(
     envs.map((node) => [
       node.getAttribute("name"),
       node.getAttribute("value") ?? ""
@@ -1449,7 +1485,7 @@ function jetbrains(element) {
       disabledReason = "Gradle custom VM/script parameters need an explicit Oxbit command";
   } else
     disabledReason = `${type2 || "This IDE configuration"} requires an IDE/debug adapter; add an explicit Oxbit command to enable it`;
-  task.env = env;
+  task.env = env2;
   const before = Array.from(element.getElementsByTagName("method")).flatMap((node) => children(node, "option")).filter((node) => node.getAttribute("enabled") === "true");
   if (before.length)
     disabledReason = "Before-launch IDE steps require an explicit command/dependency mapping";
@@ -1528,7 +1564,7 @@ function readSource(kind, text2) {
     result.worktree = hooks(kind === "oxbit" ? data.worktree : meta.worktree);
     if (kind === "oxbit") {
       if (data.version !== 1)
-        invalid("Unsupported Oxbit tasks version (expected 1)");
+        invalid$1("Unsupported Oxbit tasks version (expected 1)");
       for (const key of Object.keys(data))
         if (![
           "$schema",
@@ -1538,7 +1574,7 @@ function readSource(kind, text2) {
           "env",
           "worktree"
         ].includes(key))
-          invalid(`Unknown Oxbit configuration field: ${key}`);
+          invalid$1(`Unknown Oxbit configuration field: ${key}`);
       for (const [name, task] of Object.entries(
         object$2(data.tasks ?? {}, "tasks")
       ))
@@ -1571,10 +1607,10 @@ function readSource(kind, text2) {
         );
     } else if (kind === "vscode-launch") {
       if (!Array.isArray(data.configurations))
-        invalid("VS Code launch configurations must be an array");
-      for (const entry of data.configurations) {
+        invalid$1("VS Code launch configurations must be an array");
+      for (const entry2 of data.configurations) {
         const platform = process.platform === "darwin" ? "osx" : process.platform === "win32" ? "windows" : "linux";
-        const item = { ...entry, ...entry[platform] };
+        const item = { ...entry2, ...entry2[platform] };
         const python = ["python", "debugpy"].includes(item.type);
         let disabledReason;
         if (item.request !== "launch" || !["node", "pwa-node", "python", "debugpy"].includes(item.type))
@@ -1603,11 +1639,11 @@ function readSource(kind, text2) {
       );
     } else if (kind === "vscode") {
       if (data.version !== "2.0.0")
-        invalid("Only VS Code tasks version 2.0.0 is supported");
-      if (!Array.isArray(data.tasks)) invalid("VS Code tasks must be an array");
+        invalid$1("Only VS Code tasks version 2.0.0 is supported");
+      if (!Array.isArray(data.tasks)) invalid$1("VS Code tasks must be an array");
       for (const raw of data.tasks) {
-        const entry = object$2(raw, "VS Code task"), platform = process.platform === "darwin" ? "osx" : process.platform === "win32" ? "windows" : "linux";
-        const item = { ...entry, ...entry[platform] };
+        const entry2 = object$2(raw, "VS Code task"), platform = process.platform === "darwin" ? "osx" : process.platform === "win32" ? "windows" : "linux";
+        const item = { ...entry2, ...entry2[platform] };
         const args = (item.args ?? []).map(
           (arg) => typeof arg === "string" ? arg : object$2(arg, "argument").value
         );
@@ -1664,10 +1700,10 @@ function readSource(kind, text2) {
       }
     }
   }
-  if (result.tasks.length > 256) invalid("Maximum 256 tasks per configuration");
+  if (result.tasks.length > 256) invalid$1("Maximum 256 tasks per configuration");
   const names = /* @__PURE__ */ new Set();
   for (const task of result.tasks) {
-    if (names.has(task.name)) invalid(`Duplicate task name: ${task.name}`);
+    if (names.has(task.name)) invalid$1(`Duplicate task name: ${task.name}`);
     names.add(task.name);
     if (!task.disabledReason) task.definition = definition(task.definition);
   }
@@ -1675,7 +1711,7 @@ function readSource(kind, text2) {
 }
 function writeTask(kind, text2, name, task, sourceCommand) {
   if (kind === "make" || kind === "just")
-    invalid("Recipe imports are read-only; copy to Oxbit to customize");
+    invalid$1("Recipe imports are read-only; copy to Oxbit to customize");
   if (kind === "jetbrains") {
     const doc = xml(text2);
     let target = Array.from(doc.getElementsByTagName("configuration")).find(
@@ -1713,11 +1749,11 @@ function writeTask(kind, text2, name, task, sourceCommand) {
   }
   if (kind === "procfile") {
     if (task && (task.command.includes("\n") || Object.keys(task).some((key) => !["command", "type"].includes(key))))
-      invalid(
+      invalid$1(
         "Procfile supports a single-line service command. Copy to Oxbit for advanced settings."
       );
     if (!/^[\w-]+$/.test(name))
-      invalid(
+      invalid$1(
         "Procfile names must contain letters, numbers, hyphens or underscores"
       );
     const lines = text2.split(/\r?\n/), index = lines.findIndex((line) => line.startsWith(name + ":"));
@@ -1810,10 +1846,10 @@ function writeTask(kind, text2, name, task, sourceCommand) {
       try {
         script = JSON.parse(script);
       } catch {
-        invalid("Composer script array must be valid JSON");
+        invalid$1("Composer script array must be valid JSON");
       }
       if (!Array.isArray(script) || script.some((v) => typeof v !== "string"))
-        invalid("Composer script array must contain strings");
+        invalid$1("Composer script array must contain strings");
     }
     next = editJson(next, ["scripts", name], script);
   }
@@ -1823,9 +1859,9 @@ function writeTask(kind, text2, name, task, sourceCommand) {
   delete metadata.args;
   return editJson(next, ["oxbit", "tasks", name], metadata);
 }
-function writeSettings(kind, text2, worktree, env) {
+function writeSettings(kind, text2, worktree, env2) {
   if (["make", "just", "procfile"].includes(kind))
-    invalid(
+    invalid$1(
       "This source cannot store lifecycle settings; save an Oxbit configuration first"
     );
   if (kind === "jetbrains") {
@@ -1839,7 +1875,7 @@ function writeSettings(kind, text2, worktree, env) {
       doc.documentElement.appendChild(component);
     }
     option(doc, component, "worktree", JSON.stringify(worktree));
-    option(doc, component, "env", JSON.stringify(env));
+    option(doc, component, "env", JSON.stringify(env2));
     return new XMLSerializer().serializeToString(doc);
   }
   let next = editJson(
@@ -1851,7 +1887,7 @@ function writeSettings(kind, text2, worktree, env) {
     next = editJson(next, ["worktree", "setup"], worktree.init);
     next = editJson(next, ["worktree", "teardown"], worktree.preteardown);
   }
-  return editJson(next, kind === "oxbit" ? ["env"] : ["oxbit", "env"], env);
+  return editJson(next, kind === "oxbit" ? ["env"] : ["oxbit", "env"], env2);
 }
 const digest$2 = (text2) => createHash("sha256").update(text2).digest("hex");
 const missing$1 = (error) => error.code === "ENOENT";
@@ -2008,10 +2044,10 @@ class TaskConfigStore {
         const entries = await fs.readdir(path.join(this.root, directory), {
           withFileTypes: true
         });
-        for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 128))
-          if (entry.isFile() && entry.name.endsWith(".xml"))
+        for (const entry2 of entries.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 128))
+          if (entry2.isFile() && entry2.name.endsWith(".xml"))
             candidates.push({
-              file: path.join(directory, entry.name),
+              file: path.join(directory, entry2.name),
               kind: "jetbrains"
             });
       } catch (error) {
@@ -2028,7 +2064,7 @@ class TaskConfigStore {
       { file: this.privatePath, kind: "oxbit", private: true }
     );
     const sources = [], tasks = [];
-    let worktree = {}, env = {}, settingsFound = false, noImports = false;
+    let worktree = {}, env2 = {}, settingsFound = false, noImports = false;
     for (const candidate of candidates) {
       if (noImports) continue;
       const file = path.resolve(this.root, candidate.file), source2 = {
@@ -2062,7 +2098,7 @@ class TaskConfigStore {
           noImports = json(text2).autoDetect === false;
         if (!settingsFound && source2.writable && !["procfile"].includes(source2.kind)) {
           worktree = parsed.worktree;
-          env = parsed.env;
+          env2 = parsed.env;
           settingsFound = true;
         }
         for (const task of parsed.tasks)
@@ -2099,7 +2135,7 @@ class TaskConfigStore {
       sources,
       tasks,
       worktree,
-      env
+      env: env2
     };
   }
   async source(id, expected) {
@@ -2424,22 +2460,22 @@ function tcpReady(host, port2, timeoutMs = 1e3) {
     socket.once("timeout", () => finish(false));
   });
 }
-function expand(value, env, strict = true) {
+function expand(value, env2, strict = true) {
   return value.replace(
     /\$\$|\$\{([A-Za-z_][A-Za-z0-9_]*)\}|\$([A-Za-z_][A-Za-z0-9_]*)/g,
     (match, braced, bare) => {
       if (match === "$$") return "$";
       const key = braced ?? bare;
-      if (env[key] === void 0 && strict)
+      if (env2[key] === void 0 && strict)
         throw new RpcError(
           "UNRESOLVED_VARIABLE",
           `Variable ${key} is not defined`
         );
-      return env[key] ?? "";
+      return env2[key] ?? "";
     }
   );
 }
-function taskEnvironment(store, task, ports, catalog, context = {}) {
+function taskEnvironment(store, task, ports, catalog, context = {}, base = process.env) {
   const root = context.projectDir ?? context.root ?? store.root, plan = ports.get(task.id);
   const variables = {
     OXBIT_PROJECT_ID: store.projectId,
@@ -2467,26 +2503,26 @@ function taskEnvironment(store, task, ports, catalog, context = {}) {
     for (const [name, port2] of Object.entries(plan.ports))
       variables[`OXBIT_${name.toUpperCase()}_PORT`] = String(port2);
   }
-  const env = { ...process.env, ...variables };
-  env.PASEO_SOURCE_CHECKOUT_PATH = variables.OXBIT_SOURCE_DIR;
-  env.PASEO_WORKTREE_PATH = root;
-  env.PASEO_ROOT_PATH = variables.OXBIT_SOURCE_DIR;
-  env.PASEO_BRANCH_NAME = variables.OXBIT_BRANCH;
-  env.PASEO_WORKSPACE_ID = variables.OXBIT_WORKSPACE_ID;
-  env.PASEO_SCRIPTNAME = task.name;
+  const env2 = { ...base, ...variables };
+  env2.PASEO_SOURCE_CHECKOUT_PATH = variables.OXBIT_SOURCE_DIR;
+  env2.PASEO_WORKTREE_PATH = root;
+  env2.PASEO_ROOT_PATH = variables.OXBIT_SOURCE_DIR;
+  env2.PASEO_BRANCH_NAME = variables.OXBIT_BRANCH;
+  env2.PASEO_WORKSPACE_ID = variables.OXBIT_WORKSPACE_ID;
+  env2.PASEO_SCRIPTNAME = task.name;
   if (plan) {
-    env.PASEO_PORT = variables.OXBIT_PORT;
-    env.PASEO_URL = variables.OXBIT_URL;
-    env.PASEO_WORKTREE_PORT = variables.OXBIT_PORT;
-    env.PORT = variables.OXBIT_PORT;
-    env.HOST = variables.OXBIT_HOST;
+    env2.PASEO_PORT = variables.OXBIT_PORT;
+    env2.PASEO_URL = variables.OXBIT_URL;
+    env2.PASEO_WORKTREE_PORT = variables.OXBIT_PORT;
+    env2.PORT = variables.OXBIT_PORT;
+    env2.HOST = variables.OXBIT_HOST;
   }
   for (const [key, value] of Object.entries(variables))
     if (key.startsWith("OXBIT_SERVICE_"))
-      env[key.replace("OXBIT_", "PASEO_")] = value;
+      env2[key.replace("OXBIT_", "PASEO_")] = value;
   const custom = { ...catalog.env, ...task.env }, resolved = /* @__PURE__ */ new Set(), resolving = /* @__PURE__ */ new Set();
   function resolve(key) {
-    if (resolved.has(key)) return env[key];
+    if (resolved.has(key)) return env2[key];
     if (resolving.has(key))
       throw new RpcError(
         "UNRESOLVED_VARIABLE",
@@ -2505,13 +2541,13 @@ function taskEnvironment(store, task, ports, catalog, context = {}) {
       const other = match[1] ?? match[2];
       if (other !== key && Object.hasOwn(custom, other)) resolve(other);
     }
-    env[key] = expand(value, env);
+    env2[key] = expand(value, env2);
     resolving.delete(key);
     resolved.add(key);
-    return env[key];
+    return env2[key];
   }
   for (const key of Object.keys(custom)) resolve(key);
-  return { env, variables };
+  return { env: env2, variables };
 }
 function detectLinks(text2) {
   const clean = text2.replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "").replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
@@ -2519,11 +2555,11 @@ function detectLinks(text2) {
   for (const match of clean.matchAll(/https?:\/\/[^\s<>"'\x00-\x1f]+/g)) {
     const raw = match[0].replace(/[),.;\]}]+$/, "");
     try {
-      const url = new URL(raw);
-      if (!url.username && !url.password) {
-        if (["0.0.0.0", "[::]"].includes(url.hostname))
-          url.hostname = "localhost";
-        found.add(url.href);
+      const url2 = new URL(raw);
+      if (!url2.username && !url2.password) {
+        if (["0.0.0.0", "[::]"].includes(url2.hostname))
+          url2.hostname = "localhost";
+        found.add(url2.href);
       }
     } catch {
     }
@@ -2531,35 +2567,38 @@ function detectLinks(text2) {
   return [...found].slice(0, 32);
 }
 class TaskRunner {
-  constructor(store, emit, forwardPort) {
+  constructor(store, emit, forwardPort, shellEnvironment = async () => process.env) {
     this.store = store;
     this.emit = emit;
     this.forwardPort = forwardPort;
+    this.shellEnvironment = shellEnvironment;
     this.ports = new TaskPorts(store.root);
   }
   store;
   emit;
   forwardPort;
+  shellEnvironment;
   runs = /* @__PURE__ */ new Map();
   ports;
   publicPorts = /* @__PURE__ */ new Map();
   closed = false;
+  environment;
   publicLinks(run2, links) {
     if (!this.forwardPort) return links;
     const plan = this.ports.get(run2.task.id);
     return links.map((link) => {
       try {
-        const url = new URL(link), port2 = this.publicPorts.get(run2.task.id)?.get(Number(url.port || (url.protocol === "https:" ? 443 : 80)));
+        const url2 = new URL(link), port2 = this.publicPorts.get(run2.task.id)?.get(Number(url2.port || (url2.protocol === "https:" ? 443 : 80)));
         if (port2 && [
           "localhost",
           "127.0.0.1",
           "[::1]",
           plan?.hostname,
           plan?.host
-        ].includes(url.hostname)) {
-          url.hostname = "127.0.0.1";
-          url.port = String(port2);
-          return url.href;
+        ].includes(url2.hostname)) {
+          url2.hostname = "127.0.0.1";
+          url2.port = String(port2);
+          return url2.href;
         }
       } catch {
       }
@@ -2584,10 +2623,10 @@ class TaskRunner {
     for (const update of run2.updates) update();
     run2.updates.clear();
   }
-  state(run2, state2, message) {
-    if (run2.value.state === state2 && run2.value.message === message) return;
+  state(run2, state2, message2) {
+    if (run2.value.state === state2 && run2.value.message === message2) return;
     run2.value.state = state2;
-    run2.value.message = message;
+    run2.value.message = message2;
     this.publish(run2);
   }
   owned(id, owner) {
@@ -2685,10 +2724,10 @@ class TaskRunner {
       )
     );
   }
-  async runHook(owner, command, name, context, env, signal) {
+  async runHook(owner, command, name, context, env2, signal) {
     if (signal?.aborted)
       throw new RpcError("CANCELLED", "Worktree operation was cancelled");
-    const catalog = { ...await this.store.catalog(), tasks: [], env };
+    const catalog = { ...await this.store.catalog(), tasks: [], env: env2 };
     signal?.throwIfAborted();
     const run2 = this.begin(
       owner,
@@ -2822,12 +2861,14 @@ class TaskRunner {
   }
   async spawnAttempt(run2) {
     const generation = ++run2.generation;
-    const { env, variables } = taskEnvironment(
+    const base = await (this.environment ??= this.shellEnvironment(this.store.root));
+    const { env: env2, variables } = taskEnvironment(
       this.store,
       run2.task,
       this.ports,
       run2.catalog,
-      run2.context
+      run2.context,
+      base
     );
     await fs.mkdir(variables.OXBIT_PREINIT_DIR, {
       recursive: true,
@@ -2835,7 +2876,7 @@ class TaskRunner {
     });
     const cwd = path.resolve(
       run2.context.root ?? this.store.root,
-      expand(run2.task.cwd ?? ".", env)
+      expand(run2.task.cwd ?? ".", env2)
     );
     const real = await fs.realpath(cwd);
     const bound = await fs.realpath(run2.context.root ?? this.store.root), relative = path.relative(bound, real);
@@ -2844,7 +2885,7 @@ class TaskRunner {
         "INVALID_PATH",
         "Task working directory must be within this workspace"
       );
-    const args = (run2.task.args ?? []).map((arg) => expand(arg, env));
+    const args = (run2.task.args ?? []).map((arg) => expand(arg, env2));
     const plan = this.ports.get(run2.task.id);
     if (plan && this.forwardPort) {
       const forwarded = /* @__PURE__ */ new Map();
@@ -2866,15 +2907,15 @@ class TaskRunner {
     run2.readySeen = false;
     run2.timedOut = false;
     run2.tail = "";
-    const command = run2.task.execution === "process" ? expand(run2.task.command, env) : run2.task.command + (args.length ? " " + args.map(shellQuote).join(" ") : "");
+    const command = run2.task.execution === "process" ? expand(run2.task.command, env2) : run2.task.command + (args.length ? " " + args.map(shellQuote).join(" ") : "");
     const child = run2.task.execution === "process" ? spawn(command, args, {
       cwd: real,
-      env,
+      env: env2,
       detached: process.platform !== "win32",
       stdio: ["ignore", "pipe", "pipe"]
     }) : spawn(command, {
       cwd: real,
-      env,
+      env: env2,
       shell: true,
       detached: process.platform !== "win32",
       stdio: ["ignore", "pipe", "pipe"]
@@ -2958,19 +2999,19 @@ class TaskRunner {
       let healthy = !run2.task.ready?.pattern || run2.readySeen;
       try {
         if (run2.task.ready?.url) {
-          const url = new URL(
+          const url2 = new URL(
             expand(run2.task.ready.url, {
               ...process.env,
               ...run2.value.variables
             })
           );
-          if (!["http:", "https:"].includes(url.protocol) || url.username || url.password)
+          if (!["http:", "https:"].includes(url2.protocol) || url2.username || url2.password)
             throw new Error(
               "Readiness URL must use HTTP(S) without credentials"
             );
-          if (plan && url.hostname === plan.hostname)
-            url.hostname = plan.host === "0.0.0.0" ? "127.0.0.1" : plan.host;
-          const response = await fetch(url, {
+          if (plan && url2.hostname === plan.hostname)
+            url2.hostname = plan.host === "0.0.0.0" ? "127.0.0.1" : plan.host;
+          const response = await fetch(url2, {
             signal: AbortSignal.timeout(1500),
             redirect: "manual"
           });
@@ -3055,7 +3096,7 @@ class TaskRunner {
       await this.ports.reserveAgain(run2.task.id).catch(() => {
       });
   }
-  finish(run2, code, signal, message) {
+  finish(run2, code, signal, message2) {
     if (run2.ended) return;
     run2.ended = true;
     clearTimeout(run2.monitor);
@@ -3068,7 +3109,7 @@ class TaskRunner {
     this.state(
       run2,
       run2.stopRequested ? "stopped" : code === 0 && run2.task.type !== "service" ? "completed" : "failed",
-      message
+      message2
     );
     run2.doneResolve();
     this.emit(
@@ -3346,13 +3387,13 @@ ${command}`,
             "INVALID_STATE",
             "Switch to the source checkout before removing this worktree"
           );
-        const exists = await fs.lstat(record.path).catch((error) => {
+        const exists2 = await fs.lstat(record.path).catch((error) => {
           if (error.code === "ENOENT") return null;
           throw error;
         });
-        if (exists && (exists.isSymbolicLink() || await fs.realpath(record.path) !== record.path))
+        if (exists2 && (exists2.isSymbolicLink() || await fs.realpath(record.path) !== record.path))
           throw new RpcError("INVALID_STATE", "Managed worktree path changed");
-        if (exists) {
+        if (exists2) {
           const known = await this.git(
             ["worktree", "list", "--porcelain", "-z"],
             void 0,
@@ -3379,9 +3420,9 @@ ${command}`,
         record.operationPid = process.pid;
         record.message = void 0;
         await this.persist(records2);
-        let removed = !exists;
+        let removed = !exists2;
         try {
-          if (exists) {
+          if (exists2) {
             await this.phase(record, "preteardown", owner, signal);
             await this.runner.stopInDirectory(record.path);
             if (signal?.aborted)
@@ -3416,6 +3457,8 @@ function bounded(value) {
     );
   return value;
 }
+const BRANCH_DIFF_FILES = 50;
+const BRANCH_DIFF_TEXT = 2e5;
 const conflicted = (index, working) => ["DD", "AU", "UD", "UA", "DU", "AA", "UU"].includes(index + working);
 const digest$1 = (value) => createHash("sha256").update(value).digest("hex");
 class Git {
@@ -3642,14 +3685,14 @@ class Git {
         if (error.code !== "ENOENT") throw error;
       }
     }
-    const binary = diff.includes("Binary files ") || before.stdout.includes("\0") || after.includes("\0");
+    const binary2 = diff.includes("Binary files ") || before.stdout.includes("\0") || after.includes("\0");
     const pieces = diff.split(/(?=^@@ )/m);
-    const canHunk = !binary && !change?.conflict && !change?.originalPath && pieces.length > 1 && !/^(new file|deleted file|old mode|new mode|diff --cc)/m.test(diff) && (diff.match(/^diff --git /gm)?.length ?? 0) === 1;
+    const canHunk = !binary2 && !change?.conflict && !change?.originalPath && pieces.length > 1 && !/^(new file|deleted file|old mode|new mode|diff --cc)/m.test(diff) && (diff.match(/^diff --git /gm)?.length ?? 0) === 1;
     return bounded({
-      before: binary ? "" : before.exitCode ? "" : before.stdout,
-      after: binary ? "" : after,
+      before: binary2 ? "" : before.exitCode ? "" : before.stdout,
+      after: binary2 ? "" : after,
       diff,
-      binary,
+      binary: binary2,
       fingerprint: digest$1(diff),
       hunks: canHunk ? pieces.slice(1).map((patch, index) => ({
         index,
@@ -3746,18 +3789,18 @@ class Git {
     if (typeof params.path !== "string")
       throw new RpcError("INVALID_PARAMS", "A file path is required");
     await this.files.resolve(params.path, true);
-    const detail = await this.show(params.ref, signal), file = detail.files.find((file2) => file2.path === params.path);
+    const detail2 = await this.show(params.ref, signal), file = detail2.files.find((file2) => file2.path === params.path);
     if (!file)
       throw new RpcError("NOT_FOUND", "File is not part of this commit");
-    const before = detail.commit.parents[0] ? await this.optional(
+    const before = detail2.commit.parents[0] ? await this.optional(
       [
         "show",
-        `${detail.commit.parents[0]}:${file.originalPath ?? file.path}`
+        `${detail2.commit.parents[0]}:${file.originalPath ?? file.path}`
       ],
       signal
     ) : void 0;
     const after = await this.optional(
-      ["show", `${detail.commit.id}:${file.path}`],
+      ["show", `${detail2.commit.id}:${file.path}`],
       signal
     );
     const diff = await this.run(
@@ -3768,19 +3811,19 @@ class Git {
         "--no-ext-diff",
         "--no-textconv",
         "--no-color",
-        detail.commit.id,
+        detail2.commit.id,
         "--",
         file.path,
         ...file.originalPath ? [file.originalPath] : []
       ],
       signal
     );
-    const binary = diff.stdout.includes("Binary files ") || before?.stdout.includes("\0") || after.stdout.includes("\0");
+    const binary2 = diff.stdout.includes("Binary files ") || before?.stdout.includes("\0") || after.stdout.includes("\0");
     return bounded({
-      before: binary || before?.exitCode ? "" : before?.stdout ?? "",
-      after: binary || after.exitCode ? "" : after.stdout,
+      before: binary2 || before?.exitCode ? "" : before?.stdout ?? "",
+      after: binary2 || after.exitCode ? "" : after.stdout,
       diff: diff.stdout,
-      binary: !!binary
+      binary: !!binary2
     });
   }
   async stashes(signal) {
@@ -3826,6 +3869,88 @@ class Git {
       )).stdout
     });
   }
+  /** The upstream remote's default branch, then `origin/HEAD`, then local `main` or `master`. */
+  async baseBranch(branch, signal) {
+    const remote = branch ? (await this.optional(["config", "--get", `branch.${branch}.remote`], signal)).stdout.trim() : "";
+    const candidates = [
+      ...remote && remote !== "." ? [`refs/remotes/${remote}/HEAD`] : [],
+      "refs/remotes/origin/HEAD",
+      "refs/heads/main",
+      "refs/heads/master"
+    ];
+    for (const ref of candidates) {
+      const commit = await this.optional(
+        ["rev-parse", "--verify", "--quiet", "--end-of-options", `${ref}^{commit}`],
+        signal
+      );
+      if (commit.exitCode) continue;
+      const name = await this.optional(["rev-parse", "--abbrev-ref", ref], signal);
+      return { name: name.stdout.trim() || ref, commit: commit.stdout.trim() };
+    }
+    return void 0;
+  }
+  async untrackedPatch(relative, signal) {
+    const result = await this.run(
+      ["diff", "--no-index", "--no-ext-diff", "--no-textconv", "--no-color", "--src-prefix=a/", "--dst-prefix=b/", "--", "/dev/null", relative],
+      signal,
+      this.files.root,
+      void 0,
+      true
+    );
+    if (result.exitCode > 1)
+      throw new RpcError("GIT_FAILED", result.stderr.trim() || `Git exited ${result.exitCode}`);
+    return result.stdout;
+  }
+  /** Committed, staged, unstaged and untracked changes since the merge base with the base branch. */
+  async branchDiff(params, signal) {
+    const limit2 = Number(params.limit ?? BRANCH_DIFF_FILES);
+    if (!Number.isInteger(limit2) || limit2 < 0 || limit2 > BRANCH_DIFF_FILES)
+      throw new RpcError("INVALID_PARAMS", "Invalid file limit");
+    const inside = await this.optional(["rev-parse", "--is-inside-work-tree"], signal);
+    if (inside.exitCode || inside.stdout.trim() !== "true") {
+      if (inside.exitCode && !inside.stderr.includes("not a git repository"))
+        throw new RpcError("GIT_FAILED", inside.stderr.trim());
+      return { repository: false };
+    }
+    const head = await this.head(signal);
+    if (!head) throw new RpcError("NOT_FOUND", "This branch has no commits yet");
+    const branch = (await this.optional(["symbolic-ref", "-q", "--short", "HEAD"], signal)).stdout.trim();
+    const base = await this.baseBranch(branch, signal);
+    if (!base) throw new RpcError("NOT_FOUND", "No base branch: origin/HEAD, main and master are missing");
+    const mergeBase = await this.optional(["merge-base", base.commit, head], signal);
+    if (mergeBase.exitCode)
+      throw new RpcError("NOT_FOUND", `${branch || "HEAD"} has no common history with ${base.name}`);
+    const from = mergeBase.stdout.trim();
+    const names = async (args) => (await this.run(args, signal)).stdout.split("\0").filter(Boolean);
+    const tracked = await names(["diff", "--name-only", "--relative", "-z", from, "--"]);
+    const untracked = await names(["ls-files", "--others", "--exclude-standard", "-z", "--"]);
+    const files = [];
+    let size = 0, truncated = false;
+    for (const [index, relative] of [...tracked, ...untracked].entries()) {
+      if (files.length >= limit2 || size >= BRANCH_DIFF_TEXT) {
+        truncated = true;
+        break;
+      }
+      let diff = "";
+      try {
+        diff = index < tracked.length ? (await this.run(
+          ["diff", "--no-ext-diff", "--no-textconv", "--no-color", "--relative", "--src-prefix=a/", "--dst-prefix=b/", from, "--", relative],
+          signal
+        )).stdout : await this.untrackedPatch(relative, signal);
+      } catch (error) {
+        if (error.code !== "OUTPUT_LIMIT") throw error;
+        truncated = true;
+      }
+      const binary2 = /^Binary files /m.test(diff);
+      if (size + diff.length > BRANCH_DIFF_TEXT) {
+        diff = diff.slice(0, BRANCH_DIFF_TEXT - size);
+        truncated = true;
+      }
+      size += diff.length;
+      files.push({ path: relative, diff, binary: binary2 });
+    }
+    return bounded({ base: base.name, head: branch || head.slice(0, 7), files, truncated });
+  }
   async action(method, params, signal, progress) {
     const pending = this.queue.catch(() => {
     }).then(() => this.execute(method, params, signal, progress));
@@ -4319,9 +4444,9 @@ class ExternalSources {
     }
   }
   async authorize(uri) {
-    const url = new URL(uri);
-    if (url.protocol !== "file:" || url.host || url.search || url.hash) throw new RpcError("PATH_DENIED", "External sources require local file URIs");
-    const file = await fs.realpath(fileURLToPath(url));
+    const url2 = new URL(uri);
+    if (url2.protocol !== "file:" || url2.host || url2.search || url2.hash) throw new RpcError("PATH_DENIED", "External sources require local file URIs");
+    const file = await fs.realpath(fileURLToPath(url2));
     if (!this.roots.some((root) => contains(root, file))) throw new RpcError("PATH_DENIED", "Source is outside registered dependency roots");
     const stat = await fs.stat(file);
     if (!stat.isFile() || stat.size > 20 * 1024 * 1024) throw new RpcError("PATH_DENIED", "Source is not a supported text file");
@@ -4331,16 +4456,16 @@ class ExternalSources {
     return { handle, uri, name: path.basename(file), readonly: true };
   }
   async read(handle) {
-    const entry = this.handles.get(handle);
-    if (!entry || !this.roots.some((root) => contains(root, entry.file)) || await fs.realpath(entry.file) !== entry.file) throw new RpcError("PATH_DENIED", "External source handle expired");
-    const descriptor = await fs.open(entry.file, constants$1.O_RDONLY | constants$1.O_NOFOLLOW);
+    const entry2 = this.handles.get(handle);
+    if (!entry2 || !this.roots.some((root) => contains(root, entry2.file)) || await fs.realpath(entry2.file) !== entry2.file) throw new RpcError("PATH_DENIED", "External source handle expired");
+    const descriptor = await fs.open(entry2.file, constants$1.O_RDONLY | constants$1.O_NOFOLLOW);
     try {
       const stat = await descriptor.stat();
       if (!stat.isFile() || stat.size > 20 * 1024 * 1024) throw new RpcError("PATH_DENIED", "External source is not a supported text file");
       const bytes = await descriptor.readFile();
-      const current = await fs.stat(entry.file);
-      if (stat.dev !== current.dev || stat.ino !== current.ino || bytes.length > 20 * 1024 * 1024 || await fs.realpath(entry.file) !== entry.file || bytes.includes(0)) throw new RpcError("PATH_DENIED", "External source changed or is binary");
-      return { handle, uri: entry.uri, name: path.basename(entry.file), text: new TextDecoder("utf-8", { fatal: true }).decode(bytes), revision: createHash("sha256").update(bytes).digest("hex"), readonly: true };
+      const current = await fs.stat(entry2.file);
+      if (stat.dev !== current.dev || stat.ino !== current.ino || bytes.length > 20 * 1024 * 1024 || await fs.realpath(entry2.file) !== entry2.file || bytes.includes(0)) throw new RpcError("PATH_DENIED", "External source changed or is binary");
+      return { handle, uri: entry2.uri, name: path.basename(entry2.file), text: new TextDecoder("utf-8", { fatal: true }).decode(bytes), revision: createHash("sha256").update(bytes).digest("hex"), readonly: true };
     } finally {
       await descriptor.close();
     }
@@ -4531,17 +4656,17 @@ class LanguageServer {
       }
     }
   }
-  send(message) {
-    if (message.id !== void 0 && !message.method) {
-      const pending = this.incoming.get(message.id);
+  send(message2) {
+    if (message2.id !== void 0 && !message2.method) {
+      const pending = this.incoming.get(message2.id);
       if (!pending) return;
-      this.incoming.delete(message.id);
-      if (message.error) pending.reject(new ResponseError(message.error.code, message.error.message, message.error.data));
-      else pending.resolve(message.result);
+      this.incoming.delete(message2.id);
+      if (message2.error) pending.reject(new ResponseError(message2.error.code, message2.error.message, message2.error.data));
+      else pending.resolve(message2.result);
       return;
     }
     if (!this.rpc) throw new RpcError("LSP_UNAVAILABLE", "Language server is stopped");
-    void this.rpc.sendNotification(message.method, ...Array.isArray(message.params) ? message.params : [message.params]).catch((error) => {
+    void this.rpc.sendNotification(message2.method, ...Array.isArray(message2.params) ? message2.params : [message2.params]).catch((error) => {
       if (this.rpc) this.emit("window/logMessage", { type: 1, message: String(error) });
     });
   }
@@ -4577,7 +4702,10 @@ class LanguageServer {
     if (resume) this.paused = false;
     if (!resume && this.phase === "failed") throw new RpcError("LSP_FAILED", this.error || "Language server failed. Retry from Language Servers.");
     if (this.paused) throw new RpcError("LSP_STOPPED", "Language server is stopped. Start it from Language Servers.");
-    if (this.starting) return this.starting;
+    if (this.starting) {
+      this.emit("oxbit/serverState", { state: this.phase });
+      return this.starting;
+    }
     if (this.child && this.capabilities)
       return { capabilities: this.capabilities, registrations: [...this.registrations.values()], rootUri: this.uri(""), projectRootUri: pathToFileURL(this.options.root ?? this.files.root).href, version: this.launchSpec?.version };
     this.error = "";
@@ -4696,12 +4824,12 @@ class LanguageServer {
     });
     connection.listen();
     this.child.stderr.on("data", (data) => {
-      let message = data.toString().slice(0, 16e3);
+      let message2 = data.toString().slice(0, 16e3);
       const key = this.launchSpec?.initializationOptions?.licenceKey;
-      if (typeof key === "string" && key) message = message.replaceAll(key, "[redacted]");
-      this.output.push(message);
+      if (typeof key === "string" && key) message2 = message2.replaceAll(key, "[redacted]");
+      this.output.push(message2);
       while (this.output.join("").length > 16e3) this.output.shift();
-      this.emit("window/logMessage", { type: 4, message });
+      this.emit("window/logMessage", { type: 4, message: message2 });
     });
     const launched = this.child;
     this.child.on("error", (error) => {
@@ -4762,61 +4890,61 @@ class LanguageServer {
     this.emit("oxbit/serverState", { state: "running", name: this.serverName });
     return { capabilities: this.capabilities, registrations: [...this.registrations.values()], rootUri: this.uri(""), projectRootUri: pathToFileURL(this.options.root ?? this.files.root).href, version: this.launchSpec?.version };
   }
-  receive(message) {
-    if (setting("LSP_TRACE")) this.emit("window/logMessage", { type: 4, message: `${this.serverName}: ${message.method ?? "response"}` });
-    if (message.id !== void 0 && message.method) {
-      if (message.method === "vscode/content" && this.launchSpec?.schemaContent) {
+  receive(message2) {
+    if (setting("LSP_TRACE")) this.emit("window/logMessage", { type: 4, message: `${this.serverName}: ${message2.method ?? "response"}` });
+    if (message2.id !== void 0 && message2.method) {
+      if (message2.method === "vscode/content" && this.launchSpec?.schemaContent) {
         const connection = this.rpc;
-        const uri = Array.isArray(message.params) && message.params.length === 1 ? message.params[0] : message.params;
+        const uri = Array.isArray(message2.params) && message2.params.length === 1 ? message2.params[0] : message2.params;
         void this.launchSpec.schemaContent(uri).then(
           (result) => {
-            if (this.rpc === connection) this.send({ id: message.id, result });
+            if (this.rpc === connection) this.send({ id: message2.id, result });
           },
           (error) => {
-            if (this.rpc === connection) this.send({ id: message.id, error: { code: -32603, message: String(error) } });
+            if (this.rpc === connection) this.send({ id: message2.id, error: { code: -32603, message: String(error) } });
           }
         );
         return;
       }
-      if (["workspace/semanticTokens/refresh", "workspace/inlayHint/refresh"].includes(message.method)) {
-        this.emit("oxbit/refresh", { method: message.method });
-        this.send({ id: message.id, result: null });
+      if (["workspace/semanticTokens/refresh", "workspace/inlayHint/refresh"].includes(message2.method)) {
+        this.emit("oxbit/refresh", { method: message2.method });
+        this.send({ id: message2.id, result: null });
         return;
       }
-      if (message.method === "window/showMessageRequest") {
+      if (message2.method === "window/showMessageRequest") {
         const connection = this.rpc;
         const timer = setTimeout(() => {
-          if (this.rpc === connection) this.send({ id: message.id, result: null });
+          if (this.rpc === connection) this.send({ id: message2.id, result: null });
         }, 3e4);
         timer.unref();
-        this.emit("oxbit/serverRequest", { id: message.id, method: message.method, params: message.params });
+        this.emit("oxbit/serverRequest", { id: message2.id, method: message2.method, params: message2.params });
         return;
       }
-      if (message.method === "workspace/applyEdit") {
+      if (message2.method === "workspace/applyEdit") {
         const child = this.child;
         void (async () => {
-          await this.validate(message.params?.edit);
-          return this.applyEdit ? await this.applyEdit(message.params.edit, message.params.label) : { applied: false, failureReason: "No initiating document client is available" };
+          await this.validate(message2.params?.edit);
+          return this.applyEdit ? await this.applyEdit(message2.params.edit, message2.params.label) : { applied: false, failureReason: "No initiating document client is available" };
         })().catch((error) => ({ applied: false, failureReason: String(error) })).then((result) => {
-          if (this.child === child) this.send({ jsonrpc: "2.0", id: message.id, result });
+          if (this.child === child) this.send({ jsonrpc: "2.0", id: message2.id, result });
         });
         return;
       }
-      if (message.method === "client/registerCapability" || message.method === "client/unregisterCapability") {
-        const adding = message.method === "client/registerCapability";
-        const registrations = adding ? message.params?.registrations : message.params?.unregisterations;
+      if (message2.method === "client/registerCapability" || message2.method === "client/unregisterCapability") {
+        const adding = message2.method === "client/registerCapability";
+        const registrations = adding ? message2.params?.registrations : message2.params?.unregisterations;
         const syncMethods = ["textDocument/didOpen", "textDocument/didClose", "textDocument/didChange", "textDocument/didSave", "textDocument/willSave", "textDocument/willSaveWaitUntil"];
         const watcherShape = (watcher) => (typeof watcher?.globPattern === "string" || typeof watcher?.globPattern?.pattern === "string") && (watcher.kind === void 0 || Number.isInteger(watcher.kind) && watcher.kind >= 1 && watcher.kind <= 7);
         const supported = (item) => item && typeof item.id === "string" && (lspCapabilityKeys[item.method] || syncMethods.includes(item.method) || item.method === "workspace/didChangeConfiguration" || item.method === "workspace/didChangeWorkspaceFolders" || item.method === "workspace/didChangeWatchedFiles" && Array.isArray(item.registerOptions?.watchers) && item.registerOptions.watchers.every(watcherShape));
         if (!Array.isArray(registrations) || new Set(registrations.map((item) => item?.id)).size !== registrations.length || registrations.some((item) => adding ? !supported(item) || this.registrations.has(item.id) : this.registrations.get(item.id)?.method !== item.method)) {
-          this.send({ id: message.id, error: { code: -32602, message: "Unsupported or unknown capability registration" } });
+          this.send({ id: message2.id, error: { code: -32602, message: "Unsupported or unknown capability registration" } });
         } else {
           const previousSync = new Map([...this.documents.keys()].map((uri) => [uri, this.syncOptions(uri).openClose]));
           for (const item of registrations) {
             if (adding) this.registrations.set(item.id, item);
             else this.registrations.delete(item.id);
           }
-          this.send({ id: message.id, result: null });
+          this.send({ id: message2.id, result: null });
           for (const [uri, wasOpen] of previousSync) {
             const isOpen = this.syncOptions(uri).openClose;
             if (!wasOpen && isOpen) this.opened(uri);
@@ -4826,15 +4954,15 @@ class LanguageServer {
         }
         return;
       }
-      if (message.method === "workspace/workspaceFolders") {
-        this.send({ jsonrpc: "2.0", id: message.id, result: [{ uri: pathToFileURL(this.options.root ?? this.files.root).href, name: path.basename(this.options.root ?? this.files.root) }] });
+      if (message2.method === "workspace/workspaceFolders") {
+        this.send({ jsonrpc: "2.0", id: message2.id, result: [{ uri: pathToFileURL(this.options.root ?? this.files.root).href, name: path.basename(this.options.root ?? this.files.root) }] });
         return;
       }
-      if (message.method === "workspace/configuration")
+      if (message2.method === "workspace/configuration")
         this.send({
           jsonrpc: "2.0",
-          id: message.id,
-          result: (message.params?.items ?? []).map((item) => {
+          id: message2.id,
+          result: (message2.params?.items ?? []).map((item) => {
             if (item.scopeUri) {
               try {
                 const scope = fileURLToPath(item.scopeUri), root = this.options.root ?? this.files.root;
@@ -4849,28 +4977,28 @@ class LanguageServer {
             return item.section.split(".").reduce((value, key) => value?.[key], settings) ?? null;
           })
         });
-      else if (message.method === "window/workDoneProgress/create")
-        this.send({ jsonrpc: "2.0", id: message.id, result: null });
-      else this.send({ jsonrpc: "2.0", id: message.id, error: { code: -32601, message: `Unsupported server request ${message.method}` } });
+      else if (message2.method === "window/workDoneProgress/create")
+        this.send({ jsonrpc: "2.0", id: message2.id, result: null });
+      else this.send({ jsonrpc: "2.0", id: message2.id, error: { code: -32601, message: `Unsupported server request ${message2.method}` } });
       return;
     }
-    if (message.method === "tsserver/request" && this.companion) {
+    if (message2.method === "tsserver/request" && this.companion) {
       const child = this.child;
-      for (const [id, command, payload] of Array.isArray(message.params?.[0]) ? message.params : [message.params]) void this.companion.request("workspace/executeCommand", {
+      for (const [id, command, payload] of Array.isArray(message2.params?.[0]) ? message2.params : [message2.params]) void this.companion.request("workspace/executeCommand", {
         command: "typescript.tsserverRequest",
         arguments: [command, payload]
       }).catch(() => null).then((result) => {
-        if (this.child === child) this.send({ jsonrpc: "2.0", method: "tsserver/response", params: Array.isArray(message.params?.[0]) ? [[id, result?.body ?? null]] : [id, result?.body ?? null] });
+        if (this.child === child) this.send({ jsonrpc: "2.0", method: "tsserver/response", params: Array.isArray(message2.params?.[0]) ? [[id, result?.body ?? null]] : [id, result?.body ?? null] });
       });
       return;
     }
-    if (message.method === "textDocument/publishDiagnostics" && this.launchSpec?.diagnostics) message.params = { ...message.params, diagnostics: this.launchSpec.diagnostics(message.params.diagnostics ?? []) };
-    if (message.method === "textDocument/publishDiagnostics" && this.companion) {
-      this.primaryDiagnostics.set(message.params.uri, message.params.diagnostics ?? []);
-      this.emit(message.method, { ...message.params, diagnostics: [...message.params.diagnostics ?? [], ...this.companionDiagnostics.get(message.params.uri) ?? []] });
+    if (message2.method === "textDocument/publishDiagnostics" && this.launchSpec?.diagnostics) message2.params = { ...message2.params, diagnostics: this.launchSpec.diagnostics(message2.params.diagnostics ?? []) };
+    if (message2.method === "textDocument/publishDiagnostics" && this.companion) {
+      this.primaryDiagnostics.set(message2.params.uri, message2.params.diagnostics ?? []);
+      this.emit(message2.method, { ...message2.params, diagnostics: [...message2.params.diagnostics ?? [], ...this.companionDiagnostics.get(message2.params.uri) ?? []] });
       return;
     }
-    if (message.method && !this.options.onServerMessage?.(message.method, message.params)) this.emit(message.method, message.params);
+    if (message2.method && !this.options.onServerMessage?.(message2.method, message2.params)) this.emit(message2.method, message2.params);
   }
   respond(id, result) {
     this.send({ id, result });
@@ -5101,8 +5229,8 @@ async function dependencyRoots(root, signal) {
       for (const base of resolve.resolve.paths(name) ?? []) {
         try {
           const installed = await fs.realpath(path.join(base, name));
-          const pkg = JSON.parse(await fs.readFile(path.join(installed, "package.json"), "utf8"));
-          if (pkg.name !== name || installed === path.parse(installed).root) break;
+          const pkg2 = JSON.parse(await fs.readFile(path.join(installed, "package.json"), "utf8"));
+          if (pkg2.name !== name || installed === path.parse(installed).root) break;
           if (!roots.has(installed)) {
             roots.add(installed);
             queue.push({ directory: installed, development: false });
@@ -5207,6 +5335,47 @@ function deferToRuff(spec) {
     diagnostics: (diagnostics) => diagnostics.filter((item) => item.code !== void 0)
   };
 }
+const phpProbes = [
+  { command: ["herd", "which-php"], php: (output) => output.includes("No usable PHP version found") ? void 0 : [output.trim()] },
+  { command: ["valet", "which-php"], php: (output) => [output.trim()] },
+  { command: ["./vendor/bin/sail", "ps"], php: () => ["./vendor/bin/sail", "php"] },
+  { command: ["lando", "php", "-r", "echo PHP_BINARY;"], php: () => ["lando", "php"] },
+  { command: ["ddev", "php", "-r", "echo PHP_BINARY;"], php: () => ["ddev", "php"] },
+  { command: ["php", "-r", "echo PHP_BINARY;"], php: (output) => [output.trim()] }
+];
+function probe(command, cwd, env2, timeout, signal) {
+  return new Promise((resolve) => {
+    const child = spawn(command[0], command.slice(1), { cwd, env: env2, detached: process.platform !== "win32", stdio: ["ignore", "pipe", "ignore"] });
+    trackChild(child);
+    let output = "";
+    const finish = (value) => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", stop2);
+      resolve(value);
+    };
+    const stop2 = () => {
+      killProcess(child);
+      finish();
+    };
+    const timer = setTimeout(stop2, timeout);
+    signal?.addEventListener("abort", stop2, { once: true });
+    child.stdout.on("data", (data) => {
+      output = (output + data.toString()).slice(-4096);
+    });
+    child.on("error", () => finish());
+    child.on("close", (code) => finish(code === 0 ? output : void 0));
+  });
+}
+async function laravelPhpCommand(root, env2, signal, timeout = 5e3) {
+  for (const { command, php } of phpProbes) {
+    signal?.throwIfAborted();
+    const output = await probe(command, root, env2, timeout, signal);
+    const found = output === void 0 ? void 0 : php(output);
+    if (found?.[0]) return found;
+  }
+  signal?.throwIfAborted();
+  throw new Error("Laravel needs PHP on the runtime host. No PHP was found through Herd, Valet, Sail, Lando, DDEV or php on PATH. Install PHP or set languageServers.laravel.initializationOptions.phpCommand.");
+}
 const npmPresets = {
   typescript: ["typescript-language-server", "lib/cli.mjs", ["typescript"]],
   html: ["vscode-langservers-extracted", "bin/vscode-html-language-server"],
@@ -5222,11 +5391,11 @@ const npmPresets = {
 };
 async function resolveLaunch(id, root, installer, signal) {
   if (id === "laravel" || id === "ruff") {
-    const binary = await installer.native(id, signal);
-    return { executable: binary.executable, args: id === "ruff" ? ["server"] : [], version: binary.version };
+    const binary2 = await installer.native(id, signal);
+    return { executable: binary2.executable, args: id === "ruff" ? ["server"] : [], version: binary2.version };
   }
   if (id === "marksman" || id === "taplo") {
-    const binary = await installer.native(id, signal);
+    const binary2 = await installer.native(id, signal);
     const schemaDirectory = path.join(installer.cache, "schemas");
     if (id === "taplo") {
       await fs.mkdir(schemaDirectory, { recursive: true });
@@ -5234,9 +5403,9 @@ async function resolveLaunch(id, root, installer, signal) {
       await fs.writeFile(path.join(schemaDirectory, "cargo-config.json"), JSON.stringify(cargoConfigSchema));
     }
     return {
-      executable: binary.executable,
+      executable: binary2.executable,
       args: id === "marksman" ? ["server"] : ["lsp", "stdio"],
-      version: binary.version,
+      version: binary2.version,
       ...id === "marksman" ? { env: { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: "1", DOTNET_CLI_TELEMETRY_OPTOUT: "1" } } : {},
       ...id === "taplo" ? { dependencyRoots: [schemaDirectory], settingsSection: "evenBetterToml", initializationOptions: { cachePath: path.join(installer.cache, "taplo-schemas"), configurationSection: "evenBetterToml" }, settings: { evenBetterToml: { schema: { enabled: true, catalogs: [], associations: {
         "(^|/)Cargo\\.toml$": pathToFileURL(path.join(schemaDirectory, "cargo.json")).href,
@@ -5253,9 +5422,9 @@ async function resolveLaunch(id, root, installer, signal) {
       settings: { xml: { telemetry: { enabled: false }, downloadExternalResources: { enabled: false } } }
     };
   }
-  const entry = npmPresets[id];
-  if (!entry) throw new Error(`Unknown language server preset: ${id}`);
-  const [name, bin, dependencies = []] = entry;
+  const entry2 = npmPresets[id];
+  if (!entry2) throw new Error(`Unknown language server preset: ${id}`);
+  const [name, bin, dependencies = []] = entry2;
   const installation = await installer.npm(id, [name, ...dependencies], signal);
   const modules = path.join(installation.directory, "node_modules");
   const bootstrap = await consoleBootstrap(installer.cache);
@@ -5322,10 +5491,10 @@ function lockedPackages(roots) {
   const selected = /* @__PURE__ */ new Map();
   function visit(location) {
     if (selected.has(location)) return;
-    const entry = packages[location];
-    if (!entry?.resolved || !entry.integrity || !entry.version) throw new Error(`Missing locked package: ${location}`);
-    selected.set(location, entry);
-    for (const name of Object.keys({ ...entry.dependencies, ...entry.optionalDependencies })) {
+    const entry2 = packages[location];
+    if (!entry2?.resolved || !entry2.integrity || !entry2.version) throw new Error(`Missing locked package: ${location}`);
+    selected.set(location, entry2);
+    for (const name of Object.keys({ ...entry2.dependencies, ...entry2.optionalDependencies })) {
       let base = location, found;
       while (true) {
         const candidate = `${base ? base + "/" : ""}node_modules/${name}`;
@@ -5337,7 +5506,7 @@ function lockedPackages(roots) {
         base = base.includes("/node_modules/") ? base.slice(0, base.lastIndexOf("/node_modules/")) : "";
       }
       if (found) visit(found);
-      else if (!entry.optionalDependencies?.[name]) throw new Error(`Unresolved locked dependency: ${name}`);
+      else if (!entry2.optionalDependencies?.[name]) throw new Error(`Unresolved locked dependency: ${name}`);
     }
   }
   roots.forEach((name) => visit(`node_modules/${name}`));
@@ -5356,13 +5525,13 @@ class ManagedInstaller {
   cache;
   platform;
   download;
-  async bytes(url, integrity, signal) {
-    if (!url.startsWith("https://")) throw new Error("Managed artifacts require HTTPS");
+  async bytes(url2, integrity, signal) {
+    if (!url2.startsWith("https://")) throw new Error("Managed artifacts require HTTPS");
     let failure2;
     for (let attempt = 0; attempt < 3; attempt++) {
       signal?.throwIfAborted();
       try {
-        const response = await this.download(url, { signal: AbortSignal.any([AbortSignal.timeout(12e4), ...signal ? [signal] : []]) });
+        const response = await this.download(url2, { signal: AbortSignal.any([AbortSignal.timeout(12e4), ...signal ? [signal] : []]) });
         if (!response.ok || !response.body) throw new Error(`Artifact download failed (${response.status})`);
         const chunks = [];
         let size = 0;
@@ -5395,13 +5564,13 @@ class ManagedInstaller {
         strict: true,
         preservePaths: false,
         filter(name, candidate) {
-          const entry = candidate;
+          const entry2 = candidate;
           const normalized = name.split("/").slice(strip).join("/");
           if (name.startsWith("/") || name.includes("\\") || name.split("/").includes("..")) rejection ??= new Error("Unsafe archive path");
-          else if (!["File", "OldFile", "Directory", "SymbolicLink"].includes(entry.type)) rejection ??= new Error("Unsupported archive entry");
-          else if (entry.type === "SymbolicLink") {
-            const target = path.resolve(directory, path.dirname(normalized), entry.linkpath ?? "");
-            if (path.isAbsolute(entry.linkpath ?? "") || !target.startsWith(directory + path.sep)) rejection ??= new Error("Archive link leaves installation");
+          else if (!["File", "OldFile", "Directory", "SymbolicLink"].includes(entry2.type)) rejection ??= new Error("Unsupported archive entry");
+          else if (entry2.type === "SymbolicLink") {
+            const target = path.resolve(directory, path.dirname(normalized), entry2.linkpath ?? "");
+            if (path.isAbsolute(entry2.linkpath ?? "") || !target.startsWith(directory + path.sep)) rejection ??= new Error("Archive link leaves installation");
           }
           return !rejection;
         }
@@ -5447,19 +5616,22 @@ class ManagedInstaller {
             }
           }
         } catch {
-          try {
-            if (Date.now() - (await fs.stat(lock)).mtimeMs > 6e4) {
-              await fs.rm(lock, { recursive: true, force: true });
-              continue;
-            }
-          } catch {
+        }
+        try {
+          if (Date.now() - (await fs.stat(lock)).mtimeMs > 6e4) {
+            await fs.rm(lock, { recursive: true, force: true });
+            continue;
           }
+        } catch {
         }
         if (Date.now() > deadline) throw new Error("Timed out waiting for another language server installation");
         await setTimeout$1(100, void 0, { signal });
       }
     }
     const stage = path.join(base, `.staging-${randomUUID()}`);
+    const heartbeat = setInterval(() => void fs.utimes(lock, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date()).catch(() => {
+    }), 1e4);
+    heartbeat.unref();
     try {
       if (await complete()) return target;
       for (const name of await fs.readdir(base)) if (name.startsWith(".staging-")) await fs.rm(path.join(base, name), { recursive: true, force: true });
@@ -5475,6 +5647,7 @@ class ManagedInstaller {
       await fs.rename(stage, target);
       return target;
     } finally {
+      clearInterval(heartbeat);
       await fs.rm(stage, { recursive: true, force: true });
       await fs.rm(lock, { recursive: true, force: true });
     }
@@ -5485,7 +5658,7 @@ class ManagedInstaller {
       const queue = [...entries].sort(([a], [b]) => a.split("/").length - b.split("/").length);
       for (let start = 0; start < queue.length; start += 6) {
         const batch = queue.slice(start, start + 6);
-        const bytes = await Promise.all(batch.map(([, entry]) => this.bytes(entry.resolved, entry.integrity, signal)));
+        const bytes = await Promise.all(batch.map(([, entry2]) => this.bytes(entry2.resolved, entry2.integrity, signal)));
         for (const [index, [location]] of batch.entries()) {
           signal?.throwIfAborted();
           await this.extract(bytes[index], path.join(stage, location), 1);
@@ -5540,17 +5713,17 @@ class JsonSchemas {
     uri.hash = "";
     return uri.href;
   }
-  async cached(url) {
+  async cached(url2) {
     try {
-      const file = path.join(this.cache, digest(url) + ".json");
+      const file = path.join(this.cache, digest(url2) + ".json");
       if ((await fs.stat(file)).size > maxBytes * 3) return;
       const value = JSON.parse(await fs.readFile(file, "utf8"));
-      if (value.url === url && typeof value.text === "string" && typeof value.fetchedAt === "number" && value.integrity === digest(value.text)) return value;
+      if (value.url === url2 && typeof value.text === "string" && typeof value.fetchedAt === "number" && value.integrity === digest(value.text)) return value;
     } catch {
     }
   }
-  async fetchJson(url) {
-    let current = url;
+  async fetchJson(url2) {
+    let current = url2;
     const signal = AbortSignal.any([this.abort.signal, AbortSignal.timeout(8e3)]);
     for (let redirects = 0; redirects < 6; redirects++) {
       const response = await this.download(current, { signal, redirect: "manual", headers: { Accept: "application/schema+json, application/json" } });
@@ -5584,47 +5757,47 @@ class JsonSchemas {
     throw new Error("Too many JSON schema redirects");
   }
   async remote(value, enabled) {
-    const url = this.remoteUri(value), cached2 = await this.cached(url);
+    const url2 = this.remoteUri(value), cached2 = await this.cached(url2);
     if (cached2 && (!enabled || Date.now() - cached2.fetchedAt < maxAge)) return cached2.text;
     if (!enabled) throw new Error("Schema downloads are disabled and this schema is not cached");
-    if ((this.failures.get(url) ?? 0) > Date.now()) {
+    if ((this.failures.get(url2) ?? 0) > Date.now()) {
       if (cached2) return cached2.text;
       throw new Error("Schema download is temporarily unavailable");
     }
-    let pending = this.pending.get(url);
+    let pending = this.pending.get(url2);
     if (!pending) {
       pending = (async () => {
         try {
-          const text2 = await this.fetchJson(url);
+          const text2 = await this.fetchJson(url2);
           await fs.mkdir(this.cache, { recursive: true, mode: 448 });
-          const target = path.join(this.cache, digest(url) + ".json"), temporary = target + "." + randomUUID();
+          const target = path.join(this.cache, digest(url2) + ".json"), temporary = target + "." + randomUUID();
           try {
-            await fs.writeFile(temporary, JSON.stringify({ url, fetchedAt: Date.now(), integrity: digest(text2), text: text2 }), { mode: 384 });
+            await fs.writeFile(temporary, JSON.stringify({ url: url2, fetchedAt: Date.now(), integrity: digest(text2), text: text2 }), { mode: 384 });
             await fs.rename(temporary, target);
           } finally {
             await fs.rm(temporary, { force: true });
           }
           return text2;
         } catch (error) {
-          this.failures.set(url, Date.now() + 6e4);
+          this.failures.set(url2, Date.now() + 6e4);
           if (cached2) return cached2.text;
           throw error;
         } finally {
-          this.pending.delete(url);
+          this.pending.delete(url2);
         }
       })();
-      this.pending.set(url, pending);
+      this.pending.set(url2, pending);
     }
     return pending;
   }
   async content(uri, enabled = true) {
     if (typeof uri !== "string" || uri.length > 8192) throw new Error("Invalid schema URI");
-    const url = new URL(uri);
-    url.hash = "";
-    if (url.href === SETTINGS_SCHEMA_URI || this.settingsPaths.schemaFile && url.href === pathToFileURL(this.settingsPaths.schemaFile).href) return JSON.stringify(settingsSchema);
-    if (url.protocol === "file:") {
-      url.hash = "";
-      const file = await this.files.resolve(path.relative(this.files.root, fileURLToPath(url)).split(path.sep).join("/"));
+    const url2 = new URL(uri);
+    url2.hash = "";
+    if (url2.href === SETTINGS_SCHEMA_URI || this.settingsPaths.schemaFile && url2.href === pathToFileURL(this.settingsPaths.schemaFile).href) return JSON.stringify(settingsSchema);
+    if (url2.protocol === "file:") {
+      url2.hash = "";
+      const file = await this.files.resolve(path.relative(this.files.root, fileURLToPath(url2)).split(path.sep).join("/"));
       if ((await fs.stat(file)).size > maxBytes) throw new Error("JSON schema exceeds 5 MiB");
       return fs.readFile(file, "utf8");
     }
@@ -5773,6 +5946,8 @@ class LanguageServerManager {
           else spec = await resolveLaunch(definition2.id, root, this.installer, signal);
           spec = { ...spec, args: definition2.args ?? spec.args, env: { ...spec.env, ...definition2.env }, initializationOptions: merge(spec.initializationOptions, definition2.initializationOptions), settings: merge(spec.settings, definition2.settings) };
           if (ruff) spec = deferToRuff(spec);
+          if (definition2.id === "laravel" && !spec.initializationOptions?.phpCommand && (spec.initializationOptions?.phpEnvironment ?? "auto") === "auto")
+            spec.initializationOptions = { ...spec.initializationOptions, phpCommand: await laravelPhpCommand(root, { ...process.env, ...spec.env }, signal) };
           if (definition2.id === "json") {
             const options2 = this.project ? (await this.project.reload()).schemas : { catalog: true, download: true, associations: [] };
             spec.settings = await this.schemas.settings(spec.settings ?? {}, options2);
@@ -5813,7 +5988,7 @@ class LanguageServerManager {
       if (!instance.attachments.size && !instance.idle) {
         instance.idle = setTimeout(() => {
           instance.idle = void 0;
-          void this.stop(false, instance.id);
+          if (this.instances.get(instance.id) === instance) void this.stop(false, instance.id);
         }, this.idleMs);
         instance.idle.unref();
       }
@@ -6092,24 +6267,24 @@ class ProjectStore {
       } catch {
       }
       const entries = await fs.readdir(directoryPath, { withFileTypes: true }).catch(() => []);
-      for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
-        const relative = path.posix.join(directory, entry.name);
-        if (entry.isSymbolicLink() || entry.name.startsWith(".oxbit-tmp-") || config.intelligence.exclude.some((pattern) => matchesFilePattern(pattern, relative) || matchesFilePattern(pattern, relative + "/"))) continue;
+      for (const entry2 of entries.sort((a, b) => a.name.localeCompare(b.name))) {
+        const relative = path.posix.join(directory, entry2.name);
+        if (entry2.isSymbolicLink() || entry2.name.startsWith(".oxbit-tmp-") || config.intelligence.exclude.some((pattern) => matchesFilePattern(pattern, relative) || matchesFilePattern(pattern, relative + "/"))) continue;
         let ignored = false;
         for (const [base, rules] of ignores) if (!base || relative.startsWith(base + "/")) {
-          const match = rules.test(relative.slice(base ? base.length + 1 : 0) + (entry.isDirectory() ? "/" : ""));
+          const match = rules.test(relative.slice(base ? base.length + 1 : 0) + (entry2.isDirectory() ? "/" : ""));
           if (match.ignored) ignored = true;
           else if (match.unignored) ignored = false;
         }
         if (ignored) continue;
-        if (entry.isDirectory()) {
-          if (!excludedDirectories.has(entry.name)) {
+        if (entry2.isDirectory()) {
+          if (!excludedDirectories.has(entry2.name)) {
             if (queue.length < config.intelligence.maxFiles) queue.push(relative);
             else result.truncated = true;
           }
           continue;
         }
-        if (!entry.isFile()) continue;
+        if (!entry2.isFile()) continue;
         if (result.files.length >= config.intelligence.maxFiles) {
           result.truncated = true;
           break;
@@ -6134,12 +6309,12 @@ class ProjectStore {
           const text2 = await fs.readFile(full, "utf8").catch(() => "");
           bytes += stat.size;
           texts.set(full, text2);
-          if (entry.name === "package.json" || entry.name === "composer.json") {
+          if (entry2.name === "package.json" || entry2.name === "composer.json") {
             try {
-              const data = JSON.parse(text2), ecosystem = entry.name === "package.json" ? "npm" : "composer";
-              const pkg = { path: relative, name: typeof data.name === "string" ? data.name : directory || config.name, ecosystem, dependencies: [] };
-              for (const kind of ecosystem === "npm" ? ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"] : ["require", "require-dev"]) for (const [name, version] of Object.entries(data[kind] ?? {})) if (typeof version === "string") pkg.dependencies.push({ name, version, kind });
-              result.packages.push(pkg);
+              const data = JSON.parse(text2), ecosystem = entry2.name === "package.json" ? "npm" : "composer";
+              const pkg2 = { path: relative, name: typeof data.name === "string" ? data.name : directory || config.name, ecosystem, dependencies: [] };
+              for (const kind of ecosystem === "npm" ? ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"] : ["require", "require-dev"]) for (const [name, version] of Object.entries(data[kind] ?? {})) if (typeof version === "string") pkg2.dependencies.push({ name, version, kind });
+              result.packages.push(pkg2);
             } catch {
               result.warnings.push(`Invalid manifest: ${relative}`);
             }
@@ -6175,7 +6350,7 @@ class ProjectStore {
       const values = [base, ...[".ts", ".tsx", ".js", ".jsx", ".mts", ".mjs", ".mdx", ".vue", ".astro", ".json"].flatMap((ext) => [base + ext, path.join(base, "index" + ext)])];
       return values.find((file) => fullPaths.has(file));
     };
-    const workspacePackages = new Map(result.packages.filter((pkg) => pkg.ecosystem === "npm").map((pkg) => [pkg.name, pkg.path]));
+    const workspacePackages = new Map(result.packages.filter((pkg2) => pkg2.ecosystem === "npm").map((pkg2) => [pkg2.name, pkg2.path]));
     const exportPath = (value) => typeof value === "string" ? value : Array.isArray(value) ? value.map(exportPath).find(Boolean) : value && typeof value === "object" ? exportPath(value.types ?? value.import ?? value.default ?? value.require) : void 0;
     let analyzed = 0;
     for (const record of result.files) {
@@ -6206,8 +6381,8 @@ class ProjectStore {
         if (!target && workspaceManifest) {
           const file = path.join(this.files.root, workspaceManifest), manifest = JSON.parse(texts.get(file));
           const subpath = specifier.slice(packageName.length), key = subpath ? "." + subpath : ".";
-          const entry = exportPath(manifest.exports?.[key] ?? (!subpath ? manifest.exports : void 0)) ?? (!subpath ? manifest.types ?? manifest.typings ?? manifest.module ?? manifest.main ?? "index" : subpath.slice(1));
-          if (typeof entry === "string") target = candidate(path.resolve(path.dirname(file), entry));
+          const entry2 = exportPath(manifest.exports?.[key] ?? (!subpath ? manifest.exports : void 0)) ?? (!subpath ? manifest.types ?? manifest.typings ?? manifest.module ?? manifest.main ?? "index" : subpath.slice(1));
+          if (typeof entry2 === "string") target = candidate(path.resolve(path.dirname(file), entry2));
         }
         return { specifier, ...target && fullPaths.has(target) ? { target: fullPaths.get(target) } : !specifier.startsWith(".") && !specifier.startsWith("/") ? { package: specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0] } : {} };
       });
@@ -6217,7 +6392,7 @@ class ProjectStore {
         for (const name of names) if (name && ts.isIdentifier(name) && record.symbols.length < 100) record.symbols.push({ name: name.text, kind: ts.SyntaxKind[statement.kind], line: ast.getLineAndCharacterOfPosition(name.getStart(ast)).line + 1 });
       }
     }
-    const dependencies = new Set(result.packages.flatMap((pkg) => pkg.dependencies.map((item) => item.name)));
+    const dependencies = new Set(result.packages.flatMap((pkg2) => pkg2.dependencies.map((item) => item.name)));
     result.frameworks = ["laravel/framework", "next", "nuxt", "astro", "vue", "react", "@mdx-js/mdx"].filter((name) => dependencies.has(name));
     if (result.truncated) result.warnings.push(`File/directory inventory reached the ${config.intelligence.maxFiles} entry budget`);
     result.warnings = result.warnings.slice(0, 100);
@@ -6769,9 +6944,9 @@ class Collaboration {
     }
   }
   async changed(relative) {
-    const entry = this.rooms.get(relative);
-    if (!entry) return;
-    const room = await entry;
+    const entry2 = this.rooms.get(relative);
+    if (!entry2) return;
+    const room = await entry2;
     if (room.saving) return;
     let disk;
     try {
@@ -6820,9 +6995,9 @@ class Collaboration {
     );
   }
   async leave(connection, relative) {
-    for (const [key, entry] of this.rooms) {
+    for (const [key, entry2] of this.rooms) {
       if (relative && relative !== key) continue;
-      const room = await entry;
+      const room = await entry2;
       room.members.delete(connection);
       const clients = room.clients.get(connection);
       if (clients)
@@ -6830,7 +7005,7 @@ class Collaboration {
       room.clients.delete(connection);
       if (!room.members.size) {
         await room.persist;
-        if (!room.members.size && this.rooms.get(key) === entry) {
+        if (!room.members.size && this.rooms.get(key) === entry2) {
           this.rooms.delete(key);
           this.lsp.closeCanonical(key);
           room.awareness.destroy();
@@ -6840,8 +7015,8 @@ class Collaboration {
     }
   }
   async close() {
-    for (const entry of this.rooms.values()) {
-      const room = await entry;
+    for (const entry2 of this.rooms.values()) {
+      const room = await entry2;
       await room.persist;
       room.awareness.destroy();
       room.doc.destroy();
@@ -6851,7 +7026,7 @@ class Collaboration {
 }
 const terminal = (state2) => !["pending", "running", "unknown"].includes(state2);
 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 str$1 = (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);
 const statusNames = {
@@ -6890,7 +7065,7 @@ function normalizeDelegation(provider, update) {
         {
           providerId: sub.threadId,
           toolId,
-          name: str(str(sub.path)?.split("/").filter(Boolean).at(-1), 200),
+          name: str$1(str$1(sub.path)?.split("/").filter(Boolean).at(-1), 200),
           state: state(sub.activity === "started" ? "running" : sub.activity),
           evidence: "provider",
           spawn: sub.activity === "started"
@@ -6906,7 +7081,7 @@ function normalizeDelegation(provider, update) {
       return [
         {
           toolId,
-          task: str(raw.prompt),
+          task: str$1(raw.prompt),
           state: update.status === "failed" ? "failed" : "unknown",
           evidence: "tool",
           spawn: true
@@ -6915,11 +7090,11 @@ function normalizeDelegation(provider, update) {
     return ids.map((providerId) => ({
       providerId,
       toolId,
-      parent: str(collab.senderThreadId, 512),
-      task: str(raw.prompt),
-      model: str(raw.model, 200),
+      parent: str$1(collab.senderThreadId, 512),
+      task: str$1(raw.prompt),
+      model: str$1(raw.model, 200),
       state: state(states[providerId]?.status) ?? (collab.tool === "spawnAgent" && update.status === "failed" ? "failed" : void 0),
-      result: str(states[providerId]?.message, 16384),
+      result: str$1(states[providerId]?.message, 16384),
       evidence: "provider",
       spawn: collab.tool === "spawnAgent",
       reopen: ["resumeAgent", "sendInput", "followupTask"].includes(collab.tool) && ["running", "pendingInit"].includes(states[providerId]?.status)
@@ -6933,9 +7108,9 @@ function normalizeDelegation(provider, update) {
       {
         toolId,
         providerId: identity(task.agentId ?? outcome.agentId) ? task.agentId ?? outcome.agentId : void 0,
-        name: str(task.description, 200),
-        task: str(task.prompt),
-        model: str(task.model, 200),
+        name: str$1(task.description, 200),
+        task: str$1(task.prompt),
+        model: str$1(task.model, 200),
         durationMs: Number.isFinite(task.durationMs ?? outcome.durationMs) && (task.durationMs ?? outcome.durationMs) >= 0 ? task.durationMs ?? outcome.durationMs : void 0,
         state: state(outcomeName),
         result: preview(task.result ?? outcome.result ?? output.result),
@@ -6948,9 +7123,9 @@ function normalizeDelegation(provider, update) {
     return [
       {
         toolId,
-        name: str(raw.description ?? raw.subagent_type, 200),
-        task: str(raw.prompt),
-        model: str(raw.model, 200),
+        name: str$1(raw.description ?? raw.subagent_type, 200),
+        task: str$1(raw.prompt),
+        model: str$1(raw.model, 200),
         state: update.status === "failed" ? "failed" : "unknown",
         evidence: "tool",
         spawn: true
@@ -7109,8 +7284,8 @@ class SubagentRegistry {
         parentId: this.idForSession(sessionId),
         sessionId: child,
         providerId: child,
-        name: str(update.name, 200) || record.name,
-        task: str(update.task) ?? record.task,
+        name: str$1(update.name, 200) || record.name,
+        task: str$1(update.task) ?? record.task,
         evidence: "native",
         visibility: "full"
       });
@@ -7232,20 +7407,20 @@ class SubagentRegistry {
   }
   toolActivity(record, update) {
     const id = `tool:${update.toolCallId}`;
-    let entry = record.activity.find((a) => a.id === id);
-    if (!entry) {
-      entry = { id, kind: "tool" };
-      record.activity.push(entry);
-    }
-    entry.title = str(update.title, 200) ?? entry.title ?? "Delegated task";
-    if (!["completed", "failed"].includes(entry.status ?? ""))
-      entry.status = str(update.status, 40) ?? entry.status;
-    entry.input = preview(update.rawInput) ?? entry.input;
-    entry.output = preview(toolOutput(update)) ?? entry.output;
-    entry.locations = Array.isArray(update.locations) ? update.locations.filter((l) => typeof l.path === "string").slice(0, 16).map((l) => ({
+    let entry2 = record.activity.find((a) => a.id === id);
+    if (!entry2) {
+      entry2 = { id, kind: "tool" };
+      record.activity.push(entry2);
+    }
+    entry2.title = str$1(update.title, 200) ?? entry2.title ?? "Delegated task";
+    if (!["completed", "failed"].includes(entry2.status ?? ""))
+      entry2.status = str$1(update.status, 40) ?? entry2.status;
+    entry2.input = preview(update.rawInput) ?? entry2.input;
+    entry2.output = preview(toolOutput(update)) ?? entry2.output;
+    entry2.locations = Array.isArray(update.locations) ? update.locations.filter((l) => typeof l.path === "string").slice(0, 16).map((l) => ({
       path: l.path.slice(0, 4096),
       line: Number.isSafeInteger(l.line) ? l.line : void 0
-    })) : entry.locations;
+    })) : entry2.locations;
   }
   activity(sessionId, update) {
     const id = this.idForSession(sessionId);
@@ -7264,24 +7439,24 @@ class SubagentRegistry {
       "user_message_chunk"
     ].includes(update.sessionUpdate)) {
       const role = update.sessionUpdate === "agent_thought_chunk" ? "thought" : update.sessionUpdate === "user_message_chunk" ? "user" : "agent";
-      const content = str(update.content?.text ?? update.content?.resource?.text, 16384) ?? "";
+      const content = str$1(update.content?.text ?? update.content?.resource?.text, 16384) ?? "";
       const previous = record.activity.at(-1);
-      let entry = identity(update.messageId) ? record.activity.find(
+      let entry2 = identity(update.messageId) ? record.activity.find(
         (a) => a.kind === "message" && a.id === `message:provider:${update.messageId}`
       ) : previous?.kind === "message" && previous.role === role ? previous : void 0;
-      if (!entry) {
-        entry = {
+      if (!entry2) {
+        entry2 = {
           id: identity(update.messageId) ? `message:provider:${update.messageId}` : `message:local:${++this.serial}`,
           kind: "message",
           role,
           text: ""
         };
-        record.activity.push(entry);
+        record.activity.push(entry2);
       }
-      if (entry.text.length + content.length > 16384) record.truncated = true;
-      entry.text = (entry.text + content).slice(-16384);
+      if (entry2.text.length + content.length > 16384) record.truncated = true;
+      entry2.text = (entry2.text + content).slice(-16384);
       if (role === "agent") {
-        record.result = entry.text;
+        record.result = entry2.text;
         phase = "responding";
       } else if (role === "thought") phase = "thinking";
     } else if (["tool_call", "tool_call_update"].includes(update.sessionUpdate) && identity(update.toolCallId)) {
@@ -7319,12 +7494,12 @@ class SubagentRegistry {
     const id = this.idForSession(sessionId), record = id && this.records.get(id);
     if (!record) return;
     const entryId = `terminal:${terminalId}`;
-    const entry = record.activity.find((a) => a.id === entryId) ?? {
+    const entry2 = record.activity.find((a) => a.id === entryId) ?? {
       id: entryId,
       kind: "terminal"
     };
-    if (!record.activity.includes(entry)) record.activity.push(entry);
-    Object.assign(entry, {
+    if (!record.activity.includes(entry2)) record.activity.push(entry2);
+    Object.assign(entry2, {
       title: title2.slice(0, 200),
       text: output.slice(-8192),
       status: ended ? "completed" : "in_progress"
@@ -7350,7 +7525,7 @@ class SubagentRegistry {
 let cached;
 function runtimeVersion() {
   if (cached) return cached;
-  return cached = "0.7.1";
+  return cached = "0.9.0";
 }
 const MAX_REQUEST_BYTES = 1024 * 1024;
 const MAX_CONCURRENT_REQUESTS = 16;
@@ -7475,7 +7650,7 @@ function validateArguments(name, args) {
   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";
+  if (name === "oxbit_update_plan" && (!Array.isArray(args.entries) || args.entries.length > 50 || args.entries.some((entry2) => !object(entry2) || typeof entry2.content !== "string" || !["pending", "in_progress", "completed"].includes(String(entry2.status)) || entry2.priority !== void 0 && typeof entry2.priority !== "string"))) return "entries must contain plan content and status";
   return void 0;
 }
 function reply(response, status2, body) {
@@ -7487,8 +7662,8 @@ function reply(response, status2, body) {
   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 } };
+function rpcError(id, code, message2) {
+  return { jsonrpc: "2.0", id: id ?? null, error: { code, message: message2 } };
 }
 class AgentMCP {
   constructor(handler) {
@@ -7573,25 +7748,25 @@ class AgentMCP {
         if (length > MAX_REQUEST_BYTES) return reply(response, 413);
         chunks.push(chunk);
       }
-      let message;
+      let message2;
       try {
-        message = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+        message2 = 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"));
+      if (!object(message2) || message2.jsonrpc !== "2.0" || typeof message2.method !== "string" || message2.id !== void 0 && typeof message2.id !== "string" && typeof message2.id !== "number") return reply(response, 400, rpcError(object(message2) ? message2.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;
+      if (version && !PROTOCOL_VERSIONS.includes(version)) return reply(response, 400, rpcError(message2.id, -32600, "Unsupported MCP protocol version"));
+      if (message2.id === void 0) return reply(response, 202);
+      const id = message2.id;
+      if (message2.method === "initialize") {
+        const requested = object(message2.params) && typeof message2.params.protocolVersion === "string" ? message2.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 (message2.method === "ping") return reply(response, 200, { jsonrpc: "2.0", id, result: {} });
+      if (message2.method === "tools/list") return reply(response, 200, { jsonrpc: "2.0", id, result: { tools: NATIVE_AGENT_TOOLS } });
+      if (message2.method !== "tools/call") return reply(response, 200, rpcError(id, -32601, "Method not found"));
+      const params = message2.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);
@@ -7612,7 +7787,332 @@ class AgentMCP {
     }
   }
 }
+const run$1 = promisify(execFile);
+const TTL = 3e5, MiB = 1024 * 1024, MAX_LISTING = 2 * MiB, MAX_ARCHIVE = 512 * MiB;
+const REGISTRY_ID = /^[a-z0-9][a-z0-9._-]{0,63}$/;
+const VERSION = /^[A-Za-z0-9][A-Za-z0-9.+_-]{0,63}$/;
+const ENV_KEY = /^[A-Za-z_][A-Za-z0-9_]{0,127}$/;
+const TARGETS = ["darwin", "linux", "windows"].flatMap((os2) => [`${os2}-aarch64`, `${os2}-x86_64`]);
+const ARCHIVES = [".tar.gz", ".tgz", ".tar.bz2", ".tar.xz", ".zip"];
+const invalid = () => {
+  throw new Error("invalid");
+};
+const plain = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const str = (value, max) => typeof value === "string" && value && value.length <= max && !value.includes("\0") ? value : invalid();
+const optional = (value, max) => value === void 0 ? void 0 : str(value, max);
+const list = (value) => value === void 0 ? [] : Array.isArray(value) && value.length <= 128 && value.every((v) => typeof v === "string" && v.length <= 16384 && !v.includes("\0")) ? value : invalid();
+function env(value) {
+  if (value === void 0) return {};
+  if (!plain(value)) return invalid();
+  const entries = Object.entries(value);
+  if (entries.length > 64 || entries.some(([k, v]) => !ENV_KEY.test(k) || typeof v !== "string" || v.length > 16384 || v.includes("\0"))) return invalid();
+  return Object.fromEntries(entries);
+}
+function url(value) {
+  const parsed = new URL(str(value, 4096));
+  return ["https:", "http:"].includes(parsed.protocol) ? parsed.href : invalid();
+}
+function pkg(value) {
+  if (value === void 0) return;
+  if (!plain(value)) return invalid();
+  const name = str(value.package, 512);
+  if (name.startsWith("-")) return invalid();
+  return { package: name, args: list(value.args), env: env(value.env) };
+}
+function binary(value) {
+  if (value === void 0) return;
+  if (!plain(value)) return invalid();
+  const targets = {};
+  for (const [key, t] of Object.entries(value)) {
+    if (!plain(t)) return invalid();
+    const sha256 = t.sha256 === void 0 ? void 0 : typeof t.sha256 === "string" && /^[a-f0-9]{64}$/i.test(t.sha256) ? t.sha256.toLowerCase() : invalid();
+    const target = { archive: url(t.archive), cmd: str(t.cmd, 1024), args: list(t.args), env: env(t.env), sha256 };
+    if (TARGETS.includes(key)) targets[key] = target;
+  }
+  return targets;
+}
+function entry(value) {
+  if (!plain(value) || !plain(value.distribution)) return invalid();
+  const id = str(value.id, 64), version = str(value.version, 64);
+  if (!REGISTRY_ID.test(id) || !VERSION.test(version)) return invalid();
+  if (typeof value.description !== "string" || value.description.length > 4e3) return invalid();
+  const d = value.distribution;
+  const distribution = { npx: pkg(d.npx), uvx: pkg(d.uvx), binary: binary(d.binary) };
+  if (!distribution.npx && !distribution.uvx && !distribution.binary) return invalid();
+  return {
+    id,
+    version,
+    name: str(value.name, 200),
+    description: value.description,
+    repository: optional(value.repository, 2048),
+    website: optional(value.website, 2048),
+    license: optional(value.license, 200),
+    distribution
+  };
+}
+function parseRegistry(text2) {
+  const value = JSON.parse(text2);
+  if (!plain(value) || !Array.isArray(value.agents)) throw new Error("The ACP Registry response has no agents list");
+  const agents = /* @__PURE__ */ new Map();
+  for (const item of value.agents.slice(0, 2e3)) {
+    try {
+      const agent = entry(item);
+      if (!agents.has(agent.id)) agents.set(agent.id, agent);
+    } catch {
+    }
+  }
+  return [...agents.values()];
+}
+function platformTarget(platform = process.platform, arch = process.arch) {
+  const os2 = { darwin: "darwin", linux: "linux", win32: "windows" }[platform];
+  const cpu = { arm64: "aarch64", x64: "x86_64" }[arch];
+  return os2 && cpu ? `${os2}-${cpu}` : void 0;
+}
+function pickDistribution(agent, target = platformTarget()) {
+  const { npx, uvx, binary: binary2 } = agent.distribution;
+  if (npx) return { kind: "npx", spec: npx };
+  if (uvx) return { kind: "uvx", spec: uvx };
+  const spec = target ? binary2?.[target] : void 0;
+  if (spec) return { kind: "binary", spec };
+}
+async function* capped(body, max, what) {
+  let length = 0;
+  for await (const chunk of body) {
+    length += chunk.length;
+    if (length > max) throw new Error(`${what} exceeds ${max / MiB} MiB`);
+    yield chunk;
+  }
+}
+const exists = (file) => fs.stat(file).then(() => true, () => false);
+const message = (error) => error instanceof Error ? error.message : String(error);
+async function installedCommand(dir, cmd) {
+  const root = await fs.realpath(dir);
+  const inside = (file) => file.startsWith(root + path.sep);
+  const escape = new RpcError("INVALID_PARAMS", `The agent command ${cmd} resolves outside its install directory`);
+  const target = path.resolve(root, cmd);
+  if (!inside(target)) throw escape;
+  const real = await fs.realpath(target).catch(() => {
+    throw new RpcError("INVALID_PARAMS", `The agent archive has no ${cmd}`);
+  });
+  if (!inside(real)) throw escape;
+  const stat = await fs.stat(real);
+  if (!stat.isFile()) throw new RpcError("INVALID_PARAMS", `The agent command ${cmd} is not a file`);
+  if (process.platform !== "win32") await fs.chmod(real, stat.mode | 73);
+  return real;
+}
+function untilAborted(promise, signal) {
+  if (!signal) return promise;
+  if (signal.aborted) return Promise.reject(new Error("Agent connection cancelled"));
+  return new Promise((resolve, reject) => {
+    const stop2 = () => reject(new Error("Agent connection cancelled"));
+    signal.addEventListener("abort", stop2, { once: true });
+    promise.then(resolve, reject).finally(() => signal.removeEventListener("abort", stop2));
+  });
+}
+async function extract(archive, dest, format, signal) {
+  const tar = ["tar", ["-xf", archive, "-C", dest]];
+  const attempts = format !== ".zip" ? [tar] : [...process.platform === "darwin" ? [tar] : [], ["unzip", ["-q", archive, "-d", dest]]];
+  const missing2 = [];
+  let failure2;
+  for (const [tool, args] of attempts) {
+    await fs.rm(dest, { recursive: true, force: true });
+    await fs.mkdir(dest);
+    try {
+      await run$1(tool, args, { signal, maxBuffer: MiB });
+      return;
+    } catch (error) {
+      if (signal?.aborted) throw new Error("Agent connection cancelled");
+      if (error.code === "ENOENT") missing2.push(tool);
+      else failure2 = new Error(`${tool} could not extract the agent archive: ${String(error.stderr || message(error)).trim().slice(0, 500)}`);
+    }
+  }
+  throw failure2 ?? new RpcError("INVALID_PARAMS", `Install ${missing2.join(" or ")} to extract this agent archive`);
+}
+class ACPRegistry {
+  constructor(dataDir, url2 = ACP_REGISTRY_URL, download = fetch, target = platformTarget()) {
+    this.dataDir = dataDir;
+    this.url = url2;
+    this.download = download;
+    this.target = target;
+    this.installRoot = path.join(dataDir, "acp-agents");
+  }
+  dataDir;
+  url;
+  download;
+  target;
+  fetching;
+  installs = /* @__PURE__ */ new Map();
+  installRoot;
+  get cacheFile() {
+    return path.join(this.dataDir, "acp-registry.json");
+  }
+  checkUrl(value) {
+    const parsed = new URL(value), registry = new URL(this.url);
+    const loopback = (u) => u.protocol === "http:" && u.hostname === "127.0.0.1";
+    if (parsed.protocol === "https:" || loopback(registry) && loopback(parsed)) return parsed.href;
+    throw new Error(`ACP agent downloads require HTTPS (${parsed.origin})`);
+  }
+  async open(source2, signal, max, what) {
+    let current = this.checkUrl(source2);
+    for (let redirects = 0; ; redirects++) {
+      const response = await this.download(current, { signal, redirect: "manual" });
+      if ([301, 302, 303, 307, 308].includes(response.status)) {
+        await response.body?.cancel();
+        const location = response.headers.get("location");
+        if (!location) throw new Error(`${what} redirect has no location`);
+        if (redirects >= 5) throw new Error(`${what} has too many redirects`);
+        current = this.checkUrl(new URL(location, current).href);
+        continue;
+      }
+      if (!response.ok || !response.body) {
+        await response.body?.cancel();
+        throw new Error(`${what} download failed (HTTP ${response.status})`);
+      }
+      if (Number(response.headers.get("content-length")) > max) {
+        await response.body.cancel();
+        throw new Error(`${what} exceeds ${max / MiB} MiB`);
+      }
+      return capped(response.body, max, what);
+    }
+  }
+  async cached() {
+    try {
+      const value = JSON.parse(await fs.readFile(this.cacheFile, "utf8"));
+      if (value?.url === this.url && typeof value.text === "string" && !Number.isNaN(Date.parse(value.fetchedAt)))
+        return { agents: parseRegistry(value.text), fetchedAt: value.fetchedAt };
+    } catch {
+    }
+  }
+  async fetchRegistry() {
+    const chunks = [];
+    for await (const chunk of await this.open(this.url, AbortSignal.timeout(15e3), MAX_LISTING, "The ACP Registry")) chunks.push(chunk);
+    const text2 = Buffer.concat(chunks).toString("utf8");
+    const agents = parseRegistry(text2), fetchedAt = (/* @__PURE__ */ new Date()).toISOString();
+    await fs.mkdir(this.dataDir, { recursive: true, mode: 448 });
+    const temp = `${this.cacheFile}.${process.pid}.tmp`;
+    await fs.writeFile(temp, JSON.stringify({ url: this.url, fetchedAt, text: text2 }), { mode: 384 });
+    await fs.rename(temp, this.cacheFile);
+    return { agents, fetchedAt };
+  }
+  async load(refresh = false) {
+    const cached2 = await this.cached();
+    const age = cached2 ? Date.now() - Date.parse(cached2.fetchedAt) : Infinity;
+    if (cached2 && !refresh && age >= 0 && age < TTL) return cached2;
+    try {
+      this.fetching ??= this.fetchRegistry().finally(() => this.fetching = void 0);
+      return await this.fetching;
+    } catch (error) {
+      const reason = `Could not reach the ACP Registry: ${message(error)}`;
+      if (cached2) return { ...cached2, error: reason };
+      throw new RpcError("UNAVAILABLE", reason);
+    }
+  }
+  dir(agent) {
+    return path.join(this.installRoot, agent.id, agent.version);
+  }
+  unavailable(picked) {
+    if (!picked) return "No build for this runtime's platform";
+    if (picked.kind !== "binary") return void 0;
+    if (!picked.spec.sha256) return "The registry publishes no checksum for this build";
+    const file = new URL(picked.spec.archive).pathname.toLowerCase();
+    if (!ARCHIVES.some((ext) => file.endsWith(ext))) return "Oxbit cannot extract this build's archive format";
+  }
+  async listing(refresh = false) {
+    const { agents, fetchedAt, error } = await this.load(refresh);
+    const listed = await Promise.all(agents.map(async (agent) => {
+      const picked = pickDistribution(agent, this.target), builtin = acpBuiltinForRegistry(agent.id)?.id;
+      const { npx, uvx } = agent.distribution;
+      const distribution = picked?.kind ?? (npx ? "npx" : uvx ? "uvx" : "binary");
+      const reason = this.unavailable(picked);
+      return {
+        id: agent.id,
+        name: agent.name,
+        version: agent.version,
+        description: agent.description,
+        ...agent.repository ? { repository: agent.repository } : {},
+        ...agent.website ? { website: agent.website } : {},
+        ...agent.license ? { license: agent.license } : {},
+        distribution,
+        available: !reason,
+        ...reason ? { reason } : {},
+        ...picked?.kind === "binary" ? { installed: await exists(this.dir(agent)) } : {},
+        ...builtin ? { builtin } : {}
+      };
+    }));
+    return { agents: listed, fetchedAt, ...error ? { error } : {} };
+  }
+  async resolve(id, version, signal) {
+    const agent = (await this.load()).agents.find((a) => a.id === id);
+    if (!agent) throw new RpcError("INVALID_PARAMS", "Unknown agent");
+    if (version !== void 0 && version !== agent.version)
+      throw new RpcError("INVALID_PARAMS", `${agent.name} ${version} is no longer in the ACP Registry; refresh the agent list`);
+    const picked = pickDistribution(agent, this.target);
+    if (!picked) throw new RpcError("INVALID_PARAMS", `${agent.name} has no ACP Registry build for ${this.target ?? `${process.platform}-${process.arch}`}`);
+    const base = { name: agent.name, env: picked.spec.env };
+    if (picked.kind !== "binary") {
+      const { package: name, args } = picked.spec;
+      return { ...base, command: picked.kind, args: picked.kind === "npx" ? ["-y", name, ...args] : [name, ...args] };
+    }
+    return { ...base, command: await this.install(agent, picked.spec, signal), args: picked.spec.args };
+  }
+  /** Concurrent callers share one download, which stops only after every caller has cancelled. */
+  async install(agent, spec, signal) {
+    const key = `${agent.id}@${agent.version}`;
+    let shared = this.installs.get(key);
+    if (!shared) {
+      const abort = new AbortController();
+      const promise = this.installOnce(agent, spec, abort.signal).finally(() => this.installs.delete(key));
+      promise.catch(() => {
+      });
+      shared = { promise, abort, waiters: 0 };
+      this.installs.set(key, shared);
+    }
+    const install = shared;
+    install.waiters++;
+    try {
+      return await untilAborted(install.promise, signal);
+    } finally {
+      if (--install.waiters === 0 && signal?.aborted) install.abort.abort();
+    }
+  }
+  async installOnce(agent, spec, signal) {
+    const dir = this.dir(agent);
+    if (await exists(dir)) return installedCommand(dir, spec.cmd);
+    if (!spec.sha256) throw new RpcError("INVALID_PARAMS", `${agent.name} has no sha256 checksum in the ACP Registry, so Oxbit does not install it`);
+    const file = new URL(spec.archive).pathname.toLowerCase();
+    const format = ARCHIVES.find((ext) => file.endsWith(ext));
+    if (!format) throw new RpcError("INVALID_PARAMS", `Oxbit cannot extract ${path.posix.basename(file)}; supported archives are ${ARCHIVES.join(", ")}`);
+    await fs.mkdir(path.dirname(dir), { recursive: true, mode: 448 });
+    const temp = await fs.mkdtemp(path.join(path.dirname(dir), `.${agent.version}-`));
+    try {
+      const archive = path.join(temp, `archive${format}`), files = path.join(temp, "files");
+      const hash2 = createHash("sha256");
+      const body = await this.open(spec.archive, signal, MAX_ARCHIVE, `The ${agent.name} archive`);
+      await pipeline(async function* () {
+        for await (const chunk of body) {
+          hash2.update(chunk);
+          yield chunk;
+        }
+      }, createWriteStream(archive, { mode: 384 }), { signal });
+      if (hash2.digest("hex") !== spec.sha256)
+        throw new RpcError("INVALID_PARAMS", `The ${agent.name} archive does not match its sha256 checksum`);
+      await extract(archive, files, format, signal);
+      await installedCommand(files, spec.cmd);
+      await fs.rename(files, dir).catch(async (error) => {
+        if (!await exists(dir)) throw error;
+      });
+      return await installedCommand(dir, spec.cmd);
+    } finally {
+      await fs.rm(temp, { recursive: true, force: true });
+    }
+  }
+}
 const MAX_BYTES = 1024 * 1024;
+const IMAGE_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"];
+const MAX_IMAGES = 4;
+const MAX_IMAGE_DATA = Math.ceil(5 * 1024 * 1024 / 3) * 4;
+const MAX_QUEUED_IMAGE_DATA = 16 * 1024 * 1024;
+const withoutImageData = (key, value) => key === "data" ? void 0 : value;
 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(
@@ -7626,14 +8126,19 @@ function strings(value) {
 }
 class AgentACP {
   constructor(files, emit, stateChanged = () => {
+  }, acpRegistry, statusChanged = () => {
   }) {
     this.files = files;
     this.emit = emit;
     this.stateChanged = stateChanged;
+    this.acpRegistry = acpRegistry;
+    this.statusChanged = statusChanged;
   }
   files;
   emit;
   stateChanged;
+  acpRegistry;
+  statusChanged;
   agents = /* @__PURE__ */ new Map();
   mcp = new AgentMCP((id, name, args) => this.tool(id, name, args));
   get(owner, id) {
@@ -7642,8 +8147,8 @@ class AgentACP {
       throw new RpcError("NOT_FOUND", "Agent connection has ended");
     return agent;
   }
-  send(agent, message) {
-    const data = JSON.stringify({ jsonrpc: "2.0", ...message }) + "\n";
+  send(agent, message2) {
+    const data = JSON.stringify({ jsonrpc: "2.0", ...message2 }) + "\n";
     if (agent.stopped || !agent.child.stdin.writable)
       throw new Error("Agent process has ended");
     if (Buffer.byteLength(data) > 2 * MAX_BYTES || agent.child.stdin.writableLength > MAX_BYTES)
@@ -7672,9 +8177,9 @@ class AgentACP {
   publish(agent, event, 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));
+      const entry2 = JSON.parse(JSON.stringify({ name: event, params: payload }));
+      agent.events.push(entry2);
+      agent.eventBytes += Buffer.byteLength(JSON.stringify(entry2));
       while (agent.events.length > 2e3 || agent.eventBytes > 2 * MAX_BYTES) {
         agent.eventBytes -= Buffer.byteLength(JSON.stringify(agent.events.shift()));
         agent.truncated = true;
@@ -7683,6 +8188,20 @@ class AgentACP {
     if (agent.client) this.emit(agent.client, event, payload);
     this.stateChanged();
   }
+  report(agent, status2) {
+    try {
+      this.statusChanged({
+        owner: agent.owner,
+        agent: agent.connection.name ?? agent.connection.provider,
+        status: status2,
+        pending: agent.approvals.size,
+        startedAt: agent.startedAt
+      });
+    } catch (error) {
+      process.stderr.write(`Oxbit agent status listener failed: ${String(error)}
+`);
+    }
+  }
   list(owner) {
     return { sessions: [...this.agents.values()].filter((a) => a.owner === owner && !a.stopped).map((a) => ({
       connection: a.connection,
@@ -7742,27 +8261,15 @@ class AgentACP {
     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");
-    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"
-    );
-    if (!command.trim() || command.includes("\0"))
-      throw new RpcError("INVALID_PARAMS", "Invalid agent executable");
-    const args = strings(launch.args ?? [...preset2.args]);
+    this.slot(owner, false);
+    const resolved = await this.resolveLaunch(launch, signal);
+    if (signal?.aborted) throw new Error("Agent connection cancelled");
+    this.slot(owner, true);
+    const { command, args } = resolved;
     const child = spawn(command, args, {
       cwd: this.files.root,
-      env: process.env,
+      env: resolved.env && Object.keys(resolved.env).length ? { ...process.env, ...resolved.env } : process.env,
       stdio: "pipe",
       detached: process.platform !== "win32",
       windowsHide: true
@@ -7775,7 +8282,8 @@ class AgentACP {
       child,
       connection: {
         id: randomUUID(),
-        provider: preset2.id,
+        provider: resolved.provider,
+        name: resolved.name,
         root: this.files.root,
         authMethods: []
       },
@@ -7829,10 +8337,10 @@ class AgentACP {
           return;
         }
         try {
-          const message = JSON.parse(line);
-          if (message?.jsonrpc !== "2.0")
+          const message2 = JSON.parse(line);
+          if (message2?.jsonrpc !== "2.0")
             throw new Error("Invalid ACP envelope");
-          void this.message(agent, message).catch(
+          void this.message(agent, message2).catch(
             (error) => this.stopAgent(agent, String(error))
           );
         } catch {
@@ -7852,7 +8360,7 @@ class AgentACP {
         clientCapabilities: {
           fs: { readTextFile: true, writeTextFile: true },
           terminal: true,
-          ...preset2.id === "codex" ? { subagents: {} } : {}
+          ...resolved.provider === "codex" ? { subagents: {} } : {}
         },
         clientInfo: { name: "oxbit", title: "Oxbit", version: runtimeVersion() }
       });
@@ -7869,6 +8377,43 @@ class AgentACP {
       signal?.removeEventListener("abort", abort);
     }
   }
+  slot(owner, evict) {
+    const owned = [...this.agents.values()].filter((a) => a.owner === owner);
+    if (owned.length < 3) return;
+    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");
+    if (evict) this.stopAgent(idle, "Stopped to start another agent");
+  }
+  async resolveLaunch(launch, signal) {
+    const provider = launch?.provider;
+    if (typeof provider !== "string" || !provider || provider.length > 64)
+      throw new RpcError("INVALID_PARAMS", "Unknown agent");
+    if (launch.registry !== void 0) {
+      const { id, version } = launch.registry ?? {};
+      if (typeof id !== "string" || !REGISTRY_ID.test(id) || version !== void 0 && typeof version !== "string")
+        throw new RpcError("INVALID_PARAMS", "Invalid ACP Registry agent");
+      const builtin = acpBuiltinForRegistry(id);
+      if (builtin)
+        return { provider: builtin.id, name: builtin.name, command: builtin.command, args: [...builtin.args] };
+      if (!this.acpRegistry)
+        throw new RpcError("INVALID_PARAMS", "This runtime cannot launch ACP Registry agents");
+      return { provider: id, ...await this.acpRegistry.resolve(id, version, signal) };
+    }
+    const preset2 = acpPreset(provider);
+    if (!preset2 && (typeof launch.command !== "string" || !launch.command.trim()))
+      throw new RpcError("INVALID_PARAMS", provider === ACP_CUSTOM_PROVIDER ? "Enter a command for the custom agent" : "Unknown agent");
+    const command = requireString({ command: launch.command ?? preset2.command }, "command");
+    if (!command.trim() || command.includes("\0"))
+      throw new RpcError("INVALID_PARAMS", "Invalid agent executable");
+    const custom = typeof launch.name === "string" ? launch.name.trim().slice(0, 80) : "";
+    return {
+      provider,
+      name: preset2?.name ?? (custom || "Custom agent"),
+      command,
+      args: strings(launch.args ?? (preset2 ? [...preset2.args] : []))
+    };
+  }
   async call(owner, id, method, params = {}, signal) {
     const agent = this.get(owner, id);
     if (agent.busy)
@@ -7912,11 +8457,16 @@ class AgentACP {
         agent.busy = false;
       }
     }
-    if (["session/new", "session/load", "session/resume"].includes(method)) {
+    if (["session/new", "session/load", "session/resume", "session/fork"].includes(method)) {
       if (method === "session/load" && !agent.connection.capabilities?.loadSession)
         throw new Error("This agent does not support loading conversations");
       if (method === "session/resume" && !agent.connection.capabilities?.sessionCapabilities?.resume)
         throw new Error("This agent does not support resuming conversations");
+      if (method === "session/fork" && !agent.connection.capabilities?.sessionCapabilities?.fork)
+        throw new Error("This agent does not support forking conversations");
+      const source2 = agent.connection.sessionId;
+      if (method === "session/fork" && !source2)
+        throw new Error("Start a conversation first");
       if (agent.subagents?.activeCount)
         throw new Error(
           "Wait for active subagents or disconnect before changing conversations"
@@ -7928,7 +8478,7 @@ class AgentACP {
       const previousBytes = agent.eventBytes;
       const previousTitle = agent.title;
       const previousTruncated = agent.truncated;
-      const target = method === "session/new" ? void 0 : requireString(params, "sessionId");
+      const target = method === "session/new" || method === "session/fork" ? void 0 : requireString(params, "sessionId");
       if (agent.approvals.size)
         throw new Error(
           "Resolve pending requests before changing conversations"
@@ -7949,7 +8499,7 @@ class AgentACP {
         const result = await this.request(agent, method, {
           cwd: this.files.root,
           mcpServers: [await this.mcp.server(agent.connection.id, !!agent.connection.capabilities?.mcpCapabilities?.http)],
-          ...target ? { sessionId: target } : {}
+          ...target ? { sessionId: target } : method === "session/fork" ? { sessionId: source2 } : {}
         });
         const sessionId2 = target ?? result?.sessionId;
         if (typeof sessionId2 !== "string" || !sessionId2)
@@ -8017,41 +8567,22 @@ class AgentACP {
     const text2 = requireString(params, "text", MAX_BYTES);
     if (!text2.trim()) throw new Error("Enter a message");
     const prompt = [{ type: "text", text: text2 }];
-    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) {
-        const content = requireString(item, "text", 2e5);
-        const relative = requireString(item, "path");
-        const absolute = await this.files.resolve(relative);
-        const label = typeof item.label === "string" ? item.label.slice(0, 1024) : relative;
-        if (agent.connection.capabilities?.promptCapabilities?.embeddedContext)
-          prompt.push({
-            type: "resource",
-            resource: {
-              uri: pathToFileURL(absolute).href + (Number.isSafeInteger(item.line) ? `#L${item.line}` : ""),
-              mimeType: "text/plain",
-              text: `Editor snapshot: ${label}
-${content}`
-            }
-          });
-        else
-          prompt.push({
-            type: "text",
-            text: `Attached editor context: ${label}
-${content}`
-          });
-      }
-    }
-    if (Buffer.byteLength(JSON.stringify(prompt)) > MAX_BYTES)
+    if (params.context !== void 0) prompt.push(...await this.contextBlocks(agent, params.context));
+    if (Buffer.byteLength(JSON.stringify(prompt.filter((block) => block.type !== "image"))) > MAX_BYTES)
       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++;
+    agent.startedAt = Date.now();
     if (agent.title === "New conversation") agent.title = text2.slice(0, 100);
-    this.publish(agent, "acp.turnStarted", { messageId, text: text2, context: params.context ?? [] });
+    this.publish(agent, "acp.turnStarted", {
+      messageId,
+      text: text2,
+      context: JSON.parse(JSON.stringify(params.context ?? [], withoutImageData))
+    });
+    this.report(agent, "working");
     const abort = () => this.stopAgent(agent, "Agent request interrupted");
     signal?.addEventListener("abort", abort, { once: true });
     let stopReason;
@@ -8076,11 +8607,55 @@ ${content}`
       signal?.removeEventListener("abort", abort);
       if (!agent.stopped) {
         this.publish(agent, "acp.turnEnded", { stopReason, error: failure2 });
+        if (failure2 !== void 0) this.report(agent, "failed");
+        else if (stopReason !== "cancelled") this.report(agent, "finished");
         this.publishQueue(agent);
         queueMicrotask(() => this.runQueue(agent));
       }
     }
   }
+  /** Validates attached context and converts it into ACP prompt content blocks. */
+  async contextBlocks(agent, context) {
+    if (context === void 0) return [];
+    if (!Array.isArray(context) || context.length > 8)
+      throw new Error("Attach up to eight context items");
+    if (context.filter((item) => item?.kind === "image").length > MAX_IMAGES)
+      throw new Error(`Attach up to ${MAX_IMAGES} images per message`);
+    const blocks = [];
+    for (const item of context) {
+      if (item?.kind === "image") {
+        if (!agent.connection.capabilities?.promptCapabilities?.image)
+          throw new RpcError("INVALID_PARAMS", "This agent does not accept images");
+        const mimeType = requireString(item, "mimeType", 64);
+        const data = requireString(item, "data", MAX_IMAGE_DATA);
+        if (!IMAGE_TYPES.includes(mimeType) || !data || !/^[A-Za-z0-9+/]+={0,2}$/.test(data))
+          throw new RpcError("INVALID_PARAMS", "Invalid image attachment");
+        blocks.push({ type: "image", mimeType, data });
+        continue;
+      }
+      const content = requireString(item, "text", 2e5);
+      const relative = requireString(item, "path");
+      const absolute = await this.files.resolve(relative);
+      const label = typeof item.label === "string" ? item.label.slice(0, 1024) : relative;
+      if (agent.connection.capabilities?.promptCapabilities?.embeddedContext)
+        blocks.push({
+          type: "resource",
+          resource: {
+            uri: pathToFileURL(absolute).href + (Number.isSafeInteger(item.line) ? `#L${item.line}` : ""),
+            mimeType: "text/plain",
+            text: `Editor snapshot: ${label}
+${content}`
+          }
+        });
+      else
+        blocks.push({
+          type: "text",
+          text: `Attached editor context: ${label}
+${content}`
+        });
+    }
+    return blocks;
+  }
   publishQueue(agent) {
     this.publish(agent, "acp.queue", { queue: agent.queue, paused: agent.queuePaused });
     return { queue: [...agent.queue], paused: agent.queuePaused };
@@ -8091,18 +8666,13 @@ ${content}`
     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 (params.context !== void 0) await this.contextBlocks(agent, params.context);
     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)
+    const queued = [...agent.queue, prompt];
+    const imageData = queued.flatMap((p) => p.context ?? []).reduce((n, item) => n + (item.data?.length ?? 0), 0);
+    if (agent.queue.length >= 16 || imageData > MAX_QUEUED_IMAGE_DATA || Buffer.byteLength(JSON.stringify(queued, withoutImageData)) > MAX_BYTES)
       throw new Error("Queued messages exceed the limit; remove a message first");
     if (interrupt) {
       agent.queue.unshift(prompt);
@@ -8121,6 +8691,14 @@ ${content}`
     this.publishQueue(agent);
     return { prompt };
   }
+  moveQueued(owner, id, promptId, index) {
+    const agent = this.get(owner, id);
+    const from = agent.queue.findIndex((p) => p.id === promptId);
+    if (from < 0) throw new Error("The queued message has already started or was removed");
+    const [prompt] = agent.queue.splice(from, 1);
+    agent.queue.splice(Math.max(0, Math.min(index, agent.queue.length)), 0, prompt);
+    return this.publishQueue(agent);
+  }
   resumeQueue(owner, id) {
     const agent = this.get(owner, id);
     agent.queuePaused = false;
@@ -8282,6 +8860,7 @@ ${content}`
       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));
+      if (method === "session/request_permission") this.report(agent, "waiting");
     });
   }
   async tool(id, name, args) {
@@ -8351,10 +8930,10 @@ ${content}`
           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) } : {} };
+          const entries = args.entries.map((entry2) => {
+            const content = requireString(entry2, "content", 2e3);
+            if (!["pending", "in_progress", "completed"].includes(entry2.status)) throw new Error("Invalid plan status");
+            return { content, status: entry2.status, ...typeof entry2.priority === "string" ? { priority: entry2.priority.slice(0, 40) } : {} };
           });
           publish({ sessionUpdate: "plan", entries });
           result = { entries };
@@ -8370,52 +8949,52 @@ ${content}`
       throw error;
     }
   }
-  async message(agent, message) {
+  async message(agent, message2) {
     if (agent.stopped) return;
-    if (!message.method) {
-      const pending = agent.pending.get(message.id);
+    if (!message2.method) {
+      const pending = agent.pending.get(message2.id);
       if (!pending) return;
       clearTimeout(pending.timer);
-      agent.pending.delete(message.id);
-      if (message.error)
+      agent.pending.delete(message2.id);
+      if (message2.error)
         pending.reject(
           new RpcError(
-            String(message.error.code),
-            message.error.message ?? "ACP request failed",
-            message.error.data
+            String(message2.error.code),
+            message2.error.message ?? "ACP request failed",
+            message2.error.data
           )
         );
-      else pending.resolve(message.result);
+      else pending.resolve(message2.result);
       return;
     }
-    const params = message.params ?? {};
-    if (message.id === void 0) {
-      if (message.method === "session/update" && agent.newSessionUpdates) {
+    const params = message2.params ?? {};
+    if (message2.id === void 0) {
+      if (message2.method === "session/update" && agent.newSessionUpdates) {
         if (agent.newSessionUpdates.length >= 100)
           throw new Error("Too many updates while creating a session");
         agent.newSessionUpdates.push(params);
         return;
       }
-      if (message.method === "session/update")
+      if (message2.method === "session/update")
         this.routeUpdate(agent, params.sessionId, params.update);
-      else if (message.method.startsWith("cursor/") && agent.connection.provider === "cursor")
+      else if (message2.method.startsWith("cursor/") && agent.connection.provider === "cursor")
         this.routeUpdate(
           agent,
           params.sessionId ?? agent.connection.sessionId,
-          { ...params, sessionUpdate: message.method }
+          { ...params, sessionUpdate: message2.method }
         );
       return;
     }
     try {
       const registry = agent.subagents;
-      const cursorRequest = message.method.startsWith("cursor/") && agent.connection.provider === "cursor";
+      const cursorRequest = message2.method.startsWith("cursor/") && agent.connection.provider === "cursor";
       const sessionId = params.sessionId ?? (cursorRequest ? agent.connection.sessionId : void 0);
       if (!registry?.acceptsRequest(sessionId))
         throw new Error("Unknown ACP session");
       params.sessionId = sessionId;
-      if (message.method.startsWith("terminal/")) {
-        const result2 = await this.terminal(agent, message.method, params);
-        this.send(agent, { id: message.id, result: result2 });
+      if (message2.method.startsWith("terminal/")) {
+        const result2 = await this.terminal(agent, message2.method, params);
+        this.send(agent, { id: message2.id, result: result2 });
         return;
       }
       if (![
@@ -8424,19 +9003,19 @@ ${content}`
         "session/request_permission",
         "cursor/ask_question",
         "cursor/create_plan"
-      ].includes(message.method)) {
+      ].includes(message2.method)) {
         this.send(agent, {
-          id: message.id,
+          id: message2.id,
           error: { code: -32601, message: "Client method is not supported" }
         });
         return;
       }
-      const result = await this.clientRequest(agent, message.method, params);
-      if (!agent.stopped) this.send(agent, { id: message.id, result });
+      const result = await this.clientRequest(agent, message2.method, params);
+      if (!agent.stopped) this.send(agent, { id: message2.id, result });
     } catch (error) {
       if (!agent.stopped)
         this.send(agent, {
-          id: message.id,
+          id: message2.id,
           error: { code: -32603, message: String(error) }
         });
     }
@@ -8472,15 +9051,15 @@ ${content}`
       const command = requireString(params, "command");
       if (!command || command.includes("\0"))
         throw new Error("Invalid terminal command");
-      const env = { ...process.env };
+      const env2 = { ...process.env };
       if (params.env !== void 0) {
         if (!Array.isArray(params.env) || params.env.length > 128)
           throw new Error("Invalid terminal environment");
-        for (const entry of params.env) {
-          const name = requireString(entry, "name"), value = requireString(entry, "value", 16384);
+        for (const entry2 of params.env) {
+          const name = requireString(entry2, "name"), value = requireString(entry2, "value", 16384);
           if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name) || value.includes("\0"))
             throw new Error("Invalid environment variable");
-          env[name] = value;
+          env2[name] = value;
         }
       }
       const limit2 = params.outputByteLimit ?? MAX_BYTES;
@@ -8492,7 +9071,7 @@ ${content}`
         throw new Error("Agent connection has ended");
       const child = spawn(command, strings(params.args ?? []), {
         cwd,
-        env,
+        env: env2,
         stdio: "pipe",
         detached: process.platform !== "win32",
         windowsHide: true
@@ -8612,6 +9191,124 @@ ${content}`
     return this.mcp.close();
   }
 }
+const CHECKPOINT_TIMEOUT = 5e3;
+const TREE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+const GITLINK = "160000";
+const BATCH = 500;
+const unavailable = (reason) => ({ unavailable: reason });
+class ACPCheckpoints {
+  constructor(root, executable = "git") {
+    this.root = root;
+    this.executable = executable;
+  }
+  root;
+  executable;
+  queue = Promise.resolve();
+  async run(args, signal, index, acceptFailure = false) {
+    const result = await runCommand(this.executable, ["--literal-pathspecs", "-c", "color.ui=false", ...args], {
+      cwd: this.root,
+      signal,
+      maxBytes: MAX_MESSAGE_BYTES,
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0",
+        GIT_OPTIONAL_LOCKS: "0",
+        LC_ALL: "C",
+        ...index ? { GIT_INDEX_FILE: index } : {}
+      }
+    });
+    if (result.exitCode && !acceptFailure)
+      throw new RpcError("GIT_FAILED", result.stderr.trim() || `Git exited ${result.exitCode}`, { exitCode: result.exitCode });
+    return result;
+  }
+  serial(task) {
+    const next = this.queue.then(task, task);
+    this.queue = next.catch(() => {
+    });
+    return next;
+  }
+  async withIndex(task) {
+    const directory = await fs.mkdtemp(path.join(os.tmpdir(), "oxbit-checkpoint-"));
+    try {
+      return await task(path.join(directory, "index"));
+    } finally {
+      await fs.rm(directory, { recursive: true, force: true });
+    }
+  }
+  /** Copies the real index so `add -A` reuses its stat data, then writes the tree. */
+  async snapshot(signal) {
+    const repository = await this.run(["rev-parse", "--git-dir", "--show-toplevel"], signal, void 0, true);
+    if (repository.exitCode) return unavailable("not-repository");
+    const top = repository.stdout.trim().split("\n").at(-1) ?? "";
+    if (await fs.realpath(top).catch(() => top) !== this.root) return unavailable("subdirectory");
+    const real = path.resolve(this.root, (await this.run(["rev-parse", "--git-path", "index"], signal)).stdout.trim());
+    return this.withIndex(async (index) => {
+      await fs.copyFile(real, index).catch((error) => {
+        if (error.code !== "ENOENT") throw error;
+      });
+      await this.run(["add", "-A"], signal, index);
+      return (await this.run(["write-tree"], signal, index)).stdout.trim();
+    });
+  }
+  create(signal) {
+    const timeout = AbortSignal.timeout(CHECKPOINT_TIMEOUT);
+    return this.serial(async () => {
+      try {
+        const tree = await this.snapshot(signal ? AbortSignal.any([signal, timeout]) : timeout);
+        return typeof tree === "string" ? { tree } : tree;
+      } catch (error) {
+        if (signal?.aborted) throw error;
+        return unavailable(timeout.aborted ? "timeout" : "failed");
+      }
+    });
+  }
+  async changes(tree, signal) {
+    if (typeof tree !== "string" || !TREE.test(tree)) throw new RpcError("INVALID_PARAMS", "Choose a valid checkpoint");
+    const current = await this.snapshot(signal);
+    if (typeof current !== "string") return current;
+    if ((await this.run(["cat-file", "-e", `${tree}^{tree}`], signal, void 0, true)).exitCode) return unavailable("missing");
+    const output = (await this.run(["diff-tree", "-r", "-z", "--raw", "--no-renames", current, tree], signal)).stdout.split("\0");
+    const changes = [];
+    for (let i = 0; i + 1 < output.length; i += 2) {
+      const [from, to, , , status2] = output[i].replace(/^:/, "").split(" ");
+      if (from === GITLINK || to === GITLINK) continue;
+      changes.push({ status: status2, path: output[i + 1] });
+    }
+    return { tree: current, changes };
+  }
+  diff(tree, signal) {
+    return this.serial(() => this.changes(tree, signal));
+  }
+  /** Writes only paths that differ from the checkpoint. `paths` is the set the client checked for unsaved edits. */
+  restore(tree, paths, signal) {
+    if (paths !== void 0 && (!Array.isArray(paths) || paths.some((item) => typeof item !== "string")))
+      throw new RpcError("INVALID_PARAMS", "paths must be a string array");
+    return this.serial(async () => {
+      const diff = await this.changes(tree, signal);
+      if ("unavailable" in diff) throw new RpcError("CHECKPOINT_UNAVAILABLE", "This checkpoint is no longer available");
+      const checked = paths && new Set(paths);
+      if (checked && diff.changes.some((change) => !checked.has(change.path)))
+        throw new RpcError("CONFLICT", "Files changed while preparing the restore. Try again.");
+      const deleted = diff.changes.filter((change) => change.status === "D").map((change) => change.path);
+      const restored = diff.changes.filter((change) => change.status !== "D").map((change) => change.path);
+      for (const file of deleted) await this.remove(file);
+      if (restored.length)
+        await this.withIndex(async (index) => {
+          await this.run(["read-tree", tree], signal, index);
+          for (let i = 0; i < restored.length; i += BATCH)
+            await this.run(["checkout-index", "-f", "--", ...restored.slice(i, i + BATCH)], signal, index);
+        });
+      return { restored, deleted };
+    });
+  }
+  async remove(relative) {
+    const full = path.resolve(this.root, relative);
+    if (!full.startsWith(this.root + path.sep)) throw new RpcError("PATH_DENIED", `Path is outside the workspace: ${relative}`);
+    await fs.rm(full, { force: true });
+    for (let directory = path.dirname(full); directory !== this.root; directory = path.dirname(directory))
+      if (!await fs.rmdir(directory).then(() => true, () => false)) break;
+  }
+}
 var re = { exports: {} };
 var constants;
 var hasRequiredConstants;
@@ -9289,7 +9986,7 @@ function requireSort() {
   if (hasRequiredSort) return sort_1;
   hasRequiredSort = 1;
   const compareBuild = requireCompareBuild();
-  const sort = (list, loose) => list.sort((a, b) => compareBuild(a, b, loose));
+  const sort = (list2, loose) => list2.sort((a, b) => compareBuild(a, b, loose));
   sort_1 = sort;
   return sort_1;
 }
@@ -9299,7 +9996,7 @@ function requireRsort() {
   if (hasRequiredRsort) return rsort_1;
   hasRequiredRsort = 1;
   const compareBuild = requireCompareBuild();
-  const rsort = (list, loose) => list.sort((a, b) => compareBuild(b, a, loose));
+  const rsort = (list2, loose) => list2.sort((a, b) => compareBuild(b, a, loose));
   rsort_1 = rsort;
   return rsort_1;
 }
@@ -11460,8 +12157,8 @@ function createKernel({
         }
         extensionChanged(id);
       },
-      async load(url, options2) {
-        const parsed = new URL(url, globalThis.location?.href ?? "file:///");
+      async load(url2, options2) {
+        const parsed = new URL(url2, globalThis.location?.href ?? "file:///");
         if (!["http:", "https:", "file:"].includes(parsed.protocol) && (!extensionOrigins.has(`${parsed.protocol}//${parsed.host}`) || parsed.username || parsed.password))
           throw new Error(
             "Extensions require a trusted HTTP(S), file, or application ESM artifact"
@@ -11612,9 +12309,9 @@ function bonjourName() {
   return macLocalName || void 0;
 }
 function lanAddresses$1(interfaces = os.networkInterfaces()) {
-  const addresses = Object.values(interfaces).flatMap((entries) => entries ?? []).filter((entry) => !entry.internal);
+  const addresses = Object.values(interfaces).flatMap((entries) => entries ?? []).filter((entry2) => !entry2.internal);
   const of = (family) => [
-    ...new Set(addresses.filter((entry) => entry.family === family).map((entry) => entry.address.split("%")[0]))
+    ...new Set(addresses.filter((entry2) => entry2.family === family).map((entry2) => entry2.address.split("%")[0]))
   ];
   return { v4: of("IPv4"), v6: of("IPv6") };
 }
@@ -11630,6 +12327,267 @@ function lanUrl(port2, interfaces = os.networkInterfaces()) {
   const address = lanAddresses$1(interfaces).v4[0];
   return address ? `http://${address}:${port2}` : void 0;
 }
+const MAX_OUTPUT_BYTES = 1024 * 1024;
+const shellOwned = /* @__PURE__ */ new Set(["PWD", "OLDPWD", "SHLVL", "_", "OXBIT_RESOLVING_ENVIRONMENT"]);
+const launchOwned = (key) => /^(SSH_|GH_|GITHUB_)/.test(key) || key.toLowerCase().endsWith("_proxy");
+function parseShellEnvironment(output, mark) {
+  const start = output.indexOf(mark), end = output.lastIndexOf(mark);
+  if (start < 0 || end <= start) return void 0;
+  const env2 = {};
+  for (const entry2 of output.slice(start + mark.length, end).split("\0")) {
+    const separator = entry2.indexOf("="), key = entry2.slice(0, separator);
+    if (separator > 0 && /^[A-Za-z_][A-Za-z0-9_]*$/.test(key) && !shellOwned.has(key))
+      env2[key] = entry2.slice(separator + 1);
+  }
+  return env2;
+}
+function loginShellEnvironment(cwd, inherited = process.env, platform = process.platform, timeout = 1e4) {
+  if (platform === "win32") return Promise.resolve(inherited);
+  const { shell, args } = resolveTerminalShell(inherited, platform);
+  const mark = randomBytes(12).toString("hex");
+  return new Promise((resolve) => {
+    const chunks = [];
+    let bytes = 0, settled = false;
+    const child = spawn(shell, [...args, "-c", `printf ${mark}; /usr/bin/env -0; printf ${mark}`], {
+      cwd,
+      env: { ...inherited, OXBIT_RESOLVING_ENVIRONMENT: "1" },
+      stdio: ["ignore", "pipe", "ignore"],
+      detached: true
+    });
+    trackChild(child);
+    const finish = (env2) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+      if (!env2) {
+        resolve(inherited);
+        return;
+      }
+      const merged = { ...inherited, ...env2 };
+      for (const [key, value] of Object.entries(inherited))
+        if (launchOwned(key)) merged[key] = value;
+      resolve(merged);
+    };
+    const timer = setTimeout(() => finish(), timeout);
+    child.stdout.on("data", (chunk) => {
+      bytes += chunk.length;
+      if (bytes > MAX_OUTPUT_BYTES) finish();
+      else chunks.push(chunk);
+    });
+    child.on("error", () => finish());
+    child.on("close", (code) => finish(code === 0 ? parseShellEnvironment(Buffer.concat(chunks).toString(), mark) : void 0));
+  });
+}
+const PUSH_DEVICES_FILE = "push-devices.json";
+const MAX_DEVICES = 16;
+const RETENTION_MS = 30 * 24 * 60 * 60 * 1e3;
+const WINDOW_SECONDS = 15 * 60;
+const RELAY_TIMEOUT_MS = 1e4;
+const HANDLE = /^[A-Za-z0-9_-]{1,2048}$/;
+const STATUSES = ["working", "waiting", "finished", "failed"];
+const TITLES = { waiting: "Agent needs your input", finished: "Agent finished", failed: "Agent turn failed" };
+const log = (message2) => process.stderr.write(`Oxbit push: ${message2}
+`);
+function deviceIdOf(params) {
+  const value = requireString(params, "deviceId", 128);
+  if (!value) throw new RpcError("INVALID_PARAMS", "Invalid deviceId");
+  return value;
+}
+function handleOf(params, key) {
+  const value = params[key];
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value !== "string" || !HANDLE.test(value)) throw new RpcError("INVALID_PARAMS", `Invalid ${key}`);
+  return value;
+}
+const text$1 = (value) => typeof value === "string" && value.length <= 1024;
+function activityOf(value) {
+  if (value === null) return null;
+  const v = value ?? {};
+  const startedAt = v.startedAt;
+  if (typeof value !== "object" || !text$1(v.agent) || !text$1(v.title) || !text$1(v.detail) || !STATUSES.includes(v.status) || !Number.isSafeInteger(v.pending) || v.pending < 0 || startedAt !== void 0 && (typeof startedAt !== "number" || !Number.isFinite(startedAt) || startedAt < 0))
+    throw new RpcError("INVALID_PARAMS", "Invalid activity");
+  return {
+    agent: v.agent,
+    title: v.title,
+    status: v.status,
+    detail: v.detail,
+    pending: v.pending,
+    ...startedAt === void 0 ? {} : { startedAt }
+  };
+}
+function restore(entry2) {
+  try {
+    const activity = entry2.activity === void 0 ? null : activityOf(entry2.activity);
+    const device = {
+      deviceId: deviceIdOf(entry2),
+      session: requireString(entry2, "session", 128),
+      alert: handleOf(entry2, "alert"),
+      liveActivity: handleOf(entry2, "liveActivity"),
+      active: false,
+      ...activity ? { activity } : {},
+      updatedAt: entry2.updatedAt
+    };
+    return Number.isFinite(device.updatedAt) ? device : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function detail(status2, pending) {
+  if (status2 === "working") return "Working";
+  if (status2 === "waiting") return pending === 1 ? "1 request needs an answer" : `${pending} requests need an answer`;
+  return TITLES[status2];
+}
+function activityState(snapshot, event) {
+  return {
+    status: event.status,
+    title: snapshot.title,
+    detail: detail(event.status, event.pending),
+    pending: event.pending,
+    ...event.status === "working" && event.startedAt !== void 0 ? { startedAt: Math.floor(event.startedAt / 1e3) } : {}
+  };
+}
+class PushDevices {
+  constructor(file) {
+    this.file = file;
+  }
+  file;
+  devices = /* @__PURE__ */ new Map();
+  /** Last Live Activity state sent per device. */
+  sent = /* @__PURE__ */ new Map();
+  persistence = Promise.resolve();
+  static async open(dataDir) {
+    const store = new PushDevices(path.join(dataDir, PUSH_DEVICES_FILE));
+    try {
+      const state2 = JSON.parse(await fs.readFile(store.file, "utf8"));
+      if (state2?.version === 1 && Array.isArray(state2.devices))
+        for (const entry2 of state2.devices) {
+          const device = entry2 && typeof entry2 === "object" ? restore(entry2) : void 0;
+          if (device) store.devices.set(device.deviceId, device);
+        }
+    } catch (error) {
+      if (error.code !== "ENOENT") log(`ignoring unreadable ${PUSH_DEVICES_FILE}: ${String(error)}`);
+    }
+    store.prune();
+    return store;
+  }
+  async register(session, connection, params) {
+    const deviceId = deviceIdOf(params), alert = handleOf(params, "alert"), liveActivity = handleOf(params, "liveActivity");
+    const previous = this.devices.get(deviceId);
+    this.sent.delete(deviceId);
+    this.devices.set(deviceId, {
+      ...previous,
+      deviceId,
+      session,
+      alert,
+      liveActivity,
+      active: true,
+      connection,
+      updatedAt: Date.now()
+    });
+    await this.persist();
+    return {};
+  }
+  async state(session, connection, params) {
+    const deviceId = deviceIdOf(params);
+    if (typeof params.active !== "boolean") throw new RpcError("INVALID_PARAMS", "active must be boolean");
+    const activity = params.activity === void 0 ? void 0 : activityOf(params.activity);
+    const device = this.devices.get(deviceId);
+    if (!device || device.session !== session) throw new RpcError("NOT_FOUND", "Register the device first");
+    device.active = params.active;
+    if (params.active) device.connection = connection;
+    if (activity) device.activity = activity;
+    else if (activity === null) delete device.activity;
+    device.updatedAt = Date.now();
+    this.sent.delete(deviceId);
+    await this.persist();
+    return {};
+  }
+  async unregister(session, params) {
+    const deviceId = deviceIdOf(params);
+    if (this.devices.get(deviceId)?.session === session) {
+      this.devices.delete(deviceId);
+      this.sent.delete(deviceId);
+      await this.persist();
+    }
+    return {};
+  }
+  /** Marks devices inactive when the connection that set them active closes. */
+  disconnect(connection) {
+    let changed = false;
+    for (const device of this.devices.values())
+      if (device.active && device.connection === connection) {
+        device.active = false;
+        changed = true;
+      }
+    if (changed) this.persist().catch((error) => log(`cannot save devices: ${String(error)}`));
+  }
+  /** Sends alert and Live Activity pushes to the owner's inactive devices; resolves after every send settles. */
+  async notify(event) {
+    const sends = [];
+    for (const device of this.devices.values()) {
+      if (device.active || device.session !== event.owner) continue;
+      if (event.status !== "working" && device.alert)
+        sends.push(this.send(device.deviceId, "alert", {
+          handle: device.alert,
+          alert: { title: TITLES[event.status], body: device.activity?.title || event.agent }
+        }));
+      if (!device.liveActivity || !device.activity) continue;
+      const state2 = activityState(device.activity, event), end = event.status === "finished" || event.status === "failed";
+      const key = JSON.stringify([end, state2]);
+      if (this.sent.get(device.deviceId) === key) continue;
+      this.sent.set(device.deviceId, key);
+      const window = Math.floor(Date.now() / 1e3) + WINDOW_SECONDS;
+      sends.push(this.send(device.deviceId, "liveActivity", {
+        handle: device.liveActivity,
+        activity: { event: end ? "end" : "update", state: state2, ...end ? { dismissalDate: window } : { staleDate: window } }
+      }));
+    }
+    await Promise.all(sends);
+  }
+  flush() {
+    return this.persistence.catch(() => {
+    });
+  }
+  async send(deviceId, kind, request) {
+    const relay = (process.env.OXBIT_PUSH_RELAY ?? PUSH_RELAY_URL).replace(/\/+$/, "");
+    try {
+      const response = await fetch(`${relay}/v1/push`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(request),
+        signal: AbortSignal.timeout(RELAY_TIMEOUT_MS)
+      });
+      const result = await response.json().catch(() => ({}));
+      const device = this.devices.get(deviceId);
+      if (result.gone && device?.[kind] === request.handle) {
+        delete device[kind];
+        if (kind === "liveActivity") this.sent.delete(deviceId);
+        await this.persist();
+      } else if (!response.ok || !result.sent)
+        log(`relay did not send to ${deviceId}: ${result.reason ?? `HTTP ${response.status}`}`);
+    } catch (error) {
+      log(`push to ${deviceId} failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  prune(now = Date.now()) {
+    for (const [id, device] of this.devices)
+      if (now - device.updatedAt > RETENTION_MS) this.devices.delete(id);
+    const oldest = [...this.devices.values()].sort((a, b) => a.updatedAt - b.updatedAt);
+    for (const device of oldest.slice(0, Math.max(0, oldest.length - MAX_DEVICES))) this.devices.delete(device.deviceId);
+    for (const id of this.sent.keys()) if (!this.devices.has(id)) this.sent.delete(id);
+  }
+  persist() {
+    this.prune();
+    const payload = JSON.stringify({ version: 1, devices: [...this.devices.values()] });
+    this.persistence = this.persistence.catch(() => {
+    }).then(async () => {
+      await fs.writeFile(this.file + ".tmp", payload, { mode: 384 });
+      await fs.rename(this.file + ".tmp", this.file);
+    });
+    return this.persistence;
+  }
+}
 const MAX_SOCKET_BACKLOG_BYTES = MAX_FILE_WRITE_MESSAGE_BYTES;
 const allCapabilities = [
   "filesystem.read",
@@ -11734,13 +12692,13 @@ async function createRuntime(options2) {
     const origin = request.headers.origin;
     return origin === void 0 ? !required : allowedOrigins().has(origin);
   };
-  const send = (connection, message) => {
+  const send = (connection, message2) => {
     if (connection.ws.readyState !== WebSocket.OPEN) return;
     if (connection.ws.bufferedAmount > MAX_SOCKET_BACKLOG_BYTES) {
       connection.ws.close(1013, "Slow consumer; reconnect to resynchronize");
       return;
     }
-    connection.ws.send(JSON.stringify(message));
+    connection.ws.send(JSON.stringify(message2));
   };
   const event = (connection, name, params, stream, seq) => send(connection, {
     v: 1,
@@ -11771,10 +12729,12 @@ async function createRuntime(options2) {
       throw new RpcError("FORBIDDEN", "Owner access is required");
     return session;
   };
+  const acpRegistry = new ACPRegistry(dataDir, options2.acpRegistryUrl);
+  const pushDevices = await PushDevices.open(dataDir);
   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());
+  }, () => updateIdle(), acpRegistry, (status2) => void pushDevices.notify(status2));
   const processEvent = ({ event: name, params, stream, seq }, ownerId) => {
     const cap = name.startsWith("terminal.") ? "terminal" : "tasks";
     for (const c of connections.values()) {
@@ -11784,7 +12744,7 @@ async function createRuntime(options2) {
   };
   const processes = new Processes(root, processEvent);
   const taskStore = await TaskConfigStore.create(root, { home: options2.tasksHome ?? setting("TASKS_HOME"), gitPath: options2.desktop?.gitPath });
-  const tasks = new TaskRunner(taskStore, processEvent, options2.forwardTaskPort);
+  const tasks = new TaskRunner(taskStore, processEvent, options2.forwardTaskPort, loginShellEnvironment);
   const worktrees = new TaskWorktrees(taskStore, tasks);
   let projectChanged = () => {
   };
@@ -11834,6 +12794,7 @@ async function createRuntime(options2) {
     }
   );
   const git = new Git(files, options2.desktop?.gitPath);
+  const checkpoints = new ACPCheckpoints(files.root, options2.desktop?.gitPath);
   const extensions = new RuntimeExtensions(files, {
     "runtime.git": {
       status: (signal) => git.status(signal),
@@ -11939,29 +12900,29 @@ async function createRuntime(options2) {
         httpJson(response, 403, { error: "Origin is not allowed" });
         return;
       }
-      const url = new URL(request.url ?? "/", `http://${host}:${port2}`);
-      if (url.pathname === "/api/health") {
+      const url2 = new URL(request.url ?? "/", `http://${host}:${port2}`);
+      if (url2.pathname === "/api/health") {
         httpJson(response, 200, { ok: true, protocol: 1, ...identity2 });
         return;
       }
-      if (url.pathname === "/api/pair" && request.method === "POST") {
+      if (url2.pathname === "/api/pair" && request.method === "POST") {
         if (options2.desktop) {
           httpJson(response, 403, { error: "Desktop pairing requires the parent channel" });
           return;
         }
-        const address2 = request.socket.remoteAddress ?? "unknown", entry = attempts.get(address2) ?? {
+        const address2 = request.socket.remoteAddress ?? "unknown", entry2 = attempts.get(address2) ?? {
           count: 0,
           reset: Date.now() + 6e4
         };
-        if (Date.now() > entry.reset) {
-          entry.count = 0;
-          entry.reset = Date.now() + 6e4;
+        if (Date.now() > entry2.reset) {
+          entry2.count = 0;
+          entry2.reset = Date.now() + 6e4;
         }
-        if (++entry.count > pairingAttemptsPerMinute) {
+        if (++entry2.count > pairingAttemptsPerMinute) {
           httpJson(response, 429, { error: "Pairing rate limit reached" });
           return;
         }
-        attempts.set(address2, entry);
+        attempts.set(address2, entry2);
         const input = await body(request);
         const code = typeof input.code === "string" ? input.code : "";
         const a = Buffer.from(code), b = Buffer.from(pairingCode);
@@ -11977,7 +12938,7 @@ async function createRuntime(options2) {
         httpJson(response, 200, { ...result, runtime: identity2 });
         return;
       }
-      if (url.pathname === "/api/grants") {
+      if (url2.pathname === "/api/grants") {
         const session = httpSession(request);
         if (!session?.owner) {
           httpJson(response, 403, { error: "Owner access is required" });
@@ -12006,7 +12967,7 @@ async function createRuntime(options2) {
           return;
         }
       }
-      if (url.pathname.startsWith("/api/grants/") && request.method === "DELETE") {
+      if (url2.pathname.startsWith("/api/grants/") && request.method === "DELETE") {
         if (!httpSession(request)?.owner) {
           httpJson(response, 403, { error: "Owner access is required" });
           return;
@@ -12015,7 +12976,7 @@ async function createRuntime(options2) {
           response,
           200,
           await revoke(
-            decodeURIComponent(url.pathname.slice("/api/grants/".length))
+            decodeURIComponent(url2.pathname.slice("/api/grants/".length))
           )
         );
         return;
@@ -12026,7 +12987,7 @@ async function createRuntime(options2) {
       }
       let relative;
       try {
-        relative = decodeURIComponent(url.pathname);
+        relative = decodeURIComponent(url2.pathname);
       } catch {
         httpJson(response, 400, { error: "Invalid path" });
         return;
@@ -12120,7 +13081,7 @@ async function createRuntime(options2) {
     if (method.startsWith("terminal.")) return { cap: "terminal", trust: true };
     if (method.startsWith("tasks.")) return { cap: "tasks", trust: !["tasks.catalog", "tasks.list", "tasks.attach", "tasks.worktrees"].includes(method) };
     if (method.startsWith("git.")) return { cap: "git", trust: true };
-    if (method.startsWith("acp.")) return { cap: "extensions", trust: true };
+    if (method.startsWith("acp.") || method.startsWith("push.")) return { cap: "extensions", trust: true };
     if (method.startsWith("lsp.")) return { cap: "lsp", trust: true };
     if (method.startsWith("collab.")) return { cap: "collaboration" };
     if (method.startsWith("extensions."))
@@ -12150,9 +13111,10 @@ async function createRuntime(options2) {
     const required = permission(method), session = authorized(connection, required.cap, required.trust);
     if (method.startsWith("acp.")) {
       owner(connection);
-      if (!["acp.start", "acp.list", "acp.attach", "acp.disconnect"].includes(method))
+      if (!["acp.start", "acp.list", "acp.attach", "acp.detach", "acp.stop", "acp.disconnect", "acp.registry"].includes(method) && !method.startsWith("acp.checkpoint."))
         agents.control(session.id, requireString(params, "id"), connection.id);
     }
+    if (method.startsWith("push.")) owner(connection);
     if (method.startsWith("project.")) owner(connection);
     if (method.startsWith("settings.")) owner(connection);
     switch (method) {
@@ -12178,6 +13140,8 @@ async function createRuntime(options2) {
         return agents.start(session.id, params, signal, connection.id);
       case "acp.list":
         return agents.list(session.id);
+      case "acp.registry":
+        return acpRegistry.listing(params.refresh === true);
       case "acp.attach":
         return agents.attach(session.id, requireString(params, "id"), connection.id, params.clientCapabilities?.editorTools === true);
       case "acp.enqueue":
@@ -12185,6 +13149,9 @@ async function createRuntime(options2) {
         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.moveQueued":
+        if (!Number.isInteger(params.index)) throw new RpcError("INVALID_PARAMS", "index must be an integer");
+        return agents.moveQueued(session.id, requireString(params, "id"), requireString(params, "promptId"), params.index);
       case "acp.resumeQueue":
         return agents.resumeQueue(session.id, requireString(params, "id"));
       case "acp.call":
@@ -12195,9 +13162,26 @@ async function createRuntime(options2) {
         return agents.cancel(session.id, requireString(params, "id"));
       case "acp.stop":
         return agents.stop(session.id, requireString(params, "id"));
+      case "acp.detach":
+        agents.detach(connection.id);
+        return {};
       case "acp.disconnect":
         agents.disconnect(session.id, connection.id);
         return {};
+      case "push.register":
+        return pushDevices.register(session.id, connection.id, params);
+      case "push.state":
+        return pushDevices.state(session.id, connection.id, params);
+      case "push.unregister":
+        return pushDevices.unregister(session.id, params);
+      case "acp.checkpoint.create":
+        return checkpoints.create(signal);
+      case "acp.checkpoint.diff":
+        return checkpoints.diff(params.tree, signal);
+      case "acp.checkpoint.restore":
+        if (agents.list(session.id).sessions.some((agent) => agent.busy || agent.pendingRequests))
+          throw new RpcError("BUSY", "Wait for the agent to finish before restoring a checkpoint");
+        return checkpoints.restore(params.tree, params.paths, signal);
       case "workspace.info":
         return sessionInfo(session);
       case "workspace.trust":
@@ -12371,6 +13355,8 @@ async function createRuntime(options2) {
         return git.show(params.ref, signal);
       case "git.commitDiff":
         return git.commitDiff(params, signal);
+      case "git.branchDiff":
+        return git.branchDiff(params, signal);
       case "git.stashes":
         return git.stashes(signal);
       case "git.stashDiff":
@@ -12535,6 +13521,25 @@ async function createRuntime(options2) {
           params.encoding,
           params.eol
         );
+      case "search.files": {
+        const term = requireString(params, "query", 1024).trim().toLowerCase();
+        if (!term) return [];
+        const result = await runCommand(options2.desktop?.rgPath ?? "rg", ["--files", "--hidden", "--glob", "!.git", "--glob", "!node_modules", "--glob", "!.oxbit-tmp-*"], {
+          cwd: root,
+          signal,
+          maxBytes: 64 * MAX_BUFFER_BYTES
+        });
+        if (result.exitCode > 1) throw new RpcError("SEARCH_FAILED", result.stderr.trim());
+        const matches = (path2) => {
+          let at = 0;
+          for (const char of term) {
+            at = path2.indexOf(char, at) + 1;
+            if (!at) return false;
+          }
+          return true;
+        };
+        return result.stdout.split("\n").filter((path2) => path2 && matches(path2.toLowerCase())).sort().slice(0, 1e3);
+      }
       case "search.query": {
         const query = requireString(params, "query", 8192);
         if (!query) return [];
@@ -12669,32 +13674,32 @@ async function createRuntime(options2) {
     authDeadline.unref();
     ws.on("message", (raw) => {
       void (async () => {
-        let message;
+        let message2;
         try {
-          message = parseClientMessage(raw.toString());
+          message2 = parseClientMessage(raw.toString());
         } catch (error) {
           event(connection, "protocol.error", errorShape(error));
           ws.close(1008, "Invalid protocol message");
           return;
         }
-        if (message.type === "cancel") {
+        if (message2.type === "cancel") {
           authorized(connection);
-          connection.pending.get(message.id)?.abort();
+          connection.pending.get(message2.id)?.abort();
           return;
         }
-        if (message.type === "ack") {
+        if (message2.type === "ack") {
           const session = authorized(connection, "terminal");
-          if (!message.stream.startsWith("terminal:"))
+          if (!message2.stream.startsWith("terminal:"))
             throw new RpcError("INVALID_PARAMS", "Unknown stream");
           processes.ack(
-            message.stream.slice(9),
+            message2.stream.slice(9),
             session.id,
             connection.id,
-            message.seq
+            message2.seq
           );
           return;
         }
-        const { id, method, params } = message;
+        const { id, method, params } = message2;
         if (connection.pending.size >= 64) {
           send(connection, {
             v: 1,
@@ -12800,6 +13805,7 @@ async function createRuntime(options2) {
       clearTimeout(authDeadline);
       agents.detach(connection.id);
       lsp.detach(connection.id);
+      pushDevices.disconnect(connection.id);
       connections.delete(connection.id);
       updateIdle();
       for (const pending of connection.edits.values()) {
@@ -12950,6 +13956,7 @@ async function createRuntime(options2) {
       await Promise.allSettled([...inflight.values()]);
       await collaboration.close();
       await persistence;
+      await pushDevices.flush();
       await new Promise((resolve) => websocket.close(() => resolve()));
       await new Promise((resolve) => server.close(() => resolve()));
     }
@@ -13147,7 +14154,7 @@ function lanAddresses() {
   return { v4: of("IPv4"), v6: of("IPv6") };
 }
 const stderrLog = (line) => process.stderr.write(line + "\n");
-function advertise(ad, log = stderrLog) {
+function advertise(ad, log2 = stderrLog) {
   const instance = instanceLabel(ad.name, ad.id);
   const current = (ttl) => records({ ...ad, ...(ad.addresses ?? lanAddresses)() }, ttl);
   const timers = [];
@@ -13166,11 +14173,11 @@ function advertise(ad, log = stderrLog) {
   };
   const fail = (error) => {
     if (closed) return;
-    log(`mDNS advertising disabled: ${error.message}`);
+    log2(`mDNS advertising disabled: ${error.message}`);
     stop2();
   };
   const sendFailure = (error) => {
-    if (!sendFailed) log(`mDNS send failed: ${error.message}`);
+    if (!sendFailed) log2(`mDNS send failed: ${error.message}`);
     sendFailed = true;
   };
   const send = (packet, port2 = PORT, address = GROUP, done) => {
@@ -13240,8 +14247,8 @@ function advertise(ad, log = stderrLog) {
     })
   };
 }
-const dataDirFor = (root, env = process.env) => {
-  const directory = setting("DATA_DIR", env);
+const dataDirFor = (root, env2 = process.env) => {
+  const directory = setting("DATA_DIR", env2);
   return directory ? path.resolve(directory) : workspaceDataDir(root);
 };
 const recordFile = (dataDir) => path.join(dataDir, "daemon.json");
@@ -13252,14 +14259,14 @@ function launchUrl(daemon, file) {
   if (file) params.set("open", file);
   return `http://${localHost(daemon.host)}:${daemon.port}/#${params}`;
 }
-function browserCommand(url, platform) {
-  if (platform === "darwin") return { command: "open", args: [url] };
+function browserCommand(url2, platform) {
+  if (platform === "darwin") return { command: "open", args: [url2] };
   if (platform === "win32")
-    return { command: "cmd", args: ["/c", "start", "", url] };
-  return { command: "xdg-open", args: [url] };
+    return { command: "cmd", args: ["/c", "start", "", url2] };
+  return { command: "xdg-open", args: [url2] };
 }
-function launchBrowser(url) {
-  const { command, args } = browserCommand(url, process.platform);
+function launchBrowser(url2) {
+  const { command, args } = browserCommand(url2, process.platform);
   const child = spawn(command, args, { detached: true, stdio: "ignore" });
   child.on("error", () => {
   });
@@ -13357,7 +14364,7 @@ function parseDuration(value) {
   const duration = match ? Number(match[1]) * units[match[2] ?? ""] : NaN;
   return Number.isSafeInteger(duration) ? duration : void 0;
 }
-function parse(argv, env = process.env) {
+function parse(argv, env2 = process.env) {
   const parsed = tokenize(argv);
   if ("error" in parsed) return parsed;
   const { values, positionals } = parsed;
@@ -13369,23 +14376,23 @@ function parse(argv, env = process.env) {
     return { error: "--desktop cannot be combined with browser runtime options" };
   if (values.lan && values.host)
     return { error: "--lan binds every interface and cannot be combined with --host" };
-  const requested = text(values.port) ?? env.PORT;
+  const requested = text(values.port) ?? env2.PORT;
   const port2 = requested === void 0 ? 0 : Number(requested);
   if (!Number.isInteger(port2) || port2 < 0 || port2 > 65535)
     return {
       error: `Port must be a whole number between 0 and 65535, received "${requested}"`
     };
-  const lifetime = text(values["keep-alive"]) ?? setting("KEEP_ALIVE", env);
+  const lifetime = text(values["keep-alive"]) ?? setting("KEEP_ALIVE", env2);
   const keepAlive = lifetime === void 0 ? 0 : parseDuration(lifetime);
   if (keepAlive === void 0)
     return {
       error: `Keep-alive must be a duration such as 75s, 15m, 1h, forever, or milliseconds, received "${lifetime}"`
     };
   return {
-    target: positionals[0] ?? setting("WORKSPACE", env) ?? ".",
+    target: positionals[0] ?? setting("WORKSPACE", env2) ?? ".",
     port: port2,
     keepAlive,
-    host: values.lan ? "0.0.0.0" : text(values.host) ?? env.HOST ?? DEFAULT_HOST,
+    host: values.lan ? "0.0.0.0" : text(values.host) ?? env2.HOST ?? DEFAULT_HOST,
     lan: values.lan === true,
     open: values["no-open"] !== true,
     foreground: values.foreground === true,
@@ -13417,15 +14424,15 @@ function serveFailure(error, host, port2) {
     return `Cannot serve on ${address}: the address is not available on this machine.`;
   return `The runtime could not start: ${failure2.message ?? String(error)}`;
 }
-async function serve(invocation, target, dataDir, env) {
+async function serve(invocation, target, dataDir, env2) {
   try {
-    return await serveRuntime(invocation, target, dataDir, env);
+    return await serveRuntime(invocation, target, dataDir, env2);
   } catch (error) {
     process.stderr.write(serveFailure(error, invocation.host, invocation.port) + "\n");
     return 1;
   }
 }
-async function serveRuntime(invocation, target, dataDir, env) {
+async function serveRuntime(invocation, target, dataDir, env2) {
   const host = invocation.host;
   const port2 = invocation.port;
   let stop2 = () => {
@@ -13435,10 +14442,10 @@ async function serveRuntime(invocation, target, dataDir, env) {
     port: port2,
     host,
     dataDir,
-    pairingCode: setting("PAIRING_CODE", env),
-    pairingAttemptsPerMinute: setting("PAIRING_ATTEMPTS_PER_MINUTE", env) === void 0 ? void 0 : Number(setting("PAIRING_ATTEMPTS_PER_MINUTE", env)),
-    origins: setting("ORIGINS", env)?.split(",").filter(Boolean),
-    webRoot: setting("WEB_ROOT", env),
+    pairingCode: setting("PAIRING_CODE", env2),
+    pairingAttemptsPerMinute: setting("PAIRING_ATTEMPTS_PER_MINUTE", env2) === void 0 ? void 0 : Number(setting("PAIRING_ATTEMPTS_PER_MINUTE", env2)),
+    origins: setting("ORIGINS", env2)?.split(",").filter(Boolean),
+    webRoot: setting("WEB_ROOT", env2),
     ...invocation.keepAlive ? { idleShutdown: { afterMs: invocation.keepAlive, onIdle: () => stop2() } } : {}
   });
   let advertiser;
@@ -13456,16 +14463,16 @@ async function serveRuntime(invocation, target, dataDir, env) {
     startedAt: Date.now()
   };
   await writeRecord(dataDir, daemon);
-  const url = launchUrl(daemon, target.file);
+  const url2 = launchUrl(daemon, target.file);
   process.stdout.write(
     (invocation.lan ? networkSummary(daemon) : `Oxbit runtime: http://${host}:${runtime.port}
 Workspace: ${runtime.root}
 Owner pairing code: ${runtime.pairingCode}
 Runtime id: ${runtime.identity.id}
-`) + `Open: ${url}
+`) + `Open: ${url2}
 `
   );
-  if (invocation.open) launchBrowser(url);
+  if (invocation.open) launchBrowser(url2);
   await new Promise((resolve) => {
     const shutdown = () => {
       void Promise.resolve(advertiser?.close()).then(() => runtime.close()).then(() => removeRecord(dataDir)).then(resolve, resolve);
@@ -13487,29 +14494,29 @@ Owner pairing code: ${daemon.pairingCode}
 Runtime id: ${daemon.id}
 `;
 }
-async function detach(invocation, target, dataDir, entry) {
+async function detach(invocation, target, dataDir, entry2) {
   await fs.mkdir(dataDir, { recursive: true, mode: 448 });
-  const log = await fs.open(logFile(dataDir), "a", 384);
-  const args = [entry, "--foreground", "--no-open", ...invocation.lan ? ["--lan"] : ["--host", invocation.host]];
+  const log2 = await fs.open(logFile(dataDir), "a", 384);
+  const args = [entry2, "--foreground", "--no-open", ...invocation.lan ? ["--lan"] : ["--host", invocation.host]];
   if (invocation.port) args.push("--port", String(invocation.port));
   args.push("--keep-alive", invocation.keepAlive ? String(invocation.keepAlive) : "forever");
   args.push(target.root);
-  const env = { ...process.env, OXBIT_DATA_DIR: dataDir };
-  delete env.PORT;
-  delete env.HOST;
-  delete env.OXBIT_WORKSPACE;
-  delete env.OXBIT_KEEP_ALIVE;
+  const env2 = { ...process.env, OXBIT_DATA_DIR: dataDir };
+  delete env2.PORT;
+  delete env2.HOST;
+  delete env2.OXBIT_WORKSPACE;
+  delete env2.OXBIT_KEEP_ALIVE;
   const child = spawn(process.execPath, args, {
     detached: true,
-    stdio: ["ignore", log.fd, log.fd],
-    env
+    stdio: ["ignore", log2.fd, log2.fd],
+    env: env2
   });
   let exit;
   child.on("exit", (code) => {
     exit = code ?? 1;
   });
   child.unref();
-  await log.close();
+  await log2.close();
   const deadline = Date.now() + READY_TIMEOUT;
   while (Date.now() < deadline) {
     const daemon = await liveDaemon(dataDir);
@@ -13565,11 +14572,11 @@ Open: ${launchUrl(daemon)}
 }
 async function run(argv, context = {}) {
   const {
-    env = process.env,
+    env: env2 = process.env,
     cwd = process.cwd(),
-    entry = fileURLToPath(import.meta.url)
+    entry: entry2 = fileURLToPath(import.meta.url)
   } = context;
-  const invocation = parse(argv, env);
+  const invocation = parse(argv, env2);
   if ("error" in invocation) {
     process.stderr.write(`${invocation.error}
 
@@ -13594,10 +14601,10 @@ ${USAGE}`);
     return 1;
   }
   if (invocation.action === "desktop") return launchDesktop(target.file ? path.join(target.root, target.file) : target.root);
-  const dataDir = dataDirFor(target.root, env);
+  const dataDir = dataDirFor(target.root, env2);
   if (invocation.action === "stop") return stop(dataDir, target.root);
   if (invocation.action === "status") return status(dataDir, target.root);
-  if (invocation.foreground) return serve(invocation, target, dataDir, env);
+  if (invocation.foreground) return serve(invocation, target, dataDir, env2);
   const existing = await liveDaemon(dataDir);
   if (existing && invocation.lan && !wildcardHost(existing.host)) {
     process.stderr.write(`A runtime already serves ${existing.root} on ${existing.host}. Run oxbit --stop, then oxbit --lan.
@@ -13608,18 +14615,18 @@ ${USAGE}`);
   if (existing) daemon = existing;
   else
     try {
-      daemon = await detach(invocation, target, dataDir, entry);
+      daemon = await detach(invocation, target, dataDir, entry2);
     } catch (error) {
       process.stderr.write(`${error.message}
 `);
       return 1;
     }
-  const url = launchUrl(daemon, target.file);
-  process.stdout.write(invocation.lan ? `${networkSummary(daemon)}Open: ${url}
+  const url2 = launchUrl(daemon, target.file);
+  process.stdout.write(invocation.lan ? `${networkSummary(daemon)}Open: ${url2}
 ` : `${daemon.root}
-${url}
+${url2}
 `);
-  if (invocation.open) launchBrowser(url);
+  if (invocation.open) launchBrowser(url2);
   return 0;
 }
 function desktopCommand(target, platform = process.platform) {