@canonmsg/codex-plugin 0.13.3 → 0.14.1

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, buildCanonTurnEnvelopeV1, 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, renderCanonTurnEnvelopePrompt, resolveCanonHostPromptMode, 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';
@@ -50,7 +50,6 @@ Keep this terminal open while you want Canon to reach the agent. Closing it,
 logging out, rebooting, or sleeping long enough to stop the process takes the
 local agent offline until you revive it. Docs:
 https://canonmail.com/agents/integrations`;
-const HOST_PROMPT_MODE = resolveCanonHostPromptMode(process.env.CANON_HOST_PROMPT_MODE);
 const MAX_SESSIONS = 12;
 const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
 const HEARTBEAT_MS = 30_000;
@@ -75,19 +74,6 @@ let workspaceRoots = [];
 let workspaceRootMetadata = [];
 function buildCodexRuntimeDescriptor(input) {
     const commands = [
-        ...(input.supportsPlanMode
-            ? [{
-                    id: 'plan',
-                    label: 'Plan first',
-                    description: 'Ask Codex to plan before implementing. Text after /plan becomes the planning prompt.',
-                    aliases: ['plan'],
-                    category: 'plan',
-                    placements: ['composer_slash', 'command_palette'],
-                    availability: ['always'],
-                    trailingTextBehavior: 'send_as_prompt',
-                    dispatch: { kind: 'text_passthrough', template: '/plan {argument}' },
-                }]
-            : []),
         {
             id: 'runtime-status',
             label: 'Runtime status',
@@ -116,6 +102,29 @@ function buildCodexRuntimeDescriptor(input) {
         defaultPermissionMode: input.defaultPermissionMode,
         presentation: input.presentation,
         streamingTextMode: 'snapshot',
+        ...(input.supportsPlanMode
+            ? {
+                turnModes: [
+                    {
+                        id: 'normal',
+                        label: 'Normal',
+                        description: 'Let Codex answer or act normally.',
+                        scope: 'next_turn',
+                        default: true,
+                        activation: { kind: 'message_metadata', value: 'normal' },
+                    },
+                    {
+                        id: 'plan',
+                        label: 'Plan',
+                        description: 'Ask Codex to plan before implementing.',
+                        scope: 'next_turn',
+                        ownerOnly: true,
+                        aliases: ['plan'],
+                        activation: { kind: 'message_metadata', value: 'plan' },
+                    },
+                ],
+            }
+            : {}),
         commands,
         ...(input.supportsRichCards
             ? {
@@ -229,25 +238,17 @@ function resolveCodexEffectiveRuntimePolicy(input) {
     };
 }
 function buildCanonPrompt(input) {
-    if (HOST_PROMPT_MODE === 'envelope') {
-        return renderCanonTurnEnvelopePrompt(buildCanonTurnEnvelopeV1({
-            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,
-            hydratedFromPage: input.hydratedFromPage,
-        }));
-    }
-    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);
@@ -1157,6 +1158,10 @@ export async function main() {
     }
     async function enqueueInboundMessage(input) {
         knownConversationIds.add(input.conversationId);
+        if (input.turnDispatch && input.turnDispatch.kind !== 'run_turn') {
+            console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Suppressed server-dispatched turn: ${input.turnDispatch.reason}`);
+            return;
+        }
         if (isRecord(input.message.metadata)
             && input.message.metadata.type === 'plan_approval_reply'
             && typeof input.message.metadata.decision === 'string') {
@@ -1182,8 +1187,12 @@ export async function main() {
             }
         }
         const renderedContent = renderInboundContent(input.message, materialized);
+        const turnMetadata = normalizeTurnMetadata(input.message.metadata);
+        const requestedPlanMode = turnMetadata?.requestedTurnMode === 'plan';
         const planCommand = useAppServer
-            ? parsePlanCommand(renderedContent)
+            ? requestedPlanMode
+                ? { planMode: true, content: renderedContent }
+                : parsePlanCommand(renderedContent)
             : { planMode: false, content: renderedContent };
         const content = planCommand.content;
         const hydrated = await loadHydratedInboundContext({
@@ -1212,14 +1221,18 @@ export async function main() {
             .filter((path) => path !== null);
         const mediaAddDirs = uniqueStrings(promptMaterialized.map((attachment) => dirname(attachment.path)));
         const participantContext = hydrated.participantContext;
-        const autoReply = decideAutoReply(participantContext, behavior);
+        const autoReply = input.turnDispatch?.kind === 'run_turn'
+            ? {
+                allow: true,
+                reason: input.turnDispatch.reason || 'server dispatch allowed this turn',
+            }
+            : decideAutoReply(participantContext, behavior);
         if (!autoReply.allow) {
             console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Suppressed auto-reply: ${autoReply.reason}`);
             return;
         }
         console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Message from ${input.senderName}: "${content.slice(0, 80)}" (${autoReply.reason})`);
         markGroupContextModeUsed(input.conversationId, participantContext.groupContextMode);
-        const turnMetadata = normalizeTurnMetadata(input.message.metadata);
         const deliveryIntent = turnMetadata?.deliveryIntent ?? 'queue';
         const shouldMarkAccepted = turnMetadata?.inboundDisposition === 'queued';
         let session;
@@ -1252,7 +1265,6 @@ export async function main() {
             provenance: hydrated.provenance,
             replyContext,
             message: input.message,
-            hydratedFromPage: hydrated.hydratedFromPage,
         });
         if (session.running && deliveryIntent === 'interrupt') {
             enqueuePrompt(session, prompt, deliveryIntent, true, input.message.id, shouldMarkAccepted, imagePaths, mediaAddDirs, planCommand.planMode);
@@ -1687,6 +1699,10 @@ export async function main() {
                 const message = payload.message;
                 if (message.senderId === agentId)
                     return;
+                if (payload.turnDispatch && payload.turnDispatch.kind !== 'run_turn') {
+                    console.error(`[canon-codex] [${payload.conversationId.slice(0, 8)}] Ignoring server-dispatched observe-only message: ${payload.turnDispatch.reason}`);
+                    return;
+                }
                 void enqueueInboundMessage({
                     conversationId: payload.conversationId,
                     message,
@@ -1696,6 +1712,7 @@ export async function main() {
                     activeSelfContextId: payload.activeSelfContextId,
                     selfContexts: payload.selfContexts,
                     provenance: payload.provenance,
+                    turnDispatch: payload.turnDispatch,
                 });
                 if (message.id) {
                     saveRuntimeSessionState(runtimeId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.13.3",
+  "version": "0.14.1",
   "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.4.0",
-    "@canonmsg/core": "^1.7.0"
+    "@canonmsg/agent-sdk": "^3.1.0",
+    "@canonmsg/core": "^2.1.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"
 }