@jini-ai/ui 0.5.5 → 0.6.10

package/dist/features/memory/formatters.js

@@ -45,84 +45,101 @@ export function providerDisplayName(provider) {
             return 'Memory model';
     }
 }
-export function parseProviderError(raw) {
+function isString(value) {
+    return typeof value === 'string';
+}
+function isNumber(value) {
+    return typeof value === 'number';
+}
+// Reads message/code/status out of the first `{...}` in the raw provider
+// error. The nested `error.*` field wins for message/code; the top-level
+// field wins for status.
+function parseJsonErrorFields(raw) {
     const jsonStart = raw.indexOf('{');
-    let message = raw.trim();
-    let code = '';
-    let status = null;
-    if (jsonStart >= 0) {
-        try {
-            const parsed = JSON.parse(raw.slice(jsonStart));
-            const error = parsed?.error;
-            if (typeof error?.message === 'string')
-                message = error.message;
-            else if (typeof parsed?.message === 'string')
-                message = parsed.message;
-            if (typeof error?.code === 'string')
-                code = error.code;
-            else if (typeof parsed?.code === 'string')
-                code = parsed.code;
-            if (typeof parsed?.status === 'number')
-                status = parsed.status;
-            else if (typeof error?.status === 'number')
-                status = error.status;
-        }
-        catch {
-            // Fall through to regex parsing below.
-        }
+    if (jsonStart < 0)
+        return {};
+    try {
+        // Text starting at `{` can only parse to an object, so `parsed` is never null.
+        const parsed = JSON.parse(raw.slice(jsonStart));
+        const error = parsed.error;
+        return {
+            message: [error?.message, parsed.message].find(isString),
+            code: [error?.code, parsed.code].find(isString),
+            status: [parsed.status, error?.status].find(isNumber),
+        };
+    }
+    catch {
+        // Fall through to regex parsing below.
+        return {};
     }
+}
+export function parseProviderError(raw) {
+    const fields = parseJsonErrorFields(raw);
     const statusMatch = /\b(4\d\d|5\d\d)\b/.exec(raw);
-    if (status === null && statusMatch?.[1])
-        status = Number(statusMatch[1]);
     return {
-        message: message.replace(/\s+/g, ' ').trim(),
-        code,
-        status,
+        message: (fields.message ?? raw.trim()).replace(/\s+/g, ' ').trim(),
+        code: fields.code ?? '',
+        status: fields.status ?? (statusMatch ? Number(statusMatch[1]) : null),
     };
 }
+function classifyFailure({ status, haystack }) {
+    if (status === 401 || /token[_ -]?expired|authentication token has expired|invalid[_ -]?api[_ -]?key|unauthorized/.test(haystack)) {
+        return 'auth';
+    }
+    if (status === 429 || /rate limit|quota|too many requests|insufficient_quota/.test(haystack))
+        return 'quota';
+    if (/network|fetch failed|timeout|timed out|econnreset|enotfound/.test(haystack))
+        return 'network';
+    return 'other';
+}
+function failureCopy({ category, providerName, usesChatCli, source, message, }) {
+    switch (category) {
+        case 'auth':
+            return {
+                title: `${providerName} authentication expired`,
+                detail: source,
+                action: usesChatCli
+                    ? 'Sign in to the selected local CLI or choose a different memory model.'
+                    : 'Update the memory extraction model key or sign in again.',
+            };
+        case 'quota':
+            return {
+                title: `${providerName} quota or rate limit hit`,
+                detail: source,
+                action: 'Try again later or switch the memory extraction model.',
+            };
+        case 'network':
+            return {
+                title: `${providerName} request failed`,
+                detail: source,
+                action: usesChatCli
+                    ? 'Check the selected local CLI and try again.'
+                    : 'Check the model provider connection and try again.',
+            };
+        default:
+            return {
+                title: 'Memory extraction failed',
+                detail: message || source,
+                action: usesChatCli
+                    ? 'Try again after checking the selected local CLI.'
+                    : 'Try again after checking the memory extraction model settings.',
+            };
+    }
+}
 export function describeExtractionFailure(record) {
     if (record.phase !== 'failed' || !record.error)
         return null;
-    const providerName = providerDisplayName(record.provider);
-    const usesChatCli = record.provider?.credentialSource === 'chat-cli';
     const parsed = parseProviderError(record.error);
     const haystack = `${parsed.message} ${parsed.code} ${record.error}`.toLowerCase();
-    const source = record.kind === 'connector'
-        ? 'Connected apps were read, but the assistant could not turn that context into memory.'
-        : 'Memory extraction could not run for this chat.';
-    if (parsed.status === 401
-        || /token[_ -]?expired|authentication token has expired|invalid[_ -]?api[_ -]?key|unauthorized/.test(haystack)) {
-        return {
-            title: `${providerName} authentication expired`,
-            detail: source,
-            action: usesChatCli
-                ? 'Sign in to the selected local CLI or choose a different memory model.'
-                : 'Update the memory extraction model key or sign in again.',
-        };
-    }
-    if (parsed.status === 429 || /rate limit|quota|too many requests|insufficient_quota/.test(haystack)) {
-        return {
-            title: `${providerName} quota or rate limit hit`,
-            detail: source,
-            action: 'Try again later or switch the memory extraction model.',
-        };
-    }
-    if (/network|fetch failed|timeout|timed out|econnreset|enotfound/.test(haystack)) {
-        return {
-            title: `${providerName} request failed`,
-            detail: source,
-            action: usesChatCli
-                ? 'Check the selected local CLI and try again.'
-                : 'Check the model provider connection and try again.',
-        };
-    }
-    return {
-        title: 'Memory extraction failed',
-        detail: parsed.message || source,
-        action: usesChatCli
-            ? 'Try again after checking the selected local CLI.'
-            : 'Try again after checking the memory extraction model settings.',
-    };
+    return failureCopy({
+        category: classifyFailure({ status: parsed.status, haystack }),
+        providerName: providerDisplayName(record.provider),
+        usesChatCli: record.provider?.credentialSource === 'chat-cli',
+        source: record.kind === 'connector'
+            ? 'Connected apps were read, but the assistant could not turn that context into memory.'
+            : 'Memory extraction could not run for this chat.',
+        message: parsed.message,
+    });
 }
 export function formatConnectorContextBytes(bytes) {
     if (!Number.isFinite(bytes) || bytes <= 0)
@@ -248,43 +265,55 @@ export function formatRelativeTimeAgo(at, now) {
 export function memoryCountLabel(count) {
     return count === 1 ? 'memory' : 'memories';
 }
+// The record's written count when it is a positive number, else 0.
+function positiveWrittenCount(record) {
+    const count = record.writtenCount;
+    return typeof count === 'number' && count > 0 ? count : 0;
+}
+function connectorCardTitle({ record, t }) {
+    switch (record.phase) {
+        case 'running':
+            return t('Scanning connected apps');
+        case 'failed':
+            return t('Connected app scan failed');
+        case 'skipped':
+            return t('Connected app scan skipped');
+        case 'success': {
+            const writtenCount = positiveWrittenCount(record);
+            if (writtenCount > 0) {
+                return t('Saved {count} {label}', { count: writtenCount, label: memoryCountLabel(writtenCount) });
+            }
+            return t('No new memories found');
+        }
+        default:
+            return t('Connected app scan');
+    }
+}
 export function extractionCardTitle(record, t) {
     const kind = record.kind ?? 'llm';
     if (kind !== 'connector') {
         return record.userMessagePreview || t('Extraction');
     }
-    if (record.phase === 'running')
-        return t('Scanning connected apps');
-    if (record.phase === 'failed')
-        return t('Connected app scan failed');
-    if (record.phase === 'skipped')
-        return t('Connected app scan skipped');
-    if (record.phase === 'success') {
-        const writtenCount = typeof record.writtenCount === 'number' ? record.writtenCount : null;
-        if (writtenCount && writtenCount > 0) {
-            return t('Saved {count} {label}', { count: writtenCount, label: memoryCountLabel(writtenCount) });
-        }
-        return t('No new memories found');
-    }
-    return t('Connected app scan');
+    return connectorCardTitle({ record, t });
 }
-export function extractionCardMeta(record, now, t) {
-    const kind = record.kind ?? 'llm';
+function connectorCardMeta({ record, now, t }) {
+    if (record.phase === 'running')
+        return t('Checking selected apps');
     const age = formatRelativeTimeAgo(record.startedAt, now);
-    if (kind === 'connector') {
-        if (record.phase === 'running')
-            return t('Checking selected apps');
-        if (record.phase === 'failed')
+    switch (record.phase) {
+        case 'failed':
             return `${t('Needs attention')} · ${age}`;
-        if (record.phase === 'skipped')
+        case 'skipped':
             return `${t('Skipped')} · ${age}`;
-        if (record.phase === 'success') {
-            const writtenCount = typeof record.writtenCount === 'number' ? record.writtenCount : null;
-            const result = writtenCount && writtenCount > 0 ? t('From connected apps') : t('Checked selected apps');
+        case 'success': {
+            const result = positiveWrittenCount(record) > 0 ? t('From connected apps') : t('Checked selected apps');
             return `${result} · ${age}`;
         }
-        return `${t('Connected apps')} · ${age}`;
+        default:
+            return `${t('Connected apps')} · ${age}`;
     }
+}
+function modelCardMeta({ record, now, t }) {
     const duration = formatDuration(record);
     const parts = [formatAbsoluteTime(record.startedAt, now), formatRelativeTime(record.startedAt, now)];
     if (duration)
@@ -294,6 +323,12 @@ export function extractionCardMeta(record, now, t) {
     }
     return parts.join(' · ');
 }
+export function extractionCardMeta(record, now, t) {
+    const kind = record.kind ?? 'llm';
+    if (kind === 'connector')
+        return connectorCardMeta({ record, now, t });
+    return modelCardMeta({ record, now, t });
+}
 /** Localized labels for each memory type badge. `t`-only, so callers memoize on
  *  `t` at the call site instead of drilling the map through props. */
 export function memoryTypeLabels(t) {

package/dist/features/memory/react/components/MemoryConnectedPanel.js

@@ -14,43 +14,99 @@ import { ConnectorLogo } from '../../../connectors/index.js';
 import { Icon } from '../../../../react/components/Icon.js';
 import { useT } from '../../../i18n/index.js';
 import { MemoryExtractionCard } from './MemoryExtractionCard.js';
-export function MemoryConnectedPanel({ enabled, onOpenConnectors, connectorStatuses, connectorsLoading, connectedCount, selectedConnectorIds, selectedConnectedConnectorIds, connectingConnectorIds, pendingConnectorAuthIds, connectorConnectErrors, connectorIdsWithDetails, connectorExtracting, connectorSaving, connectorScanLabel, connectorSuggestions, selectedSuggestionIds, selectedConnectorSuggestions, connectorStatus, connectorError, connectorLoadError, connectorAttempts, connectorContextBytes, connectorExtractions, memoryConnectors, toggleConnectorSelection, onConnectMemoryConnector, toggleConnectorSuggestion, onSuggestConnectorMemory, onSaveConnectorSuggestions, onDiscardConnectorSuggestions, nowClock, onOpenPreview, onDeleteExtraction, }) {
+function isStatusResolved({ connector, context }) {
+    return context.connectorIdsWithDetails.has(connector.id) || context.connectorStatuses[connector.id] !== undefined;
+}
+function connectorRowState({ connector, context }) {
+    const connected = connector.status === 'connected';
+    const connecting = context.connectingConnectorIds.has(connector.id);
+    const authorizationPending = context.pendingConnectorAuthIds.has(connector.id);
+    const connectError = context.connectorConnectErrors[connector.id];
+    const checkingStatus = context.connectorsLoading && !isStatusResolved({ connector, context }) && !connected && !authorizationPending && !connectError && !connecting;
+    return {
+        connected,
+        selected: context.selectedConnectorIds.has(connector.id) && connected,
+        connecting,
+        authorizationPending,
+        connectError,
+        checkingStatus,
+        reconnecting: connector.status === 'error',
+        busy: connecting || authorizationPending || checkingStatus,
+    };
+}
+function connectorHint({ connector, state, t }) {
+    if (state.connected)
+        return connector.accountLabel || `${connector.tools.length} ${t('read tools')}`;
+    if (state.checkingStatus)
+        return t('Checking connection status…');
+    if (state.authorizationPending)
+        return t('Finish authorization in your browser, then return here');
+    return connector.lastError?.trim() || state.connectError || t('Connect this app before extraction');
+}
+function connectButtonLabel({ state, t }) {
+    if (state.checkingStatus)
+        return t('Checking');
+    if (state.authorizationPending)
+        return t('Waiting');
+    if (state.connecting)
+        return t('Connecting');
+    return state.reconnecting ? t('Reconnect') : t('Connect');
+}
+function MemoryConnectButton({ connector, state, onConnectMemoryConnector, }) {
+    const t = useT();
+    return (_jsxs("button", { type: "button", className: `memory-connector-connect-button${state.busy ? ' is-loading' : ''}`, disabled: state.busy, "aria-busy": state.busy || undefined, "aria-label": `${state.reconnecting ? t('Reconnect') : t('Connect')} ${connector.name}`, onClick: (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            void onConnectMemoryConnector(connector.id);
+        }, children: [_jsx(Icon, { name: state.busy ? 'refresh' : 'plus', size: 12, className: state.busy ? 'icon-spin' : '' }), _jsx("span", { children: connectButtonLabel({ state, t }) })] }));
+}
+function MemoryConnectorPicker({ selected }) {
+    const t = useT();
+    return (_jsxs("span", { className: `memory-connector-picker${selected ? ' is-selected' : ''}`, children: [_jsx("span", { className: "memory-connector-picker-box", "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 12 }) : null }), _jsx("span", { children: selected ? t('Selected') : t('Select') })] }));
+}
+function MemoryConnectorRow({ connector, context, toggleConnectorSelection, onConnectMemoryConnector, }) {
+    const t = useT();
+    const state = connectorRowState({ connector, context });
+    const { connected, selected } = state;
+    return (_jsxs("label", { className: `memory-connector-row${connected ? '' : ' is-disabled'}${selected ? ' is-selected' : ''}`, "data-memory-connector-id": connector.id, children: [_jsx("input", { className: "memory-connector-input", type: "checkbox", checked: selected, disabled: !connected, "aria-label": `${t('Use')} ${connector.name} ${t('for memory extraction')}`, onChange: () => toggleConnectorSelection(connector.id) }), _jsxs("span", { className: `memory-connector-brand${selected ? ' is-selected' : ''}`, children: [_jsx(ConnectorLogo, { connectorId: connector.id, connectorName: connector.name, logoUrl: connector.logoUrl, size: "sm" }), _jsx("span", { className: "memory-connector-selected-mark", "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 13 }) : null })] }), _jsxs("span", { className: "memory-connector-copy", children: [_jsx("strong", { children: connector.name }), _jsx("small", { children: connectorHint({ connector, state, t }) })] }), connected ? (_jsx(MemoryConnectorPicker, { selected: selected })) : (_jsx(MemoryConnectButton, { connector: connector, state: state, onConnectMemoryConnector: onConnectMemoryConnector }))] }));
+}
+function MemoryConnectedSummary({ connectorsLoading, connectedCount, onOpenConnectors, }) {
+    const t = useT();
+    return (_jsxs("div", { className: "memory-source-summary memory-connected-summary", children: [_jsx("span", { className: "memory-block-icon", children: _jsx(Icon, { name: "link", size: 15 }) }), _jsxs("div", { children: [_jsx("h4", { children: t('Import from apps') }), _jsx("p", { className: "hint", children: t('Choose apps to scan for design preferences, project context, and visual references. Nothing is scanned until you select an app.') })] }), _jsx("span", { className: "memory-source-badge", children: connectorsLoading ? t('Loading') : `${connectedCount} ${t('connected')}` }), _jsx("button", { type: "button", className: "ghost memory-source-action", onClick: onOpenConnectors, disabled: !onOpenConnectors, children: t('Manage') })] }));
+}
+function MemoryConnectorRunBar({ enabled, connectorExtracting, connectorSaving, connectedCount, selectedCount, connectorScanLabel, onSuggestConnectorMemory, }) {
+    const t = useT();
+    return (_jsxs("div", { className: "memory-connector-actions memory-connector-runbar", children: [_jsxs("span", { className: "hint", children: [t('Selected'), " ", selectedCount, " ", t('of'), " ", connectedCount, " ", t('connected'), ' ', connectedCount === 1 ? t('app') : t('apps'), "."] }), _jsxs("button", { type: "button", className: "primary memory-source-action", onClick: () => void onSuggestConnectorMemory(), disabled: !enabled || connectorExtracting || connectorSaving || selectedCount === 0, children: [_jsx(Icon, { name: connectorExtracting ? 'refresh' : 'sparkles', size: 14, className: connectorExtracting ? 'icon-spin' : '' }), _jsx("span", { children: t(connectorScanLabel) })] })] }));
+}
+function MemorySuggestionCard({ suggestion, selected, typeLabel, toggleConnectorSuggestion, }) {
+    const t = useT();
+    const sourceLabel = suggestion.source?.connectorName || suggestion.source?.toolTitle || t('Connected apps');
+    return (_jsxs("label", { className: `memory-suggestion-card${selected ? ' is-selected' : ''}`, children: [_jsxs("span", { className: "memory-connector-check", children: [_jsx("input", { type: "checkbox", checked: selected, onChange: () => toggleConnectorSuggestion(suggestion.id) }), _jsx("span", { "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 13 }) : null })] }), _jsxs("span", { className: "memory-suggestion-copy", children: [_jsxs("span", { className: "memory-suggestion-title", children: [_jsx("strong", { children: suggestion.name }), _jsx("span", { className: "memory-type-badge", children: typeLabel })] }), suggestion.description ? _jsx("small", { children: suggestion.description }) : null, _jsx("span", { className: "memory-suggestion-body", children: suggestion.body })] }), _jsx("span", { className: "memory-connector-state is-connected", children: sourceLabel })] }));
+}
+function MemorySuggestionPanel({ connectorSuggestions, selectedSuggestionIds, selectedConnectorSuggestions, connectorSaving, toggleConnectorSuggestion, onSaveConnectorSuggestions, onDiscardConnectorSuggestions, }) {
     const t = useT();
     const typeLabel = useMemo(() => memoryTypeLabels(t), [t]);
-    return (_jsxs("div", { className: "memory-tab-panel memory-connected-panel", children: [_jsxs("div", { className: "memory-source-summary memory-connected-summary", children: [_jsx("span", { className: "memory-block-icon", children: _jsx(Icon, { name: "link", size: 15 }) }), _jsxs("div", { children: [_jsx("h4", { children: t('Import from apps') }), _jsx("p", { className: "hint", children: t('Choose apps to scan for design preferences, project context, and visual references. Nothing is scanned until you select an app.') })] }), _jsx("span", { className: "memory-source-badge", children: connectorsLoading ? t('Loading') : `${connectedCount} ${t('connected')}` }), _jsx("button", { type: "button", className: "ghost memory-source-action", onClick: onOpenConnectors, disabled: !onOpenConnectors, children: t('Manage') })] }), _jsxs("div", { className: "memory-connector-workbench", children: [connectorLoadError ? (_jsx("div", { role: "alert", className: "memory-connector-result is-error", children: connectorLoadError })) : null, _jsxs("div", { className: "memory-connector-picker-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Choose sources') }), _jsx("p", { className: "hint", children: t('Select connected apps first. Only the apps you choose are scanned.') })] }), _jsxs("span", { className: "memory-source-badge", children: [selectedConnectedConnectorIds.length, " ", t('selected')] })] }), _jsx("div", { className: "memory-connector-list", "aria-label": t('Connected memory apps'), children: memoryConnectors.map((connector) => {
-                            const connected = connector.status === 'connected';
-                            const selected = selectedConnectorIds.has(connector.id) && connected;
-                            const connecting = connectingConnectorIds.has(connector.id);
-                            const authorizationPending = pendingConnectorAuthIds.has(connector.id);
-                            const connectError = connectorConnectErrors[connector.id];
-                            const statusResolved = connectorIdsWithDetails.has(connector.id) || connectorStatuses[connector.id] !== undefined;
-                            const checkingStatus = connectorsLoading && !statusResolved && !connected && !authorizationPending && !connectError && !connecting;
-                            const connectorLastError = connector.lastError?.trim();
-                            const reconnecting = connector.status === 'error';
-                            const connectorHint = connected
-                                ? connector.accountLabel || `${connector.tools.length} ${t('read tools')}`
-                                : checkingStatus
-                                    ? t('Checking connection status…')
-                                    : authorizationPending
-                                        ? t('Finish authorization in your browser, then return here')
-                                        : connectorLastError || connectError || t('Connect this app before extraction');
-                            return (_jsxs("label", { className: `memory-connector-row${connected ? '' : ' is-disabled'}${selected ? ' is-selected' : ''}`, "data-memory-connector-id": connector.id, children: [_jsx("input", { className: "memory-connector-input", type: "checkbox", checked: selected, disabled: !connected, "aria-label": `${t('Use')} ${connector.name} ${t('for memory extraction')}`, onChange: () => toggleConnectorSelection(connector.id) }), _jsxs("span", { className: `memory-connector-brand${selected ? ' is-selected' : ''}`, children: [_jsx(ConnectorLogo, { connectorId: connector.id, connectorName: connector.name, logoUrl: connector.logoUrl, size: "sm" }), _jsx("span", { className: "memory-connector-selected-mark", "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 13 }) : null })] }), _jsxs("span", { className: "memory-connector-copy", children: [_jsx("strong", { children: connector.name }), _jsx("small", { children: connectorHint })] }), connected ? (_jsxs("span", { className: `memory-connector-picker${selected ? ' is-selected' : ''}`, children: [_jsx("span", { className: "memory-connector-picker-box", "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 12 }) : null }), _jsx("span", { children: selected ? t('Selected') : t('Select') })] })) : (_jsxs("button", { type: "button", className: `memory-connector-connect-button${connecting || authorizationPending || checkingStatus ? ' is-loading' : ''}`, disabled: connecting || authorizationPending || checkingStatus, "aria-busy": connecting || authorizationPending || checkingStatus || undefined, "aria-label": `${reconnecting ? t('Reconnect') : t('Connect')} ${connector.name}`, onClick: (event) => {
-                                            event.preventDefault();
-                                            event.stopPropagation();
-                                            void onConnectMemoryConnector(connector.id);
-                                        }, children: [_jsx(Icon, { name: connecting || authorizationPending || checkingStatus ? 'refresh' : 'plus', size: 12, className: connecting || authorizationPending || checkingStatus ? 'icon-spin' : '' }), _jsx("span", { children: checkingStatus
-                                                    ? t('Checking')
-                                                    : authorizationPending
-                                                        ? t('Waiting')
-                                                        : connecting
-                                                            ? t('Connecting')
-                                                            : reconnecting
-                                                                ? t('Reconnect')
-                                                                : t('Connect') })] }))] }, connector.id));
-                        }) }), _jsxs("div", { className: "memory-connector-actions memory-connector-runbar", children: [_jsxs("span", { className: "hint", children: [t('Selected'), " ", selectedConnectedConnectorIds.length, " ", t('of'), " ", connectedCount, " ", t('connected'), ' ', connectedCount === 1 ? t('app') : t('apps'), "."] }), _jsxs("button", { type: "button", className: "primary memory-source-action", onClick: () => void onSuggestConnectorMemory(), disabled: !enabled || connectorExtracting || connectorSaving || selectedConnectedConnectorIds.length === 0, children: [_jsx(Icon, { name: connectorExtracting ? 'refresh' : 'sparkles', size: 14, className: connectorExtracting ? 'icon-spin' : '' }), _jsx("span", { children: t(connectorScanLabel) })] })] })] }), connectorSuggestions.length > 0 ? (_jsxs("div", { className: "memory-suggestion-panel", children: [_jsxs("div", { className: "memory-subsection-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Suggested memories') }), _jsx("p", { className: "hint", children: t('Review design-related memories before saving them.') })] }), _jsxs("span", { className: "memory-source-badge", children: [selectedConnectorSuggestions.length, " ", t('selected')] })] }), _jsx("div", { className: "memory-suggestion-list", children: connectorSuggestions.map((suggestion) => {
-                            const selected = selectedSuggestionIds.has(suggestion.id);
-                            const sourceLabel = suggestion.source?.connectorName || suggestion.source?.toolTitle || t('Connected apps');
-                            return (_jsxs("label", { className: `memory-suggestion-card${selected ? ' is-selected' : ''}`, children: [_jsxs("span", { className: "memory-connector-check", children: [_jsx("input", { type: "checkbox", checked: selected, onChange: () => toggleConnectorSuggestion(suggestion.id) }), _jsx("span", { "aria-hidden": "true", children: selected ? _jsx(Icon, { name: "check", size: 13 }) : null })] }), _jsxs("span", { className: "memory-suggestion-copy", children: [_jsxs("span", { className: "memory-suggestion-title", children: [_jsx("strong", { children: suggestion.name }), _jsx("span", { className: "memory-type-badge", children: typeLabel[suggestion.type] })] }), suggestion.description ? _jsx("small", { children: suggestion.description }) : null, _jsx("span", { className: "memory-suggestion-body", children: suggestion.body })] }), _jsx("span", { className: "memory-connector-state is-connected", children: sourceLabel })] }, suggestion.id));
-                        }) }), _jsxs("div", { className: "memory-connector-actions", children: [_jsxs("button", { type: "button", className: "primary memory-source-action", onClick: () => void onSaveConnectorSuggestions(), disabled: connectorSaving || selectedConnectorSuggestions.length === 0, children: [_jsx(Icon, { name: connectorSaving ? 'refresh' : 'check', size: 14, className: connectorSaving ? 'icon-spin' : '' }), _jsx("span", { children: connectorSaving ? t('Saving') : t('Save selected') })] }), _jsx("button", { type: "button", className: "ghost memory-source-action", onClick: onDiscardConnectorSuggestions, disabled: connectorSaving, children: t('Discard') })] })] })) : null, connectorStatus ? (_jsx("div", { role: "status", className: "memory-connector-result is-success", children: connectorStatus })) : null, connectorError ? (_jsx("div", { role: "alert", className: "memory-connector-result is-error", children: connectorError })) : null, connectorAttempts.length > 0 ? (_jsxs("div", { className: "memory-connector-diagnostics", "aria-label": t('Connected app read status'), children: [_jsxs("div", { className: "memory-connector-diagnostics-head", children: [_jsx("strong", { children: t('Last scan') }), _jsxs("span", { children: [formatConnectorContextBytes(connectorContextBytes), " ", t('read')] })] }), _jsx("div", { className: "memory-connector-diagnostics-list", children: connectorAttempts.map((attempt) => (_jsxs("div", { className: `memory-connector-diagnostic-row is-${attempt.status}`, children: [_jsx("span", { className: "memory-connector-diagnostic-dot", "aria-hidden": "true" }), _jsxs("span", { className: "memory-connector-diagnostic-copy", children: [_jsx("strong", { children: connectorAttemptTitle(attempt) }), _jsx("small", { children: connectorAttemptDetail(attempt) })] })] }, `${attempt.connectorId}-${attempt.status}-${attempt.toolName ?? 'none'}`))) })] })) : null, connectorExtractions.length > 0 ? (_jsxs("details", { className: "memory-scan-history", children: [_jsxs("summary", { children: [_jsx("span", { children: t('Recent scans') }), _jsx("span", { children: connectorExtractions.length })] }), _jsx("div", { className: "memory-connector-run-history", "aria-label": t('Connected app memory run status'), children: connectorExtractions.slice(0, 4).map((record) => (_jsx(MemoryExtractionCard, { record: record, nowClock: nowClock, onOpenPreview: onOpenPreview, onDelete: onDeleteExtraction }, record.id))) })] })) : null] }));
+    return (_jsxs("div", { className: "memory-suggestion-panel", children: [_jsxs("div", { className: "memory-subsection-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Suggested memories') }), _jsx("p", { className: "hint", children: t('Review design-related memories before saving them.') })] }), _jsxs("span", { className: "memory-source-badge", children: [selectedConnectorSuggestions.length, " ", t('selected')] })] }), _jsx("div", { className: "memory-suggestion-list", children: connectorSuggestions.map((suggestion) => (_jsx(MemorySuggestionCard, { suggestion: suggestion, selected: selectedSuggestionIds.has(suggestion.id), typeLabel: typeLabel[suggestion.type], toggleConnectorSuggestion: toggleConnectorSuggestion }, suggestion.id))) }), _jsxs("div", { className: "memory-connector-actions", children: [_jsxs("button", { type: "button", className: "primary memory-source-action", onClick: () => void onSaveConnectorSuggestions(), disabled: connectorSaving || selectedConnectorSuggestions.length === 0, children: [_jsx(Icon, { name: connectorSaving ? 'refresh' : 'check', size: 14, className: connectorSaving ? 'icon-spin' : '' }), _jsx("span", { children: connectorSaving ? t('Saving') : t('Save selected') })] }), _jsx("button", { type: "button", className: "ghost memory-source-action", onClick: onDiscardConnectorSuggestions, disabled: connectorSaving, children: t('Discard') })] })] }));
+}
+function MemoryConnectorDiagnostics({ connectorAttempts, connectorContextBytes, }) {
+    const t = useT();
+    return (_jsxs("div", { className: "memory-connector-diagnostics", "aria-label": t('Connected app read status'), children: [_jsxs("div", { className: "memory-connector-diagnostics-head", children: [_jsx("strong", { children: t('Last scan') }), _jsxs("span", { children: [formatConnectorContextBytes(connectorContextBytes), " ", t('read')] })] }), _jsx("div", { className: "memory-connector-diagnostics-list", children: connectorAttempts.map((attempt) => (_jsxs("div", { className: `memory-connector-diagnostic-row is-${attempt.status}`, children: [_jsx("span", { className: "memory-connector-diagnostic-dot", "aria-hidden": "true" }), _jsxs("span", { className: "memory-connector-diagnostic-copy", children: [_jsx("strong", { children: connectorAttemptTitle(attempt) }), _jsx("small", { children: connectorAttemptDetail(attempt) })] })] }, `${attempt.connectorId}-${attempt.status}-${attempt.toolName ?? 'none'}`))) })] }));
+}
+function MemoryScanHistory({ connectorExtractions, nowClock, onOpenPreview, onDeleteExtraction, }) {
+    const t = useT();
+    return (_jsxs("details", { className: "memory-scan-history", children: [_jsxs("summary", { children: [_jsx("span", { children: t('Recent scans') }), _jsx("span", { children: connectorExtractions.length })] }), _jsx("div", { className: "memory-connector-run-history", "aria-label": t('Connected app memory run status'), children: connectorExtractions.slice(0, 4).map((record) => (_jsx(MemoryExtractionCard, { record: record, nowClock: nowClock, onOpenPreview: onOpenPreview, onDelete: onDeleteExtraction }, record.id))) })] }));
+}
+export function MemoryConnectedPanel({ enabled, onOpenConnectors, connectorStatuses, connectorsLoading, connectedCount, selectedConnectorIds, selectedConnectedConnectorIds, connectingConnectorIds, pendingConnectorAuthIds, connectorConnectErrors, connectorIdsWithDetails, connectorExtracting, connectorSaving, connectorScanLabel, connectorSuggestions, selectedSuggestionIds, selectedConnectorSuggestions, connectorStatus, connectorError, connectorLoadError, connectorAttempts, connectorContextBytes, connectorExtractions, memoryConnectors, toggleConnectorSelection, onConnectMemoryConnector, toggleConnectorSuggestion, onSuggestConnectorMemory, onSaveConnectorSuggestions, onDiscardConnectorSuggestions, nowClock, onOpenPreview, onDeleteExtraction, }) {
+    const t = useT();
+    const rowContext = {
+        connectorStatuses,
+        connectorsLoading,
+        selectedConnectorIds,
+        connectingConnectorIds,
+        pendingConnectorAuthIds,
+        connectorConnectErrors,
+        connectorIdsWithDetails,
+    };
+    return (_jsxs("div", { className: "memory-tab-panel memory-connected-panel", children: [_jsx(MemoryConnectedSummary, { connectorsLoading: connectorsLoading, connectedCount: connectedCount, onOpenConnectors: onOpenConnectors }), _jsxs("div", { className: "memory-connector-workbench", children: [connectorLoadError ? (_jsx("div", { role: "alert", className: "memory-connector-result is-error", children: connectorLoadError })) : null, _jsxs("div", { className: "memory-connector-picker-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Choose sources') }), _jsx("p", { className: "hint", children: t('Select connected apps first. Only the apps you choose are scanned.') })] }), _jsxs("span", { className: "memory-source-badge", children: [selectedConnectedConnectorIds.length, " ", t('selected')] })] }), _jsx("div", { className: "memory-connector-list", "aria-label": t('Connected memory apps'), children: memoryConnectors.map((connector) => (_jsx(MemoryConnectorRow, { connector: connector, context: rowContext, toggleConnectorSelection: toggleConnectorSelection, onConnectMemoryConnector: onConnectMemoryConnector }, connector.id))) }), _jsx(MemoryConnectorRunBar, { enabled: enabled, connectorExtracting: connectorExtracting, connectorSaving: connectorSaving, connectedCount: connectedCount, selectedCount: selectedConnectedConnectorIds.length, connectorScanLabel: connectorScanLabel, onSuggestConnectorMemory: onSuggestConnectorMemory })] }), connectorSuggestions.length > 0 ? (_jsx(MemorySuggestionPanel, { connectorSuggestions: connectorSuggestions, selectedSuggestionIds: selectedSuggestionIds, selectedConnectorSuggestions: selectedConnectorSuggestions, connectorSaving: connectorSaving, toggleConnectorSuggestion: toggleConnectorSuggestion, onSaveConnectorSuggestions: onSaveConnectorSuggestions, onDiscardConnectorSuggestions: onDiscardConnectorSuggestions })) : null, connectorStatus ? (_jsx("div", { role: "status", className: "memory-connector-result is-success", children: connectorStatus })) : null, connectorError ? (_jsx("div", { role: "alert", className: "memory-connector-result is-error", children: connectorError })) : null, connectorAttempts.length > 0 ? (_jsx(MemoryConnectorDiagnostics, { connectorAttempts: connectorAttempts, connectorContextBytes: connectorContextBytes })) : null, connectorExtractions.length > 0 ? (_jsx(MemoryScanHistory, { connectorExtractions: connectorExtractions, nowClock: nowClock, onOpenPreview: onOpenPreview, onDeleteExtraction: onDeleteExtraction })) : null] }));
 }
 //# sourceMappingURL=MemoryConnectedPanel.js.map

package/dist/features/memory/react/components/MemoryList.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 // Dumb panel for the saved-memory records: counts, the type-filter pills, the
 // extraction clear/refresh toolbar, and the unified list (saved entries + the
 // visible extraction rows). Rendering only — every list, count, and handler is
@@ -11,24 +11,43 @@ import { TYPES } from '../../constants.js';
 import { memoryTypeLabels } from '../../formatters.js';
 import { MemoryEntryCard } from './MemoryEntryCard.js';
 import { MemoryExtractionCard } from './MemoryExtractionCard.js';
-export function MemoryList({ sectionRef, entries, filtered, visibleExtractions, filter, onFilterChange, unifiedMemoryCount, onClearExtractions, onRefreshExtractions, isRefreshing, previewId, previewBody, nowClock, onOpenPreview, onStartEdit, onDeleteEntry, onDeleteExtraction, agentHandle, }) {
+/** Per-row agent handles under `<agentHandle>-<action>`, or undefined when unpublished. */
+function rowHandles({ agentHandle, action, ids }) {
+    return agentHandle ? buildAgentListHandles({ prefix: agentSubHandle({ base: agentHandle, action }), ids }) : undefined;
+}
+function MemoryListCounts({ savedCount, extractionCount }) {
+    const t = useT();
+    return (_jsxs("div", { className: "memory-management-counts", children: [_jsxs("span", { className: "memory-source-badge", children: [savedCount, " ", t('saved')] }), extractionCount > 0 ? (_jsxs("span", { className: "memory-source-badge", children: [extractionCount, " ", extractionCount === 1 ? t('extraction') : t('extractions')] })) : null] }));
+}
+function MemoryFilterPills({ entries, extractionCount, filter, onFilterChange, agentHandle, }) {
     const t = useT();
     const typeLabel = useMemo(() => memoryTypeLabels(t), [t]);
-    const entryHandles = agentHandle
-        ? buildAgentListHandles({ prefix: agentSubHandle({ base: agentHandle, action: 'entry' }), ids: filtered.map((e) => e.id) })
-        : undefined;
-    const extractionHandles = agentHandle
-        ? buildAgentListHandles({ prefix: agentSubHandle({ base: agentHandle, action: 'extraction' }), ids: visibleExtractions.map((r) => r.id) })
-        : undefined;
-    return (_jsx("section", { ref: sectionRef, className: "settings-section settings-section-card memory-records-section", children: _jsxs("div", { className: "memory-management-panel", children: [_jsxs("div", { className: "memory-subsection-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Saved memory') }), _jsx("p", { className: "hint", children: t('Saved facts, preferences, and project context available to future chats.') })] }), _jsxs("div", { className: "memory-management-counts", children: [_jsxs("span", { className: "memory-source-badge", children: [entries.length, " ", t('saved')] }), visibleExtractions.length > 0 ? (_jsxs("span", { className: "memory-source-badge", children: [visibleExtractions.length, " ", visibleExtractions.length === 1 ? t('extraction') : t('extractions')] })) : null] })] }), _jsxs("div", { className: "library-toolbar is-row", children: [_jsxs("div", { className: "library-filters", children: [_jsxs("button", { type: "button", className: `filter-pill${filter === 'all' ? ' active' : ''}`, onClick: () => onFilterChange('all'), ...agentHandleProps({}, { base: agentHandle, ...({ action: 'filter-all', role: 'button', label: t('All') }) }), children: [t('All'), _jsx("span", { className: "filter-pill-count", children: entries.length + visibleExtractions.length })] }), TYPES.map((type) => {
-                                    const count = entries.filter((e) => e.type === type).length;
-                                    if (count === 0 && filter !== type)
-                                        return null;
-                                    return (_jsxs("button", { type: "button", className: `filter-pill${filter === type ? ' active' : ''}`, onClick: () => onFilterChange(type), ...agentHandleProps({}, { base: agentHandle, ...({ action: `filter-${type}`, role: 'button', label: typeLabel[type] }) }), children: [typeLabel[type], _jsx("span", { className: "filter-pill-count", children: count })] }, type));
-                                })] }), _jsxs("div", { className: "memory-management-actions", children: [visibleExtractions.length > 0 ? (_jsxs("button", { type: "button", className: "ghost memory-clear-extractions", onClick: () => onClearExtractions(), title: t('Clear extraction history'), ...agentHandleProps({}, { base: agentHandle, ...({ action: 'clear-extractions', role: 'button', label: t('Clear extraction history') }) }), children: [_jsx(Icon, { name: "close", size: 12 }), _jsx("span", { children: t('Clear') })] })) : null, visibleExtractions.length > 0 ? (_jsxs("button", { type: "button", className: "ghost memory-refresh-extractions", onClick: () => onRefreshExtractions(), disabled: isRefreshing, title: t('Refresh'), ...agentHandleProps({}, { base: agentHandle, ...({ action: 'refresh-extractions', role: 'button', label: t('Refresh') }) }), children: [_jsx(Icon, { name: "refresh", size: 12, className: isRefreshing ? 'icon-spin' : '' }), _jsx("span", { children: isRefreshing ? t('Refreshing') : t('Refresh') })] })) : null] })] }), _jsx("div", { className: "library-content memory-unified-list", children: unifiedMemoryCount === 0 ? (
-                    // Empty state: one clear "no rows yet" line and a one-sentence
-                    // primer that explains the mechanism (talk in chat, fact gets
-                    // extracted) with a single example.
-                    _jsxs("div", { className: "library-empty", children: [_jsx("p", { className: "library-empty-title", children: t('No saved memories yet') }), _jsxs("p", { className: "library-empty-hint", children: [t('Tell the assistant a fact in chat — e.g.'), " ", _jsx("code", { children: t('I prefer dark mode') }), ' ', t('— and it will be saved here automatically.')] })] })) : (_jsxs(_Fragment, { children: [filtered.map((entry, index) => (_jsx(MemoryEntryCard, { entry: entry, previewId: previewId, previewBody: previewBody, onOpenPreview: onOpenPreview, onStartEdit: onStartEdit, onDelete: onDeleteEntry, ...(entryHandles?.[index] ? { agentHandle: entryHandles[index] } : {}) }, entry.id))), visibleExtractions.map((record, index) => (_jsx(MemoryExtractionCard, { record: record, nowClock: nowClock, onOpenPreview: onOpenPreview, onDelete: onDeleteExtraction, ...(extractionHandles?.[index] ? { agentHandle: extractionHandles[index] } : {}) }, record.id)))] })) })] }) }));
+    return (_jsxs("div", { className: "library-filters", children: [_jsxs("button", { type: "button", className: `filter-pill${filter === 'all' ? ' active' : ''}`, onClick: () => onFilterChange('all'), ...agentHandleProps({}, { base: agentHandle, action: 'filter-all', role: 'button', label: t('All') }), children: [t('All'), _jsx("span", { className: "filter-pill-count", children: entries.length + extractionCount })] }), TYPES.map((type) => {
+                const count = entries.filter((e) => e.type === type).length;
+                if (count === 0 && filter !== type)
+                    return null;
+                return (_jsxs("button", { type: "button", className: `filter-pill${filter === type ? ' active' : ''}`, onClick: () => onFilterChange(type), ...agentHandleProps({}, { base: agentHandle, action: `filter-${type}`, role: 'button', label: typeLabel[type] }), children: [typeLabel[type], _jsx("span", { className: "filter-pill-count", children: count })] }, type));
+            })] }));
+}
+function MemoryExtractionActions({ onClearExtractions, onRefreshExtractions, isRefreshing, agentHandle, }) {
+    const t = useT();
+    return (_jsxs(_Fragment, { children: [_jsxs("button", { type: "button", className: "ghost memory-clear-extractions", onClick: () => onClearExtractions(), title: t('Clear extraction history'), ...agentHandleProps({}, { base: agentHandle, action: 'clear-extractions', role: 'button', label: t('Clear extraction history') }), children: [_jsx(Icon, { name: "close", size: 12 }), _jsx("span", { children: t('Clear') })] }), _jsxs("button", { type: "button", className: "ghost memory-refresh-extractions", onClick: () => onRefreshExtractions(), disabled: isRefreshing, title: t('Refresh'), ...agentHandleProps({}, { base: agentHandle, action: 'refresh-extractions', role: 'button', label: t('Refresh') }), children: [_jsx(Icon, { name: "refresh", size: 12, className: isRefreshing ? 'icon-spin' : '' }), _jsx("span", { children: isRefreshing ? t('Refreshing') : t('Refresh') })] })] }));
+}
+function MemoryListEmpty() {
+    const t = useT();
+    return (
+    // Empty state: one clear "no rows yet" line and a one-sentence
+    // primer that explains the mechanism (talk in chat, fact gets
+    // extracted) with a single example.
+    _jsxs("div", { className: "library-empty", children: [_jsx("p", { className: "library-empty-title", children: t('No saved memories yet') }), _jsxs("p", { className: "library-empty-hint", children: [t('Tell the assistant a fact in chat — e.g.'), " ", _jsx("code", { children: t('I prefer dark mode') }), ' ', t('— and it will be saved here automatically.')] })] }));
+}
+function MemoryListRows({ filtered, visibleExtractions, previewId, previewBody, nowClock, onOpenPreview, onStartEdit, onDeleteEntry, onDeleteExtraction, agentHandle, }) {
+    const entryHandles = rowHandles({ agentHandle, action: 'entry', ids: filtered.map((e) => e.id) });
+    const extractionHandles = rowHandles({ agentHandle, action: 'extraction', ids: visibleExtractions.map((r) => r.id) });
+    return (_jsxs(_Fragment, { children: [filtered.map((entry, index) => (_jsx(MemoryEntryCard, { entry: entry, previewId: previewId, previewBody: previewBody, onOpenPreview: onOpenPreview, onStartEdit: onStartEdit, onDelete: onDeleteEntry, ...(entryHandles?.[index] ? { agentHandle: entryHandles[index] } : {}) }, entry.id))), visibleExtractions.map((record, index) => (_jsx(MemoryExtractionCard, { record: record, nowClock: nowClock, onOpenPreview: onOpenPreview, onDelete: onDeleteExtraction, ...(extractionHandles?.[index] ? { agentHandle: extractionHandles[index] } : {}) }, record.id)))] }));
+}
+export function MemoryList({ sectionRef, entries, filtered, visibleExtractions, filter, onFilterChange, unifiedMemoryCount, onClearExtractions, onRefreshExtractions, isRefreshing, previewId, previewBody, nowClock, onOpenPreview, onStartEdit, onDeleteEntry, onDeleteExtraction, agentHandle, }) {
+    const t = useT();
+    return (_jsx("section", { ref: sectionRef, className: "settings-section settings-section-card memory-records-section", children: _jsxs("div", { className: "memory-management-panel", children: [_jsxs("div", { className: "memory-subsection-head", children: [_jsxs("div", { children: [_jsx("h4", { children: t('Saved memory') }), _jsx("p", { className: "hint", children: t('Saved facts, preferences, and project context available to future chats.') })] }), _jsx(MemoryListCounts, { savedCount: entries.length, extractionCount: visibleExtractions.length })] }), _jsxs("div", { className: "library-toolbar is-row", children: [_jsx(MemoryFilterPills, { entries: entries, extractionCount: visibleExtractions.length, filter: filter, onFilterChange: onFilterChange, agentHandle: agentHandle }), _jsx("div", { className: "memory-management-actions", children: visibleExtractions.length > 0 ? (_jsx(MemoryExtractionActions, { onClearExtractions: onClearExtractions, onRefreshExtractions: onRefreshExtractions, isRefreshing: isRefreshing, agentHandle: agentHandle })) : null })] }), _jsx("div", { className: "library-content memory-unified-list", children: unifiedMemoryCount === 0 ? (_jsx(MemoryListEmpty, {})) : (_jsx(MemoryListRows, { filtered: filtered, visibleExtractions: visibleExtractions, previewId: previewId, previewBody: previewBody, nowClock: nowClock, onOpenPreview: onOpenPreview, onStartEdit: onStartEdit, onDeleteEntry: onDeleteEntry, onDeleteExtraction: onDeleteExtraction, agentHandle: agentHandle })) })] }) }));
 }
 //# sourceMappingURL=MemoryList.js.map

package/dist/features/memory/react/hooks/useMemoryExtractions.store.js

@@ -81,30 +81,51 @@ export function createExtractionHistoryStore(onRowsChanged) {
     function tombstone(id) {
         tombstones.add(id);
     }
+    function applyClearedFrame() {
+        // A remote clear removed every attempt the daemon knew about, which
+        // covers everything this client has observed: visible rows, ids hidden
+        // by a pending local delete, and buffered frames. Tombstone them all
+        // (rule C) so delayed frames cannot recreate discarded attempts.
+        const owned = new Set([...rows.map((row) => row.id), ...pendingDeletes.keys(), ...deferred.keys()]);
+        for (const id of owned)
+            tombstone(id);
+        deferred.clear();
+        clearStamp = commit([]);
+    }
+    function applyDeletedFrame({ id }) {
+        deferred.delete(id);
+        tombstone(id);
+        commit(rows.filter((row) => row.id !== id));
+    }
+    function deferFrame(ev) {
+        const prior = deferred.get(ev.id);
+        deferred.set(ev.id, prior ? mergeSameAttempt(prior, ev) : ev);
+    }
+    function upsertFrame(ev) {
+        // Merge by id (rule B): phase transitions for an in-flight attempt
+        // collapse onto a single row instead of stacking N entries. New ids are
+        // unshifted so the latest appears at the top.
+        const at = rows.findIndex((row) => row.id === ev.id);
+        let next;
+        if (at >= 0) {
+            next = rows.slice();
+            next[at] = mergeSameAttempt(next[at], ev);
+        }
+        else {
+            next = [ev, ...rows].slice(0, MAX_ROWS);
+        }
+        rowStamp.set(ev.id, commit(next));
+    }
     function applyFrame(ev) {
         if (!ev || !ev.id)
             return;
         // Pseudo-phases: the daemon emits these synthetically when a row is
         // dropped from the buffer, by the per-row delete button or the "Clear"
         // affordance at the top (possibly in another client).
-        if (ev.phase === 'cleared') {
-            // A remote clear removed every attempt the daemon knew about, which
-            // covers everything this client has observed: visible rows, ids hidden
-            // by a pending local delete, and buffered frames. Tombstone them all
-            // (rule C) so delayed frames cannot recreate discarded attempts.
-            const owned = new Set([...rows.map((row) => row.id), ...pendingDeletes.keys(), ...deferred.keys()]);
-            for (const id of owned)
-                tombstone(id);
-            deferred.clear();
-            clearStamp = commit([]);
-            return;
-        }
-        if (ev.phase === 'deleted') {
-            deferred.delete(ev.id);
-            tombstone(ev.id);
-            commit(rows.filter((row) => row.id !== ev.id));
-            return;
-        }
+        if (ev.phase === 'cleared')
+            return applyClearedFrame();
+        if (ev.phase === 'deleted')
+            return applyDeletedFrame({ id: ev.id });
         // Rule C: a confirmed-removed id never comes back. A delayed frame on
         // the SSE connection may have been emitted before the DELETE response
         // won the fetch race.
@@ -115,24 +136,9 @@ export function createExtractionHistoryStore(onRowsChanged) {
         // operation for their id. Buffer them (content-merged, rule B) so they
         // cannot visibly undo the optimistic removal; the settle path replays
         // the best buffered frame on failure and tombstones it on success.
-        if (pendingDeletes.has(ev.id) || pendingClears > 0) {
-            const prior = deferred.get(ev.id);
-            deferred.set(ev.id, prior ? mergeSameAttempt(prior, ev) : ev);
-            return;
-        }
-        // Merge by id (rule B): phase transitions for an in-flight attempt
-        // collapse onto a single row instead of stacking N entries. New ids are
-        // unshifted so the latest appears at the top.
-        const at = rows.findIndex((row) => row.id === ev.id);
-        let next;
-        if (at >= 0) {
-            next = rows.slice();
-            next[at] = mergeSameAttempt(next[at], ev);
-        }
-        else {
-            next = [ev, ...rows].slice(0, MAX_ROWS);
-        }
-        rowStamp.set(ev.id, commit(next));
+        if (pendingDeletes.has(ev.id) || pendingClears > 0)
+            return deferFrame(ev);
+        upsertFrame(ev);
     }
     function commitSnapshot(confirmed, sinceClock) {
         // An authoritative clear younger than this read supersedes the whole