fix(catalog): include visibility filters in gather flight key

Author: Wibias

src/claude/alias.ts

@@ -14,6 +14,10 @@
  *    `claude-ocx-openrouter--anthropic~sclaude-opus-4-8`);
  *  - model ids MAY contain `~` — encoded as `~t` (so slash encoding cannot
  *    collide with a literal tilde that older releases already persisted);
+ *  - `~s` / `~t` are reserved escape sequences: decode always treats them as
+ *    `/` and `~` respectively. Model ids that historically contained the literal
+ *    two-char sequences `~s` / `~t` are not preserved (extremely rare; encode would
+ *    write `~ts` / `~tt` for those characters after a literal tilde today);
  *  - bare `~` not followed by `s`/`t` is left as a literal tilde on decode
  *    (legacy aliases from before slash encoding);
  *  - model ids MAY contain `--` (resolve splits on the FIRST `--` only);

src/codex/catalog/provider-fetch.ts

@@ -86,6 +86,7 @@ function providerCatalogFingerprint(name: string, prov: OcxProviderConfig): Reco
     base: prov.baseUrl ?? "",
     adapter: prov.adapter ?? "",
     models: [...(prov.models ?? [])].sort(),
+    selected: [...(prov.selectedModels ?? [])].sort(),
     defaultModel: prov.defaultModel ?? null,
     ctx: prov.contextWindow ?? null,
     ctxW: prov.modelContextWindows ?? null,
@@ -108,6 +109,7 @@ function gatherFlightKey(config: OcxConfig): string {
     .sort((a, b) => String(a.n).localeCompare(String(b.n)));
   const assembly = stableJson({
     providers,
+    disabledModels: [...(config.disabledModels ?? [])].sort(),
     combos: config.combos ?? {},
     customModels: (config.customModels ?? []).map((cm) => ({
       p: cm.provider,

tests/claude-alias.test.ts

@@ -57,6 +57,20 @@ describe("claude discovery aliases", () => {
     expect(resolveAlias(`${CLAUDE_ALIAS_PREFIX}demo--old~model`)).toBe("demo/old~model");
   });
 
+  test("~s/~t are reserved escapes: round-trip / and ~; legacy ~s decodes as slash", () => {
+    // Intentional encode/decode round-trips for the reserved escape alphabet.
+    expect(aliasForRoute("demo", "a/b")).toBe(`${CLAUDE_ALIAS_PREFIX}demo--a~sb`);
+    expect(resolveAlias(`${CLAUDE_ALIAS_PREFIX}demo--a~sb`)).toBe("demo/a/b");
+    expect(aliasForRoute("demo", "a~b")).toBe(`${CLAUDE_ALIAS_PREFIX}demo--a~tb`);
+    expect(resolveAlias(`${CLAUDE_ALIAS_PREFIX}demo--a~tb`)).toBe("demo/a~b");
+    expect(aliasForRoute("demo", "a~/b")).toBe(`${CLAUDE_ALIAS_PREFIX}demo--a~t~sb`);
+    expect(resolveAlias(`${CLAUDE_ALIAS_PREFIX}demo--a~t~sb`)).toBe("demo/a~/b");
+
+    // Pre-~s-encoding aliases that stored a literal "~s" sequence are not preserved:
+    // decode always treats ~s as "/". Document current behavior only.
+    expect(resolveAlias(`${CLAUDE_ALIAS_PREFIX}demo--old~smodel`)).toBe("demo/old/model");
+  });
+
   test("resolveAlias rejects non-aliases and malformed ids", () => {
     expect(resolveAlias("claude-sonnet-4-5")).toBeNull();
     expect(resolveAlias("gpt-5.5")).toBeNull();

tests/gather-routed-models-single-flight.test.ts

@@ -1,6 +1,7 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import {
   clearGatherRoutedModelsInflight,
+  filterCatalogVisibleModels,
   gatherRoutedModels as gatherRoutedModelsDirect,
   resetCatalogRuntimeStateForTests,
   type ComboCatalogOmission,
@@ -241,4 +242,100 @@ describe("gatherRoutedModels single-flight", () => {
     expect(a.find(m => m.id === "m1")?.contextWindow).toBe(100_000);
     expect(b.find(m => m.id === "m1")?.contextWindow).toBe(200_000);
   });
+
+  test("selectedModels-only config changes do not share a flight", async () => {
+    let fetchCount = 0;
+    let release!: () => void;
+    const gate = new Promise<void>(resolve => {
+      release = resolve;
+    });
+
+    globalThis.fetch = (async () => {
+      fetchCount += 1;
+      await gate;
+      return new Response(
+        JSON.stringify({ data: [{ id: "keep-me" }, { id: "drop-me" }] }),
+        { status: 200, headers: { "content-type": "application/json" } },
+      );
+    }) as typeof fetch;
+
+    const base: OcxConfig = {
+      port: 10100,
+      defaultProvider: "p",
+      providers: {
+        p: {
+          adapter: "openai-chat",
+          baseUrl: "https://sel.example.test/v1",
+          models: [],
+        },
+      },
+    };
+    const withSel: OcxConfig = {
+      ...base,
+      providers: {
+        p: {
+          ...base.providers.p,
+          selectedModels: ["keep-me"],
+        },
+      },
+    };
+
+    const first = gatherRoutedModels(base);
+    const second = gatherRoutedModels(withSel);
+    await Promise.resolve();
+    // Distinct flight keys => two live discoveries (cannot reuse unfiltered result).
+    expect(fetchCount).toBe(2);
+    release();
+    const [all, withSelModels] = await Promise.all([first, second]);
+    // gather itself is unfiltered; visibility is applied by callers.
+    expect(all.map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(withSelModels.map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(filterCatalogVisibleModels(all, base).map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(filterCatalogVisibleModels(withSelModels, withSel).map(m => m.id)).toEqual(["keep-me"]);
+  });
+
+  test("disabledModels-only config changes do not share a flight", async () => {
+    let fetchCount = 0;
+    let release!: () => void;
+    const gate = new Promise<void>(resolve => {
+      release = resolve;
+    });
+
+    globalThis.fetch = (async () => {
+      fetchCount += 1;
+      await gate;
+      return new Response(
+        JSON.stringify({ data: [{ id: "keep-me" }, { id: "drop-me" }] }),
+        { status: 200, headers: { "content-type": "application/json" } },
+      );
+    }) as typeof fetch;
+
+    const base: OcxConfig = {
+      port: 10100,
+      defaultProvider: "p",
+      providers: {
+        p: {
+          adapter: "openai-chat",
+          baseUrl: "https://dis.example.test/v1",
+          models: [],
+        },
+      },
+    };
+    const withDisabled: OcxConfig = {
+      ...base,
+      disabledModels: ["p/drop-me"],
+    };
+
+    const first = gatherRoutedModels(base);
+    const second = gatherRoutedModels(withDisabled);
+    await Promise.resolve();
+    expect(fetchCount).toBe(2);
+    release();
+    const [all, withDisabledModels] = await Promise.all([first, second]);
+    expect(all.map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(withDisabledModels.map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(filterCatalogVisibleModels(all, base).map(m => m.id).sort()).toEqual(["drop-me", "keep-me"]);
+    expect(filterCatalogVisibleModels(withDisabledModels, withDisabled).map(m => m.id)).toEqual(["keep-me"]);
+  });
+
 });