@cmodjs/core 0.2.3 → 1.0.0

package/jobs/permissions/find-project-scope.js

@@ -1,3 +1,4 @@
+import { ifMissing } from '../../utils/paths.js';
 import { basename, dirname, resolve } from '../../vendor.js';
 export async function findProjectScope(pluginRoot, home, fs) {
     const skills = dirname(pluginRoot);
@@ -32,20 +33,16 @@ export async function findProjectScope(pluginRoot, home, fs) {
 }
 async function readRepository(workTree, fs) {
     const gitPath = resolve(workTree, '.git');
-    const git = await fs.stat(gitPath).catch(() => undefined);
+    const git = await fs.stat(gitPath).catch(ifMissing(undefined));
     if (git === undefined)
         return undefined;
     if (git.kind === 'dir')
         return git.realPath ?? gitPath;
-    try {
-        const gitDirectory = /^gitdir:\s*(.+)$/m.exec(await fs.read(gitPath))?.[1]?.trim();
-        if (gitDirectory === undefined)
-            throw new Error(`${gitPath} has no gitdir line.`);
-        const linkedDirectory = resolve(workTree, gitDirectory);
-        const commonDirectory = await fs.read(resolve(linkedDirectory, 'commondir')).then((text) => resolve(linkedDirectory, text.trim()), () => linkedDirectory);
-        return (await fs.stat(commonDirectory)).realPath ?? commonDirectory;
-    }
-    catch {
+    const gitDirectory = /^gitdir:\s*(.+)$/m.exec(await fs.read(gitPath))?.[1]?.trim();
+    if (gitDirectory === undefined)
         return workTree;
-    }
+    const linkedDirectory = resolve(workTree, gitDirectory);
+    const commonDirectory = await fs.read(resolve(linkedDirectory, 'commondir')).then((text) => resolve(linkedDirectory, text.trim()), ifMissing(linkedDirectory));
+    const common = await fs.stat(commonDirectory).catch(ifMissing(undefined));
+    return common === undefined ? workTree : (common.realPath ?? commonDirectory);
 }

package/jobs/permissions/match-target.d.ts

@@ -1,4 +1,4 @@
-import { type CallBase, type CallEffects, type CommandCall, type FetchCall, type FileAccess, type FileCall, type ToolCall } from '../../utils/call-effects.js';
+import { type CallBase, type CallEffects, type CommandCall, type FetchCall, type FileAccess, type FileCall, type Call } from '../../utils/call-effects.js';
 import type { Workspace } from './find-project-scope.js';
 export type TargetCalls = {
     command: CommandCall;
@@ -14,7 +14,7 @@ export type Target = {
     [Key in TargetKey]: TargetOf<Key>;
 }[TargetKey];
 export type MatchedCall = {
-    call: ToolCall;
+    call: Call;
     access: FileAccess | undefined;
     folder: string;
 };

package/jobs/permissions/match-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"match-target.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/match-target.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAC1K,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,MAAM,WAAW,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAA;AACzI,MAAM,MAAM,SAAS,GAAG,MAAM,WAAW,CAAA;AACzC,MAAM,MAAM,QAAQ,CAAC,GAAG,SAAS,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9H,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC;CAAE,CAAC,SAAS,CAAC,CAAA;AACrE,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAI5F,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAWrG;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAkCpI;AA4BD,wBAAsB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI/H"}
+{"version":3,"file":"match-target.d.ts","sourceRoot":"","sources":["../../src/jobs/permissions/match-target.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,MAAM,6BAA6B,CAAA;AACtK,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,MAAM,WAAW,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAA;AACzI,MAAM,MAAM,SAAS,GAAG,MAAM,WAAW,CAAA;AACzC,MAAM,MAAM,QAAQ,CAAC,GAAG,SAAS,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;AAC9H,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC;CAAE,CAAC,SAAS,CAAC,CAAA;AACrE,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIxF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAWrG;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAkCpI;AA4BD,wBAAsB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI/H"}

package/jobs/permissions.d.ts

@@ -1,6 +1,6 @@
 import type { Job, Mod } from '../mod.js';
 import { type PermissionRules as RulesFor, type Rule as RuleFor } from './permissions/decide-permission.js';
-export type { CommandCall, FetchCall, FileCall, ToolCall } from '../utils/call-effects.js';
+export type { CommandCall, FetchCall, FileCall, Call } from '../utils/call-effects.js';
 export type { Target } from './permissions/match-target.js';
 export type Rule<State extends object = Record<never, never>> = RuleFor<Mod<State>>;
 export type PermissionRules<State extends object = Record<never, never>> = RulesFor<Mod<State>>;

package/jobs/permissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/jobs/permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAGzC,OAAO,EAAqC,KAAK,eAAe,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,OAAO,EAAgB,MAAM,oCAAoC,CAAA;AAK5J,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC1F,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACnF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AAI/F,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA6BrK"}
+{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/jobs/permissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIzC,OAAO,EAAqC,KAAK,eAAe,IAAI,QAAQ,EAAE,KAAK,IAAI,IAAI,OAAO,EAAgB,MAAM,oCAAoC,CAAA;AAK5J,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACtF,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACnF,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AAI/F,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA8BrK"}

package/jobs/permissions.js

@@ -1,14 +1,16 @@
+import { engineOf } from '../runtime/engine.js';
 import { inputOf } from '../utils/call-effects.js';
 import { decidePermission, stricterVerdict } from './permissions/decide-permission.js';
 import { targetOf } from './permissions/match-target.js';
 import { messageOf } from '../utils/text.js';
-import { modOf, workspaceReader } from './context.js';
+import { withinDeadline, workspaceReader } from './context.js';
 const deadline = { ms: 2000, job: 'permissions' };
 export function permissions(rules) {
     const count = typeof rules === 'function' ? undefined : checkedCount(rules);
     if (count === 0)
         throw new Error('permissions: give it a deny or an ask rule, or remove it from setup.');
     return (job) => {
+        const { router, toolCalls } = engineOf(job.mod);
         const readWorkspace = workspaceReader(job);
         const verdictOf = async (e) => {
             let current;
@@ -20,14 +22,14 @@ export function permissions(rules) {
                 return { decision: 'deny', reason: `The permission rules of ${job.mod.name} failed, so it denies the call: ${messageOf(error)}` };
             }
             try {
-                const [agent, workspace] = await Promise.all([job.toolCalls.agentOf(e.tool_use_id), readWorkspace()]);
-                return await decidePermission(current, { tool: e.tool, input: inputOf(e.input), ...agent }, workspace, (call, folder) => modOf(job, { call, folder }, workspace, deadline));
+                const [agent, workspace] = await Promise.all([toolCalls.agentOf(e.tool_use_id), readWorkspace()]);
+                return await decidePermission(current, { tool: e.tool, input: inputOf(e.input), ...agent }, workspace, job.mod, (run) => withinDeadline(job.mod, deadline, 'it', run));
             }
             catch (error) {
                 return { decision: 'deny', reason: `The permissions job could not read the session, so it denies the call: ${messageOf(error)}` };
             }
         };
-        job.mod.claude.on('tool.check', async (e, next) => {
+        router.add('tool.check', async (e, next) => {
             const [below, ours] = await Promise.all([next(e), verdictOf(e)]);
             return ours === undefined ? below : stricterVerdict(below, ours);
         });

package/jobs/program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/jobs/program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;IACxE,KAAK,IAAI,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACvD,CAAA;AAMD,wBAAgB,OAAO,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAAC,CA2ErI"}
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/jobs/program.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAKpC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;IACxE,KAAK,IAAI,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACvD,CAAA;AAMD,wBAAgB,OAAO,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAAC,CA8ErI"}

package/jobs/program.js

@@ -1,10 +1,11 @@
-import { PermissionRefused } from '../runtime/grants.js';
+import { PermissionRefused, programAddresses } from '../runtime/grants.js';
+import { engineOf } from '../runtime/engine.js';
 import { messageOf } from '../utils/text.js';
 const backoffSeconds = [1, 2, 4, 8, 16];
 export function program(options) {
     const { command, environment } = options;
     return ({ mod, announce }) => {
-        const { claude } = mod;
+        const { claude, report } = engineOf(mod);
         const [executable] = command;
         if (executable === undefined)
             throw new Error(`${mod.name}: the program has no command. Name the program on PATH and its arguments, such as ['preview-server', '--port', '0'].`);
@@ -13,10 +14,11 @@ export function program(options) {
         let failure;
         let exits = 0;
         const waiting = [];
+        const ownAddresses = programAddresses(mod);
         const stop = (reason) => {
             state = 'fatal';
             failure = new Error(`${mod.name}: the ${executable} program stopped: ${reason}`);
-            claude.ui.log(failure.message);
+            report({ id: `program:${executable}`, message: `The ${executable} program stopped`, description: reason });
             for (const waiter of waiting.splice(0))
                 waiter.reject(failure);
         };
@@ -44,6 +46,7 @@ export function program(options) {
                     }
                     state = 'running';
                     exits = 0;
+                    ownAddresses.add(address.socketPath ?? new URL(address.url).host);
                     for (const waiter of waiting.splice(0))
                         waiter.resolve(address);
                 }
@@ -53,6 +56,8 @@ export function program(options) {
                     return stop(`${messageOf(error)} Add it, then run /reload-plugins.`);
                 lastError = messageOf(error);
             }
+            if (address !== undefined)
+                ownAddresses.delete(address.socketPath ?? new URL(address.url).host);
             address = undefined;
             exits += 1;
             const wait = backoffSeconds[exits - 1];

package/jobs/prompt.d.ts

@@ -1,9 +1,11 @@
 import type { Job, Mod } from '../mod.js';
-import { type ToolCall } from '../utils/call-effects.js';
+import { type Call } from '../utils/call-effects.js';
 import { type Target } from './permissions/match-target.js';
 type PromptInput = {
     userPrompt?: string;
-    call?: ToolCall;
+    call?: Call & {
+        readonly folder: string;
+    };
 };
 type PromptOptions<State extends object> = {
     name: string;

package/jobs/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/jobs/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAc,GAAG,EAAE,MAAM,WAAW,CAAA;AAIrD,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAyB,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGlF,KAAK,WAAW,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAA;AAE3D,KAAK,aAAa,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACjD,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1B,CAAA;AAID,wBAAgB,MAAM,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoC/I"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../src/jobs/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAc,GAAG,EAAE,MAAM,WAAW,CAAA;AAKrD,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAyB,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGlF,KAAK,WAAW,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,GAAG;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAErF,KAAK,aAAa,CAAC,KAAK,SAAS,MAAM,IAAI;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACjD,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1B,CAAA;AAID,wBAAgB,MAAM,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoC/I"}

package/jobs/prompt.js

@@ -1,10 +1,10 @@
-import { longestMs } from '../runtime/deadline.js';
+import { engineOf } from '../runtime/engine.js';
 import { onStateChange } from '../runtime/state.js';
 import { listed, messageOf } from '../utils/text.js';
 import { callEffects } from '../utils/call-effects.js';
 import { matchTarget, targetOf } from './permissions/match-target.js';
-import { afterCall, modOf, modWithin, targetWords } from './context.js';
-const deadline = { ms: 5000, longestMs, job: 'prompt' };
+import { afterCall, inFolder, targetWords, withinDeadline } from './context.js';
+const deadline = { ms: 5000, job: 'prompt' };
 export function prompt({ name, prompt: text, when, after }) {
     if (name.trim() === '')
         throw new Error('prompt: give the block a name. Claude reads the text under it.');
@@ -15,10 +15,10 @@ export function prompt({ name, prompt: text, when, after }) {
         targetOf(target);
     return (job) => {
         job.reserveName('prompt', name, `prompt: ${job.mod.name} adds the name "${name}" two times. Give each prompt its own name.`);
-        const log = (reason) => job.mod.claude.ui.log(`prompt "${name}" added nothing: ${reason}`, { to: 'debug' });
-        const textFor = async (input, mod) => {
+        const log = (reason) => job.mod.log(`prompt "${name}" added nothing: ${reason}`);
+        const textFor = async (input) => {
             try {
-                const value = typeof text === 'string' ? text : await text(input, mod);
+                const value = typeof text === 'string' ? text : await withinDeadline(job.mod, deadline, `the ${name} prompt`, () => text(input, job.mod));
                 return value === '' ? undefined : value;
             }
             catch (error) {
@@ -26,12 +26,12 @@ export function prompt({ name, prompt: text, when, after }) {
                 return undefined;
             }
         };
-        const headedText = async (input, mod) => {
-            const value = await textFor(input, mod);
+        const headedText = async (input) => {
+            const value = await textFor(input);
             return value === undefined ? undefined : `# ${name}\n${value}`;
         };
         if (when !== undefined) {
-            addAfterUserPrompts(job, when, (userPrompt) => headedText({ userPrompt }, modWithin(job, deadline)), log);
+            addAfterUserPrompts(job, when, (userPrompt) => headedText({ userPrompt }), log);
             job.announce(`the ${name} prompt after matching user prompts`);
         }
         else if (targets.length > 0) {
@@ -39,23 +39,24 @@ export function prompt({ name, prompt: text, when, after }) {
             job.announce(`the ${name} prompt after ${listed(targets.map(targetWords))}`);
         }
         else {
-            addKeptCurrent(job, name, () => textFor({}, modWithin(job, deadline)), log);
+            addKeptCurrent(job, name, () => textFor({}), log);
             job.announce(`the ${name} prompt`);
         }
     };
 }
 function addKeptCurrent(job, name, textFor, log) {
+    const { claude, router } = engineOf(job.mod);
     let given;
     let hasStarted = false;
     let isQueued = false;
     let updates = Promise.resolve();
-    job.mod.claude.on('classic.SessionStart', (e, next) => {
+    router.add('classic.SessionStart', (e, next) => {
         hasStarted = e.source === 'resume' || e.source === 'compact';
         if (!hasStarted)
             given = undefined;
         return next(e);
     });
-    job.mod.claude.on('prompt.context', async (e, next) => {
+    router.add('prompt.context', async (e, next) => {
         const below = await next(e);
         hasStarted = true;
         if (below.blocks.some((block) => block.name === name)) {
@@ -73,7 +74,7 @@ function addKeptCurrent(job, name, textFor, log) {
         if (value === undefined || value === given)
             return;
         given = value;
-        await job.mod.claude.session.append({ message: { type: 'user', content: [{ type: 'text', text: `# ${name}\n${value}` }] } }).then((added) => {
+        await claude.session.append({ message: { type: 'user', content: [{ type: 'text', text: `# ${name}\n${value}` }] } }).then((added) => {
             if (added.deny !== undefined)
                 log(`Claude Code refused the new text: ${added.deny}`);
         });
@@ -86,7 +87,7 @@ function addKeptCurrent(job, name, textFor, log) {
     });
 }
 function addAfterUserPrompts(job, when, textFor, log) {
-    job.mod.claude.on('prompt.submit', async (e, next) => {
+    engineOf(job.mod).router.add('prompt.submit', async (e, next) => {
         let value;
         try {
             if (typeof when === 'function' ? when(e.text) : e.text.search(when) >= 0)
@@ -105,7 +106,7 @@ function addAfterCalls(job, targets, textFor, log) {
             const [matched] = await matchTarget(target, use, effects, workspace);
             if (matched === undefined)
                 continue;
-            const value = await textFor({ call: matched.call }, modOf(job, matched, workspace, deadline));
+            const value = await textFor({ call: await inFolder(matched.call, matched.folder, workspace) });
             return value === undefined ? [] : [value];
         }
         return [];

package/jobs/schedule.d.ts

@@ -1,7 +1,7 @@
 import type { Job } from '../mod.js';
-export type Schedule = {
+export type ScheduledPrompt = {
     readonly cron: string;
     readonly prompt: string;
 };
-export declare function schedule<State extends object = Record<never, never>>(entry: Schedule | ((state: State) => Schedule | undefined)): Job<void, State>;
+export declare function schedule<State extends object = Record<never, never>>(entry: ScheduledPrompt | ((state: State) => ScheduledPrompt | undefined)): Job<void, State>;
 //# sourceMappingURL=schedule.d.ts.map

package/jobs/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/jobs/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIzE,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,QAAQ,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoDlJ"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../src/jobs/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIpC,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAIhF,wBAAgB,QAAQ,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,eAAe,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAoDhK"}

package/jobs/schedule.js

@@ -1,20 +1,20 @@
 import { onStateChange } from '../runtime/state.js';
-import { messageOf } from '../utils/text.js';
+import { engineOf } from '../runtime/engine.js';
 const scheduleCounts = new WeakMap();
 export function schedule(entry) {
     if (typeof entry !== 'function')
         checked(entry);
     return (job) => {
         const { mod } = job;
-        const { claude } = mod;
+        const { claude, report: reportFailure } = engineOf(mod);
         const order = scheduleCounts.get(mod) ?? 0;
         scheduleCounts.set(mod, order + 1);
         const storeKey = `cmod:schedule:${order}`;
-        const log = (reason) => claude.ui.log(`${mod.name}: the schedule ${reason}`);
+        const report = (message, error) => reportFailure({ id: storeKey, message: `The schedule ${message}`, error });
         let current;
         let isQueued = false;
         const remove = async (id) => {
-            await claude.tool.call({ tool: 'CronDelete', id }).catch(() => undefined);
+            await claude.tool.call({ tool: 'CronDelete', id }).catch((error) => report(`could not delete its last cron ${id}`, error));
             await claude.store.delete(storeKey);
         };
         const update = async () => {
@@ -26,7 +26,7 @@ export function schedule(entry) {
                     checked(next);
             }
             catch (error) {
-                log(`kept its last cron: ${messageOf(error)}`);
+                report('kept its last cron', error);
                 return;
             }
             const wanted = next === undefined ? undefined : JSON.stringify([next.cron, next.prompt]);
@@ -39,9 +39,9 @@ export function schedule(entry) {
                 return;
             const answer = await claude.tool.call({ tool: 'CronCreate', cron: next.cron, prompt: next.prompt, recurring: true });
             if (answer.deny !== undefined)
-                return log(`was refused: ${answer.deny}`);
+                return report('was refused', answer.deny);
             if (answer.isError === true)
-                return log(`failed: ${answer.text ?? 'CronCreate answered an error'}`);
+                return report('failed', answer.text ?? 'CronCreate answered an error');
             current = { id: answer.result.id, wanted: wanted };
             await claude.store.set(storeKey, current.id);
         };
@@ -49,12 +49,12 @@ export function schedule(entry) {
             .get(storeKey)
             .then((left) => (typeof left === 'string' ? remove(left) : undefined))
             .then(update)
-            .catch((error) => log(`failed: ${messageOf(error)}`));
+            .catch((error) => report('failed', error));
         onStateChange(mod.state, () => {
             if (isQueued)
                 return;
             isQueued = true;
-            updates = updates.then(update).catch((error) => log(`failed: ${messageOf(error)}`));
+            updates = updates.then(update).catch((error) => report('failed', error));
         });
         job.announce(typeof entry === 'function' ? 'a schedule from its state' : `a schedule at ${entry.cron}`);
     };

package/jobs/slash-command.d.ts

@@ -1,5 +1,5 @@
-import type { Job, Mod } from '../mod.js';
-export type Reply = string | {
+import type { Disposable, Job, Mod } from '../mod.js';
+export type CommandReply = string | {
     text?: string;
     context?: string;
 } | undefined;
@@ -11,6 +11,6 @@ export declare function slashCommand<State extends object = Record<never, never>
     readonly reply: (input: {
         args: string;
         positionals: string[];
-    }, mod: Mod<State>) => Reply | void | Promise<Reply | void>;
-}): Job<void, State>;
+    }, mod: Mod<State>) => CommandReply | void | Promise<CommandReply | void>;
+}): Job<Disposable, State>;
 //# sourceMappingURL=slash-command.d.ts.map

package/jobs/slash-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slash-command.d.ts","sourceRoot":"","sources":["../src/jobs/slash-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAMzC,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAA;AAM5E,wBAAgB,YAAY,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IACjF,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,GAAG,IAAI,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAA;CAC1H,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA6BnB"}
+{"version":3,"file":"slash-command.d.ts","sourceRoot":"","sources":["../src/jobs/slash-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAOrD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAA;AAMnF,wBAAgB,YAAY,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IACjF,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;CACxI,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAkCzB"}

package/jobs/slash-command.js

@@ -1,35 +1,40 @@
 import { parse } from '../vendor.js';
-import { longestMs } from '../runtime/deadline.js';
+import { engineOf } from '../runtime/engine.js';
 import { messageOf } from '../utils/text.js';
-import { modWithin } from './context.js';
-const deadline = { ms: 30000, longestMs, job: 'slashCommand' };
+import { withinDeadline } from './context.js';
+const deadline = { ms: 30000, job: 'slashCommand' };
 const commandName = /^[A-Za-z0-9_-]{1,64}$/;
 export function slashCommand(options) {
     const { name, description, argumentHint, immediate, reply } = options;
     return (job) => {
         const { mod, announce, reserveName } = job;
-        const { claude } = mod;
+        const { claude, router, report } = engineOf(mod);
         if (!commandName.test(name))
             throw new Error(`${mod.name}: "${name}" is not a slash command name. Use 1 to 64 letters, digits, "_", or "-", without the slash.`);
-        reserveName('slashCommand', name, `${mod.name}: the slash command /${name} is already added. Give each slashCommand its own name.`);
+        const reserved = reserveName('slashCommand', name, `${mod.name}: the slash command /${name} is already added. Give each slashCommand its own name.`);
         let registered;
         claude.command.register({ name, description, ...(argumentHint === undefined ? {} : { argumentHint }), ...(immediate === undefined ? {} : { immediate }) }).then(({ command }) => {
             registered = command;
         }, (error) => {
-            claude.ui.log(`${mod.name}: /${name} is not added: ${oneLine(error)}`);
+            report({ id: `command:${name}`, message: `/${name} is not added`, error });
         });
         announce(`/${name}`);
-        const replyMod = modWithin(job, deadline);
-        claude.on('command.run', async (e, next) => {
+        const answering = router.add('command.run', async (e, next) => {
             if (e.command !== registered)
                 return next(e);
             try {
-                return answerOf(await reply({ args: e.args, positionals: splitWords(e.args) }, replyMod));
+                return answerOf(await withinDeadline(mod, deadline, `/${name}`, () => reply({ args: e.args, positionals: splitWords(e.args) }, mod)));
             }
             catch (error) {
                 return { text: `/${name} failed: ${oneLine(error)}` };
             }
         });
+        return {
+            dispose() {
+                answering.dispose();
+                reserved.dispose();
+            },
+        };
     };
 }
 function answerOf(reply) {

package/jobs/status-line.d.ts

@@ -1,15 +1,5 @@
 import type { Job, Mod } from '../mod.js';
-export type Usage = {
-    model: string;
-    context: {
-        tokens?: number;
-        window: number;
-        percent?: number;
-    };
-    cost?: {
-        usd: number;
-    };
-};
+import type { Usage } from '../session/session.js';
 export declare function statusLine<State extends object = Record<never, never>>(options: {
     readonly text: (usage: Usage, mod: Mod<State>) => string | undefined | Promise<string | undefined>;
     readonly interval?: number;

package/jobs/status-line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status-line.d.ts","sourceRoot":"","sources":["../src/jobs/status-line.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAKzC,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC9D,IAAI,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CACvB,CAAA;AAID,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IAC/E,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAClG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAC3B,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CA0CnB"}
+{"version":3,"file":"status-line.d.ts","sourceRoot":"","sources":["../src/jobs/status-line.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAIzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAMlD,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IAC/E,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAClG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAC3B,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAiCnB"}

package/jobs/status-line.js

@@ -1,40 +1,36 @@
+import { engineOf } from '../runtime/engine.js';
+import { usageOf } from '../runtime/sessions.js';
 import { messageOf } from '../utils/text.js';
-import { modWithin } from './context.js';
+import { withinDeadline } from './context.js';
 const deadline = { ms: 2000, job: 'statusLine' };
 export function statusLine(options) {
     const { text, interval = 10000 } = options;
     return (job) => {
         const { mod, announce, reserveName } = job;
-        const { claude } = mod;
+        const { claude, router } = engineOf(mod);
         if (!(interval >= 1))
             throw new Error(`${mod.name}: the status line interval is ${interval}. Give it in milliseconds, 1 or more.`);
         reserveName('statusLine', '', `${mod.name}: a status line is already added. A mod has one status line: join the texts in one statusLine.`);
-        const textMod = modWithin(job, deadline);
         let shown;
         let queue = Promise.resolve();
         const update = async () => {
             try {
-                const [model, usage] = await Promise.all([claude.session.model(), claude.session.usage()]);
-                const { tokens, window, percent } = usage.context;
-                const next = await text({
-                    model,
-                    context: { window, ...(tokens === undefined ? {} : { tokens }), ...(percent === undefined ? {} : { percent }) },
-                    ...(usage.cost === undefined ? {} : { cost: { usd: usage.cost.usd } }),
-                }, textMod);
+                const usage = await usageOf(claude);
+                const next = await withinDeadline(mod, deadline, 'the status line', () => text(usage, mod));
                 if (next === shown)
                     return;
                 shown = next;
                 claude.ui.status(next);
             }
             catch (error) {
-                claude.ui.log(`${mod.name}: the status line kept its last text: ${messageOf(error)}`, { to: 'debug' });
+                mod.log(`the status line kept its last text: ${messageOf(error)}`);
             }
         };
         const refresh = () => {
             queue = queue.then(update);
         };
         announce('a status line');
-        claude.on('session.measure', (e, next) => {
+        router.add('session.measure', (e, next) => {
             refresh();
             return next(e);
         });

package/jobs/tool.d.ts

@@ -1,5 +1,5 @@
 import type { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import type { Job, Mod } from '../mod.js';
+import type { Disposable, Job, Mod } from '../mod.js';
 export declare function tool<const Schema extends object = {
     type: 'object';
 }, State extends object = Record<never, never>>(options: {
@@ -7,7 +7,7 @@ export declare function tool<const Schema extends object = {
     readonly description: string;
     readonly inputSchema?: Schema;
     readonly execute: (input: Schema extends JSONSchema ? FromSchema<Schema> : never, mod: Mod<State>) => unknown;
-}): Job<{
+}): Job<Disposable & {
     readonly name: string;
 }, State>;
 //# sourceMappingURL=tool.d.ts.map

package/jobs/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/jobs/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AASzC,wBAAgB,IAAI,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,EAAE,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IAC3H,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,SAAS,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,OAAO,CAAA;CAC9G,GAAG,GAAG,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,CAAC,CAqCxC"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/jobs/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AAUrD,wBAAgB,IAAI,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,EAAE,KAAK,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE;IAC3H,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,SAAS,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,OAAO,CAAA;CAC9G,GAAG,GAAG,CAAC,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,CAAC,CA0CrD"}

package/jobs/tool.js

@@ -1,31 +1,31 @@
 import { Validator } from '../vendor.js';
 import { toolDeadline } from '../runtime/deadline.js';
+import { engineOf } from '../runtime/engine.js';
 import { reservedKeys, toolInputOf } from '../runtime/tool-calls.js';
 import { messageOf } from '../utils/text.js';
-import { modWithin } from './context.js';
+import { withinDeadline } from './context.js';
 const toolName = /^[A-Za-z0-9_-]{1,64}$/;
 export function tool(options) {
     const { name, description, inputSchema, execute } = options;
     return (job) => {
         const { mod, announce, reserveName } = job;
-        const { claude } = mod;
+        const { claude, router, report } = engineOf(mod);
         if (!toolName.test(name))
             throw new Error(`${mod.name}: "${name}" is not a tool name. Use 1 to 64 letters, digits, "_", or "-".`);
         const properties = inputSchema?.properties ?? {};
         const reserved = reservedKeys.filter((key) => Object.hasOwn(properties, key));
         if (reserved.length > 0)
             throw new Error(`${mod.name}: the ${name} tool's inputSchema has the property ${reserved.join(', ')}, which Claude Code keeps for itself. Rename it.`);
-        reserveName('tool', name, `${mod.name}: the tool ${name} is already added. Give each tool its own name.`);
-        const validator = new Validator((inputSchema ?? { type: 'object' }), '2020-12', false);
+        const named = reserveName('tool', name, `${mod.name}: the tool ${name} is already added. Give each tool its own name.`);
+        const validator = new Validator(inputSchema ?? { type: 'object' }, '2020-12', false);
         let registered;
         claude.tool.register({ name, description, ...(inputSchema === undefined ? {} : { inputSchema: inputSchema }) }).then((answer) => {
             registered = answer.tool;
         }, (error) => {
-            claude.ui.log(`${mod.name}: the ${name} tool is not added: ${messageOf(error)}`);
+            report({ id: `tool:${name}`, message: `The ${name} tool is not added`, error });
         });
         announce(`the ${name} tool`);
-        const executeMod = modWithin(job, toolDeadline);
-        claude.on('tool.call', async (e, next) => {
+        const answering = router.add('tool.call', async (e, next) => {
             if (e.tool !== registered)
                 return next(e);
             const input = toolInputOf(e);
@@ -33,13 +33,19 @@ export function tool(options) {
             if (!valid)
                 return { deny: `The ${name} tool input is not valid:\n${errors.map((error) => `- ${error.instanceLocation}: ${error.error}`).join('\n')}` };
             try {
-                return { result: resultOf(await execute(input, executeMod)) };
+                return { result: resultOf(await withinDeadline(mod, toolDeadline, `the ${name} tool`, () => execute(input, mod))) };
             }
             catch (error) {
                 return { deny: `The ${name} tool failed: ${messageOf(error)}` };
             }
         });
-        return { name: `mcp__${claude.plugin.name}__${name}` };
+        return {
+            name: `mcp__${claude.plugin.name}__${name}`,
+            dispose() {
+                answering.dispose();
+                named.dispose();
+            },
+        };
     };
 }
 function resultOf(value) {