fix: handle aliased upgrade targets and RFC3339 variants

Author: 7Sageer

packages/kap-server/src/routes/modelCatalog.ts

@@ -430,8 +430,12 @@ export function registerModelCatalogRoutes(app: ModelCatalogRouteHost, core: Sco
           const previous = previousByModel.get(entry.model);
           let upgrade = previous?.upgrade;
           if (upgrade?.model.startsWith(`${provider_id}/`) === true) {
-            const target = `${newId}/${upgrade.model.slice(provider_id.length + 1)}`;
-            upgrade = newAliasKeys.has(target) ? { ...upgrade, model: target } : undefined;
+            const targetModel = models[upgrade.model]?.model;
+            const target = targetModel === undefined ? undefined : `${newId}/${targetModel}`;
+            upgrade =
+              target !== undefined && newAliasKeys.has(target)
+                ? { ...upgrade, model: target }
+                : undefined;
           }
           const alias: ModelRecord = {
             ...previous,

packages/kap-server/test/modelCatalogProviderWrite.test.ts

@@ -753,7 +753,7 @@ describe('server-v2 /api/v1 provider write endpoints', () => {
 
   it('rewrites model upgrade targets when renaming a provider', async () => {
     await boot(
-      `${DEFAULTED_TOML}\n[models.gpt4o.upgrade]\nmodel = "openai/gpt-4.1"\nmigration_markdown = "Use next"\n`,
+      `${DEFAULTED_TOML}\n[models."openai/replacement-key"]\nprovider = "openai"\nmodel = "gpt-4.1"\nmax_context_size = 1047576\n\n[models.gpt4o.upgrade]\nmodel = "openai/replacement-key"\nmigration_markdown = "Use next"\n`,
     );
     const { status } = await putJson('/api/v1/providers/openai', {
       ...REPLACE_BODY,
@@ -782,7 +782,7 @@ describe('server-v2 /api/v1 provider write endpoints', () => {
 
   it('drops model upgrades whose target disappears on provider edit', async () => {
     await boot(
-      `${DEFAULTED_TOML}\n[models.gpt4o.upgrade]\nmodel = "openai/gpt-4.1"\nmigration_markdown = "Use next"\n`,
+      `${DEFAULTED_TOML}\n[models."openai/replacement-key"]\nprovider = "openai"\nmodel = "gpt-4.1"\nmax_context_size = 1047576\n\n[models.gpt4o.upgrade]\nmodel = "openai/replacement-key"\nmigration_markdown = "Use next"\n`,
     );
     const { status } = await putJson('/api/v1/providers/openai', {
       ...REPLACE_BODY,

packages/oauth/src/custom-registry.ts

@@ -170,7 +170,7 @@ function toStringArrayOrUndefined(value: unknown): readonly string[] | undefined
   return out;
 }
 
-const RFC3339_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/;
+const RFC3339_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/i;
 
 function isValidRetirementAt(value: unknown): value is string | null | undefined {
   return (

packages/oauth/test/custom-registry.test.ts

@@ -184,6 +184,28 @@ describe('fetchCustomRegistry', () => {
     });
   });
 
+  it('accepts lowercase RFC3339 separators', async () => {
+    const body = makeKokubResponseBody();
+    body['registry_chat-completions']!.models['gpt-5.5'] = {
+      id: 'gpt-5.5',
+      upgrade: {
+        model: 'gpt-6',
+        migration_markdown: 'Use GPT-6',
+        retirement_at: '2030-01-01t00:00:00z',
+      },
+    };
+    const fetchMock = vi.fn(async () => makeJsonResponse(body));
+
+    const result = await fetchCustomRegistry(
+      KOKUB_SOURCE,
+      { fetchImpl: fetchMock as unknown as typeof fetch },
+    );
+
+    expect(result['registry_chat-completions']?.models['gpt-5.5']?.upgrade?.retirement_at).toBe(
+      '2030-01-01t00:00:00z',
+    );
+  });
+
   it('rejects malformed upgrade timestamps', async () => {
     const body = makeKokubResponseBody();
     body['registry_chat-completions']!.models['gpt-5.5'] = {