Merge remote-tracking branch 'origin/main' into release/2026.4.25

src/cli/plugins-cli.ts

@@ -571,12 +571,12 @@ export function registerPluginsCli(program: Command) {
       } = await import("../plugins/installed-plugin-index-records.js");
       const { buildPluginDiagnosticsReport } = await import("../plugins/status.js");
       const {
+        applyPluginUninstallDirectoryRemoval,
         formatUninstallActionLabels,
         formatUninstallSlotResetPreview,
+        planPluginUninstall,
         resolveUninstallChannelConfigKeys,
-        resolveUninstallDirectoryTarget,
         UNINSTALL_ACTION_LABELS,
-        uninstallPlugin,
       } = await import("../plugins/uninstall.js");
       const { commitPluginInstallRecordsWithConfig } =
         await import("./plugins-install-record-commit.js");

src/commands/models/list.list-command.forward-compat.test.ts

@@ -12,19 +12,6 @@ const OPENAI_CODEX_MODEL = {
   cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
 };
 
-const OPENAI_CODEX_MINI_MODEL = {
-  ...OPENAI_CODEX_MODEL,
-  id: "gpt-5.4-mini",
-  name: "GPT-5.4 Mini",
-  contextWindow: 272_000,
-};
-
-const OPENAI_CODEX_PRO_MODEL = {
-  ...OPENAI_CODEX_MODEL,
-  id: "gpt-5.4-pro",
-  name: "GPT-5.4 Pro",
-};
-
 const OPENAI_CODEX_53_MODEL = {
   ...OPENAI_CODEX_MODEL,
   id: "gpt-5.4",

src/plugins/installed-plugin-index.ts

@@ -604,6 +604,9 @@ function buildInstalledPluginIndex(
     if (record.enabledByDefault === true) {
       indexRecord.enabledByDefault = true;
     }
+    if (record.syntheticAuthRefs && record.syntheticAuthRefs.length > 0) {
+      indexRecord.syntheticAuthRefs = record.syntheticAuthRefs;
+    }
     if (record.setupSource) {
       indexRecord.setupSource = record.setupSource;
     }

src/plugins/synthetic-auth.runtime.test.ts

@@ -1,12 +1,22 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+type SyntheticAuthRegistrySnapshotResult = {
+  source: "persisted" | "provided" | "derived";
+  snapshot: {
+    plugins: Array<{ syntheticAuthRefs?: string[] }>;
+  };
+  diagnostics: [];
+};
+
 const getPluginRegistryState = vi.hoisted(() => vi.fn());
 const pluginRegistryMocks = vi.hoisted(() => ({
-  loadPluginRegistrySnapshotWithMetadata: vi.fn((_params?: unknown) => ({
-    source: "persisted",
-    snapshot: { plugins: [] },
-    diagnostics: [],
-  })),
+  loadPluginRegistrySnapshotWithMetadata: vi.fn(
+    (_params?: unknown): SyntheticAuthRegistrySnapshotResult => ({
+      source: "persisted",
+      snapshot: { plugins: [] },
+      diagnostics: [],
+    }),
+  ),
 }));
 
 vi.mock("./runtime-state.js", () => ({