@k2b/cloud 0.39.0 → 0.41.0

package/src/ai/chat/action-text.ts

@@ -0,0 +1,288 @@
+import { dates, i18n } from "@k2b/stdlib";
+import { capabilityPersonText, capabilitySentenceText } from "../../_internal/capability-sentences";
+import type { CapabilityAskReason, CapabilityPerson, CapabilitySentence } from "../../contracts/capabilities";
+import { formatBytes } from "../../shared/format";
+import type { ActionCard } from "./action-card";
+import { actionMessages } from "./action-messages";
+
+export type ActionTextRow = { label: string; value: string; format?: "date" | "date-time"; block?: true };
+export type ActionQuestionText = {
+  locale: string;
+  question: string;
+  reason: string;
+  reasonCode: CapabilityAskReason;
+  rows: ActionTextRow[];
+  readMore?: string;
+  confirm: string;
+  decline: string;
+  incomplete: boolean;
+};
+
+const messages = i18n.define({
+  baseLocale: "en",
+  messages: {
+    en: {
+      from: "From",
+      to: "To",
+      cc: "Cc",
+      bcc: "Bcc",
+      subject: "Subject",
+      sendAt: "Send at",
+      warning: "Warning",
+      attachments: "Attachments",
+      text: "Text",
+      when: "When",
+      until: "Until",
+      where: "Where",
+      with: "With",
+      repeats: "Repeats",
+      due: "Due",
+      assignees: "Assignees",
+      status: "Status",
+      checklist: "Checklist",
+      tags: "Tags",
+      folder: "Folder",
+      size: "Size",
+      target: "To",
+      place: "Place",
+      added: "Added",
+      removed: "Removed",
+      starts: "Starts",
+      may: "May",
+      mayAdded: "May (added)",
+      mayRemoved: "May (removed)",
+      also: "Also",
+      readAll: "Read all",
+      title: "Title",
+      name: "Name",
+      note: "Note",
+      before: ({ label }: { label: string }) => `${label} (before)`,
+      more: ({ count }: { count: number }) => `${count.toLocaleString("en")} more`,
+    },
+    de: {
+      from: "Von",
+      to: "An",
+      cc: "Cc",
+      bcc: "Bcc",
+      subject: "Betreff",
+      sendAt: "Senden am",
+      warning: "Warnung",
+      attachments: "Anhänge",
+      text: "Text",
+      when: "Wann",
+      until: "Bis",
+      where: "Wo",
+      with: "Mit",
+      repeats: "Wiederholung",
+      due: "Fällig",
+      assignees: "Zuständig",
+      status: "Status",
+      checklist: "Checkliste",
+      tags: "Tags",
+      folder: "Ordner",
+      size: "Größe",
+      target: "Ziel",
+      place: "Ort",
+      added: "Neu",
+      removed: "Entfernt",
+      starts: "Startet",
+      may: "Darf",
+      mayAdded: "Darf (neu)",
+      mayRemoved: "Darf (entfernt)",
+      also: "Folge",
+      readAll: "Ganz lesen",
+      title: "Titel",
+      name: "Name",
+      note: "Hinweis",
+      before: ({ label }) => `${label} (vorher)`,
+      more: ({ count }) => `${count.toLocaleString("de")} weitere`,
+    },
+  },
+});
+export const checkActionTextMessages = () => messages.check();
+/** The label for a row an old review left without one, where a transport requires labels. */
+export const actionNoteLabel = (locale: string): string => messages.resolve([locale]).t.note;
+
+/** Flatten the question card once. Transport limits and terminal escaping belong to its callers. */
+export const actionCardText = (card: ActionCard): ActionQuestionText => {
+  const t = messages.resolve([card.locale]).t;
+  const rows: ActionTextRow[] = [];
+  let incomplete = false;
+  const row = (label: string, value: string | undefined, extra: Pick<ActionTextRow, "block" | "format"> = {}) => {
+    if (value !== undefined && value !== "") rows.push({ label, value, ...extra });
+  };
+  const list = (values: string[], more = 0) => {
+    if (more > 0) {
+      incomplete = true;
+      values.push(t.more({ count: more }));
+    }
+    return new Intl.ListFormat(card.locale, { type: "conjunction" }).format(values);
+  };
+  const people = (values: CapabilityPerson[] | undefined, more = 0) => list((values ?? []).map(capabilityPersonText), more);
+  // The thing's own name, unless the question already says it.
+  const named = (label: string, value: string) => {
+    if (!card.questionText.includes(value)) row(label, value);
+  };
+  const model = card.preview;
+  if (model?.kind === "legacy") {
+    rows.push(...model.rows);
+    row(t.text, model.markdown, { block: true });
+  } else if (model?.kind === "review") {
+    const context = { locale: card.locale, timeZone: model.timeZone };
+    const sentence = (value: CapabilitySentence) => capabilitySentenceText(value.text, value.slots ?? model.slots ?? {}, context);
+    const preview = model.preview;
+    if (preview && "truncated" in preview && preview.truncated) incomplete = true;
+    switch (preview?.kind) {
+      case "message":
+        row(t.from, preview.from && capabilityPersonText(preview.from));
+        row(t.to, people(preview.to, preview.more?.to));
+        row(t.cc, people(preview.cc, preview.more?.cc));
+        row(t.bcc, people(preview.bcc, preview.more?.bcc));
+        row(t.subject, preview.subject);
+        row(t.sendAt, preview.sendAt, { format: "date-time" });
+        row(t.warning, preview.warnings?.join(" · "));
+        row(
+          t.attachments,
+          list(
+            (preview.attachments ?? []).map((file) =>
+              file.size === undefined ? file.name : `${file.name} (${formatBytes(file.size, { locale: card.locale })})`,
+            ),
+            preview.moreAttachments,
+          ),
+        );
+        row(t.text, preview.body, { block: true });
+        break;
+      case "event": {
+        named(t.title, preview.title);
+        const dateOnly = (value: string) => /^\d{4}-\d{2}-\d{2}$/.test(value);
+        const allDay = preview.allDay === true || dateOnly(preview.start);
+        // Both ends stay typed, so a device shows them in its own zone. An all-day instant becomes its calendar day
+        // in the card's zone first, so no reader's zone moves it to another day.
+        const day = (value: string) =>
+          dateOnly(value)
+            ? value
+            : new Intl.DateTimeFormat("en-CA", { timeZone: model.timeZone, year: "numeric", month: "2-digit", day: "2-digit" }).format(
+                new Date(value),
+              );
+        const format = allDay ? "date" : "date-time";
+        row(t.when, allDay ? day(preview.start) : preview.start, { format });
+        if (preview.end) row(t.until, allDay ? day(preview.end) : preview.end, { format });
+        row(t.where, [preview.place, preview.location].filter(Boolean).join(" · "));
+        row(t.with, people(preview.attendees));
+        row(t.repeats, preview.recurrence);
+        row(t.text, preview.description, { block: true });
+        break;
+      }
+      case "task":
+        named(t.title, preview.title);
+        row(t.place, preview.place);
+        row(t.due, preview.due, { format: /^\d{4}-\d{2}-\d{2}$/.test(preview.due ?? "") ? "date" : "date-time" });
+        row(t.assignees, people(preview.assignees));
+        row(t.status, preview.status);
+        row(t.checklist, preview.checklist?.map((item) => `${item.done ? "☑" : "☐"} ${item.label}`).join(" · "));
+        row(t.tags, preview.tags?.join(", "));
+        row(t.text, preview.description, { block: true });
+        break;
+      case "file":
+        named(t.name, preview.name);
+        row(t.folder, preview.place ?? preview.path);
+        row(t.size, preview.size === undefined ? undefined : formatBytes(preview.size, { locale: card.locale }));
+        row(t.target, preview.to);
+        break;
+      case "page":
+        named(t.title, preview.title);
+        row(t.place, preview.place);
+        row(t.text, preview.body, { block: true });
+        for (const change of preview.changes ?? []) row(change.change === "added" ? t.added : t.removed, change.text);
+        break;
+      case "rule":
+        row(t.starts, sentence(preview.when));
+        row(t.text, preview.does, { block: true });
+        for (const may of preview.may)
+          row(may.mark === "added" ? t.mayAdded : may.mark === "removed" ? t.mayRemoved : t.may, sentence(may));
+        // The card's fixed line: a routine knows only its instruction, never this chat.
+        if (!preview.seesChat) row(t.note, actionMessages(card.locale).ruleBlindToChat);
+        break;
+      case "fields":
+        for (const field of preview.rows) {
+          rows.push({ label: field.label, value: field.value, ...(field.format ? { format: field.format } : {}) });
+          if (field.before !== undefined)
+            rows.push({ label: t.before({ label: field.label }), value: field.before, ...(field.format ? { format: field.format } : {}) });
+        }
+        break;
+    }
+    for (const consequence of model.consequences)
+      row(consequence.mark === "added" ? t.added : consequence.mark === "removed" ? t.removed : t.also, consequence.plain);
+  }
+  // A long question shortens slot values and names at most three people of a slot, then "N more". The text is
+  // complete only when the question or a row shows each value whole; people the app left out are never shown.
+  const shown = [card.questionText, ...rows.map((entry) => entry.value)];
+  const whole = (value: string) => shown.some((text) => text.includes(value));
+  const typed = (value: string, format: "date" | "date-time") =>
+    rows.some((entry) => entry.value === value && (entry.format === "date-time" || entry.format === format));
+  if (
+    card.slotValues?.unlisted ||
+    card.slotValues?.values.some((value) => !whole(value)) ||
+    card.slotValues?.times.some(
+      (time) => !whole(time.text) && !(typed(time.start, time.format) && (!time.end || typed(time.end, time.format))),
+    )
+  )
+    incomplete = true;
+  return {
+    locale: card.locale,
+    question: card.questionText,
+    reason: card.reason.text,
+    reasonCode: card.reason.code,
+    rows,
+    ...(card.readMore ? { readMore: card.readMore } : {}),
+    confirm: card.confirm.label,
+    decline: card.decline,
+    incomplete,
+  };
+};
+
+/** The CLI's plain question block, before terminal-safe sanitizing at the CLI boundary. */
+export const actionQuestionLines = (
+  text: ActionQuestionText,
+  extra: { origin?: string; commands?: { approve: string; reject: string }; timeZone: string },
+): string[] => {
+  const t = messages.resolve([text.locale]).t;
+  const lines = [`? ${text.question}`, `  ${text.reason}`];
+  if (extra.origin) lines.push(`  ${extra.origin}`);
+  const width = Math.max(0, ...text.rows.filter((row) => !row.block && row.label).map((row) => Array.from(row.label).length + 1));
+  let markedIncomplete = false;
+  for (const row of text.rows) {
+    if (row.block) {
+      const body = row.value.split(/\r?\n/);
+      // Cut a long text only when "Read all" can open the whole thing; otherwise the terminal shows all of it.
+      const shown = text.readMore ? body.slice(0, 8) : body;
+      lines.push(...shown.map((line) => `  ${line}`));
+      if (shown.length < body.length || (text.incomplete && !markedIncomplete)) {
+        lines.push("  …");
+        markedIncomplete = true;
+      }
+      continue;
+    }
+    const options = { locale: text.locale, timeZone: extra.timeZone };
+    const value =
+      row.format === "date-time"
+        ? dates.formatDateTime(row.value, options)
+        : row.format === "date"
+          ? dates.formatDate(/^\d{4}-\d{2}-\d{2}$/.test(row.value) ? `${row.value}T12:00:00.000Z` : row.value, {
+              ...options,
+              ...(/^\d{4}-\d{2}-\d{2}$/.test(row.value) ? { timeZone: "UTC" } : {}),
+            })
+          : row.value;
+    lines.push(row.label ? `  ${(row.label + ":").padEnd(width)} ${value}` : `  ${value}`);
+  }
+  if (text.incomplete && !markedIncomplete) lines.push("  …");
+  if (text.readMore) lines.push(`  ${t.readAll}: ${text.readMore}`);
+  if (extra.commands) {
+    const width = Math.max(Array.from(text.confirm).length, Array.from(text.decline).length) + 1;
+    lines.push(
+      `  ${(text.confirm + ":").padEnd(width)} ${extra.commands.approve}`,
+      `  ${(text.decline + ":").padEnd(width)} ${extra.commands.reject}`,
+    );
+  }
+  return lines;
+};

package/src/ai/chat/blocks.tsx

@@ -3,6 +3,7 @@ import { mutation } from "@k2b/stdlib/solid";
 import { Button, ButtonLink, Chat, isStructuredDataValue, MarkdownView, SplitButton, StructuredDataPreview, useLocale } from "@k2b/ui";
 import { createSignal, createUniqueId, For, type JSX, Match, Show, Switch, untrack } from "solid-js";
 import { capabilityApprovalReason, capabilityApprovalReasonLabel } from "../../_internal/capability-sentences";
+import { capabilityReviewView } from "../../capabilities/reviews";
 import type { CapabilityActionReview } from "../../contracts/capabilities";
 import { markdown } from "../../shared";
 import type { AiTurnBlock } from "../protocol";
@@ -31,8 +32,10 @@ import {
 } from "./message-utils";
 import { aiChatMessages } from "./messages";
 import { AssistantMarkdownBlock } from "./primitives";
+import { ToolActionView } from "./tool-action";
 import { AiToolActivity } from "./tool-disclosure";
 import { isFailedTool } from "./tool-groups";
+import type { AiTurnActionState } from "./turn-layout";
 import { CloudCardBlock, CloudSurveyBlock, CloudSurveyResultBlock, CloudTextEditorBlock, CloudTextEditorResultBlock } from "./visual-tools";
 import { FetchFileToolBlock, WebExtractToolBlock, WebSearchToolBlock, WebsiteReceipts, websiteReceipts } from "./web-tools";
 
@@ -199,6 +202,7 @@ export function ApprovalBlockView(props: { turnId: string; block: ToolBlock; onD
   const locale = useLocale();
   const timeZone = useReaderTimeZone();
   const t = () => aiChatMessages(locale());
+  const review = () => (props.block.approval?.review ? capabilityReviewView(props.block.approval.review, { timeZone }) : undefined);
   const request = () => ({ turnId: props.turnId, callId: props.block.callId, name: props.block.name });
   const pending = () => props.block.status === "awaiting_approval";
   const actionDisabled = () => actions.actionDisabled?.() ?? false;
@@ -229,7 +233,7 @@ export function ApprovalBlockView(props: { turnId: string; block: ToolBlock; onD
   // The model's own reason, labelled as such, only where Cloud offered it; it adds to the app's sentence and never replaces it.
   const reason = () => (props.block.presentation?.approvalReason ? capabilityApprovalReason(props.block.args) : null);
   const description = () => {
-    const reviewMessage = props.block.approval?.review?.message.trim();
+    const reviewMessage = review()?.message.trim();
     if (reviewMessage) return reviewMessage;
     // An app Action's approval text repeats its heading and reason for text-only readers; the card shows them itself.
     if (capability()) return null;
@@ -252,10 +256,9 @@ export function ApprovalBlockView(props: { turnId: string; block: ToolBlock; onD
         const match = /^([^:]{1,40}):\s+(.+)$/.exec(line);
         return match ? { label: match[1], value: match[2] } : { value: line };
       });
-  const inlineReviewDetails = () =>
-    (props.block.approval?.review?.details ?? []).filter((detail) => (detail.display ?? "inline") === "inline");
-  const blockReviewDetails = () => (props.block.approval?.review?.details ?? []).filter((detail) => detail.display === "block");
-  const reviewLinks = () => props.block.approval?.review?.links ?? [];
+  const inlineReviewDetails = () => (review()?.details ?? []).filter((detail) => (detail.display ?? "inline") === "inline");
+  const blockReviewDetails = () => (review()?.details ?? []).filter((detail) => detail.display === "block");
+  const reviewLinks = () => review()?.links ?? [];
   const reviewLinkTitle = (rel: "open" | "edit" | "status" | "preview" | "download") =>
     ({
       open: t().openIn({ app: ownerName() }),
@@ -545,20 +548,6 @@ function CapabilityToolView(props: { block: ToolBlock }) {
   );
 }
 
-function RejectedToolView(props: { block: ToolBlock }) {
-  const locale = useLocale();
-  const timeZone = useReaderTimeZone();
-  const presentation = () => props.block.presentation;
-  const title = () => toolSubject(props.block, locale(), timeZone) ?? presentation()?.title ?? displayToolName(props.block.name, locale());
-  return (
-    <Chat.Activity
-      icon={aiToolIcon(props.block.name, presentation()?.appIcon)}
-      label={toolOutcome(props.block, "rejected", locale(), timeZone) ?? aiChatMessages(locale()).toolRejected({ title: title() })}
-      accent={presentation()?.appAccent}
-    />
-  );
-}
-
 export function SurveyToolView(props: { turnId: string; block: ToolBlock; active?: boolean }) {
   const actions = useAiChatActions();
   const locale = useLocale();
@@ -670,6 +659,15 @@ function ToolBlockView(props: { turnId: string; block: ToolBlock; active?: boole
   const actions = useAiChatActions();
   const locale = useLocale();
   const status = () => props.block.status;
+  // The same states as place 4 of a turn: open, then running, done, rejected, failed, or not run.
+  const actionState = (): AiTurnActionState | "open" | undefined => {
+    if (status() === "awaiting_approval") return "open";
+    if (status() === "rejected") return "rejected";
+    const action = props.block.presentation?.kind === "capability" && props.block.presentation.capabilityKind === "action";
+    if (!action) return undefined;
+    if (status() === "running" || status() === "awaiting_client") return props.active === false ? "not_run" : "running";
+    return isFailedTool(props.block) ? "failed" : "done";
+  };
   const fetchError = () =>
     props.block.name === "fetch_file" && props.block.isError ? fetchFileErrorPresentation(props.block.result, locale()) : undefined;
   return (
@@ -688,12 +686,8 @@ function ToolBlockView(props: { turnId: string; block: ToolBlock; active?: boole
           />
         }
       >
-        <Match when={status() === "awaiting_approval"}>
-          <ApprovalBlockView turnId={props.turnId} block={props.block} />
-        </Match>
-        <Match when={status() === "rejected"}>
-          <RejectedToolView block={props.block} />
-        </Match>
+        {/* A question, and every outcome of an app Action, is one card v4 element. */}
+        <Match when={actionState()}>{(state) => <ToolActionView block={props.block} turnId={props.turnId} state={state()} />}</Match>
         <Match when={props.block.presentation?.kind === "capability"}>
           <CapabilityToolView block={props.block} />
         </Match>

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

@@ -12,6 +12,7 @@ import {
 } from "@k2b/ui";
 import { createContext, createSignal, For, type JSX, Show, useContext } from "solid-js";
 import type { CloudResourceRef } from "../../contracts/capabilities";
+import type { AiActionCheck } from "../action-review";
 import type { AiTurnBlock } from "../protocol";
 import type { AiMessageFeedback, AiMessageFeedbackReason, AiStoredMessage } from "../types";
 import {
@@ -46,6 +47,11 @@ export type AiChatActions = {
   /** Revoke the approval that lets this chat read `origin` without asking; the next request asks again. */
   onRevokeWebsite?: (origin: string) => Promise<void>;
   onFrontendToolResult?: FrontendToolResultHandler;
+  /**
+   * Ask the owning app once more whether a call whose outcome stayed unknown happened, through its `check` Query. Never
+   * repeats the call itself. Resolves with the stored check; without it, an unknown outcome offers no new check.
+   */
+  onCheckAction?: (request: AiTurnActionRequest) => Promise<AiActionCheck>;
   onForkMessage?: ForkMessageHandler;
   onRetryMessage?: RetryMessageHandler;
   onRetrySteer?: RetrySteerHandler;

package/src/ai/chat/tool-action-words.ts

@@ -0,0 +1,31 @@
+import { capabilityUnknownText } from "../../_internal/capability-sentences";
+import type { AiTurnBlock } from "../protocol";
+import { toolOutcome } from "../tool-wording";
+import { isRecord } from "./message-utils";
+import { aiChatMessages } from "./messages";
+
+type ToolBlock = Extract<AiTurnBlock, { kind: "tool" }>;
+
+/** The application's own short summary of a result, if it fits on one line. */
+const resultSummary = (block: ToolBlock): string | undefined => {
+  const value = isRecord(block.result) ? block.result.summary : undefined;
+  return typeof value === "string" && value.trim() && value.trim().length <= 500 ? value.trim() : undefined;
+};
+
+/** The words of a call without an app sentence: Cloud's frames around its catalog sentence or title. */
+export const legacyOutcomeWords = (block: ToolBlock, locale: string, timeZone: string) => (subject: string) => {
+  const t = aiChatMessages(locale);
+  const capability = block.presentation?.kind === "capability";
+  return {
+    running: t.receiptRunning({ title: subject }),
+    // The app's done sentence, else its own summary of the call, else Cloud's frame.
+    done:
+      toolOutcome(block, "done", locale, timeZone) ??
+      resultSummary(block) ??
+      (capability ? t.receiptDone({ title: subject }) : t.receiptApproved({ title: subject })),
+    rejected: toolOutcome(block, "rejected", locale, timeZone) ?? t.receiptRejected({ title: subject }),
+    notRun: toolOutcome(block, "notRun", locale, timeZone) ?? t.receiptNotRun({ title: subject, stopped: false }),
+    unknown: capabilityUnknownText(subject, locale),
+    unknownStill: capabilityUnknownText(subject, locale, true),
+  };
+};