@cmodjs/core 1.6.0 → 2.0.1

package/runtime/before.js

@@ -1,6 +1,6 @@
 import { ContextEnd } from '../session/context/context.js';
-import { Document } from '../session/context/turn/message/document.js';
-import { Message, messagesOf, rowOfAppend, withTexts } from '../session/context/turn/message/message.js';
+import { InstructionFile, isRulePath } from '../session/context/turn/message/instruction-file.js';
+import { instructionPathOf, Message, messagesOf, noFiles, rowOfAppend, withTexts } 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';
@@ -10,10 +10,16 @@ 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 { TaskEnd, TaskStart } from '../session/goal/task.js';
+import { Task, TaskStart } from '../session/goal/task.js';
+import { sessionEvents } from '../session/session.js';
 import { cmodPluginName } from './dependencies.js';
 import { toolInputOf } from './tool-calls.js';
-const appended = [Note, Reply, ToolResult, Notice];
+import { resolve } from '../vendor.js';
+const appended = [Note, Reply, Notice];
+const withNote = (below, note) => {
+    const fields = (below ?? {});
+    return note === undefined ? fields : { ...fields, additionalContext: [...(fields['additionalContext'] ?? []), note] };
+};
 const relayTag = /^(?:<cross-session-message[^>]*>\s*)?<cmod-relay>([\s\S]*)<\/cmod-relay>(?:\s*<\/cross-session-message>[\s\S]*)?$/;
 export function relayOf(e) {
     const isFromCmod = e.origin.kind === 'peer' && !('teammate' in e.origin) && e.origin.plugin === cmodPluginName;
@@ -26,34 +32,56 @@ export function installBefore({ claude, router, hooks }) {
     const message = (where, unplaced, task, isInTurn = true) => {
         const turn = isInTurn ? (task === undefined ? where.turn : where.taskTurns[task]) : undefined;
         const context = task === undefined ? where.context : (where.tasks[task]?.context ?? where.context);
-        return { type: Message, message: { ...unplaced, session: where.session, context, ...(turn === undefined ? {} : { turn: turn.prompt.id }), ...(task === undefined ? {} : { task }) } };
+        const call = unplaced.type === ToolResult ? where.openCalls?.[unplaced.callId] : undefined;
+        return { type: Message, message: { ...unplaced, ...call, session: where.session, context, ...(turn === undefined ? {} : { turn: turn.prompt.id }), ...(task === undefined ? {} : { task }) } };
+    };
+    const titles = new Map();
+    const spawned = new Map();
+    const agentFolders = new Map();
+    const toolResultHook = (isFailure) => async (e, next) => {
+        if (!(await wants(ToolResult)))
+            return next(e);
+        const where = await place();
+        const name = String(e['tool_name']);
+        const callId = String(e['tool_use_id']);
+        const input = (typeof e['tool_input'] === 'object' && e['tool_input'] !== null ? e['tool_input'] : {});
+        const task = typeof e['agent_id'] === 'string' ? e['agent_id'] : undefined;
+        const result = { id: callId, at: now(), type: ToolResult, callId, name, input, cwd: String(e['cwd']), files: noFiles, output: isFailure ? e['error'] : e['tool_response'], isError: isFailure };
+        const answer = await asked(ToolResult, message(where, result, task));
+        const below = await next(e);
+        const rewritten = answer.output === undefined || isFailure ? {} : name.startsWith('mcp__') ? { updatedMCPToolOutput: answer.output } : { updatedToolOutput: answer.output };
+        const failed = answer.isError === true && !isFailure ? { block: answer.note ?? `${name} failed.` } : {};
+        return { ...withNote(below, answer.isError === true ? undefined : answer.note), ...rewritten, ...failed };
     };
     const added = [
         router.add('prompt.submit', async (e, next) => {
-            if (!(await wants(Prompt)) || e.text.startsWith('/'))
+            if (!(await wants(Prompt)))
                 return next(e);
             const where = await place();
             const answer = await asked(Prompt, message(where, { id: '', at: now(), type: Prompt, text: e.text, from: senderOf(e.origin, false) }, undefined, false));
             if (answer.refuse !== undefined)
                 return { drop: answer.refuse };
-            return next(answer.text === undefined ? e : { ...e, text: answer.text });
+            const text = answer.text ?? e.text;
+            if (answer.title !== undefined)
+                titles.set(text, answer.title);
+            const context = answer.note === undefined ? e.context : [...(e.context ?? []), answer.note];
+            const ran = await next({ ...e, text, ...(context === undefined ? {} : { context }) });
+            const passed = titles.get(text);
+            if (passed !== undefined && ('drop' in ran || ran.text !== text)) {
+                titles.delete(text);
+                if (!('drop' in ran) && typeof ran.text === 'string')
+                    titles.set(ran.text, passed);
+            }
+            return ran;
         }),
-        router.add('command.run', async (e, next) => {
-            if (!(await wants(Prompt)))
-                return next(e);
-            const typed = e.args === '' ? `/${e.command}` : `/${e.command} ${e.args}`;
-            const where = await place();
-            const answer = await asked(Prompt, message(where, { id: '', at: now(), type: Prompt, text: typed, from: senderOf(e.origin, false) }, undefined, false));
-            if (answer.refuse !== undefined)
-                return { text: answer.refuse };
-            if (answer.text === undefined || answer.text === typed)
-                return next(e);
-            const same = new RegExp(`^/${e.command}(?:\\s+|$)`).exec(answer.text);
-            if (same !== null)
-                return next({ ...e, args: answer.text.slice(same[0].length) });
-            void claude.prompt.submit({ text: answer.text });
-            return {};
+        router.add('classic.UserPromptSubmit', async (e, next) => {
+            const named = titles.get(e.prompt);
+            titles.delete(e.prompt);
+            const below = await next(e);
+            return named === undefined ? below : { ...below, sessionTitle: named };
         }),
+        router.add('classic.PostToolUse', toolResultHook(false)),
+        router.add('classic.PostToolUseFailure', toolResultHook(true)),
         router.add('session.receive', async (e, next) => {
             if (!(await wants(Prompt)) || relayOf(e) !== undefined)
                 return next(e);
@@ -71,11 +99,11 @@ export function installBefore({ claude, router, hooks }) {
             return answer.text === undefined ? next(e) : { text: answer.text };
         }),
         router.add('prompt.attachment', async (e, next) => {
-            if (!(await wants(Document)) || e.type !== 'nested_memory')
+            if (!(await wants(InstructionFile)) || e.type !== 'nested_memory')
                 return next(e);
             const where = await place();
-            const path = /^Contents of (.+?) \(/.exec(e.text)?.[1] ?? '';
-            const answer = await asked(Document, message(where, { id: '', at: now(), type: Document, path, text: e.text }, e.agentId));
+            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 };
@@ -104,7 +132,8 @@ export function installBefore({ claude, router, hooks }) {
                 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() }, 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)
@@ -115,27 +144,54 @@ export function installBefore({ claude, router, hooks }) {
             return next({ ...reserved, ...answer.input });
         }),
         router.add('agent.spawn', async (e, next) => {
+            spawned.set(e.tool_use_id, e.prompt);
+            const start = async (args) => {
+                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 next(e);
+                return start(e);
             const where = await place();
             const task = { 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 } });
-            if (answer.refuse !== undefined)
+            if (answer.refuse !== undefined) {
+                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.SubagentStop', async (e, next) => {
-            if (!(await wants(TaskEnd)) && !(await wants(TurnEnd)))
-                return next(e);
+        router.add('classic.SubagentStart', async (e, next) => {
             const where = await place();
-            const task = where.tasks[e.agent_id];
-            if (task === undefined)
+            const openedBy = where.tasks[e.agent_id]?.openedBy;
+            const prompt = openedBy === undefined ? undefined : spawned.get(openedBy);
+            if (openedBy !== undefined)
+                spawned.delete(openedBy);
+            if (!(await wants(Prompt)))
                 return next(e);
-            const turn = where.taskTurns[e.agent_id];
-            const ending = (await wants(TaskEnd)) ? await asked(TaskEnd, { type: TaskEnd, task: { ...task, closedAt: now() } }) : {};
-            const refuse = ending.refuse ?? ((await wants(TurnEnd)) && turn !== undefined ? (await asked(TurnEnd, { type: TurnEnd, turn: { ...turn, closedAt: now() } })).refuse : undefined);
+            const open = where.taskTurns[e.agent_id]?.prompt;
+            const text = open?.text ?? prompt;
+            if (text === undefined)
+                return next(e);
+            const answer = await asked(Prompt, message(where, { id: open?.id ?? '', at: now(), type: Prompt, text, from: open?.from ?? { type: Task } }, e.agent_id, false));
+            return withNote(await next(e), answer.note);
+        }),
+        router.add('classic.SubagentStop', async (e, next) => {
+            const stopped = (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 stopped(await next(e));
+            const answer = await asked(TurnEnd, { type: TurnEnd, turn: { ...turn, closedAt: now() } });
             const below = await next(e);
-            return refuse === undefined ? below : { ...below, block: refuse };
+            return stopped(answer.refuse === undefined ? below : { ...below, block: answer.refuse });
         }),
         router.add('classic.Stop', async (e, next) => {
             if (!(await wants(TurnEnd)))
@@ -162,6 +218,8 @@ export function installBefore({ claude, router, hooks }) {
     return { dispose: () => added.forEach((each) => each.dispose()) };
 }
 export function withAnswer(change, answer) {
+    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 } };
     if (change.type === Message && answer.input !== undefined && change.message.type === ToolCall)
@@ -170,18 +228,47 @@ export function withAnswer(change, answer) {
         return { ...change, task: { ...change.task, model: answer.owner.model } };
     return change;
 }
-export async function foldAnswers(event, change, askers, report) {
+export const methodOf = (prefix, event) => `${prefix}${Object.entries(sessionEvents).find(([, each]) => each === event)?.[0] ?? event}`;
+export const beforeAnswerKeys = {
+    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, change, askers, report) {
+    return foldAnswers(methodOf('before', event), beforeAnswerKeys[event], ['refuse', 'result'], change, askers, report, withAnswer);
+}
+export function takenAnswer(method, takes, answer) {
+    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(method, takes, ends, change, askers, report, applied = (same) => same) {
     let latest = change;
     let result;
     for (const ask of askers) {
         try {
-            const answer = answerOf(event, await ask(latest));
-            if (answer === undefined)
+            const answer = takenAnswer(method, takes, await ask(latest));
+            if (typeof answer !== 'object' || answer === null)
                 continue;
-            result = { ...result, ...answer };
-            if (answer.refuse !== undefined || answer.result !== undefined)
+            const given = answer;
+            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;
-            latest = withAnswer(latest, answer);
+            latest = applied(latest, answer);
         }
         catch (error) {
             report(error);
@@ -189,26 +276,3 @@ export async function foldAnswers(event, change, askers, report) {
     }
     return result;
 }
-export function answerOf(event, answer) {
-    if (typeof answer !== 'object' || answer === null)
-        return undefined;
-    const given = answer;
-    const allowed = {
-        prompt: ['text', 'refuse'],
-        note: ['text'],
-        skill: ['text'],
-        document: ['text', 'refuse'],
-        reply: ['text'],
-        toolCall: ['input', 'result', 'refuse'],
-        toolResult: ['text'],
-        notice: ['text'],
-        taskStart: ['owner', 'refuse'],
-        taskEnd: ['refuse'],
-        turnEnd: ['refuse'],
-        contextEnd: ['refuse'],
-    };
-    const unread = Object.keys(given).filter((key) => !allowed[event].includes(key));
-    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;
-}

package/runtime/claude.d.ts

@@ -1,4 +1,4 @@
-import type { AgentInfo, AgentSpawnArgs, AgentSpawnResult, Args, EngineInterface, AskOptions, CommandSpec, ConfigRow, ElementTable, FsEntry, FsStat, FsStatOptions, HookStream, HttpInit, HttpResponse, InvalidatableEventName, PaneCloseArgs, PaneOpenArgs, ProcessRunInit, ProcessRunResult, ProcessSpawnChunk, ProcessSpawnRequest, ProcessSpawnResult, RenderSurface, ResolveInput, SessionUsage, Settings, SettingsReadArgs, Timer, ToolSpec, UiCopyArgs, UiFocusArgs, UiFocusResult, UiCopyResult, UiLogOptions, UiOpenResult, UiPane, UiScrollArgs, UiScrollResult } from 'claude-code';
+import type { AgentInfo, AgentSpawnArgs, AgentSpawnResult, Args, EngineInterface, AskOptions, CommandInfo, CommandRunArgs, CommandRunResult, CommandSpec, ConfigRow, ElementTable, FsEntry, FsStat, FsStatOptions, HookStream, HttpInit, HttpResponse, InvalidatableEventName, PaneCloseArgs, PaneOpenArgs, ProcessRunInit, ProcessRunResult, ProcessSpawnChunk, ProcessSpawnRequest, ProcessSpawnResult, RenderSurface, ResolveInput, SessionUsage, Settings, SettingsReadArgs, Timer, ToolSpec, UiCopyArgs, UiFocusArgs, UiFocusResult, UiCopyResult, UiLogOptions, UiOpenResult, UiPane, UiScrollArgs, UiScrollResult } from 'claude-code';
 export type Claude = {
     readonly plugin: {
         readonly name: string;
@@ -63,6 +63,9 @@ export type Claude = {
     readonly prompt: {
         submit: EngineInterface['prompt']['submit'];
     };
+    readonly turn: {
+        abort: EngineInterface['turn']['abort'];
+    };
     readonly model: {
         complete: EngineInterface['model']['complete'];
     };
@@ -70,6 +73,8 @@ export type Claude = {
         register(command: CommandSpec): Promise<{
             command: string;
         }>;
+        list(): Promise<readonly CommandInfo[]>;
+        run(args: CommandRunArgs): Promise<CommandRunResult>;
     };
     readonly tool: {
         register(tool: ToolSpec): Promise<{

package/runtime/claude.d.ts.map

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

package/runtime/conversations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../src/runtime/conversations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAY5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AA2BzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAA;IAClH,KAAK,IAAI,IAAI,CAAA;CACd,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG,aAAa,CAugBlR"}
+{"version":3,"file":"conversations.d.ts","sourceRoot":"","sources":["../src/runtime/conversations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAY5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AA2BzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAA;IAClH,KAAK,IAAI,IAAI,CAAA;CACd,CAAA;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG,aAAa,CA6iBlR"}

package/runtime/conversations.js

@@ -8,10 +8,10 @@ import { GoalChange } from '../session/goal/goal.js';
 import { receivedMatcher } from '../utils/matcher.js';
 import { ifMissing } from '../utils/paths.js';
 import { formatExit, messageOf } from '../utils/text.js';
-import { foldAnswers, installBefore, relayOf } from './before.js';
+import { foldBefore, installBefore, relayOf } from './before.js';
 import { cmodPluginName } from './dependencies.js';
 import { readLines, runCmod } from './programs.js';
-import { actPermission, beforePermission, conversationMethods, everySession, isAct, isHeardBy, resultOf, usageOf } from './sessions.js';
+import { actPermission, conversationMethods, everySession, isAct, isHeardBy, resultOf, spawnTask, usageOf } from './sessions.js';
 const bufferedTaskRows = 200;
 const beforeDeadlineMs = 5000;
 const livenessMs = 5000;
@@ -34,7 +34,23 @@ export function serveConversations({ claude, router, store, project, report }) {
     const liveIds = new Set();
     const waitingRows = new Map();
     let follower;
-    const json = async (args) => JSON.parse(await runCmod(claude, [...args, '--json', '--project', project()], session === '' ? await claude.session.id() : session));
+    const engineTurns = new Map();
+    router.add('turn.start', async (e, next) => {
+        const agent = e.agentId ?? '';
+        engineTurns.set(agent, e.turnId);
+        return next(e);
+    });
+    const endTurn = (ending, task) => (below) => {
+        if (below.block !== undefined)
+            return below;
+        engineTurns.delete(task ?? '');
+        dispatch(session, conversation.endTurn(new Date().toISOString(), ending, task));
+        return below;
+    };
+    router.add('classic.Stop', async (e, next) => endTurn({ reason: 'answer', ...(e.last_assistant_message === undefined ? {} : { answer: e.last_assistant_message }) })(await next(e)));
+    router.add('classic.StopFailure', async (e, next) => endTurn({ reason: 'error', failure: { type: String(e.error), text: e.error_details ?? e.last_assistant_message ?? String(e.error) } })(await next(e)));
+    router.add('classic.SubagentStop', async (e, next) => endTurn({ reason: 'answer', ...(e.last_assistant_message === undefined ? {} : { answer: e.last_assistant_message }) }, e.agent_id)(await next(e)));
+    const json = async (args) => JSON.parse(await runCmod(claude, [...args, '--json', '--project', project()], await claude.session.id()));
     const isGranted = async (caller, item) => {
         if (caller === cmodPluginName)
             return true;
@@ -61,6 +77,8 @@ export function serveConversations({ claude, router, store, project, report }) {
         }
     };
     const restartFollower = async () => {
+        if (session === '')
+            return;
         const wantsEvery = [...heard.values()].some((sessions) => (sessions.get(everySession) ?? []).length > 0);
         const named = [...heard.values()].flatMap((sessions) => [...sessions].filter(([id, list]) => id !== session && id !== everySession && list.length > 0).map(([id]) => id));
         const others = [...new Set(named)].sort();
@@ -98,16 +116,39 @@ export function serveConversations({ claude, router, store, project, report }) {
         if (sent.isDelivered !== true)
             throw ended(to);
     };
+    const waitingOn = new Map();
+    let liveness;
+    let isChecking = false;
+    const checkLiveness = async () => {
+        if (isChecking)
+            return;
+        isChecking = true;
+        try {
+            const waiting = [...waitingOn];
+            const running = new Set((await json(['history', 'sessions', '--running', '--all'])).map((each) => each.id));
+            for (const [settle, to] of waiting)
+                if (!running.has(to))
+                    settle.reject(ended(to));
+        }
+        finally {
+            isChecking = false;
+        }
+    };
+    const watchLife = (settle, to) => {
+        waitingOn.set(settle, to);
+        liveness ??= claude.clock.every(livenessMs, () => void checkLiveness().catch((error) => report('liveness', 'Could not check which sessions still run', error)));
+        return {
+            cancel() {
+                waitingOn.delete(settle);
+                if (waitingOn.size > 0)
+                    return;
+                liveness?.cancel();
+                liveness = undefined;
+            },
+        };
+    };
     const ask = (to, relay, deadlineMs) => new Promise((resolve, reject) => {
         const id = `${session}:${(asks += 1)}`;
-        const timer = deadlineMs === undefined
-            ? claude.clock.every(livenessMs, () => {
-                void isRunning(to).then((isLive) => {
-                    if (!isLive)
-                        settle.reject(ended(to));
-                });
-            })
-            : claude.clock.after(deadlineMs, () => settle.reject(new Error(`session ${to} did not answer within ${deadlineMs / 1000} s`)));
         const settle = {
             resolve(value) {
                 if (asked.delete(id))
@@ -120,6 +161,7 @@ export function serveConversations({ claude, router, store, project, report }) {
                 reject(error);
             },
         };
+        const timer = deadlineMs === undefined ? watchLife(settle, to) : claude.clock.after(deadlineMs, () => settle.reject(new Error(`session ${to} did not answer within ${deadlineMs / 1000} s`)));
         asked.set(id, settle);
         post(to, { ...relay, id, from: session }).catch((error) => settle.reject(error instanceof Error ? error : new Error(messageOf(error))));
     });
@@ -156,17 +198,16 @@ export function serveConversations({ claude, router, store, project, report }) {
         watching = readWatchers().catch((error) => report('before', 'Kept the other sessions’ before listeners from before', error));
     };
     const place = () => {
-        const { context, contextOpenedAt, turn, tasks, taskTurns } = conversation.state;
-        return { session, context, contextOpenedAt, ...(turn === undefined ? {} : { turn }), tasks, taskTurns };
+        const { context, contextOpenedAt, turn, tasks, taskTurns, openCalls } = conversation.state;
+        return { session, context, contextOpenedAt, ...(turn === undefined ? {} : { turn }), tasks, taskTurns, ...(openCalls === undefined ? {} : { openCalls }) };
     };
     const deciders = (event) => {
         const all = [...[...ownWatches.values()].filter((watch) => watch.target === session || watch.target === everySession).map((watch) => ({ ...watch, from: session })), ...watchers];
         return [...new Map(all.filter((watcher) => watcher.events.includes(event)).map((watcher) => [`${watcher.from}\n${watcher.mod}`, watcher])).values()];
     };
     const askHere = async (mod, event, change, from = session, isInProject = true) => {
-        for (const needed of ['conversation', beforePermission(event)])
-            if (!(await isGranted(mod, needed)))
-                throw new Error(`${mod} needs the ${needed} permission for before(${event}). Turn it on in /mods ${mod}.`);
+        if (from !== session && !(await isGranted(mod, 'conversation')))
+            throw new Error(`${mod} needs the conversation permission to change what happens in another session. Turn it on in /mods ${mod}.`);
         return claude.cmod.call({ to: mod, method: conversationMethods.before, input: { session: from, event, change, isInProject } });
     };
     const askAway = async (watcher, event, change) => {
@@ -194,7 +235,7 @@ export function serveConversations({ claude, router, store, project, report }) {
                 await Promise.all([starting, watching]);
                 return deciders(event).length > 0;
             },
-            decide: (event, change) => foldAnswers(event, change, deciders(event).map((watcher) => (latest) => (watcher.from === session ? askHere(watcher.mod, event, latest) : askAway(watcher, event, latest))), (error) => report(`before:${event}`, `Passed the ${event} on without a mod's answer`, error)),
+            decide: (event, change) => foldBefore(event, change, deciders(event).map((watcher) => (latest) => (watcher.from === session ? askHere(watcher.mod, event, latest) : askAway(watcher, event, latest))), (error) => report(`before:${event}`, `Passed the ${event} on without a mod's answer`, error)),
         },
     });
     const start = (id, source) => {
@@ -325,11 +366,13 @@ export function serveConversations({ claude, router, store, project, report }) {
     const perform = async (caller, action, input, task) => {
         await checkAct(caller, action, input);
         await starting;
+        if (action === 'abort')
+            return abortTurn(input, task);
         if (task !== undefined)
             return performInTask(action, input, task);
         if (action === 'usage')
             return usageOf(claude);
-        if (action === 'clients')
+        if (action === 'surfaces')
             return [...(await claude.session.surfaces())];
         if (action === 'send') {
             const { type, text, as } = input;
@@ -342,27 +385,27 @@ export function serveConversations({ claude, router, store, project, report }) {
                 throw new Error(`Claude Code dropped the prompt: ${delivered.drop}`);
             return null;
         }
-        if (action === 'startTask') {
-            const args = input;
-            const started = await claude.agent.spawn({
-                prompt: args.prompt,
-                ...(args.name === undefined ? {} : { description: args.name, name: args.name }),
-                ...(args.agentType === undefined ? {} : { subagentType: args.agentType }),
-                ...(args.model === undefined ? {} : { model: args.model }),
-                ...(args.cwd === undefined ? {} : { cwd: args.cwd }),
-            });
-            if (started.deny !== undefined)
-                throw new Error(`Claude Code refused the task: ${started.deny}`);
-            return { id: started.agentId ?? '', title: args.name ?? '', agentType: args.agentType ?? 'general-purpose', model: started.model, openedBy: '', openedAt: new Date().toISOString() };
-        }
+        if (action === 'startTask')
+            return spawnTask(claude, input);
         const { name, input: toolInput } = input;
-        return resultOf(place(), await claude.tool.call({ ...toolInput, tool: name }));
+        return resultOf(place(), { name, input: toolInput, cwd: await claude.session.cwd() }, await claude.tool.call({ ...toolInput, tool: name }));
+    };
+    const abortTurn = async (input, task) => {
+        const turnId = engineTurns.get(task ?? '');
+        if (turnId === undefined)
+            throw new Error(`no turn is running in ${task === undefined ? `session ${session}` : `task ${task}`}.`);
+        const asked = isObject(input) ? input['turn'] : undefined;
+        const open = task === undefined ? conversation.state.turn : conversation.state.taskTurns[task];
+        if (open?.prompt.id !== asked)
+            throw new Error(`turn ${String(asked)} has ended, so there is nothing to abort.`);
+        await claude.turn.abort({ turnId });
+        return null;
     };
     const performInTask = async (action, input, task) => {
         const running = conversation.state.tasks[task];
         if (action === 'usage')
             return json(['history', 'usage', session, '--task', task]);
-        if (action === 'clients')
+        if (action === 'surfaces')
             return running === undefined || running.closedAt !== undefined ? [] : [...(await claude.session.surfaces())];
         if (action !== 'send')
             throw new Error(`cmod: ${action} runs only on a session's own main loop.`);
@@ -378,7 +421,7 @@ export function serveConversations({ claude, router, store, project, report }) {
         const isLive = await isRunning(target);
         if (!isLive && action === 'usage')
             return json(['history', 'usage', target, ...(task === undefined ? [] : ['--task', task])]);
-        if (!isLive && action === 'clients')
+        if (!isLive && action === 'surfaces')
             return [];
         if (!isLive)
             throw ended(task ?? target);
@@ -424,8 +467,8 @@ export function serveConversations({ claude, router, store, project, report }) {
         },
         async [conversationMethods.search](request) {
             const before = isObject(request['before']) ? request['before'] : undefined;
-            const record = [...textArg('--session', request['session']), ...textArg('--task', request['task']), ...textArg('--turn', request['turn']), ...countArg('--context', request['context']), ...(request['isGoal'] === true ? ['--goal'] : [])];
-            return json(['history', 'search', String(request['text']), ...scopeArgs(request), ...record, ...(request['running'] === true ? ['--running'] : []), ...countArg('--limit', request['limit']), ...(before === undefined ? [] : ['--before', `${String(before['session'])}:${String(before['id'])}`])]);
+            const record = [...textArg('--session', request['session']), ...textArg('--task', request['task']), ...textArg('--turn', request['turn']), ...countArg('--context', request['context']), ...(request['isAgent'] === true ? ['--agent'] : [])];
+            return json(['history', 'search', String(request['text']), ...scopeArgs(request), ...record, ...(request['running'] === true ? ['--running'] : []), ...(before === undefined ? [] : ['--before', `${String(before['session'])}:${String(before['id'])}`])]);
         },
         async [conversationMethods.messages](request) {
             const id = String(request['session']);
@@ -523,7 +566,7 @@ export function serveConversations({ claude, router, store, project, report }) {
             const task = typeof request['task'] === 'string' ? request['task'] : undefined;
             if (!isAct(action))
                 throw new Error(`cmod takes no action named ${action}.`);
-            if (target === session)
+            if (target === (await claude.session.id()))
                 return perform(caller, action, request['input'], task);
             return actElsewhere(caller, target, action, request['input'], task);
         },
@@ -541,7 +584,8 @@ export function serveConversations({ claude, router, store, project, report }) {
             if (method === undefined)
                 return undefined;
             const input = isObject(e.input) ? e.input : {};
-            if (e.method !== conversationMethods.act && !(await isGranted(e.caller, 'conversation')))
+            const isDropping = (e.method === conversationMethods.subscribe || e.method === conversationMethods.watchBefore) && Array.isArray(input['subscriptions']) && input['subscriptions'].length === 0;
+            if (e.method !== conversationMethods.act && !isDropping && input['session'] !== (await claude.session.id()) && !(await isGranted(e.caller, 'conversation')))
                 return { deny: `${e.caller ?? 'A mod'} reads your conversations without your grant. Turn it on in /mods ${e.caller ?? ''}.`.trim() };
             try {
                 return { value: await method(input, e.caller) };

package/runtime/deadline.d.ts

@@ -5,5 +5,22 @@ export type Deadline = {
 };
 export declare const longestMs = 600000;
 export declare const toolDeadline: Deadline;
+export type ListenOptions = {
+    readonly timeoutMs?: number;
+    readonly onFailure?: 'pass' | 'refuse';
+};
+export type ListenTime = {
+    readonly deadline: number;
+    readonly signal: AbortSignal;
+};
+export declare const listenerMs = 10000;
+export declare class PassedTimeout extends Error {
+}
+export declare function listenerOf(name: string, method: string, args: readonly unknown[]): {
+    readonly matcher: unknown;
+    readonly listener: (payload: never, time: ListenTime) => unknown;
+    readonly options: ListenOptions;
+};
+export declare function withinTime<Value>(clock: Pick<Claude['clock'], 'now'>, method: string, { timeoutMs }: ListenOptions, run: (time: ListenTime) => Value | Promise<Value>): Promise<Value>;
 export declare function beforeDeadline<Value>(claude: Claude, { ms, job }: Deadline, call: string, task: Promise<Value>): Promise<Value>;
 //# sourceMappingURL=deadline.d.ts.map

package/runtime/deadline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deadline.d.ts","sourceRoot":"","sources":["../src/runtime/deadline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAErE,eAAO,MAAM,SAAS,SAAU,CAAA;AAEhC,eAAO,MAAM,YAAY,EAAE,QAAqC,CAAA;AAEhE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAe/H"}
+{"version":3,"file":"deadline.d.ts","sourceRoot":"","sources":["../src/runtime/deadline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAErE,eAAO,MAAM,SAAS,SAAU,CAAA;AAEhC,eAAO,MAAM,YAAY,EAAE,QAAqC,CAAA;AAEhE,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AAEnG,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;CAAE,CAAA;AAEpF,eAAO,MAAM,UAAU,QAAS,CAAA;AAEhC,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAI3C,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAA;CAAE,CASnN;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,SAAsB,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAezM;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAe/H"}