@myagentroam/agent 0.10.59 → 0.10.61

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

@@ -45,7 +45,7 @@ import { AGENT_EXECUTION_POLICY } from '../runtime/execution-policy.js';
 import { loadAgentInstructions, renderAgentInstructions } from '../runtime/context/instructions.js';
 import { normalizeMessagesForModel } from '../runtime/context/normalize.js';
 import { latestSmartContextTokens, projectSmartCompactionMessage, requestSmartCompaction } from '../runtime/compaction/smart.js';
-import { compactSummaryFromCheckpoint, inputMetadataFromRecord } from '../session/jsonl-store.js';
+import { compactSummaryFromCheckpoint, inputMetadataFromRecord } from '../session/store/index.js';
 import { SubagentSessionController } from '../subagent/session-controller.js';
 import { agentStartToolDefinitionWithModels } from '../tools/agent/agent-start.js';
 import { allowsDirectTool, allowsToolCaller, toolCallers } from '../tools/callers.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.d.ts

@@ -1,3 +1,3 @@
-import type { JsonlSessionStore } from '../session/jsonl-store.js';
+import type { JsonlSessionStore } from '../session/store/index.js';
 import type { SubagentSessionControllerBackend } from '../subagent/session-controller.js';
 export declare function createSubagentBackend(store: JsonlSessionStore, workspace: string): SubagentSessionControllerBackend;

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/catalog.js

@@ -1,6 +1,6 @@
 import { MarAgentError } from '../error.js';
 import { publicHostedToolEvents } from '../runtime/event-projection.js';
-import { JsonlSessionStore } from './jsonl-store.js';
+import { JsonlSessionStore } from './store/index.js';
 const MAX_INPUT_IMAGE_BYTES = 5 * 1024 * 1024;
 const INPUT_IMAGE_MIME_TYPES = new Set(['image/png', 'image/jpeg', 'image/gif', 'image/webp']);
 export async function openMarAgentSessionCatalog(input) {

package/dist/agent-core/session/context-gc-checkpoint.d.ts

@@ -1,6 +1,6 @@
 import { type ContextGcWebToolName } from './context-gc-replacements.js';
 import { type ContextGcSubagentToolName } from './context-gc-subagent.js';
-import type { SessionRecord } from './jsonl-store.js';
+import type { SessionRecord } from './store/index.js';
 export declare const CONTEXT_GC_CHECKPOINT_VERSION: 1;
 export declare const CONTEXT_GC_MAX_TARGETS = 4096;
 export type ContextGcPlatform = 'linux' | 'darwin' | 'win32';
@@ -35,7 +35,6 @@ export interface ContextGcTarget {
     readonly role: 'tool_call' | 'tool' | 'provider';
     readonly callId?: string;
     readonly toolName?: string;
-    readonly sourceHash: string;
 }
 export interface ContextGcReadItemReplacement {
     readonly supersededByCallId?: string;
@@ -125,7 +124,6 @@ export interface ContextGcCheckpointDraft {
     readonly version: 1;
     readonly base: ContextGcBase;
     readonly boundarySequence: number;
-    sourceProjectionHash: string;
     readonly replacements: readonly ContextGcReplacement[];
     readonly trigger: {
         readonly usageSequence: number;
@@ -145,20 +143,18 @@ export interface ContextGcCheckpointPayload extends ContextGcCheckpointDraft {
 /** Disposable memoization for one evaluation's immutable record snapshot. */
 export declare class ContextGcCheckpointCache {
     #private;
-    read(records: readonly SessionRecord[], boundarySequence?: number, workspace?: string | undefined): ReturnType<typeof latestValidContextGcCheckpoint>;
+    read(records: readonly SessionRecord[], boundarySequence?: number, workspace?: string): ReturnType<typeof latestValidContextGcCheckpoint>;
 }
 export declare function contextGcMinimumUsageGrowth(contextWindowTokens: number): number;
-export declare function contextGcRecordSourceHash(record: Pick<SessionRecord, 'payload'>): string;
 export declare function contextGcLogicalPathKey(path: string, workspace: string, platform?: ContextGcPlatform): string | undefined;
 export declare function contextGcTargetKey(target: ContextGcTarget): string;
 export declare function contextGcReplacementKey(replacement: ContextGcReplacement): string;
 export declare function contextGcBaseFromRecords(records: readonly SessionRecord[], boundarySequence?: number): ContextGcBase | undefined;
 export declare function contextGcBaseSequence(base: ContextGcBase): number;
-export declare function contextGcSourceProjectionHash(records: readonly SessionRecord[], boundarySequence: number, base?: ContextGcBase | undefined): string | undefined;
 export declare function normalizeContextGcReplacements(replacements: readonly ContextGcReplacement[]): ContextGcReplacement[] | undefined;
 export declare function parseContextGcCheckpoint(record: SessionRecord | undefined): ContextGcCheckpointPayload | undefined;
-export declare function validateContextGcCheckpoint(records: readonly SessionRecord[], record: SessionRecord, workspace?: string | undefined): ContextGcCheckpointPayload | undefined;
-export declare function latestValidContextGcCheckpoint(records: readonly SessionRecord[], boundarySequence?: number, workspace?: string | undefined): {
+export declare function validateContextGcCheckpoint(records: readonly SessionRecord[], record: SessionRecord, workspace?: string | undefined, committedReplacements?: readonly ContextGcReplacement[]): ContextGcCheckpointPayload | undefined;
+export declare function latestValidContextGcCheckpoint(records: readonly SessionRecord[], boundarySequence?: number, _workspace?: string): {
     readonly record: SessionRecord;
     readonly payload: ContextGcCheckpointPayload;
 } | undefined;