@canonmsg/codex-plugin 0.13.0 → 0.13.2

package/dist/host.js

@@ -5,7 +5,7 @@ import { spawnSync } from 'node:child_process';
 import { dirname } from 'node:path';
 import { parseArgs } from 'node:util';
 import { getCodexImagePath, materializeMessageMedia, materializeReplyContextMedia, } from '@canonmsg/agent-sdk';
-import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, buildPlanApprovalRequest, buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createRuntimeStatePublisher, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfileLock, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, loadRuntimeSessionState, markLocalRuntimeStopped, normalizeTurnMetadata, parseRuntimeCardV1, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, shouldTriggerAgentTurn, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, buildPlanApprovalRequest, buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, 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, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, loadRuntimeSessionState, markLocalRuntimeStopped, normalizeTurnMetadata, parseRuntimeCardV1, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, sendMessageWithRetry, shouldTriggerAgentTurn, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
 import { CodexAppServerAdapter } from './app-server-adapter.js';
@@ -54,6 +54,8 @@ const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
 const HEARTBEAT_MS = 30_000;
 const IDLE_CHECK_MS = 60_000;
 const CONTROL_POLL_MS = 2_000;
+const IDLE_CONTROL_POLL_MS = 10_000;
+const CONTROL_POLL_JITTER_MS = 1_000;
 const CODEX_RUNTIME_CAPABILITIES = {
     ...DEFAULT_RUNTIME_CAPABILITIES,
     supportsInterrupt: true,
@@ -61,6 +63,10 @@ const CODEX_RUNTIME_CAPABILITIES = {
     supportsQueue: true,
     supportsNonFinalPermanentMessages: false,
 };
+function controlPollDelayMs(hasActiveWork) {
+    const base = hasActiveWork ? CONTROL_POLL_MS : IDLE_CONTROL_POLL_MS;
+    return base + Math.floor(Math.random() * CONTROL_POLL_JITTER_MS);
+}
 let workingDir = process.cwd();
 let workspaceOptions = [];
 let workspaceRoots = [];
@@ -119,6 +125,7 @@ function buildCodexRuntimeDescriptor(input) {
                         result: 'action_or_values',
                         maxTimeoutMs: 30 * 60_000,
                         blockKinds: ['summary', 'metricGrid', 'chart', 'table', 'list', 'callout', 'actions'],
+                        actionFieldTypes: ['text', 'textarea', 'select', 'multiSelect', 'boolean'],
                         native: true,
                     },
                 },
@@ -390,6 +397,11 @@ export async function main() {
     console.error(`[canon-codex] Starting${profile ? ` (profile: ${profile})` : ''} in ${workingDir}`);
     const client = new CanonClient(apiKey, baseUrl);
     initRTDBAuth(client);
+    const typingSignals = createTypingStatusPublisher({
+        setTyping: (conversationId, typing, status) => status
+            ? client.setTyping(conversationId, typing, status)
+            : client.setTyping(conversationId, typing),
+    });
     let agentId;
     let ownerId = null;
     let ownerName = null;
@@ -660,31 +672,33 @@ export async function main() {
             turnId: session.currentTurnId ?? block.turnId,
         })));
     }
+    function buildCodexMessageId(session, kind) {
+        return `codex-${kind}-${session.currentTurnId ?? randomUUID()}`;
+    }
+    function buildCodexRuntimeCardOutcomeMessageId(cardId, status) {
+        return `codex-card-${cardId}-${status}`;
+    }
     async function handoffFinalMessage(conversationId) {
         await sleep(FINAL_MESSAGE_HANDOFF_MS);
         clearStreaming(conversationId);
-        client.setTyping(conversationId, false).catch(() => { });
+        typingSignals.clear(conversationId).catch(() => { });
     }
     function refreshVisibleWorkSignal(session) {
         if (!session.running || session.closed)
             return;
         if (session.turnState !== 'thinking' && session.turnState !== 'tool')
             return;
-        client.setTyping(session.conversationId, true, 'thinking').catch(() => { });
+        typingSignals.start(session.conversationId, 'thinking').catch(() => { });
     }
     function startVisibleWorkSignal(session) {
         refreshVisibleWorkSignal(session);
-        if (session.typingKeepaliveTimer)
-            return;
-        session.typingKeepaliveTimer = setInterval(() => {
-            refreshVisibleWorkSignal(session);
-        }, 3500);
     }
     function stopVisibleWorkSignal(session) {
         if (session.typingKeepaliveTimer) {
             clearInterval(session.typingKeepaliveTimer);
             session.typingKeepaliveTimer = null;
         }
+        typingSignals.clear(session.conversationId).catch(() => { });
     }
     function closeSession(conversationId) {
         const session = sessions.get(conversationId);
@@ -699,7 +713,8 @@ export async function main() {
         clearStreaming(conversationId);
         runtimeState.clearSessionState(conversationId).catch(() => { });
         runtimeState.clearTurnState(conversationId).catch(() => { });
-        client.setTyping(conversationId, false).catch(() => { });
+        typingSignals.clear(conversationId).catch(() => { });
+        typingSignals.dispose(conversationId);
         sessions.delete(conversationId);
     }
     async function resetRuntimeSession(session) {
@@ -725,7 +740,7 @@ export async function main() {
         }
         stopVisibleWorkSignal(session);
         clearStreaming(conversationId);
-        client.setTyping(conversationId, false).catch(() => { });
+        typingSignals.clear(conversationId).catch(() => { });
         writeState(session);
         writeTurn(session);
     }
@@ -1005,7 +1020,8 @@ export async function main() {
                 });
                 requestResolved = true;
                 const outcome = buildRuntimeCardOutcome(cardId, response.status, { reason: response.status });
-                await client.sendMessage(session.conversationId, outcome.text, {
+                await sendMessageWithRetry(client, session.conversationId, outcome.text, {
+                    messageId: buildCodexRuntimeCardOutcomeMessageId(cardId, response.status),
                     metadata: {
                         ...outcome.metadata,
                         turnId: session.currentTurnId ?? undefined,
@@ -1031,7 +1047,8 @@ export async function main() {
                         cancel: true,
                     }).catch(() => null);
                     const outcome = buildRuntimeCardOutcome(cardId, 'cancelled', { reason: 'interrupted' });
-                    await client.sendMessage(session.conversationId, outcome.text, {
+                    await sendMessageWithRetry(client, session.conversationId, outcome.text, {
+                        messageId: buildCodexRuntimeCardOutcomeMessageId(cardId, 'cancelled'),
                         metadata: {
                             ...outcome.metadata,
                             turnId: session.currentTurnId ?? undefined,
@@ -1197,7 +1214,8 @@ export async function main() {
             const userMessage = error instanceof ExecutionEnvironmentError ? error.userMessage : message;
             console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Failed to create session: ${message}`);
             await markQueuedMessageAccepted(input.conversationId, input.message.id, shouldMarkAccepted);
-            await client.sendMessage(input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+            await sendMessageWithRetry(client, input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                messageId: `codex-start-failed-${input.message.id}`,
                 ...(activeSelfContextId ? { selfContextId: activeSelfContextId } : {}),
                 metadata: {
                     turnSemantics: 'turn_complete',
@@ -1220,7 +1238,7 @@ export async function main() {
             console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Interrupting current turn for explicit human send-now`);
             await session.adapter.interrupt().catch(() => { });
             clearStreaming(input.conversationId);
-            client.setTyping(input.conversationId, false).catch(() => { });
+            typingSignals.clear(input.conversationId).catch(() => { });
             return;
         }
         enqueuePrompt(session, prompt, deliveryIntent, false, input.message.id, shouldMarkAccepted, imagePaths, mediaAddDirs, planCommand.planMode);
@@ -1269,7 +1287,6 @@ export async function main() {
                     markTurnProgress(session);
                     writeTurn(session);
                     stopVisibleWorkSignal(session);
-                    client.setTyping(session.conversationId, false).catch(() => { });
                     writeCodexStreaming(session, event.text, 'streaming');
                     return;
                 }
@@ -1278,7 +1295,6 @@ export async function main() {
                     markTurnProgress(session);
                     writeTurn(session);
                     stopVisibleWorkSignal(session);
-                    client.setTyping(session.conversationId, false).catch(() => { });
                     upsertTurnBlock(session, {
                         id: `plan:${session.currentTurnId}`,
                         kind: 'plan',
@@ -1357,7 +1373,8 @@ export async function main() {
                     title: 'Codex Plan',
                     body: result.finalMessage,
                 });
-                await client.sendMessage(session.conversationId, planApproval.text, {
+                await sendMessageWithRetry(client, session.conversationId, planApproval.text, {
+                    messageId: buildCodexMessageId(session, 'plan'),
                     metadata: {
                         ...planApproval.metadata,
                         turnId: session.currentTurnId,
@@ -1373,7 +1390,8 @@ export async function main() {
                     clearStoredThread();
                 }
                 const turnTrail = buildFinalTurnTrail(session);
-                await client.sendMessage(session.conversationId, result.finalMessage, {
+                await sendMessageWithRetry(client, session.conversationId, result.finalMessage, {
+                    messageId: buildCodexMessageId(session, 'final'),
                     ...(session.activeSelfContextId
                         ? { selfContextId: session.activeSelfContextId }
                         : {}),
@@ -1395,7 +1413,8 @@ export async function main() {
                     console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn exited ${result.exitCode}: ${result.errorText}`);
                 }
                 const turnTrail = buildFinalTurnTrail(session);
-                await client.sendMessage(session.conversationId, userVisibleError, {
+                await sendMessageWithRetry(client, session.conversationId, userVisibleError, {
+                    messageId: buildCodexMessageId(session, 'error'),
                     ...(session.activeSelfContextId
                         ? { selfContextId: session.activeSelfContextId }
                         : {}),
@@ -1416,7 +1435,7 @@ export async function main() {
                 writeTurn(session);
                 stopVisibleWorkSignal(session);
                 clearStreaming(session.conversationId);
-                client.setTyping(session.conversationId, false).catch(() => { });
+                typingSignals.clear(session.conversationId).catch(() => { });
                 console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn interrupted`);
             }
         }
@@ -1426,7 +1445,8 @@ export async function main() {
                 : `The Codex host failed to start a turn: ${error instanceof Error ? error.message : String(error)}`;
             session.state.lastError = message;
             writeState(session);
-            await client.sendMessage(session.conversationId, message, {
+            await sendMessageWithRetry(client, session.conversationId, message, {
+                messageId: buildCodexMessageId(session, 'failure'),
                 ...(session.activeSelfContextId
                     ? { selfContextId: session.activeSelfContextId }
                     : {}),
@@ -1777,6 +1797,8 @@ export async function main() {
     });
     const pollControl = async () => {
         while (!controlStopped) {
+            const hadActiveWork = [...sessions.values()].some((session) => !session.closed
+                && (session.running || session.queue.length > 0 || session.turnState === 'waiting_input'));
             for (const conversationId of [...sessions.keys()]) {
                 try {
                     const controlRaw = await rtdbRead(`/control/${conversationId}/${agentId}/session`);
@@ -1845,14 +1867,14 @@ export async function main() {
                     session.turnState = 'interrupted';
                     writeTurn(session);
                     clearStreaming(conversationId);
-                    client.setTyping(conversationId, false).catch(() => { });
+                    typingSignals.clear(conversationId).catch(() => { });
                     await rtdbWrite(`/control/${conversationId}/${agentId}/signal`, null).catch(() => { });
                 }
                 catch {
                     // Ignore transient RTDB failures.
                 }
             }
-            await new Promise((resolve) => setTimeout(resolve, CONTROL_POLL_MS));
+            await new Promise((resolve) => setTimeout(resolve, controlPollDelayMs(hadActiveWork)));
         }
     };
     void pollControl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,8 +29,8 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^2.1.0",
-    "@canonmsg/core": "^1.2.0"
+    "@canonmsg/agent-sdk": "^2.3.0",
+    "@canonmsg/core": "^1.6.0"
   },
   "engines": {
     "node": ">=18.0.0"