@canonmsg/codex-plugin 0.18.5 → 0.18.7

package/dist/adapter.d.ts

@@ -8,6 +8,7 @@ export type CodexEvent = {
 } | {
     type: 'message';
     text: string;
+    itemId?: string;
 } | {
     type: 'plan.updated';
     text: string;

package/dist/adapter.js

@@ -99,7 +99,13 @@ export class CodexConversationAdapter {
                     if (event.item?.type === 'agent_message') {
                         latestMessage = normalizeMessageText(event.item.text);
                         if (latestMessage) {
-                            onEvent({ type: 'message', text: latestMessage });
+                            onEvent({
+                                type: 'message',
+                                text: latestMessage,
+                                ...(typeof event.item.id === 'string' && event.item.id.trim()
+                                    ? { itemId: event.item.id.trim() }
+                                    : {}),
+                            });
                         }
                     }
                     else if (event.item?.type === 'command_execution') {

package/dist/app-server-adapter.js

@@ -148,18 +148,14 @@ export class CodexAppServerAdapter {
                 ],
                 ...(this.model ? { model: this.model } : {}),
                 ...this.sandboxPolicyPayload(_extraAddDirs),
-                ...(options.planMode
-                    ? {
-                        collaborationMode: {
-                            mode: 'plan',
-                            settings: {
-                                ...(planModel ? { model: planModel } : {}),
-                                reasoning_effort: this.reasoningEffort ?? null,
-                                developer_instructions: null,
-                            },
-                        },
-                    }
-                    : {}),
+                collaborationMode: {
+                    mode: options.planMode ? 'plan' : 'default',
+                    settings: {
+                        ...(planModel ? { model: planModel } : {}),
+                        reasoning_effort: this.reasoningEffort ?? null,
+                        developer_instructions: null,
+                    },
+                },
             });
             const turn = turnStarted.turn;
             if (this.currentTurnResolve) {
@@ -338,7 +334,7 @@ export class CodexAppServerAdapter {
             this.messageTextByItem.set(itemId, next);
             this.currentFinalMessage = next.trim() ? next : this.currentFinalMessage;
             if (next.trim())
-                this.currentOnEvent?.({ type: 'message', text: next });
+                this.currentOnEvent?.({ type: 'message', text: next, itemId });
             return;
         }
         if (method === 'turn/plan/updated') {
@@ -372,10 +368,15 @@ export class CodexAppServerAdapter {
         if (method === 'item/completed') {
             const item = params.item;
             if (item?.type === 'agentMessage') {
+                const itemId = readString(item, 'id');
                 const text = readString(item, 'text');
                 if (text) {
                     this.currentFinalMessage = text;
-                    this.currentOnEvent?.({ type: 'message', text });
+                    this.currentOnEvent?.({
+                        type: 'message',
+                        text,
+                        ...(itemId ? { itemId } : {}),
+                    });
                 }
             }
             else if (item?.type === 'commandExecution') {

package/dist/host.js

@@ -19,7 +19,7 @@ import { startCodexStreamInBackground } from './host-lifecycle.js';
 import { createCodexControlPoller } from './control-channel.js';
 import { runCli } from './cli-entry.js';
 import { collectMissedInboundMessages, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from './startup-recovery.js';
-import { beginCommandBlock, claimCommandBlock, createCommandBlockTracker, } from './turn-activity.js';
+import { applyTextSegmentBlock, beginCommandBlock, claimCommandBlock, createCommandBlockTracker, } from './turn-activity.js';
 const HELP = `canon-codex — run a local Codex agent host for Canon
 
 USAGE
@@ -675,6 +675,18 @@ export async function main() {
             blocks: session.turnBlocks,
         }).catch(() => { });
     }
+    function upsertCodexTextSegment(session, event) {
+        const next = applyTextSegmentBlock({
+            turnLiveText: session.turnLiveText,
+            turnBlocks: session.turnBlocks,
+        }, {
+            turnId: session.currentTurnId,
+            itemId: event.itemId,
+            text: event.text,
+        });
+        session.turnLiveText = next.turnLiveText;
+        session.turnBlocks = next.turnBlocks;
+    }
     function upsertTurnBlock(session, block) {
         const now = Date.now();
         const index = session.turnBlocks.findIndex((existing) => existing.id === block.id);
@@ -1430,7 +1442,8 @@ export async function main() {
                     markTurnProgress(session);
                     writeTurn(session);
                     stopVisibleWorkSignal(session);
-                    writeCodexStreaming(session, event.text, 'streaming');
+                    upsertCodexTextSegment(session, event);
+                    writeCodexStreaming(session, null, 'streaming');
                     return;
                 }
                 if (event.type === 'plan.updated') {

package/dist/turn-activity.d.ts

@@ -1,3 +1,4 @@
+import type { TurnOutputBlock } from '@canonmsg/core';
 interface RunningCommandBlock {
     command: string;
     blockId: string;
@@ -7,7 +8,17 @@ export interface CommandBlockTracker {
     sequence: number;
     running: RunningCommandBlock[];
 }
+export interface TextSegmentBlockState {
+    turnLiveText: string;
+    turnBlocks: TurnOutputBlock[];
+}
 export declare function createCommandBlockTracker(): CommandBlockTracker;
+export declare function applyTextSegmentBlock(state: TextSegmentBlockState, input: {
+    turnId: string | null | undefined;
+    itemId?: string;
+    text: string;
+    now?: number;
+}): TextSegmentBlockState;
 export declare function beginCommandBlock(tracker: CommandBlockTracker, input: {
     turnId: string | null | undefined;
     command: string;

package/dist/turn-activity.js

@@ -8,6 +8,49 @@ function normalizeOptionalString(value) {
     const normalized = value?.trim();
     return normalized ? normalized : undefined;
 }
+function textBlockId(turnId, itemId) {
+    return `message:${turnId ?? 'turn'}:${normalizeOptionalString(itemId) ?? 'latest'}`;
+}
+function buildLiveText(blocks) {
+    return blocks
+        .filter((block) => block.kind === 'text' && block.text?.trim())
+        .sort((left, right) => {
+        if (left.sequence !== right.sequence)
+            return left.sequence - right.sequence;
+        return left.id.localeCompare(right.id);
+    })
+        .map((block) => block.text)
+        .join('\n\n');
+}
+export function applyTextSegmentBlock(state, input) {
+    const id = textBlockId(input.turnId, input.itemId);
+    const now = input.now ?? Date.now();
+    const index = state.turnBlocks.findIndex((block) => block.id === id);
+    const existing = index >= 0 ? state.turnBlocks[index] : null;
+    const next = {
+        ...(existing ?? {
+            sequence: state.turnBlocks.length + 1,
+            createdAt: now,
+        }),
+        id,
+        turnId: input.turnId ?? id,
+        kind: 'text',
+        status: existing?.status ?? 'running',
+        text: input.text,
+        updatedAt: now,
+    };
+    const turnBlocks = index >= 0
+        ? [
+            ...state.turnBlocks.slice(0, index),
+            next,
+            ...state.turnBlocks.slice(index + 1),
+        ]
+        : [...state.turnBlocks, next];
+    return {
+        turnBlocks,
+        turnLiveText: buildLiveText(turnBlocks) || state.turnLiveText,
+    };
+}
 function nextCommandBlockId(tracker, turnId, itemId) {
     const stableTurnId = turnId ?? 'turn';
     if (itemId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.18.5",
+  "version": "0.18.7",
   "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": "^3.2.3",
+    "@canonmsg/agent-sdk": "^3.3.1",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^2.8.0"
+    "@canonmsg/core": "^2.8.1"
   },
   "engines": {
     "node": ">=18.0.0"