@commonlyai/cli 0.1.181 → 0.1.183

package/node_modules/@commonlyai/seats/src/wire/provider-proxy.js

@@ -1,4 +1,5 @@
 import { Transform } from 'node:stream';
+import { StringDecoder } from 'node:string_decoder';
 /** The per-spawn loopback proxy shared by OpenAI-compatible CLI adapters. */
 import { randomBytes, timingSafeEqual } from 'crypto';
 import { constants as fsConstants, realpathSync } from 'fs';
@@ -40,6 +41,71 @@ export const redactProviderMaterial = (material) => {
   });
 };
 
+const MAX_PINNED_REQUEST_BYTES = 8 * 1024 * 1024;
+const MAX_PINNED_RESPONSE_BYTES = 16 * 1024 * 1024;
+
+/**
+ * Checks that every completion an upstream serves names the pinned model.
+ * SSE is checked line by line, and nothing is released until a line has named
+ * the pinned model; after that only checked lines are released, so a chunk
+ * naming another model never reaches the CLI. Any other body is held whole and
+ * released only after its `model` is checked. A body that names no model is
+ * unverified, which counts as a failure: the pin is only as good as the check.
+ */
+const servedModelCheck = ({ pinned, stream, onServed }) => {
+  // A chunk boundary can fall inside a multi-byte character; the decoder
+  // carries the partial bytes into the next chunk instead of mangling both.
+  const decoder = new StringDecoder('utf8');
+  let pending = '';
+  let held = '';
+  let named = false;
+  let size = 0;
+  const check = (value) => {
+    if (typeof value !== 'string') return;
+    named = true;
+    onServed(value);
+    if (value !== pinned) throw new Error(`served model ${JSON.stringify(value)} is not the pinned ${JSON.stringify(pinned)}`);
+  };
+  const checkLine = (line) => {
+    const data = /^data:\s?(.*)$/.exec(line.replace(/\r$/, ''))?.[1];
+    if (data === undefined || data.trim() === '[DONE]' || !data.trim()) return;
+    let parsed;
+    try { parsed = JSON.parse(data); } catch { return; }
+    check(parsed?.model);
+  };
+  return new Transform({
+    transform(chunk, _encoding, done) {
+      size += chunk.length;
+      if (size > MAX_PINNED_RESPONSE_BYTES) { done(new Error('provider response exceeded the pinned-model check limit')); return; }
+      pending += decoder.write(chunk);
+      if (!stream) { done(); return; }
+      const end = pending.lastIndexOf('\n');
+      if (end < 0) { done(); return; }
+      const complete = pending.slice(0, end + 1);
+      pending = pending.slice(end + 1);
+      try { complete.split('\n').forEach(checkLine); } catch (error) { done(error); return; }
+      held += complete;
+      if (!named) { done(); return; }
+      const release = held;
+      held = '';
+      done(null, release);
+    },
+    flush(done) {
+      pending += decoder.end();
+      try {
+        if (stream) checkLine(pending);
+        else {
+          let parsed;
+          try { parsed = JSON.parse(pending); } catch { parsed = null; }
+          check(parsed?.model);
+        }
+        if (!named) throw new Error(`provider response named no model; the pinned ${JSON.stringify(pinned)} cannot be verified`);
+      } catch (error) { done(error); return; }
+      done(null, held + pending);
+    },
+  });
+};
+
 const isPathWithin = (parent, candidate) => {
   const fromParent = relative(parent, candidate);
   return fromParent === '' || (fromParent !== '..'
@@ -103,7 +169,13 @@ const readProviderKey = async (keyFile, adapterLabel) => {
 
 export const startProviderProxy = async ({
   provider, keyFile, keyMaterial, tokenFile, socketPath, isolatedPort, adapterLabel = 'OpenCode',
+  // When set, every completion must request this model and be served by it.
+  pinnedModel,
 }) => {
+  if (pinnedModel !== undefined && (typeof pinnedModel !== 'string' || !pinnedModel.trim())) {
+    throw new Error(`${adapterLabel} pinnedModel must be a non-empty string`);
+  }
+  const modelState = { requested: new Set(), served: new Set(), refused: 0, failures: [] };
   const upstream = new URL(provider.baseURL);
   if (socketPath && (!isAbsolute(socketPath)
     || !Number.isInteger(isolatedPort) || isolatedPort < 1 || isolatedPort > 65535)) {
@@ -212,42 +284,98 @@ export const startProviderProxy = async ({
     headers.authorization = `Bearer ${upstreamKey}`;
     headers.host = target.host;
     headers['accept-encoding'] = 'identity';
-    const request = (target.protocol === 'https:' ? httpsRequest : httpRequest)({
-      protocol: target.protocol,
-      hostname: target.hostname,
-      port: target.port,
-      path: target.path,
-      method: incoming.method,
-      headers,
-    }, (response) => {
-      if (response.statusCode >= 300 && response.statusCode < 400) {
-        response.resume();
-        outgoing.writeHead(502).end('Provider redirects are not supported');
-        return;
-      }
-      if (response.headers['content-encoding'] && response.headers['content-encoding'] !== 'identity') {
-        response.resume(); outgoing.writeHead(502).end('Compressed provider responses are not supported'); return;
+    const pinned = pinnedModel !== undefined && target.path.endsWith('/chat/completions');
+    const forward = (body) => {
+      let streamed = false;
+      if (body) {
+        headers['content-length'] = String(body.length);
+        try { streamed = JSON.parse(body.toString('utf8'))?.stream === true; } catch { /* checked before forward */ }
       }
-      const responseHeaders = Object.fromEntries(Object.entries(response.headers)
-        .filter(([name]) => ![
-          'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
-          'te', 'trailer', 'transfer-encoding', 'upgrade',
-        ].includes(name.toLowerCase())));
-      delete responseHeaders['content-length'];
-      for (const [name, value] of Object.entries(responseHeaders)) {
-        if (typeof value === 'string') responseHeaders[name] = value.split(upstreamKey).join('[redacted]');
-        else if (Array.isArray(value)) responseHeaders[name] = value.map((entry) => entry.split(upstreamKey).join('[redacted]'));
-      }
-      outgoing.writeHead(response.statusCode || 502, responseHeaders);
-      response.pipe(redactProviderMaterial(upstreamKey)).pipe(outgoing);
+      const request = (target.protocol === 'https:' ? httpsRequest : httpRequest)({
+        protocol: target.protocol,
+        hostname: target.hostname,
+        port: target.port,
+        path: target.path,
+        method: incoming.method,
+        headers,
+      }, (response) => {
+        if (response.statusCode >= 300 && response.statusCode < 400) {
+          response.resume();
+          outgoing.writeHead(502).end('Provider redirects are not supported');
+          return;
+        }
+        if (response.headers['content-encoding'] && response.headers['content-encoding'] !== 'identity') {
+          response.resume(); outgoing.writeHead(502).end('Compressed provider responses are not supported'); return;
+        }
+        const responseHeaders = Object.fromEntries(Object.entries(response.headers)
+          .filter(([name]) => ![
+            'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
+            'te', 'trailer', 'transfer-encoding', 'upgrade',
+          ].includes(name.toLowerCase())));
+        delete responseHeaders['content-length'];
+        for (const [name, value] of Object.entries(responseHeaders)) {
+          if (typeof value === 'string') responseHeaders[name] = value.split(upstreamKey).join('[redacted]');
+          else if (Array.isArray(value)) responseHeaders[name] = value.map((entry) => entry.split(upstreamKey).join('[redacted]'));
+        }
+        const ok = response.statusCode >= 200 && response.statusCode < 300;
+        if (!pinned || !ok) {
+          outgoing.writeHead(response.statusCode || 502, responseHeaders);
+          response.pipe(redactProviderMaterial(upstreamKey)).pipe(outgoing);
+          return;
+        }
+        const sse = streamed || /text\/event-stream/i.test(String(response.headers['content-type'] || ''));
+        const check = servedModelCheck({
+          pinned: pinnedModel, stream: sse, onServed: (served) => modelState.served.add(served),
+        });
+        const fail = (error) => {
+          modelState.failures.push(error.message);
+          process.stderr.write(`[${adapterLabel.toLowerCase()}] provider proxy: ${error.message}\n`);
+          response.destroy();
+          if (!outgoing.headersSent) outgoing.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' }).end('Served model check failed');
+          else outgoing.destroy();
+        };
+        check.on('error', fail);
+        // A stream's headers go out at once; a whole body waits for its check.
+        if (sse) outgoing.writeHead(response.statusCode, responseHeaders);
+        else check.once('data', () => { if (!outgoing.headersSent) outgoing.writeHead(response.statusCode, responseHeaders); });
+        response.pipe(check).pipe(redactProviderMaterial(upstreamKey)).pipe(outgoing);
+      });
+      request.on('error', () => {
+        if (!outgoing.headersSent) outgoing.writeHead(502);
+        outgoing.end('Provider request failed');
+      });
+      outgoing.on('close', () => request.destroy());
+      incoming.on('aborted', () => request.destroy());
+      if (body) request.end(body);
+      else incoming.pipe(request);
+    };
+    if (!pinned) {
+      forward(null);
+      return;
+    }
+    // A pinned proxy reads the request first: a completion for any other model
+    // is refused here, before the provider bills it.
+    const chunks = [];
+    let size = 0;
+    incoming.on('data', (chunk) => {
+      size += chunk.length;
+      if (size <= MAX_PINNED_REQUEST_BYTES) chunks.push(chunk);
     });
-    request.on('error', () => {
-      if (!outgoing.headersSent) outgoing.writeHead(502);
-      outgoing.end('Provider request failed');
+    incoming.on('end', () => {
+      if (size > MAX_PINNED_REQUEST_BYTES) { outgoing.writeHead(413).end(); return; }
+      const body = Buffer.concat(chunks);
+      let requested;
+      try { requested = JSON.parse(body.toString('utf8'))?.model; } catch { requested = undefined; }
+      if (requested !== pinnedModel) {
+        modelState.refused += 1;
+        process.stderr.write(`[${adapterLabel.toLowerCase()}] provider proxy refused a completion for an unpinned model\n`);
+        outgoing.writeHead(403, { 'content-type': 'text/plain; charset=utf-8' });
+        outgoing.end(`This seat is pinned to ${pinnedModel}`);
+        return;
+      }
+      modelState.requested.add(requested);
+      forward(body);
     });
-    outgoing.on('close', () => request.destroy());
-    incoming.on('aborted', () => request.destroy());
-    incoming.pipe(request);
   });
 
   await new Promise((resolve, reject) => {
@@ -274,6 +402,14 @@ export const startProviderProxy = async ({
     tokenFile,
     socketPath,
     port,
+    /** The pin's verdict so far: what was asked for, what was served, and what failed. */
+    modelCheck: () => ({
+      pinned: pinnedModel ?? null,
+      requested: [...modelState.requested],
+      served: [...modelState.served],
+      refused: modelState.refused,
+      failures: [...modelState.failures],
+    }),
     close: () => new Promise((resolve) => {
       server.close(async () => {
         if (socketPath) await unlink(socketPath).catch(() => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonlyai/cli",
-  "version": "0.1.181",
+  "version": "0.1.183",
   "license": "Apache-2.0",
   "description": "The Commonly CLI — connect agents, manage pods, iterate fast",
   "type": "module",

package/src/lib/adapters/dsh.js

@@ -1,12 +1,28 @@
 import { observeSpawn } from '../runtime-observation.js';
-/** DeepSeek Harness 0.2.1-rc.2, private seats only. Configuration is per spawn. */
+/**
+ * DeepSeek Harness 0.2.1-rc.2, private seats only. Configuration is per spawn.
+ *
+ * A seat runs plain, or confined: `sandbox: { mode: 'workspace', network:
+ * { policy: 'restricted' } }` runs dsh inside one Seatbelt profile that writes
+ * only the workspace and the seat's home, reaches only three loopback ports
+ * (the provider proxy, the Commonly instance relay and the GitHub egress
+ * proxy), and cannot reach the Security services the keychain sits behind.
+ * The provider proxy is pinned to the seat's model and checks the model each
+ * response names. dsh's own sandbox is turned off inside it, because a second
+ * Seatbelt cannot be applied under the first.
+ */
+import { spawnInOwnGroup, wantsOwnProcessGroup } from '@commonlyai/seats/process-group';
 import { requireSeatModel } from './seat-model.js';
 import { spawn as childSpawn, spawnSync } from 'child_process';
 import { createHash } from 'crypto';
-import { existsSync } from 'fs';
+import { existsSync, realpathSync } from 'fs';
 import { chmod, mkdir, mkdtemp, readFile, readdir, rm, writeFile } from 'fs/promises';
 import { homedir, tmpdir } from 'os';
-import { basename, join } from 'path';
+import { basename, delimiter, isAbsolute, join, sep } from 'path';
+import { startEgressProxy } from '../egress-proxy.js';
+import { startInstanceProxy } from '../instance-proxy.js';
+import { prepareMcpSpawn, selectedMcpVersionDir } from '../mcp-home.js';
+import { detectSeatbelt, wrapArgvWithSeatbelt } from '../sandbox/seatbelt.js';
 import { buildMemoryPreamble } from '../memory-bridge.js';
 import { commonlyMcpServer } from '../default-environment.js';
 import { effectiveSandboxTrust, refuseWorkspaceTrust, validateEnvironmentSpec } from '../environment.js';
@@ -21,15 +37,56 @@ const PROXY_KEY_ENV = 'COMMONLY_DSH_PROXY_KEY';
 const MAX_TIMEOUT_MS = 15 * 60 * 1000;
 const SAFE_ENV = /^(?:PATH|LANG|LC_[A-Z_]+|TERM|USER|LOGNAME|NO_COLOR|CI|SSL_CERT_FILE|SSL_CERT_DIR)$/;
 
-export const assertPrivateDsh = (environment = {}) => {
+/** True for the one confined shape this adapter enforces; throws on any other sandbox. */
+export const isConfinedDsh = (environment = {}) => {
   const sandbox = environment?.sandbox || {};
   refuseWorkspaceTrust(sandbox, 'dsh');
   if (effectiveSandboxTrust(sandbox.trust) === 'public') {
     throw new Error('dsh adapter: public-trust seats are not supported; nested Seatbelt fails closed');
   }
-  if (sandbox.mode !== undefined) {
-    throw new Error(`dsh adapter: sandbox.mode=${sandbox.mode} cannot be enforced by this adapter`);
+  if (sandbox.mode === undefined) return false;
+  const { mode, network, ...rest } = sandbox;
+  const networkKeys = Object.keys(network || {});
+  if (mode === 'workspace' && network?.policy === 'restricted'
+    && networkKeys.length === 1 && Object.keys(rest).length === 0) return true;
+  throw new Error(`dsh adapter: sandbox.mode=${mode} cannot be enforced by this adapter; `
+    + "the one confined shape is { mode: 'workspace', network: { policy: 'restricted' } }");
+};
+
+export const assertPrivateDsh = (environment = {}) => { isConfinedDsh(environment); };
+
+const onPath = (name, env) => {
+  if (isAbsolute(name)) return existsSync(name) ? name : null;
+  for (const dir of String(env?.PATH || '').split(delimiter)) {
+    if (dir && existsSync(join(dir, name))) return join(dir, name);
   }
+  return null;
+};
+
+/**
+ * The script a dsh executable runs, and the outermost node_modules holding it:
+ * a confined run starts that script with this node, and reads that tree only.
+ */
+export const resolveDshEntry = (binary, env) => {
+  const found = onPath(binary, env);
+  if (!found) throw new Error(`dsh adapter: a confined seat could not find ${binary} on PATH`);
+  const entry = realpathSync(found);
+  const parts = entry.split(sep);
+  const root = parts.indexOf('node_modules');
+  if (root < 1 || !/\.(?:c|m)?js$/.test(entry)) {
+    throw new Error(`dsh adapter: a confined seat runs dsh from its node package; ${found} resolves to ${entry}`);
+  }
+  return { entry, packages: parts.slice(0, root + 1).join(sep) };
+};
+
+/** Fail a confined turn whose provider traffic broke the model pin. */
+export const assertServedModel = (check, credentials) => {
+  if (!check.refused && !check.failures.length) return;
+  const parts = [
+    ...(check.refused ? [`${check.refused} request(s) for a model other than ${check.pinned} refused`] : []),
+    ...check.failures,
+  ];
+  throw adapterFailure('dsh', `served model check failed: ${parts.join('; ')}`, { credentials, limit: 500 });
 };
 
 /** A stable home per agent and Commonly instance, never the operator's ~/.dsh. */
@@ -71,9 +128,17 @@ export const resolveCommonlyMcp = (declared, ctx) => {
   if (servers.length !== 1 || servers[0]?.name !== 'commonly') {
     throw new Error('dsh adapter: PR 1 supports only the Commonly MCP server');
   }
-  const server = servers[0];
-  if ((server.transport || 'stdio') !== 'stdio'
-    || !isCommonlyCommand(server.command) || !describeMcpCommand(server.command)?.isCommonly) {
+  const isCommonly = (entry) => (entry.transport || 'stdio') === 'stdio'
+    && isCommonlyCommand(entry.command) && !!describeMcpCommand(entry.command)?.isCommonly;
+  if (!isCommonly(servers[0])) {
+    throw new Error('dsh adapter: Commonly MCP must be a recognized stdio @commonlyai/mcp command');
+  }
+  // A confined seat runs the warmed build it can read, never a package runner,
+  // and that build is held to the same check as the declaration.
+  const server = ctx.prepareCommand
+    ? { ...servers[0], command: ctx.prepareCommand(servers[0].command) }
+    : servers[0];
+  if (!isCommonly(server)) {
     throw new Error('dsh adapter: Commonly MCP must be a recognized stdio @commonlyai/mcp command');
   }
   const delivery = deliverSeatCredential(server, {
@@ -101,7 +166,9 @@ export const resolveCommonlyMcp = (declared, ctx) => {
 };
 
 /** JSON is valid YAML; a generated patch has no expression or quoting ambiguity. */
-export const buildPatch = ({ proxyBaseURL, model, cwd, mcp, effort, deepseekOfficial = false }) => ([
+export const buildPatch = ({
+  proxyBaseURL, model, cwd, mcp, effort, deepseekOfficial = false, confined = false,
+}) => ([
   { id: 'llm-pi-ai', config: { providers: {
     commonly: {
       apiKeyEnv: PROXY_KEY_ENV, api: 'openai-completions', baseURL: proxyBaseURL,
@@ -124,7 +191,9 @@ export const buildPatch = ({ proxyBaseURL, model, cwd, mcp, effort, deepseekOffi
   { id: 'llm-deepseek', disabled: true },
   { id: 'llm-deepseek-account', disabled: true },
   { id: 'session-log-deepseek', config: { enabled: false } },
-  { id: 'sandbox-policy', config: { mode: 'workspace-write', workspaceRoot: cwd } },
+  // Confined, the outer Seatbelt is the sandbox: dsh's own would nest a second
+  // one, which macOS refuses, so it is off.
+  { id: 'sandbox-policy', config: { mode: confined ? 'danger-full-access' : 'workspace-write', workspaceRoot: cwd } },
   { insert: [mcp] },
 ]);
 
@@ -169,8 +238,10 @@ const parseEvent = (line, state) => {
   }
 };
 
-export const runDsh = ({ binary, args, cwd, env, timeoutMs, credentials, spawnImpl = childSpawn, onSpawn, controls = {} }) => new Promise((resolve, reject) => {
-  const proc = spawnImpl(binary, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
+export const runDsh = ({
+  binary, args, cwd, env, timeoutMs, credentials, spawnImpl = childSpawn, onSpawn, controls = {}, ownGroup = false,
+}) => new Promise((resolve, reject) => {
+  const proc = spawnInOwnGroup(spawnImpl, binary, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] }, { ownGroup });
   observeSpawn(proc, onSpawn, controls);
   const state = { sessionId: null, final: null, error: null, buffer: '' };
   let stderr = '';
@@ -252,7 +323,14 @@ export default {
 
   async spawn(prompt, ctx = {}) {
     const seatModel = requireSeatModel(ctx.environment, 'dsh', true);
-    assertPrivateDsh(ctx.environment);
+    const confined = isConfinedDsh(ctx.environment);
+    if (confined) {
+      if ((ctx._platform || process.platform) !== 'darwin') {
+        throw new Error('dsh adapter: a confined seat needs Seatbelt, which is macOS only');
+      }
+      const seatbelt = (ctx._detectSeatbelt || detectSeatbelt)();
+      if (!seatbelt.available) throw new Error(`dsh adapter: a confined seat needs Seatbelt: ${seatbelt.error}`);
+    }
     if (!ctx.environment?.provider || !ctx.environment?.model) {
       throw new Error('dsh requires environment.provider and environment.model');
     }
@@ -270,19 +348,39 @@ export default {
     const tempDir = await mkdtemp(join(tmpdir(), 'commonly-dsh-'));
     await chmod(tempDir, 0o700);
     let proxy;
+    let relay;
+    let egress;
     try {
       const credential = writeCredentialFile(ctx.runtimeToken, { agentName: 'commonly', root: tempDir });
       proxy = await startProviderProxy({
         provider: ctx.environment.provider, keyFile,
         tokenFile: join(tempDir, 'provider-proxy-token'), adapterLabel: 'dsh',
+        ...(confined ? { pinnedModel: seatModel } : {}),
       });
       const bearer = (await readFile(proxy.tokenFile, 'utf8')).trim();
+      const mcpDirectories = [];
+      if (confined) {
+        relay = await startInstanceProxy({ instanceUrl: ctx.instanceUrl });
+        egress = await (ctx._startEgressProxy || startEgressProxy)();
+      }
       const mcp = resolveCommonlyMcp(ctx.environment?.mcp, {
-        credentialFile: credential.path, instanceUrl: ctx.instanceUrl,
+        credentialFile: credential.path,
+        instanceUrl: confined ? relay.url : ctx.instanceUrl,
+        ...(confined ? {
+          prepareCommand: (command) => {
+            const warmed = (ctx._prepareMcpSpawn || prepareMcpSpawn)(command, { apiUrl: ctx.instanceUrl, publicSeat: true });
+            const directory = warmed && (ctx._selectedMcpVersionDir || selectedMcpVersionDir)(warmed);
+            if (!directory) {
+              throw new Error('dsh adapter: a confined seat runs only a warmed Commonly MCP build, and none is ready on this host');
+            }
+            mcpDirectories.push(directory);
+            return [process.execPath, warmed[1]];
+          },
+        } : {}),
       });
       const patchData = buildPatch({
         proxyBaseURL: proxy.baseURL, model: seatModel,
-        cwd: ctx.cwd, mcp, effort: ctx.environment.effort,
+        cwd: ctx.cwd, mcp, effort: ctx.environment.effort, confined,
         deepseekOfficial: new URL(ctx.environment.provider.baseURL).hostname === 'api.deepseek.com',
       });
       const patch = JSON.stringify(patchData, null, 2);
@@ -300,11 +398,51 @@ export default {
       const requested = Number(ctx.timeoutMs);
       const timeoutMs = Number.isFinite(requested) && requested > 0
         ? Math.min(requested, MAX_TIMEOUT_MS) : MAX_TIMEOUT_MS;
-      return await runDsh({
-        binary, args, cwd: ctx.cwd, env, timeoutMs,
-        credentials: [...spawnCredentials(ctx, []), bearer], spawnImpl: ctx._spawnImpl, onSpawn: ctx.onSpawn, controls: { model: passedModel || null, effort: passedProvider.reasoning || null },
-      });
+      let command = binary;
+      let commandArgs = args;
+      if (confined) {
+        const { entry, packages } = resolveDshEntry(binary, sourceEnv);
+        const tempWork = join(home, 'tmp');
+        await mkdir(tempWork, { recursive: true, mode: 0o700 });
+        env.TMPDIR = tempWork;
+        for (const name of ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy']) env[name] = egress.url;
+        env.NO_PROXY = '127.0.0.1,localhost';
+        env.no_proxy = env.NO_PROXY;
+        [command, ...commandArgs] = (ctx._wrapArgvWithSeatbelt || wrapArgvWithSeatbelt)([process.execPath, entry, ...args], {
+          workspacePath: ctx.cwd,
+          workspaceAccess: 'write',
+          executablePath: process.execPath,
+          statePath: home,
+          mcpConfigDir: tempDir,
+          network: 'loopback',
+          loopbackNetworkPorts: [proxy.port, relay.port, egress.port],
+          readOnlyDirectories: [packages, ...mcpDirectories],
+        });
+      }
+      const credentials = [...spawnCredentials(ctx, []), bearer];
+      let result;
+      let failure;
+      try {
+        result = await runDsh({
+          binary: command, args: commandArgs, cwd: ctx.cwd, env, timeoutMs, credentials,
+          spawnImpl: ctx._spawnImpl, onSpawn: ctx.onSpawn, ownGroup: wantsOwnProcessGroup(ctx),
+          controls: { model: passedModel || null, effort: passedProvider.reasoning || null },
+        });
+      } catch (error) {
+        failure = error;
+      }
+      // A broken pin is the reason a turn failed, whatever dsh said about it.
+      if (confined) {
+        const { refusals } = egress.stats();
+        // eslint-disable-next-line no-console
+        if (refusals.length) console.warn(`[dsh] egress refused: ${refusals.map((r) => `${r.target} (${r.reason})`).join(', ')}`);
+        assertServedModel(proxy.modelCheck(), credentials);
+      }
+      if (failure) throw failure;
+      return result;
     } finally {
+      try { await egress?.close(); } catch { /* best effort */ }
+      try { await relay?.close(); } catch { /* best effort */ }
       try { await proxy?.close(); } catch { /* best effort */ }
       await rm(tempDir, { recursive: true, force: true });
     }

package/src/lib/egress-proxy.js

@@ -0,0 +1,160 @@
+/**
+ * A per-spawn loopback CONNECT proxy that reaches only a fixed list of hosts.
+ *
+ * A confined run gets no outbound network of its own (Seatbelt `network:
+ * 'loopback'`); HTTPS_PROXY points it here. Only CONNECT to an allowlisted
+ * name on an allowlisted port is opened, and the name is resolved here and
+ * the connection made to the address resolved, so a name that resolves to
+ * loopback or a private network is refused rather than followed. Plain HTTP
+ * requests are refused: the proxy never sees the content of what it carries.
+ *
+ * There is no proxy credential. Everything the proxy reaches, any process on
+ * the host already reaches; it gives the confined run a route, not authority.
+ */
+import { createServer } from 'http';
+import { BlockList, connect, isIP } from 'net';
+import { lookup } from 'dns/promises';
+
+// GitHub's download hosts only. github.com and api.github.com accept writes
+// (git push, gists, issues) made with any token a run is handed, and a tunnel
+// cannot tell a read from a write, so they would be an outbound route for
+// anything the run can read. These hosts only serve content.
+export const GITHUB_CONTENT_HOSTS = Object.freeze([
+  'codeload.github.com',
+  'raw.githubusercontent.com',
+  'objects.githubusercontent.com',
+]);
+
+const CONNECT_TIMEOUT_MS = 10_000;
+const MAX_REFUSALS_KEPT = 20;
+
+const nonPublic = new BlockList();
+for (const [address, prefix] of [
+  ['0.0.0.0', 8], ['10.0.0.0', 8], ['100.64.0.0', 10], ['127.0.0.0', 8],
+  ['169.254.0.0', 16], ['172.16.0.0', 12], ['192.0.0.0', 24], ['192.168.0.0', 16],
+  ['198.18.0.0', 15], ['224.0.0.0', 4], ['240.0.0.0', 4],
+]) nonPublic.addSubnet(address, prefix, 'ipv4');
+for (const [address, prefix] of [
+  ['::', 128], ['::1', 128], ['fc00::', 7], ['fe80::', 10], ['ff00::', 8], ['64:ff9b::', 96],
+]) nonPublic.addSubnet(address, prefix, 'ipv6');
+
+/** True for an address no public host name should resolve to. */
+export const isNonPublicAddress = (address) => {
+  const mapped = /^::ffff:(\d+\.\d+\.\d+\.\d+)$/i.exec(address);
+  if (mapped) return nonPublic.check(mapped[1], 'ipv4');
+  const family = isIP(address);
+  if (!family) return true;
+  return nonPublic.check(address, family === 6 ? 'ipv6' : 'ipv4');
+};
+
+/** `host:port` from a CONNECT target, or null when it is not one. */
+const parseTarget = (target) => {
+  const match = /^([A-Za-z0-9.-]+):(\d{1,5})$/.exec(target || '');
+  if (!match) return null;
+  const port = Number(match[2]);
+  if (port < 1 || port > 65535) return null;
+  return { host: match[1].toLowerCase().replace(/\.$/, ''), port };
+};
+
+/**
+ * startEgressProxy({ allowHosts?, allowPorts? }) → { port, url, refusals, close }
+ *
+ * Listens on 127.0.0.1 at an ephemeral port. `_resolve` and `_allowPrivate`
+ * exist for tests only, so a test can reach a loopback upstream.
+ */
+export const startEgressProxy = async ({
+  allowHosts = GITHUB_CONTENT_HOSTS,
+  allowPorts = [443],
+  _resolve = (host) => lookup(host, { all: true, verbatim: true }),
+  _allowPrivate = false,
+} = {}) => {
+  const hosts = new Set(allowHosts.map((host) => String(host).toLowerCase()));
+  const ports = new Set(allowPorts);
+  if (!hosts.size || [...ports].some((port) => !Number.isInteger(port) || port < 1 || port > 65535)) {
+    throw new Error('Egress proxy needs at least one host and valid TCP ports');
+  }
+  const refusals = [];
+  let opened = 0;
+  const refuse = (socket, status, target, reason) => {
+    refusals.push({ target, reason });
+    if (refusals.length > MAX_REFUSALS_KEPT) refusals.shift();
+    if (!socket.destroyed) socket.end(`HTTP/1.1 ${status}\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`);
+  };
+  const sockets = new Set();
+  const track = (socket) => {
+    sockets.add(socket);
+    socket.on('close', () => sockets.delete(socket));
+  };
+
+  const server = createServer((incoming, outgoing) => {
+    incoming.resume();
+    refusals.push({ target: String(incoming.url || '').slice(0, 200), reason: 'not CONNECT' });
+    if (refusals.length > MAX_REFUSALS_KEPT) refusals.shift();
+    outgoing.writeHead(405, { Connection: 'close' }).end();
+  });
+  server.on('connection', track);
+  server.on('connect', async (request, client, head) => {
+    client.on('error', () => {});
+    const target = parseTarget(request.url);
+    const label = String(request.url || '').slice(0, 200);
+    if (!target) { refuse(client, '400 Bad Request', label, 'malformed target'); return; }
+    if (isIP(target.host)) { refuse(client, '403 Forbidden', label, 'address literal'); return; }
+    if (!hosts.has(target.host) || !ports.has(target.port)) {
+      refuse(client, '403 Forbidden', label, 'not allowlisted');
+      return;
+    }
+    let addresses;
+    try {
+      addresses = (await _resolve(target.host)).map((entry) => entry.address);
+    } catch {
+      refuse(client, '502 Bad Gateway', label, 'did not resolve');
+      return;
+    }
+    // Every address must be public, not just the one used: a name that
+    // resolves to both is not one this proxy was asked to reach.
+    if (!addresses.length || (!_allowPrivate && addresses.some(isNonPublicAddress))) {
+      refuse(client, '403 Forbidden', label, 'resolves to a non-public address');
+      return;
+    }
+    if (client.destroyed) return;
+    const upstream = connect({ host: addresses[0], port: target.port });
+    track(upstream);
+    let established = false;
+    client.on('close', () => upstream.destroy());
+    upstream.setTimeout(CONNECT_TIMEOUT_MS, () => upstream.destroy());
+    upstream.on('error', () => {});
+    upstream.on('close', () => {
+      if (established) client.destroy();
+      else refuse(client, '502 Bad Gateway', label, 'upstream unreachable');
+    });
+    upstream.once('connect', () => {
+      upstream.setTimeout(0);
+      established = true;
+      opened += 1;
+      client.write('HTTP/1.1 200 Connection Established\r\n\r\n');
+      if (head?.length) upstream.write(head);
+      upstream.pipe(client);
+      client.pipe(upstream);
+    });
+  });
+
+  await new Promise((resolve, reject) => {
+    server.once('error', reject);
+    server.listen(0, '127.0.0.1', () => {
+      server.removeListener('error', reject);
+      resolve();
+    });
+  });
+  const { port } = server.address();
+  return {
+    port,
+    url: `http://127.0.0.1:${port}`,
+    /** { opened, refusals: [{ target, reason }] } — the last 20 refusals. */
+    stats: () => ({ opened, refusals: refusals.map((entry) => ({ ...entry })) }),
+    close: async () => {
+      const closed = new Promise((resolve) => server.close(resolve));
+      for (const socket of sockets) socket.destroy();
+      await closed;
+    },
+  };
+};

package/src/lib/git-readonly.js

@@ -127,16 +127,28 @@ const TOP_LEVEL = Object.freeze([
 ]);
 
 // A %G placeholder (%G?, %GG, %GS, %GK, %GF, %GP, %GT) runs gpg on each signed
-// commit. A value with no %, no format: and no tformat: is looked up by
-// prefix among the built-in formats and the repository's `pretty.<name>`
-// aliases, and an alias can hold one, so only a built-in name is taken.
-const FORMAT_ARGUMENT = /^--(?:pretty|format)=([\s\S]*)$/;
+// commit, and git reads one behind a `+`, `-` or space modifier (`%+G?`,
+// `%-GG`, `% GS`) as the same placeholder. A value with no %, no format: and
+// no tformat: is looked up by prefix among the built-in formats and the
+// repository's `pretty.<name>` aliases, and an alias can hold one, so only a
+// built-in name is taken.
+const SIGNATURE_PLACEHOLDER = /%[-+ ]?G/;
 const BUILTIN_FORMATS = Object.freeze(['oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'mboxrd', 'raw']);
+// Git's revision parser reads --pretty and --format only by their exact names,
+// and their format only after `=`: a bare --pretty means medium, and a bare
+// --format is an unrecognized argument. The check does not depend on that. An
+// abbreviation (`--form=`, `--pret=`) is checked like the full name, and a
+// --format that would take its format from the next argument is refused.
+const FORMAT_OPTIONS = Object.freeze(['--pretty', '--format']);
 const checkFormat = (arg) => {
-  const match = FORMAT_ARGUMENT.exec(arg);
-  if (!match) return null;
-  const value = match[1];
-  if (value.includes('%G')) return `${arg} is refused: a %G placeholder runs gpg to check a signature`;
+  const [name] = arg.split('=', 1);
+  const option = name.length >= 3 && FORMAT_OPTIONS.find((full) => full.startsWith(name));
+  if (!option) return null;
+  if (name === arg) {
+    return option === '--format' ? `${arg} is refused: give the format in the same argument, as --format=<format>` : null;
+  }
+  const value = arg.slice(name.length + 1);
+  if (SIGNATURE_PLACEHOLDER.test(value)) return `${arg} is refused: a %G placeholder runs gpg to check a signature`;
   const userFormat = value === '' || value.startsWith('format:') || value.startsWith('tformat:') || value.includes('%');
   if (userFormat || BUILTIN_FORMATS.includes(value.toLowerCase())) return null;
   return `${arg} is refused: name a built-in format (${BUILTIN_FORMATS.join(', ')}) or give format:<placeholders>`;

package/src/lib/instance-proxy.js

@@ -1,4 +1,8 @@
-/** A per-spawn Unix-socket relay to one declared Commonly instance origin. */
+/**
+ * A per-spawn relay to one declared Commonly instance origin, on a Unix
+ * socket, or on an ephemeral loopback TCP port when no socketPath is given
+ * (for a Seatbelt run whose only network is loopback).
+ */
 import { createServer, request as httpRequest } from 'http';
 import { request as httpsRequest } from 'https';
 import { chmod, unlink } from 'fs/promises';
@@ -48,20 +52,25 @@ export const startInstanceProxy = async ({ instanceUrl, socketPath }) => {
   });
   await new Promise((resolve, reject) => {
     server.once('error', reject);
-    server.listen(socketPath, () => {
+    const listening = () => {
       server.removeListener('error', reject);
       resolve();
-    });
+    };
+    if (socketPath) server.listen(socketPath, listening);
+    else server.listen(0, '127.0.0.1', listening);
   });
-  await chmod(socketPath, 0o600);
+  if (socketPath) await chmod(socketPath, 0o600);
+  const port = socketPath ? null : server.address().port;
   return {
-    socketPath,
+    socketPath: socketPath || null,
+    port,
+    url: port ? `http://127.0.0.1:${port}` : null,
     close: async () => {
       const closed = new Promise((resolve) => server.close(resolve));
       for (const upstream of upstreams) upstream.destroy();
       server.closeAllConnections();
       await closed;
-      await unlink(socketPath).catch((err) => { if (err.code !== 'ENOENT') throw err; });
+      if (socketPath) await unlink(socketPath).catch((err) => { if (err.code !== 'ENOENT') throw err; });
     },
   };
 };

package/src/lib/sandbox/seatbelt.js

@@ -274,7 +274,12 @@ const PLATFORM_BASELINE = String.raw`
 ; Apple's App Sandbox grants every app this same domain.
 (allow user-preference-read
   (preference-domain "kCFPreferencesAnyApplication"))
+`;
 
+// Open network, the tail of the default baseline. A `network: 'loopback'`
+// profile leaves it out: no outbound except the loopback ports it lists, and
+// none of the Security framework services the keychain is reached through.
+const OPEN_NETWORK = String.raw`
 ; The selected provider and declared MCP transports need outbound network. The model's
 ; WebSearch/WebFetch/Bash tools are denied independently in the adapter argv.
 (allow network-outbound)
@@ -367,6 +372,8 @@ export const buildSeatbeltProfile = ({
   readOnlyDirectories = [],
   loopbackNetworkPorts = [],
   allowClaudeRuntimeAccess = false,
+  // 'open' (the default) or 'loopback': only the listed loopback ports.
+  network = 'open',
   // Names directly inside a writable workspace that stay read-only. A
   // workspace seat granted write keeps its project's .git read-only, so every
   // change it makes is one `git status` shows the person (TASK-294).
@@ -387,6 +394,9 @@ export const buildSeatbeltProfile = ({
       throw new Error('Seatbelt loopbackNetworkPorts entries must be valid TCP ports');
     }
   }
+  if (!['open', 'loopback'].includes(network)) {
+    throw new Error('Seatbelt network must be open or loopback');
+  }
   if (!['read', 'write'].includes(workspaceAccess)) {
     throw new Error('Seatbelt workspaceAccess must be read or write');
   }
@@ -456,7 +466,7 @@ export const buildSeatbeltProfile = ({
   })() : [];
 
   return [
-    PLATFORM_BASELINE.trim(),
+    (network === 'open' ? `${PLATFORM_BASELINE}${OPEN_NETWORK}` : PLATFORM_BASELINE).trim(),
     executableRules,
     executableSymlinkRules,
     `(allow file-read-metadata file-test-existence (path-ancestors "${escapeSbplString(resolvedWorkspace)}"))`,