@canonmsg/codex-plugin 0.18.11 → 0.19.0

package/README.md

@@ -108,7 +108,7 @@ ps aux | rg canon-codex
 If you installed the package only inside this repo and not globally, run the built host directly:
 
 ```bash
-node packages/codex-plugin/dist/host.js --cwd /path/to/project --full-auto
+node adapters/codex-plugin/dist/host.js --cwd /path/to/project --full-auto
 ```
 
 If `canon-codex` starts but cannot find the `codex` binary, either fix your `PATH` or launch with an explicit binary path:
@@ -149,7 +149,7 @@ CANON_AGENT=frontend canon-codex --cwd ~/projects/frontend
 ## Development
 
 ```bash
-cd packages/codex-plugin
+cd adapters/codex-plugin
 npm install
 npm run build
 ```

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

@@ -1,4 +1,5 @@
 import type { CodexApprovalPolicy, CodexEvent, CodexRunTurnOptions, CodexSandboxMode, CodexTurnResult } from './adapter.js';
+export type JsonRecord = Record<string, unknown>;
 export interface CodexSkillMetadata {
     name: string;
     path: string;
@@ -18,6 +19,7 @@ export declare class CodexAppServerAdapter {
     private readonly configOverrides;
     private readonly fullAuto;
     private readonly bypassApprovalsAndSandbox;
+    private readonly dynamicTools;
     private child;
     private threadId;
     private loadedThreadId;
@@ -49,6 +51,7 @@ export declare class CodexAppServerAdapter {
         configOverrides?: string[];
         fullAuto?: boolean;
         bypassApprovalsAndSandbox?: boolean;
+        dynamicTools?: readonly JsonRecord[];
     });
     getThreadId(): string | null;
     clearThreadId(): void;
@@ -65,6 +68,7 @@ export declare class CodexAppServerAdapter {
     isRunning(): boolean;
     interrupt(): Promise<void>;
     compactThread(): Promise<void>;
+    requestAppServer(method: string, params: unknown): Promise<unknown>;
     close(): void;
     runTurn(prompt: string, onEvent: (event: CodexEvent) => void, onLog?: (line: string) => void, imagePaths?: readonly string[], _extraAddDirs?: readonly string[], options?: CodexRunTurnOptions): Promise<CodexTurnResult>;
     private resolveApprovalPolicy;
@@ -80,6 +84,7 @@ export declare class CodexAppServerAdapter {
     private handleLine;
     private handleServerRequest;
     private handleNotification;
+    private isCurrentThreadNotification;
     private resolveCurrentTurn;
     private clearActiveTurn;
     private sendRequest;

package/dist/app-server-adapter.js

@@ -11,6 +11,7 @@ export class CodexAppServerAdapter {
     configOverrides;
     fullAuto;
     bypassApprovalsAndSandbox;
+    dynamicTools;
     child = null;
     threadId;
     loadedThreadId = null;
@@ -42,6 +43,7 @@ export class CodexAppServerAdapter {
         this.configOverrides = opts.configOverrides ?? [];
         this.fullAuto = opts.fullAuto ?? false;
         this.bypassApprovalsAndSandbox = opts.bypassApprovalsAndSandbox ?? false;
+        this.dynamicTools = opts.dynamicTools ?? [];
     }
     getThreadId() {
         return this.threadId;
@@ -92,6 +94,10 @@ export class CodexAppServerAdapter {
             threadId: this.threadId,
         });
     }
+    async requestAppServer(method, params) {
+        await this.ensureStarted();
+        return await this.sendRequest(method, params);
+    }
     close() {
         this.child?.kill('SIGTERM');
         this.child = null;
@@ -122,6 +128,7 @@ export class CodexAppServerAdapter {
                     approvalPolicy: this.resolveApprovalPolicy(),
                     excludeTurns: true,
                     persistExtendedHistory: true,
+                    ...(this.dynamicTools.length ? { dynamicTools: this.dynamicTools } : {}),
                 });
                 this.loadedThreadId = this.threadId;
                 this.rememberResolvedModel(resumed);
@@ -133,6 +140,7 @@ export class CodexAppServerAdapter {
                     ...(this.sandbox ? { sandbox: this.sandbox } : {}),
                     ...this.configPayload(),
                     approvalPolicy: this.resolveApprovalPolicy(),
+                    ...(this.dynamicTools.length ? { dynamicTools: this.dynamicTools } : {}),
                     experimentalRawEvents: false,
                     persistExtendedHistory: true,
                 });
@@ -358,16 +366,18 @@ export class CodexAppServerAdapter {
         }
     }
     handleNotification(method, params) {
-        if (method === 'turn/started') {
-            this.currentTurnId = readString(params.turn, 'id') ?? this.currentTurnId;
-            this.currentOnEvent?.({ type: 'turn.started' });
-            return;
-        }
         if (method === 'skills/changed') {
             this.skillsCache = null;
             this.currentOnEvent?.({ type: 'skills.changed' });
             return;
         }
+        if (!this.isCurrentThreadNotification(params))
+            return;
+        if (method === 'turn/started') {
+            this.currentTurnId = readString(params.turn, 'id') ?? this.currentTurnId;
+            this.currentOnEvent?.({ type: 'turn.started' });
+            return;
+        }
         if (method === 'thread/status/changed') {
             const status = params.status;
             if (status?.type === 'active' && Array.isArray(status.activeFlags)) {
@@ -476,6 +486,15 @@ export class CodexAppServerAdapter {
             this.currentErrorText = stringifyPreview(params);
         }
     }
+    isCurrentThreadNotification(params) {
+        const threadId = readNotificationThreadId(params);
+        if (threadId && this.threadId && threadId !== this.threadId)
+            return false;
+        const turnId = readNotificationTurnId(params);
+        if (turnId && this.currentTurnId && turnId !== this.currentTurnId)
+            return false;
+        return true;
+    }
     resolveCurrentTurn() {
         const result = {
             threadId: this.threadId,
@@ -538,6 +557,18 @@ function readRawString(record, key) {
     const value = record?.[key];
     return typeof value === 'string' ? value : undefined;
 }
+function readNotificationThreadId(params) {
+    return readString(params, 'threadId')
+        ?? readString(params.thread, 'id')
+        ?? readString(params.turn, 'threadId')
+        ?? readString(params.item, 'threadId')
+        ?? readString(params.status, 'threadId');
+}
+function readNotificationTurnId(params) {
+    return readString(params, 'turnId')
+        ?? readString(params.turn, 'id')
+        ?? readString(params.item, 'turnId');
+}
 function readNullableString(record, key) {
     const value = record?.[key];
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;

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

@@ -1,4 +1,4 @@
-import type { ApprovalNativeRequestMetadata, ApprovalRequestCategory, ApprovalRequestDetail, ApprovalResult, ApprovalRisk, CanonUnifiedDiff } from '@canonmsg/core';
+import type { ApprovalNativeRequestMetadata, ApprovalRequestCategory, ApprovalRequestDetail, ApprovalResult, ApprovalRisk, CanonUnifiedDiff } from '@canonmsg/core/contract';
 /**
  * Mapping for Codex app-server native approval requests.
  *

package/dist/app-server-approval.js

@@ -1,4 +1,4 @@
-import { sanitizeUnifiedDiffForSharing, truncateUnifiedDiff } from '@canonmsg/core';
+import { sanitizeUnifiedDiffForSharing, truncateUnifiedDiff } from '@canonmsg/core/contract';
 function isRecord(value) {
     return Boolean(value && typeof value === 'object' && !Array.isArray(value));
 }

package/dist/bridge-bin.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Packaged canon-bridge daemon resolution (bridge plan Phase 6, §F3).
+ *
+ * On a fresh npm install nothing has populated ~/.canon/bin yet, so
+ * connectBridge()'s fallback chain (explicit binPath → $CANON_BRIDGE_BIN →
+ * the shared install) has nothing to spawn. The plugin therefore ships the
+ * daemon as its own @canonmsg/bridge dependency and passes the packaged
+ * dist entry as binPath.
+ *
+ * $CANON_BRIDGE_BIN still wins: when the env override is set we return
+ * undefined and let connectBridge()'s own env resolution take it (an
+ * options.binPath would out-rank the env var otherwise).
+ */
+export declare function resolvePackagedBridgeBin(env?: NodeJS.ProcessEnv): string | undefined;

package/dist/bridge-bin.js

@@ -0,0 +1,27 @@
+/**
+ * Packaged canon-bridge daemon resolution (bridge plan Phase 6, §F3).
+ *
+ * On a fresh npm install nothing has populated ~/.canon/bin yet, so
+ * connectBridge()'s fallback chain (explicit binPath → $CANON_BRIDGE_BIN →
+ * the shared install) has nothing to spawn. The plugin therefore ships the
+ * daemon as its own @canonmsg/bridge dependency and passes the packaged
+ * dist entry as binPath.
+ *
+ * $CANON_BRIDGE_BIN still wins: when the env override is set we return
+ * undefined and let connectBridge()'s own env resolution take it (an
+ * options.binPath would out-rank the env var otherwise).
+ */
+import { createRequire } from 'node:module';
+import { dirname, join as joinPath } from 'node:path';
+export function resolvePackagedBridgeBin(env = process.env) {
+    if (env.CANON_BRIDGE_BIN)
+        return undefined;
+    try {
+        const require = createRequire(import.meta.url);
+        const manifestPath = require.resolve('@canonmsg/bridge/package.json');
+        return joinPath(dirname(manifestPath), 'dist', 'main.js');
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/cli-entry.d.ts

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

package/dist/cli-entry.js

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

package/dist/codex-app-tools.d.ts

@@ -0,0 +1,42 @@
+type JsonRecord = Record<string, unknown>;
+interface DynamicToolSpec {
+    [key: string]: unknown;
+    namespace: 'codex_app';
+    name: string;
+    description: string;
+    inputSchema: JsonRecord;
+    deferLoading?: boolean;
+}
+export interface CodexAppToolAdapter {
+    requestAppServer(method: string, params: unknown): Promise<unknown>;
+}
+export interface CodexAppToolWorkspace {
+    id: string;
+    label: string;
+    cwd: string;
+}
+export interface CodexAppToolRuntime {
+    adapter: CodexAppToolAdapter;
+    currentThreadId: string | null;
+    currentCwd: string;
+    workspaces: ReadonlyArray<CodexAppToolWorkspace>;
+    model?: string | null;
+    effort?: string | null;
+}
+export interface CodexAppToolCallParams {
+    arguments?: unknown;
+    namespace?: unknown;
+    tool?: unknown;
+}
+type DynamicToolCallResponse = {
+    success: boolean;
+    contentItems: Array<{
+        type: 'inputText';
+        text: string;
+    }>;
+};
+export declare const CODEX_APP_DYNAMIC_TOOLS: ReadonlyArray<DynamicToolSpec>;
+export declare function isCodexAppToolCall(params: Record<string, unknown>): boolean;
+export declare function deniedCodexAppToolResult(reason: string): DynamicToolCallResponse;
+export declare function handleCodexAppToolCall(runtime: CodexAppToolRuntime, params: CodexAppToolCallParams): Promise<DynamicToolCallResponse>;
+export {};