@northflare/runner 0.0.7 → 0.0.9

package/lib/codex-sdk/tests/runStreamed.test.ts

@@ -0,0 +1,211 @@
+import path from "node:path";
+
+import { describe, expect, it } from "@jest/globals";
+
+import { Codex } from "../src/codex";
+import { ThreadEvent } from "../src/index";
+
+import {
+  assistantMessage,
+  responseCompleted,
+  responseStarted,
+  sse,
+  startResponsesTestProxy,
+} from "./responsesProxy";
+
+const codexExecPath = path.join(process.cwd(), "..", "..", "codex-rs", "target", "debug", "codex");
+
+describe("Codex", () => {
+  it("returns thread events", async () => {
+    const { url, close } = await startResponsesTestProxy({
+      statusCode: 200,
+      responseBodies: [sse(responseStarted(), assistantMessage("Hi!"), responseCompleted())],
+    });
+
+    try {
+      const client = new Codex({ codexPathOverride: codexExecPath, baseUrl: url, apiKey: "test" });
+
+      const thread = client.startThread();
+      const result = await thread.runStreamed("Hello, world!");
+
+      const events: ThreadEvent[] = [];
+      for await (const event of result.events) {
+        events.push(event);
+      }
+
+      expect(events).toEqual([
+        {
+          type: "thread.started",
+          thread_id: expect.any(String),
+        },
+        {
+          type: "turn.started",
+        },
+        {
+          type: "item.completed",
+          item: {
+            id: "item_0",
+            type: "agent_message",
+            text: "Hi!",
+          },
+        },
+        {
+          type: "turn.completed",
+          usage: {
+            cached_input_tokens: 12,
+            input_tokens: 42,
+            output_tokens: 5,
+          },
+        },
+      ]);
+      expect(thread.id).toEqual(expect.any(String));
+    } finally {
+      await close();
+    }
+  });
+
+  it("sends previous items when runStreamed is called twice", async () => {
+    const { url, close, requests } = await startResponsesTestProxy({
+      statusCode: 200,
+      responseBodies: [
+        sse(
+          responseStarted("response_1"),
+          assistantMessage("First response", "item_1"),
+          responseCompleted("response_1"),
+        ),
+        sse(
+          responseStarted("response_2"),
+          assistantMessage("Second response", "item_2"),
+          responseCompleted("response_2"),
+        ),
+      ],
+    });
+
+    try {
+      const client = new Codex({ codexPathOverride: codexExecPath, baseUrl: url, apiKey: "test" });
+
+      const thread = client.startThread();
+      const first = await thread.runStreamed("first input");
+      await drainEvents(first.events);
+
+      const second = await thread.runStreamed("second input");
+      await drainEvents(second.events);
+
+      // Check second request continues the same thread
+      expect(requests.length).toBeGreaterThanOrEqual(2);
+      const secondRequest = requests[1];
+      expect(secondRequest).toBeDefined();
+      const payload = secondRequest!.json;
+
+      const assistantEntry = payload.input.find(
+        (entry: { role: string }) => entry.role === "assistant",
+      );
+      expect(assistantEntry).toBeDefined();
+      const assistantText = assistantEntry?.content?.find(
+        (item: { type: string; text: string }) => item.type === "output_text",
+      )?.text;
+      expect(assistantText).toBe("First response");
+    } finally {
+      await close();
+    }
+  });
+
+  it("resumes thread by id when streaming", async () => {
+    const { url, close, requests } = await startResponsesTestProxy({
+      statusCode: 200,
+      responseBodies: [
+        sse(
+          responseStarted("response_1"),
+          assistantMessage("First response", "item_1"),
+          responseCompleted("response_1"),
+        ),
+        sse(
+          responseStarted("response_2"),
+          assistantMessage("Second response", "item_2"),
+          responseCompleted("response_2"),
+        ),
+      ],
+    });
+
+    try {
+      const client = new Codex({ codexPathOverride: codexExecPath, baseUrl: url, apiKey: "test" });
+
+      const originalThread = client.startThread();
+      const first = await originalThread.runStreamed("first input");
+      await drainEvents(first.events);
+
+      const resumedThread = client.resumeThread(originalThread.id!);
+      const second = await resumedThread.runStreamed("second input");
+      await drainEvents(second.events);
+
+      expect(resumedThread.id).toBe(originalThread.id);
+
+      expect(requests.length).toBeGreaterThanOrEqual(2);
+      const secondRequest = requests[1];
+      expect(secondRequest).toBeDefined();
+      const payload = secondRequest!.json;
+
+      const assistantEntry = payload.input.find(
+        (entry: { role: string }) => entry.role === "assistant",
+      );
+      expect(assistantEntry).toBeDefined();
+      const assistantText = assistantEntry?.content?.find(
+        (item: { type: string; text: string }) => item.type === "output_text",
+      )?.text;
+      expect(assistantText).toBe("First response");
+    } finally {
+      await close();
+    }
+  });
+
+  it("applies output schema turn options when streaming", async () => {
+    const { url, close, requests } = await startResponsesTestProxy({
+      statusCode: 200,
+      responseBodies: [
+        sse(
+          responseStarted("response_1"),
+          assistantMessage("Structured response", "item_1"),
+          responseCompleted("response_1"),
+        ),
+      ],
+    });
+
+    const schema = {
+      type: "object",
+      properties: {
+        answer: { type: "string" },
+      },
+      required: ["answer"],
+      additionalProperties: false,
+    } as const;
+
+    try {
+      const client = new Codex({ codexPathOverride: codexExecPath, baseUrl: url, apiKey: "test" });
+
+      const thread = client.startThread();
+      const streamed = await thread.runStreamed("structured", { outputSchema: schema });
+      await drainEvents(streamed.events);
+
+      expect(requests.length).toBeGreaterThanOrEqual(1);
+      const payload = requests[0];
+      expect(payload).toBeDefined();
+      const text = payload!.json.text;
+      expect(text).toBeDefined();
+      expect(text?.format).toEqual({
+        name: "codex_output_schema",
+        type: "json_schema",
+        strict: true,
+        schema,
+      });
+    } finally {
+      await close();
+    }
+  });
+});
+
+async function drainEvents(events: AsyncGenerator<ThreadEvent>): Promise<void> {
+  let done = false;
+  do {
+    done = (await events.next()).done ?? false;
+  } while (!done);
+}

package/lib/codex-sdk/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "resolveJsonModule": true,
+    "lib": ["ES2022"],
+    "types": ["node", "jest"],
+    "sourceMap": true,
+    "declaration": true,
+    "declarationMap": true,
+    "noImplicitAny": true,
+    "outDir": "dist",
+    "stripInternal": true
+  },
+  "include": ["src", "tests", "tsup.config.ts", "samples"],
+  "exclude": ["dist", "node_modules"]
+}

package/lib/codex-sdk/tsup.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["esm"],
+  dts: true,
+  sourcemap: true,
+  clean: true,
+  minify: false,
+  target: "node18",
+  shims: false,
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@northflare/runner",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Distributed conversation runner for Northflare",
   "license": "MIT",
   "main": "dist/index.js",
@@ -24,6 +24,8 @@
     "@anthropic-ai/claude-agent-sdk": "0.1.37",
     "@botanicastudios/claude-code-sdk-ts": "0.2.22-fork",
     "@botanicastudios/mcp-host-rpc": "^0.4.0",
+    "@northflare/codex-sdk": "file:lib/codex-sdk",
+    "@openai/codex-sdk": "^0.58.0",
     "@tanstack/react-query": "^5.x.x",
     "@types/jsonwebtoken": "^9.0.10",
     "ajv": "^8.x.x",

package/rejections.log

@@ -61,3 +61,5 @@
 {"date":"Mon Sep 08 2025 22:57:44 GMT+0200 (Central European Summer Time)","error":{},"level":"error","message":"unhandledRejection: HTTP 502: \nError: HTTP 502: \n    at RunnerApp.sendToOrchestrator (/Users/toby/Code/claudette/runner/dist/runner-sse.js:202:23)\n    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)\n    at async RunnerApp.sendToOrchestratorWithRetry (/Users/toby/Code/claudette/runner/dist/runner-sse.js:447:24)\n    at async RunnerApp.notify (/Users/toby/Code/claudette/runner/dist/runner-sse.js:157:13)\n    at async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js:253:13","os":{"loadavg":[3.6865234375,4.97021484375,5.3193359375],"uptime":194745},"process":{"argv":["/Users/toby/.nvm/versions/node/v22.15.0/bin/node","/Users/toby/Code/claudette/runner/bin/claudette-runner"],"cwd":"/Users/toby/Code/claudette/runner","execPath":"/Users/toby/.nvm/versions/node/v22.15.0/bin/node","gid":20,"memoryUsage":{"arrayBuffers":791696,"external":4349826,"heapTotal":23592960,"heapUsed":17737264,"rss":77004800},"pid":70062,"uid":501,"version":"v22.15.0"},"rejection":true,"stack":"Error: HTTP 502: \n    at RunnerApp.sendToOrchestrator (/Users/toby/Code/claudette/runner/dist/runner-sse.js:202:23)\n    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)\n    at async RunnerApp.sendToOrchestratorWithRetry (/Users/toby/Code/claudette/runner/dist/runner-sse.js:447:24)\n    at async RunnerApp.notify (/Users/toby/Code/claudette/runner/dist/runner-sse.js:157:13)\n    at async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js:253:13","trace":[{"column":23,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"RunnerApp.sendToOrchestrator","line":202,"method":"sendToOrchestrator","native":false},{"column":5,"file":"node:internal/process/task_queues","function":"process.processTicksAndRejections","line":105,"method":"processTicksAndRejections","native":false},{"column":24,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"async RunnerApp.sendToOrchestratorWithRetry","line":447,"method":"sendToOrchestratorWithRetry","native":false},{"column":13,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"async RunnerApp.notify","line":157,"method":"notify","native":false},{"column":13,"file":"async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js","function":null,"line":253,"method":null,"native":false}]}
 {"date":"Tue Sep 09 2025 10:29:32 GMT+0200 (Central European Summer Time)","error":{},"level":"error","message":"unhandledRejection: HTTP 502: \nError: HTTP 502: \n    at RunnerApp.sendToOrchestrator (/Users/toby/Code/claudette/runner/dist/runner-sse.js:202:23)\n    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)\n    at async RunnerApp.sendToOrchestratorWithRetry (/Users/toby/Code/claudette/runner/dist/runner-sse.js:447:24)\n    at async RunnerApp.notify (/Users/toby/Code/claudette/runner/dist/runner-sse.js:157:13)\n    at async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js:253:13","os":{"loadavg":[3.1787109375,4.40380859375,4.64892578125],"uptime":236253},"process":{"argv":["/Users/toby/.nvm/versions/node/v22.15.0/bin/node","/Users/toby/Code/claudette/runner/bin/claudette-runner"],"cwd":"/Users/toby/Code/claudette/runner","execPath":"/Users/toby/.nvm/versions/node/v22.15.0/bin/node","gid":20,"memoryUsage":{"arrayBuffers":167387,"external":3725517,"heapTotal":25362432,"heapUsed":16211304,"rss":59359232},"pid":7619,"uid":501,"version":"v22.15.0"},"rejection":true,"stack":"Error: HTTP 502: \n    at RunnerApp.sendToOrchestrator (/Users/toby/Code/claudette/runner/dist/runner-sse.js:202:23)\n    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)\n    at async RunnerApp.sendToOrchestratorWithRetry (/Users/toby/Code/claudette/runner/dist/runner-sse.js:447:24)\n    at async RunnerApp.notify (/Users/toby/Code/claudette/runner/dist/runner-sse.js:157:13)\n    at async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js:253:13","trace":[{"column":23,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"RunnerApp.sendToOrchestrator","line":202,"method":"sendToOrchestrator","native":false},{"column":5,"file":"node:internal/process/task_queues","function":"process.processTicksAndRejections","line":105,"method":"processTicksAndRejections","native":false},{"column":24,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"async RunnerApp.sendToOrchestratorWithRetry","line":447,"method":"sendToOrchestratorWithRetry","native":false},{"column":13,"file":"/Users/toby/Code/claudette/runner/dist/runner-sse.js","function":"async RunnerApp.notify","line":157,"method":"notify","native":false},{"column":13,"file":"async /Users/toby/Code/claudette/runner/dist/components/claude-manager.js","function":null,"line":253,"method":null,"native":false}]}
 {"date":"Fri Oct 31 2025 15:15:47 GMT+0100 (Central European Standard Time)","error":{"code":"MODULE_NOT_FOUND","path":"/Users/toby/Code/claudette/runner/node_modules/@anthropic-ai/claude-code/package.json","requestPath":"@anthropic-ai/claude-code"},"level":"error","message":"unhandledRejection: Cannot find module '/Users/toby/Code/claudette/runner/node_modules/@anthropic-ai/claude-code/sdk.mjs'. Please verify that the package.json has a valid \"main\" entry\nError: Cannot find module '/Users/toby/Code/claudette/runner/node_modules/@anthropic-ai/claude-code/sdk.mjs'. Please verify that the package.json has a valid \"main\" entry\n    at tryPackage (node:internal/modules/cjs/loader:511:19)\n    at Function._findPath (node:internal/modules/cjs/loader:796:18)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)\n    at Module.require (node:internal/modules/cjs/loader:1487:12)\n    at require (node:internal/modules/helpers:135:16)","os":{"loadavg":[10.09228515625,5.86376953125,4.3662109375],"uptime":187703},"process":{"argv":["/Users/toby/.nvm/versions/node/v22.15.0/bin/node","/Users/toby/Code/claudette/runner/bin/claudette-runner"],"cwd":"/Users/toby/Code/claudette/runner","execPath":"/Users/toby/.nvm/versions/node/v22.15.0/bin/node","gid":20,"memoryUsage":{"arrayBuffers":12531,"external":1652665,"heapTotal":10829824,"heapUsed":7045984,"rss":56049664},"pid":4552,"uid":501,"version":"v22.15.0"},"rejection":true,"stack":"Error: Cannot find module '/Users/toby/Code/claudette/runner/node_modules/@anthropic-ai/claude-code/sdk.mjs'. Please verify that the package.json has a valid \"main\" entry\n    at tryPackage (node:internal/modules/cjs/loader:511:19)\n    at Function._findPath (node:internal/modules/cjs/loader:796:18)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)\n    at Module.require (node:internal/modules/cjs/loader:1487:12)\n    at require (node:internal/modules/helpers:135:16)","trace":[{"column":19,"file":"node:internal/modules/cjs/loader","function":"tryPackage","line":511,"method":null,"native":false},{"column":18,"file":"node:internal/modules/cjs/loader","function":"Function._findPath","line":796,"method":"_findPath","native":false},{"column":27,"file":"node:internal/modules/cjs/loader","function":"Function._resolveFilename","line":1387,"method":"_resolveFilename","native":false},{"column":19,"file":"node:internal/modules/cjs/loader","function":"defaultResolveImpl","line":1057,"method":null,"native":false},{"column":22,"file":"node:internal/modules/cjs/loader","function":"resolveForCJSWithHooks","line":1062,"method":null,"native":false},{"column":37,"file":"node:internal/modules/cjs/loader","function":"Function._load","line":1211,"method":"_load","native":false},{"column":14,"file":"node:diagnostics_channel","function":"TracingChannel.traceSync","line":322,"method":"traceSync","native":false},{"column":24,"file":"node:internal/modules/cjs/loader","function":"wrapModuleLoad","line":235,"method":null,"native":false},{"column":12,"file":"node:internal/modules/cjs/loader","function":"Module.require","line":1487,"method":"require","native":false},{"column":16,"file":"node:internal/modules/helpers","function":"require","line":135,"method":null,"native":false}]}
+{"date":"Tue Nov 18 2025 11:23:35 GMT+0100 (Central European Standard Time)","error":{"code":"ERR_PACKAGE_PATH_NOT_EXPORTED"},"level":"error","message":"unhandledRejection: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\nError [ERR_PACKAGE_PATH_NOT_EXPORTED]: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\n    at exportsNotFound (node:internal/modules/esm/resolve:314:10)\n    at packageExportsResolve (node:internal/modules/esm/resolve:604:13)\n    at resolveExports (node:internal/modules/cjs/loader:657:36)\n    at Function._findPath (node:internal/modules/cjs/loader:749:31)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)","os":{"loadavg":[4.82373046875,4.37255859375,4.115234375],"uptime":97198},"process":{"argv":["/Users/toby/.nvm/versions/node/v22.15.0/bin/node","/Users/toby/Code/claudette/runner/bin/northflare-runner"],"cwd":"/Users/toby/Code/claudette/runner","execPath":"/Users/toby/.nvm/versions/node/v22.15.0/bin/node","gid":20,"memoryUsage":{"arrayBuffers":18675,"external":2091282,"heapTotal":18972672,"heapUsed":12330016,"rss":65404928},"pid":95991,"uid":501,"version":"v22.15.0"},"rejection":true,"stack":"Error [ERR_PACKAGE_PATH_NOT_EXPORTED]: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\n    at exportsNotFound (node:internal/modules/esm/resolve:314:10)\n    at packageExportsResolve (node:internal/modules/esm/resolve:604:13)\n    at resolveExports (node:internal/modules/cjs/loader:657:36)\n    at Function._findPath (node:internal/modules/cjs/loader:749:31)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)","trace":[{"column":10,"file":"node:internal/modules/esm/resolve","function":"exportsNotFound","line":314,"method":null,"native":false},{"column":13,"file":"node:internal/modules/esm/resolve","function":"packageExportsResolve","line":604,"method":null,"native":false},{"column":36,"file":"node:internal/modules/cjs/loader","function":"resolveExports","line":657,"method":null,"native":false},{"column":31,"file":"node:internal/modules/cjs/loader","function":"Function._findPath","line":749,"method":"_findPath","native":false},{"column":27,"file":"node:internal/modules/cjs/loader","function":"Function._resolveFilename","line":1387,"method":"_resolveFilename","native":false},{"column":19,"file":"node:internal/modules/cjs/loader","function":"defaultResolveImpl","line":1057,"method":null,"native":false},{"column":22,"file":"node:internal/modules/cjs/loader","function":"resolveForCJSWithHooks","line":1062,"method":null,"native":false},{"column":37,"file":"node:internal/modules/cjs/loader","function":"Function._load","line":1211,"method":"_load","native":false},{"column":14,"file":"node:diagnostics_channel","function":"TracingChannel.traceSync","line":322,"method":"traceSync","native":false},{"column":24,"file":"node:internal/modules/cjs/loader","function":"wrapModuleLoad","line":235,"method":null,"native":false}]}
+{"date":"Tue Nov 18 2025 11:24:17 GMT+0100 (Central European Standard Time)","error":{"code":"ERR_PACKAGE_PATH_NOT_EXPORTED"},"level":"error","message":"unhandledRejection: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\nError [ERR_PACKAGE_PATH_NOT_EXPORTED]: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\n    at exportsNotFound (node:internal/modules/esm/resolve:314:10)\n    at packageExportsResolve (node:internal/modules/esm/resolve:604:13)\n    at resolveExports (node:internal/modules/cjs/loader:657:36)\n    at Function._findPath (node:internal/modules/cjs/loader:749:31)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)","os":{"loadavg":[7.13623046875,4.9140625,4.31787109375],"uptime":97240},"process":{"argv":["/Users/toby/.nvm/versions/node/v22.15.0/bin/node","/Users/toby/Code/claudette/runner/bin/northflare-runner"],"cwd":"/Users/toby/Code/claudette/runner","execPath":"/Users/toby/.nvm/versions/node/v22.15.0/bin/node","gid":20,"memoryUsage":{"arrayBuffers":18675,"external":2091282,"heapTotal":18710528,"heapUsed":12265536,"rss":65486848},"pid":99528,"uid":501,"version":"v22.15.0"},"rejection":true,"stack":"Error [ERR_PACKAGE_PATH_NOT_EXPORTED]: No \"exports\" main defined in /Users/toby/Code/claudette/runner/node_modules/@northflare/codex-sdk/package.json\n    at exportsNotFound (node:internal/modules/esm/resolve:314:10)\n    at packageExportsResolve (node:internal/modules/esm/resolve:604:13)\n    at resolveExports (node:internal/modules/cjs/loader:657:36)\n    at Function._findPath (node:internal/modules/cjs/loader:749:31)\n    at Function._resolveFilename (node:internal/modules/cjs/loader:1387:27)\n    at defaultResolveImpl (node:internal/modules/cjs/loader:1057:19)\n    at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1062:22)\n    at Function._load (node:internal/modules/cjs/loader:1211:37)\n    at TracingChannel.traceSync (node:diagnostics_channel:322:14)\n    at wrapModuleLoad (node:internal/modules/cjs/loader:235:24)","trace":[{"column":10,"file":"node:internal/modules/esm/resolve","function":"exportsNotFound","line":314,"method":null,"native":false},{"column":13,"file":"node:internal/modules/esm/resolve","function":"packageExportsResolve","line":604,"method":null,"native":false},{"column":36,"file":"node:internal/modules/cjs/loader","function":"resolveExports","line":657,"method":null,"native":false},{"column":31,"file":"node:internal/modules/cjs/loader","function":"Function._findPath","line":749,"method":"_findPath","native":false},{"column":27,"file":"node:internal/modules/cjs/loader","function":"Function._resolveFilename","line":1387,"method":"_resolveFilename","native":false},{"column":19,"file":"node:internal/modules/cjs/loader","function":"defaultResolveImpl","line":1057,"method":null,"native":false},{"column":22,"file":"node:internal/modules/cjs/loader","function":"resolveForCJSWithHooks","line":1062,"method":null,"native":false},{"column":37,"file":"node:internal/modules/cjs/loader","function":"Function._load","line":1211,"method":"_load","native":false},{"column":14,"file":"node:diagnostics_channel","function":"TracingChannel.traceSync","line":322,"method":"traceSync","native":false},{"column":24,"file":"node:internal/modules/cjs/loader","function":"wrapModuleLoad","line":235,"method":null,"native":false}]}

package/src/components/claude-sdk-manager.ts

@@ -15,6 +15,7 @@
  */
 
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
+import type { Conversation as ClaudeConversation } from "@botanicastudios/claude-code-sdk-ts";
 // Keep SDKMessage loosely typed to avoid tight coupling to SDK typings
 type SDKMessage = any;
 import { IRunnerApp } from "../types/runner-interface";
@@ -301,11 +302,11 @@ export class ClaudeManager {
     // Simplified MCP server configuration
     let mcpServers: Record<string, any> | undefined;
     if (config.mcpServers) {
+      mcpServers = expandEnv(config.mcpServers, { TOOL_TOKEN: toolToken });
       console.log(
         "[ClaudeManager] MCP servers configuration:",
-        JSON.stringify(config.mcpServers, null, 2)
+        JSON.stringify(mcpServers, null, 2)
       );
-      mcpServers = expandEnv(config.mcpServers, { TOOL_TOKEN: toolToken });
     }
 
     // Create input stream for user messages (simplified message queueing)
@@ -473,7 +474,9 @@ export class ClaudeManager {
         context.status = "stopped";
 
         // Properly end the conversation using the SDK
-        await context.conversation.end();
+        if (isClaudeConversation(context.conversation)) {
+          await context.conversation.end();
+        }
       } catch (error) {
         console.error(`Error ending conversation ${agentSessionId}:`, error);
       }
@@ -508,7 +511,7 @@ export class ClaudeManager {
 
     // After starting the conversation with the sessionId, we need to send a message
     // to actually trigger the Claude process to continue
-    if (context.conversation) {
+    if (context.conversation && isClaudeConversation(context.conversation)) {
       try {
         // Use the provided resume message or default to system instruction
         const messageToSend =
@@ -524,6 +527,10 @@ export class ClaudeManager {
       } catch (error) {
         console.error(`[ClaudeManager] Error sending resume message:`, error);
       }
+    } else {
+      console.warn(
+        "[ClaudeManager] Resume requested but conversation instance missing or incompatible"
+      );
     }
 
     return context.agentSessionId;
@@ -573,7 +580,8 @@ export class ClaudeManager {
     config?: ConversationConfig,
     conversationObjectType?: "Task" | "TaskPlan",
     conversationObjectId?: string,
-    conversation?: any
+    conversation?: any,
+    _agentSessionIdOverride?: string
   ): Promise<void> {
     console.log(`[ClaudeManager] sendUserMessage called with:`, {
       conversationId,
@@ -644,7 +652,7 @@ export class ClaudeManager {
 
     try {
       // Send immediately when a conversation instance exists; no need to wait for "active"
-      if (!context.conversation) {
+      if (!context.conversation || !isClaudeConversation(context.conversation)) {
         throw new Error(
           `No conversation instance found for conversation ${context.conversationId}`
         );
@@ -980,14 +988,17 @@ export class ClaudeManager {
         }
 
         case "thinking" as any: {
-          // Map thinking to assistant with subtype
-          messageType = "assistant";
-          subtype = "thinking";
+          messageType = "thinking";
+          subtype = undefined;
           const thinkingMsg = message as any;
-          structuredContent = {
-            text: thinkingMsg.content || "",
-            timestamp: new Date().toISOString(),
-          };
+          structuredContent = [
+            {
+              type: "thinking",
+              thinking: thinkingMsg.content || "",
+              text: thinkingMsg.content || "",
+              timestamp: new Date().toISOString(),
+            },
+          ];
           break;
         }
 
@@ -1402,3 +1413,12 @@ function createConversationWrapper(
     },
   };
 }
+function isClaudeConversation(
+  conversation: ConversationContext["conversation"]
+): conversation is ClaudeConversation {
+  return (
+    !!conversation &&
+    typeof (conversation as ClaudeConversation).send === "function" &&
+    typeof (conversation as ClaudeConversation).end === "function"
+  );
+}