feat: unify installation model catalog

backend/test/pi-process-manager.test.ts

@@ -8,6 +8,7 @@ import {
 } from "node:fs";
 import { tmpdir } from "node:os";
 import { PiProcessManager } from "../src/pi/pi-process-manager.js";
+import type { RuntimeModelCatalog, RuntimeModel } from "../src/models/runtime-model-catalog.js";
 import { loadConfig } from "../src/config.js";
 import {
   PI_MANAGED_CONFIG_ERROR_MESSAGE,
@@ -641,6 +642,53 @@ test("session Pi spawn reads the single secret bundle and scrubs its path", asyn
   }
 });
 
+test("session Pi spawn resolves the selected catalog credential from the secret bundle", () => {
+  const root = mkdtempSync(path.join(tmpdir(), "thothii-catalog-credential-"));
+  const agentDir = path.join(root, "agent");
+  mkdirSync(agentDir, { mode: 0o700 });
+  writeFileSync(path.join(agentDir, "auth.json"), "{}\n", { mode: 0o600 });
+  writeFileSync(path.join(agentDir, "models.json"), '{"providers":{}}\n', { mode: 0o600 });
+  const secret = path.join(root, "thothii.secrets");
+  writeFileSync(secret, "ZAI_API_KEY=catalog-secret\nTHT_MODEL_API_KEY=legacy-secret\n", { mode: 0o600 });
+  const model: RuntimeModel = {
+    id: "openai/test-model",
+    provider: "openai",
+    model: "test-model",
+    label: "Test model",
+    upstreamModel: "test-model",
+    authentication: { mode: "secret_env", apiKeyEnv: "ZAI_API_KEY" },
+    sessionAdapter: { mode: "pi_builtin" },
+    session: { reasoning: false },
+  };
+  const modelCatalog: RuntimeModelCatalog = {
+    defaultSession: model.id,
+    defaultMetadataGeneration: null,
+    embedding: null,
+    sessionModels: () => [model],
+    metadataModels: () => [],
+    hasSession: (id) => id === model.id,
+  };
+  const calls: any[][] = [];
+  const child = recordingChild();
+  child.stderr.resume = () => {};
+  vi.stubEnv("PI_CODING_AGENT_DIR", agentDir);
+  const mgr = new PiProcessManager(loadConfig({ THT_SECRETS_FILE: secret }), {
+    modelCatalog,
+    authProviders: () => new Set(),
+    spawnFn: (...args: any[]) => { calls.push(args); return child as any; },
+  });
+  try {
+    mgr.createFor("catalog-credential", { provider: "openai", model: "test-model" });
+    expect(calls[0][2].env.ZAI_API_KEY).toBe("catalog-secret");
+    expect(calls[0][2].env).not.toHaveProperty("OPENAI_API_KEY");
+    expect(calls[0][2].env).not.toHaveProperty("THT_MODEL_API_KEY");
+  } finally {
+    mgr.teardown("catalog-credential");
+    vi.unstubAllEnvs();
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
 test.each([["OpenAI", "openai"], ["gemini", "google"]])(
   "set_model uses canonical packaged provider ID for %s", async (provider, canonical) => {
     const secret = path.resolve(__dirname, `.canonical-key-${process.pid}-${provider}`);