@cmodjs/core 4.0.2 → 4.1.0

package/runtime/before.js

@@ -1,4 +1,5 @@
 import { ContextEnd } from '../session/context/context.js';
+import { AttachedFile, attachedPathOf, attachmentTypeOf } from '../session/context/turn/message/attached-file.js';
 import { InstructionFile, isRulePath } from '../session/context/turn/message/instruction-file.js';
 import { instructionPathOf, Message, messagesOf, noFiles, rowOfAppend, withTexts } from '../session/context/turn/message/message.js';
 import { Note, untagged } from '../session/context/turn/message/note.js';
@@ -10,6 +11,7 @@ import { Skill } from '../session/context/turn/message/skill.js';
 import { ToolCall } from '../session/context/turn/message/tool-call.js';
 import { ToolResult } from '../session/context/turn/message/tool-result.js';
 import { TurnEnd } from '../session/context/turn/turn.js';
+import { ownerOfSpawn } from '../session/conversation.js';
 import { Task, TaskStart } from '../session/goal/task.js';
 import { sessionEvents } from '../session/session.js';
 import { cmodPluginName } from './dependencies.js';
@@ -20,6 +22,7 @@ const withNote = (below, note) => {
     const fields = (below ?? {});
     return note === undefined ? fields : { ...fields, additionalContext: [...(fields['additionalContext'] ?? []), note] };
 };
+const withContext = (ran, note) => note === undefined || ran.deny !== undefined ? ran : { ...ran, context: [...(ran.context ?? []), note] };
 const relayTag = /^(?:<cross-session-message[^>]*>\s*)?<cmod-relay>([\s\S]*)<\/cmod-relay>(?:\s*<\/cross-session-message>[\s\S]*)?$/;
 export function relayOf(e) {
     const isFromCmod = e.origin.kind === 'peer' && !('teammate' in e.origin) && e.origin.plugin === cmodPluginName;
@@ -37,6 +40,14 @@ export function installBefore({ claude, router, hooks }) {
     };
     const titles = new Map();
     const spawned = new Map();
+    const startedBy = new Map();
+    const startingSpawn = (agentId, agentType) => {
+        const known = startedBy.get(agentId);
+        if (known !== undefined)
+            return known;
+        const waiting = [...spawned].filter(([call, spawn]) => spawn.agentType === agentType && ![...startedBy.values()].includes(call));
+        return waiting.length === 1 ? waiting[0]?.[0] : undefined;
+    };
     const agentFolders = new Map();
     const toolResultHook = (isFailure) => async (e, next) => {
         if (!(await wants(ToolResult)))
@@ -99,11 +110,15 @@ export function installBefore({ claude, router, hooks }) {
             return answer.text === undefined ? next(e) : { text: answer.text };
         }),
         router.add('prompt.attachment', async (e, next) => {
-            if (!(await wants(InstructionFile)) || e.type !== 'nested_memory')
+            const attachmentType = attachmentTypeOf(e.type);
+            const event = e.type === 'nested_memory' ? InstructionFile : attachmentType === undefined ? undefined : AttachedFile;
+            if (event === undefined || !(await wants(event)))
                 return next(e);
             const where = await place();
-            const path = instructionPathOf(e.text);
-            const answer = await asked(InstructionFile, message(where, { id: '', at: now(), type: InstructionFile, path, text: e.text, isRule: isRulePath(path) }, e.agentId));
+            const found = attachmentType === undefined
+                ? { id: '', at: now(), type: InstructionFile, path: instructionPathOf(e.text), text: e.text, isRule: isRulePath(instructionPathOf(e.text)) }
+                : { id: '', at: now(), type: AttachedFile, path: attachedPathOf(e.text), attachmentType, text: e.text };
+            const answer = await asked(event, message(where, found, e.agentId));
             if (answer.refuse !== undefined)
                 return { text: null };
             return answer.text === undefined ? next(e) : { text: answer.text };
@@ -138,16 +153,20 @@ export function installBefore({ claude, router, hooks }) {
             if (answer.refuse !== undefined)
                 return { deny: answer.refuse };
             if (answer.result !== undefined)
-                return { result: answer.result };
+                return withContext({ result: answer.result }, answer.note);
             if (answer.input === undefined)
-                return next(e);
+                return withContext(await next(e), answer.note);
             const reserved = Object.fromEntries(Object.entries(e).filter(([key]) => !(key in input)));
-            return next({ ...reserved, ...answer.input });
+            return withContext(await next({ ...reserved, ...answer.input }), answer.note);
         }),
         router.add('agent.spawn', async (e, next) => {
-            spawned.set(e.tool_use_id, e.prompt);
+            spawned.set(e.tool_use_id, { prompt: e.prompt, agentType: e.subagentType });
             const start = async (args) => {
                 const started = await next(args);
+                if (started.agentId === undefined)
+                    spawned.delete(e.tool_use_id);
+                else if (spawned.has(e.tool_use_id))
+                    startedBy.set(started.agentId, e.tool_use_id);
                 const folder = args.isTeammate === true ? undefined : (args.cwd ?? (args.parentAgentId === undefined ? undefined : agentFolders.get(args.parentAgentId)));
                 if (started.agentId !== undefined && folder !== undefined)
                     agentFolders.set(started.agentId, resolve(await claude.session.cwd(), folder));
@@ -156,20 +175,36 @@ export function installBefore({ claude, router, hooks }) {
             if (!(await wants(TaskStart)))
                 return start(e);
             const where = await place();
-            const task = { id: '', title: e.description, agentType: e.subagentType, model: e.model ?? e.parentModel, openedBy: e.tool_use_id, openedAt: now(), ...(e.parentAgentId === undefined ? {} : { parent: e.parentAgentId }) };
+            const task = { id: '', title: e.description, ...ownerOfSpawn(e.subagentType, where.session), model: e.model ?? e.parentModel, openedBy: e.tool_use_id, openedAt: now(), ...(e.parentAgentId === undefined ? {} : { parent: e.parentAgentId }) };
             const answer = await asked(TaskStart, { type: TaskStart, task: { ...task, context: where.context } });
             if (answer.refuse !== undefined) {
                 spawned.delete(e.tool_use_id);
                 return { deny: answer.refuse };
             }
-            return start(answer.owner === undefined ? e : { ...e, model: answer.owner.model });
+            if (e.workflow !== undefined)
+                return start(e);
+            const isFork = task.forkedFrom !== undefined;
+            const { agentType, model, cwd } = (isFork ? undefined : answer.owner) ?? {};
+            const isAsync = isFork ? undefined : answer.isAsync;
+            const answered = {
+                ...e,
+                ...(answer.prompt === undefined ? {} : { prompt: answer.prompt }),
+                ...(answer.title === undefined ? {} : { description: answer.title }),
+                ...(agentType === undefined ? {} : { subagentType: agentType }),
+                ...(model === undefined ? {} : { model }),
+                ...(cwd === undefined ? {} : { cwd }),
+                ...(isAsync === undefined ? {} : { background: isAsync }),
+            };
+            spawned.set(e.tool_use_id, { prompt: answered.prompt, agentType: answered.subagentType });
+            return start(answered);
         }),
         router.add('classic.SubagentStart', async (e, next) => {
             const where = await place();
-            const openedBy = where.tasks[e.agent_id]?.openedBy;
-            const prompt = openedBy === undefined ? undefined : spawned.get(openedBy);
+            const openedBy = where.tasks[e.agent_id]?.openedBy ?? startingSpawn(e.agent_id, e.agent_type);
+            const prompt = openedBy === undefined ? undefined : spawned.get(openedBy)?.prompt;
             if (openedBy !== undefined)
                 spawned.delete(openedBy);
+            startedBy.delete(e.agent_id);
             if (!(await wants(Prompt)))
                 return next(e);
             const open = where.taskTurns[e.agent_id]?.prompt;
@@ -192,7 +227,7 @@ export function installBefore({ claude, router, hooks }) {
                 return stopped(await next(e));
             const answer = await asked(TurnEnd, { type: TurnEnd, turn: { ...turn, closedAt: now() } });
             const below = await next(e);
-            return stopped(answer.refuse === undefined ? below : { ...below, block: answer.refuse });
+            return stopped(answer.refuse === undefined ? withNote(below, answer.note) : { ...below, block: answer.refuse });
         }),
         router.add('classic.Stop', async (e, next) => {
             if (!(await wants(TurnEnd)))
@@ -202,7 +237,7 @@ export function installBefore({ claude, router, hooks }) {
                 return next(e);
             const answer = await asked(TurnEnd, { type: TurnEnd, turn: { ...where.turn, closedAt: now() } });
             const below = await next(e);
-            return answer.refuse === undefined ? below : { ...below, block: answer.refuse };
+            return answer.refuse === undefined ? withNote(below, answer.note) : { ...below, block: answer.refuse };
         }),
         router.add('session.compact', async (e, next) => {
             if (!(await wants(ContextEnd)) || e.trigger === 'precompute')
@@ -227,8 +262,10 @@ export function withAnswer(change, answer) {
         return { ...change, message: { ...change.message, text: answer.text } };
     if (change.type === Message && answer.input !== undefined && change.message.type === ToolCall)
         return { ...change, message: { ...change.message, input: answer.input } };
-    if (change.type === TaskStart && answer.owner !== undefined)
-        return { ...change, task: { ...change.task, model: answer.owner.model } };
+    if (change.type === TaskStart) {
+        const { agentType, model } = answer.owner ?? {};
+        return { ...change, task: { ...change.task, ...(answer.title === undefined ? {} : { title: answer.title }), ...(agentType === undefined ? {} : { agentType }), ...(model === undefined ? {} : { model }) } };
+    }
     return change;
 }
 export const methodOf = (prefix, event) => `${prefix}${Object.entries(sessionEvents).find(([, each]) => each === event)?.[0] ?? event}`;
@@ -237,12 +274,13 @@ export const beforeAnswerKeys = {
     note: ['text'],
     skill: ['text'],
     instructionFile: ['text', 'refuse'],
+    attachedFile: ['text', 'refuse'],
     reply: ['text'],
-    toolCall: ['input', 'result', 'refuse'],
+    toolCall: ['input', 'result', 'refuse', 'note'],
     toolResult: ['output', 'isError', 'note'],
     notice: ['text'],
-    taskStart: ['owner', 'refuse'],
-    turnEnd: ['refuse'],
+    taskStart: ['prompt', 'title', 'owner', 'isAsync', 'refuse'],
+    turnEnd: ['refuse', 'note'],
     contextEnd: ['refuse'],
 };
 export function foldBefore(event, change, askers, report) {

package/runtime/buttons.d.ts

@@ -0,0 +1,10 @@
+import type { RenderElement } from 'claude-code';
+export type FilledButton = {
+    readonly key: string;
+    readonly label: string;
+    readonly hotkey?: string;
+    readonly variant?: 'primary' | 'secondary';
+    readonly onPress: () => void;
+};
+export declare function filledButton({ key, label, hotkey, variant, onPress }: FilledButton): RenderElement;
+//# sourceMappingURL=buttons.d.ts.map

package/runtime/buttons.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buttons.d.ts","sourceRoot":"","sources":["../src/runtime/buttons.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,WAAW,CAAA;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAC7B,CAAA;AAED,wBAAgB,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAqB,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,aAAa,CAUhH"}

package/runtime/buttons.js

@@ -0,0 +1,12 @@
+import { Button, Text } from '../ui/elements.js';
+export function filledButton({ key, label, hotkey, variant = 'secondary', onPress }) {
+    const isPrimary = variant === 'primary';
+    return Button({
+        plain: true,
+        key,
+        label,
+        ...(hotkey === undefined ? {} : { hotkey }),
+        onPress,
+        children: Text({ backgroundColor: isPrimary ? 'claude' : 'userMessageBackground', color: isPrimary ? 'inverseText' : 'text', bold: isPrimary, children: ` ${label} ` }),
+    });
+}

package/runtime/conversations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../src/runtime/conversations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAK5D,OAAO,EAA2J,KAAK,QAAQ,EAAmB,MAAM,4BAA4B,CAAA;AAQpO,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,aAAa,CAAA;AAkCrD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAA;IAClH,KAAK,IAAI,IAAI,CAAA;IACb,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAA;CAClD,CAAA;AAMD,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAA;IAC9B,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACtE,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC,GAAG,aAAa,CA2lBhB"}
+{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../src/runtime/conversations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAK5D,OAAO,EAA0L,KAAK,QAAQ,EAAmB,MAAM,4BAA4B,CAAA;AAUnQ,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,aAAa,CAAA;AAyCrD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAA;IAClH,KAAK,IAAI,IAAI,CAAA;IACb,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAA;CAClD,CAAA;AAMD,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAA;IAC9B,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACtE,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC,GAAG,aAAa,CA4rBhB"}

package/runtime/conversations.js

@@ -2,19 +2,22 @@ import { consentPath, coreVersion, dataFolder, grantFix, isObject, parseConsent
 import { Message, rowOfAppend } from '../session/context/turn/message/message.js';
 import { modNote, Note } from '../session/context/turn/message/note.js';
 import { Person } from '../session/context/turn/message/sender.js';
-import { createConversation, emptyConversation } from '../session/conversation.js';
+import { createConversation, emptyConversation, ownerOfSpawn, tasksWithAgents } from '../session/conversation.js';
 import { Session, UsageChange } from '../session/session.js';
 import { GoalChange } from '../session/goal/goal.js';
 import { TurnEnd, TurnStart } from '../session/context/turn/turn.js';
+import { TaskStart } from '../session/goal/task.js';
 import { receivedMatcher } from '../utils/matcher.js';
+import { resolve } from '../vendor.js';
 import { ifMissing } from '../utils/paths.js';
 import { formatExit, messageOf } from '../utils/text.js';
 import { beforeAnswerKeys, foldBefore, installBefore, relayOf } from './before.js';
 import { cmodPluginName } from './dependencies.js';
-import { readLines, runCmod } from './programs.js';
+import { readLines, runCmod, spawnCmod } from './programs.js';
 import { PassedTimeout } from './deadline.js';
 import { actPermission, conversationMethods, everySession, isAct, isHeardBy, isInScope, resultOf, spawnTask, usageOf } from './sessions.js';
-const relayKinds = new Set(['act', 'before', 'answer', 'watch', 'goal']);
+const relayKinds = new Set(['act', 'before', 'answer', 'watch', 'goal', 'taskEnd']);
+const taskVariable = 'CMOD_TASK';
 const isRelay = (value) => isObject(value) && relayKinds.has(value['kind']);
 const bufferedTaskRows = 200;
 const beforeDeadlineMs = 5000;
@@ -25,8 +28,12 @@ const keptMessages = 200;
 export function serveConversations({ claude, router, store, project, report, clear, }) {
     const folder = dataFolder(store, cmodPluginName);
     const goals = `${folder}/goals`;
+    const backgroundTasks = `${folder}/tasks`;
     const watches = `${folder}/before`;
+    const listeners = `${folder}/listeners`;
     const heard = new Map();
+    const subscribed = new Map();
+    let savingListeners = Promise.resolve();
     const asked = new Map();
     const ownWatches = new Map();
     let watchers = [];
@@ -57,6 +64,12 @@ export function serveConversations({ claude, router, store, project, report, cle
     router.add('classic.Stop', async (e, next) => endTurn({ reason: 'answer', ...(e.last_assistant_message === undefined ? {} : { answer: e.last_assistant_message }) })(await next(e)));
     router.add('classic.StopFailure', async (e, next) => endTurn({ reason: 'error', failure: { type: String(e.error), text: e.error_details ?? e.last_assistant_message ?? String(e.error) } })(await next(e)));
     router.add('classic.SubagentStop', async (e, next) => endTurn({ reason: 'answer', ...(e.last_assistant_message === undefined ? {} : { answer: e.last_assistant_message }) }, e.agent_id)(await next(e)));
+    router.add('classic.Stop', async (e, next) => {
+        const below = await next(e);
+        if (below.block === undefined)
+            void answerTask().catch((error) => report('task', 'Could not record that this session answered its task', error));
+        return below;
+    });
     const json = async (args) => JSON.parse(await runCmod(claude, [...args, '--json', '--project', project()], await claude.session.id()));
     const isGranted = async (caller, item) => {
         if (caller === cmodPluginName)
@@ -103,7 +116,7 @@ export function serveConversations({ claude, router, store, project, report, cle
         follower = undefined;
         if (args.length === 0)
             return;
-        const stream = claude.process.spawn({ argv: ['cmod', 'history', 'follow', ...args, '--json', '--project', project()], env: { CLAUDE_CODE_SESSION_ID: session } });
+        const stream = spawnCmod(claude, ['history', 'follow', ...args, '--json', '--project', project()], session);
         const started = { sessions: wanted, stop: () => void stream.return(undefined) };
         follower = started;
         void readLines(stream, (line) => {
@@ -194,14 +207,42 @@ export function serveConversations({ claude, router, store, project, report, cle
         const told = new Set([...running, ...targets].filter((id) => id !== everySession && id !== session));
         await Promise.all([...told].map((id) => post(id, { kind: 'watch' }).catch((error) => claude.ui.log(`cmod: session ${id} did not hear of a before listener: ${messageOf(error)}`, { to: 'debug' }))));
     };
+    const hear = (caller, id, list) => {
+        const sessions = heard.get(caller) ?? new Map();
+        sessions.set(id, list.map(({ event, matcher }) => ({ event, matcher: matcher === undefined ? undefined : receivedMatcher(matcher) })));
+        heard.set(caller, sessions);
+        const lists = subscribed.get(caller) ?? new Map();
+        lists.set(id, list);
+        subscribed.set(caller, lists);
+    };
+    const saveListeners = (isEnding = false) => {
+        const at = session;
+        const kept = isEnding ? {} : Object.fromEntries([...subscribed].map(([caller, lists]) => [caller, Object.fromEntries(lists)]));
+        const next = savingListeners.then(() => (at === '' ? undefined : claude.fs.write(`${listeners}/${at}.json`, JSON.stringify(kept))));
+        savingListeners = next.catch((error) => claude.ui.log(`cmod: saving the mods' listeners failed: ${messageOf(error)}`, { to: 'debug' }));
+        return next;
+    };
+    const restoreListeners = async () => {
+        const kept = JSON.parse(await claude.fs.read(`${listeners}/${session}.json`).catch(ifMissing('{}')));
+        for (const [caller, lists] of Object.entries(kept))
+            if (!subscribed.has(caller))
+                for (const [id, list] of Object.entries(lists))
+                    hear(caller, id, list);
+    };
     const readWatchers = async () => {
         const files = await claude.fs.list(watches).catch(ifMissing([]));
         const found = [];
         for (const file of files) {
             const from = file.name.replace(/\.json$/, '');
-            if (from === session || !file.name.endsWith('.json'))
+            if (!file.name.endsWith('.json'))
                 continue;
             const list = JSON.parse(await claude.fs.read(`${watches}/${file.name}`).catch(ifMissing('[]')));
+            if (from === session) {
+                for (const watch of list)
+                    if (!ownWatches.has(`${watch.mod}\n${watch.target}`))
+                        ownWatches.set(`${watch.mod}\n${watch.target}`, watch);
+                continue;
+            }
             found.push(...list.filter((watch) => watch.target === session || (watch.target === everySession && watch.project === project())).map((watch) => ({ ...watch, from })));
         }
         watchers = found;
@@ -249,6 +290,19 @@ export function serveConversations({ claude, router, store, project, report, cle
             return undefined;
         }
     };
+    const wants = async (event) => {
+        await Promise.all([starting, watching]);
+        return deciders(event).length > 0;
+    };
+    const decide = () => {
+        let endsAt;
+        return (event, change) => foldBefore(event, change, deciders(event).map((watcher) => async (latest) => {
+            if (watcher.from === session)
+                return askHere(watcher.mod, event, latest);
+            endsAt ??= claude.clock.now().then((now) => now + awayFoldMs);
+            return askAway(watcher, event, latest, await endsAt);
+        }), (error) => report(`before:${event}`, `Passed the ${event} on without a mod's answer`, error));
+    };
     installBefore({
         claude,
         router,
@@ -257,19 +311,8 @@ export function serveConversations({ claude, router, store, project, report, cle
                 await starting;
                 return place();
             },
-            wants: async (event) => {
-                await Promise.all([starting, watching]);
-                return deciders(event).length > 0;
-            },
-            fold: () => {
-                let endsAt;
-                return (event, change) => foldBefore(event, change, deciders(event).map((watcher) => async (latest) => {
-                    if (watcher.from === session)
-                        return askHere(watcher.mod, event, latest);
-                    endsAt ??= claude.clock.now().then((now) => now + awayFoldMs);
-                    return askAway(watcher, event, latest, await endsAt);
-                }), (error) => report(`before:${event}`, `Passed the ${event} on without a mod's answer`, error));
-            },
+            wants,
+            fold: decide,
         },
     });
     const start = (id, source) => {
@@ -288,8 +331,13 @@ export function serveConversations({ claude, router, store, project, report, cle
                     if (session === id)
                         conversation = createConversation({ ...emptyConversation(id), ...state });
                 }, (error) => report('state', `Starts session ${id} without its earlier turns`, error));
-        follow();
+        const restored = restoreListeners()
+            .catch((error) => report('listeners', "Could not read back the mods' listeners of this session", error))
+            .then(follow);
+        starting = Promise.all([starting, restored]).then(() => undefined);
         reloadWatchers();
+        if (subscribed.size > 0)
+            void Promise.all([previous === '' ? undefined : claude.fs.write(`${listeners}/${previous}.json`, '{}'), saveListeners()]).catch((error) => report('follow', 'Kept telling the mods about the session from before', error));
         if (ownWatches.size === 0)
             return;
         void Promise.all([previous === '' ? undefined : claude.fs.write(`${watches}/${previous}.json`, '[]'), publishWatches()]).catch((error) => report('before', 'Kept its before listeners on the session from before', error));
@@ -322,6 +370,8 @@ export function serveConversations({ claude, router, store, project, report, cle
     router.add('classic.SessionEnd', async (e, next) => {
         if (ownWatches.size > 0)
             await publishWatches(true).catch((error) => report('before', 'Left its before listeners registered', error));
+        if (subscribed.size > 0)
+            await saveListeners(true).catch((error) => report('follow', 'Left its listeners registered', error));
         return next(e);
     });
     const recordAppend = async (e, next) => {
@@ -354,8 +404,8 @@ export function serveConversations({ claude, router, store, project, report, cle
         if (spawned.deny !== undefined || spawned.agentId === undefined)
             return spawned;
         const id = spawned.agentId;
-        const opened = { id, title: e.description, agentType: e.subagentType, model: spawned.model, openedBy: e.tool_use_id, openedAt: new Date().toISOString(), ...(e.parentAgentId === undefined ? {} : { parent: e.parentAgentId }) };
         await starting;
+        const opened = { id, title: e.description, ...ownerOfSpawn(e.subagentType, session), model: spawned.model, openedBy: e.tool_use_id, openedAt: new Date().toISOString(), ...(e.parentAgentId === undefined ? {} : { parent: e.parentAgentId }) };
         dispatch(session, conversation.startTask(opened));
         const waiting = waitingRows.get(id) ?? [];
         waitingRows.delete(id);
@@ -394,6 +444,11 @@ export function serveConversations({ claude, router, store, project, report, cle
             changeGoal(relay.task, relay.text);
             return;
         }
+        if (relay.kind === 'taskEnd') {
+            await starting;
+            dispatch(session, conversation.endTask(relay.task, relay.task.closedAt ?? new Date().toISOString()));
+            return;
+        }
         const answered = async (run) => {
             try {
                 await post(relay.from, { kind: 'answer', id: relay.id, value: (await run()) ?? null });
@@ -435,6 +490,12 @@ export function serveConversations({ claude, router, store, project, report, cle
         }
         if (action === 'startTask')
             return spawnTask(claude, input);
+        if (action === 'fork')
+            return spawnTask(claude, input, session);
+        if (action === 'startBackgroundTask')
+            return startBackground(input);
+        if (action === 'clone')
+            return startBackground(input, session);
         const { name, input: toolInput } = input;
         return resultOf(place(), { name, input: toolInput, cwd: await claude.session.cwd() }, await claude.tool.call({ ...toolInput, tool: name }));
     };
@@ -465,6 +526,51 @@ export function serveConversations({ claude, router, store, project, report, cle
             throw ended(task);
         return null;
     };
+    const startBackground = async (task, forkedFrom) => {
+        if (task.title.trim() === '')
+            throw new Error('a task needs a title.');
+        if (task.name !== undefined)
+            throw new Error('a background task takes no name.');
+        const fresh = forkedFrom === undefined ? task : {};
+        const asked = { id: '', title: task.title, ...(forkedFrom === undefined ? {} : { forkedFrom }), ...(fresh.agentType === undefined ? {} : { agentType: fresh.agentType }), ...(fresh.model === undefined ? {} : { model: fresh.model }), openedBy: '', openedAt: new Date().toISOString(), isBackground: true };
+        const answer = (await wants(TaskStart)) ? await decide()(TaskStart, { type: TaskStart, task: { ...asked, context: conversation.state.context } }) : undefined;
+        if (answer?.refuse !== undefined)
+            throw new Error(`a beforeTaskStart listener refused the task: ${answer.refuse}`);
+        const owner = forkedFrom === undefined ? (answer?.owner ?? {}) : {};
+        const folder = owner.cwd ?? fresh.cwd;
+        const here = await claude.session.cwd();
+        const args = [
+            'task',
+            'start',
+            '--title',
+            answer?.title ?? task.title,
+            ...(forkedFrom === undefined ? [] : ['--clone']),
+            ...textArg('--agent', owner.agentType ?? fresh.agentType),
+            ...textArg('--model', owner.model ?? fresh.model),
+            '--cwd',
+            folder === undefined ? here : resolve(here, folder),
+            '--json',
+            '--',
+            answer?.prompt ?? task.prompt,
+        ];
+        const started = JSON.parse(await runCmod(claude, args, session));
+        dispatch(session, conversation.startTask(started));
+        return started;
+    };
+    const answerTask = async () => {
+        const { env } = await claude.settings.read();
+        const asked = isObject(env) ? env[taskVariable] : undefined;
+        if (typeof asked !== 'string')
+            return;
+        const answered = `cmod:task-answered:${session}`;
+        if ((await claude.store.get(answered)) === true)
+            return;
+        await claude.store.set(answered, true);
+        const { session: from, ...task } = JSON.parse(asked);
+        const ended = { ...task, id: session, closedAt: new Date().toISOString() };
+        await claude.fs.write(`${backgroundTasks}/${from}/${session}.json`, JSON.stringify(ended));
+        await post(from, { kind: 'taskEnd', task: ended }).catch((error) => claude.ui.log(`cmod: session ${from} did not hear that its task ${session} answered: ${messageOf(error)}`, { to: 'debug' }));
+    };
     const actElsewhere = async (caller, target, action, input, task) => {
         await checkAct(caller, action, input);
         const isLive = await isRunning(target);
@@ -493,12 +599,14 @@ export function serveConversations({ claude, router, store, project, report, cle
     const liveTasks = () => Object.values(conversation.state.tasks).map((task) => ({
         id: task.id,
         title: task.title,
-        agentType: task.agentType,
+        ...(task.agentType === undefined ? {} : { agentType: task.agentType }),
         ...(task.model === undefined ? {} : { model: task.model }),
         openedBy: task.openedBy,
         openedAt: task.openedAt,
         ...(task.closedAt === undefined ? {} : { closedAt: task.closedAt }),
         ...(task.parent === undefined ? {} : { parent: task.parent }),
+        ...(task.forkedFrom === undefined ? {} : { forkedFrom: task.forkedFrom }),
+        ...(task.isBackground === true ? { isBackground: true } : {}),
     }));
     const liveContext = (task) => {
         if (typeof task === 'string') {
@@ -565,7 +673,9 @@ export function serveConversations({ claude, router, store, project, report, cle
                 return saved;
             await starting;
             const kept = liveTasks().filter((task) => isNested || task.parent === request['task']);
-            return merged(saved, kept, (task) => task.id);
+            const running = await claude.agent.list().catch((error) => (claude.ui.log(`cmod: the tasks show no status, because Claude Code listed no agents: ${messageOf(error)}`, { to: 'debug' }), []));
+            const background = saved.flatMap(({ id, status }) => (status === undefined ? [] : [{ id, status }]));
+            return tasksWithAgents(merged(saved, kept, (task) => task.id), [...running, ...background]);
         },
         async [conversationMethods.goal](request) {
             const id = String(request['session']);
@@ -597,10 +707,9 @@ export function serveConversations({ claude, router, store, project, report, cle
                 throw new Error('cmod hears no caller for this subscription.');
             const id = String(request['session']);
             const list = Array.isArray(request['subscriptions']) ? request['subscriptions'] : [];
-            const sessions = heard.get(caller) ?? new Map();
-            sessions.set(id, list.map(({ event, matcher }) => ({ event, matcher: matcher === undefined ? undefined : receivedMatcher(matcher) })));
-            heard.set(caller, sessions);
+            hear(caller, id, list);
             follow();
+            await saveListeners();
             return null;
         },
         async [conversationMethods.watchBefore](request, caller) {

package/runtime/engine.d.ts

@@ -1,3 +1,4 @@
+import type { HookStream, ProcessSpawnChunk, ProcessSpawnRequest, ProcessSpawnResult } from 'claude-code';
 import type { Claude } from './claude.js';
 import type { Pages } from './pages.js';
 import type { Router } from './router.js';
@@ -11,6 +12,7 @@ export type Engine = {
     readonly report: (failure: Failure) => void;
     readonly hasPermissionCheck: () => boolean;
     readonly answerInput: <Answer>(run: () => Promise<Answer>, passOn: () => Promise<unknown>) => Promise<Answer>;
+    readonly spawnCmod: (args: readonly string[], program: ProcessSpawnRequest) => Promise<HookStream<ProcessSpawnChunk, ProcessSpawnResult>>;
     readonly widgets?: Widgets;
     readonly pages?: Pages;
 };

package/runtime/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/runtime/engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,OAAO,CAAA;IAC1C,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7G,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CACvB,CAAA;AAID,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI5C"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/runtime/engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACzG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,OAAO,CAAA;IAC1C,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7G,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,UAAU,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,CAAA;IACzI,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CACvB,CAAA;AAID,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI5C"}

package/runtime/grants.d.ts

@@ -15,6 +15,7 @@ export declare class PermissionRefused extends Error {
 }
 export declare function programAddresses(mod: object): Set<string>;
 export declare function checkGrant(grants: Grants, call: string, item: string | undefined): Promise<void>;
+export declare function checkRun(grants: Grants, call: 'process.run' | 'process.spawn', argv: readonly string[]): Promise<void>;
 export declare function checkWrite(grants: Grants, call: string, path: string): Promise<void>;
 export declare function checkSettings(grants: Grants, source: 'user' | 'project' | 'local', values: Readonly<Record<string, unknown>>): Promise<void>;
 export declare function checkingGrants(claude: Claude, grants: Grants): Claude;

package/runtime/grants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../src/runtime/grants.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG7C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAA;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,MAAM,CAAA;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,SAAS,MAAM,EAAE,CAAA;IAC7C,QAAQ,CAAC,aAAa,EAAE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAA;CAClD,CAAA;AAED,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAI/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAIzD;AAkBD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAItG;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1F;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAElJ;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAwFrE;AAmBD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAWvG;AAiBD,wBAAgB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9G;AA0BD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;IAChC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1C,CAAA;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAEzD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAa9G;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BxJ"}
+{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../src/runtime/grants.ts"],"names":[],"mappings":"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"}

package/runtime/grants.js

@@ -31,6 +31,9 @@ export async function checkGrant(grants, call, item) {
     if (!isCovered(grants.granted(), item, grants.home))
         throw new PermissionRefused(refusal(grants, call, item));
 }
+export async function checkRun(grants, call, argv) {
+    await checkGrant(grants, `${call}(${argv.join(' ')})`, `run:${programOf(argv)}`);
+}
 export async function checkWrite(grants, call, path) {
     await checkGrant(grants, call, writeItem(grants, path));
 }
@@ -44,11 +47,11 @@ export function checkingGrants(claude, grants) {
         ...claude,
         process: {
             async run(argv, init) {
-                await gate(`process.run(${argv.join(' ')})`, `run:${programOf(argv)}`);
+                await checkRun(grants, 'process.run', argv);
                 return claude.process.run(argv, init);
             },
             spawn(request) {
-                const started = gate(`process.spawn(${request.argv.join(' ')})`, `run:${programOf(request.argv)}`).then(() => claude.process.spawn(request));
+                const started = checkRun(grants, 'process.spawn', request.argv).then(() => claude.process.spawn(request));
                 return spawned(started);
             },
         },

package/runtime/hotkeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hotkeys.d.ts","sourceRoot":"","sources":["../src/runtime/hotkeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAIpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAS7G;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,MAAM,EACN,MAAM,EACN,WAAW,EACX,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7G,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC5C,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA4C5C"}
+{"version":3,"file":"hotkeys.d.ts","sourceRoot":"","sources":["../src/runtime/hotkeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAIpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAS7G;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,MAAM,EACN,MAAM,EACN,WAAW,EACX,MAAM,GACP,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7G,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC5C,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA8C5C"}

package/runtime/hotkeys.js

@@ -1,6 +1,7 @@
 import { boundCombos, hotkeyCommand } from '../records.js';
 import { ifMissing } from '../utils/paths.js';
 import { messageOf } from '../utils/text.js';
+import { cmodPluginName } from './dependencies.js';
 export async function readCombos(claude, configRoot) {
     if (configRoot === undefined)
         return new Map();
@@ -14,6 +15,12 @@ export async function readCombos(claude, configRoot) {
     }
 }
 export async function createHotkeys({ name, declared, configRoot, claude, router, answerInput, report, }) {
+    if (name === cmodPluginName) {
+        router.add('command.describe', async (e, next) => {
+            const described = await next(e);
+            return e.command.startsWith(hotkeyCommand(e.provider.plugin, '')) ? { ...described, isHidden: true } : described;
+        });
+    }
     const entries = Object.entries(declared);
     if (entries.length === 0)
         return {};
@@ -24,10 +31,6 @@ export async function createHotkeys({ name, declared, configRoot, claude, router
         listeners.set(hotkey, new Set());
         claude.command.register({ name: hotkeyCommand(name, hotkey), description: title, immediate: true }).then(({ command }) => void commands.set(command, hotkey), (error) => report({ id: `hotkey:${hotkey}`, message: `The ${title} hotkey is not added`, error }));
     }
-    router.add('command.describe', async (e, next) => {
-        const described = await next(e);
-        return commands.has(e.command) ? { ...described, isHidden: true } : described;
-    });
     router.add('command.run', async (e, next) => {
         const hotkey = commands.get(e.command);
         if (hotkey === undefined)