@myagentroam/agent 0.10.60 → 0.10.61

package/dist/agent-core/sdk/agent.js

@@ -100,7 +100,7 @@ export async function createMarAgentWithAdapter(options) {
             return schedule(definition, run);
         },
         baseTools: (id, context) => {
-            const execution = sessionRuntimes.get(id)?.toolSources;
+            const execution = sessionRuntimes.get(id)?.execution?.toolSources;
             if (context?.executionId && execution?.executionId === context.executionId)
                 return execution.bindings;
             return (options.host.extensionPorts?.tools?.catalog(id, context?.executionId) ?? []).map((source) => ({

package/dist/agent-core/sdk/extension-agents.js

@@ -28,7 +28,11 @@ export function createExtensionAgentsBackend(input) {
                     throw new MarAgentError(created.errorCode ?? 'MAR_AGENT_SUBAGENT_FAILED', created.errorMessage ?? 'Agent could not start.');
             }
         })),
-        list: (call) => withController(call, async (controller) => controller.inspectAll()),
+        list: (call) => withController(call, async (controller) => {
+            await controller.prepareAll(call.signal);
+            call.signal.throwIfAborted();
+            return controller.inspectAll();
+        }),
         inspect: (target, call) => withController(call, (controller) => controller.inspect(target.agentId)),
         wait: (target, call) => withController(call, (controller) => {
             const selection = parseAgentWaitTargets(target);

package/dist/agent-core/sdk/session.d.ts

@@ -14,9 +14,25 @@ import { JsonlSessionStore } from '../session/store/index.js';
 import { SubagentSessionController, type SubagentMailboxMessage, type SubagentMessageDelivery, type SubagentTurnHandle } from '../subagent/session-controller.js';
 import { createSessionToolScheduler } from '../tools/scheduler.js';
 import { TodoStore } from '../tools/agent/todo.js';
-import type { CreateMarAgentOptions, ExecutionResult, MarAgentSession } from './types.js';
-export interface SessionRuntime {
+import type { CreateMarAgentOptions, ExecutionMode, ExecutionResult, MarAgentSession } from './types.js';
+interface SessionExecutionContext {
+    readonly executionId: string;
+    readonly modelId: string;
+    readonly mode: ExecutionMode;
+    readonly models: ReadonlyMap<string, ResolvedModelConfiguration>;
+    readonly instruction: string | undefined;
     steer?: (input: import('./types.js').SteerInput) => Promise<import('./types.js').SteerResult>;
+    compactRequests?: CompactRequests;
+    requestMessages?: {
+        read(): readonly ModelMessage[];
+    };
+    appendedMessages?: {
+        append(recordId: string, message: ModelMessage): void;
+    };
+    toolSources?: ExecutionToolSources;
+}
+export interface SessionRuntime {
+    execution?: SessionExecutionContext;
     todo?: TodoStore;
     readonly scheduleTool: ReturnType<typeof createSessionToolScheduler>;
     readonly sourceType: 'user' | 'subagent';
@@ -26,22 +42,12 @@ export interface SessionRuntime {
     subagents?: SubagentSessionController;
     subagentsOpening?: Promise<SubagentSessionController>;
     inputs?: SessionInputCoordinator;
-    compactRequests?: CompactRequests;
     requestSnapshots?: ExtensionRequestSnapshots;
-    requestMessages?: {
-        readonly executionId: string;
-        read(): readonly ModelMessage[];
-    };
     recordProjection?: Promise<unknown>;
-    appendedMessages?: {
-        readonly executionId: string;
-        append(recordId: string, message: ModelMessage): void;
-    };
     sessionBackend?: CoreSessionBackend & {
         kick(): void;
     };
     agentsBackend?: CoreAgentsBackend;
-    toolSources?: ExecutionToolSources;
 }
 interface InternalMarAgentSession extends MarAgentSession {
     startSubagentTurn(input: {

package/dist/agent-core/sdk/session.js

@@ -123,7 +123,6 @@ export function createSessionOpener(services) {
                 text: sessionSource.type === 'subagent' ? childSubagentInstruction || null : null
             }
         ]);
-        let promptDefaults;
         const sessionAdapter = (modelId, configuredModels) => {
             let selected = sessionRuntime.adapters.get(modelId);
             if (selected === undefined) {
@@ -187,7 +186,7 @@ export function createSessionOpener(services) {
                     };
                     recordSessionInputCommit(entry, result);
                     if (message)
-                        sessionRuntime.appendedMessages?.append(record.recordId, message);
+                        sessionRuntime.execution?.appendedMessages?.append(record.recordId, message);
                     return result;
                 });
             }
@@ -208,7 +207,6 @@ export function createSessionOpener(services) {
             const messageSources = new WeakMap();
             let liveModelMessages = [];
             const compactRequests = new CompactRequests(executionId, () => compactCoordinator.assertNotReentrant());
-            sessionRuntime.compactRequests = compactRequests;
             const permissionPolicy = new ExecutionToolPermissions(mode === 'compact' ? 'full-access' : resolvePermissionMode(input.permissionMode), { sessionId, executionId }, host.requestToolApproval
                 ? {
                     request: (request, signal) => host.requestToolApproval(request, signal),
@@ -225,13 +223,15 @@ export function createSessionOpener(services) {
                 ...currentLocalTimeContext()
             };
             const executionSystemInstruction = settings.systemInstruction;
-            promptDefaults = {
+            const executionContext = {
                 executionId,
                 modelId: input.modelId ?? executionDefaultModelId,
                 mode: mode === 'compact' ? 'run' : mode,
                 models: executionModels,
-                instruction: executionSystemInstruction
+                instruction: executionSystemInstruction,
+                compactRequests
             };
+            sessionRuntime.execution = executionContext;
             const manualCompactionId = mode === 'compact' ? randomUUID() : undefined;
             active.set(`${sessionId}:${executionId}`, controller);
             const inputs = sessionInputs();
@@ -369,8 +369,7 @@ export function createSessionOpener(services) {
                         await inputs.idle();
                     let immediateTarget;
                     const pendingAppends = [];
-                    sessionRuntime.appendedMessages = {
-                        executionId,
+                    executionContext.appendedMessages = {
                         append(recordId, message) {
                             pendingAppends.push({
                                 recordId,
@@ -755,7 +754,7 @@ export function createSessionOpener(services) {
                     const coreExtensions = await services.extensions.prepare(sessionId, controller.signal, sourceBindings, sessionSource.type === 'user' &&
                         (mode === 'run' || mode === 'plan') &&
                         !internal.automaticInput);
-                    sessionRuntime.toolSources = sources;
+                    executionContext.toolSources = sources;
                     const operation = (run) => services.extensions.operations.run({
                         sessionId,
                         sessionEpoch: coreExtensions.epoch,
@@ -863,6 +862,7 @@ export function createSessionOpener(services) {
                         executionTools = mcpRegistry.project(baseTools());
                     };
                     const loadRetainedSessionResources = async () => {
+                        await subagents?.prepareSessionResources(controller.signal);
                         const hostResources = (await host.listSessionResources?.(sessionId)) ?? {
                             processes: []
                         };
@@ -1128,8 +1128,7 @@ export function createSessionOpener(services) {
                     sources.bind(captureRoundToolScope().toolScope);
                     let preparingRequestMessages;
                     let preparingRequestBaseLength = 0;
-                    sessionRuntime.requestMessages = {
-                        executionId,
+                    executionContext.requestMessages = {
                         read: () => preparingRequestMessages !== undefined
                             ? normalizeMessagesForModel([...preparingRequestMessages, ...messages.slice(preparingRequestBaseLength)], { supportsImages: selectedModel.inputCapabilities.includes('IMAGE') })
                             : projectSessionRequestMessages(messages.map((message, index) => index === currentExecutionUserIndex && modelInputImages?.length
@@ -1192,7 +1191,7 @@ export function createSessionOpener(services) {
                             return { executionId, status: 'completed', finalAnswer: '', inputHandled: true };
                         }
                         acceptsSteer = true;
-                        sessionRuntime.steer = createNativeSteer({
+                        executionContext.steer = createNativeSteer({
                             executionId,
                             inputs,
                             signal: controller.signal,
@@ -1885,12 +1884,12 @@ export function createSessionOpener(services) {
                     finalAnswer = executionLoop?.finalAnswer ?? finalAnswer;
                     acceptsMailbox = false;
                     acceptsSteer = false;
-                    delete sessionRuntime.steer;
+                    delete executionContext.steer;
                     await sessionRuntime.recordProjection?.catch(() => undefined);
                     await compactCoordinator.close(error);
                     compactRequests.close(new MarAgentError('MAR_AGENT_CANCELLED', 'Execution ended.'));
-                    if (sessionRuntime.compactRequests === compactRequests)
-                        delete sessionRuntime.compactRequests;
+                    if (executionContext.compactRequests === compactRequests)
+                        delete executionContext.compactRequests;
                     if (controller.signal.aborted) {
                         subagents?.endParentExecution(executionId);
                         await emit({ type: 'execution.cancelled' });
@@ -1912,19 +1911,16 @@ export function createSessionOpener(services) {
                     };
                 }
                 finally {
-                    if (sessionRuntime.requestMessages?.executionId === executionId)
-                        delete sessionRuntime.requestMessages;
+                    delete executionContext.requestMessages;
                     compactRequests.close(new MarAgentError('MAR_AGENT_CANCELLED', 'Execution ended.'));
-                    if (sessionRuntime.compactRequests === compactRequests)
-                        delete sessionRuntime.compactRequests;
-                    if (sessionRuntime.appendedMessages?.executionId === executionId)
-                        delete sessionRuntime.appendedMessages;
-                    if (promptDefaults?.executionId === executionId)
-                        promptDefaults = undefined;
+                    if (executionContext.compactRequests === compactRequests)
+                        delete executionContext.compactRequests;
+                    delete executionContext.appendedMessages;
+                    delete executionContext.steer;
                     acceptsMailbox = false;
                     executionToolSources?.close();
-                    if (sessionRuntime.toolSources === executionToolSources)
-                        delete sessionRuntime.toolSources;
+                    if (executionContext.toolSources === executionToolSources)
+                        delete executionContext.toolSources;
                     internal.signal?.removeEventListener('abort', abortSource);
                     await compactCoordinator.close(controller.signal.reason ?? new MarAgentError('MAR_AGENT_CANCELLED', 'Execution ended.'));
                     await selectedTurn?.close().catch(() => undefined);
@@ -1940,6 +1936,8 @@ export function createSessionOpener(services) {
                     }
                     subagents?.endParentExecution(executionId);
                     await releaseSession?.();
+                    if (sessionRuntime.execution === executionContext)
+                        delete sessionRuntime.execution;
                     active.delete(`${sessionId}:${executionId}`);
                     sessionRuntime.sessionBackend?.kick();
                     queue.close();
@@ -1974,20 +1972,15 @@ export function createSessionOpener(services) {
         sessionRuntime.sessionBackend ??= createExtensionSessionBackend({
             describe: async (call) => {
                 call.signal.throwIfAborted();
+                const defaults = sessionRuntime.execution;
+                const state = defaults ?? services.modelState();
+                const modelId = defaults?.modelId ?? services.modelState().defaultModelId;
                 const current = await store.getSession(sessionId);
-                const records = await store.read(sessionId);
+                const userTurns = await store.userTurnCount(sessionId);
                 call.signal.throwIfAborted();
-                const state = promptDefaults ?? services.modelState();
-                const modelId = promptDefaults?.modelId ?? services.modelState().defaultModelId;
                 const model = state.models.get(modelId);
                 if (!model)
                     throw new MarAgentError('MAR_AGENT_MODEL_DISABLED', 'Selected model is unavailable.');
-                const userTurns = records.filter((record) => {
-                    if (record.type !== 'turn.user')
-                        return false;
-                    const payload = record.payload;
-                    return payload.inputSource === undefined;
-                }).length;
                 return {
                     sessionId,
                     ...(logicalWorkspace ? { cwd: logicalWorkspace, root: logicalWorkspace } : {}),
@@ -2000,9 +1993,10 @@ export function createSessionOpener(services) {
             },
             composePrompt: async (facts, call) => {
                 call.signal.throwIfAborted();
-                const defaults = promptDefaults;
+                const defaults = sessionRuntime.execution;
                 const state = defaults ?? services.modelState();
                 const modelId = facts.modelId ?? defaults?.modelId ?? services.modelState().defaultModelId;
+                const instruction = defaults ? defaults.instruction : settings.systemInstruction;
                 const model = state.models.get(modelId);
                 if (!model)
                     throw new MarAgentError('MAR_AGENT_MODEL_DISABLED', 'Selected model is unavailable.');
@@ -2047,7 +2041,7 @@ export function createSessionOpener(services) {
                 });
                 call.signal.throwIfAborted();
                 return {
-                    sections: buildSessionPromptSections(tools, mode, model, defaults?.instruction ?? settings.systemInstruction, instructions?.skillCatalog),
+                    sections: buildSessionPromptSections(tools, mode, model, instruction, instructions?.skillCatalog),
                     facts: { modelId, mode, tools: tools.map((tool) => tool.name) }
                 };
             },
@@ -2075,8 +2069,9 @@ export function createSessionOpener(services) {
                 }
                 call.signal.throwIfAborted();
                 const targetRuntime = sessionRuntimes.get(target);
-                if (selection.view === 'request' && targetRuntime?.requestMessages)
-                    return sessionMessagesPage(targetRuntime.requestMessages.read(), selection);
+                const requestMessages = targetRuntime?.execution?.requestMessages;
+                if (selection.view === 'request' && requestMessages)
+                    return sessionMessagesPage(requestMessages.read(), selection);
                 const modelState = services.modelState();
                 const requestModel = selection.view === 'request'
                     ? modelState.models.get(targetModelId ?? modelState.defaultModelId)
@@ -2215,8 +2210,8 @@ export function createSessionOpener(services) {
             id: sessionId,
             run: (input) => execution('run', input),
             plan: (input) => execution('plan', input),
-            steer: (input) => sessionRuntime.steer?.(input) ?? Promise.resolve({ status: 'notAccepted' }),
-            compact: (input = {}) => sessionRuntime.compactRequests?.request(input) ??
+            steer: (input) => sessionRuntime.execution?.steer?.(input) ?? Promise.resolve({ status: 'notAccepted' }),
+            compact: (input = {}) => sessionRuntime.execution?.compactRequests?.request(input) ??
                 execution('compact', {
                     prompt: input.prompt ?? DEFAULT_COMPACTION_FOCUS,
                     ...input

package/dist/agent-core/sdk/subagent-backend.js

@@ -14,33 +14,36 @@ export function createSubagentBackend(store, workspace) {
         },
         listChildren: async (parentSessionId) => {
             const sessions = await store.listSubagentChildren(parentSessionId);
-            return Promise.all(sessions.map(async (session) => ({
+            return sessions.map((session) => ({
                 id: session.id,
                 createdAt: session.createdAt,
                 lastActivityAt: session.lastActivityAt,
-                source: session.source,
-                records: await store.read(session.id)
-            })));
+                source: session.source
+            }));
         },
         loadChild: async (parentSessionId, childSessionId) => {
-            let session;
             try {
-                session = await store.getSession(childSessionId);
+                const session = await store.getSession(childSessionId);
+                if (session.source.type !== 'subagent' ||
+                    session.source.parentSessionId !== parentSessionId)
+                    return undefined;
+                return {
+                    id: session.id,
+                    createdAt: session.createdAt,
+                    lastActivityAt: session.lastActivityAt,
+                    source: session.source,
+                    records: await store.read(session.id)
+                };
             }
             catch (error) {
-                if (error instanceof MarAgentError && error.code === 'MAR_AGENT_SESSION_NOT_FOUND')
-                    return undefined;
+                if (error instanceof MarAgentError && error.code === 'MAR_AGENT_SESSION_NOT_FOUND') {
+                    // A history read failure is not proof that the child was deleted.
+                    const children = await store.listSubagentChildren(parentSessionId);
+                    if (!children.some((child) => child.id === childSessionId))
+                        return undefined;
+                }
                 throw error;
             }
-            if (session.source.type !== 'subagent' || session.source.parentSessionId !== parentSessionId)
-                return undefined;
-            return {
-                id: session.id,
-                createdAt: session.createdAt,
-                lastActivityAt: session.lastActivityAt,
-                source: session.source,
-                records: await store.read(session.id)
-            };
         }
     };
 }

package/dist/agent-core/session/store/directory-index.d.ts

@@ -1,7 +1,7 @@
 import type { SessionListInput, SessionSource } from '../types.js';
 import type { SessionIndex, SessionMeta } from './types.js';
-/** Merge a derived cache only onto the unchanged history it was computed from. */
-export declare function mergeFirstUserMessagePreviewCache(current: SessionMeta, cached: SessionMeta): SessionMeta;
+/** Merge only derived fields, and only onto the history they were computed from. */
+export declare function mergeSessionDerivedCache(current: SessionMeta, cached: SessionMeta): SessionMeta;
 export declare function readSessionIndex(path: string): Promise<SessionIndex | undefined>;
 export declare function persistSessionIndex(path: string, index: SessionIndex): Promise<void>;
 export declare function normalizeSessionSource(value: SessionSource | undefined): SessionSource;

package/dist/agent-core/session/store/directory-index.js

@@ -2,21 +2,25 @@ import { randomUUID } from 'node:crypto';
 import { readFile, rename, rm, writeFile } from 'node:fs/promises';
 import { isDeepStrictEqual } from 'node:util';
 import { MarAgentError } from '../../error.js';
-/** Merge a derived cache only onto the unchanged history it was computed from. */
-export function mergeFirstUserMessagePreviewCache(current, cached) {
-    if (cached.resume?.firstUserMessageIndexed !== true ||
-        current.nextSequence !== cached.nextSequence ||
-        current.storageTransactionId !== cached.storageTransactionId ||
-        current.resume?.firstUserMessagePreview !== undefined ||
-        (current.resume?.firstUserMessageIndexed === true &&
-            cached.resume.firstUserMessagePreview === undefined))
+/** Merge only derived fields, and only onto the history they were computed from. */
+export function mergeSessionDerivedCache(current, cached) {
+    if (current.nextSequence !== cached.nextSequence ||
+        current.storageTransactionId !== cached.storageTransactionId)
+        return current;
+    const preview = cached.resume?.firstUserMessageIndexed === true &&
+        current.resume?.firstUserMessagePreview === undefined &&
+        !(current.resume?.firstUserMessageIndexed === true &&
+            cached.resume.firstUserMessagePreview === undefined);
+    const count = current.resume?.userTurns === undefined && cached.resume?.userTurns !== undefined;
+    if (!preview && !count)
         return current;
     return {
         ...current,
         resume: {
             ...(current.resume ?? { version: 1, todoRevision: 0 }),
-            firstUserMessageIndexed: true,
-            ...(cached.resume?.firstUserMessagePreview === undefined
+            ...(count ? { userTurns: cached.resume.userTurns } : {}),
+            ...(preview ? { firstUserMessageIndexed: true } : {}),
+            ...(!preview || cached.resume?.firstUserMessagePreview === undefined
                 ? {}
                 : { firstUserMessagePreview: cached.resume.firstUserMessagePreview })
         }
@@ -45,7 +49,9 @@ export async function readSessionIndex(path) {
                 typeof session.createdAt !== 'string' ||
                 typeof session.lastActivityAt !== 'string' ||
                 !Number.isSafeInteger(session.nextSequence) ||
-                session.nextSequence < 1))
+                session.nextSequence < 1 ||
+                (session.resume?.userTurns !== undefined &&
+                    (!Number.isSafeInteger(session.resume.userTurns) || session.resume.userTurns < 0))))
             throw new Error('invalid index shape');
         return value;
     }

package/dist/agent-core/session/store/execution-state.d.ts

@@ -3,6 +3,7 @@ import type { CompactHistoryMessage, SessionExecutionState, SessionMeta, Session
 export declare function deriveExecutionState(records: readonly SessionRecord[]): SessionExecutionState & {
     resume: NonNullable<SessionMeta['resume']>;
 };
+export declare function isNativeUserTurn(record: SessionRecord): boolean;
 export declare function userMessagePreviewFromRecord(record: SessionRecord): string | undefined;
 export declare function executionModelFromRecord(record: SessionRecord): {
     modelId: string;

package/dist/agent-core/session/store/execution-state.js

@@ -9,7 +9,10 @@ export function deriveExecutionState(records) {
     let todoItems = [];
     let executionModel;
     let firstUserMessagePreview;
+    let userTurns = 0;
     for (const record of records) {
+        if (isNativeUserTurn(record))
+            userTurns++;
         firstUserMessagePreview ??= userMessagePreviewFromRecord(record);
         if (record.type === 'session.created')
             automaticTitle =
@@ -40,6 +43,7 @@ export function deriveExecutionState(records) {
         contextRecords: boundary < 0 ? [...records] : records.slice(boundary),
         resume: {
             version: 1,
+            userTurns,
             ...(compactSequence === undefined ? {} : { compactSequence }),
             ...(checkpoint === undefined
                 ? {}
@@ -57,6 +61,10 @@ export function deriveExecutionState(records) {
         }
     };
 }
+export function isNativeUserTurn(record) {
+    return (record.type === 'turn.user' &&
+        record.payload.inputSource === undefined);
+}
 export function userMessagePreviewFromRecord(record) {
     if (record.type !== 'turn.user' ||
         !isObject(record.payload) ||
@@ -160,6 +168,7 @@ export function isCompactCheckpoint(record) {
 }
 export function sameResumeIndex(left, right) {
     return (left?.version === right.version &&
+        left.userTurns === right.userTurns &&
         left.compactSequence === right.compactSequence &&
         left.gcSequence === right.gcSequence &&
         left.gcGeneration === right.gcGeneration &&

package/dist/agent-core/session/store/jsonl-store.d.ts

@@ -24,7 +24,6 @@ export declare class JsonlSessionStore {
         workspace: string;
         source?: SessionSource;
     }): Promise<SessionMeta>;
-    sessionDirectory(sessionId: string): string;
     readContextualWorldState(sessionId: string): Promise<unknown | undefined>;
     writeContextualWorldState(sessionId: string, state: unknown): Promise<void>;
     /** Mark each image pending before publication; turn.user or lease recovery resolves ownership. */
@@ -102,7 +101,6 @@ export declare class JsonlSessionStore {
         readonly expectedState?: readonly CodeModeStateEntry[];
     }): Promise<CodeModeStateEntry[]>;
     readExecutionState(sessionId: string): Promise<SessionExecutionState>;
-    readContext(sessionId: string): Promise<SessionRecord[]>;
     /** Compare the planned sequence inside the existing record writer queue. */
     commitContextGc(sessionId: string, draft: ContextGcCheckpointDraft, planningRecords?: readonly SessionRecord[]): Promise<SessionRecord>;
     readPage(sessionId: string, input?: {
@@ -177,6 +175,8 @@ export declare class JsonlSessionStore {
         readonly reasoningEffort?: string;
     } | undefined>;
     sessionTree(sessionId: string): Promise<readonly string[]>;
+    /** Counts native input records, not the post-Compact model context. */
+    userTurnCount(sessionId: string): Promise<number>;
     firstUserMessagePreview(sessionId: string): Promise<string | undefined>;
     delete(sessionId: string): Promise<{
         readonly deleted: boolean;