@myagentroam/node 0.11.46 → 0.11.47

package/dist/runner/mar-agent/agent-network-extension.js

@@ -210,7 +210,21 @@ export function agentNetworkExtension(invoke, currentExecution) {
                                 (Array.isArray(args.attachmentIds) && args.attachmentIds.length > 0))
                             ? { ...args, deliveryIntent: 'REPLACE_CURRENT' }
                             : args;
-                        const result = await invoke(executionId, tool.action, operationInput, call);
+                        const onResolved = call.publishEventData
+                            ? async (sessions) => {
+                                const rows = sessions.map((session) => ({
+                                    agentId: session.id,
+                                    title: session.customTitle ?? session.runnerTitle ?? undefined
+                                }));
+                                const result = tool.action === 'wait'
+                                    ? { agents: rows }
+                                    : tool.action === 'view'
+                                        ? { session: rows[0] }
+                                        : (rows[0] ?? {});
+                                await call.publishEventData(agentOperationEvent(tool.action, {}, result).eventData);
+                            }
+                            : undefined;
+                        const result = await invoke(executionId, tool.action, operationInput, call, onResolved);
                         const modelResult = tool.action === 'wait' ? agentNetworkWaitModelOutput(result) : result;
                         return {
                             data: result,

package/dist/runner/mar-agent/conversation-normalizer.js

@@ -6,7 +6,7 @@ export function normalizeMarAgentUsage(usage) {
 }
 import { boundedConversationItemId, compactRunnerText, compactRunnerValue } from '../normalization.js';
 import { runnerErrorProjection } from '../runner-error.js';
-import { toolPresentationSchema } from '@myagentroam/protocol';
+import { toolPresentationSchema, agentOperationPresentationSchema } from '@myagentroam/protocol';
 import { publicOutputSnapshot, publicToolOutput } from '../normalization.js';
 import { boundToolOutput } from '@myagentroam/protocol';
 import { agentOperationAction, agentOperationPresentation } from './agent-operation-presentation.js';
@@ -170,6 +170,20 @@ export class MarAgentConversationNormalizer {
                 ...this.#codeModeToolResults(event)
             ];
         }
+        if (event.type === 'tool.updated') {
+            const state = this.#tools.get(event.callId);
+            if (!state?.active ||
+                state.toolName !== event.toolName ||
+                !agentOperationAction(event.toolName))
+                return [];
+            const operation = agentOperationPresentationSchema.safeParse(record(event.data)?.agentOperation);
+            if (!operation.success || operation.data.action !== agentOperationAction(event.toolName))
+                return [];
+            this.#tools.set(event.callId, { ...state, presentationData: event.data });
+            return [
+                genericToolItem(state.itemId, state.toolName, 'IN_PROGRESS', state.input, null, null, false, event.data, state.subagentTitle, state.subagentDetails, undefined, undefined, state.inputTruncated)
+            ];
+        }
         if (event.type === 'sleep.started') {
             const state = this.#tools.get(event.callId);
             if (state?.toolName !== 'sleep')
@@ -673,7 +687,7 @@ export class MarAgentConversationNormalizer {
         }
         const item = genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, 'COMPLETED', state?.input, generatedImages.length === 0
             ? event.summary
-            : generatedImages.map((image) => image.name).join(', '), null, event.outputTruncation !== undefined, event.data, agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated, event.summaryTruncated === true);
+            : generatedImages.map((image) => image.name).join(', '), null, event.outputTruncation !== undefined, mergeAgentOperationData(event.toolName, state?.presentationData, event.data), agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated, event.summaryTruncated === true);
         return [
             {
                 ...item,
@@ -704,7 +718,11 @@ export class MarAgentConversationNormalizer {
         return [
             genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, event.code === 'MAR_AGENT_CANCELLED' || event.code === 'MAR_AGENT_EXECUTION_CANCELLED'
                 ? 'CANCELLED'
-                : 'FAILED', state?.input, event.message ?? event.code, event.code, event.truncated === true, event.data === undefined ? state?.presentationData : event.data, state?.subagentTitle, state?.subagentDetails, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated)
+                : 'FAILED', state?.input, event.message ?? event.code, event.code, event.truncated === true, agentOperationAction(event.toolName)
+                ? mergeAgentOperationData(event.toolName, state?.presentationData, event.data)
+                : event.data === undefined
+                    ? state?.presentationData
+                    : event.data, state?.subagentTitle, state?.subagentDetails, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated)
         ];
     }
     #codeModeToolResults(event) {
@@ -1027,6 +1045,28 @@ function codeExecutionError(data) {
         message: compactRunnerText(error.message, 1000)
     };
 }
+function mergeAgentOperationData(toolName, previous, current) {
+    if (!agentOperationAction(toolName))
+        return current;
+    const before = agentOperationPresentationSchema.safeParse(record(previous)?.agentOperation);
+    if (!before.success || before.data.action !== agentOperationAction(toolName))
+        return current;
+    const after = agentOperationPresentationSchema.safeParse(record(current)?.agentOperation);
+    if (!after.success || after.data.action !== before.data.action) {
+        return { ...record(current), agentOperation: before.data };
+    }
+    return {
+        ...record(current),
+        agentOperation: {
+            ...after.data,
+            targets: before.data.targets.map((target) => ({
+                ...after.data.targets.find((candidate) => candidate.agentId === target.agentId),
+                ...target
+            })),
+            ...(before.data.targetsTruncated ? { targetsTruncated: true } : {})
+        }
+    };
+}
 function genericToolItem(id, toolName, status, input, outputSummary = null, errorCode = null, truncated = false, output, subagentTitle, knownSubagentDetails, sleepStartedAt, outputTruncation, inputTruncated = false, summaryTruncated = false) {
     if (toolName === 'code_exec') {
         const code = typeof input === 'string' ? input : record(input)?.code;

package/dist/service/agent-network-bindings.js

@@ -383,10 +383,11 @@ export function createNodeAgentNetwork(options) {
                 truncated: page.nextCursor !== null
             };
         },
-        view: async (actor, input) => {
+        view: async (actor, input, onResolved) => {
             const source = terminalCalls.has(actor) ? undefined : await actorSession(actor);
             const session = input.agentId === source?.id ? source : await target(actor, input.agentId);
             assertSessionControlOwner(options.runtime, session.id, actor.requestUserId);
+            await onResolved?.([session]);
             return {
                 session: marctlSessionDetail(options.runtime, session, options.runtime.sessionQueue(session.id).itemIds.length),
                 goal: publicGoal(options.goals.get(session.id)) ?? null,

package/dist/service/agent-network-invoke.js

@@ -4,9 +4,9 @@ import { randomUUID } from 'node:crypto';
 import { modelUsageGrantSchema } from '@myagentroam/protocol';
 /** Bind each native invocation to the actual live Node Execution and its captured resources. */
 export function agentNetworkInvoke(input) {
-    return async (executionId, action, payload, context) => {
+    return async (executionId, action, payload, context, onResolved) => {
         const actor = executionAgentActor({ ...input, executionId });
-        return invokeAgentNetwork(input.service, actor, action, payload, context);
+        return invokeAgentNetwork(input.service, actor, action, payload, context, undefined, onResolved);
     };
 }
 /** Read actor resources from the current Node-owned Execution, not caller arguments. */
@@ -51,7 +51,7 @@ export function executionAgentActor(input) {
     };
 }
 /** Shared command dispatch; callers must bind actor authority at their trusted boundary. */
-export async function invokeAgentNetwork(service, actor, action, payload, context, requestSignal) {
+export async function invokeAgentNetwork(service, actor, action, payload, context, requestSignal, onResolved) {
     const signal = context?.signal ?? requestSignal;
     switch (action) {
         case 'start':
@@ -63,16 +63,16 @@ export async function invokeAgentNetwork(service, actor, action, payload, contex
                 typeof payload.title === 'string' &&
                 !payload.title.trim()) {
                 const { title: _title, ...withoutTitle } = payload;
-                return service.start(actor, withoutTitle, signal);
+                return service.start(actor, withoutTitle, signal, onResolved);
             }
             return service.start(actor, {
                 ...payload,
                 ...(typeof payload.title === 'string' ? { title: payload.title.trim() } : {})
-            }, signal);
+            }, signal, onResolved);
         case 'send':
-            return service.send(actor, payload, signal);
+            return service.send(actor, payload, signal, onResolved);
         case 'stop':
-            return service.stop(actor, payload);
+            return service.stop(actor, payload, onResolved);
         case 'wait':
             return service.wait(actor, {
                 ...payload,
@@ -81,11 +81,11 @@ export async function invokeAgentNetwork(service, actor, action, payload, contex
                     : requestSignal
                         ? { signal: requestSignal }
                         : {})
-            });
+            }, onResolved);
         case 'list':
             return service.list(actor, payload);
         case 'view':
-            return service.view(actor, payload);
+            return service.view(actor, payload, onResolved);
     }
 }
 /** Node broker injects the caller only after validating the Server-issued Execution credential. */

package/dist/service/agent-network-service.js

@@ -12,10 +12,10 @@ export class AgentNetworkService {
     list(actor, input = {}) {
         return this.options.list(actor, input);
     }
-    view(actor, input) {
-        return this.options.view(actor, input);
+    view(actor, input, onResolved) {
+        return this.options.view(actor, input, onResolved);
     }
-    async start(actor, input, signal) {
+    async start(actor, input, signal, onResolved) {
         signal?.throwIfAborted();
         const goal = parseAgentGoal(input.goal);
         const content = input.content ?? '';
@@ -41,6 +41,7 @@ export class AgentNetworkService {
             clientMessageId: input.clientMessageId ?? randomUUID(),
             goal
         }, signal);
+        await onResolved?.([created.session]);
         try {
             if (created.session.parentSessionId === actor.sessionId)
                 this.options.observe(actor, created.session);
@@ -54,7 +55,7 @@ export class AgentNetworkService {
             };
         }
     }
-    async send(actor, input, signal) {
+    async send(actor, input, signal, onResolved) {
         signal?.throwIfAborted();
         const goal = parseAgentGoal(input.goal);
         const content = input.content ?? '';
@@ -92,6 +93,7 @@ export class AgentNetworkService {
         if (input.approval !== undefined)
             await this.options.validateApproval(actor, session, input.approval);
         signal?.throwIfAborted();
+        await onResolved?.([session]);
         if (session.parentSessionId === actor.sessionId)
             this.options.observe(actor, session);
         const approvalResult = input.approval === undefined
@@ -191,7 +193,7 @@ export class AgentNetworkService {
             };
         }
     }
-    async stop(actor, input) {
+    async stop(actor, input, onResolved) {
         if (typeof input.agentId !== 'string' ||
             !input.agentId ||
             typeof input.executionId !== 'string' ||
@@ -199,6 +201,7 @@ export class AgentNetworkService {
             throw new Error('AGENT_STOP_INVALID');
         const session = await this.options.target(actor, input.agentId);
         await this.options.authorize(actor, session, 'stop');
+        await onResolved?.([session]);
         const goalBefore = this.options.goal(session.id);
         try {
             const result = this.options.stop(actor, session, input.executionId);
@@ -224,7 +227,7 @@ export class AgentNetworkService {
             };
         }
     }
-    async wait(actor, input) {
+    async wait(actor, input, onResolved) {
         validateAgentWaitOptions(input);
         if ((input.mode !== undefined && input.agentIds === undefined) ||
             (input.agentId !== undefined && input.agentIds !== undefined) ||
@@ -268,6 +271,7 @@ export class AgentNetworkService {
         if (!targets.length)
             throw new Error('AGENT_EXECUTION_NOT_FOUND');
         const selected = new Set(targets.map((target) => target.agentId));
+        await onResolved?.(targets.map((target) => sessions.find((session) => session.id === target.agentId)));
         const directChildren = new Set();
         for (const session of sessions)
             if (selected.has(session.id) && session.parentSessionId === actor.sessionId) {

package/dist/session/native-session-projection-service.js

@@ -29,11 +29,19 @@ export class NativeSessionProjectionService {
                 return accepted === undefined ? [] : [accepted];
             });
         }
+        const candidates = new Map(ordered.map((session) => [session.id, session]));
         return ordered.flatMap((session) => {
             const record = database.getSessionRecord(session.id);
-            if (record === undefined && session.parentSessionId != null)
+            if (record === undefined && !this.validParent(session, candidates))
                 return [];
-            return [{ ...session, parentSessionId: record?.metadata.parentSessionId ?? null }];
+            return [
+                {
+                    ...session,
+                    parentSessionId: record === undefined
+                        ? (session.parentSessionId ?? null)
+                        : (record.metadata.parentSessionId ?? null)
+                }
+            ];
         });
     }
     async discoverCodex(workspaceId) {
@@ -237,29 +245,30 @@ export class NativeSessionProjectionService {
             createdAt: timestamp
         };
     }
+    validParent(session, candidates) {
+        const database = this.options.database();
+        const visited = new Set([session.id]);
+        let parentId = session.parentSessionId ?? null;
+        let depth = 1;
+        while (parentId !== null) {
+            if (visited.has(parentId) || ++depth > 3)
+                return false;
+            visited.add(parentId);
+            const stored = database?.getSessionRecord(parentId);
+            const candidate = stored === undefined ? candidates.get(parentId) : undefined;
+            if ((stored?.workspaceId ?? candidate?.workspaceId) !== session.workspaceId)
+                return false;
+            parentId =
+                stored === undefined
+                    ? (candidate?.parentSessionId ?? null)
+                    : (stored.metadata.parentSessionId ?? null);
+        }
+        return true;
+    }
     remember(sessions) {
         const database = this.options.database();
         const candidates = new Map(sessions.map((session) => [session.id, session]));
-        const validParent = (session) => {
-            const visited = new Set([session.id]);
-            let parentId = session.parentSessionId ?? null;
-            let depth = 1;
-            while (parentId !== null) {
-                if (visited.has(parentId) || ++depth > 3)
-                    return false;
-                visited.add(parentId);
-                const stored = database?.getSessionRecord(parentId);
-                const candidate = stored === undefined ? candidates.get(parentId) : undefined;
-                if ((stored?.workspaceId ?? candidate?.workspaceId) !== session.workspaceId)
-                    return false;
-                parentId =
-                    stored === undefined
-                        ? (candidate?.parentSessionId ?? null)
-                        : (stored.metadata.parentSessionId ?? null);
-            }
-            return true;
-        };
-        const valid = new Map(sessions.map((session) => [session.id, validParent(session)]));
+        const valid = new Map(sessions.map((session) => [session.id, this.validParent(session, candidates)]));
         const accepted = sessions.flatMap((proposed) => {
             const metadata = database === undefined || proposed.externalSessionId === null
                 ? undefined

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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.46",
+  "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.46",
-    "@myagentroam/marctl": "0.11.7",
-    "@myagentroam/protocol": "0.11.46",
-    "@myagentroam/code-navigation": "0.11.1"
+    "@myagentroam/code-navigation": "0.11.1",
+    "@myagentroam/marctl": "0.11.8",
+    "@myagentroam/agent": "0.11.47",
+    "@myagentroam/protocol": "0.11.47"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"