@oxbit/cli 0.8.0 → 0.10.0

package/runtime/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { realpathSync, constants as constants$1, watch, createWriteStream } from "node:fs";
+import { realpathSync, constants as constants$1, watch, createWriteStream, existsSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as fs from "node:fs/promises";
 import path from "node:path";
@@ -933,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","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":"[]"},"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.autoApplyEdits":{"title":"Auto-apply agent edits","description":"New conversations save agent file changes without review. Undo stays available, and permission prompts still ask.","type":"boolean","default":false},"agentACP.generateTitles":{"title":"Generate conversation titles","description":"When an agent does not name a conversation, ask the Oxbit Agent model for a short title after the first reply.","type":"boolean","default":true},"agentACP.oxbit-cli.command":{"title":"Oxbit Agent CLI executable","type":"string","default":"oxbit-agent"},"agentACP.oxbit-cli.args":{"title":"Oxbit Agent CLI arguments (JSON array)","type":"string","default":"[\\"acp\\"]"},"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.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" }, "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.autoApplyEdits": { "$ref": "#/properties/agentACP.autoApplyEdits" }, "agentACP.generateTitles": { "$ref": "#/properties/agentACP.generateTitles" }, "agentACP.oxbit-cli.command": { "$ref": "#/properties/agentACP.oxbit-cli.command" }, "agentACP.oxbit-cli.args": { "$ref": "#/properties/agentACP.oxbit-cli.args" }, "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,
@@ -1106,7 +1106,17 @@ function synchronization(capabilities) {
   const sync = capabilities.textDocumentSync;
   return typeof sync === "number" ? { openClose: true, change: sync } : sync ?? { openClose: false, change: 0 };
 }
+const OXBIT_CLI_PROVIDER = "oxbit-cli";
 const ACP_PROVIDERS = [
+  {
+    id: OXBIT_CLI_PROVIDER,
+    name: "Oxbit Agent CLI",
+    command: "oxbit-agent",
+    args: ["acp"],
+    setup: "Runs the oxbit-agent CLI that ships with Oxbit. It reads providers, keys, MCP servers, skills and hooks from ~/.oxbit/agent. Elsewhere, install @oxbit/agent from npm.",
+    url: "https://github.com/yannelli/oxbit/tree/main/apps/agent",
+    registryId: "oxbit-agent"
+  },
   {
     id: "codex",
     name: "Codex ACP",
@@ -1166,6 +1176,7 @@ 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",
@@ -3456,6 +3467,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 {
@@ -3786,18 +3799,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(
@@ -3808,7 +3821,7 @@ class Git {
         "--no-ext-diff",
         "--no-textconv",
         "--no-color",
-        detail.commit.id,
+        detail2.commit.id,
         "--",
         file.path,
         ...file.originalPath ? [file.originalPath] : []
@@ -3866,6 +3879,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));
@@ -4617,7 +4712,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 = "";
@@ -5247,6 +5345,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"],
@@ -5487,19 +5626,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 });
@@ -5515,6 +5657,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 });
     }
@@ -5813,6 +5956,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);
@@ -5853,7 +5998,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();
       }
@@ -7390,7 +7535,7 @@ class SubagentRegistry {
 let cached;
 function runtimeVersion() {
   if (cached) return cached;
-  return cached = "0.8.0";
+  return cached = "0.10.0";
 }
 const MAX_REQUEST_BYTES = 1024 * 1024;
 const MAX_CONCURRENT_REQUESTS = 16;
@@ -7979,6 +8124,9 @@ 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 bundledAgent(base = import.meta.url) {
+  return ["./agent/index.js", "../../agent/dist/index.js"].map((relative) => fileURLToPath(new URL(relative, base))).find((file) => existsSync(file));
+}
 function strings(value) {
   if (!Array.isArray(value) || value.length > 128 || value.some(
     (v) => typeof v !== "string" || v.length > 16384 || v.includes("\0")
@@ -7991,16 +8139,19 @@ function strings(value) {
 }
 class AgentACP {
   constructor(files, emit, stateChanged = () => {
-  }, acpRegistry) {
+  }, 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) {
@@ -8050,6 +8201,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,
@@ -8255,12 +8420,11 @@ class AgentACP {
     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] : []))
-    };
+    const name = preset2?.name ?? (custom || "Custom agent");
+    const args = strings(launch.args ?? (preset2 ? [...preset2.args] : []));
+    const bundled = provider === OXBIT_CLI_PROVIDER && command === preset2?.command ? bundledAgent() : void 0;
+    if (bundled) return { provider, name, command: process.execPath, args: [bundled, ...args] };
+    return { provider, name, command, args };
   }
   async call(owner, id, method, params = {}, signal) {
     const agent = this.get(owner, id);
@@ -8305,11 +8469,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"
@@ -8321,7 +8490,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"
@@ -8342,7 +8511,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)
@@ -8418,12 +8587,14 @@ class AgentACP {
     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: 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;
@@ -8448,6 +8619,8 @@ class AgentACP {
       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));
       }
@@ -8530,6 +8703,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;
@@ -8691,6 +8872,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) {
@@ -12209,6 +12391,215 @@ function loginShellEnvironment(cwd, inherited = process.env, platform = process.
     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",
@@ -12351,10 +12742,11 @@ async function createRuntime(options2) {
     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(), acpRegistry);
+  }, () => 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()) {
@@ -12701,7 +13093,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."))
@@ -12734,6 +13126,7 @@ async function createRuntime(options2) {
       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) {
@@ -12768,6 +13161,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":
@@ -12784,6 +13180,12 @@ async function createRuntime(options2) {
       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":
@@ -12965,6 +13367,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":
@@ -13129,6 +13533,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 [];
@@ -13394,6 +13817,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()) {
@@ -13544,6 +13968,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()));
     }
@@ -13741,7 +14166,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 = [];
@@ -13760,11 +14185,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) => {
@@ -14083,7 +14508,7 @@ Runtime id: ${daemon.id}
 }
 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 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");
@@ -14095,7 +14520,7 @@ async function detach(invocation, target, dataDir, entry2) {
   delete env2.OXBIT_KEEP_ALIVE;
   const child = spawn(process.execPath, args, {
     detached: true,
-    stdio: ["ignore", log.fd, log.fd],
+    stdio: ["ignore", log2.fd, log2.fd],
     env: env2
   });
   let exit;
@@ -14103,7 +14528,7 @@ async function detach(invocation, target, dataDir, entry2) {
     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);