@myagentroam/node 0.10.35 → 0.10.37

package/dist/service/scheduled-session-store.js

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { assertScheduleTimezone, nextScheduledAt, parseScheduledCron } from './scheduled-session-recurrence.js';
+export const SCHEDULE_RESTART_OUTCOME_UNKNOWN = 'SCHEDULE_RESTART_OUTCOME_UNKNOWN';
 export class ScheduledSessionStore {
     database;
     now;
@@ -176,6 +177,26 @@ export class ScheduledSessionStore {
             throw error;
         }
     }
+    recoverInterrupted() {
+        return this.write(() => {
+            // FAILED closes scheduling bookkeeping, not the unknown execution or its side effects.
+            const rows = this.database
+                .prepare(`UPDATE scheduled_session_occurrences SET status='FAILED',code=?,updated_at=?
+          WHERE status IN ('CLAIMED','SUBMITTED') RETURNING id,task_id`)
+                .all(SCHEDULE_RESTART_OUTCOME_UNKNOWN, this.now());
+            const tasks = new Map();
+            for (const row of rows) {
+                if (tasks.has(row.task_id))
+                    continue;
+                const task = this.getById(row.task_id);
+                if (task === undefined)
+                    throw new Error('SCHEDULE_TASK_NOT_FOUND');
+                tasks.set(task.id, task);
+                this.pruneTerminal(row.id);
+            }
+            return rows.map((row) => ({ task: tasks.get(row.task_id), occurrenceId: row.id }));
+        });
+    }
     finish(occurrenceId, status, code, runId) {
         const result = this.database
             .prepare(`UPDATE scheduled_session_occurrences SET status=?,code=?,run_id=?,updated_at=?
@@ -183,6 +204,9 @@ export class ScheduledSessionStore {
             .run(status, code ?? null, runId ?? null, this.now(), occurrenceId);
         if (result.changes === 0 || status === 'SUBMITTED')
             return;
+        this.pruneTerminal(occurrenceId);
+    }
+    pruneTerminal(occurrenceId) {
         this.database
             .prepare(`DELETE FROM scheduled_session_occurrences
       WHERE task_id=(SELECT task_id FROM scheduled_session_occurrences WHERE id=?)

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

@@ -11,6 +11,7 @@ export class SessionCatalogService {
     operations() {
         return {
             'session.list': (data) => this.list(record(data)),
+            'session.graph': (data) => this.graph(record(data)),
             'session.remove': (data) => this.enqueueMutation(() => this.remove(record(data))),
             'workspace.sessions.cleanup': (data) => this.enqueueMutation(() => this.cleanupWorkspaceSessions(record(data))),
             'session.rewind': (data) => this.enqueueMutation(() => this.rewind(record(data))),
@@ -18,11 +19,59 @@ export class SessionCatalogService {
         };
     }
     async list(input) {
+        const sessions = await this.collect(input);
+        return sessionPage(sessions.filter((session) => input.parentSessionId === undefined || session.parentSessionId === input.parentSessionId), input);
+    }
+    async graph(input) {
+        if (typeof input.workspaceId !== 'string')
+            throw new Error('WORKSPACE_NOT_FOUND');
+        if (typeof input.sessionId !== 'string')
+            throw new Error('SESSION_INVALID');
+        const limit = input.limit === undefined ? 100 : input.limit;
+        if (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)
+            throw new Error('SESSION_INVALID');
+        const sessions = await this.collect({ workspaceId: input.workspaceId, registeredOnly: true });
+        const root = sessions.find((session) => session.id === input.sessionId);
+        if (root === undefined)
+            throw new Error('SESSION_NOT_FOUND');
+        const children = new Map();
+        for (const session of sessions) {
+            if (session.parentSessionId == null)
+                continue;
+            const siblings = children.get(session.parentSessionId) ?? [];
+            siblings.push(session);
+            children.set(session.parentSessionId, siblings);
+        }
+        const queue = [root];
+        const visited = new Set([root.id]);
+        const nodes = [];
+        for (let index = 0; index < queue.length && index < limit; index += 1) {
+            const session = queue[index];
+            nodes.push({
+                id: session.id,
+                parentSessionId: session.parentSessionId ?? null,
+                title: session.customTitle ?? session.runnerTitle ?? 'Untitled session',
+                runner: session.runner,
+                ...('activity' in session ? { activity: session.activity } : {})
+            });
+            for (const child of children.get(session.id) ?? []) {
+                if (visited.has(child.id))
+                    continue;
+                visited.add(child.id);
+                queue.push(child);
+            }
+        }
+        return { rootSessionId: root.id, nodes, truncated: queue.length > nodes.length };
+    }
+    async collect(input) {
         const workspaceId = typeof input.workspaceId === 'string' ? input.workspaceId : undefined;
+        const registeredOnly = input.registeredOnly === true;
+        if (registeredOnly && workspaceId === undefined)
+            throw new Error('WORKSPACE_NOT_FOUND');
         const query = typeof input.query === 'string' && input.query.trim().length > 0
             ? input.query.trim().normalize('NFKC').toLocaleLowerCase()
             : undefined;
-        const nativeSessions = workspaceId === undefined
+        const nativeSessions = registeredOnly || workspaceId === undefined
             ? this.options.cachedNative()
             : query === undefined
                 ? await this.options.cachedWorkspace(workspaceId)
@@ -57,7 +106,7 @@ export class SessionCatalogService {
                 this.options.projectionForNative(candidate) === undefined)
         ].map((session) => [session.id, session]));
         if (workspaceId !== undefined)
-            this.mergePersisted(merged, workspaceId, query === undefined && this.options.discoveryPending(workspaceId));
+            this.mergePersisted(merged, workspaceId, !registeredOnly && query === undefined && this.options.discoveryPending(workspaceId));
         const sessions = [...merged.values()].filter((session) => {
             if (query === undefined)
                 return true;
@@ -66,9 +115,9 @@ export class SessionCatalogService {
                 .toLocaleLowerCase();
             return title.includes(query);
         });
-        return sessionPage(workspaceId === undefined
+        return workspaceId === undefined
             ? sessions
-            : sessions.filter((session) => session.workspaceId === workspaceId), input);
+            : sessions.filter((session) => session.workspaceId === workspaceId);
     }
     mergePersisted(merged, workspaceId, discoveryPending) {
         const database = this.options.database();
@@ -95,6 +144,7 @@ export class SessionCatalogService {
                 access: persisted.metadata.access,
                 customTitle: persisted.metadata.customTitle,
                 sessionPrompt: persisted.metadata.sessionPrompt ?? null,
+                parentSessionId: persisted.metadata.parentSessionId ?? null,
                 runnerTitle: persisted.metadata.runnerTitle,
                 pinnedAt: persisted.pinOrder === null ? null : 1,
                 pinOrder: persisted.pinOrder,
@@ -249,6 +299,7 @@ export class SessionCatalogService {
                         session.lastActivityAt >= cutoff)) ||
                 (session.pinOrder !== null && session.pinOrder !== undefined) ||
                 this.options.isWatching(session.id) ||
+                this.options.isRecovering?.(session.id) ||
                 this.options.runtime.sessionQueue(session.id).itemIds.length > 0 ||
                 this.options.runtime
                     .listRunsForSession(session.id)
@@ -301,6 +352,8 @@ export class SessionCatalogService {
             ? this.options.runtime.beginSessionHistoryMutation(session.id)
             : undefined;
         try {
+            if (this.options.isRecovering?.(session.id))
+                throw new Error('SESSION_RESTART_PENDING');
             const runner = this.options.runners.require(session.runner);
             const missingCandidate = requireCleanupSafety && session.externalDiscovered === false;
             if (missingCandidate && !(await runner.isNativeSessionMissing(session)))

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

@@ -72,6 +72,7 @@ export class SessionCommandService {
             return this.options.goal({
                 session,
                 objective: invocation.argument,
+                ...(input.__suppressNotifications === true ? { suppressNotifications: true } : {}),
                 ...(input.__usageGrant === undefined
                     ? {}
                     : { usageGrant: modelUsageGrantSchema.parse(input.__usageGrant) }),

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

@@ -97,6 +97,20 @@ export class SessionLifecycleService {
         const workspace = database.getWorkspace(input.workspaceId);
         if (workspace === undefined)
             throw new Error('WORKSPACE_NOT_FOUND');
+        let parentSessionId;
+        if (input.parentSessionId !== undefined) {
+            if (typeof input.parentSessionId !== 'string' ||
+                input.parentSessionId.length === 0 ||
+                input.parentSessionId.length > 512)
+                throw new Error('SESSION_INVALID');
+            const liveParent = this.options.runtime.getAgentSession(input.parentSessionId);
+            const parent = liveParent ?? database.getSessionRecord(input.parentSessionId);
+            if (parent === undefined || parent.workspaceId !== workspace.id)
+                throw new Error('SESSION_NOT_FOUND');
+            if (liveParent?.externalSessionId === null)
+                throw new Error('SESSION_ACTIVATION_REQUIRED');
+            parentSessionId = liveParent?.externalSessionId ?? parent.id;
+        }
         const environment = parseSecretEnvironment(input.secretEnvironment);
         const saved = database.getRunnerDefaults().find((value) => value.runner === runner.name);
         const fallback = runner.defaultConfiguration(workspace, environment);
@@ -113,6 +127,7 @@ export class SessionLifecycleService {
         if (runner.name === 'mar-agent' && !['auto', 'full-access'].includes(configuration.access))
             throw new Error('SESSION_INVALID');
         const session = this.options.runtime.createAgentSession({
+            ...(parentSessionId === undefined ? {} : { parentSessionId }),
             workspaceId: input.workspaceId,
             runner: runner.name,
             cwd: input.cwd,
@@ -134,24 +149,25 @@ export class SessionLifecycleService {
     }
     async updateConfiguration(input) {
         if (typeof input.sessionId !== 'string' ||
-            typeof input.model !== 'string' ||
+            (input.model === undefined && input.effort === undefined && input.access === undefined) ||
             !validSessionOption(input.model) ||
-            typeof input.effort !== 'string' ||
             !validSessionEffort(input.effort) ||
-            typeof input.access !== 'string' ||
             !validSessionOption(input.access))
             throw new Error('SESSION_INVALID');
         const current = this.options.runtime.getAgentSession(input.sessionId) ??
             (await this.options.projection.createMetadataProjection(input.sessionId));
-        if (current === undefined)
+        if (current === undefined ||
+            (typeof input.workspaceId === 'string' && input.workspaceId !== current.workspaceId))
             throw new Error('SESSION_NOT_FOUND');
-        if (current.runner === 'mar-agent' && !['auto', 'full-access'].includes(input.access))
+        if (current.runner === 'mar-agent' &&
+            input.access !== undefined &&
+            !['auto', 'full-access'].includes(input.access))
             throw new Error('SESSION_INVALID');
         const session = this.options.runtime.updateAgentSessionConfiguration({
             sessionId: current.id,
-            model: input.model,
-            effort: input.effort,
-            access: input.access
+            ...(typeof input.model === 'string' ? { model: input.model } : {}),
+            ...(typeof input.effort === 'string' ? { effort: input.effort } : {}),
+            ...(typeof input.access === 'string' ? { access: input.access } : {})
         });
         if (session.externalSessionId !== null)
             this.options.database().saveNativeSessionMetadata({
@@ -232,6 +248,7 @@ export class SessionLifecycleService {
                 sessionId: messageSessionId,
                 clientMessageId: input.clientMessageId,
                 content: input.content,
+                ...(input.__suppressNotifications === true ? { __suppressNotifications: true } : {}),
                 ...(input.__requestUserId === undefined ? {} : { __requestUserId: input.__requestUserId }),
                 ...(input.__usageGrant === undefined ? {} : { __usageGrant: input.__usageGrant }),
                 ...(input.secretEnvironment === undefined

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

@@ -5,17 +5,29 @@ import { parseSecretEnvironment } from '../util/secret-environment.js';
 import { personalInstructionsForRunner } from '../util/personal-instructions.js';
 import { safeErrorCode } from '../util/safe-error.js';
 import { publicGoalStartText } from './goal-runtime.js';
-import { serializeComposerTag, composerVisibleText } from '@myagentroam/protocol';
+import { serializeComposerTag, composerVisibleText, steerComposerMessage } from '@myagentroam/protocol';
 import { relative } from 'node:path';
 import { prepareComposerResourceInput, composerResourceInputTags, validateComposerSkills } from './composer-message-input.js';
 const INTERNAL_GOAL = Symbol('internalGoal');
 const INTERNAL_SCHEDULE = Symbol('internalSchedule');
+const INTERNAL_RESTORE = Symbol('internalRestore');
 export class SessionMessageService {
     options;
     pendingMessages = new Map();
+    preparations = new Set();
+    accepting = true;
     constructor(options) {
         this.options = options;
     }
+    async drain() {
+        await Promise.allSettled([...this.preparations]);
+    }
+    setAccepting(accepting) {
+        this.accepting = accepting;
+    }
+    restoreQueued(input) {
+        return this.message({ ...input, [INTERNAL_RESTORE]: true });
+    }
     operations() {
         return {
             'session.message': (data) => this.message(record(data)),
@@ -26,7 +38,11 @@ export class SessionMessageService {
     submitGoal(input) {
         return this.message({
             [INTERNAL_GOAL]: true,
+            [INTERNAL_RESTORE]: input.restoreQueued === true,
             sessionId: input.sessionId,
+            __suppressNotifications: input.suppressNotifications === true ||
+                (input.kind === 'continue' &&
+                    this.options.runtime.activeSessionRun(input.sessionId)?.suppressNotifications === true),
             clientMessageId: `goal:${randomUUID()}`,
             content: input.kind === 'start'
                 ? publicGoalStartText(input.objective ?? '')
@@ -64,7 +80,14 @@ export class SessionMessageService {
             marAgentRuntimeScopeId: input.marAgentRuntimeScopeId
         });
     }
-    async message(input) {
+    message(input) {
+        if (!this.accepting)
+            return Promise.reject(new Error('NODE_STOPPED'));
+        const task = this.prepareMessage(input);
+        this.preparations.add(task);
+        return task.finally(() => this.preparations.delete(task));
+    }
+    async prepareMessage(input) {
         if (typeof input.sessionId !== 'string' ||
             typeof input.clientMessageId !== 'string' ||
             input.clientMessageId.length === 0 ||
@@ -77,7 +100,9 @@ export class SessionMessageService {
         const content = input.content;
         const internalGoal = input[INTERNAL_GOAL] === true;
         const internalSchedule = input[INTERNAL_SCHEDULE] === true;
-        const internalRunnerContent = (internalGoal || internalSchedule) && typeof input.__runnerContent === 'string'
+        const internalRestore = input[INTERNAL_RESTORE] === true;
+        const internalRunnerContent = (internalGoal || internalSchedule || internalRestore) &&
+            typeof input.__runnerContent === 'string'
             ? input.__runnerContent
             : content;
         const inlineAttachments = parseMessageAttachments(input.attachments);
@@ -112,9 +137,9 @@ export class SessionMessageService {
                 ...(existing.kind === 'queue' ? { queueItemId: existing.item.id } : {}),
                 delivery: existing.kind === 'queue' ? 'QUEUED' : 'STARTED',
                 idempotent: true,
-                auditReceipt: auditReceipt(session, existing.kind === 'queue' ? 'QUEUE' : 'SEND', existing.run.id, existing.kind === 'queue' ? existing.item.id : undefined)
+                auditReceipt: auditReceipt(session, existing.kind === 'queue' ? 'QUEUE' : 'SEND', existing.kind === 'queue' ? existing.item.id : existing.run.id, existing.kind === 'queue' ? existing.item.id : undefined)
             };
-        const goalMessage = internalGoal || internalSchedule
+        const goalMessage = internalGoal || internalSchedule || internalRestore
             ? undefined
             : this.options.goalMessage(session, content, requestedIntent);
         const runnerContent = goalMessage?.runnerContent ?? internalRunnerContent;
@@ -128,23 +153,48 @@ export class SessionMessageService {
         const operation = (async () => {
             const acceptedSession = accepted.session;
             const session = this.options.runtime.getAgentSession(acceptedSession.id) ?? acceptedSession;
-            const runId = randomUUID();
+            const runId = internalRestore && typeof input.__queueItemId === 'string'
+                ? input.__queueItemId
+                : randomUUID();
             const queueBeforeCreate = this.options.runtime.sessionQueue(session.id);
             const active = this.options.runtime.activeSessionRun(session.id);
             if (internalSchedule && (active !== undefined || queueBeforeCreate.itemIds.length > 0))
                 throw new Error('SCHEDULE_SESSION_BUSY');
             const replaceCurrentRun = intent === 'REPLACE_CURRENT' ? active : undefined;
-            const created = this.options.coordinator.accept({
+            const userSteer = requestedIntent === 'REPLACE_CURRENT' &&
+                goalMessage?.activated !== true &&
+                !internalGoal &&
+                !internalSchedule &&
+                !internalRestore;
+            const steerTarget = userSteer
+                ? {
+                    turnId: active === undefined
+                        ? undefined
+                        : this.options.runtime.conversationTurnForRun(active.id)?.id,
+                    executionId: active === undefined ? undefined : this.options.runtime.currentExecutionId(active.id)
+                }
+                : undefined;
+            const acceptedMessage = {
                 runId,
                 sessionId: session.id,
                 clientMessageId,
                 content: publicContent,
                 ...(internalSchedule ? { source: 'SCHEDULED' } : {}),
+                ...(input.__suppressNotifications === true ? { suppressNotifications: true } : {}),
                 ...(Number.isSafeInteger(input.__requestUserId)
                     ? { initiatedByUserId: input.__requestUserId }
                     : {}),
                 ...(inlineAttachments.length === 0 ? {} : { attachments: inlineAttachments })
-            }, secretEnvironment);
+            };
+            const created = internalRestore
+                ? {
+                    run: undefined,
+                    queueItem: this.options.runtime.createQueueItem({
+                        ...acceptedMessage,
+                        queueItemId: runId
+                    }).item
+                }
+                : this.options.coordinator.accept(acceptedMessage, secretEnvironment);
             const submissionId = created.queueItem?.id ?? created.run.id;
             const sessionForPresentation = input.__goal === true
                 ? session
@@ -193,6 +243,13 @@ export class SessionMessageService {
                     else
                         this.options.runtime.updateQueueItemAttachments(created.queueItem.id, attachments, displayInput);
                     this.options.coordinator.prepare(submissionId, {
+                        restartMessage: {
+                            content,
+                            attachments,
+                            ...(Number.isSafeInteger(input.__requestUserId)
+                                ? { initiatedByUserId: input.__requestUserId }
+                                : {})
+                        },
                         ...(input.__usageGrant === undefined
                             ? {}
                             : { usageGrant: modelUsageGrantSchema.parse(input.__usageGrant) }),
@@ -201,6 +258,11 @@ export class SessionMessageService {
                         workspaceId: currentSession.workspaceId,
                         runner: currentSession.runner,
                         input: runner.prepareMessageInput(runnerInput, planActive ? 'plan' : 'default'),
+                        ...(userSteer
+                            ? {
+                                prepareSteerInput: () => runner.prepareMessageInput(steerComposerMessage(runnerInput), planActive ? 'plan' : 'default')
+                            }
+                            : {}),
                         clientMessageId,
                         attachments: runnerImageAttachments,
                         attachmentPaths,
@@ -235,12 +297,15 @@ export class SessionMessageService {
                         !this.options.prepareGoalInsertion(session.id, submissionId, goalMessage.goal))
                         throw new Error('GOAL_REVISION_STALE');
                     this.options.attachments.retainSessionFiles(currentSession.id, submissionId);
-                    const delivery = this.options.coordinator.settle({
-                        submissionId,
-                        intent,
-                        queueBefore: queueBeforeCreate,
-                        ...(replaceCurrentRun === undefined ? {} : { activeRunId: replaceCurrentRun.id })
-                    });
+                    const delivery = internalRestore
+                        ? 'QUEUED'
+                        : this.options.coordinator.settle({
+                            submissionId,
+                            intent,
+                            queueBefore: queueBeforeCreate,
+                            ...(steerTarget === undefined ? {} : { steerTarget }),
+                            ...(replaceCurrentRun === undefined ? {} : { activeRunId: replaceCurrentRun.id })
+                        });
                     reservation?.commit((directories) => this.options.attachments.adoptSessionFiles(currentSession.id, submissionId, directories, currentSession.workspaceId, attachmentPaths));
                     this.options.attachments.acceptSessionInput(currentSession.id);
                     return delivery;
@@ -263,7 +328,7 @@ export class SessionMessageService {
                 ...(created.queueItem === undefined ? {} : { queueItemId: created.queueItem.id }),
                 delivery,
                 idempotent: false,
-                auditReceipt: auditReceipt(sessionForPresentation, intent === 'QUEUE' ? 'QUEUE' : intent === 'REPLACE_CURRENT' ? 'REPLACE_CURRENT' : 'SEND', created.run.id, created.queueItem?.id)
+                auditReceipt: auditReceipt(sessionForPresentation, intent === 'QUEUE' ? 'QUEUE' : intent === 'REPLACE_CURRENT' ? 'REPLACE_CURRENT' : 'SEND', created.run?.id ?? submissionId, created.queueItem?.id)
             };
         })();
         this.pendingMessages.set(pendingKey, operation);

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

@@ -12,6 +12,7 @@ export class SessionPresentationService {
                 session = {
                     ...session,
                     sessionPrompt: metadata.sessionPrompt ?? null,
+                    parentSessionId: metadata.parentSessionId ?? session.parentSessionId ?? null,
                     pinnedAt: metadata.pinnedAt,
                     pinOrder: metadata.pinOrder
                 };
@@ -24,6 +25,7 @@ export class SessionPresentationService {
         });
         return {
             ...session,
+            parentSessionId: session.parentSessionId ?? null,
             ...presentation,
             runtime: {
                 ...presentation.runtime,

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

@@ -11,7 +11,7 @@ export class SessionQueryService {
             'session.cli.context': (data) => this.cliContext(record(data)),
             'session.goal.get': async (data) => {
                 const input = record(data);
-                const session = await this.requireSession(input.sessionId, input.workspaceId);
+                const session = await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true);
                 return { goal: this.options.goal?.(session.id) ?? null };
             },
             'session.runs': (data) => this.runs(record(data)),
@@ -24,7 +24,7 @@ export class SessionQueryService {
     }
     async get(input) {
         return {
-            session: this.options.present(await this.requireSession(input.sessionId, input.workspaceId))
+            session: this.options.present(await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true))
         };
     }
     async cliContext(input) {
@@ -35,7 +35,7 @@ export class SessionQueryService {
             throw new Error('WORKSPACE_NOT_FOUND');
         const session = input.sessionId === undefined
             ? undefined
-            : await this.requireSession(input.sessionId, workspace.id);
+            : await this.requireSession(input.sessionId, workspace.id, input.registeredOnly === true);
         return {
             workspace: { id: workspace.id, path: workspace.path },
             session: session === undefined ? null : this.options.present(session),
@@ -43,12 +43,12 @@ export class SessionQueryService {
         };
     }
     async runs(input) {
-        const session = await this.requireSession(input.sessionId, input.workspaceId);
+        const session = await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true);
         return { runs: this.options.runtime.listRunsForSession(session.id, { includeTerminal: true }) };
     }
     async turns(input) {
         const page = pageInput(input);
-        const session = await this.requireSession(input.sessionId, input.workspaceId);
+        const session = await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true);
         if (input.unit === 'SEGMENT')
             return this.options.segments(session, page);
         if (input.unit !== undefined && input.unit !== 'TURN')
@@ -66,7 +66,7 @@ export class SessionQueryService {
         return this.options.runtime.listConversationItems({ sessionId: session.id, ...page });
     }
     async readToolResource(input) {
-        const session = await this.requireSession(input.sessionId, input.workspaceId);
+        const session = await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true);
         if (typeof input.workspaceId !== 'string' || input.workspaceId !== session.workspaceId)
             throw new Error('SESSION_NOT_FOUND');
         const resource = toolResultResourceInputSchema.parse({
@@ -80,7 +80,7 @@ export class SessionQueryService {
         return toolResultResourcePageSchema.parse(await runner.readToolResultResource(session, resource));
     }
     async readContext(input) {
-        return this.options.context.read(await this.requireSession(input.sessionId, input.workspaceId));
+        return this.options.context.read(await this.requireSession(input.sessionId, input.workspaceId, input.registeredOnly === true));
     }
     async discover(input) {
         const runner = this.options.runners.product(input.runner);
@@ -96,10 +96,15 @@ export class SessionQueryService {
         const sessions = await this.options.discover(runner.name, workspaceId);
         return { sessions: sessions.map((session) => this.options.present(session)) };
     }
-    async requireSession(sessionId, workspaceId) {
+    async requireSession(sessionId, workspaceId, registeredOnly = false) {
         if (typeof sessionId !== 'string')
             throw new Error('SESSION_INVALID');
-        const session = this.options.runtime.getAgentSession(sessionId) ?? (await this.options.resolve(sessionId));
+        const session = this.options.runtime.getAgentSession(sessionId) ??
+            (await this.options.resolve(sessionId, registeredOnly));
+        if (session === undefined && registeredOnly && typeof workspaceId === 'string')
+            throw Object.assign(new Error('SESSION_NOT_FOUND'), {
+                publicDetails: this.options.similar(sessionId, workspaceId)
+            });
         if (session === undefined || (workspaceId !== undefined && session.workspaceId !== workspaceId))
             throw new Error('SESSION_NOT_FOUND');
         return session;

package/dist/service/workspace-queue-workbench-service.js

@@ -1,3 +1,4 @@
+import { steerComposerMessage } from '@myagentroam/protocol';
 import { isPlainRecord, withNonImageAttachmentPrompt } from '../util/node-operation-parsers.js';
 import { assertQueueItemOwner, assertSessionControlOwner } from './run-ownership-policy.js';
 export class WorkspaceQueueWorkbenchService {
@@ -63,10 +64,15 @@ export class WorkspaceQueueWorkbenchService {
             })
         };
     }
-    get(input) {
-        const session = this.requireSession(input);
+    async get(input) {
+        if (typeof input.workspaceId !== 'string' || typeof input.sessionId !== 'string')
+            throw new Error('WORKSPACE_NOT_FOUND');
+        const session = this.options.runtime.getAgentSession(input.sessionId) ??
+            (await this.options.resolve(input.sessionId, input.registeredOnly === true));
+        if (session?.workspaceId !== input.workspaceId)
+            throw new Error('SESSION_NOT_FOUND');
         return {
-            queue: this.present(session.workspaceId, session.id)
+            queue: this.snapshot(session.id)
         };
     }
     pauseOrResume(mode, input) {
@@ -113,12 +119,13 @@ export class WorkspaceQueueWorkbenchService {
         const item = this.requireItem(input.queueItemId, input.workspaceId);
         assertQueueItemOwner(item, input.__requestUserId);
         const content = input.content.trim();
-        this.options.runtime.updateQueueItem(item.id, content);
         const prepared = this.options.coordinator.pending(item.id);
-        if (prepared !== undefined) {
-            const runnerInput = withNonImageAttachmentPrompt(content, prepared.attachmentPaths, prepared.attachmentFiles);
-            this.options.coordinator.updatePreparedInput(item.id, this.options.prepareInput(prepared.runner, runnerInput, prepared.collaborationMode));
-        }
+        const runnerInput = prepared === undefined
+            ? undefined
+            : this.options.prepareInput(prepared.runner, withNonImageAttachmentPrompt(prepared.steering ? steerComposerMessage(content) : content, prepared.attachmentPaths, prepared.attachmentFiles), prepared.collaborationMode);
+        this.options.runtime.updateQueueItem(item.id, content);
+        if (runnerInput !== undefined)
+            this.options.coordinator.updatePreparedInput(item.id, runnerInput);
         this.options.emit(item.workspaceId, item.sessionId);
         return {
             queue: this.present(item.workspaceId, item.sessionId),