diff --git a/src/commands/models/list.auth-index.ts b/src/commands/models/list.auth-index.ts
index 8d86f1b66db..cc042d26aed 100644
--- a/src/commands/models/list.auth-index.ts
+++ b/src/commands/models/list.auth-index.ts
@@ -112,7 +112,9 @@ export function createModelListAuthIndex(
       addProvider(provider);
     }
   }
-  const primaryModelProvider = params.cfg.agents?.defaults?.model?.primary?.split("/", 1)[0];
+  const defaultModel = params.cfg.agents?.defaults?.model;
+  const primaryModel = typeof defaultModel === "string" ? defaultModel : defaultModel?.primary;
+  const primaryModelProvider = primaryModel?.split("/", 1)[0];
   if (primaryModelProvider === "openai-codex" || primaryModelProvider === "codex") {
     addSyntheticProvider("codex");
   }
diff --git a/src/plugins/plugin-metadata-snapshot.ts b/src/plugins/plugin-metadata-snapshot.ts
index 1a2ec494b9d..02b629f67af 100644
--- a/src/plugins/plugin-metadata-snapshot.ts
+++ b/src/plugins/plugin-metadata-snapshot.ts
@@ -214,7 +214,7 @@ function loadPluginMetadataSnapshotImpl(
           config: params.config,
           workspaceDir: params.workspaceDir,
           env: params.env,
-          diagnostics: index.diagnostics,
+          diagnostics: [...index.diagnostics],
           installRecords: index.installRecords,
         })
       : loadPluginManifestRegistryForInstalledIndex({