ur-agent 1.35.1 → 1.36.1

package/README.md

@@ -68,8 +68,14 @@ handing work off to other tools or agents when needed.
 
 ### Requirements
 
-- Bun. This repository is configured with `bun@1.3.14`.
-- A Node.js-compatible shell environment (Node 18+ for the npm launcher).
+- Bun `>=1.3.0` (this repository pins `bun@1.3.14`). Bun is mandatory: every
+  install path — npm, GitHub, or source checkout — runs the CLI through Bun,
+  not Node. UR-AGENT is not Node-native.
+- Node.js `>=18.18` only to start the npm-installed launcher script
+  (`bin/ur.js`), which immediately checks for Bun and re-execs into it. If Bun
+  is missing, the launcher errors out instead of falling back to Node.
+- `sharp` installs automatically as a native runtime dependency (image
+  resizing for file reads, pasted images, and multimodal provider input).
 - For the default local setup: a running Ollama app or server
   (`http://localhost:11434/api`). Any other supported provider (API key,
   OpenAI-compatible server, or subscription CLI) works without Ollama.
@@ -252,7 +258,10 @@ identity line in the system prompt reflects it too:
   for LM Studio/llama.cpp/vLLM; the native API for Ollama).
 - **Subscription CLIs** (Codex, Claude Code, Gemini, Antigravity) are external
   app bridges: selecting one dispatches the turn through the vendor's official
-  CLI using your subscription. Log in with `ur auth <provider>`.
+  CLI using your subscription. Log in with `ur auth <provider>`. UR-native
+  tool calling, UR-native streaming, UR Bash/File tool execution, and sandbox
+  guarantees apply to UR-run tools and final UR output — not to what the
+  external CLI does internally (see Provider Guide below).
 - **Subscription** access does not list fake models. If no independent
   subscription backend is configured, `/model` marks it unavailable and asks you
   to choose a connected local, server, or API provider.
@@ -502,9 +511,10 @@ settings, generated indexes, memory, logs, and secrets out of Git.
 
 ## Architecture
 
-- `bin/ur.js` is the global launcher. It reads package metadata, uses the
-  bundled `dist/cli.js` when available, and otherwise starts the TypeScript CLI
-  through Bun.
+- `bin/ur.js` is the global launcher, invoked via Node's shebang. It always
+  executes the CLI through Bun — `bun dist/cli.js` when the bundle is present,
+  otherwise `bun run` against the TypeScript entrypoint — and exits with an
+  install error if Bun is not found. Node never runs the CLI itself.
 - `src/entrypoints/cli.tsx` handles fast startup paths such as `--version`,
   A2A serving, background sessions, bridge mode, and daemon paths before loading
   the full CLI.
@@ -546,8 +556,16 @@ the permission boundary matters.
   scripts, instruction files, `.ur/verify.json`, and safety config.
 - The deep verification subagent is available through `/verify` and can be
   auto-enabled with `UR_VERIFIER_AUTO_SUBAGENT=1`.
-- OS-level sandbox support is available on macOS and Linux through UR's
-  sandbox settings.
+- UR enforces permission and sandbox policy before running UR Bash/File
+  tools, not after. Sandbox mode is `disabled` (default), `recommended`
+  (`sandbox.enabled: true`, best-effort), or `required`
+  (`sandbox.enabled: true` + `sandbox.failIfUnavailable: true`) — `required`
+  fails closed and refuses to start if OS sandbox support is unavailable.
+  OS confinement uses `sandbox-exec` (Seatbelt) on macOS or `bwrap`
+  (bubblewrap) on Linux/WSL2; see `ur sandbox status`.
+- This sandbox wraps UR-run Bash/File tool commands only. It does not extend
+  to actions a subscription CLI provider performs internally — see
+  [Provider Guide](docs/providers.md).
 - MCP servers can access external services; only enable servers you trust.
 
 See [Configuration](docs/CONFIGURATION.md), [Validation](docs/VALIDATION.md),

package/bin/ur.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { spawn } from 'node:child_process'
+import { spawn, spawnSync } from 'node:child_process'
 import { existsSync, readFileSync } from 'node:fs'
-import { createServer } from 'node:http'
 import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -39,186 +38,40 @@ const bun = process.env.BUN_BIN || process.env.BUN_EXECUTABLE || 'bun'
 const ollamaModel =
   process.env.OLLAMA_MODEL || process.env.UR_MODEL
 const userArgs = process.argv.slice(2)
-
-function argValue(flag, fallback) {
-  const index = userArgs.indexOf(flag)
-  return index === -1 ? fallback : (userArgs[index + 1] ?? fallback)
-}
-
-function isLoopback(host) {
-  return host === '127.0.0.1' || host === 'localhost' || host === '::1'
-}
-
-function sendJson(res, status, body) {
-  res.writeHead(status, { 'content-type': 'application/json' })
-  res.end(JSON.stringify(body, null, 2))
+const requiredBun = packageMetadata.engines?.bun ?? '>=1.3.0'
+
+function printBunRuntimeError(detail) {
+  const attempted = bun
+  const source =
+    process.env.BUN_BIN
+      ? 'BUN_BIN'
+      : process.env.BUN_EXECUTABLE
+        ? 'BUN_EXECUTABLE'
+        : 'PATH'
+  console.error(
+    [
+      `UR-AGENT requires Bun ${requiredBun} at runtime because the published CLI bundle is built with --target bun.`,
+      `Could not execute "${attempted}" from ${source}.${detail ? ` ${detail}` : ''}`,
+      'Install Bun from https://bun.sh, or set BUN_BIN to the absolute path of a Bun executable.',
+    ].join('\n'),
+  )
 }
 
-function readJson(req) {
-  return new Promise(resolve => {
-    const chunks = []
-    req.on('data', chunk => chunks.push(Buffer.from(chunk)))
-    req.on('end', () => {
-      try {
-        resolve(JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}'))
-      } catch {
-        resolve(null)
-      }
-    })
-    req.on('error', () => resolve(null))
-  })
-}
-
-function buildAgentCard(baseUrl) {
-  return {
-    protocolVersion: '0.3.0',
-    name: 'UR-AGENT',
-    description:
-      'Local-first terminal coding agent powered through the local Ollama app, with MCP tools, custom agents, browser workflows, memory, verifier gates, and permission controls.',
-    url: `${baseUrl}/a2a`,
-    version,
-    documentationUrl:
-      'https://github.com/Maitham16/UR/blob/master/docs/AGENT_TRENDS.md',
-    capabilities: {
-      streaming: true,
-      pushNotifications: false,
-      stateTransitionHistory: true,
-    },
-    defaultInputModes: ['text/plain', 'text/markdown', 'application/json'],
-    defaultOutputModes: ['text/plain', 'text/markdown', 'application/json'],
-    provider: {
-      organization: 'Maitham Al-rubaye',
-      url: 'https://github.com/Maitham16/UR',
-    },
-    skills: [
-      {
-        id: 'coding-agent',
-        name: 'Coding Agent',
-        description:
-          'Read, edit, test, verify, and explain code inside a local workspace with permission controls.',
-        tags: ['coding', 'terminal', 'verification'],
-        examples: [
-          'Fix this failing test and run the relevant checks.',
-          'Review the current diff for behavioral regressions.',
-        ],
-        inputModes: ['text/plain', 'text/markdown'],
-        outputModes: ['text/plain', 'text/markdown'],
-      },
-    ],
-  }
-}
-
-function runAgentPrompt(prompt) {
-  const childArgs = existsSync(bundledEntrypoint)
-    ? [bundledEntrypoint, '-p', '--output-format', 'json', prompt]
-    : [
-        'run',
-        '--preload',
-        preload,
-        '--define',
-        defineMacro('MACRO.VERSION', version),
-        '--define',
-        defineMacro('MACRO.BUILD_TIME', ''),
-        '--define',
-        defineMacro('MACRO.PACKAGE_URL', packageName),
-        '--define',
-        defineMacro('MACRO.NATIVE_PACKAGE_URL', undefined),
-        '--define',
-        defineMacro('MACRO.FEEDBACK_CHANNEL', issuesUrl),
-        '--define',
-        defineMacro('MACRO.ISSUES_EXPLAINER', `file an issue at ${issuesUrl}`),
-        '--define',
-        defineMacro('MACRO.VERSION_CHANGELOG', ''),
-        entrypoint,
-        '-p',
-        '--output-format',
-        'json',
-        prompt,
-      ]
-
-  return new Promise(resolve => {
-    const child = spawn(bun, childArgs, {
-      cwd: process.cwd(),
-      env: {
-        ...process.env,
-        ...(ollamaModel ? { OLLAMA_MODEL: ollamaModel } : {}),
-      },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    })
-    const stdout = []
-    const stderr = []
-    child.stdout.on('data', chunk => stdout.push(Buffer.from(chunk)))
-    child.stderr.on('data', chunk => stderr.push(Buffer.from(chunk)))
-    child.on('error', error => {
-      resolve({ code: 1, stdout: '', stderr: error.message })
-    })
-    child.on('exit', code => {
-      resolve({
-        code: code ?? 1,
-        stdout: Buffer.concat(stdout).toString('utf8'),
-        stderr: Buffer.concat(stderr).toString('utf8'),
-      })
-    })
+function assertBunAvailable() {
+  const result = spawnSync(bun, ['--version'], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
   })
-}
 
-function runA2AServer() {
-  const host = argValue('--host', '127.0.0.1')
-  const port = Number(argValue('--port', '8765'))
-  const token = argValue('--token')
-  const dryRun = userArgs.includes('--dry-run')
-  if (!Number.isInteger(port) || port < 0 || port > 65535) {
-    console.error(`Invalid --port value: ${argValue('--port')}`)
+  if (result.error) {
+    printBunRuntimeError(result.error.message)
     process.exit(1)
   }
-  if (!isLoopback(host) && !token) {
-    console.error('Refusing to bind a2a server off-loopback without --token')
-    process.exit(1)
+  if (result.status !== 0) {
+    const detail = (result.stderr || result.stdout || '').trim()
+    printBunRuntimeError(detail || `Exited with status ${result.status}.`)
+    process.exit(result.status ?? 1)
   }
-
-  const baseUrl = `http://${host}:${port}`
-  const server = createServer(async (req, res) => {
-    const url = new URL(req.url ?? '/', baseUrl)
-    if (req.method === 'GET' && url.pathname === '/healthz') {
-      sendJson(res, 200, { ok: true })
-      return
-    }
-    if (
-      req.method === 'GET' &&
-      (url.pathname === '/.well-known/agent-card.json' ||
-        url.pathname === '/agent-card.json')
-    ) {
-      sendJson(res, 200, buildAgentCard(baseUrl))
-      return
-    }
-    if (req.method === 'POST' && url.pathname === '/a2a/tasks') {
-      if (token && req.headers.authorization !== `Bearer ${token}`) {
-        sendJson(res, 401, { error: 'unauthorized' })
-        return
-      }
-      const body = await readJson(req)
-      const prompt =
-        body && typeof body.prompt === 'string' ? body.prompt.trim() : ''
-      if (!prompt) {
-        sendJson(res, 400, { error: 'missing prompt' })
-        return
-      }
-      const command = [bun, bundledEntrypoint, '-p', '--output-format', 'json', prompt]
-      if (dryRun) {
-        sendJson(res, 200, { dryRun: true, command })
-        return
-      }
-      const result = await runAgentPrompt(prompt)
-      sendJson(res, result.code === 0 ? 200 : 500, result)
-      return
-    }
-    sendJson(res, 404, { error: 'not found' })
-  })
-  server.listen(port, host, () => {
-    const actual = server.address()
-    const actualPort = actual && typeof actual === 'object' ? actual.port : port
-    console.log(`A2A server listening on http://${host}:${actualPort}`)
-  })
 }
 
 const args =
@@ -246,6 +99,8 @@ const args =
         ...userArgs,
       ]
 
+assertBunAvailable()
+
 const child = spawn(bun, args, {
   cwd: process.cwd(),
   env: {
@@ -257,9 +112,7 @@ const child = spawn(bun, args, {
 
 child.on('error', error => {
   if (error.code === 'ENOENT') {
-    console.error(
-      'UR-AGENT requires Bun to run. Install Bun from https://bun.sh, then retry.',
-    )
+    printBunRuntimeError(error.message)
     process.exit(1)
   }