@k2b/cloud 0.43.0 → 0.45.0

package/src/ai/resource-refs.ts

@@ -13,7 +13,7 @@ import type { AiConversationResourceObservation } from "./types";
 
 const LinkedResourceReferenceSchema = CloudResourceReferenceSchema.extend({
   href: CloudResourceHrefSchema.optional(),
-});
+}).strip();
 
 export const addCloudResourceHrefs = <T>(
   value: T,
@@ -67,12 +67,14 @@ export const collectConversationResourceObservations = (...values: unknown[]): A
       return;
     }
 
-    const view = CloudResourceViewSchema.safeParse(value);
+    const view = CloudResourceViewSchema.strip().safeParse(value);
     if (view.success) {
       const resource: CloudResourceView = view.data;
       observations.set(observationKey(resource.ref), {
         ref: resource.ref,
         title: resource.title,
+        context: resource.context,
+        status: resource.status,
         preview: resource.preview,
         icon: resource.icon,
         href: resource.links.find((link) => link.rel === "open")?.href,
@@ -87,6 +89,8 @@ export const collectConversationResourceObservations = (...values: unknown[]): A
           ...previous,
           ref,
           ...(resource.title !== undefined ? { title: resource.title } : {}),
+          ...(resource.context !== undefined ? { context: resource.context } : {}),
+          ...(resource.status !== undefined ? { status: resource.status } : {}),
           ...(resource.preview !== undefined ? { preview: resource.preview } : {}),
           ...(resource.icon !== undefined ? { icon: resource.icon } : {}),
           ...(resource.href !== undefined ? { href: resource.href } : {}),

package/src/ai/routes.ts

@@ -8,7 +8,6 @@ import { ErrorResponseSchema } from "../contracts";
 import { APPROVAL_CLIENT_HEADER } from "../contracts/approvals";
 import { capabilityActionPolicy } from "../contracts/capabilities";
 import {
-  type AccessSubject,
   type AuthContext,
   auth,
   err,
@@ -37,7 +36,7 @@ import { coreSettings } from "../services/settings/api";
 import { resolveAppIdentityPresentation } from "../shared/app-presentation";
 import { readThemeFromCookieHeader } from "../shared/theme";
 import { type AiStoredActionReview, isLegacyActionReview, isUnknownActionOutcome, storedActionReview } from "./action-review";
-import { assistantAiSettingsState, listAssistantAiModels, resolveAssistantAudioModel, selectAssistantAiModelId } from "./assistant-models";
+import { assistantAiSettingsState, peopleAiModels, resolveAssistantAudioModel, selectAssistantAiModel } from "./assistant-models";
 import { AI_AUDIO_MAX_BYTES } from "./audio-format";
 import { buildAiCapabilityCatalog } from "./capabilities";
 import { checkAiCapability, resolveAiCapabilityActor } from "./capability-execution";
@@ -80,6 +79,7 @@ import {
 } from "./message-queue";
 import { aiActorUser, aiPrefsUserId, aiUserPrefs } from "./prefs";
 import { aiProjects } from "./projects";
+import type { AiResourceContext } from "./projects-authorization";
 import { projectPublicAiStoredMessages, publicAiStoredMessages } from "./public-projection";
 import { AiRecentResourceSchema, listAiRecentResources } from "./recent-resources";
 import { RECENT_SENT_REF_LIMIT } from "./recent-sent-refs";
@@ -224,6 +224,8 @@ const MemoryCreateSchema = z.object({
 const MemoryUpdateSchema = MemoryCreateSchema.partial().refine((value) => Object.keys(value).length > 0, "Pass a changed field.");
 const MemoryIdSchema = z.string().regex(AI_SHORT_ID_PATTERN);
 
+const resourceContext = (c: Context<AuthContext>): AiResourceContext => ({ actor: c.get("actor"), accessSubject: c.get("accessSubject") });
+
 const notFound = (c: Context<AuthContext>) => respond(c, fail(err.notFound("Conversation")));
 const fileNotFound = (c: Context<AuthContext>) => respond(c, fail(err.notFound("File")));
 
@@ -232,14 +234,14 @@ const publicConversation = (conversation: AiConversation, projectId: string | nu
   id: conversation.shortId,
   projectId: conversation.projectId ? projectId : null,
 });
-const publicConversations = async (conversations: AiConversation[], subject: AccessSubject) => {
+const publicConversations = async (conversations: AiConversation[], subject: AiResourceContext) => {
   const projectIds = conversations.flatMap((conversation) => (conversation.projectId ? [conversation.projectId] : []));
   const shortIds = await aiProjects.resolveShortIds(projectIds, subject);
   return conversations.map((conversation) =>
     publicConversation(conversation, conversation.projectId ? (shortIds.get(conversation.projectId) ?? null) : null),
   );
 };
-const publicConversationFor = async (conversation: AiConversation, subject: AccessSubject) =>
+const publicConversationFor = async (conversation: AiConversation, subject: AiResourceContext) =>
   (await publicConversations([conversation], subject))[0]!;
 const publicMemories = async (userId: string, memories: Awaited<ReturnType<typeof aiMemories.list>>) => {
   const sourceIds = memories.flatMap((memory) => (memory.sourceConversationId ? [memory.sourceConversationId] : []));
@@ -254,13 +256,13 @@ const publicMemory = async (userId: string, memory: Awaited<ReturnType<typeof ai
   (await publicMemories(userId, [memory]))[0]!;
 
 /** Fire-and-forget: remember the model this user actually ran a turn with (preselected for new chats). */
-const rememberLastUsedModel = (actor: RequestActor, modelProfileId: string | null | undefined): void => {
+const rememberLastUsedModel = (actor: RequestActor, model: import("../shared/ai-models").AiModelRequest | undefined): void => {
   const userId = aiPrefsUserId(actor);
-  if (!userId || !modelProfileId) return;
-  void aiUserPrefs.update(userId, { lastModelId: modelProfileId }).catch(() => undefined);
+  if (!userId || !model) return;
+  void aiUserPrefs.update(userId, { selection: model }).catch(() => undefined);
 };
 
-const conversationDetail = async (conversation: AiConversation, subject: AccessSubject) => {
+const conversationDetail = async (conversation: AiConversation, subject: AiResourceContext) => {
   const [state, timeline, publicView] = await Promise.all([
     loadAiStreamState(conversation),
     aiConversations.listConversationTimeline({ conversationId: conversation.id }),
@@ -297,7 +299,7 @@ const prepareConversationForMessageRetry = async (conversationId: string): Promi
 
 const prepareLaunchDraft = async (
   body: z.infer<typeof AiCreateConversationInputSchema>,
-  subject: AccessSubject | null,
+  subject: AiResourceContext | null,
   authority: import("../server").RequestAuthority | null = null,
 ) => {
   const content = [...(body.draft?.content ?? [])];
@@ -348,7 +350,7 @@ export const aiRoutes = (() => {
         return c.json(await getAiChatQuotas(c.get("accessSubject")));
       })
       .get("/models", async (c) => {
-        return respond(c, ok(await listAssistantAiModels(c.get("accessSubject"))));
+        return respond(c, ok(await peopleAiModels(c.get("accessSubject"))));
       })
       .get("/prefs", async (c) => {
         const ctx = await resolveContext(c);
@@ -438,16 +440,15 @@ export const aiRoutes = (() => {
         const state = await readAiSettingsState();
         let previewProfile: ReturnType<typeof selectAiModelProfile> | null = null;
         if (state.ok && state.enabled) {
-          const models = await listAssistantAiModels(c.get("accessSubject"), ctx.modelPolicy);
-          const preferredId =
-            models.find((model) => model.id === prefs?.lastModelId)?.id ??
-            models.find((model) => model.id === state.defaultModelId)?.id ??
-            models[0]?.id;
-          if (preferredId) previewProfile = selectAiModelProfile(state, ctx.modelPolicy, preferredId);
+          try {
+            previewProfile = selectAiModelProfile(state, ctx.modelPolicy, prefs.selection ?? undefined);
+          } catch {
+            /* The prompt preview remains available without a usable model. */
+          }
         }
         const toolsSupported = Boolean(previewProfile?.capabilities.includes("tools"));
         const availableSkills = toolsSupported
-          ? (await aiSkills.list(c.get("accessSubject"), { authority: appAccessAuthority(c) })).filter((skill) => skill.enabled)
+          ? (await aiSkills.list(resourceContext(c), { authority: appAccessAuthority(c) })).filter((skill) => skill.enabled)
           : [];
         const skillCatalog = selectAiSkillCatalog(
           availableSkills.filter((skill) => !skill.manualOnly).map(({ name, description }) => ({ name, description })),
@@ -462,8 +463,8 @@ export const aiRoutes = (() => {
               })),
               ...(client?.localTools === "ask" ? [createCloudAiLocalBashTool(), ...createCloudAiLocalTools()] : []),
               ...(memoryEnabled ? [createCloudAiMemoryTool()] : []),
-              ...(availableSkills.length ? [createCloudAiLoadSkillTool(c.get("accessSubject"), appAccessAuthority(c))] : []),
-              ...(skillCatalog.omitted > 0 ? [createCloudAiSearchSkillsTool(c.get("accessSubject"), [], appAccessAuthority(c))] : []),
+              ...(availableSkills.length ? [createCloudAiLoadSkillTool(resourceContext(c), appAccessAuthority(c))] : []),
+              ...(skillCatalog.omitted > 0 ? [createCloudAiSearchSkillsTool(resourceContext(c), [], appAccessAuthority(c))] : []),
             ]
           : [];
         const memoryToolEnabled = tools.some((tool) => tool.def.name === "memory");
@@ -546,7 +547,7 @@ export const aiRoutes = (() => {
         const ctx = await resolveContext(c);
         if (ctx instanceof Response) return ctx;
         const query = c.req.valid("query");
-        const project = query.projectId ? await aiProjects.getByShortId(query.projectId, c.get("accessSubject"), "read") : null;
+        const project = query.projectId ? await aiProjects.getByShortId(query.projectId, resourceContext(c), "read") : null;
         if (query.projectId && !project) return respond(c, fail(err.notFound("Project")));
         return respond(
           c,
@@ -562,7 +563,7 @@ export const aiRoutes = (() => {
                 unassigned: query.unassigned,
                 limit: query.limit,
               }),
-              c.get("accessSubject"),
+              resourceContext(c),
             ),
           ),
         );
@@ -571,7 +572,7 @@ export const aiRoutes = (() => {
         const ctx = await resolveContext(c);
         if (ctx instanceof Response) return ctx;
         const query = c.req.valid("query");
-        const project = query.projectId ? await aiProjects.getByShortId(query.projectId, c.get("accessSubject"), "read") : null;
+        const project = query.projectId ? await aiProjects.getByShortId(query.projectId, resourceContext(c), "read") : null;
         if (query.projectId && !project) return respond(c, fail(err.notFound("Project")));
         const page = await aiConversations.listConversationsPage({
           ownerUserId: ctx.ownerUserId,
@@ -584,15 +585,15 @@ export const aiRoutes = (() => {
           page: query.page ?? 1,
           perPage: query.perPage ?? 20,
         });
-        return respond(c, ok({ ...page, items: await publicConversations(page.items, c.get("accessSubject")) }));
+        return respond(c, ok({ ...page, items: await publicConversations(page.items, resourceContext(c)) }));
       })
       .post("/conversations", v("json", AiCreateConversationInputSchema), async (c) => {
         const ctx = await resolveContext(c);
         if (ctx instanceof Response) return ctx;
         const body = c.req.valid("json");
-        const project = body.projectId ? await aiProjects.getByShortId(body.projectId, c.get("accessSubject"), "read") : null;
+        const project = body.projectId ? await aiProjects.getByShortId(body.projectId, resourceContext(c), "read") : null;
         if (body.projectId && !project) return respond(c, fail(err.notFound("Project")));
-        const draft = await prepareLaunchDraft(body, c.get("accessSubject"), appAccessAuthority(c));
+        const draft = await prepareLaunchDraft(body, resourceContext(c), appAccessAuthority(c));
         if (!draft.ok) return respond(c, draft);
         const requestedCapabilityTools = (body.preloadTools ?? []).filter(
           (requested): requested is { appId: string; kind: "query" | "action"; id: string } => "appId" in requested,
@@ -643,9 +644,7 @@ export const aiRoutes = (() => {
             launchedByAppId: body.launchedByAppId,
           });
           // A replay may return a conversation assigned to a Project since creation.
-          const currentProject = conversation.projectId
-            ? await aiProjects.get(conversation.projectId, c.get("accessSubject"), "read")
-            : null;
+          const currentProject = conversation.projectId ? await aiProjects.get(conversation.projectId, resourceContext(c), "read") : null;
           if (conversation.projectId && !currentProject) return respond(c, fail(err.notFound("Project")));
           return respond(c, ok(publicConversation(conversation, currentProject?.shortId ?? null)), 201);
         } catch (error) {
@@ -660,7 +659,7 @@ export const aiRoutes = (() => {
         if (ctx instanceof Response) return ctx;
         const conversation = await loadConversation(c, ctx);
         if (!conversation) return notFound(c);
-        return respond(c, ok(await conversationDetail(conversation, c.get("accessSubject"))));
+        return respond(c, ok(await conversationDetail(conversation, resourceContext(c))));
       })
       .get(
         "/conversations/:conversationId/submission/:draftRevision",
@@ -670,7 +669,7 @@ export const aiRoutes = (() => {
           if (ctx instanceof Response) return ctx;
           const conversation = await loadConversation(c, ctx);
           if (!conversation) return notFound(c);
-          if (conversation.projectId && !(await aiProjects.get(conversation.projectId, c.get("accessSubject"), "read"))) return notFound(c);
+          if (conversation.projectId && !(await aiProjects.get(conversation.projectId, resourceContext(c), "read"))) return notFound(c);
           const submission = await aiConversations.getDraftSubmission({
             conversationId: conversation.id,
             ownerUserId: ctx.ownerUserId,
@@ -798,7 +797,7 @@ export const aiRoutes = (() => {
           pinned: body.pinned,
         });
         if (!updated) return notFound(c);
-        return respond(c, ok(await publicConversationFor(updated, c.get("accessSubject"))));
+        return respond(c, ok(await publicConversationFor(updated, resourceContext(c))));
       })
       .put("/conversations/:conversationId/project", v("json", ConversationProjectInputSchema), async (c) => {
         const ctx = await resolveContext(c);
@@ -806,7 +805,7 @@ export const aiRoutes = (() => {
         const conversation = await loadConversation(c, ctx);
         if (!conversation) return notFound(c);
         const body = c.req.valid("json");
-        const project = body.projectId ? await aiProjects.getByShortId(body.projectId, c.get("accessSubject"), "read") : null;
+        const project = body.projectId ? await aiProjects.getByShortId(body.projectId, resourceContext(c), "read") : null;
         if (body.projectId && !project) return respond(c, fail(err.notFound("Project")));
         const result = await aiConversations.setConversationProject({
           conversationId: conversation.id,
@@ -821,7 +820,7 @@ export const aiRoutes = (() => {
           }
           return notFound(c);
         }
-        return respond(c, ok(await publicConversationFor(result.conversation, c.get("accessSubject"))));
+        return respond(c, ok(await publicConversationFor(result.conversation, resourceContext(c))));
       })
       .post("/conversations/:conversationId/pin", async (c) => {
         const ctx = await resolveContext(c);
@@ -833,7 +832,7 @@ export const aiRoutes = (() => {
           ownerUserId: ctx.ownerUserId,
           pinned: true,
         });
-        return updated ? respond(c, ok(await publicConversationFor(updated, c.get("accessSubject")))) : notFound(c);
+        return updated ? respond(c, ok(await publicConversationFor(updated, resourceContext(c)))) : notFound(c);
       })
       .delete("/conversations/:conversationId/pin", async (c) => {
         const ctx = await resolveContext(c);
@@ -845,7 +844,7 @@ export const aiRoutes = (() => {
           ownerUserId: ctx.ownerUserId,
           pinned: false,
         });
-        return updated ? respond(c, ok(await publicConversationFor(updated, c.get("accessSubject")))) : notFound(c);
+        return updated ? respond(c, ok(await publicConversationFor(updated, resourceContext(c)))) : notFound(c);
       })
       .put("/conversations/:conversationId/done", v("json", z.object({ done: z.boolean().nullable() })), async (c) => {
         const ctx = await resolveContext(c);
@@ -861,7 +860,7 @@ export const aiRoutes = (() => {
           return result.reason === "active_turn"
             ? respond(c, fail(err.conflict("Stop the current response before marking this chat done.")))
             : notFound(c);
-        return respond(c, ok(await publicConversationFor(result.conversation, c.get("accessSubject"))));
+        return respond(c, ok(await publicConversationFor(result.conversation, resourceContext(c))));
       })
       .post("/conversations/:conversationId/archive", async (c) => {
         const ctx = await resolveContext(c);
@@ -911,7 +910,7 @@ export const aiRoutes = (() => {
                 error: error instanceof Error ? error.message : String(error),
               }),
             );
-        return restored ? respond(c, ok(await publicConversationFor(restored, c.get("accessSubject")))) : notFound(c);
+        return restored ? respond(c, ok(await publicConversationFor(restored, resourceContext(c)))) : notFound(c);
       })
       .post("/conversations/:conversationId/viewed", async (c) => {
         const ctx = await resolveContext(c);
@@ -1008,7 +1007,7 @@ export const aiRoutes = (() => {
           };
         });
         const { input, message } = aiInputToUserMessage(aiTurnInputToContent({ content: turnContent }));
-        const project = conversation.projectId ? await aiProjects.snapshot(conversation.projectId, c.get("accessSubject")) : null;
+        const project = conversation.projectId ? await aiProjects.snapshot(conversation.projectId, resourceContext(c)) : null;
         if (conversation.projectId && !project) return respond(c, fail(err.notFound("Project")));
         try {
           const submission = {
@@ -1022,7 +1021,7 @@ export const aiRoutes = (() => {
             locale: getLocale(c),
             theme: readThemeFromCookieHeader(c.req.header("cookie")),
             timeZone: getTimeZone(c),
-            requestedModelId: body.modelProfileId ?? project?.defaultModelProfileId ?? undefined,
+            model: body.model ?? project?.defaultModel ?? undefined,
             modelPolicy: ctx.modelPolicy,
             project: project ?? undefined,
             clientToolIds: body.clientToolIds,
@@ -1043,7 +1042,7 @@ export const aiRoutes = (() => {
             return respond(c, ok({ queued: true }));
           }
           const result = await submitAiChatTurn(submission);
-          rememberLastUsedModel(ctx.actor, result.turn.modelProfileId);
+          rememberLastUsedModel(ctx.actor, body.model);
           return respond(
             c,
             ok({
@@ -1111,13 +1110,13 @@ export const aiRoutes = (() => {
           ? await aiConversations.getTurnRunConfig({ conversationId: conversation.id, turnId: target.loopId })
           : null;
         const originalProject = originalRunConfig?.kind !== "compact" ? originalRunConfig?.project : undefined;
-        const currentProject = originalProject?.id ? await aiProjects.getByShortId(originalProject.id, c.get("accessSubject")) : null;
+        const currentProject = originalProject?.id ? await aiProjects.getByShortId(originalProject.id, resourceContext(c)) : null;
         if (originalProject && !currentProject) return respond(c, fail(err.notFound("Project")));
 
         try {
-          const requestedModelId = await selectAssistantAiModelId(
+          const model = await selectAssistantAiModel(
             c.get("accessSubject"),
-            body.modelProfileId ?? originalProject?.defaultModelProfileId ?? undefined,
+            body.model ?? originalProject?.defaultModel ?? undefined,
             ctx.modelPolicy,
           );
           if ((await prepareConversationForMessageRetry(conversation.id)) === "busy") {
@@ -1134,7 +1133,7 @@ export const aiRoutes = (() => {
             locale: getLocale(c),
             theme: readThemeFromCookieHeader(c.req.header("cookie")),
             timeZone: getTimeZone(c),
-            requestedModelId,
+            model,
             modelPolicy: ctx.modelPolicy,
             systemPrompt,
             project: originalProject,
@@ -1158,7 +1157,7 @@ export const aiRoutes = (() => {
                 }
               : undefined,
           });
-          rememberLastUsedModel(ctx.actor, result.turn.modelProfileId);
+          rememberLastUsedModel(ctx.actor, body.model);
           return respond(
             c,
             ok({
@@ -1190,7 +1189,7 @@ export const aiRoutes = (() => {
         }
 
         const body = c.req.valid("json");
-        if (conversation.projectId && !(await aiProjects.get(conversation.projectId, c.get("accessSubject"), "read"))) {
+        if (conversation.projectId && !(await aiProjects.get(conversation.projectId, resourceContext(c), "read"))) {
           return respond(c, fail(err.notFound("Project")));
         }
         const forked = await aiConversations.forkConversation({
@@ -1199,7 +1198,7 @@ export const aiRoutes = (() => {
           ownerUserId: ctx.ownerUserId,
           title: body.title ?? conversation.title,
         });
-        return respond(c, ok(await conversationDetail(forked, c.get("accessSubject"))));
+        return respond(c, ok(await conversationDetail(forked, resourceContext(c))));
       })
       .get("/conversations/:conversationId/enrichment", async (c) => {
         const ctx = await resolveContext(c);
@@ -1230,7 +1229,7 @@ export const aiRoutes = (() => {
           const result = await submitAiCompaction({
             conversationId: conversation.id,
             actor: ctx.actor,
-            requestedModelId: body.modelProfileId,
+            model: body.model,
             modelPolicy: ctx.modelPolicy,
           });
           return respond(c, ok({ turn: publicTurn(result.turn, conversation.shortId) }), 201);

package/src/ai/runtime.ts

@@ -8,6 +8,7 @@ import { type ApprovalDecisionChannel, approvals } from "../services/approvals";
 import { logger } from "../services/logging";
 import { superviseRuntimeTask } from "../services/runtime-lifecycle";
 import { coreSettings } from "../services/settings/api";
+import type { AiModelRequest } from "../shared/ai-models";
 import {
   AI_WEBSITE_APPROVAL_TOOL,
   type AiToolApprovalChangeContext,
@@ -15,16 +16,17 @@ import {
   aiTurnAllowsRememberedApprovals,
   rememberAiToolApproval,
 } from "./approvals";
-import { aiChatAccessSubject, selectAssistantAiModelId } from "./assistant-models";
+import { aiChatAccessSubject, selectAssistantAiModel } from "./assistant-models";
 import { startAiDictationRuntime } from "./dictation-runtime";
 import { AiTurnExecutor, type ExecutorConfig } from "./executor";
 import { canonicalizeAiConversationAttachments, snapshotAiConversationFiles } from "./file-context";
 import type { AiLocalClient, AiLocalContext } from "./local-tool-contracts";
 import { drainQueuedMessages } from "./message-queue";
+import { aiUserPrefs } from "./prefs";
 import { AI_TURN_LEASE_MS } from "./protocol";
 import { aiQuotas } from "./quotas";
 import { parseAiResourceMarker } from "./resource-markers";
-import { isAiVisionModelConfigured } from "./settings";
+import { isAiVisionModelConfigured, readAiSettingsState } from "./settings";
 import { aiConversations } from "./store";
 import { publishAiWireEvent } from "./stream";
 import { aiToolAudit } from "./tool-audit";
@@ -110,7 +112,7 @@ export type SubmitAiChatTurnInput = {
   theme?: "light" | "dark";
   timeZone?: string;
   modelPolicy?: AiModelPolicy;
-  requestedModelId?: string;
+  model?: AiModelRequest;
   /** Optional instructions that apply only to this turn. */
   systemPrompt?: string;
   project?: AiChatTurnRunConfig["project"];
@@ -143,21 +145,43 @@ export const prepareAiChatTurn = async (input: SubmitAiChatTurnInput) => {
   );
   const canonicalInput = files?.attached.length ? inputMessage.content : input.input;
   const hasImageAttachments = Boolean(files?.attached.some((file) => isAiImageMediaType(file.mediaType)));
+  const state = await readAiSettingsState();
   const canInspectAttachedImages =
     input.canInspectAttachedImages ??
-    (input.toolSource?.kind === "default" && (await isAiVisionModelConfigured(input.modelPolicy?.allowedDataBoundaries)));
-  const requestedModelId = input.assistantChat
-    ? await selectAssistantAiModelId(aiChatAccessSubject(input.actor), input.requestedModelId, input.modelPolicy)
-    : input.requestedModelId;
-  const { resolved } = await validateAiTurnRequest({
-    input: canonicalInput,
-    hasImageAttachments,
-    canInspectAttachedImages,
-    modelPolicy: input.modelPolicy,
-    requestedModelId,
-  });
+    (input.toolSource?.kind === "default" && (await isAiVisionModelConfigured(input.modelPolicy?.allowedDataBoundaries, state)));
+  let requested = input.model;
+  let previousLabel: string | undefined;
+  if (input.assistantChat) {
+    const latest = await aiConversations.getLatestTurn({ conversationId: input.conversationId, kind: "chat" });
+    const previous = latest ? await aiConversations.getTurnRunConfig({ conversationId: input.conversationId, turnId: latest.id }) : null;
+    const inherited = previous?.kind === "chat" ? previous.model : undefined;
+    requested ??= inherited;
+    if (inherited && "id" in inherited && requested && "id" in requested && requested.id === inherited.id) {
+      if (!state.profiles.some((profile) => profile.id === inherited.id)) {
+        previousLabel = previous?.kind === "chat" ? (previous.modelLabel ?? inherited.id) : inherited.id;
+        const subject = aiChatAccessSubject(input.actor);
+        const prefs = subject?.type === "user" ? await aiUserPrefs.get(subject.userId) : null;
+        requested = prefs?.selection && "class" in prefs.selection ? prefs.selection : { class: "balanced" };
+      }
+    }
+  }
+  const model = input.assistantChat
+    ? await selectAssistantAiModel(aiChatAccessSubject(input.actor), requested, input.modelPolicy, state)
+    : requested;
+  const { resolved } = await validateAiTurnRequest(
+    {
+      input: canonicalInput,
+      hasImageAttachments,
+      canInspectAttachedImages,
+      modelPolicy: input.modelPolicy,
+      model,
+    },
+    state,
+  );
   const quotaSubject = aiChatAccessSubject(input.actor);
-  if (input.assistantChat && quotaSubject) await aiQuotas.assertAllowed(quotaSubject, resolved.profile.id);
+  if (input.assistantChat && quotaSubject) await aiQuotas.assertAllowed(quotaSubject, resolved.profile.id, state);
+  const modelLabel =
+    resolved.profile.label + (resolved.profile.id !== resolved.profile.modelId ? ` · ${resolved.profile.variantLabel}` : "");
   const runConfig: AiChatTurnRunConfig = {
     kind: "chat",
     selectedSkillIds: [
@@ -177,7 +201,10 @@ export const prepareAiChatTurn = async (input: SubmitAiChatTurnInput) => {
     ...(input.theme ? { theme: input.theme } : {}),
     ...(input.timeZone ? { timeZone: input.timeZone } : {}),
     modelPolicy: input.modelPolicy,
-    requestedModelId,
+    model,
+    modelResolved: resolved.model,
+    modelLabel,
+    ...(previousLabel ? { modelReplacement: { kind: "model_replaced", previousLabel, nextLabel: modelLabel } } : {}),
     systemPrompt: input.systemPrompt,
     project: input.project,
     files,
@@ -191,7 +218,7 @@ export const prepareAiChatTurn = async (input: SubmitAiChatTurnInput) => {
 
   return {
     conversationId: input.conversationId,
-    modelProfileId: resolved.profile.id,
+    modelId: resolved.profile.id,
     runConfig,
     userMessage,
     truncateFromSeq: input.truncateFromSeq,
@@ -244,7 +271,7 @@ export const deliverAiInterChatMessage = async (input: {
   };
   const delivered = await aiConversations.deliverInterChatMessage({
     messageId: input.message.id,
-    modelProfileId: resolved.profile.id,
+    modelId: resolved.profile.id,
     runConfig,
     userMessage: { role: "user", content: [{ type: "text", text }] },
     sourceHref: input.sourceHref,
@@ -257,20 +284,21 @@ export type SubmitAiCompactionInput = {
   conversationId: string;
   actor?: RequestActor;
   modelPolicy?: AiModelPolicy;
-  requestedModelId?: string;
+  model?: AiModelRequest;
 };
 
 export const submitAiCompaction = async (input: SubmitAiCompactionInput): Promise<{ turn: AiTurn }> => {
-  const { resolved } = await validateAiTurnRequest({ input: "", modelPolicy: input.modelPolicy, requestedModelId: input.requestedModelId });
+  const { resolved } = await validateAiTurnRequest({ input: "", modelPolicy: input.modelPolicy, model: input.model });
   const runConfig: AiCompactionTurnRunConfig = {
     kind: "compact",
     actor: input.actor,
     modelPolicy: input.modelPolicy,
-    requestedModelId: input.requestedModelId,
+    model: { id: resolved.profile.id },
+    modelResolved: resolved.model,
   };
   const turn = await aiConversations.createCompactionTurn({
     conversationId: input.conversationId,
-    modelProfileId: resolved.profile.id,
+    modelId: resolved.profile.id,
     runConfig,
   });
   await enqueueAiTurn({ conversationId: input.conversationId, turnId: turn.id });