@canonmsg/codex-plugin 0.9.2 → 0.9.4

package/dist/host.js

@@ -3,7 +3,7 @@ import { setDefaultResultOrder } from 'node:dns';
 import { randomUUID } from 'node:crypto';
 import { parseArgs } from 'node:util';
 import { getCodexImagePath, materializeMessageMedia, } from '@canonmsg/agent-sdk';
-import { buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, createConversationMetadataLoader, createRuntimeStatePublisher, 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, normalizeTurnState, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, shouldTriggerAgentTurn, saveRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, createConversationMetadataLoader, createRuntimeStatePublisher, 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, normalizeTurnState, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, shouldTriggerAgentTurn, saveRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
 import { clearStoredThreadId, loadStoredThreadId, saveStoredThreadId, } from './session-store.js';
@@ -63,15 +63,6 @@ function normalizeRuntimeTurnState(value) {
     if (normalizedTurn) {
         return { state: normalizedTurn.state };
     }
-    if (!value || typeof value !== 'object')
-        return null;
-    const state = value.state;
-    if (state === 'running') {
-        return { state: 'streaming' };
-    }
-    if (state === 'requires_action') {
-        return { state: 'waiting_input' };
-    }
     return null;
 }
 async function publishAgentRuntime(agentId, runtime) {
@@ -247,11 +238,7 @@ export async function main() {
     }
     async function loadSenderRuntimeState(conversationId, senderId) {
         try {
-            const [turnState, sessionState] = await Promise.all([
-                rtdbRead(`/turn-state/${conversationId}/${senderId}`),
-                rtdbRead(`/session-state/${conversationId}/${senderId}`),
-            ]);
-            return normalizeRuntimeTurnState(turnState) ?? normalizeRuntimeTurnState(sessionState);
+            return normalizeRuntimeTurnState(await rtdbRead(`/turn-state/${conversationId}/${senderId}`));
         }
         catch {
             return null;
@@ -286,7 +273,6 @@ export async function main() {
                 : {}),
             hostMode: true,
             clientType: 'codex',
-            state: session.state.state,
             isActive: true,
         }).catch(() => { });
     }
@@ -309,6 +295,13 @@ export async function main() {
             return;
         await client.updateMessageDisposition(conversationId, sourceMessageId, 'accepted_now').catch(() => { });
     }
+    async function markQueuedPromptsRejected(conversationId, prompts) {
+        await Promise.all(prompts.map((prompt) => {
+            if (!prompt.markAccepted || !prompt.sourceMessageId)
+                return Promise.resolve();
+            return client.updateMessageDisposition(conversationId, prompt.sourceMessageId, 'rejected').catch(() => { });
+        }));
+    }
     function clearStreaming(conversationId) {
         runtimeState.clearStreaming(conversationId).catch(() => { });
     }
@@ -435,6 +428,7 @@ export async function main() {
                     closed: false,
                 };
                 sessions.set(conversationId, session);
+                await baselineControlSignal(conversationId);
                 console.error(`[canon-codex] [${conversationId.slice(0, 8)}] Environment → ${environment.mode} (${sessionCwd})`);
                 writeState(session);
                 writeTurn(session);
@@ -677,6 +671,8 @@ export async function main() {
         }
     }
     let controlStopped = false;
+    const lastSeenControl = new Map();
+    const lastSeenSignal = new Map();
     let streamConnected = false;
     const hostAvailableExecutionModes = [
         ...EXECUTION_ENVIRONMENT_MODES,
@@ -700,6 +696,17 @@ export async function main() {
             defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
         }),
     };
+    async function baselineControlSignal(conversationId) {
+        if (lastSeenSignal.has(conversationId))
+            return;
+        const raw = await rtdbRead(`/control/${conversationId}/${agentId}/signal`).catch(() => null);
+        if (!raw || typeof raw !== 'object')
+            return;
+        const timestamp = Number(raw.updatedAt ?? 0);
+        if (timestamp > 0) {
+            lastSeenSignal.set(conversationId, timestamp);
+        }
+    }
     const publishRuntimeHeartbeat = async () => {
         heartbeatLocalRuntimeEntry(runtimeId, {
             agentId,
@@ -744,15 +751,11 @@ export async function main() {
                 ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
                 : runtimeDescriptor.defaultWorkspaceId;
             const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+            const descriptor = runtimeDescriptor.runtimeDescriptor;
+            if (!descriptor)
+                return;
             const payload = {
-                descriptor: runtimeDescriptor.runtimeDescriptor ?? buildCodexRuntimeDescriptor({
-                    models: runtimeDescriptor.availableModels ?? [],
-                    workspaces: buildPublicWorkspaceOptions(workspaceOptions),
-                    workspaceRoots: workspaceRootMetadata,
-                    executionModes: hostAvailableExecutionModes,
-                    permissionModes: [...codexPermissionEnvelope.availablePermissionModes],
-                    defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
-                }),
+                descriptor,
                 surfaceMode: 'host',
                 statusItems: [
                     {
@@ -932,8 +935,6 @@ export async function main() {
     await stream.start().catch((error) => {
         console.error('[canon-codex] SSE start error:', error instanceof Error ? error.message : error);
     });
-    const lastSeenControl = new Map();
-    const lastSeenSignal = new Map();
     const pollControl = async () => {
         while (!controlStopped) {
             for (const conversationId of [...sessions.keys()]) {
@@ -974,15 +975,23 @@ export async function main() {
                     const session = sessions.get(conversationId);
                     if (!session || session.closed)
                         continue;
+                    if (!session.running && (signal.type !== 'stop_and_drop' || session.queue.length === 0)) {
+                        await rtdbWrite(`/control/${conversationId}/${agentId}/signal`, null).catch(() => { });
+                        continue;
+                    }
                     console.error(`[canon-codex] [${conversationId.slice(0, 8)}] ${signal.type} signal`);
-                    await session.adapter.interrupt();
+                    if (session.running) {
+                        await session.adapter.interrupt();
+                    }
                     session.turnState = 'interrupted';
                     if (signal.type === 'stop_and_drop') {
-                        session.queue.length = 0;
+                        const droppedPrompts = session.queue.splice(0);
+                        await markQueuedPromptsRejected(conversationId, droppedPrompts);
                     }
                     writeTurn(session);
                     clearStreaming(conversationId);
                     client.setTyping(conversationId, false).catch(() => { });
+                    await rtdbWrite(`/control/${conversationId}/${agentId}/signal`, null).catch(() => { });
                 }
                 catch {
                     // Ignore transient RTDB failures.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "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": "^0.10.2",
-    "@canonmsg/core": "^0.14.0"
+    "@canonmsg/agent-sdk": "^1.1.0",
+    "@canonmsg/core": "^0.15.0"
   },
   "engines": {
     "node": ">=18.0.0"