@myagentroam/node 0.11.0 → 0.11.1

package/dist/connector.js

@@ -87,7 +87,8 @@ import { NodeControlChannel } from './service/node-control-channel.js';
 import { NodeControlMessageService } from './service/node-control-message-service.js';
 import { NodeRequestService } from './service/node-request-service.js';
 import { WorkbenchManifestService } from './service/workbench-manifest-service.js';
-import { NodeRunEventBridge, workbenchPayloadSessionId } from './service/node-run-event-bridge.js';
+import { NodeRunEventBridge } from './service/node-run-event-bridge.js';
+import { workbenchPayloadSessionId } from './service/workbench-event-projection.js';
 import { NodeWorkspaceCoordinator } from './service/node-workspace-coordinator.js';
 import { FakeManagedRunService } from './service/fake-managed-run-service.js';
 import { RunnerChannelMessageService } from './service/runner-channel-message-service.js';
@@ -203,9 +204,18 @@ export class NodeConnector {
     configPath;
     reconnect;
     claudeApprovalTimeoutMs;
-    workbenchEventService = new WorkbenchEventService((envelope) => this.sendEnvelope(envelope), (category, payload) => {
-        const sessionId = workbenchPayloadSessionId(this.runtime, category, payload);
-        return sessionId === undefined || !this.sessionIdentityService.bootstrapIds.has(sessionId);
+    workbenchEventService = new WorkbenchEventService({
+        send: (envelope) => this.sendEnvelope(envelope),
+        accepts: (category, payload) => {
+            const sessionId = workbenchPayloadSessionId((id) => this.runtime.getRun(id), category, payload);
+            return sessionId === undefined || !this.sessionIdentityService.bootstrapIds.has(sessionId);
+        },
+        projection: {
+            getRun: (id) => this.runtime.getRun(id),
+            conversationTurnForRun: (id) => this.runtime.conversationTurnForRun(id),
+            progress: (sessionId) => marctlSessionProgress(this.runtime, sessionId)
+        },
+        emitRealtime: (sessionId, event) => this.nativeSessionWatchService.emitRealtime(sessionId, event)
     });
     fakeRunner;
     fakeScript;
@@ -1146,8 +1156,10 @@ export class NodeConnector {
                     nodeLog('node.connection.replaced', {
                         message: 'This Node connection was replaced by a newer instance with the same identity. Check for duplicate processes.'
                     });
-                if (code === 4003 || code === 1001)
-                    void this.terminalManager.shutdown();
+                // Credential revocation ends terminals, but the control channel can still reconnect.
+                // Only final Node disposal shuts down the manager and its idle collector.
+                if (code === 4003)
+                    void this.terminalManager.closeAll();
             }
         });
         this.controlMessages = new NodeControlMessageService({
@@ -1718,24 +1730,7 @@ export class NodeConnector {
         }
         this.emitWorkbenchEvent('session', payload);
     };
-    emitWorkbenchEvent = (category, payload) => {
-        payload = this.runEventBridge.projectWorkbenchPayload(category, payload);
-        if (payload === undefined)
-            return;
-        const event = this.workbenchEventService.next(category, payload);
-        if (event === undefined)
-            return;
-        const notification = category === 'conversation' &&
-            isPlainRecord(payload) &&
-            isPlainRecord(payload.event) &&
-            payload.event.eventType === 'notification';
-        const sessionId = workbenchPayloadSessionId(this.runtime, category, payload);
-        if (!notification &&
-            sessionId !== undefined &&
-            this.nativeSessionWatchService.emitRealtime(sessionId, event))
-            return;
-        this.workbenchEventService.publish(event);
-    };
+    emitWorkbenchEvent = (category, payload) => this.workbenchEventService.dispatch(category, payload);
     discoverWorkspaceSessions = (workspaceId, onRunnerDiscovered) => this.nativeSessionProjectionService.discoverWorkspace(workspaceId, onRunnerDiscovered);
     invalidateWorkspaceWatchTopics = (workspaceId) => this.workspaceCoordinator.invalidate(workspaceId);
     reconcilePersistedRuns = () => undefined;

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

@@ -1,122 +1,9 @@
-import { conversationSegmentIdentityForItem, conversationSegments } from './conversation-segment-service.js';
-import { runConversationItemId } from '../runtime-state.js';
-import { marctlSessionProgress } from './session-recent-activity.js';
-import { isNodeAgentRun, isNodeConversationTurn, isPlainRecord } from '../runner/codex/conversation-parser.js';
-export function workbenchPayloadSessionId(runtime, category, payload) {
-    if (!isPlainRecord(payload))
-        return undefined;
-    if (category === 'session') {
-        if (isPlainRecord(payload.session)) {
-            const id = payload.session.id;
-            if (typeof id === 'string')
-                return id;
-        }
-        return typeof payload.sessionId === 'string' ? payload.sessionId : undefined;
-    }
-    if (category === 'run' && isNodeAgentRun(payload.run))
-        return payload.run.sessionId;
-    if (category === 'conversation') {
-        if (isNodeConversationTurn(payload.turn))
-            return payload.turn.sessionId;
-        if (typeof payload.sessionId === 'string')
-            return payload.sessionId;
-        if (isPlainRecord(payload.event)) {
-            const runId = payload.event.runId;
-            return typeof runId === 'string' ? runtime.getRun(runId)?.sessionId : undefined;
-        }
-    }
-    if (category === 'queue') {
-        const id = payload.sessionId;
-        return typeof id === 'string' ? id : undefined;
-    }
-    return undefined;
-}
 /** Bridges process-local Run state to normalized control and Workbench events. */
 export class NodeRunEventBridge {
     options;
     constructor(options) {
         this.options = options;
     }
-    /** The sole public projection boundary for normalized Run callbacks. */
-    projectWorkbenchPayload(category, payload) {
-        if (category === 'conversation' &&
-            isPlainRecord(payload) &&
-            isPlainRecord(payload.event) &&
-            payload.event.eventType !== 'notification') {
-            const runId = typeof payload.event.runId === 'string' ? payload.event.runId : undefined;
-            const sequence = typeof payload.event.sequence === 'number' ? payload.event.sequence : undefined;
-            const turn = runId === undefined ? undefined : this.options.runtime.conversationTurnForRun(runId);
-            if (turn === undefined)
-                return;
-            const rawPayload = isPlainRecord(payload.event.payload) ? payload.event.payload : undefined;
-            const text = payload.event.eventType === 'text.delta' && typeof rawPayload?.text === 'string'
-                ? rawPayload.text
-                : undefined;
-            const nativeItemId = typeof rawPayload?.itemId === 'string'
-                ? rawPayload.itemId
-                : typeof rawPayload?.approvalId === 'string'
-                    ? `approval:${rawPayload.approvalId}`
-                    : undefined;
-            const item = text !== undefined && sequence !== undefined
-                ? turn.items.find((candidate) => candidate.kind === 'assistant_message' && candidate.revision === sequence)
-                : nativeItemId === undefined
-                    ? undefined
-                    : turn.items.find((candidate) => candidate.id ===
-                        runConversationItemId(runId, nativeItemId, typeof rawPayload?.kind === 'string' ? rawPayload.kind : undefined));
-            if (text !== undefined && item?.kind === 'assistant_message') {
-                const segment = conversationSegmentIdentityForItem(turn, item.id, item.kind);
-                payload = {
-                    sessionId: turn.sessionId,
-                    delta: {
-                        turnId: turn.id,
-                        segmentId: segment.id,
-                        segmentIndex: segment.index,
-                        runId: turn.runId,
-                        itemId: item.id,
-                        text,
-                        createdAt: typeof payload.event.createdAt === 'number' ? payload.event.createdAt : Date.now()
-                    }
-                };
-            }
-            else if (item !== undefined) {
-                const segment = conversationSegmentIdentityForItem(turn, item.id, item.kind);
-                payload = {
-                    sessionId: turn.sessionId,
-                    runId: turn.runId,
-                    ...(['assistant_message', 'tool_call', 'command_execution', 'file_change'].includes(item.kind) &&
-                        (rawPayload?.append === undefined || item.status !== 'IN_PROGRESS')
-                        ? { progress: marctlSessionProgress(this.options.runtime, turn.sessionId) }
-                        : {}),
-                    item: {
-                        turnId: turn.id,
-                        itemId: item.id,
-                        kind: item.kind,
-                        status: item.status,
-                        payload: item.payload,
-                        startedAt: item.startedAt,
-                        completedAt: item.completedAt,
-                        segmentId: segment.id,
-                        segmentIndex: segment.index
-                    }
-                };
-            }
-            else {
-                if (payload.event.eventType !== 'run.started' && payload.event.eventType !== 'run.running')
-                    return;
-                payload = { turn };
-            }
-        }
-        if (category === 'conversation' &&
-            isPlainRecord(payload) &&
-            isNodeConversationTurn(payload.turn))
-            return { ...payload, segments: conversationSegments(payload.turn) };
-        if (category === 'run' && isPlainRecord(payload) && isNodeAgentRun(payload.run))
-            return {
-                ...payload,
-                progress: marctlSessionProgress(this.options.runtime, payload.run.sessionId)
-            };
-        return payload;
-    }
     emitConversationItem(runId, item) {
         this.emitRun(runId, 'conversation.item', item);
     }

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

@@ -16,24 +16,22 @@ export class ScheduledSessionCoordinator {
         const store = this.options.store();
         store.finish(run.clientMessageId, status === 'SUCCEEDED' ? 'SUCCEEDED' : 'FAILED', status === 'SUCCEEDED' ? undefined : `SCHEDULE_RUN_${status}`, run.id);
         const task = store.getById(run.clientMessageId.split(':', 1)[0]);
-        if (task !== undefined) {
-            if (task.notifyOnTerminal)
-                this.publishTaskNotification(task, run.clientMessageId, {
-                    kind: 'SCHEDULE_TERMINAL',
-                    outcome: status,
-                    runId: run.id
-                });
-            else if (status !== 'SUCCEEDED')
-                this.notify(task, run.clientMessageId, `SCHEDULE_RUN_${status}`, 'FAILED');
-        }
+        if (task !== undefined)
+            this.publishTaskNotification(task, run.clientMessageId, {
+                kind: 'SCHEDULE_TERMINAL',
+                outcome: status,
+                runId: run.id
+            });
     }
     notify = (task, occurrenceId, code, status) => this.publishTaskNotification(task, occurrenceId, {
         kind: status === 'FAILED' ? 'SCHEDULE_FAILED' : 'SCHEDULE_SKIPPED',
         code
     });
     publishTaskNotification = (task, occurrenceId, event) => {
+        const currentTask = this.options.store().getById(task.id) ?? task;
+        if (!currentTask.notifyOnTerminal)
+            return;
         const occurredAt = Date.now();
-        const recipient = this.options.store().getById(task.id)?.ownerUserId ?? task.ownerUserId;
         this.options.emitNotification({
             event: {
                 runId: event.kind === 'SCHEDULE_TERMINAL' ? event.runId : occurrenceId,
@@ -41,7 +39,7 @@ export class ScheduledSessionCoordinator {
                 eventType: 'notification',
                 payload: {
                     targetType: 'WORKSPACE_SESSION',
-                    userId: recipient,
+                    userId: currentTask.ownerUserId,
                     workspaceId: task.workspaceId,
                     sessionId: task.sessionId,
                     sessionTitle: this.options.sessionTitle(task.sessionId),

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

@@ -0,0 +1,112 @@
+import { conversationSegmentIdentityForItem, conversationSegments } from './conversation-segment-service.js';
+import { runConversationItemId } from '../runtime-state.js';
+import { isNodeAgentRun, isNodeConversationTurn, isPlainRecord } from '../runner/codex/conversation-parser.js';
+export function workbenchPayloadSessionId(getRun, category, payload) {
+    if (!isPlainRecord(payload))
+        return undefined;
+    if (category === 'session') {
+        if (isPlainRecord(payload.session)) {
+            const id = payload.session.id;
+            if (typeof id === 'string')
+                return id;
+        }
+        return typeof payload.sessionId === 'string' ? payload.sessionId : undefined;
+    }
+    if (category === 'run' && isNodeAgentRun(payload.run))
+        return payload.run.sessionId;
+    if (category === 'conversation') {
+        if (isNodeConversationTurn(payload.turn))
+            return payload.turn.sessionId;
+        if (typeof payload.sessionId === 'string')
+            return payload.sessionId;
+        if (isPlainRecord(payload.event)) {
+            const runId = payload.event.runId;
+            return typeof runId === 'string' ? getRun(runId)?.sessionId : undefined;
+        }
+    }
+    if (category === 'queue') {
+        const id = payload.sessionId;
+        return typeof id === 'string' ? id : undefined;
+    }
+    return undefined;
+}
+/** Projects normalized runtime facts without publishing or mutating them. */
+export function projectWorkbenchPayload(queries, category, payload) {
+    if (category === 'conversation' &&
+        isPlainRecord(payload) &&
+        isPlainRecord(payload.event) &&
+        payload.event.eventType !== 'notification') {
+        const runId = typeof payload.event.runId === 'string' ? payload.event.runId : undefined;
+        const sequence = typeof payload.event.sequence === 'number' ? payload.event.sequence : undefined;
+        const turn = runId === undefined ? undefined : queries.conversationTurnForRun(runId);
+        if (turn === undefined)
+            return;
+        const rawPayload = isPlainRecord(payload.event.payload) ? payload.event.payload : undefined;
+        const text = payload.event.eventType === 'text.delta' && typeof rawPayload?.text === 'string'
+            ? rawPayload.text
+            : undefined;
+        const nativeItemId = typeof rawPayload?.itemId === 'string'
+            ? rawPayload.itemId
+            : typeof rawPayload?.approvalId === 'string'
+                ? `approval:${rawPayload.approvalId}`
+                : undefined;
+        const item = text !== undefined && sequence !== undefined
+            ? turn.items.find((candidate) => candidate.kind === 'assistant_message' && candidate.revision === sequence)
+            : nativeItemId === undefined
+                ? undefined
+                : turn.items.find((candidate) => candidate.id ===
+                    runConversationItemId(runId, nativeItemId, typeof rawPayload?.kind === 'string' ? rawPayload.kind : undefined));
+        if (text !== undefined && item?.kind === 'assistant_message') {
+            const segment = conversationSegmentIdentityForItem(turn, item.id, item.kind);
+            payload = {
+                sessionId: turn.sessionId,
+                delta: {
+                    turnId: turn.id,
+                    segmentId: segment.id,
+                    segmentIndex: segment.index,
+                    runId: turn.runId,
+                    itemId: item.id,
+                    text,
+                    createdAt: typeof payload.event.createdAt === 'number'
+                        ? payload.event.createdAt
+                        : (queries.now ?? Date.now)()
+                }
+            };
+        }
+        else if (item !== undefined) {
+            const segment = conversationSegmentIdentityForItem(turn, item.id, item.kind);
+            payload = {
+                sessionId: turn.sessionId,
+                runId: turn.runId,
+                ...(['assistant_message', 'tool_call', 'command_execution', 'file_change'].includes(item.kind) &&
+                    (rawPayload?.append === undefined || item.status !== 'IN_PROGRESS')
+                    ? { progress: queries.progress(turn.sessionId) }
+                    : {}),
+                item: {
+                    turnId: turn.id,
+                    itemId: item.id,
+                    kind: item.kind,
+                    status: item.status,
+                    payload: item.payload,
+                    startedAt: item.startedAt,
+                    completedAt: item.completedAt,
+                    segmentId: segment.id,
+                    segmentIndex: segment.index
+                }
+            };
+        }
+        else {
+            if (payload.event.eventType !== 'run.started' && payload.event.eventType !== 'run.running')
+                return;
+            payload = { turn };
+        }
+    }
+    if (category === 'conversation' && isPlainRecord(payload) && isNodeConversationTurn(payload.turn))
+        return { ...payload, segments: conversationSegments(payload.turn) };
+    if (category === 'run' && isPlainRecord(payload) && isNodeAgentRun(payload.run))
+        return {
+            ...payload,
+            progress: queries.progress(payload.run.sessionId)
+        };
+    return payload;
+}

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

@@ -1,19 +1,36 @@
 import { createEnvelope } from '@myagentroam/protocol';
+import { isPlainRecord } from '../runner/codex/conversation-parser.js';
+import { projectWorkbenchPayload, workbenchPayloadSessionId } from './workbench-event-projection.js';
 export class WorkbenchEventService {
-    send;
-    accepts;
+    options;
     sequence = 0;
-    constructor(send, accepts) {
-        this.send = send;
-        this.accepts = accepts;
+    constructor(options) {
+        this.options = options;
+    }
+    dispatch(category, payload) {
+        payload = projectWorkbenchPayload(this.options.projection, category, payload);
+        if (payload === undefined)
+            return;
+        const event = this.next(category, payload);
+        if (event === undefined)
+            return;
+        const notification = category === 'conversation' &&
+            isPlainRecord(payload) &&
+            isPlainRecord(payload.event) &&
+            payload.event.eventType === 'notification';
+        const sessionId = workbenchPayloadSessionId(this.options.projection.getRun, category, payload);
+        // A Watch owns pending buffering and observation drops as well as ready delivery.
+        if (!notification && sessionId !== undefined && this.options.emitRealtime(sessionId, event))
+            return;
+        this.publish(event);
     }
     next(category, payload) {
-        if (!this.accepts(category, payload))
+        if (!this.options.accepts(category, payload))
             return undefined;
         return { sequence: ++this.sequence, category, payload };
     }
     publish(event) {
-        this.send(createEnvelope('workbench.event', event));
+        this.options.send(createEnvelope('workbench.event', event));
     }
     snapshotSequence() {
         return this.sequence;

package/dist/terminal.js

@@ -318,17 +318,14 @@ export class TerminalManager {
         const summary = this.notifySummary(terminal);
         try {
             if (terminal.pty !== undefined) {
-                if (this.platform === 'win32') {
-                    // Killing only the shell bypasses node-pty's native console cleanup.
-                    try {
-                        terminal.pty.kill();
-                    }
-                    catch {
-                        await this.terminate(terminal.pty, this.platform);
-                    }
+                // Native PTY hangup reaches POSIX foreground jobs in a separate process group
+                // and releases the native console on Windows; shell-group TERM cannot do this.
+                try {
+                    terminal.pty.kill();
                 }
-                else
+                catch {
                     await this.terminate(terminal.pty, this.platform);
+                }
             }
             if (terminal.pipe !== undefined)
                 await this.terminate(terminal.pipe, this.platform);
@@ -338,13 +335,17 @@ export class TerminalManager {
         }
         return summary;
     }
+    /** Ends current terminals without disposing the manager's idle collection. */
+    async closeAll() {
+        await Promise.all([...this.terminals.values()]
+            .filter((terminal) => terminal.state === 'RUNNING')
+            .map((terminal) => this.close(terminal.id)));
+    }
     async shutdown() {
         if (this.idleTimer !== undefined)
             clearInterval(this.idleTimer);
         this.idleTimer = undefined;
-        await Promise.all([...this.terminals.values()]
-            .filter((terminal) => terminal.state === 'RUNNING')
-            .map((terminal) => this.close(terminal.id)));
+        await this.closeAll();
     }
     onFrame(listener) {
         this.frameListeners.add(listener);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -37,10 +37,10 @@
     "playwright": "1.62.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.11.0",
-    "@myagentroam/marctl": "0.11.0",
+    "@myagentroam/agent": "0.11.1",
     "@myagentroam/code-navigation": "0.11.0",
-    "@myagentroam/protocol": "0.11.0"
+    "@myagentroam/marctl": "0.11.0",
+    "@myagentroam/protocol": "0.11.1"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"