@jini-ai/chat 0.6.15 → 0.6.17

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

@@ -1,7 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { pickerModelValue, pickerCatalogNote, pickerModelOptions, shortModelLabel } from '../model-options.js';
+import { useId } from 'react';
 import { createPortal } from 'react-dom';
 import { AgentIcon, RemixIcon, SearchableModelSelect } from '@jini-ai/ui';
+import { InfoTip } from '@jini-ai/ui/admin-widgets';
 import { assessNativeToolPolicy } from '@jini-ai/agent-runtime/native-tool-policy';
 import { useT } from '../../../hooks/context.js';
 import { definedProps } from '../../../util/defined-props.js';
@@ -18,27 +20,37 @@ export function runtimeAgentStatus({ agent }) {
         return 'Installed · sign-in required';
     return agent.version ?? 'Installed';
 }
+/**
+ * An agent's `fullCliAccessNote` as a warning icon whose tip (hover, focus, tap) holds the text.
+ * It was a paragraph beside the model picker that squeezed the composer row (owner 2026-10-30).
+ * `descriptionId` lets the agent's own radio in the picker list read the same text.
+ */
+function FullAccessNoteTip({ note, descriptionId, t }) {
+    return (_jsx("span", { className: "jini-runtime-access-note", children: _jsx(InfoTip, { label: t(note), triggerLabel: t('Full computer access'), descriptionId: descriptionId, placement: "top", icon: _jsx(RemixIcon, { name: "alert-line", size: 16 }) }) }));
+}
 /** Selection preflight uses the launch assessor; it never substitutes for enforcement. */
 function NativeToolPolicyWarning({ agent, policy, isApi }) {
     const t = useT();
     if (!agent || isApi)
         return null;
     const warning = policy ? assessNativeToolPolicy({ def: agent, policy }) : null;
-    return _jsxs(_Fragment, { children: [agent.fullCliAccessNote ? _jsx("p", { children: t(agent.fullCliAccessNote) }) : null, warning ? _jsx("p", { role: "alert", children: t(warning) }) : null] });
+    return _jsxs(_Fragment, { children: [agent.fullCliAccessNote ? _jsx(FullAccessNoteTip, { note: agent.fullCliAccessNote, t: t }) : null, warning ? _jsx("p", { role: "alert", children: t(warning) }) : null] });
 }
 function RuntimeModeButtons({ executionMode, daemonOnline, apiModeAvailable, onExecutionModeChange, t, }) {
     const localModeLabel = executionMode === 'local' ? t('active') : '';
     return (_jsxs(_Fragment, { children: [_jsxs("button", { type: "button", className: `jini-runtime-mode${executionMode === 'local' ? ' is-active' : ''}`, disabled: !daemonOnline && executionMode !== 'local', onClick: () => onExecutionModeChange?.('local'), children: [_jsx(RemixIcon, { name: "terminal-box-line", size: 18 }), _jsx("span", { children: t('Use Local CLI') }), _jsx("span", { className: "jini-runtime-mode__meta", children: !daemonOnline ? t('offline') : localModeLabel }), executionMode === 'local' ? (_jsx(RemixIcon, { name: "check-line", size: 19, className: "jini-runtime-check" })) : null] }), _jsxs("button", { type: "button", className: `jini-runtime-mode${executionMode === 'api' ? ' is-active' : ''}`, disabled: !apiModeAvailable, onClick: () => onExecutionModeChange?.('api'), children: [_jsx(RemixIcon, { name: "link", size: 18 }), _jsx("span", { children: t('Use API · BYOK') }), !apiModeAvailable ? _jsx("span", { className: "jini-runtime-mode__meta", children: t('not configured') }) : null, executionMode === 'api' ? (_jsx(RemixIcon, { name: "check-line", size: 19, className: "jini-runtime-check" })) : null] })] }));
 }
 function RuntimeAgentList({ orderedAgents, value, onChange, agentIconBasePath, t, }) {
+    const noteIdPrefix = useId();
     if (orderedAgents.length === 0) {
         return _jsx("div", { className: "jini-runtime-empty", children: t('No available code agents') });
     }
-    return (_jsx(_Fragment, { children: orderedAgents.map((agent) => {
-            const active = agent.id === value.agentId;
-            const status = runtimeAgentStatus({ agent: agent });
-            return (_jsxs("button", { type: "button", role: "radio", "aria-checked": active, className: `jini-runtime-agent${active ? ' is-active' : ''}`, "aria-current": active ? 'true' : undefined, "aria-label": `${agent.name} · ${status}`, onClick: () => onChange(defaultChatPaneSelection({ agent: agent })), children: [_jsx(AgentIcon, { id: agent.id, size: 20, className: "jini-runtime-agent-icon", ...definedProps({ source: { basePath: agentIconBasePath } }) }), _jsxs("span", { className: "jini-runtime-agent__copy", children: [_jsx("strong", { children: agent.name }), agent.fullCliAccessNote ? _jsx("small", { children: t(agent.fullCliAccessNote) }) : null] }), agent.supportsTools === false ? (_jsx("span", { className: "jini-runtime-agent__badge", title: t("This CLI has no MCP support, so it cannot use this app's tools."), children: t('No tools') })) : null, _jsx("span", { className: "jini-runtime-agent__status", children: active ? t('selected') : status }), active ? (_jsx(RemixIcon, { name: "check-line", size: 19, className: "jini-runtime-check" })) : null] }, agent.id));
-        }) }));
+    return (_jsx(_Fragment, { children: orderedAgents.map((agent) => (_jsx(RuntimeAgentRow, { agent: agent, active: agent.id === value.agentId, noteId: agent.fullCliAccessNote ? `${noteIdPrefix}-${agent.id}-note` : undefined, onChange: onChange, agentIconBasePath: agentIconBasePath, t: t }, agent.id))) }));
+}
+function RuntimeAgentRow({ agent, active, noteId, onChange, agentIconBasePath, t }) {
+    const status = runtimeAgentStatus({ agent: agent });
+    // The note's icon is a control of its own, so it sits beside the radio, never inside it.
+    return (_jsxs("div", { className: "jini-runtime-agent-row", children: [_jsxs("button", { type: "button", role: "radio", "aria-checked": active, className: `jini-runtime-agent${active ? ' is-active' : ''}`, "aria-current": active ? 'true' : undefined, "aria-label": `${agent.name} · ${status}`, ...(noteId ? { 'aria-describedby': noteId } : {}), onClick: () => onChange(defaultChatPaneSelection({ agent: agent })), children: [_jsx(AgentIcon, { id: agent.id, size: 20, className: "jini-runtime-agent-icon", ...definedProps({ source: { basePath: agentIconBasePath } }) }), _jsx("span", { className: "jini-runtime-agent__copy", children: _jsx("strong", { children: agent.name }) }), agent.supportsTools === false ? (_jsx("span", { className: "jini-runtime-agent__badge", title: t("This CLI has no MCP support, so it cannot use this app's tools."), children: t('No tools') })) : null, _jsx("span", { className: "jini-runtime-agent__status", children: active ? t('selected') : status }), active ? (_jsx(RemixIcon, { name: "check-line", size: 19, className: "jini-runtime-check" })) : null] }), agent.fullCliAccessNote ? _jsx(FullAccessNoteTip, { note: agent.fullCliAccessNote, descriptionId: noteId, t: t }) : null] }));
 }
 /**
  * The composer bar's "Model ⌄" and "Effort ⌄" drop-ups for the selected CLI. These replace the

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 }));
             },
@@ -302,11 +303,11 @@ function buildChatPaneSlots({ surfaceSlots, embed, renderRuntimePicker }, { lead
             footerAccessories: embed ? undefined : renderRuntimePicker(),
         } });
 }
-function ChatPaneTranscript({ pane, emptyState, embed, suggestions, onSelectSuggestion, pendingPrompts, projectFileNameSet, toolCallDisplay, showUsageLine, showThinking, t, }) {
+function ChatPaneTranscript({ pane, sendingLabel, emptyState, embed, suggestions, onSelectSuggestion, pendingPrompts, projectFileNameSet, toolCallDisplay, showUsageLine, showThinking, t, }) {
     if (pane.conversation.messages.length === 0 && emptyState) {
         return (_jsxs("div", { className: "jini-message-list jini-message-list--empty", children: [emptyState, embed && _jsx(ChatPaneSuggestionsRow, { suggestions: suggestions, onSelect: onSelectSuggestion, t: t })] }));
     }
-    return (_jsx(MessageList, { messages: pane.conversation.messages, isStreaming: pane.conversation.isStreaming, scrollIntent: pane.conversation.scrollIntent, onScrolled: pane.conversation.acknowledgeScroll, pendingPrompts: pendingPrompts, toolCallDisplay: toolCallDisplay, showUsageLine: showUsageLine, showThinking: showThinking, ...(projectFileNameSet === undefined ? {} : { projectFileNames: projectFileNameSet }) }));
+    return (_jsx(MessageList, { messages: pane.conversation.messages, ...definedProps({ source: { sendingLabel } }), isStreaming: pane.conversation.isStreaming, scrollIntent: pane.conversation.scrollIntent, onScrolled: pane.conversation.acknowledgeScroll, pendingPrompts: pendingPrompts, toolCallDisplay: toolCallDisplay, showUsageLine: showUsageLine, showThinking: showThinking, ...(projectFileNameSet === undefined ? {} : { projectFileNames: projectFileNameSet }) }));
 }
 /** The controls-area suggestions row shows on every workspace surface, and on the embed surface
  * only when the empty transcript has no `emptyState` to host it instead. */
@@ -404,6 +405,6 @@ export function ChatPane(props) {
     const selectSuggestion = useChatPaneSuggestion({ rootRef, setDraft: pane.composer.setDraft });
     const openLinkInNewTab = useChatPaneNewTabLinks();
     const { pendingPrompts, projectFileNameSet } = useChatPaneTranscriptProps({ pane }, definedProps({ source: { projectFileNames: p.projectFileNames } }));
-    return (_jsxs("section", { className: chatPaneClassName(p.variant, p.className), style: p.style, "data-activity": pane.activity, ref: rootRef, onClickCapture: openLinkInNewTab, children: [_jsx("style", { "data-jini-chat-pane-styles": "true", children: CHAT_PANE_STYLES }), p.header ?? defaultHeader(p.title, pane.reset, t), p.agentPluginsMode !== 'off' && _jsx(AgentPluginUsage, { conversationId: pane.conversation.conversationId, messages: pane.conversation.messages }), _jsxs("div", { className: "jini-chat-pane__body", children: [_jsx(ChatPaneTranscript, { pane: pane, emptyState: p.emptyState, embed: surface.embed, suggestions: p.suggestions, onSelectSuggestion: selectSuggestion, pendingPrompts: pendingPrompts, projectFileNameSet: projectFileNameSet, toolCallDisplay: p.toolCallDisplay, showUsageLine: p.showUsageLine, showThinking: p.showThinking, t: t }), _jsxs("div", { className: "jini-chat-pane__controls", ref: controlsRef, children: [showsControlsSuggestions(surface.embed, pane.conversation.messages.length, p.emptyState) && (_jsx(ChatPaneSuggestionsRow, { suggestions: p.suggestions, onSelect: selectSuggestion, t: t })), pane.secretRedacted ? _jsx("div", { className: "jini-chat-pane__notice", role: "status", children: t(SECRET_REDACTED_NOTICE) }) : null, _jsx(ChatPaneStatusMessages, { unavailable: unavailable, scanningAgents: runtimeView.scanningAgents, connectingAgents: runtimeView.connectingAgents, executionMode: p.executionMode, apiModeAvailable: p.apiModeAvailable, onExecutionModeChange: p.onExecutionModeChange, sendError: pane.conversation.sendError, onRetrySend: () => void pane.retrySend(), attachmentError: pane.attachmentError, dropReadError: fileDrop.dropReadError, workingDirectoryError: pane.workingDirectoryError, workingDirectoryPending: pane.workingDirectoryPending, workingDirectoryInvalid: pane.workingDirectoryInvalid, runtimeInventoryError: inventory.runtimeInventoryError, typedAnswerNotice: pane.typedAnswerNotice, t: t }), _jsx(ChatPaneComposerArea, { fileDrop: fileDrop, uploadAttachments: surface.uploadAttachments, pane: pane, disabled: p.disabled, unavailable: unavailable, placeholder: composerPlaceholder, slots: slots, attachmentAccept: p.attachmentAccept, workingDirectoryAccess: p.workingDirectoryAccess, workingDirectoryControlPlacement: surface.workingDirectoryControlPlacement, t: t })] })] }), p.footer] }));
+    return (_jsxs("section", { className: chatPaneClassName(p.variant, p.className), style: p.style, "data-activity": pane.activity, ref: rootRef, onClickCapture: openLinkInNewTab, children: [_jsx("style", { "data-jini-chat-pane-styles": "true", children: CHAT_PANE_STYLES }), p.header ?? defaultHeader(p.title, pane.reset, t), p.agentPluginsMode !== 'off' && _jsx(AgentPluginUsage, { conversationId: pane.conversation.conversationId, messages: pane.conversation.messages }), _jsxs("div", { className: "jini-chat-pane__body", children: [_jsx(ChatPaneTranscript, { pane: pane, sendingLabel: p.sendingLabel, emptyState: p.emptyState, embed: surface.embed, suggestions: p.suggestions, onSelectSuggestion: selectSuggestion, pendingPrompts: pendingPrompts, projectFileNameSet: projectFileNameSet, toolCallDisplay: p.toolCallDisplay, showUsageLine: p.showUsageLine, showThinking: p.showThinking, t: t }), _jsxs("div", { className: "jini-chat-pane__controls", ref: controlsRef, children: [showsControlsSuggestions(surface.embed, pane.conversation.messages.length, p.emptyState) && (_jsx(ChatPaneSuggestionsRow, { suggestions: p.suggestions, onSelect: selectSuggestion, t: t })), pane.secretRedacted ? (_jsxs("div", { className: "jini-chat-pane__status jini-chat-pane__status--dismissible", role: "status", children: [_jsx("span", { children: t(SECRET_REDACTED_NOTICE) }), _jsx("button", { type: "button", className: "jini-chat-pane__error-action", onClick: pane.dismissSecretRedacted, children: t('Dismiss') })] })) : null, _jsx(ChatPaneStatusMessages, { unavailable: unavailable, scanningAgents: runtimeView.scanningAgents, connectingAgents: runtimeView.connectingAgents, executionMode: p.executionMode, apiModeAvailable: p.apiModeAvailable, onExecutionModeChange: p.onExecutionModeChange, sendError: pane.conversation.sendError, onRetrySend: () => void pane.retrySend(), attachmentError: pane.attachmentError, dropReadError: fileDrop.dropReadError, workingDirectoryError: pane.workingDirectoryError, workingDirectoryPending: pane.workingDirectoryPending, workingDirectoryInvalid: pane.workingDirectoryInvalid, runtimeInventoryError: inventory.runtimeInventoryError, typedAnswerNotice: pane.typedAnswerNotice, t: t }), _jsx(ChatPaneComposerArea, { fileDrop: fileDrop, uploadAttachments: surface.uploadAttachments, pane: pane, disabled: p.disabled, unavailable: unavailable, placeholder: composerPlaceholder, slots: slots, attachmentAccept: p.attachmentAccept, workingDirectoryAccess: p.workingDirectoryAccess, workingDirectoryControlPlacement: surface.workingDirectoryControlPlacement, t: t })] })] }), p.footer] }));
 }
 //# sourceMappingURL=ChatPane.js.map

package/dist/react/features/chat-pane/hooks/useChatPane.hooks.d.ts

@@ -44,8 +44,10 @@ export interface UseChatPaneOptions extends UserTextRedactionOptions {
     deliverMidRunMessage?: DeliverMidRunMessage;
 }
 export interface UseChatPaneResult extends UseChatPaneWorkingDirectoryResult {
-    /** Show a localized non-secret notice when a paste was removed. */
+    /** Show a localized non-secret notice when a paste was removed. Cleared by the next send or {@link dismissSecretRedacted}. */
     secretRedacted: boolean;
+    /** Hides the redaction notice. */
+    dismissSecretRedacted: () => void;
     conversation: UseConversationResult;
     composer: UseComposerResult;
     selection: ChatPaneAgentSelection;

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,
@@ -680,12 +697,13 @@ export function useChatPane(options) {
         if (!prompt || composerDeliveryBlocked({ delivering: deliveringTypedAnswerRef.current, starting: startingPromptRef.current, composer, submitted: submittedComposerRef.current }))
             return;
         setTypedAnswerNotice(null);
+        guard.clearNotice();
         // Until upload completes, an empty attachment list is not evidence of a text-only answer.
         if (uploadingWhileStreaming) {
             await sendOrdinaryTurn(prompt);
             return;
         }
-        const typedAnswer = findTypedAnswerTarget({
+        const typedAnswer = composer.folders?.length ? null : findTypedAnswerTarget({
             deliver: options.deliverTypedAnswer,
             blocker: sendBlocker,
             attachmentCount: composer.attachments.length,
@@ -701,6 +719,7 @@ export function useChatPane(options) {
         composer,
         conversation.isStreaming,
         conversation.messages,
+        guard.clearNotice,
         options.deliverTypedAnswer,
         sendBlocker,
         sendOrdinaryTurn,
@@ -713,23 +732,25 @@ 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);
         if (!prompt || composerDeliveryBlocked({ delivering: deliveringTypedAnswerRef.current, starting: startingPromptRef.current, composer, submitted: submittedComposerRef.current }))
             return;
         setTypedAnswerNotice(null);
+        guard.clearNotice();
         await sendOrdinaryTurn(prompt);
-    }, [composer, sendOrdinaryTurn]);
+    }, [composer, guard.clearNotice, sendOrdinaryTurn]);
     const interruptSend = useCallback(() => {
         const prompt = composerPrompt(composer);
         if (!prompt || composerDeliveryBlocked({ delivering: deliveringTypedAnswerRef.current, starting: startingPromptRef.current, composer, submitted: submittedComposerRef.current }))
             return;
+        guard.clearNotice();
         enqueueTurn({ turn: guard.redact({ text: prompt }, {}) });
         composer.setDraft('');
         conversation.cancel();
-    }, [composer, conversation, enqueueTurn, guard.redact]);
+    }, [composer, conversation, enqueueTurn, guard.clearNotice, guard.redact]);
     /** Abort only uploads owned by the removed inputs; late completions must not refill the composer. */
     const discardQueuedUploads = useCallback(({ id }, _options = {}) => {
         for (const [controller, owner] of queuedUploadOwnersRef.current) {
@@ -769,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;
@@ -799,6 +820,7 @@ export function useChatPane(options) {
         composer.reset();
         setAttachmentError(null);
         setTypedAnswerNotice(null);
+        guard.clearNotice();
         typedAnswerGenerationRef.current += 1;
         // Without this, a prompt queued behind a streaming run survives `reset()` and — once
         // `conversation.cancel()` above clears the streaming blocker — the flush effect fires it into
@@ -808,9 +830,10 @@ export function useChatPane(options) {
         queuedUploadOwnersRef.current.clear();
         setQueuedInputs([]);
         refusedSendRef.current = null;
-    }, [composer, conversation, options.initialMessages]);
+    }, [composer, conversation, guard.clearNotice, options.initialMessages]);
     return {
         secretRedacted: guard.secretRedacted,
+        dismissSecretRedacted: guard.clearNotice,
         conversation,
         composer,
         selection,