@northflare/runner 0.0.13 → 0.0.16

package/dist/components/claude-sdk-manager.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * ClaudeManager - Manages Claude conversations using SDK-native patterns
  *
@@ -14,56 +13,21 @@
  * - SDK's onProcessComplete() for proper cleanup
  * - Simplified error handling while maintaining compatibility
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClaudeManager = void 0;
-const claude_agent_sdk_1 = require("@anthropic-ai/claude-agent-sdk");
-const status_line_1 = require("../utils/status-line");
-const console_1 = require("../utils/console");
-const expand_env_1 = require("../utils/expand-env");
-const debug_1 = require("../utils/debug");
-const jwt = __importStar(require("jsonwebtoken"));
-class ClaudeManager {
+import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
+import { statusLineManager } from '../utils/status-line.js';
+import { console } from '../utils/console.js';
+import { expandEnv } from '../utils/expand-env.js';
+import { isRunnerDebugEnabled } from '../utils/debug.js';
+import jwt from "jsonwebtoken";
+export class ClaudeManager {
     runner;
     repositoryManager;
     constructor(runner, repositoryManager) {
         this.runner = runner;
         this.repositoryManager = repositoryManager;
         // Log debug mode status
-        if ((0, debug_1.isRunnerDebugEnabled)()) {
-            console_1.console.log("[ClaudeManager] DEBUG MODE ENABLED - Claude SDK will log verbose output");
+        if (isRunnerDebugEnabled()) {
+            console.log("[ClaudeManager] DEBUG MODE ENABLED - Claude SDK will log verbose output");
         }
         // Note: MCP host configuration is passed from orchestrator
         // Runner does not define its own MCP tools
@@ -101,7 +65,7 @@ class ClaudeManager {
         };
         // Store with conversation.id as the key
         this.runner.activeConversations_.set(conversationId, context);
-        console_1.console.log(`[ClaudeManager] Stored conversation context:`, {
+        console.log(`[ClaudeManager] Stored conversation context:`, {
             conversationId,
             agentSessionId: context.agentSessionId,
             conversationObjectType: context.conversationObjectType,
@@ -116,7 +80,7 @@ class ClaudeManager {
         if (config.runnerRepoPath) {
             // Local workspace - use the provided path directly
             workspacePath = config.runnerRepoPath;
-            console_1.console.log(`Using local workspace path: ${workspacePath}`);
+            console.log(`Using local workspace path: ${workspacePath}`);
             // For task conversations in local workspaces, create a local task handle
             if (conversationObjectType === "Task") {
                 const taskHandle = await this.repositoryManager.createLocalTaskHandle(conversationObjectId, workspacePath);
@@ -128,7 +92,7 @@ class ClaudeManager {
             config.repository &&
             workspaceId) {
             // Use task-specific worktree for task conversations
-            console_1.console.log(`[ClaudeManager] Creating task worktree with repository config:`, {
+            console.log(`[ClaudeManager] Creating task worktree with repository config:`, {
                 conversationObjectId,
                 workspaceId,
                 repository: config.repository,
@@ -151,7 +115,7 @@ class ClaudeManager {
             if (config.repository.type === "local" && config.repository.localPath) {
                 // Use the local path directly
                 workspacePath = config.repository.localPath;
-                console_1.console.log(`Using local repository path: ${workspacePath}`);
+                console.log(`Using local repository path: ${workspacePath}`);
             }
             else {
                 // Fall back to workspace-based checkout for non-task conversations
@@ -159,7 +123,8 @@ class ClaudeManager {
             }
         }
         else if (workspaceId) {
-            workspacePath = await this.repositoryManager.getWorkspacePath(workspaceId);
+            workspacePath =
+                await this.repositoryManager.getWorkspacePath(workspaceId);
         }
         else {
             // Default workspace path when no workspaceId is provided
@@ -182,10 +147,10 @@ class ClaudeManager {
                 }, runnerToken, {
                     expiresIn: "60m", // 60 minutes expiry
                 });
-                console_1.console.log("[ClaudeManager] Generated TOOL_TOKEN for MCP authentication");
+                console.log("[ClaudeManager] Generated TOOL_TOKEN for MCP authentication");
             }
             else {
-                console_1.console.warn("[ClaudeManager] Unable to generate TOOL_TOKEN - missing required data");
+                console.warn("[ClaudeManager] Unable to generate TOOL_TOKEN - missing required data");
             }
         }
         // Simplified SDK configuration - using native query API with streamlined options
@@ -208,7 +173,7 @@ class ClaudeManager {
         if (githubToken) {
             envVars["GITHUB_TOKEN"] = githubToken;
         }
-        if ((0, debug_1.isRunnerDebugEnabled)()) {
+        if (isRunnerDebugEnabled()) {
             envVars["DEBUG"] = "1";
         }
         // Simplified system prompt handling
@@ -219,7 +184,7 @@ class ClaudeManager {
             .filter(Boolean)
             .join("\n\n");
         // Debug log the appendSystemPrompt being sent to Claude SDK
-        console_1.console.log(`[ClaudeManager] Building appendSystemPrompt for conversation ${context.conversationId}:`, {
+        console.log(`[ClaudeManager] Building appendSystemPrompt for conversation ${context.conversationId}:`, {
             hasGlobalInstructions: !!context.globalInstructions,
             globalInstructionsLength: context.globalInstructions?.length ?? 0,
             hasWorkspaceInstructions: !!context.workspaceInstructions,
@@ -240,18 +205,18 @@ class ClaudeManager {
             ]
             : [];
         if (disallowedTools.length) {
-            console_1.console.log("[ClaudeManager] Applied read-only mode tool restrictions");
+            console.log("[ClaudeManager] Applied read-only mode tool restrictions");
         }
         // Simplified MCP server configuration
         let mcpServers;
         if (config.mcpServers) {
-            mcpServers = (0, expand_env_1.expandEnv)(config.mcpServers, { TOOL_TOKEN: toolToken });
-            console_1.console.log("[ClaudeManager] MCP servers configuration:", JSON.stringify(mcpServers, null, 2));
+            mcpServers = expandEnv(config.mcpServers, { TOOL_TOKEN: toolToken });
+            console.log("[ClaudeManager] MCP servers configuration:", JSON.stringify(mcpServers, null, 2));
         }
         // Create input stream for user messages (simplified message queueing)
         const input = createUserMessageStream();
         // Launch SDK with simplified configuration
-        const sdk = (0, claude_agent_sdk_1.query)({
+        const sdk = sdkQuery({
             prompt: input.iterable,
             options: {
                 //pathToClaudeCodeExecutable: cliPath,
@@ -271,11 +236,11 @@ class ClaudeManager {
                     : {}),
                 ...(disallowedTools.length ? { disallowedTools } : {}),
                 ...(mcpServers ? { mcpServers } : {}),
-                ...((0, debug_1.isRunnerDebugEnabled)()
+                ...(isRunnerDebugEnabled()
                     ? {
                         stderr: (data) => {
                             try {
-                                console_1.console.log(`[Claude SDK] ${data}`);
+                                console.log(`[Claude SDK] ${data}`);
                             }
                             catch { }
                         },
@@ -331,18 +296,18 @@ class ClaudeManager {
                     // Treat 'result' as an end-of-conversation signal for the SDK
                     try {
                         await this._finalizeConversation(context, false);
-                        console_1.console.log("[ClaudeManager] Finalized conversation due to SDK 'result' message", {
+                        console.log("[ClaudeManager] Finalized conversation due to SDK 'result' message", {
                             conversationId: context.conversationId,
                             agentSessionId: context.agentSessionId,
                         });
                     }
                     catch (e) {
-                        console_1.console.warn("[ClaudeManager] Error finalizing on 'result' message:", e);
+                        console.warn("[ClaudeManager] Error finalizing on 'result' message:", e);
                     }
                 }
             }
             catch (e) {
-                console_1.console.warn("[ClaudeManager] finalize-on-system heuristic error:", e);
+                console.warn("[ClaudeManager] finalize-on-system heuristic error:", e);
             }
         };
         conversation.stream(messageHandler);
@@ -357,7 +322,7 @@ class ClaudeManager {
                     text: initialText,
                 });
             }
-            console_1.console.log(`Started conversation for ${conversationObjectType} ${conversationObjectId} in workspace ${workspacePath}`);
+            console.log(`Started conversation for ${conversationObjectType} ${conversationObjectId} in workspace ${workspacePath}`);
             // Return the conversation context directly
             return context;
         }
@@ -383,15 +348,15 @@ class ClaudeManager {
                 }
             }
             catch (error) {
-                console_1.console.error(`Error ending conversation ${agentSessionId}:`, error);
+                console.error(`Error ending conversation ${agentSessionId}:`, error);
             }
             // Clean up conversation reference
             delete context.conversation;
         }
-        console_1.console.log(`Stopped conversation ${agentSessionId} for ${context.conversationObjectType} ${context.conversationObjectId}`);
+        console.log(`Stopped conversation ${agentSessionId} for ${context.conversationObjectType} ${context.conversationObjectId}`);
     }
     async resumeConversation(conversationObjectType, conversationObjectId, agentSessionId, config, conversationData, resumeMessage) {
-        console_1.console.log(`[ClaudeManager] Resuming conversation ${agentSessionId}`);
+        console.log(`[ClaudeManager] Resuming conversation ${agentSessionId}`);
         // Resume is handled by starting a new conversation with the existing session ID
         const context = await this.startConversation(conversationObjectType, conversationObjectId, { ...config, sessionId: agentSessionId }, [], // Don't send initial messages
         conversationData);
@@ -402,26 +367,41 @@ class ClaudeManager {
                 // Use the provided resume message or default to system instruction
                 const messageToSend = resumeMessage ||
                     "<system-instructions>Please continue</system-instructions>";
-                console_1.console.log(`[ClaudeManager] Sending resume message to conversation ${agentSessionId}`);
+                console.log(`[ClaudeManager] Sending resume message to conversation ${agentSessionId}`);
                 context.conversation.send({
                     type: "text",
                     text: messageToSend,
                 });
             }
             catch (error) {
-                console_1.console.error(`[ClaudeManager] Error sending resume message:`, error);
+                console.error(`[ClaudeManager] Error sending resume message:`, error);
             }
         }
         else {
-            console_1.console.warn("[ClaudeManager] Resume requested but conversation instance missing or incompatible");
+            console.warn("[ClaudeManager] Resume requested but conversation instance missing or incompatible");
         }
         return context.agentSessionId;
     }
     async _finalizeConversation(context, hadError, error, reason) {
-        // Ensure idempotency
+        // Synchronous idempotency check - must happen before any async operations
         if (context._finalized)
             return;
         context._finalized = true;
+        // Mark as completed immediately to prevent restart on catch-up
+        // This is synchronous and happens before any async operations
+        this.runner.markConversationCompleted(context.conversationId);
+        // Clean up conversation from active conversations (synchronous)
+        try {
+            console.log(`[ClaudeManager] Removing conversation from active map:`, {
+                conversationId: context.conversationId,
+                agentSessionId: context.agentSessionId,
+                mapSizeBefore: this.runner.activeConversations_.size,
+            });
+            this.runner.activeConversations_.delete(context.conversationId);
+            statusLineManager.updateActiveCount(this.runner.activeConversations_.size);
+        }
+        catch { }
+        // Now do async notification (after all sync cleanup)
         try {
             await this.runner.notify("conversation.end", {
                 conversationId: context.conversationId,
@@ -434,22 +414,11 @@ class ClaudeManager {
             });
         }
         catch (e) {
-            console_1.console.error("[ClaudeManager] Failed to notify conversation.end:", e);
-        }
-        // Clean up conversation from active conversations
-        try {
-            console_1.console.log(`[ClaudeManager] Removing conversation from active map:`, {
-                conversationId: context.conversationId,
-                agentSessionId: context.agentSessionId,
-                mapSizeBefore: this.runner.activeConversations_.size,
-            });
-            this.runner.activeConversations_.delete(context.conversationId);
-            status_line_1.statusLineManager.updateActiveCount(this.runner.activeConversations_.size);
+            console.error("[ClaudeManager] Failed to notify conversation.end:", e);
         }
-        catch { }
     }
     async sendUserMessage(conversationId, content, config, conversationObjectType, conversationObjectId, conversation, _agentSessionIdOverride) {
-        console_1.console.log(`[ClaudeManager] sendUserMessage called with:`, {
+        console.log(`[ClaudeManager] sendUserMessage called with:`, {
             conversationId,
             conversationObjectType,
             conversationObjectId,
@@ -459,7 +428,7 @@ class ClaudeManager {
         });
         // Find by conversationId only
         let context = this.runner.getConversationContext(conversationId);
-        console_1.console.log(`[ClaudeManager] Lookup by conversationId result:`, {
+        console.log(`[ClaudeManager] Lookup by conversationId result:`, {
             found: !!context,
             conversationId: context?.conversationId,
             agentSessionId: context?.agentSessionId,
@@ -468,7 +437,7 @@ class ClaudeManager {
             // Use provided conversation details
             try {
                 const conversationDetails = conversation;
-                console_1.console.log(`[ClaudeManager] Using provided config from RunnerMessage:`, {
+                console.log(`[ClaudeManager] Using provided config from RunnerMessage:`, {
                     hasConfig: !!config,
                     hasRepository: !!config?.repository,
                     repositoryType: config?.repository?.type,
@@ -492,7 +461,7 @@ class ClaudeManager {
                 context = this.runner.getConversationContext(conversationId);
             }
             catch (error) {
-                console_1.console.error(`Failed to fetch conversation ${conversationId}:`, error);
+                console.error(`Failed to fetch conversation ${conversationId}:`, error);
             }
         }
         if (!context) {
@@ -500,14 +469,15 @@ class ClaudeManager {
         }
         try {
             // Send immediately when a conversation instance exists; no need to wait for "active"
-            if (!context.conversation || !isClaudeConversation(context.conversation)) {
+            if (!context.conversation ||
+                !isClaudeConversation(context.conversation)) {
                 throw new Error(`No conversation instance found for conversation ${context.conversationId}`);
             }
             // Guard: Don't send messages if conversation is stopped or stopping
             const conversationStatus = context.status;
             if (conversationStatus === "stopped" ||
                 conversationStatus === "stopping") {
-                console_1.console.warn(`Attempted to send message to stopped/stopping conversation ${context.conversationId}`, {
+                console.warn(`Attempted to send message to stopped/stopping conversation ${context.conversationId}`, {
                     status: context.status,
                     conversationObjectType: context.conversationObjectType,
                     conversationObjectId: context.conversationObjectId,
@@ -516,8 +486,8 @@ class ClaudeManager {
             }
             // Native message injection - SDK handles queueing and delivery
             const normalizedText = this.normalizeToText(content);
-            if ((0, debug_1.isRunnerDebugEnabled)()) {
-                console_1.console.log("[ClaudeManager] Normalized follow-up content", {
+            if (isRunnerDebugEnabled()) {
+                console.log("[ClaudeManager] Normalized follow-up content", {
                     originalType: typeof content,
                     isArray: Array.isArray(content) || undefined,
                     normalizedPreview: typeof normalizedText === "string"
@@ -531,7 +501,7 @@ class ClaudeManager {
             });
             // Update last activity timestamp
             context.lastActivityAt = new Date();
-            console_1.console.log(`Sent user message to conversation ${context.conversationId} (agentSessionId: ${context.agentSessionId}, status: ${context.status})`);
+            console.log(`Sent user message to conversation ${context.conversationId} (agentSessionId: ${context.agentSessionId}, status: ${context.status})`);
         }
         catch (error) {
             // Handle errors properly
@@ -548,14 +518,14 @@ class ClaudeManager {
                 },
             });
             if (!response.ok) {
-                console_1.console.error(`Failed to fetch GitHub tokens: ${response.status}`);
+                console.error(`Failed to fetch GitHub tokens: ${response.status}`);
                 return undefined;
             }
             const data = (await response.json());
             return data.githubToken;
         }
         catch (error) {
-            console_1.console.error("Error fetching GitHub tokens:", error);
+            console.error("Error fetching GitHub tokens:", error);
             return undefined;
         }
     }
@@ -575,7 +545,7 @@ class ClaudeManager {
             },
         });
         // Conversation continues on error - no automatic cleanup
-        console_1.console.error(`Conversation error for ${context.conversationObjectType} ${context.conversationObjectId}:`, error);
+        console.error(`Conversation error for ${context.conversationObjectType} ${context.conversationObjectId}:`, error);
     }
     classifyError(error) {
         if (error.message.includes("process exited")) {
@@ -678,7 +648,7 @@ class ClaudeManager {
         // Guard: Don't process messages if conversation is stopped or stopping
         const status = context.status;
         if (status === "stopped" || status === "stopping") {
-            console_1.console.log(`Ignoring message for stopped/stopping conversation ${context.conversationId}`, {
+            console.log(`Ignoring message for stopped/stopping conversation ${context.conversationId}`, {
                 status: context.status,
                 messageType: message.type,
             });
@@ -686,7 +656,7 @@ class ClaudeManager {
         }
         try {
             // High-level receipt log
-            console_1.console.log(`Received streamed message for ${context.conversationObjectType} ${context.conversationObjectId}`, {
+            console.log(`Received streamed message for ${context.conversationObjectType} ${context.conversationObjectId}`, {
                 type: message?.type,
             });
             // Raw SDK message diagnostics
@@ -707,7 +677,7 @@ class ClaudeManager {
                         return value;
                     }, 2);
                 };
-                console_1.console.log("[ClaudeManager] RAW SDK message FULL:", safeStringify(message));
+                console.log("[ClaudeManager] RAW SDK message FULL:", safeStringify(message));
                 const summary = {
                     keys: Object.keys(message || {}),
                     hasMessage: !!message?.message,
@@ -715,16 +685,16 @@ class ClaudeManager {
                     messageContentType: typeof message?.message?.content,
                     sessionId: message?.session_id || message?.sessionId || null,
                 };
-                console_1.console.log("[ClaudeManager] RAW SDK message summary:", summary);
+                console.log("[ClaudeManager] RAW SDK message summary:", summary);
                 if (message?.content !== undefined) {
-                    console_1.console.log("[ClaudeManager] RAW SDK content:", message.content);
+                    console.log("[ClaudeManager] RAW SDK content:", message.content);
                 }
                 if (message?.message?.content !== undefined) {
-                    console_1.console.log("[ClaudeManager] RAW SDK nested content:", message.message.content);
+                    console.log("[ClaudeManager] RAW SDK nested content:", message.message.content);
                 }
             }
             catch (e) {
-                console_1.console.warn("[ClaudeManager] Failed to log raw SDK message:", e);
+                console.warn("[ClaudeManager] Failed to log raw SDK message:", e);
             }
             // Build structured content based on message type
             let messageType = message.type;
@@ -857,7 +827,7 @@ class ClaudeManager {
                             // Check if this is a subagent prompt (Task tool input being sent to subagent)
                             // These have parent_tool_use_id but are NOT tool_result messages
                             if (userMsg.parent_tool_use_id) {
-                                console_1.console.log("[ClaudeManager] Detected subagent prompt message (parent_tool_use_id present, no tool_result)", {
+                                console.log("[ClaudeManager] Detected subagent prompt message (parent_tool_use_id present, no tool_result)", {
                                     parent_tool_use_id: userMsg.parent_tool_use_id,
                                 });
                                 messageType = "assistant"; // Change from "user" to "assistant"
@@ -869,7 +839,7 @@ class ClaudeManager {
                         if (Array.isArray(structuredContent) &&
                             structuredContent.length > 0 &&
                             structuredContent.every((it) => !it || typeof it !== "object" || Object.keys(it).length === 0)) {
-                            console_1.console.log("[ClaudeManager] Skipping empty 'user' message with only empty objects from SDK");
+                            console.log("[ClaudeManager] Skipping empty 'user' message with only empty objects from SDK");
                             skipSend = true;
                         }
                     }
@@ -950,7 +920,7 @@ class ClaudeManager {
                 default: {
                     // Unknown message type - log and send as assistant
                     const unknownMsg = message;
-                    console_1.console.warn(`Unknown message type: ${unknownMsg.type}`, message);
+                    console.warn(`Unknown message type: ${unknownMsg.type}`, message);
                     messageType = "assistant";
                     structuredContent = {
                         text: JSON.stringify(message),
@@ -967,7 +937,7 @@ class ClaudeManager {
             const currentStatus = context.status;
             if (currentStatus !== "stopped" && currentStatus !== "stopping") {
                 if (skipSend) {
-                    console_1.console.log("[ClaudeManager] Not sending message.agent due to skipSend=true");
+                    console.log("[ClaudeManager] Not sending message.agent due to skipSend=true");
                     return;
                 }
                 const payload = {
@@ -988,7 +958,7 @@ class ClaudeManager {
                     payload.metadata = metadata;
                 }
                 try {
-                    console_1.console.log("[ClaudeManager] Sending message.agent payload:", {
+                    console.log("[ClaudeManager] Sending message.agent payload:", {
                         type: payload.type,
                         subtype: payload.subtype,
                         contentPreview: Array.isArray(payload.content)
@@ -1003,7 +973,7 @@ class ClaudeManager {
             // We just log that we saw them but don't intercept or process them
             if (structuredContent.toolCalls &&
                 structuredContent.toolCalls.length > 0) {
-                console_1.console.log(`Claude is making ${structuredContent.toolCalls.length} tool call(s) via MCP`, {
+                console.log(`Claude is making ${structuredContent.toolCalls.length} tool call(s) via MCP`, {
                     conversationObjectId: context.conversationObjectId,
                     toolNames: structuredContent.toolCalls.map((tc) => tc.name),
                 });
@@ -1019,15 +989,14 @@ class ClaudeManager {
             if (isTransportError &&
                 (statusCheck === "stopped" || statusCheck === "stopping")) {
                 // This is expected when conversation is stopped - just log it
-                console_1.console.log(`Transport error for stopped/stopping conversation ${context.conversationId} (expected):`, errorMessage);
+                console.log(`Transport error for stopped/stopping conversation ${context.conversationId} (expected):`, errorMessage);
                 return;
             }
-            console_1.console.error(`Error handling streamed message for ${context.conversationObjectType} ${context.conversationObjectId}:`, error);
+            console.error(`Error handling streamed message for ${context.conversationObjectType} ${context.conversationObjectId}:`, error);
             await this._handleConversationError(context, error);
         }
     }
 }
-exports.ClaudeManager = ClaudeManager;
 function createUserMessageStream() {
     const queue = [];
     let resolver = null;