@bivy/bivy 0.18.8 → 0.18.9-staging.10

package/dist/agents/claude-code/runtime.js

@@ -13,7 +13,6 @@
 //   * The SDK is loaded with a dynamic import so it stays an *optional*
 //     dependency: a Bivy install only needs it when this runtime is selected.
 import { withSessionCredentials, credentialEnvFallback } from "../../credentials/session.js";
-import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import { withExactCapabilitySurface } from "../../runtime/types.js";
@@ -30,6 +29,7 @@ import { anthropicCredentialPreflight, describeAnthropicError, isAnthropicAuthEr
 import { toModelInfo as sharedToModelInfo } from "../../runtime/normalize.js";
 import { hasLiveProcessForCwd } from "../../runtime/native-process-scan.js";
 import { bivySessionEnv } from "../../runtime/session-env.js";
+import { bridgeInstalled, enableBridgeResolution } from "../../agent-bridges.mjs";
 /** Binary names a live Claude Code process could be running under (see
  *  native-process-scan.ts's best-effort cwd match). */
 const CLAUDE_BIN_NAMES = ["claude"];
@@ -190,20 +190,15 @@ export function claudeRuntimeFromEnv() {
 }
 /** True when `@anthropic-ai/claude-agent-sdk` is resolvable in this install. */
 export function claudeSdkInstalled() {
-    try {
-        createRequire(import.meta.url).resolve(SDK_PACKAGE);
-        return true;
-    }
-    catch {
-        return false;
-    }
+    return bridgeInstalled(SDK_PACKAGE);
 }
 async function loadSdk() {
+    enableBridgeResolution();
     try {
         return await import(SDK_PACKAGE);
     }
     catch {
-        throw new Error(`The claude-code-sdk runtime requires the "${SDK_PACKAGE}" package. Install it with: npm install ${SDK_PACKAGE}`);
+        throw new Error(`The claude-code-sdk runtime requires the "${SDK_PACKAGE}" bridge. Install it with: bivy agents:install --bridges`);
     }
 }
 /**
@@ -303,6 +298,9 @@ function extractText(message) {
  *  handled separately (see INTERRUPT_MARKER) because — unlike these — they carry
  *  meaning a human wants to see. */
 const DROP_META_TEXT = /^\s*<(?:task-notification|system-reminder)[\s>/]/;
+/** Re-drives a self-woken turn after a credential reload (see recoverFromAuthError).
+ *  Wrapped as a system-reminder so DROP_META_TEXT keeps it out of the chat. */
+const AUTH_RECOVERY_CONTINUE = "<system-reminder>Your last request failed because the sign-in expired; it has been refreshed. Continue exactly where you left off.</system-reminder>";
 /** The CLI writes this synthetic user-role marker whenever a turn is aborted —
  *  by a real user Stop OR by any teardown of the streaming query (our shutdown,
  *  a mid-flight credential reload, a TUI refresh). We don't drop it: we surface
@@ -885,7 +883,9 @@ class ClaudeSession {
             // Kept even when the native tool below is also registered: it's a cheap,
             // harmless fallback for a shell/subprocess the agent spawns that can't
             // reach the in-process MCP tool directly.
-            systemPrompt: { type: "preset", preset: "claude_code", append: BIVY_ATTACH_SYSTEM_PROMPT },
+            // The user's account-wide instructions follow it; the repo's CLAUDE.md
+            // still loads through the preset as usual.
+            systemPrompt: { type: "preset", preset: "claude_code", append: [BIVY_ATTACH_SYSTEM_PROMPT, this.runtimeOptions.instructions].filter(Boolean).join("\n\n") },
             ...(this.runtimeOptions.executablePath ? { pathToClaudeCodeExecutable: this.runtimeOptions.executablePath } : {}),
         };
         if (resumeId)
@@ -1076,15 +1076,19 @@ class ClaudeSession {
     /** Recover a provider 401 regardless of whether the SDK throws it, emits it as
      * assistant text, or puts it in an error result. The latter is how revoked
      * OAuth tokens commonly arrive, so only handling consume()'s catch would leave
-     * the turn stopped until the user sent another message. */
+     * the turn stopped until the user sent another message.
+     *
+     * A turn the agent woke into on its own (a background task's notification,
+     * with no user prompt in flight) recovers too: its trigger lived in the torn-down
+     * query, so the resumed one is nudged with a hidden continuation instead. */
     async recoverFromAuthError(raw) {
-        if (!isAnthropicAuthError(raw) || this.reloadedThisTurn || this.inFlightPrompt === undefined)
+        if (!isAnthropicAuthError(raw) || this.reloadedThisTurn)
             return false;
         this.reloadedThisTurn = true;
         if (!(await this.restartWithFreshCredential(this.spawnedToken)))
             return false;
         this.streaming = true;
-        this.input.push({ type: "user", message: { role: "user", content: this.inFlightPrompt }, parent_tool_use_id: null });
+        this.input.push({ type: "user", message: { role: "user", content: this.inFlightPrompt ?? AUTH_RECOVERY_CONTINUE }, parent_tool_use_id: null });
         return true;
     }
     beginMessage() {
@@ -1273,6 +1277,11 @@ class ClaudeSession {
                 // Turn completed — the prompt is on disk now, so drop the copy kept for a
                 // mid-flight reload re-drive (see inFlightPrompt / consume's catch).
                 this.inFlightPrompt = undefined;
+                // Re-arm the one-reload-per-turn guard only after a clean turn, so the
+                // next (possibly self-woken) turn can recover, while a failed turn that
+                // already reloaded surfaces its error instead of looping.
+                if (!resultError)
+                    this.reloadedThisTurn = false;
                 if (message.subtype && message.subtype !== "success") {
                     this.emit({ type: "tool_result", error: message.subtype, message: message.result });
                 }
@@ -1516,12 +1525,12 @@ export class ClaudeCodeRuntime {
         return [{ id: "anthropic", name: "Anthropic", oauth: true, models: FALLBACK_MODELS }];
     }
     async createSession(options) {
-        const session = new ClaudeSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace, options.toolInterceptor, options.toolProvider);
+        const session = new ClaudeSession({ ...(await withSessionCredentials(this.options, options.credentialLabels)), instructions: options.instructions?.text }, options.workspace, options.toolInterceptor, options.toolProvider);
         this.sessions.push(session);
         return { session };
     }
     async openSession(options) {
-        const session = new ClaudeSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace, options.toolInterceptor, options.toolProvider, options.sessionFile);
+        const session = new ClaudeSession({ ...(await withSessionCredentials(this.options, options.credentialLabels)), instructions: options.instructions?.text }, options.workspace, options.toolInterceptor, options.toolProvider, options.sessionFile);
         this.sessions.push(session);
         return {
             session,

package/dist/agents/pi/integration.js

@@ -5,6 +5,7 @@ import os from "node:os";
 import path from "node:path";
 import { defineAgentIntegration } from "../definition.js";
 import { PI_CAPABILITIES } from "./capabilities.js";
+import { bridgeInstalled, enableBridgeResolution } from "../../agent-bridges.mjs";
 export const PI_TESTED_VERSION = "0.87.1";
 export function piAgentDir() {
     return process.env.PI_CODING_AGENT_DIR?.trim() || path.join(os.homedir(), ".pi", "agent");
@@ -18,6 +19,7 @@ export function piCommand() {
  * PI_CODING_AGENT_DIR (normally ~/.pi/agent). Takeover discovery must inspect
  * that native store rather than only the governed one. */
 export async function listNativePiSessions() {
+    enableBridgeResolution();
     const { SessionManager } = await import("@earendil-works/pi-coding-agent");
     // Do not pass the sessions root here. Pi's default store is split into one
     // encoded subdirectory per cwd, and SessionManager.listAll(customDir) scans
@@ -40,13 +42,7 @@ export function piCommandAvailable() {
     return resolveExecutable(piCommand()) !== null;
 }
 export function piBridgeInstalled() {
-    try {
-        import.meta.resolve("@earendil-works/pi-coding-agent");
-        return true;
-    }
-    catch {
-        return false;
-    }
+    return bridgeInstalled("@earendil-works/pi-coding-agent");
 }
 function unsupportedNodeMessage() {
     return `Pi requires Node.js 22.19+ (found ${process.version}). Upgrade Node, or select another agent such as Claude Code/Codex/OpenCode.`;
@@ -67,6 +63,7 @@ export class LazyPiRuntime {
     async runtime() {
         if (!nodeSupportsPi())
             throw new Error(unsupportedNodeMessage());
+        enableBridgeResolution();
         this.inner ??= import("./runtime.js").then(({ PiRuntime }) => new PiRuntime(this.options));
         return this.inner;
     }

package/dist/agents/pi/runtime.js

@@ -459,6 +459,9 @@ export class PiRuntime {
                 modelRuntime,
                 resourceLoaderOptions: {
                     extensionFactories: [guardianFactory(sessionId, options.toolInterceptor), ...providedTools],
+                    // Additive: keep whatever Pi discovered itself, then the user's
+                    // account-wide instructions (see OpenSessionOptions.instructions).
+                    ...(options.instructions ? { appendSystemPromptOverride: (base) => [...base, options.instructions.text] } : {}),
                 },
             });
             // Override only the built-in bash definition. Pi still owns rendering,

package/dist/agents/profiles.js

@@ -48,6 +48,9 @@ export const AGENT_PROFILES = {
         // `opencode run -s <id> "<prompt>"` continues a prior session by its own id
         // (`-s, --session  session id to continue`, per `opencode run --help`).
         resume: { template: ["run", "-s", "{id}"] },
+        // OPENCODE_CONFIG_CONTENT is merged over OpenCode's own config; its
+        // `instructions` entries are loaded alongside the repo's AGENTS.md.
+        instructions: { env: { OPENCODE_CONFIG_CONTENT: '{"instructions":["{fileJson}"]}' } },
         // `opencode run --model <provider/model> "<prompt>"` — the flag follows the
         // `run` subcommand (insertAt: 1). Models are `provider/model` ids.
         model: {

package/dist/apps/gateway.js

@@ -13,13 +13,7 @@ import { displayViewer, DISPLAY_MENU_PATH, DISPLAY_SOCKET_PATH, DISPLAY_STATS_PA
 import { pressMenu, readMenuPath, readMenus } from "./menu.js";
 import { inspectorScript } from "./inspector.js";
 import { readStrokes, readElementScrolls } from "./annotate.js";
-const MIME = {
-    ".html": "text/html; charset=utf-8", ".js": "text/javascript; charset=utf-8", ".mjs": "text/javascript; charset=utf-8",
-    ".css": "text/css; charset=utf-8", ".json": "application/json", ".svg": "image/svg+xml", ".png": "image/png",
-    ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp", ".ico": "image/x-icon",
-    ".woff": "font/woff", ".woff2": "font/woff2", ".ttf": "font/ttf", ".wasm": "application/wasm",
-    ".txt": "text/plain; charset=utf-8", ".pdf": "application/pdf", ".mp4": "video/mp4", ".webm": "video/webm",
-};
+import { contentType } from "./mime.js";
 const COOKIE = "__Host-bivy-preview";
 const OPEN_PATH = "/__bivy/open";
 const REDEEM_PATH = "/__bivy/redeem";
@@ -534,7 +528,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
                 return;
             }
             const headers = responseHeaders({}, this.ancestors(id));
-            headers["content-type"] = MIME[path.extname(file).toLowerCase()] || "application/octet-stream";
+            headers["content-type"] = contentType(file);
             if (inspect && path.extname(file).toLowerCase() === ".html" && data.length <= MAX_INJECT_BYTES)
                 data = withInspector(data);
             sendBytes(req, res, status, headers, data);

package/dist/apps/mime.js

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Petter André Sjulstad
+import path from "node:path";
+/** Content types for files a static app view serves. Browsers refuse module
+ * scripts (and some stylesheets) without the right one, so every server of a
+ * static snapshot — the preview gateway and the screenshot loopback — uses this. */
+const MIME = {
+    ".html": "text/html; charset=utf-8", ".js": "text/javascript; charset=utf-8", ".mjs": "text/javascript; charset=utf-8",
+    ".css": "text/css; charset=utf-8", ".json": "application/json", ".svg": "image/svg+xml", ".png": "image/png",
+    ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp", ".ico": "image/x-icon",
+    ".woff": "font/woff", ".woff2": "font/woff2", ".ttf": "font/ttf", ".wasm": "application/wasm",
+    ".txt": "text/plain; charset=utf-8", ".pdf": "application/pdf", ".mp4": "video/mp4", ".webm": "video/webm",
+};
+export function contentType(file) {
+    return MIME[path.extname(file).toLowerCase()] || "application/octet-stream";
+}

package/dist/apps/screenshot.js

@@ -7,6 +7,7 @@ import http from "node:http";
 import { once } from "node:events";
 import { spawn, execFileSync } from "node:child_process";
 import { WebSocket } from "ws";
+import { contentType } from "./mime.js";
 import { captureFrame, encodePng } from "./rfb.js";
 /** Browsers tried in order; BIVY_CHROME overrides. Any Chromium works. */
 const CANDIDATES = [
@@ -45,12 +46,14 @@ async function serveSnapshot(files) {
         let file = decodeURIComponent((req.url ?? "/").split("?")[0]);
         if (file.endsWith("/"))
             file += "index.html";
-        const data = files.get(file) ?? (path.extname(file) ? undefined : files.get("/index.html"));
+        const name = files.has(file) || path.extname(file) ? file : "/index.html";
+        const data = files.get(name);
         if (!data) {
             res.writeHead(404);
             res.end();
             return;
         }
+        res.writeHead(200, { "content-type": contentType(name) });
         res.end(data);
     });
     server.listen(0, "127.0.0.1");

package/dist/apps/styles.css

@@ -120,7 +120,7 @@ input, textarea, select { font-family: inherit; font-size: 16px; }
 .menu-item:hover, .menu-item[aria-checked="true"], .menu-item.active { background: var(--surface-2); }
 .menu-item.danger { color: var(--danger); }
 .menu-item-label { flex: 1; min-width: 0; }
-.menu-item.separated { margin-top: var(--space-1); border-top: 1px solid var(--line); border-radius: 0 0 var(--radius-sm) var(--radius-sm); }
+.menu-item.separated { margin-top: var(--space-1); border-top: 1px solid var(--line); }
 /* A section title inside a menu (e.g. "Preview cards" above its choices). */
 .menu-heading { padding: var(--space-2) var(--space-3) var(--space-1); color: var(--muted); font-size: var(--text-xs); font-weight: var(--weight-semibold); letter-spacing: 0.04em; text-transform: uppercase; }
 
@@ -2214,6 +2214,42 @@ a.queue-item:hover { border-color: var(--line-strong); background: var(--surface
 .settings-nav-item.active .settings-nav-icon { color: var(--accent); }
 .settings-nav-label { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .settings-nav-chevron { display: none; flex: none; color: var(--muted); font-size: 18px; }
+/* Account identity card pinned to the top of the nav (Claude/ChatGPT pattern):
+   avatar + email on one raised surface. */
+.settings-account-card {
+  display: flex; flex-direction: column; gap: 1px; padding: var(--space-1);
+  background: var(--surface); border: 1px solid var(--line); border-radius: var(--radius-md);
+}
+.settings-account-avatar {
+  flex: none; display: inline-flex; align-items: center; justify-content: center;
+  width: 36px; height: 36px; border-radius: var(--radius-full);
+  background: var(--surface-3); color: var(--ink); font-size: var(--text-sm); font-weight: var(--weight-semibold);
+}
+.settings-account-avatar svg { width: 20px; height: 20px; }
+.settings-account-text { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 1px; }
+.settings-account-sub { font-size: var(--text-xs); color: var(--muted); font-weight: normal; }
+.settings-account-usage { display: flex; flex-direction: column; gap: var(--space-2); padding: var(--space-1) 10px var(--space-2); font-size: var(--text-xs); color: var(--muted); }
+.settings-account-usage-row { display: flex; align-items: center; justify-content: space-between; gap: var(--space-2); min-height: 20px; }
+.settings-account-usage-count { color: var(--ink); font-variant-numeric: tabular-nums; }
+.settings-account-usage-note { font-weight: var(--weight-semibold); }
+.settings-account-usage[data-state="near"] .settings-account-usage-note { color: var(--warn); }
+.settings-account-usage[data-state="reached"] .settings-account-usage-note { color: var(--danger); }
+.settings-account-usage .banner { margin: 0; }
+.settings-account-usage-status { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
+.settings-account-usage > .btn.block { margin-top: 0; }
+/* The same meter on the Account page, aligned with the plan rows. */
+.settings-section > .settings-account-usage { padding: var(--space-1) 0 0; font-size: var(--text-sm); }
+
+/* Account page offer (e.g. upgrade): a .card, layout only. */
+.account-offer { display: flex; flex-direction: column; gap: var(--space-3); padding: var(--space-4); margin-top: var(--space-4); }
+.account-offer .card-head { margin-bottom: 0; align-items: baseline; }
+.account-offer .card-sub { margin: calc(-1 * var(--space-2)) 0 0; }
+.account-offer-price { font-size: var(--text-base); font-weight: var(--weight-semibold); color: var(--ink); white-space: nowrap; }
+.account-offer-points { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: var(--space-2); font-size: var(--text-sm); }
+.account-offer-points li { display: flex; align-items: flex-start; gap: var(--space-2); }
+.account-offer-check { flex: none; display: inline-flex; color: var(--accent); margin-top: 1px; }
+.account-offer > .btn.block { margin-top: var(--space-1); }
+.account-offer + .settings-section { margin-top: var(--space-5); }
 .settings-nav-version { flex: none; display: flex; flex-direction: column; gap: 1px; padding: 10px 10px 2px; color: var(--muted); font-size: 12px; letter-spacing: 0.02em; }
 .settings-nav-version-updated { font-size: 11px; opacity: 0.8; }
 
@@ -2228,6 +2264,13 @@ a.queue-item:hover { border-color: var(--line-strong); background: var(--surface
 .settings-body { flex: 1; overflow-y: auto; min-height: 0; padding: 14px 18px 28px; -webkit-overflow-scrolling: touch; overscroll-behavior: contain; animation: settings-panel-in var(--dur) var(--ease-standard); }
 .settings-body .settings-form { padding: 0; }
 
+/* Canonical meter — a thin allowance/usage bar (role="meter"). data-state
+   near/reached tints it warn/danger. Reflects the styleguide (.meter). */
+.meter { display: block; height: 6px; border-radius: var(--radius-full); background: var(--surface-3); overflow: hidden; }
+.meter-fill { display: block; height: 100%; border-radius: inherit; background: var(--accent); transition: width var(--dur) var(--ease-standard); }
+.meter[data-state="near"] .meter-fill { background: var(--warn); }
+.meter[data-state="reached"] .meter-fill { background: var(--danger); }
+
 /* Canonical selectable — the shared "active-accent-tint" choice control. Its
    selected state (accent border + soft accent fill) is the one that used to be
    copy-pasted across the theme picker, segmented buttons and ruleset chips; new
@@ -2353,6 +2396,7 @@ a.queue-item:hover { border-color: var(--line-strong); background: var(--surface
   .settings-nav-group-label { font-size: 12px; padding: 10px 6px 4px; }
   .settings-nav-item { padding: 14px 12px; font-size: 16px; }
   .settings-nav-chevron { display: inline-flex; }
+  .settings-account-card { background: var(--surface-2); margin-bottom: var(--space-2); }
   .settings-content { padding-top: max(0px, env(safe-area-inset-top)); }
   .settings-back { display: inline-flex; }
   .settings-body { padding: 14px 16px max(28px, env(safe-area-inset-bottom)); }
@@ -2489,10 +2533,6 @@ a.queue-item:hover { border-color: var(--line-strong); background: var(--surface
 .fork-progress-dialog { color: var(--ink); margin: auto; max-width: calc(100% - var(--space-8)); }
 .fork-progress-dialog::backdrop { background: var(--overlay); }
 .app-dialog-actions { display: flex; justify-content: flex-end; gap: 8px; flex-wrap: wrap; }
-.stat-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; }
-.stat { border: 1px solid var(--line); border-radius: var(--radius-md); padding: 10px 12px; background: var(--surface-2); }
-.stat-label { font-size: 11px; text-transform: uppercase; letter-spacing: 0.04em; color: var(--muted); }
-.stat-value { font-size: 16px; font-weight: 700; margin-top: 2px; }
 textarea.picker-search { resize: vertical; font-family: ui-monospace, monospace; }
 
 /* ---- Terminal ---- */

package/dist/harness/mcp-config.js

@@ -97,6 +97,10 @@ export function bivyToolsServerSpec(opts) {
     const env = { BIVY_SESSION_ID: opts.sessionId };
     if (opts.endpoint)
         env.BIVY_MCP_ENDPOINT = opts.endpoint;
+    // The user's account-wide instructions, advertised as the server's MCP
+    // `instructions` — the best-effort channel for agents with no native one.
+    if (opts.instructionsFile)
+        env.BIVY_AGENT_INSTRUCTIONS_FILE = opts.instructionsFile;
     return { command: opts.bivyCommand ?? "bivy", args: ["mcp-serve"], env };
 }
 /**

package/dist/harness/mcp-inject.js

@@ -136,7 +136,7 @@ export function injectBivyToolsForSession(agentId, ctx, bivyCommand = "bivy") {
     });
     if (!target)
         return { injected: [], restore: () => { } };
-    const spec = bivyToolsServerSpec({ sessionId: ctx.sessionId, endpoint: ctx.endpoint, bivyCommand });
+    const spec = bivyToolsServerSpec({ sessionId: ctx.sessionId, endpoint: ctx.endpoint, bivyCommand, instructionsFile: ctx.instructionsFile });
     const ext = path.extname(target).toLowerCase();
     const openCode = agentId === "opencode" || isOpenCodeConfigFile(target);
     const existed = fs.existsSync(target);

package/dist/harness/mcp-serve-cli.js

@@ -20,6 +20,7 @@
 // with an injected fetch; the process/transport wiring is thin. Deliberately do
 // not expose governed Runs here: agents should use their native sub-agent tools,
 // which stay inside the parent Session instead of cluttering the Session list.
+import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -88,13 +89,25 @@ export async function runAttachToChat(endpoint, sessionId, args, fetchImpl, toke
     const name = body?.name || filePath;
     return { isError: false, text: `Attached ${name} to the chat as ${body?.kind === "image" ? "an inline image" : "a downloadable file"}. The user can see it now.` };
 }
+/** The user's instructions to advertise at initialize, or undefined when there are none. */
+function readInstructions(file) {
+    if (!file)
+        return undefined;
+    try {
+        return fs.readFileSync(file, "utf8").trim() || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Build the Bivy MCP `Server` with tools/list + tools/call handlers wired. */
 export function createBivyMcpServer(deps = {}) {
     const endpoint = deps.endpoint ?? process.env.BIVY_MCP_ENDPOINT ?? DEFAULT_ENDPOINT;
     const sessionId = deps.sessionId ?? process.env.BIVY_SESSION_ID ?? process.env.BIVY_MCP_SESSION ?? "";
     const token = deps.token ?? process.env.BIVY_MCP_TOKEN ?? undefined;
     const fetchImpl = deps.fetchImpl ?? globalThis.fetch;
-    const server = new Server({ name: "bivy", version: "1.0.0" }, { capabilities: { tools: {} } });
+    const instructions = readInstructions(deps.instructionsFile ?? process.env.BIVY_AGENT_INSTRUCTIONS_FILE);
+    const server = new Server({ name: "bivy", version: "1.0.0" }, { capabilities: { tools: {} }, ...(instructions ? { instructions } : {}) });
     server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: BIVY_MCP_TOOLS }));
     server.setRequestHandler(CallToolRequestSchema, async (req) => {
         const args = (req.params.arguments ?? {});

package/dist/runtime/agent-service.js

@@ -135,8 +135,8 @@ export class AgentService {
             const toolProvider = message.options.toolSpecs?.length ? this.makeToolProvider(svc, message.options.toolSpecs) : undefined;
             const workspace = message.options.workspace ?? process.cwd();
             const result = message.op === "open" && message.options.sessionFile
-                ? await runtime.openSession({ workspace, credentialLabels: message.options.credentialLabels, sessionFile: message.options.sessionFile, toolInterceptor, toolProvider })
-                : await runtime.createSession({ workspace, credentialLabels: message.options.credentialLabels, toolInterceptor, toolProvider });
+                ? await runtime.openSession({ workspace, credentialLabels: message.options.credentialLabels, sessionFile: message.options.sessionFile, toolInterceptor, toolProvider, instructions: message.options.instructions })
+                : await runtime.createSession({ workspace, credentialLabels: message.options.credentialLabels, toolInterceptor, toolProvider, instructions: message.options.instructions });
             svc.session = result.session;
             svc.id = result.session.id;
             svc.lastSent = this.mirror(result.session);

package/dist/runtime/index.js

@@ -643,6 +643,7 @@ function acpRuntimeOptions(opts) {
         // An ACP-promoted opencode still surfaces/expands its on-disk commands (the
         // ACP handshake doesn't carry them); a bare ACP agent has none.
         ...(slashCommands ? { slashCommands } : {}),
+        ...(opts.instructionsEnv ? { instructionsEnv: opts.instructionsEnv } : {}),
         ...(opts.credsDir ? { credentials: createCredentialStore(opts.credsDir) } : {}),
         // Declared credential behaviors apply to the governed path exactly as they do
         // to the pipe path: the preflight surfaces a clear no-credential error before
@@ -1147,6 +1148,7 @@ function makeCliRuntime(id, options, spec) {
             ...(spec.authOwner && spec.authOwner !== "agent" ? { credsDir: options.credsDir } : {}),
             sandbox: options.sandbox,
             mcpConfig: options.mcpConfig,
+            instructionsEnv: spec.instructions?.env,
         }));
     }
     const structured = executionMode === "structured-pipe";
@@ -1264,6 +1266,7 @@ function makeCliRuntime(id, options, spec) {
         thinking: cliThinkingConfig(id, spec),
         usageReporting: cliUsageReporting(spec),
         slashCommands: cliSlashCommands(spec),
+        ...(spec.instructions ? { instructionsEnv: spec.instructions.env } : {}),
         ...resumeOpts,
         ...nativeSessionOpts,
     });

package/dist/runtime/model-namer.js

@@ -13,6 +13,7 @@
 // inference SDK, kept under src/runtime/ so the core daemon (src/server.ts) stays
 // free of any @earendil-works import.
 import { createPiModelRuntime } from "./pi-oauth.js";
+import { enableBridgeResolution } from "../agent-bridges.mjs";
 function cleanSessionName(value) {
     return value
         .replace(/[\r\n"'`]/g, " ")
@@ -54,6 +55,7 @@ export async function suggestNameFromSelectedModel(opts) {
     if (!prompt)
         return undefined;
     try {
+        enableBridgeResolution();
         const [{ completeSimple }, { ModelRegistry }] = await Promise.all([
             import("@earendil-works/pi-ai/compat"),
             import("@earendil-works/pi-coding-agent"),

package/dist/runtime/pi-oauth.js

@@ -12,6 +12,7 @@ import path from "node:path";
 import { createCredentialVault } from "./credential-store.js";
 import { isNativeOAuthProvider } from "./oauth/model-oauth-providers.js";
 import { selectedCredentialStore } from "../credentials/selected-store.js";
+import { enableBridgeResolution } from "../agent-bridges.mjs";
 /** Adapt Bivy's store to pi-ai's structurally-identical CredentialStore for injection. */
 export function piCredentialStore(store) {
     return store;
@@ -25,6 +26,7 @@ export function piCredentialStore(store) {
  */
 export async function createPiModelRuntime(opts) {
     const store = opts.store ?? createCredentialVault(opts.credsDir);
+    enableBridgeResolution();
     const { ModelRuntime } = await import("@earendil-works/pi-coding-agent");
     const selected = selectedCredentialStore(store, opts.credsDir, { workspace: opts.workspace, credentialLabels: opts.credentialLabels });
     for (const provider of Object.keys(opts.credentialLabels ?? {}))

package/dist/runtime/process.js

@@ -8,7 +8,7 @@ import { buildAgentCredentialEnv } from "./credentials.js";
 import { withSessionCredentials, credentialEnvFallback } from "../credentials/session.js";
 import { egressEnv, sessionEgressEnv } from "../harness/egress.js";
 import { depCacheEnv } from "../harness/dep-cache.js";
-import { bivySessionEnv } from "./session-env.js";
+import { bivySessionEnv, withSessionInstructions } from "./session-env.js";
 import { withExactCapabilitySurface } from "./types.js";
 /**
  * Send `signal` to `child`'s whole process group when possible, so a forking CLI
@@ -539,7 +539,7 @@ export class ProcessRuntime {
         return [...byProvider.values()];
     }
     async createSession(options) {
-        const session = new ProcessSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace);
+        const session = new ProcessSession(withSessionInstructions(await withSessionCredentials(this.options, options.credentialLabels), options.instructions), options.workspace);
         this.sessions.push(session);
         return { session, warning: "Generic CLI runtime streams stdout/stderr only; approvals, model picker, and resume depend on the underlying agent protocol." };
     }
@@ -547,7 +547,7 @@ export class ProcessRuntime {
         // Resumable runtimes bind the agent's session id so each prompt continues it
         // (see resumeArgs); non-resumable ones ignore the ref and start fresh.
         if (this.options.resumable) {
-            const session = new ProcessSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace, options.sessionFile);
+            const session = new ProcessSession(withSessionInstructions(await withSessionCredentials(this.options, options.credentialLabels), options.instructions), options.workspace, options.sessionFile);
             this.sessions.push(session);
             return { session };
         }

package/dist/runtime/protocol.js

@@ -5,7 +5,7 @@ import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import { buildAgentCredentialEnv } from "./credentials.js";
 import { withSessionCredentials, credentialEnvFallback } from "../credentials/session.js";
-import { bivySessionEnv } from "./session-env.js";
+import { bivySessionEnv, withSessionInstructions } from "./session-env.js";
 import { mergeAgentCommands } from "./slash-commands.js";
 import { withExactCapabilitySurface } from "./types.js";
 import { extractTokenUsage } from "./cli-parsers.js";
@@ -157,6 +157,7 @@ class ProtocolSession {
     cwd;
     capabilitiesRef;
     toolInterceptor;
+    instructions;
     id;
     child;
     buffer = "";
@@ -225,11 +226,15 @@ class ProtocolSession {
     // taking the ref as its id — otherwise the daemon persists a SECOND metadata
     // row keyed by the ref, duplicating the conversation. Falls back to the ref,
     // then a fresh UUID, preserving the prior behaviour when no id is supplied.
-    canonicalId) {
+    canonicalId, 
+    // The user's account-wide instructions (OpenSessionOptions.instructions),
+    // sent on session.create/session.resume for the shim to hand its agent.
+    instructions) {
         this.runtimeOptions = runtimeOptions;
         this.cwd = cwd;
         this.capabilitiesRef = capabilitiesRef;
         this.toolInterceptor = toolInterceptor;
+        this.instructions = instructions;
         this.id = canonicalId || resumeRef || randomUUID();
         this.resumeRef = resumeRef;
         if (resumeRef) {
@@ -891,12 +896,15 @@ class ProtocolSession {
         // resume.
         const resumeRef = this.resumeRef ?? this.runtimeSessionRef;
         const created = resumeRef && this.capabilitiesRef.resume
-            ? await this.command("session.resume", { workspace: this.cwd, sessionId: this.id, runtimeSessionRef: resumeRef, resumeRef })
-            : await this.command("session.create", { workspace: this.cwd, sessionId: this.id });
+            ? await this.command("session.resume", { workspace: this.cwd, sessionId: this.id, runtimeSessionRef: resumeRef, resumeRef, ...this.instructionsField() })
+            : await this.command("session.create", { workspace: this.cwd, sessionId: this.id, ...this.instructionsField() });
         if (typeof created.runtimeSessionRef === "string")
             this.runtimeSessionRef = created.runtimeSessionRef;
         this.started = true;
     }
+    instructionsField() {
+        return this.instructions ? { instructions: this.instructions } : {};
+    }
     async prompt(text, options) {
         const wasStarted = this.started;
         await this.open();
@@ -1039,7 +1047,7 @@ export class ProtocolRuntime {
         return this.options.catalog ?? [];
     }
     async createSession(options) {
-        const session = new ProtocolSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace, this.capabilities, options.toolInterceptor);
+        const session = new ProtocolSession(withSessionInstructions(await withSessionCredentials(this.options, options.credentialLabels), options.instructions), options.workspace, this.capabilities, options.toolInterceptor, undefined, undefined, options.instructions?.text);
         try {
             await session.start();
             this.sessions.push(session);
@@ -1056,7 +1064,7 @@ export class ProtocolRuntime {
         // Adopt the caller's canonical id (a reopen of a known session) so the
         // resumed session keeps its original id instead of taking `sessionFile` (the
         // agent's own ref) as its id — see OpenSessionOptions.canonicalId.
-        const session = new ProtocolSession(await withSessionCredentials(this.options, options.credentialLabels), options.workspace, this.capabilities, options.toolInterceptor, options.sessionFile, options.canonicalId);
+        const session = new ProtocolSession(withSessionInstructions(await withSessionCredentials(this.options, options.credentialLabels), options.instructions), options.workspace, this.capabilities, options.toolInterceptor, options.sessionFile, options.canonicalId, options.instructions?.text);
         try {
             await session.start();
             if (!this.options.resumable && !this.capabilities.resume) {

package/dist/runtime/remote.js

@@ -543,12 +543,12 @@ export class RemoteRuntime {
     async createSession(options) {
         const transport = await this.config.connect();
         const toolSpecs = options.toolProvider?.list();
-        return startRemoteSession(transport, { runtime: this.id, sandbox: this.config.sandbox, op: "create", options: { credentialLabels: options.credentialLabels, workspace: options.workspace, hasToolInterceptor: Boolean(options.toolInterceptor), ...(toolSpecs?.length ? { toolSpecs } : {}) } }, { toolInterceptor: options.toolInterceptor, toolProvider: options.toolProvider });
+        return startRemoteSession(transport, { runtime: this.id, sandbox: this.config.sandbox, op: "create", options: { credentialLabels: options.credentialLabels, workspace: options.workspace, ...(options.instructions ? { instructions: options.instructions } : {}), hasToolInterceptor: Boolean(options.toolInterceptor), ...(toolSpecs?.length ? { toolSpecs } : {}) } }, { toolInterceptor: options.toolInterceptor, toolProvider: options.toolProvider });
     }
     async openSession(options) {
         const transport = await this.config.connect();
         const toolSpecs = options.toolProvider?.list();
-        return startRemoteSession(transport, { runtime: this.id, sandbox: this.config.sandbox, op: "open", options: { credentialLabels: options.credentialLabels, workspace: options.workspace, sessionFile: options.sessionFile, hasToolInterceptor: Boolean(options.toolInterceptor), ...(toolSpecs?.length ? { toolSpecs } : {}) } }, { toolInterceptor: options.toolInterceptor, toolProvider: options.toolProvider });
+        return startRemoteSession(transport, { runtime: this.id, sandbox: this.config.sandbox, op: "open", options: { credentialLabels: options.credentialLabels, workspace: options.workspace, sessionFile: options.sessionFile, ...(options.instructions ? { instructions: options.instructions } : {}), hasToolInterceptor: Boolean(options.toolInterceptor), ...(toolSpecs?.length ? { toolSpecs } : {}) } }, { toolInterceptor: options.toolInterceptor, toolProvider: options.toolProvider });
     }
     /**
      * Re-attach to a session already live on the agent service (Stage 2 routing).

package/dist/runtime/session-env.js

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: AGPL-3.0-only
-// Copyright (c) 2026 Petter André Sjulstad
 //
 // Shared across every runtime adapter that spawns (or configures the spawn of) a
 // subprocess for its agent: fold this into that subprocess's env so the agent's
@@ -20,3 +18,21 @@
 export function bivySessionEnv(sessionId) {
     return { BIVY_SESSION_ID: sessionId };
 }
+/**
+ * Apply a profile's instructions env template (AgentProfile.instructions) for one
+ * session: `{file}` → the composed instructions file, `{fileJson}` → the same
+ * path escaped for use inside a JSON string. A variable the operator already set
+ * is left alone rather than clobbered. No template or no instructions = options
+ * returned unchanged.
+ */
+export function withSessionInstructions(options, instructions) {
+    if (!options.instructionsEnv || !instructions)
+        return options;
+    const patch = {};
+    for (const [name, template] of Object.entries(options.instructionsEnv)) {
+        if (process.env[name] !== undefined || options.env?.[name] !== undefined)
+            continue;
+        patch[name] = template.replace(/\{fileJson\}/g, JSON.stringify(instructions.file).slice(1, -1)).replace(/\{file\}/g, instructions.file);
+    }
+    return { ...options, env: { ...options.env, ...patch } };
+}