@canonmsg/codex-plugin 0.9.8 → 0.10.0

package/dist/host.js

@@ -4,7 +4,7 @@ import { randomUUID } from 'node:crypto';
 import { dirname } from 'node:path';
 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, rtdbWrite, shouldTriggerAgentTurn, saveRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, 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, buildCodexThreadPolicyFingerprint, loadStoredThreadId, saveStoredThreadId, } from './session-store.js';
@@ -65,26 +65,9 @@ function buildCodexRuntimeDescriptor(input) {
         defaultPermissionMode: input.defaultPermissionMode,
         streamingTextMode: 'snapshot',
         actions: [
-            {
-                id: 'stop',
-                label: 'Stop',
-                description: 'Interrupt the current Codex exec turn.',
-                aliases: ['stop'],
-                category: 'turn',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['busy'],
-                dispatch: { kind: 'signal', signal: 'interrupt' },
-            },
-            {
-                id: 'stop-and-clear-queue',
-                label: 'Stop & clear queue',
-                description: 'Interrupt the current Codex exec turn and drop queued Canon messages.',
-                aliases: ['stop-clear', 'clear-queue'],
-                category: 'turn',
-                placements: ['composer_slash', 'command_palette', 'session_strip'],
-                availability: ['busy_with_queue'],
-                dispatch: { kind: 'signal', signal: 'stop_and_drop' },
-            },
+            RUNTIME_STOP_ACTION,
+            RUNTIME_STOP_AND_DROP_ACTION,
+            RUNTIME_NEW_SESSION_ACTION,
         ],
     });
     if (input.models.length > 0) {
@@ -452,6 +435,32 @@ export async function main() {
         client.setTyping(conversationId, false).catch(() => { });
         sessions.delete(conversationId);
     }
+    async function resetRuntimeSession(session) {
+        const conversationId = session.conversationId;
+        session.resetRequested = true;
+        const droppedPrompts = session.queue.splice(0);
+        await markQueuedPromptsRejected(conversationId, droppedPrompts);
+        clearStoredThreadId(runtimeId, agentId, conversationId, session.environment.baseCwd, session.environment.mode);
+        session.adapter.clearThreadId();
+        session.activeSelfContextId = null;
+        session.state.lastError = undefined;
+        if (session.running) {
+            await session.adapter.interrupt();
+            session.turnState = 'interrupted';
+        }
+        else {
+            session.turnState = 'idle';
+            session.currentTurnId = null;
+            session.currentTurnOpenedAt = null;
+            session.lastAcceptedIntent = null;
+            session.resetRequested = false;
+        }
+        stopVisibleWorkSignal(session);
+        clearStreaming(conversationId);
+        client.setTyping(conversationId, false).catch(() => { });
+        writeState(session);
+        writeTurn(session);
+    }
     function evictOldestIdle() {
         let oldest = null;
         for (const session of sessions.values()) {
@@ -531,6 +540,7 @@ export async function main() {
                     currentTurnOpenedAt: null,
                     activeSelfContextId: null,
                     lastAcceptedIntent: null,
+                    resetRequested: false,
                     lastActivity: Date.now(),
                     typingKeepaliveTimer: null,
                     closed: false,
@@ -680,6 +690,9 @@ export async function main() {
             const handleCodexEvent = (event) => {
                 session.lastActivity = Date.now();
                 if (event.type === 'thread.started') {
+                    if (session.resetRequested) {
+                        return;
+                    }
                     saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, event.threadId, session.environment.mode, session.policyFingerprint);
                     console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Thread ${event.threadId}`);
                     return;
@@ -727,7 +740,7 @@ export async function main() {
                 clearStoredThread();
                 result = await runTurnOnce();
             }
-            if (result.threadId) {
+            if (result.threadId && !session.resetRequested) {
                 saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, result.threadId, session.environment.mode, session.policyFingerprint);
             }
             if (!result.interrupted && result.finalMessage) {
@@ -811,6 +824,7 @@ export async function main() {
             session.currentTurnId = null;
             session.currentTurnOpenedAt = null;
             session.lastAcceptedIntent = null;
+            session.resetRequested = false;
             session.lastActivity = Date.now();
             writeState(session);
             writeTurn(session);
@@ -1153,7 +1167,7 @@ export async function main() {
                         continue;
                     const signal = raw;
                     const timestamp = signal.updatedAt ?? 0;
-                    if ((signal.type !== 'interrupt' && signal.type !== 'stop_and_drop')
+                    if ((signal.type !== 'interrupt' && signal.type !== 'stop_and_drop' && signal.type !== 'new_session')
                         || timestamp <= (lastSeenSignal.get(conversationId) ?? 0)) {
                         continue;
                     }
@@ -1161,6 +1175,12 @@ export async function main() {
                     const session = sessions.get(conversationId);
                     if (!session || session.closed)
                         continue;
+                    if (signal.type === 'new_session') {
+                        console.error(`[canon-codex] [${conversationId.slice(0, 8)}] new_session signal`);
+                        await resetRuntimeSession(session);
+                        await rtdbWrite(`/control/${conversationId}/${agentId}/signal`, null).catch(() => { });
+                        continue;
+                    }
                     if (!session.running && (signal.type !== 'stop_and_drop' || session.queue.length === 0)) {
                         await rtdbWrite(`/control/${conversationId}/${agentId}/signal`, null).catch(() => { });
                         continue;

package/dist/session-store.js

@@ -84,11 +84,26 @@ export function saveStoredThreadId(runtimeId, agentId, conversationId, baseCwd,
 }
 export function clearStoredThreadId(runtimeId, agentId, conversationId, baseCwd, executionMode) {
     if (runtimeId) {
+        const existing = baseCwd
+            ? loadRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd,
+                executionMode,
+            })
+            : null;
         clearRuntimeSessionState(runtimeId, {
             conversationId,
             baseCwd,
             executionMode,
         });
+        if (existing?.lastInboundMessageId && baseCwd) {
+            saveRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd,
+                ...(executionMode ? { executionMode } : {}),
+                lastInboundMessageId: existing.lastInboundMessageId,
+            });
+        }
         return;
     }
     const store = loadStore();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.9.8",
+  "version": "0.10.0",
   "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": "^1.1.4",
-    "@canonmsg/core": "^0.15.4"
+    "@canonmsg/agent-sdk": "^1.2.0",
+    "@canonmsg/core": "^0.16.0"
   },
   "engines": {
     "node": ">=18.0.0"