Fix current CI baseline failures

TurboTheTurtle · TurboTheTurtle · commit f7b7c3c14eb3 · 2026-05-20T13:00:19.000-07:00
diff --git a/extensions/openrouter/provider-routing.ts b/extensions/openrouter/provider-routing.ts
@@ -56,9 +56,9 @@ function mergeOpenRouterProviderRouting(params: {
   const modelRouting = readRecord(params.modelParams?.provider);
   const extraRouting = readRecord(params.extraParams.provider);
   const merged = {
-    ...(providerRouting ?? {}),
-    ...(modelRouting ?? {}),
-    ...(extraRouting ?? {}),
+    ...providerRouting,
+    ...modelRouting,
+    ...extraRouting,
   };
   return Object.keys(merged).length > 0 ? merged : undefined;
 }
@@ -78,8 +78,8 @@ export function resolveOpenRouterExtraParamsForTransport(
   }
   return {
     patch: {
-      ...(providerConfigParams ?? {}),
-      ...(modelParams ?? {}),
+      ...providerConfigParams,
+      ...modelParams,
       ...ctx.extraParams,
       ...(providerRouting ? { provider: providerRouting } : {}),
     },
diff --git a/src/commands/status.summary.redaction.test.ts b/src/commands/status.summary.redaction.test.ts
@@ -14,6 +14,9 @@ function createRecentSessionRow() {
     remainingTokens: 4,
     percentUsed: 5,
     model: "gpt-5",
+    configuredModel: "gpt-5",
+    selectedModel: "gpt-5",
+    modelSelectionReason: null,
     contextTokens: 200_000,
     flags: ["id:sess-1"],
   };
diff --git a/src/infra/secret-file.test.ts b/src/infra/secret-file.test.ts
@@ -112,20 +112,6 @@ describe("readSecretFileSync", () => {
   });
 
   it.each([
-    {
-      name: "returns undefined from the non-throwing helper for rejected files",
-      pathValue: async () =>
-        createSecretPath(async (dir) => {
-          const target = path.join(dir, "target.txt");
-          const link = path.join(dir, "secret-link.txt");
-          await fsPromises.writeFile(target, "top-secret\n", "utf8");
-          await fsPromises.symlink(target, link);
-          return link;
-        }),
-      label: "Telegram bot token",
-      options: { rejectSymlink: true },
-      expected: undefined,
-    },
     {
       name: "returns undefined from the non-throwing helper for blank file paths",
       pathValue: async () => "   ",
@@ -144,6 +130,20 @@ describe("readSecretFileSync", () => {
     const file = await pathValue();
     expect(tryReadSecretFileSync(file, label, options)).toBe(expected);
   });
+
+  it("throws from the non-throwing helper for rejected symlinks", async () => {
+    const link = await createSecretPath(async (dir) => {
+      const target = path.join(dir, "target.txt");
+      const symlink = path.join(dir, "secret-link.txt");
+      await fsPromises.writeFile(target, "top-secret\n", "utf8");
+      await fsPromises.symlink(target, symlink);
+      return symlink;
+    });
+
+    expect(() =>
+      tryReadSecretFileSync(link, "Telegram bot token", { rejectSymlink: true }),
+    ).toThrow("must not be a symlink");
+  });
 });
 
 describe("writePrivateSecretFileAtomic", () => {
