@jini-ai/chat 0.5.3 → 0.5.5

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

@@ -0,0 +1,89 @@
+/** One credential policy for chat text; secure card values must bypass this text-only boundary. */
+import { redactSecretShapes } from '@jini-ai/diagnostics/redaction/secrets-only';
+export const SECRET_REDACTED_NOTICE = 'I removed what looked like a key from your message. If it was real, rotate it. Use the secure form to save it.';
+export const CREDENTIAL_CARD_GUIDANCE = 'Use the secure form to save keys, tokens, passwords, and secrets. Chat answers are sent to the assistant.';
+const REMOVED = '[token removed]';
+const INTERNAL_REMOVED = '[REDACTED:chat_secret]';
+const REDACTION_MARKER = /\[REDACTED:[^\]\r\n]+\]/g;
+const CHAT_RULES = [
+    { kind: 'chat_key', pattern: /(?<![A-Za-z0-9_-])sk-[A-Za-z0-9_-]{16,}/g, replacement: () => INTERNAL_REMOVED },
+    { kind: 'chat_key', pattern: /(?<![A-Za-z0-9_])xox[baprs]-[A-Za-z0-9-]{16,}/g, replacement: () => INTERNAL_REMOVED },
+    // Explicit authorization syntax catches even short values. Exempt scheme descriptions in prose.
+    { kind: 'chat_bearer', pattern: /\bBearer[ \t]+(?!\[REDACTED)(?!(?:token|tokens|authentication|authorization|auth|scheme|credentials?)\b)[A-Za-z0-9._~+\/=-]+/gi, replacement: () => 'Bearer ' + INTERNAL_REMOVED },
+];
+function entropy(text) {
+    const counts = new Map();
+    for (const char of text)
+        counts.set(char, (counts.get(char) ?? 0) + 1);
+    let bits = 0;
+    for (const count of counts.values()) {
+        const probability = count / text.length;
+        bits -= probability * Math.log2(probability);
+    }
+    return bits;
+}
+/** Stricter than error redaction: also detects unlabelled long tokens, while retaining ordinary URLs,
+ * hexadecimal hashes, identifiers and prose. Strong credential syntax inside a URL is still caught. */
+export function redactUserText({ text }, { secretField = false } = {}) {
+    // Existing removal markers must survive a second pass through assignment rules (api_key=…).
+    const literalMarkers = new Map();
+    let literalPrefix = 'chat_literal_';
+    while (text.includes(literalPrefix))
+        literalPrefix += '_';
+    const protectedText = text.replace(REDACTION_MARKER, marker => {
+        const key = '[REDACTED:' + literalPrefix + literalMarkers.size + ']';
+        literalMarkers.set(key, marker);
+        return key;
+    }).replaceAll(REMOVED, INTERNAL_REMOVED);
+    const base = redactSecretShapes({ text: protectedText, policy: { additionalRules: CHAT_RULES } });
+    let count = base.redactions;
+    const urls = [...base.text.matchAll(/\b[a-z][a-z0-9+.-]*:\/\/[^\s<>"']+/gi)]
+        .map(match => ({ start: match.index, end: match.index + match[0].length }));
+    let cleaned = base.text.replace(/(?<![A-Za-z0-9_+\/=-])[A-Za-z0-9_+\/=-]{40,}(?![A-Za-z0-9_+\/=-])/g, (candidate, offset) => {
+        if (urls.some(url => offset >= url.start && offset < url.end))
+            return candidate;
+        if (/^[a-f0-9]+$/i.test(candidate) || !/[A-Za-z]/.test(candidate))
+            return candidate;
+        const bits = entropy(candidate);
+        const mixedAlphabet = /[A-Z]/.test(candidate) && /[a-z]/.test(candidate);
+        if (bits < 4 || (!/[0-9]/.test(candidate) && (!mixedAlphabet || bits < 4.5)))
+            return candidate;
+        count += 1;
+        return INTERNAL_REMOVED;
+    });
+    // A labelled credential answer can be a short password with no recognisable shape at all.
+    if (secretField && cleaned.trim() !== '' && cleaned !== INTERNAL_REMOVED) {
+        cleaned = INTERNAL_REMOVED;
+        count = Math.max(1, count);
+    }
+    return { text: cleaned.replace(REDACTION_MARKER, marker => literalMarkers.get(marker) ?? REMOVED), secretRedacted: count > 0, count };
+}
+/** Prepare before storage OR model dispatch. Return only sanitized content and non-secret metadata. */
+export function redactUserMessage({ message }, options = {}) {
+    if (message.role !== 'user')
+        return { message, secretRedacted: false, count: 0 };
+    const result = (options.redactUserText ?? redactUserText)({ text: message.content });
+    const signal = result.secretRedacted ? { secretRedacted: true, count: result.count } : undefined;
+    if (signal)
+        options.onSecretRedacted?.(signal);
+    return {
+        message: { ...message, content: result.text, ...(signal ? { secretRedaction: signal } : {}) },
+        secretRedacted: result.secretRedacted, count: result.count,
+    };
+}
+/** Also protects replay of historical text accepted before the guard was installed. */
+export function redactUserHistory({ history }, options = {}) {
+    return history.map(message => redactUserMessage({ message }, options).message);
+}
+/** Redact model input and append the host's non-secret card guidance once, using the redaction
+ * signal rather than display text. `secretRedacted` carries an earlier ingress/composer signal;
+ * persistence must continue to use redactUserText/redactUserMessage without the model note. */
+export function guardUserText({ text }, options = {}) {
+    const safe = (options.redactUserText ?? redactUserText)({ text }, {});
+    if (!safe.secretRedacted && options.secretRedacted !== true)
+        return safe.text;
+    if (!options.modelNote || safe.text.includes(options.modelNote))
+        return safe.text;
+    return `${safe.text}\n\n${options.modelNote}`;
+}
+//# sourceMappingURL=user-text-redaction.js.map

package/dist/embed-widget/browser/page-actions.d.ts

@@ -1,121 +1,2 @@
-/** Resolved target supplied by the host; the client never derives a path from a title. */
-export interface ResolvedPageTarget {
-    readonly slug: string;
-    readonly title: string;
-    readonly path: string;
-}
-export type PageAction = {
-    readonly type: 'navigate';
-    readonly target: ResolvedPageTarget;
-    readonly auto: boolean;
-} | {
-    readonly type: 'scroll_to' | 'highlight';
-    readonly target: ResolvedPageTarget;
-};
-export type NavigateAction = Extract<PageAction, {
-    type: 'navigate';
-}>;
-export type NonNavigateAction = Exclude<PageAction, {
-    type: 'navigate';
-}>;
-export interface DirectiveCarryingEvent {
-    readonly kind: string;
-    readonly name?: string;
-    readonly data?: unknown;
-}
-export interface SplitPageActions {
-    readonly navigate: NavigateAction | null;
-    readonly other: NonNavigateAction | null;
-}
-/** Narrows an untrusted, bare queued action. URL authorization remains a separate host policy. O(1). */
-export declare function isQueuedPageAction(args: {
-    value: unknown;
-}): args is {
-    value: PageAction;
-};
-/** Narrows an untrusted directive envelope, dropping unknown kinds. O(1). */
-export declare function isPageActionDirective(args: {
-    value: unknown;
-}): args is {
-    value: {
-        kind: 'page_action';
-        action: PageAction;
-    };
-};
-/** Preserves valid action order while ignoring unrelated events. O(events) time and output space. */
-export declare function extractPageActions({ events, directiveEventName }: {
-    events: readonly DirectiveCarryingEvent[] | undefined;
-    directiveEventName: string;
-}): PageAction[];
-/** Returns only the first navigation and first page treatment. O(actions), O(1) extra space. */
-export declare function splitPageActions({ actions }: {
-    actions: readonly PageAction[];
-}): SplitPageActions;
-export interface TargetSelectionPolicy {
-    readonly candidateSelector: string;
-    readonly excludedAncestorSelector: string;
-}
-/** Exact title match first, case-insensitive fallback; never searches excluded UI. O(candidates). */
-export declare function findTargetElement({ title, root, selection }: {
-    title: string;
-    root: Pick<ParentNode, 'querySelectorAll'>;
-    selection: TargetSelectionPolicy;
-}): Element | null;
-export interface PageActionTimerPort {
-    schedule(args: {
-        callback: () => void;
-        delayMs: number;
-    }): unknown;
-    cancel(args: {
-        handle: unknown;
-    }): void;
-}
-export interface PageActionPort {
-    allows(args: {
-        action: PageAction;
-    }): boolean;
-    navigate(args: {
-        action: NavigateAction;
-    }): boolean;
-    execute(args: {
-        action: NonNavigateAction;
-    }): boolean;
-    clearHighlight(args: Record<string, never>): void;
-}
-export interface BrowserPageActionController extends PageActionPort {
-    applyHighlight(args: {
-        element: Element;
-    }): void;
-    scrollToElement(args: {
-        element: Element;
-    }): void;
-}
-export interface BrowserPageActionsArgs {
-    readonly root: Pick<ParentNode, 'querySelectorAll'>;
-    readonly selection: TargetSelectionPolicy;
-    readonly allowPath: (args: {
-        path: string;
-    }) => boolean;
-    readonly navigate: (args: {
-        path: string;
-    }) => void;
-    readonly reducedMotion: (args: Record<string, never>) => boolean;
-    readonly scroll: (args: {
-        element: Element;
-        options: ScrollIntoViewOptions;
-    }) => void;
-    readonly timers: PageActionTimerPort;
-    readonly highlightClass: string;
-    readonly fadeAnimationName: string;
-    readonly cleanupFallbackMs: number;
-}
-/**
- * Creates page effects with injected DOM, navigation, URL policy, scroll and timers.
- * At most one highlight belongs to this instance; cleanup and navigation remove it.
- * URL policy is checked before queueing, navigation or page effects. Stale timers and descendant
- * animation events cannot remove the current highlight. Navigation paths are resolved by the host,
- * never guessed from a title; each controller owns its mutable highlight state.
- * @complexity Execute O(candidates); other operations O(1), with one timer/listener retained.
- */
-export declare function createBrowserPageActions(args: BrowserPageActionsArgs): BrowserPageActionController;
+export * from '../../core/browser/page-actions.js';
 //# sourceMappingURL=page-actions.d.ts.map

package/dist/embed-widget/browser/page-actions.js

@@ -1,113 +1,3 @@
-function record(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-function target(value) {
-    return record(value) && typeof value.slug === 'string' && typeof value.title === 'string' && typeof value.path === 'string';
-}
-/** Narrows an untrusted, bare queued action. URL authorization remains a separate host policy. O(1). */
-export function isQueuedPageAction(args) {
-    const { value } = args;
-    if (!record(value) || !target(value.target))
-        return false;
-    return value.type === 'navigate' ? typeof value.auto === 'boolean' : value.type === 'scroll_to' || value.type === 'highlight';
-}
-/** Narrows an untrusted directive envelope, dropping unknown kinds. O(1). */
-export function isPageActionDirective(args) {
-    const { value } = args;
-    return record(value) && value.kind === 'page_action' && isQueuedPageAction({ value: value.action });
-}
-/** Preserves valid action order while ignoring unrelated events. O(events) time and output space. */
-export function extractPageActions({ events, directiveEventName }) {
-    const actions = [];
-    for (const event of events ?? []) {
-        const envelope = { value: event.data };
-        if (event.kind === 'ext' && event.name === directiveEventName && isPageActionDirective(envelope)) {
-            actions.push(envelope.value.action);
-        }
-    }
-    return actions;
-}
-/** Returns only the first navigation and first page treatment. O(actions), O(1) extra space. */
-export function splitPageActions({ actions }) {
-    return {
-        navigate: actions.find((a) => a.type === 'navigate') ?? null,
-        other: actions.find((a) => a.type !== 'navigate') ?? null,
-    };
-}
-/** Exact title match first, case-insensitive fallback; never searches excluded UI. O(candidates). */
-export function findTargetElement({ title, root, selection }) {
-    const needle = title.trim();
-    if (!needle)
-        return null;
-    const candidates = Array.from(root.querySelectorAll(selection.candidateSelector))
-        .filter(el => !el.closest(selection.excludedAncestorSelector));
-    return candidates.find(el => (el.textContent ?? '').trim() === needle)
-        ?? candidates.find(el => (el.textContent ?? '').trim().toLowerCase() === needle.toLowerCase()) ?? null;
-}
-/**
- * Creates page effects with injected DOM, navigation, URL policy, scroll and timers.
- * At most one highlight belongs to this instance; cleanup and navigation remove it.
- * URL policy is checked before queueing, navigation or page effects. Stale timers and descendant
- * animation events cannot remove the current highlight. Navigation paths are resolved by the host,
- * never guessed from a title; each controller owns its mutable highlight state.
- * @complexity Execute O(candidates); other operations O(1), with one timer/listener retained.
- */
-export function createBrowserPageActions(args) {
-    if (!Number.isFinite(args.cleanupFallbackMs) || args.cleanupFallbackMs < 0)
-        throw new Error('Invalid highlight deadline');
-    let current = null;
-    const clearHighlight = (_args) => {
-        if (!current)
-            return;
-        const old = current;
-        current = null;
-        args.timers.cancel({ handle: old.handle });
-        old.element.removeEventListener('animationend', old.onEnd);
-        old.element.classList.remove(args.highlightClass);
-    };
-    function highlight(element) {
-        if (current?.element === element)
-            return;
-        clearHighlight({});
-        const onEnd = event => {
-            if (event.target === element && event.animationName === args.fadeAnimationName)
-                clearHighlight({});
-        };
-        element.classList.add(args.highlightClass);
-        element.addEventListener('animationend', onEnd);
-        // Identity check makes even a late callback from a canceled timer harmless.
-        const handle = args.timers.schedule({ delayMs: args.cleanupFallbackMs, callback: () => {
-                if (current?.element === element && current.onEnd === onEnd)
-                    clearHighlight({});
-            } });
-        current = { element, handle, onEnd };
-    }
-    const scrollToElement = ({ element }) => {
-        args.scroll({ element, options: { behavior: args.reducedMotion({}) ? 'auto' : 'smooth', block: 'center' } });
-    };
-    return {
-        applyHighlight({ element }) { highlight(element); },
-        scrollToElement,
-        allows({ action }) { return args.allowPath({ path: action.target.path }); },
-        navigate({ action }) {
-            if (!args.allowPath({ path: action.target.path }))
-                return false;
-            clearHighlight({});
-            args.navigate({ path: action.target.path });
-            return true;
-        },
-        execute({ action }) {
-            if (!args.allowPath({ path: action.target.path }))
-                return false;
-            const element = findTargetElement({ title: action.target.title, root: args.root, selection: args.selection });
-            if (!element)
-                return false;
-            scrollToElement({ element });
-            if (action.type === 'highlight')
-                highlight(element);
-            return true;
-        },
-        clearHighlight,
-    };
-}
+// Compatibility path; shared page-action decisions belong to chat core.
+export * from '../../core/browser/page-actions.js';
 //# sourceMappingURL=page-actions.js.map

package/dist/embed-widget/react/embed.d.ts

@@ -1,7 +1,7 @@
 import type { ChatTransport } from '../../core/transport.js';
 import type { ChatPaneAgent } from '../../react/chat-pane.js';
 import type { BrowserSessionStore } from '../browser/session-store.js';
-import type { PageActionPort } from '../browser/page-actions.js';
+import type { PageActionPort } from '../../core/browser/page-actions.js';
 import type { EmbedHeaderCopy, EscapeKeyPort } from './header.js';
 export { EmbedChatHeader } from './header.js';
 export type { EmbedChatHeaderArgs, EmbedHeaderCopy, EscapeKeyPort } from './header.js';

package/dist/embed-widget/react/embed.js

@@ -5,7 +5,7 @@ import { isTerminalRunStatus } from '../../core/messages.js';
 import { ChatPane } from '../../react/chat-pane.js';
 import { ChatFab } from '../../react/components/ChatFab.js';
 import { JiniChatProvider } from '../../react/components/JiniChatProvider.js';
-import { extractPageActions, splitPageActions, isQueuedPageAction } from '../browser/page-actions.js';
+import { extractPageActions, splitPageActions, isQueuedPageAction } from '../../core/browser/page-actions.js';
 import { EmbedChatHeader } from './header.js';
 export { EmbedChatHeader } from './header.js';
 const shellStyles = `

package/dist/react/artifact-types.d.ts

@@ -1,22 +1,16 @@
 /**
  * @module artifact-types
  *
- * Minimal `ArtifactFile`/`ArtifactRenderer`/`RendererRegistry` shapes,
- * defined locally per this task's SCOPE NOTE: r4b calls the artifact-renderer
- * package `@jini-ai/artifacts-react`; the actual locked name
- * (`ADS-memory/reports/jini-port/extraction-plan.md` §3) is `@jini-ai/renderers-react`, which
- * is still a placeholder stub being built in a separate session. `chat-react`
- * needs these shapes now (for `useArtifactStream` and the `ArtifactFile`
- * field on `ProjectContextValue`), so they are defined here to the exact
- * shape r4b §2 specifies, with the intent that a future pass re-points every
- * import below at `@jini-ai/renderers-react`'s real exports once that package
- * lands, deletes this file, and removes the re-export from `index.ts`.
+ * Chat's public streaming artifact contracts, used by useArtifactStream and
+ * ProjectContextValue. The renderer implementation is available in @jini-ai/ui,
+ * but direct delegation would change this compatibility surface: chat registers
+ * mutably, resolves newest-first, returns unregister handles, accepts files
+ * without manifests and returns the matched file. UI's registry is immutable,
+ * replaces registrations by ID, requires a manifest and returns that manifest;
+ * its predicate and resolve signatures also pass hints as a separate option.
  *
- * TODO(renderers-react): replace this file's contents with
- * `export * from '@jini-ai/renderers-react'` (or the equivalent named
- * re-exports) once `@jini-ai/renderers-react` ships real `ArtifactFile`/
- * `ArtifactRenderer`/`RendererRegistry` implementations. Do not block this
- * package's other work on that package landing first.
+ * TODO(renderer-delegation): Coordinator must resolve these contracts before
+ * delegating to UI. A wildcard re-export is not a behavior-preserving migration.
  */
 import type { ArtifactManifest } from '../core/index.js';
 /** Generic artifact-file shape a host's project/workspace file maps onto. */

package/dist/react/components/Composer.js

@@ -15,6 +15,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useLayoutEffect, useRef, useState, } from 'react';
 import { RemixIcon } from '@jini-ai/ui';
 import { useT } from '../hooks/context.js';
+import { useComposerHistoryKeys } from '../hooks/useComposerHistoryKeys.hooks.js';
 import { AttachmentTray } from './AttachmentTray.js';
 import { ComposerDiscoveryMenu, ComposerSlashMenu } from './ComposerDiscovery.js';
 import { appendComposerDiscovery, composerDiscoveryMenuPosition, composerSlashMenuPosition, filterComposerDiscovery, parseComposerSlashQuery, replaceComposerSlashTrigger, resolveComposerSlashInvocation, resolveComposerSlashKeyAction, } from './composer-discovery.js';
@@ -103,6 +104,9 @@ export function Composer({ composer, onSend, disabled = false, sendDisabled = fa
      * point the shrinking list is its own feedback.
      */
     const showSlashFilterHint = slashQuery !== null && slashQuery.command === '' && slashQuery.argument === null;
+    const handleHistoryKey = useComposerHistoryKeys({ composer, textareaRef }, {
+        popupOpen: slashOpen || discoveryMenuOpen || workdirOpen || composer.mention.open,
+    });
     function restoreComposerFocus() {
         textareaRef.current?.focus();
     }
@@ -286,6 +290,8 @@ export function Composer({ composer, onSend, disabled = false, sendDisabled = fa
                 return;
             }
         }
+        if (handleHistoryKey(event))
+            return;
         if (event.key !== 'Enter' || event.shiftKey)
             return;
         event.preventDefault();

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 { terminalMessageNotice, continuingRunNotice } from '../../core/durable-projection.js';
 /**
  * @module MessageRow
  *
@@ -120,6 +121,23 @@ function UsageSummary({ usage }) {
         return null;
     return (_jsxs("div", { className: "jini-message-usage", children: [_jsx("span", { className: "jini-message-usage-dot", "aria-hidden": true, children: "\u25CF" }), t('Done'), " \u00B7 ", parts.join(' · ')] }));
 }
+function messageBlocks({ visibleContent, message, rows }, _optional = {}) {
+    // Interleaving is skipped outright when an artifact was stripped. `stripArtifact` operates on the
+    // whole string and trims, so the surviving text no longer lines up with the per-run offsets the
+    // event walk produces, and an artifact block could legitimately span a tool call. Rather than
+    // reason about partial overlaps, an artifact-bearing message keeps the flat layout — those
+    // messages are dominated by the artifact panel anyway, so the ordering matters least there.
+    if (visibleContent !== message.content)
+        return null;
+    return interleaveMessageBlocks({ events: message.events, content: message.content, rows }, { slotOf: (ev) => extEventSlot({ name: ev.name, data: ev.data }) });
+}
+function messageAwaitingAnswer({ runStreaming, runInProgress, events }, _optional = {}) {
+    return runStreaming === true && runInProgress && isAwaitingAnswer({ events });
+}
+function AssistantMessageFooter({ message, usageEvent, terminalNotice, pending, runInProgress, runStreaming, visibleContent }, _optional = {}) {
+    const t = useT();
+    return _jsxs(_Fragment, { children: [usageEvent ? _jsx(UsageSummary, { usage: usageEvent }) : null, terminalNotice ? _jsx("div", { className: "jini-message-error", role: "status", children: t(terminalNotice) }) : null, !pending && !runInProgress ? (_jsx("div", { className: "jini-message-actions jini-message-actions--assistant", children: _jsx(CopyMessageButton, { text: visibleContent, label: t('Copy message') }) })) : null, runInProgress ? _jsx(RunActivityLine, { events: message.events, active: pending || (runStreaming === true && runInProgress) }) : null] });
+}
 /**
  * Quiet, icon-only copy affordance shared by the user- and assistant-message
  * action rows below. Delegates the actual clipboard write (and its
@@ -147,20 +165,14 @@ export function MessageRow({ message, runStreaming = false, runSucceeded = false
     if (message.role === 'user') {
         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("button", { type: "button", className: "jini-message-attachment-chip", onClick: () => setOpenAttachment(a), title: t('Open {name}', { name: a.name }), "aria-label": t('Open {name}', { name: a.name }), children: renderAttachment ? renderAttachment(a) : a.name }, 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') }) }), openAttachment ? (_jsx(AttachmentPreviewModal, { attachment: openAttachment, onClose: () => setOpenAttachment(null) })) : null] }));
     }
+    const terminalNotice = terminalMessageNotice({ message }, {});
     const visibleContent = stripArtifact({ content: message.content });
     const segments = splitOnQuestionForms({ input: visibleContent });
     const usageEvent = message.events?.filter((ev) => ev.kind === 'usage').pop();
-    // Interleaving is skipped outright when an artifact was stripped. `stripArtifact` operates on the
-    // whole string and trims, so the surviving text no longer lines up with the per-run offsets the
-    // event walk produces, and an artifact block could legitimately span a tool call. Rather than
-    // reason about partial overlaps, an artifact-bearing message keeps the flat layout — those
-    // messages are dominated by the artifact panel anyway, so the ordering matters least there.
-    const blocks = visibleContent === message.content
-        ? interleaveMessageBlocks({ events: message.events, content: message.content, rows: timeline.rows }, { slotOf: (ev) => extEventSlot({ name: ev.name, data: ev.data }) })
-        : null;
+    const blocks = messageBlocks({ visibleContent, message, rows: timeline.rows }, {});
     const pending = isPendingWithNoContent(message, visibleContent, timeline.rows.length);
     const runInProgress = isRunInProgress(message.runStatus);
-    const awaitingAnswer = runStreaming && runInProgress && isAwaitingAnswer({ events: message.events });
+    const awaitingAnswer = messageAwaitingAnswer({ runStreaming, runInProgress, events: message.events }, {});
     const renderToolCard = (row) => (_jsx(ToolCard, { use: row.use, result: row.result, runStreaming: runStreaming, runSucceeded: runSucceeded, ...(projectFileNames !== undefined ? { projectFileNames } : {}), ...(onRequestOpenFile !== undefined ? { onRequestOpenFile } : {}) }, row.id));
     const renderExtGroup = (group) => {
         const renderer = getExtEventRenderer({ name: group.name });
@@ -197,7 +209,7 @@ export function MessageRow({ message, runStreaming = false, runSucceeded = false
                         return null;
                     return (_jsx("div", { className: "jini-message-ext-events", children: renderExtGroup(group) }, block.key));
                 })
-                : (_jsxs(_Fragment, { children: [segments.map((segment, i) => segment.kind === 'text' ? (segment.text.trim() ? (_jsx("div", { className: "jini-message-content", children: _jsx(Markdown, { children: segment.text }) }, i)) : null) : (_jsx(QuestionForm, { form: segment.form, interactive: questionFormInteractive, ...(questionFormSubmittedAnswers !== undefined ? { submittedAnswers: questionFormSubmittedAnswers } : {}), ...(onQuestionFormSubmit !== undefined ? { onSubmit: onQuestionFormSubmit } : {}) }, i))), timeline.rows.length > 0 ? (_jsx("div", { className: "jini-message-tools", children: timeline.rows.map(renderToolCard) })) : null, extGroups.length > 0 ? _jsx("div", { className: "jini-message-ext-events", children: extGroups.map(renderExtGroup) }) : null] })), usageEvent ? _jsx(UsageSummary, { usage: usageEvent }) : null, message.runStatus === 'failed' ? _jsx("div", { className: "jini-message-error", children: t('This turn failed.') }) : null, !pending && !runInProgress ? (_jsx("div", { className: "jini-message-actions jini-message-actions--assistant", children: _jsx(CopyMessageButton, { text: visibleContent, label: t('Copy message') }) })) : null, _jsx(RunActivityLine, { events: message.events, active: pending || (runStreaming === true && runInProgress) })] }));
+                : (_jsxs(_Fragment, { children: [segments.map((segment, i) => segment.kind === 'text' ? (segment.text.trim() ? (_jsx("div", { className: "jini-message-content", children: _jsx(Markdown, { children: segment.text }) }, i)) : null) : (_jsx(QuestionForm, { form: segment.form, interactive: questionFormInteractive, ...(questionFormSubmittedAnswers !== undefined ? { submittedAnswers: questionFormSubmittedAnswers } : {}), ...(onQuestionFormSubmit !== undefined ? { onSubmit: onQuestionFormSubmit } : {}) }, i))), timeline.rows.length > 0 ? (_jsx("div", { className: "jini-message-tools", children: timeline.rows.map(renderToolCard) })) : null, extGroups.length > 0 ? _jsx("div", { className: "jini-message-ext-events", children: extGroups.map(renderExtGroup) }) : null] })), _jsx(AssistantMessageFooter, { message, usageEvent, terminalNotice, pending, runInProgress, runStreaming, visibleContent })] }));
 }
 /**
  * The live "what is it doing" line under a running reply (see `core/run-activity.ts`). Replaces the
@@ -205,7 +217,8 @@ export function MessageRow({ message, runStreaming = false, runSucceeded = false
  * Kept a separate component so its one-second tick re-renders only this line, not the whole row.
  */
 function RunActivityLine({ events, active }) {
-    const label = useRunActivity({ events: events, active: active });
+    const activityLabel = useRunActivity({ events: events, active: active });
+    const label = continuingRunNotice({ events, active }, {}) ?? activityLabel;
     if (label === null)
         return null;
     return (_jsx("div", { className: "jini-message-pending jini-run-activity", "aria-live": "off", children: label }));

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

@@ -1,3 +1,4 @@
+import { type UserTextRedactionOptions } from '../../core/user-text-redaction.js';
 import type { QuestionForm as QuestionFormType } from '../../core/index.js';
 export interface QuestionFormFileSubmission {
     questionId: string;
@@ -9,7 +10,7 @@ export interface QuestionFormHandle {
     /** Submit with no answers — every question is optional, so this records each as "(skipped)" and moves on. */
     skipAll: () => void;
 }
-export interface QuestionFormProps {
+export interface QuestionFormProps extends UserTextRedactionOptions {
     form: QuestionFormType;
     /** Whether the user can still submit answers — the host disables this once the turn is no longer the most recent one. */
     interactive: boolean;

package/dist/react/components/QuestionForm.js

@@ -1,4 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { CREDENTIAL_CARD_GUIDANCE, SECRET_REDACTED_NOTICE } from '../../core/user-text-redaction.js';
+import { useUserTextGuard } from '../hooks/useUserTextGuard.js';
 /**
  * @module QuestionForm
  *
@@ -13,15 +15,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * string wrapped in `useT()`.
  */
 import { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from 'react';
-import { formatFormAnswers, formOptionValueForLabel } from '../../core/index.js';
+import { formatFormAnswers, formOptionValueForLabel, redactQuestionAnswers, isSecretQuestion, withoutSecretQuestionDefaults, questionTextInputProps, questionTextareaProps } from '../../core/index.js';
 import { useT } from '../hooks/context.js';
-export const QuestionForm = forwardRef(function QuestionForm({ form, interactive, submittedAnswers, hideInternalSubmit = false, draftAnswers, onReadyChange, onDraftChange, onAnswerChange, onSubmit }, ref) {
+export const QuestionForm = forwardRef(function QuestionForm({ form: incomingForm, interactive, submittedAnswers, hideInternalSubmit = false, draftAnswers, onReadyChange, onDraftChange, onAnswerChange, onSubmit, redactUserText, onSecretRedacted }, ref) {
     const t = useT();
+    const form = useMemo(() => withoutSecretQuestionDefaults({ form: incomingForm }), [incomingForm]);
+    const guard = useUserTextGuard({ ...(redactUserText ? { redactUserText } : {}), ...(onSecretRedacted ? { onSecretRedacted } : {}) });
     const initial = useMemo(() => buildInitialState(form, submittedAnswers, draftAnswers), [form, submittedAnswers, draftAnswers]);
     const [answers, setAnswers] = useState(initial);
     const [fileAnswers, setFileAnswers] = useState({});
     const locked = !interactive || !onSubmit || submittedAnswers !== undefined;
-    const currentAnswers = submittedAnswers ?? answers;
+    const currentAnswers = submittedAnswers ? redactQuestionAnswers({ form, answers: submittedAnswers }).answers : answers;
     useEffect(() => {
         setFileAnswers({});
     }, [form.id]);
@@ -51,8 +55,8 @@ export const QuestionForm = forwardRef(function QuestionForm({ form, interactive
             return;
         const next = { ...answers, [id]: value };
         setAnswers(next);
-        onDraftChange?.(draftSafeAnswers(form, next));
-        onAnswerChange?.(id, value);
+        onDraftChange?.(redactQuestionAnswers({ form, answers: draftSafeAnswers(form, next) }).answers);
+        onAnswerChange?.(id, redactQuestionAnswers({ form, answers: { [id]: value } }).answers[id]);
     }
     function toggleCheckbox(id, option, maxSelections) {
         if (locked)
@@ -64,7 +68,7 @@ export const QuestionForm = forwardRef(function QuestionForm({ form, interactive
         const next = has ? current.filter((v) => v !== option) : [...current, option];
         const nextAnswers = { ...answers, [id]: next };
         setAnswers(nextAnswers);
-        onDraftChange?.(draftSafeAnswers(form, nextAnswers));
+        onDraftChange?.(redactQuestionAnswers({ form, answers: draftSafeAnswers(form, nextAnswers) }).answers);
         onAnswerChange?.(id, next);
     }
     function updateCheckboxCustom(q, raw) {
@@ -79,11 +83,13 @@ export const QuestionForm = forwardRef(function QuestionForm({ form, interactive
             return;
         if (!ready)
             return;
+        const safe = redactQuestionAnswers({ form, answers }, { ...(redactUserText ? { redactUserText } : {}), onSecretRedacted: guard.notifyRedaction });
+        setAnswers(safe.answers);
         const files = collectFileSubmissions(form, fileAnswers);
         if (files.length > 0)
-            onSubmit(formatFormAnswers({ form: form, answers: answers }), answers, files);
+            onSubmit(formatFormAnswers({ form: form, answers: safe.answers }), safe.answers, files);
         else
-            onSubmit(formatFormAnswers({ form: form, answers: answers }), answers);
+            onSubmit(formatFormAnswers({ form: form, answers: safe.answers }), safe.answers);
     }
     function handleSkipAll() {
         if (locked || !onSubmit)
@@ -113,18 +119,18 @@ export const QuestionForm = forwardRef(function QuestionForm({ form, interactive
     }, [onReadyChange, locked, ready]);
     return (_jsxs("div", { className: `question-form${locked ? ' question-form-locked' : ''}`, "data-form-id": form.id, children: [_jsxs("div", { className: "question-form-head", children: [_jsx("span", { className: "question-form-icon", "aria-hidden": true, children: "?" }), _jsxs("div", { className: "question-form-titles", children: [_jsx("div", { className: "question-form-title", children: form.title }), form.description ? _jsx("div", { className: "question-form-desc", children: form.description }) : null] }), locked ? _jsx("span", { className: "question-form-pill", children: t('Answered') }) : null] }), _jsx("div", { className: "question-form-body", children: form.questions.map((q) => {
                     const value = currentAnswers[q.id];
-                    return (_jsxs("div", { className: "qf-field", children: [_jsxs("label", { className: "qf-label", children: [_jsx("span", { children: q.label }), q.required ? (_jsx("span", { className: "qf-required", "aria-label": t('required'), children: "*" })) : null] }), q.help ? _jsx("div", { className: "qf-help", children: q.help }) : null, q.type === 'radio' && q.options ? (_jsx("div", { className: "qf-options", children: q.options.map((opt) => (_jsxs("label", { className: `qf-chip${value === opt.value ? ' qf-chip-on' : ''}`, title: opt.description, children: [_jsx("input", { type: "radio", name: `${form.id}-${q.id}`, value: opt.value, checked: value === opt.value, disabled: locked, "aria-label": opt.label, onChange: () => update(q.id, opt.value) }), _jsx(OptionCopy, { option: opt })] }, opt.value))) })) : null, q.type === 'radio' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null, q.type === 'checkbox' && q.options ? (_jsx("div", { className: "qf-options", children: q.options.map((opt) => {
+                    return (_jsxs("div", { className: "qf-field", children: [_jsxs("label", { className: "qf-label", children: [_jsx("span", { children: q.label }), q.required ? (_jsx("span", { className: "qf-required", "aria-label": t('required'), children: "*" })) : null] }), q.help ? _jsx("div", { className: "qf-help", children: q.help }) : null, isSecretQuestion({ question: q }) ? _jsx("div", { className: "qf-help", children: t(CREDENTIAL_CARD_GUIDANCE) }) : null, q.type === 'radio' && q.options ? (_jsx("div", { className: "qf-options", children: q.options.map((opt) => (_jsxs("label", { className: `qf-chip${value === opt.value ? ' qf-chip-on' : ''}`, title: opt.description, children: [_jsx("input", { type: "radio", name: `${form.id}-${q.id}`, value: opt.value, checked: value === opt.value, disabled: locked, "aria-label": opt.label, onChange: () => update(q.id, opt.value) }), _jsx(OptionCopy, { option: opt })] }, opt.value))) })) : null, q.type === 'radio' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null, q.type === 'checkbox' && q.options ? (_jsx("div", { className: "qf-options", children: q.options.map((opt) => {
                                     const arr = Array.isArray(value) ? value : [];
                                     const on = arr.includes(opt.value);
                                     const maxed = q.maxSelections !== undefined && !on && arr.length >= q.maxSelections;
                                     return (_jsxs("label", { title: opt.description, className: `qf-chip${on ? ' qf-chip-on' : ''}${maxed ? ' qf-chip-disabled' : ''}`, children: [_jsx("input", { type: "checkbox", value: opt.value, checked: on, disabled: locked || maxed, "aria-label": opt.label, onChange: () => toggleCheckbox(q.id, opt.value, q.maxSelections) }), _jsx(OptionCopy, { option: opt })] }, opt.value));
-                                }) })) : null, q.type === 'checkbox' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customCheckboxValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => updateCheckboxCustom(q, next) })) : null, q.type === 'select' && q.options ? (_jsxs("select", { className: "qf-select", value: typeof value === 'string' && questionValueIsKnown(q, value) ? value : '', disabled: locked, onChange: (e) => update(q.id, e.target.value), children: [_jsx("option", { value: "", disabled: true, children: q.placeholder ?? t('Choose one') }), q.options.map((opt) => (_jsx("option", { value: opt.value, title: opt.description, children: opt.label }, opt.value)))] })) : null, q.type === 'select' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null, q.type === 'text' ? _jsx("input", { type: "text", className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'number' ? _jsx("input", { type: "number", className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, min: q.min, max: q.max, step: q.step, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'range' ? (_jsxs("div", { className: "qf-range-wrap", children: [_jsx("input", { type: "range", className: "qf-range", value: typeof value === 'string' && value.trim() ? value : String(q.min ?? 0), min: q.min, max: q.max, step: q.step, disabled: locked, onChange: (e) => update(q.id, e.target.value) }), _jsx("output", { className: "qf-range-value", children: typeof value === 'string' && value.trim() ? value : String(q.min ?? 0) })] })) : null, q.type === 'date' || q.type === 'time' || q.type === 'datetime-local' ? _jsx("input", { type: q.type, className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'color' ? _jsx("input", { type: "color", className: "qf-color", value: normalizeColorInputValue(value), disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'url' || q.type === 'email' || q.type === 'tel' ? _jsx("input", { type: q.type, className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'file' ? (_jsxs("div", { className: "qf-file-wrap", children: [_jsx("input", { type: "file", className: "qf-file", multiple: q.multiple, accept: q.accept, disabled: locked, onChange: (e) => {
+                                }) })) : null, q.type === 'checkbox' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customCheckboxValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => updateCheckboxCustom(q, next) })) : null, q.type === 'select' && q.options ? (_jsxs("select", { className: "qf-select", value: typeof value === 'string' && questionValueIsKnown(q, value) ? value : '', disabled: locked, onChange: (e) => update(q.id, e.target.value), children: [_jsx("option", { value: "", disabled: true, children: q.placeholder ?? t('Choose one') }), q.options.map((opt) => (_jsx("option", { value: opt.value, title: opt.description, children: opt.label }, opt.value)))] })) : null, q.type === 'select' && q.options && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null, q.type === 'text' ? _jsx("input", { ...questionTextInputProps({ question: q }), className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'number' ? _jsx("input", { type: "number", className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, min: q.min, max: q.max, step: q.step, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'range' ? (_jsxs("div", { className: "qf-range-wrap", children: [_jsx("input", { type: "range", className: "qf-range", value: typeof value === 'string' && value.trim() ? value : String(q.min ?? 0), min: q.min, max: q.max, step: q.step, disabled: locked, onChange: (e) => update(q.id, e.target.value) }), _jsx("output", { className: "qf-range-value", children: typeof value === 'string' && value.trim() ? value : String(q.min ?? 0) })] })) : null, q.type === 'date' || q.type === 'time' || q.type === 'datetime-local' ? _jsx("input", { type: q.type, className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'color' ? _jsx("input", { type: "color", className: "qf-color", value: normalizeColorInputValue(value), disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'url' || q.type === 'email' || q.type === 'tel' ? _jsx("input", { type: q.type, className: "qf-input", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'file' ? (_jsxs("div", { className: "qf-file-wrap", children: [_jsx("input", { type: "file", className: "qf-file", multiple: q.multiple, accept: q.accept, disabled: locked, onChange: (e) => {
                                             const files = Array.from(e.target.files ?? []);
                                             const names = files.map((file) => file.name);
                                             setFileAnswers((current) => ({ ...current, [q.id]: files }));
                                             update(q.id, q.multiple ? names : (names[0] ?? ''));
-                                        } }), fileValueLabel(value) ? _jsx("div", { className: "qf-file-summary", children: fileValueLabel(value) }) : null] })) : null, q.type === 'switch' ? (_jsxs("label", { className: "qf-switch", children: [_jsx("input", { type: "checkbox", role: "switch", checked: value === 'true', disabled: locked, onChange: (e) => update(q.id, e.target.checked ? 'true' : 'false') }), _jsx("span", { "aria-hidden": true })] })) : null, q.type === 'textarea' ? _jsx("textarea", { className: "qf-textarea", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, rows: 3, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'direction-cards' && q.cards && q.cards.length > 0 ? (_jsx("div", { className: "qf-direction-cards", children: q.cards.map((card) => (_jsx(DirectionCardView, { card: card, formId: form.id, questionId: q.id, selected: value === card.id || value === card.label, disabled: locked, onSelect: () => update(q.id, card.id) }, card.id))) })) : null, q.type === 'direction-cards' && q.cards && q.cards.length > 0 && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null] }, q.id));
-                }) }), hideInternalSubmit ? null : (_jsxs("div", { className: "question-form-foot", children: [locked ? _jsx("span", { className: "qf-locked-note", children: submittedAnswers ? t('You answered this') : t('A newer message answered this') }) : _jsx("span", { className: "qf-hint", children: t('Answer above, then continue') }), !locked ? (_jsx("button", { type: "button", className: "primary", onClick: handleSubmit, disabled: !ready, title: ready ? t('Submit your answers') : t('Answer the required questions first'), children: form.submitLabel ?? t('Continue') })) : null] }))] }));
+                                        } }), fileValueLabel(value) ? _jsx("div", { className: "qf-file-summary", children: fileValueLabel(value) }) : null] })) : null, q.type === 'switch' ? (_jsxs("label", { className: "qf-switch", children: [_jsx("input", { type: "checkbox", role: "switch", checked: value === 'true', disabled: locked, onChange: (e) => update(q.id, e.target.checked ? 'true' : 'false') }), _jsx("span", { "aria-hidden": true })] })) : null, q.type === 'textarea' ? _jsx("textarea", { ...questionTextareaProps({ question: q }), className: "qf-textarea", value: typeof value === 'string' ? value : '', placeholder: q.placeholder, disabled: locked, rows: 3, onChange: (e) => update(q.id, e.target.value) }) : null, q.type === 'direction-cards' && q.cards && q.cards.length > 0 ? (_jsx("div", { className: "qf-direction-cards", children: q.cards.map((card) => (_jsx(DirectionCardView, { card: card, formId: form.id, questionId: q.id, selected: value === card.id || value === card.label, disabled: locked, onSelect: () => update(q.id, card.id) }, card.id))) })) : null, q.type === 'direction-cards' && q.cards && q.cards.length > 0 && shouldRenderCustomChoice(q) ? (_jsx(CustomChoiceInput, { label: q.customLabel ?? t('Something else'), value: customSingleValue(q, value), placeholder: q.customPlaceholder ?? t('Type your own answer'), disabled: locked, onChange: (next) => update(q.id, next) })) : null] }, q.id));
+                }) }), guard.secretRedacted ? _jsx("div", { role: "status", children: t(SECRET_REDACTED_NOTICE) }) : null, hideInternalSubmit ? null : (_jsxs("div", { className: "question-form-foot", children: [locked ? _jsx("span", { className: "qf-locked-note", children: submittedAnswers ? t('You answered this') : t('A newer message answered this') }) : _jsx("span", { className: "qf-hint", children: t('Answer above, then continue') }), !locked ? (_jsx("button", { type: "button", className: "primary", onClick: handleSubmit, disabled: !ready, title: ready ? t('Submit your answers') : t('Answer the required questions first'), children: form.submitLabel ?? t('Continue') })) : null] }))] }));
 });
 function OptionCopy({ option }) {
     return (_jsxs("span", { className: "qf-chip-copy", children: [_jsx("span", { children: option.label }), option.description ? _jsx("span", { className: "qf-chip-desc", children: option.description }) : null] }));