@northflare/runner 0.0.33 → 0.0.34

package/dist/{dist-4E3H46W5.js → dist-GBG24TS5.js}

@@ -155,13 +155,44 @@ ${msg.content}`;
 }
 var INTERNAL_ORIGINATOR_ENV = "CODEX_INTERNAL_ORIGINATOR_OVERRIDE";
 var TYPESCRIPT_SDK_ORIGINATOR = "codex_sdk_ts";
-var isDebugEnabled = process.env["DEBUG"] === "true";
+function isCodexDebugEnabled() {
+  const runnerDebug = process.env["NORTHFLARE_RUNNER_DEBUG"];
+  if (runnerDebug && runnerDebug.trim().length > 0) {
+    return true;
+  }
+  const debug = process.env["DEBUG"];
+  if (!debug) return false;
+  const normalized = debug.toLowerCase();
+  if (normalized === "true" || normalized === "1" || normalized === "*") {
+    return true;
+  }
+  return normalized.split(",").map((entry) => entry.trim()).some((entry) => entry === "*" || entry.includes("codex"));
+}
 var CodexExec = class {
   executablePath;
+  executablePrefixArgs;
+  codexRuntimePath;
   envOverride;
   constructor(executablePath = null, env) {
-    this.executablePath = executablePath || findCodexPath();
+    if (executablePath) {
+      this.executablePath = executablePath;
+      this.executablePrefixArgs = [];
+      this.codexRuntimePath = executablePath;
+    } else {
+      const resolved = findCodexPath();
+      this.executablePath = resolved.path;
+      this.executablePrefixArgs = resolved.prefixArgs;
+      this.codexRuntimePath = resolved.runtimePath;
+    }
     this.envOverride = env;
+    if (isCodexDebugEnabled()) {
+      console.log("[CodexExec] Initialized with Codex runtime path:", this.codexRuntimePath);
+      console.log("[CodexExec] Initialized executable path:", this.executablePath);
+      console.log(
+        "[CodexExec] Initialized executable prefix args:",
+        this.executablePrefixArgs
+      );
+    }
   }
   async *run(args) {
     const commandArgs = ["exec", "--experimental-json"];
@@ -214,8 +245,10 @@ var CodexExec = class {
     if (args.threadId) {
       commandArgs.push("resume", args.threadId);
     }
-    if (isDebugEnabled) {
+    if (isCodexDebugEnabled()) {
+      console.log("[CodexExec] Codex runtime path:", this.codexRuntimePath);
       console.log("[CodexExec] Executable path:", this.executablePath);
+      console.log("[CodexExec] Executable prefix args:", this.executablePrefixArgs);
       console.log("[CodexExec] Command arguments:", commandArgs);
     }
     const env = {};
@@ -244,10 +277,14 @@ var CodexExec = class {
     if (args.apiKey) {
       env.CODEX_API_KEY = args.apiKey;
     }
-    const child = spawn(this.executablePath, commandArgs, {
-      env,
-      signal: args.signal
-    });
+    const child = spawn(
+      this.executablePath,
+      [...this.executablePrefixArgs, ...commandArgs],
+      {
+        env,
+        signal: args.signal
+      }
+    );
     let spawnError = null;
     child.once("error", (err) => spawnError = err);
     if (!child.stdin) {
@@ -300,7 +337,19 @@ var CodexExec = class {
 };
 var moduleRequire = createRequire(import.meta.url);
 function findCodexPath() {
-  const candidates = process.platform === "win32" ? ["codex.cmd", "codex.ps1", "codex"] : ["codex"];
+  const directCodexSearchPaths = moduleRequire.resolve.paths("@openai/codex") ?? [];
+  for (const basePath of directCodexSearchPaths) {
+    if (!basePath) continue;
+    const entrypoint = path2.join(basePath, "@openai", "codex", "bin", "codex.js");
+    if (!existsSync(entrypoint)) continue;
+    const resolvedEntrypoint = realpathSync(entrypoint);
+    return {
+      path: process.execPath,
+      prefixArgs: [resolvedEntrypoint],
+      runtimePath: resolvedEntrypoint
+    };
+  }
+  const shimCandidates = process.platform === "win32" ? ["codex.cmd", "codex.ps1", "codex"] : ["codex"];
   const searchPaths = moduleRequire.resolve.paths("@openai/codex-sdk") ?? [];
   for (const basePath of searchPaths) {
     if (!basePath) continue;
@@ -308,14 +357,38 @@ function findCodexPath() {
     if (!existsSync(path2.join(codexSdkPackageRoot, "package.json"))) {
       continue;
     }
-    for (const binName of candidates) {
-      const binPath = path2.join(codexSdkPackageRoot, "node_modules", ".bin", binName);
-      if (!existsSync(binPath)) continue;
-      return realpathSync(binPath);
+    const shimRoots = [
+      path2.join(codexSdkPackageRoot, "node_modules", ".bin"),
+      path2.join(basePath, ".bin")
+    ];
+    for (const shimRoot of shimRoots) {
+      for (const binName of shimCandidates) {
+        const binPath = path2.join(shimRoot, binName);
+        if (!existsSync(binPath)) continue;
+        const resolvedBinPath = realpathSync(binPath);
+        return {
+          path: resolvedBinPath,
+          prefixArgs: [],
+          runtimePath: resolvedBinPath
+        };
+      }
+    }
+    const jsEntrypoints = [
+      path2.join(codexSdkPackageRoot, "node_modules", "@openai", "codex", "bin", "codex.js"),
+      path2.join(basePath, "@openai", "codex", "bin", "codex.js")
+    ];
+    for (const entrypoint of jsEntrypoints) {
+      if (!existsSync(entrypoint)) continue;
+      const resolvedEntrypoint = realpathSync(entrypoint);
+      return {
+        path: process.execPath,
+        prefixArgs: [resolvedEntrypoint],
+        runtimePath: resolvedEntrypoint
+      };
     }
   }
   throw new Error(
-    `[Codex SDK] Unable to locate the Codex CLI entrypoint installed by @openai/codex-sdk. Try re-running \`pnpm install\` and ensure optional dependencies are enabled.`
+    `[Codex SDK] Unable to locate the Codex CLI entrypoint from @openai/codex/@openai/codex-sdk. Try re-running \`npm install\` (or \`pnpm install\`) and ensure optional dependencies are enabled.`
   );
 }
 function formatConfigValue(value) {
@@ -363,4 +436,4 @@ export {
   Codex,
   Thread
 };
-//# sourceMappingURL=dist-4E3H46W5.js.map
+//# sourceMappingURL=dist-GBG24TS5.js.map

package/dist/dist-GBG24TS5.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../codex-sdk/src/outputSchemaFile.ts","../../codex-sdk/src/thread.ts","../../codex-sdk/src/exec.ts","../../codex-sdk/src/codex.ts"],"sourcesContent":["import { promises as fs } from \"node:fs\";\nimport os from \"node:os\";\nimport path from \"node:path\";\n\nexport type OutputSchemaFile = {\n  schemaPath?: string;\n  cleanup: () => Promise<void>;\n};\n\nexport async function createOutputSchemaFile(schema: unknown): Promise<OutputSchemaFile> {\n  if (schema === undefined) {\n    return { cleanup: async () => {} };\n  }\n\n  if (!isJsonObject(schema)) {\n    throw new Error(\"outputSchema must be a plain JSON object\");\n  }\n\n  const schemaDir = await fs.mkdtemp(path.join(os.tmpdir(), \"codex-output-schema-\"));\n  const schemaPath = path.join(schemaDir, \"schema.json\");\n  const cleanup = async () => {\n    try {\n      await fs.rm(schemaDir, { recursive: true, force: true });\n    } catch {\n      // suppress\n    }\n  };\n\n  try {\n    await fs.writeFile(schemaPath, JSON.stringify(schema), \"utf8\");\n    return { schemaPath, cleanup };\n  } catch (error) {\n    await cleanup();\n    throw error;\n  }\n}\n\nfunction isJsonObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n","import { CodexOptions } from \"./codexOptions\";\nimport { ThreadEvent, ThreadError, Usage } from \"./events\";\nimport { CodexExec } from \"./exec\";\nimport { ThreadItem } from \"./items\";\nimport { ThreadOptions } from \"./threadOptions\";\nimport { TurnOptions } from \"./turnOptions\";\nimport { createOutputSchemaFile } from \"./outputSchemaFile\";\n\n/** Completed turn. */\nexport type Turn = {\n  items: ThreadItem[];\n  finalResponse: string;\n  usage: Usage | null;\n};\n\n/** Alias for `Turn` to describe the result of `run()`. */\nexport type RunResult = Turn;\n\n/** The result of the `runStreamed` method. */\nexport type StreamedTurn = {\n  events: AsyncGenerator<ThreadEvent>;\n};\n\n/** Alias for `StreamedTurn` to describe the result of `runStreamed()`. */\nexport type RunStreamedResult = StreamedTurn;\n\n/** An input to send to the agent. */\nexport type UserInput =\n  | {\n      type: \"text\";\n      text: string;\n    }\n  | {\n      type: \"local_image\";\n      path: string;\n    };\n\nexport type Input = string | UserInput[];\n\n/** Respesent a thread of conversation with the agent. One thread can have multiple consecutive turns. */\nexport class Thread {\n  private _exec: CodexExec;\n  private _options: CodexOptions;\n  private _id: string | null;\n  private _threadOptions: ThreadOptions;\n  private _initialMessagesSent: boolean = false;\n\n  /** Returns the ID of the thread. Populated after the first turn starts. */\n  public get id(): string | null {\n    return this._id;\n  }\n\n  /* @internal */\n  constructor(\n    exec: CodexExec,\n    options: CodexOptions,\n    threadOptions: ThreadOptions,\n    id: string | null = null,\n  ) {\n    this._exec = exec;\n    this._options = options;\n    this._id = id;\n    this._threadOptions = threadOptions;\n    // If resuming an existing thread, initial messages have already been sent\n    this._initialMessagesSent = id !== null;\n  }\n\n  /** Provides the input to the agent and streams events as they are produced during the turn. */\n  async runStreamed(input: Input, turnOptions: TurnOptions = {}): Promise<StreamedTurn> {\n    return { events: this.runStreamedInternal(input, turnOptions) };\n  }\n\n  private async *runStreamedInternal(\n    input: Input,\n    turnOptions: TurnOptions = {},\n  ): AsyncGenerator<ThreadEvent> {\n    const { schemaPath, cleanup } = await createOutputSchemaFile(turnOptions.outputSchema);\n    const options = this._threadOptions;\n    const { prompt, images } = normalizeInput(input);\n\n    // Prepend initial messages on the first turn only\n    let finalPrompt = prompt;\n    if (!this._initialMessagesSent && options.initialMessages?.length) {\n      const formattedMessages = formatInitialMessages(options.initialMessages);\n      finalPrompt = formattedMessages + \"\\n\\n\" + prompt;\n      this._initialMessagesSent = true;\n    }\n\n    const generator = this._exec.run({\n      input: finalPrompt,\n      baseUrl: this._options.baseUrl,\n      apiKey: this._options.apiKey,\n      threadId: this._id,\n      images,\n      model: options?.model,\n      sandboxMode: options?.sandboxMode,\n      workingDirectory: options?.workingDirectory,\n      skipGitRepoCheck: options?.skipGitRepoCheck,\n      outputSchemaFile: schemaPath,\n      modelReasoningEffort: options?.modelReasoningEffort,\n      signal: turnOptions.signal,\n      networkAccessEnabled: options?.networkAccessEnabled,\n      webSearchEnabled: options?.webSearchEnabled,\n      approvalPolicy: options?.approvalPolicy,\n      additionalDirectories: options?.additionalDirectories,\n      configOverrides: options?.configOverrides,\n    });\n    try {\n      for await (const item of generator) {\n        let parsed: ThreadEvent;\n        try {\n          parsed = JSON.parse(item) as ThreadEvent;\n        } catch (error) {\n          throw new Error(`Failed to parse item: ${item}`, { cause: error });\n        }\n        if (parsed.type === \"thread.started\") {\n          this._id = parsed.thread_id;\n        }\n        yield parsed;\n      }\n    } finally {\n      await cleanup();\n    }\n  }\n\n  /** Provides the input to the agent and returns the completed turn. */\n  async run(input: Input, turnOptions: TurnOptions = {}): Promise<Turn> {\n    const generator = this.runStreamedInternal(input, turnOptions);\n    const items: ThreadItem[] = [];\n    let finalResponse: string = \"\";\n    let usage: Usage | null = null;\n    let turnFailure: ThreadError | null = null;\n    for await (const event of generator) {\n      if (event.type === \"item.completed\") {\n        if (event.item.type === \"agent_message\") {\n          finalResponse = event.item.text;\n        }\n        items.push(event.item);\n      } else if (event.type === \"turn.completed\") {\n        usage = event.usage;\n      } else if (event.type === \"turn.failed\") {\n        turnFailure = event.error;\n        break;\n      }\n    }\n    if (turnFailure) {\n      throw new Error(turnFailure.message);\n    }\n    return { items, finalResponse, usage };\n  }\n}\n\nfunction normalizeInput(input: Input): { prompt: string; images: string[] } {\n  if (typeof input === \"string\") {\n    return { prompt: input, images: [] };\n  }\n  const promptParts: string[] = [];\n  const images: string[] = [];\n  for (const item of input) {\n    if (item.type === \"text\") {\n      promptParts.push(item.text);\n    } else if (item.type === \"local_image\") {\n      images.push(item.path);\n    }\n  }\n  return { prompt: promptParts.join(\"\\n\\n\"), images };\n}\n\nimport type { InitialMessage } from \"./threadOptions\";\n\n/**\n * Format initial messages into a structured prompt section.\n * Each message is wrapped with role markers to preserve semantic meaning.\n */\nfunction formatInitialMessages(messages: InitialMessage[]): string {\n  return messages\n    .map((msg) => {\n      const roleLabel = msg.role.charAt(0).toUpperCase() + msg.role.slice(1);\n      return `[${roleLabel}]\\n${msg.content}`;\n    })\n    .join(\"\\n\\n\");\n}\n","import { spawn } from \"node:child_process\";\nimport { existsSync, realpathSync } from \"node:fs\";\nimport path from \"node:path\";\nimport readline from \"node:readline\";\nimport { createRequire } from \"node:module\";\n\nimport { SandboxMode, ModelReasoningEffort, ApprovalMode } from \"./threadOptions\";\n\nexport type CodexExecArgs = {\n  input: string;\n\n  baseUrl?: string;\n  apiKey?: string;\n  threadId?: string | null;\n  images?: string[];\n  // --model\n  model?: string;\n  // --sandbox\n  sandboxMode?: SandboxMode;\n  // --cd\n  workingDirectory?: string;\n  // --add-dir\n  additionalDirectories?: string[];\n  // --skip-git-repo-check\n  skipGitRepoCheck?: boolean;\n  // --output-schema\n  outputSchemaFile?: string;\n  // --config model_reasoning_effort\n  modelReasoningEffort?: ModelReasoningEffort;\n  // AbortSignal to cancel the execution\n  signal?: AbortSignal;\n  // --config sandbox_workspace_write.network_access\n  networkAccessEnabled?: boolean;\n  // --config features.web_search_request\n  webSearchEnabled?: boolean;\n  // --config approval_policy\n  approvalPolicy?: ApprovalMode;\n  // Generic config overrides for `-c key=value`\n  configOverrides?: Record<string, unknown>;\n};\n\nconst INTERNAL_ORIGINATOR_ENV = \"CODEX_INTERNAL_ORIGINATOR_OVERRIDE\";\nconst TYPESCRIPT_SDK_ORIGINATOR = \"codex_sdk_ts\";\n\nfunction isCodexDebugEnabled(): boolean {\n  const runnerDebug = process.env[\"NORTHFLARE_RUNNER_DEBUG\"];\n  if (runnerDebug && runnerDebug.trim().length > 0) {\n    return true;\n  }\n\n  const debug = process.env[\"DEBUG\"];\n  if (!debug) return false;\n\n  const normalized = debug.toLowerCase();\n  if (normalized === \"true\" || normalized === \"1\" || normalized === \"*\") {\n    return true;\n  }\n\n  return normalized\n    .split(\",\")\n    .map((entry) => entry.trim())\n    .some((entry) => entry === \"*\" || entry.includes(\"codex\"));\n}\n\ntype ResolvedCodexExecutable = {\n  path: string;\n  prefixArgs: string[];\n  runtimePath: string;\n};\n\nexport class CodexExec {\n  private executablePath: string;\n  private executablePrefixArgs: string[];\n  private codexRuntimePath: string;\n  private envOverride?: Record<string, string>;\n\n  constructor(executablePath: string | null = null, env?: Record<string, string>) {\n    if (executablePath) {\n      this.executablePath = executablePath;\n      this.executablePrefixArgs = [];\n      this.codexRuntimePath = executablePath;\n    } else {\n      const resolved = findCodexPath();\n      this.executablePath = resolved.path;\n      this.executablePrefixArgs = resolved.prefixArgs;\n      this.codexRuntimePath = resolved.runtimePath;\n    }\n    this.envOverride = env;\n\n    if (isCodexDebugEnabled()) {\n      console.log(\"[CodexExec] Initialized with Codex runtime path:\", this.codexRuntimePath);\n      console.log(\"[CodexExec] Initialized executable path:\", this.executablePath);\n      console.log(\n        \"[CodexExec] Initialized executable prefix args:\",\n        this.executablePrefixArgs\n      );\n    }\n  }\n\n  async *run(args: CodexExecArgs): AsyncGenerator<string> {\n    const commandArgs: string[] = [\"exec\", \"--experimental-json\"];\n\n    if (args.model) {\n      commandArgs.push(\"--model\", args.model);\n    }\n\n    if (args.sandboxMode) {\n      commandArgs.push(\"--sandbox\", args.sandboxMode);\n    }\n\n    if (args.workingDirectory) {\n      commandArgs.push(\"--cd\", args.workingDirectory);\n    }\n\n    if (args.additionalDirectories?.length) {\n      for (const dir of args.additionalDirectories) {\n        commandArgs.push(\"--add-dir\", dir);\n      }\n    }\n\n    if (args.skipGitRepoCheck) {\n      commandArgs.push(\"--skip-git-repo-check\");\n    }\n\n    if (args.outputSchemaFile) {\n      commandArgs.push(\"--output-schema\", args.outputSchemaFile);\n    }\n\n    if (args.modelReasoningEffort) {\n      commandArgs.push(\"--config\", `model_reasoning_effort=\"${args.modelReasoningEffort}\"`);\n    }\n\n    if (args.networkAccessEnabled !== undefined) {\n      commandArgs.push(\n        \"--config\",\n        `sandbox_workspace_write.network_access=${args.networkAccessEnabled}`,\n      );\n    }\n\n    if (args.webSearchEnabled !== undefined) {\n      commandArgs.push(\"--config\", `features.web_search_request=${args.webSearchEnabled}`);\n    }\n\n    if (args.approvalPolicy) {\n      commandArgs.push(\"--config\", `approval_policy=\"${args.approvalPolicy}\"`);\n    }\n\n    if (args.configOverrides) {\n      for (const [key, value] of Object.entries(args.configOverrides)) {\n        const formatted = formatConfigValue(value);\n        commandArgs.push(\"--config\", `${key}=${formatted}`);\n      }\n    }\n\n    if (args.images?.length) {\n      for (const image of args.images) {\n        commandArgs.push(\"--image\", image);\n      }\n    }\n\n    if (args.threadId) {\n      commandArgs.push(\"resume\", args.threadId);\n    }\n\n    if (isCodexDebugEnabled()) {\n      console.log(\"[CodexExec] Codex runtime path:\", this.codexRuntimePath);\n      console.log(\"[CodexExec] Executable path:\", this.executablePath);\n      console.log(\"[CodexExec] Executable prefix args:\", this.executablePrefixArgs);\n      console.log(\"[CodexExec] Command arguments:\", commandArgs);\n    }\n\n    const env: Record<string, string> = {};\n    if (this.envOverride) {\n      Object.assign(env, this.envOverride);\n      const hasPathKey = Object.keys(env).some((key) => key.toUpperCase() === \"PATH\");\n      if (!hasPathKey) {\n        const inheritedPathKey = Object.keys(process.env).find((key) => key.toUpperCase() === \"PATH\");\n        if (inheritedPathKey && process.env[inheritedPathKey]) {\n          env.PATH = process.env[inheritedPathKey]!;\n        }\n      }\n    } else {\n      for (const [key, value] of Object.entries(process.env)) {\n        if (value !== undefined) {\n          env[key] = value;\n        }\n      }\n    }\n    if (!env[INTERNAL_ORIGINATOR_ENV]) {\n      env[INTERNAL_ORIGINATOR_ENV] = TYPESCRIPT_SDK_ORIGINATOR;\n    }\n    if (args.baseUrl) {\n      env.OPENAI_BASE_URL = args.baseUrl;\n    }\n    if (args.apiKey) {\n      env.CODEX_API_KEY = args.apiKey;\n    }\n\n    const child = spawn(\n      this.executablePath,\n      [...this.executablePrefixArgs, ...commandArgs],\n      {\n      env,\n      signal: args.signal,\n      }\n    );\n\n    let spawnError: unknown | null = null;\n    child.once(\"error\", (err) => (spawnError = err));\n\n    if (!child.stdin) {\n      child.kill();\n      throw new Error(\"Child process has no stdin\");\n    }\n    child.stdin.write(args.input);\n    child.stdin.end();\n\n    if (!child.stdout) {\n      child.kill();\n      throw new Error(\"Child process has no stdout\");\n    }\n    const stderrChunks: Buffer[] = [];\n\n    if (child.stderr) {\n      child.stderr.on(\"data\", (data) => {\n        stderrChunks.push(data);\n      });\n    }\n\n    const rl = readline.createInterface({\n      input: child.stdout,\n      crlfDelay: Infinity,\n    });\n\n    try {\n      for await (const line of rl) {\n        // `line` is a string (Node sets default encoding to utf8 for readline)\n        yield line as string;\n      }\n\n      const exitCode = new Promise((resolve, reject) => {\n        child.once(\"exit\", (code) => {\n          if (code === 0) {\n            resolve(code);\n          } else {\n            const stderrBuffer = Buffer.concat(stderrChunks);\n            reject(\n              new Error(`Codex Exec exited with code ${code}: ${stderrBuffer.toString(\"utf8\")}`),\n            );\n          }\n        });\n      });\n\n      if (spawnError) throw spawnError;\n      await exitCode;\n    } finally {\n      rl.close();\n      child.removeAllListeners();\n      try {\n        if (!child.killed) child.kill();\n      } catch {\n        // ignore\n      }\n    }\n  }\n}\n\nconst moduleRequire = createRequire(import.meta.url);\n\nfunction findCodexPath(): ResolvedCodexExecutable {\n  // Prefer a single canonical runtime source:\n  // - @openai/codex/bin/codex.js (invoked with node)\n  const directCodexSearchPaths = moduleRequire.resolve.paths(\"@openai/codex\") ?? [];\n  for (const basePath of directCodexSearchPaths) {\n    if (!basePath) continue;\n    const entrypoint = path.join(basePath, \"@openai\", \"codex\", \"bin\", \"codex.js\");\n    if (!existsSync(entrypoint)) continue;\n    const resolvedEntrypoint = realpathSync(entrypoint);\n    return {\n      path: process.execPath,\n      prefixArgs: [resolvedEntrypoint],\n      runtimePath: resolvedEntrypoint,\n    };\n  }\n\n  // Compatibility fallback for mixed npm/pnpm layouts:\n  // - pnpm nested shim: @openai/codex-sdk/node_modules/.bin/codex\n  // - npm/hoisted shim: <node_modules>/.bin/codex\n  // - direct JS entry: @openai/codex/bin/codex.js (invoked with node)\n  //\n  // We always realpath shims so wrapper-relative paths work correctly.\n  const shimCandidates =\n    process.platform === \"win32\" ? [\"codex.cmd\", \"codex.ps1\", \"codex\"] : [\"codex\"];\n\n  const searchPaths = moduleRequire.resolve.paths(\"@openai/codex-sdk\") ?? [];\n  for (const basePath of searchPaths) {\n    if (!basePath) continue;\n    const codexSdkPackageRoot = path.join(basePath, \"@openai\", \"codex-sdk\");\n    if (!existsSync(path.join(codexSdkPackageRoot, \"package.json\"))) {\n      continue;\n    }\n\n    const shimRoots = [\n      path.join(codexSdkPackageRoot, \"node_modules\", \".bin\"),\n      path.join(basePath, \".bin\"),\n    ];\n\n    for (const shimRoot of shimRoots) {\n      for (const binName of shimCandidates) {\n        const binPath = path.join(shimRoot, binName);\n        if (!existsSync(binPath)) continue;\n        const resolvedBinPath = realpathSync(binPath);\n        return {\n          path: resolvedBinPath,\n          prefixArgs: [],\n          runtimePath: resolvedBinPath,\n        };\n      }\n    }\n\n    const jsEntrypoints = [\n      path.join(codexSdkPackageRoot, \"node_modules\", \"@openai\", \"codex\", \"bin\", \"codex.js\"),\n      path.join(basePath, \"@openai\", \"codex\", \"bin\", \"codex.js\"),\n    ];\n\n    for (const entrypoint of jsEntrypoints) {\n      if (!existsSync(entrypoint)) continue;\n      const resolvedEntrypoint = realpathSync(entrypoint);\n      return {\n        path: process.execPath,\n        prefixArgs: [resolvedEntrypoint],\n        runtimePath: resolvedEntrypoint,\n      };\n    }\n  }\n\n  throw new Error(\n    `[Codex SDK] Unable to locate the Codex CLI entrypoint from @openai/codex/@openai/codex-sdk. ` +\n      `Try re-running \\`npm install\\` (or \\`pnpm install\\`) and ensure optional dependencies are enabled.`,\n  );\n}\n\nfunction formatConfigValue(value: unknown): string {\n  if (typeof value === \"string\") {\n    return JSON.stringify(value);\n  }\n  if (typeof value === \"number\" || typeof value === \"boolean\") {\n    return String(value);\n  }\n  if (value === null || value === undefined) {\n    return \"null\";\n  }\n  try {\n    return JSON.stringify(value);\n  } catch {\n    return JSON.stringify(String(value));\n  }\n}\n","import { CodexOptions } from \"./codexOptions\";\nimport { CodexExec } from \"./exec\";\nimport { Thread } from \"./thread\";\nimport { ThreadOptions } from \"./threadOptions\";\n\n/**\n * Codex is the main class for interacting with the Codex agent.\n *\n * Use the `startThread()` method to start a new thread or `resumeThread()` to resume a previously started thread.\n */\nexport class Codex {\n  private exec: CodexExec;\n  private options: CodexOptions;\n\n  constructor(options: CodexOptions = {}) {\n    this.exec = new CodexExec(options.codexPathOverride, options.env);\n    this.options = options;\n  }\n\n  /**\n   * Starts a new conversation with an agent.\n   * @returns A new thread instance.\n   */\n  startThread(options: ThreadOptions = {}): Thread {\n    return new Thread(this.exec, this.options, options);\n  }\n\n  /**\n   * Resumes a conversation with an agent based on the thread id.\n   * Threads are persisted in ~/.codex/sessions.\n   *\n   * @param id The id of the thread to resume.\n   * @returns A new thread instance.\n   */\n  resumeThread(id: string, options: ThreadOptions = {}): Thread {\n    return new Thread(this.exec, this.options, options, id);\n  }\n}\n"],"mappings":"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","names":["path"]}

package/dist/index.js

@@ -3323,7 +3323,7 @@ function buildSystemPromptWithNorthflare(basePrompt, northflarePrompt) {
 var codexSdkPromise = null;
 async function loadCodexSdk() {
   if (!codexSdkPromise) {
-    codexSdkPromise = import("./dist-4E3H46W5.js");
+    codexSdkPromise = import("./dist-GBG24TS5.js");
   }
   return codexSdkPromise;
 }
@@ -6346,10 +6346,53 @@ Please resolve the conflicts in that directory and complete the in-progress git
         }
         case "result": {
           const resultMsg = message;
-          structuredContent = {
-            text: resultMsg.content || resultMsg.result || "",
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          };
+          const resultIsError = resultMsg.is_error === true;
+          const resultSubtype = resultMsg.subtype || "success";
+          const errorMessage = resultMsg.error_message || resultMsg.result || "";
+          if (resultIsError) {
+            context.metadata = context.metadata || {};
+            context.metadata["_sdkError"] = {
+              isError: true,
+              errorMessage,
+              subtype: resultSubtype
+            };
+            console4.log(
+              "[NorthflareAgentManager] SDK result message indicates error",
+              {
+                conversationId: context.conversationId,
+                subtype: resultSubtype,
+                errorMessage: errorMessage?.slice?.(0, 200)
+              }
+            );
+            messageType = "system";
+            subtype = "error";
+            isError = true;
+            structuredContent = {
+              text: errorMessage || "SDK execution error",
+              errorType: resultSubtype,
+              errorDetails: {
+                sdk_subtype: resultSubtype,
+                duration_ms: resultMsg.duration_ms,
+                num_turns: resultMsg.num_turns
+              },
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            };
+          } else if (typeof resultMsg.content === "string" || typeof resultMsg.result === "string") {
+            structuredContent = {
+              text: resultMsg.content || resultMsg.result || "",
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            };
+          } else {
+            console4.log(
+              "[NorthflareAgentManager] SDK result message (success)",
+              {
+                conversationId: context.conversationId,
+                subtype: resultSubtype,
+                resultPreview: (resultMsg.result || "").slice?.(0, 100)
+              }
+            );
+            skipSend = true;
+          }
           break;
         }
         case "user": {
@@ -6473,52 +6516,6 @@ Please resolve the conflicts in that directory and complete the in-progress git
           };
           break;
         }
-        case "result": {
-          const resultMsg = message;
-          const resultIsError = resultMsg.is_error === true;
-          const resultSubtype = resultMsg.subtype || "success";
-          const errorMessage = resultMsg.error_message || resultMsg.result || "";
-          if (resultIsError) {
-            context.metadata = context.metadata || {};
-            context.metadata["_sdkError"] = {
-              isError: true,
-              errorMessage,
-              subtype: resultSubtype
-            };
-            console4.log(
-              "[NorthflareAgentManager] SDK result message indicates error",
-              {
-                conversationId: context.conversationId,
-                subtype: resultSubtype,
-                errorMessage: errorMessage?.slice?.(0, 200)
-              }
-            );
-            messageType = "system";
-            subtype = "error";
-            isError = true;
-            structuredContent = {
-              text: errorMessage || "SDK execution error",
-              errorType: resultSubtype,
-              errorDetails: {
-                sdk_subtype: resultSubtype,
-                duration_ms: resultMsg.duration_ms,
-                num_turns: resultMsg.num_turns
-              },
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
-            };
-          } else {
-            console4.log(
-              "[NorthflareAgentManager] SDK result message (success)",
-              {
-                conversationId: context.conversationId,
-                subtype: resultSubtype,
-                resultPreview: (resultMsg.result || "").slice?.(0, 100)
-              }
-            );
-            skipSend = true;
-          }
-          break;
-        }
         default: {
           const unknownMsg = message;
           console4.warn(`Unknown message type: ${unknownMsg.type}`, message);