@myagentroam/node 0.11.45 → 0.11.47

package/dist/session/session-catalog-service.js

@@ -187,7 +187,7 @@ export class SessionCatalogService {
                 nativeControl: 'EXTERNAL',
                 channelToken: null,
                 cwd: workspace.path,
-                model: persisted.metadata.model,
+                modelId: persisted.metadata.modelId,
                 effort: persisted.metadata.effort,
                 access: persisted.metadata.access,
                 customTitle: persisted.metadata.customTitle,
@@ -283,7 +283,7 @@ export class SessionCatalogService {
             cwd,
             nativeControl: 'MAR_MANAGED',
             ...(nativeId === null ? {} : { externalSessionId: nativeId }),
-            ...(source.model === null ? {} : { model: source.model }),
+            ...(source.modelId === null ? {} : { modelId: source.modelId }),
             ...(source.effort === null ? {} : { effort: source.effort }),
             ...(source.access === null ? {} : { access: source.access }),
             title
@@ -322,7 +322,7 @@ export class SessionCatalogService {
             this.options.invalidateWorkspaceSessions(session.workspaceId);
         }
     }
-    async removeTree(root) {
+    async removeTree(root, cleanup) {
         if (root.externalSessionId === null)
             throw new Error('NATIVE_TRANSCRIPT_UNAVAILABLE');
         const database = this.options.database();
@@ -340,13 +340,20 @@ export class SessionCatalogService {
         const ids = [root.externalSessionId];
         const seen = new Set(ids);
         const parents = new Map();
+        const settle = (session, deleted) => {
+            if (cleanup === undefined)
+                return;
+            database.deleteSessionRecord(session.id);
+            this.options.forget(session, this.options.nativeIds(session));
+            cleanup.settled(session, deleted);
+        };
         const releases = [];
         const locked = new Set();
         const lock = (id) => {
             const actual = this.options.runtime.getAgentSession(id)?.id ?? id;
             if (locked.has(actual))
                 return;
-            releases.push(this.options.runtime.beginSessionHistoryMutation(actual, { allowQueued: true }));
+            releases.push(this.options.runtime.beginSessionHistoryMutation(actual, cleanup !== undefined && actual === root.id ? undefined : { allowQueued: true }));
             locked.add(actual);
         };
         try {
@@ -355,6 +362,9 @@ export class SessionCatalogService {
                 const parent = ids[index];
                 const children = [
                     ...database.listChildSessionRecords(root.workspaceId, parent).map((record) => record.id),
+                    ...(cleanup?.children.get(parent) ?? [])
+                        .filter((session) => cleanup?.candidates.has(session.id))
+                        .map((session) => session.externalSessionId ?? session.id),
                     ...(liveChildren.get(parent) ?? [])
                 ];
                 for (const child of children) {
@@ -371,35 +381,64 @@ export class SessionCatalogService {
             }
             const sessions = [];
             for (const id of ids) {
-                const session = this.options.runtime.getAgentSession(id) ??
+                const session = cleanup?.candidates.get(id) ??
+                    this.options.runtime.getAgentSession(id) ??
                     (await this.options.projection.resolve(id, true));
                 if (session === undefined || session.workspaceId !== root.workspaceId)
                     throw new Error('SESSION_NOT_FOUND');
                 sessions.push(session);
             }
             // Validate every member before performing any irreversible native deletion.
-            for (const session of sessions)
-                await this.assertRemovable(session);
-            const batches = new Map();
+            for (const session of sessions) {
+                const missing = cleanup !== undefined && session.externalDiscovered === false;
+                if (missing && !this.options.runnerAvailable(session.runner))
+                    throw new Error('NATIVE_TRANSCRIPT_UNAVAILABLE');
+                await this.assertRemovable(session, cleanup?.budget, missing);
+            }
+            if (cleanup !== undefined && this.cleanupRootProtected(root, cleanup.cutoff)) {
+                throw new Error('SESSION_WATCHING');
+            }
+            let batch = [];
+            const flushBatch = async () => {
+                if (batch.length === 0)
+                    return;
+                cleanup?.budget.check();
+                await this.options.runners.require(batch[0].runner).removeNativeMembers(batch);
+                for (const session of batch)
+                    settle(session, true);
+                batch = [];
+            };
             for (const session of [...sessions].reverse()) {
+                if (cleanup !== undefined &&
+                    (session.externalSessionId === null || session.externalDiscovered === false)) {
+                    await flushBatch();
+                    cleanup.budget.check();
+                    settle(session, true);
+                    continue;
+                }
                 if (session.externalSessionId === null)
                     continue;
                 const runner = this.options.runners.require(session.runner);
                 if (runner.supportsNativeBatchRemoval?.() === true) {
-                    const members = batches.get(session.runner) ?? [];
-                    members.push(session);
-                    batches.set(session.runner, members);
+                    if (batch.length > 0 && batch[0].runner !== session.runner)
+                        await flushBatch();
+                    batch.push(session);
+                }
+                else {
+                    // Preserve descendant-first order across batch and non-batch native owners.
+                    await flushBatch();
+                    cleanup?.budget.check();
+                    const deleted = await this.removeNativeHistories(session, this.options.nativeIds(session));
+                    settle(session, deleted);
                 }
-                else
-                    await this.removeNativeHistories(session, this.options.nativeIds(session));
             }
-            for (const [runner, members] of batches)
-                await this.options.runners.require(runner).removeNativeMembers(members);
-            // Preserve every relationship if any native owner fails, so retries cannot
-            // lose sight of descendants whose native cleanup was already attempted.
-            for (const session of sessions.reverse()) {
-                this.options.database().deleteSessionRecord(session.id);
-                this.options.forget(session, this.options.nativeIds(session));
+            await flushBatch();
+            // Manual deletion preserves all relationships if any native owner fails.
+            if (cleanup === undefined) {
+                for (const session of sessions.reverse()) {
+                    this.options.database().deleteSessionRecord(session.id);
+                    this.options.forget(session, this.options.nativeIds(session));
+                }
             }
         }
         finally {
@@ -443,6 +482,7 @@ export class SessionCatalogService {
         let deleted = 0;
         let skipped = 0;
         let failed = 0;
+        const outcomes = new Map();
         const deletedByRunner = {};
         let candidateCount;
         let timedOut = false;
@@ -458,7 +498,14 @@ export class SessionCatalogService {
                 candidates.set(session.id, session);
             }
             this.mergePersisted(candidates, workspaceId, false);
-            const candidateParents = new Set([...candidates.values()].flatMap((candidate) => candidate.parentSessionId === null ? [] : [candidate.parentSessionId]));
+            const children = new Map();
+            for (const candidate of candidates.values()) {
+                if (candidate.parentSessionId == null)
+                    continue;
+                const siblings = children.get(candidate.parentSessionId) ?? [];
+                siblings.push(candidate);
+                children.set(candidate.parentSessionId, siblings);
+            }
             candidateCount = candidates.size;
             for (const session of candidates.values()) {
                 budget.check();
@@ -472,14 +519,6 @@ export class SessionCatalogService {
                         session.lastActivityAt > 0 &&
                         session.lastActivityAt >= cutoff) ||
                     (session.pinOrder !== null && session.pinOrder !== undefined) ||
-                    (session.externalSessionId !== null &&
-                        (this.options.database().listChildSessionRecords(workspaceId, session.externalSessionId)
-                            .length > 0 ||
-                            candidateParents.has(session.externalSessionId) ||
-                            this.options.runtime
-                                .listAgentSessions()
-                                .some((child) => child.workspaceId === workspaceId &&
-                                child.parentSessionId === session.externalSessionId))) ||
                     this.options.isWatching(session.id) ||
                     this.options.isRecovering?.(session.id) ||
                     this.options.runtime.sessionQueue(session.id).itemIds.length > 0 ||
@@ -487,24 +526,31 @@ export class SessionCatalogService {
                         .listRunsForSession(session.id)
                         .some((run) => !isTerminalRunStatus(run.status)) ||
                     this.options.externalActivity(session.id) === 'BUSY') {
-                    skipped += 1;
+                    outcomes.set(session.id, { session, status: 'skipped' });
                     continue;
                 }
                 try {
-                    if ((await this.removeResolved(session, true, budget)) === 'deleted') {
-                        deleted += 1;
-                        deletedByRunner[session.runner] = (deletedByRunner[session.runner] ?? 0) + 1;
-                    }
-                    else
-                        skipped += 1;
+                    await this.removeTree(session, {
+                        candidates,
+                        children,
+                        cutoff,
+                        budget,
+                        settled: (member, wasDeleted) => {
+                            candidates.delete(member.id);
+                            outcomes.set(member.id, {
+                                session: member,
+                                status: wasDeleted ? 'deleted' : 'skipped'
+                            });
+                        }
+                    });
                 }
                 catch (error) {
                     if (error instanceof WorkspaceSessionCleanupDeadline)
                         throw error;
                     if (isCleanupSkip(error))
-                        skipped += 1;
+                        outcomes.set(session.id, { session, status: 'skipped' });
                     else {
-                        failed += 1;
+                        outcomes.set(session.id, { session, status: 'failed' });
                         nodeLog('workspace.session.cleanup.failed', {
                             workspaceId,
                             sessionId: session.id,
@@ -514,6 +560,7 @@ export class SessionCatalogService {
                     }
                 }
             }
+            budget.check();
         }
         catch (error) {
             if (!(error instanceof WorkspaceSessionCleanupDeadline))
@@ -525,6 +572,16 @@ export class SessionCatalogService {
         finally {
             this.options.invalidateWorkspaceSessions(workspaceId);
         }
+        for (const { session, status } of outcomes.values()) {
+            if (status === 'deleted') {
+                deleted += 1;
+                deletedByRunner[session.runner] = (deletedByRunner[session.runner] ?? 0) + 1;
+            }
+            else if (status === 'skipped')
+                skipped += 1;
+            else
+                failed += 1;
+        }
         const result = {
             deleted,
             skipped,
@@ -535,7 +592,7 @@ export class SessionCatalogService {
                     timedOut: true,
                     ...(candidateCount === undefined
                         ? {}
-                        : { remaining: candidateCount - deleted - skipped - failed })
+                        : { remaining: Math.max(0, candidateCount - outcomes.size) })
                 }
                 : {})
         };
@@ -559,15 +616,16 @@ export class SessionCatalogService {
             lastActivityAt: latestSessionActivityAt(projected.lastActivityAt, native.lastActivityAt)
         };
     }
-    async assertRemovable(session) {
+    async assertRemovable(session, budget, missing = false) {
         if (this.options.isRecovering?.(session.id))
             throw new Error('SESSION_RESTART_PENDING');
         if (this.options.runtime
             .listRunsForSession(session.id)
             .some((run) => !isTerminalRunStatus(run.status)))
             throw new Error('SESSION_ACTIVE');
-        if (session.externalSessionId !== null && session.nativeControl === 'EXTERNAL') {
-            await this.options.refreshActivity(session);
+        if (!missing && session.externalSessionId !== null && session.nativeControl === 'EXTERNAL') {
+            const refresh = () => this.options.refreshActivity(session);
+            await (budget ? budget.read(refresh) : refresh());
             if (this.options.externalActivity(session.id) === 'BUSY')
                 throw new Error('SESSION_ACTIVE');
         }
@@ -592,55 +650,22 @@ export class SessionCatalogService {
         }
         return deleted;
     }
-    async removeResolved(session, requireCleanupSafety = false, budget) {
-        if (session.externalSessionId === null)
-            throw new Error('NATIVE_TRANSCRIPT_UNAVAILABLE');
-        const releaseMutation = this.options.runtime.beginSessionHistoryMutation(session.id, requireCleanupSafety ? undefined : { allowQueued: true });
-        try {
-            if (this.options.isRecovering?.(session.id))
-                throw new Error('SESSION_RESTART_PENDING');
-            const missingCandidate = requireCleanupSafety && session.externalDiscovered === false;
-            if (this.options.runtime
+    cleanupRootProtected(session, cutoff) {
+        // Pin updates and Watch admission do not share the history mutation queue.
+        const pinOrder = session.externalSessionId === null
+            ? undefined
+            : this.options
+                .database()
+                .getNativeSessionMetadata(session.runner, session.externalSessionId, session.workspaceId)?.pinOrder;
+        return ((session.externalDiscovered !== false &&
+            latestSessionActivityAt(session.lastActivityAt, this.options.runtime.getAgentSession(session.id)?.lastActivityAt ?? 0) >= cutoff) ||
+            (pinOrder !== undefined && pinOrder !== null) ||
+            this.options.isWatching(session.id) ||
+            this.options.isRecovering?.(session.id) === true ||
+            this.options.runtime.sessionQueue(session.id).itemIds.length > 0 ||
+            this.options.runtime
                 .listRunsForSession(session.id)
-                .some((run) => !isTerminalRunStatus(run.status)))
-                throw new Error('SESSION_ACTIVE');
-            if (session.nativeControl === 'EXTERNAL' && !missingCandidate) {
-                const refresh = () => this.options.refreshActivity(session);
-                await (budget ? budget.read(refresh) : refresh());
-                if (this.options.externalActivity(session.id) === 'BUSY')
-                    throw new Error('SESSION_ACTIVE');
-            }
-            if (requireCleanupSafety) {
-                if (this.options.isWatching(session.id))
-                    throw new Error('SESSION_WATCHING');
-                if (this.options.runtime.sessionQueue(session.id).itemIds.length > 0)
-                    throw new Error('SESSION_QUEUE_NOT_EMPTY');
-                // Pin updates do not share the cleanup mutation queue.
-                const pinOrder = this.options
-                    .database()
-                    .getNativeSessionMetadata(session.runner, session.externalSessionId, session.workspaceId)?.pinOrder;
-                if (pinOrder !== undefined && pinOrder !== null)
-                    return 'skipped';
-                if (this.options.runtime
-                    .listRunsForSession(session.id)
-                    .some((run) => !isTerminalRunStatus(run.status)))
-                    throw new Error('SESSION_ACTIVE');
-            }
-            budget?.check();
-            const nativeIds = this.options.nativeIds(session);
-            if (missingCandidate) {
-                this.options.database().deleteSessionRecord(session.id);
-                this.options.forget(session, nativeIds);
-                return 'deleted';
-            }
-            const deleted = await this.removeNativeHistories(session, nativeIds);
-            this.options.database().deleteSessionRecord(session.id);
-            this.options.forget(session, nativeIds);
-            return deleted ? 'deleted' : 'skipped';
-        }
-        finally {
-            releaseMutation();
-        }
+                .some((run) => !isTerminalRunStatus(run.status)));
     }
 }
 export function rewindTitle(sourceTitle, existingTitles = []) {
@@ -674,6 +699,7 @@ function deduplicateNativeSessions(sessions) {
 function isCleanupSkip(error) {
     return (error instanceof Error &&
         (error.message === 'SESSION_ACTIVE' ||
+            error.message === 'SESSION_RESTART_PENDING' ||
             error.message === 'SESSION_NOT_FOUND' ||
             error.message === 'SESSION_QUEUE_NOT_EMPTY' ||
             error.message === 'SESSION_WATCHING' ||

package/dist/session/session-command-service.js

@@ -31,6 +31,7 @@ export class SessionCommandService {
     }
     async sessionCommand(input) {
         if (typeof input.sessionId !== 'string' ||
+            Object.hasOwn(input, 'model') ||
             typeof input.commandId !== 'string' ||
             input.commandId.length === 0 ||
             typeof input.input !== 'string' ||

package/dist/session/session-context-service.js

@@ -20,7 +20,7 @@ export class SessionContextService {
             return { context: null, pending: false };
         }
         const context = {
-            model: usage.model ?? session.model,
+            model: usage.model ?? session.modelId,
             usedTokens: usage.usedTokens,
             maxTokens: usage.maxTokens,
             percentage: Math.round((usage.usedTokens / usage.maxTokens) * 1000) / 10

package/dist/session/session-lifecycle-service.js

@@ -120,7 +120,8 @@ export class SessionLifecycleService {
             (input.externalSessionId !== undefined && typeof input.externalSessionId !== 'string') ||
             !validSessionTitle(input.title) ||
             !validSessionTitle(input.customTitle) ||
-            !validSessionOption(input.model) ||
+            Object.hasOwn(input, 'model') ||
+            !validSessionOption(input.modelId) ||
             !validSessionEffort(input.effort) ||
             !validSessionOption(input.access))
             throw new Error('SESSION_INVALID');
@@ -172,7 +173,7 @@ export class SessionLifecycleService {
         const fallback = runner.defaultConfiguration(workspace, environment, executionContext);
         const configuration = {
             runner: runner.name,
-            model: typeof input.model === 'string' ? input.model : (saved?.model ?? fallback.model),
+            modelId: typeof input.modelId === 'string' ? input.modelId : (saved?.modelId ?? fallback.modelId),
             effort: typeof input.effort === 'string' ? input.effort : (saved?.effort ?? fallback.effort),
             access: typeof input.access === 'string'
                 ? input.access
@@ -183,7 +184,7 @@ export class SessionLifecycleService {
         if (runner.name === 'mar-agent' && !['auto', 'full-access'].includes(configuration.access))
             throw new Error('SESSION_INVALID');
         if (parentSessionId !== undefined)
-            runner.assertChildModel(configuration.model, executionContext);
+            runner.assertChildModel(configuration.modelId, executionContext);
         const session = this.options.runtime.createAgentSession({
             ...(parentSessionId === undefined ? {} : { parentSessionId }),
             workspaceId: input.workspaceId,
@@ -192,7 +193,7 @@ export class SessionLifecycleService {
             ...(typeof input.externalSessionId === 'string'
                 ? { externalSessionId: input.externalSessionId }
                 : {}),
-            model: configuration.model,
+            modelId: configuration.modelId,
             effort: configuration.effort,
             access: configuration.access,
             ...(typeof input.title === 'string' ? { title: input.title } : {}),
@@ -208,8 +209,9 @@ export class SessionLifecycleService {
     }
     async updateConfiguration(input) {
         if (typeof input.sessionId !== 'string' ||
-            (input.model === undefined && input.effort === undefined && input.access === undefined) ||
-            !validSessionOption(input.model) ||
+            (input.modelId === undefined && input.effort === undefined && input.access === undefined) ||
+            Object.hasOwn(input, 'model') ||
+            !validSessionOption(input.modelId) ||
             !validSessionEffort(input.effort) ||
             !validSessionOption(input.access))
             throw new Error('SESSION_INVALID');
@@ -222,13 +224,13 @@ export class SessionLifecycleService {
             input.access !== undefined &&
             !['auto', 'full-access'].includes(input.access))
             throw new Error('SESSION_INVALID');
-        if (current.parentSessionId != null && typeof input.model === 'string') {
+        if (current.parentSessionId != null && typeof input.modelId === 'string') {
             const runner = this.options.runners.require(current.runner);
-            runner.assertChildModel(input.model, runner.prepareExecutionContext(input));
+            runner.assertChildModel(input.modelId, runner.prepareExecutionContext(input));
         }
         const session = this.options.runtime.updateAgentSessionConfiguration({
             sessionId: current.id,
-            ...(typeof input.model === 'string' ? { model: input.model } : {}),
+            ...(typeof input.modelId === 'string' ? { modelId: input.modelId } : {}),
             ...(typeof input.effort === 'string' ? { effort: input.effort } : {}),
             ...(typeof input.access === 'string' ? { access: input.access } : {})
         });
@@ -237,7 +239,7 @@ export class SessionLifecycleService {
                 runner: session.runner,
                 externalSessionId: session.externalSessionId,
                 workspaceId: session.workspaceId,
-                model: session.model,
+                modelId: session.modelId,
                 effort: session.effort,
                 access: session.access
             });

package/dist/session/session-message-service.js

@@ -91,7 +91,8 @@ export class SessionMessageService {
     }
     async prepareMessage(input) {
         checkSessionAdmission(input);
-        if (typeof input.sessionId !== 'string' ||
+        if (Object.hasOwn(input, 'model') ||
+            typeof input.sessionId !== 'string' ||
             typeof input.clientMessageId !== 'string' ||
             input.clientMessageId.length === 0 ||
             typeof input.content !== 'string' ||
@@ -148,7 +149,7 @@ export class SessionMessageService {
         if (session.parentSessionId != null)
             this.options.runners
                 .require(session.runner)
-                .assertChildModel(session.model, executionContext);
+                .assertChildModel(session.modelId, executionContext);
         const sourceContent = withSessionMessageOrigin(content, input.__marctlOrigin, session.parentSessionId);
         const goalMessage = internalGoal || internalSchedule || internalRestore
             ? undefined
@@ -296,7 +297,7 @@ export class SessionMessageService {
                         cwd,
                         workspacePath,
                         externalSessionId: currentSession.externalSessionId,
-                        model: currentSession.model,
+                        modelId: currentSession.modelId,
                         effort: currentSession.effort,
                         access: currentSession.access,
                         collaborationMode: planActive ? 'plan' : 'default',

package/dist/workspace/workspace-session-service.js

@@ -209,7 +209,7 @@ function sessionSignature(sessions) {
         session.runner,
         session.externalSessionId,
         session.nativeControl,
-        session.model,
+        session.modelId,
         session.effort,
         session.access,
         session.runnerTitle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.45",
+  "version": "0.11.47",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -38,10 +38,10 @@
     "sharp": "0.35.5",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.11.45",
     "@myagentroam/code-navigation": "0.11.1",
-    "@myagentroam/marctl": "0.11.6",
-    "@myagentroam/protocol": "0.11.45"
+    "@myagentroam/marctl": "0.11.8",
+    "@myagentroam/agent": "0.11.47",
+    "@myagentroam/protocol": "0.11.47"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"