@cmodjs/core 1.0.0 → 1.5.0

package/session/conversation.js

@@ -11,19 +11,38 @@ export const searchLimit = 50;
 const agentTools = ['Agent', 'Task'];
 const asyncLaunch = 'Async agent launched';
 export function emptyConversation(session) {
-    return { session, context: 0, contextOpenedAt: '', agentCalls: [], endedCalls: {}, tasks: {} };
+    return { session, context: 0, contextOpenedAt: '', agentCalls: [], endedCalls: {}, tasks: {}, taskTurns: {} };
 }
 export function createConversation(start) {
     let { context, contextOpenedAt, turn, goal } = start;
     const agentCalls = new Set(start.agentCalls);
     const endedCalls = new Map(Object.entries(start.endedCalls));
     const tasks = new Map(Object.entries(start.tasks));
+    const taskTurns = new Map(Object.entries(start.taskTurns));
+    const endTaskTurn = (task, at) => {
+        const open = taskTurns.get(task);
+        if (open === undefined)
+            return [];
+        taskTurns.delete(task);
+        return open.closedAt === undefined ? [{ type: TurnEnd, turn: { ...open, closedAt: at } }] : [];
+    };
     const startContext = (at) => {
         context += 1;
         contextOpenedAt = at;
         return [{ type: ContextStart, context: { number: context, openedAt: at } }];
     };
     const endContext = (at) => (context === 0 ? [] : [{ type: ContextEnd, context: { number: context, openedAt: contextOpenedAt, closedAt: at } }]);
+    const compactTask = (task, at) => {
+        const owner = tasks.get(task);
+        if (owner === undefined)
+            return [];
+        const next = { ...owner, context: owner.context + 1, contextOpenedAt: at };
+        tasks.set(task, next);
+        return [
+            { type: ContextEnd, context: { number: owner.context, openedAt: owner.contextOpenedAt ?? owner.openedAt, closedAt: at, task } },
+            { type: ContextStart, context: { number: next.context, openedAt: at, task } },
+        ];
+    };
     const endTurn = (at) => {
         if (turn === undefined)
             return [];
@@ -31,19 +50,22 @@ export function createConversation(start) {
         turn = undefined;
         return [{ type: TurnEnd, turn: ended }];
     };
-    const endTask = (call, at) => {
-        const task = [...tasks.values()].find((each) => each.openedBy === call);
-        if (task === undefined) {
+    const endTask = (call, at, only) => {
+        const opened = [...tasks.values()].filter((each) => each.openedBy === call && (only === undefined || each.id === only));
+        if (opened.length === 0) {
             if (agentCalls.has(call))
                 endedCalls.set(call, at);
             return [];
         }
-        if (task.closedAt !== undefined)
-            return [];
-        const ended = { ...task, closedAt: at };
-        tasks.set(task.id, ended);
-        agentCalls.delete(call);
-        return [{ type: TaskEnd, task: ended }];
+        if (only === undefined)
+            agentCalls.delete(call);
+        return opened.flatMap((task) => {
+            if (task.closedAt !== undefined)
+                return [];
+            const ended = { ...task, closedAt: at };
+            tasks.set(task.id, ended);
+            return [...endTaskTurn(task.id, at), { type: TaskEnd, task: ended }];
+        });
     };
     const changeGoal = (text) => {
         goal = text;
@@ -56,28 +78,31 @@ export function createConversation(start) {
                 changes.push(...startContext(row.at));
             if (task === undefined && row.type === 'system' && row.name === 'turn_duration')
                 return [...changes, ...endTurn(row.at)];
-            if (task === undefined && row.type === 'system' && row.name === 'compact_boundary')
-                return [...changes, ...endContext(row.at), ...startContext(row.at)];
+            if (row.type === 'system' && row.name === 'compact_boundary')
+                return [...changes, ...(task === undefined ? [...endContext(row.at), ...startContext(row.at)] : compactTask(task, row.at))];
             const owner = task === undefined ? undefined : tasks.get(task);
+            const placedIn = owner?.context ?? context;
             for (const unplaced of messagesOf(row, task !== undefined)) {
-                if (task === undefined && unplaced.type === Prompt) {
-                    changes.push(...endTurn(row.at));
-                    const opened = { prompt: { ...unplaced, session: start.session, context, turn: unplaced.id }, context, openedAt: row.at };
-                    turn = opened;
+                if (unplaced.type === Prompt) {
+                    changes.push(...(task === undefined ? endTurn(row.at) : endTaskTurn(task, row.at)));
+                    const opened = { prompt: { ...unplaced, session: start.session, context: placedIn, turn: unplaced.id, ...(task === undefined ? {} : { task }) }, context: placedIn, openedAt: row.at, ...(owner?.closedAt === undefined ? {} : { closedAt: owner.closedAt }) };
+                    if (task === undefined)
+                        turn = opened;
+                    else
+                        taskTurns.set(task, opened);
                     changes.push({ type: TurnStart, turn: opened });
-                    if (goal === undefined)
+                    if (task === undefined && goal === undefined)
                         changes.push(...changeGoal(unplaced.text));
                 }
+                const open = task === undefined ? turn : taskTurns.get(task);
                 const placed = {
                     ...unplaced,
                     session: start.session,
-                    context: owner?.context ?? context,
-                    ...(task === undefined && turn !== undefined ? { turn: turn.prompt.id } : {}),
+                    context: placedIn,
+                    ...(open === undefined ? {} : { turn: open.prompt.id }),
                     ...(task === undefined ? {} : { task }),
                 };
                 changes.push({ type: Message, message: placed });
-                if (task !== undefined)
-                    continue;
                 if (placed.type === ToolCall && agentTools.includes(placed.name))
                     agentCalls.add(placed.callId);
                 if (placed.type === ToolResult && agentCalls.has(placed.callId) && !placed.text.startsWith(asyncLaunch))
@@ -85,7 +110,7 @@ export function createConversation(start) {
                 if (placed.type === Note && placed.from.type === Task) {
                     const call = tagOf(textOf(row.content), 'tool-use-id');
                     if (call !== undefined && agentCalls.has(call))
-                        changes.push(...endTask(call, row.at));
+                        changes.push(...endTask(call, row.at, tagOf(textOf(row.content), 'task-id')));
                 }
             }
             return changes;
@@ -98,13 +123,10 @@ export function createConversation(start) {
             agentCalls.add(data.openedBy);
             const changes = [{ type: TaskStart, task: started }];
             const endedAt = endedCalls.get(data.openedBy);
-            if (endedAt !== undefined) {
-                endedCalls.delete(data.openedBy);
-                changes.push(...endTask(data.openedBy, endedAt));
-            }
+            if (endedAt !== undefined)
+                changes.push(...endTask(data.openedBy, endedAt, data.id));
             return changes;
         },
-        endContext,
         startContext,
         changeGoal,
         get state() {
@@ -117,6 +139,7 @@ export function createConversation(start) {
                 agentCalls: [...agentCalls],
                 endedCalls: Object.fromEntries(endedCalls),
                 tasks: Object.fromEntries(tasks),
+                taskTurns: Object.fromEntries(taskTurns),
             };
         },
     };

package/session/goal/goal.d.ts

@@ -1,10 +1,11 @@
+import type { RecordPart } from '../session.js';
 import type { Task } from './task.js';
 export declare const GoalChange = "goalChange";
-export type Goal = {
+export type Goal = RecordPart & {
     readonly text: string;
+    tasks(): Promise<Task[]>;
     update(change: {
         readonly text: string;
     }): Promise<void>;
-    tasks(): Promise<Task[]>;
 };
 //# sourceMappingURL=goal.d.ts.map

package/session/goal/goal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"goal.d.ts","sourceRoot":"","sources":["../../src/session/goal/goal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC,eAAO,MAAM,UAAU,eAAe,CAAA;AAEtC,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACxD,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;CACzB,CAAA"}
+{"version":3,"file":"goal.d.ts","sourceRoot":"","sources":["../../src/session/goal/goal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAErC,eAAO,MAAM,UAAU,eAAe,CAAA;AAEtC,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACzD,CAAA"}

package/session/goal/task.d.ts

@@ -1,16 +1,16 @@
 import type { Message } from '../context/turn/message/message.js';
+import type { RecordPart, Session } from '../session.js';
 export declare const Task = "task";
 export declare const TaskStart = "taskStart";
 export declare const TaskEnd = "taskEnd";
-export type Task = {
+export type Task = RecordPart & {
     readonly id: string;
     readonly title: string;
-    readonly agentType: string;
-    readonly model?: string;
+    readonly owner: Session;
     readonly openedBy: string;
     readonly openedAt: string;
     readonly closedAt?: string;
-    messages(): Promise<Message[]>;
     tasks(): Promise<Task[]>;
+    messages(): Promise<Message[]>;
 };
 //# sourceMappingURL=task.d.ts.map

package/session/goal/task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/session/goal/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAEjE,eAAO,MAAM,IAAI,SAAS,CAAA;AAE1B,eAAO,MAAM,SAAS,cAAc,CAAA;AAEpC,eAAO,MAAM,OAAO,YAAY,CAAA;AAEhC,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9B,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;CACzB,CAAA"}
+{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/session/goal/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAExD,eAAO,MAAM,IAAI,SAAS,CAAA;AAE1B,eAAO,MAAM,SAAS,cAAc,CAAA;AAEpC,eAAO,MAAM,OAAO,YAAY,CAAA;AAEhC,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxB,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CAC/B,CAAA"}

package/session/session.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable } from '../mod.js';
+import type { Disposable } from '../utils/disposable.js';
 import type { Matcher } from '../utils/matcher.js';
 import type { Context, ContextEnd, ContextStart } from './context/context.js';
 import type { Document } from './context/turn/message/document.js';
@@ -15,7 +15,8 @@ import type { Turn, TurnEnd, TurnStart } from './context/turn/turn.js';
 import type { Goal, GoalChange } from './goal/goal.js';
 import type { Task, TaskEnd, TaskStart } from './goal/task.js';
 export declare const Session = "session";
-export type SessionEvent = typeof Message | MessageType | typeof ContextStart | typeof ContextEnd | typeof TurnStart | typeof TurnEnd | typeof TaskStart | typeof TaskEnd | typeof GoalChange;
+export declare const UsageChange = "usageChange";
+export type SessionEvent = typeof Message | MessageType | typeof ContextStart | typeof ContextEnd | typeof TurnStart | typeof TurnEnd | typeof TaskStart | typeof TaskEnd | typeof GoalChange | typeof UsageChange;
 export type SessionPayload = {
     readonly message: Message;
     readonly prompt: Prompt;
@@ -33,19 +34,73 @@ export type SessionPayload = {
     readonly taskStart: Task;
     readonly taskEnd: Task;
     readonly goalChange: Goal;
+    readonly usageChange: Usage;
 };
+export type Refusal = {
+    readonly refuse: string;
+};
+export type BeforeAnswer = {
+    readonly prompt: {
+        readonly text: string;
+    } | Refusal;
+    readonly note: {
+        readonly text: string;
+    };
+    readonly skill: {
+        readonly text: string;
+    };
+    readonly document: {
+        readonly text: string;
+    } | Refusal;
+    readonly reply: {
+        readonly text: string;
+    };
+    readonly toolCall: {
+        readonly input: Readonly<Record<string, unknown>>;
+    } | {
+        readonly result: string;
+    } | Refusal;
+    readonly toolResult: {
+        readonly text: string;
+    };
+    readonly notice: {
+        readonly text: string;
+    };
+    readonly taskStart: {
+        readonly owner: {
+            readonly model: string;
+        };
+    } | Refusal;
+    readonly taskEnd: Refusal;
+    readonly turnEnd: Refusal;
+    readonly contextEnd: Refusal;
+};
+export type BeforeEvent = keyof BeforeAnswer;
 export type Usage = {
     readonly model: string;
     readonly context: {
         readonly tokens?: number;
-        readonly window: number;
+        readonly window?: number;
         readonly percent?: number;
     };
     readonly cost?: {
         readonly usd: number;
     };
 };
+export type Client = 'terminal' | 'desktop' | 'mobile' | 'vscode';
 export type Listener<Event extends SessionEvent> = (payload: SessionPayload[Event]) => unknown;
+export type BeforeListener<Event extends BeforeEvent> = (payload: SessionPayload[Event]) => BeforeAnswer[Event] | void | Promise<BeforeAnswer[Event] | void>;
+export type SearchOptions = {
+    readonly limit?: number;
+    readonly before?: Pick<Message, 'session' | 'id'>;
+};
+export type RecordPart = {
+    search(text: string, options?: SearchOptions): Promise<Message[]>;
+    on<Event extends SessionEvent>(event: Event, listener: Listener<Event>): Disposable;
+    on<Event extends SessionEvent>(event: Event, matcher: Matcher<SessionPayload[Event]>, listener: Listener<Event>): Disposable;
+    before<Event extends BeforeEvent>(event: Event, listener: BeforeListener<Event>): Disposable;
+    before<Event extends BeforeEvent>(event: Event, matcher: Matcher<SessionPayload[Event]>, listener: BeforeListener<Event>): Disposable;
+};
 export type SessionSend = {
     readonly type: typeof Prompt | typeof Note;
     readonly text: string;
@@ -58,42 +113,46 @@ export type TaskStartArgs = {
     readonly name?: string;
     readonly cwd?: string;
 };
-export type Session = {
+export type ToolCallArgs = {
+    readonly name: string;
+    readonly input: Readonly<Record<string, unknown>>;
+};
+export type Session = RecordPart & {
     readonly id: string;
     readonly title: string;
     readonly project: string;
-    readonly cwd: string;
+    readonly agentType?: string;
     readonly model: string;
+    readonly cwd: string;
+    readonly isRunning: boolean;
     readonly startedAt: string;
     readonly lastAt: string;
     readonly forkedFrom?: string;
-    readonly isRunning: boolean;
-    usage(): Promise<Usage>;
-    on<Event extends SessionEvent>(event: Event, listener: Listener<Event>): Disposable;
-    on<Event extends SessionEvent>(event: Event, matcher: Matcher<SessionPayload[Event]>, listener: Listener<Event>): Disposable;
-    send(message: SessionSend): Promise<void>;
-    startTask(task: TaskStartArgs): Promise<Task>;
+    goal(): Promise<Goal>;
+    context(): Promise<Context>;
+    contexts(): Promise<Context[]>;
+    turn(): Promise<Turn | undefined>;
+    turns(options?: {
+        readonly last?: number;
+    }): Promise<Turn[]>;
     messages(options?: {
         readonly after?: string;
         readonly last?: number;
     }): Promise<Message[]>;
-    turns(options?: {
-        readonly last?: number;
-    }): Promise<Turn[]>;
-    contexts(): Promise<Context[]>;
-    goal(): Promise<Goal>;
+    send(message: SessionSend): Promise<void>;
+    startTask(task: TaskStartArgs): Promise<Task>;
+    callTool(call: ToolCallArgs): Promise<ToolResult>;
+    usage(): Promise<Usage>;
+    clients(): Promise<Client[]>;
 };
 export type SessionScope = {
     readonly running?: boolean;
     readonly since?: string;
     readonly everyProject?: boolean;
 };
-export type Sessions = {
+export type Sessions = Omit<RecordPart, 'search'> & {
     readonly current: Session;
     list(options?: SessionScope): Promise<Session[]>;
-    search(text: string, options?: SessionScope & {
-        readonly limit?: number;
-        readonly before?: Pick<Message, 'session' | 'id'>;
-    }): Promise<Message[]>;
+    search(text: string, options?: SessionScope & SearchOptions): Promise<Message[]>;
 };
 //# sourceMappingURL=session.d.ts.map

package/session/session.d.ts.map

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

package/session/session.js

@@ -1 +1,2 @@
 export const Session = 'session';
+export const UsageChange = 'usageChange';

package/src/jobs/program.ts

@@ -28,7 +28,12 @@ export function program(options: { readonly command: readonly string[]; readonly
     const stop = (reason: string) => {
       state = 'fatal'
       failure = new Error(`${mod.name}: the ${executable} program stopped: ${reason}`)
-      report({ id: `program:${executable}`, message: `The ${executable} program stopped`, description: reason })
+      const retry = () => {
+        exits = 0
+        failure = undefined
+        void start()
+      }
+      report({ id: `program:${executable}`, message: `The ${executable} program stopped`, description: reason, retry })
       for (const waiter of waiting.splice(0)) waiter.reject(failure)
     }
 
@@ -66,7 +71,7 @@ export function program(options: { readonly command: readonly string[]; readonly
       exits += 1
       const wait = backoffSeconds[exits - 1]
       if (wait === undefined) {
-        stop(`it did not start again after ${backoffSeconds.length} tries: ${lastError === '' ? 'no standard error' : lastError}. Fix it, then run /reload-plugins.`)
+        stop(`it did not start again after ${backoffSeconds.length} tries: ${lastError === '' ? 'no standard error' : lastError}.`)
         return
       }
       state = 'backoff'

package/src/mod.ts

@@ -2,6 +2,7 @@ import type {
   AskOptions,
   ClassicHookInputs,
   CmodDependencies,
+  ConfigRow,
   FsStatOptions,
   HookStream,
   HttpInit,
@@ -28,11 +29,10 @@ import { Mod as modSender } from './session/context/turn/message/sender.js'
 import type { Sessions } from './session/session.js'
 import type { Pane } from './ui/define-pane.js'
 import type { Place, PlaceProps } from './ui/places.js'
+import type { Disposable } from './utils/disposable.js'
 import type { Matcher } from './utils/matcher.js'
 
-export type Disposable = {
-  dispose(): void
-}
+export type { Disposable }
 
 export type ToastId = string | number
 
@@ -63,6 +63,8 @@ export type PaneHandle = {
   close(): Promise<void>
   toggle(options?: Readonly<Pick<PaneOpenArgs, 'focus'>>): Promise<void>
   readonly isOpen: boolean
+  readonly isShown: boolean
+  readonly isFocused: boolean
 }
 
 export const SessionStart = 'SessionStart'
@@ -83,26 +85,56 @@ export const Stop = 'Stop'
 export const StopFailure = 'StopFailure'
 export const CwdChanged = 'CwdChanged'
 export const FileChanged = 'FileChanged'
+export const UserPromptExpansion = 'UserPromptExpansion'
+export const Setup = 'Setup'
+export const ConfigChange = 'ConfigChange'
+export const DirectoryAdded = 'DirectoryAdded'
+export const PreModelSwitch = 'PreModelSwitch'
+export const PostModelSwitch = 'PostModelSwitch'
+export const PostCompact = 'PostCompact'
+export const MessageDisplay = 'MessageDisplay'
+export const TodoCreated = 'TaskCreated'
+export const TodoCompleted = 'TaskCompleted'
+export const TeammateIdle = 'TeammateIdle'
+export const Elicitation = 'Elicitation'
+export const ElicitationResult = 'ElicitationResult'
+export const WorktreeCreate = 'WorktreeCreate'
+export const WorktreeRemove = 'WorktreeRemove'
 
 export const hooks = [
+  Setup,
   SessionStart,
   SessionEnd,
   UserPromptSubmit,
+  UserPromptExpansion,
   InstructionsLoaded,
+  ConfigChange,
+  DirectoryAdded,
+  PreModelSwitch,
+  PostModelSwitch,
   PreToolUse,
   PermissionRequest,
   PermissionDenied,
   PostToolUse,
   PostToolUseFailure,
   PostToolBatch,
+  MessageDisplay,
   SubagentStart,
   SubagentStop,
+  TodoCreated,
+  TodoCompleted,
+  TeammateIdle,
+  Elicitation,
+  ElicitationResult,
   Notification,
   PreCompact,
+  PostCompact,
   Stop,
   StopFailure,
   CwdChanged,
   FileChanged,
+  WorktreeCreate,
+  WorktreeRemove,
 ] as const
 
 export type Hook = (typeof hooks)[number]
@@ -129,6 +161,8 @@ export type HookAnswer = {
     updatedToolOutput?: unknown
     updatedMCPToolOutput?: unknown
     retry?: boolean
+    displayContent?: string
+    worktreePath?: string
   }
 }
 
@@ -203,9 +237,15 @@ export type SettingsFile = {
   update(values: Readonly<Record<string, unknown>>): Promise<void>
 }
 
+export type Setting = Pick<ConfigRow, 'key' | 'label' | 'kind' | 'value' | 'isLocked'> & {
+  readonly description?: string
+  readonly options?: readonly string[]
+  readonly plugin?: string
+}
+
 export type Imports = {
   readonly sessions: Sessions
-  readonly settings: { readonly user: SettingsFile; readonly project: SettingsFile; readonly local: SettingsFile }
+  readonly settings: { list(): Promise<Setting[]>; readonly user: SettingsFile; readonly project: SettingsFile; readonly local: SettingsFile }
   readonly model: { complete(request: ModelCompleteRequest, options?: ModelCompleteOptions): Promise<ModelCompleteResult> }
   readonly fs: {
     read(path: string): Promise<string>
@@ -232,9 +272,12 @@ export const sessions: Imports['sessions'] = {
   },
   list: (options) => bound().sessions.list(options),
   search: (text, options) => bound().sessions.search(text, options),
+  on: ((...args: Parameters<Imports['sessions']['on']>) => bound().sessions.on(...args)) as Imports['sessions']['on'],
+  before: ((...args: Parameters<Imports['sessions']['before']>) => bound().sessions.before(...args)) as Imports['sessions']['before'],
 }
 
 export const settings: Imports['settings'] = {
+  list: () => bound().settings.list(),
   user: { read: () => bound().settings.user.read(), update: (values) => bound().settings.user.update(values) },
   project: { read: () => bound().settings.project.read(), update: (values) => bound().settings.project.update(values) },
   local: { read: () => bound().settings.local.read(), update: (values) => bound().settings.local.update(values) },
@@ -335,7 +378,7 @@ export function defineMod<State extends StateGroups = Record<never, never>, Name
 export type { Matcher } from './utils/matcher.js'
 export type { Place, PlaceProps } from './ui/places.js'
 export { AbovePrompt, AskUserQuestion, CommandOutput, PromptHint, SessionMode, Spinner, ToolGroup, ToolProgress, TurnDuration } from './ui/places.js'
-export { Session, type SessionEvent, type SessionPayload, type SessionScope, type SessionSend, type Sessions, type TaskStartArgs, type Usage } from './session/session.js'
+export { Session, UsageChange, type BeforeAnswer, type BeforeEvent, type BeforeListener, type Client, type Listener, type RecordPart, type Refusal, type SearchOptions, type SessionEvent, type SessionPayload, type SessionScope, type SessionSend, type Sessions, type TaskStartArgs, type ToolCallArgs, type Usage } from './session/session.js'
 export { ContextEnd, ContextStart, type Context } from './session/context/context.js'
 export { TurnEnd, TurnStart, type Turn } from './session/context/turn/turn.js'
 export { Message, type MessageType } from './session/context/turn/message/message.js'

package/src/records.ts

@@ -42,6 +42,7 @@ export type RunnerEvent =
   | { type: 'needs-consent'; sha256: string; install: string; uninstall: string; keys: string; permissions: readonly string[] }
   | { type: 'done'; name: string; version?: string }
   | { type: 'missing'; name: string }
+  | { type: 'retries'; when: 'changed' | 'later' }
   | { type: 'failed'; code: number; message: string }
 
 export const pluginName = /^[A-Za-z0-9][A-Za-z0-9._-]*$/
@@ -249,7 +250,7 @@ function readKeys(keys: unknown): Steps {
   return { keys: commands }
 }
 
-export const coreVersion = '1.0.0'
+export const coreVersion = '1.5.0'
 
 export function oldestCmodFor(steps: Steps): string {
   if (steps.permissions?.some((item) => item === 'tasks' || item.startsWith('config:')) === true) return '1.0.0'
@@ -328,6 +329,8 @@ export function formatEvent(event: RunnerEvent): string {
       return `missing ${event.name}`
     case 'failed':
       return `failed ${event.code}\t${event.message.replace(/\s*\n\s*/g, ' ')}`
+    case 'retries':
+      return `retries ${event.when}`
   }
 }
 
@@ -345,6 +348,8 @@ export function parseEvent(line: string): RunnerEvent {
   if (missing !== null) return { type: 'missing', name: missing[1] as string }
   const failed = /^failed (-?\d+)(?:\t(.*))?$/.exec(line)
   if (failed !== null) return { type: 'failed', code: Number(failed[1]), message: failed[2] ?? '' }
+  const retries = /^retries (changed|later)$/.exec(line)
+  if (retries !== null) return { type: 'retries', when: retries[1] as 'changed' | 'later' }
   return { type: 'log', text: line.replace(/^log /, '') }
 }
 

package/src/register.ts

@@ -30,6 +30,7 @@ async function startMod($: EngineInterface, eventInput: Frozen<Args<'session.sta
       panes: () => $.ui.panes(),
       scroll: (args) => $.ui.scroll(args),
       copy: (args) => $.ui.copy(args),
+      focus: (args) => $.ui.focus(args),
       resolve: (render) => $.ui.resolve(render),
     },
     process: {
@@ -101,21 +102,36 @@ export function registerMod<State extends object, Declared extends Options>(addH
   registered = definition as ModDefinition<object>
   lifecycle = createLifecycle(definition, () => checksPermissions, options)
   addHook('session.start', startMod)
+  addHook('classic.Setup', routeToMod)
   addHook('classic.SessionStart', routeToMod)
   addHook('classic.SessionEnd', routeToMod)
   addHook('classic.UserPromptSubmit', routeToMod)
+  addHook('classic.UserPromptExpansion', routeToMod)
   addHook('classic.InstructionsLoaded', routeToMod)
+  addHook('classic.ConfigChange', routeToMod)
+  addHook('classic.DirectoryAdded', routeToMod)
+  addHook('classic.PreModelSwitch', routeToMod)
+  addHook('classic.PostModelSwitch', routeToMod)
   addHook('classic.PermissionDenied', routeToMod)
   addHook('classic.PostToolUse', routeToMod)
   addHook('classic.PostToolUseFailure', routeToMod)
   addHook('classic.PostToolBatch', routeToMod)
+  addHook('classic.MessageDisplay', routeToMod)
   addHook('classic.SubagentStart', routeToMod)
   addHook('classic.SubagentStop', routeToMod)
+  addHook('classic.TaskCreated', routeToMod)
+  addHook('classic.TaskCompleted', routeToMod)
+  addHook('classic.TeammateIdle', routeToMod)
+  addHook('classic.Elicitation', routeToMod)
+  addHook('classic.ElicitationResult', routeToMod)
   addHook('classic.Notification', routeToMod)
   addHook('classic.PreCompact', routeToMod)
+  addHook('classic.PostCompact', routeToMod)
   addHook('classic.Stop', routeToMod)
   addHook('classic.StopFailure', routeToMod)
   addHook('classic.FileChanged', routeToMod)
+  addHook('classic.WorktreeCreate', routeToMod)
+  addHook('classic.WorktreeRemove', routeToMod)
   addHook('tool.call', routeToMod)
   addHook('prompt.submit', routeToMod)
   addHook('prompt.context', routeToMod)
@@ -132,6 +148,7 @@ export function registerMod<State extends object, Declared extends Options>(addH
   addHook('session.compact', routeToMod)
   addHook('session.receive', routeToMod)
   addHook('agent.spawn', routeToMod)
+  addHook('prompt.attachment', routeToMod)
 }
 
 export function registerPermissionCheck(addHook: On): void {

package/src/runtime/announce.ts

@@ -27,9 +27,11 @@ export async function announcementOf(claude: Claude, plugin: Plugin, granted: Re
   const open = (page?: string) => () => claude.cmod.call({ to: cmodPluginName, method: 'openSettings', input: { mod: plugin.name, ...(page === undefined ? {} : { page }) } })
   if (previous === undefined) {
     const { program, keys } = plugin.steps
+    const rules = (await claude.fs.list(`${plugin.root}/rules`).catch(ifMissing([]))).filter((entry) => entry.kind === 'file' && entry.name.endsWith('.md')).map((entry) => entry.name.slice(0, -'.md'.length)).toSorted()
     const lines = [
       field('description'),
       added.length > 0 ? `Adds ${listed(added)}.` : undefined,
+      rules.length > 0 ? `Adds ${rules.length} ${rules.length === 1 ? 'rule' : 'rules'}: ${listed(rules)}.` : undefined,
       program === undefined ? undefined : `Installed the ${program} program.`,
       ...Object.entries(keys ?? {}).map(([key, command]) => `Binds ${key} to /${command}.`),
       ...[...granted].map((item) => `${permissionWords(item)}.`),