@djangocfg/ui-tools 2.1.411 → 2.1.413

package/src/tools/{Chat → chat}/hooks/useChat.ts

@@ -407,6 +407,38 @@ export function useChat(config: UseChatConfig): UseChatReturn {
               sources: ev.sources?.length ?? 0,
             });
             return;
+          case 'message_metrics':
+            // Non-terminal: attach per-turn metrics to the streaming
+            // message. The stream stays open until message_end / error.
+            dispatch({
+              type: 'MESSAGE_PATCH',
+              id: targetId,
+              patch: {
+                metrics: ev.metrics,
+                ...(ev.metrics.resolvedModel
+                  ? { resolvedModel: ev.metrics.resolvedModel }
+                  : {}),
+              },
+            });
+            log.stream.debug('message_metrics', {
+              turns: ev.metrics.turns,
+              toolCallCount: ev.metrics.toolCallCount,
+              resolvedModel: ev.metrics.resolvedModel,
+            });
+            return;
+          case 'resolved_model':
+            // Non-terminal: model alias was resolved mid-run.
+            dispatch({
+              type: 'MESSAGE_PATCH',
+              id: targetId,
+              patch: { resolvedModel: ev.resolvedModel },
+            });
+            log.stream.debug('resolved_model', {
+              originalAlias: ev.originalAlias,
+              resolvedModel: ev.resolvedModel,
+              upgraded: ev.upgraded,
+            });
+            return;
           case 'error':
             tokenBuffer.flush();
             dispatch({

package/src/tools/{Chat → chat}/hooks/useChatComposer.ts

@@ -50,6 +50,9 @@ export interface UseChatComposerReturn {
   setValue: (next: string) => void;
   attachments: ChatAttachment[];
   addAttachment: (a: ChatAttachment) => void;
+  /** Patch an existing attachment in place — used by the upload lifecycle
+   *  to flip `status` / `progress` / `url` without losing list order. */
+  updateAttachment: (id: string, patch: Partial<ChatAttachment>) => void;
   removeAttachment: (id: string) => void;
   isSubmitting: boolean;
   canSubmit: boolean;
@@ -192,6 +195,15 @@ export function useChatComposer(options: UseChatComposerOptions): UseChatCompose
     [maxAttachments],
   );
 
+  const updateAttachment = useCallback(
+    (id: string, patch: Partial<ChatAttachment>) => {
+      setAttachments((prev) =>
+        prev.map((a) => (a.id === id ? { ...a, ...patch } : a)),
+      );
+    },
+    [],
+  );
+
   const removeAttachment = useCallback((id: string) => {
     setAttachments((prev) => prev.filter((a) => a.id !== id));
   }, []);
@@ -276,6 +288,7 @@ export function useChatComposer(options: UseChatComposerOptions): UseChatCompose
     setValue,
     attachments,
     addAttachment,
+    updateAttachment,
     removeAttachment,
     isSubmitting,
     canSubmit,

package/src/tools/{Chat → chat}/index.ts

@@ -115,4 +115,4 @@ export {
   extractTextFromChildren,
   type MarkdownMessageProps,
   type LinkRule,
-} from '../MarkdownMessage';
+} from '../dev/MarkdownMessage';

package/src/tools/{Chat → chat}/launcher/header/ChatHeaderLanguageButton.tsx

@@ -11,14 +11,14 @@ import {
 } from '@djangocfg/ui-core/components';
 import { cn } from '@djangocfg/ui-core/lib';
 
-import { findSpeechLanguage } from '../../../SpeechRecognition';
+import { findSpeechLanguage } from '../../../input/SpeechRecognition';
 
 import {
   WEB_SPEECH_LANGUAGES,
   countryFromTag,
   useResolvedLanguage,
   useSpeechPrefs,
-} from '../../../SpeechRecognition';
+} from '../../../input/SpeechRecognition';
 
 export interface ChatHeaderLanguageButtonProps {
   /** Override aria-label. Default "Speech language". */

package/src/tools/{Chat → chat}/messages/MessageBubble.tsx

@@ -5,7 +5,7 @@ import { memo, type ReactNode } from 'react';
 import { Avatar, AvatarFallback, AvatarImage } from '@djangocfg/ui-core/components';
 import { cn } from '@djangocfg/ui-core/lib';
 
-import { MarkdownMessage } from '../../MarkdownMessage';
+import { MarkdownMessage } from '../../dev/MarkdownMessage';
 import type {
   ChatAssistantContext,
   ChatAttachment,
@@ -264,7 +264,7 @@ const MessageBubbleInner = ({
         {message.blocks?.length ? (
           <MessageBlocks
             blocks={message.blocks}
-            registry={resolvedBlockRegistry}
+            registry={resolvedBlockRegistry ?? undefined}
             appearance={appearance}
             isUser={isUser}
           />

package/src/tools/{Chat → chat}/messages/blocks/builtin.tsx

@@ -12,7 +12,7 @@
 
 import { lazy, Suspense, type ComponentType } from 'react';
 
-import { MarkdownMessage } from '../../../MarkdownMessage';
+import { MarkdownMessage } from '../../../dev/MarkdownMessage';
 import type {
   AudioBlock,
   CodeBlock,

package/src/tools/{Chat → chat}/messages/blocks/renderers/AudioBlock.tsx

@@ -2,7 +2,7 @@
 
 /** Audio block — thin chat wrapper around `AudioPlayer`. */
 
-import { LazyPlayer } from '../../../../AudioPlayer/lazy';
+import { LazyPlayer } from '../../../../media/AudioPlayer/lazy';
 import type { AudioBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/CodeBlock.tsx

@@ -2,8 +2,8 @@
 
 /** Code block — read-only syntax highlighting via `PrettyCode`. */
 
-import { LazyPrettyCode } from '../../../../PrettyCode/lazy';
-import type { Language } from '../../../../PrettyCode/lazy';
+import { LazyPrettyCode } from '../../../../dev/PrettyCode/lazy';
+import type { Language } from '../../../../dev/PrettyCode/lazy';
 import type { CodeBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/GalleryBlock.tsx

@@ -2,8 +2,8 @@
 
 /** Gallery block — thin chat wrapper around `Gallery`. */
 
-import { Gallery } from '../../../../Gallery';
-import type { GalleryMediaItem } from '../../../../Gallery';
+import { Gallery } from '../../../../media/Gallery';
+import type { GalleryMediaItem } from '../../../../media/Gallery';
 import type { GalleryBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/ImageBlock.tsx

@@ -2,7 +2,7 @@
 
 /** Image block — interactive → `ImageViewer`, otherwise a plain `<img>`. */
 
-import { LazyImageViewer } from '../../../../ImageViewer/lazy';
+import { LazyImageViewer } from '../../../../media/ImageViewer/lazy';
 import type { ImageBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/JsonBlock.tsx

@@ -2,7 +2,7 @@
 
 /** JSON block — thin chat wrapper around `JsonTree`. */
 
-import { LazyJsonTree } from '../../../../JsonTree/lazy';
+import { LazyJsonTree } from '../../../../data/JsonTree/lazy';
 import type { JsonBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/LottieBlock.tsx

@@ -2,7 +2,7 @@
 
 /** Lottie block — thin chat wrapper around `LottiePlayer`. */
 
-import { LazyLottiePlayer } from '../../../../LottiePlayer/lazy';
+import { LazyLottiePlayer } from '../../../../media/LottiePlayer/lazy';
 import type { LottieBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/MapBlock.tsx

@@ -2,8 +2,8 @@
 
 /** Map block — thin chat wrapper around `LazyMapContainer` + `MapMarker`. */
 
-import { LazyMapContainer, MapMarker } from '../../../../Map/lazy';
-import type { MarkerData } from '../../../../Map/lazy';
+import { LazyMapContainer, MapMarker } from '../../../../dev/Map/lazy';
+import type { MarkerData } from '../../../../dev/Map/lazy';
 import type { MapBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/MermaidBlock.tsx

@@ -2,7 +2,7 @@
 
 /** Mermaid block — thin chat wrapper around `Mermaid`. */
 
-import { LazyMermaid } from '../../../../Mermaid/lazy';
+import { LazyMermaid } from '../../../../dev/Mermaid/lazy';
 import type { MermaidBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/messages/blocks/renderers/VideoBlock.tsx

@@ -2,8 +2,8 @@
 
 /** Video block — thin chat wrapper around `VideoPlayer`. */
 
-import { VideoPlayer } from '../../../../VideoPlayer/VideoPlayer';
-import type { UrlSource } from '../../../../VideoPlayer/types';
+import { VideoPlayer } from '../../../../media/VideoPlayer/VideoPlayer';
+import type { UrlSource } from '../../../../media/VideoPlayer/types';
 import type { VideoBlock } from '../../../types/block';
 import type { BlockRendererProps } from './types';
 

package/src/tools/{Chat → chat}/public.ts

@@ -34,6 +34,7 @@ export type {
   ChatLabels,
   ChatTransport,
   ChatStreamEvent,
+  ChatMessageMetrics,
   CreateSessionOptions,
   SessionInfo,
   HistoryPage,

package/src/tools/chat/types/events.ts

@@ -0,0 +1,85 @@
+/**
+ * SSE stream events — the canonical wire shape consumed by the reducer.
+ *
+ * Backend-specific shapes (e.g. pydantic-AI's `text_delta`) get normalized
+ * into this union by `mapPydanticAIEvent` and friends.
+ */
+
+import type { ChatSource } from './attachment';
+
+/**
+ * Per-run metrics block. Emitted once per assistant turn alongside the
+ * terminal `message_end` event (a separate `message_metrics` event so
+ * `message_end` keeps its lean `tokensIn`/`tokensOut`/`sources` shape).
+ *
+ * All fields optional — the backend omits anything it could not measure.
+ */
+export interface ChatMessageMetrics {
+  inputTokens?: number;
+  outputTokens?: number;
+  totalTokens?: number;
+  cacheReadTokens?: number;
+  cacheWriteTokens?: number;
+  processingTimeMs?: number;
+  firstTokenMs?: number;
+  turns?: number;
+  toolCallCount?: number;
+  toolNames?: string[];
+  /** Model the request was sent with (may be an alias). */
+  model?: string;
+  /** Concrete model the alias resolved to. */
+  resolvedModel?: string;
+  /** Short summary of the model's thinking, if available. */
+  thinkingSummary?: string;
+}
+
+export type ChatStreamEvent =
+  | { type: 'message_start'; messageId: string; sessionId: string }
+  | { type: 'resume_start' }
+  | { type: 'chunk'; delta: string }
+  | { type: 'tool_activity'; tool: string; status: string }
+  | {
+      type: 'tool_call_start';
+      toolId: string;
+      name: string;
+      input: unknown;
+      sourceHostname?: string;
+    }
+  | { type: 'tool_call_delta'; toolId: string; delta: string }
+  | {
+      type: 'tool_call_end';
+      toolId: string;
+      output: unknown;
+      status: 'success' | 'error';
+    }
+  | {
+      type: 'message_end';
+      tokensIn?: number;
+      tokensOut?: number;
+      sources?: ChatSource[];
+    }
+  | {
+      /**
+       * Per-turn metrics for the assistant message currently streaming.
+       * Non-terminal — arrives near the end of the run but does not
+       * close the stream (`message_end` / `error` do that).
+       */
+      type: 'message_metrics';
+      metrics: ChatMessageMetrics;
+    }
+  | {
+      /**
+       * One-shot model-alias resolution (e.g. `@code` → `glm-5.1`).
+       * Non-terminal — lets the UI update the model chip mid-run.
+       */
+      type: 'resolved_model';
+      /** Alias the user/request originally specified. */
+      originalAlias: string;
+      /** Concrete model id the alias resolved to. */
+      resolvedModel: string;
+      /** True when routing upgraded the model (e.g. for a larger context). */
+      upgraded?: boolean;
+      /** Human-readable reason the router picked this model. */
+      routingReason?: string;
+    }
+  | { type: 'error'; code: string; message: string };

package/src/tools/{Chat → chat}/types/index.ts

@@ -40,7 +40,7 @@ export type { ChatMessage } from './message';
 export { DEFAULT_LABELS } from './labels';
 export type { ChatLabels } from './labels';
 export type { ChatConfig, ChatPrefs, ChatDisplayMode } from './config';
-export type { ChatStreamEvent } from './events';
+export type { ChatStreamEvent, ChatMessageMetrics } from './events';
 export type {
   CreateSessionOptions,
   SessionInfo,

package/src/tools/{Chat → chat}/types/message.ts

@@ -7,6 +7,7 @@
 
 import type { ChatAttachment, ChatSource } from './attachment';
 import type { MessageBlock } from './block';
+import type { ChatMessageMetrics } from './events';
 import type { ChatPersona, ChatRole } from './persona';
 import type { ChatToolCall } from './tool-call';
 
@@ -32,4 +33,8 @@ export interface ChatMessage {
   sources?: ChatSource[];
   tokensIn?: number;
   tokensOut?: number;
+  /** Per-turn metrics (from a `message_metrics` stream event). */
+  metrics?: ChatMessageMetrics;
+  /** Concrete model the request resolved to (from a `resolved_model` event). */
+  resolvedModel?: string;
 }