@bivy/bivy 0.21.1 → 0.21.2-staging.10

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

@@ -691,6 +691,8 @@ class ClaudeSession {
     messages = [];
     streaming = false;
     name;
+    /** Set by the runtime so a disposed session leaves its registry. */
+    onDispose;
     models = [];
     currentModel;
     desiredModel;
@@ -1390,6 +1392,7 @@ class ClaudeSession {
             }
         }
         this.emitter.removeAllListeners();
+        this.onDispose?.();
     }
     async getModels() {
         // Re-query the live agent so the picker reflects the current lineup instead
@@ -1515,6 +1518,16 @@ export class ClaudeCodeRuntime {
     constructor(options = {}) {
         this.options = options;
     }
+    /** Each session holds its whole transcript, so it stays registered only
+     *  while open; a closed one would otherwise be kept for the daemon's lifetime. */
+    track(session) {
+        this.sessions.push(session);
+        session.onDispose = () => {
+            const i = this.sessions.indexOf(session);
+            if (i >= 0)
+                this.sessions.splice(i, 1);
+        };
+    }
     /** Claude Code runs Anthropic models; the authoritative list comes from the
      *  live query per session, so the session-less catalog is the known lineup. */
     listCatalog() {
@@ -1522,12 +1535,12 @@ export class ClaudeCodeRuntime {
     }
     async createSession(options) {
         const session = new ClaudeSession({ ...(await withSessionCredentials(this.options, options.credentialLabels)), instructions: options.instructions?.text }, options.workspace, options.toolInterceptor, options.toolProvider);
-        this.sessions.push(session);
+        this.track(session);
         return { session };
     }
     async openSession(options) {
         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);
+        this.track(session);
         return {
             session,
             warning: "Resumed Claude Code session history is replayed by the agent on the next turn; prior messages are not preloaded.",
@@ -1732,15 +1745,11 @@ export class ClaudeCodeRuntime {
         // Drop (and tear down) any in-memory handle so the fallback branch of
         // listSessions (used when no sessionsDir is set) can't re-advertise it, and a
         // still-live child doesn't outlive the delete.
-        for (let i = this.sessions.length - 1; i >= 0; i--) {
-            const s = this.sessions[i];
-            if (s.id === sessionId || (sessionFile && s.sessionFile === sessionFile)) {
-                try {
-                    s.dispose();
-                }
-                catch { /* already disposed by the caller's close */ }
-                this.sessions.splice(i, 1);
+        for (const s of this.sessions.filter((s) => s.id === sessionId || (sessionFile && s.sessionFile === sessionFile))) {
+            try {
+                s.dispose();
             }
+            catch { /* already disposed by the caller's close */ }
         }
         // Prefer the exact path the SDK reports (that's the file it would re-read on
         // the next list); fall back to locating the transcript by id across Claude's

package/dist/apps/styles.css

@@ -581,6 +581,7 @@ input, textarea, select { font-family: inherit; font-size: 16px; }
    large remote image can't blow out the chat column; rounded to match chips. */
 .msg.assistant img { max-width: 100%; height: auto; border-radius: var(--radius-md); }
 .msg.assistant img.md-image { max-height: 420px; object-fit: contain; }
+.msg.assistant img.md-image[src] { cursor: zoom-in; }
 /* Before ChatView's hydrate effect resolves data-remote-src to a fetched blob:
    URL (or if the node's fetch fails/is disallowed), the element has no `src` and
    would otherwise collapse to nothing — give it a visible placeholder box so a
@@ -1102,13 +1103,6 @@ button.sheet-action:last-child { border-bottom: 0; }
 .composer-btn.stop { background: var(--ink); color: var(--bg); }
 .composer-btn.stop.is-stopping { width: auto; border-radius: var(--radius-full); padding-inline: var(--space-3); display: inline-flex; gap: var(--space-2); }
 .composer-btn.stop:active { transform: scale(0.92); }
-/* "Steer current turn": an explicit interrupt, distinct from the default Send
-   (which queues while busy — see FollowupQueue). --accent is already a warm
-   orange (the Send button), so this borrows --unseen's blue instead — a color
-   used nowhere else in the composer — to read as clearly "not a normal send." */
-.composer-btn.steer { background: var(--unseen); color: var(--unseen-contrast); }
-.composer-btn.steer:hover { filter: brightness(1.1); }
-.composer-btn.steer:active { transform: scale(0.92); }
 .attach-pill { padding: 4px 8px; }
 
 /* Voice-input trigger: a circular icon button seated just left of Send. */
@@ -1181,49 +1175,6 @@ button.sheet-action:last-child { border-bottom: 0; }
 .attach-thumb-btn { flex: none; border: 0; padding: 0; background: none; cursor: zoom-in; line-height: 0; border-radius: var(--radius-sm); overflow: hidden; }
 .attach-thumb { display: block; width: 28px; height: 28px; object-fit: cover; border-radius: var(--radius-sm); }
 
-/* Queued follow-ups (issue #154) — a panel just above the composer showing
-   prompts held back while the session is busy, with their order and delivery
-   state. Reuses .queue-action-btn (GithubQueue's button look) for edit/
-   remove/reorder/send-next so this reads as the same "manage a queue"
-   pattern already established there, rather than inventing a new one. */
-.followup-queue {
-  margin: var(--space-2) var(--space-3) 0; display: flex; flex-direction: column; gap: var(--space-2);
-  max-height: calc(var(--app-h, 100dvh) * 0.32); min-height: 0; overflow: hidden;
-}
-.followup-queue-head { flex: none; font-size: var(--text-xs); font-weight: var(--weight-semibold); color: var(--muted); padding: 0 var(--space-1); }
-.followup-list {
-  display: flex; flex-direction: column; gap: var(--space-2); min-height: 0; overflow-y: auto;
-  overscroll-behavior: contain; -webkit-overflow-scrolling: touch; padding: 0 var(--space-1) var(--space-1);
-}
-.followup-card { flex: none; padding: 0; overflow: hidden; }
-.followup-card.locked { opacity: 0.75; }
-.followup-card-row {
-  display: flex; flex-wrap: wrap; align-items: flex-start; gap: 8px; padding: 8px 10px;
-}
-.followup-card-row:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; border-radius: var(--radius-md); }
-.followup-reorder { display: flex; flex-direction: column; gap: 2px; flex: none; }
-/* The text keeps a readable width; on a phone the actions wrap onto their own line. */
-.followup-body { flex: 1 1 12rem; min-width: 0; display: flex; flex-direction: column; gap: 3px; }
-.followup-status { font-size: 11px; font-weight: 600; color: var(--muted); text-transform: uppercase; letter-spacing: 0.02em; }
-.followup-card.locked .followup-status { color: var(--accent); }
-.followup-text { font-size: 14px; color: var(--ink); white-space: pre-wrap; overflow-wrap: anywhere; }
-.followup-attachments { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 2px; }
-.followup-card-actions { display: flex; align-items: center; gap: 6px; flex: none; flex-wrap: wrap; justify-content: flex-end; margin-left: auto; }
-.followup-edit { display: flex; flex-direction: column; gap: 8px; padding: 8px 10px; }
-.followup-edit-input { resize: vertical; min-height: 44px; }
-.followup-edit-actions { display: flex; justify-content: flex-end; gap: 8px; }
-/* Bigger tap targets for the reorder/edit/remove icon buttons specifically —
-   the shared .queue-action-btn.icon sizing (from GithubQueue) is a bit tight
-   for a control someone taps repeatedly on a phone to walk an item up a queue. */
-.followup-reorder .queue-action-btn.icon,
-.followup-card-actions .queue-action-btn.icon {
-  min-width: 32px; min-height: 32px;
-}
-
-/* Inline re-time field on a scheduled follow-up row (FollowupQueue ✎). */
-.schedule-field { display: flex; flex-direction: column; gap: 4px; }
-.schedule-label { font-size: 11px; font-weight: 600; color: var(--muted); text-transform: uppercase; letter-spacing: 0.02em; }
-
 /* Drag-and-drop drop zone over the composer card. */
 .composer-card.dragging { border-color: var(--accent); }
 .composer-drop {

package/dist/automation-reseal.js

@@ -13,6 +13,8 @@ export async function resealAutomationTemplates(opts) {
         const plaintext = opts.retired.map((key) => tryOpen(key, payload)).find((text) => text !== undefined);
         if (plaintext === undefined) {
             result.unreadable.push(template.id);
+            if (!template.instructionsUnreadable)
+                await opts.markUnreadable(template.id);
             continue;
         }
         await opts.save(template.id, `${prefix}${seal(opts.current, plaintext)}`);

package/dist/node-config.js

@@ -4,6 +4,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
+import { parseAgentAdapter } from "./plugin-sdk/manifest.js";
 export const NODE_CONFIG_FILE = "config.yaml";
 export const NODE_CONFIG_VERSION = 1;
 const ROOT_KEYS = ["version", "node", "defaults", "safety", "sessions", "github", "automation", "agents", "environment"];
@@ -170,6 +171,23 @@ export function validateNodeConfig(value) {
             errors.push(`${at} must be an object`);
             continue;
         }
+        if (spec.adapter !== undefined) {
+            unknownKeys(spec, ["name", "description", "hidden", "authOwner", "adapter"], at, errors);
+            const adapter = parseAgentAdapter(spec.adapter, `${at}.adapter`, errors);
+            const authOwner = spec.authOwner;
+            if (authOwner !== undefined && authOwner !== "agent" && authOwner !== "bivy" && authOwner !== "mixed")
+                errors.push(`${at}.authOwner must be agent, bivy, or mixed`);
+            const name = optionalString(spec.name, `${at}.name`, errors, 120);
+            const description = optionalString(spec.description, `${at}.description`, errors, 500);
+            const hidden = optionalBoolean(spec.hidden, `${at}.hidden`, errors);
+            if (adapter)
+                agents[id] = { name, description, hidden, authOwner, adapter };
+            continue;
+        }
+        if (spec.extends === undefined) {
+            errors.push(`${at} needs an adapter (any ACP or CLI command) or extends (a maintained agent id)`);
+            continue;
+        }
         unknownKeys(spec, ["extends", "label", "command", "args", "jsonArgs", "parserId", "promptMode", "hidden"], at, errors);
         const extend = optionalString(spec.extends, `${at}.extends`, errors, 80);
         const list = (value, key) => {

package/dist/node-update.js

@@ -18,7 +18,28 @@ export function managedInstall(packageRoot) {
     }
     return null;
 }
-export function updateRegistryUrl(appDir, override) {
+/**
+ * True when this daemon runs from a GitHub release archive install: the
+ * launcher's BIVY_ARCHIVE_ROOT names the install holding `packageRoot` (the
+ * same check bin/archive-install.mjs makes for the CLI).
+ */
+export function isArchiveInstall(packageRoot, archiveRoot = process.env.BIVY_ARCHIVE_ROOT) {
+    if (!archiveRoot)
+        return false;
+    try {
+        return fs.realpathSync(path.join(archiveRoot, "app")) === fs.realpathSync(packageRoot)
+            && fs.existsSync(path.join(archiveRoot, "bivy-archive.json"));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Where to look for a newer version on the install's recorded channel: the npm
+ * registry, or for an archive install the channel's GitHub release manifest
+ * (URLs as in bin/archive-install.mjs). Both answer with `{ version }`.
+ */
+export function updateRegistryUrl(appDir, override, archive = false) {
     if (override)
         return override;
     let channel = "latest";
@@ -28,6 +49,10 @@ export function updateRegistryUrl(appDir, override) {
             channel = recorded;
     }
     catch { /* Existing installs track stable. */ }
+    if (archive) {
+        const releases = process.env.BIVY_RELEASES_URL || "https://github.com/bivysh/bivy/releases";
+        return channel === "latest" ? `${releases}/latest/download/manifest.json` : `${releases}/download/${encodeURIComponent(channel)}/manifest.json`;
+    }
     return `https://registry.npmjs.org/%40bivy%2Fbivy/${encodeURIComponent(channel)}`;
 }
 /** Running version is fixed for this process, never re-read after an install. */

package/dist/plugin-cli.js

@@ -247,13 +247,13 @@ export async function main(argv = process.argv.slice(2)) {
             if (!input)
                 fail("Usage: bivy plugin install <path> [--force]", json);
             const result = installPlugin(input, { dataDir, force: args.includes("--force") });
-            const body = { ok: true, installed: result.manifest.metadata.id, version: result.manifest.metadata.version, path: result.path, replaced: result.replaced, restartRequired: true };
+            const body = { ok: true, installed: result.manifest.metadata.id, version: result.manifest.metadata.version, path: result.path, replaced: result.replaced };
             if (json)
                 outputJson(body);
             else {
                 console.log(`${result.replaced ? "Updated" : "Installed"} ${result.manifest.metadata.name} (${result.manifest.metadata.id}@${result.manifest.metadata.version}).`);
                 console.log(`Stored at ${result.path}`);
-                console.log("Restart Bivy to activate it: bivy restart");
+                console.log("It is in the agent picker now.");
             }
             return;
         }
@@ -300,12 +300,11 @@ export async function main(argv = process.argv.slice(2)) {
             const removed = removePlugin(id, dataDir);
             if (!removed)
                 fail(`Plugin ${id} is not installed`, json);
-            const body = { ok: true, removed: id, restartRequired: true };
+            const body = { ok: true, removed: id };
             if (json)
                 outputJson(body);
             else {
                 console.log(`Removed plugin ${id}.`);
-                console.log("Restart Bivy to unload it: bivy restart");
             }
             return;
         }

package/dist/plugin-sdk/manifest.js

@@ -179,6 +179,21 @@ function parseAcpAdapter(raw, at, errors) {
     const args = stringList(raw.args, `${at}.args`, errors);
     return command ? { kind: "acp", command, ...(args ? { args } : {}) } : undefined;
 }
+/** Validate one `adapter` block. Plugin manifests and node `config.yaml` agents
+ *  share it, so an agent is described the same way wherever it is declared. */
+export function parseAgentAdapter(value, at, errors) {
+    const raw = object(value);
+    if (!raw) {
+        errors.push(`${at} must be an object`);
+        return undefined;
+    }
+    if (raw.kind === "process")
+        return parseProcessAdapter(raw, at, errors);
+    if (raw.kind === "acp")
+        return parseAcpAdapter(raw, at, errors);
+    errors.push(`${at}.kind must be process or acp`);
+    return undefined;
+}
 function parseAgent(value, index, errors) {
     const at = `contributes.agents[${index}]`;
     const raw = object(value);
@@ -198,16 +213,7 @@ function parseAgent(value, index, errors) {
     if (authOwner !== undefined && authOwner !== "agent" && authOwner !== "bivy" && authOwner !== "mixed") {
         errors.push(`${at}.authOwner must be agent, bivy, or mixed`);
     }
-    const adapterRaw = object(raw.adapter);
-    let adapter;
-    if (!adapterRaw)
-        errors.push(`${at}.adapter must be an object`);
-    else if (adapterRaw.kind === "process")
-        adapter = parseProcessAdapter(adapterRaw, `${at}.adapter`, errors);
-    else if (adapterRaw.kind === "acp")
-        adapter = parseAcpAdapter(adapterRaw, `${at}.adapter`, errors);
-    else
-        errors.push(`${at}.adapter.kind must be process or acp`);
+    const adapter = parseAgentAdapter(raw.adapter, `${at}.adapter`, errors);
     if (!id || !name || !adapter)
         return undefined;
     return {
@@ -351,5 +357,7 @@ export function recommendedBivyRange(currentVersion) {
     const parsed = parseSemver(currentVersion);
     if (!parsed)
         throw new Error(`Cannot generate a compatibility range from invalid Bivy version ${currentVersion}`);
-    return `>=${parsed.major}.${parsed.minor}.${parsed.patch} <${parsed.major}.${parsed.minor + 1}.0`;
+    // The manifest contract is versioned by apiVersion, so a plugin keeps working
+    // across Bivy minor releases; only a major release may break it.
+    return `>=${parsed.major}.${parsed.minor}.${parsed.patch} <${parsed.major + 1}.0.0`;
 }

package/dist/runtime/cli-parsers.js

@@ -241,6 +241,7 @@ export function bivyProtocolParser() {
     // appended verbatim (a shim emits an explicit break when it wants one), so it
     // opts out of inferred segment boundaries.
     const acc = new TurnAccumulator({ provider: "bivy-protocol", protocol: "protocol" }, false);
+    let sessionRef;
     return {
         onLine(line) {
             const events = [];
@@ -255,9 +256,23 @@ export function bivyProtocolParser() {
                 return events; // ignore non-JSON noise (banners etc.)
             }
             const type = String(msg.type ?? "");
-            if (type === "message.delta") {
+            if (type === "session.started") {
+                // The adapter's own conversation id; `resume.args` gets it back as {id}.
+                if (typeof msg.sessionId === "string" && msg.sessionId.trim())
+                    sessionRef = msg.sessionId.trim();
+            }
+            else if (type === "message.delta") {
                 acc.appendText(String(msg.text ?? ""), events);
             }
+            else if (type === "message.reasoning") {
+                acc.appendReasoning(String(msg.text ?? ""), events);
+            }
+            else if (type === "usage") {
+                const tokens = extractTokenUsage(msg.tokens ?? msg);
+                const costUsd = typeof msg.costUsd === "number" ? { costUsd: msg.costUsd } : {};
+                if (tokens || costUsd.costUsd !== undefined)
+                    acc.addUsage({ ...tokens, ...costUsd });
+            }
             else if (type === "session.status") {
                 const status = String(msg.status ?? "");
                 if (status === "working")
@@ -288,6 +303,8 @@ export function bivyProtocolParser() {
             return events;
         },
         messages: () => acc.history(),
+        usage: () => acc.usageSnapshot,
+        sessionRef: () => sessionRef,
     };
 }
 /** Parser for Claude Code CLI `--output-format stream-json`. */

package/dist/runtime/index.js

@@ -55,6 +55,8 @@ import { ProtocolRuntime, protocolRuntimeFromEnv, protocolCommandsFromEnv } from
 import { codexSlashCommands, opencodeSlashCommands } from "./slash-commands.js";
 import { withExactCapabilitySurface } from "./types.js";
 import { installedAgentContributions } from "../plugins/store.js";
+import { readNodeConfig } from "../node-config.js";
+import { defaultDataDir } from "../data-dir.js";
 import { forkCapsFromInfo } from "../session/fork-matrix.js";
 import { currentBivyVersion } from "../app-version.js";
 const PREFLIGHT_BEHAVIORS = {
@@ -116,54 +118,81 @@ function genericCliInfo() {
             : "Set BIVY_AGENT_COMMAND to enable this universal CLI runtime.",
     };
 }
-function customAgentSpecs() {
-    const out = new Map();
+/**
+ * The node's own agents, read from `<data-dir>/config.yaml` on every registry
+ * build so an edit or `bivy agent add` shows up without a restart. The legacy
+ * BIVY_CUSTOM_AGENTS projection is used only on a node with no config.yaml.
+ */
+function configuredAgents(dataDir = defaultDataDir()) {
+    try {
+        const config = readNodeConfig(dataDir);
+        if (config)
+            return { agents: Object.entries(config.agents ?? {}) };
+    }
+    catch (error) {
+        return { agents: [], error: error instanceof Error ? error.message : String(error) };
+    }
     const raw = process.env.BIVY_CUSTOM_AGENTS?.trim();
     if (!raw)
-        return out;
+        return { agents: [] };
     try {
         const parsed = JSON.parse(raw);
         if (!Array.isArray(parsed))
-            return out;
-        for (const value of parsed) {
-            if (!value || typeof value !== "object")
-                continue;
-            const item = value;
-            const id = typeof item.id === "string" ? item.id.trim().toLowerCase() : "";
-            if (!/^[a-z][a-z0-9-]{1,47}$/.test(id) || out.has(id))
-                continue;
-            if (typeof item.extends !== "string" || !isAgentProfileId(item.extends))
-                continue;
-            const base = AGENT_PROFILES[item.extends];
-            const strings = (v) => Array.isArray(v) && v.every((x) => typeof x === "string") ? v : undefined;
-            out.set(id, {
-                ...base,
-                displayName: typeof item.label === "string" && item.label.trim() ? item.label.trim() : id,
-                command: typeof item.command === "string" && item.command.trim() ? item.command.trim() : base.command,
-                ...(strings(item.args) ? { args: strings(item.args) } : {}),
-                ...(strings(item.jsonArgs) ? { jsonArgs: strings(item.jsonArgs) } : {}),
-                ...(typeof item.parserId === "string" ? { parserId: item.parserId } : {}),
-                ...(item.promptMode === "stdin" || item.promptMode === "argv" ? { promptMode: item.promptMode } : {}),
-                hidden: item.hidden === true,
-                supportTier: "experimental",
-                testedVersion: undefined,
-                install: undefined,
-                // `extends` reuses declarative launch syntax, never maintained host code.
-                // A different executable must not inherit Codex/OpenCode/Grok credential,
-                // store, slash-command, or native-discovery behavior by accident.
-                behaviors: undefined,
-                ...(base.resume ? { resume: { template: base.resume.template, ...(base.resume.newTemplate ? { newTemplate: base.resume.newTemplate } : {}) } } : {}),
-            });
-        }
+            return { agents: [] };
+        return {
+            agents: parsed
+                .filter((item) => Boolean(item) && typeof item.id === "string")
+                .map(({ id, ...spec }) => [id.trim().toLowerCase(), spec]),
+        };
     }
     catch {
         // Invalid operator configuration is ignored; packaged integrations remain usable.
+        return { agents: [] };
+    }
+}
+function extendsAgentSpec(id, item) {
+    if (!isAgentProfileId(item.extends))
+        return undefined;
+    const base = AGENT_PROFILES[item.extends];
+    const strings = (v) => Array.isArray(v) && v.every((x) => typeof x === "string") ? v : undefined;
+    return {
+        ...base,
+        displayName: typeof item.label === "string" && item.label.trim() ? item.label.trim() : id,
+        command: typeof item.command === "string" && item.command.trim() ? item.command.trim() : base.command,
+        ...(strings(item.args) ? { args: strings(item.args) } : {}),
+        ...(strings(item.jsonArgs) ? { jsonArgs: strings(item.jsonArgs) } : {}),
+        ...(typeof item.parserId === "string" ? { parserId: item.parserId } : {}),
+        ...(item.promptMode === "stdin" || item.promptMode === "argv" ? { promptMode: item.promptMode } : {}),
+        hidden: item.hidden === true,
+        supportTier: "experimental",
+        testedVersion: undefined,
+        install: undefined,
+        // `extends` reuses declarative launch syntax, never maintained host code.
+        // A different executable must not inherit Codex/OpenCode/Grok credential,
+        // store, slash-command, or native-discovery behavior by accident.
+        behaviors: undefined,
+        ...(base.resume ? { resume: { template: base.resume.template, ...(base.resume.newTemplate ? { newTemplate: base.resume.newTemplate } : {}) } } : {}),
+    };
+}
+function customAgentSpecs(dataDir) {
+    const out = new Map();
+    for (const [id, item] of configuredAgents(dataDir).agents) {
+        if (!/^[a-z][a-z0-9-]{1,47}$/.test(id) || out.has(id) || !item || typeof item !== "object")
+            continue;
+        const spec = "adapter" in item
+            ? adapterAgentSpec({ name: item.name || id, ...item }, "Configured on this machine")
+            : extendsAgentSpec(id, item);
+        if (spec)
+            out.set(id, spec);
     }
     return out;
 }
 export function pluginAgentConflictDiagnostics(dataDir) {
     const installed = installedAgentContributions(dataDir);
     const errors = [...installed.errors];
+    const configError = configuredAgents(dataDir).error;
+    if (configError)
+        errors.push(configError);
     for (const conflict of agentRegistry(dataDir).diagnostics()) {
         if (conflict.rejectedOrigin.kind !== "package" || conflict.rejectedOrigin.location !== "installed")
             continue;
@@ -171,18 +200,18 @@ export function pluginAgentConflictDiagnostics(dataDir) {
     }
     return errors;
 }
-/** Translate a public manifest contribution into the shared CLI adapter shape. */
-function pluginAgentSpec(contribution) {
-    const { agent } = contribution;
+/** Translate one `adapter` declaration (plugin manifest or config.yaml) into
+ *  the shared CLI/ACP launch shape. */
+function adapterAgentSpec(agent, packageName) {
     const common = {
         displayName: agent.name,
         command: agent.adapter.command,
-        packageName: `${contribution.pluginName} plugin`,
+        packageName,
         promptMode: "stdin",
         hidden: agent.hidden === true,
         supportTier: "experimental",
         authOwner: agent.authOwner ?? "agent",
-        blurb: agent.description ?? `Agent contributed by ${contribution.pluginName}.`,
+        blurb: agent.description ?? `${packageName}.`,
         install: undefined,
     };
     if (agent.adapter.kind === "acp") {
@@ -982,10 +1011,11 @@ function agentRegistry(pluginDataDir) {
     }
     // Machine configuration and installed packages use the exact same lifecycle.
     // Earlier registrations win, and every retained/rejected origin remains explicit.
-    for (const [id, spec] of customAgentSpecs())
+    for (const [id, spec] of customAgentSpecs(pluginDataDir))
         registry.register(cliRegistration(id, spec, { kind: "config" }));
     for (const contribution of installedAgentContributions(pluginDataDir).agents) {
-        registry.register(cliRegistration(contribution.agent.id, pluginAgentSpec(contribution), {
+        const { agent, pluginName } = contribution;
+        registry.register(cliRegistration(agent.id, adapterAgentSpec({ ...agent, description: agent.description ?? `Agent contributed by ${pluginName}.` }, `${pluginName} plugin`), {
             kind: "package",
             packageId: contribution.pluginId,
             packageVersion: contribution.pluginVersion,