pastilhas
813bc200bf
resume a conversation and the model picker showed the first entry in the catalogue instead of the model the session was actually on. that was invisible for as long as the first entry was `opus`, and became obvious the day `fable` went above it — so this is a pre-existing bug my model-list change exposed, not one it introduced. two defects, stacked. the value did not survive a refresh: `initialModel` came from `props.model ?? locationState?.model`, and both are volatile — a panel channel and react-router location state. on a hard load neither exists, the settings default is skipped (it only runs for NEW chats), and ModelSelector's fallback effect fired `onModelChange(providerModels[0].id)`. and even when it did arrive it could not match. a transcript records the API model; the picker offers CLI aliases. `claude-opus-5` is in a different id space from `claude-code/opus[1m]`, and the mapping is one-way: opus and opus[1m] both serve claude-opus-5, opusplan serves whichever model answered. read out of a real 59MB transcript, the distinct values were claude-opus-5, <synthetic>, claude-sonnet-5, claude-haiku-4-5-20251001, claude-fable-5 — note the synthetic marker and the inconsistent date suffix. so the transcript cannot answer "what should the picker show", and a new table does: chat_session_models (session_id pk, model, updated_at) officer's own id space, so opus[1m] and opusplan round-trip. keyed on the TRANSCRIPT uuid rather than officer's session id, because that is what the session list joins on — which is why the write waits for the harness to announce the id rather than firing at turn start. records the EFFECTIVE model, so a refused switch stores what answered. not derived from chat_session_events, which does now hold model:switched: right data, wrong index. that table holds every assistant message and is unbounded, and "latest model for these 200 sessions" would scan far more than the question deserves. not a chat_sessions table either — a session IS its transcript, and a row holding title and cwd would be a second source of truth for two fields that already have one. BACKFILL RUNS FROM postdb:push, so every server picks it up on its next schema push. bun does fire pre/post hooks for colon-named scripts — verified on 1.3.14 before building on it, because a post hook that silently never runs is the worst outcome here. insert-only, exits 0 on every failure path (the push has already applied; a cosmetic backfill must not make it look failed). seeded 11 of 12 transcripts on this machine. it reads the FIRST model, which sounds wrong for a table storing the current one — but switching only became possible today, so no older transcript can hold two, and first costs a bounded head read instead of reading 59MB. also: the family map returns null for mythos rather than a neighbouring family (Project Glasswing only — a picker entry that 401s is worse than none), and ModelSelector no longer picks a default once a conversation has started. an unset picker is the honest state when the server cannot say. tests: the alias map against the five real transcript values, and the selector's default gated on hasStarted. re-broke the guard to confirm it bites. still to do: `model` on the session LIST rows, which the sessions-list revamp wants. the storage and the batched read (getChatSessionModels) are in place for it.
50 lines
2.7 KiB
TypeScript
50 lines
2.7 KiB
TypeScript
/**
|
|
* Anthropic API model id → the Officer id that most nearly names it.
|
|
*
|
|
* Two id spaces meet here. A transcript records what the API served (`claude-opus-5`); Officer's picker
|
|
* offers what the CLI accepts (`claude-code/opus`, `claude-code/opus[1m]`). This translates one to the
|
|
* other, and it is **deliberately lossy in one direction only** — that is the whole reason
|
|
* `chat_session_models` exists:
|
|
*
|
|
* - `opus` and `opus[1m]` both serve `claude-opus-5`, so the 1M variant cannot be recovered.
|
|
* - `opusplan` serves whichever of opus/sonnet answered that turn, so it cannot be recognised at all.
|
|
* - `mythos` has no Officer entry (Project Glasswing only), so it resolves to null rather than to a
|
|
* neighbouring family — offering a model this machine may not reach is worse than offering none.
|
|
*
|
|
* So this is the FALLBACK for a session that has not taken a turn since the table landed, and the seed for
|
|
* the backfill. A real turn overwrites its guess with the exact alias the user picked. Never use it to
|
|
* decide what to run — only to decide what to display.
|
|
*
|
|
* Matching is by FAMILY PREFIX rather than an exhaustive id list, because the API ids are not uniform:
|
|
* `claude-haiku-4-5-20251001` carries a date suffix while `claude-fable-5` does not, and new versions ship
|
|
* without warning. A prefix match keeps a model released tomorrow resolving to the right family instead of
|
|
* to null.
|
|
*/
|
|
|
|
/** Claude Code's own marker for an entry it generated itself. Not a model, and must never be stored. */
|
|
export const SYNTHETIC_MODEL = '<synthetic>';
|
|
|
|
const FAMILIES: { prefix: string; officerId: string }[] = [
|
|
{ prefix: 'claude-fable', officerId: 'claude-code/fable' },
|
|
{ prefix: 'claude-opus', officerId: 'claude-code/opus' },
|
|
{ prefix: 'claude-sonnet', officerId: 'claude-code/sonnet' },
|
|
{ prefix: 'claude-haiku', officerId: 'claude-code/haiku' },
|
|
];
|
|
|
|
/**
|
|
* The Officer model id for an API model id, or null when there is no honest answer.
|
|
*
|
|
* Null for `<synthetic>`, for mythos, for an OpenCode model, and for anything unrecognised. Callers treat
|
|
* null as "we do not know", which renders as no model rather than as a guess.
|
|
*/
|
|
export function officerModelForApiModel(apiModel: string | null | undefined): string | null {
|
|
if (!apiModel || apiModel === SYNTHETIC_MODEL) return null;
|
|
const id = apiModel.trim().toLowerCase();
|
|
if (!id) return null;
|
|
const family = FAMILIES.find((f) => id.startsWith(f.prefix));
|
|
return family?.officerId ?? null;
|
|
}
|
|
|
|
/** Whether a transcript entry's model is a real model rather than Claude Code's synthetic marker. */
|
|
export const isRealModel = (apiModel: string | null | undefined): boolean => !!apiModel && apiModel !== SYNTHETIC_MODEL;
|