@jini-ai/chat 0.6.16 → 0.6.17

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.6.17
+
+### Patch Changes
+
+- Carry picked folders as per-message folder references, with draft and sent-message chips, persistence and replay.
+- Preserve ordinary typed paths while redacting glued-on secrets and slash-containing keys.
+- Handle npm 12 pack JSON through the shared parser in isolated-consumer tests.
+- Treat Node builtin dependencies as builtins when copying isolated runtime fixtures.
+
 ## 0.6.13
 
 ### Patch Changes

package/dist/core/accepted-input.d.ts

@@ -9,6 +9,8 @@ export interface AcceptedChatInput {
     answerText?: string;
     /** Absent for legacy/ordinary inputs; consumed only after a CLI UUID receipt. */
     deliveryState?: 'queued' | 'consumed';
+    /** Picked directory paths, kept byte-exact and separate from upload references. */
+    folders?: string[];
     attachments?: ChatAttachment[];
     secretRedaction?: ChatMessage['secretRedaction'];
     /** Wire ids replaced by this receipt remain seen by recall. */
@@ -71,5 +73,15 @@ export declare function projectAcceptedInputEvents({ events }: {
 export declare function acceptedInputsFromMessages({ messages }: {
     messages: readonly ChatMessage[];
 }, _options?: {}): AcceptedChatInput[];
+/** Preserve folder metadata through existing event JSON storage; no attachment lifecycle or schema.
+ * Existing per-input receipts already own queued variants and must retain their identities.
+ */
+export declare function withFolderReceipt({ message }: {
+    message: ChatMessage;
+}, _options?: {}): ChatMessage;
+/** Hydrate the message's folder list from its accepted receipts after a database read. */
+export declare function foldersFromReceipts({ events }: {
+    events: unknown;
+}, _options?: {}): string[];
 export {};
 //# sourceMappingURL=accepted-input.d.ts.map

package/dist/core/accepted-input.js

@@ -17,9 +17,11 @@ export function projectAcceptedInputMessages({ messages }, _options = {}) {
             return [message];
         const turn = { ...message };
         delete turn.attachments;
+        delete turn.folders;
         delete turn.secretRedaction;
         // MOVE: Older receipts have no per-input files; retain those legacy files on the final bubble.
         return inputs.map((input, index) => ({ ...turn, id: input.id, content: input.text,
+            folders: input.folders ?? (index === inputs.length - 1 ? message.folders ?? [] : []),
             attachments: input.attachments ?? (index === inputs.length - 1 ? message.attachments ?? [] : []), ...(input.secretRedaction ? { secretRedaction: input.secretRedaction } : {}) }));
     });
 }
@@ -246,7 +248,7 @@ export function acceptedInputsFromMessages({ messages }, _options = {}) {
                 const input = acceptedInputEvent({ event });
                 return input ? [input.data] : [];
             });
-            return receipts.length > 0 ? receipts : [{ id: message.id, text: message.content }];
+            return receipts.length > 0 ? receipts : [{ id: message.id, text: message.content, ...(message.folders ? { folders: message.folders } : {}) }];
         }
         return projectAcceptedInputEvents({ events: message.events ?? [] }).flatMap(event => {
             const input = acceptedInputEvent({ event });
@@ -256,4 +258,30 @@ export function acceptedInputsFromMessages({ messages }, _options = {}) {
         });
     });
 }
+/** Preserve folder metadata through existing event JSON storage; no attachment lifecycle or schema.
+ * Existing per-input receipts already own queued variants and must retain their identities.
+ */
+export function withFolderReceipt({ message }, _options = {}) {
+    if (message.role !== 'user' || !message.folders?.length)
+        return message;
+    const events = message.events ?? [];
+    if (events.some(event => acceptedInputEvent({ event })))
+        return message;
+    return { ...message, events: [...events, acceptedInputUserEvent({ input: {
+                    id: message.id, text: message.content, folders: message.folders,
+                    ...(message.secretRedaction ? { secretRedaction: message.secretRedaction } : {}),
+                    ...(message.attachments ? { attachments: message.attachments } : {}),
+                } }, { receipt: 'accepted' })] };
+}
+/** Hydrate the message's folder list from its accepted receipts after a database read. */
+export function foldersFromReceipts({ events }, _options = {}) {
+    if (!Array.isArray(events))
+        return [];
+    return events.flatMap(event => {
+        if (event === null || typeof event !== 'object')
+            return [];
+        const folders = acceptedInputEvent({ event })?.data.folders;
+        return Array.isArray(folders) ? folders.filter((path) => typeof path === 'string') : [];
+    });
+}
 //# sourceMappingURL=accepted-input.js.map

package/dist/core/assistant-client/transport.js

@@ -375,6 +375,7 @@ export function createAssistantTransportClient({ ports }, _options = {}) {
         return {
             messages: byokMessages({ history: input.history }, {}),
             ...attachmentIdsField(input),
+            ...(input.folders?.length ? { folders: input.folders } : {}),
             ...conversationIdField(input),
             agentPluginState: input.context?.["agentPluginState"],
             userPrompt: input.context?.["userPrompt"],
@@ -584,6 +585,7 @@ export function createAssistantTransportClient({ ports }, _options = {}) {
             ...modelField(input),
             ...reasoningField(input),
             ...attachmentIdsField(input),
+            ...(input.folders?.length ? { folders: input.folders } : {}),
             ...pluginRefIdsField(input),
             agentPluginState: input.context?.["agentPluginState"],
             userPrompt: input.context?.["userPrompt"],

package/dist/core/messages.d.ts

@@ -58,6 +58,8 @@ export interface ChatMessage {
     lastRunEventId?: string;
     startedAt?: number;
     endedAt?: number;
+    /** Picked directory paths, kept byte-exact and separate from upload references. */
+    folders?: string[];
     attachments?: ChatAttachment[];
 }
 //# sourceMappingURL=messages.d.ts.map

package/dist/core/transport.d.ts

@@ -57,6 +57,8 @@ export interface StartRunInput {
     history: ChatMessage[];
     agentId?: string;
     conversationId?: string | null;
+    /** Picked directory paths, kept byte-exact and separate from upload references. */
+    folders?: string[];
     attachments?: ChatAttachment[];
     context?: RunContext;
     /** Stops the browser-side subscription; the run continues host-side. */

package/dist/core/user-text-redaction.js

@@ -25,6 +25,24 @@ function entropy(text) {
     }
     return bits;
 }
+/** Recognize identifier paths, including the fragment after a space in a typed path.
+ * Require multiple segments and readable words: arbitrary base64 and long digit-mixed runs
+ * must still reach the entropy guard. Specific credential rules have already run. */
+function isIdentifierPath({ text }, _options = {}) {
+    const segments = text.replace(/^(?:[a-z]:|~)?[\\/]*/i, '').split(/[\\/]/).filter(Boolean);
+    return segments.length >= 2 && segments.every(segment => /^[a-z][a-z0-9]*(?:[-_.][a-z0-9]+)*$/.test(segment)
+        || segment.split(/[-_.]/).every(word => /^[A-Z]$/.test(word)
+            || /^[A-Z]?[a-z]{2,}(?:[A-Z][a-z]{2,}|[0-9]{1,4}(?=[A-Z][a-z]{2,}|$))*$/.test(word)));
+}
+/** A piece of a random key: long, both letter cases, and a character-class change at most positions.
+ * Readable names (CamelCase, SCREAMING_CASE, dated file names) change class far less often, and
+ * every piece of a 40-character base64 key split by '/' is 12+ characters in most keys. */
+function isOpaqueSegment(segment) {
+    if (segment.length < 12 || !/[A-Z]/.test(segment) || !/[a-z]/.test(segment))
+        return false;
+    const changes = segment.match(/[A-Z](?=[^A-Z])|[a-z](?=[^a-z])|\d(?=\D)/g)?.length ?? 0;
+    return changes / (segment.length - 1) >= 0.4;
+}
 /** Stricter than error redaction: also detects unlabelled long tokens, while retaining ordinary URLs,
  * filesystem paths, hexadecimal hashes, identifiers and prose. Strong credential syntax inside
  * URLs or paths is still caught. */
@@ -42,15 +60,23 @@ export function redactUserText({ text }, { secretField = false } = {}) {
     const base = redactSecretShapes({ text: protectedText, policy: { additionalRules: CHAT_RULES } });
     let count = base.redactions;
     // Exempt locations only AFTER specific secret rules. Only quoted paths may contain whitespace;
-    // unquoted paths end there so an adjacent slash-bearing secret cannot inherit the exemption.
+    // unquoted paths and URLs end there, and at , | ; and invisible separators, so an adjacent
+    // secret glued after them cannot inherit the exemption.
     // A quoted path ends at its first matching quote, which must sit on a word boundary, so an
     // apostrophe later in the line ("don't") cannot close an unterminated quote and exempt the gap.
     // Require a root boundary so a slash inside an opaque token cannot exempt that token, and a
     // folder after the root so a bare "/" + token is not mistaken for a path.
-    const locations = [...base.text.matchAll(/\b[a-z][a-z0-9+.-]*:\/\/[^\s<>"']+|(?<!\w)(["'`])(?:~\/|[a-z]:[\\/]|\\\\|\/)[^\r\n"'`\\/]+[\\/](?:(?!\1)[^\r\n])*\1(?!\w)|(?<![\w+\/=\\~.-])(?:~\/|[a-z]:[\\/]|\\\\|\/)[^\s<>"'`\\/]+[\\/][^\s<>"'`]*/gi)]
-        .map(match => ({ start: match.index, end: match.index + match[0].length }));
+    const locations = [
+        ...[...base.text.matchAll(/\b[a-z][a-z0-9+.-]*:\/\/[^\s<>"'`,|;\u200B-\u200D\uFEFF]+|(?<!\w)(["'`])(?:~\/|[a-z]:[\\/]|\\\\|\/)[^\r\n"'`\\/]+[\\/](?:(?!\1)[^\r\n])*\1(?!\w)|(?<![\w+\/=\\~.-])(?:~\/|[a-z]:[\\/]|\\\\|\/)[^\s<>"'`,|;\u200B-\u200D\uFEFF\\/]+[\\/][^\s<>"'`,|;\u200B-\u200D\uFEFF]*/gi)]
+            .map(match => ({ match, url: /^[a-z][a-z0-9+.-]*:\/\//i.test(match[0]) })),
+        // The part of a hand-typed unquoted path after a space (Work/CustomerPortal…) has no root.
+        ...[...base.text.matchAll(/[^\s<>"'`,|;\u200B-\u200D\uFEFF]+/g)]
+            .filter(match => isIdentifierPath({ text: match[0] })).map(match => ({ match, url: false })),
+    ].map(({ match, url }) => ({ start: match.index, end: match.index + match[0].length, url }));
     let cleaned = base.text.replace(/(?<![A-Za-z0-9_+\/=-])[A-Za-z0-9_+\/=-]{40,}(?![A-Za-z0-9_+\/=-])/g, (candidate, offset) => {
-        if (locations.some(location => offset >= location.start && offset < location.end))
+        const location = locations.find(span => offset >= span.start && offset + candidate.length <= span.end);
+        // A key glued straight onto a path (/proj/KEY) is still checked; URLs keep their opaque ids.
+        if (location && (location.url || !candidate.split(/[\\/]/).some(isOpaqueSegment)))
             return candidate;
         if (/^[a-f0-9]+$/i.test(candidate) || !/[A-Za-z]/.test(candidate))
             return candidate;

package/dist/react/components/Composer.js

@@ -12,6 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * the slots a host supplies; it does not itself know what a "library
  * picker" or "session mode" is.
  */
+import { FolderChips } from './FolderChips.js';
 import { useEffect, useLayoutEffect, useRef, useState, } from 'react';
 import { RemixIcon } from '@jini-ai/ui';
 import { useT } from '../hooks/context.js';
@@ -320,7 +321,7 @@ export function Composer({ composer, onSend, disabled = false, sendDisabled = fa
         event.preventDefault();
         runComposerHostEffect('attachmentPicker.onFiles', () => attachmentPicker.onFiles(files));
     }
-    return (_jsxs("div", { className: "jini-composer", children: [_jsx(AccessorySlot, { className: "jini-composer-leading", children: leadingAccessories }), _jsx(AttachmentTray, { attachments: composer.attachments, onRemove: composer.removeAttachment }), _jsx("textarea", { ref: textareaRef, className: "jini-composer-input", value: composer.draft, placeholder: placeholder ?? t('Send a message…'), disabled: disabled, onChange: (e) => {
+    return (_jsxs("div", { className: "jini-composer", children: [_jsx(AccessorySlot, { className: "jini-composer-leading", children: leadingAccessories }), _jsxs("div", { className: "jini-composer-attachments", children: [_jsx(AttachmentTray, { attachments: composer.attachments, onRemove: composer.removeAttachment }), _jsx(FolderChips, { folders: composer.folders, onRemove: composer.removeFolder })] }), _jsx("textarea", { ref: textareaRef, className: "jini-composer-input", value: composer.draft, placeholder: placeholder ?? t('Send a message…'), disabled: disabled, onChange: (e) => {
                     composer.setDraft(e.target.value);
                     setSlashActiveIndex(0);
                     setDismissedSlashDraft(null);

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

@@ -3,6 +3,8 @@ interface CopyMessageButtonProps {
     text: string;
     /** Accessible name while idle; swaps to a "Copied" label once the copy lands. */
     label: string;
+    /** Optional hover tooltip; icon-only buttons outside a message action row have no other visible label. */
+    title?: string | undefined;
 }
 /**
  * Quiet, icon-only copy affordance shared by the user- and assistant-message
@@ -11,8 +13,9 @@ interface CopyMessageButtonProps {
  * the icon swap and the accessible announcement of the transient state.
  * @param props.text - Exact string to copy, verbatim.
  * @param props.label - Idle accessible name (already translated by the caller).
+ * @param props.title - Optional hover tooltip (already translated); swaps to "Copied" like the label.
  * @complexity O(1) — one child hook call, no branching beyond the copied-state read.
  */
-export declare function CopyMessageButton({ text, label }: CopyMessageButtonProps): import("react").JSX.Element;
+export declare function CopyMessageButton({ text, label, title }: CopyMessageButtonProps): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=CopyMessageButton.d.ts.map

package/dist/react/components/CopyMessageButton.js

@@ -10,12 +10,13 @@ import { Icon } from './Icon.js';
  * the icon swap and the accessible announcement of the transient state.
  * @param props.text - Exact string to copy, verbatim.
  * @param props.label - Idle accessible name (already translated by the caller).
+ * @param props.title - Optional hover tooltip (already translated); swaps to "Copied" like the label.
  * @complexity O(1) — one child hook call, no branching beyond the copied-state read.
  */
-export function CopyMessageButton({ text, label }) {
+export function CopyMessageButton({ text, label, title }) {
     const t = useT();
     const { copied, copy } = useCopyToClipboard();
-    return (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", className: "jini-message-action-btn", "aria-label": copied ? t('Copied') : label, onClick: () => {
+    return (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", className: "jini-message-action-btn", "aria-label": copied ? t('Copied') : label, title: title && (copied ? t('Copied') : title), onClick: () => {
                     void copy(text);
                 }, children: _jsx(Icon, { name: copied ? 'check' : 'copy' }) }), _jsx("span", { className: "jini-message-copy-status", "aria-live": "polite", children: copied ? t('Copied to clipboard') : '' })] }));
 }

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

@@ -0,0 +1,13 @@
+type OnRemove = (input: {
+    path: string;
+}, options?: {}) => void;
+/**
+ * Shared composer/sent-message folder indicator; references never participate in uploads.
+ * One folder shows its chip directly; a "Folders (n)" toggle would only repeat its name.
+ */
+export declare function FolderChips({ folders, onRemove }: {
+    folders?: readonly string[] | undefined;
+    onRemove?: OnRemove | undefined;
+}): import("react").JSX.Element | null;
+export {};
+//# sourceMappingURL=FolderChips.d.ts.map

package/dist/react/components/FolderChips.js

@@ -0,0 +1,32 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useId, useState } from 'react';
+import { useT } from '../hooks/context.js';
+import { CopyMessageButton } from './CopyMessageButton.js';
+import { Icon } from './Icon.js';
+/** Display only: splitting both separators never changes the exact path carried or copied. */
+function folderName({ path }, _options = {}) {
+    return path.split(/[\\/]/).filter(Boolean).at(-1) ?? path;
+}
+/** One folder: last name (full path on hover), copy, and × when removable. */
+function FolderChip({ path, onRemove }) {
+    const t = useT();
+    const copyLabel = t('Copy folder path: {path}', { path });
+    const removeLabel = t('Remove folder: {path}', { path });
+    return _jsxs("li", { className: "jini-folder-chips__item", children: [_jsx(Icon, { name: "folder" }), _jsx("span", { className: "jini-folder-chips__name", title: path, "aria-label": path, children: folderName({ path }) }), _jsx(CopyMessageButton, { text: path, label: copyLabel, title: copyLabel }), onRemove && _jsx("button", { type: "button", className: "jini-folder-chips__remove", title: removeLabel, "aria-label": removeLabel, onClick: () => onRemove({ path }), children: _jsx(Icon, { name: "close" }) })] });
+}
+/**
+ * Shared composer/sent-message folder indicator; references never participate in uploads.
+ * One folder shows its chip directly; a "Folders (n)" toggle would only repeat its name.
+ */
+export function FolderChips({ folders = [], onRemove }) {
+    const t = useT();
+    const [expanded, setExpanded] = useState(false);
+    const id = useId();
+    if (folders.length === 0)
+        return null;
+    const list = (listId) => _jsx("ul", { id: listId, className: "jini-folder-chips__list", children: folders.map(path => _jsx(FolderChip, { path: path, onRemove: onRemove }, path)) });
+    if (folders.length === 1)
+        return _jsx("div", { className: "jini-folder-chips", children: list() });
+    return _jsxs("div", { className: "jini-folder-chips", children: [_jsxs("button", { type: "button", className: "jini-folder-chips__toggle", "aria-expanded": expanded, "aria-controls": id, onClick: () => setExpanded(value => !value), children: [_jsx(Icon, { name: "folder" }), _jsx("span", { children: t('Folders ({count})', { count: folders.length }) }), _jsx(Icon, { name: expanded ? 'chevron-down' : 'chevron-right' })] }), expanded && list(id)] });
+}
+//# sourceMappingURL=FolderChips.js.map

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

@@ -7,7 +7,7 @@
  * AgentIcon and WorkingDirPicker.
  */
 import type { SVGProps } from 'react';
-export type IconName = 'spinner' | 'check' | 'close' | 'chevron-down' | 'chevron-left' | 'chevron-right' | 'attach' | 'file' | 'image' | 'x' | 'comment' | 'search' | 'plus' | 'pencil' | 'copy' | 'retry';
+export type IconName = 'spinner' | 'check' | 'close' | 'chevron-down' | 'chevron-left' | 'chevron-right' | 'attach' | 'folder' | 'file' | 'image' | 'x' | 'comment' | 'search' | 'plus' | 'pencil' | 'copy' | 'retry';
 interface IconProps extends Omit<SVGProps<SVGSVGElement>, 'name'> {
     name: IconName;
     size?: number | string;

package/dist/react/components/Icon.js

@@ -15,6 +15,7 @@ const ICON_GLYPHS = {
     'chevron-left': _jsx("path", { d: "m15 18-6-6 6-6" }),
     'chevron-right': _jsx("path", { d: "m9 18 6-6-6-6" }),
     attach: _jsx("path", { d: "m21.44 11.05-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" }),
+    folder: _jsx("path", { d: "M3 7V5a2 2 0 0 1 2-2h5l2 3h7a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" }),
     file: _jsxs(_Fragment, { children: [_jsx("path", { d: "M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8Z" }), _jsx("path", { d: "M14 2v6h6" }), _jsx("path", { d: "M8 13h8M8 17h6" })] }),
     image: _jsxs(_Fragment, { children: [_jsx("rect", { width: "18", height: "18", x: "3", y: "3", rx: "2" }), _jsx("circle", { cx: "9", cy: "9", r: "2" }), _jsx("path", { d: "m21 15-5-5L5 21" })] }),
     pencil: _jsxs(_Fragment, { children: [_jsx("path", { d: "m16 3 5 5L8 21H3v-5L16 3Z" }), _jsx("path", { d: "m14 5 5 5" })] }),

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

@@ -3,6 +3,7 @@ import { type MessageRowProps } from './MessageRow.js';
 interface PendingPrompt {
     id?: string;
     text: string;
+    folders?: string[];
     attachments?: ChatAttachment[];
     onCancel: () => void;
 }

package/dist/react/components/MessageList.js

@@ -10,6 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * scroll-anchoring state lives in `useMessageListAutoScroll`
  * (`MessageList.hooks.ts`); see that file for why it is presentational.
  */
+import { FolderChips } from './FolderChips.js';
 import { memo, useMemo } from 'react';
 import { projectAcceptedInputMessages } from '../../core/accepted-input.js';
 import { isTerminalRunStatus } from '../../core/index.js';
@@ -55,6 +56,6 @@ function QueuedMessage({ prompt, renderAttachment }) {
     const t = useT();
     const attachments = prompt.attachments ?? [];
     const gallery = useAttachmentGallery({ attachments });
-    return (_jsxs("div", { className: "jini-chat-pane__queued", role: "status", "aria-label": t('Message queued — not yet sent, will send once the current run finishes'), "data-testid": "chat-pane-queued", "data-agent-element": "chat-message-pending", "data-agent-role": "region", "data-agent-label": "A message queued to send once the current run finishes", children: [_jsx("div", { children: t('Queued — sends when this reply finishes') }), _jsx("div", { className: "jini-chat-pane__queued-text", children: prompt.text }), attachments.length > 0 && _jsx("div", { className: "jini-message-attachments", children: attachments.map(attachment => _jsx(SentAttachmentButton, { attachment: attachment, onOpen: gallery.open, renderAttachment: renderAttachment }, attachment.path)) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation }), _jsx("div", { className: "jini-chat-pane__queued-actions", children: _jsx("button", { type: "button", className: "jini-chat-pane__queued-cancel", onClick: () => prompt.onCancel(), title: t('Cancel queued message'), children: t('Cancel') }) })] }));
+    return (_jsxs("div", { className: "jini-chat-pane__queued", role: "status", "aria-label": t('Message queued — not yet sent, will send once the current run finishes'), "data-testid": "chat-pane-queued", "data-agent-element": "chat-message-pending", "data-agent-role": "region", "data-agent-label": "A message queued to send once the current run finishes", children: [_jsx("div", { children: t('Queued — sends when this reply finishes') }), prompt.folders?.length ? _jsx("div", { className: "jini-message-attachments", children: _jsx(FolderChips, { folders: prompt.folders }) }) : null, _jsx("div", { className: "jini-chat-pane__queued-text", children: prompt.text }), attachments.length > 0 && _jsx("div", { className: "jini-message-attachments", children: attachments.map(attachment => _jsx(SentAttachmentButton, { attachment: attachment, onOpen: gallery.open, renderAttachment: renderAttachment }, attachment.path)) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation }), _jsx("div", { className: "jini-chat-pane__queued-actions", children: _jsx("button", { type: "button", className: "jini-chat-pane__queued-cancel", onClick: () => prompt.onCancel(), title: t('Cancel queued message'), children: t('Cancel') }) })] }));
 }
 //# sourceMappingURL=MessageList.js.map

package/dist/react/components/MessageRow.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { FolderChips } from './FolderChips.js';
 import { projectAcceptedInputEvents } from '../../core/accepted-input.js';
 import { MidRunUserMessage, MID_RUN_USER_MESSAGE_EXT_EVENT_NAME } from './MidRunUserMessage.js';
 import { useSurfaceAnswerContexts } from './mcp-ui-question-input.js';
@@ -184,7 +185,7 @@ function UserMessageRow({ message, renderAttachment }) {
     // different messages opening their own attachments independently is fine and expected.
     // Previous/next steps through this message's images only.
     const gallery = useAttachmentGallery({ attachments: message.attachments ?? NO_ATTACHMENTS });
-    return (_jsxs("div", { className: "jini-message jini-message-user", "data-message-id": message.id, "data-agent-element": `chat-message-${message.id}`, "data-agent-role": "region", "data-agent-label": "A message from the user", children: [message.attachments && message.attachments.length > 0 ? (_jsx("div", { className: "jini-message-attachments", children: message.attachments.map((a) => (_jsx(SentAttachmentButton, { attachment: a, onOpen: gallery.open, renderAttachment: renderAttachment }, a.path))) })) : null, _jsx("div", { className: "jini-message-content", children: message.content }), _jsx("div", { className: "jini-message-actions jini-message-actions--user", children: _jsx(CopyMessageButton, { text: message.content, label: t('Copy message') }) }), gallery.opened ? (_jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })) : null] }));
+    return (_jsxs("div", { className: "jini-message jini-message-user", "data-message-id": message.id, "data-agent-element": `chat-message-${message.id}`, "data-agent-role": "region", "data-agent-label": "A message from the user", children: [(message.attachments?.length || message.folders?.length) ? (_jsxs("div", { className: "jini-message-attachments", children: [_jsx(FolderChips, { folders: message.folders }), (message.attachments ?? []).map((a) => (_jsx(SentAttachmentButton, { attachment: a, onOpen: gallery.open, renderAttachment: renderAttachment }, a.path)))] })) : null, _jsx("div", { className: "jini-message-content", children: message.content }), _jsx("div", { className: "jini-message-actions jini-message-actions--user", children: _jsx(CopyMessageButton, { text: message.content, label: t('Copy message') }) }), gallery.opened ? (_jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })) : null] }));
 }
 function AssistantMessageRow({ message, usageSummary, showUsageTotal, showUsageLine, toolCallDisplay, showThinking, runStreaming, runSending, sendingLabel, runSucceeded, questionFormInteractive, questionFormSubmittedAnswers, onQuestionFormSubmit, projectFileNames, onRequestOpenFile, }) {
     const registry = useExtEventRendererRegistry();

package/dist/react/components/MidRunUserMessage.js

@@ -10,6 +10,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  * It is stored as an event of the assistant turn, not a `ChatMessage` of its own, because the agent folded it
  * into the turn it was already running — there is no separate reply to hang off it.
  */
+import { FolderChips } from './FolderChips.js';
 import { acceptedInputEvent } from '../../core/accepted-input.js';
 import { SentAttachmentButton } from './SentAttachment.js';
 import { CopyMessageButton } from './CopyMessageButton.js';
@@ -37,7 +38,7 @@ export function MidRunUserMessage({ events, runStreaming = false, transcriptRow
         return null;
     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 }];
+    const inputs = receipt?.data.inputs ?? [receipt?.data ?? { id: field(data, 'id') ?? 'mid-run', text }];
     // 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, transcriptRow: transcriptRow, queued: runStreaming && (input.deliveryState ?? receipt?.data.deliveryState) === 'queued' }, input.id)) });
 }
@@ -48,7 +49,7 @@ function MidRunInput({ input, queued, transcriptRow }) {
     const t = useT();
     const attachments = input.attachments ?? [];
     const gallery = useAttachmentGallery({ attachments });
-    return (_jsxs("div", { className: `jini-message jini-message-user${transcriptRow ? '' : ' 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)) }), _jsx("div", { className: "jini-message-actions jini-message-actions--user", children: _jsx(CopyMessageButton, { text: input.text, label: t('Copy message') }) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })] }));
+    return (_jsxs("div", { className: `jini-message jini-message-user${transcriptRow ? '' : ' 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') }), input.folders?.length ? _jsx("div", { className: "jini-message-attachments", children: _jsx(FolderChips, { folders: input.folders }) }) : null, _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)) }), _jsx("div", { className: "jini-message-actions jini-message-actions--user", children: _jsx(CopyMessageButton, { text: input.text, label: t('Copy message') }) }), gallery.opened !== null && _jsx(AttachmentPreviewModal, { attachment: gallery.opened, onClose: gallery.close, navigation: gallery.navigation })] }));
 }
 /**
  * Registers {@link MidRunUserMessage} against the ext-event registry.

package/dist/react/features/chat-pane/components/ChatPane.js

@@ -271,6 +271,7 @@ function useComposerHandlePublisher({ pane }, { composerHandle }) {
         if (!composerHandle)
             return undefined;
         composerHandle.current = {
+            addFolders: pane.composer.addFolders,
             insertText: (text) => {
                 pane.composer.setDraft(appendComposerDiscovery({ draft: composerDraftRef.current, insertText: text }));
             },

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

@@ -50,12 +50,12 @@ const ATTACHMENTS_ONLY_PROMPT = 'Review the attached file(s).';
  */
 function composerPrompt(composer) {
     return composer.draft.trim()
-        || (composer.attachments.length > 0 ? ATTACHMENTS_ONLY_PROMPT : '');
+        || (composer.attachments.length > 0 || composer.folders?.length ? ATTACHMENTS_ONLY_PROMPT : '');
 }
 /** History hydration can replace a controller without an edit. Compare the accepted empty draft
  * and staged files so holding Enter cannot requeue an attachment-only submission on that render. */
 function isRepeatedComposerSubmission({ composer, submitted }, _options = {}) {
-    return submitted === composer || (submitted !== null && composer.draft.trim() === '' && submitted.attachments === composer.attachments);
+    return submitted === composer || (submitted !== null && composer.draft.trim() === '' && submitted.attachments === composer.attachments && submitted.folders === composer.folders);
 }
 function composerDeliveryBlocked({ delivering, starting, composer, submitted }, _options = {}) {
     return delivering || starting || isRepeatedComposerSubmission({ composer, submitted });
@@ -331,6 +331,8 @@ export function useChatPane(options) {
     latestComposerRef.current = composer;
     const latestDraftRef = useRef(composer.draft);
     latestDraftRef.current = composer.draft;
+    const latestFoldersRef = useRef(composer.folders ?? []);
+    latestFoldersRef.current = composer.folders ?? [];
     const latestAttachmentsRef = useRef(composer.attachments);
     latestAttachmentsRef.current = composer.attachments;
     useEffect(() => {
@@ -440,6 +442,7 @@ export function useChatPane(options) {
     const restoreQueuedDraft = useCallback(({ inputs, text, attachments }, _options = {}) => {
         if (inputs === undefined)
             return;
+        latestComposerRef.current.addFolders({ folders: inputs.flatMap(input => input.folders ?? []) });
         latestComposerRef.current.setDraft([text, latestDraftRef.current].filter(Boolean).join('\n\n'));
         const staged = new Set(latestAttachmentsRef.current.map(attachment => attachment.path));
         for (const attachment of attachments) {
@@ -449,20 +452,21 @@ export function useChatPane(options) {
     }, []);
     /** A refused composer send is kept for Retry and goes back only into a composer that is still
      * empty: text typed (or files staged) while it was sending are never overwritten. */
-    const restoreRefusedDraft = useCallback(({ redaction, draft, attachments }, _options = {}) => {
-        refusedSendRef.current = { redaction, draft, attachments };
+    const restoreRefusedDraft = useCallback(({ redaction, draft, attachments, folders = [] }, _options = {}) => {
+        refusedSendRef.current = { redaction, draft, attachments, folders };
+        latestComposerRef.current.addFolders({ folders });
         if (latestDraftRef.current.trim() !== '' || latestAttachmentsRef.current.length > 0)
             return;
         latestComposerRef.current.setDraft(draft);
         for (const attachment of attachments)
             latestComposerRef.current.addAttachment(attachment);
     }, []);
-    const finishPromptSend = useCallback(({ accepted, inputs, redaction, submittedDraft, attachments, composerDraft }, _options = {}) => {
+    const finishPromptSend = useCallback(({ accepted, inputs, redaction, submittedDraft, attachments, composerDraft, folders }, _options = {}) => {
         if (!accepted) {
             if (composerDraft === undefined)
                 restoreQueuedDraft({ inputs, text: redaction.text, attachments });
             else
-                restoreRefusedDraft({ redaction, draft: composerDraft, attachments });
+                restoreRefusedDraft({ redaction, draft: composerDraft, attachments, folders });
             return;
         }
         refusedSendRef.current = null;
@@ -471,11 +475,17 @@ export function useChatPane(options) {
             latestComposerRef.current.setDraft('');
             latestComposerRef.current.closeMention();
         }
+        // Composer/queued sends already took these references. A later pick, even of the same path,
+        // belongs to the next draft and must survive this send's asynchronous acceptance.
+        if (composerDraft === undefined && inputs === undefined) {
+            for (const path of folders)
+                latestComposerRef.current.removeFolder({ path });
+        }
         consumeDeliveredAttachments({ attachments });
     }, [consumeDeliveredAttachments, restoreQueuedDraft, restoreRefusedDraft]);
     /** `composerDraft`: the composer text this send already took out of the composer, so the
      * composer is never cleared again on acceptance and a refusal hands the text back. */
-    const sendGuardedPrompt = useCallback(async ({ redaction, inputs, attachments = composer.attachments, composerDraft }, _options = {}) => {
+    const sendGuardedPrompt = useCallback(async ({ redaction, inputs, attachments = composer.attachments, composerDraft, folders = inputs ? inputs.flatMap(input => input.folders ?? []) : composer.folders ?? [] }, _options = {}) => {
         const trimmed = redaction.text.trim();
         assertPromptSendable({ trimmed, sendBlocker });
         if (startingPromptRef.current)
@@ -494,6 +504,7 @@ export function useChatPane(options) {
                     // Empty attachment arrays remain absent at the transport boundary.
                     attachments: attachments.length === 0 ? undefined : attachments,
                     context,
+                    folders: folders.length ? folders : undefined,
                     acceptedInputs: inputs,
                     onAccepted: ({ inputs: acceptedInputs }) => {
                         accepted = true;
@@ -503,7 +514,7 @@ export function useChatPane(options) {
                 } }));
             if (!mountedRef.current || generation !== typedAnswerGenerationRef.current)
                 return;
-            finishPromptSend({ accepted, inputs, redaction, submittedDraft, attachments, composerDraft });
+            finishPromptSend({ accepted, inputs, redaction, submittedDraft, attachments, composerDraft, folders });
         }
         finally {
             startingPromptRef.current = false;
@@ -520,24 +531,27 @@ export function useChatPane(options) {
             return;
         const draft = latestDraftRef.current;
         const attachments = latestAttachmentsRef.current;
+        const folders = latestFoldersRef.current;
+        for (const path of folders)
+            latestComposerRef.current.removeFolder({ path });
         latestComposerRef.current.setDraft('');
         latestComposerRef.current.closeMention();
         for (const attachment of attachments)
             latestComposerRef.current.removeAttachment(attachment.path);
         const redaction = guard.redact({ text: prompt.trim() }, {});
         try {
-            await sendGuardedPrompt({ redaction, attachments, composerDraft: draft });
+            await sendGuardedPrompt({ redaction, attachments, folders, composerDraft: draft });
         }
         catch (error) {
             // A host hook that throws (run context, activity) must not cost the typed text either.
-            restoreRefusedDraft({ redaction, draft, attachments });
+            restoreRefusedDraft({ redaction, draft, attachments, folders });
             throw error;
         }
     }, [guard.redact, restoreRefusedDraft, sendBlocker, sendGuardedPrompt]);
     // MOVE: Every queue path retains per-message receipts; appendQueuedTurn owns their one-turn delivery.
     // A turn queued against another conversation is not joined — it would never be flushed there anyway.
     const enqueueTurn = useCallback(({ turn, inputs, attachments = composer.attachments }, _options = {}) => {
-        const accepted = inputs ?? [{ id: createChatLocalId({}), text: turn.text, attachments,
+        const accepted = inputs ?? [{ id: createChatLocalId({}), text: turn.text, attachments, folders: composer.folders ?? [],
                 ...(turn.secretRedacted ? { secretRedaction: { secretRedacted: true, count: turn.count } } : {}) }];
         const sameConversation = queuedConversationIdRef.current === options.conversationId;
         queuedConversationIdRef.current = options.conversationId;
@@ -550,7 +564,9 @@ export function useChatPane(options) {
         // MOVE: Take files out of the composer without rotating their batch: every queued message ships together.
         for (const attachment of attachments)
             latestComposerRef.current.removeAttachment(attachment.path);
-    }, [composer.attachments, options.conversationId, recordAcceptedInput]);
+        for (const path of composer.folders ?? [])
+            latestComposerRef.current.removeFolder({ path });
+    }, [composer.folders, composer.attachments, options.conversationId, recordAcceptedInput]);
     const answerWaitingQuestion = useCallback(async ({ deliver, questionId, text }) => {
         const safeText = guard.redactText(text);
         const generation = typedAnswerGenerationRef.current;
@@ -647,7 +663,8 @@ export function useChatPane(options) {
             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({
+        // Folder context is attached on ordinary run start; live messages have no such envelope.
+        const target = uploadPending || composer.folders?.length || queuedInputs.some(input => input.liveMessageId === undefined) ? null : findMidRunTarget({
             deliver: options.deliverMidRunMessage,
             blocker: sendBlocker,
             attachmentCount: composer.attachments.length,
@@ -686,7 +703,7 @@ export function useChatPane(options) {
             await sendOrdinaryTurn(prompt);
             return;
         }
-        const typedAnswer = findTypedAnswerTarget({
+        const typedAnswer = composer.folders?.length ? null : findTypedAnswerTarget({
             deliver: options.deliverTypedAnswer,
             blocker: sendBlocker,
             attachmentCount: composer.attachments.length,
@@ -715,7 +732,7 @@ export function useChatPane(options) {
         }
         if (sendBlocker !== null || startingPromptRef.current)
             return;
-        await sendGuardedPrompt({ redaction: refused.redaction, attachments: refused.attachments, composerDraft: refused.draft });
+        await sendGuardedPrompt({ redaction: refused.redaction, attachments: refused.attachments, composerDraft: refused.draft, folders: refused.folders });
     }, [send, sendBlocker, sendGuardedPrompt]);
     const sendAsNewMessage = useCallback(async () => {
         const prompt = composerPrompt(composer);
@@ -773,7 +790,7 @@ export function useChatPane(options) {
         }
         if (activeUploadCount > 0 || attachmentError !== null)
             return;
-        const target = queuedForLiveDeliveryRef.current ? findMidRunTarget({
+        const target = queuedForLiveDeliveryRef.current && !queuedInputs.some(input => input.folders?.length) ? findMidRunTarget({
             deliver: options.deliverMidRunMessage,
             blocker: sendBlocker, attachmentCount: queuedInputs.flatMap(input => input.attachments).length, messages: conversation.messages,
         }) : null;