@cmodjs/core 4.0.3 → 4.1.0

package/runtime/widgets.js

@@ -1,10 +1,10 @@
-import { isObject, widgetsPath } from '../records.js';
+import { isObject, storeChangedPath, widgetsPath } from '../records.js';
 import { AbovePrompt, areas, BelowPrompt, TurnEnd, Working } from '../ui/areas.js';
 import { Box, drawWith } from '../ui/elements.js';
 import { ifMissing } from '../utils/paths.js';
 import { messageOf } from '../utils/text.js';
 import { cmodPluginName } from './dependencies.js';
-import { partMethods } from './ui.js';
+import { partMethods, styledAt, viewportColumns } from './ui.js';
 export const claudeHint = 'claude/hint';
 export const claudeModes = 'claude/modes';
 export const builtInWidgets = [
@@ -13,7 +13,7 @@ export const builtInWidgets = [
 ];
 const promptIndent = 4;
 const transcriptIndent = 2;
-const terminalColumns = 80;
+const widgetSizes = { fit: { flexShrink: 0 }, fill: { flexGrow: 1, flexShrink: 1, minWidth: 0 } };
 const separator = '';
 export function layoutOf(value) {
     const keys = (list) => (Array.isArray(list) ? list.filter((key) => typeof key === 'string') : []);
@@ -66,10 +66,12 @@ function declarationsOf(input) {
     const listed = isObject(input) && Array.isArray(input['widgets']) ? input['widgets'] : [];
     return listed.filter(isObject).flatMap((each) => {
         const known = Array.isArray(each['areas']) ? each['areas'].filter((area) => areas.includes(area)) : [];
-        return typeof each['id'] === 'string' && typeof each['title'] === 'string' && known.length > 0 ? [{ id: each['id'], title: each['title'], areas: known }] : [];
+        const { side, size } = isObject(each['place']) ? each['place'] : {};
+        const place = { ...(side === 'left' || side === 'right' ? { side } : {}), ...(size === 'fit' || size === 'fill' ? { size } : {}) };
+        return typeof each['id'] === 'string' && typeof each['title'] === 'string' && known.length > 0 ? [{ id: each['id'], title: each['title'], areas: known, place }] : [];
     });
 }
-export function serveWidgets({ claude, router, store, report, turnClosedBy, parts, }) {
+export function serveWidgets({ claude, router, store, report, turnClosedBy, parts, markdownIn, }) {
     const path = widgetsPath(store);
     const declared = new Map();
     let stored = layoutOf({});
@@ -83,7 +85,7 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
     };
     const read = async () => layoutOf(await readFile());
     const redraw = () => claude.ui.invalidate('ui.render');
-    const placed = () => [...builtInWidgets, ...[...declared].flatMap(([mod, list]) => list.map(({ id, title, areas: listed }) => ({ key: `${mod}/${id}`, mod, title, areas: listed })))];
+    const placed = () => [...builtInWidgets, ...[...declared].flatMap(([mod, list]) => list.map(({ id, title, areas: listed, place }) => ({ key: `${mod}/${id}`, mod, title, areas: listed, ...(place === undefined ? {} : { place }) })))];
     const change = (edit) => {
         saving = saving
             .then(async () => {
@@ -94,6 +96,7 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
             if (next !== current) {
                 const kept = isObject(file) ? file : {};
                 await claude.fs.write(path, `${JSON.stringify({ ...kept, ...next, areas: { ...(isObject(kept['areas']) ? kept['areas'] : {}), ...next.areas } }, null, 2)}\n`);
+                await claude.fs.write(storeChangedPath(store), '');
                 stored = next;
             }
             place();
@@ -107,9 +110,11 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
     };
     const withNewWidgets = (current) => placed()
         .filter(({ key, mod }) => mod !== 'claude' && placedIn(current, key) === undefined && !placedKeys.has(key))
-        .reduce((next, { key, areas: [area = AbovePrompt] }) => {
+        .reduce((next, { key, areas: [area = AbovePrompt], place }) => {
         const [first, ...rest] = next.areas[area];
-        return { ...next, areas: { ...next.areas, [area]: [{ ...first, left: [...(first?.left ?? []), key], right: first?.right ?? [] }, ...rest] } };
+        const row = { ...first, left: first?.left ?? [], right: first?.right ?? [] };
+        const side = place?.side ?? 'left';
+        return { ...next, areas: { ...next.areas, [area]: [{ ...row, [side]: [...row[side], key] }, ...rest] } };
     }, current);
     const ask = async (mod) => {
         try {
@@ -152,7 +157,10 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
     };
     const elementFor = (key, area, columns, turn) => {
         const widget = widgetOf(key);
-        return widget === undefined ? undefined : parts.element(widget.mod, cacheKey(key, area, columns, turn), `${key}:`, nameOf(widget), `widget:${key}`);
+        if (widget === undefined)
+            return undefined;
+        const element = parts.element(widget.mod, cacheKey(key, area, columns, turn), `${key}:`, nameOf(widget), `widget:${key}`);
+        return element === undefined ? undefined : Box({ ...widgetSizes[widget.place?.size ?? 'fit'], children: element });
     };
     const isHidden = (key) => layout.hidden.includes(key);
     const shown = (keys) => keys.filter((key) => !isHidden(key));
@@ -160,37 +168,38 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
         const side = (keys) => shown(keys).map((key) => elementFor(key, area, columns, turn)).filter((each) => each !== undefined);
         const left = side(row.left);
         const right = side(row.right);
-        return left.length + right.length === 0 ? [] : [Box({ justifyContent: 'space-between', width: columns, children: [Box({ gap: 2, children: left }), Box({ gap: 2, children: right })] })];
+        const group = (keys, children) => Box({ flexShrink: shown(keys).some((key) => widgetOf(key)?.place?.size === 'fill') ? 1 : 0, minWidth: 0, columnGap: 2, children });
+        return left.length + right.length === 0 ? [] : [Box({ justifyContent: 'space-between', width: columns, columnGap: 2, children: [group(row.left, left), group(row.right, right)] })];
     });
     const keysIn = (area) => layout.areas[area].flatMap((row) => shown([...row.left, ...row.right]));
-    const draw = async (area, table, columns, turn) => {
-        await Promise.all(keysIn(area).map((key) => fill(key, area, columns, turn)));
-        return drawWith(table, () => rowsNow(area, columns, turn));
+    const draw = async (area, table, at, turn) => {
+        await Promise.all(keysIn(area).map((key) => fill(key, area, at.columns, turn)));
+        return drawWith(table, () => rowsNow(area, at.columns, turn), markdownIn(table, at));
     };
     const rows = (area, columns) => {
         const started = keysIn(area).flatMap((key) => fill(key, area, columns, undefined) ?? []);
         if (started.length > 0)
-            void Promise.all(started).then(() => claude.ui.invalidate('ui.render'));
+            void Promise.all(started).then(redraw);
         return rowsNow(area, columns, undefined);
     };
     const column = (table, children) => drawWith(table, () => Box({ flexDirection: 'column', children }));
     const below = (table, above, added) => (added.length === 0 ? above : column(table, [above, ...added]));
     router.add('ui.render', async (e, next) => {
         const table = claude.ui.resolve(e);
-        const columns = (e.viewport?.columns ?? terminalColumns) - transcriptIndent;
+        const inTranscript = styledAt(e, viewportColumns(e) - transcriptIndent);
         if (e.component === 'AbovePrompt')
-            return e.props.hasSurvey ? next(e) : below(table, await next(e), await draw(AbovePrompt, table, e.props.bodyColumns));
+            return e.props.hasSurvey ? next(e) : below(table, await next(e), await draw(AbovePrompt, table, styledAt(e, e.props.bodyColumns)));
         if (e.component === 'PromptHint') {
-            const added = await draw(BelowPrompt, table, (e.viewport?.columns ?? terminalColumns) - promptIndent);
+            const added = await draw(BelowPrompt, table, styledAt(e, viewportColumns(e) - promptIndent));
             return isHidden(claudeHint) ? column(table, added) : below(table, await next(e), added);
         }
         if (e.component === 'SessionMode')
             return isHidden(claudeModes) ? column(table, []) : next(e);
         if (e.component === 'Spinner')
-            return below(table, await next(e), await draw(Working, table, columns));
+            return below(table, await next(e), await draw(Working, table, inTranscript));
         if (e.component === 'TurnDuration') {
             const turn = turnClosedBy(e.requestId);
-            return below(table, await next(e), turn === undefined ? [] : await draw(TurnEnd, table, columns, turn));
+            return below(table, await next(e), turn === undefined ? [] : await draw(TurnEnd, table, inTranscript, turn));
         }
         return next(e);
     });
@@ -204,7 +213,7 @@ export function serveWidgets({ claude, router, store, report, turnClosedBy, part
                 const isNewList = JSON.stringify(listed) !== JSON.stringify(declared.get(mod) ?? []);
                 declared.set(mod, listed);
                 if (isNewList)
-                    place();
+                    return place();
             }
             claude.ui.invalidate('ui.render');
         },

package/session/context/turn/message/attached-file.d.ts

@@ -0,0 +1,13 @@
+import type { MessageOf } from './message.js';
+export declare const AttachedFile = "attachedFile";
+export type AttachmentType = 'contents' | 'reference' | 'change';
+export type AttachedFile = MessageOf<typeof AttachedFile> & {
+    readonly path: string;
+    readonly attachmentType: AttachmentType;
+    readonly text: string;
+};
+export declare const attachmentTypes: Readonly<Record<string, AttachmentType>>;
+export declare function attachmentTypeOf(name: string | undefined): AttachmentType | undefined;
+export declare function attachmentNameOf(type: AttachmentType): string;
+export declare function attachedPathOf(text: string): string;
+//# sourceMappingURL=attached-file.d.ts.map

package/session/context/turn/message/attached-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attached-file.d.ts","sourceRoot":"","sources":["../../../../src/session/context/turn/message/attached-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,eAAO,MAAM,YAAY,iBAAiB,CAAA;AAE1C,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,WAAW,GAAG,QAAQ,CAAA;AAEhE,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,YAAY,CAAC,GAAG;IAC1D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAIpE,CAAA;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAErF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAI7D;AAMD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGnD"}

package/session/context/turn/message/attached-file.js

@@ -0,0 +1,21 @@
+export const AttachedFile = 'attachedFile';
+export const attachmentTypes = {
+    file: 'contents',
+    compact_file_reference: 'reference',
+    edited_text_file: 'change',
+};
+export function attachmentTypeOf(name) {
+    return name !== undefined && Object.hasOwn(attachmentTypes, name) ? attachmentTypes[name] : undefined;
+}
+export function attachmentNameOf(type) {
+    const name = Object.keys(attachmentTypes).find((each) => attachmentTypes[each] === type);
+    if (name === undefined)
+        throw new Error(`Claude Code writes no attachment row for a ${type} file.`);
+    return name;
+}
+const readPath = /^Called the Read tool with the following input: \{.*?"file_path":\s*("(?:[^"\\]|\\["\\/bfnrt]|\\u[0-9a-fA-F]{4})*")/m;
+const noted = /^Note: (.+?) (?:was read before the last conversation was summarized|changed on disk since you last read it)/m;
+export function attachedPathOf(text) {
+    const read = readPath.exec(text)?.[1];
+    return read === undefined ? (noted.exec(text)?.[1] ?? '') : JSON.parse(read);
+}

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

@@ -1,3 +1,4 @@
+import { AttachedFile } from './attached-file.js';
 import { InstructionFile } from './instruction-file.js';
 import { Note } from './note.js';
 import { Notice } from './notice.js';
@@ -7,7 +8,7 @@ import { Skill } from './skill.js';
 import { ToolCall, type CallFiles } from './tool-call.js';
 import { ToolResult } from './tool-result.js';
 export declare const Message = "message";
-export type MessageType = typeof Prompt | typeof Note | typeof Reply | typeof ToolCall | typeof ToolResult | typeof Skill | typeof InstructionFile | typeof Notice;
+export type MessageType = typeof Prompt | typeof Note | typeof Reply | typeof ToolCall | typeof ToolResult | typeof Skill | typeof InstructionFile | typeof AttachedFile | typeof Notice;
 export type MessageOf<Type extends MessageType> = {
     readonly id: string;
     readonly type: Type;
@@ -17,7 +18,7 @@ export type MessageOf<Type extends MessageType> = {
     readonly turn?: string;
     readonly task?: string;
 };
-export type Message = Prompt | Note | Reply | ToolCall | ToolResult | Skill | InstructionFile | Notice;
+export type Message = Prompt | Note | Reply | ToolCall | ToolResult | Skill | InstructionFile | AttachedFile | Notice;
 export type Placed = 'session' | 'context' | 'turn' | 'task';
 export type Unplaced<M extends Message = Message> = M extends Message ? Omit<M, Placed> : never;
 export type Row = {

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

@@ -1,5 +1,6 @@
 import { isObject } from '../../../../records.js';
 import { Task } from '../../../goal/task.js';
+import { AttachedFile, attachedPathOf, attachmentTypeOf } from './attached-file.js';
 import { InstructionFile, isRulePath } from './instruction-file.js';
 import { modNote, modNoteBlock, modNotesIn, Note } from './note.js';
 import { Notice } from './notice.js';
@@ -10,7 +11,7 @@ import { Skill } from './skill.js';
 import { ToolCall } from './tool-call.js';
 import { ToolResult } from './tool-result.js';
 export const Message = 'message';
-export const messageTypes = [Prompt, Note, Reply, ToolCall, ToolResult, Skill, InstructionFile, Notice];
+export const messageTypes = [Prompt, Note, Reply, ToolCall, ToolResult, Skill, InstructionFile, AttachedFile, Notice];
 export const skillPrefix = 'Base directory for this skill:';
 const rowTypes = ['user', 'assistant', 'attachment', 'system'];
 const interruption = /^\[Request interrupted by user( for tool use)?\]$/;
@@ -24,8 +25,9 @@ export function rowOfLine(row) {
         return undefined;
     const message = isObject(row['message']) ? row['message'] : {};
     const attachment = isObject(row['attachment']) ? row['attachment'] : {};
-    const content = type === 'attachment' ? attachment['content'] : type === 'system' ? row['content'] : message['content'];
     const name = type === 'attachment' ? attachment['type'] : row['subtype'];
+    const content = type === 'attachment' ? attachedContentOf(attachment) : type === 'system' ? row['content'] : message['content'];
+    const path = attachment['path'] ?? attachment['filename'];
     return {
         id: uuid,
         at: timestamp,
@@ -36,14 +38,20 @@ export function rowOfLine(row) {
         content: blocksOf(content),
         ...(row['origin'] === undefined ? {} : { origin: row['origin'] }),
         ...(typeof row['cwd'] === 'string' ? { cwd: row['cwd'] } : {}),
-        ...(typeof attachment['path'] === 'string' ? { path: attachment['path'] } : {}),
+        ...(typeof path === 'string' ? { path } : {}),
         ...(typeof message['model'] === 'string' ? { model: message['model'] } : {}),
     };
 }
+function attachedContentOf(attachment) {
+    if (attachment['type'] === 'edited_text_file')
+        return attachment['snippet'];
+    const file = isObject(attachment['content']) ? attachment['content']['file'] : undefined;
+    return attachment['type'] === 'file' && isObject(file) ? file['content'] : attachment['content'];
+}
 export function rowOfAppend(append, at, cwd) {
     const { message, origin } = append;
     const text = textOf(message.content);
-    const path = message.type === 'attachment' ? instructionPathOf(text) || undefined : undefined;
+    const path = message.type === 'attachment' ? (attachmentTypeOf(message.name) !== undefined ? attachedPathOf(text) : instructionPathOf(text)) || undefined : undefined;
     const model = isObject(origin) && origin['kind'] === 'model' && typeof origin['model'] === 'string' ? origin['model'] : undefined;
     return {
         id: append.uuid,
@@ -72,8 +80,12 @@ function unplacedOf(row, isInTask) {
         return row.name === 'turn_duration' || row.name === 'compact_boundary' || text === '' ? [] : [{ ...base, type: Notice, text }];
     if (row.type === 'attachment' && row.name === 'hook_additional_context')
         return notesFrom(row.content.flatMap((entry) => modNotesIn(typeof entry === 'string' ? entry : textOf([entry]))));
-    if (row.type === 'attachment')
-        return row.name === 'nested_memory' ? [{ ...base, type: InstructionFile, path: row.path ?? '', text, isRule: isRulePath(row.path ?? '') }] : [];
+    if (row.type === 'attachment' && row.name === 'nested_memory')
+        return [{ ...base, type: InstructionFile, path: row.path ?? '', text, isRule: isRulePath(row.path ?? '') }];
+    if (row.type === 'attachment') {
+        const attachmentType = attachmentTypeOf(row.name);
+        return attachmentType === undefined ? [] : [{ ...base, type: AttachedFile, path: row.path ?? '', attachmentType, text }];
+    }
     if (isModNotesRow(row))
         return notesFrom(modNotesIn(text));
     if (row.type === 'assistant') {
@@ -187,6 +199,8 @@ export function searchText(message) {
         return '';
     if (message.type === InstructionFile)
         return `${message.path}\n${message.text}`;
+    if (message.type === AttachedFile)
+        return message.path;
     return message.text;
 }
 function blocksOf(content) {

package/session/conversation.d.ts

@@ -3,7 +3,7 @@ import { Message, type Row } from './context/turn/message/message.js';
 import { ToolCall } from './context/turn/message/tool-call.js';
 import { TurnEnd, TurnStart, type Turn } from './context/turn/turn.js';
 import { GoalChange } from './goal/goal.js';
-import { Task, TaskEnd, TaskStart } from './goal/task.js';
+import { Task, TaskEnd, TaskStart, type TaskStatus } from './goal/task.js';
 import type { UsageChange, Usage } from './session.js';
 export type SessionData = {
     readonly id: string;
@@ -20,11 +20,21 @@ export type SessionData = {
 export type ContextData = Pick<Context, 'number' | 'openedAt' | 'closedAt' | 'task'>;
 export type TurnData = Pick<Turn, 'prompt' | 'context' | 'openedAt' | 'closedAt' | 'answer' | 'reason' | 'failure'>;
 export type TurnEnding = Pick<Turn, 'answer' | 'reason' | 'failure'>;
-export type TaskData = Pick<Task, 'id' | 'title' | 'openedBy' | 'openedAt' | 'closedAt'> & {
-    readonly agentType: string;
+export type TaskData = Pick<Task, 'id' | 'title' | 'openedBy' | 'openedAt' | 'closedAt' | 'status' | 'name' | 'spawnedBy' | 'isBackground'> & {
+    readonly agentType?: string;
     readonly model?: string;
     readonly parent?: string;
+    readonly forkedFrom?: string;
+};
+export declare const forkAgentType = "fork";
+export declare function ownerOfSpawn(agentType: string | undefined, session: string): Pick<TaskData, 'agentType' | 'forkedFrom'>;
+type Agent = {
+    readonly id: string;
+    readonly status: TaskStatus;
+    readonly name?: string;
+    readonly spawnedBy?: string;
 };
+export declare function tasksWithAgents(tasks: readonly TaskData[], agents: readonly Agent[]): TaskData[];
 export type RunningTask = TaskData & {
     readonly context: number;
     readonly contextOpenedAt?: string;
@@ -68,6 +78,7 @@ type OpenCall = Pick<ToolCall, 'name' | 'input' | 'cwd'>;
 export type Conversation = {
     add(row: Row, task?: string): SessionChange[];
     startTask(task: TaskData): SessionChange[];
+    endTask(task: TaskData, at: string): SessionChange[];
     startContext(at: string): SessionChange[];
     endTurn(at: string, ending: TurnEnding, task?: string): SessionChange[];
     changeGoal(text: string): SessionChange[];

package/session/conversation.d.ts.map

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

package/session/conversation.js

@@ -7,6 +7,17 @@ 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 forkAgentType = 'fork';
+export function ownerOfSpawn(agentType, session) {
+    return agentType === forkAgentType ? { forkedFrom: session } : { agentType: agentType ?? 'general-purpose' };
+}
+export function tasksWithAgents(tasks, agents) {
+    const byId = new Map(agents.map((agent) => [agent.id, agent]));
+    return tasks.map((task) => {
+        const agent = byId.get(task.id);
+        return agent === undefined ? task : { ...task, status: agent.status, ...(agent.name === undefined ? {} : { name: agent.name }), ...(agent.spawnedBy === undefined ? {} : { spawnedBy: agent.spawnedBy }) };
+    });
+}
 export const searchLimit = 50;
 const agentTools = ['Agent', 'Task'];
 const asyncLaunch = 'Async agent launched';
@@ -51,7 +62,7 @@ export function createConversation(start) {
         turn = undefined;
         return [{ type: TurnEnd, turn: ended }];
     };
-    const endTask = (call, at, only) => {
+    const endCall = (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))
@@ -113,11 +124,11 @@ export function createConversation(start) {
                 if (placed.type === ToolCall && agentTools.includes(placed.name))
                     agentCalls.add(placed.callId);
                 if (placed.type === ToolResult && agentCalls.has(placed.callId) && !String(placed.output).startsWith(asyncLaunch))
-                    changes.push(...endTask(placed.callId, row.at));
+                    changes.push(...endCall(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')));
+                        changes.push(...endCall(call, row.at, tagOf(textOf(row.content), 'task-id')));
                 }
             }
             return changes;
@@ -131,9 +142,17 @@ export function createConversation(start) {
             const changes = [{ type: TaskStart, task: started }];
             const endedAt = endedCalls.get(data.openedBy);
             if (endedAt !== undefined)
-                changes.push(...endTask(data.openedBy, endedAt, data.id));
+                changes.push(...endCall(data.openedBy, endedAt, data.id));
             return changes;
         },
+        endTask(data, at) {
+            const open = tasks.get(data.id) ?? { ...data, context };
+            if (open.closedAt !== undefined)
+                return [];
+            const ended = { ...open, closedAt: at };
+            tasks.set(data.id, ended);
+            return [...endTaskTurn(data.id, at), { type: TaskEnd, task: ended }];
+        },
         startContext,
         endTurn: (at, ending, task) => (task === undefined ? endTurn(at, ending) : endTaskTurn(task, at, ending)),
         changeGoal,

package/session/goal/task.d.ts

@@ -3,6 +3,7 @@ import type { RecordPart, TaskOwner } from '../session.js';
 export declare const Task = "task";
 export declare const TaskStart = "taskStart";
 export declare const TaskEnd = "taskEnd";
+export type TaskStatus = 'pending' | 'running' | 'waiting' | 'idle' | 'completed' | 'failed' | 'killed';
 export type Task = RecordPart & {
     readonly id: string;
     readonly title: string;
@@ -10,6 +11,10 @@ export type Task = RecordPart & {
     readonly openedBy: string;
     readonly openedAt: string;
     readonly closedAt?: string;
+    readonly status?: TaskStatus;
+    readonly name?: string;
+    readonly spawnedBy?: string;
+    readonly isBackground?: true;
     tasks(): Promise<Task[]>;
     messages(): Promise<Message[]>;
 };

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

@@ -1 +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,SAAS,EAAE,MAAM,eAAe,CAAA;AAE1D,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,SAAS,CAAA;IACzB,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"}
+{"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,SAAS,EAAE,MAAM,eAAe,CAAA;AAE1D,eAAO,MAAM,IAAI,SAAS,CAAA;AAE1B,eAAO,MAAM,SAAS,cAAc,CAAA;AAEpC,eAAO,MAAM,OAAO,YAAY,CAAA;AAEhC,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEvG,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,SAAS,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,UAAU,CAAA;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAA;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACxB,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CAC/B,CAAA"}

package/session/session.d.ts

@@ -2,6 +2,7 @@ import type { Subscription } from '../utils/subscription.js';
 import type { Matcher } from '../utils/matcher.js';
 import type { Sender } from './context/turn/message/sender.js';
 import type { Context, ContextEnd, ContextStart } from './context/context.js';
+import type { AttachedFile } from './context/turn/message/attached-file.js';
 import type { InstructionFile } from './context/turn/message/instruction-file.js';
 import type { Message, MessageType } from './context/turn/message/message.js';
 import type { Note } from './context/turn/message/note.js';
@@ -27,6 +28,7 @@ export type SessionPayload = {
     readonly toolResult: ToolResult;
     readonly skill: Skill;
     readonly instructionFile: InstructionFile;
+    readonly attachedFile: AttachedFile;
     readonly notice: Notice;
     readonly contextStart: Context;
     readonly contextEnd: Context;
@@ -55,13 +57,18 @@ export type BeforeAnswer = {
     readonly instructionFile: {
         readonly text: string;
     } | Refusal;
+    readonly attachedFile: {
+        readonly text: string;
+    } | Refusal;
     readonly reply: {
         readonly text: string;
     };
     readonly toolCall: {
-        readonly input: Readonly<Record<string, unknown>>;
+        readonly input?: Readonly<Record<string, unknown>>;
+        readonly note?: string;
     } | {
         readonly result: string;
+        readonly note?: string;
     } | Refusal;
     readonly toolResult: {
         readonly output?: unknown;
@@ -72,11 +79,18 @@ export type BeforeAnswer = {
         readonly text: string;
     };
     readonly taskStart: {
-        readonly owner: {
-            readonly model: string;
+        readonly prompt?: string;
+        readonly title?: string;
+        readonly owner?: {
+            readonly agentType?: string;
+            readonly model?: string;
+            readonly cwd?: string;
         };
+        readonly isAsync?: boolean;
+    } | Refusal;
+    readonly turnEnd: {
+        readonly note: string;
     } | Refusal;
-    readonly turnEnd: Refusal;
     readonly contextEnd: Refusal;
 };
 export type BeforeEvent = keyof BeforeAnswer;
@@ -87,10 +101,16 @@ export type Usage = {
         readonly size?: number;
         readonly percent?: number;
     };
+    readonly rateLimits?: readonly RateLimit[];
     readonly cost?: {
         readonly usd: number;
     };
 };
+export type RateLimit = {
+    readonly type: string;
+    readonly percent: number;
+    readonly resetsAt?: string;
+};
 export type Surface = 'terminal' | 'desktop' | 'mobile' | 'vscode';
 export declare const sessionEvents: {
     readonly Message: 'message';
@@ -101,6 +121,7 @@ export declare const sessionEvents: {
     readonly ToolResult: 'toolResult';
     readonly Skill: 'skill';
     readonly InstructionFile: 'instructionFile';
+    readonly AttachedFile: 'attachedFile';
     readonly Notice: 'notice';
     readonly ContextStart: 'contextStart';
     readonly ContextEnd: 'contextEnd';
@@ -111,7 +132,7 @@ export declare const sessionEvents: {
     readonly GoalChange: 'goalChange';
     readonly UsageChange: 'usageChange';
 };
-export declare const beforeEvents: readonly ["Prompt", "Note", "Skill", "InstructionFile", "Reply", "ToolCall", "ToolResult", "Notice", "TaskStart", "TurnEnd", "ContextEnd"];
+export declare const beforeEvents: readonly ["Prompt", "Note", "Skill", "InstructionFile", "AttachedFile", "Reply", "ToolCall", "ToolResult", "Notice", "TaskStart", "TurnEnd", "ContextEnd"];
 export type EventName = keyof typeof sessionEvents;
 export type BeforeName = (typeof beforeEvents)[number];
 export type PayloadOf<Name extends EventName> = SessionPayload[(typeof sessionEvents)[Name]];
@@ -156,6 +177,7 @@ export type TaskStartArgs = {
     readonly title: string;
     readonly name?: string;
     readonly cwd?: string;
+    readonly isBackground?: boolean;
 };
 export type ToolCallArgs = {
     readonly name: string;
@@ -185,11 +207,13 @@ export type Session = RecordPart & {
     }): Promise<Message[]>;
     send(message: SessionSend): Promise<void>;
     startTask(task: TaskStartArgs): Promise<Task>;
+    fork(task: Pick<TaskStartArgs, 'prompt' | 'title'>): Promise<Task>;
+    clone(task: Pick<TaskStartArgs, 'prompt' | 'title'>): Promise<Task>;
     callTool(call: ToolCallArgs): Promise<ToolResult>;
     usage(): Promise<Usage>;
     surfaces(): Promise<Surface[]>;
 };
-export type TaskOwner = Omit<Session, 'startTask' | 'callTool'>;
+export type TaskOwner = Omit<Session, 'startTask' | 'callTool' | 'fork' | 'clone'>;
 export declare const processEvents: {
     readonly ProjectSetup: {
         readonly on: 'Setup';
@@ -429,7 +453,9 @@ export type ProcessAsked = Omit<ProcessPayload, 'SessionStart'> & {
     readonly SessionStart: SessionStartAsked;
 };
 export type ProcessAnswer = {
-    readonly ProjectSetup: Record<never, never>;
+    readonly ProjectSetup: {
+        readonly note: string;
+    };
     readonly SessionStart: {
         readonly note?: string;
         readonly title?: string;
@@ -438,6 +464,8 @@ export type ProcessAnswer = {
     };
     readonly ModelChange: {
         readonly ask: string;
+    } | {
+        readonly note: string;
     } | Refusal;
     readonly WorktreeCreate: {
         readonly result: string;