@northflare/runner 0.0.8 → 0.0.10

package/src/components/message-handler-sse.ts

@@ -3,12 +3,18 @@
  */
 
 import { IRunnerApp } from "../types/runner-interface";
-import { RunnerMessage, MethodHandler, ConversationContext } from "../types";
+import {
+  RunnerMessage,
+  MethodHandler,
+  ConversationContext,
+  ConversationConfig,
+} from "../types";
 import { SSEClient, SSEEvent } from "../services/SSEClient";
 import { RunnerAPIClient } from "../services/RunnerAPIClient";
 import { statusLineManager } from "../utils/status-line";
 import { console } from "../utils/console";
 import { createLogger } from "../utils/logger";
+import { isRunnerDebugEnabled } from "../utils/debug";
 
 const logger = createLogger("MessageHandler");
 
@@ -151,7 +157,7 @@ export class MessageHandler {
     if (event.type === "runner.message") {
       const message = event.data as RunnerMessage;
 
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Received SSE event", {
           eventId: event.id,
           type: event.type,
@@ -178,7 +184,7 @@ export class MessageHandler {
   }
 
   private async processMessage(message: RunnerMessage): Promise<void> {
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("processMessage called", {
         messageId: message.id,
         method: message.payload?.method,
@@ -211,7 +217,7 @@ export class MessageHandler {
       return;
     }
 
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("Processing message", {
         messageId: message.id,
         method: method,
@@ -227,7 +233,7 @@ export class MessageHandler {
       // Acknowledge ALL messages to update lastProcessedAt
       await this.acknowledgeMessage(message);
 
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Message acknowledged", {
           messageId: message.id,
           method: method,
@@ -236,7 +242,7 @@ export class MessageHandler {
         });
       }
     } catch (error) {
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Message processing error", {
           messageId: message.id,
           method: method,
@@ -293,7 +299,7 @@ export class MessageHandler {
       };
     })();
 
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("Message processing decision", {
         messageId: message.id,
         method: message.payload?.method,
@@ -361,7 +367,7 @@ export class MessageHandler {
       console.error(
         `[MessageHandler] Cannot send error report - no conversationObjectId available. Error: ${errorMessage}`
       );
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Error without conversationObjectId", {
           messageId: message.id,
           method: message.payload?.method,
@@ -398,7 +404,7 @@ export class MessageHandler {
       console.error(
         `[MessageHandler] Cannot send error report - no conversationObjectId available. Processing error: ${errorMessage}`
       );
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Processing error without conversationObjectId", {
           messageId: message.id,
           method: message.payload?.method,
@@ -499,8 +505,11 @@ export class MessageHandler {
       }
     );
 
+    const provider = this.resolveAgentProvider(conversationData, config);
+    const manager = this.getManagerForProvider(provider);
+
     // Start the conversation with the provided/loaded conversation details
-    await this.runner.claudeManager_.startConversation(
+    await manager.startConversation(
       finalObjectType,
       finalObjectId,
       config,
@@ -551,7 +560,8 @@ export class MessageHandler {
 
     if (context && targetConversationId) {
       context.status = "stopping";
-      await this.runner.claudeManager_.stopConversation(
+      const manager = this.getManagerForConversationContext(context);
+      await manager.stopConversation(
         context.agentSessionId,
         context,
         false, // Not a runner shutdown
@@ -611,7 +621,9 @@ export class MessageHandler {
       throw new Error("Cannot resume conversation without agentSessionId");
     }
 
-    await this.runner.claudeManager_.resumeConversation(
+    const provider = this.resolveAgentProvider(conversationData, config);
+    const manager = this.getManagerForProvider(provider);
+    await manager.resumeConversation(
       conversationData.objectType,
       conversationData.objectId,
       agentSessionId,
@@ -666,7 +678,9 @@ export class MessageHandler {
     );
 
     // Stop the current conversation
-    await this.runner.claudeManager_.stopConversation(
+    const manager = this.getManagerForConversationContext(context);
+
+    await manager.stopConversation(
       context.agentSessionId,
       context,
       false // Not a runner shutdown, just updating config
@@ -680,7 +694,7 @@ export class MessageHandler {
     );
 
     // Resume with new config
-    await this.runner.claudeManager_.resumeConversation(
+    await manager.resumeConversation(
       context.conversationObjectType,
       context.conversationObjectId,
       context.agentSessionId,
@@ -717,6 +731,7 @@ export class MessageHandler {
       conversationObjectType = message.conversationObjectType || "Task",
       conversationObjectId = message.conversationObjectId,
       conversation,
+      agentSessionId,
     } = params;
 
     // Validate required parameters
@@ -728,13 +743,21 @@ export class MessageHandler {
       throw new Error("Missing required parameter: content");
     }
 
-    await this.runner.claudeManager_.sendUserMessage(
+    const existingContext = this.runner.getConversationContext(conversationId);
+    const manager = existingContext
+      ? this.getManagerForConversationContext(existingContext)
+      : this.getManagerForProvider(
+          this.resolveAgentProvider(conversation, config)
+        );
+
+    await manager.sendUserMessage(
       conversationId,
       content,
       config,
       conversationObjectType,
       conversationObjectId,
-      conversation
+      conversation,
+      agentSessionId
     );
   }
 
@@ -748,7 +771,7 @@ export class MessageHandler {
       `MessageHandler: Handling UID change notification - new UID: ${runnerUid}, lastProcessedAt: ${lastProcessedAt}`
     );
 
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("UID change notification received", {
         newUid: runnerUid,
         currentUid: this.runner.getRunnerUid(),
@@ -770,7 +793,7 @@ export class MessageHandler {
         lastProcessedAt ? new Date(lastProcessedAt) : null
       );
 
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Runner activated as primary", {
           runnerUid: runnerUid,
           lastProcessedAt: lastProcessedAt,
@@ -786,7 +809,7 @@ export class MessageHandler {
         });
       } catch (error) {
         console.error("Failed to send activation notification:", error);
-        if (process.env["DEBUG"] === "true") {
+        if (isRunnerDebugEnabled()) {
           logger.debug("Activation notification failed", {
             error: error instanceof Error ? error.message : String(error),
           });
@@ -808,7 +831,7 @@ export class MessageHandler {
           console.log(
             `MessageHandler: Ignoring old UID change (${lastProcessedAt} < ${currentLastProcessedAt.toISOString()})`
           );
-          if (process.env["DEBUG"] === "true") {
+          if (isRunnerDebugEnabled()) {
             logger.debug("Ignoring old UID change", {
               newUid: runnerUid,
               newLastProcessedAt: lastProcessedAt,
@@ -833,7 +856,7 @@ export class MessageHandler {
         }
       }
 
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Runner deactivated - being replaced", {
           newRunnerUid: runnerUid,
           ourUid: this.runner.getRunnerUid(),
@@ -860,7 +883,7 @@ export class MessageHandler {
         });
       } catch (error) {
         console.error("Failed to send deactivation notification:", error);
-        if (process.env["DEBUG"] === "true") {
+        if (isRunnerDebugEnabled()) {
           logger.debug("Deactivation notification failed", {
             error: error instanceof Error ? error.message : String(error),
           });
@@ -1022,4 +1045,53 @@ export class MessageHandler {
       timestamp: new Date(),
     });
   }
+
+  private resolveAgentProvider(
+    conversation?: {
+      providerType?: string;
+      agentProviderType?: string;
+      model?: string;
+    },
+    config?: ConversationConfig
+  ): "openai" | "claude" {
+    const explicitProvider =
+      conversation?.providerType ||
+      conversation?.agentProviderType ||
+      (config as any)?.providerType ||
+      (config as any)?.agentProviderType;
+
+    if (typeof explicitProvider === "string") {
+      const normalized = explicitProvider.toLowerCase();
+      if (normalized === "openai") return "openai";
+      if (normalized === "claude") return "claude";
+    }
+
+    const model =
+      conversation?.model ||
+      (config as any)?.model ||
+      (config as any)?.defaultModel ||
+      "";
+    const normalizedModel = model.toLowerCase();
+
+    const looksLikeCodex =
+      normalizedModel.includes("gpt") ||
+      /^o\d/.test(normalizedModel) ||
+      normalizedModel.includes("openai") ||
+      normalizedModel.includes("codex");
+
+    return looksLikeCodex ? "openai" : "claude";
+  }
+
+  private getManagerForProvider(provider?: string) {
+    if (provider?.toLowerCase() === "openai") {
+      return this.runner.codexManager_;
+    }
+    return this.runner.claudeManager_;
+  }
+
+  private getManagerForConversationContext(context: ConversationContext) {
+    return context.provider === "openai"
+      ? this.runner.codexManager_
+      : this.runner.claudeManager_;
+  }
 }

package/src/index.ts

@@ -5,6 +5,7 @@
 import { RunnerApp } from "./runner-sse";
 import { ConfigManager } from "./utils/config";
 import { logger, configureFileLogging } from "./utils/logger";
+import { isRunnerDebugEnabled } from "./utils/debug";
 import path from "path";
 import fs from "fs/promises";
 
@@ -13,6 +14,7 @@ let runner: RunnerApp | null = null;
 async function main() {
   try {
     logger.info("Starting Northflare Runner...");
+    const debugEnabled = isRunnerDebugEnabled();
 
     // Load configuration (args already parsed by CLI)
     let configPath = process.argv[2]; // This is set by the CLI if --config was provided
@@ -53,7 +55,7 @@ async function main() {
     });
 
     // Additional debug logging
-    if (process.env["DEBUG"] === "true") {
+    if (debugEnabled) {
       logger.debug("Debug mode enabled - verbose logging active", {
         dataDir: config.dataDir,
         heartbeatInterval: config.heartbeatInterval,
@@ -75,7 +77,7 @@ async function main() {
     });
 
     // Log additional details in debug mode
-    if (process.env["DEBUG"] === "true" && runner) {
+    if (debugEnabled && runner) {
       logger.debug("Runner started with full details", {
         runnerId: runner.getRunnerId(),
         runnerUid: runner.getRunnerUid(),

package/src/runner-sse.ts

@@ -13,19 +13,35 @@ import {
 import { IRunnerApp } from "./types/runner-interface";
 import { MessageHandler } from "./components/message-handler-sse";
 import { ClaudeManager } from "./components/claude-sdk-manager";
+import { CodexManager } from "./components/codex-sdk-manager";
 import { EnhancedRepositoryManager } from "./components/enhanced-repository-manager";
 import { StateManager } from "./utils/StateManager";
 import { createLogger } from "./utils/logger";
 import { statusLineManager } from "./utils/status-line";
+import { isRunnerDebugEnabled } from "./utils/debug";
 import fs from "fs/promises";
 import path from "path";
 import computerName from "computer-name";
+import {
+  sanitizeToolResponsePayload,
+  TOOL_RESPONSE_BYTE_LIMIT,
+} from "./utils/tool-response-sanitizer";
 
 const logger = createLogger("RunnerApp");
 
+function logToolResponseTruncation(toolUseId?: string) {
+  const message = `Tool response exceeded ${TOOL_RESPONSE_BYTE_LIMIT} bytes and was truncated`;
+  if (toolUseId) {
+    logger.warn(message, { toolUseId });
+  } else {
+    logger.warn(message);
+  }
+}
+
 export class RunnerApp implements IRunnerApp {
   private messageHandler!: MessageHandler;
   private claudeManager!: ClaudeManager;
+  private codexManager!: CodexManager;
   private repositoryManager!: EnhancedRepositoryManager;
   private stateManager!: StateManager;
   private agentConversations: Map<string, ConversationContext>; // Keyed by conversation.id
@@ -91,6 +107,9 @@ export class RunnerApp implements IRunnerApp {
     // Initialize Claude manager with repository manager (using SDK-native manager)
     this.claudeManager = new ClaudeManager(this, this.repositoryManager);
 
+    // Initialize Codex manager for OpenAI-based conversations
+    this.codexManager = new CodexManager(this, this.repositoryManager);
+
     // Initialize message handler with SSE support
     this.messageHandler = new MessageHandler(this);
   }
@@ -139,7 +158,7 @@ export class RunnerApp implements IRunnerApp {
       await this.registerWithRetry();
 
       // Log debug info after registration
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug("Runner initialized with ownership details", {
           runnerId: this.config.runnerId,
           runnerUid: this.runnerUid,
@@ -193,17 +212,24 @@ export class RunnerApp implements IRunnerApp {
 
   async notify(method: string, params: any): Promise<void> {
     try {
+      const sanitization = sanitizeToolResponsePayload(method, params);
+      if (sanitization.truncated) {
+        logToolResponseTruncation(sanitization.toolUseId);
+      }
+      const safeParams = sanitization.truncated
+        ? sanitization.params
+        : params;
       // Log RPC notification in debug mode
       logger.debug(`[RPC] Sending notification: ${method}`, {
         method,
-        params: JSON.stringify(params, null, 2),
+        params: JSON.stringify(safeParams, null, 2),
       });
 
       // Send notification with retry logic
       await this.sendToOrchestratorWithRetry({
         jsonrpc: "2.0",
         method,
-        params,
+        params: safeParams,
       });
     } catch (error) {
       // Special handling for heartbeat errors - just log a simple line
@@ -224,13 +250,28 @@ export class RunnerApp implements IRunnerApp {
   }
 
   async sendToOrchestrator(message: JsonRpcMessage): Promise<any> {
+    const sanitization = sanitizeToolResponsePayload(
+      message.method,
+      message.params
+    );
+    if (sanitization.truncated) {
+      logToolResponseTruncation(sanitization.toolUseId);
+    }
+
+    const messageToSend = sanitization.truncated
+      ? {
+          ...message,
+          params: sanitization.params,
+        }
+      : message;
+
     try {
       // Log RPC request in debug mode
       logger.debug(`[RPC] Sending request:`, {
-        method: message.method,
-        id: message.id,
-        params: message.params
-          ? JSON.stringify(message.params, null, 2)
+        method: messageToSend.method,
+        id: messageToSend.id,
+        params: messageToSend.params
+          ? JSON.stringify(messageToSend.params, null, 2)
           : undefined,
       });
 
@@ -250,7 +291,7 @@ export class RunnerApp implements IRunnerApp {
         {
           method: "POST",
           headers,
-          body: JSON.stringify(message),
+          body: JSON.stringify(messageToSend),
           signal: AbortSignal.timeout(30000), // 30 second timeout
         }
       );
@@ -264,8 +305,8 @@ export class RunnerApp implements IRunnerApp {
 
       // Log RPC response in debug mode
       logger.debug(`[RPC] Received response:`, {
-        method: message.method,
-        id: message.id,
+        method: messageToSend.method,
+        id: messageToSend.id,
         result: result?.result
           ? JSON.stringify(result.result, null, 2)
           : undefined,
@@ -288,8 +329,8 @@ export class RunnerApp implements IRunnerApp {
       } else {
         // For other RPC messages, log the attempted message and error
         logger.error(`RPC failed:`, {
-          method: message.method,
-          params: message.params,
+          method: messageToSend.method,
+          params: messageToSend.params,
           error: errorMessage,
         });
       }
@@ -302,7 +343,7 @@ export class RunnerApp implements IRunnerApp {
   ): ConversationContext | undefined {
     // Using conversation.id as primary key for conversation tracking
     const context = this.agentConversations.get(conversationId);
-    console.log(`[Runner] getConversationContext lookup:`, {
+    logger.debug(`[Runner] getConversationContext lookup:`, {
       conversationId,
       found: !!context,
       totalConversations: this.agentConversations.size,
@@ -327,12 +368,12 @@ export class RunnerApp implements IRunnerApp {
                 `RunnerRepo validated: ${repo.name} at ${resolvedPath}`
               );
             } else {
-              logger.error(
+              logger.warn(
                 `RunnerRepo path is not a directory: ${repo.name} at ${resolvedPath}`
               );
             }
           } catch (error) {
-            logger.error(
+            logger.warn(
               `RunnerRepo path does not exist: ${repo.name} at ${repo.path}`
             );
           }
@@ -362,7 +403,7 @@ export class RunnerApp implements IRunnerApp {
       logger.info(`Registration response:`, JSON.stringify(response, null, 2));
 
       // Log the runnerRepos being sent and received
-      if (process.env["DEBUG"] === "true") {
+      if (isRunnerDebugEnabled()) {
         logger.debug(
           "Registration runnerRepos sent:",
           JSON.stringify(filteredRunnerRepos)
@@ -424,7 +465,7 @@ export class RunnerApp implements IRunnerApp {
         }
 
         // Debug logging for registration details
-        if (process.env["DEBUG"] === "true") {
+        if (isRunnerDebugEnabled()) {
           logger.debug("Registration complete with details", {
             runnerId: this.config.runnerId,
             runnerUid: this.runnerUid,
@@ -760,8 +801,9 @@ export class RunnerApp implements IRunnerApp {
 
     for (const [conversationId, context] of this.agentConversations) {
       if (context.status === "active" || context.status === "starting") {
+        const manager = this.getManagerForContext(context);
         stopPromises.push(
-          this.claudeManager
+          manager
             .stopConversation(context.agentSessionId, context, isRunnerShutdown)
             .catch((error) => {
               logger.error(
@@ -797,6 +839,9 @@ export class RunnerApp implements IRunnerApp {
   get claudeManager_(): ClaudeManager {
     return this.claudeManager;
   }
+  get codexManager_(): CodexManager {
+    return this.codexManager;
+  }
   get repositoryManager_(): EnhancedRepositoryManager {
     return this.repositoryManager;
   }
@@ -827,7 +872,7 @@ export class RunnerApp implements IRunnerApp {
       logger.error("Failed to persist active status:", error);
     });
 
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("Active runner status changed", {
         previous: previousState,
         new: active,
@@ -841,7 +886,7 @@ export class RunnerApp implements IRunnerApp {
     const previousTimestamp = this.lastProcessedAt;
     this.lastProcessedAt = timestamp;
 
-    if (process.env["DEBUG"] === "true") {
+    if (isRunnerDebugEnabled()) {
       logger.debug("LastProcessedAt updated", {
         previous: previousTimestamp?.toISOString() || "null",
         new: timestamp?.toISOString() || "null",
@@ -859,4 +904,14 @@ export class RunnerApp implements IRunnerApp {
   setDelayFunction(fn: (ms: number) => Promise<void>): void {
     this.delayFn = fn;
   }
+
+  private getManagerForContext(
+    context?: ConversationContext | null
+  ): ClaudeManager | CodexManager {
+    const provider = context?.provider?.toLowerCase();
+    if (provider === "openai") {
+      return this.codexManager;
+    }
+    return this.claudeManager;
+  }
 }

package/src/types/claude.ts

@@ -3,6 +3,7 @@
  */
 
 import { Conversation } from "@botanicastudios/claude-code-sdk-ts";
+import type { Thread } from "@northflare/codex-sdk";
 
 // Repository information passed in conversation config
 export interface RepositoryInfo {
@@ -25,6 +26,7 @@ export interface ConversationConfig {
   repository?: RepositoryInfo; // Repository details from orchestrator
   sessionId?: string; // For resume operations
   runnerRepoPath?: string; // Path to local runner repo for local workspaces
+  codexAuth?: CodexAuthConfig;
 }
 
 // Internal conversation tracking
@@ -39,7 +41,9 @@ export interface ConversationContext {
   config: ConversationConfig;
   startedAt: Date;
   lastActivityAt: Date;
-  conversation?: Conversation; // Claude SDK conversation instance (stateful)
+  conversation?: Conversation | Thread; // Conversation or Codex thread instance
+  provider?: "claude" | "openai" | string;
+  metadata?: Record<string, any>;
 
   // Additional conversation details from database
   model: string;
@@ -48,6 +52,13 @@ export interface ConversationContext {
   permissionsMode: string;
 }
 
+export interface CodexAuthConfig {
+  accessToken: string;
+  idToken: string;
+  accountId: string;
+  lastRefresh?: string | null;
+}
+
 // Message type for initial messages
 export interface Message {
   content: string;

package/src/types/index.ts

@@ -59,5 +59,6 @@ export interface EnvironmentConfig {
   NORTHFLARE_RUNNER_TOKEN: string;
   NORTHFLARE_WORKSPACE_DIR: string;
   NORTHFLARE_ORCHESTRATOR_URL: string;
+  NORTHFLARE_RUNNER_DEBUG?: string;
   DEBUG?: string;
 }

package/src/types/runner-interface.ts

@@ -4,6 +4,7 @@
 
 import { RunnerConfig, ConversationContext, JsonRpcMessage } from './index';
 import { ClaudeManager } from '../components/claude-sdk-manager';
+import { CodexManager } from '../components/codex-sdk-manager';
 import { EnhancedRepositoryManager } from '../components/enhanced-repository-manager';
 
 export interface IRunnerApp {
@@ -18,6 +19,7 @@ export interface IRunnerApp {
   get config_(): RunnerConfig;
   get activeConversations_(): Map<string, ConversationContext>;
   get claudeManager_(): ClaudeManager;
+  get codexManager_(): CodexManager;
   get repositoryManager_(): EnhancedRepositoryManager;
   
   // Runner state
@@ -31,4 +33,4 @@ export interface IRunnerApp {
   
   // Optional methods for SSE implementation
   updateLastProcessedAt?(timestamp: Date | null): Promise<void>;
-}
+}

package/src/utils/config.ts

@@ -294,6 +294,7 @@ export class ConfigManager {
       NORTHFLARE_RUNNER_TOKEN: process.env["NORTHFLARE_RUNNER_TOKEN"]!,
       NORTHFLARE_WORKSPACE_DIR: process.env["NORTHFLARE_WORKSPACE_DIR"]!,
       NORTHFLARE_ORCHESTRATOR_URL: process.env["NORTHFLARE_ORCHESTRATOR_URL"]!,
+      NORTHFLARE_RUNNER_DEBUG: process.env["NORTHFLARE_RUNNER_DEBUG"],
       DEBUG: process.env["DEBUG"],
     };
   }

package/src/utils/console.ts

@@ -2,7 +2,9 @@
  * Console wrapper that suppresses output when not in debug mode
  */
 
-const isDebug = process.env["DEBUG"] === "true";
+import { isRunnerDebugEnabled } from "./debug";
+
+const isDebug = isRunnerDebugEnabled();
 
 export const console = {
   log: isDebug ? global.console.log.bind(global.console) : () => {},
@@ -10,4 +12,4 @@ export const console = {
   error: global.console.error.bind(global.console), // Always show errors
   info: isDebug ? global.console.info.bind(global.console) : () => {},
   debug: isDebug ? global.console.debug.bind(global.console) : () => {},
-};
+};

package/src/utils/debug.ts

@@ -0,0 +1,18 @@
+export function isRunnerDebugEnabled(): boolean {
+  const explicitFlag = process.env["NORTHFLARE_RUNNER_DEBUG"];
+  if (typeof explicitFlag === "string") {
+    return isTruthy(explicitFlag);
+  }
+
+  const legacyFlag = process.env["DEBUG"];
+  if (typeof legacyFlag === "string") {
+    return isTruthy(legacyFlag);
+  }
+
+  return false;
+}
+
+function isTruthy(value: string): boolean {
+  const normalized = value.trim().toLowerCase();
+  return normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "on";
+}