@k2b/cloud 0.27.0 → 0.28.0

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

@@ -13,11 +13,14 @@ import {
   userVisibleTextFromMessage,
   vfsAttachmentsFromMessage,
 } from "./message-utils";
+import { aiChatMessages } from "./messages";
 
 const openModifyRetryDialog = (
   entry: AiStoredMessage,
   onRetryMessage: (entry: AiStoredMessage, input?: AiRetryMessageInput) => void | Promise<void>,
+  locale: string,
 ) => {
+  const t = aiChatMessages(locale);
   void dialogCore.open<void>((close) => {
     const [draft, setDraft] = createSignal(userVisibleTextFromMessage(entry.message));
     const content = () => userContentWithEditedVisibleText(entry.message, draft());
@@ -34,11 +37,11 @@ const openModifyRetryDialog = (
 
     return (
       <PanelDialog>
-        <PanelDialog.Header title="Edit and try again" icon="ti ti-pencil" close={close} />
+        <PanelDialog.Header title={t.retryTitle} icon="ti ti-pencil" close={close} />
         <PanelDialog.Body>
           <TextInput
-            label="Prompt"
-            description="Attachments from the original message stay attached."
+            label={t.retryPrompt}
+            description={t.retryPromptHint}
             multiline
             lines={8}
             value={draft}
@@ -47,18 +50,18 @@ const openModifyRetryDialog = (
           />
           <Show when={retryMutation.error()}>
             <p class="text-xs text-red-600 dark:text-red-400" role="alert">
-              Could not retry this message. Your changes are still here.
+              {t.retryFailed}
             </p>
           </Show>
         </PanelDialog.Body>
         <PanelDialog.Footer>
           <div class="ml-auto flex items-center gap-2">
             <Button type="button" variant="secondary" size="sm" onClick={() => close()}>
-              Cancel
+              {t.cancel}
             </Button>
             <Button type="button" variant="ai" size="sm" disabled={!canRetry()} onClick={retry}>
               <i class={`ti ${retryMutation.loading() ? "ti-loader-2 animate-spin" : "ti-refresh"}`} aria-hidden="true" />
-              {retryMutation.loading() ? "Trying again" : "Try again"}
+              {retryMutation.loading() ? t.retrying : t.actionTryAgain}
             </Button>
           </div>
         </PanelDialog.Footer>
@@ -93,38 +96,39 @@ export const aiUserMessageAttachments = (entry: AiStoredMessage, actions: AiChat
   })),
 ];
 
-export const createAiUserMessageActions = (entry: AiStoredMessage, actions: AiChatActions): ChatAction[] => {
+export const createAiUserMessageActions = (entry: AiStoredMessage, actions: AiChatActions, locale: string): ChatAction[] => {
+  const t = aiChatMessages(locale);
   const result: ChatAction[] = [];
   const copyText = copyTextFromMessage(entry.message);
 
   if (copyText) {
-    result.push({ id: "copy", label: "Copy", icon: "ti ti-copy", copyText });
+    result.push({ id: "copy", label: t.actionCopy, icon: "ti ti-copy", copyText });
   }
   if (!entry.compactedAt && actions.onRetryMessage) {
     result.push(
       {
         id: "retry",
-        label: "Try again",
+        label: t.actionTryAgain,
         icon: "ti ti-refresh",
         onSelect: () => actions.onRetryMessage?.(entry, { mode: "retry" }),
       },
       {
         id: "details",
-        label: "More detailed",
+        label: t.actionMoreDetailed,
         icon: "ti ti-list-details",
         onSelect: () => actions.onRetryMessage?.(entry, { mode: "details" }),
       },
       {
         id: "concise",
-        label: "More concise",
+        label: t.actionMoreConcise,
         icon: "ti ti-align-left",
         onSelect: () => actions.onRetryMessage?.(entry, { mode: "concise" }),
       },
       {
         id: "edit",
-        label: "Edit prompt",
+        label: t.actionEditPrompt,
         icon: "ti ti-pencil",
-        onSelect: () => openModifyRetryDialog(entry, actions.onRetryMessage!),
+        onSelect: () => openModifyRetryDialog(entry, actions.onRetryMessage!, locale),
       },
     );
   }
@@ -136,12 +140,13 @@ export const aiSteerMessageText = (block: Extract<AiTurnBlock, { kind: "steer_me
 export const createAiSteerMessageActions = (
   block: Extract<AiTurnBlock, { kind: "steer_message" }>,
   actions: AiChatActions,
+  locale: string,
 ): ChatAction[] => {
   if (block.status !== "failed" || !actions.onRetrySteer) return [];
   return [
     {
       id: "retry-steer",
-      label: "Retry guidance",
+      label: aiChatMessages(locale).actionRetryGuidance,
       icon: "ti ti-refresh",
       onSelect: () => actions.onRetrySteer?.(block),
     },

package/src/ai/chat/visual-tools.tsx

@@ -228,7 +228,7 @@ export function CloudSurveyBlock(props: {
           </Show>
         </div>
       </div>
-      <footer class="flex min-h-12 items-center gap-3 border-t border-[var(--k2b-border)] bg-[var(--k2b-surface-subtle)] px-4 py-2.5">
+      <footer class="flex min-h-12 items-center gap-3 px-4 pb-3">
         <Show when={submitted()}>
           <span class="inline-flex items-center gap-1.5 text-xs font-medium text-secondary">
             <i class="ti ti-check text-[var(--k2b-ai-accent)]" aria-hidden="true" />

package/src/ai/client/controller.ts

@@ -94,13 +94,26 @@ const isCurrentStreamSession = (current: AiStreamSession | null, candidate: AiSt
 
 const DEFAULT_RUN_ERROR = "Assistant response failed.";
 
-const conversationRunError = (conversation: AiConversation | null | undefined): string | null =>
-  conversation?.runStatus === "failed" ? conversation.runError?.trim() || DEFAULT_RUN_ERROR : null;
+/** The failure of the chat's latest turn, and that turn when known. */
+type AiRunError = { message: string; turnId: string | null };
 
-const runErrorFromEvent = (event: AiStreamEvent, activeTurnId: string | null | undefined): string | null | undefined => {
+const conversationRunError = (conversation: AiConversation | null | undefined): AiRunError | null =>
+  conversation?.runStatus === "failed"
+    ? { message: conversation.runError?.trim() || DEFAULT_RUN_ERROR, turnId: conversation.runTurnId ?? null }
+    : null;
+
+/**
+ * Whether the failed turn shows its failure itself: its last message carries the reason, and the timeline words it in
+ * a notice at the turn's end. The run error then stays out of `error()`, so it does not appear twice. A turn without a
+ * recorded reason, such as a failed compaction or a turn from an earlier release, still reports it there.
+ */
+const turnShowsError = (messages: readonly AiStoredMessage[], turnId: string | null): boolean =>
+  turnId !== null && messages.some((message) => message.loopId === turnId && message.meta?.turnError);
+
+const runErrorFromEvent = (event: AiStreamEvent, activeTurnId: string | null | undefined): AiRunError | null | undefined => {
   if (event.type === "state") return conversationRunError(event.conversation);
   if (event.type !== "turn_finished" || event.turnId !== activeTurnId) return undefined;
-  return event.status === "failed" ? event.error?.trim() || DEFAULT_RUN_ERROR : null;
+  return event.status === "failed" ? { message: event.error?.trim() || DEFAULT_RUN_ERROR, turnId: event.turnId } : null;
 };
 
 export type CreateAiChatControllerOptions = {
@@ -168,7 +181,7 @@ const errorText = (error: unknown, fallback: string): string =>
 export const createAiChatController = (options: CreateAiChatControllerOptions) => {
   const [activeConversationId, setActiveConversationIdSignal] = createSignal<string | null>(options.initialConversationId ?? null);
   const [globalError, setGlobalError] = createSignal<string | null>(options.initialError ?? null);
-  const [runError, setRunError] = createSignal<string | null>(conversationRunError(options.initialDetail?.conversation));
+  const [runError, setRunError] = createSignal<AiRunError | null>(conversationRunError(options.initialDetail?.conversation));
   const [runStatusRaw, setRunStatusRaw] = createSignal<AiChatRunStatus | null>(null);
   const [streamStatus, setStreamStatus] = createSignal<AiStreamStatus>("idle");
   const initialProjection = options.initialDetail ? detailToProjection(options.initialDetail) : emptyProjection();
@@ -250,7 +263,10 @@ export const createAiChatController = (options: CreateAiChatControllerOptions) =
     const conversationId = activeConversationId();
     if (conversationId) openStream(conversationId);
   };
-  const error = () => globalError() ?? runError();
+  const error = () => {
+    const run = runError();
+    return globalError() ?? (run && !turnShowsError(state.messages, run.turnId) ? run.message : null);
+  };
 
   const activeTurn = () => state.activeTurn;
   const messages = createMemo(() => messagesWithPendingSend(visibleMessages(state), pendingSends()[activeConversationId() ?? ""]));
@@ -1415,6 +1431,7 @@ export const __aiControllerTest = {
   completeFrontendToolBlock,
   conversationRunError,
   failSteerBlock,
+  turnShowsError,
   projectionForConversationOpen,
   reconcileSteerBlocks,
   runErrorFromEvent,