@cmodjs/core 1.5.0 → 1.5.1

package/docs/ui.md

@@ -411,7 +411,7 @@ export const indexer = defineMod({
 
 An error cmod catches for a mod, such as a hook that throws, shows as an error toast that stays, with its buttons on a line under the message:
 
-- `Retry` runs the failed step again, where running it again can work: an install, the mod's setup, or a program that stopped.
+- `Retry` runs the failed step again, where running it again can work: an install, the mod's setup, or a program that stopped. The toast stays where it is, and the step's progress shows in place of its description, or of its buttons when it has none, until the try ends.
 - `Report` replaces the toast's buttons with the ways to tell the mod's author, with the keys on the first, and `Back` returns to the buttons. The same failure happening again keeps them open. `Ask Claude to report it` sends this session a prompt to file the report with the person's own tools, and Claude Code asks before each step. `Report it on GitHub (opens your browser)` opens a filled-in issue on the mod's `supportUrl` or `repository` in its `plugin.json`, or `Email the author (opens your mail app)` writes to its `author.email`. `Copy the error` copies the mod's name and version, the `@cmodjs/core` version, the message, the whole cause, and the stack.
 - `Hide` closes the toast and keeps the same failure hidden in later sessions. A new version of the mod, or a different failure, shows again.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmodjs/core",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Build Claude Code mods: hooks, panes, permissions, checks, and an install that just works.",
   "license": "MIT",
   "type": "module",

package/records.d.ts

@@ -72,7 +72,7 @@ export declare function marketplaceOf(root: string, name: string): string | unde
 export declare function updatesToTurnOn(marketplace: string | undefined, settings: unknown, known: unknown): string | undefined;
 export declare function consentPath(store: string): string;
 export declare function parseConsent(value: unknown, path: string): Record<string, string[]>;
-export declare const coreVersion = "1.5.0";
+export declare const coreVersion = "1.5.1";
 export declare function oldestCmodFor(steps: Steps): string;
 export declare function keyWords(keys: Readonly<Record<string, string>> | undefined): string;
 export declare function scriptPaths(command: string): string[];

package/records.js

@@ -220,7 +220,7 @@ function readKeys(keys) {
     }
     return { keys: commands };
 }
-export const coreVersion = '1.5.0';
+export const coreVersion = '1.5.1';
 export function oldestCmodFor(steps) {
     if (steps.permissions?.some((item) => item === 'tasks' || item.startsWith('config:')) === true)
         return '1.0.0';

package/runtime/lifecycle.js

@@ -301,7 +301,7 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             claude().ui.log(`${name} waits for consent to run ${event.install}. Run cmod install ${name} in a terminal.`);
             return;
         }
-        installing('Waiting for your answer');
+        runtime?.toaster.toast.info('Installing', { id: installId, description: 'Waiting for your answer', duration: Infinity });
         const updates = await updatesToShow().catch((error) => {
             toastFailure({ id: 'cmod:updates', message: 'Could not read whether its marketplace updates automatically', error });
             return undefined;

package/runtime/toaster.d.ts.map

@@ -1 +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,KAAK,EAAE,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAA;AAIxE,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,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,CAAA;AAEhK,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;IAC/B,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,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAA;CACnH,CAAA;AAsCD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAwOtG"}
+{"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,KAAK,EAAE,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAA;AAIxE,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,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,CAAA;AAEhK,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;IAC/B,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,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAA;CACnH,CAAA;AAuCD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CA6PtG"}

package/runtime/toaster.js

@@ -32,7 +32,7 @@ export function createToaster(claude, name, version) {
     let showsAll = false;
     let bandId;
     const changed = () => {
-        const isLoading = [...entries.values()].some((entry) => entry.type === 'loading');
+        const isLoading = [...entries.values()].some((entry) => entry.type === 'loading' || entry.trying !== undefined);
         if (isLoading && spinning === undefined) {
             spinning = claude.clock.every(spinnerMs, () => {
                 frame += 1;
@@ -75,6 +75,11 @@ export function createToaster(claude, name, version) {
     const put = (type, message, options, actions, hides) => {
         const id = options.id ?? (lastId += 1);
         const previous = entries.get(id);
+        if (previous?.trying !== undefined && type === 'loading') {
+            previous.trying = options.description ?? message;
+            changed();
+            return id;
+        }
         if (previous !== undefined)
             disarm(previous);
         const reporting = hides !== undefined && previous?.hides === hides ? previous.reporting : undefined;
@@ -149,7 +154,23 @@ export function createToaster(claude, name, version) {
             if ('deny' in focused)
                 claude.ui.log(`${name}: the Report choices did not take the keys: ${String(focused.deny)}`, { to: 'debug' });
         };
-        const actions = [...(retry === undefined ? [] : [{ label: 'Retry', onClick: retry }]), { label: 'Report', onClick: startReporting }];
+        const tryAgain = async () => {
+            const shown = entries.get(id);
+            if (shown === undefined || retry === undefined || shown.trying !== undefined)
+                return;
+            shown.trying = 'Starting';
+            changed();
+            try {
+                await retry();
+            }
+            finally {
+                if (entries.get(id) === shown) {
+                    shown.trying = undefined;
+                    changed();
+                }
+            }
+        };
+        const actions = [...(retry === undefined ? [] : [{ label: 'Retry', onClick: tryAgain }]), { label: 'Report', onClick: startReporting }];
         return put('error', message, { id, ...(description === undefined ? {} : { description }), duration: Infinity }, actions, hides);
     };
     const toggle = (entry) => () => {
@@ -160,14 +181,16 @@ export function createToaster(claude, name, version) {
     const row = (entry) => {
         const { description } = entry.options;
         const isText = typeof description === 'string';
-        const icon = entry.type === 'loading' ? { glyph: spinner[frame % spinner.length], color: 'claude' } : icons[entry.type];
+        const icon = entry.type === 'loading' || entry.trying !== undefined ? { 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 });
         const close = Button({ plain: true, dimColor: true, key: `toast:${entry.id}:close`, label: entry.hides === undefined ? '✕' : 'Hide', onPress: () => hide(entry) });
         const actions = entry.actions.map((action, index) => Button({ plain: true, key: `toast:${entry.id}:${index === 0 ? 'action' : `action-${index}`}`, label: action.label, onPress: press(entry, action.onClick) }));
-        const text = details === undefined ? [message] : [message, details];
-        const under = entry.reporting === undefined ? [Box({ gap: 2, flexWrap: 'wrap', children: [...actions, close] })] : reportChoices(entry, entry.reporting);
+        const buttons = Box({ gap: 2, flexWrap: 'wrap', children: [...actions, close] });
+        const trying = entry.trying === undefined ? undefined : Box({ gap: 1, children: [Text({ dimColor: true, children: 'Trying again:' }), typeof entry.trying === 'string' ? Text({ dimColor: true, wrap: 'truncate-end', children: entry.trying }) : entry.trying] });
+        const text = details === undefined ? [message] : [message, trying ?? details];
+        const under = trying !== undefined && details === undefined ? [trying] : entry.reporting === undefined ? [buttons] : reportChoices(entry, entry.reporting);
         return Box({
             gap: 2,
             children: [

package/src/records.ts

@@ -250,7 +250,7 @@ function readKeys(keys: unknown): Steps {
   return { keys: commands }
 }
 
-export const coreVersion = '1.5.0'
+export const coreVersion = '1.5.1'
 
 export function oldestCmodFor(steps: Steps): string {
   if (steps.permissions?.some((item) => item === 'tasks' || item.startsWith('config:')) === true) return '1.0.0'

package/src/runtime/lifecycle.ts

@@ -367,7 +367,7 @@ export function createLifecycle<State extends object, Declared extends Options =
       claude().ui.log(`${name} waits for consent to run ${event.install}. Run cmod install ${name} in a terminal.`)
       return
     }
-    installing('Waiting for your answer')
+    runtime?.toaster.toast.info('Installing', { id: installId, description: 'Waiting for your answer', duration: Infinity })
     const updates = await updatesToShow().catch((error: unknown) => {
       toastFailure({ id: 'cmod:updates', message: 'Could not read whether its marketplace updates automatically', error })
       return undefined

package/src/runtime/toaster.ts

@@ -32,6 +32,7 @@ type Entry = {
   readonly hides?: string
   isOpen: boolean
   reporting?: Reporting | undefined
+  trying?: string | RenderElement | undefined
   timer: Timer | undefined
 }
 
@@ -71,7 +72,7 @@ export function createToaster(claude: Claude, name: string, version: () => strin
   let bandId: string | undefined
 
   const changed = () => {
-    const isLoading = [...entries.values()].some((entry) => entry.type === 'loading')
+    const isLoading = [...entries.values()].some((entry) => entry.type === 'loading' || entry.trying !== undefined)
     if (isLoading && spinning === undefined) {
       spinning = claude.clock.every(spinnerMs, () => {
         frame += 1
@@ -113,6 +114,11 @@ export function createToaster(claude: Claude, name: string, version: () => strin
   const put = (type: ToastType, message: string, options: ToastOptions, actions: readonly Action[], hides?: string): ToastId => {
     const id = options.id ?? (lastId += 1)
     const previous = entries.get(id)
+    if (previous?.trying !== undefined && type === 'loading') {
+      previous.trying = options.description ?? message
+      changed()
+      return id
+    }
     if (previous !== undefined) disarm(previous)
     const reporting = hides !== undefined && previous?.hides === hides ? previous.reporting : undefined
     const entry: Entry = { id, type, message, options, actions, ...(hides === undefined ? {} : { hides }), isOpen: previous?.isOpen ?? false, reporting, timer: undefined }
@@ -192,7 +198,21 @@ export function createToaster(claude: Claude, name: string, version: () => strin
       const focused = await claude.ui.focus({ requestId: bandId, key: `toast:${id}:ask-claude` })
       if ('deny' in focused) claude.ui.log(`${name}: the Report choices did not take the keys: ${String(focused.deny)}`, { to: 'debug' })
     }
-    const actions = [...(retry === undefined ? [] : [{ label: 'Retry', onClick: retry }]), { label: 'Report', onClick: startReporting }]
+    const tryAgain = async () => {
+      const shown = entries.get(id)
+      if (shown === undefined || retry === undefined || shown.trying !== undefined) return
+      shown.trying = 'Starting'
+      changed()
+      try {
+        await retry()
+      } finally {
+        if (entries.get(id) === shown) {
+          shown.trying = undefined
+          changed()
+        }
+      }
+    }
+    const actions = [...(retry === undefined ? [] : [{ label: 'Retry', onClick: tryAgain }]), { label: 'Report', onClick: startReporting }]
     return put('error', message, { id, ...(description === undefined ? {} : { description }), duration: Infinity }, actions, hides)
   }
 
@@ -205,14 +225,16 @@ export function createToaster(claude: Claude, name: string, version: () => strin
   const row = (entry: Entry): RenderElement => {
     const { description } = entry.options
     const isText = typeof description === 'string'
-    const icon = entry.type === 'loading' ? { glyph: spinner[frame % spinner.length] as string, color: 'claude' } : icons[entry.type]
+    const icon = entry.type === 'loading' || entry.trying !== undefined ? { glyph: spinner[frame % spinner.length] as string, 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: RenderElement) => Box({ flexShrink: 0, children: child })
     const close = Button({ plain: true, dimColor: true, key: `toast:${entry.id}:close`, label: entry.hides === undefined ? '✕' : 'Hide', onPress: () => hide(entry) })
     const actions = entry.actions.map((action, index) => Button({ plain: true, key: `toast:${entry.id}:${index === 0 ? 'action' : `action-${index}`}`, label: action.label, onPress: press(entry, action.onClick) }))
-    const text = details === undefined ? [message] : [message, details]
-    const under = entry.reporting === undefined ? [Box({ gap: 2, flexWrap: 'wrap', children: [...actions, close] })] : reportChoices(entry, entry.reporting)
+    const buttons = Box({ gap: 2, flexWrap: 'wrap', children: [...actions, close] })
+    const trying = entry.trying === undefined ? undefined : Box({ gap: 1, children: [Text({ dimColor: true, children: 'Trying again:' }), typeof entry.trying === 'string' ? Text({ dimColor: true, wrap: 'truncate-end', children: entry.trying }) : entry.trying] })
+    const text = details === undefined ? [message] : [message, trying ?? details]
+    const under = trying !== undefined && details === undefined ? [trying] : entry.reporting === undefined ? [buttons] : reportChoices(entry, entry.reporting)
     return Box({
       gap: 2,
       children: [