@ahggg/dsh-side-chat 0.4.1 → 0.5.0

package/lib/client/rc6/SideChatTool.js

@@ -0,0 +1,395 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from 'react';
+import { CodeBlock, DiffBlock, DisclosureRow, IconApiOutline14, IconBrowseOutline16, IconCodeOutline16, IconEditOutline16, IconSearchOutline16, IconSparkle16, ReadBlock, SearchBlock, StateDot, TerminalBlock, WebBlock, } from '@deepseek-ai/dsh-client-ui-primitives';
+const TOOL_VARIANTS = {
+    bash: 'bash',
+    pwsh: 'bash',
+    read: 'read',
+    web_fetch: 'read',
+    web_search: 'search',
+    grep: 'search',
+    glob: 'search',
+    write: 'write',
+    edit: 'edit',
+    run_code: 'code',
+};
+const VARIANT_TITLES = {
+    search: 'Search',
+    read: 'Read',
+    bash: 'Bash',
+    write: 'Write',
+    edit: 'Edit',
+    code: 'Code',
+    others: 'Tool call',
+};
+const SUMMARY_KEYS = {
+    bash: ['description', 'command'],
+    read: ['path', 'file_path', 'url'],
+    search: ['query', 'pattern', 'url'],
+    write: ['path', 'file_path'],
+    edit: ['path', 'file_path'],
+    code: ['description'],
+    others: [],
+};
+function record(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+        ? value
+        : null;
+}
+function stringValue(value) {
+    return typeof value === 'string' && value !== '' ? value : undefined;
+}
+function numberValue(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+function booleanValue(value) {
+    return typeof value === 'boolean' ? value : undefined;
+}
+function firstLine(text) {
+    const newline = text.indexOf('\n');
+    return newline === -1 ? text : text.slice(0, newline);
+}
+function stringify(value) {
+    if (typeof value === 'string')
+        return value;
+    try {
+        return JSON.stringify(value, null, 2);
+    }
+    catch {
+        return String(value);
+    }
+}
+function contentText(content) {
+    return content.map((block) => {
+        if (block.type === 'text' || block.type === 'reasoning')
+            return block.text;
+        if (block.type === 'image')
+            return '[Image]';
+        if (block.type === 'tool-call')
+            return `${block.name}(${block.arguments})`;
+        if (block.type === 'tool-result')
+            return contentText(block.content);
+        return stringify(block);
+    }).filter(Boolean).join('\n');
+}
+export function toolOutputText(content) {
+    const text = contentText(content);
+    const fileEnvelope = /^<path>[\s\S]*?<\/path>\s*<type>[\s\S]*?<\/type>\s*<content>\s*\n?([\s\S]*?)\n?<\/content>\s*$/u.exec(text);
+    return fileEnvelope?.[1]?.trimEnd() ?? text;
+}
+function parseArguments(argsRaw) {
+    try {
+        return record(JSON.parse(argsRaw));
+    }
+    catch {
+        return null;
+    }
+}
+function formattedArguments(argsRaw) {
+    try {
+        return JSON.stringify(JSON.parse(argsRaw), null, 2);
+    }
+    catch {
+        return argsRaw;
+    }
+}
+function classifyTool(name) {
+    return TOOL_VARIANTS[name.toLowerCase()] ?? 'others';
+}
+function toolTitle(name, variant) {
+    if (name.toLowerCase() === 'pwsh')
+        return 'Pwsh';
+    return VARIANT_TITLES[variant];
+}
+function pickArgument(args, keys) {
+    for (const key of keys) {
+        const value = stringValue(args[key]);
+        if (value !== undefined)
+            return value;
+    }
+    return Object.values(args).find((value) => typeof value === 'string' && value !== '');
+}
+function relativizeToCwd(path, cwd) {
+    if (cwd === undefined || cwd === '')
+        return path;
+    const root = cwd.replace(/[/\\]+$/u, '');
+    const lowerPath = path.toLowerCase();
+    const lowerRoot = root.toLowerCase();
+    return lowerPath.startsWith(`${lowerRoot}/`) || lowerPath.startsWith(`${lowerRoot}\\`)
+        ? path.slice(root.length + 1)
+        : path;
+}
+function summaryFromArguments(name, variant, argsRaw, callId, cwd) {
+    const args = parseArguments(argsRaw);
+    const picked = args === null ? undefined : pickArgument(args, SUMMARY_KEYS[variant]);
+    const base = relativizeToCwd(firstLine(picked ?? (argsRaw === '' || argsRaw === '{}' ? callId : argsRaw)), cwd);
+    return variant === 'others' && name !== '' ? `${name} · ${base}` : base;
+}
+function filePathFromArguments(variant, argsRaw) {
+    if (variant !== 'read' && variant !== 'write' && variant !== 'edit')
+        return undefined;
+    const args = parseArguments(argsRaw);
+    if (args === null)
+        return undefined;
+    return stringValue(args['path']) ?? stringValue(args['file_path']);
+}
+function variantIcon(variant) {
+    switch (variant) {
+        case 'search': return _jsx(IconSearchOutline16, { size: 14 });
+        case 'read': return _jsx(IconBrowseOutline16, { size: 14 });
+        case 'bash': return _jsx(IconApiOutline14, { size: 14 });
+        case 'write':
+        case 'edit': return _jsx(IconEditOutline16, { size: 14 });
+        case 'code': return _jsx(IconCodeOutline16, { size: 14 });
+        case 'others': return _jsx(IconSparkle16, { size: 14 });
+    }
+}
+function resolveTerminalCwd(viewCwd, cwd) {
+    if (viewCwd === undefined || viewCwd === '')
+        return cwd;
+    if (cwd === undefined || cwd === '' || /^(?:[A-Za-z]:[/\\]|[/\\]{1,2})/u.test(viewCwd))
+        return viewCwd;
+    return `${cwd.replace(/[/\\]+$/u, '')}\\${viewCwd}`;
+}
+function terminalCard(variant, argsRaw, state, output, callView, resultView, cwd) {
+    const call = record(callView);
+    const result = record(resultView);
+    const callIsTerminal = call?.['card'] === 'terminal';
+    const resultIsTerminal = result?.['card'] === 'terminal';
+    if (variant !== 'bash' && !callIsTerminal && !resultIsTerminal)
+        return null;
+    const args = parseArguments(argsRaw);
+    const command = stringValue(result?.['title'])
+        ?? stringValue(call?.['title'])
+        ?? (args === null ? undefined : stringValue(args['command']))
+        ?? '';
+    return {
+        command,
+        cwd: resolveTerminalCwd(stringValue(call?.['cwd']), cwd),
+        output: stringValue(result?.['output']) ?? output,
+        exitCode: numberValue(result?.['exitCode']),
+        signal: stringValue(result?.['signal']),
+        running: state === 'running' || state === 'pending',
+        description: stringValue(call?.['description']),
+    };
+}
+function languageForPath(path) {
+    if (path === undefined)
+        return undefined;
+    const extension = /\.([^.\\/]+)$/u.exec(path)?.[1]?.toLowerCase();
+    const aliases = {
+        js: 'javascript', jsx: 'jsx', ts: 'typescript', tsx: 'tsx',
+        json: 'json', css: 'css', html: 'html', md: 'markdown',
+        yml: 'yaml', yaml: 'yaml', py: 'python', ps1: 'powershell',
+        sh: 'bash', toml: 'toml', xml: 'xml',
+    };
+    return extension === undefined ? undefined : aliases[extension];
+}
+function validReadLines(value) {
+    if (!Array.isArray(value))
+        return null;
+    const lines = [];
+    for (const item of value) {
+        const line = record(item);
+        const number = numberValue(line?.['number']);
+        const text = stringValue(line?.['text']) ?? (line?.['text'] === '' ? '' : undefined);
+        if (number === undefined || text === undefined)
+            return null;
+        lines.push({ number, text });
+    }
+    return lines;
+}
+function readCard(name, argsRaw, state, output, resultView, cwd) {
+    if (state === 'running' || state === 'pending' || state === 'error' || state === 'interrupted')
+        return null;
+    const result = record(resultView);
+    if (result?.['card'] === 'read') {
+        const lines = validReadLines(result['lines']);
+        const totalLines = numberValue(result['totalLines']);
+        const path = stringValue(result['path']);
+        if (lines === null || totalLines === undefined)
+            return null;
+        return {
+            label: stringValue(result['title']) ?? (path === undefined ? undefined : relativizeToCwd(path, cwd)),
+            lines,
+            totalLines,
+            lang: stringValue(result['lang']),
+        };
+    }
+    if (name.toLowerCase() !== 'read' || output === undefined)
+        return null;
+    const path = filePathFromArguments('read', argsRaw);
+    const texts = output.split('\n');
+    return {
+        label: path === undefined ? undefined : relativizeToCwd(path, cwd),
+        lines: texts.map((text, index) => ({ number: index + 1, text })),
+        totalLines: texts.length,
+        lang: languageForPath(path),
+    };
+}
+function validSearchCard(resultView) {
+    const result = record(resultView);
+    if (result?.['card'] !== 'search')
+        return null;
+    const truncated = booleanValue(result['truncated']);
+    const total = numberValue(result['total']);
+    if (truncated === undefined || total === undefined)
+        return null;
+    if (result['shape'] === 'paths') {
+        const paths = result['paths'];
+        return Array.isArray(paths) && paths.every((path) => typeof path === 'string')
+            ? { kind: 'paths', paths, truncated, total }
+            : null;
+    }
+    if (result['shape'] !== 'matches' || !Array.isArray(result['files']))
+        return null;
+    const files = [];
+    for (const item of result['files']) {
+        const file = record(item);
+        const path = stringValue(file?.['path']);
+        const matchesValue = file?.['matches'];
+        if (path === undefined || !Array.isArray(matchesValue))
+            return null;
+        const matches = [];
+        for (const matchValue of matchesValue) {
+            const match = record(matchValue);
+            const lineNumber = numberValue(match?.['lineNumber']);
+            const line = stringValue(match?.['line']) ?? (match?.['line'] === '' ? '' : undefined);
+            if (lineNumber === undefined || line === undefined)
+                return null;
+            matches.push({ lineNumber, line });
+        }
+        files.push({ path, matches });
+    }
+    return { kind: 'matches', files, truncated, total };
+}
+function validDiffs(view) {
+    const value = record(view);
+    if (value?.['card'] !== 'diff' || !Array.isArray(value['diffs']) || value['diffs'].length === 0)
+        return null;
+    const diffs = [];
+    for (const item of value['diffs']) {
+        const hunk = record(item);
+        const path = stringValue(hunk?.['path']);
+        const oldText = hunk?.['oldText'];
+        const newText = stringValue(hunk?.['newText']) ?? (hunk?.['newText'] === '' ? '' : undefined);
+        if (path === undefined || (oldText !== null && typeof oldText !== 'string') || newText === undefined)
+            return null;
+        diffs.push({ path, oldText, newText });
+    }
+    return diffs;
+}
+function validWebCard(view) {
+    const result = record(view);
+    if (result?.['card'] !== 'web')
+        return null;
+    const truncated = booleanValue(result['truncated']);
+    if (truncated === undefined)
+        return null;
+    if (result['kind'] === 'fetch') {
+        const url = stringValue(result['url']);
+        const statusCode = numberValue(result['statusCode']);
+        return url === undefined || statusCode === undefined ? null : { kind: 'fetch', url, statusCode, truncated };
+    }
+    if (result['kind'] !== 'search' || !Array.isArray(result['sources']))
+        return null;
+    const sources = [];
+    for (const item of result['sources']) {
+        const source = record(item);
+        const url = stringValue(source?.['url']);
+        if (url === undefined)
+            return null;
+        const title = stringValue(source?.['title']);
+        const snippet = stringValue(source?.['snippet']);
+        const publishedAt = stringValue(source?.['publishedAt']);
+        sources.push({
+            url,
+            ...(title === undefined ? {} : { title }),
+            ...(snippet === undefined ? {} : { snippet }),
+            ...(publishedAt === undefined ? {} : { publishedAt }),
+        });
+    }
+    const answer = stringValue(result['answer']);
+    return { kind: 'search', sources, truncated, ...(answer === undefined ? {} : { answer }) };
+}
+function genericBody(variant, argsRaw) {
+    if (argsRaw === '' || argsRaw === '{}')
+        return null;
+    if (variant === 'read' || variant === 'write' || variant === 'edit')
+        return null;
+    return formattedArguments(argsRaw);
+}
+function leadingFor(state, icon) {
+    if (state === 'error')
+        return _jsx(StateDot, { state: "error" });
+    if (state === 'interrupted')
+        return _jsx(StateDot, { state: "warning" });
+    return icon;
+}
+function toolStatus(state) {
+    if (state === 'running' || state === 'pending')
+        return 'Running';
+    if (state === 'error')
+        return 'Failed';
+    if (state === 'interrupted')
+        return 'Stopped';
+    return null;
+}
+export function ToolCard({ callId, name, argsRaw, state, output, callView, resultView, cwd, }) {
+    const [expanded, setExpanded] = useState(false);
+    const variant = classifyTool(name);
+    const terminal = terminalCard(variant, argsRaw, state, output, callView, resultView, cwd);
+    const terminalFailed = terminal !== null
+        && !terminal.running
+        && ((terminal.exitCode !== undefined && terminal.exitCode !== 0) || terminal.signal !== undefined);
+    const visualState = state === 'success' && terminalFailed ? 'error' : state;
+    const read = readCard(name, argsRaw, visualState, output, resultView, cwd);
+    const search = validSearchCard(resultView);
+    const diffs = validDiffs(resultView) ?? validDiffs(callView);
+    const web = validWebCard(resultView);
+    const args = parseArguments(argsRaw);
+    const code = variant === 'code' && args !== null ? stringValue(args['code']) : undefined;
+    const body = genericBody(variant, argsRaw);
+    const summary = terminal?.description
+        ?? stringValue(record(resultView)?.['title'])
+        ?? summaryFromArguments(name, variant, argsRaw, callId, cwd);
+    const failureLine = visualState === 'error' && output !== undefined ? firstLine(output) : null;
+    const summaryText = failureLine ?? summary;
+    const hasSpecialCard = terminal !== null || read !== null || search !== null || diffs !== null || web !== null || code !== undefined;
+    const expandable = hasSpecialCard || body !== null || output !== undefined;
+    const open = expanded && expandable;
+    const status = toolStatus(visualState);
+    return (_jsxs("section", { className: "dsh-side-chat-tool", "data-call-id": callId, "data-state": visualState, "data-expanded": open || undefined, children: [status !== null && _jsx("span", { className: "dsh-side-chat-tool-visually-hidden", children: status }), _jsx(DisclosureRow, { rowClassName: "dsh-side-chat-tool-row", leadingClassName: "dsh-side-chat-tool-leading", titleClassName: "dsh-side-chat-tool-title", chevronClassName: "dsh-side-chat-tool-chevron", icon: leadingFor(visualState, variantIcon(variant)), title: toolTitle(name, variant), open: open, expandable: expandable, expandOnRowClick: true, keepContentWhenOpen: true, onToggle: () => { setExpanded(current => !current); }, collapsedContent: summaryText !== '' && (_jsxs(_Fragment, { children: [_jsx("span", { className: "dsh-side-chat-tool-separator", "aria-hidden": "true" }), _jsx("span", { className: failureLine === null
+                                ? 'dsh-side-chat-tool-summary'
+                                : 'dsh-side-chat-tool-summary dsh-side-chat-tool-error-summary', children: summaryText })] })), children: _jsx("div", { className: "dsh-side-chat-tool-body-wrap", children: terminal !== null
+                        ? (_jsx(TerminalBlock, { command: terminal.command, cwd: terminal.cwd, output: terminal.output, exitCode: terminal.exitCode, signal: terminal.signal, running: terminal.running, maxLines: Infinity, className: "dsh-side-chat-tool-terminal" }))
+                        : read !== null
+                            ? _jsx(ReadBlock, { ...read, maxLines: 8, className: "dsh-side-chat-tool-read" })
+                            : search !== null
+                                ? _jsx(SearchBlock, { ...search, maxLines: 8, className: "dsh-side-chat-tool-search" })
+                                : diffs !== null
+                                    ? _jsx(DiffBlock, { diffs: diffs, maxLines: 8, className: "dsh-side-chat-tool-diff" })
+                                    : web !== null
+                                        ? _jsx(WebBlock, { ...web, className: "dsh-side-chat-tool-web" })
+                                        : code !== undefined
+                                            ? _jsx(CodeBlock, { code: code, lang: "typescript", copyLabel: "Copy", copiedLabel: "Copied", className: "dsh-side-chat-tool-code" })
+                                            : (body !== null || output !== undefined) && (_jsxs("div", { className: "dsh-side-chat-tool-io-card", children: [body !== null && (_jsxs("div", { className: "dsh-side-chat-tool-io-section", children: [_jsx("span", { className: "dsh-side-chat-tool-io-label", children: "IN" }), _jsx("span", { className: "dsh-side-chat-tool-io-text", children: body })] })), body !== null && output !== undefined && _jsx("span", { className: "dsh-side-chat-tool-io-divider", "aria-hidden": "true" }), output !== undefined && (_jsxs("div", { className: "dsh-side-chat-tool-io-section", children: [_jsx("span", { className: "dsh-side-chat-tool-io-label", children: "OUT" }), _jsx("span", { className: "dsh-side-chat-tool-io-text", "data-error": visualState === 'error' || undefined, children: output })] }))] })) }) })] }));
+}
+function resultState(node, output) {
+    if (!node.isError)
+        return 'success';
+    const identity = `${node.error?.name ?? ''} ${node.error?.code ?? ''} ${output}`;
+    return /\b(?:aborted|cancelled|canceled)\b/iu.test(identity) ? 'interrupted' : 'error';
+}
+export function ToolBlockCard({ block, cwd }) {
+    const settled = 'kind' in block;
+    const output = settled ? toolOutputText(block.content) : undefined;
+    const state = settled ? resultState(block, output ?? '') : 'running';
+    const name = settled ? block.call?.name ?? block.callId : block.name;
+    const argsRaw = settled ? block.call?.argsRaw ?? '{}' : block.argsRaw;
+    return (_jsxs("div", { className: "dsh-side-chat-tool-branch", children: [_jsx(ToolCard, { callId: block.callId, name: name, argsRaw: argsRaw, state: state, output: output, callView: block.callView, resultView: settled ? block.resultView : null, cwd: cwd }), block.subCalls.length > 0 && (_jsx("div", { className: "dsh-side-chat-tool-subcalls", "data-subcalls": true, children: block.subCalls.map(child => _jsx(ToolBlockCard, { block: child, cwd: cwd }, child.callId)) }))] }));
+}
+export function RunningToolCard({ call, cwd }) {
+    return _jsx(ToolBlockCard, { block: call, cwd: cwd });
+}
+//# sourceMappingURL=SideChatTool.js.map

package/lib/client/rc6/SideChatTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SideChatTool.js","sourceRoot":"","sources":["../../../src/client/rc6/SideChatTool.tsx"],"names":[],"mappings":"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"}

package/lib/client/rc6/sessions-adapter.d.ts

@@ -1,19 +1,28 @@
 import type { ConversationSnapshot, SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
 import type { SideChatClientSessions, SideChatSessionLease } from '../contracts.js';
 import type { ConversationSelection, SessionId } from '../../shared/contracts.js';
+import type { ParentComposerInputSnapshot } from '../parent-composer/add-to-conversation.js';
 import type { Rc6ClientContext } from './context.js';
 /** Adapter over rc.6's public SessionRuntime and exported concrete Session type. */
 export declare class Rc6SideChatSessions implements SideChatClientSessions {
     private readonly ctx;
     private readonly renamed;
+    private readonly annotationPersistence;
     constructor(ctx: Rc6ClientContext);
     /** Observable rc.6 Session-list surface used to follow main-session switches. */
     readonly subscribeList: (listener: () => void) => (() => void);
+    /** Follow both current-session switches and that session's composer state. */
+    readonly subscribeConversationInput: (listener: () => void) => (() => void);
+    readonly currentConversationInputSnapshot: () => ParentComposerInputSnapshot | undefined;
     currentSessionId(): SessionId | undefined;
     lastCompletedSeq(parentSessionId: SessionId): number | undefined;
     selectionIsCurrent(selection: ConversationSelection): boolean;
     /** Add one selected passage to the native composer of its parent Session. */
     addSelectionToConversation(selection: ConversationSelection, comment?: string): boolean;
+    /** Update an existing unsent annotation without adding a duplicate passage. */
+    updateConversationAnnotation(annotationIndex: number, comment?: string): boolean;
+    /** Mirror or recover the current Session's unsent annotation occurrence. */
+    reconcileConversationAnnotationPersistence(): void;
     /** Number assigned to the next annotation shown beside the selected passage. */
     nextConversationAnnotationNumber(): number;
     /** Remove the current Session's unsent selected-passage annotations. */
@@ -26,6 +35,8 @@ export declare class Rc6SideChatSessions implements SideChatClientSessions {
     }): void;
     face(sessionId: SessionId): SessionFace | undefined;
     title(sessionId: SessionId): string | undefined;
+    cwd(sessionId: SessionId): string | undefined;
+    private currentParentInput;
     private waitForBinding;
 }
 export declare function selectionDescriptor(snapshot: ConversationSnapshot, anchorKey: string): {

package/lib/client/rc6/sessions-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions-adapter.d.ts","sourceRoot":"","sources":["../../../src/client/rc6/sessions-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EAEpB,WAAW,EAEZ,MAAM,wCAAwC,CAAA;AAS/C,OAAO,KAAK,EACV,sBAAsB,EAGtB,oBAAoB,EAErB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EACV,qBAAqB,EACrB,SAAS,EAGV,MAAM,2BAA2B,CAAA;AAOlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AA6JpD,oFAAoF;AACpF,qBAAa,mBAAoB,YAAW,sBAAsB;IAGpD,OAAO,CAAC,QAAQ,CAAC,GAAG;IAFhC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;gBAElB,GAAG,EAAE,gBAAgB;IAElD,iFAAiF;IACjF,QAAQ,CAAC,aAAa,GAAI,UAAU,MAAM,IAAI,KAAG,CAAC,MAAM,IAAI,CAAC,CAA8C;IAE3G,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAKzC,gBAAgB,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAKhE,kBAAkB,CAAC,SAAS,EAAE,qBAAqB,GAAG,OAAO;IAc7D,6EAA6E;IAC7E,0BAA0B,CAAC,SAAS,EAAE,qBAAqB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAOvF,gFAAgF;IAChF,gCAAgC,IAAI,MAAM;IAQ1C,wEAAwE;IACxE,6BAA6B,IAAI,OAAO;IAQlC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAc3D,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,MAAM,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKrF,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAInD,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAI/C,OAAO,CAAC,cAAc;CAwBvB;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,MAAM,GAChB;IACD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAA;IAC1D,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B,GAAG,SAAS,CAuBZ"}
+{"version":3,"file":"sessions-adapter.d.ts","sourceRoot":"","sources":["../../../src/client/rc6/sessions-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EAEpB,WAAW,EAEZ,MAAM,wCAAwC,CAAA;AAS/C,OAAO,KAAK,EACV,sBAAsB,EAGtB,oBAAoB,EAErB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EACV,qBAAqB,EACrB,SAAS,EAGV,MAAM,2BAA2B,CAAA;AAQlC,OAAO,KAAK,EAEV,2BAA2B,EAC5B,MAAM,2CAA2C,CAAA;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AA6JpD,oFAAoF;AACpF,qBAAa,mBAAoB,YAAW,sBAAsB;IAIpD,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHhC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0C;gBAEnD,GAAG,EAAE,gBAAgB;IAElD,iFAAiF;IACjF,QAAQ,CAAC,aAAa,GAAI,UAAU,MAAM,IAAI,KAAG,CAAC,MAAM,IAAI,CAAC,CAA8C;IAE3G,8EAA8E;IAC9E,QAAQ,CAAC,0BAA0B,GAAI,UAAU,MAAM,IAAI,KAAG,CAAC,MAAM,IAAI,CAAC,CAmBzE;IAED,QAAQ,CAAC,gCAAgC,QAAO,2BAA2B,GAAG,SAAS,CACvC;IAEhD,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAKzC,gBAAgB,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAKhE,kBAAkB,CAAC,SAAS,EAAE,qBAAqB,GAAG,OAAO;IAc7D,6EAA6E;IAC7E,0BAA0B,CAAC,SAAS,EAAE,qBAAqB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAQvF,+EAA+E;IAC/E,4BAA4B,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO;IAUhF,4EAA4E;IAC5E,0CAA0C,IAAI,IAAI;IAQlD,gFAAgF;IAChF,gCAAgC,IAAI,MAAM;IAK1C,wEAAwE;IACxE,6BAA6B,IAAI,OAAO;IAUlC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAc3D,WAAW,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,MAAM,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAKrF,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS;IAInD,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAI/C,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAI7C,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,cAAc;CAwBvB;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,EAAE,MAAM,GAChB;IACD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAA;IAC1D,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B,GAAG,SAAS,CAuBZ"}

package/lib/client/rc6/sessions-adapter.js

@@ -1,5 +1,6 @@
 import { SessionId as sideChatSessionId } from '../../shared/contracts.js';
-import { addSelectionToConversation as addSelectionToParentComposer, conversationAnnotations, removeConversationAnnotations as removeParentConversationAnnotations, } from '../parent-composer/add-to-conversation.js';
+import { addSelectionToConversation as addSelectionToParentComposer, conversationAnnotations, removeConversationAnnotations as removeParentConversationAnnotations, updateConversationAnnotation as updateParentConversationAnnotation, } from '../parent-composer/add-to-conversation.js';
+import { ConversationAnnotationPersistence } from '../parent-composer/annotation-persistence.js';
 const BINDING_WAIT_MS = 8_000;
 function sideChatError(error, fallback) {
     return {
@@ -141,11 +142,35 @@ class Rc6SessionBinding {
 export class Rc6SideChatSessions {
     ctx;
     renamed = new Set();
+    annotationPersistence = new ConversationAnnotationPersistence();
     constructor(ctx) {
         this.ctx = ctx;
     }
     /** Observable rc.6 Session-list surface used to follow main-session switches. */
     subscribeList = (listener) => this.ctx.sessions.list.subscribe(listener);
+    /** Follow both current-session switches and that session's composer state. */
+    subscribeConversationInput = (listener) => {
+        let input;
+        let removeInputListener = () => { };
+        const bindInput = () => {
+            const next = this.currentParentInput();
+            if (next === input)
+                return;
+            removeInputListener();
+            input = next;
+            removeInputListener = input?.state.subscribe?.(listener) ?? (() => { });
+        };
+        bindInput();
+        const removeListListener = this.ctx.sessions.list.subscribe(() => {
+            bindInput();
+            listener();
+        });
+        return () => {
+            removeListListener();
+            removeInputListener();
+        };
+    };
+    currentConversationInputSnapshot = () => this.currentParentInput()?.state.getSnapshot();
     currentSessionId() {
         const current = this.ctx.sessions.list.getSnapshot().current;
         return current === undefined ? undefined : sideChatSessionId(current);
@@ -173,30 +198,46 @@ export class Rc6SideChatSessions {
     addSelectionToConversation(selection, comment) {
         if (this.currentSessionId() !== selection.parentSessionId)
             return false;
-        const scope = this.ctx.sessions.scope(dshSessionId(selection.parentSessionId));
-        if (scope === undefined)
+        const input = this.currentParentInput();
+        if (input === undefined || !addSelectionToParentComposer(input, selection, comment))
+            return false;
+        this.annotationPersistence.reconcile(selection.parentSessionId, input);
+        return true;
+    }
+    /** Update an existing unsent annotation without adding a duplicate passage. */
+    updateConversationAnnotation(annotationIndex, comment) {
+        const sessionId = this.currentSessionId();
+        const input = this.currentParentInput();
+        if (sessionId === undefined
+            || input === undefined
+            || !updateParentConversationAnnotation(input, annotationIndex, comment))
             return false;
-        return addSelectionToParentComposer(this.ctx.conversation.input.for(scope), selection, comment);
+        this.annotationPersistence.reconcile(sessionId, input);
+        return true;
+    }
+    /** Mirror or recover the current Session's unsent annotation occurrence. */
+    reconcileConversationAnnotationPersistence() {
+        const sessionId = this.currentSessionId();
+        const input = this.currentParentInput();
+        if (sessionId !== undefined && input !== undefined) {
+            this.annotationPersistence.reconcile(sessionId, input);
+        }
     }
     /** Number assigned to the next annotation shown beside the selected passage. */
     nextConversationAnnotationNumber() {
-        const sessionId = this.currentSessionId();
-        if (sessionId === undefined)
-            return 1;
-        const scope = this.ctx.sessions.scope(dshSessionId(sessionId));
-        if (scope === undefined)
-            return 1;
-        return conversationAnnotations(this.ctx.conversation.input.for(scope).state.getSnapshot()).length + 1;
+        const snapshot = this.currentConversationInputSnapshot();
+        return snapshot === undefined ? 1 : conversationAnnotations(snapshot).length + 1;
     }
     /** Remove the current Session's unsent selected-passage annotations. */
     removeConversationAnnotations() {
         const sessionId = this.currentSessionId();
-        if (sessionId === undefined)
+        const input = this.currentParentInput();
+        if (sessionId === undefined
+            || input === undefined
+            || !removeParentConversationAnnotations(input))
             return false;
-        const scope = this.ctx.sessions.scope(dshSessionId(sessionId));
-        if (scope === undefined)
-            return false;
-        return removeParentConversationAnnotations(this.ctx.conversation.input.for(scope));
+        this.annotationPersistence.reconcile(sessionId, input);
+        return true;
     }
     async retain(sessionId) {
         const binding = await this.waitForBinding(dshSessionId(sessionId));
@@ -224,6 +265,16 @@ export class Rc6SideChatSessions {
     title(sessionId) {
         return this.ctx.sessions.list.getSnapshot().byId[dshSessionId(sessionId)]?.displayTitle;
     }
+    cwd(sessionId) {
+        return this.ctx.sessions.list.getSnapshot().byId[dshSessionId(sessionId)]?.cwd;
+    }
+    currentParentInput() {
+        const sessionId = this.currentSessionId();
+        if (sessionId === undefined)
+            return;
+        const scope = this.ctx.sessions.scope(dshSessionId(sessionId));
+        return scope === undefined ? undefined : this.ctx.conversation.input.for(scope);
+    }
     waitForBinding(sessionId) {
         const immediate = this.ctx.sessions.binding(sessionId);
         if (immediate !== undefined)