refactor(worker): move Codex turn logic into CodexAdapter behind AgentRuntime

2026-07-11 02:53:26 -04:00
parent c1e816741d
commit e5bba720b4
5 changed files with 382 additions and 268 deletions
@@ -0,0 +1,111 @@
+import { describe, expect, test, vi } from 'vitest';
+
+import type { NormalizedAgentEvent } from '../../src/agent-events';
+import type { ExecStreamFn } from '../../src/runtime/agent-runtime';
+import type { AdapterWorkspace, Claim } from '../../src/runtime/provider';
+
+const loadAdapter = async () => {
+  process.env.SPOON_WORKER_TOKEN = 'test-worker-token';
+  process.env.GITHUB_APP_ID = '123';
+  process.env.GITHUB_APP_PRIVATE_KEY =
+    '-----BEGIN PRIVATE KEY-----\\ntest\\n-----END PRIVATE KEY-----';
+  return await import('../../src/runtime/codex-adapter');
+};
+
+const claim = {
+  job: {
+    _id: 'job-1',
+    prompt: 'hi',
+    baseBranch: 'main',
+    workBranch: 'spoon/x',
+    forkOwner: 'o',
+    forkRepo: 'r',
+    upstreamOwner: 'u',
+    upstreamRepo: 'r',
+  },
+  spoon: { name: 'Spoon' },
+  openai: { model: 'gpt-5', reasoningEffort: 'medium' },
+  aiProviderProfile: {
+    id: 'p',
+    name: 'Codex',
+    provider: 'opencode_openai_login',
+    authType: 'opencode_auth_json',
+    model: 'gpt-5',
+    reasoningEffort: 'medium',
+  },
+  github: {},
+  secrets: [],
+} as unknown as Claim;
+
+const makeWorkspace = (): AdapterWorkspace => ({
+  claim,
+  // A non-existent workdir so the --output-last-message read is a clean ENOENT.
+  workdir: '/tmp/spoon-codex-adapter-test-missing',
+  homeDir: '/tmp/spoon-codex-adapter-test-missing',
+  username: 'tester',
+  containerHome: '/home/tester',
+  containerRepo: '/home/tester/Code/spoon',
+  repoDir: '/tmp/spoon-codex-adapter-test-missing/Code/spoon',
+  boxName: 'spoon-box-tester',
+  redact: (value: string) => value,
+  runtime: 'codex',
+});
+
+describe('CodexAdapter', () => {
+  test('streams normalized events and marks the turn via buildMarkedCommand', async () => {
+    const { createCodexAdapter } = await loadAdapter();
+    const captured: unknown[] = [];
+    const execStream = vi.fn(async (args) => {
+      captured.push(args.command);
+      await args.onStdoutLine?.(
+        JSON.stringify({
+          type: 'item.completed',
+          item: { id: 'item-1', type: 'agent_message', text: 'done' },
+        }),
+      );
+      await args.onStdoutLine?.(JSON.stringify({ type: 'turn.completed' }));
+      return { exitCode: 0, output: '' };
+    }) as unknown as ExecStreamFn;
+
+    const adapter = createCodexAdapter({ execStream });
+    const events: NormalizedAgentEvent[] = [];
+    const onEvent = (event: NormalizedAgentEvent): Promise<void> => {
+      events.push(event);
+      return Promise.resolve();
+    };
+
+    const result = await adapter.runTurn(makeWorkspace(), 'do it', onEvent);
+
+    expect(events).toContainEqual({
+      kind: 'assistant_delta',
+      content: 'done\n\n',
+      externalMessageId: 'item-1',
+    });
+    expect(events).toContainEqual({ kind: 'assistant_completed' });
+    expect(result).toBeTypeOf('object');
+    // The turn ran through buildMarkedCommand (setsid bash session).
+    const command = captured[0] as string[];
+    expect(command[0]).toBe('setsid');
+    expect(command[1]).toBe('bash');
+  });
+
+  test('surfaces a turn.failed error while exiting zero', async () => {
+    const { createCodexAdapter } = await loadAdapter();
+    const execStream = vi.fn(async (args) => {
+      await args.onStdoutLine?.(
+        JSON.stringify({
+          type: 'turn.failed',
+          error: { message: 'boom' },
+        }),
+      );
+      return { exitCode: 0, output: '' };
+    }) as unknown as ExecStreamFn;
+
+    const adapter = createCodexAdapter({ execStream });
+    const result = await adapter.runTurn(makeWorkspace(), 'do it', () =>
+      Promise.resolve(),
+    );
+
+    expect(result.error).toContain('boom');
+  });
+});