@canonmsg/codex-plugin 0.23.5 → 0.23.7

package/dist/adapter.d.ts

@@ -61,7 +61,6 @@ export declare class CodexConversationAdapter {
     private model;
     private reasoningEffort;
     private readonly sandbox;
-    private readonly legacyApprovalPolicy;
     private readonly codexProfile;
     private readonly addDirs;
     private readonly configOverrides;
@@ -78,7 +77,6 @@ export declare class CodexConversationAdapter {
         model?: string | null;
         reasoningEffort?: string | null;
         sandbox?: CodexSandboxMode | null;
-        approvalPolicy?: CodexApprovalPolicy | null;
         codexProfile?: string | null;
         addDirs?: string[];
         configOverrides?: string[];

package/dist/adapter.js

@@ -7,7 +7,6 @@ export class CodexConversationAdapter {
     model;
     reasoningEffort;
     sandbox;
-    legacyApprovalPolicy;
     codexProfile;
     addDirs;
     configOverrides;
@@ -24,7 +23,6 @@ export class CodexConversationAdapter {
         this.model = opts.model ?? null;
         this.reasoningEffort = opts.reasoningEffort ?? null;
         this.sandbox = opts.sandbox ?? null;
-        this.legacyApprovalPolicy = opts.approvalPolicy ?? null;
         this.codexProfile = opts.codexProfile ?? null;
         this.addDirs = opts.addDirs ?? [];
         this.configOverrides = opts.configOverrides ?? [];

package/dist/app-server-adapter.d.ts

@@ -1,4 +1,4 @@
-import type { CodexApprovalPolicy, CodexEvent, CodexRunTurnOptions, CodexSandboxMode, CodexTurnResult } from './adapter.js';
+import type { CodexEvent, CodexRunTurnOptions, CodexSandboxMode, CodexTurnResult } from './adapter.js';
 export type JsonRecord = Record<string, unknown>;
 export interface CodexSkillMetadata {
     name: string;
@@ -27,7 +27,6 @@ export declare class CodexAppServerAdapter {
     private model;
     private reasoningEffort;
     private readonly sandbox;
-    private readonly legacyApprovalPolicy;
     private readonly addDirs;
     private readonly configOverrides;
     private readonly fullAuto;
@@ -60,7 +59,6 @@ export declare class CodexAppServerAdapter {
         model?: string | null;
         reasoningEffort?: string | null;
         sandbox?: CodexSandboxMode | null;
-        approvalPolicy?: CodexApprovalPolicy | null;
         addDirs?: string[];
         configOverrides?: string[];
         fullAuto?: boolean;

package/dist/app-server-adapter.js

@@ -8,7 +8,6 @@ export class CodexAppServerAdapter {
     model;
     reasoningEffort;
     sandbox;
-    legacyApprovalPolicy;
     addDirs;
     configOverrides;
     fullAuto;
@@ -42,7 +41,6 @@ export class CodexAppServerAdapter {
         this.reasoningEffort = opts.reasoningEffort ?? null;
         this.resolvedReasoningEffort = this.reasoningEffort;
         this.sandbox = opts.sandbox ?? null;
-        this.legacyApprovalPolicy = opts.approvalPolicy ?? null;
         this.addDirs = opts.addDirs ?? [];
         this.configOverrides = opts.configOverrides ?? [];
         this.fullAuto = opts.fullAuto ?? false;
@@ -198,9 +196,7 @@ export class CodexAppServerAdapter {
         }
     }
     resolveApprovalPolicy() {
-        if (this.bypassApprovalsAndSandbox || this.fullAuto)
-            return 'never';
-        return this.legacyApprovalPolicy;
+        return (this.bypassApprovalsAndSandbox || this.fullAuto) ? 'never' : null;
     }
     configPayload() {
         const config = {};

package/dist/host.js

@@ -5,9 +5,8 @@ import { spawnSync } from 'node:child_process';
 import { dirname } from 'node:path';
 import { parseArgs } from 'node:util';
 import { getCodexImagePath, materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
-import { buildTrailBlockId, buildUndeliverableFinalNotice, captureTurnArtifactSnapshot, collectTurnArtifacts, IDLE_TIMEOUT_MS, PLAN_BLOCK_TITLE, } from '@canonmsg/coding-agent-host';
-import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, resolveQuestionAllowOther, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, buildCanonInboundFrameV1, 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, markLocalRuntimeStopped, normalizeTurnMetadata, parseRuntimeCardV1, RuntimeRequestManager, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, CanonApiError, loadRuntimeSessionState, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
-import { decideAutoReply, } from './inbound-policy.js';
+import { buildTrailBlockId, buildUndeliverableFinalNotice, captureTurnArtifactSnapshot, collectTurnArtifacts, IDLE_TIMEOUT_MS, PLAN_BLOCK_TITLE, collectMissedInboundMessages, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from '@canonmsg/coding-agent-host';
+import { RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildRuntimeCardOutcome, resolveQuestionAllowOther, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, buildCanonInboundFrameV1, 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, decideAutoReply, initRTDBAuth, buildLocalRuntimeId, heartbeatLocalRuntimeEntry, markLocalRuntimeStopped, normalizeTurnMetadata, parseRuntimeCardV1, RuntimeRequestManager, prepareConversationEnvironment, loadHostSessionConfig, releaseConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, CanonApiError, loadRuntimeSessionState, sendMessageWithRetry, sendMessageWithRetryChunked, saveRuntimeSessionState, buildBoundedTurnTrail, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { CodexConversationAdapter, } from './adapter.js';
 import { CodexAppServerAdapter, } from './app-server-adapter.js';
 import { CODEX_APP_DYNAMIC_TOOLS, deniedCodexAppToolResult, handleCodexAppToolCall, isCodexAppToolCall, } from './codex-app-tools.js';
@@ -18,8 +17,7 @@ import { detectCodexCliVersion } from './codex-cli-version.js';
 import { buildCodexModelGuardMessage, formatCodexTurnFailure, isRecoverableCodexThreadError, } from './error-format.js';
 import { startCodexStreamInBackground } from './host-lifecycle.js';
 import { createCodexControlPoller } from './control-channel.js';
-import { runCli } from './cli-entry.js';
-import { collectMissedInboundMessages, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from './startup-recovery.js';
+import { runCli } from '@canonmsg/core';
 import { applyTextSegmentBlock, beginCommandBlock, claimCommandBlock, createCommandBlockTracker, } from './turn-activity.js';
 import { FALLBACK_CODEX_EFFORT_OPTIONS, buildCodexEffortOptions, buildCodexModelOptions, readCodexConfiguredEffort, resolveCodexDefaultModel, resolveCodexEffortForModel, } from './model-catalog.js';
 const HELP = `canon-codex — run a local Codex agent host for Canon
@@ -240,13 +238,14 @@ export function buildCodexTurnResponseRouting(input) {
 export function getCodexRequestingUserId(message) {
     return message.senderType === 'human' ? message.senderId : null;
 }
-async function publishAgentRuntime(agentId, runtime) {
-    await publishHostAgentRuntime(agentId, 'codex', runtime);
+async function publishAgentRuntime(agentId, runtime, rtdb) {
+    await publishHostAgentRuntime(agentId, 'codex', runtime, rtdb);
 }
-async function loadSessionConfig(conversationId, agentId) {
+async function loadSessionConfig(conversationId, agentId, rtdb) {
     return loadHostSessionConfig({
         conversationId,
         agentId,
+        rtdb,
         extraStringFields: CODEX_SESSION_CONFIG_FIELDS,
     });
 }
@@ -286,9 +285,7 @@ function resolveCodexEffectiveRuntimePolicy(input) {
     }
     const approvalOverride = mapCanonPermissionToCodex(permissionMode);
     const defaultSandbox = (stringArg(input.args, 'sandbox') ?? null);
-    const defaultApprovalPolicy = (stringArg(input.args, 'ask-for-approval') ?? null);
     const sandbox = approvalOverride ? approvalOverride.sandbox : defaultSandbox;
-    const approvalPolicy = approvalOverride ? null : defaultApprovalPolicy;
     const fullAuto = approvalOverride ? approvalOverride.fullAuto : boolArg(input.args, 'full-auto');
     const bypassApprovalsAndSandbox = approvalOverride
         ? approvalOverride.bypassApprovalsAndSandbox
@@ -298,7 +295,9 @@ function resolveCodexEffectiveRuntimePolicy(input) {
         executionMode: input.environment.mode,
         permissionMode: permissionMode ?? null,
         sandbox,
-        approvalPolicy,
+        // `--ask-for-approval` is rejected at startup, so this was always null.
+        // The key must stay: it is hashed into every persisted thread fingerprint.
+        approvalPolicy: null,
         fullAuto,
         bypassApprovalsAndSandbox,
     });
@@ -306,7 +305,6 @@ function resolveCodexEffectiveRuntimePolicy(input) {
         ...(model ? { model } : {}),
         ...(permissionMode ? { permissionMode } : {}),
         sandbox,
-        approvalPolicy,
         fullAuto,
         bypassApprovalsAndSandbox,
         fingerprint,
@@ -620,6 +618,7 @@ export async function main() {
         agentId,
         clientType: 'codex',
         hostMode: true,
+        rtdb,
     });
     const sessions = new Map();
     const pendingSessionCreations = new Map();
@@ -939,7 +938,7 @@ export async function main() {
         const droppedPrompts = session.queue.splice(0);
         await markQueuedPromptsRejected(conversationId, droppedPrompts);
         rememberDroppedRecoveryCursor(session, droppedPrompts);
-        clearStoredThreadId(runtimeId, agentId, conversationId, session.environment.baseCwd, session.environment.mode);
+        clearStoredThreadId(runtimeId, conversationId, session.environment.baseCwd, session.environment.mode);
         session.adapter.clearThreadId();
         session.activeSelfContextId = null;
         session.state.lastError = undefined;
@@ -989,7 +988,7 @@ export async function main() {
             evictOldestIdle();
         }
         const creation = (async () => {
-            const config = await loadSessionConfig(conversationId, agentId);
+            const config = await loadSessionConfig(conversationId, agentId, rtdb);
             const sessionExecutionMode = resolveSessionExecutionMode(config);
             const workspaceCwd = resolveWorkspaceCwd(config);
             const environment = prepareConversationEnvironment({
@@ -1010,7 +1009,7 @@ export async function main() {
                 if (modelGuard) {
                     throw new ExecutionEnvironmentError(modelGuard, modelGuard);
                 }
-                const storedThreadId = loadStoredThreadId(runtimeId, agentId, conversationId, environment.baseCwd, environment.mode, policy.fingerprint);
+                const storedThreadId = loadStoredThreadId(runtimeId, conversationId, environment.baseCwd, environment.mode, policy.fingerprint);
                 const effectiveModel = policy.model ?? codexDefaultModel;
                 const initialEffortResolution = resolveCodexEffortForModel({
                     models: codexModels,
@@ -1026,7 +1025,6 @@ export async function main() {
                         model: policy.model ?? null,
                         reasoningEffort: initialEffort,
                         sandbox: policy.sandbox,
-                        approvalPolicy: policy.approvalPolicy,
                         addDirs: args['add-dir'] ?? [],
                         configOverrides: args.config ?? [],
                         fullAuto: policy.fullAuto,
@@ -1040,7 +1038,6 @@ export async function main() {
                         model: policy.model ?? null,
                         reasoningEffort: initialEffort,
                         sandbox: policy.sandbox,
-                        approvalPolicy: policy.approvalPolicy,
                         codexProfile: typeof args['codex-profile'] === 'string' ? args['codex-profile'] : null,
                         addDirs: args['add-dir'] ?? [],
                         configOverrides: args.config ?? [],
@@ -1565,7 +1562,7 @@ export async function main() {
                     if (session.resetRequested) {
                         return;
                     }
-                    saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, event.threadId, session.environment.mode, session.policyFingerprint);
+                    saveStoredThreadId(runtimeId, 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;
                 }
@@ -1669,7 +1666,7 @@ export async function main() {
                 console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] ${line}`);
             };
             const clearStoredThread = () => {
-                clearStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, session.environment.mode);
+                clearStoredThreadId(runtimeId, session.conversationId, session.environment.baseCwd, session.environment.mode);
                 session.adapter.clearThreadId();
             };
             const runTurnOnce = () => session.adapter.runTurn(turnPrompt, handleCodexEvent, logCodexLine, turnImagePaths, turnMediaAddDirs, {
@@ -1698,7 +1695,7 @@ export async function main() {
                 }
             }
             if (result.threadId && !session.resetRequested) {
-                saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, result.threadId, session.environment.mode, session.policyFingerprint);
+                saveStoredThreadId(runtimeId, session.conversationId, session.environment.baseCwd, result.threadId, session.environment.mode, session.policyFingerprint);
             }
             if (!result.interrupted && result.finalMessage && nextTurn.planMode) {
                 await routeArtifactsOnce();
@@ -1831,7 +1828,7 @@ export async function main() {
             }).catch(() => { });
             await handoffFinalMessage(session.conversationId);
             if (error instanceof Error && isRecoverableCodexThreadError(error.message)) {
-                clearStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, session.environment.mode);
+                clearStoredThreadId(runtimeId, session.conversationId, session.environment.baseCwd, session.environment.mode);
             }
             console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn failed:`, error);
         }
@@ -2109,7 +2106,7 @@ export async function main() {
         });
         if (!streamConnected)
             return;
-        await publishAgentRuntime(agentId, runtimeDescriptor).catch((error) => {
+        await publishAgentRuntime(agentId, runtimeDescriptor, rtdb).catch((error) => {
             console.error('[canon-codex] Failed to publish agent runtime:', error);
         });
         if (publishRuntimeDetailsInFlight)
@@ -2122,6 +2119,7 @@ export async function main() {
             await publishHostSessionSnapshots({
                 conversationIds: Array.from(knownConversationIds),
                 agentId,
+                rtdb,
                 clientType: 'codex',
                 runtime: runtimeDescriptor,
                 workspaceOptions,

package/dist/register.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
-import { setDefaultResultOrder } from 'node:dns';
-import { parseArgs } from 'node:util';
-import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, registerAndWaitForApproval, resolveCanonRuntimeConnection, loadProfiles, updatePendingRegistration, upsertAgentProfile, verifyCanonRuntimeConnection, } from '@canonmsg/core';
-import { runCli } from './cli-entry.js';
+import { registerRegistrationCli, runRegistrationCli, } from '@canonmsg/core';
 const HELP = `canon-codex-register — register or reconnect a Codex agent in Canon
 
 USAGE
@@ -15,7 +12,7 @@ REQUIRED
 
 FLAGS
   --profile <name>           Local profile name in ~/.canon/agents.json
-  --environment <id>        Canon environment ID (or CANON_ENVIRONMENT_ID)
+  --environment <id>        Canon environment ID (or CANON_ENVIRONMENT_ID; default: canon-prod-v1)
   --base-url <url>           Canon API base URL override
   --stream-url <url>         Canon stream URL override
   --rtdb-url <url>           Canon RTDB URL override
@@ -28,113 +25,17 @@ EXAMPLES
   canon-codex-register --name "Frontend" --description "React work" --phone "+15551234567" --profile frontend
 
 After approval, start it with CANON_AGENT=<profile> canon-codex --cwd /path/to/project.`;
+const OPTIONS = {
+    moduleUrl: import.meta.url,
+    clientType: 'codex',
+    cliName: 'canon-codex-register',
+    hostBinName: 'canon-codex',
+    developerInfo: 'Codex host plugin',
+    registeringLabel: 'Codex agent',
+    usage: 'Usage: canon-codex-register --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]',
+    help: HELP,
+};
 export async function main() {
-    setDefaultResultOrder('ipv4first');
-    const { values } = parseArgs({
-        options: {
-            name: { type: 'string' },
-            description: { type: 'string' },
-            phone: { type: 'string' },
-            profile: { type: 'string' },
-            environment: { type: 'string' },
-            'base-url': { type: 'string' },
-            'stream-url': { type: 'string' },
-            'rtdb-url': { type: 'string' },
-            'firebase-api-key': { type: 'string' },
-        },
-        strict: true,
-    });
-    if (!values.name || !values.description || !values.phone) {
-        console.error('Usage: canon-codex-register --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]');
-        process.exit(1);
-    }
-    const profileName = values.profile || values.name.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-');
-    const environmentId = values.environment || process.env.CANON_ENVIRONMENT_ID;
-    if (!environmentId) {
-        throw new Error('--environment or CANON_ENVIRONMENT_ID is required');
-    }
-    const connection = resolveCanonRuntimeConnection({
-        environmentId,
-        apiBaseUrl: values['base-url'],
-        streamUrl: values['stream-url'],
-        rtdbUrl: values['rtdb-url'],
-        firebaseWebApiKey: values['firebase-api-key'],
-    });
-    await verifyCanonRuntimeConnection(connection);
-    const existingProfile = loadProfiles()[profileName];
-    const existingAgentId = existingProfile?.environmentId === connection.environmentId
-        ? existingProfile.agentId
-        : undefined;
-    console.log(`Registering Codex agent "${values.name}" (profile: ${profileName})...`);
-    const pending = getOrCreatePendingRegistration(profileName, 'codex', connection);
-    const result = await registerAndWaitForApproval({
-        name: values.name,
-        description: values.description,
-        ownerPhone: values.phone,
-        developerInfo: 'Codex host plugin',
-        clientType: 'codex',
-        baseUrl: connection.apiBaseUrl,
-        requestedAgentId: existingAgentId,
-        localRegistrationId: pending.localRegistrationId,
-    }, {
-        onSubmitted: (requestId, pollToken) => {
-            updatePendingRegistration(profileName, {
-                requestId,
-                pollToken,
-                clientType: 'codex',
-            });
-            console.log(`Registration submitted (request ID: ${requestId}).`);
-            console.log('Waiting for approval in Canon app...');
-        },
-        onPollUpdate: () => {
-            process.stdout.write('.');
-        },
-    });
-    console.log('');
-    switch (result.status) {
-        case 'approved': {
-            if (!result.apiKey || !result.agentId || !result.agentName) {
-                console.error('Approval completed but Canon did not return a usable API key. Run this command again to resume key pickup.');
-                process.exit(1);
-            }
-            upsertAgentProfile(profileName, {
-                apiKey: result.apiKey,
-                agentId: result.agentId,
-                agentName: result.agentName,
-                registeredAt: new Date().toISOString(),
-                environmentId: connection.environmentId,
-                baseUrl: connection.apiBaseUrl,
-                streamUrl: connection.streamUrl,
-                rtdbUrl: connection.rtdbUrl,
-                firebaseApiKey: connection.firebaseWebApiKey,
-                clientType: 'codex',
-            });
-            if (result.requestId) {
-                await ackRegistrationApproval(connection.apiBaseUrl, result.requestId, result.pollToken);
-            }
-            clearPendingRegistration(profileName);
-            console.log(`Approved! Agent: ${result.agentName} (${result.agentId})`);
-            console.log(`Saved as profile "${profileName}" in ~/.canon/agents.json`);
-            console.log('Start it with: CANON_AGENT=' + profileName + ' canon-codex --cwd /path/to/project');
-            console.log('Keep that terminal open while you want Canon to reach the agent.');
-            console.log('Closing it, logging out, rebooting, or sleeping long enough to stop the process takes this local agent offline until you revive it.');
-            console.log('Docs: https://canonmail.com/agents/integrations');
-            break;
-        }
-        case 'rejected':
-            console.log('Registration was rejected.');
-            process.exit(1);
-            break;
-        case 'timeout':
-            console.log('Registration timed out (5 minutes). Try again later.');
-            process.exit(1);
-            break;
-    }
+    await runRegistrationCli(OPTIONS);
 }
-runCli(import.meta.url, main, (error) => {
-    console.error('[canon-codex-register] Fatal error:', error);
-    process.exit(1);
-}, {
-    name: 'canon-codex-register',
-    help: HELP,
-});
+registerRegistrationCli(OPTIONS);

package/dist/session-store.d.ts

@@ -8,6 +8,6 @@ export declare function buildCodexThreadPolicyFingerprint(input: {
     fullAuto?: boolean;
     bypassApprovalsAndSandbox?: boolean;
 }): string;
-export declare function loadStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd: string, executionMode?: ExecutionEnvironmentMode, policyFingerprint?: string): string | null;
-export declare function saveStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd: string, threadId: string, executionMode?: ExecutionEnvironmentMode, policyFingerprint?: string): void;
-export declare function clearStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd?: string, executionMode?: ExecutionEnvironmentMode): void;
+export declare function loadStoredThreadId(runtimeId: string, conversationId: string, baseCwd: string, executionMode?: ExecutionEnvironmentMode, policyFingerprint?: string): string | null;
+export declare function saveStoredThreadId(runtimeId: string, conversationId: string, baseCwd: string, threadId: string, executionMode?: ExecutionEnvironmentMode, policyFingerprint?: string): void;
+export declare function clearStoredThreadId(runtimeId: string, conversationId: string, baseCwd?: string, executionMode?: ExecutionEnvironmentMode): void;

package/dist/session-store.js

@@ -1,20 +1,5 @@
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
-import { join } from 'node:path';
-import { CANON_DIR, clearRuntimeSessionState, loadRuntimeSessionState, saveRuntimeSessionState, } from '@canonmsg/core';
-const STORE_PATH = join(CANON_DIR, 'codex-sessions.json');
-function loadStore() {
-    try {
-        return JSON.parse(readFileSync(STORE_PATH, 'utf-8'));
-    }
-    catch {
-        return { agents: {} };
-    }
-}
-function saveStore(store) {
-    mkdirSync(CANON_DIR, { recursive: true });
-    writeFileSync(STORE_PATH, JSON.stringify(store, null, 2));
-}
+import { clearRuntimeSessionState, loadRuntimeSessionState, saveRuntimeSessionState, } from '@canonmsg/core';
 export function buildCodexThreadPolicyFingerprint(input) {
     return createHash('sha256').update(JSON.stringify({
         version: 2,
@@ -27,91 +12,53 @@ export function buildCodexThreadPolicyFingerprint(input) {
         bypassApprovalsAndSandbox: input.bypassApprovalsAndSandbox === true,
     })).digest('hex').slice(0, 24);
 }
-export function loadStoredThreadId(runtimeId, agentId, conversationId, baseCwd, executionMode, policyFingerprint) {
-    if (runtimeId) {
-        const state = loadRuntimeSessionState(runtimeId, {
-            conversationId,
-            baseCwd,
-            executionMode,
-        });
-        if (state?.threadId) {
-            if (policyFingerprint && state.codexPolicyFingerprint !== policyFingerprint) {
-                clearRuntimeSessionState(runtimeId, {
-                    conversationId,
-                    baseCwd,
-                    executionMode,
-                });
-                return null;
-            }
-            return state.threadId;
-        }
-        return null;
-    }
-    const store = loadStore();
-    const record = store.agents[agentId]?.[conversationId];
-    if (!record || record.cwd !== baseCwd)
-        return null;
-    if (policyFingerprint && record.policyFingerprint !== policyFingerprint) {
-        delete store.agents[agentId][conversationId];
-        if (Object.keys(store.agents[agentId]).length === 0) {
-            delete store.agents[agentId];
+export function loadStoredThreadId(runtimeId, conversationId, baseCwd, executionMode, policyFingerprint) {
+    const state = loadRuntimeSessionState(runtimeId, {
+        conversationId,
+        baseCwd,
+        executionMode,
+    });
+    if (state?.threadId) {
+        if (policyFingerprint && state.codexPolicyFingerprint !== policyFingerprint) {
+            clearRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd,
+                executionMode,
+            });
+            return null;
         }
-        saveStore(store);
-        return null;
+        return state.threadId;
     }
-    return record.threadId;
+    return null;
 }
-export function saveStoredThreadId(runtimeId, agentId, conversationId, baseCwd, threadId, executionMode, policyFingerprint) {
-    if (runtimeId) {
-        saveRuntimeSessionState(runtimeId, {
-            conversationId,
-            baseCwd,
-            executionMode,
-            threadId,
-            ...(policyFingerprint ? { codexPolicyFingerprint: policyFingerprint } : {}),
-        });
-        return;
-    }
-    const store = loadStore();
-    store.agents[agentId] ??= {};
-    store.agents[agentId][conversationId] = {
+export function saveStoredThreadId(runtimeId, conversationId, baseCwd, threadId, executionMode, policyFingerprint) {
+    saveRuntimeSessionState(runtimeId, {
+        conversationId,
+        baseCwd,
+        executionMode,
         threadId,
-        cwd: baseCwd,
-        ...(policyFingerprint ? { policyFingerprint } : {}),
-        updatedAt: new Date().toISOString(),
-    };
-    saveStore(store);
+        ...(policyFingerprint ? { codexPolicyFingerprint: policyFingerprint } : {}),
+    });
 }
-export function clearStoredThreadId(runtimeId, agentId, conversationId, baseCwd, executionMode) {
-    if (runtimeId) {
-        const existing = baseCwd
-            ? loadRuntimeSessionState(runtimeId, {
-                conversationId,
-                baseCwd,
-                executionMode,
-            })
-            : null;
-        clearRuntimeSessionState(runtimeId, {
+export function clearStoredThreadId(runtimeId, conversationId, baseCwd, executionMode) {
+    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,
         });
-        if (existing?.lastInboundMessageId && baseCwd) {
-            saveRuntimeSessionState(runtimeId, {
-                conversationId,
-                baseCwd,
-                ...(executionMode ? { executionMode } : {}),
-                lastInboundMessageId: existing.lastInboundMessageId,
-            });
-        }
-        return;
-    }
-    const store = loadStore();
-    if (!store.agents[agentId]?.[conversationId])
-        return;
-    delete store.agents[agentId][conversationId];
-    if (Object.keys(store.agents[agentId]).length === 0) {
-        delete store.agents[agentId];
     }
-    saveStore(store);
 }

package/dist/setup.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
-import { runCli } from './cli-entry.js';
+import { runCli } from '@canonmsg/core';
 const HELP = `canon-codex-setup — print Canon Codex setup guidance
 
 USAGE

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.23.5",
+  "version": "0.23.7",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,9 +29,9 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^7.1.3",
-    "@canonmsg/coding-agent-host": "^0.3.1",
-    "@canonmsg/core": "^8.2.0"
+    "@canonmsg/agent-sdk": "^8.1.0",
+    "@canonmsg/coding-agent-host": "^0.4.0",
+    "@canonmsg/core": "^9.2.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/dist/cli-entry.d.ts

@@ -1,2 +0,0 @@
-export { handleCliMetadataRequest, isDirectExecution, readCliPackageVersion, runCli, } from '@canonmsg/core';
-export type { CliMetadata, RunCliMetadataOptions, } from '@canonmsg/core';

package/dist/cli-entry.js

@@ -1 +0,0 @@
-export { handleCliMetadataRequest, isDirectExecution, readCliPackageVersion, runCli, } from '@canonmsg/core';

package/dist/inbound-policy.d.ts

@@ -1,22 +0,0 @@
-import { type CanonGroupContext, type CanonGroupContextMode, type CanonConversation, type ResolvedAgentBehaviorPolicy } from '@canonmsg/core';
-export interface InboundParticipantContext {
-    conversationType: CanonConversation['type'] | 'unknown';
-    memberCount: number | null;
-    senderType: 'human' | 'ai_agent';
-    senderName: string;
-    isOwner: boolean;
-    mentionedAgent: boolean;
-    groupContext?: CanonGroupContext;
-    groupContextMode?: CanonGroupContextMode;
-    recentSenderTypes: Array<'human' | 'ai_agent'>;
-    recentHumanCount: number;
-    recentAgentCount: number;
-    consecutiveAgentTurns: number;
-    currentAgentStreakStartedByHuman: boolean;
-}
-export interface AutoReplyDecision {
-    allow: boolean;
-    reason: string;
-}
-export declare function buildInboundContextLines(context: InboundParticipantContext): string[];
-export declare function decideAutoReply(context: InboundParticipantContext, behavior?: ResolvedAgentBehaviorPolicy | null): AutoReplyDecision;

package/dist/inbound-policy.js

@@ -1,46 +0,0 @@
-import { buildCompactGroupContextLines, evaluateParticipationPolicy, resolveAgentBehaviorPolicy, } from '@canonmsg/core';
-function formatRecentSenders(senderTypes) {
-    if (senderTypes.length === 0)
-        return 'none';
-    return senderTypes.map((senderType) => (senderType === 'ai_agent' ? 'agent' : 'human')).join(' -> ');
-}
-export function buildInboundContextLines(context) {
-    const conversationTypeLabel = context.conversationType === 'unknown'
-        ? 'unknown'
-        : `${context.conversationType}${context.memberCount ? ` (${context.memberCount} members)` : ''}`;
-    const senderRole = context.isOwner
-        ? 'The latest sender is the verified human owner of this Canon agent.'
-        : context.senderType === 'ai_agent'
-            ? 'The latest sender is another AI agent in Canon.'
-            : 'The latest sender is a human Canon participant.';
-    return [
-        senderRole,
-        `Latest sender name: ${context.senderName}`,
-        `Latest sender type: ${context.senderType}`,
-        `Conversation type: ${conversationTypeLabel}`,
-        ...(context.groupContext && context.groupContextMode
-            ? buildCompactGroupContextLines(context.groupContext, context.groupContextMode)
-            : []),
-        `Directly addressed to this agent: ${context.mentionedAgent ? 'yes' : 'no'}`,
-        `Recent sender pattern: ${formatRecentSenders(context.recentSenderTypes)}`,
-        `Recent human messages: ${context.recentHumanCount}`,
-        `Recent agent messages: ${context.recentAgentCount}`,
-        `Consecutive recent agent turns: ${context.consecutiveAgentTurns}`,
-        `Current agent streak started after a human message: ${context.currentAgentStreakStartedByHuman ? 'yes' : 'no'}`,
-    ];
-}
-export function decideAutoReply(context, behavior) {
-    const decision = evaluateParticipationPolicy(behavior ?? resolveAgentBehaviorPolicy(), {
-        conversationType: context.conversationType,
-        senderType: context.senderType,
-        isOwner: context.isOwner,
-        mentionedAgent: context.mentionedAgent,
-        recentHumanCount: context.recentHumanCount,
-        consecutiveAgentTurns: context.consecutiveAgentTurns,
-        currentAgentStreakStartedByHuman: context.currentAgentStreakStartedByHuman,
-    });
-    return {
-        allow: decision.allow,
-        reason: decision.reason,
-    };
-}

package/dist/startup-recovery.d.ts

@@ -1,47 +0,0 @@
-/**
- * Startup recovery for inbound messages missed while the host was offline.
- *
- * The host persists a `lastInboundMessageId` cursor per conversation. On
- * startup we paginate `getMessagesPage` (newest-first pages, older pages via
- * its `before` message-id parameter) until the cursor is found or a hard
- * per-conversation bound is hit, then replay everything after the cursor.
- *
- * This module is intentionally identical in packages/claude-code-plugin and
- * packages/codex-plugin — keep both copies in sync (future consolidation
- * candidate).
- */
-export declare const STARTUP_RECOVERY_PAGE_SIZE = 25;
-export declare const STARTUP_RECOVERY_MAX_MESSAGES = 500;
-export interface StartupRecoveryMessage {
-    id: string;
-    senderId: string;
-    createdAt?: string;
-    metadata?: Record<string, unknown>;
-}
-export interface StartupRecoveryPage {
-    messages: StartupRecoveryMessage[];
-}
-export type StartupRecoveryMode = 
-/** Cursor found — `messages` is everything strictly after it. */
-'after-cursor'
-/** Cursor present but not found within the bound — `messages` is the bounded recent window. */
- | 'truncated-window'
-/**
- * No usable cursor (fresh runtime file, or the cursor message no longer
- * exists in history) — only the newest inbound message is recovered, since
- * a full-history replay could fire mass duplicate turns.
- */
- | 'latest-only';
-export interface StartupRecoveryResult<TPage extends StartupRecoveryPage> {
-    mode: StartupRecoveryMode;
-    /** Missed inbound messages (own messages excluded), oldest first. */
-    messages: TPage['messages'];
-    /** First page fetched — reusable as hydration context for recovered turns. */
-    newestPage: TPage;
-}
-export declare function collectMissedInboundMessages<TPage extends StartupRecoveryPage>(input: {
-    fetchPage: (before?: string) => Promise<TPage>;
-    cursor: string | null | undefined;
-    agentId: string;
-    maxMessages?: number;
-}): Promise<StartupRecoveryResult<TPage>>;

package/dist/startup-recovery.js

@@ -1,72 +0,0 @@
-/**
- * Startup recovery for inbound messages missed while the host was offline.
- *
- * The host persists a `lastInboundMessageId` cursor per conversation. On
- * startup we paginate `getMessagesPage` (newest-first pages, older pages via
- * its `before` message-id parameter) until the cursor is found or a hard
- * per-conversation bound is hit, then replay everything after the cursor.
- *
- * This module is intentionally identical in packages/claude-code-plugin and
- * packages/codex-plugin — keep both copies in sync (future consolidation
- * candidate).
- */
-export const STARTUP_RECOVERY_PAGE_SIZE = 25;
-export const STARTUP_RECOVERY_MAX_MESSAGES = 500;
-export async function collectMissedInboundMessages(input) {
-    const maxMessages = input.maxMessages ?? STARTUP_RECOVERY_MAX_MESSAGES;
-    const newestPage = await input.fetchPage();
-    const collected = [...newestPage.messages];
-    const seenIds = new Set(collected.map((message) => message.id));
-    const hasCursor = (messages) => input.cursor != null && messages.some((message) => message.id === input.cursor);
-    let cursorFound = hasCursor(collected);
-    if (input.cursor != null) {
-        while (!cursorFound && collected.length < maxMessages) {
-            // Pages are newest-first, so the last collected message is the oldest.
-            const before = collected[collected.length - 1]?.id;
-            if (!before)
-                break;
-            const page = await input.fetchPage(before);
-            const fresh = page.messages.filter((message) => !seenIds.has(message.id));
-            // No pagination progress (history exhausted, or the server ignored the
-            // `before` cursor because that message was hard-deleted) — stop here.
-            if (fresh.length === 0)
-                break;
-            for (const message of fresh)
-                seenIds.add(message.id);
-            collected.push(...fresh);
-            cursorFound = hasCursor(fresh);
-        }
-    }
-    // The REST API already gives us a deterministic newest-first sequence,
-    // including messages with equal or missing timestamps. Reverse that wire
-    // order rather than re-sorting on a lossy display timestamp.
-    const ascending = [...collected].reverse();
-    const completedSourceMessageIds = new Set(collected.flatMap((message) => {
-        if (message.senderId !== input.agentId)
-            return [];
-        const metadata = message.metadata;
-        if (metadata?.turnSemantics !== 'turn_complete')
-            return [];
-        return typeof metadata.sourceMessageId === 'string'
-            ? [metadata.sourceMessageId]
-            : [];
-    }));
-    const inboundOnly = (messages) => messages.filter((message) => message.senderId !== input.agentId && !completedSourceMessageIds.has(message.id));
-    let mode;
-    let missed;
-    if (cursorFound) {
-        const cursorIndex = ascending.findIndex((message) => message.id === input.cursor);
-        mode = 'after-cursor';
-        missed = inboundOnly(ascending.slice(cursorIndex + 1));
-    }
-    else if (input.cursor != null && collected.length >= maxMessages) {
-        mode = 'truncated-window';
-        missed = inboundOnly(ascending.slice(-maxMessages));
-    }
-    else {
-        mode = 'latest-only';
-        missed = inboundOnly(ascending).slice(-1);
-    }
-    // Safe: `missed` only holds elements of pages returned by `fetchPage`.
-    return { mode, messages: missed, newestPage };
-}