mcp-codex-worker 0.1.13 → 0.1.15

package/src/execution/codex-adapter.ts

@@ -12,7 +12,10 @@ import {
   type ProviderSpawnOptions,
   type AvailabilityResult,
 } from './base-adapter.js';
-import type { CodexRuntime } from '../services/codex-runtime.js';
+import { CodexRuntime } from '../services/codex-runtime.js';
+import type { AppServerClient } from '../services/app-server-client.js';
+import { attachPauseFlow } from './codex-pause-flow.js';
+import { REQUEST_TIMEOUT_MS } from '../config/defaults.js';
 
 // ---------------------------------------------------------------------------
 // Options
@@ -52,16 +55,103 @@ export class CodexAdapter extends BaseProviderAdapter {
     return {};
   }
 
+  // -------------------------------------------------------------------------
+  // Core session lifecycle
+  // -------------------------------------------------------------------------
+
   protected async executeSession(
-    _handle: TaskHandle,
-    _prompt: string,
+    handle: TaskHandle,
+    prompt: string,
     _signal: AbortSignal,
-    _options: ProviderSpawnOptions,
+    options: ProviderSpawnOptions,
   ): Promise<void> {
-    throw new Error('CodexAdapter.executeSession is not yet implemented');
+    const runtime = this.getRuntime();
+    let detachPauseFlow: (() => void) | undefined;
+
+    try {
+      // 1. Create a new thread
+      const { params: threadParams } = await runtime.buildThreadStartParams({
+        model: options.model,
+        cwd: options.cwd,
+      });
+      const threadResult = await runtime.request('thread/start', threadParams) as {
+        thread?: { id?: string };
+      };
+      const threadId = threadResult?.thread?.id;
+      if (!threadId) {
+        throw new Error('thread/start did not return a thread ID');
+      }
+
+      // 2. Mark running with the thread ID as session identifier
+      handle.markRunning(threadId);
+
+      // 3. Attach pause-flow: translate server-requests → PendingQuestions
+      //    getCurrentClient() is private on CodexRuntime; access via cast.
+      //    Safe after a successful request() call guarantees the client exists.
+      const client = (runtime as unknown as { getCurrentClient(): AppServerClient })
+        .getCurrentClient();
+      detachPauseFlow = attachPauseFlow(client, handle, threadId);
+
+      // 4. Build turn params and start the turn via bridged request
+      const { params: turnParams } = await runtime.buildTurnStartParams({
+        threadId,
+        userInput: prompt,
+        model: options.model,
+      });
+      const bridgeResult = await runtime.requestWithBridge(
+        'turn/start',
+        turnParams,
+        { threadId },
+      );
+
+      // 5. Handle bridge result
+      if (bridgeResult.status === 'pending_request') {
+        // Pause flow already queued the question on the handle and
+        // markInputRequired was called. Nothing more to do here —
+        // the wait-task / answer-task handlers drive the rest.
+        return;
+      }
+
+      if (bridgeResult.status === 'completed') {
+        handle.markCompleted();
+        return;
+      }
+
+      // status === 'running' — the bridge timed out before completion;
+      // poll until the operation settles.
+      const timeoutMs = options.timeout > 0 ? options.timeout : REQUEST_TIMEOUT_MS;
+      const op = await runtime.waitForOperation(
+        bridgeResult.operationId,
+        timeoutMs,
+        500,
+      );
+
+      if (op.status === 'completed') {
+        handle.markCompleted();
+      } else {
+        handle.markFailed(op.error ?? 'Turn failed');
+      }
+    } finally {
+      detachPauseFlow?.();
+    }
   }
 
   async shutdown(): Promise<void> {
     await this.runtime?.shutdown();
   }
+
+  // -------------------------------------------------------------------------
+  // Internal
+  // -------------------------------------------------------------------------
+
+  private getRuntime(): CodexRuntime {
+    if (!this.runtime) {
+      this.runtime = new CodexRuntime({
+        command: this.options.command,
+        args: this.options.args,
+        env: this.options.env,
+      });
+    }
+    return this.runtime;
+  }
 }

package/src/index.ts

@@ -64,6 +64,21 @@ server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
 
 async function main(): Promise<void> {
   await app.initialize();
+
+  // Wire state-change notifications: when any task status changes,
+  // notify MCP clients that the scoreboard and task detail resources are updated.
+  const taskManager = app.getTaskManager();
+  taskManager.onStatusChange((task) => {
+    server.notification({
+      method: 'notifications/resources/updated',
+      params: { uri: 'task:///all' },
+    }).catch(() => {});
+    server.notification({
+      method: 'notifications/resources/updated',
+      params: { uri: `task:///${task.id}` },
+    }).catch(() => {});
+  });
+
   const transport = new StdioServerTransport();
   await server.connect(transport);
   process.stdin.resume();

package/src/mcp/tool-definitions.ts

@@ -164,6 +164,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     {
       name: 'codex-thread-start',
       description: [
+        '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
         'Launch a new Codex agent as a background thread.',
         '',
         'PARALLEL EXECUTION: Launch multiple threads simultaneously — each thread is an independent agent workspace with its own context and conversation history.',
@@ -192,7 +193,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     },
     {
       name: 'codex-thread-resume',
-      description: 'Resume a previously started Codex thread. Reloads context and reconnects the agent. Use to continue work on an existing thread after a pause, or to send follow-up instructions to a completed thread.',
+      description: '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n\nResume a previously started Codex thread. Reloads context and reconnects the agent. Use to continue work on an existing thread after a pause, or to send follow-up instructions to a completed thread.',
       inputSchema: objectSchema({
         thread_id: { type: 'string', minLength: 1, description: 'ID of the thread to resume.' },
         model: {
@@ -208,6 +209,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     {
       name: 'codex-thread-read',
       description: [
+        '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
         'Read thread status and conversation history. Use to check what an agent has done, inspect its output, or verify task completion. Set include_turns=true for full turn details including tool calls and file changes.',
         threadBanner,
       ].filter(Boolean).join('\n\n'),
@@ -219,7 +221,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     },
     {
       name: 'codex-thread-list',
-      description: 'List recent Codex threads across all sessions. Use to discover existing threads before starting new ones, or to find a thread ID you need to resume.',
+      description: '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n\nList recent Codex threads across all sessions. Use to discover existing threads before starting new ones, or to find a thread ID you need to resume.',
       inputSchema: objectSchema({
         limit: { type: 'integer', minimum: 1, maximum: 100, description: 'Max threads to return. Default 50.' },
         cursor: { type: 'string', description: 'Pagination cursor from a previous response.' },
@@ -230,6 +232,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
       name: 'codex-turn-start',
       description: [
         [
+          '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
           'Send a task to an active Codex thread, starting an autonomous agent turn.',
           '',
           'The agent executes independently — it reads files, writes code, runs commands, and commits changes.',
@@ -255,7 +258,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     {
       name: 'codex-turn-steer',
       description: [
-        'Redirect an in-progress turn with new instructions. The agent adjusts course without losing prior context. Use when you see the agent heading in the wrong direction via codex-thread-read or codex-request-list.',
+        '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n\nRedirect an in-progress turn with new instructions. The agent adjusts course without losing prior context. Use when you see the agent heading in the wrong direction via codex-thread-read or codex-request-list.',
         threadBanner,
       ].filter(Boolean).join('\n\n'),
       inputSchema: objectSchema({
@@ -267,7 +270,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     },
     {
       name: 'codex-turn-interrupt',
-      description: 'Stop an active turn immediately. Use when the agent is heading in the wrong direction and steering is not enough, or when you need to cancel work in progress.',
+      description: '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n\nStop an active turn immediately. Use when the agent is heading in the wrong direction and steering is not enough, or when you need to cancel work in progress.',
       inputSchema: objectSchema({
         thread_id: { type: 'string', minLength: 1, description: 'Thread containing the turn.' },
         turn_id: { type: 'string', minLength: 1, description: 'Turn ID to interrupt.' },
@@ -278,6 +281,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
       name: 'codex-request-list',
       description: [
         [
+          '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
           'List pending approval requests from Codex agents (command execution, file changes, permissions).',
           '',
           'CRITICAL: Check this after every codex-turn-start — agents frequently pause and wait for approval before executing shell commands or writing files.',
@@ -295,6 +299,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
       name: 'codex-request-respond',
       description: [
         [
+          '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
           'Approve or decline a pending Codex agent request (command execution, file changes, permissions, user input).',
           '',
           'Common patterns:',
@@ -323,6 +328,7 @@ export function createToolDefinitions(input: CreateToolDefinitionsInput): ToolDe
     {
       name: 'codex-wait',
       description: [
+        '⚠️ DEPRECATED — Use spawn-task/wait-task/respond-task instead. This tool will be removed in v2.0.\n',
         'Block until a Codex turn completes or a pending approval request appears.',
         '',
         'Use after codex-turn-start to wait for the agent to finish or ask for permission.',