@canonmsg/codex-plugin 0.29.1 → 0.29.3

package/dist/codex-app-tools.js

@@ -142,31 +142,6 @@ const CODEX_NO_REPLY_TOOL = tool(CODEX_NO_REPLY_TOOL_NAME, 'End your turn withou
     },
 }, false);
 export const CODEX_APP_DYNAMIC_TOOLS = [
-    tool('automation_update', 'Create, update, view, or delete Codex app automations. Canon exposes the name for compatibility, but does not manage Desktop automations.', {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            id: { type: 'string' },
-            mode: { type: 'string' },
-            kind: { type: 'string' },
-            name: { type: 'string' },
-            prompt: { type: 'string' },
-            rrule: { type: 'string' },
-            cwds: {
-                anyOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }],
-            },
-            destination: { type: 'string' },
-            executionEnvironment: { type: 'string' },
-            localEnvironmentConfigPath: { type: ['string', 'null'] },
-            model: { type: 'string' },
-            reasoningEffort: { type: 'string' },
-            targetThreadId: { type: 'string' },
-            status: { type: 'string' },
-        },
-    }),
-    tool('navigate_to_codex_page', 'Navigate the Codex Desktop UI. Canon exposes the name for compatibility, but has no Codex Desktop page to navigate.', { type: 'object', additionalProperties: true, properties: {} }),
-    tool('read_thread_terminal', 'Read the Codex Desktop terminal output for this thread. Canon exposes the name for compatibility, but has no Desktop terminal pane.', emptyObjectSchema, false),
-    tool('load_workspace_dependencies', 'Locate bundled Desktop workspace dependency runtimes. Canon exposes the name for compatibility, but does not provide Desktop bundle paths.', emptyObjectSchema, false),
     tool('fork_thread', 'Fork a Codex thread. Omit threadId to fork the calling thread. Canon supports same-directory forks.', {
         type: 'object',
         additionalProperties: false,
@@ -175,17 +150,6 @@ export const CODEX_APP_DYNAMIC_TOOLS = [
             environment: forkEnvironmentSchema,
         },
     }),
-    tool('handoff_thread', 'Move a Codex thread between a checkout and worktree. Canon exposes the name for compatibility, but does not manage Desktop handoffs.', {
-        type: 'object',
-        additionalProperties: false,
-        properties: { threadId: { type: 'string' } },
-        required: ['threadId'],
-    }),
-    tool('get_handoff_status', 'Read Codex Desktop handoff status. Canon exposes the name for compatibility, but does not manage Desktop handoffs.', {
-        type: 'object',
-        additionalProperties: false,
-        properties: { threadId: { type: 'string' } },
-    }),
     tool('list_projects', 'List Canon workspaces available to Codex app tools.', emptyObjectSchema),
     tool('create_thread', 'Create a separate Codex thread only when the user explicitly asks for a new or separate thread. Canon supports local project targets.', {
         type: 'object',
@@ -224,15 +188,6 @@ export const CODEX_APP_DYNAMIC_TOOLS = [
         },
         required: ['threadId', 'prompt'],
     }),
-    tool('set_thread_pinned', 'Pin or unpin a Codex thread. Canon exposes the name for compatibility, but pinned state is Desktop-only.', {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            threadId: { type: 'string' },
-            pinned: { type: 'boolean' },
-        },
-        required: ['threadId', 'pinned'],
-    }),
     tool('set_thread_archived', 'Archive or unarchive a Codex thread.', {
         type: 'object',
         additionalProperties: false,
@@ -278,7 +233,6 @@ export function filterCodexCommunicationTools(tools, outboundPolicy) {
  */
 export const CODEX_DETACHED_THREAD_DYNAMIC_TOOLS = CODEX_APP_DYNAMIC_TOOLS.filter((entry) => (entry.name !== CANON_RUNTIME_CONTROL_TOOL_NAME
     && entry.name !== CODEX_NO_REPLY_TOOL_NAME));
-const CODEX_APP_TOOL_NAMES = new Set(CODEX_APP_DYNAMIC_TOOLS.map((entry) => String(entry.name)));
 const UNSUPPORTED_TOOLS = new Map([
     ['automation_update', 'Canon does not manage Codex Desktop automations.'],
     ['navigate_to_codex_page', 'Canon has no Codex Desktop page to navigate.'],
@@ -288,6 +242,12 @@ const UNSUPPORTED_TOOLS = new Map([
     ['get_handoff_status', 'Canon does not manage Codex Desktop handoffs.'],
     ['set_thread_pinned', 'Pinned thread state is Codex Desktop-only.'],
 ]);
+// Historical calls must still reach their specific rejection, even though
+// unsupported tools are no longer advertised to the model.
+const RECOGNIZED_CODEX_APP_TOOL_NAMES = new Set([
+    ...CODEX_APP_DYNAMIC_TOOLS.map((entry) => entry.name),
+    ...UNSUPPORTED_TOOLS.keys(),
+]);
 export function isCodexAppToolCall(params) {
     const namespace = typeof params.namespace === 'string' ? params.namespace : null;
     const rawTool = typeof params.tool === 'string' ? params.tool.trim() : '';
@@ -296,7 +256,7 @@ export function isCodexAppToolCall(params) {
         return rawTool.startsWith('codex_app.');
     return namespace === 'codex_app'
         || rawTool.startsWith('codex_app.')
-        || (toolName ? CODEX_APP_TOOL_NAMES.has(toolName) : false);
+        || (toolName ? RECOGNIZED_CODEX_APP_TOOL_NAMES.has(toolName) : false);
 }
 export function deniedCodexAppToolResult(reason) {
     return toolResult(false, { error: reason });
@@ -397,7 +357,7 @@ export function classifyCodexAppToolRequest(input) {
 }
 export async function handleCodexAppToolCall(runtime, params) {
     const toolName = normalizeToolName(params.tool);
-    if (!toolName || !CODEX_APP_TOOL_NAMES.has(toolName)) {
+    if (!toolName || !RECOGNIZED_CODEX_APP_TOOL_NAMES.has(toolName)) {
         return toolResult(false, { error: `Unsupported codex_app tool: ${String(params.tool ?? 'unknown')}` });
     }
     if (toolName === CODEX_NO_REPLY_TOOL_NAME) {

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';
@@ -275,14 +272,6 @@ export function resolveWorkspaceCwd() {
         defaultCwd: workingDir,
     });
 }
-function resolveExecutionFallbackReason(environment) {
-    if (!environment?.reason || environment.mode !== 'locked') {
-        return null;
-    }
-    return environment.reason === 'Sharing the base workspace (locked mode)'
-        ? null
-        : environment.reason;
-}
 function stringArg(args, key) {
     const value = args[key];
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;
@@ -813,9 +802,6 @@ export async function main() {
         client,
         conversationCache,
     });
-    function resolveWorkspaceIdForBaseCwd(baseCwd) {
-        return workspaceOptions.find((option) => option.cwd === baseCwd)?.id;
-    }
     async function refreshKnownConversationIds(force = false) {
         if (!force && Date.now() - lastKnownConversationRefreshAt < HEARTBEAT_MS) {
             return;
@@ -2022,7 +2008,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 +2387,6 @@ export async function main() {
             acceptedInboundMessageIds.delete(oldest);
         }
     }
-    let streamConnected = false;
     const hostAvailableExecutionModes = serviceAgentMode
         ? ['locked']
         : [...EXECUTION_ENVIRONMENT_MODES];
@@ -2569,108 +2554,56 @@ 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),
-                    },
-                    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);
+        const results = await Promise.allSettled(Array.from(knownConversationIds).map(async (conversationId) => {
+            const descriptor = runtimeDescriptor.runtimeDescriptor;
+            if (!descriptor)
+                return;
+            await runtimeState.writeRuntimeInfo(conversationId, {
+                surfaceMode: 'host',
+                descriptor: {
+                    coreControls: [],
+                    supportsInterrupt: descriptor.supportsInterrupt,
+                    supportsInputInterrupt: descriptor.supportsInputInterrupt,
+                    streamingTextMode: descriptor.streamingTextMode,
+                },
             });
-        }
-        finally {
-            publishRuntimeDetailsInFlight = false;
-        }
+        }));
+        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 +2729,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 +2772,7 @@ export async function main() {
                 writeTurn(session);
             }
         }
-        void publishRuntimeHeartbeat();
+        publishLocalHeartbeat();
     }, HEARTBEAT_MS);
     const idleCheck = setInterval(() => {
         const now = Date.now();
@@ -2864,7 +2796,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.3",
   "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.1",
     "@canonmsg/agent-tools": "^0.9.0",
     "@canonmsg/coding-agent-host": "^0.7.0",
-    "@canonmsg/core": "^12.1.0",
+    "@canonmsg/core": "^12.3.0",
     "@canonmsg/rich-cards": "^0.10.4"
   },
   "engines": {