@myagentroam/agent 0.11.25 → 0.11.26

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

@@ -2,6 +2,7 @@ import type { MarAgentImageMetadata } from '../runtime/contracts.js';
 import type { MarAgentEvent } from '../runtime/events.js';
 import type { SessionStore } from './store/contracts.js';
 import type { SessionListInput, SessionSource } from './types.js';
+import type { MarAgentSessionRollbackInput } from './rollback.js';
 export interface MarAgentSessionSummary {
     id: string;
     title: string;
@@ -82,9 +83,7 @@ export interface MarAgentSessionCatalog {
         readonly boundaryTurnId: string | null;
         readonly title: string;
     }): Promise<MarAgentSessionSummary>;
-    rollback(sessionId: string, input: {
-        readonly boundaryTurnId: string | null;
-    }): Promise<MarAgentSessionSummary>;
+    rollback(sessionId: string, input: MarAgentSessionRollbackInput): Promise<MarAgentSessionSummary>;
     clear(sessionId: string): Promise<MarAgentSessionSummary>;
     delete(sessionId: string): Promise<MarAgentSessionDeleteResult>;
     close(): Promise<void>;

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

@@ -0,0 +1,13 @@
+import type { SessionRecord } from './store/types.js';
+export type MarAgentSessionRollbackInput = {
+    readonly boundaryTurnId: string | null;
+    readonly beforeInput?: never;
+} | {
+    readonly boundaryTurnId?: never;
+    readonly beforeInput: {
+        readonly turnId: string;
+        readonly clientMessageId: string;
+    };
+};
+/** Resolve the retained prefix only from records read under the Session maintenance lease. */
+export declare function rollbackBoundaryIndex(records: readonly SessionRecord[], input: MarAgentSessionRollbackInput): number;

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

@@ -0,0 +1,46 @@
+import { MarAgentError } from '../error.js';
+/** Resolve the retained prefix only from records read under the Session maintenance lease. */
+export function rollbackBoundaryIndex(records, input) {
+    const invalid = () => new MarAgentError('MAR_AGENT_ROLLBACK_TARGET_INVALID', 'Session rollback target was not found or is ambiguous.');
+    if (input.beforeInput !== undefined) {
+        const target = input.beforeInput;
+        if (input.boundaryTurnId !== undefined ||
+            target === null ||
+            typeof target !== 'object' ||
+            typeof target.turnId !== 'string' ||
+            !target.turnId.trim() ||
+            typeof target.clientMessageId !== 'string' ||
+            !target.clientMessageId.trim())
+            throw invalid();
+        let firstInput = -1;
+        let selected = -1;
+        for (const [index, record] of records.entries()) {
+            if (record.type !== 'turn.user' || record.turnId !== target.turnId)
+                continue;
+            if (firstInput < 0)
+                firstInput = index;
+            const payload = record.payload;
+            if (payload === null || typeof payload !== 'object' || Array.isArray(payload))
+                continue;
+            if (payload.clientMessageId !== target.clientMessageId)
+                continue;
+            if (selected >= 0)
+                throw invalid();
+            selected = index;
+        }
+        if (selected < 0)
+            throw invalid();
+        // The initial input owns execution-start records; subsequent inputs own only their tail.
+        return ((selected === firstInput
+            ? records.findIndex((record) => record.turnId === target.turnId)
+            : selected) - 1);
+    }
+    if (input.boundaryTurnId === null)
+        return 0;
+    if (typeof input.boundaryTurnId !== 'string' || !input.boundaryTurnId.trim())
+        throw invalid();
+    const index = records.findLastIndex((record) => record.turnId === input.boundaryTurnId);
+    if (index < 0)
+        throw invalid();
+    return index;
+}

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

@@ -7,6 +7,7 @@ import type { MarAgentSessionPage, MarAgentSessionSummary } from '../catalog.js'
 import type { ContextGcCheckpointDraft } from '../context-gc-checkpoint.js';
 import type { ToolResultResourceInput, ToolResultResourcePage } from '../tool-result-resources.js';
 import type { SessionListInput, SessionSource, SessionTitleUpdateInput } from '../types.js';
+import type { MarAgentSessionRollbackInput } from '../rollback.js';
 import type { CompactHistoryMessage, RestoredSessionInputImage, SessionExecutionState, SessionInputImage, SessionInputImageData, SessionInputImageMetadata, SessionRecord } from './types.js';
 export type { CompactHistoryMessage, CompactUserInput, RestoredSessionInputImage, SessionExecutionState, SessionInputImage, SessionInputImageData, SessionInputImageMetadata, SessionRecord } from './types.js';
 export type { CodeModeStateEntry } from '../../tools/code-mode/state.js';
@@ -147,9 +148,7 @@ export interface SessionStore {
         readonly boundaryTurnId: string | null;
         readonly title: string;
     }): Promise<SessionStoreSession>;
-    rollbackSession(sessionId: string, input: {
-        readonly boundaryTurnId: string | null;
-    }): Promise<MarAgentSessionSummary>;
+    rollbackSession(sessionId: string, input: MarAgentSessionRollbackInput): Promise<MarAgentSessionSummary>;
     clearSession(sessionId: string, maintenance?: SessionStoreMaintenance): Promise<MarAgentSessionSummary>;
     delete(sessionId: string, maintenance?: SessionStoreMaintenance): Promise<{
         readonly deleted: boolean;

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

@@ -1,3 +1,4 @@
+import { type MarAgentSessionRollbackInput } from '../rollback.js';
 import type { SessionStore, SessionStoreMaintenance, SessionRecordInput, SessionStoreCompactInput } from './contracts.js';
 import { type CoreCheckpoint, type CoreJsonValue } from '../../extensions/data.js';
 import { type CodeModeStateEntry } from '../../tools/code-mode/state.js';
@@ -53,9 +54,7 @@ export declare class JsonlSessionStore implements SessionStore {
         source: SessionSource | undefined;
     }>;
     /** Replace history under a journal; the indexed transaction ID decides the commit side. */
-    rollbackSession(sessionId: string, input: {
-        readonly boundaryTurnId: string | null;
-    }): Promise<{
+    rollbackSession(sessionId: string, input: MarAgentSessionRollbackInput): Promise<{
         id: string;
         title: string;
         workspace: string;

package/dist/agent-core/session/store/jsonl-store.js

@@ -1,4 +1,5 @@
 import { randomUUID } from 'node:crypto';
+import { rollbackBoundaryIndex } from '../rollback.js';
 import { inlineMediaHistory } from '../inline-media.js';
 import { lstat, mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
@@ -730,11 +731,7 @@ export class JsonlSessionStore {
             const records = await this.read(sessionId);
             if (records[0]?.type !== 'session.created')
                 throw new MarAgentError('MAR_AGENT_SESSION_CORRUPT', 'Session history is corrupt.');
-            const boundaryIndex = input.boundaryTurnId === null
-                ? 0
-                : records.findLastIndex((record) => record.turnId === input.boundaryTurnId);
-            if (input.boundaryTurnId !== null && boundaryIndex < 0)
-                throw new MarAgentError('MAR_AGENT_ROLLBACK_TARGET_INVALID', 'Session rollback target was not found.');
+            const boundaryIndex = rollbackBoundaryIndex(records, input);
             const retained = records
                 .slice(0, boundaryIndex + 1)
                 .filter((record) => record.type !== 'responses.continuation');

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { MarAgentError } from './agent-core/error.js';
+export type { MarAgentSessionRollbackInput } from './agent-core/session/rollback.js';
 export { MAR_AGENT_HOST_API_VERSION, negotiateHost, type HostDescription, type MarAgentHostCapability } from './agent-core/host/contracts.js';
 export type { PermissionMode, ToolApprovalRequest, ToolApprovalDecision, ToolApprovalHandler, ToolPermission, PermissionStop } from './agent-core/tools/permissions.js';
 export type { ToolResultExtension, FileChangeEvidence } from './agent-core/tools/result-extensions.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/agent",
-  "version": "0.11.25",
+  "version": "0.11.26",
   "description": "Embeddable MAR coding agent SDK and CLI.",
   "license": "Apache-2.0",
   "type": "module",