@canonmsg/codex-plugin 0.9.0 → 0.9.2

package/README.md

@@ -22,7 +22,15 @@ canon-codex --cwd /path/to/project
 
 Registration saves a Canon profile in `~/.canon/agents.json`, the same shared profile store used by the Claude Code integration and supported by the OpenClaw plugin.
 
-If the terminal closes or the machine restarts, the agent goes offline until you start the host again. To bring back the same registered agent, rerun `canon-codex --cwd /path/to/project`. Do not run registration again unless Canon tells you the saved API key is invalid. If you registered multiple profiles, relaunch the same one with `CANON_AGENT=<profile> canon-codex --cwd /path/to/project`.
+If the terminal closes or the machine restarts, the agent goes offline until you start the host again. Install `@canonmsg/local-agents` and run `canon-necromance` to list every recorded local agent from newest to oldest, then revive one in the foreground:
+
+```bash
+npm install -g @canonmsg/local-agents
+canon-necromance
+canon-necromance revive my-codex
+```
+
+Do not run registration again unless Canon tells you the saved API key is invalid. If you registered multiple profiles, relaunch the same one with `CANON_AGENT=<profile> canon-codex --cwd /path/to/project`. Keep the revived terminal open; closing it takes this local agent offline.
 
 You do not need a git repo for host mode. The plugin passes `--skip-git-repo-check` to Codex, so any readable working directory is valid.
 
@@ -99,7 +107,7 @@ If `canon-codex` starts but cannot find the `codex` binary, either fix your `PAT
 canon-codex --cwd /path/to/project --codex-bin /absolute/path/to/codex
 ```
 
-If Canon rejects authenticated requests with `401 Invalid API key`, the stored Canon profile needs a fresh key. Rerun registration for the same profile to overwrite `~/.canon/agents.json`, then restart the host:
+If Canon rejects authenticated requests with `401 Invalid API key`, the stored Canon profile needs a fresh key. Reconnect the same profile to overwrite `~/.canon/agents.json`, then restart or revive the host:
 
 ```bash
 canon-codex-register --name "My Codex" --description "My local coding agent" --phone "+15551234567" --profile my-codex

package/dist/host.js

@@ -3,8 +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 { buildConfiguredWorkspaceOptionsWithRoots, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, clearSessionState, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfile, initRTDBAuth, normalizeTurnMetadata, normalizeTurnState, prepareConversationEnvironment, releaseLock, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, writeRuntimeInfo, shouldTriggerAgentTurn, writeSessionState, writeTurnState, } from '@canonmsg/core';
-import { buildCanonHostPrompt, buildHydratedInboundContext, createConversationMetadataLoader, loadHostSessionConfig, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, } from './host-runtime.js';
+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 { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
 import { clearStoredThreadId, loadStoredThreadId, saveStoredThreadId, } from './session-store.js';
@@ -26,63 +25,15 @@ let workspaceOptions = [];
 let workspaceRoots = [];
 let workspaceRootMetadata = [];
 function buildCodexRuntimeDescriptor(input) {
-    return {
-        coreControls: [
-            {
-                id: 'model',
-                label: 'Model',
-                options: input.models,
-                defaultValue: input.models[0]?.value ?? null,
-                availability: 'setup_and_live',
-                liveBehavior: 'next_turn',
-                selectionPolicy: 'inherit',
-            },
-            {
-                id: 'workspace',
-                label: 'Project',
-                options: input.workspaces.map((workspace) => ({
-                    value: workspace.id,
-                    label: workspace.label,
-                    ...(workspace.description ? { description: workspace.description } : {}),
-                    ...(workspace.workspaceRootId ? { workspaceRootId: workspace.workspaceRootId } : {}),
-                    ...(workspace.workspaceRelativePath ? { workspaceRelativePath: workspace.workspaceRelativePath } : {}),
-                    ...(workspace.source ? { source: workspace.source } : {}),
-                })),
-                defaultValue: input.workspaces[0]?.id ?? null,
-                availability: 'setup',
-                liveBehavior: 'none',
-                selectionPolicy: 'inherit',
-                description: input.workspaceRoots?.length
-                    ? 'Choose one of the projects discovered inside the approved local roots for this host.'
-                    : 'Choose one of the local projects advertised by this host.',
-            },
-            {
-                id: 'executionMode',
-                label: 'Execution mode',
-                options: input.executionModes.map((mode) => ({
-                    value: mode,
-                    label: mode === 'worktree' ? 'Isolated worktree' : 'Use shared project',
-                    description: mode === 'worktree'
-                        ? 'Creates or reuses a per-conversation git worktree under ~/.canon/conversation-worktrees when the selected project is a git repo.'
-                        : 'Runs directly in the selected project folder. Changes happen there.',
-                })),
-                defaultValue: null,
-                availability: 'setup',
-                liveBehavior: 'none',
-                selectionPolicy: 'required_explicit',
-            },
-        ],
-        runtimeControls: [
-            {
-                id: 'permissionMode',
-                label: 'Execution policy',
-                options: input.permissionModes,
-                defaultValue: input.defaultPermissionMode ?? null,
-                availability: 'setup',
-                liveBehavior: 'none',
-                selectionPolicy: 'inherit',
-            },
-        ],
+    return buildFirstPartyCodingRuntimeDescriptor({
+        clientType: 'codex',
+        models: input.models,
+        workspaces: input.workspaces,
+        workspaceRoots: input.workspaceRoots,
+        executionModes: input.executionModes,
+        permissionModes: input.permissionModes,
+        defaultPermissionMode: input.defaultPermissionMode,
+        streamingTextMode: 'snapshot',
         actions: [
             {
                 id: 'stop',
@@ -105,10 +56,7 @@ function buildCodexRuntimeDescriptor(input) {
                 dispatch: { kind: 'signal', signal: 'stop_and_drop' },
             },
         ],
-        workspaceRoots: input.workspaceRoots,
-        supportsInterrupt: true,
-        streamingTextMode: 'snapshot',
-    };
+    });
 }
 function normalizeRuntimeTurnState(value) {
     const normalizedTurn = normalizeTurnState(value);
@@ -218,9 +166,9 @@ export async function main() {
     if (typeof args['ask-for-approval'] === 'string') {
         console.error('[canon-codex] Note: newer Codex CLI releases do not accept --ask-for-approval for `codex exec`; Canon will translate compatible legacy usage when possible.');
     }
-    const { apiKey, agentId: profileAgentId, profile } = resolveCanonAgent({ logPrefix: '[canon-codex]' });
+    const { apiKey, agentId: profileAgentId, agentName: profileAgentName, profile, baseUrl, lockHandle, } = resolveCanonAgent({ logPrefix: '[canon-codex]', expectedClientType: 'codex' });
     console.error(`[canon-codex] Starting${profile ? ` (profile: ${profile})` : ''} in ${workingDir}`);
-    const client = new CanonClient(apiKey);
+    const client = new CanonClient(apiKey, baseUrl);
     initRTDBAuth(client);
     let agentId;
     let ownerId = null;
@@ -240,6 +188,39 @@ export async function main() {
         }
         console.error(`[canon-codex] Authenticated as ${agentId}`);
     }
+    const launchArgs = [...process.argv.slice(2)];
+    if (!launchArgs.some((arg) => arg === '--cwd' || arg.startsWith('--cwd='))) {
+        launchArgs.push('--cwd', workingDir);
+    }
+    const runtimeId = buildLocalRuntimeId({
+        runtime: 'codex',
+        profile,
+        cwd: workingDir,
+        launchCommand: ['canon-codex', ...launchArgs],
+    });
+    upsertLocalRuntimeEntry({
+        id: runtimeId,
+        runtime: 'codex',
+        profile,
+        agentId,
+        agentName: profileAgentName,
+        cwd: workingDir,
+        baseCwd: workingDir,
+        workspaceRoots: workspaceRoots.map((root) => root.cwd),
+        workspaces: workspaceOptions.map((workspace) => workspace.cwd),
+        launchCommand: ['canon-codex', ...launchArgs],
+        pid: process.pid,
+        status: profile ? 'running' : 'manual',
+        reviveCapability: profile ? 'revivable' : 'manual',
+        surfaceMode: 'host',
+        lastStartedAt: new Date().toISOString(),
+        lastHeartbeatAt: new Date().toISOString(),
+    });
+    const runtimeState = createRuntimeStatePublisher({
+        agentId,
+        clientType: 'codex',
+        hostMode: true,
+    });
     const sessions = new Map();
     const pendingSessionCreations = new Map();
     const conversationCache = new Map();
@@ -293,7 +274,7 @@ export async function main() {
         });
     }
     function writeState(session) {
-        writeSessionState(session.conversationId, agentId, {
+        runtimeState.writeSessionState(session.conversationId, {
             lastError: session.state.lastError,
             model: session.state.model,
             cwd: session.cwd,
@@ -310,7 +291,7 @@ export async function main() {
         }).catch(() => { });
     }
     function writeTurn(session) {
-        writeTurnState(session.conversationId, agentId, {
+        runtimeState.writeTurnState(session.conversationId, {
             turnId: session.currentTurnId,
             state: session.turnState,
             queueDepth: session.queue.length,
@@ -329,7 +310,7 @@ export async function main() {
         await client.updateMessageDisposition(conversationId, sourceMessageId, 'accepted_now').catch(() => { });
     }
     function clearStreaming(conversationId) {
-        rtdbWrite(`/streaming/${conversationId}/${agentId}`, null).catch(() => { });
+        runtimeState.clearStreaming(conversationId).catch(() => { });
     }
     async function handoffFinalMessage(conversationId) {
         await sleep(FINAL_MESSAGE_HANDOFF_MS);
@@ -365,8 +346,8 @@ export async function main() {
         stopVisibleWorkSignal(session);
         releaseConversationEnvironment(session.environment);
         clearStreaming(conversationId);
-        clearSessionState(conversationId, agentId).catch(() => { });
-        clearTurnState(conversationId, agentId).catch(() => { });
+        runtimeState.clearSessionState(conversationId).catch(() => { });
+        runtimeState.clearTurnState(conversationId).catch(() => { });
         client.setTyping(conversationId, false).catch(() => { });
         sessions.delete(conversationId);
     }
@@ -409,7 +390,7 @@ export async function main() {
             try {
                 const sessionCwd = environment.cwd;
                 const sessionModel = config?.model ?? (typeof args.model === 'string' ? args.model : undefined);
-                const storedThreadId = loadStoredThreadId(agentId, conversationId, sessionCwd);
+                const storedThreadId = loadStoredThreadId(runtimeId, agentId, conversationId, environment.baseCwd, environment.mode);
                 if (config?.permissionMode
                     && !codexPermissionEnvelope.availablePermissionModes.some((option) => option.value === config.permissionMode)) {
                     throw new ExecutionEnvironmentError(`Permission mode "${config.permissionMode}" is not supported by this Codex host.`, 'This Canon host was started with stricter approval settings. Choose one of the advertised permission modes or restart the host with more permissive flags.');
@@ -577,17 +558,16 @@ export async function main() {
         writeState(session);
         writeTurn(session);
         startVisibleWorkSignal(session);
-        rtdbWrite(`/streaming/${session.conversationId}/${agentId}`, {
+        runtimeState.writeStreaming(session.conversationId, {
             text: 'Thinking…',
             status: 'thinking',
-            updatedAt: { '.sv': 'timestamp' },
         }).catch(() => { });
         try {
             const turnImagePaths = nextTurn.imagePaths ?? [];
             const result = await session.adapter.runTurn(nextTurn.prompt, (event) => {
                 session.lastActivity = Date.now();
                 if (event.type === 'thread.started') {
-                    saveStoredThreadId(agentId, session.conversationId, session.cwd, event.threadId);
+                    saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, event.threadId, session.environment.mode);
                     console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Thread ${event.threadId}`);
                     return;
                 }
@@ -596,10 +576,9 @@ export async function main() {
                     writeTurn(session);
                     stopVisibleWorkSignal(session);
                     client.setTyping(session.conversationId, false).catch(() => { });
-                    rtdbWrite(`/streaming/${session.conversationId}/${agentId}`, {
+                    runtimeState.writeStreaming(session.conversationId, {
                         text: event.text,
                         status: 'streaming',
-                        updatedAt: { '.sv': 'timestamp' },
                     }).catch(() => { });
                     return;
                 }
@@ -607,10 +586,9 @@ export async function main() {
                     session.turnState = 'tool';
                     writeTurn(session);
                     startVisibleWorkSignal(session);
-                    rtdbWrite(`/streaming/${session.conversationId}/${agentId}`, {
+                    runtimeState.writeStreaming(session.conversationId, {
                         text: summarizeCommand(event.command),
                         status: 'tool',
-                        updatedAt: { '.sv': 'timestamp' },
                     }).catch(() => { });
                     return;
                 }
@@ -621,7 +599,7 @@ export async function main() {
                 console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] ${line}`);
             }, turnImagePaths);
             if (result.threadId) {
-                saveStoredThreadId(agentId, session.conversationId, session.cwd, result.threadId);
+                saveStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, result.threadId, session.environment.mode);
             }
             if (!result.interrupted && result.finalMessage) {
                 await client.sendMessage(session.conversationId, result.finalMessage, {
@@ -677,7 +655,9 @@ export async function main() {
                 },
             }).catch(() => { });
             await handoffFinalMessage(session.conversationId);
-            clearStoredThreadId(agentId, session.conversationId);
+            if (error instanceof Error && /invalid|not found|unknown thread/i.test(error.message)) {
+                clearStoredThreadId(runtimeId, agentId, session.conversationId, session.environment.baseCwd, session.environment.mode);
+            }
             console.error(`[canon-codex] [${session.conversationId.slice(0, 8)}] Turn failed:`, error);
         }
         finally {
@@ -721,6 +701,12 @@ export async function main() {
         }),
     };
     const publishRuntimeHeartbeat = async () => {
+        heartbeatLocalRuntimeEntry(runtimeId, {
+            agentId,
+            agentName: profileAgentName,
+            cwd: workingDir,
+            baseCwd: workingDir,
+        });
         if (!streamConnected)
             return;
         await refreshKnownConversationIds().catch((error) => {
@@ -736,6 +722,7 @@ export async function main() {
             runtime: runtimeDescriptor,
             workspaceOptions,
             defaultCwd: workingDir,
+            extraSessionConfigFields: ['permissionMode'],
             liveSessionConfigByConversation: new Map(Array.from(sessions.values()).map((session) => {
                 const workspaceId = resolveWorkspaceIdForBaseCwd(session.environment.baseCwd);
                 return [
@@ -800,7 +787,7 @@ export async function main() {
                     'Codex review, compact/rollback, live plan/diff/reasoning updates, PTY command execution, plugin/app/MCP inventory, and structured approvals require the future app-server transport.',
                 ],
             };
-            await writeRuntimeInfo(conversationId, agentId, payload);
+            await runtimeState.writeRuntimeInfo(conversationId, payload);
         })).catch((error) => {
             console.error('[canon-codex] Failed to publish runtime info:', error);
         });
@@ -821,6 +808,13 @@ export async function main() {
                     behavior: payload.behavior,
                     workSessions: payload.workSessions,
                 });
+                if (message.id) {
+                    saveRuntimeSessionState(runtimeId, {
+                        conversationId: payload.conversationId,
+                        baseCwd: workingDir,
+                        lastInboundMessageId: message.id,
+                    });
+                }
             },
             onConnected: () => {
                 streamConnected = true;
@@ -829,7 +823,7 @@ export async function main() {
             },
             onDisconnected: () => {
                 streamConnected = false;
-                rtdbWrite(`/agent-runtime/${agentId}`, null).catch(() => { });
+                runtimeState.clearAgentRuntime().catch(() => { });
                 console.error('[canon-codex] SSE disconnected');
             },
             onError: (error) => console.error(`[canon-codex] SSE error: ${error.message}`),
@@ -881,38 +875,55 @@ export async function main() {
             knownConversationIds.add(conversation.id);
             conversationCache.set(conversation.id, conversation);
             clearStreaming(conversation.id);
-            clearSessionState(conversation.id, agentId).catch(() => { });
-            clearTurnState(conversation.id, agentId).catch(() => { });
+            runtimeState.clearSessionState(conversation.id).catch(() => { });
+            runtimeState.clearTurnState(conversation.id).catch(() => { });
         }
         for (const conversation of conversations) {
-            if (!conversation.lastMessage || conversation.lastMessage.senderId === agentId)
-                continue;
-            const latestPage = await client.getMessagesPage(conversation.id, 1);
-            const latestMessage = latestPage.messages[0];
-            if (!latestMessage || latestMessage.senderId === agentId)
-                continue;
-            const senderTurnState = latestMessage.senderType === 'ai_agent'
-                ? await loadSenderRuntimeState(conversation.id, latestMessage.senderId)
-                : null;
-            const triggerDecision = shouldTriggerAgentTurn({
-                senderType: latestMessage.senderType ?? 'human',
-                metadata: latestMessage.metadata,
-                senderTurnState,
-            });
-            if (!triggerDecision.allow) {
-                console.error(`[canon-codex] [${conversation.id.slice(0, 8)}] Skipping startup recovery for suppressed message (${triggerDecision.reason})`);
-                continue;
-            }
-            console.error(`[canon-codex] [${conversation.id.slice(0, 8)}] Recovering latest inbound message on startup`);
-            await enqueueInboundMessage({
+            const cursor = loadRuntimeSessionState(runtimeId, {
                 conversationId: conversation.id,
-                message: latestMessage,
-                senderName: latestMessage.senderId,
-                isOwner: ownerId != null && latestMessage.senderId === ownerId,
-                behavior: latestPage.behavior,
-                workSessions: latestPage.workSessions,
-                hydratedPage: latestPage,
-            });
+                baseCwd: workingDir,
+            })?.lastInboundMessageId;
+            const latestPage = await client.getMessagesPage(conversation.id, 25);
+            const inboundMessages = latestPage.messages
+                .filter((message) => message.senderId !== agentId)
+                .sort((a, b) => String(a.createdAt ?? '').localeCompare(String(b.createdAt ?? '')));
+            const cursorIndex = cursor
+                ? inboundMessages.findIndex((message) => message.id === cursor)
+                : -1;
+            const messagesToRecover = cursorIndex >= 0
+                ? inboundMessages.slice(cursorIndex + 1)
+                : inboundMessages.slice(-1);
+            for (const latestMessage of messagesToRecover) {
+                const senderTurnState = latestMessage.senderType === 'ai_agent'
+                    ? await loadSenderRuntimeState(conversation.id, latestMessage.senderId)
+                    : null;
+                const triggerDecision = shouldTriggerAgentTurn({
+                    senderType: latestMessage.senderType ?? 'human',
+                    metadata: latestMessage.metadata,
+                    senderTurnState,
+                });
+                if (!triggerDecision.allow) {
+                    console.error(`[canon-codex] [${conversation.id.slice(0, 8)}] Skipping startup recovery for suppressed message (${triggerDecision.reason})`);
+                    continue;
+                }
+                console.error(`[canon-codex] [${conversation.id.slice(0, 8)}] Recovering inbound message on startup`);
+                await enqueueInboundMessage({
+                    conversationId: conversation.id,
+                    message: latestMessage,
+                    senderName: latestMessage.senderId,
+                    isOwner: ownerId != null && latestMessage.senderId === ownerId,
+                    behavior: latestPage.behavior,
+                    workSessions: latestPage.workSessions,
+                    hydratedPage: latestPage,
+                });
+                if (latestMessage.id) {
+                    saveRuntimeSessionState(runtimeId, {
+                        conversationId: conversation.id,
+                        baseCwd: workingDir,
+                        lastInboundMessageId: latestMessage.id,
+                    });
+                }
+            }
         }
     }
     catch (error) {
@@ -1006,25 +1017,23 @@ export async function main() {
         clearInterval(heartbeat);
         clearInterval(idleCheck);
         stream.stop();
-        await rtdbWrite(`/agent-runtime/${agentId}`, null).catch(() => { });
+        await runtimeState.clearAgentRuntime().catch(() => { });
         for (const session of [...sessions.values()]) {
             await session.adapter.interrupt().catch(() => { });
             closeSession(session.conversationId);
         }
-        const activeProfile = getActiveProfile();
-        if (activeProfile)
-            releaseLock(activeProfile);
+        markLocalRuntimeStopped(runtimeId);
+        (lockHandle ?? getActiveProfileLock())?.release();
         process.exit(0);
     };
     process.on('SIGINT', shutdown);
     process.on('SIGTERM', shutdown);
+    process.on('SIGHUP', shutdown);
     console.error('[canon-codex] Ready — sessions created on demand');
     await new Promise(() => { });
 }
 runCli(import.meta.url, main, (error) => {
     console.error('[canon-codex] Fatal error:', error);
-    const activeProfile = getActiveProfile();
-    if (activeProfile)
-        releaseLock(activeProfile);
+    getActiveProfileLock()?.release();
     process.exit(1);
 });

package/dist/register.js

@@ -1,13 +1,9 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { readFileSync } from 'node:fs';
 import { parseArgs } from 'node:util';
-import { registerAndWaitForApproval } from '@canonmsg/core';
+import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, registerAndWaitForApproval, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core';
 import { runCli } from './cli-entry.js';
-const CANON_DIR = join(homedir(), '.canon');
-const AGENTS_PATH = join(CANON_DIR, 'agents.json');
 export async function main() {
     setDefaultResultOrder('ipv4first');
     const { values } = parseArgs({
@@ -34,6 +30,7 @@ export async function main() {
         // No existing profile state.
     }
     console.log(`Registering Codex agent "${values.name}" (profile: ${profileName})...`);
+    const pending = getOrCreatePendingRegistration(profileName, 'codex');
     const result = await registerAndWaitForApproval({
         name: values.name,
         description: values.description,
@@ -42,8 +39,14 @@ export async function main() {
         clientType: 'codex',
         baseUrl: values['base-url'],
         requestedAgentId: existingAgentId,
+        localRegistrationId: pending.localRegistrationId,
     }, {
-        onSubmitted: (requestId) => {
+        onSubmitted: (requestId, pollToken) => {
+            updatePendingRegistration(profileName, {
+                requestId,
+                pollToken,
+                clientType: 'codex',
+            });
             console.log(`Registration submitted (request ID: ${requestId}).`);
             console.log('Waiting for approval in Canon app...');
         },
@@ -54,24 +57,26 @@ export async function main() {
     console.log('');
     switch (result.status) {
         case 'approved': {
-            mkdirSync(CANON_DIR, { recursive: true });
-            let profiles = {};
-            try {
-                profiles = JSON.parse(readFileSync(AGENTS_PATH, 'utf-8'));
+            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);
             }
-            catch {
-                // File does not exist yet.
-            }
-            profiles[profileName] = {
+            upsertAgentProfile(profileName, {
                 apiKey: result.apiKey,
                 agentId: result.agentId,
                 agentName: result.agentName,
                 registeredAt: new Date().toISOString(),
-            };
-            writeFileSync(AGENTS_PATH, JSON.stringify(profiles, null, 2));
+                clientType: 'codex',
+                ...(typeof values['base-url'] === 'string' ? { baseUrl: values['base-url'] } : {}),
+            });
+            if (result.requestId) {
+                await ackRegistrationApproval(values['base-url'], 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-codex --cwd /path/to/project');
+            console.log('Start it with: CANON_AGENT=' + profileName + ' canon-codex --cwd /path/to/project');
+            console.log('Keep that terminal open. Closing it takes this local agent offline.');
             break;
         }
         case 'rejected':

package/dist/session-store.d.ts

@@ -1,3 +1,4 @@
-export declare function loadStoredThreadId(agentId: string, conversationId: string, cwd: string): string | null;
-export declare function saveStoredThreadId(agentId: string, conversationId: string, cwd: string, threadId: string): void;
-export declare function clearStoredThreadId(agentId: string, conversationId: string): void;
+import { type ExecutionEnvironmentMode } from '@canonmsg/core';
+export declare function loadStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd: string, executionMode?: ExecutionEnvironmentMode): string | null;
+export declare function saveStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd: string, threadId: string, executionMode?: ExecutionEnvironmentMode): void;
+export declare function clearStoredThreadId(runtimeId: string | null, agentId: string, conversationId: string, baseCwd?: string, executionMode?: ExecutionEnvironmentMode): void;

package/dist/session-store.js

@@ -1,6 +1,6 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { CANON_DIR } from '@canonmsg/core';
+import { CANON_DIR, clearRuntimeSessionState, loadRuntimeSessionState, saveRuntimeSessionState, } from '@canonmsg/core';
 const STORE_PATH = join(CANON_DIR, 'codex-sessions.json');
 function loadStore() {
     try {
@@ -14,24 +14,50 @@ function saveStore(store) {
     mkdirSync(CANON_DIR, { recursive: true });
     writeFileSync(STORE_PATH, JSON.stringify(store, null, 2));
 }
-export function loadStoredThreadId(agentId, conversationId, cwd) {
+export function loadStoredThreadId(runtimeId, agentId, conversationId, baseCwd, executionMode) {
+    if (runtimeId) {
+        const state = loadRuntimeSessionState(runtimeId, {
+            conversationId,
+            baseCwd,
+            executionMode,
+        });
+        if (state?.threadId)
+            return state.threadId;
+    }
     const store = loadStore();
     const record = store.agents[agentId]?.[conversationId];
-    if (!record || record.cwd !== cwd)
+    if (!record || record.cwd !== baseCwd)
         return null;
     return record.threadId;
 }
-export function saveStoredThreadId(agentId, conversationId, cwd, threadId) {
+export function saveStoredThreadId(runtimeId, agentId, conversationId, baseCwd, threadId, executionMode) {
+    if (runtimeId) {
+        saveRuntimeSessionState(runtimeId, {
+            conversationId,
+            baseCwd,
+            executionMode,
+            threadId,
+        });
+        return;
+    }
     const store = loadStore();
     store.agents[agentId] ??= {};
     store.agents[agentId][conversationId] = {
         threadId,
-        cwd,
+        cwd: baseCwd,
         updatedAt: new Date().toISOString(),
     };
     saveStore(store);
 }
-export function clearStoredThreadId(agentId, conversationId) {
+export function clearStoredThreadId(runtimeId, agentId, conversationId, baseCwd, executionMode) {
+    if (runtimeId) {
+        clearRuntimeSessionState(runtimeId, {
+            conversationId,
+            baseCwd,
+            executionMode,
+        });
+        return;
+    }
     const store = loadStore();
     if (!store.agents[agentId]?.[conversationId])
         return;

package/package.json

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

package/dist/host-runtime.d.ts

@@ -1,133 +0,0 @@
-/**
- * Host-runtime helpers, inlined from @canonmsg/core.
- *
- * These helpers glue Canon host wrappers (Codex, Claude Code) to the Canon
- * RTDB session/runtime surface. They used to live in
- * `@canonmsg/core/src/host-runtime/` but were moved into each plugin in
- * media-parity PR C so core does not have to carry host-specific concerns.
- *
- * Keep this file in lockstep with the equivalent file in
- * `packages/claude-code-plugin/src/host-runtime.ts`. If you change the
- * behavior here, update that copy too and adjust the shared golden
- * fixture test (`packages/codex-plugin/src/host-runtime.test.ts`).
- */
-import { type AgentClientType, type AgentRuntime, type CanonClient, type CanonConversation, type CanonMessage, type CanonMessagesPage, type MessageCreatedPayload, type ResolvedAgentBehaviorPolicy, type SessionWorkspaceConfig } from '@canonmsg/core';
-export interface HostInboundParticipantContext {
-    conversationType: CanonConversation['type'] | 'unknown';
-    memberCount: number | null;
-    senderType: 'human' | 'ai_agent';
-    senderName: string;
-    isOwner: boolean;
-    mentionedAgent: boolean;
-    recentSenderTypes: Array<'human' | 'ai_agent'>;
-    recentHumanCount: number;
-    recentAgentCount: number;
-    consecutiveAgentTurns: number;
-    currentAgentStreakStartedByHuman: boolean;
-}
-type HostInboundMessage = {
-    text?: string | null;
-    contentType?: CanonMessage['contentType'] | null;
-    attachments?: CanonMessage['attachments'];
-    senderType?: CanonMessage['senderType'];
-    mentions?: string[] | null;
-    contactCard?: CanonMessage['contactCard'];
-};
-interface HostWorkspaceResolverOption {
-    id: string;
-    cwd: string;
-}
-export declare const HOST_ADMISSION_ACTION_CAPABILITIES: Readonly<{
-    canStartDirectConversation: false;
-    canSendContactRequest: false;
-    canApprovePendingContactRequests: false;
-    canRejectPendingContactRequests: false;
-}>;
-export declare function buildCanonHostPrompt(input: {
-    hostLabel: string;
-    content: string;
-    conversationId: string;
-    participantContext: HostInboundParticipantContext;
-    behavior?: ResolvedAgentBehaviorPolicy | null;
-    workSession?: MessageCreatedPayload['message']['workSession'];
-    workSessions?: MessageCreatedPayload['workSessions'];
-    buildInboundContextLines: (context: HostInboundParticipantContext) => string[];
-}): string;
-/**
- * Render the **text portion** of an inbound Canon message. Images are
- * referenced by short placeholders — their actual bytes are delivered to the
- * host as native vision/media inputs (Codex `-i <file>`, Anthropic image
- * blocks). URLs are intentionally *not* inlined, since the harness never
- * needs to refetch and earlier `[Image: <url>]` inlining caused vision
- * models to see a string about an image instead of the image itself.
- *
- * `materialized` may be passed so non-image attachments can reference a
- * local path the agent can Read. Without it we fall back to an unadorned
- * placeholder; the vision path still works because image args carry the
- * file path directly.
- */
-export declare function renderCanonHostInboundContent(message: HostInboundMessage, materialized?: ReadonlyArray<{
-    kind: 'image' | 'audio' | 'file';
-    path: string;
-    fileName?: string;
-    durationMs?: number;
-    index: number;
-}>): string;
-export declare function buildHydratedInboundContext(input: {
-    agentId: string;
-    conversation: CanonConversation | null;
-    page?: CanonMessagesPage | null;
-    message: HostInboundMessage;
-    senderName: string;
-    isOwner: boolean;
-}): {
-    participantContext: HostInboundParticipantContext;
-    behavior?: ResolvedAgentBehaviorPolicy | null;
-    workSessions: NonNullable<MessageCreatedPayload['workSessions']>;
-    hydratedFromPage: boolean;
-};
-export declare function publishHostAgentRuntime(agentId: string, clientType: AgentClientType, runtime: AgentRuntime): Promise<void>;
-export declare function publishHostSessionSnapshots(input: {
-    conversationIds: string[];
-    agentId: string;
-    clientType: AgentClientType;
-    runtime: AgentRuntime;
-    workspaceOptions: HostWorkspaceResolverOption[];
-    defaultCwd: string;
-    liveSessionConfigByConversation?: ReadonlyMap<string, {
-        model?: string;
-        permissionMode?: string;
-        effort?: string;
-        runtimeControlValues?: Record<string, string>;
-        workspaceId?: string;
-        executionMode?: SessionWorkspaceConfig['executionMode'];
-        executionBranch?: string | null;
-    }>;
-}): Promise<void>;
-export declare function readHostSessionConfig<TExtra extends string = never>(raw: unknown, extraStringFields?: readonly TExtra[]): (SessionWorkspaceConfig & Partial<Record<TExtra, string>> & {
-    runtimeControlValues?: Record<string, string>;
-}) | null;
-export declare function loadHostSessionConfig<TExtra extends string = never>(input: {
-    conversationId: string;
-    agentId: string;
-    extraStringFields?: readonly TExtra[];
-}): Promise<(SessionWorkspaceConfig & Partial<Record<TExtra, string>> & {
-    runtimeControlValues?: Record<string, string>;
-}) | null>;
-export declare function resolveHostWorkspaceCwd(input: {
-    workspaceOptions: HostWorkspaceResolverOption[];
-    config: {
-        workspaceId?: string;
-        retiredWorkspaceConfig?: boolean;
-    } | null;
-    defaultCwd: string;
-}): string;
-export declare function createConversationMetadataLoader(input: {
-    client: CanonClient;
-    conversationCache: Map<string, CanonConversation>;
-    cacheTtlMs?: number;
-}): {
-    refreshConversationCache(force?: boolean): Promise<void>;
-    getConversationMeta(conversationId: string): Promise<CanonConversation | null>;
-};
-export {};

package/dist/host-runtime.js

@@ -1,265 +0,0 @@
-/**
- * Host-runtime helpers, inlined from @canonmsg/core.
- *
- * These helpers glue Canon host wrappers (Codex, Claude Code) to the Canon
- * RTDB session/runtime surface. They used to live in
- * `@canonmsg/core/src/host-runtime/` but were moved into each plugin in
- * media-parity PR C so core does not have to carry host-specific concerns.
- *
- * Keep this file in lockstep with the equivalent file in
- * `packages/claude-code-plugin/src/host-runtime.ts`. If you change the
- * behavior here, update that copy too and adjust the shared golden
- * fixture test (`packages/codex-plugin/src/host-runtime.test.ts`).
- */
-import { buildAgentSessionSnapshot, buildConversationWorktreeSpec, buildBehaviorPolicyLines, buildParticipationHistorySnapshot, buildWorkSessionsPromptLines, mergeWorkSessionContexts, normalizeOptionalString, patchAgentSessionSnapshot, readSessionWorkspaceConfig, resolveConfiguredWorkspaceCwd, rtdbRead, rtdbWrite, } from '@canonmsg/core';
-export const HOST_ADMISSION_ACTION_CAPABILITIES = Object.freeze({
-    canStartDirectConversation: false,
-    canSendContactRequest: false,
-    canApprovePendingContactRequests: false,
-    canRejectPendingContactRequests: false,
-});
-export function buildCanonHostPrompt(input) {
-    const resolvedWorkSessions = mergeWorkSessionContexts(input.workSession, input.workSessions);
-    return [
-        `You are connected to Canon messaging through a ${input.hostLabel} host wrapper.`,
-        'Only the last assistant message from this turn will be delivered as the permanent Canon reply.',
-        'Short intermediate assistant messages may be shown as ephemeral status while you work.',
-        ...input.buildInboundContextLines(input.participantContext),
-        ...buildBehaviorPolicyLines(input.behavior),
-        ...buildWorkSessionsPromptLines(resolvedWorkSessions),
-        'Canon participants may be humans or AI agents.',
-        'Honor the Canon behavior policy above when deciding how proactively to participate.',
-        ...(resolvedWorkSessions.length > 0
-            ? ['Honor the Canon work-session context above within its stated disclosure limits.']
-            : []),
-        `Conversation ID: ${input.conversationId}`,
-        '',
-        'New Canon message:',
-        input.content,
-    ].join('\n');
-}
-/**
- * Render the **text portion** of an inbound Canon message. Images are
- * referenced by short placeholders — their actual bytes are delivered to the
- * host as native vision/media inputs (Codex `-i <file>`, Anthropic image
- * blocks). URLs are intentionally *not* inlined, since the harness never
- * needs to refetch and earlier `[Image: <url>]` inlining caused vision
- * models to see a string about an image instead of the image itself.
- *
- * `materialized` may be passed so non-image attachments can reference a
- * local path the agent can Read. Without it we fall back to an unadorned
- * placeholder; the vision path still works because image args carry the
- * file path directly.
- */
-export function renderCanonHostInboundContent(message, materialized) {
-    const body = message.text || '';
-    const placeholders = [];
-    const attachments = message.attachments ?? [];
-    for (let i = 0; i < attachments.length; i += 1) {
-        const att = attachments[i];
-        const mat = materialized?.find((m) => m.index === i) ?? null;
-        placeholders.push(describeAttachment(att, mat));
-    }
-    if (message.contentType === 'contact_card' && message.contactCard) {
-        placeholders.push(describeContactCard(message.contactCard));
-    }
-    const rendered = [...placeholders, body].filter(Boolean).join('\n');
-    return rendered || '[Empty message]';
-}
-function describeContactCard(card) {
-    const parts = [`${card.userType} · userId: ${card.userId}`];
-    if (card.accessLevel)
-        parts.push(`access: ${card.accessLevel}`);
-    if (card.ownerName)
-        parts.push(`owner: ${card.ownerName}`);
-    if (card.about)
-        parts.push(`about: ${card.about}`);
-    const identity = `📇 Contact card: "${card.displayName}" (${parts.join(' · ')}).`;
-    const missingCapabilities = [
-        !HOST_ADMISSION_ACTION_CAPABILITIES.canStartDirectConversation
-            ? 'start a direct conversation'
-            : null,
-        !HOST_ADMISSION_ACTION_CAPABILITIES.canSendContactRequest
-            ? 'send a contact request'
-            : null,
-        !HOST_ADMISSION_ACTION_CAPABILITIES.canApprovePendingContactRequests
-            ? 'approve pending requests'
-            : null,
-        !HOST_ADMISSION_ACTION_CAPABILITIES.canRejectPendingContactRequests
-            ? 'reject pending requests'
-            : null,
-    ].filter(Boolean).join(', ');
-    const hint = `This host can inspect the card, but Canon admission actions are missing here. Missing capabilities: ${missingCapabilities}. Use another Canon surface for userId ${card.userId}.`;
-    return `${identity}\n${hint}`;
-}
-function describeAttachment(attachment, materialized) {
-    if (attachment.kind === 'image') {
-        return '[Image attached]';
-    }
-    if (attachment.kind === 'audio') {
-        const durationMs = materialized?.durationMs ?? attachment.durationMs;
-        const duration = durationMs ? ` (${Math.round(durationMs / 1000)}s)` : '';
-        const ref = materialized?.path ? ` ${materialized.path}` : '';
-        return `[Voice message${duration}${ref}]`;
-    }
-    // file
-    const label = materialized?.fileName ?? attachment.fileName ?? 'File';
-    const ref = materialized?.path ? ` ${materialized.path}` : '';
-    return `[File: ${label}${ref}]`;
-}
-export function buildHydratedInboundContext(input) {
-    const history = buildParticipationHistorySnapshot(input.page?.messages ?? [], input.agentId);
-    return {
-        participantContext: {
-            conversationType: input.conversation?.type ?? 'unknown',
-            memberCount: input.conversation?.memberIds?.length ?? null,
-            senderType: input.message.senderType ?? 'human',
-            senderName: input.senderName,
-            isOwner: input.isOwner,
-            mentionedAgent: Array.isArray(input.message.mentions) && input.message.mentions.includes(input.agentId),
-            recentSenderTypes: history.recentSenderTypes,
-            recentHumanCount: history.recentHumanCount,
-            recentAgentCount: history.recentAgentCount,
-            consecutiveAgentTurns: history.consecutiveAgentTurns,
-            currentAgentStreakStartedByHuman: history.currentAgentStreakStartedByHuman,
-        },
-        behavior: input.page?.behavior ?? input.conversation?.behavior,
-        workSessions: input.page?.workSessions ?? [],
-        hydratedFromPage: input.page != null,
-    };
-}
-export async function publishHostAgentRuntime(agentId, clientType, runtime) {
-    await rtdbWrite(`/agent-runtime/${agentId}`, {
-        clientType,
-        hostMode: true,
-        ...runtime,
-        updatedAt: { '.sv': 'timestamp' },
-    });
-}
-export async function publishHostSessionSnapshots(input) {
-    if (input.conversationIds.length === 0) {
-        return;
-    }
-    await Promise.all(input.conversationIds.map(async (conversationId) => {
-        const persistedConfig = await loadHostSessionConfig({
-            conversationId,
-            agentId: input.agentId,
-            extraStringFields: ['permissionMode'],
-        });
-        const liveConfig = input.liveSessionConfigByConversation?.get(conversationId) ?? null;
-        const mergedConfig = {
-            ...(persistedConfig ?? {}),
-            ...(liveConfig ?? {}),
-        };
-        const snapshot = buildAgentSessionSnapshot({
-            conversationId,
-            agentId: input.agentId,
-            runtime: {
-                ...input.runtime,
-                clientType: input.clientType,
-                hostMode: true,
-            },
-            sessionConfig: {
-                ...(mergedConfig.model ? { model: mergedConfig.model } : {}),
-                ...(mergedConfig.permissionMode ? { permissionMode: mergedConfig.permissionMode } : {}),
-                ...(mergedConfig.effort ? { effort: mergedConfig.effort } : {}),
-                ...(mergedConfig.runtimeControlValues
-                    ? { runtimeControlValues: mergedConfig.runtimeControlValues }
-                    : {}),
-                ...(mergedConfig.workspaceId ? { workspaceId: mergedConfig.workspaceId } : {}),
-                ...(mergedConfig.executionMode ? { executionMode: mergedConfig.executionMode } : {}),
-            },
-            lastHeartbeatAt: undefined,
-        });
-        let executionBranch = liveConfig?.executionBranch ?? null;
-        if (!executionBranch && snapshot.executionMode === 'worktree' && snapshot.workspaceId) {
-            const workspace = input.workspaceOptions.find((option) => option.id === snapshot.workspaceId);
-            if (workspace) {
-                executionBranch = buildConversationWorktreeSpec({
-                    agentId: input.agentId,
-                    conversationId,
-                    workspaceCwd: workspace.cwd,
-                }).branch;
-            }
-        }
-        return patchAgentSessionSnapshot(conversationId, input.agentId, {
-            clientType: input.clientType,
-            hostMode: true,
-            model: snapshot.model ?? null,
-            permissionMode: snapshot.permissionMode ?? null,
-            effort: snapshot.effort ?? null,
-            runtimeControlValues: snapshot.runtimeControlValues ?? null,
-            workspaceId: snapshot.workspaceId ?? null,
-            executionMode: snapshot.executionMode ?? null,
-            executionBranch,
-            modelOptions: snapshot.modelOptions,
-            permissionModeOptions: snapshot.permissionModeOptions,
-            workspaceOptions: snapshot.workspaceOptions,
-            availableExecutionModes: snapshot.availableExecutionModes,
-            lastHeartbeatAt: { '.sv': 'timestamp' },
-        });
-    }));
-}
-export function readHostSessionConfig(raw, extraStringFields = []) {
-    const baseConfig = readSessionWorkspaceConfig(raw);
-    if (!raw || typeof raw !== 'object') {
-        return baseConfig;
-    }
-    const data = raw;
-    const extraConfig = Object.fromEntries(extraStringFields.flatMap((field) => {
-        const value = normalizeOptionalString(data[field]);
-        return value ? [[field, value]] : [];
-    }));
-    const runtimeControlValues = Object.fromEntries(Object.entries(data.runtimeControlValues && typeof data.runtimeControlValues === 'object'
-        ? data.runtimeControlValues
-        : {}).flatMap(([key, value]) => {
-        const normalizedValue = normalizeOptionalString(value);
-        return normalizedValue ? [[key, normalizedValue]] : [];
-    }));
-    return {
-        ...(baseConfig ?? {}),
-        ...extraConfig,
-        ...(Object.keys(runtimeControlValues).length > 0 ? { runtimeControlValues } : {}),
-    };
-}
-export async function loadHostSessionConfig(input) {
-    const raw = await rtdbRead(`/session-config/${input.conversationId}/${input.agentId}`);
-    return readHostSessionConfig(raw, input.extraStringFields);
-}
-export function resolveHostWorkspaceCwd(input) {
-    return resolveConfiguredWorkspaceCwd(input);
-}
-export function createConversationMetadataLoader(input) {
-    const cacheTtlMs = input.cacheTtlMs ?? 10_000;
-    let conversationCacheLoadedAt = 0;
-    async function refreshConversationCache(force = false) {
-        if (!force
-            && input.conversationCache.size > 0
-            && Date.now() - conversationCacheLoadedAt < cacheTtlMs) {
-            return;
-        }
-        const conversations = await input.client.getConversations();
-        input.conversationCache.clear();
-        for (const conversation of conversations) {
-            input.conversationCache.set(conversation.id, conversation);
-        }
-        conversationCacheLoadedAt = Date.now();
-    }
-    async function getConversationMeta(conversationId) {
-        try {
-            await refreshConversationCache();
-            const cached = input.conversationCache.get(conversationId);
-            if (cached)
-                return cached;
-            await refreshConversationCache(true);
-            return input.conversationCache.get(conversationId) ?? null;
-        }
-        catch {
-            return input.conversationCache.get(conversationId) ?? null;
-        }
-    }
-    return {
-        refreshConversationCache,
-        getConversationMeta,
-    };
-}