@canonmsg/codex-plugin 0.9.7 → 0.10.0

package/dist/adapter.d.ts

@@ -64,7 +64,8 @@ export declare class CodexConversationAdapter {
     setModel(model: string | null): void;
     isRunning(): boolean;
     interrupt(): Promise<void>;
-    runTurn(prompt: string, onEvent: (event: CodexEvent) => void, onLog?: (line: string) => void, imagePaths?: readonly string[]): Promise<CodexTurnResult>;
+    runTurn(prompt: string, onEvent: (event: CodexEvent) => void, onLog?: (line: string) => void, imagePaths?: readonly string[], extraAddDirs?: readonly string[]): Promise<CodexTurnResult>;
+    private buildAddDirs;
     private buildArgs;
     private canResumeWithCurrentPolicy;
     private clearActiveProcess;

package/dist/adapter.js

@@ -51,11 +51,11 @@ export class CodexConversationAdapter {
                 this.child.kill('SIGKILL');
         }, 5_000);
     }
-    async runTurn(prompt, onEvent, onLog, imagePaths = []) {
+    async runTurn(prompt, onEvent, onLog, imagePaths = [], extraAddDirs = []) {
         if (this.child) {
             throw new Error('A Codex turn is already in progress for this conversation');
         }
-        const args = this.buildArgs(prompt, imagePaths);
+        const args = this.buildArgs(prompt, imagePaths, extraAddDirs);
         const child = spawn(this.codexBin, args, {
             cwd: this.cwd,
             stdio: ['ignore', 'pipe', 'pipe'],
@@ -147,7 +147,19 @@ export class CodexConversationAdapter {
             });
         });
     }
-    buildArgs(prompt, imagePaths = []) {
+    buildAddDirs(extraAddDirs = []) {
+        const seen = new Set();
+        const dirs = [];
+        for (const value of [...this.addDirs, ...extraAddDirs]) {
+            const trimmed = value.trim();
+            if (!trimmed || seen.has(trimmed))
+                continue;
+            seen.add(trimmed);
+            dirs.push(value);
+        }
+        return dirs;
+    }
+    buildArgs(prompt, imagePaths = [], extraAddDirs = []) {
         if (this.threadId && this.canResumeWithCurrentPolicy()) {
             const args = ['exec', 'resume', '--json', '--skip-git-repo-check'];
             if (this.model) {
@@ -159,6 +171,9 @@ export class CodexConversationAdapter {
             for (const configOverride of this.configOverrides) {
                 args.push('-c', configOverride);
             }
+            for (const addDir of this.buildAddDirs(extraAddDirs)) {
+                args.push('--add-dir', addDir);
+            }
             if (this.fullAuto) {
                 args.push('--full-auto');
             }
@@ -168,6 +183,9 @@ export class CodexConversationAdapter {
             for (const imagePath of imagePaths) {
                 args.push('-i', imagePath);
             }
+            if (imagePaths.length > 0) {
+                args.push('--');
+            }
             args.push(this.threadId, prompt);
             return args;
         }
@@ -189,7 +207,7 @@ export class CodexConversationAdapter {
         if (this.codexProfile) {
             args.push('-p', this.codexProfile);
         }
-        for (const addDir of this.addDirs) {
+        for (const addDir of this.buildAddDirs(extraAddDirs)) {
             args.push('--add-dir', addDir);
         }
         for (const configOverride of this.configOverrides) {
@@ -204,6 +222,9 @@ export class CodexConversationAdapter {
         for (const imagePath of imagePaths) {
             args.push('-i', imagePath);
         }
+        if (imagePaths.length > 0) {
+            args.push('--');
+        }
         args.push(prompt);
         return args;
     }

package/dist/host.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
 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';
@@ -64,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) {
@@ -207,6 +191,9 @@ function summarizeCommand(command) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function uniqueStrings(values) {
+    return Array.from(new Set(values.filter((value) => value.trim().length > 0)));
+}
 export async function main() {
     setDefaultResultOrder('ipv4first');
     const { values: args } = parseArgs({
@@ -448,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()) {
@@ -525,7 +538,9 @@ export async function main() {
                     turnState: 'idle',
                     currentTurnId: null,
                     currentTurnOpenedAt: null,
+                    activeSelfContextId: null,
                     lastAcceptedIntent: null,
+                    resetRequested: false,
                     lastActivity: Date.now(),
                     typingKeepaliveTimer: null,
                     closed: false,
@@ -553,8 +568,8 @@ export async function main() {
             pendingSessionCreations.delete(conversationId);
         }
     }
-    function enqueuePrompt(session, prompt, intent = 'queue', toFront = false, sourceMessageId, markAccepted = false, imagePaths = []) {
-        const nextPrompt = { prompt, intent, sourceMessageId, markAccepted, imagePaths };
+    function enqueuePrompt(session, prompt, intent = 'queue', toFront = false, sourceMessageId, markAccepted = false, imagePaths = [], mediaAddDirs = []) {
+        const nextPrompt = { prompt, intent, sourceMessageId, markAccepted, imagePaths, mediaAddDirs };
         if (toFront) {
             session.queue.unshift(nextPrompt);
         }
@@ -582,6 +597,7 @@ export async function main() {
         const imagePaths = materialized
             .map((attachment) => getCodexImagePath(attachment))
             .filter((path) => path !== null);
+        const mediaAddDirs = uniqueStrings(materialized.map((attachment) => dirname(attachment.path)));
         const content = renderInboundContent(input.message, materialized);
         const hydrated = await loadHydratedInboundContext({
             conversationId: input.conversationId,
@@ -591,11 +607,11 @@ export async function main() {
             hydratedPage: input.hydratedPage,
         });
         const behavior = input.behavior ?? hydrated.behavior;
-        const workSessions = hydrated.hydratedFromPage
-            ? hydrated.workSessions
-            : Array.isArray(input.workSessions)
-                ? input.workSessions
-                : hydrated.workSessions;
+        const selfContexts = hydrated.hydratedFromPage
+            ? hydrated.selfContexts
+            : Array.isArray(input.selfContexts)
+                ? input.selfContexts
+                : hydrated.selfContexts;
         const participantContext = hydrated.participantContext;
         const autoReply = decideAutoReply(participantContext, behavior);
         if (!autoReply.allow) {
@@ -612,6 +628,7 @@ export async function main() {
             const userMessage = error instanceof ExecutionEnvironmentError ? error.userMessage : message;
             console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Failed to create session: ${message}`);
             await client.sendMessage(input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                ...(selfContexts[0]?.id ? { selfContextId: selfContexts[0].id } : {}),
                 metadata: {
                     turnSemantics: 'turn_complete',
                     turnComplete: true,
@@ -621,6 +638,7 @@ export async function main() {
             return;
         }
         const turnMetadata = normalizeTurnMetadata(input.message.metadata);
+        session.activeSelfContextId = selfContexts[0]?.id ?? null;
         const deliveryIntent = turnMetadata?.deliveryIntent ?? 'queue';
         const shouldMarkAccepted = turnMetadata?.inboundDisposition === 'queued';
         const prompt = buildCanonPrompt({
@@ -628,18 +646,17 @@ export async function main() {
             conversationId: input.conversationId,
             participantContext,
             behavior,
-            workSession: input.message.workSession,
-            workSessions,
+            selfContexts,
         });
         if (session.running && deliveryIntent === 'interrupt') {
-            enqueuePrompt(session, prompt, deliveryIntent, true, input.message.id, shouldMarkAccepted, imagePaths);
+            enqueuePrompt(session, prompt, deliveryIntent, true, input.message.id, shouldMarkAccepted, imagePaths, mediaAddDirs);
             console.error(`[canon-codex] [${input.conversationId.slice(0, 8)}] Interrupting current turn for explicit human send-now`);
             await session.adapter.interrupt().catch(() => { });
             clearStreaming(input.conversationId);
             client.setTyping(input.conversationId, false).catch(() => { });
             return;
         }
-        enqueuePrompt(session, prompt, deliveryIntent, false, input.message.id, shouldMarkAccepted, imagePaths);
+        enqueuePrompt(session, prompt, deliveryIntent, false, input.message.id, shouldMarkAccepted, imagePaths, mediaAddDirs);
     }
     async function runNextTurn(session) {
         if (session.running || session.closed)
@@ -669,9 +686,13 @@ export async function main() {
                 throw new ExecutionEnvironmentError(modelGuard, modelGuard);
             }
             const turnImagePaths = nextTurn.imagePaths ?? [];
+            const turnMediaAddDirs = nextTurn.mediaAddDirs ?? [];
             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;
@@ -708,7 +729,7 @@ export async function main() {
                 clearStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, session.environment.mode);
                 session.adapter.clearThreadId();
             };
-            const runTurnOnce = () => session.adapter.runTurn(nextTurn.prompt, handleCodexEvent, logCodexLine, turnImagePaths);
+            const runTurnOnce = () => session.adapter.runTurn(nextTurn.prompt, handleCodexEvent, logCodexLine, turnImagePaths, turnMediaAddDirs);
             let result = await runTurnOnce();
             if (!result.interrupted
                 && !result.finalMessage
@@ -719,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) {
@@ -727,6 +748,9 @@ export async function main() {
                     clearStoredThread();
                 }
                 await client.sendMessage(session.conversationId, result.finalMessage, {
+                    ...(session.activeSelfContextId
+                        ? { selfContextId: session.activeSelfContextId }
+                        : {}),
                     metadata: {
                         turnId: session.currentTurnId,
                         turnSemantics: 'turn_complete',
@@ -745,6 +769,9 @@ export async function main() {
                     console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn exited ${result.exitCode}: ${result.errorText}`);
                 }
                 await client.sendMessage(session.conversationId, userVisibleError, {
+                    ...(session.activeSelfContextId
+                        ? { selfContextId: session.activeSelfContextId }
+                        : {}),
                     metadata: {
                         turnId: session.currentTurnId,
                         turnSemantics: 'turn_complete',
@@ -773,6 +800,9 @@ export async function main() {
             session.state.lastError = message;
             writeState(session);
             await client.sendMessage(session.conversationId, message, {
+                ...(session.activeSelfContextId
+                    ? { selfContextId: session.activeSelfContextId }
+                    : {}),
                 metadata: {
                     turnId: session.currentTurnId,
                     turnSemantics: 'turn_complete',
@@ -794,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);
@@ -969,7 +1000,7 @@ export async function main() {
                     senderName: message.senderName || message.senderId,
                     isOwner: message.isOwner ?? (ownerId != null && message.senderId === ownerId),
                     behavior: payload.behavior,
-                    workSessions: payload.workSessions,
+                    selfContexts: payload.selfContexts,
                 });
                 if (message.id) {
                     saveRuntimeSessionState(runtimeId, {
@@ -1076,7 +1107,7 @@ export async function main() {
                     senderName: latestMessage.senderId,
                     isOwner: ownerId != null && latestMessage.senderId === ownerId,
                     behavior: latestPage.behavior,
-                    workSessions: latestPage.workSessions,
+                    selfContexts: latestPage.selfContexts,
                     hydratedPage: latestPage,
                 });
                 if (latestMessage.id) {
@@ -1136,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;
                     }
@@ -1144,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.7",
+  "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.2",
-    "@canonmsg/core": "^0.15.4"
+    "@canonmsg/agent-sdk": "^1.2.0",
+    "@canonmsg/core": "^0.16.0"
   },
   "engines": {
     "node": ">=18.0.0"