@canonmsg/codex-plugin 0.18.11 → 0.19.0

package/dist/register.js

@@ -2,8 +2,45 @@
 import { setDefaultResultOrder } from 'node:dns';
 import { readFileSync } from 'node:fs';
 import { parseArgs } from 'node:util';
-import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, registerAndWaitForApproval, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core';
+import { ackRegistrationApprovalWith, resolveCanonBaseUrl, runRegistrationFlow, } from '@canonmsg/core/contract';
+import { clearPendingRegistration, getOrCreatePendingRegistration, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core/local';
+import { resolvePackagedBridgeBin } from './bridge-bin.js';
+import { connectBridge } from '@canonmsg/framework';
 import { runCli } from './cli-entry.js';
+/**
+ * Registration rides the bridge (Phase 6, same shape as the Hermes port): a
+ * short-lived PRE-IDENTITY registration daemon (offline stub +
+ * CANON_BRIDGE_REGISTRATION_BASE_URL, managed-child so it dies with this
+ * process) serves the three unauthenticated §B10 routes over JSON-RPC.
+ */
+async function openRegistrationBridge(baseUrl) {
+    return connectBridge({
+        profile: 'registration',
+        mode: 'managed-child',
+        ...(resolvePackagedBridgeBin() ? { binPath: resolvePackagedBridgeBin() } : {}),
+        env: {
+            ...process.env,
+            CANON_BRIDGE_AGENT_ID: 'canon-registration',
+            CANON_BRIDGE_REGISTRATION_BASE_URL: baseUrl,
+        },
+        hello: { clientType: 'codex', wantFamilies: [] },
+    });
+}
+function bridgeRegistrationTransport(bridge) {
+    return {
+        register: (_baseUrl, body) => bridge.client.call('register', body),
+        checkStatus: (_baseUrl, requestId, pollToken) => bridge.client.call('getRegistrationStatus', {
+            requestId,
+            ...(pollToken ? { pollToken } : {}),
+        }),
+        ackRegistrationStatus: async (_baseUrl, requestId, pollToken) => {
+            await bridge.client.call('ackRegistrationStatus', {
+                requestId,
+                ...(pollToken ? { pollToken } : {}),
+            });
+        },
+    };
+}
 const HELP = `canon-codex-register — register or reconnect a Codex agent in Canon
 
 USAGE
@@ -52,29 +89,39 @@ export async function main() {
     }
     console.log(`Registering Codex agent "${values.name}" (profile: ${profileName})...`);
     const pending = getOrCreatePendingRegistration(profileName, 'codex');
-    const result = await registerAndWaitForApproval({
-        name: values.name,
-        description: values.description,
-        ownerPhone: values.phone,
-        developerInfo: 'Codex host plugin',
-        clientType: 'codex',
-        baseUrl: values['base-url'],
-        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('.');
-        },
-    });
+    const baseUrl = resolveCanonBaseUrl(values['base-url']);
+    const bridge = await openRegistrationBridge(baseUrl);
+    const transport = bridgeRegistrationTransport(bridge);
+    let result;
+    try {
+        result = await runRegistrationFlow({
+            name: values.name,
+            description: values.description,
+            ownerPhone: values.phone,
+            developerInfo: 'Codex host plugin',
+            clientType: 'codex',
+            baseUrl: values['base-url'],
+            requestedAgentId: existingAgentId,
+            localRegistrationId: pending.localRegistrationId,
+        }, transport, {
+            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('.');
+            },
+        });
+    }
+    catch (error) {
+        bridge.client.close();
+        throw error;
+    }
     console.log('');
     switch (result.status) {
         case 'approved': {
@@ -91,7 +138,7 @@ export async function main() {
                 ...(typeof values['base-url'] === 'string' ? { baseUrl: values['base-url'] } : {}),
             });
             if (result.requestId) {
-                await ackRegistrationApproval(values['base-url'], result.requestId, result.pollToken);
+                await ackRegistrationApprovalWith(transport, values['base-url'], result.requestId, result.pollToken);
             }
             clearPendingRegistration(profileName);
             console.log(`Approved! Agent: ${result.agentName} (${result.agentId})`);
@@ -111,6 +158,7 @@ export async function main() {
             process.exit(1);
             break;
     }
+    bridge.client.close();
 }
 runCli(import.meta.url, main, (error) => {
     console.error('[canon-codex-register] Fatal error:', error);

package/dist/session-store.d.ts

@@ -1,4 +1,4 @@
-import { type ExecutionEnvironmentMode } from '@canonmsg/core';
+import { type ExecutionEnvironmentMode } from '@canonmsg/core/local';
 export declare function buildCodexThreadPolicyFingerprint(input: {
     baseCwd: string;
     executionMode?: ExecutionEnvironmentMode;

package/dist/session-store.js

@@ -1,7 +1,7 @@
 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';
+import { CANON_DIR, clearRuntimeSessionState, loadRuntimeSessionState, saveRuntimeSessionState, } from '@canonmsg/core/local';
 const STORE_PATH = join(CANON_DIR, 'codex-sessions.json');
 function loadStore() {
     try {
@@ -17,7 +17,7 @@ function saveStore(store) {
 }
 export function buildCodexThreadPolicyFingerprint(input) {
     return createHash('sha256').update(JSON.stringify({
-        version: 1,
+        version: 2,
         baseCwd: input.baseCwd,
         executionMode: input.executionMode ?? null,
         permissionMode: input.permissionMode ?? null,

package/dist/turn-activity.d.ts

@@ -1,4 +1,3 @@
-import type { TurnOutputBlock } from '@canonmsg/core';
 interface RunningCommandBlock {
     command: string;
     blockId: string;
@@ -8,17 +7,14 @@ export interface CommandBlockTracker {
     sequence: number;
     running: RunningCommandBlock[];
 }
-export interface TextSegmentBlockState {
-    turnLiveText: string;
-    turnBlocks: TurnOutputBlock[];
-}
 export declare function createCommandBlockTracker(): CommandBlockTracker;
-export declare function applyTextSegmentBlock(state: TextSegmentBlockState, input: {
-    turnId: string | null | undefined;
-    itemId?: string;
-    text: string;
-    now?: number;
-}): TextSegmentBlockState;
+/**
+ * Stable block id for one assistant text segment. The segment state itself
+ * (snapshot replacement + live-text rebuild around activity blocks) lives in
+ * core's TurnOutputController (`replaceTextSegmentSnapshot`) — this module
+ * only owns the codex id scheme.
+ */
+export declare function textSegmentBlockId(turnId: string | null | undefined, itemId?: string): string;
 export declare function beginCommandBlock(tracker: CommandBlockTracker, input: {
     turnId: string | null | undefined;
     command: string;

package/dist/turn-activity.js

@@ -8,49 +8,15 @@ function normalizeOptionalString(value) {
     const normalized = value?.trim();
     return normalized ? normalized : undefined;
 }
-function textBlockId(turnId, itemId) {
+/**
+ * Stable block id for one assistant text segment. The segment state itself
+ * (snapshot replacement + live-text rebuild around activity blocks) lives in
+ * core's TurnOutputController (`replaceTextSegmentSnapshot`) — this module
+ * only owns the codex id scheme.
+ */
+export function textSegmentBlockId(turnId, itemId) {
     return `message:${turnId ?? 'turn'}:${normalizeOptionalString(itemId) ?? 'latest'}`;
 }
-function buildLiveText(blocks) {
-    return blocks
-        .filter((block) => block.kind === 'text' && block.text?.trim())
-        .sort((left, right) => {
-        if (left.sequence !== right.sequence)
-            return left.sequence - right.sequence;
-        return left.id.localeCompare(right.id);
-    })
-        .map((block) => block.text)
-        .join('\n\n');
-}
-export function applyTextSegmentBlock(state, input) {
-    const id = textBlockId(input.turnId, input.itemId);
-    const now = input.now ?? Date.now();
-    const index = state.turnBlocks.findIndex((block) => block.id === id);
-    const existing = index >= 0 ? state.turnBlocks[index] : null;
-    const next = {
-        ...(existing ?? {
-            sequence: state.turnBlocks.length + 1,
-            createdAt: now,
-        }),
-        id,
-        turnId: input.turnId ?? id,
-        kind: 'text',
-        status: existing?.status ?? 'running',
-        text: input.text,
-        updatedAt: now,
-    };
-    const turnBlocks = index >= 0
-        ? [
-            ...state.turnBlocks.slice(0, index),
-            next,
-            ...state.turnBlocks.slice(index + 1),
-        ]
-        : [...state.turnBlocks, next];
-    return {
-        turnBlocks,
-        turnLiveText: buildLiveText(turnBlocks) || state.turnLiveText,
-    };
-}
 function nextCommandBlockId(tracker, turnId, itemId) {
     const stableTurnId = turnId ?? 'turn';
     if (itemId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.18.11",
+  "version": "0.19.0",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -21,7 +21,7 @@
     "scripts"
   ],
   "scripts": {
-    "prepare:workspace-deps": "node ../../scripts/run-workspace-prep.mjs ../core ../agent-sdk ../coding-agent-host",
+    "prepare:workspace-deps": "node ../../scripts/run-workspace-prep.mjs ../../packages/core ../../packages/agent-sdk ../../packages/framework ../../packages/bridge ../../packages/agent-host",
     "build": "npm run prepare:workspace-deps && node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc",
     "dev": "npm run prepare:workspace-deps && tsc --watch",
     "smoke": "node scripts/smoke-test.mjs",
@@ -29,9 +29,12 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^3.4.1",
-    "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^2.9.2"
+    "@canonmsg/agent-host": "^0.3.0",
+    "@canonmsg/agent-sdk": "^3.4.3",
+    "@canonmsg/backend-contracts": "^1.8.0",
+    "@canonmsg/bridge": "^0.2.0",
+    "@canonmsg/core": "^3.1.0",
+    "@canonmsg/framework": "^0.2.0"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -46,9 +49,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/HeyBobChan/canon",
-    "directory": "packages/codex-plugin"
+    "directory": "adapters/codex-plugin"
   },
-  "homepage": "https://github.com/HeyBobChan/canon/tree/main/packages/codex-plugin",
+  "homepage": "https://github.com/HeyBobChan/canon/tree/main/adapters/codex-plugin",
   "publishConfig": {
     "access": "public"
   },

package/dist/host-lifecycle.d.ts

@@ -1,4 +0,0 @@
-export interface LongLivedStream {
-    start(): Promise<void>;
-}
-export declare function startCodexStreamInBackground(stream: LongLivedStream, onError: (error: unknown) => void): void;

package/dist/host-lifecycle.js

@@ -1,3 +0,0 @@
-export function startCodexStreamInBackground(stream, onError) {
-    stream.start().catch(onError);
-}

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,46 +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;
-}
-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,59 +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);
-        }
-    }
-    const ascending = [...collected].sort((a, b) => String(a.createdAt ?? '').localeCompare(String(b.createdAt ?? '')));
-    const inboundOnly = (messages) => messages.filter((message) => message.senderId !== input.agentId);
-    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 };
-}