@canonmsg/codex-plugin 0.29.1 → 0.29.2

package/dist/host.js

@@ -6,7 +6,7 @@ import { dirname } from 'node:path';
 import { parseArgs } from 'node:util';
 import { getCodexImagePath, materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { buildTrailBlockId, buildUndeliverableFinalNotice, captureTurnArtifactSnapshot, createTurnArtifactRouter, IDLE_TIMEOUT_MS, PLAN_BLOCK_TITLE, resolveTurnArtifactRouting, collectMissedInboundMessages, createRecoveryCheckpointTracker, createReconnectRecoveryCoordinator, STARTUP_RECOVERY_PAGE_SIZE, } from '@canonmsg/coding-agent-host';
-import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, resolveQuestionAllowOther, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, buildCanonInboundFrameV1, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfileLock, decideAutoReply, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, markLocalRuntimeStopped, normalizeTurnMetadata, parseTurnVerbosityConfig, RuntimeRequestManager, prepareConversationEnvironment, releaseConversationEnvironment, resolveLocalRuntimeSessionState, resolveCanonAgent, verifyResolvedAgentEnvironment, CanonApiError, loadRuntimeSessionState, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveConfiguredWorkspaceCwd, isSilentTurnSuppressed, resolveSilentTurnDelivery, resolveTurnVerbosity, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, resolveQuestionAllowOther, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, buildCanonInboundFrameV1, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createRuntimeStatePublisher, createRuntimeHeartbeat, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfileLock, decideAutoReply, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, markLocalRuntimeStopped, normalizeTurnMetadata, parseTurnVerbosityConfig, RuntimeRequestManager, prepareConversationEnvironment, releaseConversationEnvironment, resolveLocalRuntimeSessionState, resolveCanonAgent, verifyResolvedAgentEnvironment, CanonApiError, loadRuntimeSessionState, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveConfiguredWorkspaceCwd, isSilentTurnSuppressed, resolveSilentTurnDelivery, resolveTurnVerbosity, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { validateCard } from '@canonmsg/rich-cards';
 import { CodexConversationAdapter, } from './adapter.js';
 import { CodexAppServerAdapter, } from './app-server-adapter.js';
@@ -253,9 +253,6 @@ export function buildCodexTurnResponseRouting(input) {
 export function getCodexRequestingUserId(message) {
     return message.senderType === 'human' ? message.senderId : null;
 }
-async function publishAgentRuntime(agentId, runtime, rtdb) {
-    await publishHostAgentRuntime(agentId, 'codex', runtime, rtdb);
-}
 export function resolveSessionExecutionMode(serviceAgentMode = false, defaultExecutionMode = 'worktree') {
     if (serviceAgentMode)
         return 'locked';
@@ -2022,7 +2019,7 @@ export async function main() {
                     return;
                 }
                 if (event.type === 'skills.changed') {
-                    void refreshCodexSkillInventory(true).then(() => publishRuntimeHeartbeat());
+                    void refreshCodexSkillInventory(true).then(() => runtimeHeartbeat.refresh());
                     return;
                 }
                 if (event.type === 'settings.updated') {
@@ -2401,7 +2398,6 @@ export async function main() {
             acceptedInboundMessageIds.delete(oldest);
         }
     }
-    let streamConnected = false;
     const hostAvailableExecutionModes = serviceAgentMode
         ? ['locked']
         : [...EXECUTION_ENVIRONMENT_MODES];
@@ -2569,108 +2565,109 @@ export async function main() {
             console.error(`[canon-codex] [${(error.conversationId ?? 'unknown').slice(0, 8)}] Control ${error.key ?? 'poll'} handler failed:`, error.error instanceof Error ? error.error.message : error.error);
         },
     });
-    let publishRuntimeDetailsInFlight = false;
-    const publishRuntimeHeartbeat = async () => {
+    const publishLocalHeartbeat = () => {
         heartbeatLocalRuntimeEntry(runtimeId, {
             agentId,
             agentName: profileAgentName,
             cwd: workingDir,
             baseCwd: workingDir,
         });
-        if (!streamConnected)
+    };
+    const refreshRuntimeDetails = async (signal) => {
+        await refreshKnownConversationIds().catch((error) => {
+            console.error('[canon-codex] Failed to refresh known conversations:', error);
+        });
+        if (signal.aborted)
             return;
-        await publishAgentRuntime(agentId, runtimeDescriptor, rtdb).catch((error) => {
-            console.error('[canon-codex] Failed to publish agent runtime:', error);
+        await publishHostSessionSnapshots({
+            conversationIds: Array.from(knownConversationIds),
+            agentId,
+            rtdb,
+            clientType: 'codex',
+        }).catch((error) => {
+            console.error('[canon-codex] Failed to publish session snapshots:', error);
         });
-        if (publishRuntimeDetailsInFlight)
+        if (signal.aborted)
             return;
-        publishRuntimeDetailsInFlight = true;
-        try {
-            await refreshKnownConversationIds().catch((error) => {
-                console.error('[canon-codex] Failed to refresh known conversations:', error);
-            });
-            await publishHostSessionSnapshots({
-                conversationIds: Array.from(knownConversationIds),
-                agentId,
-                rtdb,
-                clientType: 'codex',
-            }).catch((error) => {
-                console.error('[canon-codex] Failed to publish session snapshots:', error);
-            });
-            await Promise.all(Array.from(knownConversationIds).map(async (conversationId) => {
-                const session = sessions.get(conversationId);
-                const workspaceId = session
-                    ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
-                    : runtimeDescriptor.defaultWorkspaceId;
-                const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
-                const descriptor = runtimeDescriptor.runtimeDescriptor;
-                if (!descriptor)
-                    return;
-                const payload = {
-                    descriptor,
-                    surfaceMode: 'host',
-                    // The exec --json transport cannot block on approvals — without a
-                    // strip-level warning a user can believe they have an approval
-                    // gate they do not have.
-                    ...(useAppServer
-                        ? {}
-                        : { warning: "Approvals can't block on this Codex CLI — update Codex to enable the app-server transport and approval gates." }),
-                    statusItems: [
-                        {
-                            id: 'transport',
-                            label: 'Transport',
-                            value: useAppServer ? 'app-server' : 'exec --json',
-                        },
-                        {
-                            id: 'streaming',
-                            label: 'Live output',
-                            value: useAppServer
-                                ? 'Plans, questions, approvals, tools, and message deltas'
-                                : 'Thinking, tools, and completed-message previews',
-                        },
-                        {
-                            id: 'codex-cli',
-                            label: 'Codex CLI',
-                            value: codexCliStatus.version ?? (codexCliStatus.raw ?? 'Version unknown'),
-                            tone: codexCliStatus.version ? 'default' : 'warning',
-                        },
-                        {
-                            id: 'nativeActions',
-                            label: 'Native actions',
-                            value: useAppServer ? 'Enabled' : 'Limited until app-server transport',
-                            ...(useAppServer ? {} : { tone: 'warning' }),
-                        },
-                        {
-                            id: 'mediaOut',
-                            label: 'Media out',
-                            value: 'Generated media artifacts',
-                        },
-                    ],
-                    execution: {
-                        resolvedWorkspaceLabel: workspace?.label ?? workspaceId ?? null,
-                        resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
-                        workspaceRootId: workspace?.workspaceRootId ?? null,
-                        workspaceRelativePath: workspace?.workspaceRelativePath ?? null,
-                        executionMode: session?.environment.mode ?? null,
-                        executionBranch: session?.environment.branch ?? null,
-                        worktreePath: session?.environment.worktreePath ?? null,
-                        fallbackReason: resolveExecutionFallbackReason(session?.environment),
+        const results = await Promise.allSettled(Array.from(knownConversationIds).map(async (conversationId) => {
+            const session = sessions.get(conversationId);
+            const workspaceId = session
+                ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
+                : runtimeDescriptor.defaultWorkspaceId;
+            const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+            const descriptor = runtimeDescriptor.runtimeDescriptor;
+            if (!descriptor)
+                return;
+            const payload = {
+                descriptor,
+                surfaceMode: 'host',
+                // The exec --json transport cannot block on approvals — without a
+                // strip-level warning a user can believe they have an approval
+                // gate they do not have.
+                ...(useAppServer
+                    ? {}
+                    : { warning: "Approvals can't block on this Codex CLI — update Codex to enable the app-server transport and approval gates." }),
+                statusItems: [
+                    {
+                        id: 'transport',
+                        label: 'Transport',
+                        value: useAppServer ? 'app-server' : 'exec --json',
                     },
-                    notes: [
-                        useAppServer
-                            ? 'This Codex host uses the app-server transport, so Canon can route native plan mode, runtime questions, approvals, and live turn updates.'
-                            : 'This Codex host uses the current exec --json transport, so Canon can show thinking, tool activity, and completed assistant-message previews, but not native plan questions or structured approvals.',
-                    ],
-                };
-                await runtimeState.writeRuntimeInfo(conversationId, payload);
-            })).catch((error) => {
-                console.error('[canon-codex] Failed to publish runtime info:', error);
-            });
-        }
-        finally {
-            publishRuntimeDetailsInFlight = false;
-        }
+                    {
+                        id: 'streaming',
+                        label: 'Live output',
+                        value: useAppServer
+                            ? 'Plans, questions, approvals, tools, and message deltas'
+                            : 'Thinking, tools, and completed-message previews',
+                    },
+                    {
+                        id: 'codex-cli',
+                        label: 'Codex CLI',
+                        value: codexCliStatus.version ?? (codexCliStatus.raw ?? 'Version unknown'),
+                        tone: codexCliStatus.version ? 'default' : 'warning',
+                    },
+                    {
+                        id: 'nativeActions',
+                        label: 'Native actions',
+                        value: useAppServer ? 'Enabled' : 'Limited until app-server transport',
+                        ...(useAppServer ? {} : { tone: 'warning' }),
+                    },
+                    {
+                        id: 'mediaOut',
+                        label: 'Media out',
+                        value: 'Generated media artifacts',
+                    },
+                ],
+                execution: {
+                    resolvedWorkspaceLabel: workspace?.label ?? workspaceId ?? null,
+                    resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
+                    workspaceRootId: workspace?.workspaceRootId ?? null,
+                    workspaceRelativePath: workspace?.workspaceRelativePath ?? null,
+                    executionMode: session?.environment.mode ?? null,
+                    executionBranch: session?.environment.branch ?? null,
+                    worktreePath: session?.environment.worktreePath ?? null,
+                    fallbackReason: resolveExecutionFallbackReason(session?.environment),
+                },
+                notes: [
+                    useAppServer
+                        ? 'This Codex host uses the app-server transport, so Canon can route native plan mode, runtime questions, approvals, and live turn updates.'
+                        : 'This Codex host uses the current exec --json transport, so Canon can show thinking, tool activity, and completed assistant-message previews, but not native plan questions or structured approvals.',
+                ],
+            };
+            await runtimeState.writeRuntimeInfo(conversationId, payload);
+        }));
+        const failure = results.find((result) => result.status === 'rejected');
+        if (failure?.status === 'rejected')
+            throw failure.reason;
     };
+    const runtimeHeartbeat = createRuntimeHeartbeat({
+        publisher: runtimeState,
+        getRuntime: () => runtimeDescriptor,
+        refreshDetails: refreshRuntimeDetails,
+        onError: (error, operation) => {
+            console.error(`[canon-codex] Runtime ${operation} failed:`, error);
+        },
+    });
     let startupRecoveryComplete = false;
     async function recoverInboundMessageGaps() {
         // A reconnect can reveal conversations created while this host was
@@ -2796,14 +2793,13 @@ export async function main() {
                 codexDynamicTools = filterCodexCommunicationTools(baseCodexDynamicTools, outboundPolicy);
             },
             onConnected: () => {
-                streamConnected = true;
-                void publishRuntimeHeartbeat();
+                publishLocalHeartbeat();
+                runtimeHeartbeat.connect();
                 observeReconnectRecovery('reconnect', reconnectRecovery.onConnected());
                 console.error('[canon-codex] SSE connected');
             },
             onDisconnected: () => {
-                streamConnected = false;
-                runtimeState.clearAgentRuntime().catch(() => { });
+                void runtimeHeartbeat.disconnect();
                 console.error('[canon-codex] SSE disconnected');
             },
             onReplayExpired: () => observeReconnectRecovery('replay-expired', reconnectRecovery.onReplayExpired()),
@@ -2840,7 +2836,7 @@ export async function main() {
                 writeTurn(session);
             }
         }
-        void publishRuntimeHeartbeat();
+        publishLocalHeartbeat();
     }, HEARTBEAT_MS);
     const idleCheck = setInterval(() => {
         const now = Date.now();
@@ -2864,7 +2860,7 @@ export async function main() {
         }
         runtimeRequests.dispose();
         stream.stop();
-        await runtimeState.clearAgentRuntime().catch(() => { });
+        await runtimeHeartbeat.dispose();
         for (const session of [...sessions.values()]) {
             await session.adapter.interrupt().catch(() => { });
             closeSession(session.conversationId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,10 +29,10 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^10.1.0",
+    "@canonmsg/agent-sdk": "^10.2.0",
     "@canonmsg/agent-tools": "^0.9.0",
     "@canonmsg/coding-agent-host": "^0.7.0",
-    "@canonmsg/core": "^12.1.0",
+    "@canonmsg/core": "^12.2.0",
     "@canonmsg/rich-cards": "^0.10.4"
   },
   "engines": {