@myagentroam/node 0.11.15 → 0.11.17

package/dist/service/hosted-conversation-node-service.js

@@ -1,33 +1,19 @@
 import { assertMcpServerNames } from '../mcp/naming.js';
 import { modelUsageGrantSchema, steerComposerMessage } from '@myagentroam/protocol';
-import { createHash, randomUUID } from 'node:crypto';
+import { randomUUID } from 'node:crypto';
 import { constants } from 'node:fs';
 import { lstat, mkdir, open, readFile, rename, rm, utimes } from 'node:fs/promises';
-import { isAbsolute, join, relative, resolve, sep } from 'node:path';
-import { toolResultResourceInputSchema, toolResultResourcePageSchema, conversationTurnSchema, conversationTemplateDraftSchema, conversationTemplateSummarySchema, hostedConversationConfigUpdateInputSchema, hostedConversationCreateInputSchema, hostedConversationDeleteResultSchema, hostedConversationFileDeleteInputSchema, hostedConversationFileDeleteResultSchema, hostedConversationFileReadInputSchema, hostedConversationFileReadResultSchema, hostedConversationFilesSchema, hostedConversationHistoryInputSchema, hostedConversationHistoryPageSchema, hostedConversationIdInputSchema, hostedConversationImageReadInputSchema, hostedConversationListInputSchema, hostedConversationListPageSchema, hostedConversationMessageInputSchema, hostedConversationMetadataUpdateInputSchema, hostedConversationRollbackInputSchema, hostedConversationSnapshotSchema, hostedConversationSummarySchema, hostedConversationUnwatchInputSchema, hostedConversationUploadChunkInputSchema, hostedConversationUploadControlInputSchema, hostedConversationUploadCreateInputSchema, hostedConversationUploadPreflightInputSchema, hostedConversationUploadPreflightResultSchema, hostedConversationUploadSchema, hostedConversationWatchInputSchema, marAgentRuntimeModelConfigurationSchema, mcpInstallationConfigurationSchema, mcpRuntimeDescriptorSchema, resolveMarAgentDefaultReasoningEffort } from '@myagentroam/protocol';
+import { join } from 'node:path';
+import { toolResultResourceInputSchema, toolResultResourcePageSchema, conversationTurnSchema, conversationTemplateSummarySchema, hostedConversationConfigUpdateInputSchema, hostedConversationCreateInputSchema, hostedConversationDeleteResultSchema, hostedConversationFileDeleteInputSchema, hostedConversationFileDeleteResultSchema, hostedConversationFileReadInputSchema, hostedConversationFileReadResultSchema, hostedConversationFilesSchema, hostedConversationHistoryInputSchema, hostedConversationHistoryPageSchema, hostedConversationIdInputSchema, hostedConversationImageReadInputSchema, hostedConversationListInputSchema, hostedConversationListPageSchema, hostedConversationMessageInputSchema, hostedConversationMetadataUpdateInputSchema, hostedConversationRollbackInputSchema, hostedConversationSnapshotSchema, hostedConversationSummarySchema, hostedConversationUnwatchInputSchema, hostedConversationUploadChunkInputSchema, hostedConversationUploadControlInputSchema, hostedConversationUploadCreateInputSchema, hostedConversationUploadPreflightInputSchema, hostedConversationUploadPreflightResultSchema, hostedConversationUploadSchema, hostedConversationWatchInputSchema, marAgentRuntimeModelConfigurationSchema, resolveMarAgentDefaultReasoningEffort } from '@myagentroam/protocol';
 import { hostedConversationGeneratedImagesDisplayDirectory, hostedConversationImageRunId, marAgentGeneratedImagesDirectory } from '../runner/mar-agent/generated-images.js';
 import { sessionTitleFromFirstMessage } from '../util/node-operation-parsers.js';
 import { safeErrorCode } from '../util/safe-error.js';
 import { SessionWatchSlotCoordinator } from './session-watch-slot-coordinator.js';
+import { parseTemplateVersionManifest, templateContentHash, templateMcpConfigHash, templateManifestHash } from './conversation-template-manifest.js';
 const DEFAULT_HOSTED_CONVERSATION_TITLE = 'New conversation';
 const HOST_POLICY_VERSION = 1;
 const MAX_FILE_READ_BYTES = 512 * 1024;
 const WATCH_TTL_MS = 45_000;
-const RUNTIME_LINK_ROOTS = ['/usr', '/bin', '/sbin', '/lib', '/lib64'];
-const RESERVED_SANDBOX_ROOTS = [
-    '/workspace',
-    '/home/mar',
-    '/runtime',
-    '/usr',
-    '/bin',
-    '/sbin',
-    '/lib',
-    '/lib64',
-    '/proc',
-    '/dev',
-    '/run',
-    '/tmp'
-];
 /** Implements the Node-owned hosted-conversation domain over an injected MAR Agent runtime. */
 export class HostedConversationNodeService {
     options;
@@ -1719,8 +1705,7 @@ export class HostedConversationNodeService {
         try {
             const manifestText = await readFile(manifestPath, 'utf8');
             const manifestJson = manifestText.endsWith('\n') ? manifestText.slice(0, -1) : manifestText;
-            if (manifestJson !== row.manifest ||
-                createHash('sha256').update(manifestJson).digest('hex') !== row.manifest_hash)
+            if (manifestJson !== row.manifest || templateManifestHash(manifestText) !== row.manifest_hash)
                 throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
             persisted = JSON.parse(manifestJson);
         }
@@ -1729,16 +1714,14 @@ export class HostedConversationNodeService {
         }
         if (!record(persisted))
             throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-        const snapshot = publishedTemplateSnapshot(persisted);
-        const parsedDraft = publishedTemplateDraft(persisted.draft);
-        const draft = parsedDraft.draft;
-        const mcpServers = publishedMcpServers(persisted.mcpServers);
-        const contentHash = publishedTemplateContentHash(snapshot.directories, snapshot.entries);
+        const snapshot = parseTemplateVersionManifest(persisted);
+        const { allowedModels, defaultModelId, ...draft } = snapshot.draft;
+        const mcpServers = snapshot.mcpServers;
+        const contentHash = templateContentHash(snapshot.directories, snapshot.entries);
         const totalBytes = snapshot.entries.reduce((total, entry) => total + entry.size, 0);
-        if (persisted.mcpConfigHash !== row.mcp_config_hash ||
-            createHash('sha256').update(JSON.stringify(mcpServers)).digest('hex') !==
-                row.mcp_config_hash ||
-            persisted.contentHash !== row.content_hash ||
+        if (snapshot.mcpConfigHash !== row.mcp_config_hash ||
+            templateMcpConfigHash(mcpServers) !== row.mcp_config_hash ||
+            snapshot.contentHash !== row.content_hash ||
             contentHash !== row.content_hash ||
             row.file_count !== snapshot.entries.length ||
             row.total_bytes !== totalBytes)
@@ -1756,7 +1739,10 @@ export class HostedConversationNodeService {
             templateDirectory: contentDirectory,
             sourceWorkspacePath: snapshot.sourceWorkspacePath,
             draft,
-            modelPolicy: parsedDraft.modelPolicy,
+            modelPolicy: {
+                allowedIds: allowedModels.map((model) => model.modelId),
+                defaultId: defaultModelId
+            },
             mcpServers
         };
     }
@@ -1825,160 +1811,11 @@ function selectModel(version, models, requestedModelId) {
         throw new Error('HOSTED_CONVERSATION_MODEL_NOT_AVAILABLE');
     return model;
 }
-function publishedTemplateDraft(value) {
-    const current = conversationTemplateDraftSchema.safeParse(value);
-    if (current.success) {
-        const { allowedModels, defaultModelId, ...draft } = current.data;
-        return {
-            draft,
-            modelPolicy: {
-                allowedIds: allowedModels.map((model) => model.modelId),
-                defaultId: defaultModelId
-            }
-        };
-    }
-    throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-}
 function networkModels(models, networkMode) {
     if (networkMode !== 'NONE')
         return models;
     return models.map((model) => model.hostedWebSearch ? { ...model, hostedWebSearch: false } : model);
 }
-function publishedMcpServers(value) {
-    if (!Array.isArray(value))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return value.map((candidate) => {
-        if (!record(candidate))
-            throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-        const keys = Object.keys(candidate).sort().join(',');
-        if (keys !== 'configuration,displayName,id,origin,runtime,serverName,transport,version')
-            throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-        const runtime = mcpRuntimeDescriptorSchema.parse(candidate.runtime);
-        const configuration = mcpInstallationConfigurationSchema.parse(candidate.configuration);
-        if (typeof candidate.id !== 'string' ||
-            typeof candidate.serverName !== 'string' ||
-            typeof candidate.displayName !== 'string' ||
-            typeof candidate.version !== 'string' ||
-            (candidate.origin !== 'NODE' && candidate.origin !== 'WORKSPACE') ||
-            candidate.transport !== runtime.transport)
-            throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-        return {
-            id: candidate.id,
-            serverName: candidate.serverName,
-            displayName: candidate.displayName,
-            version: candidate.version,
-            origin: candidate.origin,
-            transport: runtime.transport,
-            runtime,
-            configuration
-        };
-    });
-}
-function publishedTemplateSnapshot(manifest) {
-    if (manifest.schemaVersion !== 2 ||
-        typeof manifest.sourceWorkspacePath !== 'string' ||
-        !Array.isArray(manifest.directories) ||
-        !Array.isArray(manifest.entries))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    validatePublishedSourceWorkspacePath(manifest.sourceWorkspacePath);
-    const directories = manifest.directories.map(safePublishedTemplateRelativePath);
-    if (new Set(directories).size !== directories.length ||
-        directories.includes('inbox') ||
-        directories.includes('output'))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    const entries = manifest.entries.map(publishedTemplateEntry);
-    if (new Set(entries.map((entry) => entry.relativePath)).size !== entries.length)
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return {
-        schemaVersion: 2,
-        sourceWorkspacePath: manifest.sourceWorkspacePath,
-        directories,
-        entries
-    };
-}
-function publishedTemplateEntry(value) {
-    if (!record(value))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    if (value.kind === 'FILE')
-        return publishedTemplateFile(value, true);
-    if (value.kind !== 'SYMLINK' ||
-        typeof value.linkTarget !== 'string' ||
-        value.linkTarget.length === 0 ||
-        value.linkTarget.includes('\0') ||
-        (value.targetKind !== 'SNAPSHOT' && value.targetKind !== 'RUNTIME') ||
-        typeof value.resolvedTarget !== 'string')
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    const relativePath = safePublishedTemplateRelativePath(value.relativePath);
-    const size = safePublishedTemplateSize(value.size);
-    const linkTarget = value.linkTarget;
-    const targetKind = value.targetKind;
-    const resolvedTarget = value.resolvedTarget;
-    if (size !== Buffer.byteLength(linkTarget))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    if (targetKind === 'SNAPSHOT')
-        safePublishedTemplateRelativePath(resolvedTarget);
-    else if (!isAbsolute(resolvedTarget) ||
-        !RUNTIME_LINK_ROOTS.some((root) => resolvedTarget === root || within(root, resolvedTarget)))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return {
-        kind: 'SYMLINK',
-        relativePath,
-        size,
-        linkTarget,
-        targetKind,
-        resolvedTarget
-    };
-}
-function publishedTemplateFile(value, requireKind = false) {
-    if (!record(value) ||
-        (requireKind && value.kind !== 'FILE') ||
-        typeof value.executable !== 'boolean' ||
-        typeof value.sha256 !== 'string' ||
-        !/^[a-f0-9]{64}$/u.test(value.sha256))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return {
-        kind: 'FILE',
-        relativePath: safePublishedTemplateRelativePath(value.relativePath),
-        size: safePublishedTemplateSize(value.size),
-        executable: value.executable,
-        sha256: value.sha256
-    };
-}
-function safePublishedTemplateRelativePath(value) {
-    if (typeof value !== 'string' ||
-        value.length === 0 ||
-        value.startsWith('/') ||
-        value.includes('\\') ||
-        value.split('/').some((segment) => segment.length === 0 || segment === '.' || segment === '..'))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return value;
-}
-function safePublishedTemplateSize(value) {
-    if (!Number.isSafeInteger(value) || value < 0)
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-    return value;
-}
-/** Current manifests hash directory and entry identities; changing the format requires a new version. */
-function publishedTemplateContentHash(directories, entries) {
-    const content = [
-        ...directories.map((directory) => `DIRECTORY\0${directory}`),
-        ...entries.map((entry) => entry.kind === 'FILE'
-            ? `${entry.kind}\0${entry.relativePath}\0${entry.size}\0${entry.executable ? 1 : 0}\0${entry.sha256}`
-            : `${entry.kind}\0${entry.relativePath}\0${entry.size}\0${entry.linkTarget}\0${entry.targetKind}\0${entry.resolvedTarget}`)
-    ].join('\n');
-    return createHash('sha256').update(content).digest('hex');
-}
-function validatePublishedSourceWorkspacePath(path) {
-    if (!isAbsolute(path) ||
-        resolve(path) !== path ||
-        path === '/' ||
-        RESERVED_SANDBOX_ROOTS.some((root) => path === root || within(root, path) || within(path, root)))
-        throw new Error('CONVERSATION_TEMPLATE_VERSION_CORRUPTED');
-}
-function within(parent, candidate) {
-    const relation = relative(parent, candidate);
-    return relation.length > 0 && relation !== '..' && !relation.startsWith(`..${sep}`);
-}
 function resolveMcpServers(version, environment) {
     const resolveReferences = (references) => {
         const resolved = {};

package/dist/service/hosted-conversation-store.js

@@ -701,11 +701,8 @@ export class HostedConversationStore {
                 const paths = conversationPaths(directory);
                 await this.assertConversationLayout(paths);
                 let manifest;
-                let manifestNeedsUpgrade = false;
                 try {
-                    const stored = storedHostedConversationManifest(JSON.parse(await readFile(paths.manifestPath, 'utf8')));
-                    manifest = stored.manifest;
-                    manifestNeedsUpgrade = stored.upgraded;
+                    manifest = hostedConversationManifestSchema.parse(JSON.parse(await readFile(paths.manifestPath, 'utf8')));
                 }
                 catch {
                     throw new Error('HOSTED_CONVERSATION_STORAGE_INVALID');
@@ -724,7 +721,7 @@ export class HostedConversationStore {
                         ...manifest,
                         quota: { ...manifest.quota, usedBytes }
                     });
-                if (manifestNeedsUpgrade || next !== manifest)
+                if (next !== manifest)
                     await this.writeManifest(paths.manifestPath, next);
                 rebuilt.push({ manifest: next, files });
             }
@@ -1220,34 +1217,6 @@ function conversationPaths(conversationDirectory) {
         quotaDirectory: join(runtimeDirectory, 'quota')
     };
 }
-function storedHostedConversationManifest(input) {
-    const stored = typeof input === 'object' && input !== null && !Array.isArray(input)
-        ? input
-        : {};
-    const withoutLegacyMetadata = { ...stored };
-    delete withoutLegacyMetadata['recoverableUntil'];
-    delete withoutLegacyMetadata['pendingVersionId'];
-    const missingPinnedAt = !('pinnedAt' in stored);
-    const missingTitleSource = !('titleSource' in stored);
-    const legacyUpgradeStatus = stored.status === 'UPGRADE_PENDING' || stored.status === 'UPGRADE_FAILED';
-    const hasPendingVersion = 'pendingVersionId' in stored;
-    const upgraded = missingPinnedAt ||
-        missingTitleSource ||
-        'recoverableUntil' in stored ||
-        hasPendingVersion ||
-        legacyUpgradeStatus;
-    return {
-        manifest: hostedConversationManifestSchema.parse(upgraded
-            ? {
-                ...withoutLegacyMetadata,
-                ...(missingPinnedAt ? { pinnedAt: null } : {}),
-                ...(missingTitleSource ? { titleSource: 'CUSTOM' } : {}),
-                ...(legacyUpgradeStatus ? { status: 'ACTIVE' } : {})
-            }
-            : input),
-        upgraded
-    };
-}
 function childPath(parent, key) {
     if (!STORAGE_KEY.test(key))
         throw new Error('HOSTED_CONVERSATION_STORAGE_INVALID');

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

@@ -117,28 +117,21 @@ export class NativeSessionProjectionService {
     }
     resumedConfiguration(session) {
         const workspace = this.options.database()?.getWorkspace(session.workspaceId);
+        const runner = this.options.runners.require(session.runner);
         const saved = this.options
             .database()
             ?.getRunnerDefaults()
             .find((value) => value.runner === session.runner);
-        const fallback = saved ?? this.options.runners.require(session.runner).defaultConfiguration(workspace);
+        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,
             effort: typeof session.effort === 'string' ? session.effort : fallback.effort,
-            access: typeof session.access === 'string' && session.access.trim().length > 0
-                ? session.access
-                : session.runner === 'mar-agent'
-                    ? 'full-access'
-                    : fallback.access
+            access: runner.restoreStoredAccess(session.access, fallback.access)
         };
-        return session.runner === 'mar-agent' &&
-            configuration.access !== 'auto' &&
-            configuration.access !== 'full-access'
-            ? { ...configuration, access: 'full-access' }
-            : configuration;
+        return configuration;
     }
     ensureResumedConfiguration(session) {
         const configuration = this.resumedConfiguration(session);
@@ -315,32 +308,22 @@ export class NativeSessionProjectionService {
                 runner.forgetNativeAlias(nativeId);
             }
         }
+        const directIds = new Set();
         for (const [directId, direct] of this.options.state.directNative) {
             if (direct.runner === session.runner &&
                 direct.cwd === session.cwd &&
                 direct.externalSessionId !== null &&
                 nativeIds.has(direct.externalSessionId)) {
+                directIds.add(directId);
                 this.options.state.directNative.delete(directId);
-                this.options.state.externalActivity.delete(directId);
-                this.options.state.resumedByDirectId.delete(directId);
-                this.options.state.resumeFailures.delete(directId);
-                this.options.state.messageResumeFailures.delete(directId);
-                this.options.state.resumeFailureDetails.delete(directId);
-                const timer = this.options.state.failureTimers.get(directId);
-                if (timer !== undefined)
-                    clearTimeout(timer);
-                this.options.state.failureTimers.delete(directId);
             }
         }
-        for (const [directId, resumedId] of this.options.state.resumedByDirectId)
-            if (projectionIds.has(resumedId))
-                this.options.state.resumedByDirectId.delete(directId);
         for (const projectionId of projectionIds) {
             if (this.options.runtime.getAgentSession(projectionId) !== undefined)
                 this.options.runtime.removeAgentSession(projectionId);
             this.options.commands.removeSession(projectionId);
-            this.options.state.externalActivity.delete(projectionId);
         }
+        this.options.releaseResumeState(directIds, projectionIds);
     }
     requireDatabase() {
         const database = this.options.database();

package/dist/service/node-control-channel.js

@@ -1,7 +1,7 @@
 import WebSocket from 'ws';
 import { createEnvelope } from '@myagentroam/protocol';
 import { ControlOutboundScheduler } from '../control-outbound-scheduler.js';
-import { nodeConnectEndpoint } from '../runner/codex/conversation-parser.js';
+import { nodeConnectEndpoint } from '../util/node-operation-parsers.js';
 export class NodeControlChannel {
     options;
     socket;

package/dist/service/node-control-message-service.js

@@ -51,10 +51,6 @@ export class NodeControlMessageService {
         }
         if (envelope.type === 'ack')
             return;
-        if (envelope.type === 'runs.reconcile') {
-            this.options.reconcileRuns(envelope);
-            return;
-        }
         if (envelope.type === 'run.approval.decision') {
             this.decideApproval(envelope);
             return;
@@ -80,10 +76,6 @@ export class NodeControlMessageService {
             this.cancelRun(envelope);
             return;
         }
-        if (envelope.type === 'lease.reconcile') {
-            this.options.send('ack', { type: envelope.type }, envelope.id);
-            return;
-        }
         if (envelope.type !== 'error')
             this.options.send('error', { code: 'MESSAGE_TYPE_UNKNOWN' }, envelope.id);
     }

package/dist/service/node-request-service.js

@@ -1,5 +1,5 @@
 import { nodeLog } from '../operational.js';
-import { validUserAuthorization } from '../runner/codex/conversation-parser.js';
+import { validUserAuthorization } from '../util/node-operation-parsers.js';
 import { safePublicError } from '../util/safe-error.js';
 /** Validates and executes the closed Admin-facing Node operation envelope. */
 export class NodeRequestService {

package/dist/service/node-run-event-bridge.js

@@ -27,41 +27,4 @@ export class NodeRunEventBridge {
             queue: this.options.queues.present(workspaceId, sessionId)
         });
     }
-    migrateRunnerSessionIdentity(sessionId, nativeSessionId) {
-        for (const [turnId, managed] of this.options.codex.execution.managedTurns) {
-            if (managed.sessionId === sessionId)
-                this.options.codex.execution.managedTurns.set(turnId, {
-                    ...managed,
-                    sessionId: nativeSessionId
-                });
-        }
-        for (const [runId, managed] of this.options.codex.execution.runs) {
-            if (managed.sessionId === sessionId)
-                this.options.codex.execution.runs.set(runId, { ...managed, sessionId: nativeSessionId });
-        }
-        for (const [runId, managed] of this.options.claude.execution.runs) {
-            if (managed.marSessionId === sessionId)
-                this.options.claude.execution.runs.set(runId, {
-                    ...managed,
-                    marSessionId: nativeSessionId
-                });
-        }
-        for (const [runId, managed] of this.options.openCode.execution) {
-            if (managed.sessionId === sessionId)
-                this.options.openCode.execution.set(runId, { ...managed, sessionId: nativeSessionId });
-        }
-    }
-    reconcile(envelope) {
-        const payload = envelope.payload;
-        if (!Array.isArray(payload.runIds) || payload.runIds.some((id) => typeof id !== 'string')) {
-            this.options.send('error', { code: 'MESSAGE_INVALID' }, envelope.id);
-            return;
-        }
-        for (const runId of payload.runIds) {
-            const known = this.options.state.active.has(runId);
-            this.options.runtime.reconcileRun(runId, known);
-            this.options.send('lease.reconcile', { runId, known });
-        }
-        this.options.send('ack', { type: 'runs.reconcile' }, envelope.id);
-    }
 }

package/dist/service/node-terminal-channel.js

@@ -1,6 +1,6 @@
 import WebSocket from 'ws';
 import { terminalDataFrameSchema } from '@myagentroam/protocol';
-import { nodeTerminalConnectEndpoint, isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { nodeTerminalConnectEndpoint, isPlainRecord } from '../util/node-operation-parsers.js';
 import { TerminalRelayState } from './terminal-relay-state.js';
 import { TerminalRelaySender } from '@myagentroam/marctl/src/terminal-relay-sender.mjs';
 export class NodeTerminalChannel {

package/dist/service/recent-run-projection-service.js

@@ -1,3 +1,4 @@
+import { composerVisibleText } from '@myagentroam/protocol';
 const TERMINAL_TTL_MS = 12 * 60 * 60_000;
 const CLEANUP_INTERVAL_MS = 5 * 60_000;
 const TERMINAL_LIMIT = 100;
@@ -91,7 +92,7 @@ function taskKey(userId, sessionId) {
     return `${userId}\0${sessionId}`;
 }
 function messagePreview(value) {
-    const normalized = value?.trim().replace(/\s+/gu, ' ');
+    const normalized = value === undefined ? undefined : composerVisibleText(value).replace(/\s+/gu, ' ');
     return normalized === undefined || normalized.length === 0 ? undefined : normalized.slice(0, 500);
 }
 function terminal(status) {

package/dist/service/run-workbench-service.js

@@ -1,7 +1,7 @@
 import { runImageReadInputSchema } from '@myagentroam/protocol';
 import { nodeOperationData } from '../util/node-operation-data.js';
 import { isTerminalRunStatus } from '../util/node-operation-parsers.js';
-import { isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { isPlainRecord } from '../util/node-operation-parsers.js';
 import { isHostedConversationImageRunId } from '../runner/mar-agent/generated-images.js';
 import { assertRunOwner } from './run-ownership-policy.js';
 export class RunWorkbenchService {

package/dist/service/runner-interaction-service.js

@@ -1,5 +1,6 @@
 import { denyPermission } from '../claude-agent-sdk.js';
-import { boundedConversationItemId, claudeUserInputQuestions, isTerminalRunStatus } from '../runner/codex/conversation-parser.js';
+import { boundedConversationItemId, isTerminalRunStatus } from '../util/node-operation-parsers.js';
+import { claudeUserInputQuestions } from '../runner/claude/conversation-parser.js';
 export class RunnerInteractionService {
     options;
     constructor(options) {

package/dist/service/runner-service.js

@@ -52,13 +52,15 @@ export class RunnerService {
         const defaults = this.database()
             .getRunnerDefaults()
             .map((configuration) => {
-            if (configuration.runner !== 'mar-agent' ||
-                configuration.access === 'auto' ||
-                configuration.access === 'full-access')
+            const runner = this.runners.optional(configuration.runner);
+            if (runner === undefined)
+                return configuration;
+            const access = runner.restoreStoredAccess(configuration.access, configuration.access);
+            if (access === configuration.access)
                 return configuration;
             const normalized = {
                 ...configuration,
-                access: 'full-access'
+                access
             };
             this.database().saveRunnerDefaults(normalized);
             return normalized;

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

@@ -28,6 +28,7 @@ export class SessionIdentityService {
         const session = this.options.runtime.promoteSessionIdentity(sessionId, nativeSessionId, {
             deferRunChanges: true
         });
+        this.options.migrateAttachments(sessionId, nativeSessionId);
         this.options.migrateGoal(sessionId, nativeSessionId);
         this.options.migrateCommands(sessionId, nativeSessionId);
         this.options.migrateQueue(sessionId, nativeSessionId);

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

@@ -178,6 +178,7 @@ export class SessionMessageService {
                 sessionId: session.id,
                 clientMessageId,
                 content: publicContent,
+                ...(internalGoal || goalMessage?.activated === true ? { goalInput: true } : {}),
                 ...(internalSchedule ? { source: 'SCHEDULED' } : {}),
                 ...(input.__suppressNotifications === true ? { suppressNotifications: true } : {}),
                 ...(Number.isSafeInteger(input.__requestUserId)

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

@@ -1,5 +1,5 @@
 import { marctlSessionDetail } from './session-recent-activity.js';
-import { isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { isPlainRecord } from '../util/node-operation-parsers.js';
 import { toolResultResourceInputSchema, toolResultResourcePageSchema } from '@myagentroam/protocol';
 export class SessionQueryService {
     options;

package/dist/service/workbench-event-projection.js

@@ -1,6 +1,6 @@
 import { conversationSegmentIdentityForItem, conversationSegments } from './conversation-segment-service.js';
 import { runConversationItemId } from '../runtime-state.js';
-import { isNodeAgentRun, isNodeConversationTurn, isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { isNodeAgentRun, isNodeConversationTurn, isPlainRecord } from '../util/node-operation-parsers.js';
 export function workbenchPayloadSessionId(getRun, category, payload) {
     if (!isPlainRecord(payload))
         return undefined;

package/dist/service/workbench-event-service.js

@@ -1,5 +1,5 @@
 import { createEnvelope } from '@myagentroam/protocol';
-import { isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { isPlainRecord } from '../util/node-operation-parsers.js';
 import { projectWorkbenchPayload, workbenchPayloadSessionId } from './workbench-event-projection.js';
 export class WorkbenchEventService {
     options;

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

@@ -189,7 +189,6 @@ export class WorkspaceFileService {
             throw new Error('FILE_PATH_ESCAPE');
         return this.serializeMutation(workspace.id, async () => {
             const result = await writeWorkspaceTextFile(workspace.path, path, content, expectedRevision);
-            this.dispose(workspace.id);
             this.onInvalidated(workspace.id);
             return result;
         });
@@ -221,7 +220,6 @@ export class WorkspaceFileService {
             throw new Error('FILE_PATH_ESCAPE');
         return this.serializeMutation(workspace.id, async () => {
             const result = await mutateWorkspaceFile(workspace.path, action === 'MOVE' ? { action, path, destination: destination } : { action, path });
-            this.dispose(workspace.id);
             this.onInvalidated(workspace.id);
             return result;
         });

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

@@ -177,7 +177,7 @@ export class WorkspaceQueueWorkbenchService {
     }
     publicQueueItem(itemId) {
         const item = this.options.runtime.getQueueItem(itemId);
-        return item?.clientMessageId.startsWith('goal:') ? undefined : item;
+        return item?.goalInput === true ? undefined : item;
     }
     queuedCount(sessionId) {
         return this.options.runtime
@@ -185,7 +185,7 @@ export class WorkspaceQueueWorkbenchService {
             .itemIds.filter((id) => this.publicQueueItem(id) !== undefined).length;
     }
     requireItem(itemId, workspaceId) {
-        const item = this.options.runtime.getQueueItem(itemId);
+        const item = this.publicQueueItem(itemId);
         if (item === undefined)
             throw new Error('QUEUE_ITEM_INVALID');
         if (typeof workspaceId !== 'string' || item.workspaceId !== workspaceId)