@cmodjs/core 1.6.0 → 2.0.1

package/runtime/lifecycle.js

@@ -1,4 +1,3 @@
-import { hooks, PreToolUse } from '../mod.js';
 import { changelogPage, consentPath, dataFolder, finishStepsMethod, isAtLeast, marketplaceOf, oldestCmodFor, openPageMethod, parseConsent, pendingStepsMethod, parseEvent, permissionWords, readRecord, readSteps, recordPath, scriptsSha256, settingsPagesMethod, storeFolder, updatesToTurnOn } from '../records.js';
 import { homePrefix, ifMissing, relativePath } from '../utils/paths.js';
 import { firstLine, formatExit, listed, messageOf } from '../utils/text.js';
@@ -6,9 +5,9 @@ import { beforeDeadline } from './deadline.js';
 import { announcedOf, announcementMs, announcementOf } from './announce.js';
 import { bind } from './bound.js';
 import { serveConversations } from './conversations.js';
-import { answerCall, cmodPluginName, dependencyCalls, withBareRefusals } from './dependencies.js';
+import { answerCall, answeringOwnCalls, cmodPluginName, dependencyCalls, withBareRefusals } from './dependencies.js';
 import { keepEngine } from './engine.js';
-import { classicHook, heldDecisionHook, permissionEvents, preToolUseHook, userSkillHook } from './hooks.js';
+import { classicHook, permissionEvents, userSkillHook } from './hooks.js';
 import { checkedAnswer, checkingGrants, checkSettings, checksAnswers, checkWrite, isCovered, itemOf, passedDown, programAddresses } from './grants.js';
 import { cmodError, lastLineOf, locatingPrograms, readLines } from './programs.js';
 import { createModFiles, resolvedPath } from './metadata.js';
@@ -29,6 +28,7 @@ const installId = 'cmod:install';
 const installRetrySeconds = [2, 4, 8, 16, 32, 64, 128];
 const cmodCheckMs = 1000;
 const cmodWaitMs = 60_000;
+const cmodSlowCheckMs = 10_000;
 const startHoldMs = 10_000 - 1_000;
 const dependencyCallMs = 30_000;
 const cannotStart = /failed to start: /;
@@ -93,7 +93,7 @@ async function cmodVersion(claude) {
         throw new Error(`cmod --version ${formatExit(result.exitCode, lastLineOf(result.stderr) ?? '')}`);
     return result.stdout.trim().split(/\s+/).at(-1);
 }
-export function createLifecycle(definition, checksPermissions = () => true, options = {}, asksPerson = true) {
+export function createLifecycle(definition, permissionRoutes = () => undefined, options = {}, asksPerson = true) {
     let router = createRouter();
     let phase = 'starting';
     let runtime;
@@ -103,6 +103,7 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
     let activation;
     let mod;
     let imports;
+    let raise;
     let failure;
     let pluginOptions = options;
     const installer = createInstaller(definition.name, () => claude());
@@ -250,7 +251,7 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         if (runtime === undefined || plugin === undefined)
             return;
         const activeRouter = createRouter();
-        const active = await createMod(definition, { ...runtime, router: activeRouter, dataFolder: dataFolder(plugin.store, plugin.name), store: plugin.store, steps: plugin.steps, granted, refreshGrants, checksPermissions, options: pluginOptions }).catch(async (error) => {
+        const active = await createMod(definition, { ...runtime, router: activeRouter, dataFolder: dataFolder(plugin.store, plugin.name), store: plugin.store, steps: plugin.steps, granted, refreshGrants, permissionRoutes, options: pluginOptions }).catch(async (error) => {
             if (error instanceof MissingOptions && (await askOptions(error)))
                 return undefined;
             fail(messageOf(error), error instanceof MissingOptions ? `Set ${error.keys.length === 1 ? 'it' : 'them'} in /config.` : undefined, begin);
@@ -261,18 +262,26 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         const { added } = active;
         mod = active.mod;
         imports = active.imports;
+        raise = active.raise;
         router = activeRouter;
         phase = 'active';
         runtime.claude.ui.invalidate('ui.render');
         void runSteps(active.mod).catch((error) => toastFailure({ id: 'cmod:steps', message: 'Its installer stopped', error }));
         const missed = missedSessionStart;
         missedSessionStart = undefined;
-        const lateAnswer = missed === undefined ? {} : await activeRouter.dispatch('classic.SessionStart', missed, async () => ({})).catch((error) => {
+        const replay = (e) => (definition.name === cmodPluginName ? activeRouter.dispatch('classic.SessionStart', e, async () => ({})) : checkedRoute('classic.SessionStart', e, async () => ({})));
+        const lateAnswer = missed === undefined ? {} : await replay(missed).catch((error) => {
             toastFailure({ id: 'classic.SessionStart', message: 'The SessionStart hook failed', error });
             return {};
         });
-        if (Object.keys(lateAnswer).length > 0) {
-            runtime.claude.ui.log(`${definition.name} started after Claude Code's SessionStart, so Claude Code did not read the answer of its SessionStart hooks.`, { to: 'debug' });
+        const { additionalContext, ...unread } = lateAnswer;
+        for (const text of additionalContext ?? []) {
+            const added = await runtime.claude.session.append({ message: { type: 'user', content: [{ type: 'text', text }] } });
+            if (added.deny !== undefined)
+                runtime.claude.ui.log(`${definition.name}: Claude Code refused its SessionStart note: ${added.deny}`, { to: 'debug' });
+        }
+        if (Object.keys(unread).length > 0) {
+            runtime.claude.ui.log(`${definition.name} started after Claude Code's SessionStart, so Claude Code did not read ${Object.keys(unread).join(', ')} from its SessionStart hooks.`, { to: 'debug' });
         }
         const version = plugin.version ?? '';
         const announced = announcedOf(await runtime.claude.store.get(announcedKey));
@@ -358,7 +367,7 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             timer.cancel();
             longWait.cancel();
         };
-        const timer = claude().clock.every(cmodCheckMs, () => {
+        const poll = (ms) => claude().clock.every(ms, () => {
             check ??= cmodVersion(claude())
                 .then((version) => {
                 check = undefined;
@@ -373,9 +382,14 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
                 report(error);
             });
         });
-        const longWait = claude().clock.after(cmodWaitMs, () => installing(latest === undefined
-            ? "Still waiting for cmod to download cmod. See cmod's own line."
-            : `PATH finds cmod ${latest}, and ${definition.name} needs cmod ${oldestCmodFor(plugin?.steps ?? {})} or later. Run npm i -g @cmodjs/cli, or put ~/.local/bin ahead of the old cmod on PATH.`));
+        let timer = poll(cmodCheckMs);
+        const longWait = claude().clock.after(cmodWaitMs, () => {
+            timer.cancel();
+            timer = poll(cmodSlowCheckMs);
+            installing(latest === undefined
+                ? "Still waiting for cmod to download cmod. See cmod's own line."
+                : `PATH finds cmod ${latest}, and ${definition.name} needs cmod ${oldestCmodFor(plugin?.steps ?? {})} or later. Run npm i -g @cmodjs/cli, or put ~/.local/bin ahead of the old cmod on PATH.`);
+        });
     };
     const bootstrap = async (root) => {
         installing();
@@ -502,6 +516,12 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
         get toasts() {
             return runtime?.toaster.shown ?? [];
         },
+        async raise(method, payload) {
+            if (raise === undefined || imports === undefined)
+                throw new Error(`${definition.name} has not started, so ${method} has no listener yet.`);
+            bind(imports);
+            return raise(method, payload);
+        },
         async start(claudeCalls, read) {
             if (runtime !== undefined)
                 return;
@@ -537,8 +557,10 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
             if (event === 'cmod.call' && !isCallToThisMod)
                 return next(e);
             await (event === 'classic.SessionStart' || isCallToThisMod ? holdUntilStarted() : whenActive());
-            if (event === 'classic.SessionStart' && phase !== 'active')
+            if (event === 'classic.SessionStart' && phase !== 'active') {
                 missedSessionStart = e;
+                return next(e);
+            }
             if (isCallToThisMod && phase !== 'active') {
                 const isStopped = phase === 'declined' || phase === 'failed';
                 return { deny: isStopped ? `${definition.name} is not set up. Its toast says why.` : `${definition.name} is installing. Try again when it's ready.` };
@@ -565,9 +587,8 @@ export function createLifecycle(definition, checksPermissions = () => true, opti
 async function createMod(definition, runtime) {
     const { router, toaster } = runtime;
     const report = (failure) => void toaster.fail(failure);
-    const claude = withBareRefusals(checkingKeys(runtime.claude, toaster.toast, runtime.steps.keys ?? {}));
+    const claude = answeringOwnCalls(withBareRefusals(checkingKeys(runtime.claude, toaster.toast, runtime.steps.keys ?? {})), router);
     const added = [];
-    const hooksAdded = [];
     const announce = (feature) => {
         added.push(feature);
     };
@@ -640,7 +661,7 @@ async function createMod(definition, runtime) {
     }));
     const modState = createState({ name: definition.name, initial: definition.state ?? {}, session, root, claude, report, changed: area.changed, forkParent });
     const modOptions = createOptions({ name: definition.name, declared: definition.options ?? {}, fromClaude: runtime.options, claude, report, changed: modState.changed });
-    const held = runtime.checksPermissions() ? new Map() : undefined;
+    const hookOn = (hook, listener) => router.add(`classic.${hook}`, classicHook(hook, listener, report));
     const expand = (path) => (homePrefix.test(path) ? resolvedPath(path, places) : path);
     const settingsFile = (source) => ({
         read: () => checked.settings.read({ source }),
@@ -649,8 +670,18 @@ async function createMod(definition, runtime) {
             await claude.cmod.call({ to: cmodPluginName, method: 'updateSettings', input: { mod: definition.name, source, project: modState.root, values } });
         },
     });
-    const client = createSessionsClient({ name: definition.name, claude: checked, report: (id, message, error) => report({ id, message, error }), isGranted: (permission) => flag(permission) });
+    const client = createSessionsClient({
+        name: definition.name,
+        claude: checked,
+        report: (id, message, error) => report({ id, message, error }),
+        isGranted: (permission) => flag(permission),
+        hookOn: (hook, listener) => hookOn(hook, listener),
+        routeOn: (event, hook) => router.add(event, hook),
+        permissionRoutes: runtime.permissionRoutes,
+    });
     let followed;
+    let isSetUp = false;
+    const watches = new Set();
     const followFolders = (project, folder) => {
         if (followed === undefined)
             return;
@@ -659,7 +690,16 @@ async function createMod(definition, runtime) {
     };
     const imports = {
         sessions: client.sessions,
-        settings: {
+        commands: {
+            list: async () => (await checked.command.list()).map(({ name, description, source, plugin }) => ({ name, description, source, ...(plugin === undefined ? {} : { plugin }) })),
+            run: async (command, args) => {
+                const { text, context } = await checked.command.run({ command, ...(args === undefined ? {} : { args }) });
+                return { ...(text === undefined ? {} : { text }), ...(context === undefined || context.length === 0 ? {} : { note: context.join('\n') }) };
+            },
+            beforeRun: (...args) => client.listen('beforeRun', args),
+            onRun: (...args) => client.listen('onRun', args),
+        },
+        config: {
             list: async () => (await checked.config.list()).map(({ key, label, description, kind, value, options, provider, isLocked }) => ({
                 key,
                 label,
@@ -670,9 +710,22 @@ async function createMod(definition, runtime) {
                 ...(options === undefined ? {} : { options }),
                 ...(provider.plugin === 'engine' ? {} : { plugin: provider.plugin }),
             })),
+        },
+        settings: {
             user: settingsFile('user'),
             project: settingsFile('project'),
             local: settingsFile('local'),
+            beforeFileChange: (matcherOrListener, maybeListener) => {
+                const listener = (maybeListener ?? matcherOrListener);
+                const matcher = maybeListener === undefined ? undefined : matcherOrListener;
+                return hookOn('ConfigChange', async ({ source, file_path }) => {
+                    const change = { source: source === 'skills' ? 'skills' : source.replace('_settings', ''), ...(file_path === undefined ? {} : { path: file_path }) };
+                    if (matcher !== undefined && !matches(change, matcher))
+                        return undefined;
+                    const refuse = (await listener(change))?.refuse;
+                    return typeof refuse === 'string' ? { block: refuse } : undefined;
+                });
+            },
         },
         model: { complete: (completion, options) => checked.model.complete(completion, options) },
         fs: {
@@ -685,6 +738,23 @@ async function createMod(definition, runtime) {
                 const { kind, size, mtimeMs, isLink, realPath } = await checked.fs.stat(expand(path), options);
                 return { isFile: kind === 'file', isFolder: kind === 'dir', isLink, size, modifiedAt: mtimeMs, ...(realPath === undefined ? {} : { realPath }) };
             },
+            onChange({ path }, listener) {
+                if (isSetUp)
+                    throw new Error(`${definition.name}: fs.onChange works only in setup, because Claude Code reads the paths it watches when a session starts.`);
+                const paths = [path].flat().map((each) => resolvedPath(each, places));
+                const watch = { paths, listener };
+                watches.add(watch);
+                if (watches.size === 1) {
+                    hookOn('SessionStart', () => ({ watchPaths: [...new Set([...watches].flatMap((each) => each.paths))] }));
+                    hookOn('FileChanged', ({ file_path, event }) => {
+                        for (const each of watches)
+                            if (each.paths.some((watched) => relativePath(watched, file_path) !== undefined))
+                                void Promise.resolve(each.listener({ path: file_path, type: event })).catch((error) => report({ id: 'fs:onChange', message: 'The fs.onChange listener failed', error }));
+                        return undefined;
+                    });
+                }
+                return { dispose: () => void watches.delete(watch) };
+            },
         },
         metadata: {
             read: (path) => files.read(path),
@@ -748,26 +818,10 @@ async function createMod(definition, runtime) {
             files: allowed('files'),
             config: allowed('config'),
         },
-        on(hook, matcherOrListener, listenerOrOptions, maybeOptions) {
-            const hasMatcher = typeof listenerOrOptions === 'function';
-            const listener = (hasMatcher ? listenerOrOptions : matcherOrListener);
-            const matcher = hasMatcher ? matcherOrListener : undefined;
-            const options = (hasMatcher ? maybeOptions : listenerOrOptions);
-            if (!hooks.includes(hook))
-                throw new Error(`${definition.name}: mod.on takes one of Claude Code's hooks, such as PreToolUse, not ${String(hook)}.`);
-            const matched = matcher === undefined ? listener : (input) => (matches(input, matcher) ? listener(input) : undefined);
-            const bounded = options?.timeoutMs === undefined ? matched : timedHook(hook, matched, checkedMs(definition.name, `the ${hook} hook's timeoutMs`, options.timeoutMs), claude, toaster.toast);
-            if (!hooksAdded.includes(hook))
-                hooksAdded.push(hook);
-            if (hook === PreToolUse)
-                return router.add('tool.call', preToolUseHook(definition.name, bounded, claude, agents, held));
-            const classic = hook;
-            return router.add(`classic.${classic}`, classicHook(definition.name, classic, bounded, claude, agents, report));
-        },
         every: (ms, listener) => timer(ms, 'every', claude.clock.every, listener),
         after: (ms, listener) => timer(ms, 'after', claude.clock.after, listener),
         use: (job) => job({ mod, announce, reserveName }),
-        log: (text) => claude.ui.log(`${definition.name}: ${text}`, { to: 'debug' }),
+        log: (text, options) => claude.ui.log(`${definition.name}: ${text}`, { to: options?.to ?? 'debug' }),
         ui: { ...area.ui, notice: (callId, text) => claude.ui.notice(callId, text) },
         settings: settingsPages,
         dependencies: dependencyCalls(claude, (call, task) => beforeDeadline(claude, { ms: dependencyCallMs }, call, task)),
@@ -858,9 +912,9 @@ async function createMod(definition, runtime) {
             return next(e);
         const call = e;
         if (e.method === conversationMethods.changed && call.caller === cmodPluginName) {
-            if (!flag('conversation'))
-                return { value: null };
             const { session: changedSession, change, isInProject } = e.input;
+            if (changedSession !== client.sessions.current.id && !flag('conversation'))
+                return { value: null };
             client.changed(changedSession, change, isInProject !== false);
             return { value: null };
         }
@@ -894,22 +948,19 @@ async function createMod(definition, runtime) {
         throw new MissingOptions(missing, missing.map((key) => definition.options?.[key]?.title ?? key));
     await failsAs('the details of its session did not load', () => followCurrent(undefined));
     await failsAs('its setup function threw', () => definition.setup(mod));
+    isSetUp = true;
     const permissionHooks = permissionEvents.filter((event) => router.has(event));
-    if (permissionHooks.length > 0 && !runtime.checksPermissions()) {
+    if (permissionHooks.length > 0 && runtime.permissionRoutes() === undefined) {
         throw new Error(`it decides permissions on ${listed(permissionHooks)}, so hooks/register.ts must call registerPermissionCheck(addHook) after registerMod`);
     }
-    if (held !== undefined && hooksAdded.includes(PreToolUse))
-        router.add('tool.check', heldDecisionHook(held));
     await failsAs('its open panes did not load', () => area.restorePanes());
-    if (hooksAdded.length > 0)
-        added.push(`${hooksAdded.length === 1 ? 'a hook' : 'hooks'} on ${listed(hooksAdded)}`);
-    return { mod, added, imports };
+    return { mod, added, imports, raise: client.raise };
 }
 function checkingKeys(claude, toast, keys) {
     const bound = Object.entries(keys);
     if (bound.length === 0)
         return claude;
-    const register = (command) => {
+    const addCommand = (command) => {
         for (const [key, commandName] of bound) {
             if (commandName === command.name && command.immediate !== true) {
                 toast.warning(`${key} runs /${command.name}, which waits for Claude's turn to end`, { id: `key:${key}`, description: `It adds a row to the conversation. Give /${command.name} immediate: true.`, duration: Infinity });
@@ -917,7 +968,7 @@ function checkingKeys(claude, toast, keys) {
         }
         return claude.command.register(command);
     };
-    return { ...claude, command: { ...claude.command, register } };
+    return { ...claude, command: { ...claude.command, register: addCommand } };
 }
 const longestTimerMs = 2_147_483_647;
 function checkedMs(name, subject, ms) {
@@ -925,23 +976,6 @@ function checkedMs(name, subject, ms) {
         throw new Error(`${name}: ${subject} is ${ms}. Give a whole number of milliseconds above 0 and at most ${longestTimerMs}.`);
     return ms;
 }
-function timedHook(event, hook, ms, claude, toast) {
-    return (input) => new Promise((resolve, reject) => {
-        const timer = claude.clock.after(ms, () => {
-            toast.warning(`The ${event} hook passed its ${ms / 1000} s timeout`, { id: `timeout:${event}` });
-            resolve(undefined);
-        });
-        Promise.resolve()
-            .then(() => hook(input))
-            .then((answer) => {
-            timer.cancel();
-            resolve(answer);
-        }, (error) => {
-            timer.cancel();
-            reject(error);
-        });
-    });
-}
 async function failsAs(subject, step) {
     try {
         await step();

package/runtime/permission-check.d.ts

@@ -0,0 +1,15 @@
+import type { Disposable } from '../mod.js';
+import type { HookFields } from './hooks.js';
+import { type HookOn, type RouteOn } from './sessions.js';
+export type PermissionUse = {
+    readonly raise: (method: string, payload: HookFields) => Promise<HookFields | undefined>;
+    readonly hookOn: HookOn;
+    readonly routeOn: RouteOn;
+    readonly current: () => {
+        readonly id: string;
+        readonly cwd: string;
+    };
+};
+export type PermissionRoutes = (method: string, use: PermissionUse) => Disposable;
+export declare const permissionRoutes: PermissionRoutes;
+//# sourceMappingURL=permission-check.d.ts.map

package/runtime/permission-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"permission-check.d.ts","sourceRoot":"","sources":["../src/runtime/permission-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAuC,KAAK,MAAM,EAAE,KAAK,OAAO,EAAkB,MAAM,eAAe,CAAA;AAE9G,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;IACxF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CACtE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,UAAU,CAAA;AAMjF,eAAO,MAAM,gBAAgB,EAAE,gBA6B9B,CAAA"}

package/runtime/permission-check.js

@@ -0,0 +1,37 @@
+import { defined, processPayloadOf, recordOf } from './sessions.js';
+const verdictName = (decision) => (decision === 'deny' ? 'refuse' : decision);
+export const permissionRoutes = (method, { raise, hookOn, routeOn, current }) => {
+    const isBefore = method.startsWith('before');
+    if (method.endsWith('PermissionCheck')) {
+        return routeOn('tool.check', async (e, next) => {
+            const below = (await next(e));
+            const { id, cwd } = current();
+            const payload = { session: id, cwd, ...defined({ task: e.agentId, callId: e.tool_use_id, reason: below.reason, rule: below.rule, ceiling: e.ceiling === undefined ? undefined : verdictName(e.ceiling) }), name: e.tool, input: recordOf(e.input), decision: verdictName(below.decision) };
+            if (!isBefore) {
+                void raise(method, payload);
+                return below;
+            }
+            const answer = await raise(method, payload);
+            if (answer === undefined || below.decision === 'deny')
+                return below;
+            if (typeof answer['refuse'] === 'string')
+                return { decision: 'deny', reason: answer['refuse'] };
+            if (typeof answer['ask'] === 'string')
+                return { decision: 'ask', reason: answer['ask'] };
+            return answer['allow'] === true ? { decision: 'allow' } : below;
+        });
+    }
+    return hookOn('PermissionRequest', async (input) => {
+        const payload = processPayloadOf('PermissionRequest', input);
+        if (!isBefore) {
+            void raise(method, payload);
+            return undefined;
+        }
+        const answer = await raise(method, payload);
+        if (answer === undefined)
+            return undefined;
+        if (typeof answer['refuse'] === 'string')
+            return { decision: defined({ behavior: 'deny', message: answer['refuse'], interrupt: answer['interrupt'] }) };
+        return answer['allow'] === true ? { decision: defined({ behavior: 'allow', updatedInput: answer['input'], updatedPermissions: answer['updates'] }) } : undefined;
+    });
+};

package/runtime/sessions.d.ts

@@ -1,9 +1,13 @@
+import type { Args, CommandRunResult } from 'claude-code';
+import type { Disposable } from '../mod.js';
 import { ToolResult } from '../session/context/turn/message/tool-result.js';
-import type { SessionChange, SessionData } from '../session/conversation.js';
-import { type BeforeEvent, type SessionEvent, type Sessions, type Usage } from '../session/session.js';
+import { type SessionChange, type SessionData, type TaskData } from '../session/conversation.js';
+import { type BeforeEvent, type ProcessName, type SessionEvent, type Sessions, type TaskStartArgs, type ToolCallArgs, type Usage } from '../session/session.js';
 import { type SentMatcher } from '../utils/matcher.js';
 import { type Place } from './before.js';
 import type { Claude } from './claude.js';
+import { type HookFields } from './hooks.js';
+import type { PermissionRoutes } from './permission-check.js';
 export type Subscription = {
     readonly event: SessionEvent;
     readonly matcher: SentMatcher | undefined;
@@ -25,7 +29,7 @@ export declare const conversationMethods: {
     readonly changed: 'cmod:changed';
     readonly before: 'cmod:before';
 };
-export type Act = 'send' | 'startTask' | 'callTool' | 'usage' | 'clients';
+export type Act = 'send' | 'startTask' | 'callTool' | 'usage' | 'surfaces' | 'abort';
 export declare const beforePermission: (event: BeforeEvent) => string;
 export declare const isAct: (action: string) => action is Act;
 export declare function toolPermission(tool: string): string | undefined;
@@ -36,11 +40,14 @@ export type Scope = {
     readonly turn?: string;
     readonly task?: string;
     readonly isGoal?: true;
+    readonly isAgent?: true;
 };
 export type SessionsClient = {
     readonly sessions: Sessions;
     changed(session: string, change: SessionChange, isInProject: boolean): void;
     answerBefore(session: string, event: BeforeEvent, change: SessionChange, isInProject: boolean): Promise<unknown>;
+    raise(method: string, payload: Readonly<Record<string, unknown>>): Promise<unknown>;
+    listen(method: string, args: readonly unknown[]): Disposable;
     /** An empty title keeps the title the session already has. */
     follow(current: Omit<SessionData, 'isRunning' | 'lastAt'>): void;
 };
@@ -48,11 +55,34 @@ export declare function usageOf(claude: Pick<Claude, 'session'>): Promise<Usage>
 export declare function payloadOf(change: SessionChange): unknown;
 export declare function isHeardBy(event: SessionEvent, matcher: unknown, change: SessionChange): boolean;
 export declare function isInScope(scope: Scope, session: string, change: SessionChange, isUnder: (task: string, ancestor: string) => boolean): boolean;
-export declare function createSessionsClient({ name, claude, report, isGranted }: {
+export type HookOn = (hook: string, listener: (input: unknown) => HookFields | undefined | Promise<HookFields | undefined>) => Disposable;
+export declare function createSessionsClient({ name, claude, report, isGranted, hookOn, routeOn, permissionRoutes }: {
     readonly name: string;
     readonly claude: Claude;
     readonly report: (id: string, message: string, error: unknown) => void;
     readonly isGranted: (permission: string) => boolean;
+    readonly hookOn?: HookOn;
+    readonly routeOn?: RouteOn;
+    readonly permissionRoutes?: () => PermissionRoutes | undefined;
 }): SessionsClient;
-export declare function resultOf(where: Pick<Place, 'session' | 'context' | 'turn'>, answered: Awaited<ReturnType<Claude['tool']['call']>>): ToolResult;
+export type ToolCheck = {
+    readonly tool: string;
+    readonly input: unknown;
+    readonly tool_use_id?: string;
+    readonly agentId?: string;
+    readonly ceiling?: 'allow' | 'ask' | 'deny';
+};
+export type RouteOn = {
+    (event: 'tool.check', hook: (e: ToolCheck, next: (e: ToolCheck) => Promise<unknown>) => Promise<unknown>): Disposable;
+    (event: 'command.run', hook: (e: Args<'command.run'>, next: (e: Args<'command.run'>) => Promise<CommandRunResult>) => Promise<CommandRunResult>): Disposable;
+};
+export declare const recordOf: (value: unknown) => Readonly<Record<string, unknown>>;
+export declare const defined: (fields: HookFields) => HookFields;
+type ProcessFieldsName = Exclude<ProcessName, 'PermissionCheck'>;
+export declare function spawnTask(claude: Pick<Claude, 'agent'>, task: TaskStartArgs): Promise<TaskData>;
+export declare function processPayloadOf(named: ProcessFieldsName, input: unknown): HookFields;
+export declare function resultOf(where: Pick<Place, 'session' | 'context' | 'turn'>, call: ToolCallArgs & {
+    readonly cwd: string;
+}, answered: Awaited<ReturnType<Claude['tool']['call']>>): ToolResult;
+export {};
 //# sourceMappingURL=sessions.d.ts.map

package/runtime/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/runtime/sessions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAE3E,OAAO,KAAK,EAAyB,aAAa,EAAE,WAAW,EAAsB,MAAM,4BAA4B,CAAA;AAGvH,OAAO,EAAW,KAAK,WAAW,EAAoD,KAAK,YAAY,EAAuC,KAAK,QAAQ,EAAyC,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7O,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAA6B,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAA;CAAE,CAAA;AAEtG,eAAO,MAAM,YAAY,MAAM,CAAA;AAE/B,eAAO,MAAM,mBAAmB;aAC9B,QAAQ,EAAE,eAAe;aACzB,MAAM,EAAE,aAAa;aACrB,QAAQ,EAAE,eAAe;aACzB,KAAK,EAAE,YAAY;aACnB,QAAQ,EAAE,eAAe;aACzB,KAAK,EAAE,YAAY;aACnB,IAAI,EAAE,WAAW;aACjB,UAAU,EAAE,iBAAiB;aAC7B,KAAK,EAAE,YAAY;aACnB,SAAS,EAAE,gBAAgB;aAC3B,WAAW,EAAE,kBAAkB;aAC/B,GAAG,EAAE,UAAU;aACf,OAAO,EAAE,cAAc;aACvB,MAAM,EAAE,aAAa;CACb,CAAA;AAEV,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAA;AAQzE,eAAO,MAAM,gBAAgB,UAAW,WAAW,KAAG,MAA0G,CAAA;AAEhK,eAAO,MAAM,KAAK,WAAW,MAAM,KAAG,MAAM,IAAI,GAAwD,CAAA;AAExG,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE7E;AAED,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AAEpJ,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAC3B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,GAAG,IAAI,CAAA;IAC3E,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChH,8DAA8D;IAC9D,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAA;CACjE,CAAA;AAQD,wBAAsB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAI7E;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAUxD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAG/F;AAwBD,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAS7I;AAED,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GAAG,cAAc,CAmTzQ;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,UAAU,CAI9I"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/runtime/sessions.ts"],"names":[],"mappings":"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"}