@cmodjs/core 0.3.0 → 1.5.0

package/session/conversation.js

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

package/session/goal/goal.d.ts

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

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

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

package/session/goal/goal.js

@@ -0,0 +1 @@
+export const GoalChange = 'goalChange';

package/session/goal/task.d.ts

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

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

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

package/session/goal/task.js

@@ -0,0 +1,3 @@
+export const Task = 'task';
+export const TaskStart = 'taskStart';
+export const TaskEnd = 'taskEnd';

package/session/session.d.ts

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

package/session/session.d.ts.map

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

package/session/session.js

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

package/src/jobs/check.ts

@@ -1,9 +1,10 @@
 import type { Job } from '../mod.js'
 import { longestMs, type Deadline } from '../runtime/deadline.js'
-import { callEffects, type ToolCall } from '../utils/call-effects.js'
+import { callEffects, type Call } from '../utils/call-effects.js'
 import { dirname } from '../vendor.js'
 import { listed, messageOf } from '../utils/text.js'
-import { afterCall, modOf, targetWords } from './context.js'
+import { engineOf } from '../runtime/engine.js'
+import { afterCall, targetWords, withinDeadline } from './context.js'
 import type { Workspace } from './permissions/find-project-scope.js'
 import { matchTarget, targetOf, type Target } from './permissions/match-target.js'
 
@@ -27,7 +28,9 @@ export function check<State extends object = Record<never, never>>(options: { re
         if (triggered === undefined) return []
         try {
           const { command, folder } = triggered
-          const { exitCode, stdout, stderr } = await modOf(job, { folder }, workspace, deadline).process.run(command)
+          const workTree = await workspace.scope?.workTreeOf(folder)
+          const { claude } = engineOf(job.mod)
+          const { exitCode, stdout, stderr } = await withinDeadline(job.mod, deadline, command.join(' '), () => claude.process.run(command, { ...(workTree === undefined ? {} : { cwd: workTree }), timeoutMs }))
           return exitCode === 0 ? [] : [`${command.join(' ')} exited with ${exitCode}:\n${`${stdout}${stderr}`.trim()}`]
         } catch (error) {
           return [`The ${named} failed: ${messageOf(error)}`]
@@ -39,7 +42,7 @@ export function check<State extends object = Record<never, never>>(options: { re
   }
 }
 
-async function triggeredRun(after: readonly Target[], run: readonly string[], use: ToolCall, workspace: Workspace): Promise<{ command: string[]; folder: string } | undefined> {
+async function triggeredRun(after: readonly Target[], run: readonly string[], use: Call, workspace: Workspace): Promise<{ command: string[]; folder: string } | undefined> {
   const effects = callEffects(use, workspace)
   const paths = new Set<string>()
   let commandFolder: string | undefined

package/src/jobs/context.ts

@@ -1,48 +1,42 @@
-import type { Args, Frozen, HookStream, ProcessSpawnChunk, ProcessSpawnResult } from 'claude-code'
-import type { JobContext, Mod } from '../mod.js'
-import type { Claude } from '../runtime/claude.js'
+import type { JobContext } from '../mod.js'
 import { beforeDeadline, type Deadline } from '../runtime/deadline.js'
-import { dependencyCalls } from '../runtime/dependencies.js'
+import { engineOf } from '../runtime/engine.js'
 import { toolInputOf } from '../runtime/tool-calls.js'
 import { listed } from '../utils/text.js'
-import type { ToolCall } from '../utils/call-effects.js'
+import type { Call } from '../utils/call-effects.js'
 import { findProjectScope, type Workspace } from './permissions/find-project-scope.js'
 import { targetOf, type Target } from './permissions/match-target.js'
 import type { FileSystem } from '../utils/paths.js'
 
 type Session = Omit<Workspace, 'projectRoot' | 'cwd'>
 
-type Stream = HookStream<ProcessSpawnChunk, ProcessSpawnResult>
-
-export function workspaceReader({ mod: { claude } }: JobContext): () => Promise<Workspace> {
+export function workspaceReader({ mod }: JobContext): () => Promise<Workspace> {
+  const { claude } = engineOf(mod)
   let session: Promise<Session> | undefined
   return async () => {
-    session ??= readSession(claude)
+    session ??= readSession()
     const [{ home, scope, fs }, projectRoot, cwd] = await Promise.all([session, claude.session.root(), claude.session.cwd()])
     return { projectRoot, cwd, home, fs, scope }
   }
-}
 
-async function readSession(claude: Claude): Promise<Session> {
-  const fs: FileSystem = {
-    read: (path) => claude.fs.read(path),
-    stat: (path) => claude.fs.stat(path, { resolve: true }),
-    exists: (path) => claude.fs.exists(path),
+  async function readSession(): Promise<Session> {
+    const fs: FileSystem = {
+      read: (path) => claude.fs.read(path),
+      stat: (path) => claude.fs.stat(path, { resolve: true }),
+      exists: (path) => claude.fs.exists(path),
+    }
+    const home = await claude.env.home()
+    if (home === undefined) throw new Error('HOME is not set, so ~ in a path has no meaning. Start Claude Code with HOME set.')
+    return { home, fs, scope: await findProjectScope(claude.plugin.root, home, fs) }
   }
-  const home = await claude.env.home()
-  if (home === undefined) throw new Error('HOME is not set, so ~ in a path has no meaning. Start Claude Code with HOME set.')
-  return { home, fs, scope: await findProjectScope(claude.plugin.root, home, fs) }
 }
 
-export function afterCall<State extends object>(
-  job: JobContext<State>,
-  contextAfter: (call: ToolCall, workspace: Workspace) => Promise<readonly string[]>,
-  failed: (error: unknown) => readonly string[],
-): void {
+export function afterCall<State extends object>(job: JobContext<State>, contextAfter: (call: Call, workspace: Workspace) => Promise<readonly string[]>, failed: (error: unknown) => readonly string[]): void {
+  const { router, toolCalls } = engineOf(job.mod)
   const readWorkspace = workspaceReader(job)
-  job.mod.claude.on('tool.call', async (e, next) => {
-    const before = Promise.all([useOf(job, e), readWorkspace()])
-    await before.catch(() => undefined)
+  router.add('tool.call', async (e, next) => {
+    const before = Promise.all([toolCalls.agentOf(e.tool_use_id).then((agent): Call => ({ tool: e.tool, input: toolInputOf(e), ...agent })), readWorkspace()])
+    await Promise.allSettled([before])
     const result = await next(e)
     if (result.deny !== undefined || result.isError === true) return result
     const added = await before.then(([use, workspace]) => contextAfter(use, workspace)).catch(failed)
@@ -50,64 +44,12 @@ export function afterCall<State extends object>(
   })
 }
 
-async function useOf({ toolCalls }: JobContext, e: Frozen<Args<'tool.call'>>): Promise<ToolCall> {
-  return { tool: e.tool, input: toolInputOf(e), ...(await toolCalls.agentOf(e.tool_use_id)) }
+export async function inFolder(call: Call, folder: string, workspace: Workspace): Promise<Call & { readonly folder: string }> {
+  return { ...call, folder: (await workspace.scope?.workTreeOf('path' in call ? call.path : folder)) ?? folder }
 }
 
-export function modOf<State extends object>(job: JobContext<State>, { call, folder }: { readonly call?: ToolCall; readonly folder: string }, workspace: Workspace, deadline: Deadline): Mod<State> {
-  return modWithin(job, deadline, async () => workspace.scope?.workTreeOf(call !== undefined && 'path' in call ? call.path : folder))
-}
-
-export function modWithin<State extends object>({ mod }: JobContext<State>, deadline: Deadline, workTree: () => Promise<string | undefined> = async () => undefined): Mod<State> {
-  const { claude } = mod
-  const within = <Value>(call: string, task: Promise<Value>) => beforeDeadline(claude, deadline, call, task)
-  const folderOf = async (cwd: string | undefined) => {
-    const folder = cwd ?? (await workTree())
-    return folder === undefined ? {} : { cwd: folder }
-  }
-  const overrides: Pick<Mod<State>, 'process' | 'fs' | 'http' | 'dependencies'> = {
-    process: {
-      async run(argv, init) {
-        const folder = await folderOf(init?.cwd)
-        const timeoutMs = Math.min(init?.timeoutMs ?? deadline.ms, deadline.longestMs ?? deadline.ms)
-        return beforeDeadline(claude, { ...deadline, ms: timeoutMs }, 'mod.process.run', mod.process.run(argv, { ...init, ...folder, timeoutMs }))
-      },
-      spawn: (argv, init) => spawnWithin(claude, deadline, folderOf(init?.cwd).then((folder) => mod.process.spawn(argv, { ...init, ...folder }))),
-    },
-    fs: {
-      read: (path) => within('mod.fs.read', mod.fs.read(path)),
-      write: (path, text) => within('mod.fs.write', mod.fs.write(path, text)),
-      list: (path) => within('mod.fs.list', mod.fs.list(path)),
-      exists: (path) => within('mod.fs.exists', mod.fs.exists(path)),
-      stat: (path, options) => within('mod.fs.stat', mod.fs.stat(path, options)),
-      find: (glob) => within('mod.fs.find', mod.fs.find(glob)),
-    },
-    http: { fetch: (url, init) => within('mod.http.fetch', mod.http.fetch(url, init)) },
-    dependencies: dependencyCalls(claude, within),
-  }
-  return Object.assign(Object.create(mod) as Mod<State>, overrides)
-}
-
-function spawnWithin(claude: Claude, deadline: Deadline, started: Promise<Stream>): Stream {
-  async function* pieces(): AsyncGenerator<ProcessSpawnChunk, ProcessSpawnResult> {
-    const stream: AsyncIterator<ProcessSpawnChunk, ProcessSpawnResult> = await started
-    let finish: () => void = () => undefined
-    const running = beforeDeadline(claude, deadline, 'mod.process.spawn', new Promise<void>((resolve) => (finish = resolve)))
-    const passed = running.then(() => new Promise<never>(() => undefined))
-    try {
-      for (;;) {
-        const piece = await Promise.race([stream.next(), passed])
-        if (piece.done === true) return piece.value
-        yield piece.value
-      }
-    } finally {
-      finish()
-      void stream.return?.()
-    }
-  }
-  const result = started.then((stream) => stream.result)
-  result.catch(() => undefined)
-  return Object.assign(pieces(), { result })
+export function withinDeadline<Value>(mod: object, deadline: Deadline, subject: string, run: () => Value | Promise<Value>): Promise<Value> {
+  return beforeDeadline(engineOf(mod).claude, deadline, subject, Promise.resolve().then(run))
 }
 
 export function targetWords(target: Target): string {

package/src/jobs/permissions/decide-permission.ts

@@ -1,17 +1,18 @@
 import { strictness } from '../../runtime/hooks.js'
 import { messageOf } from '../../utils/text.js'
-import { callBaseOf, callEffects, type CallEffects, type ToolCall } from '../../utils/call-effects.js'
+import { callBaseOf, callEffects, type CallEffects, type Call } from '../../utils/call-effects.js'
 import type { Workspace } from './find-project-scope.js'
 import { folderInScope, matchTarget, targetOf, type MatchedCall, type Target, type TargetCalls, type TargetKey, type TargetOf } from './match-target.js'
 import { resolve } from '../../vendor.js'
+import { inFolder } from '../context.js'
 
 export type Rule<Mod> = {
   [Key in TargetKey]: TargetOf<Key> & {
-    when?: (call: TargetCalls[Key], mod: Mod) => boolean | Promise<boolean>
+    when?: (call: TargetCalls[Key] & { readonly folder: string }, mod: Mod) => boolean | Promise<boolean>
     reason?: string
   }
 }[TargetKey]
-type WhenOf<Mod> = { when?(call: ToolCall, mod: Mod): boolean | Promise<boolean> }
+type WhenOf<Mod> = { when?(call: Call & { readonly folder: string }, mod: Mod): boolean | Promise<boolean> }
 export type PermissionRules<Mod> = { deny?: Rule<Mod>[]; ask?: Rule<Mod>[] }
 export type Decision = 'allow' | 'ask' | 'deny'
 export type Verdict = { decision: Decision; reason?: string }
@@ -22,12 +23,12 @@ export function stricterVerdict<Result extends Verdict>(first: Result, second: R
   return strictness.indexOf(second.decision) > strictness.indexOf(first.decision) ? second : first
 }
 
-export async function decidePermission<Mod>(rules: PermissionRules<Mod>, use: ToolCall, workspace: Workspace, modOf: (call: ToolCall, folder: string) => Mod): Promise<Verdict | undefined> {
+export async function decidePermission<Mod>(rules: PermissionRules<Mod>, use: Call, workspace: Workspace, mod: Mod, within: (run: () => boolean | Promise<boolean>) => Promise<boolean>): Promise<Verdict | undefined> {
   try {
     const effects = callEffects(use, workspace)
     for (const decision of ['deny', 'ask'] as const) {
       for (const rule of rules[decision] ?? []) {
-        const outcome = await ruleOutcome(rule, use, effects, workspace, modOf)
+        const outcome = await ruleOutcome(rule, use, effects, workspace, mod, within)
         if (outcome === undefined) continue
         const reason = [rule.reason, outcome.failure === undefined ? undefined : `Its when check failed: ${outcome.failure}`].filter((part) => part !== undefined).join(' ')
         return reason === '' ? { decision } : { decision, reason }
@@ -39,7 +40,7 @@ export async function decidePermission<Mod>(rules: PermissionRules<Mod>, use: To
   }
 }
 
-async function ruleOutcome<Mod>(rule: Rule<Mod>, use: ToolCall, effects: CallEffects, workspace: Workspace, modOf: (call: ToolCall, folder: string) => Mod): Promise<{ failure: string | undefined } | undefined> {
+async function ruleOutcome<Mod>(rule: Rule<Mod>, use: Call, effects: CallEffects, workspace: Workspace, mod: Mod, within: (run: () => boolean | Promise<boolean>) => Promise<boolean>): Promise<{ failure: string | undefined } | undefined> {
   const matched = await matchTarget(rule, use, effects, workspace)
   const calls = matched.length > 0 ? matched : await unparsedMatches(rule, use, effects, workspace)
   if (calls.length === 0) return undefined
@@ -48,7 +49,8 @@ async function ruleOutcome<Mod>(rule: Rule<Mod>, use: ToolCall, effects: CallEff
   for (const { call, access, folder } of calls) {
     const fullCall = access?.contents === undefined ? call : { ...call, ...(await access.contents()) }
     try {
-      if (await when(fullCall, modOf(fullCall, folder))) return { failure: undefined }
+      const placed = await inFolder(fullCall, folder, workspace)
+      if (await within(() => when(placed, mod))) return { failure: undefined }
     } catch (error) {
       return { failure: messageOf(error) }
     }
@@ -56,7 +58,7 @@ async function ruleOutcome<Mod>(rule: Rule<Mod>, use: ToolCall, effects: CallEff
   return undefined
 }
 
-async function unparsedMatches(target: Target, use: ToolCall, effects: CallEffects, workspace: Workspace): Promise<MatchedCall[]> {
+async function unparsedMatches(target: Target, use: Call, effects: CallEffects, workspace: Workspace): Promise<MatchedCall[]> {
   const shell = effects.shell
   if (shell === undefined || shell.isFullyParsed) return []
   const { key, patterns } = targetOf(target)

package/src/jobs/permissions/find-project-scope.ts

@@ -1,4 +1,4 @@
-import type { FileSystem } from '../../utils/paths.js'
+import { ifMissing, type FileSystem } from '../../utils/paths.js'
 import { basename, dirname, resolve } from '../../vendor.js'
 
 export type ProjectScope = { workTreeOf: (path: string) => Promise<string | undefined> }
@@ -33,19 +33,13 @@ export async function findProjectScope(pluginRoot: string, home: string, fs: Fil
 
 async function readRepository(workTree: string, fs: FileSystem): Promise<string | undefined> {
   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 {
-    return workTree
-  }
+  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)
 }