@cmodjs/core 2.0.0 → 2.1.0

package/runtime/sessions.js

@@ -10,7 +10,7 @@ import { GoalChange } from '../session/goal/goal.js';
 import { TaskEnd, TaskStart } from '../session/goal/task.js';
 import { beforeEvents, processEvents, Session, sessionEvents } from '../session/session.js';
 import { matches, sentMatcher } from '../utils/matcher.js';
-import { foldAnswers } from './before.js';
+import { beforeAnswerKeys, foldAnswers, foldBefore, methodOf, takenAnswer } from './before.js';
 import { cmodPluginName } from './dependencies.js';
 import { messageOf } from '../utils/text.js';
 import { listenerOf, PassedTimeout, withinTime } from './deadline.js';
@@ -36,7 +36,6 @@ const actPermissions = { send: 'prompt', startTask: 'tasks', usage: 'conversatio
 const startsTurns = ['CronCreate'];
 const ownSchedule = ['CronDelete', 'CronList'];
 export const beforePermission = (event) => (event === 'toolCall' ? 'tools' : event === TaskStart ? 'tasks' : 'prompt');
-const methodOf = (prefix, event) => `${prefix}${Object.entries(sessionEvents).find(([, each]) => each === event)?.[0] ?? event}`;
 export const isAct = (action) => action === 'callTool' || action in actPermissions;
 export function toolPermission(tool) {
     return startsTurns.includes(tool) ? 'prompt' : ownSchedule.includes(tool) ? undefined : 'tools';
@@ -113,7 +112,10 @@ export function isInScope(scope, session, change, isUnder) {
         return change.message.turn === scope.turn;
     return (change.type === TurnStart || change.type === TurnEnd) && change.turn.prompt.id === scope.turn;
 }
-export function createSessionsClient({ name, claude, report, isGranted, hookOn, routeOn }) {
+export function withoutPermissionCheck(name, hearer) {
+    return `${name}: ${hearer} hears Claude Code's permission check, so hooks/register.ts must call registerPermissionCheck(addHook) after registerMod.`;
+}
+export function createSessionsClient({ name, claude, report, isGranted, hookOn, routeOn, permissionRoutes }) {
     const call = (method, input) => claude.cmod.call({ to: cmodPluginName, method, input });
     const listening = new Map();
     const deciding = new Map();
@@ -176,6 +178,12 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
             },
         };
     };
+    const invoke = (method, options, run, takes = []) => withinTime(claude.clock, method, options, run).catch((error) => {
+        if (error instanceof PassedTimeout && !method.startsWith('before'))
+            return undefined;
+        report(`session:${method}`, `The ${method} listener failed`, error);
+        return options.onFailure === 'refuse' && takes.includes('refuse') ? { refuse: `${name}: ${messageOf(error)}` } : undefined;
+    });
     const combined = async (session, event, change, isInProject) => {
         const askers = [...(deciding.get(session) ?? []), ...(isInProject ? (deciding.get(everySession) ?? []) : [])]
             .filter((entry) => entry.event === event)
@@ -185,17 +193,12 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
             if (entry.matcher !== undefined && !matches(payloadOf(latest), entry.matcher))
                 return undefined;
             const payload = await payloadFor(session, latest);
-            const answer = await withinTime(claude.clock, entry.method, entry.options, (time) => entry.listener(payload, time)).catch((error) => {
-                if (entry.options.onFailure !== 'refuse')
-                    throw error;
-                report(`session:${entry.method}`, `The ${entry.method} listener failed`, error);
-                return { refuse: `${name}: ${messageOf(error)}` };
-            });
+            const answer = await invoke(entry.method, entry.options, async (time) => takenAnswer(entry.method, beforeAnswerKeys[event], await entry.listener(payload, time)), beforeAnswerKeys[event]);
             if (answer === undefined || answer === null || (typeof answer === 'object' && 'refuse' in answer) || isGranted(beforePermission(event)))
                 return answer;
             throw new Error(`Its ${entry.method} answer changes nothing until ${beforePermission(event)} is turned on for ${name} in /mods.`);
         });
-        return foldAnswers(event, change, askers, (error) => report(`session:${methodOf('before', event)}`, `The ${methodOf('before', event)} listener failed`, error));
+        return foldBefore(event, change, askers, (error) => report(`session:${methodOf('before', event)}`, `The ${methodOf('before', event)} listener failed`, error));
     };
     const eventMethods = (scopeOf, hasBefore, ended) => {
         const method = (into, named, event) => (...args) => {
@@ -208,10 +211,12 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
             ...(hasBefore ? beforeEvents.map((named) => [`before${named}`, method(deciding, `before${named}`, sessionEvents[named])]) : []),
         ]);
     };
+    let folders;
     const withFiles = async (message) => {
         if (message.type !== ToolCall && message.type !== ToolResult)
             return message;
-        return { ...message, files: await callFiles(name, claude, { tool: message.name, input: message.input }, message.cwd) };
+        folders ??= Promise.all([claude.env.home(), claude.env.configHome()]).then(([home, configRoot]) => ({ home, configRoot }));
+        return { ...message, files: await callFiles(name, claude, folders, { tool: message.name, input: message.input }, message.cwd) };
     };
     const messagesFrom = async (method, input) => Promise.all((await call(method, input)).map(withFiles));
     const searched = (request, matcher) => ({
@@ -405,39 +410,16 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
     };
     const processListeners = new Map();
     const raise = async (method, payload) => {
-        const isBefore = method.startsWith('before');
         const heard = [...(processListeners.get(method) ?? [])].filter(({ matcher }) => payload['task'] === undefined && (matcher === undefined || matches(payload, matcher)));
-        if (!isBefore) {
-            await Promise.all(heard.map(({ listener, options }) => withinTime(claude.clock, method, options, (time) => listener(payload, time)).catch((error) => {
-                if (!(error instanceof PassedTimeout))
-                    report(`session:${method}`, `The ${method} listener failed`, error);
-            })));
+        if (!method.startsWith('before')) {
+            await Promise.all(heard.map(({ listener, options }) => invoke(method, options, (time) => listener(payload, time))));
             return undefined;
         }
+        const failing = method === 'beforePermissionRequest' ? { onFailure: 'refuse' } : {};
         const takes = answerKeys[method.slice('before'.length)] ?? [];
-        let merged;
-        for (const { listener, options } of heard) {
-            try {
-                const answer = (await withinTime(claude.clock, method, options, (time) => listener(payload, time)));
-                if (answer === undefined || answer === null)
-                    continue;
-                const unread = Object.keys(answer).filter((key) => !takes.includes(key));
-                if (unread.length > 0)
-                    throw new Error(`it answered ${unread.join(' and ')}, which ${method} does not take. It takes ${takes.map((key) => `{ ${key} }`).join(', ') || 'no answer'}.`);
-                const notes = [merged?.['note'], answer['note']].filter((note) => typeof note === 'string');
-                merged = { ...merged, ...answer, ...(notes.length === 0 ? {} : { note: notes.join('\n\n') }) };
-                if (typeof answer['refuse'] === 'string')
-                    return merged;
-            }
-            catch (error) {
-                report(`session:${method}`, `The ${method} listener failed`, error);
-                if (options.onFailure === 'refuse' || method === 'beforePermissionRequest')
-                    return { refuse: `${name}: ${messageOf(error)}` };
-            }
-        }
-        return merged;
+        const askers = heard.map(({ listener, options }) => () => invoke(method, { ...options, ...failing }, async (time) => takenAnswer(method, takes, await listener(payload, time)), takes));
+        return foldAnswers(method, takes, ['refuse'], undefined, askers, (error) => report(`session:${method}`, `The ${method} listener failed`, error));
     };
-    const permissionCheck = (e, below) => ({ session: current.id, cwd: current.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) });
     const commandRun = async (e) => {
         const source = (await claude.command.list()).find((command) => command.name === e.command)?.source;
         return { session: current.id, cwd: current.cwd, name: e.command, args: e.args, ...defined({ source }), from: senderOf(e.origin, false) };
@@ -466,22 +448,11 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
         if (hookOn === undefined || routeOn === undefined)
             throw new Error(`${name}: ${method} works only in a mod's own session.`);
         const isBefore = method.startsWith('before');
-        if (named === 'PermissionCheck') {
-            return routeOn('tool.check', async (e, next) => {
-                const below = (await next(e));
-                if (!isBefore) {
-                    void raise(method, permissionCheck(e, below));
-                    return below;
-                }
-                const answer = await raise(method, permissionCheck(e, below));
-                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;
-            });
+        if (named === 'PermissionCheck' || named === 'PermissionRequest') {
+            const routes = permissionRoutes?.();
+            if (routes === undefined)
+                throw new Error(withoutPermissionCheck(name, method));
+            return routes(method, { raise, hookOn, routeOn, current: () => current });
         }
         const event = processEvents[named];
         const hook = (isBefore ? event.before : undefined) ?? event.on;
@@ -493,7 +464,7 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
                 return undefined;
             }
             const answer = await raise(method, payload);
-            return answer === undefined ? undefined : hookAnswerOf(named, hook, answer);
+            return answer === undefined ? undefined : hookAnswerOf(named, answer);
         });
     };
     const listen = (method, args) => {
@@ -529,16 +500,15 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
         },
         changed(session, change, isInProject) {
             remember(session, change);
+            let payload;
             for (const key of isInProject ? [session, everySession] : [session]) {
                 for (const { scope, event, method, matcher, listener, options } of listening.get(key) ?? []) {
                     if (!isHeardBy(event, matcher, change) || !isInScope(scope, session, change, isUnderIn(session)))
                         continue;
-                    void payloadFor(session, change)
-                        .then((payload) => withinTime(claude.clock, method, options, (time) => listener(payload, time)))
-                        .catch((error) => {
-                        if (!(error instanceof PassedTimeout))
-                            report(`session:${method}`, `The ${method} listener failed`, error);
-                    });
+                    payload ??= payloadFor(session, change);
+                    void payload
+                        .then((heard) => invoke(method, options, (time) => listener(heard, time)))
+                        .catch((error) => report(`session:${method}`, `The ${method} listener failed`, error));
                 }
             }
         },
@@ -567,9 +537,8 @@ export function createSessionsClient({ name, claude, report, isGranted, hookOn,
         },
     };
 }
-const verdictName = (decision) => (decision === 'deny' ? 'refuse' : decision);
-const recordOf = (value) => (typeof value === 'object' && value !== null && !Array.isArray(value) ? value : {});
-const defined = (fields) => Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined));
+export const recordOf = (value) => (typeof value === 'object' && value !== null && !Array.isArray(value) ? value : {});
+export const defined = (fields) => Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined));
 const placementOf = (input) => defined({ session: input['session_id'], task: input['agent_id'], agentType: input['agent_type'], cwd: input['cwd'], permissionMode: input['permission_mode'] });
 const mcpServerOf = (server) => (server === undefined ? undefined : { name: String(recordOf(server)['name']), source: String(recordOf(server)['source']) });
 const modelChangeOf = (input) => ({
@@ -653,30 +622,25 @@ export function processPayloadOf(named, input) {
     const fields = recordOf(input);
     return { ...placementOf(fields), ...defined(processFields[named](fields)) };
 }
-export function hookAnswerOf(named, hook, answer) {
-    const output = (fields) => ({ hookSpecificOutput: { hookEventName: hook, ...defined(fields) } });
+function hookAnswerOf(named, answer) {
     const refuse = typeof answer['refuse'] === 'string' ? answer['refuse'] : undefined;
+    const note = typeof answer['note'] === 'string' ? [answer['note']] : undefined;
     if (named === 'SessionStart')
-        return output({ additionalContext: answer['note'], sessionTitle: answer['title'], reloadSkills: answer['reloadSkills'], initialUserMessage: answer['firstPrompt'] });
+        return defined({ additionalContext: note, sessionTitle: answer['title'], reloadSkills: answer['reloadSkills'] === true ? true : undefined, initialUserMessage: answer['firstPrompt'] });
     if (named === 'ModelChange') {
         if (refuse !== undefined)
-            return output({ permissionDecision: 'deny', permissionDecisionReason: refuse });
-        return typeof answer['ask'] === 'string' ? output({ permissionDecision: 'ask', permissionDecisionReason: answer['ask'] }) : undefined;
+            return { permissionDecision: 'deny', permissionDecisionReason: refuse };
+        return typeof answer['ask'] === 'string' ? { permissionDecision: 'ask', permissionDecisionReason: answer['ask'] } : undefined;
     }
     if (named === 'WorktreeCreate')
-        return output({ worktreePath: answer['result'] });
-    if (named === 'PermissionRequest') {
-        if (refuse !== undefined)
-            return output({ decision: defined({ behavior: 'deny', message: refuse, interrupt: answer['interrupt'] }) });
-        return answer['allow'] === true ? output({ decision: defined({ behavior: 'allow', updatedInput: answer['input'], updatedPermissions: answer['updates'] }) }) : undefined;
-    }
+        return defined({ worktreePath: answer['result'] });
     if (named === 'PermissionDenial')
-        return output({ retry: answer['retry'] });
+        return answer['retry'] === true ? { retry: true } : undefined;
     if (named === 'ToolBatch')
-        return output({ additionalContext: answer['note'] });
+        return defined({ additionalContext: note });
     if (named === 'ReplyDisplay')
-        return output({ displayContent: answer['text'] });
-    return refuse === undefined ? undefined : { decision: 'block', reason: refuse };
+        return defined({ displayContent: answer['text'] });
+    return refuse === undefined ? undefined : { block: refuse };
 }
 export function resultOf(where, call, answered) {
     const base = { id: '', type: ToolResult, at: new Date().toISOString(), session: where.session, context: where.context, ...(where.turn === undefined ? {} : { turn: where.turn.prompt.id }), callId: '', name: call.name, input: call.input, cwd: call.cwd, files: noFiles };

package/runtime/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/runtime/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAQ3C,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,MAAM,IAAI;IAC3C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,OAAO,IAAI,IAAI,CAAA;IACf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACvH,CAAA;AAQD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAIvE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAO9H;AAED,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,CA6G9J"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/runtime/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAQ3C,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,MAAM,IAAI;IAC3C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,OAAO,IAAI,IAAI,CAAA;IACf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACvH,CAAA;AAQD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAIvE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAO9H;AAED,wBAAgB,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,CAoH9J"}

package/runtime/state.js

@@ -46,17 +46,18 @@ export function createState({ name, initial, session, root, claude, report, chan
     const transcriptsKey = `${name}.$transcripts.`;
     const forgetEndedSessions = async (current) => {
         const stored = await claude.store.keys();
-        for (const recorded of stored.filter((key) => key.startsWith(transcriptsKey))) {
-            const owner = recorded.slice(transcriptsKey.length);
-            if (owner === current)
-                continue;
+        const ended = async (recorded) => {
             const transcript = await claude.store.get(recorded);
-            if (typeof transcript === 'string' && (await claude.fs.exists(transcript)))
-                continue;
-            for (const value of stored.filter((key) => key.startsWith(`${name}.`) && key.endsWith(`.sessions.${owner}`)))
-                await claude.store.delete(value);
+            return typeof transcript !== 'string' || !(await claude.fs.exists(transcript));
+        };
+        const owners = stored.filter((key) => key.startsWith(transcriptsKey) && key !== `${transcriptsKey}${current}`);
+        await Promise.all(owners.map(async (recorded) => {
+            if (!(await ended(recorded)))
+                return;
+            const owner = recorded.slice(transcriptsKey.length);
+            await Promise.all(stored.filter((key) => key.startsWith(`${name}.`) && key.endsWith(`.sessions.${owner}`)).map((value) => claude.store.delete(value)));
             await claude.store.delete(recorded);
-        }
+        }));
     };
     const loadGroups = async (only, next) => {
         const loaded = [];
@@ -114,8 +115,10 @@ export function createState({ name, initial, session, root, claude, report, chan
         }),
         moveTo: (nextRoot) => inTurn(async () => (nextRoot === projectRoot ? undefined : loadGroups(['project'], { root: nextRoot, session: sessionId }))),
         switchSession: (nextSession, source, transcript) => inTurn(async () => {
-            await claude.store.set(`${transcriptsKey}${nextSession}`, transcript);
-            await forgetEndedSessions(nextSession);
+            if (Object.keys(declared.session).length > 0) {
+                await claude.store.set(`${transcriptsKey}${nextSession}`, transcript);
+                void forgetEndedSessions(nextSession).catch((error) => report({ id: 'state:sessions', message: 'Could not forget the session values of ended sessions', error }));
+            }
             if (nextSession === sessionId)
                 return;
             if (source === 'fork')

package/session/context/turn/message/message.d.ts

@@ -35,6 +35,7 @@ export type Row = {
 };
 export declare const messageTypes: readonly MessageType[];
 export declare const skillPrefix = "Base directory for this skill:";
+export declare function instructionPathOf(text: string): string;
 export declare function rowOfLine(row: Readonly<Record<string, unknown>>): Row | undefined;
 export declare function rowOfAppend(append: {
     readonly uuid: string;

package/session/context/turn/message/message.d.ts.map

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

package/session/context/turn/message/message.js

@@ -13,7 +13,10 @@ export const Message = 'message';
 export const messageTypes = [Prompt, Note, Reply, ToolCall, ToolResult, Skill, InstructionFile, Notice];
 export const skillPrefix = 'Base directory for this skill:';
 const rowTypes = ['user', 'assistant', 'attachment', 'system'];
-const memoryPath = /^Contents of (.+?) \(/;
+const memoryPath = /^Contents of (.+?)(?: \([^)\n]*\))?:\r?$/m;
+export function instructionPathOf(text) {
+    return memoryPath.exec(text)?.[1] ?? '';
+}
 export function rowOfLine(row) {
     const { uuid, timestamp, type } = row;
     if (typeof uuid !== 'string' || typeof timestamp !== 'string' || typeof type !== 'string' || !rowTypes.includes(type))
@@ -39,7 +42,7 @@ export function rowOfLine(row) {
 export function rowOfAppend(append, at, cwd) {
     const { message, origin } = append;
     const text = textOf(message.content);
-    const path = message.type === 'attachment' ? memoryPath.exec(text)?.[1] : undefined;
+    const path = message.type === 'attachment' ? instructionPathOf(text) || undefined : undefined;
     const model = isObject(origin) && origin['kind'] === 'model' && typeof origin['model'] === 'string' ? origin['model'] : undefined;
     return {
         id: append.uuid,

package/src/jobs/permissions.ts

@@ -2,6 +2,7 @@ import type { Args, Frozen } from 'claude-code'
 import type { Job, Mod } from '../mod.js'
 import type { Deadline } from '../runtime/deadline.js'
 import { engineOf } from '../runtime/engine.js'
+import { withoutPermissionCheck } from '../runtime/sessions.js'
 import { inputOf } from '../utils/call-effects.js'
 import { decidePermission, stricterVerdict, type PermissionRules as RulesFor, type Rule as RuleFor, type Verdict } from './permissions/decide-permission.js'
 import { targetOf } from './permissions/match-target.js'
@@ -20,7 +21,8 @@ export function permissions<State extends object = Record<never, never>>(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 { router, toolCalls, hasPermissionCheck } = engineOf(job.mod)
+    if (!hasPermissionCheck()) throw new Error(withoutPermissionCheck(job.mod.name, 'the permissions job'))
     const readWorkspace = workspaceReader(job)
 
     const verdictOf = async (e: Frozen<Args<'tool.check'>>): Promise<Verdict | undefined> => {

package/src/records.ts

@@ -259,7 +259,7 @@ function readKeys(keys: unknown): Steps {
   return { keys: commands }
 }
 
-export const coreVersion = '2.0.0'
+export const coreVersion = '2.1.0'
 
 export function oldestCmodFor(steps: Steps): string {
   if (steps.permissions?.some((item) => item.startsWith('config:')) === true) return '1.6.0'

package/src/register.ts

@@ -5,10 +5,11 @@ import type { Claude } from './runtime/claude.js'
 import type { RoutedEvent } from './runtime/hooks.js'
 import { cmodPluginName } from './runtime/dependencies.js'
 import { createLifecycle, readPlugin, type Lifecycle } from './runtime/lifecycle.js'
+import { permissionRoutes, type PermissionRoutes } from './runtime/permission-check.js'
 
 let lifecycle: Lifecycle<object>
 
-let checksPermissions = false
+let permissionCheck: PermissionRoutes | undefined
 
 let registered: ModDefinition<object> | undefined
 
@@ -99,9 +100,9 @@ function routeCallToMod(_$: EngineInterface, eventInput: Frozen<Args<'cmod.call'
 }
 
 export function registerMod<State extends object, Declared extends Options>(addHook: On, definition: ModDefinition<State, string, Declared>, options: PluginOptions): void {
-  checksPermissions = false
+  permissionCheck = undefined
   registered = definition as ModDefinition<object>
-  lifecycle = createLifecycle(definition, () => checksPermissions, options)
+  lifecycle = createLifecycle(definition, () => permissionCheck, options)
   addHook('session.start', startMod)
   addHook('classic.Setup', routeToMod)
   addHook('classic.SessionStart', routeToMod)
@@ -154,7 +155,7 @@ export function registerMod<State extends object, Declared extends Options>(addH
 }
 
 export function registerPermissionCheck(addHook: On): void {
-  checksPermissions = true
+  permissionCheck = permissionRoutes
   addHook('tool.check', routeToMod)
   addHook('classic.PermissionRequest', routeToMod)
 }

package/src/runtime/before.ts

@@ -2,7 +2,7 @@ import type { Args, Frozen } from 'claude-code'
 import type { Disposable } from '../mod.js'
 import { ContextEnd } from '../session/context/context.js'
 import { InstructionFile, isRulePath } from '../session/context/turn/message/instruction-file.js'
-import { Message, messagesOf, noFiles, rowOfAppend, withTexts, type Unplaced } from '../session/context/turn/message/message.js'
+import { instructionPathOf, Message, messagesOf, noFiles, rowOfAppend, withTexts, type Unplaced } from '../session/context/turn/message/message.js'
 import { Note } from '../session/context/turn/message/note.js'
 import { Notice } from '../session/context/turn/message/notice.js'
 import { Prompt } from '../session/context/turn/message/prompt.js'
@@ -12,13 +12,14 @@ import { Skill } from '../session/context/turn/message/skill.js'
 import { ToolCall } from '../session/context/turn/message/tool-call.js'
 import { ToolResult } from '../session/context/turn/message/tool-result.js'
 import { TurnEnd } from '../session/context/turn/turn.js'
-import type { ConversationState, SessionChange, TaskData } from '../session/conversation.js'
+import type { ContextData, ConversationState, RunningTask, SessionChange, TaskData } from '../session/conversation.js'
 import { Task, TaskStart } from '../session/goal/task.js'
-import type { BeforeEvent } from '../session/session.js'
+import { sessionEvents, type BeforeEvent, type SessionEvent } from '../session/session.js'
 import type { Claude } from './claude.js'
 import { cmodPluginName } from './dependencies.js'
 import type { Router } from './router.js'
 import { toolInputOf } from './tool-calls.js'
+import { resolve } from '../vendor.js'
 
 export type Place = Pick<ConversationState, 'session' | 'context' | 'contextOpenedAt' | 'turn' | 'tasks' | 'taskTurns' | 'openCalls'>
 
@@ -66,6 +67,7 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
   }
   const titles = new Map<string, string>()
   const spawned = new Map<string, string>()
+  const agentFolders = new Map<string, string>()
   const toolResultHook = (isFailure: boolean) => async (e: Readonly<Record<string, unknown>>, next: (e: never) => Promise<unknown>) => {
     if (!(await wants(ToolResult))) return next(e as never)
     const where = await place()
@@ -121,7 +123,7 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
     router.add('prompt.attachment', async (e, next) => {
       if (!(await wants(InstructionFile)) || e.type !== 'nested_memory') return next(e)
       const where = await place()
-      const path = /^Contents of (.+?) \(/.exec(e.text)?.[1] ?? ''
+      const path = instructionPathOf(e.text)
       const answer = await asked(InstructionFile, message(where, { id: '', at: now(), type: InstructionFile, path, text: e.text, isRule: isRulePath(path) }, e.agentId))
       if (answer.refuse !== undefined) return { text: null }
       return answer.text === undefined ? next(e) : { text: answer.text }
@@ -145,7 +147,8 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
       if (!(await wants(ToolCall))) return next(e)
       const where = await place()
       const input = toolInputOf(e)
-      const answer = await asked(ToolCall, message(where, { id: e.tool_use_id, at: now(), type: ToolCall, callId: e.tool_use_id, name: e.tool, input, cwd: await claude.session.cwd(), files: noFiles }, e.agentId))
+      const cwd = (e.agentId === undefined ? undefined : agentFolders.get(e.agentId)) ?? (await claude.session.cwd())
+      const answer = await asked(ToolCall, message(where, { id: e.tool_use_id, at: now(), type: ToolCall, callId: e.tool_use_id, name: e.tool, input, cwd, files: noFiles }, e.agentId))
       if (answer.refuse !== undefined) return { deny: answer.refuse }
       if (answer.result !== undefined) return { result: answer.result }
       if (answer.input === undefined) return next(e)
@@ -154,7 +157,13 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
     }),
     router.add('agent.spawn', async (e, next) => {
       spawned.set(e.tool_use_id, e.prompt)
-      if (!(await wants(TaskStart))) return next(e)
+      const start = async (args: typeof e) => {
+        const started = await next(args)
+        const folder = args.isTeammate === true ? undefined : (args.cwd ?? (args.parentAgentId === undefined ? undefined : agentFolders.get(args.parentAgentId)))
+        if (started.agentId !== undefined && folder !== undefined) agentFolders.set(started.agentId, resolve(await claude.session.cwd(), folder))
+        return started
+      }
+      if (!(await wants(TaskStart))) return start(e)
       const where = await place()
       const task: TaskData = { id: '', title: e.description, agentType: e.subagentType, model: e.model ?? e.parentModel, openedBy: e.tool_use_id, openedAt: now(), ...(e.parentAgentId === undefined ? {} : { parent: e.parentAgentId }) }
       const answer = await asked(TaskStart, { type: TaskStart, task: { ...task, context: where.context } })
@@ -162,7 +171,7 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
         spawned.delete(e.tool_use_id)
         return { deny: answer.refuse }
       }
-      return next(answer.owner === undefined ? e : { ...e, model: answer.owner.model })
+      return start(answer.owner === undefined ? e : { ...e, model: answer.owner.model })
     }),
     router.add('classic.SubagentStart', async (e, next) => {
       const where = await place()
@@ -177,12 +186,16 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
       return withNote(await next(e), answer.note)
     }),
     router.add('classic.SubagentStop', async (e, next) => {
-      if (!(await wants(TurnEnd))) return next(e)
+      const stopped = <Answer extends { readonly block?: string }>(answer: Answer) => {
+        if (answer.block === undefined) agentFolders.delete(e.agent_id)
+        return answer
+      }
+      if (!(await wants(TurnEnd))) return stopped(await next(e))
       const turn = (await place()).taskTurns[e.agent_id]
-      if (turn === undefined) return next(e)
+      if (turn === undefined) return stopped(await next(e))
       const answer = await asked(TurnEnd, { type: TurnEnd, turn: { ...turn, closedAt: now() } })
       const below = await next(e)
-      return answer.refuse === undefined ? below : { ...below, block: answer.refuse }
+      return stopped(answer.refuse === undefined ? below : { ...below, block: answer.refuse })
     }),
     router.add('classic.Stop', async (e, next) => {
       if (!(await wants(TurnEnd))) return next(e)
@@ -197,14 +210,17 @@ export function installBefore({ claude, router, hooks }: { readonly claude: Clau
       const where = await place()
       const task = e.agentId === undefined ? undefined : where.tasks[e.agentId]
       if (e.agentId !== undefined && task === undefined) return next(e)
-      const context = task === undefined ? { number: where.context, openedAt: where.contextOpenedAt } : { number: task.context, openedAt: task.contextOpenedAt ?? task.openedAt, task: task.id }
-      const answer = await asked(ContextEnd, { type: ContextEnd, context: { ...context, closedAt: now() } })
+      const answer = await asked(ContextEnd, { type: ContextEnd, context: closingContext(where, task, now()) })
       return answer.refuse === undefined ? next(e) : { skip: answer.refuse }
     }),
   ]
   return { dispose: () => added.forEach((each) => each.dispose()) }
 }
 
+export function closingContext(where: Place, task: RunningTask | undefined, closedAt: string): ContextData {
+  return task === undefined ? { number: where.context, openedAt: where.contextOpenedAt, closedAt } : { number: task.context, openedAt: task.contextOpenedAt ?? task.openedAt, closedAt, task: task.id }
+}
+
 export function withAnswer(change: SessionChange, answer: Partial<Answers>): SessionChange {
   if (change.type === Message && answer.output !== undefined && change.message.type === ToolResult) return { ...change, message: { ...change.message, output: answer.output } }
   if (change.type === Message && answer.text !== undefined) return { ...change, message: { ...change.message, text: answer.text } as Message }
@@ -213,41 +229,49 @@ export function withAnswer(change: SessionChange, answer: Partial<Answers>): Ses
   return change
 }
 
-export async function foldAnswers(event: BeforeEvent, change: SessionChange, askers: readonly ((change: SessionChange) => Promise<unknown>)[], report: (error: unknown) => void): Promise<Partial<Answers> | undefined> {
+export const methodOf = (prefix: 'on' | 'before', event: SessionEvent): string => `${prefix}${Object.entries(sessionEvents).find(([, each]) => each === event)?.[0] ?? event}`
+
+export const beforeAnswerKeys: Readonly<Record<BeforeEvent, readonly (keyof Answers)[]>> = {
+  prompt: ['text', 'note', 'title', 'refuse'],
+  note: ['text'],
+  skill: ['text'],
+  instructionFile: ['text', 'refuse'],
+  reply: ['text'],
+  toolCall: ['input', 'result', 'refuse'],
+  toolResult: ['output', 'isError', 'note'],
+  notice: ['text'],
+  taskStart: ['owner', 'refuse'],
+  turnEnd: ['refuse'],
+  contextEnd: ['refuse'],
+}
+
+export function foldBefore(event: BeforeEvent, change: SessionChange, askers: readonly ((change: SessionChange) => Promise<unknown>)[], report: (error: unknown) => void): Promise<Partial<Answers> | undefined> {
+  return foldAnswers(methodOf('before', event), beforeAnswerKeys[event], ['refuse', 'result'], change, askers, report, withAnswer)
+}
+
+export function takenAnswer(method: string, takes: readonly string[], answer: unknown): unknown {
+  if (answer === undefined || answer === null || answer === false) return undefined
+  if (typeof answer !== 'object' || Array.isArray(answer)) throw new Error(`it answered ${JSON.stringify(answer)}, but ${method} takes an object or nothing: ${takes.map((key) => `{ ${key} }`).join(', ') || 'no answer'}.`)
+  const unread = Object.keys(answer).filter((key) => !takes.includes(key))
+  if (unread.length > 0) throw new Error(`it answered ${unread.join(' and ')}, which ${method} does not take. It takes ${takes.map((key) => `{ ${key} }`).join(', ') || 'no answer'}.`)
+  return answer
+}
+
+export async function foldAnswers<Change, Answer extends object>(method: string, takes: readonly string[], ends: readonly string[], change: Change, askers: readonly ((change: Change) => Promise<unknown>)[], report: (error: unknown) => void, applied: (change: Change, answer: Answer) => Change = (same) => same): Promise<Answer | undefined> {
   let latest = change
-  let result: Partial<Answers> | undefined
+  let result: Record<string, unknown> | undefined
   for (const ask of askers) {
     try {
-      const answer = answerOf(event, await ask(latest))
-      if (answer === undefined) continue
-      const notes = [result?.note, answer.note].filter((note) => note !== undefined)
-      result = { ...result, ...answer, ...(notes.length === 0 ? {} : { note: notes.join('\n\n') }) }
-      if (answer.refuse !== undefined || answer.result !== undefined) return result
-      latest = withAnswer(latest, answer)
+      const answer = takenAnswer(method, takes, await ask(latest))
+      if (typeof answer !== 'object' || answer === null) continue
+      const given = answer as Record<string, unknown>
+      const notes = [result?.['note'], given['note']].filter((note) => typeof note === 'string')
+      result = { ...result, ...given, ...(notes.length === 0 ? {} : { note: notes.join('\n\n') }) }
+      if (ends.some((key) => given[key] !== undefined)) return result as Answer
+      latest = applied(latest, answer as Answer)
     } catch (error) {
       report(error)
     }
   }
-  return result
-}
-
-export function answerOf(event: BeforeEvent, answer: unknown): Partial<Answers> | undefined {
-  if (typeof answer !== 'object' || answer === null) return undefined
-  const given = answer as Partial<Answers>
-  const allowed: Readonly<Record<BeforeEvent, readonly (keyof Answers)[]>> = {
-    prompt: ['text', 'note', 'title', 'refuse'],
-    note: ['text'],
-    skill: ['text'],
-    instructionFile: ['text', 'refuse'],
-    reply: ['text'],
-    toolCall: ['input', 'result', 'refuse'],
-    toolResult: ['output', 'isError', 'note'],
-    notice: ['text'],
-    taskStart: ['owner', 'refuse'],
-    turnEnd: ['refuse'],
-    contextEnd: ['refuse'],
-  }
-  const unread = Object.keys(given).filter((key) => !allowed[event].includes(key as keyof Answers))
-  if (unread.length > 0) throw new Error(`a before(${event}) listener answered ${unread.join(' and ')}, which ${event} does not take. It takes ${allowed[event].map((key) => `{ ${key} }`).join(', ')}.`)
-  return given
+  return result as Answer | undefined
 }