@cmodjs/core 4.0.3 → 4.1.0

package/runtime/installer.d.ts

@@ -1,9 +1,9 @@
-import type { Args, Frozen, RenderElement } from 'claude-code';
 import type { Step } from '../installer.js';
 import type { Mod } from '../mod.js';
 import type { Option } from '../options.js';
 import type { Claude } from './claude.js';
-export declare const installerPaneOf: (name: string) => string;
+import { type PartsUpdate, type ShownPages } from './ui.js';
+export declare const installPage = "cmod:install";
 export type Consent = {
     readonly install: string;
     readonly uninstall: string;
@@ -12,16 +12,19 @@ export type Consent = {
     readonly updates?: string | undefined;
 };
 export type Installer = {
-    draws(e: Frozen<Args<'ui.render'>>): boolean;
-    draw(e: Frozen<Args<'ui.render'>>): RenderElement;
-    closed(id: string): void;
+    answer(method: string, input: unknown): Promise<{
+        readonly value: unknown;
+    }> | undefined;
+    hear(shown: ShownPages): void;
     consent(consent: Consent): Promise<boolean>;
     options(missing: readonly (readonly [string, Option])[], save: (key: string, value: string) => Promise<string | undefined>): Promise<boolean>;
     step<State extends object>(mod: Mod<State>, step: Step<State>, index: number, total: number): Promise<boolean>;
     close(): Promise<void>;
+    shown(): Promise<void>;
+    collect(run: () => Promise<unknown>): Promise<PartsUpdate>;
 };
 export declare function createInstaller(name: string, claude: () => Claude, waiting: {
     show(open: () => Promise<void>): void;
     hide(): void;
-}): Installer;
+}, nextDraw: () => number): Installer;
 //# sourceMappingURL=installer.d.ts.map

package/runtime/installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../src/runtime/installer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAI3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAA0E,CAAA;AAEzH,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AAOD,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAA;IAC5C,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,aAAa,CAAA;IACjD,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7I,IAAI,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9G,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB,CAAA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAAC,IAAI,IAAI,IAAI,CAAA;CAAE,GAAG,SAAS,CAoJ/I"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../src/runtime/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAM3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAuD,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAEhH,eAAO,MAAM,WAAW,iBAAiB,CAAA;AAEzC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC,CAAA;AAOD,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,SAAS,CAAA;IACxF,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IAC7B,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7I,IAAI,CAAC,KAAK,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC9G,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,OAAO,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAC3D,CAAA;AAID,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAAC,IAAI,IAAI,IAAI,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,MAAM,GAAG,SAAS,CA2MvK"}

package/runtime/installer.js

@@ -1,48 +1,108 @@
-import { permissionWords, secretFix } from '../records.js';
-import { Box, Button, drawWith, Input, Text } from '../ui/elements.js';
+import { isObject, permissionWords, secretFix } from '../records.js';
+import { Box, elementData, Input, Text } from '../ui/elements.js';
+import { filledButton } from './buttons.js';
 import { messageOf } from '../utils/text.js';
-export const installerPaneOf = (name) => `installer-${name.replace(/[^A-Za-z0-9_-]/g, '_')}`.slice(0, 64);
-export function createInstaller(name, claude, waiting) {
-    const paneId = installerPaneOf(name);
-    let page;
+import { cmodPluginName, withBareRefusals } from './dependencies.js';
+import { merged, partMethods } from './ui.js';
+export const installPage = 'cmod:install';
+const keptDraws = 8;
+export function createInstaller(name, claude, waiting, nextDraw) {
+    let question;
     let isOpen = false;
-    const open = async () => {
-        isOpen = true;
-        await claude().ui.open({ id: paneId, title: `Install ${name}`, focus: true, holdToasts: true, closeOnEscape: true });
+    let isSeen = false;
+    let waitingForShow = [];
+    let collected;
+    const draws = new Map();
+    const send = async (update) => {
+        if (collected !== undefined)
+            return void collected.push(update);
+        await withBareRefusals(claude()).cmod.call({ to: cmodPluginName, method: partMethods.changed, input: update });
     };
+    const log = (what) => (error) => claude().ui.log(`${name}: ${what}: ${messageOf(error)}`, { to: 'debug' });
+    const open = (isAsked) => send({ requests: [{ open: installPage, focus: true }], ...(isAsked ? { isAsked: true } : {}) });
     const show = async (build, cancelled) => {
-        page?.cancel();
+        question?.cancel();
         const answer = new Promise((resolve) => {
+            let isAnswered = false;
             const done = (value) => {
-                if (page === shown)
-                    page = undefined;
+                if (isAnswered)
+                    return;
+                isAnswered = true;
                 waiting.hide();
-                resolve(value);
+                claude().clock.after(0, () => resolve(value));
             };
-            const shown = { ...build(done), cancel: () => done(cancelled) };
-            page = shown;
+            question = { ...build(done), cancel: () => done(cancelled) };
         });
-        waiting.show(open);
-        if (!isOpen)
-            await open().catch((error) => {
+        waiting.show(() => open(true));
+        if (isOpen) {
+            await send({ redraw: true }).catch(log('the installer did not redraw'));
+        }
+        else {
+            isOpen = true;
+            await open(false).catch((error) => {
+                isOpen = false;
                 waiting.hide();
                 throw error;
             });
-        claude().ui.invalidate('ui.render');
+        }
+        for (const resolve of waitingForShow)
+            resolve();
+        waitingForShow = [];
         return answer;
     };
-    const frame = (title, body, actions) => Box({ flexDirection: 'column', gap: 1, paddingX: 1, children: [Text({ bold: true, children: title }), ...body, Box({ gap: 3, children: actions })] });
-    const bullet = (text) => Text({ children: [Text({ color: 'claude', children: '◆ ' }), text] });
+    const redraw = () => void send({ redraw: true }).catch(log('the installer did not redraw'));
+    const actions = (...buttons) => Box({ gap: 2, flexShrink: 0, children: buttons });
+    const dialog = (title, ...children) => Box({ flexDirection: 'column', gap: 1, children: [title, ...children] });
+    const bullet = (text) => Box({ gap: 1, children: [Text({ dimColor: true, children: '•' }), Text({ wrap: 'wrap', children: text })] });
+    const group = (heading, items) => Box({ flexDirection: 'column', children: [Text({ bold: true, children: heading }), ...items.map(bullet)] });
+    const draw = (columns, isFocused) => {
+        if (question === undefined && !isOpen)
+            claude().clock.after(0, () => void send({ requests: [{ close: installPage }] }).catch(log('a leftover install page stayed open')));
+        const handlers = [];
+        const tree = elementData(question?.draw({ params: undefined, isFocused, columns }) ?? Text({ dimColor: true, children: `${name} needs nothing from you now.` }), handlers);
+        const drawn = nextDraw();
+        draws.set(drawn, handlers);
+        for (const kept of draws.keys())
+            if (draws.size > keptDraws)
+                draws.delete(kept);
+        return { draw: drawn, tree };
+    };
+    const collect = async (run) => {
+        const outer = collected;
+        const mine = [];
+        collected = mine;
+        try {
+            await run();
+        }
+        finally {
+            collected = outer;
+        }
+        return merged(mine);
+    };
+    const press = async ({ draw: drawn, handler, args }) => {
+        const run = draws.get(drawn)?.[handler];
+        if (run === undefined)
+            throw new Error(`${name}: that button drew before the last redraw. Press the one it shows now.`);
+        return collect(() => run(...args));
+    };
     return {
-        draws: (e) => e.component === 'Pane' && e.requestId === paneId,
-        draw(e) {
-            return drawWith(claude().ui.resolve(e), () => page?.draw(e.props) ?? Text({ dimColor: true, children: `${name} is installing.` }));
+        answer(method, input) {
+            if (method === partMethods.draw && isObject(input) && input['page'] === installPage)
+                return Promise.resolve({ value: draw(Number(input['columns']), input['isFocused'] === true) });
+            if (method === partMethods.press && isObject(input) && typeof input['draw'] === 'number' && draws.has(input['draw']))
+                return press(input).then((value) => ({ value }));
+            return undefined;
         },
-        closed(id) {
-            if (id !== paneId)
+        hear(shown) {
+            if (shown.open.some((each) => each.id === installPage)) {
+                isSeen = isOpen;
+                return;
+            }
+            if (!isSeen)
                 return;
             isOpen = false;
-            page?.cancel();
+            isSeen = false;
+            question?.cancel();
         },
         consent({ install, uninstall, hotkeys, permissions, updates }) {
             const changes = [
@@ -52,24 +112,17 @@ export function createInstaller(name, claude, waiting) {
                 ...(updates === undefined ? [] : [`Update ${name} automatically from the ${updates} marketplace`]),
             ];
             return show((answer) => ({
-                draw: () => frame(`${name} wants to:`, [
-                    ...(permissions.length === 0 ? [] : [Box({ flexDirection: 'column', children: permissions.map((item) => bullet(permissionWords(item))) })]),
-                    ...(changes.length === 0 ? [] : [Text({ children: permissions.length === 0 ? 'Change your computer:' : 'and change your computer:' }), Box({ flexDirection: 'column', children: changes.map(bullet) })]),
-                    Text({ dimColor: true, children: 'You can turn each permission off later in Settings.' }),
-                ], [Button({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) }), Button({ key: 'accept', hotkey: 'a', label: 'Accept', onPress: () => answer(true) })]),
+                draw: () => dialog(Text({ bold: true, children: `Install ${name}?` }), ...(permissions.length === 0 ? [] : [group(`${name} wants to:`, permissions.map(permissionWords))]), ...(changes.length === 0 ? [] : [group(permissions.length === 0 ? `${name} wants to change your computer:` : 'and change your computer:', changes)]), Text({ dimColor: true, wrap: 'wrap', children: 'You can turn each permission off later in Settings.' }), actions(filledButton({ key: 'accept', hotkey: 'a', variant: 'primary', label: 'Accept', onPress: () => answer(true) }), filledButton({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) }))),
             }), false);
         },
         options(missing, save) {
             const saved = new Map();
             const failures = new Map();
             return show((answer) => ({
-                draw: () => frame(`${name} needs ${missing.length === 1 ? 'one setting' : `${missing.length} settings`}:`, missing.map(([key, option]) => {
-                    const label = Text({ children: [Text({ bold: true, children: option.title }), option.description === '' ? '' : Text({ dimColor: true, children: `  ${option.description}` })] });
+                draw: () => dialog(Text({ bold: true, children: `Set up ${name}` }), Text({ children: `${name} needs ${missing.length === 1 ? 'one setting' : `${missing.length} settings`}:` }), ...missing.map(([key, option]) => {
+                    const label = Box({ flexDirection: 'column', children: [Text({ bold: true, children: option.title }), ...(option.description === '' ? [] : [Text({ dimColor: true, wrap: 'wrap', children: option.description })])] });
                     if (option.type === 'secret') {
-                        return Box({
-                            flexDirection: 'column',
-                            children: [label, Text({ dimColor: true, children: `${secretFix} Then press Next.` }), Button({ key: `secret:${key}`, label: 'Open /config', onPress: () => void claude().command.run({ command: 'config' }) })],
-                        });
+                        return Box({ flexDirection: 'column', children: [label, Text({ dimColor: true, wrap: 'wrap', children: `${secretFix} Then press Next.` }), filledButton({ key: `secret:${key}`, label: 'Open /config', onPress: () => void claude().command.run({ command: 'config' }) })] });
                     }
                     const failure = failures.get(key);
                     const field = Input({
@@ -88,11 +141,11 @@ export function createInstaller(name, claude, waiting) {
                                 failures.set(key, refused);
                         })
                             .catch((error) => failures.set(key, messageOf(error)))
-                            .finally(() => claude().ui.invalidate('ui.render')),
+                            .finally(redraw),
                     });
-                    const status = failure !== undefined ? Text({ color: 'error', children: failure }) : saved.has(key) ? Text({ color: 'success', children: '✔ saved' }) : Text({ children: '' });
-                    return Box({ flexDirection: 'column', children: [label, field, status] });
-                }), [Button({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) }), Button({ key: 'next', hotkey: 'x', label: 'Next', onPress: () => answer(true) })]),
+                    const status = failure !== undefined ? [Text({ color: 'error', wrap: 'wrap', children: failure })] : saved.has(key) ? [Text({ color: 'success', children: '✓ saved' })] : [];
+                    return Box({ flexDirection: 'column', children: [label, field, ...status] });
+                }), actions(filledButton({ key: 'next', hotkey: 'x', variant: 'primary', label: 'Next', onPress: () => answer(true) }), filledButton({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) }))),
             }), false);
         },
         step(mod, step, index, total) {
@@ -104,7 +157,7 @@ export function createInstaller(name, claude, waiting) {
                         body = step.render(mod, props);
                     }
                     catch (error) {
-                        body = Text({ color: 'error', children: `The ${step.title} step could not draw: ${messageOf(error)}` });
+                        body = Text({ color: 'error', wrap: 'wrap', children: `The ${step.title} step could not draw: ${messageOf(error)}` });
                     }
                     const next = async () => {
                         try {
@@ -115,18 +168,22 @@ export function createInstaller(name, claude, waiting) {
                         catch (error) {
                             notice = { color: 'error', text: `The ${step.title} step's isDone failed: ${messageOf(error)}` };
                         }
-                        claude().ui.invalidate('ui.render');
+                        await send({ redraw: true });
                     };
-                    return frame(`${step.title}  (${index} of ${total})`, [body, ...(notice === undefined ? [] : [Text({ color: notice.color, children: notice.text })])], [Button({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) }), Button({ key: 'next', hotkey: 'x', label: index === total ? 'Finish' : 'Next', onPress: () => void next() })]);
+                    return dialog(Text({ children: [Text({ bold: true, children: step.title }), Text({ dimColor: true, children: `  (${index} of ${total})` })] }), body, ...(notice === undefined ? [] : [Text({ color: notice.color, wrap: 'wrap', children: notice.text })]), actions(filledButton({ key: 'next', hotkey: 'x', variant: 'primary', label: index === total ? 'Finish' : 'Next', onPress: () => void next() }), filledButton({ key: 'not-now', hotkey: 'n', label: 'Not now', onPress: () => answer(false) })));
                 },
             }), false);
         },
         async close() {
-            page = undefined;
+            question?.cancel();
+            question = undefined;
             if (!isOpen)
                 return;
             isOpen = false;
-            await claude().ui.close({ id: paneId });
+            isSeen = false;
+            await send({ requests: [{ close: installPage }] }).catch(log('the install page stayed open'));
         },
+        shown: () => new Promise((resolve) => void waitingForShow.push(resolve)),
+        collect,
     };
 }

package/runtime/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/runtime/lifecycle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/runtime/lifecycle.ts"],"names":[],"mappings":"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"}

package/runtime/lifecycle.js

@@ -1,4 +1,4 @@
-import { consentPath, dataFolder, finishStepsMethod, grantFix, coreVersion, isAtLeast, marketplaceOf, parseConsent, pendingStepsMethod, parseEvent, permissionWords, readRecord, readSteps, recordPath, scriptsSha256, storeFolder, updatesToTurnOn } from '../records.js';
+import { consentPath, dataFolder, finishStepsMethod, grantFix, coreVersion, isAtLeast, isProgramNewer, marketplaceOf, parseConsent, pendingStepsMethod, parseEvent, permissionWords, programPath, readRecord, readSteps, recordPath, scriptsSha256, storeFolder, updatesToTurnOn } from '../records.js';
 import { homePrefix, ifMissing, relativePath } from '../utils/paths.js';
 import { firstLine, formatExit, messageOf } from '../utils/text.js';
 import { beforeDeadline } from './deadline.js';
@@ -8,8 +8,8 @@ import { serveConversations } from './conversations.js';
 import { answerCall, answeringOwnCalls, cmodPluginName, dependencyCalls, withBareRefusals } from './dependencies.js';
 import { keepEngine } from './engine.js';
 import { classicFailure, classicHook, userSkillHook } from './hooks.js';
-import { checkedAnswer, checkingGrants, checkSettings, checksAnswers, checkWrite, isCovered, itemOf, passedDown, programAddresses } from './grants.js';
-import { cmodError, locatingPrograms, readLines } from './programs.js';
+import { checkedAnswer, checkingGrants, checkRun, checkSettings, checksAnswers, checkWrite, isCovered, itemOf, passedDown, programAddresses } from './grants.js';
+import { cmodError, locatingPrograms, readLines, spawnCmod } from './programs.js';
 import { createModFiles, resolvedPath } from './metadata.js';
 import { fitsOption } from '../options.js';
 import { createInstaller } from './installer.js';
@@ -35,6 +35,8 @@ const askingId = 'cmod:asking';
 const recordId = 'cmod:record';
 const installRetrySeconds = [2, 4, 8, 16, 32, 64, 128];
 const cmodCheckMs = 1000;
+const recordCheckMs = 1000;
+const drawsPerMs = 1000;
 const cmodWaitMs = 60_000;
 const cmodSlowCheckMs = 10_000;
 const hookMs = 10_000;
@@ -68,7 +70,8 @@ export async function readPlugin(claude) {
     if (version === undefined || record?.scriptsSha256 !== scripts)
         return { ...plugin, isInstalled: false, shouldRecord: false };
     const isInstalled = record.version === version || record.root === root;
-    return { ...plugin, isInstalled, shouldRecord: isInstalled && record.version !== version };
+    const programModifiedMs = record.program === null ? undefined : (await claude.fs.stat(programPath(store, record.program, record.version)).catch(ifMissing(undefined)))?.mtimeMs;
+    return { ...plugin, isInstalled, shouldRecord: isInstalled && (record.version !== version || isProgramNewer(record, programModifiedMs)) };
 }
 async function filesBelow(claude, folder) {
     const entries = await claude.fs.list(folder);
@@ -121,6 +124,8 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
     let raise;
     let failure;
     let pluginOptions = options;
+    let drawCount = 0;
+    const nextDraw = () => (drawCount += 1);
     const installer = createInstaller(definition.name, () => claude(), {
         show: (open) => {
             if (phase !== 'active')
@@ -128,7 +133,7 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
             runtime?.toaster.toast.info('Installing', { id: askingId, description: 'Waiting for your answer', duration: Infinity, action: { label: 'Answer', onClick: open } });
         },
         hide: () => runtime?.toaster.toast.dismiss(askingId),
-    });
+    }, nextDraw);
     let shouldRecord = false;
     let recording;
     let missedSessionStart;
@@ -147,6 +152,7 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
         failure ??= new Error(`${definition.name}: ${reason}${/[.!?]$/.test(reason) ? '' : '.'}${fix === undefined ? '' : ` ${fix}`}`, { cause: error });
         const again = retry === undefined ? {} : { retry: () => ((failure = undefined), stopRetrying(), retry().catch(report)) };
         toastFailure({ id: installId, message: reason, ...(fix === undefined ? {} : { description: fix }), ...(error === undefined ? {} : { error }), ...again });
+        watchRecord();
     };
     let consented;
     const installAgain = () => install(consented);
@@ -255,29 +261,34 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
     };
     const runSteps = async (active) => {
         const steps = asksPerson ? (definition.installer ?? []) : [];
-        for (const [index, step] of steps.entries()) {
-            if (await isStepDone(active, step))
-                continue;
-            const isAnswered = (await claude().session.surfaces()).length > 0 && (await installer.step(active, step, index + 1, steps.length));
-            if (!isAnswered) {
-                runtime?.toaster.toast.warning(steps.length - index === 1 ? 'Needs one more step' : `Needs ${steps.length - index} more steps`, {
-                    id: 'cmod:steps',
-                    description: `Starting with ${step.title}.`,
-                    duration: Infinity,
-                    action: { label: 'Finish', onClick: () => runSteps(active) },
-                });
-                break;
+        try {
+            for (const [index, step] of steps.entries()) {
+                if (await isStepDone(active, step))
+                    continue;
+                const isAnswered = (await claude().session.surfaces()).length > 0 && (await installer.step(active, step, index + 1, steps.length));
+                if (!isAnswered) {
+                    runtime?.toaster.toast.warning(steps.length - index === 1 ? 'Needs one more step' : `Needs ${steps.length - index} more steps`, {
+                        id: 'cmod:steps',
+                        description: `Starting with ${step.title}.`,
+                        duration: Infinity,
+                        action: { label: 'Finish', onClick: () => runSteps(active) },
+                    });
+                    break;
+                }
             }
         }
-        await installer.close();
+        finally {
+            await installer.close();
+        }
     };
     const activate = async () => {
         if (runtime === undefined || plugin === undefined)
             return;
         const activeRouter = createRouter();
-        const active = await createMod(definition, { ...runtime, router: activeRouter, dataFolder: dataFolder(plugin.store, plugin.name), store: plugin.store, steps: plugin.steps, granted, refreshGrants, permissionRoutes, options: pluginOptions }).catch(async (error) => {
+        const active = await createMod(definition, { ...runtime, router: activeRouter, dataFolder: dataFolder(plugin.store, plugin.name), store: plugin.store, steps: plugin.steps, granted, refreshGrants, permissionRoutes, options: pluginOptions, nextDraw }).catch(async (error) => {
             if (error instanceof MissingOptions && (await askOptions(error)))
                 return undefined;
+            await installer.close();
             fail(messageOf(error), error instanceof MissingOptions ? `Retry asks for ${error.keys.length === 1 ? 'it' : 'them'}.` : undefined, begin, error);
             throw error;
         });
@@ -289,6 +300,7 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
         raise = active.raise;
         router = activeRouter;
         phase = 'active';
+        stopWatchingRecord();
         runtime.claude.ui.invalidate('ui.render');
         void runSteps(active.mod).catch((error) => toastFailure({ id: 'cmod:steps', message: 'Its installer stopped', error }));
         const missed = missedSessionStart;
@@ -343,9 +355,15 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
             toastFailure({ id: 'cmod:updates', message: 'Could not read whether its marketplace updates automatically', error });
             return undefined;
         });
-        const isAccepted = await installer.consent({ ...event, updates });
+        const installedElsewhere = new Promise((resolve) => (settleAsked = () => resolve('installed')));
+        watchRecord();
+        const answer = await Promise.race([installer.consent({ ...event, updates }), installedElsewhere]).finally(() => {
+            settleAsked = undefined;
+        });
         await installer.close();
-        if (isAccepted) {
+        if (answer === 'installed')
+            return startInstalled();
+        if (answer) {
             consented = event.sha256;
             return install(consented);
         }
@@ -480,8 +498,8 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
     };
     let recordMs = 0;
     let readStarted;
-    const recover = async () => {
-        if (plugin === undefined || readStarted === undefined || (phase !== 'failed' && phase !== 'declined'))
+    const isNewlyInstalled = async () => {
+        if (plugin === undefined || readStarted === undefined)
             return false;
         const modifiedMs = await stampOf(recordPath(plugin.store, plugin.name));
         if (modifiedMs === recordMs)
@@ -491,12 +509,40 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
         if (!current.isInstalled)
             return false;
         plugin = current;
+        return true;
+    };
+    const startInstalled = async () => {
         failure = undefined;
         activation = undefined;
         await refreshGrants();
         await finish();
+    };
+    let settleAsked;
+    const recover = async () => {
+        if ((settleAsked === undefined && phase !== 'failed' && phase !== 'declined') || !(await isNewlyInstalled()))
+            return false;
+        if (settleAsked === undefined)
+            await startInstalled();
+        else
+            settleAsked();
         return true;
     };
+    let recordCheck;
+    let checking;
+    const watchRecord = () => {
+        recordCheck ??= claude().clock.every(recordCheckMs, () => {
+            checking ??= recover()
+                .then(() => undefined)
+                .catch((error) => claude().ui.log(`${definition.name} could not read whether another cmod installed it: ${messageOf(error)}`, { to: 'debug' }))
+                .finally(() => {
+                checking = undefined;
+            });
+        });
+    };
+    const stopWatchingRecord = () => {
+        recordCheck?.cancel();
+        recordCheck = undefined;
+    };
     const refreshGrants = async () => {
         if (plugin === undefined || plugin.name === cmodPluginName)
             return;
@@ -579,6 +625,7 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
             runtime = { claude: programs.claude, toaster: createToaster(claudeCalls, definition.name, () => plugin?.version, () => openSettings('permissions')) };
             readStarted = read;
             try {
+                drawCount = (await claudeCalls.clock.now()) * drawsPerMs;
                 await programs.refresh();
                 await begin().catch(report);
             }
@@ -589,10 +636,16 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
         async route(event, e, next) {
             if (imports !== undefined)
                 bind(imports);
-            if (event === 'ui.render' && installer.draws(e))
-                return installer.draw(e);
-            if (event === 'ui.close')
-                installer.closed(e.id);
+            const asked = e;
+            if (event === 'cmod.call' && asked.to === definition.name && asked.caller === cmodPluginName) {
+                if (asked.method === partMethods.shown)
+                    installer.hear(asked.input);
+                const answered = installer.answer(asked.method, asked.input);
+                if (answered !== undefined)
+                    return (await answered.catch((error) => ({ deny: `${definition.name}: ${messageOf(error)}` })));
+                if (asked.method === partMethods.shown && phase !== 'active')
+                    return { value: null };
+            }
             if (event === 'classic.SessionStart') {
                 missedSessionStart = undefined;
                 hasHeardSessionStart = true;
@@ -605,10 +658,11 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
                 record();
             if (event === 'classic.UserPromptSubmit' || event === 'classic.SessionStart')
                 await recover().catch((error) => claude().ui.log(`${definition.name} stays stopped: ${messageOf(error)}`, { to: 'debug' }));
-            const isCallToThisMod = event === 'cmod.call' && e.to === definition.name;
+            const tool = e.tool;
+            const isCallToThisMod = (event === 'cmod.call' && e.to === definition.name) || (event === 'tool.call' && typeof tool === 'string' && tool.startsWith(`mcp__${definition.name}__`));
             if (event === 'cmod.call' && !isCallToThisMod)
                 return next(e);
-            await (event === 'classic.SessionStart' || isCallToThisMod ? holdUntilStarted() : whenActive());
+            await (event === 'classic.SessionStart' || event === 'session.append' || isCallToThisMod ? holdUntilStarted() : whenActive());
             if (event === 'classic.SessionStart' && phase !== 'active') {
                 missedSessionStart = e;
                 return next(e);
@@ -621,8 +675,11 @@ export function createLifecycle(definition, permissionRoutes = () => undefined,
             if (event === 'cmod.call' && call.to === definition.name && mod !== undefined) {
                 if (call.method === pendingStepsMethod)
                     return { value: await pendingSteps(mod) };
-                if (call.method === finishStepsMethod)
-                    return (await runSteps(mod), { value: null });
+                if (call.method === finishStepsMethod) {
+                    const active = mod;
+                    const opened = await installer.collect(() => Promise.race([runSteps(active).catch((error) => void toastFailure({ id: 'cmod:steps', message: 'Could not finish the setup', error })), installer.shown()]));
+                    return { value: opened };
+                }
             }
             if (event === 'classic.UserPromptSubmit' || event === 'classic.SessionStart')
                 await refreshGrants().catch((error) => claude().ui.log(`${definition.name} keeps its grants from before: ${messageOf(error)}`, { to: 'debug' }));
@@ -689,7 +746,13 @@ async function createMod(definition, runtime) {
     let parentAsked;
     let hasEarlierPrompts = true;
     let agentType;
-    const area = createUi({ name: definition.name, claude, router, report, announce, mod: () => mod });
+    let parts;
+    const borrowed = (styler, cached, input) => {
+        const name = `The markdown style of ${styler}`;
+        void parts?.fill(styler, cached, input, name)?.then(() => claude.ui.invalidate('ui.render'));
+        return parts?.element(styler, cached, `${styler}/markdown:`, name, `markdown:${styler}`);
+    };
+    const area = createUi({ name: definition.name, claude, router, report, announce, mod: () => mod, borrowed, nextDraw: runtime.nextDraw });
     const askParent = async () => {
         if (definition.name === cmodPluginName)
             return undefined;
@@ -968,9 +1031,14 @@ async function createMod(definition, runtime) {
     const conversations = definition.name === cmodPluginName ? serveConversations({ claude, router, store: runtime.store, project: () => modState.root, report: (id, message, error) => report({ id, message, error }), clear: (id) => toaster.toast.dismiss(id) }) : undefined;
     let pages;
     const reportPart = (id, message, error) => report({ id, message, error });
-    const parts = drawnParts({ claude, report: reportPart, press: (to, input) => pages?.press(to, input) });
-    const widgets = conversations === undefined ? undefined : serveWidgets({ claude, router, store: runtime.store, report: reportPart, turnClosedBy: (rowId) => conversations.turnClosedBy(rowId), parts });
-    pages = widgets === undefined ? undefined : servePages({ claude, router, report: reportPart, widgets, parts });
+    const pressElsewhere = (to, input) => void claude.cmod.call({ to, method: partMethods.press, input }).catch((error) => {
+        parts?.forget(to);
+        claude.ui.invalidate('ui.render');
+        reportPart(`press:${to}`, `${to} did not take the press`, error);
+    });
+    parts = drawnParts({ claude, report: reportPart, press: (to, input) => (pages === undefined ? pressElsewhere(to, input) : pages.press(to, input)) });
+    const widgets = conversations === undefined ? undefined : serveWidgets({ claude, router, store: runtime.store, report: reportPart, turnClosedBy: (rowId) => conversations.turnClosedBy(rowId), parts, markdownIn: area.markdownIn });
+    pages = widgets === undefined ? undefined : servePages({ claude, router, report: reportPart, widgets, parts, tellStylers: area.restyled });
     router.add('cmod.call', async (e, next) => {
         if (e.to !== definition.name)
             return next(e);
@@ -986,13 +1054,13 @@ async function createMod(definition, runtime) {
         if (ask !== undefined)
             return { value: (await client.answerBefore(ask.session, ask.event, ask.change, ask.isInProject)) ?? null };
         if (e.method === partMethods.changed && call.caller !== undefined && pages !== undefined) {
-            return { value: { isHeld: pages.update(call.caller, e.input) } };
+            return { value: { isHeld: pages.update(call.caller, e.input), stylers: pages.stylers() } };
         }
-        if (call.caller === cmodPluginName) {
+        if (call.caller !== undefined) {
             const turn = e.method === partMethods.draw ? e.input.turn : undefined;
-            const answered = area.answer(e.method, turn === undefined ? e.input : { ...e.input, turn: client.turn(turn) });
+            const answered = area.answer(e.method, turn === undefined ? e.input : { ...e.input, turn: client.turn(turn) }, call.caller);
             if (answered !== undefined)
-                return answered;
+                return answered.catch((error) => ({ deny: `${definition.name}: ${messageOf(error)}` }));
         }
         const served = await conversations?.answer(call);
         return served ?? answerCall(definition.name, api, e);
@@ -1003,7 +1071,20 @@ async function createMod(definition, runtime) {
         return ask === undefined ? { deny: `${definition.name}: ${error.message}` } : { value: client.failedBefore(ask.session, ask.event, ask.change, ask.isInProject, error) ?? null };
     });
     const agents = toolCalls(claude, router);
-    keepEngine(mod, { claude: checked, router, toolCalls: agents, report, hasPermissionCheck: () => runtime.permissionRoutes() !== undefined, answerInput: area.answerInput, ...(widgets === undefined ? {} : { widgets }), ...(pages === undefined ? {} : { pages }) });
+    keepEngine(mod, {
+        claude: checked,
+        router,
+        toolCalls: agents,
+        report,
+        hasPermissionCheck: () => runtime.permissionRoutes() !== undefined,
+        answerInput: area.answerInput,
+        spawnCmod: async (args, program) => {
+            await checkRun(grants, 'process.spawn', program.argv);
+            return spawnCmod(claude, args, session, program.env);
+        },
+        ...(widgets === undefined ? {} : { widgets }),
+        ...(pages === undefined ? {} : { pages }),
+    });
     const names = new Set();
     const reserveName = (type, name, taken) => {
         const key = `${type}:${name}`;

package/runtime/pages.d.ts

@@ -11,6 +11,7 @@ export type ModPages = {
 export type PageApply = (mod: string, requests: readonly PageRequest[]) => Promise<void>;
 export type Pages = {
     declared(): readonly ModPages[];
+    stylers(): readonly string[];
     element(mod: string, page: string, params: unknown, columns: number, isFocused: boolean): RenderElement | undefined;
     press(mod: string, press: PartPress): void;
     update(mod: string, update: PartsUpdate): boolean;
@@ -18,11 +19,12 @@ export type Pages = {
     apply(listener: PageApply): void;
 };
 export declare function pagesOf(input: unknown): PageDeclaration[];
-export declare function servePages({ claude, router, report, widgets, parts }: {
+export declare function servePages({ claude, router, report, widgets, parts, tellStylers, }: {
     readonly claude: Claude;
     readonly router: Router;
     readonly report: (id: string, message: string, error: unknown) => void;
     readonly widgets: Pick<Widgets, 'update'>;
     readonly parts: DrawnParts;
+    readonly tellStylers: (stylers: readonly string[]) => void;
 }): Pages;
 //# sourceMappingURL=pages.d.ts.map

package/runtime/pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/runtime/pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAe,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAChI,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAI3C,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAA;CAAE,CAAA;AAE3F,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,WAAW,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAExF,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,IAAI,SAAS,QAAQ,EAAE,CAAA;IAC/B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAAA;IACnH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;IAC1C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAA;IACjD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1C,KAAK,CAAC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,EAAE,CAGzD;AAED,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,KAAK,CAiGjR"}
+{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/runtime/pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAe,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAChI,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAI3C,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAA;CAAE,CAAA;AAE3F,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,WAAW,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAExF,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,IAAI,SAAS,QAAQ,EAAE,CAAA;IAC/B,OAAO,IAAI,SAAS,MAAM,EAAE,CAAA;IAC5B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAAA;IACnH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;IAC1C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAA;IACjD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1C,KAAK,CAAC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,EAAE,CAGzD;AAED,wBAAgB,UAAU,CAAC,EACzB,MAAM,EACN,MAAM,EACN,MAAM,EACN,OAAO,EACP,KAAK,EACL,WAAW,GACZ,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACtE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACzC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;IAC1B,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;CAC3D,GAAG,KAAK,CAqHR"}