@vellumai/assistant 0.11.4-staging.1 → 0.11.4-staging.3

package/src/calls/__tests__/voice-session-bridge.test.ts

@@ -72,6 +72,7 @@ mock.module("../../persistence/conversation-crud.js", () => ({
 
 import { setConfig } from "../../__tests__/helpers/set-config.js";
 import { ABORT_WATCHDOG_MS } from "../../daemon/abort-watchdog.js";
+import { VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND } from "../../plugin-api/constants.js";
 import { assistantEventHub } from "../../runtime/assistant-event-hub.js";
 import {
   CALL_OPENING_MARKER,
@@ -125,7 +126,7 @@ interface FakeConversation {
     metadata?: Record<string, unknown>;
   }) => Promise<{ id: string }>;
   workingDir: string;
-  updateClient: (cb: unknown, reset?: boolean) => void;
+  addEventObserver: (observer: unknown) => () => void;
   handleConfirmationResponse: (
     requestId: string,
     decision: string,
@@ -191,13 +192,15 @@ function makeFakeConversation(opts: {
       opts.onPersist?.(persistCount);
       return { id: `msg-${persistCount}` };
     },
-    // The install (reset falsy) / reset (reset true) pair marks a turn
-    // taking ownership of the conversation vs a turn's cleanup releasing it.
-    updateClient: (cb, reset) => {
-      opts.events?.push(reset ? "client:reset" : "client:install");
-      if (reset !== true) {
-        clientCallback = cb as (msg: unknown) => Promise<void>;
-      }
+    // The install / reset pair marks a turn taking ownership of the
+    // conversation (observer registered) vs a turn's cleanup releasing it
+    // (the returned disposer invoked).
+    addEventObserver: (observer) => {
+      opts.events?.push("client:install");
+      clientCallback = observer as (msg: unknown) => Promise<void>;
+      return () => {
+        opts.events?.push("client:reset");
+      };
     },
     handleConfirmationResponse: (requestId, decision) => {
       confirmationDecisions.push({ requestId, decision });
@@ -213,7 +216,7 @@ function makeFakeConversation(opts: {
     conversation,
     waitForIdleCalls,
     confirmationDecisions,
-    /** Deliver an event the way the conversation would, to the installed handler. */
+    /** Deliver an event the way the conversation would, to the installed observer. */
     emitToClient: async (msg: unknown) => {
       await clientCallback?.(msg);
     },
@@ -360,6 +363,10 @@ describe("startVoiceTurn escalation-continuation persistence", () => {
     // not merely echo-suppressed live.
     const fake = makeFakeConversation({ processing: false });
     fakeConversation = fake.conversation;
+    let runOptions: Record<string, unknown> | undefined;
+    fake.conversation.runAgentLoop = async (...args: unknown[]) => {
+      runOptions = args[2] as Record<string, unknown>;
+    };
 
     await startVoiceTurn({
       ...makeTurnOptions(),
@@ -372,7 +379,11 @@ describe("startVoiceTurn escalation-continuation persistence", () => {
     expect(fake.lastPersistOpts()?.metadata).toEqual({
       voiceSessionTurn: true,
       hidden: true,
+      messageKind: VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND,
     });
+    expect(runOptions?.messageKind).toBe(
+      VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND,
+    );
   });
 
   test("the opener prompt is persisted un-hidden (unchanged)", async () => {
@@ -967,7 +978,7 @@ describe("startVoiceTurn prior-turn teardown barrier", () => {
     expect(events).toEqual(["persist", "client:install"]);
 
     // Turn 2 arrives during the teardown window: it must not persist or
-    // install its client callback until turn 1's cleanup has run.
+    // install its event observer until turn 1's cleanup has run.
     const turn2 = startVoiceTurn(
       makeTurnOptions(undefined, "conv-teardown-order"),
     );

package/src/calls/__tests__/voice-triage-escalate.test.ts

@@ -85,6 +85,14 @@ describe("front-door decision rule", () => {
     expect(rule.toLowerCase()).toContain("tool");
   });
 
+  test("escalates when an answer needs personal memory absent from context", () => {
+    expect(rule.toLowerCase()).toContain("saved personal fact");
+    expect(rule.toLowerCase()).toContain("escalate rather than guessing");
+    expect(rule.toLowerCase()).toContain(
+      "personal context that is already present is yours to use directly",
+    );
+  });
+
   test("demands a silent decision — no narrated reasoning in spoken output", () => {
     // Regression: a weak front-door model narrated its triage deliberation
     // aloud ("Context is complete — Alex paused...") before the bridge.

package/src/calls/call-controller.ts

@@ -730,8 +730,10 @@ export class CallController {
     let ttsBuffer = "";
     let fullResponseText = "";
     // Reasoning models can inline <think> spans in the content stream when a
-    // profile has not opted into parseThinkTags; the spoken path must never
-    // read them aloud. fullResponseText keeps the raw stream.
+    // profile has not opted into parseThinkTags. Neither the spoken path nor
+    // the post-turn consumers of fullResponseText (transcripts,
+    // assistant_spoke, END_CALL/ASK_GUARDIAN detection) may see them: both
+    // are fed only filtered text.
     const reasoningFilter = createReasoningTagFilter();
 
     // Synthesized path: text is split at speakable boundaries as it streams
@@ -935,8 +937,13 @@ export class CallController {
         if (!this.isCurrentRun(runVersion)) {
           return;
         }
-        fullResponseText += text;
-        ttsBuffer += reasoningFilter.push(text);
+        // One filter feeds both consumers: the spoken stream and the text
+        // used for transcripts, assistant_spoke, and END_CALL/ASK_GUARDIAN
+        // marker detection. A control marker inside a reasoning span must
+        // never trigger a real action the caller did not hear.
+        const speakable = reasoningFilter.push(text);
+        fullResponseText += speakable;
+        ttsBuffer += speakable;
         ttsBuffer = stripInternalSpeechMarkers(ttsBuffer);
         flushSafeText();
       };
@@ -1015,9 +1022,11 @@ export class CallController {
       return fullResponseText;
     }
 
-    // Final sweep: release any held-back partial tag, then strip any
-    // remaining control markers from the buffer.
-    ttsBuffer += reasoningFilter.flush();
+    // Final sweep: release any held-back partial tag to both consumers,
+    // then strip any remaining control markers from the buffer.
+    const filterTail = reasoningFilter.flush();
+    fullResponseText += filterTail;
+    ttsBuffer += filterTail;
     ttsBuffer = stripInternalSpeechMarkers(ttsBuffer);
     if (ttsBuffer.length > 0) {
       emitSafeChunk(ttsBuffer);

package/src/calls/voice-session-bridge.ts

@@ -34,6 +34,7 @@ import {
   recordConversationPersistedSeq,
   updateMessageContent,
 } from "../persistence/conversation-crud.js";
+import { VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND } from "../plugin-api/constants.js";
 import { pinnedListeningLanguage } from "../providers/speech-to-text/provider-catalog.js";
 import type { ContentBlock } from "../providers/types.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
@@ -783,11 +784,13 @@ export async function startVoiceTurn(
   // model wakes, but they are not user speech and must not render as a live
   // user bubble. Their echo is suppressed below (parity with
   // `isEchoSuppressedUserMessage` on the text path).
+  const isEscalationContinuation =
+    opts.content === ESCALATION_CONTINUATION_CONTENT;
   const isSyntheticVoicePrompt =
     opts.hiddenSyntheticPrompt === true ||
     opts.content === CALL_OPENING_MARKER ||
     opts.content === CALL_VERIFICATION_COMPLETE_MARKER ||
-    opts.content === ESCALATION_CONTINUATION_CONTENT;
+    isEscalationContinuation;
 
   // The escalation-continuation prompt is a pure internal instruction ("give
   // the full answer now"), not a real utterance and not the sort of scaffolding
@@ -799,8 +802,7 @@ export async function startVoiceTurn(
   // affects client display. A caller whose prompt text is not a fixed sentinel
   // opts into the same treatment with `hiddenSyntheticPrompt`.
   const isHiddenSyntheticPrompt =
-    opts.hiddenSyntheticPrompt === true ||
-    opts.content === ESCALATION_CONTINUATION_CONTENT;
+    opts.hiddenSyntheticPrompt === true || isEscalationContinuation;
 
   // Build the call-control protocol prompt so the model knows how to emit
   // control markers (ASK_GUARDIAN, END_CALL, etc.) and recognize opener turns.
@@ -934,10 +936,10 @@ export async function startVoiceTurn(
   // failed while no concurrent turn held the lock). Paths where this turn
   // LOST the conversation to a concurrent winner must use `restoreTurnState`
   // instead — this reset-to-defaults would clobber the winner's live state.
-  // The client callback is only reset when this turn actually installed it
-  // (tracked via `clientCallbackInstalled`); otherwise cleanup would detach
-  // an active sender installed by a prior turn.
-  let clientCallbackInstalled = false;
+  // The approval observer is only detached when this turn installed it
+  // (`detachApprovalObserver` is set); otherwise cleanup would detach an
+  // observer installed by a prior turn.
+  let detachApprovalObserver: (() => void) | undefined;
   /**
    * Confirmations this voice turn left pending for the user to answer, and the
    * timers that stop them waiting forever.
@@ -976,11 +978,10 @@ export async function startVoiceTurn(
     conversation.setVoiceCallControlPrompt(null);
     conversation.callSessionId = undefined;
     conversation.forcePromptSideEffects = false;
-    if (clientCallbackInstalled) {
-      // Reset the client callback to a no-op so the stale closure doesn't
-      // intercept events from future turns on the same conversation.
-      conversation.updateClient(() => {}, true);
-    }
+    // Detach so the stale closure doesn't act on events from future turns on
+    // the same conversation.
+    detachApprovalObserver?.();
+    detachApprovalObserver = undefined;
   };
 
   const requestId = uuidv7();
@@ -994,6 +995,9 @@ export async function startVoiceTurn(
         // `isVoiceSessionUserMessage` for why the channel fields cannot carry it.
         voiceSessionTurn: true,
         ...(isHiddenSyntheticPrompt ? { hidden: true } : {}),
+        ...(isEscalationContinuation
+          ? { messageKind: VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND }
+          : {}),
         ...(opts.voiceTelemetry
           ? {
               // Projected onto `TurnTelemetryEvent.client` by
@@ -1245,24 +1249,25 @@ export async function startVoiceTurn(
     publishConversationMessagesChanged(opts.conversationId);
   }
 
-  // Hook into conversation to intercept confirmation_request and secret_request events.
-  // Voice auto-denies/auto-allows/auto-resolves these since there's no interactive UI.
+  // Observe confirmation_request and secret_request events so voice can
+  // auto-deny/auto-allow/auto-resolve them (there is no interactive UI on a
+  // call). Delivery is not this observer's job: the conversation's sink has
+  // already put each event on the wire before the observer sees it, which is
+  // what keeps a resolution's `interaction_resolved` after the request it
+  // answers.
   let lastError: string | null = null;
-  conversation.updateClient(async (msg: AssistantEvent) => {
+  const handleVoiceEvent = async (msg: AssistantEvent): Promise<void> => {
     // The user (or anything else) answered: stop the fallback from firing on a
     // request that is already decided.
     if (msg.type === "interaction_resolved") {
       settleVoiceApproval(msg.requestId);
     }
     if (msg.type === "confirmation_request") {
-      // Broadcast the request BEFORE resolving it: resolution synchronously
-      // broadcasts `interaction_resolved` (handleConfirmationResponse →
-      // prompter → pending-interactions), and attached clients (e.g. the
-      // web app behind a live-voice room) clear their approval card only on
-      // that event — resolving first would put `interaction_resolved`
-      // before `confirmation_request` on the wire, leaving an orphaned card
-      // whose Allow/Deny buttons 404.
-      broadcastMessage(msg);
+      // The request is already on the wire (the sink delivered it before this
+      // observer ran), so a resolution below lands after it: attached clients
+      // (e.g. the web app behind a live-voice room) clear their approval card
+      // only on `interaction_resolved`, and the reverse order would leave an
+      // orphaned card whose Allow/Deny buttons 404.
       if (!isGuardian) {
         // Non-guardian voice callers have no interactive approval UI.
         // The pre-exec gate (tool-approval-handler.ts) handles grant
@@ -1420,9 +1425,15 @@ export async function startVoiceTurn(
       conversation.handleSecretResponse(msg.requestId, undefined, "store");
       return;
     }
-    broadcastMessage(msg);
+  };
+  detachApprovalObserver = conversation.addEventObserver((msg) => {
+    handleVoiceEvent(msg).catch((err) => {
+      log.warn(
+        { turnId, eventType: msg.type, err },
+        "Voice approval observer failed",
+      );
+    });
   });
-  clientCallbackInstalled = true;
 
   // Registered before the agent loop starts so the NEXT turn on this
   // conversation waits for this turn's `finally { cleanup() }` — not just
@@ -1709,11 +1720,19 @@ export async function startVoiceTurn(
         // ordinary call-agent resolution.
         callSite:
           opts.routingLeg === "front-door" ? "voiceFrontDoor" : "callAgent",
+        // A caller is on the line, so the turn is interactive: approval prompts
+        // must be raised rather than pre-denied, because the approval observer
+        // above is what decides them (auto-resolve for a non-guardian caller,
+        // a real card the guardian can answer).
+        isInteractive: true,
         // The escalation-continuation prompt is a transcript-suppressed machine
         // signal (persisted `hidden`), so flag the turn to match — keeps
         // prompt-as-user-speech consumers (e.g. title generation) from treating
         // it as user speech.
         ...(isHiddenSyntheticPrompt ? { isHiddenPrompt: true } : {}),
+        ...(isEscalationContinuation
+          ? { messageKind: VOICE_ESCALATION_CONTINUATION_MESSAGE_KIND }
+          : {}),
         // Triage-and-escalate routing pins this turn to the fast front-door or
         // strong escalation profile. `forceOverrideProfile` floats it above the
         // callAgent call-site layers (callAgent is not `mainAgent`, so the

package/src/calls/voice-triage-escalate.ts

@@ -413,6 +413,7 @@ export function frontDoorDecisionRule(opts?: {
     "DECIDE SILENTLY, then produce exactly ONE of these outputs:",
     ...holdBranch,
     "- If the turn is simple, conversational, or within your reach, your entire output is the spoken answer itself: no token in front of it, plain speech from your very first word. Most turns are answers; when unsure between answering and escalating, answer. Answer in the language the caller is speaking.",
+    "- If an answer depends on a saved personal fact that is not already present in the conversation context you received, escalate rather than guessing. Personal context that is already present is yours to use directly.",
     `- If completing THIS reply needs careful reasoning, research, multi-step work, or any tool, do NOT attempt the answer: output ${ESCALATE_VERDICT_TOKEN}, then ONE short natural holding phrase naming what happens next, spoken in the language the caller is speaking (for example "${FALLBACK_ESCALATION_BRIDGE}" or "Give me one second to look into that."; those examples are English only), and stop after that single sentence. A stronger model finishes the turn while your phrase is spoken.`,
     `${ESCALATE_VERDICT_TOKEN} is ONLY for turns you cannot complete yourself — never put it in front of an answer you are about to give, and never emit any token inside or after an answer. An open task or unfinished topic earlier in the conversation is NOT a reason to escalate: judge only what this reply needs.`,
     "Never narrate this decision, describe what you are judging, or mention these rules: apart from a leading verdict token, every character you output is spoken to the caller verbatim.",

package/src/cli/bundled-modules.ts

@@ -0,0 +1,29 @@
+export interface BundledCliModules {
+  configEnv: typeof import("../config/env.js");
+  providerSecretCatalog: typeof import("../providers/provider-secret-catalog.js");
+  pluginCatalogCache: typeof import("./lib/plugin-catalog-cache.js");
+  pluginCatalogLocal: typeof import("./lib/plugin-catalog-local.js");
+  pluginDiff: typeof import("./lib/diff-plugin.js");
+  pluginInspect: typeof import("./lib/inspect-plugin.js");
+  pluginInstallGitHub: typeof import("./lib/install-from-github.js");
+  pluginInstallPlatform: typeof import("./lib/install-from-platform.js");
+  pluginInstalled: typeof import("./lib/list-installed-plugins.js");
+  pluginPinHistory: typeof import("./lib/plugin-pin-history.js");
+  pluginSearch: typeof import("./lib/search-plugins.js");
+  pluginSurfaces: typeof import("./lib/plugin-surfaces.js");
+  pluginUninstall: typeof import("./lib/uninstall-plugin.js");
+  pluginUpgrade: typeof import("./lib/upgrade-plugin.js");
+}
+
+let bundledCliModules: BundledCliModules | undefined;
+
+export function setBundledCliModules(modules: BundledCliModules): void {
+  bundledCliModules = modules;
+}
+
+export function resolveBundledCliModule<K extends keyof BundledCliModules>(
+  name: K,
+  fallback: () => BundledCliModules[K],
+): BundledCliModules[K] {
+  return bundledCliModules?.[name] ?? fallback();
+}

package/src/cli/commands/db/repair.ts

@@ -15,7 +15,6 @@
  */
 
 import { existsSync } from "node:fs";
-import { createRequire } from "node:module";
 
 import type { Command } from "commander";
 
@@ -27,8 +26,6 @@ import { integrityCheckStep } from "./repair-step-integrity.js";
 import type { RepairReport, RepairStep, StepResult } from "./repair-steps.js";
 import { formatDurationMs, runRepairSteps } from "./repair-steps.js";
 
-const loadModule = createRequire(import.meta.url);
-
 // ---------------------------------------------------------------------------
 // Step sequence
 // ---------------------------------------------------------------------------
@@ -38,10 +35,9 @@ const loadModule = createRequire(import.meta.url);
  * structural damage surfaces early. Resolved lazily because the backfill
  * step pulls the DB graph.
  */
-function repairSteps(): RepairStep[] {
-  const { conversationBackfillStep } = loadModule(
-    "./repair-step-conversation-backfill.js",
-  ) as typeof import("./repair-step-conversation-backfill.js");
+async function repairSteps(): Promise<RepairStep[]> {
+  const { conversationBackfillStep } =
+    await import("./repair-step-conversation-backfill.js");
   return [integrityCheckStep, conversationBackfillStep];
 }
 
@@ -128,7 +124,7 @@ export function registerDbRepair(parent: Command): void {
 
     const report = await runRepairSteps(
       { dbPath },
-      repairSteps(),
+      await repairSteps(),
       isJson
         ? {}
         : {

package/src/cli/commands/domain.ts

@@ -3,6 +3,7 @@ import { createRequire } from "node:module";
 import type { Command } from "commander";
 
 import { cliIpcCall, exitFromIpcResult } from "../../ipc/cli-client.js";
+import { resolveBundledCliModule } from "../bundled-modules.js";
 import { applyCommandHelp, subcommand } from "../lib/cli-command-help.js";
 import { registerCommand } from "../lib/register-command.js";
 import { getCliLogger } from "../logger.js";
@@ -19,9 +20,11 @@ const log = getCliLogger("domain");
  * synchronously, so there is no place to await a module load.
  */
 function envDomains(): { apexDomain: string; baseDomain: string } {
-  const { getApexDomain, getAssistantDomain } = loadModule(
-    "../../config/env.js",
-  ) as typeof import("../../config/env.js");
+  const { getApexDomain, getAssistantDomain } = resolveBundledCliModule(
+    "configEnv",
+    () =>
+      loadModule("../../config/env.js") as typeof import("../../config/env.js"),
+  );
   return { apexDomain: getApexDomain(), baseDomain: getAssistantDomain() };
 }
 

package/src/cli/commands/email.ts

@@ -16,6 +16,7 @@ import {
 } from "../../ipc/cli-client.js";
 import { guessMimeType } from "../../util/mime-type.js";
 import { readStdinSync } from "../../util/read-stdin.js";
+import { resolveBundledCliModule } from "../bundled-modules.js";
 import { applyCommandHelp, subcommand } from "../lib/cli-command-help.js";
 import { registerCommand } from "../lib/register-command.js";
 import { getCliLogger } from "../logger.js";
@@ -60,9 +61,11 @@ function handleEmailIpcError(
  * synchronously, so there is no place to await a module load.
  */
 function assistantDomain(): string {
-  const { getAssistantDomain } = loadModule(
-    "../../config/env.js",
-  ) as typeof import("../../config/env.js");
+  const { getAssistantDomain } = resolveBundledCliModule(
+    "configEnv",
+    () =>
+      loadModule("../../config/env.js") as typeof import("../../config/env.js"),
+  );
   return getAssistantDomain();
 }
 

package/src/cli/commands/keys.ts

@@ -2,6 +2,7 @@ import { createRequire } from "node:module";
 
 import type { Command } from "commander";
 
+import { resolveBundledCliModule } from "../bundled-modules.js";
 import { applyCommandHelp, subcommand } from "../lib/cli-command-help.js";
 import { registerCommand } from "../lib/register-command.js";
 import { log } from "../logger.js";
@@ -16,9 +17,13 @@ const loadModule = createRequire(import.meta.url);
  * callbacks synchronously, so there is no place to await a module load.
  */
 function apiKeyProviders(): readonly string[] {
-  const { API_KEY_PROVIDERS } = loadModule(
-    "../../providers/provider-secret-catalog.js",
-  ) as typeof import("../../providers/provider-secret-catalog.js");
+  const { API_KEY_PROVIDERS } = resolveBundledCliModule(
+    "providerSecretCatalog",
+    () =>
+      loadModule(
+        "../../providers/provider-secret-catalog.js",
+      ) as typeof import("../../providers/provider-secret-catalog.js"),
+  );
   return API_KEY_PROVIDERS;
 }
 

package/src/cli/commands/plugins.ts

@@ -15,6 +15,7 @@ import { cliIpcCall } from "../../ipc/cli-client.js";
 import { stripAnsiAndControlChars } from "../../util/ansi.js";
 import { getWorkspacePluginsDir } from "../../util/platform.js";
 import { truncate } from "../../util/truncate.js";
+import { resolveBundledCliModule } from "../bundled-modules.js";
 import { yellow } from "../lib/cli-colors.js";
 import { applyCommandHelp, subcommand } from "../lib/cli-command-help.js";
 import { confirmPrompt } from "../lib/confirm-prompt.js";
@@ -61,64 +62,112 @@ const loadModule = createRequire(import.meta.url);
 /** Lazy accessors: each getter loads its implementation module on first use. */
 const libs = {
   get catalogCache() {
-    return loadModule(
-      "../lib/plugin-catalog-cache.js",
-    ) as typeof import("../lib/plugin-catalog-cache.js");
+    return resolveBundledCliModule(
+      "pluginCatalogCache",
+      () =>
+        loadModule(
+          "../lib/plugin-catalog-cache.js",
+        ) as typeof import("../lib/plugin-catalog-cache.js"),
+    );
   },
   get catalogLocal() {
-    return loadModule(
-      "../lib/plugin-catalog-local.js",
-    ) as typeof import("../lib/plugin-catalog-local.js");
+    return resolveBundledCliModule(
+      "pluginCatalogLocal",
+      () =>
+        loadModule(
+          "../lib/plugin-catalog-local.js",
+        ) as typeof import("../lib/plugin-catalog-local.js"),
+    );
   },
   get diff() {
-    return loadModule(
-      "../lib/diff-plugin.js",
-    ) as typeof import("../lib/diff-plugin.js");
+    return resolveBundledCliModule(
+      "pluginDiff",
+      () =>
+        loadModule(
+          "../lib/diff-plugin.js",
+        ) as typeof import("../lib/diff-plugin.js"),
+    );
   },
   get inspect() {
-    return loadModule(
-      "../lib/inspect-plugin.js",
-    ) as typeof import("../lib/inspect-plugin.js");
+    return resolveBundledCliModule(
+      "pluginInspect",
+      () =>
+        loadModule(
+          "../lib/inspect-plugin.js",
+        ) as typeof import("../lib/inspect-plugin.js"),
+    );
   },
   get installGitHub() {
-    return loadModule(
-      "../lib/install-from-github.js",
-    ) as typeof import("../lib/install-from-github.js");
+    return resolveBundledCliModule(
+      "pluginInstallGitHub",
+      () =>
+        loadModule(
+          "../lib/install-from-github.js",
+        ) as typeof import("../lib/install-from-github.js"),
+    );
   },
   get installPlatform() {
-    return loadModule(
-      "../lib/install-from-platform.js",
-    ) as typeof import("../lib/install-from-platform.js");
+    return resolveBundledCliModule(
+      "pluginInstallPlatform",
+      () =>
+        loadModule(
+          "../lib/install-from-platform.js",
+        ) as typeof import("../lib/install-from-platform.js"),
+    );
   },
   get installed() {
-    return loadModule(
-      "../lib/list-installed-plugins.js",
-    ) as typeof import("../lib/list-installed-plugins.js");
+    return resolveBundledCliModule(
+      "pluginInstalled",
+      () =>
+        loadModule(
+          "../lib/list-installed-plugins.js",
+        ) as typeof import("../lib/list-installed-plugins.js"),
+    );
   },
   get pinHistory() {
-    return loadModule(
-      "../lib/plugin-pin-history.js",
-    ) as typeof import("../lib/plugin-pin-history.js");
+    return resolveBundledCliModule(
+      "pluginPinHistory",
+      () =>
+        loadModule(
+          "../lib/plugin-pin-history.js",
+        ) as typeof import("../lib/plugin-pin-history.js"),
+    );
   },
   get search() {
-    return loadModule(
-      "../lib/search-plugins.js",
-    ) as typeof import("../lib/search-plugins.js");
+    return resolveBundledCliModule(
+      "pluginSearch",
+      () =>
+        loadModule(
+          "../lib/search-plugins.js",
+        ) as typeof import("../lib/search-plugins.js"),
+    );
   },
   get surfaces() {
-    return loadModule(
-      "../lib/plugin-surfaces.js",
-    ) as typeof import("../lib/plugin-surfaces.js");
+    return resolveBundledCliModule(
+      "pluginSurfaces",
+      () =>
+        loadModule(
+          "../lib/plugin-surfaces.js",
+        ) as typeof import("../lib/plugin-surfaces.js"),
+    );
   },
   get uninstall() {
-    return loadModule(
-      "../lib/uninstall-plugin.js",
-    ) as typeof import("../lib/uninstall-plugin.js");
+    return resolveBundledCliModule(
+      "pluginUninstall",
+      () =>
+        loadModule(
+          "../lib/uninstall-plugin.js",
+        ) as typeof import("../lib/uninstall-plugin.js"),
+    );
   },
   get upgrade() {
-    return loadModule(
-      "../lib/upgrade-plugin.js",
-    ) as typeof import("../lib/upgrade-plugin.js");
+    return resolveBundledCliModule(
+      "pluginUpgrade",
+      () =>
+        loadModule(
+          "../lib/upgrade-plugin.js",
+        ) as typeof import("../lib/upgrade-plugin.js"),
+    );
   },
 };