@canonmsg/codex-plugin 0.6.6 → 0.7.0

package/README.md

@@ -37,7 +37,7 @@ You do not need a git repo for host mode. The plugin passes `--skip-git-repo-che
 
 ## Current limitation
 
-The stable `codex exec --json` surface exposes completed assistant messages and tool activity, but not token-by-token text deltas. v1 therefore reports live status and publishes the final reply when the turn completes, instead of true token streaming.
+The stable `codex exec --json` surface exposes thinking state, tool activity, and completed assistant-message previews, but not token-by-token text deltas. v1 therefore publishes live progress and message snapshots without claiming true token streaming.
 
 ## Working directory
 
@@ -45,12 +45,22 @@ The stable `codex exec --json` surface exposes completed assistant messages and
 canon-codex --cwd /path/to/project
 ```
 
+Advertise multiple project choices to the Canon app:
+
+```bash
+canon-codex --cwd ~/dev --workspace ~/dev/canon --workspace ~/dev/yumyumv2
+```
+
+`--cwd` is the default workspace. Each `--workspace` value appears as a selectable workspace during session creation. Worktree mode creates a per-conversation git worktree under `~/.canon/conversation-worktrees`; shared-workspace mode runs directly in the selected directory.
+
 Useful flags:
 
 ```bash
 canon-codex --cwd /path/to/project --model gpt-5.4 --full-auto
 ```
 
+Codex also supports `--add-dir /extra/path` for additional writable directories passed through to `codex exec`. Canon does not yet render those extra directories as workspace choices.
+
 Recent Codex CLI releases no longer accept `--ask-for-approval` with `codex exec`. If you previously launched Canon with `--sandbox workspace-write --ask-for-approval never`, switch to `--full-auto`.
 
 Local smoke test:

package/dist/host-runtime.d.ts

@@ -97,17 +97,23 @@ export declare function publishHostSessionSnapshots(input: {
     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>>) | null;
+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>>) | null>;
+}): Promise<(SessionWorkspaceConfig & Partial<Record<TExtra, string>> & {
+    runtimeControlValues?: Record<string, string>;
+}) | null>;
 export declare function resolveHostWorkspaceCwd(input: {
     workspaceOptions: HostWorkspaceResolverOption[];
     config: {

package/dist/host-runtime.js

@@ -162,6 +162,10 @@ export async function publishHostSessionSnapshots(input) {
             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 } : {}),
             },
@@ -183,6 +187,8 @@ export async function publishHostSessionSnapshots(input) {
             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,
@@ -204,9 +210,16 @@ export function readHostSessionConfig(raw, extraStringFields = []) {
         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) {

package/dist/host.js

@@ -3,7 +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 { buildConfiguredWorkspaceOptions, 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, shouldTriggerAgentTurn, writeSessionState, writeTurnState, } from '@canonmsg/core';
+import { buildConfiguredWorkspaceOptions, 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 { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
@@ -23,6 +23,61 @@ const CODEX_RUNTIME_CAPABILITIES = {
 };
 let workingDir = process.cwd();
 let workspaceOptions = [];
+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: 'Workspace',
+                options: input.workspaces.map((workspace) => ({
+                    value: workspace.id,
+                    label: workspace.label,
+                })),
+                defaultValue: input.workspaces[0]?.id ?? null,
+                availability: 'setup',
+                liveBehavior: 'none',
+                selectionPolicy: 'inherit',
+            },
+            {
+                id: 'executionMode',
+                label: 'Execution mode',
+                options: input.executionModes.map((mode) => ({
+                    value: mode,
+                    label: mode === 'worktree' ? 'Isolated worktree' : 'Use shared workspace',
+                    description: mode === 'worktree'
+                        ? 'Creates or reuses a per-conversation git worktree under ~/.canon/conversation-worktrees when the selected workspace is a git repo.'
+                        : 'Runs directly in the selected workspace. Canon records usage, but does not create a separate checkout.',
+                })),
+                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',
+            },
+        ],
+        supportsInterrupt: true,
+        streamingTextMode: 'snapshot',
+    };
+}
 function normalizeRuntimeTurnState(value) {
     const normalizedTurn = normalizeTurnState(value);
     if (normalizedTurn) {
@@ -62,6 +117,14 @@ function resolveWorkspaceCwd(config) {
         defaultCwd: workingDir,
     });
 }
+function resolveExecutionFallbackReason(environment) {
+    if (!environment?.reason || environment.mode !== 'locked') {
+        return null;
+    }
+    return environment.reason === 'Sharing the base workspace (locked mode)'
+        ? null
+        : environment.reason;
+}
 function buildCanonPrompt(input) {
     return buildCanonHostPrompt({
         hostLabel: 'Codex',
@@ -194,6 +257,7 @@ export async function main() {
             cwd: session.cwd,
             executionMode: session.environment.mode,
             ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
+            ...(session.environment.worktreePath ? { worktreePath: session.environment.worktreePath } : {}),
             hostMode: true,
             clientType: 'codex',
             state: session.state.state,
@@ -570,6 +634,13 @@ export async function main() {
         ...(codexPermissionEnvelope.defaultPermissionMode
             ? { defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode }
             : {}),
+        runtimeDescriptor: buildCodexRuntimeDescriptor({
+            models: [],
+            workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+            executionModes: hostAvailableExecutionModes,
+            permissionModes: [...codexPermissionEnvelope.availablePermissionModes],
+            defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
+        }),
     };
     const publishRuntimeHeartbeat = async () => {
         if (!streamConnected)
@@ -602,6 +673,49 @@ export async function main() {
         }).catch((error) => {
             console.error('[canon-codex] Failed to publish session snapshots:', error);
         });
+        await Promise.all(Array.from(knownConversationIds).map(async (conversationId) => {
+            const session = sessions.get(conversationId);
+            const workspaceId = session
+                ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
+                : runtimeDescriptor.defaultWorkspaceId;
+            const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+            const payload = {
+                descriptor: runtimeDescriptor.runtimeDescriptor ?? buildCodexRuntimeDescriptor({
+                    models: runtimeDescriptor.availableModels ?? [],
+                    workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                    executionModes: hostAvailableExecutionModes,
+                    permissionModes: [...codexPermissionEnvelope.availablePermissionModes],
+                    defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
+                }),
+                surfaceMode: 'host',
+                statusItems: [
+                    {
+                        id: 'transport',
+                        label: 'Transport',
+                        value: 'exec --json',
+                    },
+                    {
+                        id: 'streaming',
+                        label: 'Live output',
+                        value: 'Thinking, tools, and completed-message previews',
+                    },
+                ],
+                execution: {
+                    resolvedWorkspaceLabel: workspace?.label ?? workspaceId ?? null,
+                    resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
+                    executionMode: session?.environment.mode ?? null,
+                    executionBranch: session?.environment.branch ?? null,
+                    worktreePath: session?.environment.worktreePath ?? null,
+                    fallbackReason: resolveExecutionFallbackReason(session?.environment),
+                },
+                notes: [
+                    'This Codex host uses the current exec --json transport, so Canon can show thinking, tool activity, and completed assistant-message previews, but not token-by-token text deltas.',
+                ],
+            };
+            await writeRuntimeInfo(conversationId, agentId, payload);
+        })).catch((error) => {
+            console.error('[canon-codex] Failed to publish runtime info:', error);
+        });
     };
     const stream = new CanonStream({
         apiKey,
@@ -643,6 +757,13 @@ export async function main() {
             ...(codexPermissionEnvelope.defaultPermissionMode
                 ? { defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode }
                 : {}),
+            runtimeDescriptor: buildCodexRuntimeDescriptor({
+                models: [],
+                workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                executionModes: hostAvailableExecutionModes,
+                permissionModes: [...codexPermissionEnvelope.availablePermissionModes],
+                defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
+            }),
         };
     }
     catch {
@@ -654,6 +775,13 @@ export async function main() {
             ...(codexPermissionEnvelope.defaultPermissionMode
                 ? { defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode }
                 : {}),
+            runtimeDescriptor: buildCodexRuntimeDescriptor({
+                models: [],
+                workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                executionModes: hostAvailableExecutionModes,
+                permissionModes: [...codexPermissionEnvelope.availablePermissionModes],
+                defaultPermissionMode: codexPermissionEnvelope.defaultPermissionMode,
+            }),
         };
     }
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,8 +29,8 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@canonmsg/agent-sdk": "^0.8.3",
-    "@canonmsg/core": "^0.7.5"
+    "@canonmsg/agent-sdk": "^0.9.0",
+    "@canonmsg/core": "^0.8.0"
   },
   "engines": {
     "node": ">=18.0.0"