@canonmsg/codex-plugin 0.23.2 → 0.23.4

package/dist/app-server-adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
+import { normalizePlanStepStatus, renderPlanSteps } from '@canonmsg/coding-agent-host';
 const DEFAULT_DISCOVERY_REQUEST_TIMEOUT_MS = 5_000;
 export class CodexAppServerAdapter {
     cwd;
@@ -783,23 +784,20 @@ function summarizeItem(item) {
         return 'Searching the web';
     return null;
 }
+/**
+ * Codex's plan update in the shared plan grammar (`renderPlanSteps` in
+ * @canonmsg/coding-agent-host), so a plan card reads the same whichever host
+ * produced it. Codex numbers steps by their position in the plan it sent, so an
+ * entry with no step text is passed through as a blank that keeps its slot
+ * rather than renumbering the steps below it.
+ */
 function renderPlan(params) {
     const explanation = readString(params, 'explanation');
     const plan = Array.isArray(params.plan) ? params.plan : [];
-    const lines = [
-        explanation ? `**Plan**\n${explanation}` : '**Plan**',
-        ...plan.flatMap((entry, index) => {
-            if (!isRecord(entry))
-                return [];
-            const step = readString(entry, 'step');
-            if (!step)
-                return [];
-            const status = readString(entry, 'status') ?? 'pending';
-            const marker = status === 'completed' ? '[x]' : status === 'inProgress' ? '[~]' : '[ ]';
-            return [`${index + 1}. ${marker} ${step}`];
-        }),
-    ];
-    return lines.join('\n');
+    return renderPlanSteps(plan.map((entry) => ({
+        text: (isRecord(entry) ? readString(entry, 'step') : undefined) ?? '',
+        status: normalizePlanStepStatus(isRecord(entry) ? readString(entry, 'status') : undefined),
+    })), { explanation });
 }
 function defaultServerRequestResult(method) {
     if (method.includes('requestApproval'))

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, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
-import { captureTurnArtifactSnapshot, collectTurnArtifacts, } from '@canonmsg/coding-agent-host';
+import { buildTrailBlockId, buildUndeliverableFinalNotice, captureTurnArtifactSnapshot, collectTurnArtifacts, IDLE_TIMEOUT_MS, PLAN_BLOCK_TITLE, } 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, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, markLocalRuntimeStopped, normalizeTurnMetadata, parseRuntimeCardV1, RuntimeRequestManager, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, CanonApiError, loadRuntimeSessionState, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
@@ -74,8 +74,12 @@ export function buildCodexLiveSessionConfig(input) {
     };
 }
 const MAX_SESSIONS = 12;
-const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
+// IDLE_TIMEOUT_MS (30 minutes) is shared with the other coding-agent hosts.
 const HEARTBEAT_MS = 30_000;
+/** How Codex says it finished the work but Canon would not take the answer. */
+const CODEX_UNDELIVERABLE_FINAL_WORDING = {
+    lead: 'The Codex host completed the turn, but Canon could not deliver the reply',
+};
 const IDLE_CHECK_MS = 60_000;
 const PLAN_REVIEW_TIMEOUT_MS = 10 * 60_000;
 const CODEX_RUNTIME_CAPABILITIES = {
@@ -1591,10 +1595,14 @@ export async function main() {
                     writeTurn(session);
                     stopVisibleWorkSignal(session);
                     upsertTurnBlock(session, {
-                        id: `plan:${session.currentTurnId}`,
+                        // Spelled through the shared helper, and with the same fallback
+                        // the other host uses: a plan arriving before a turn id would
+                        // otherwise mint the literal id `plan:null`, which two such turns
+                        // would share — one margin row for two plans.
+                        id: buildTrailBlockId('plan', session.currentTurnId ?? 'turn'),
                         kind: 'plan',
                         status: 'running',
-                        title: 'Plan',
+                        title: PLAN_BLOCK_TITLE,
                         text: event.text,
                     });
                     writeCodexStreaming(session, event.text, 'streaming');
@@ -1801,7 +1809,10 @@ export async function main() {
             const message = error instanceof ExecutionEnvironmentError
                 ? error.userMessage
                 : error instanceof CanonApiError
-                    ? `The Codex host completed the turn, but Canon could not deliver the reply: ${error.message}`
+                    // Shared with the other coding-agent hosts, which is where the bound
+                    // on the quoted error comes from: an unbounded API error body would
+                    // push this notice over the very limit that rejected the reply.
+                    ? buildUndeliverableFinalNotice({ error, wording: CODEX_UNDELIVERABLE_FINAL_WORDING })
                     : `The Codex host failed during the turn: ${error instanceof Error ? error.message : String(error)}`;
             session.state.lastError = message;
             writeState(session);

package/dist/turn-activity.js

@@ -1,15 +1,12 @@
+import { buildTrailBlockId, normalizeTrailKey } from '@canonmsg/coding-agent-host';
 export function createCommandBlockTracker() {
     return {
         sequence: 0,
         running: [],
     };
 }
-function normalizeOptionalString(value) {
-    const normalized = value?.trim();
-    return normalized ? normalized : undefined;
-}
 function textBlockId(turnId, itemId) {
-    return `message:${turnId ?? 'turn'}:${normalizeOptionalString(itemId) ?? 'latest'}`;
+    return buildTrailBlockId('message', turnId ?? 'turn', normalizeTrailKey(itemId) ?? 'latest');
 }
 function buildLiveText(blocks) {
     return blocks
@@ -54,12 +51,14 @@ export function applyTextSegmentBlock(state, input) {
 function nextCommandBlockId(tracker, turnId, itemId) {
     const stableTurnId = turnId ?? 'turn';
     if (itemId)
-        return `command:${stableTurnId}:${itemId}`;
+        return buildTrailBlockId('command', stableTurnId, itemId);
+    // Older Codex runtimes report no item id, so the per-turn sequence is what
+    // keeps two commands from sharing a row.
     tracker.sequence += 1;
-    return `command:${stableTurnId}:${tracker.sequence}`;
+    return buildTrailBlockId('command', stableTurnId, tracker.sequence);
 }
 export function beginCommandBlock(tracker, input) {
-    const itemId = normalizeOptionalString(input.itemId);
+    const itemId = normalizeTrailKey(input.itemId);
     if (itemId) {
         const existing = tracker.running.find((block) => block.itemId === itemId);
         if (existing)
@@ -74,7 +73,7 @@ export function beginCommandBlock(tracker, input) {
     return blockId;
 }
 export function claimCommandBlock(tracker, input) {
-    const itemId = normalizeOptionalString(input.itemId);
+    const itemId = normalizeTrailKey(input.itemId);
     const command = input.command.trim();
     const matchingIndex = itemId
         ? tracker.running.findIndex((block) => block.itemId === itemId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.23.2",
+  "version": "0.23.4",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,9 +29,9 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^7.0.1",
-    "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^7.0.2"
+    "@canonmsg/agent-sdk": "^7.1.2",
+    "@canonmsg/coding-agent-host": "^0.3.0",
+    "@canonmsg/core": "^8.1.0"
   },
   "engines": {
     "node": ">=18.0.0"