@canonmsg/codex-plugin 0.22.1 → 0.22.2

package/dist/host.js

@@ -76,6 +76,7 @@ const MAX_SESSIONS = 12;
 const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
 const HEARTBEAT_MS = 30_000;
 const IDLE_CHECK_MS = 60_000;
+const PLAN_REVIEW_TIMEOUT_MS = 10 * 60_000;
 const CODEX_RUNTIME_CAPABILITIES = {
     ...DEFAULT_RUNTIME_CAPABILITIES,
     supportsInterrupt: true,
@@ -1123,6 +1124,19 @@ export async function main() {
         writeTurn(session);
         void runNextTurn(session);
     }
+    function enqueueCodexPlanReviewResult(session, result, responseUserId) {
+        if (result.status === 'cancelled' || result.status === 'timeout') {
+            console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Plan review ${result.status}`);
+            return;
+        }
+        const feedback = result.feedback?.trim();
+        const prompt = result.status === 'approve'
+            ? 'The plan was approved. Implement the approved plan now.'
+            : result.status === 'reject'
+                ? `The plan was declined — keep planning and wait for guidance before implementing.${feedback ? `\n\nNotes:\n${feedback}` : ''}`
+                : `Please revise the plan.${feedback ? `\n\nRevision feedback:\n${feedback}` : ''}`;
+        enqueuePrompt(session, prompt, 'queue', false, result.receiptId ?? null, false, [], [], result.status !== 'approve', 'disabled', false, responseUserId);
+    }
     function resolveArtifactRoutingMode(participantContext) {
         return participantContext.conversationType === 'direct' && participantContext.isOwner
             ? 'workspace-generated'
@@ -1331,6 +1345,14 @@ export async function main() {
         if (isRecord(input.message.metadata)
             && input.message.metadata.type === 'plan_approval_reply'
             && typeof input.message.metadata.decision === 'string') {
+            const planId = readString(input.message.metadata, 'planId');
+            if (planId && runtimeRequests.handleMessage(input.conversationId, {
+                senderId: input.message.senderId,
+                metadata: input.message.metadata,
+            })) {
+                persistInboundRecoveryCursorWhenIdle(input.conversationId, input.message.id);
+                return;
+            }
             const session = await getOrCreateSession(input.conversationId);
             const feedback = readString(input.message.metadata, 'feedback');
             const decision = input.message.metadata.decision;
@@ -1666,20 +1688,43 @@ export async function main() {
                     requestingUserId: nextTurn.requestingUserId,
                     ownerId,
                 });
-                // 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(),
+                const planId = session.currentTurnId ?? randomUUID();
+                let planCreated = false;
+                let resolvePlanCreated;
+                let rejectPlanCreated;
+                const planCreatedPromise = new Promise((resolve, reject) => {
+                    resolvePlanCreated = resolve;
+                    rejectPlanCreated = reject;
+                });
+                const planReview = runtimeRequests.request('plan', session.conversationId, {
                     title: 'Codex Plan',
                     body: result.finalMessage,
                     ...(responseRouting.responseUserId
                         ? { responseUserId: responseRouting.responseUserId }
                         : {}),
                     ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
+                }, {
+                    requestId: planId,
+                    expiresAt: Date.now() + PLAN_REVIEW_TIMEOUT_MS,
+                    responderPolicy: 'infer',
+                    onCreated: () => {
+                        planCreated = true;
+                        session.turnState = 'waiting_input';
+                        writeTurn(session);
+                        resolvePlanCreated();
+                    },
+                });
+                void planReview.then((planResult) => {
+                    resolvePlanCreated();
+                    enqueueCodexPlanReviewResult(session, planResult, responseRouting.responseUserId ?? null);
+                }).catch((error) => {
+                    if (!planCreated) {
+                        rejectPlanCreated(error);
+                        return;
+                    }
+                    console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Plan review failed:`, error instanceof Error ? error.message : error);
                 });
+                await planCreatedPromise;
                 await handoffFinalMessage(session.conversationId);
                 console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Sent plan approval card`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@canonmsg/agent-sdk": "^5.1.1",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^4.2.2"
+    "@canonmsg/core": "^4.2.3"
   },
   "engines": {
     "node": ">=18.0.0"