fix(tui): show resolved model ref in confirmation

NarahariRaghava · web-flow · commit b2da129e51da · 2026-06-14T03:45:59.000+08:00
Uses the canonical model ref returned by `sessions.patch` for the TUI `/model` confirmation so alias inputs report the model that was actually applied. The fallback still shows the raw input when a backend does not return `resolved`, and the display path uses `modelKey` so nested model ids keep the provider prefix without double-prefixing self-prefixed ids.

Proof: local focused TUI Vitest/format/lint; autoreview clean; Crabbox AWS focused TUI test run `run_7d7cc5b040e8`; exact-head GitHub CI green on `6db4acfb08f9d477ee1bdab429bd7189b78ffc92`.
diff --git a/src/tui/tui-command-handlers.test.ts b/src/tui/tui-command-handlers.test.ts
@@ -1149,6 +1149,68 @@ describe("tui command handlers", () => {
     expect(closeOverlay).toHaveBeenCalledTimes(1);
   });
 
+  it("shows resolved canonical model ref after /model alias, not raw alias string", async () => {
+    // When the user types `/model gpt4` (a bare alias), the gateway resolves it
+    // server-side and returns the canonical ref in result.resolved. The TUI must
+    // display the canonical ref, not the raw alias, so the user knows which model
+    // was actually applied.
+    const patchSession = vi.fn().mockResolvedValue({
+      ok: true,
+      path: "/sessions/patch",
+      key: "agent:main:main",
+      entry: {},
+      resolved: { modelProvider: "openai", model: "gpt-5.5" },
+    });
+    const refreshSessionInfo = vi.fn().mockResolvedValue(undefined);
+    const applySessionInfoFromPatch = vi.fn();
+    const { handleCommand, addSystem } = createHarness({
+      patchSession,
+      refreshSessionInfo,
+      applySessionInfoFromPatch,
+    });
+
+    await handleCommand("/model gpt4");
+
+    expect(patchSession).toHaveBeenCalledWith(expect.objectContaining({ model: "gpt4" }));
+    // Should show the canonical resolved ref, not the raw alias "gpt4"
+    expect(addSystem).toHaveBeenCalledWith("model set to openai/gpt-5.5");
+  });
+
+  it("falls back to raw input in /model confirmation when resolved ref unavailable", async () => {
+    // Older gateway versions may not return resolved; fall back to raw arg.
+    const patchSession = vi.fn().mockResolvedValue({
+      ok: true,
+      path: "/sessions/patch",
+      key: "agent:main:main",
+      entry: {},
+      // No `resolved` field
+    });
+    const { handleCommand, addSystem } = createHarness({ patchSession });
+
+    await handleCommand("/model openai/gpt-5.5");
+
+    expect(addSystem).toHaveBeenCalledWith("model set to openai/gpt-5.5");
+  });
+  it("preserves provider prefix for nested model ids in /model confirmation", async () => {
+    // Some providers route to nested model ids that themselves contain a slash
+    // (e.g. resolved.model: "moonshotai/kimi-k2.5" with modelProvider: "nvidia").
+    // The confirmation must still show the full nvidia/moonshotai/kimi-k2.5 ref
+    // to match the footer/status bar, not strip the provider just because the
+    // model id already contains a slash.
+    const patchSession = vi.fn().mockResolvedValue({
+      ok: true,
+      path: "/sessions/patch",
+      key: "agent:main:main",
+      entry: {},
+      resolved: { modelProvider: "nvidia", model: "moonshotai/kimi-k2.5" },
+    });
+    const { handleCommand, addSystem } = createHarness({ patchSession });
+
+    await handleCommand("/model nvidia/moonshotai/kimi-k2.5");
+
+    expect(addSystem).toHaveBeenCalledWith("model set to nvidia/moonshotai/kimi-k2.5");
+  });
+
   it("renders model listing feedback before the backend list resolves", async () => {
     let resolveModels: (
       value: Array<{ provider: string; id: string; name?: string }>,
diff --git a/src/tui/tui-command-handlers.ts b/src/tui/tui-command-handlers.ts
@@ -469,7 +469,14 @@ export function createCommandHandlers(context: CommandHandlerContext) {
               ...currentSessionPatchTarget(),
               model: args,
             });
-            chatLog.addSystem(`model set to ${args}`);
+            const resolvedModel = result.resolved?.model;
+            const resolvedProvider = result.resolved?.modelProvider;
+            const resolvedModelRef = resolvedModel
+              ? resolvedProvider
+                ? modelKey(resolvedProvider, resolvedModel)
+                : resolvedModel
+              : args;
+            chatLog.addSystem(`model set to ${resolvedModelRef}`);
             applySessionInfoFromPatch(result);
             await refreshSessionInfo();
           } catch (err) {
