mcp-codex-worker 1.0.7 → 1.0.9

package/src/mcp/tool-definitions.ts

@@ -11,7 +11,11 @@ import { buildStatusBanner, buildRespondBanner } from '../services/tool-descript
 
 const reasoningEnum = z.enum(REASONING_OPTIONS);
 
-const spawnTaskSchema = z.object({
+// ---------------------------------------------------------------------------
+// Zod schemas — exported for registerTool (SDK validates input automatically)
+// ---------------------------------------------------------------------------
+
+export const spawnTaskSchema = z.object({
   prompt: z.string().min(1),
   task_type: z.enum(['coder', 'planner', 'tester', 'researcher', 'general']).default('coder'),
   provider: z.enum(['codex', 'copilot', 'claude-cli']).optional(),
@@ -28,13 +32,13 @@ const spawnTaskSchema = z.object({
   })).optional(),
 });
 
-const waitTaskSchema = z.object({
+export const waitTaskSchema = z.object({
   task_id: z.string().min(1),
   timeout_ms: z.number().int().positive().max(300_000).default(30_000).optional(),
   poll_interval_ms: z.number().int().min(250).max(30_000).default(1000).optional(),
 });
 
-const respondTaskSchema = z.discriminatedUnion('type', [
+export const respondTaskSchema = z.discriminatedUnion('type', [
   z.object({
     task_id: z.string().min(1),
     type: z.literal('user_input'),
@@ -64,13 +68,13 @@ const respondTaskSchema = z.discriminatedUnion('type', [
   }),
 ]);
 
-const messageTaskSchema = z.object({
+export const messageTaskSchema = z.object({
   task_id: z.string().min(1),
   message: z.string().min(1),
   reasoning: reasoningEnum.optional(),
 });
 
-const cancelTaskSchema = z.object({
+export const cancelTaskSchema = z.object({
   task_id: z.union([z.string().min(1), z.array(z.string().min(1)).min(1)]),
 });
 
@@ -317,3 +321,33 @@ export type WaitTaskInput = z.infer<typeof waitTaskSchema>;
 export type RespondTaskInput = z.infer<typeof respondTaskSchema>;
 export type MessageTaskInput = z.infer<typeof messageTaskSchema>;
 export type CancelTaskInput = z.infer<typeof cancelTaskSchema>;
+
+// ---------------------------------------------------------------------------
+// getToolDescriptions — description strings keyed by tool name
+// Used by index.ts McpServer.registerTool which takes description separately
+// ---------------------------------------------------------------------------
+
+export function getToolDescriptions(serverVersion?: string): Map<string, string> {
+  const tools = createToolDefinitions(serverVersion);
+  const map = new Map<string, string>();
+  for (const tool of tools) {
+    map.set(tool.name, tool.description);
+  }
+  return map;
+}
+
+// ---------------------------------------------------------------------------
+// TOOL_ANNOTATIONS — MCP tool annotations per tool
+// ---------------------------------------------------------------------------
+
+export interface ToolAnnotation { title: string; readOnlyHint: boolean; destructiveHint: boolean; idempotentHint: boolean; openWorldHint: boolean }
+
+const ANNOTATIONS = new Map<string, ToolAnnotation>([
+  ['spawn-task', { title: 'Spawn Task', readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true }],
+  ['wait-task', { title: 'Wait Task', readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false }],
+  ['respond-task', { title: 'Respond Task', readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false }],
+  ['message-task', { title: 'Message Task', readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: true }],
+  ['cancel-task', { title: 'Cancel Task', readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false }],
+]);
+
+export function getToolAnnotation(name: string): ToolAnnotation { return ANNOTATIONS.get(name) ?? { title: name, readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false }; }

package/src/services/tool-description-banner.ts

@@ -95,7 +95,7 @@ export function buildRespondBanner(allTasks: TaskState[]): string {
       const firstQ = pq.questions[0]!;
       let line = `- ${task.id}: "${firstQ.text}"`;
       if (firstQ.options && firstQ.options.length > 0) {
-        const choiceStr = firstQ.options.map((c, i) => `${i + 1}) ${c}`).join(' ');
+        const choiceStr = firstQ.options.map((c, i) => `${i + 1}) ${String(c)}`).join(' ');
         line += ` Options: ${choiceStr}`;
       }
       parts.push(line);

package/src/task/task-handle-impl.ts

@@ -164,6 +164,10 @@ export function createTaskHandle(
       const task = manager.getTask(taskId);
       return task?.taskType ?? 'general';
     },
+
+    setTokenUsage(usage) {
+      manager.updateTask(taskId, { tokenUsage: usage });
+    },
   };
 
   return handle;

package/src/task/task-handle.ts

@@ -132,4 +132,7 @@ export interface TaskHandle {
 
   /** The task type (coder, planner, tester, etc.). */
   getTaskType(): TaskTypeName;
+
+  /** Update the latest token usage snapshot for this task. */
+  setTokenUsage(usage: { totalTokens: number; inputTokens: number; outputTokens: number; contextWindow: number | null }): void;
 }

package/src/task/task-persistence.ts

@@ -82,6 +82,8 @@ export function applyRecovery(task: TaskState, hasCrashRecovery: boolean): TaskS
       status: TaskStatus.UNKNOWN,
       error: `Server restarted; ${task.provider} sessions don't survive restarts`,
       completedAt: now,
+      // Auto-expire recovered tasks after 60 seconds (vs 300s default)
+      keepAlive: 60_000,
       output: [
         ...task.output,
         `[recovery] Task was ${task.status} when server restarted; marked UNKNOWN`,

package/src/task/task-state.ts

@@ -116,6 +116,14 @@ export interface TaskState {
   exitCode?: number;
   result?: unknown;
 
+  // Token usage from last thread/tokenUsage/updated event
+  tokenUsage?: {
+    totalTokens: number;
+    inputTokens: number;
+    outputTokens: number;
+    contextWindow: number | null;
+  };
+
   // Recovery markers
   recovered?: boolean;
   degraded?: boolean;