@myagentroam/node 0.11.45 → 0.11.47

package/dist/runtime-state.js

@@ -103,7 +103,7 @@ export class NodeRuntimeState {
             nativeControl: input.externalSessionId === undefined ? 'MAR_MANAGED' : (input.nativeControl ?? 'EXTERNAL'),
             channelToken: null,
             cwd: input.cwd,
-            model: input.model ?? null,
+            modelId: input.modelId ?? null,
             effort: input.effort ?? null,
             access: input.access ?? null,
             customTitle,
@@ -139,7 +139,7 @@ export class NodeRuntimeState {
                 nativeControl: input.externalSessionId === undefined ? 'MAR_MANAGED' : 'EXTERNAL',
                 channelToken: null,
                 cwd: input.cwd,
-                model: null,
+                modelId: null,
                 effort: null,
                 access: null,
                 customTitle: null,
@@ -214,7 +214,7 @@ export class NodeRuntimeState {
     }
     updateAgentSessionConfiguration(input) {
         return this.replaceSession(input.sessionId, {
-            ...(input.model === undefined ? {} : { model: input.model }),
+            ...(input.modelId === undefined ? {} : { modelId: input.modelId }),
             ...(input.effort === undefined ? {} : { effort: input.effort }),
             ...(input.access === undefined ? {} : { access: input.access })
         });
@@ -456,7 +456,7 @@ export class NodeRuntimeState {
             runId: run.id,
             userItemId: user.id,
             status: 'PREPARING',
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             items: [user],
@@ -1059,7 +1059,7 @@ export class NodeRuntimeState {
             runId: null,
             userItemId: null,
             status: input.failed ? 'FAILED' : 'SUCCEEDED',
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             items: [],
@@ -1374,7 +1374,7 @@ export class NodeRuntimeState {
             runId: run.id,
             userItemId: null,
             status: terminal(run.status) ? run.status : 'RUNNING',
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             items: [],
@@ -1416,7 +1416,7 @@ export class NodeRuntimeState {
             runId: run.id,
             userItemId: userId,
             status: 'PREPARING',
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             items: [user],

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

@@ -167,9 +167,9 @@ export function createNodeAgentNetwork(options) {
             const workspace = workspaceId === undefined ? undefined : database?.getWorkspace(workspaceId);
             if (!runnerAdapter || !database || !workspace)
                 throw new Error('SESSION_INVALID');
-            const model = input.model ??
-                database.getRunnerDefaults().find((entry) => entry.runner === runner)?.model ??
-                runnerAdapter.defaultConfiguration(workspace, actor.secretEnvironment ?? {}, runnerAdapter.prepareExecutionContext(actor.runnerConfiguration ?? {})).model;
+            const model = input.modelId ??
+                database.getRunnerDefaults().find((entry) => entry.runner === runner)?.modelId ??
+                runnerAdapter.defaultConfiguration(workspace, actor.secretEnvironment ?? {}, runnerAdapter.prepareExecutionContext(actor.runnerConfiguration ?? {})).modelId;
             const request = {
                 ...executionInput(actor, runner, model, parent !== undefined),
                 workspaceId: workspace.id,
@@ -182,7 +182,7 @@ export function createNodeAgentNetwork(options) {
                 __suppressNotifications: true,
                 ...(!terminal && parent ? { __marctlOrigin: origin(parent) } : {}),
                 ...(input.title === undefined ? {} : { title: input.title }),
-                ...(model ? { model } : {}),
+                ...(model ? { modelId: model } : {}),
                 ...(input.effort === undefined ? {} : { effort: input.effort }),
                 ...(input.attachments === undefined ? {} : { attachments: input.attachments }),
                 ...(input.attachmentIds === undefined ? {} : { attachmentIds: input.attachmentIds })
@@ -229,7 +229,7 @@ export function createNodeAgentNetwork(options) {
             const current = await options.resume.resolveForMessage(session.id);
             const executionContext = options.runners
                 .require(current.runner)
-                .prepareExecutionContext(executionInput(actor, current.runner, current.model, current.parentSessionId != null));
+                .prepareExecutionContext(executionInput(actor, current.runner, current.modelId, current.parentSessionId != null));
             signal?.throwIfAborted();
             const result = await options.withGrant(actor, () => options.coordinator.start({
                 session: current,
@@ -262,7 +262,7 @@ export function createNodeAgentNetwork(options) {
             const parent = terminalCalls.has(actor) ? undefined : await actorSession(actor);
             signal?.throwIfAborted();
             const result = await options.withGrant(actor, () => options.messages.operations()['session.message']({
-                ...executionInput(actor, session.runner, session.model, session.parentSessionId != null),
+                ...executionInput(actor, session.runner, session.modelId, session.parentSessionId != null),
                 ...input,
                 ...(signal ? { [SESSION_ADMISSION_SIGNAL]: signal } : {}),
                 sessionId: session.id,
@@ -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 ?? '';
@@ -27,7 +27,8 @@ export class AgentNetworkService {
                     input.attachmentIds.some((id) => typeof id !== 'string' || !id))) ||
             (!!input.attachments?.length && !!input.attachmentIds?.length) ||
             !validOptionalString(input.runner) ||
-            !validOptionalString(input.model) ||
+            'model' in input ||
+            !validOptionalString(input.modelId) ||
             !validOptionalString(input.effort) ||
             !validOptionalString(input.title) ||
             !validOptionalString(input.parentSessionId) ||
@@ -40,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);
@@ -53,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 ?? '';
@@ -91,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
@@ -190,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' ||
@@ -198,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);
@@ -223,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) ||
@@ -267,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/service/continuous-run-coordinator.js

@@ -717,7 +717,7 @@ export class ContinuousRunCoordinator {
                 ...(pending.externalSessionId === null
                     ? {}
                     : { externalSessionId: pending.externalSessionId }),
-                ...(pending.model === null ? {} : { model: pending.model }),
+                ...(pending.modelId === null ? {} : { model: pending.modelId }),
                 ...(pending.effort === null ? {} : { effort: pending.effort }),
                 ...(pending.access === null ? {} : { access: pending.access }),
                 collaborationMode: pending.collaborationMode,

package/dist/service/external-session-resume-service.js

@@ -106,7 +106,7 @@ export class ExternalSessionResumeService {
                         cwd,
                         createdAt: session.createdAt,
                         lastActivityAt: session.lastActivityAt,
-                        model: configuration.model,
+                        modelId: configuration.modelId,
                         effort: configuration.effort,
                         access: configuration.access,
                         ...(session.runnerTitle === null ? {} : { title: session.runnerTitle }),

package/dist/service/goal-continuation-coordinator.js

@@ -184,7 +184,7 @@ export class GoalContinuationCoordinator {
             this.options
                 .runners()
                 .require(session.runner)
-                .assertChildModel(session.model, executionContext);
+                .assertChildModel(session.modelId, executionContext);
         this.invalidateGoalContinuation(session.id);
         const prepared = this.prepareGoalSession(session);
         const goalSession = prepared.session;
@@ -558,13 +558,13 @@ export class GoalContinuationCoordinator {
             : session;
         if (changed &&
             prepared.externalSessionId !== null &&
-            prepared.model !== null &&
+            prepared.modelId !== null &&
             prepared.effort !== null)
             this.options.database()?.saveNativeSessionMetadata({
                 runner: prepared.runner,
                 externalSessionId: prepared.externalSessionId,
                 workspaceId: prepared.workspaceId,
-                model: prepared.model,
+                modelId: prepared.modelId,
                 effort: prepared.effort,
                 access
             });

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

@@ -5,6 +5,7 @@ import { SessionWatchSlotCoordinator } from './session-watch-slot-coordinator.js
 const INTERVAL_MS = 2_000;
 const TTL_MS = 45_000;
 const MAX_FAILURES = 3;
+const INITIAL_SEGMENT_LIMIT = 3;
 export class NativeSessionWatchService {
     options;
     watches = new Map();
@@ -323,7 +324,9 @@ export class NativeSessionWatchService {
                 return;
             stage = 'project_snapshot';
             const page = update.page;
-            const payload = lease.unit === 'SEGMENT' ? projectInitialPage(session, page, 'SEGMENT', 10) : page;
+            const payload = lease.unit === 'SEGMENT'
+                ? projectInitialPage(session, page, 'SEGMENT', INITIAL_SEGMENT_LIMIT)
+                : page;
             this.emitSnapshot(lease, session, payload);
             this.releaseSnapshotPendingEvents(lease, page);
             const hydration = watch.observation.hydrate();
@@ -405,7 +408,7 @@ export class NativeSessionWatchService {
             if (!lease.ready)
                 continue;
             const payload = lease.unit === 'SEGMENT'
-                ? this.options.projectInitialPage?.(session, page, 'SEGMENT', 10)
+                ? this.options.projectInitialPage?.(session, page, 'SEGMENT', INITIAL_SEGMENT_LIMIT)
                 : page;
             if (payload === undefined)
                 continue;
@@ -431,7 +434,7 @@ export class NativeSessionWatchService {
             if (!lease.snapshotSent)
                 continue;
             const payload = lease.unit === 'SEGMENT'
-                ? this.options.projectInitialPage?.(session, page, 'SEGMENT', 10)
+                ? this.options.projectInitialPage?.(session, page, 'SEGMENT', INITIAL_SEGMENT_LIMIT)
                 : page;
             if (payload === undefined)
                 continue;

package/dist/service/planned-restart-handoff.js

@@ -51,7 +51,7 @@ const sessionSchema = z
         id: identifier,
         workspaceId: identifier,
         cwd: z.string().min(1),
-        model: z.string().nullable(),
+        modelId: z.string().nullable(),
         effort: z.string().nullable(),
         access: z.string().nullable()
     })
@@ -68,7 +68,7 @@ const sessionSchema = z
     .strict();
 export const plannedRestartSchema = z
     .object({
-    schemaVersion: z.literal(1),
+    schemaVersion: z.literal(2),
     id: identifier,
     nodeId: identifier,
     serverUrl: z.string().min(1),
@@ -76,6 +76,14 @@ export const plannedRestartSchema = z
     sessions: z.array(sessionSchema)
 })
     .strict();
+const legacyPlannedRestartSchema = plannedRestartSchema.extend({
+    schemaVersion: z.literal(1),
+    sessions: z.array(sessionSchema.extend({
+        session: sessionSchema.shape.session.omit({ modelId: true }).extend({
+            model: z.string().nullable()
+        })
+    }))
+});
 export const RESTART_NOTICE = 'The previous execution was interrupted by a system restart. Check the session history and current workspace, then continue unfinished work. Verify completed or uncertain actions before proceeding; do not blindly repeat actions with external side effects.';
 /** A one-shot orderly-shutdown handoff, not a crash-recovery journal. */
 export class PlannedRestartHandoff {
@@ -129,7 +137,18 @@ export class PlannedRestartHandoff {
             return;
         }
         try {
-            const value = plannedRestartSchema.parse(JSON.parse(text));
+            const saved = JSON.parse(text);
+            const legacy = legacyPlannedRestartSchema.safeParse(saved);
+            const value = plannedRestartSchema.parse(legacy.success
+                ? {
+                    ...legacy.data,
+                    schemaVersion: 2,
+                    sessions: legacy.data.sessions.map((entry) => {
+                        const { model, ...session } = entry.session;
+                        return { ...entry, session: { ...session, modelId: model } };
+                    })
+                }
+                : saved);
             const identity = this.options.identity();
             if (value.nodeId !== identity.nodeId || value.serverUrl !== identity.serverUrl)
                 throw new Error('RESTART_HANDOFF_IDENTITY_MISMATCH');
@@ -190,7 +209,7 @@ export class PlannedRestartHandoff {
                     id: session.externalSessionId,
                     workspaceId: session.workspaceId,
                     cwd: session.cwd,
-                    model: session.model,
+                    modelId: session.modelId,
                     effort: session.effort,
                     access: session.access
                 },
@@ -207,7 +226,7 @@ export class PlannedRestartHandoff {
             });
         }
         return plannedRestartSchema.parse({
-            schemaVersion: 1,
+            schemaVersion: 2,
             id: randomUUID(),
             ...this.options.identity(),
             createdAt: Date.now(),

package/dist/service/restart-session-restorer.js

@@ -18,7 +18,7 @@ export class RestartSessionRestorer {
                     workspaceId: entry.session.workspaceId,
                     ownerUserId,
                     runner: 'mar-agent',
-                    model: entry.session.model
+                    modelId: entry.session.modelId
                 }));
             return contexts.get(ownerUserId);
         };
@@ -35,7 +35,7 @@ export class RestartSessionRestorer {
             throw new Error('RESTART_SESSION_MISMATCH');
         session = this.options.runtime.updateAgentSessionConfiguration({
             sessionId: session.id,
-            model: entry.session.model ?? session.model,
+            modelId: entry.session.modelId ?? session.modelId,
             effort: entry.session.effort ?? session.effort,
             access: entry.session.access ?? session.access
         });

package/dist/service/session-recent-activity.js

@@ -127,7 +127,7 @@ export function marctlSessionDetail(runtime, session, queuedCount) {
         ...identity(session),
         status,
         runId,
-        model: session.model,
+        modelId: session.modelId,
         effort: session.effort,
         queuedCount,
         latestMessage,

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) {
@@ -89,7 +97,7 @@ export class NativeSessionProjectionService {
             nativeControl: 'EXTERNAL',
             channelToken: null,
             cwd: workspace.path,
-            model: record.metadata.model,
+            modelId: record.metadata.modelId,
             effort: record.metadata.effort,
             access: record.metadata.access,
             customTitle: record.metadata.customTitle,
@@ -123,7 +131,7 @@ export class NativeSessionProjectionService {
             cwd: direct.cwd,
             createdAt: direct.createdAt,
             lastActivityAt: direct.lastActivityAt,
-            ...(direct.model === null ? {} : { model: direct.model }),
+            ...(direct.modelId === null ? {} : { modelId: direct.modelId }),
             ...(direct.effort === null ? {} : { effort: direct.effort }),
             ...(direct.access === null ? {} : { access: direct.access }),
             ...(direct.runnerTitle === null ? {} : { title: direct.runnerTitle }),
@@ -142,9 +150,9 @@ export class NativeSessionProjectionService {
         const fallback = saved ?? runner.defaultConfiguration(workspace);
         const configuration = {
             runner: session.runner,
-            model: typeof session.model === 'string' && session.model.trim().length > 0
-                ? session.model
-                : fallback.model,
+            modelId: typeof session.modelId === 'string' && session.modelId.trim().length > 0
+                ? session.modelId
+                : fallback.modelId,
             effort: typeof session.effort === 'string' ? session.effort : fallback.effort,
             access: runner.restoreStoredAccess(session.access, fallback.access)
         };
@@ -152,13 +160,13 @@ export class NativeSessionProjectionService {
     }
     ensureResumedConfiguration(session) {
         const configuration = this.resumedConfiguration(session);
-        if (session.model === configuration.model &&
+        if (session.modelId === configuration.modelId &&
             session.effort === configuration.effort &&
             session.access === configuration.access)
             return session;
         return this.options.runtime.updateAgentSessionConfiguration({
             sessionId: session.id,
-            model: configuration.model,
+            modelId: configuration.modelId,
             effort: configuration.effort,
             access: configuration.access
         });
@@ -214,7 +222,7 @@ export class NativeSessionProjectionService {
             nativeControl: 'EXTERNAL',
             channelToken: null,
             cwd: input.cwd,
-            model: metadata?.model ?? null,
+            modelId: metadata?.modelId ?? null,
             effort: metadata?.effort ?? null,
             access: metadata?.access ?? null,
             customTitle: metadata?.customTitle ?? null,
@@ -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