@myagentroam/node 0.11.44 → 0.11.46

package/dist/runner-profiles.js

@@ -239,7 +239,7 @@ export function supportsRunnerConfiguration(input) {
     const profile = input.runner === 'claude-code'
         ? claudeProfile(input.environment ?? process.env)
         : definitions[input.runner];
-    const model = profile.models.find((candidate) => candidate.id === input.model);
+    const model = profile.models.find((candidate) => candidate.id === input.modelId);
     return (model !== undefined &&
         model.supportedEfforts.includes(input.effort) &&
         profile.accessOptions.some((candidate) => candidate.id === input.access));

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,
@@ -179,9 +179,10 @@ export function createNodeAgentNetwork(options) {
                 cwd: parent?.cwd ?? workspace.path,
                 content: input.content,
                 clientMessageId: input.clientMessageId,
+                __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 })
@@ -194,6 +195,7 @@ export function createNodeAgentNetwork(options) {
                     objective: input.goal.kind === 'set' ? input.goal.objective : '',
                     secretEnvironment: childEnvironment(actor),
                     messageContent: input.content,
+                    suppressNotifications: true,
                     ...(!terminal && parent ? { messageOrigin: origin(parent) } : {}),
                     clientMessageId: input.clientMessageId,
                     ...(input.attachments === undefined ? {} : { attachments: input.attachments }),
@@ -227,12 +229,13 @@ 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,
                 objective: change.objective,
                 executionContext,
+                suppressNotifications: true,
                 secretEnvironment: childEnvironment(actor),
                 ...(actor.requestUserId === undefined ? {} : { initiatedByUserId: actor.requestUserId }),
                 ...(actor.personalInstructions === undefined
@@ -259,10 +262,11 @@ 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,
+                __suppressNotifications: true,
                 ...(parent ? { __marctlOrigin: origin(parent) } : {})
             }));
             return publicReceipt(result);

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

@@ -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) ||

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

@@ -89,7 +89,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 +123,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 +142,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 +152,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 +214,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,

package/dist/session/runtime/conversation-projection.js

@@ -1,4 +1,4 @@
-import { appendExecutionPresentation, permissionStopSchema } from '@myagentroam/protocol';
+import { appendToolOutput, retainExecutionInputTruncation, toolOutputSchema, permissionStopSchema } from '@myagentroam/protocol';
 import { projectConversationWorkProcesses } from './work-process.js';
 function isRecord(value) {
     return typeof value === 'object' && value !== null;
@@ -292,9 +292,16 @@ export function mergeConversationItemPayload(existing, next) {
     }
     if (next.append === 'output' &&
         isRecord(next.payload.output) &&
-        typeof next.payload.output.text === 'string') {
+        Array.isArray(next.payload.output.blocks)) {
+        const update = toolOutputSchema.parse(next.payload.output);
+        const prior = base.output === undefined ? undefined : toolOutputSchema.parse(base.output);
+        value.output = appendToolOutput(prior, update);
         if (next.payload.toolPresentation !== undefined)
-            value.toolPresentation = appendExecutionPresentation(base.toolPresentation, next.payload.toolPresentation);
+            value.toolPresentation = retainExecutionInputTruncation(base.toolPresentation, next.payload.toolPresentation);
+    }
+    if (next.append === 'output' &&
+        isRecord(next.payload.output) &&
+        typeof next.payload.output.text === 'string') {
         const prior = isRecord(base.output) && typeof base.output.text === 'string' ? base.output : undefined;
         const text = `${prior?.text ?? ''}${next.payload.output.text}`;
         value.output = {

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

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

@@ -107,6 +107,23 @@ export async function readRestrictedDiff(workspacePath, fromRef, toRef) {
     }
     return { binary: false, text: result.text, truncated: result.truncated };
 }
+/** Fetches refs only; failures never expose remote URLs or authentication diagnostics. */
+export async function fetchGitRepository(workspacePath, timeoutMs) {
+    if (timeoutMs <= 0)
+        return false;
+    try {
+        const result = await runGitAllowFailure(workspacePath, ['fetch', '--all', '--quiet', '--no-recurse-submodules', '--no-write-fetch-head'], {
+            timeoutMs,
+            processGroup: true,
+            includeStderrInTimeout: false,
+            environment: { GIT_TERMINAL_PROMPT: '0', GCM_INTERACTIVE: 'never' }
+        });
+        return result.code === 0;
+    }
+    catch {
+        return false;
+    }
+}
 function currentBranchFromStatusHeader(header) {
     const value = header.slice(3);
     if (value.startsWith('HEAD '))
@@ -898,10 +915,12 @@ async function runGitAllowFailure(workspacePath, args, options = {}) {
             cwd: workspacePath,
             shell: false,
             windowsHide: true,
+            detached: options.processGroup === true && process.platform !== 'win32',
             stdio: ['ignore', 'pipe', 'pipe'],
             env: {
                 ...process.env,
                 ...gitOperationEnvironment.getStore(),
+                ...options.environment,
                 ...(options.readOnly === true ? { GIT_OPTIONAL_LOCKS: '0' } : {})
             }
         });
@@ -911,6 +930,7 @@ async function runGitAllowFailure(workspacePath, args, options = {}) {
         let errorSize = 0;
         let truncated = false;
         let timedOut = false;
+        let forcedTerminationTimer;
         const timer = setTimeout(() => {
             timedOut = true;
             if (process.platform === 'win32') {
@@ -932,6 +952,26 @@ async function runGitAllowFailure(workspacePath, args, options = {}) {
                 });
                 return;
             }
+            if (options.processGroup === true && child.pid !== undefined) {
+                const pid = child.pid;
+                try {
+                    // Give Git a chance to release transaction locks before bounded escalation.
+                    process.kill(-pid, 'SIGTERM');
+                    forcedTerminationTimer = setTimeout(() => {
+                        try {
+                            process.kill(-pid, 'SIGKILL');
+                        }
+                        catch {
+                            // The process group may have completed its cleanup already.
+                        }
+                    }, 250);
+                    forcedTerminationTimer.unref();
+                    return;
+                }
+                catch {
+                    // The group may have exited before the timeout fired.
+                }
+            }
             child.kill('SIGKILL');
         }, options.timeoutMs ?? GIT_TIMEOUT_MS);
         child.stdout.on('data', (chunk) => {
@@ -953,6 +993,7 @@ async function runGitAllowFailure(workspacePath, args, options = {}) {
         });
         child.once('error', (error) => {
             clearTimeout(timer);
+            clearTimeout(forcedTerminationTimer);
             logNodeCommandFailure(`git ${args[0] ?? 'unknown'}`, {
                 reason: error.code ?? 'START_FAILED'
             });
@@ -960,9 +1001,11 @@ async function runGitAllowFailure(workspacePath, args, options = {}) {
         });
         child.once('close', (code) => {
             clearTimeout(timer);
+            clearTimeout(forcedTerminationTimer);
             const stderr = Buffer.concat(errors).toString('utf8');
             if (timedOut) {
-                reject(gitCommandFailure(code === null || code === 0 ? 1 : code, `Git command timed out after ${options.timeoutMs ?? GIT_TIMEOUT_MS} ms.${stderr ? `\n${stderr}` : ''}`, args[0] ?? 'unknown', Math.round(performance.now() - startedAt), 'TIMEOUT'));
+                const details = options.includeStderrInTimeout === false ? '' : stderr;
+                reject(gitCommandFailure(code === null || code === 0 ? 1 : code, `Git command timed out after ${options.timeoutMs ?? GIT_TIMEOUT_MS} ms.${details ? `\n${details}` : ''}`, args[0] ?? 'unknown', Math.round(performance.now() - startedAt), 'TIMEOUT'));
                 return;
             }
             const output = Buffer.concat(chunks);