@canonmsg/codex-plugin 0.21.0 → 0.22.0

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 { captureTurnArtifactSnapshot, collectTurnArtifacts, } from '@canonmsg/coding-agent-host';
-import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, buildPlanApprovalRequest, 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, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, CanonApiError, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, 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, 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, CanonApiError, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
 import { CodexAppServerAdapter } from './app-server-adapter.js';
@@ -522,6 +522,58 @@ export async function main() {
         }
         console.error(`[canon-codex] Authenticated as ${agentId}`);
     }
+    // Shared poll/timeout engine. Built-in `input`/`card` descriptors own
+    // create+poll (codex passes native/responder policy via payload/options).
+    // Approval keeps codex's own resolution shape (no owner-authored outcome
+    // messages / session rules — that is the SDK ApprovalManager's job).
+    const runtimeRequests = new RuntimeRequestManager(client, {
+        agentId,
+        ownerId: ownerId ?? '',
+    });
+    runtimeRequests.register('approval', {
+        kind: 'approval',
+        generateId: () => randomUUID(),
+        create: async ({ client: apiClient, ctx, conversationId, requestId, payload, expiresAt }) => {
+            await apiClient.createRuntimeApprovalRequest({
+                conversationId,
+                approvalId: requestId,
+                toolName: payload.toolName,
+                toolSummary: payload.toolSummary,
+                category: payload.category,
+                risk: payload.risk,
+                riskLevel: payload.riskLevel,
+                native: payload.native,
+                details: payload.details,
+                ...(payload.diff ? { diff: payload.diff } : {}),
+                responseUserId: ctx.ownerId || undefined,
+                allowSessionRule: true,
+                expiresAt,
+                ...(payload.turnId ? { turnId: payload.turnId } : {}),
+            });
+            return { requestId };
+        },
+        consume: async ({ client: apiClient, conversationId, requestId }) => {
+            const response = await apiClient
+                .consumeRuntimeApprovalResponse({ conversationId, approvalId: requestId })
+                .catch(() => null);
+            if (response?.status === 'allow') {
+                return {
+                    state: 'resolved',
+                    result: {
+                        decision: 'allow',
+                        ...(response.sessionRule ? { sessionRule: response.sessionRule } : {}),
+                    },
+                };
+            }
+            if (response?.status === 'deny') {
+                return { state: 'resolved', result: { decision: 'deny' } };
+            }
+            if (response?.status === 'timeout')
+                return { state: 'timeout' };
+            return { state: 'pending' };
+        },
+        timeoutResult: () => ({ decision: 'deny' }),
+    });
     const launchArgs = [...process.argv.slice(2)];
     if (!launchArgs.some((arg) => arg === '--cwd' || arg.startsWith('--cwd='))) {
         launchArgs.push('--cwd', workingDir);
@@ -1015,80 +1067,6 @@ export async function main() {
             ? 'workspace-generated'
             : 'disabled';
     }
-    async function waitForRuntimeInputResponse(input) {
-        while (Date.now() < input.expiresAt) {
-            const response = await client.consumeRuntimeInputResponse({
-                conversationId: input.conversationId,
-                inputId: input.inputId,
-            }).catch(() => null);
-            if (response?.status === 'submitted') {
-                return { status: 'submitted', value: response.value, answers: response.answers };
-            }
-            if (response?.status === 'cancelled' || response?.status === 'timeout') {
-                return { status: response.status };
-            }
-            await sleep(1_000);
-        }
-        const response = await client.consumeRuntimeInputResponse({
-            conversationId: input.conversationId,
-            inputId: input.inputId,
-        }).catch(() => null);
-        if (response?.status === 'submitted') {
-            return { status: 'submitted', value: response.value, answers: response.answers };
-        }
-        return { status: 'timeout' };
-    }
-    async function waitForRuntimeApprovalResponse(input) {
-        while (Date.now() < input.expiresAt) {
-            const response = await client.consumeRuntimeApprovalResponse({
-                conversationId: input.conversationId,
-                approvalId: input.approvalId,
-            }).catch(() => null);
-            if (response?.status === 'allow') {
-                return { decision: 'allow', sessionRule: response.sessionRule };
-            }
-            if (response?.status === 'deny' || response?.status === 'timeout') {
-                return { decision: 'deny' };
-            }
-            await sleep(1_000);
-        }
-        await client.consumeRuntimeApprovalResponse({
-            conversationId: input.conversationId,
-            approvalId: input.approvalId,
-        }).catch(() => null);
-        return { decision: 'deny' };
-    }
-    async function waitForRuntimeCardResponse(input) {
-        while (Date.now() < input.expiresAt) {
-            const response = await client.consumeRuntimeCardResponse({
-                conversationId: input.conversationId,
-                cardId: input.cardId,
-            }).catch(() => null);
-            if (response?.status === 'submitted') {
-                return {
-                    status: 'submitted',
-                    ...(response.actionId ? { actionId: response.actionId } : {}),
-                    ...(response.values ? { values: response.values } : {}),
-                };
-            }
-            if (response?.status === 'cancelled' || response?.status === 'timeout') {
-                return { status: response.status };
-            }
-            await sleep(1_000);
-        }
-        const response = await client.consumeRuntimeCardResponse({
-            conversationId: input.conversationId,
-            cardId: input.cardId,
-        }).catch(() => null);
-        if (response?.status === 'submitted') {
-            return {
-                status: 'submitted',
-                ...(response.actionId ? { actionId: response.actionId } : {}),
-                ...(response.values ? { values: response.values } : {}),
-            };
-        }
-        return { status: 'timeout' };
-    }
     function runtimeCardRequestPayload(method, params) {
         if (method !== 'item/runtimeCard/request'
             && method !== 'runtimeCard/request') {
@@ -1131,14 +1109,12 @@ export async function main() {
             let requestCreated = false;
             let requestResolved = false;
             try {
-                await client.createRuntimeCardRequest({
-                    conversationId: session.conversationId,
-                    cardId,
-                    card: { ...card, cardId },
-                    expiresAt,
-                    // Omit responseUserId so the backend targets a reachable member (the
-                    // owner if present, else the sole other member) — the owner is often
-                    // not a member of agent-to-user DMs.
+                // Built-in card descriptor owns create+poll; codex passes native/turnId
+                // via payload, post-create turn side effects via onCreated. responseUserId
+                // is omitted (default `infer` policy) so the backend targets a reachable
+                // member (owner is often not a member of agent-to-user DMs).
+                const cardResult = await runtimeRequests.request('card', session.conversationId, {
+                    card,
                     native: {
                         runtime: 'codex',
                         method: request.method,
@@ -1150,25 +1126,32 @@ export async function main() {
                         },
                     },
                     turnId: session.currentTurnId ?? undefined,
-                });
-                requestCreated = true;
-                session.turnState = 'waiting_input';
-                markTurnProgress(session);
-                upsertTurnBlock(session, {
-                    id: `card:${cardId}`,
-                    kind: 'input',
-                    status: 'pending',
-                    title: card.title,
-                    summary: card.template ?? 'runtime card',
-                });
-                writeTurn(session);
-                stopVisibleWorkSignal(session);
-                writeCodexStreaming(session, null, 'waiting_input');
-                const response = await waitForRuntimeCardResponse({
-                    conversationId: session.conversationId,
-                    cardId,
+                }, {
+                    requestId: cardId,
                     expiresAt,
+                    onCreated: () => {
+                        requestCreated = true;
+                        session.turnState = 'waiting_input';
+                        markTurnProgress(session);
+                        upsertTurnBlock(session, {
+                            id: `card:${cardId}`,
+                            kind: 'input',
+                            status: 'pending',
+                            title: card.title,
+                            summary: card.template ?? 'runtime card',
+                        });
+                        writeTurn(session);
+                        stopVisibleWorkSignal(session);
+                        writeCodexStreaming(session, null, 'waiting_input');
+                    },
                 });
+                const response = cardResult.status === 'submitted'
+                    ? {
+                        status: 'submitted',
+                        ...(cardResult.actionId ? { actionId: cardResult.actionId } : {}),
+                        ...(cardResult.values ? { values: cardResult.values } : {}),
+                    }
+                    : { status: cardResult.status };
                 requestResolved = true;
                 const outcome = buildRuntimeCardOutcome(cardId, response.status, { reason: response.status });
                 await sendMessageWithRetry(client, session.conversationId, outcome.text, {
@@ -1216,12 +1199,10 @@ export async function main() {
             const paramsArguments = isRecord(params.arguments) ? params.arguments : null;
             const questions = mapCodexQuestions(params.questions ?? paramsInput?.questions ?? paramsArguments?.questions);
             const inputId = readString(params, 'itemId') ?? requestId;
-            await client.createRuntimeInputRequest({
-                conversationId: session.conversationId,
-                inputId,
+            // Built-in input descriptor owns create+poll; default `owner` responder
+            // policy resolves to ctx.ownerId (matching the former responseUserId).
+            const response = await runtimeRequests.request('input', session.conversationId, {
                 kind: 'clarify',
-                expiresAt,
-                responseUserId: ownerId ?? undefined,
                 title: 'Codex needs input',
                 prompt: questions?.length
                     ? 'Codex needs your input to continue.'
@@ -1239,12 +1220,7 @@ export async function main() {
                     },
                 },
                 turnId: session.currentTurnId ?? undefined,
-            });
-            const response = await waitForRuntimeInputResponse({
-                conversationId: session.conversationId,
-                inputId,
-                expiresAt,
-            });
+            }, { requestId: inputId, expiresAt });
             return { answers: response.status === 'submitted' ? response.answers ?? {} : {} };
         }
         const mappedApproval = mapCodexAppServerApprovalRequest({
@@ -1253,31 +1229,12 @@ export async function main() {
         });
         if (mappedApproval) {
             const approvalId = readString(params, 'approvalId') ?? readString(params, 'itemId') ?? requestId;
-            await client.createRuntimeApprovalRequest({
-                conversationId: session.conversationId,
-                approvalId,
-                toolName: mappedApproval.toolName,
-                toolSummary: mappedApproval.toolSummary,
-                category: mappedApproval.category,
-                risk: mappedApproval.risk,
-                riskLevel: mappedApproval.riskLevel,
-                native: {
-                    ...mappedApproval.native,
-                    requestId,
-                    method: request.method,
-                },
-                details: mappedApproval.details,
-                ...(mappedApproval.diff ? { diff: mappedApproval.diff } : {}),
-                responseUserId: ownerId ?? undefined,
-                allowSessionRule: true,
-                expiresAt,
+            // Approval descriptor's create authors the server request (responder = ctx.ownerId).
+            const response = await runtimeRequests.request('approval', session.conversationId, {
+                ...mappedApproval,
+                native: { ...mappedApproval.native, requestId, method: request.method },
                 turnId: session.currentTurnId ?? undefined,
-            });
-            const response = await waitForRuntimeApprovalResponse({
-                conversationId: session.conversationId,
-                approvalId,
-                expiresAt,
-            });
+            }, { requestId: approvalId, expiresAt });
             if (request.method === 'item/permissions/requestApproval') {
                 return response.decision === 'allow'
                     ? { permissions: isRecord(params.permissions) ? params.permissions : {}, scope: response.sessionRule ? 'session' : 'turn' }
@@ -1628,19 +1585,17 @@ export async function main() {
             }
             if (!result.interrupted && result.finalMessage && nextTurn.planMode) {
                 await routeArtifactsOnce();
-                const planApproval = buildPlanApprovalRequest(session.currentTurnId ?? randomUUID(), 'Plan ready for review.', {
-                    responseUserId: ownerId ?? undefined,
+                // Route plan-CREATE through the unified spine (`/runtime-plan/request`):
+                // seeds the server-owned pending node/attention/state and authors the
+                // `plan_approval` card. Resolution is UNCHANGED — Codex still re-queues a
+                // fresh turn off the server-authored `plan_approval_reply`.
+                await client.createRuntimePlanRequest({
+                    conversationId: session.conversationId,
+                    planId: session.currentTurnId ?? randomUUID(),
                     title: 'Codex Plan',
                     body: result.finalMessage,
-                });
-                await sendMessageWithRetry(client, session.conversationId, planApproval.text, {
-                    messageId: buildCodexMessageId(session, 'plan'),
-                    metadata: {
-                        ...planApproval.metadata,
-                        turnId: session.currentTurnId,
-                        turnSemantics: 'control',
-                        replyBehavior: 'suppress_auto_reply',
-                    },
+                    ...(ownerId ? { responseUserId: ownerId } : {}),
+                    ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
                 });
                 await handoffFinalMessage(session.conversationId);
                 console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Sent plan approval card`);
@@ -2136,6 +2091,7 @@ export async function main() {
         controlPoller.stop();
         clearInterval(heartbeat);
         clearInterval(idleCheck);
+        runtimeRequests.dispose();
         stream.stop();
         await runtimeState.clearAgentRuntime().catch(() => { });
         for (const session of [...sessions.values()]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "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": "^5.0.0",
+    "@canonmsg/agent-sdk": "^5.1.0",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^4.0.0"
+    "@canonmsg/core": "^4.2.0"
   },
   "engines": {
     "node": ">=18.0.0"