@cmodjs/core 0.2.3 → 1.0.0

package/runtime/state.js

@@ -1,13 +1,21 @@
-import { messageOf } from '../utils/text.js';
 const lifetimes = ['memory', 'session', 'project', 'global'];
-const keptPerValue = 20;
+const keptProjects = 20;
 const listeners = new WeakMap();
 export function onStateChange(state, listener) {
     const own = listeners.get(state) ?? new Set();
     own.add(listener);
     listeners.set(state, own);
 }
-export function createState({ name, initial, session, root, claude, changed: redraw }) {
+export async function sessionsWith(claude, name, key, value) {
+    const prefix = `${name}.${key}.sessions.`;
+    const found = [];
+    for (const stored of (await claude.store.keys()).filter((each) => each.startsWith(prefix))) {
+        if ((await claude.store.get(stored)) === value)
+            found.push(stored.slice(prefix.length));
+    }
+    return found;
+}
+export function createState({ name, initial, session, root, claude, report, changed: redraw, forkParent }) {
     const changed = () => {
         redraw();
         for (const listener of listeners.get(state) ?? [])
@@ -20,21 +28,36 @@ export function createState({ name, initial, session, root, claude, changed: red
     let turn = Promise.resolve();
     const inTurn = (task) => {
         const run = turn.then(task);
-        turn = run.catch(() => undefined);
+        turn = Promise.allSettled([run]);
         return run;
     };
     const ownersKey = (lifetime, key) => `${name}.${key}.${lifetime === 'project' ? 'projects' : 'sessions'}.`;
     const storeKey = (lifetime, key, owner) => (lifetime === 'global' ? `${name}.${key}` : `${ownersKey(lifetime, key)}${owner}`);
     const read = (lifetime, key, owner) => claude.store.get(storeKey(lifetime, key, owner));
     const write = async (lifetime, key, value, owner) => {
-        if (lifetime === 'global')
+        if (lifetime !== 'project')
             return claude.store.set(storeKey(lifetime, key, owner), value);
         await claude.store.delete(storeKey(lifetime, key, owner));
         await claude.store.set(storeKey(lifetime, key, owner), value);
         const owners = (await claude.store.keys()).filter((stored) => stored.startsWith(ownersKey(lifetime, key)));
-        for (const oldest of owners.slice(0, -keptPerValue))
+        for (const oldest of owners.slice(0, -keptProjects))
             await claude.store.delete(oldest);
     };
+    const transcriptsKey = `${name}.$transcripts.`;
+    const forgetEndedSessions = async (current) => {
+        const stored = await claude.store.keys();
+        for (const recorded of stored.filter((key) => key.startsWith(transcriptsKey))) {
+            const owner = recorded.slice(transcriptsKey.length);
+            if (owner === current)
+                continue;
+            const transcript = await claude.store.get(recorded);
+            if (typeof transcript === 'string' && (await claude.fs.exists(transcript)))
+                continue;
+            for (const value of stored.filter((key) => key.startsWith(`${name}.`) && key.endsWith(`.sessions.${owner}`)))
+                await claude.store.delete(value);
+            await claude.store.delete(recorded);
+        }
+    };
     const loadGroups = async (only, next) => {
         const loaded = [];
         for (const lifetime of only) {
@@ -47,13 +70,14 @@ export function createState({ name, initial, session, root, claude, changed: red
             current[lifetime][key] = saved === undefined ? declared[lifetime][key] : frozen(name, `${lifetime}.${key}`, saved);
         changed();
     };
-    const copySession = async (nextSession) => {
+    const copySession = async (from, to) => {
         for (const key of Object.keys(declared.session)) {
-            const saved = await read('session', key, sessionId);
+            const saved = await read('session', key, from);
             if (saved !== undefined)
-                await write('session', key, saved, nextSession);
+                await write('session', key, saved, to);
         }
     };
+    const hasSaved = async (owner) => (await claude.store.keys()).some((key) => key.startsWith(`${name}.`) && key.endsWith(`.sessions.${owner}`));
     const group = (lifetime) => new Proxy(current[lifetime], {
         set(target, key, value) {
             if (typeof key !== 'string')
@@ -66,7 +90,7 @@ export function createState({ name, initial, session, root, claude, changed: red
             if (lifetime !== 'memory') {
                 const owner = lifetime === 'project' ? projectRoot : sessionId;
                 inTurn(() => write(lifetime, key, value, owner)).catch((error) => {
-                    claude.ui.log(`${name} could not keep state.${lifetime}.${key}: ${messageOf(error)}. Keep only JSON data in mod.state.`);
+                    report({ id: `state:${lifetime}.${key}`, message: `Could not keep state.${lifetime}.${key}. Keep only JSON data in mod.state`, error });
                 });
             }
             changed();
@@ -80,13 +104,22 @@ export function createState({ name, initial, session, root, claude, changed: red
             return projectRoot;
         },
         changed,
-        load: () => inTurn(() => loadGroups(lifetimes, { root: projectRoot, session: sessionId })),
+        load: () => inTurn(async () => {
+            if (Object.keys(declared.session).length > 0 && !(await hasSaved(sessionId))) {
+                const parent = await forkParent();
+                if (parent !== undefined)
+                    await copySession(parent, sessionId);
+            }
+            return loadGroups(lifetimes, { root: projectRoot, session: sessionId });
+        }),
         moveTo: (nextRoot) => inTurn(async () => (nextRoot === projectRoot ? undefined : loadGroups(['project'], { root: nextRoot, session: sessionId }))),
-        switchSession: (nextSession, source) => inTurn(async () => {
+        switchSession: (nextSession, source, transcript) => inTurn(async () => {
+            await claude.store.set(`${transcriptsKey}${nextSession}`, transcript);
+            await forgetEndedSessions(nextSession);
             if (nextSession === sessionId)
                 return;
             if (source === 'fork')
-                await copySession(nextSession);
+                await copySession(sessionId, nextSession);
             return loadGroups(['memory', 'session'], { root: projectRoot, session: nextSession });
         }),
     };

package/runtime/toaster.d.ts

@@ -0,0 +1,31 @@
+import type { ElementTable, RenderElement, RenderPropsOf } from 'claude-code';
+import type { Mod, Toast, ToastId, ToastType } from '../mod.js';
+import type { Claude } from './claude.js';
+export type ShownToast = {
+    readonly type: ToastType;
+    readonly message: string;
+    readonly description?: string;
+};
+export type Failure = {
+    readonly id: string;
+    readonly message: string;
+    readonly error?: unknown;
+    readonly description?: string;
+};
+export type Toaster = {
+    readonly toast: Toast;
+    copy(text: string): Promise<void>;
+    readonly shown: readonly ShownToast[];
+    draw(drawn: RenderElement, table: ElementTable, band: RenderPropsOf['AbovePrompt']): RenderElement;
+};
+export declare function createToaster(claude: Claude, name: string): Toaster;
+export type FailureTarget = {
+    readonly name: string;
+    readonly ui: Pick<Mod['ui'], 'toast' | 'copy'>;
+    readonly claude: {
+        readonly plugin: Claude['plugin'];
+        readonly fs: Pick<Claude['fs'], 'read'>;
+    };
+};
+export declare function showFailure({ name, ui, claude }: FailureTarget, { id, message, error, description }: Failure): ToastId;
+//# sourceMappingURL=toaster.d.ts.map

package/runtime/toaster.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toaster.d.ts","sourceRoot":"","sources":["../src/runtime/toaster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAS,MAAM,aAAa,CAAA;AACpF,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAA;AAI7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE9G,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhI,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAA;IACrC,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA;CACnG,CAAA;AAuBD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAmJnE;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,CAAA;IAC9C,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;CAChG,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,WAA6B,EAAE,EAAE,OAAO,GAAG,OAAO,CAcxI"}

package/runtime/toaster.js

@@ -0,0 +1,176 @@
+import { Box, Button, drawWith, Text } from '../ui/elements.js';
+import { coreVersion } from '../records.js';
+import { firstLine, messageOf } from '../utils/text.js';
+const defaultDuration = 4000;
+const visibleToasts = 3;
+const spinner = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const spinnerMs = 100;
+const icons = {
+    default: { glyph: ' ' },
+    success: { glyph: '✓', color: 'success' },
+    info: { glyph: 'ℹ', color: 'suggestion' },
+    warning: { glyph: '⚠', color: 'warning' },
+    error: { glyph: '✗', color: 'error' },
+};
+export function createToaster(claude, name) {
+    const entries = new Map();
+    let lastId = 0;
+    let frame = 0;
+    let spinning;
+    let isHeld = false;
+    let showsAll = false;
+    const changed = () => {
+        const isLoading = [...entries.values()].some((entry) => entry.type === 'loading');
+        if (isLoading && spinning === undefined) {
+            spinning = claude.clock.every(spinnerMs, () => {
+                frame += 1;
+                claude.ui.invalidate('ui.render');
+            });
+        }
+        if (!isLoading && spinning !== undefined) {
+            spinning.cancel();
+            spinning = undefined;
+        }
+        if (entries.size <= visibleToasts)
+            showsAll = false;
+        claude.ui.invalidate('ui.render');
+    };
+    const disarm = (entry) => {
+        entry.timer?.cancel();
+        entry.timer = undefined;
+    };
+    const arm = (entry) => {
+        const duration = entry.options.duration ?? defaultDuration;
+        if (entry.timer !== undefined || entry.type === 'loading' || entry.isOpen || !Number.isFinite(duration))
+            return;
+        entry.timer = claude.clock.after(duration, () => {
+            entry.timer = undefined;
+            if (isHeld)
+                arm(entry);
+            else
+                dismiss(entry.id);
+        });
+    };
+    const dismiss = (id) => {
+        for (const entry of entries.values()) {
+            if (id !== undefined && entry.id !== id)
+                continue;
+            disarm(entry);
+            entries.delete(entry.id);
+        }
+        changed();
+    };
+    const show = (type) => (message, options = {}) => {
+        const id = options.id ?? (lastId += 1);
+        const previous = entries.get(id);
+        if (previous !== undefined)
+            disarm(previous);
+        const entry = { id, type, message, options, isOpen: previous?.isOpen ?? false, timer: undefined };
+        if (type === 'error' && previous?.message !== message)
+            claude.ui.log(`${name}: ${message}${typeof options.description === 'string' ? `: ${options.description}` : ''}`, { to: 'debug' });
+        entries.set(id, entry);
+        changed();
+        return id;
+    };
+    const toast = Object.assign(show('default'), {
+        success: show('success'),
+        info: show('info'),
+        warning: show('warning'),
+        error: show('error'),
+        loading: show('loading'),
+        dismiss,
+        promise(task, messages) {
+            const id = show('loading')(messages.loading);
+            const settled = Promise.resolve()
+                .then(() => (typeof task === 'function' ? task() : task))
+                .then((value) => {
+                show('success')(typeof messages.success === 'function' ? messages.success(value) : messages.success, { id });
+                return value;
+            }, (error) => {
+                show('error')(typeof messages.error === 'function' ? messages.error(error) : messages.error, { id });
+                throw error;
+            });
+            settled.catch(() => undefined);
+            return { unwrap: () => settled };
+        },
+    });
+    const copy = async (text) => {
+        const copied = await claude.ui.copy({ text });
+        if (!copied.isCopied)
+            throw new Error(copied.reason);
+    };
+    const press = (entry, run) => () => void Promise.resolve()
+        .then(run)
+        .catch((error) => showFailure({ name, claude, ui: { toast, copy } }, { id: `press:${entry.id}`, message: `${entry.message}: the press failed`, error }));
+    const toggle = (entry) => () => {
+        entry.isOpen = !entry.isOpen;
+        disarm(entry);
+        changed();
+    };
+    const row = (entry) => {
+        const { description, action } = entry.options;
+        const isText = typeof description === 'string';
+        const icon = entry.type === 'loading' ? { glyph: spinner[frame % spinner.length], color: 'claude' } : icons[entry.type];
+        const message = isText ? Button({ plain: true, key: `toast:${entry.id}:open`, label: entry.message, onPress: toggle(entry) }) : Text({ children: entry.message });
+        const details = !isText ? description : Text({ dimColor: true, wrap: entry.isOpen ? 'wrap' : 'truncate-end', children: entry.isOpen ? description : firstLine(description) });
+        const fixed = (child) => Box({ flexShrink: 0, children: child });
+        return Box({
+            gap: 2,
+            children: [
+                fixed(Text({ ...(icon.color === undefined ? {} : { color: icon.color }), children: icon.glyph })),
+                fixed(Text({ dimColor: true, children: name })),
+                Box({ flexDirection: 'column', flexGrow: 1, flexShrink: 1, children: details === undefined ? [message] : [message, details] }),
+                ...(action === undefined ? [] : [fixed(Button({ plain: true, key: `toast:${entry.id}:action`, label: action.label, onPress: press(entry, action.onClick) }))]),
+                fixed(Button({ plain: true, dimColor: true, key: `toast:${entry.id}:close`, label: '✕', onPress: () => dismiss(entry.id) })),
+            ],
+        });
+    };
+    return {
+        toast,
+        copy,
+        get shown() {
+            return [...entries.values()].map(({ type, message, options }) => ({ type, message, ...(typeof options.description === 'string' ? { description: options.description } : {}) }));
+        },
+        draw(drawn, table, band) {
+            isHeld = band.hasSurvey === true;
+            if (isHeld || entries.size === 0)
+                return drawn;
+            const all = [...entries.values()];
+            const hidden = showsAll ? 0 : Math.max(all.length - visibleToasts, 0);
+            for (const entry of all.slice(hidden))
+                arm(entry);
+            const more = Button({
+                plain: true,
+                dimColor: true,
+                key: 'toasts:more',
+                label: `+${hidden} more`,
+                onPress: () => {
+                    showsAll = true;
+                    changed();
+                },
+            });
+            return drawWith(table, () => Box({ flexDirection: 'column', children: [drawn, ...(hidden > 0 ? [more] : []), ...all.slice(hidden).map(row)] }));
+        },
+    };
+}
+export function showFailure({ name, ui, claude }, { id, message, error, description = describe(error) }) {
+    const stack = error instanceof Error && error.stack !== undefined ? `\n\n${error.stack}` : '';
+    const show = (label) => ui.toast.error(message, { id, description, duration: Infinity, action: { label, onClick: copy } });
+    const copy = async () => {
+        const modVersion = await claude.fs
+            .read(`${claude.plugin.root}/.claude-plugin/plugin.json`)
+            .then((text) => String(JSON.parse(text).version))
+            .catch((failure) => `unknown (${messageOf(failure)})`);
+        return ui.copy(`${name} ${modVersion}, @cmodjs/core ${coreVersion}\n${message}\n${description}${stack}`).then(() => show('Copied'), (failure) => show(`Copy failed: ${messageOf(failure)}`));
+    };
+    return show('Copy');
+}
+function describe(error) {
+    const messages = [];
+    for (let cause = error; cause !== undefined; cause = cause instanceof Error ? cause.cause : undefined) {
+        const text = messageOf(cause);
+        if (!messages.some((earlier) => earlier.includes(text) || text.includes(earlier)))
+            messages.push(text);
+    }
+    return messages.join('\n');
+}

package/runtime/ui.d.ts

@@ -1,31 +1,20 @@
-import type { ElementTable, RenderElement } from 'claude-code';
-import type { Mod, ProgressStep } from '../mod.js';
+import type { Mod } from '../mod.js';
 import type { Claude } from './claude.js';
 import type { Router } from './router.js';
-export type ProgressLine = {
-    report(step: ProgressStep): void;
-    wait(text: string): void;
-    fail(reason: string, fix: string): void;
-    end(): void;
-};
-export type Progress = {
-    readonly isShown: boolean;
-    start(title: string): ProgressLine;
-    draw(drawn: RenderElement, table: ElementTable, columns: number | undefined): RenderElement;
-};
-export declare function createProgress(claude: Claude): Progress;
+import type { Failure, Toaster } from './toaster.js';
 export type UiOptions<State extends object> = {
     readonly name: string;
     readonly claude: Claude;
     readonly router: Router;
-    readonly progress: Progress;
+    readonly toaster: Toaster;
+    readonly report: (failure: Failure) => void;
     readonly announce: (feature: string) => void;
     readonly mod: () => Mod<State>;
 };
 export type UiArea<State extends object> = {
-    readonly ui: Mod<State>['ui'];
+    readonly ui: Omit<Mod<State>['ui'], 'notice'>;
     changed(): void;
     restorePanes(): Promise<void>;
 };
-export declare function createUi<State extends object>({ name, claude, router, progress, announce, mod }: UiOptions<State>): UiArea<State>;
+export declare function createUi<State extends object>({ name, claude, router, toaster, report, announce, mod }: UiOptions<State>): UiArea<State>;
 //# sourceMappingURL=ui.d.ts.map

package/runtime/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../src/runtime/ui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAA+B,aAAa,EAAS,MAAM,aAAa,CAAA;AAClG,OAAO,KAAK,EAAE,GAAG,EAAc,YAAY,EAAE,MAAM,WAAW,CAAA;AAO9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAA;IAChC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IACvC,GAAG,IAAI,IAAI,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAA;IAClC,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAAA;CAC5F,CAAA;AAkBD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAqDvD;AAsGD,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI;IAC5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAA;IAC7B,OAAO,IAAI,IAAI,CAAA;IACf,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B,CAAA;AAED,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAmNjI"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../src/runtime/ui.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,GAAG,EAAc,MAAM,WAAW,CAAA;AAM5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAgFpD,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI;IAC5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3C,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC7C,OAAO,IAAI,IAAI,CAAA;IACf,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B,CAAA;AAED,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CA2NxI"}

package/runtime/ui.js

@@ -1,92 +1,8 @@
-import { ProgressBar } from '../ui/components.js';
 import { Box, drawWith, Text } from '../ui/elements.js';
+import { componentOf, nameOf } from '../ui/places.js';
 import { messageOf } from '../utils/text.js';
-const spinner = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-const spinnerMs = 100;
 const bullet = '⏺';
-const widestBar = 30;
-const narrowestBar = 10;
 const sizeKeys = ['columns', 'rows'];
-export function createProgress(claude) {
-    const lines = [];
-    let frame = 0;
-    let timer;
-    const changed = () => {
-        const isSpinning = lines.some((line) => line.failure === undefined && line.waiting === undefined);
-        if (isSpinning && timer === undefined) {
-            timer = claude.clock.every(spinnerMs, () => {
-                frame += 1;
-                claude.ui.invalidate('ui.render');
-            });
-        }
-        if (!isSpinning && timer !== undefined) {
-            timer.cancel();
-            timer = undefined;
-        }
-        claude.ui.invalidate('ui.render');
-    };
-    return {
-        get isShown() {
-            return lines.length > 0;
-        },
-        start(title) {
-            const line = { title, step: undefined, waiting: undefined, failure: undefined };
-            lines.push(line);
-            changed();
-            return {
-                report(step) {
-                    line.step = step;
-                    line.waiting = undefined;
-                    changed();
-                },
-                wait(text) {
-                    line.waiting = text;
-                    changed();
-                },
-                fail(reason, fix) {
-                    line.failure = { reason, fix };
-                    changed();
-                },
-                end() {
-                    const index = lines.indexOf(line);
-                    if (index >= 0)
-                        lines.splice(index, 1);
-                    changed();
-                },
-            };
-        },
-        draw(drawn, table, columns) {
-            return drawWith(table, () => Box({ flexDirection: 'column', children: [drawn, ...lines.map((line) => drawLine(line, frame, columns))] }));
-        },
-    };
-}
-function drawLine(line, frame, columns) {
-    const title = Text({ bold: true, children: line.title });
-    if (line.failure !== undefined) {
-        return Box({
-            flexDirection: 'column',
-            children: [
-                Box({ children: [Box({ minWidth: 2, children: Text({ color: 'error', children: '✗' }) }), Text({ children: [title, '  ', Text({ color: 'error', children: line.failure.reason })] })] }),
-                Box({ paddingLeft: 2, children: Text({ dimColor: true, children: line.failure.fix }) }),
-            ],
-        });
-    }
-    if (line.waiting !== undefined) {
-        return Text({ wrap: 'truncate-end', children: [Text({ color: 'warning', children: '◌' }), ' ', title, '  ', Text({ dimColor: true, children: line.waiting })] });
-    }
-    const glyph = Text({ color: 'claude', children: spinner[frame % spinner.length] });
-    if (line.step === undefined)
-        return Text({ wrap: 'truncate-end', children: [glyph, ' ', title, Text({ dimColor: true, children: '…' })] });
-    const { done, total, label = '' } = line.step;
-    const width = barWidth(columns, `${line.title}${done}/${total}${label}`.length);
-    return Text({ wrap: 'truncate-end', children: [glyph, ' ', title, '  ', ProgressBar({ done, total, width }), ...(label === '' ? [] : ['  ', label])] });
-}
-function barWidth(columns, textLength) {
-    if (columns === undefined)
-        return widestBar;
-    const spacing = 2 + 2 + 2 + 2;
-    return Math.max(narrowestBar, Math.min(widestBar, columns - textLength - spacing));
-}
 function paneSize(pane, state) {
     const size = {};
     for (const key of sizeKeys) {
@@ -149,7 +65,7 @@ function drawPieces(pieces, place) {
         return Box({ children: [Box({ minWidth: 2, children: Text({ color: 'text', children: bullet }) }), column(spaced)] });
     return column([opening, Box({ paddingLeft: 2, children: column(rest) })]);
 }
-export function createUi({ name, claude, router, progress, announce, mod }) {
+export function createUi({ name, claude, router, toaster, report, announce, mod }) {
     const panes = new Map();
     const paneLogs = new Map();
     const openPanes = new Set();
@@ -163,7 +79,7 @@ export function createUi({ name, claude, router, progress, announce, mod }) {
         let hasLogged = false;
         return (failure) => {
             if (!hasLogged)
-                claude.ui.log(`${name}: the ${what} render ${failure}`);
+                report({ id: `render:${what}`, message: `The ${what} render failed`, description: failure });
             hasLogged = true;
         };
     };
@@ -192,10 +108,10 @@ export function createUi({ name, claude, router, progress, announce, mod }) {
             return drawPieces(drawings.map((drawing) => ({ drawing, isClaudesRow: false })), 'pane');
         };
     };
-    const routeMarkdown = (kind) => {
+    const routeMarkdown = (createReader) => {
         if (read !== undefined)
             return;
-        const reader = kind.createReader();
+        const reader = createReader();
         read = reader;
         router.add('ui.render', async (e, next) => {
             if (e.component !== 'AssistantMessage')
@@ -275,7 +191,7 @@ export function createUi({ name, claude, router, progress, announce, mod }) {
             await run();
         }
         catch (error) {
-            claude.ui.log(`${name}: the ${pane.title} pane's ${handler} threw: ${messageOf(error)}`);
+            report({ id: `pane:${pane.id}:${handler}`, message: `The ${pane.title} pane's ${handler} threw`, error });
         }
     };
     return {
@@ -304,22 +220,31 @@ export function createUi({ name, claude, router, progress, announce, mod }) {
                 };
                 return handle;
             },
-            render(slot, Component) {
-                const place = slot;
-                const feature = 'markdown' in place ? `a render of markdown ${place.markdown.name}` : `a render of ${place.component}`;
+            render(place, Component) {
+                const target = place;
+                const markdown = typeof target === 'string' ? undefined : target;
+                const component = componentOf(place);
+                if (markdown === undefined && component === undefined)
+                    throw new Error(`${name}: ${String(place)} is not a place render draws, such as ToolCall or CodeBlock.`);
+                const feature = `a render of ${nameOf(place)}`;
                 if (renders.has(feature))
-                    throw new Error(`${name}: ${feature} is already added. Render each slot once.`);
+                    throw new Error(`${name}: ${feature} is already added. Render each place once.`);
                 renders.add(feature);
                 announce(feature);
-                if ('markdown' in place) {
-                    const kind = place.markdown;
-                    markdownRenders.set(kind.type, { Component: Component, log: logOnce(`markdown ${kind.name}`) });
-                    routeMarkdown(kind);
-                    return;
+                if (markdown !== undefined) {
+                    const markdownType = markdown.markdown;
+                    markdownRenders.set(markdownType, { Component: Component, log: logOnce(nameOf(place)) });
+                    routeMarkdown(markdown.createReader);
+                    return {
+                        dispose() {
+                            markdownRenders.delete(markdownType);
+                            renders.delete(feature);
+                            claude.ui.invalidate('ui.render');
+                        },
+                    };
                 }
-                const { component } = place;
-                const log = logOnce(component);
-                router.add('ui.render', async (e, next) => {
+                const log = logOnce(nameOf(place));
+                const drawing = router.add('ui.render', async (e, next) => {
                     if (e.component !== component)
                         return next(e);
                     const table = claude.ui.resolve(e);
@@ -332,17 +257,16 @@ export function createUi({ name, claude, router, progress, announce, mod }) {
                         return drawn.drawing;
                     return drawWith(table, () => drawPieces([drawn], e.props.isFirstOfReply ? 'opensReply' : 'inReply'));
                 });
+                return {
+                    dispose() {
+                        drawing.dispose();
+                        renders.delete(feature);
+                        claude.ui.invalidate('ui.render');
+                    },
+                };
             },
-            toast: (text, options) => claude.ui.toast(text, options),
-            async progress(title, task) {
-                const line = progress.start(title);
-                try {
-                    return await task((step) => line.report(step));
-                }
-                finally {
-                    line.end();
-                }
-            },
+            toast: toaster.toast,
+            copy: toaster.copy,
             ask: (question, options) => claude.ui.ask(question, options),
             scroll: (args) => claude.ui.scroll(args),
         },

package/session/context/context.d.ts

@@ -0,0 +1,10 @@
+import type { Turn } from './turn/turn.js';
+export declare const ContextStart = "contextStart";
+export declare const ContextEnd = "contextEnd";
+export type Context = {
+    readonly number: number;
+    readonly openedAt: string;
+    readonly closedAt?: string;
+    turns(): Promise<Turn[]>;
+};
+//# sourceMappingURL=context.d.ts.map

package/session/context/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/session/context/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,eAAO,MAAM,YAAY,iBAAiB,CAAA;AAE1C,eAAO,MAAM,UAAU,eAAe,CAAA;AAEtC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;CACzB,CAAA"}

package/session/context/context.js

@@ -0,0 +1,2 @@
+export const ContextStart = 'contextStart';
+export const ContextEnd = 'contextEnd';

package/session/context/turn/message/document.d.ts

@@ -0,0 +1,7 @@
+import type { MessageOf } from './message.js';
+export declare const Document = "document";
+export type Document = MessageOf<typeof Document> & {
+    readonly path: string;
+    readonly text: string;
+};
+//# sourceMappingURL=document.d.ts.map

package/session/context/turn/message/document.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../../../src/session/context/turn/message/document.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,eAAO,MAAM,QAAQ,aAAa,CAAA;AAElC,MAAM,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,QAAQ,CAAC,GAAG;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA"}

package/session/context/turn/message/document.js

@@ -0,0 +1 @@
+export const Document = 'document';