@k2b/cloud 0.42.0 → 0.44.0

package/src/ai/capabilities.ts

@@ -295,7 +295,8 @@ export const searchAiTools = (
     .flatMap((entry) => {
       const name = normalizeSearchText(entry.name);
       const title = normalizeSearchText(entry.title);
-      const identity = `${name} ${title}`;
+      const localizedTitle = normalizeSearchText(entry.capability?.display.title ?? "");
+      const identity = `${name} ${title} ${localizedTitle}`;
       const app = normalizeSearchText(`${entry.appId ?? ""} ${entry.searchText}`);
       const description = normalizeSearchText(entry.description);
       const identityWords = searchWordForms(identity);
@@ -303,7 +304,7 @@ export const searchAiTools = (
       const descriptionWords = searchWordForms(description);
       let matchedTerms = 0;
       let score = 0;
-      if (name === phrase || title === phrase) score += 100;
+      if (name === phrase || title === phrase || localizedTitle === phrase) score += 100;
       else if (includesSearchPhrase(identity, phrase)) score += 50;
       if (!input.appId && app === phrase) score += 40;
       else if (!input.appId && includesSearchPhrase(app, phrase)) score += 20;
@@ -324,6 +325,15 @@ export const searchAiTools = (
         right.matchedTerms - left.matchedTerms || right.score - left.score || left.entry.name.localeCompare(right.entry.name),
     )
     .slice(0, DEFAULT_SEARCH_LIMIT);
+  // appId is a discovery hint, not the conversation's authorization scope. The
+  // resolver has already removed inaccessible, unoffered and disallowed tools.
+  // Keep successful scoped searches precise; recover a mistaken owner once.
+  if (matches.length === 0 && input.appId) {
+    return searchAiTools(
+      catalog.filter((entry) => entry.appId !== input.appId),
+      { query: input.query },
+    );
+  }
   return {
     tools: matches.map(({ entry }) => ({
       name: entry.name,
@@ -669,11 +679,16 @@ export const createAiToolMetaTools = (input: {
       : "";
   const search = defineAiTool({
     name: "search_tools",
-    description: `Search available Cloud tools and installed app operations by concise task terms.${liveAppDirectory} When the app is known, set its exact appId on the first attempt. Use list_apps only when the owning app is unclear. This only discovers tools; call load_tools with the exact returned names before using deferred tools.${unavailableLoadedNotice}`,
+    description: `Search available Cloud tools and installed app operations by concise task terms.${liveAppDirectory} When the app is known, set its exact appId. If that app has no matches, search also returns matching available tools from other apps or built-ins. If the owner is unclear, omit appId or use list_apps. This only discovers tools; call load_tools with the exact returned names before using deferred tools.${unavailableLoadedNotice}`,
     inputSchema: z
       .object({
         query: z.string().trim().min(1).max(200).describe("What the tool should do."),
-        appId: z.string().trim().min(1).optional().describe("Optional exact Cloud app id."),
+        appId: z
+          .string()
+          .trim()
+          .min(1)
+          .optional()
+          .describe("Preferred exact Cloud app id; an empty scoped search falls back to other available tools."),
       })
       .strict(),
     outputSchema: z.object({ tools: z.array(ToolCatalogItemSchema).max(DEFAULT_SEARCH_LIMIT) }).strict(),

package/src/ai/capability-execution.ts

@@ -98,6 +98,8 @@ type AiCapabilityCall = {
   mandate?: { id: string; revision: number };
   /** Set only by the capability tool after its explicit approval request resolved true. */
   actionApproval?: "approved";
+  /** Outcome Queries retain turn authority without replacing the Action tool-call link. */
+  traceToolCall?: boolean;
   dependencies?: CapabilityDispatchDependencies & {
     dispatch?: typeof dispatchCapability;
   };
@@ -123,7 +125,7 @@ const dispatchAiCapability = async (
       ? idempotencyKey(input.conversationId, input.context.callId)
       : null;
   if (key) headers.set("idempotency-key", key);
-  if (!review && input.turnId && input.context.callId) {
+  if (!review && input.traceToolCall !== false && input.turnId && input.context.callId) {
     await aiToolAudit.noteCapabilityDispatch({
       conversationId: input.conversationId,
       turnId: input.turnId,
@@ -143,6 +145,7 @@ const dispatchAiCapability = async (
     request,
     kind: input.entry.kind === "query" ? "queries" : "actions",
     origin: "assistant",
+    ...(input.turnId ? { assistantTurn: { conversationId: input.conversationId, turnId: input.turnId } } : {}),
     review,
     appId: input.entry.appId,
     capabilityId: input.entry.operation.localId,
@@ -187,7 +190,7 @@ export const checkAiCapability = async (
     if (!query || "idempotency" in query.operation || !capabilityQueryChecksActionOutcome(query.operation))
       throw new Error("Action outcome Query is unavailable.");
     // The Action's audit keeps its own dispatch identity; the Query has its separate platform execution record.
-    const result = await dispatchAiCapability({ ...input, turnId: undefined, entry: query, args: input.check.input }, false);
+    const result = await dispatchAiCapability({ ...input, traceToolCall: false, entry: query, args: input.check.input }, false);
     if (!result || typeof result !== "object" || !("data" in result)) throw new Error("Invalid outcome check envelope.");
     const checked = CapabilityActionCheckSchema.parse(result.data);
     if (checked.receipt && capabilityActionReceiptIssues(checked.receipt, "links" in result ? result.links : undefined).length)

package/src/ai/chart-block.ts

@@ -1,7 +1,6 @@
 // Named renderers, not the `charts` namespace, so bundles leave out the map and state timeline renderers.
 import {
   autoBin,
-  bar,
   barGauge,
   boxplot,
   type ChartDatum,
@@ -21,11 +20,14 @@ import {
   sparkline,
   stat,
 } from "@k2b/stdlib";
+import { type BarChartOptions, barChartLayout, renderBarChartSvg } from "@k2b/ui/charts";
 import { z } from "zod";
 import type { CloudAiChartInput, CloudAiFormat, CloudAiNumberFormat } from "./default-tool-contracts";
 
 type RenderOptions = {
-  [K in CloudAiChartInput["kind"]]: { kind: K } & Omit<Parameters<(typeof charts)[K]>[0], "width" | "height" | "inspect">;
+  [K in CloudAiChartInput["kind"]]: { kind: K } & (K extends "bar"
+    ? BarChartOptions
+    : Omit<Parameters<(typeof charts)[K]>[0], "width" | "height" | "inspect">);
 }[CloudAiChartInput["kind"]];
 
 /**
@@ -205,18 +207,26 @@ type Formats = {
   x: { tick: (value: number) => string; value: (value: number) => string };
 };
 
-/** Value precision and tick precision share the same style and units; ticks must remain distinct. */
-export const cloudAiNumberFormatters = (format: CloudAiNumberFormat | undefined, locale: string) => {
+/**
+ * Value precision and tick precision share the same style and units; ticks must remain distinct. A currency without
+ * `decimals` or compact notation writes cents only when one of the formatted `values` has them: 418,000 € rather than
+ * 418,000.00 €.
+ */
+export const cloudAiNumberFormatters = (format: CloudAiNumberFormat | undefined, locale: string, values?: readonly number[]) => {
   const common: Intl.NumberFormatOptions = {
     style: format?.style === "number" ? "decimal" : format?.style,
     currency: format?.currency,
   };
+  // Compact notation keeps its fraction: 1.2K and 1.4K must not both read 1K.
+  const decimals =
+    format?.decimals ??
+    (format?.style === "currency" && !format.compact && values?.length && values.every(Number.isInteger) ? 0 : undefined);
   const value = new Intl.NumberFormat(
     locale,
     format
       ? {
           ...common,
-          ...(format.decimals === undefined ? {} : { minimumFractionDigits: format.decimals, maximumFractionDigits: format.decimals }),
+          ...(decimals === undefined ? {} : { minimumFractionDigits: decimals, maximumFractionDigits: decimals }),
           ...(format.compact ? { notation: "compact" } : {}),
         }
       : { maximumSignificantDigits: 15 },
@@ -234,10 +244,37 @@ export const cloudAiNumberFormatters = (format: CloudAiNumberFormat | undefined,
   return { value: (v: number) => `${value.format(v)}${unit}`, tick: (v: number) => `${tickValue(v)}${unit}` };
 };
 const numberFormat = (format: CloudAiFormat | undefined) => (format && !("date" in format) ? format : undefined);
+/** The values a chart writes with its value format, for whole-number currency. */
+const formattedValues = (input: CloudAiChartInput): number[] => {
+  switch (input.kind) {
+    case "line":
+    case "scatter":
+      return [...input.series.flatMap((series) => series.data.map((point) => point.y)), ...referencesOf(input, "y")];
+    case "bar":
+      return [...input.data.map((item) => item.value), ...referencesOf(input, "y")];
+    case "pie":
+    case "donut":
+    case "heatmap":
+      return input.data.map((item) => item.value);
+    case "barGauge":
+      return [...input.data.flatMap((item) => [item.value, item.min, item.max]), input.min, input.max].filter(
+        (value) => value !== undefined,
+      );
+    case "stat":
+      return [input.value, ...(input.delta === undefined ? [] : [input.delta]), ...(input.sparkline ?? [])];
+    case "gauge":
+      return [input.value, input.min, input.max].filter((value) => value !== undefined);
+    case "sparkline":
+      return input.data;
+    // Box plots write quartiles they compute, and histograms bin edges: those keep their cents.
+    default:
+      return [];
+  }
+};
 const formats = (input: CloudAiChartInput, locale: string): Formats => {
   const yFormat = "yAxis" in input ? numberFormat(input.yAxis?.format) : "format" in input ? input.format : undefined;
-  const y = cloudAiNumberFormatters(yFormat, locale);
-  const xFormat = "xAxis" in input ? input.xAxis?.format : undefined;
+  const y = cloudAiNumberFormatters(yFormat, locale, formattedValues(input));
+  const xFormat = "xAxis" in input && input.kind !== "bar" ? input.xAxis?.format : undefined;
   const x = cloudAiNumberFormatters(numberFormat(xFormat), locale);
   // An unformatted x axis often counts years or steps, which compact notation would turn into 2.02K.
   const xTick = new Intl.NumberFormat(locale, { maximumSignificantDigits: 15, useGrouping: "min2" });
@@ -268,7 +305,7 @@ const leftPadding = (values: number[], value: ChartAxisInput | undefined, tick:
 };
 
 /**
- * Category labels never shorten: when they would overlap in the narrowest column, every n-th label shows in full and
+ * Box plot labels never shorten: when they would overlap in the narrowest column, every n-th label shows in full and
  * the others stay empty, as in `cloud.chart()`. Table and tooltips keep every label.
  */
 const thinned = <T extends { label: string }>(data: T[], left: number, width = WIDTH, factor = NARROW): T[] => {
@@ -327,31 +364,27 @@ export function cloudAiChartRenderOptions(
   switch (input.kind) {
     case "bar":
     case "boxplot": {
-      const values = input.kind === "bar" ? input.data.map((item) => item.value) : input.data.flatMap((item) => item.values);
       const yAxis = referencedAxis(input, "y");
-      // The renderer prints bar values with the axis format, so printed values take the value precision for both.
-      const yFormat = options.formats?.y ?? (input.kind === "bar" && input.showValues ? format.value : format.tick);
-      const left = leftPadding(
-        [...values, ...referencesOf(input, "y"), ...(input.kind === "bar" && input.yAxis?.scale !== "log" ? [0] : [])],
-        yAxis,
-        yFormat,
-        factor,
-      );
-      if (input.kind === "boxplot")
+      // The bar renderer places every category label and printed value itself, sized for the narrowest column.
+      if (input.kind === "bar")
         return {
-          kind: "boxplot",
-          groups: thinned(input.data, left, width, factor),
-          yAxis: axis(yAxis, format.tick),
+          kind: "bar",
+          data: input.data,
+          xAxis: input.xAxis,
+          yAxis: axis(yAxis, options.formats?.y ?? format.tick),
+          // A host's own function format writes printed values like its ticks and table cells.
+          valueFormat: options.formats?.value ?? options.formats?.y ?? format.value,
+          colorByBar: input.colorByBar,
+          showValues: input.showValues,
+          legend: options.legend === "outside" ? false : input.legend,
           references,
-          padding: { left },
+          ...(options.width === undefined ? {} : { displayWidth: options.width }),
         };
+      const left = leftPadding([...input.data.flatMap((item) => item.values), ...referencesOf(input, "y")], yAxis, format.tick, factor);
       return {
-        kind: "bar",
-        data: input.colorByBar && input.legend && options.legend !== "outside" ? input.data : thinned(input.data, left, width, factor),
-        yAxis: axis(yAxis, yFormat),
-        colorByBar: input.colorByBar,
-        showValues: input.showValues,
-        legend: options.legend === "outside" ? false : input.legend,
+        kind: "boxplot",
+        groups: thinned(input.data, left, width, factor),
+        yAxis: axis(yAxis, format.tick),
         references,
         padding: { left },
       };
@@ -478,7 +511,7 @@ const draw = (options: RenderOptions): string => {
   const common = { width: WIDTH, height: HEIGHT, inspect: true };
   switch (options.kind) {
     case "bar":
-      return bar({ ...options, ...common });
+      return renderBarChartSvg({ ...options, ...common, height: barChartLayout(options).height });
     case "line":
       return line({ ...options, ...common });
     case "scatter":
@@ -554,7 +587,7 @@ export function cloudAiChartRows(
   const t = labels.resolve([locale]).t;
   const format = formats(input, locale);
   const valueFormat = input.tooltip?.format
-    ? cloudAiNumberFormatters(input.tooltip.format, locale).value
+    ? cloudAiNumberFormatters(input.tooltip.format, locale, formattedValues(input)).value
     : (options.formats?.value ?? (input.kind === "histogram" ? undefined : options.formats?.y) ?? format.value);
   const xFormat = options.formats?.x ?? format.x.value;
   const series = seriesOf(input);

package/src/ai/chat/chart-block.tsx

@@ -50,6 +50,9 @@ const drawChart = (input: CloudAiChartInput, locale: string): DrawnChart | null
  * 280-unit drawing; at 12rem a row is still taller than its text.
  */
 const chartHeight = (kind: Kind) => (kind === "sparkline" ? "8rem" : kind === "stat" ? "10rem" : kind === "barGauge" ? "12rem" : "18rem");
+/** A drawing taller than the usual 280 units, such as many bar rows, grows its frame up to 40rem and scrolls inside. */
+const grownHeight = (kind: Kind, chart: DrawnChart | null) =>
+  chart && chart.snapshot.height > 280 ? `min(40rem, max(${chartHeight(kind)}, ${chart.snapshot.height}px))` : chartHeight(kind);
 
 function ChartFrame(props: {
   title: string;
@@ -60,6 +63,11 @@ function ChartFrame(props: {
   cursor?: ReturnType<typeof createChartCursor>;
   /** A chart of a titled group: its title sits one heading level and one size below the group's. */
   nested?: boolean;
+  /**
+   * The frame takes the drawing's height (`grownHeight`). Only for a drawing present with the first frame: a frame
+   * that waits for its data keeps the kind's height, so the data never moves the chat.
+   */
+  grow?: boolean;
 }) {
   const locale = useLocale();
   const columns = () =>
@@ -80,7 +88,7 @@ function ChartFrame(props: {
       title={props.title}
       headingLevel={props.nested ? 4 : 3}
       description={props.subtitle ? <span class="text-sm text-secondary">{props.subtitle}</span> : undefined}
-      height={chartHeight(props.kind)}
+      height={props.grow ? grownHeight(props.kind, props.chart) : chartHeight(props.kind)}
       data={props.chart ? { chart: props.chart.snapshot, rows: props.chart.table.rows } : { chart: emptySnapshot(props.kind), rows: [] }}
       columns={columns()}
       legend={props.chart?.legend.length ? props.chart.legend : undefined}
@@ -166,7 +174,8 @@ const groupSummary = (group: CloudAiGroupView): GroupSummary => ({
 
 /**
  * One `chart` tool call: the shared chart with its data table and Copy data, or a group of them. The block takes its
- * full size with its first frame and keeps it; switching to the table scrolls inside the same height. A call whose
+ * full size with its first frame and keeps it, up to 40rem for a tall single chart; switching to the table scrolls
+ * inside the same height. A call whose
  * arguments are not a valid chart shows nothing while it runs, because the model gets the validation error and the
  * call fails.
  */
@@ -198,7 +207,7 @@ export function CloudChartBlock(props: { args: unknown; completed: boolean }) {
           }
         >
           {(value) => (
-            <ChartFrame title={value().input.title} subtitle={value().input.subtitle} kind={value().input.kind} chart={value()} />
+            <ChartFrame title={value().input.title} subtitle={value().input.subtitle} kind={value().input.kind} chart={value()} grow />
           )}
         </Show>
       }

package/src/ai/chat/composer-adapter.ts

@@ -1,7 +1,7 @@
 import type { ChatAttachment, ChatMention, ChatModelOption, ChatSubmitInput } from "@k2b/ui";
 import { AI_TURN_IMAGE_MAX_TOTAL_BYTES } from "../limits";
 import type { AiResourceMarker } from "../resource-markers";
-import type { AiDraftContentPart, AiPublicModelProfile, AiUserContentPart } from "../types";
+import type { AiDraftContentPart, AiUserContentPart } from "../types";
 import {
   type AiComposerAttachment,
   FILE_INPUT_ACCEPT,
@@ -45,14 +45,15 @@ export const aiComposerFileAccept = FILE_INPUT_ACCEPT;
  */
 export const aiComposerChooseMaxBytes = (attached: number): number => Math.max(0, MAX_ATTACHMENTS - attached) * VFS_FILE_MAX_BYTES;
 
-export const aiChatModelOptions = (profiles: readonly AiPublicModelProfile[]): ChatModelOption[] =>
+export const aiChatModelOptions = (
+  profiles: readonly import("../../shared/ai-models").AiPeopleModels["options"][number][],
+): ChatModelOption[] =>
   profiles.map((profile) => ({
     id: profile.id,
-    label: profile.label,
-    description: profile.model,
-    image: profile.image,
-    icon: profile.capabilities.includes("vision") ? "ti ti-photo-spark" : "ti ti-message",
-    capabilities: profile.capabilities,
+    label: [profile.label, profile.variantLabel].filter(Boolean).join(" · "),
+    description: profile.description,
+    image: profile.icon.kind === "image" ? profile.icon.src : undefined,
+    icon: "ti ti-sparkles",
   }));
 
 const isTextAttachment = (

package/src/ai/chat/message-actions.tsx

@@ -109,7 +109,7 @@ const assistantResponseInfo = (entries: AiStoredMessage[], locale: string) => {
 
   const meta = [
     { label: t.infoProviderModel, value: entry.providerModel ?? t.infoUnknown },
-    { label: t.infoModelProfile, value: entry.modelProfileId ?? t.infoUnknown },
+    { label: t.infoModelProfile, value: entry.modelId ?? t.infoUnknown },
     { label: t.infoLoopId, value: entry.loopId ?? t.infoLegacy },
     { label: t.infoFinished, value: describeResponseEnd(entry, locale) },
     { label: t.infoCreated, value: formatDateTime(entry.createdAt, locale) },

package/src/ai/chat/message-utils.ts

@@ -259,7 +259,7 @@ export const textAttachmentSummariesFromMessage = (message: Message) => {
 export type AiLatestUsageSnapshot = {
   request: Usage;
   loop: Usage;
-  modelProfileId: string | null;
+  modelId: string | null;
 };
 
 export const latestUsageSnapshot = (messages: AiStoredMessage[]): AiLatestUsageSnapshot | null => {
@@ -287,7 +287,7 @@ export const latestUsageSnapshot = (messages: AiStoredMessage[]): AiLatestUsageS
                   { input: 0, output: 0, total: 0 },
                 )
             : request),
-        modelProfileId: entry?.modelProfileId ?? null,
+        modelId: entry?.modelId ?? null,
       };
     }
     // A provider without usage must not inherit a previous request's numbers.

package/src/ai/chat/presentation.tsx

@@ -13,6 +13,7 @@ import {
   Show,
 } from "solid-js";
 import type { AiActiveTurn } from "../client/projection";
+import { aiModelChooserMessages } from "../model-chooser-messages";
 import { type AiActiveTurnSegment, type AiTurnBlock, splitActiveTurnBlocks } from "../protocol";
 import { type AiAssistantTimelineItem, buildAiMessageTimeline } from "../timeline";
 import type { AiConversationTimelineEntry, AiStoredMessage, AiTurnError } from "../types";
@@ -257,7 +258,27 @@ const storedItems = (
         actionDisplay: "menu",
         anchorId: item.entry.seq,
       };
-      return [userItem, ...unansweredNotice(item.entry, itemIndex)];
+      // A removed model: the chat says once which model answers from now on, right before the message it took over.
+      const replacement = item.entry.meta?.modelReplacement;
+      const replacementItem: ChatTimelineItem[] = replacement
+        ? [
+            {
+              kind: "message",
+              id: `${item.id}:model-replaced`,
+              role: "system",
+              createdAt: item.entry.createdAt,
+              content: (
+                <p class="text-xs text-dimmed">
+                  <i class="ti ti-replace mr-1" aria-hidden="true" />
+                  {aiModelChooserMessages
+                    .resolve([locale])
+                    .t.noteRemoved({ removed: replacement.previousLabel, next: replacement.nextLabel })}
+                </p>
+              ),
+            },
+          ]
+        : [];
+      return [...replacementItem, userItem, ...unansweredNotice(item.entry, itemIndex)];
     }
 
     if (item.type === "summary") {

package/src/ai/chat-quotas.ts

@@ -16,14 +16,15 @@ const usage = (b: AiQuotaBalance): AiChatQuotaBalance => {
 export async function getAiChatQuotas(subject: AccessSubject): Promise<AiChatQuotaSnapshot> {
   const config = await aiQuotas.config();
   if (!config.enabled) return { enabled: false, balances: [] };
-  const models = await listAssistantAiModels(subject);
-  const snapshot = await aiQuotas.snapshot(subject);
-  const profiles = (await readAiSettingsState()).profiles;
+  const state = await readAiSettingsState();
+  const models = await listAssistantAiModels(subject, undefined, state);
+  const snapshot = await aiQuotas.snapshot(subject, undefined, undefined, undefined, { state, config });
+  const profiles = state.profiles;
   return {
     enabled: snapshot.enabled,
     unlimitedModels: models
       .filter((model) => !hasBillableAiPricing(profiles.find((profile) => profile.id === model.id)?.pricing))
       .map((model) => model.id),
-    balances: snapshot.balances.filter((b) => b.scope === "*" || models.some((m) => m.id === b.scope)).map(usage),
+    balances: snapshot.balances.filter((b) => b.scope === "*" || models.some((m) => m.modelId === b.scope)).map(usage),
   };
 }

package/src/ai/chat-tasks.ts

@@ -1394,7 +1394,7 @@ export const aiChatTasks = {
 
   deliverOccurrence: async (input: {
     occurrenceId: string;
-    modelProfileId: string;
+    modelId: string;
     runConfig: AiChatTurnRunConfig;
     userMessage: Message;
     expectedRevision: number;
@@ -1464,7 +1464,7 @@ export const aiChatTasks = {
         "idx_ai_turns_conversation_short_id",
         (attempt, shortId) => attempt<{ id: string }[]>`
         INSERT INTO ai.turns (short_id, conversation_id, model_profile_id, status, run_config)
-        VALUES (${shortId}, ${occurrence.conversation_id}::uuid, ${input.modelProfileId}, 'queued', (${JSON.stringify(runConfig)}::text)::jsonb)
+        VALUES (${shortId}, ${occurrence.conversation_id}::uuid, ${input.modelId}, 'queued', (${JSON.stringify(runConfig)}::text)::jsonb)
         RETURNING id
       `,
       );

package/src/ai/client/controller.ts

@@ -2,6 +2,7 @@ import { type Accessor, createMemo, createSignal, onCleanup } from "solid-js";
 import { createStore, reconcile } from "solid-js/store";
 import { z } from "zod";
 import { CapabilityActionReceiptSchema } from "../../contracts/capabilities";
+import type { AiModelRequest } from "../../shared/ai-models";
 import { type AiActionCheck, preferredActionCheck } from "../action-review";
 import { type AiAttachmentRef, aiAttachmentMarker } from "../attachments";
 import { aiChatMessages } from "../chat/messages";
@@ -857,7 +858,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
   };
 
   const queuedAttempts = new Map<string, { key: string; files?: File[]; id: string }>();
-  const queueMessage = (input: ComposerDraftInput & { modelProfileId?: string }): Promise<boolean> => {
+  const queueMessage = (input: ComposerDraftInput & { model?: AiModelRequest }): Promise<boolean> => {
     if (!input.conversationId || !isComposerDraftSendable(input)) return Promise.resolve(false);
     const conversationId = input.conversationId;
     const key = JSON.stringify({
@@ -866,7 +867,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
       draftContent: input.draftContent,
       resources: input.resources,
       storedFiles: input.storedFiles,
-      model: input.modelProfileId,
+      model: input.model,
     });
     const previous = queuedAttempts.get(conversationId);
     if (uncertainSubmissions()[conversationId] !== undefined) {
@@ -886,7 +887,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
         const body = JSON.stringify({
           draftRevision: saved.revision,
           queueId,
-          modelProfileId: input.modelProfileId,
+          model: input.model,
           clientToolIds: options.clientToolIds?.filter((id) => options.frontendTools?.[id]),
         });
         queuedAttempts.set(conversationId, { key, files: input.files, id: queueId });
@@ -914,7 +915,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
     });
   };
 
-  const send = (input: ComposerDraftInput & { modelProfileId?: string }): Promise<boolean> => {
+  const send = (input: ComposerDraftInput & { model?: AiModelRequest }): Promise<boolean> => {
     if (!isComposerDraftSendable(input)) return Promise.resolve(false);
     const targetConversation = input.conversationId ? Promise.resolve(input.conversationId) : ensureConversation();
     return queueDraftOperation(async () => {
@@ -945,7 +946,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
         kind: "message",
         message: { role: "user", content: optimisticContent },
         loopId: null,
-        modelProfileId: null,
+        modelId: null,
         providerModel: null,
         usage: null,
         stopReason: null,
@@ -993,7 +994,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
         const submissionBody = JSON.stringify({
           draftRevision: savedDraft.revision,
           clientToolIds: options.clientToolIds?.filter((id) => options.frontendTools?.[id]),
-          modelProfileId: input.modelProfileId,
+          model: input.model,
         });
         submissionBodies.set(conversationId, submissionBody);
         const result = await request<SubmitTurnResult>(
@@ -1024,7 +1025,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
                   seq: 0,
                   status: "running",
                   blocks: [],
-                  modelProfileId: result.turn.modelProfileId,
+                  modelId: result.turn.modelId,
                 }),
         );
         if (state.conversation) {
@@ -1244,7 +1245,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
     return requestPromise;
   };
 
-  const compactConversation = async (input: { modelProfileId?: string } = {}) => {
+  const compactConversation = async (input: { model?: AiModelRequest } = {}) => {
     const conversationId = activeConversationId();
     if (!conversationId) {
       setGlobalError("Open a chat before compacting context.");
@@ -1272,7 +1273,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
     input: {
       content?: AiUserContentPart[];
       mode?: "retry" | "details" | "concise";
-      modelProfileId?: string;
+      model?: AiModelRequest;
     } = {},
   ) => {
     const conversationId = activeConversationId();
@@ -1292,7 +1293,7 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
           body: JSON.stringify({
             mode: input.mode ?? "retry",
             content: input.content,
-            modelProfileId: input.modelProfileId,
+            model: input.model,
           }),
         },
         "AI retry failed",

package/src/ai/client/projection.ts

@@ -8,7 +8,7 @@ export type AiActiveTurn = {
   seq: number;
   status: "running" | "waiting_for_action";
   blocks: AiTurnBlock[];
-  modelProfileId: string | null;
+  modelId: string | null;
   /**
    * A model call failed transiently and waits for its retry. Live only: the next turn event ends it, and so does a
    * snapshot that has moved past the retry.
@@ -124,7 +124,7 @@ export const activeTurnFromSnapshot = (snapshot: AiTurnSnapshot | null): AiActiv
     seq: snapshot.seq,
     status: snapshot.status === "waiting_for_action" ? "waiting_for_action" : "running",
     blocks: normalizeCustomApprovalBlocks(snapshot.blocks),
-    modelProfileId: snapshot.modelProfileId,
+    modelId: snapshot.modelId,
     createdAt: snapshot.createdAt,
     ...(snapshot.actionWaitMs !== undefined ? { actionWaitMs: snapshot.actionWaitMs } : {}),
     ...(snapshot.waitingSince !== undefined ? { waitingSince: snapshot.waitingSince } : {}),
@@ -191,7 +191,7 @@ export const reduceWireEvent = (state: AiChatProjection, event: AiWireEvent): Ai
         seq: event.seq,
         status: deriveStatus(blocks),
         blocks,
-        modelProfileId: event.modelProfileId,
+        modelId: event.modelId,
         ...turnTiming(active?.turnId === event.turnId ? active : null),
       },
     };

package/src/ai/code-capability-routes.ts

@@ -53,6 +53,7 @@ export function createCodeCapabilityRoutes(
         request: c.req.raw,
         authority: turnAuthority(c),
         origin: "assistant",
+        assistantTurn: { conversationId: c.req.param("conversationId")!, turnId: c.req.param("turnId")! },
         continuation: codeCapabilityOperation(c.req.param("conversationId")!, c.req.param("turnId")!),
         mandate: config.mandate
           ? { mandateId: config.mandate.id, mandateRevision: config.mandate.revision, ownerAppId: "core" }

package/src/ai/compaction.ts

@@ -120,7 +120,7 @@ const buildCompactionPrompt = (additionalInstructions: string, source: string) =
 export const createCloudCompactFn = (input: {
   conversationId: string;
   turnId?: string;
-  modelProfileId: string;
+  modelId: string;
   additionalInstructions: string;
   maxOutputTokens?: number;
   signal: AbortSignal;
@@ -157,7 +157,7 @@ export const createCloudCompactFn = (input: {
         task: "chat-compaction",
         attribution: { conversationId: input.conversationId, turnId: input.turnId },
         appId: "core",
-        modelProfileId: input.modelProfileId,
+        modelId: input.modelId,
         providerModel: ctx.provider.model,
       };
       let usage: Usage | undefined;
@@ -203,7 +203,7 @@ export const createCloudCompactFn = (input: {
         conversationId: input.conversationId,
         turnId: input.turnId,
         checkpointSeq: checkpoint.seq,
-        modelProfileId: input.modelProfileId,
+        modelId: input.modelId,
         summary: {
           role: "assistant",
           content: [{ type: "text", text: `Conversation summary:\n${summaryText}` }],