@jini-ai/chat 0.6.11 → 0.6.12

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.6.12
+
+### Patch Changes
+
+- chat: typing while a choice card waits queues the message instead of cancelling its tool call; answered choice cards keep their question and report option labels, not values; mid-run follow-ups read "Queued" until consumed; one steady thinking clock.
+  - @jini-ai/core@0.6.12
+
 ## 0.6.11
 
 ### Patch Changes

package/dist/core/run-activity.js

@@ -19,6 +19,7 @@
  */
 import { a2uiSurfaceIdOf, displayOnlySurfaceIdOf } from '@jini-ai/agentic/a2ui';
 import { isDelegatedWrapperToolName } from './tool-events.js';
+import { MID_RUN_USER_MESSAGE_EVENT_NAME } from './turn-usage.js';
 /** Tool names whose only job is finding the right tool (MCP tool search / schema lookup). */
 const DISCOVERY_TOOL_NAMES = new Set([
     'ToolSearch',
@@ -88,6 +89,9 @@ function scanStatus({ scan, event, index }, _optional = {}) {
     }
 }
 function scanEvent(scan, event, index) {
+    // Queue acceptance/consumption is user input, not new agent activity. Neither restarts its clock.
+    if (event.kind === 'ext' && event.name === MID_RUN_USER_MESSAGE_EVENT_NAME)
+        return;
     if (isVisible(event)) {
         scan.lastVisible = { index, kind: event.kind };
         scan.visibleCount += 1;

package/dist/react/components/MessageRow.js

@@ -222,7 +222,7 @@ function AssistantMessageRow({ message, usageSummary, showUsageTotal, showUsageL
     const renderExtGroup = (group) => {
         const renderer = registry.get({ name: group.name });
         if (!renderer && group.name === MID_RUN_USER_MESSAGE_EXT_EVENT_NAME)
-            return _jsx(MidRunUserMessage, { events: group.events });
+            return _jsx(MidRunUserMessage, { events: group.events, runStreaming: answeredCards.runStreaming }, group.slot);
         if (!renderer)
             return null;
         const answerText = answeredCards.answerText(group.slot);

package/dist/react/components/MidRunUserMessage.d.ts

@@ -7,7 +7,7 @@ export declare function midRunUserMessageSlotKey({ data }: {
     data: unknown;
 }): string | undefined;
 /** The bubble for one mid-run message — the same classes as a sent user message, so it reads as one. */
-export declare function MidRunUserMessage({ events }: Pick<ExtEventRenderProps, 'events'>): import("react").JSX.Element | null;
+export declare function MidRunUserMessage({ events, runStreaming }: Pick<ExtEventRenderProps, 'events'> & Partial<Pick<ExtEventRenderProps, 'runStreaming'>>): import("react").JSX.Element | null;
 /**
  * Registers {@link MidRunUserMessage} against the ext-event registry.
  *

package/dist/react/components/MidRunUserMessage.js

@@ -14,6 +14,7 @@ import { acceptedInputEvent } from '../../core/accepted-input.js';
 import { SentAttachmentButton } from './SentAttachment.js';
 import { AttachmentPreviewModal } from './AttachmentPreviewModal.js';
 import { useAttachmentGallery } from './AttachmentGallery.hooks.js';
+import { useT } from '../hooks/context.js';
 import { MID_RUN_USER_MESSAGE_EVENT_NAME } from '../../core/turn-usage.js';
 import { registerExtEventRenderer } from '../ext-event-renderer-registry.js';
 /** The ext-event name the daemon's mid-run `user_message` run event arrives under. One source with
@@ -28,7 +29,7 @@ export function midRunUserMessageSlotKey({ data }) {
     return field(data, 'id');
 }
 /** The bubble for one mid-run message — the same classes as a sent user message, so it reads as one. */
-export function MidRunUserMessage({ events }) {
+export function MidRunUserMessage({ events, runStreaming = false }) {
     const data = events.at(-1);
     const text = field(data, 'text');
     if (text === undefined)
@@ -36,12 +37,14 @@ export function MidRunUserMessage({ events }) {
     const receipt = acceptedInputEvent({ event: { kind: 'ext', name: MID_RUN_USER_MESSAGE_EVENT_NAME, data } });
     // MOVE: A single live delivery may contain several queued inputs; display their original receipts.
     const inputs = receipt?.data.inputs ?? [{ id: field(data, 'id') ?? 'mid-run', text }];
-    return _jsx(_Fragment, { children: inputs.map(input => _jsx(MidRunInput, { input: input }, input.id)) });
+    // A run that ended without reading the message hands it to the next turn; it is no longer queued here.
+    return _jsx(_Fragment, { children: inputs.map(input => _jsx(MidRunInput, { input: input, queued: runStreaming && (input.deliveryState ?? receipt?.data.deliveryState) === 'queued' }, input.id)) });
 }
-function MidRunInput({ input }) {
+function MidRunInput({ input, queued }) {
+    const t = useT();
     const attachments = input.attachments ?? [];
     const gallery = useAttachmentGallery({ attachments });
-    return (_jsxs("div", { className: "jini-message jini-message-user jini-message-user--mid-run", "data-agent-role": "region", "data-agent-label": "A message from the user, sent while the agent was working", children: [_jsx("div", { className: "jini-message-content", children: input.text }), attachments.length > 0 && _jsx("div", { className: "jini-message-attachments", children: attachments.map(attachment => _jsx(SentAttachmentButton, { attachment: attachment, onOpen: gallery.open }, attachment.path)) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })] }));
+    return (_jsxs("div", { className: "jini-message jini-message-user jini-message-user--mid-run", "data-agent-role": "region", "data-agent-label": "A message from the user, sent while the agent was working", children: [queued && _jsx("div", { className: "jini-message-user__queued", role: "status", children: t('Queued — read after the current step') }), _jsx("div", { className: "jini-message-content", children: input.text }), attachments.length > 0 && _jsx("div", { className: "jini-message-attachments", children: attachments.map(attachment => _jsx(SentAttachmentButton, { attachment: attachment, onOpen: gallery.open }, attachment.path)) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })] }));
 }
 /**
  * Registers {@link MidRunUserMessage} against the ext-event registry.
@@ -49,6 +52,6 @@ function MidRunInput({ input }) {
  * @returns An unregister handle, so a test or a hot reload can dispose cleanly.
  */
 export function registerMidRunUserMessageRenderer() {
-    return registerExtEventRenderer({ name: MID_RUN_USER_MESSAGE_EXT_EVENT_NAME, renderer: (props) => _jsx(MidRunUserMessage, { events: props.events }) }, { slotKey: midRunUserMessageSlotKey });
+    return registerExtEventRenderer({ name: MID_RUN_USER_MESSAGE_EXT_EVENT_NAME, renderer: (props) => _jsx(MidRunUserMessage, { events: props.events, runStreaming: props.runStreaming }) }, { slotKey: midRunUserMessageSlotKey });
 }
 //# sourceMappingURL=MidRunUserMessage.js.map

package/dist/react/features/chat-pane/hooks/useChatPane.hooks.js

@@ -1,5 +1,6 @@
 import { acceptedInputEvent, acceptedInputUserEvent, projectAcceptedInputEvents } from '../../../../core/accepted-input.js';
 import { useUserTextGuard } from '../../../hooks/useUserTextGuard.js';
+import { isAwaitingAnswer } from '../../../../core/run-activity.js';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { appendQueuedTurn, describeChatPaneSendBlocker, findAwaitedTypedAnswerId, findChatPaneSendBlocker, findMidRunMessageRunId, isChatPaneQueueableBlocker, resolveChatPaneSelection, } from '../rules.js';
 import { definedProps } from '../../../util/defined-props.js';
@@ -108,11 +109,17 @@ function resolveChatPaneActivity(selectedAgent, conversation) {
         return 'streaming';
     return 'ready';
 }
+/** Hold new input until its uploads or human gate settle; the existing queue owns the retry.
+ * @complexity O(e) in the newest message's events, with no I/O.
+ */
+function waitingForLiveInput({ uploadPending, messages }, _options = {}) {
+    return uploadPending || isAwaitingAnswer({ events: messages.at(-1)?.events });
+}
 /**
  * The host delivery and live run a send can go INTO instead of queueing behind, or `null` when the
  * host offers no mid-run delivery or no run can take it ({@link findMidRunMessageRunId}).
  *
- * @complexity O(1).
+ * @complexity O(e) in the newest message's events.
  */
 function findMidRunTarget({ deliver, blocker, attachmentCount, messages }) {
     if (deliver === undefined)
@@ -181,8 +188,8 @@ export function useChatPane(options) {
     const [storedQueuedInputs, setQueuedInputs] = useState([]);
     // MOVE: Uploads belong to the input that submitted them, even if a later message is queued first.
     const queuedUploadOwnersRef = useRef(new Map());
-    // A send during upload resumes once pixels arrive; a rejected live delivery waits for run end.
-    const queuedForUploadRef = useRef(false);
+    // A send held for uploads or a human card resumes live; a refused delivery waits for run end.
+    const queuedForLiveDeliveryRef = useRef(false);
     const submittedComposerRef = useRef(null);
     const startingPromptRef = useRef(false);
     const [typedAnswerNotice, setTypedAnswerNotice] = useState(null);
@@ -590,8 +597,10 @@ export function useChatPane(options) {
         }
         const turn = guard.redact({ text: prompt }, {});
         const uploadPending = activeUploadsRef.current.size > 0 || attachmentError !== null;
-        if (uploadPending)
-            queuedForUploadRef.current = queuedTurn === null || queuedForUploadRef.current;
+        // Retry live delivery after the human gate settles, using the same queue as pending uploads.
+        if (waitingForLiveInput({ uploadPending, messages: conversation.messages })) {
+            queuedForLiveDeliveryRef.current = queuedTurn === null || queuedForLiveDeliveryRef.current;
+        }
         // MOVE: The existing queue owns its files; a later steer must join it to preserve send order.
         const target = uploadPending || queuedInputs.some(input => input.liveMessageId === undefined) ? null : findMidRunTarget({
             deliver: options.deliverMidRunMessage,
@@ -679,7 +688,7 @@ export function useChatPane(options) {
     }, []);
     const cancelQueued = useCallback(() => {
         submittedComposerRef.current = null;
-        queuedForUploadRef.current = false;
+        queuedForLiveDeliveryRef.current = false;
         queuedConversationIdRef.current = undefined;
         discardQueuedUploads({});
         setQueuedInputs([]);
@@ -693,7 +702,7 @@ export function useChatPane(options) {
     // clear blocker. Clear the slot before awaiting so re-renders cannot send it twice.
     useEffect(() => {
         if (queuedTurn === null) {
-            queuedForUploadRef.current = false;
+            queuedForLiveDeliveryRef.current = false;
             return;
         }
         if (queuedConversationIdRef.current !== options.conversationId) {
@@ -705,13 +714,13 @@ export function useChatPane(options) {
         }
         if (activeUploadCount > 0 || attachmentError !== null)
             return;
-        const target = queuedForUploadRef.current ? findMidRunTarget({
+        const target = queuedForLiveDeliveryRef.current ? findMidRunTarget({
             deliver: options.deliverMidRunMessage,
             blocker: sendBlocker, attachmentCount: queuedInputs.flatMap(input => input.attachments).length, messages: conversation.messages,
         }) : null;
         if (target === null && (sendBlocker !== null || awaitingRunReceipts({ inputs: queuedInputs, messages: conversation.messages })))
             return;
-        queuedForUploadRef.current = false;
+        queuedForLiveDeliveryRef.current = false;
         const inputs = queuedInputs;
         const attachments = inputs.flatMap(input => input.attachments);
         setQueuedInputs([]);
@@ -740,7 +749,7 @@ export function useChatPane(options) {
         // `conversation.cancel()` above clears the streaming blocker — the flush effect fires it into
         // the just-reset conversation instead of discarding it like the rest of this turn's state.
         queuedConversationIdRef.current = undefined;
-        queuedForUploadRef.current = false;
+        queuedForLiveDeliveryRef.current = false;
         queuedUploadOwnersRef.current.clear();
         setQueuedInputs([]);
     }, [composer, conversation, options.initialMessages]);

package/dist/react/features/chat-pane/rules.d.ts

@@ -146,13 +146,16 @@ export declare function isTypedAnswerTurn({ blocker, attachmentCount, messages,
  * turn with a known `runId`.
  * Attachment support is decided by the host's delivery, never by dropping them here.
  *
- * @complexity O(1).
+ * A native live-input transport can reject a pending human gate when given another user turn.
+ * Keep ordinary text in the pane's queue until the card's tool settles; typed question answers
+ * have their own delivery path and never pass this guard.
+ * @complexity O(e) in the newest message's events.
  */
 export declare function findMidRunMessageRunId({ blocker, messages }: {
     blocker: ChatPaneSendBlocker | null;
     attachmentCount: number;
     messages: readonly ChatMessage[];
-}): string | null;
+}, _options?: {}): string | null;
 /**
  * MOVE: Display is per-message; delivery is ONE queued turn. A second message behind the same run
  * is appended to that delivery (a blank line apart) rather than replacing it:

package/dist/react/features/chat-pane/rules.js

@@ -1,6 +1,7 @@
 import { configuredPickerModel, pickerModelOptions, isConcretePickerModel } from './model-options.js';
 import { isTerminalRunStatus } from '../../../core/messages.js';
 import { acceptedInputEvent } from '../../../core/accepted-input.js';
+import { isAwaitingAnswer } from '../../../core/run-activity.js';
 function preferredOptionId(options) {
     return options?.find((option) => option.id === 'default')?.id ?? options?.[0]?.id;
 }
@@ -234,12 +235,17 @@ export function isTypedAnswerTurn({ blocker, attachmentCount, messages, toolName
  * turn with a known `runId`.
  * Attachment support is decided by the host's delivery, never by dropping them here.
  *
- * @complexity O(1).
+ * A native live-input transport can reject a pending human gate when given another user turn.
+ * Keep ordinary text in the pane's queue until the card's tool settles; typed question answers
+ * have their own delivery path and never pass this guard.
+ * @complexity O(e) in the newest message's events.
  */
-export function findMidRunMessageRunId({ blocker, messages }) {
+export function findMidRunMessageRunId({ blocker, messages }, _options = {}) {
     if (!isChatPaneQueueableBlocker({ blocker }))
         return null;
     const last = messages.at(-1);
+    if (isAwaitingAnswer({ events: last?.events }))
+        return null;
     return last?.role === 'assistant' && last.runId ? last.runId : null;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jini-ai/chat",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "description": "Jini's chat/artifact frontend, consolidated into one package with two subpaths: framework-free chat vocabulary and pure parsers in `/core`, headless hooks + presentational components + slots in `/react`. Import only the layer you need.",
   "license": "Apache-2.0",
   "repository": {
@@ -196,7 +196,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@jini-ai/core": "^0.6.11"
+    "@jini-ai/core": "^0.6.12"
   },
   "peerDependencies": {
     "react": "^18.3.0 || ^19.0.0",
@@ -303,13 +303,13 @@
     "pg": "8.23.0",
     "@ag-ui/core": "0.0.58",
     "fast-check": "4.3.0",
-    "@jini-ai/db": "0.6.11",
-    "@jini-ai/agent-runtime": "0.6.11",
-    "@jini-ai/protocol": "^0.6.11",
-    "@jini-ai/core": "^0.6.11",
-    "@jini-ai/diagnostics": "^0.6.11",
-    "@jini-ai/ui": "^0.6.11",
-    "@jini-ai/agentic": "^0.6.11"
+    "@jini-ai/db": "0.6.12",
+    "@jini-ai/agentic": "^0.6.12",
+    "@jini-ai/agent-runtime": "0.6.12",
+    "@jini-ai/diagnostics": "^0.6.12",
+    "@jini-ai/ui": "^0.6.12",
+    "@jini-ai/core": "^0.6.12",
+    "@jini-ai/protocol": "^0.6.12"
   },
   "typesVersions": {
     "*": {