@canonmsg/codex-plugin 0.13.2 → 0.14.0

package/README.md

@@ -80,11 +80,13 @@ Worktree mode is project isolation, not an operating-system sandbox. The Codex C
 Useful flags:
 
 ```bash
-canon-codex --cwd /path/to/project --model gpt-5.4 --full-auto
+canon-codex --cwd /path/to/project --model gpt-5.5 --full-auto
 ```
 
 Codex also supports `--add-dir /extra/path` for additional writable directories passed through to `codex exec`. Canon does not yet render those extra directories as workspace choices.
 
+`gpt-5.5` requires a recent local Codex CLI. Older CLIs fail early with an upgrade message; upgrade Codex or choose a model supported by your installed CLI.
+
 Recent Codex CLI releases no longer accept `--ask-for-approval` with `codex exec`. If you previously launched Canon with `--sandbox workspace-write --ask-for-approval never`, switch to `--full-auto`.
 
 Do not start Canon with `--sandbox danger-full-access` as an unlabeled default. Use `--dangerously-bypass-approvals-and-sandbox` only when you intentionally want Canon to advertise the owner-only Bypass policy.

package/dist/adapter.d.ts

@@ -17,11 +17,13 @@ export type CodexEvent = {
 } | {
     type: 'command.started';
     command: string;
+    itemId?: string;
 } | {
     type: 'command.completed';
     command: string;
     output: string;
     exitCode: number | null;
+    itemId?: string;
 } | {
     type: 'turn.completed';
     usage?: {

package/dist/adapter.js

@@ -83,6 +83,9 @@ export class CodexConversationAdapter {
                         onEvent({
                             type: 'command.started',
                             command: String(event.item.command ?? ''),
+                            ...(typeof event.item.id === 'string' && event.item.id.trim()
+                                ? { itemId: event.item.id.trim() }
+                                : {}),
                         });
                     }
                     break;
@@ -99,6 +102,9 @@ export class CodexConversationAdapter {
                             command: String(event.item.command ?? ''),
                             output: String(event.item.aggregated_output ?? ''),
                             exitCode: typeof event.item.exit_code === 'number' ? event.item.exit_code : null,
+                            ...(typeof event.item.id === 'string' && event.item.id.trim()
+                                ? { itemId: event.item.id.trim() }
+                                : {}),
                         });
                     }
                     break;

package/dist/app-server-adapter.js

@@ -311,10 +311,10 @@ export class CodexAppServerAdapter {
         }
         if (method === 'item/agentMessage/delta') {
             const itemId = readString(params, 'itemId') ?? 'agent-message';
-            const delta = readString(params, 'delta') ?? '';
+            const delta = readRawString(params, 'delta') ?? '';
             const next = `${this.messageTextByItem.get(itemId) ?? ''}${delta}`;
             this.messageTextByItem.set(itemId, next);
-            this.currentFinalMessage = next.trim() || this.currentFinalMessage;
+            this.currentFinalMessage = next.trim() ? next : this.currentFinalMessage;
             if (next.trim())
                 this.currentOnEvent?.({ type: 'message', text: next });
             return;
@@ -327,9 +327,9 @@ export class CodexAppServerAdapter {
             return;
         }
         if (method === 'item/plan/delta') {
-            const delta = readString(params, 'delta') ?? '';
+            const delta = readRawString(params, 'delta') ?? '';
             this.planText = `${this.planText}${delta}`;
-            this.currentFinalMessage = this.planText.trim() || this.currentFinalMessage;
+            this.currentFinalMessage = this.planText.trim() ? this.planText : this.currentFinalMessage;
             if (this.planText.trim())
                 this.currentOnEvent?.({ type: 'plan.updated', text: this.planText });
             return;
@@ -337,8 +337,14 @@ export class CodexAppServerAdapter {
         if (method === 'item/started') {
             const item = params.item;
             const summary = summarizeItem(item);
-            if (summary)
-                this.currentOnEvent?.({ type: 'command.started', command: summary });
+            if (summary) {
+                const itemId = readString(item, 'id');
+                this.currentOnEvent?.({
+                    type: 'command.started',
+                    command: summary,
+                    ...(itemId ? { itemId } : {}),
+                });
+            }
             return;
         }
         if (method === 'item/completed') {
@@ -351,13 +357,28 @@ export class CodexAppServerAdapter {
                 }
             }
             else if (item?.type === 'commandExecution') {
+                const itemId = readString(item, 'id');
                 this.currentOnEvent?.({
                     type: 'command.completed',
                     command: readString(item, 'command') ?? 'Command',
                     output: readString(item, 'aggregatedOutput') ?? '',
                     exitCode: typeof item.exitCode === 'number' ? item.exitCode : null,
+                    ...(itemId ? { itemId } : {}),
                 });
             }
+            else {
+                const summary = summarizeItem(item);
+                if (summary) {
+                    const itemId = readString(item, 'id');
+                    this.currentOnEvent?.({
+                        type: 'command.completed',
+                        command: summary,
+                        output: '',
+                        exitCode: null,
+                        ...(itemId ? { itemId } : {}),
+                    });
+                }
+            }
             return;
         }
         if (method === 'turn/completed') {
@@ -432,6 +453,10 @@ function readString(record, key) {
     const value = record?.[key];
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;
 }
+function readRawString(record, key) {
+    const value = record?.[key];
+    return typeof value === 'string' ? value : undefined;
+}
 function stringifyPreview(value) {
     if (typeof value === 'string')
         return value;

package/dist/host.js

@@ -5,8 +5,8 @@ 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, 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 { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, buildPlanApprovalRequest, buildCanonTurnContextV2, 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, CanonApiError, sendMessageWithRetry, sendMessageWithRetryChunked, shouldTriggerAgentTurn, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCanonTurnBriefPrompt, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
 import { CodexAppServerAdapter } from './app-server-adapter.js';
 import { mapCanonApprovalResultToCodexDecision, mapCodexAppServerApprovalRequest, } from './app-server-approval.js';
@@ -16,6 +16,7 @@ import { detectCodexCliVersion } from './codex-cli-version.js';
 import { buildCodexModelGuardMessage, formatCodexTurnFailure, isRecoverableCodexThreadError, } from './error-format.js';
 import { startCodexStreamInBackground } from './host-lifecycle.js';
 import { runCli } from './cli-entry.js';
+import { beginCommandBlock, claimCommandBlock, createCommandBlockTracker, } from './turn-activity.js';
 const HELP = `canon-codex — run a local Codex agent host for Canon
 
 USAGE
@@ -227,11 +228,17 @@ function resolveCodexEffectiveRuntimePolicy(input) {
     };
 }
 function buildCanonPrompt(input) {
-    return buildCanonHostPrompt({
-        hostLabel: 'Codex',
-        buildInboundContextLines,
-        ...input,
-    });
+    return renderCanonTurnBriefPrompt(buildCanonTurnContextV2({
+        content: input.content,
+        conversationId: input.conversationId,
+        participantContext: input.participantContext,
+        behavior: input.behavior,
+        selfContexts: input.selfContexts,
+        activeSelfContextId: input.activeSelfContextId,
+        provenance: input.provenance,
+        replyContext: input.replyContext,
+        message: input.message,
+    }));
 }
 function renderInboundContent(message, materialized) {
     return renderCanonHostInboundContent(message, materialized);
@@ -844,6 +851,7 @@ export async function main() {
                     closed: false,
                     turnLiveText: '',
                     turnBlocks: [],
+                    turnCommandBlocks: createCommandBlockTracker(),
                 };
                 sessions.set(conversationId, session);
                 await Promise.all([
@@ -1214,7 +1222,7 @@ 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 sendMessageWithRetry(client, input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+            await sendMessageWithRetryChunked(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: {
@@ -1231,7 +1239,10 @@ export async function main() {
             participantContext,
             behavior,
             selfContexts,
+            activeSelfContextId,
+            provenance: hydrated.provenance,
             replyContext,
+            message: input.message,
         });
         if (session.running && deliveryIntent === 'interrupt') {
             enqueuePrompt(session, prompt, deliveryIntent, true, input.message.id, shouldMarkAccepted, imagePaths, mediaAddDirs, planCommand.planMode);
@@ -1255,6 +1266,7 @@ export async function main() {
         session.currentTurnId = randomUUID();
         session.turnLiveText = '';
         session.turnBlocks = [];
+        session.turnCommandBlocks = createCommandBlockTracker();
         session.currentTurnOpenedAt = Date.now();
         session.currentTurnUpdatedAt = session.currentTurnOpenedAt;
         session.lastAcceptedIntent = nextTurn.intent;
@@ -1318,8 +1330,13 @@ export async function main() {
                     markTurnProgress(session);
                     writeTurn(session);
                     startVisibleWorkSignal(session);
+                    const blockId = beginCommandBlock(session.turnCommandBlocks, {
+                        turnId: session.currentTurnId,
+                        command: event.command,
+                        itemId: event.itemId,
+                    });
                     upsertTurnBlock(session, {
-                        id: `command:${session.currentTurnId}`,
+                        id: blockId,
                         kind: 'tool',
                         status: 'running',
                         title: summarizeCommand(event.command),
@@ -1329,7 +1346,12 @@ export async function main() {
                     return;
                 }
                 if (event.type === 'command.completed') {
-                    completeTurnBlock(session, `command:${session.currentTurnId}`, 'Command completed');
+                    const blockId = claimCommandBlock(session.turnCommandBlocks, {
+                        turnId: session.currentTurnId,
+                        command: event.command,
+                        itemId: event.itemId,
+                    });
+                    completeTurnBlock(session, blockId, 'Command completed');
                     if (session.turnState === 'tool') {
                         session.turnState = 'thinking';
                         markTurnProgress(session);
@@ -1390,7 +1412,7 @@ export async function main() {
                     clearStoredThread();
                 }
                 const turnTrail = buildFinalTurnTrail(session);
-                await sendMessageWithRetry(client, session.conversationId, result.finalMessage, {
+                await sendMessageWithRetryChunked(client, session.conversationId, result.finalMessage, {
                     messageId: buildCodexMessageId(session, 'final'),
                     ...(session.activeSelfContextId
                         ? { selfContextId: session.activeSelfContextId }
@@ -1413,7 +1435,7 @@ export async function main() {
                     console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn exited ${result.exitCode}: ${result.errorText}`);
                 }
                 const turnTrail = buildFinalTurnTrail(session);
-                await sendMessageWithRetry(client, session.conversationId, userVisibleError, {
+                await sendMessageWithRetryChunked(client, session.conversationId, userVisibleError, {
                     messageId: buildCodexMessageId(session, 'error'),
                     ...(session.activeSelfContextId
                         ? { selfContextId: session.activeSelfContextId }
@@ -1442,10 +1464,12 @@ export async function main() {
         catch (error) {
             const message = error instanceof ExecutionEnvironmentError
                 ? error.userMessage
-                : `The Codex host failed to start a turn: ${error instanceof Error ? error.message : String(error)}`;
+                : error instanceof CanonApiError
+                    ? `The Codex host completed the turn, but Canon could not deliver the reply: ${error.message}`
+                    : `The Codex host failed during the turn: ${error instanceof Error ? error.message : String(error)}`;
             session.state.lastError = message;
             writeState(session);
-            await sendMessageWithRetry(client, session.conversationId, message, {
+            await sendMessageWithRetryChunked(client, session.conversationId, message, {
                 messageId: buildCodexMessageId(session, 'failure'),
                 ...(session.activeSelfContextId
                     ? { selfContextId: session.activeSelfContextId }

package/dist/turn-activity.d.ts

@@ -0,0 +1,21 @@
+interface RunningCommandBlock {
+    command: string;
+    blockId: string;
+    itemId?: string;
+}
+export interface CommandBlockTracker {
+    sequence: number;
+    running: RunningCommandBlock[];
+}
+export declare function createCommandBlockTracker(): CommandBlockTracker;
+export declare function beginCommandBlock(tracker: CommandBlockTracker, input: {
+    turnId: string | null | undefined;
+    command: string;
+    itemId?: string;
+}): string;
+export declare function claimCommandBlock(tracker: CommandBlockTracker, input: {
+    turnId: string | null | undefined;
+    command: string;
+    itemId?: string;
+}): string;
+export {};

package/dist/turn-activity.js

@@ -0,0 +1,47 @@
+export function createCommandBlockTracker() {
+    return {
+        sequence: 0,
+        running: [],
+    };
+}
+function normalizeOptionalString(value) {
+    const normalized = value?.trim();
+    return normalized ? normalized : undefined;
+}
+function nextCommandBlockId(tracker, turnId, itemId) {
+    const stableTurnId = turnId ?? 'turn';
+    if (itemId)
+        return `command:${stableTurnId}:${itemId}`;
+    tracker.sequence += 1;
+    return `command:${stableTurnId}:${tracker.sequence}`;
+}
+export function beginCommandBlock(tracker, input) {
+    const itemId = normalizeOptionalString(input.itemId);
+    if (itemId) {
+        const existing = tracker.running.find((block) => block.itemId === itemId);
+        if (existing)
+            return existing.blockId;
+    }
+    const blockId = nextCommandBlockId(tracker, input.turnId, itemId);
+    tracker.running.push({
+        command: input.command.trim(),
+        blockId,
+        ...(itemId ? { itemId } : {}),
+    });
+    return blockId;
+}
+export function claimCommandBlock(tracker, input) {
+    const itemId = normalizeOptionalString(input.itemId);
+    const command = input.command.trim();
+    const matchingIndex = itemId
+        ? tracker.running.findIndex((block) => block.itemId === itemId)
+        : tracker.running.findIndex((block) => !block.itemId && block.command === command);
+    const fallbackIndex = matchingIndex >= 0
+        ? matchingIndex
+        : tracker.running.findIndex((block) => !block.itemId);
+    if (fallbackIndex >= 0) {
+        const [block] = tracker.running.splice(fallbackIndex, 1);
+        return block.blockId;
+    }
+    return nextCommandBlockId(tracker, input.turnId, itemId);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "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.3.0",
-    "@canonmsg/core": "^1.6.0"
+    "@canonmsg/agent-sdk": "^3.0.0",
+    "@canonmsg/core": "^2.0.0"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@types/node": "^22.0.0",
     "typescript": "~5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.1.8"
   },
   "license": "MIT"
 }