@agentxjs/runtime 1.8.1 → 2.0.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Persistence } from "@agentxjs/types";
 import { Runtime, LLMProvider, ClaudeLLMConfig } from "@agentxjs/types/runtime";
-import { Environment } from "@agentxjs/types/runtime/internal";
+import { EnvironmentFactory } from "@agentxjs/types/runtime/internal";
 import { AgentDefinition } from "@agentxjs/types/agentx";
 /**
 * Runtime configuration
@@ -20,10 +20,10 @@ interface RuntimeConfig {
 	*/
 	basePath: string;
 	/**
-	* Optional custom environment (for testing)
-	* If not provided, ClaudeEnvironment will be created from llmProvider
+	* Optional environment factory for dependency injection (e.g., mock for testing)
+	* If not provided, ClaudeEnvironment will be created by default
 	*/
-	environment?: Environment;
+	environmentFactory?: EnvironmentFactory;
 	/**
 	* Default agent definition
 	* Used as base configuration when creating new images

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/internal/SystemBusImpl.ts
 import { Subject } from "rxjs";
-import { createLogger } from "@agentxjs/common";
+import { createLogger, generateRequestId } from "@agentxjs/common";
 var logger = createLogger("runtime/SystemBusImpl");
 
 class SystemBusImpl {
@@ -73,7 +73,7 @@ class SystemBusImpl {
   }
   request(type, data, timeout = 30000) {
     return new Promise((resolve, reject) => {
-      const requestId = `req_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+      const requestId = generateRequestId();
       const responseType = type.replace("_request", "_response");
       const timer = setTimeout(() => {
         unsubscribe();
@@ -373,8 +373,7 @@ class AgentInteractor {
       category: "message",
       intent: "request",
       requestId,
-      context: eventContext,
-      broadcastable: false
+      context: eventContext
     });
     logger3.info("user_message event emitted to bus", {
       messageId: userMessage.id,
@@ -403,14 +402,13 @@ class AgentInteractor {
       category: "action",
       intent: "request",
       requestId,
-      context: eventContext,
-      broadcastable: false
+      context: eventContext
     });
   }
 }
 // src/internal/RuntimeAgent.ts
 import { createAgent } from "@agentxjs/agent";
-import { createLogger as createLogger8 } from "@agentxjs/common";
+import { createLogger as createLogger8, generateRequestId as generateRequestId2 } from "@agentxjs/common";
 
 // src/environment/ClaudeReceptor.ts
 import { createLogger as createLogger4 } from "@agentxjs/common";
@@ -443,7 +441,6 @@ class ClaudeReceptor {
       source: "environment",
       category: "stream",
       intent: "notification",
-      broadcastable: false,
       requestId: eventMeta?.requestId,
       context: eventMeta?.context,
       data: { reason }
@@ -457,7 +454,6 @@ class ClaudeReceptor {
       source: "environment",
       category: "stream",
       intent: "notification",
-      broadcastable: false,
       requestId: eventMeta?.requestId,
       context: eventMeta?.context,
       data: { message, errorCode }
@@ -478,7 +474,6 @@ class ClaudeReceptor {
           source: "environment",
           category: "stream",
           intent: "notification",
-          broadcastable: false,
           requestId,
           context,
           data: {
@@ -509,7 +504,6 @@ class ClaudeReceptor {
           source: "environment",
           category: "stream",
           intent: "notification",
-          broadcastable: false,
           requestId,
           context,
           data: {
@@ -532,7 +526,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             index: event.index,
             requestId,
             context,
@@ -548,7 +541,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             index: event.index,
             requestId,
             context,
@@ -569,7 +561,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             requestId,
             context,
             data: { text: delta.text || "" }
@@ -581,7 +572,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             index: this.blockContext.currentBlockIndex,
             requestId,
             context,
@@ -598,7 +588,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             index: this.blockContext.currentBlockIndex,
             requestId,
             context,
@@ -611,7 +600,6 @@ class ClaudeReceptor {
             source: "environment",
             category: "stream",
             intent: "notification",
-            broadcastable: false,
             index: this.blockContext.currentBlockIndex,
             requestId,
             context,
@@ -637,7 +625,6 @@ class ClaudeReceptor {
           source: "environment",
           category: "stream",
           intent: "notification",
-          broadcastable: false,
           requestId,
           context,
           data: {
@@ -732,6 +719,7 @@ import { Subject as Subject2 } from "rxjs";
 import { createLogger as createLogger6 } from "@agentxjs/common";
 
 // src/environment/buildOptions.ts
+import { spawn } from "child_process";
 import { createLogger as createLogger5 } from "@agentxjs/common";
 
 // src/RuntimeEnvironment.ts
@@ -791,6 +779,17 @@ function buildOptions(context, abortController) {
   options.stderr = (data) => {
     logger5.info("SDK stderr", { data: data.trim() });
   };
+  options.spawnClaudeCodeProcess = (spawnOptions) => {
+    const childProcess = spawn(process.execPath, spawnOptions.args, {
+      cwd: spawnOptions.cwd,
+      env: {
+        ...spawnOptions.env,
+        ELECTRON_RUN_AS_NODE: "1"
+      },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return childProcess;
+  };
   const claudeCodePath = RuntimeEnvironment.getClaudeCodePath();
   if (claudeCodePath) {
     options.pathToClaudeCodeExecutable = claudeCodePath;
@@ -821,6 +820,7 @@ function buildOptions(context, abortController) {
     options.permissionMode = "bypassPermissions";
     options.allowDangerouslySkipPermissions = true;
   }
+  options.settingSources = ["project"];
   logger5.info("SDK Options built", {
     model: options.model,
     systemPrompt: options.systemPrompt,
@@ -907,6 +907,7 @@ class SDKQueryLifecycle {
   claudeQuery = null;
   isInitialized = false;
   abortController = null;
+  capturedSessionId = null;
   constructor(config, callbacks = {}) {
     this.config = config;
     this.callbacks = callbacks;
@@ -914,6 +915,11 @@ class SDKQueryLifecycle {
   get initialized() {
     return this.isInitialized;
   }
+  async warmup() {
+    logger6.info("Warming up SDKQueryLifecycle");
+    await this.initialize();
+    logger6.info("SDKQueryLifecycle warmup complete");
+  }
   async initialize() {
     if (this.isInitialized)
       return;
@@ -987,7 +993,8 @@ class SDKQueryLifecycle {
             subtype: sdkMsg.subtype,
             sessionId: sdkMsg.session_id
           });
-          if (sdkMsg.session_id && this.callbacks.onSessionIdCaptured) {
+          if (sdkMsg.session_id && this.callbacks.onSessionIdCaptured && this.capturedSessionId !== sdkMsg.session_id) {
+            this.capturedSessionId = sdkMsg.session_id;
             this.callbacks.onSessionIdCaptured(sdkMsg.session_id);
           }
           if (sdkMsg.type === "stream_event") {
@@ -1063,6 +1070,9 @@ class ClaudeEffector {
       onListenerExit: (reason) => this.handleListenerExit(reason)
     });
   }
+  async warmup() {
+    await this.queryLifecycle.warmup();
+  }
   connect(consumer) {
     logger7.debug("ClaudeEffector connected to SystemBusConsumer", {
       agentId: this.config.agentId
@@ -1215,10 +1225,31 @@ class ClaudeEnvironment {
     this.effector = claudeEffector;
     this.claudeEffector = claudeEffector;
   }
+  async warmup() {
+    await this.claudeEffector.warmup();
+  }
   dispose() {
     this.claudeEffector.dispose();
   }
 }
+
+// src/environment/DefaultEnvironmentFactory.ts
+var defaultEnvironmentFactory = {
+  create(config) {
+    return new ClaudeEnvironment({
+      agentId: config.agentId,
+      apiKey: config.llmConfig.apiKey,
+      baseUrl: config.llmConfig.baseUrl,
+      model: config.llmConfig.model,
+      systemPrompt: config.systemPrompt,
+      cwd: config.cwd,
+      resumeSessionId: config.resumeSessionId,
+      mcpServers: config.mcpServers,
+      onSessionIdCaptured: config.onSessionIdCaptured
+    });
+  }
+};
+
 // src/internal/RuntimeAgent.ts
 var logger8 = createLogger8("runtime/RuntimeAgent");
 
@@ -1261,11 +1292,6 @@ class BusPresenter {
       }
     };
     this.producer.emit(systemEvent);
-    if (category === "message") {
-      this.session.addMessage(data).catch((err) => {
-        logger8.error("Failed to persist message", { error: err, messageType: output.type });
-      });
-    }
   }
   convertToMessage(output) {
     return output.data;
@@ -1311,11 +1337,10 @@ class RuntimeAgent {
     this.config = config.config;
     this.imageRepository = config.imageRepository;
     const resumeSessionId = config.image.metadata?.claudeSdkSessionId;
-    this.environment = new ClaudeEnvironment({
+    const factory = config.environmentFactory ?? defaultEnvironmentFactory;
+    this.environment = factory.create({
       agentId: this.agentId,
-      apiKey: config.llmConfig.apiKey,
-      baseUrl: config.llmConfig.baseUrl,
-      model: config.llmConfig.model,
+      llmConfig: config.llmConfig,
       systemPrompt: config.image.systemPrompt,
       cwd: config.sandbox.workdir.path,
       resumeSessionId,
@@ -1326,8 +1351,14 @@ class RuntimeAgent {
     });
     this.environment.receptor.connect(config.bus.asProducer());
     this.environment.effector.connect(config.bus.asConsumer());
-    logger8.info("ClaudeEnvironment created for agent", {
+    if (this.environment.warmup) {
+      this.environment.warmup().catch((err) => {
+        logger8.warn("Environment warmup failed (non-fatal)", { error: err, agentId: this.agentId });
+      });
+    }
+    logger8.info("Environment created for agent", {
       agentId: this.agentId,
+      environmentName: this.environment.name,
       imageId: this.imageId,
       cwd: config.sandbox.workdir.path,
       resumeSessionId: resumeSessionId ?? "none",
@@ -1388,7 +1419,7 @@ class RuntimeAgent {
     if (this._lifecycle !== "running") {
       throw new Error(`Cannot send message to ${this._lifecycle} agent`);
     }
-    await this.interactor.receive(content, requestId || `req_${Date.now()}`);
+    await this.interactor.receive(content, requestId || generateRequestId2());
     logger8.debug("RuntimeAgent.receive completed", { agentId: this.agentId });
   }
   interrupt(requestId) {
@@ -1775,7 +1806,8 @@ class RuntimeContainer {
       session,
       llmConfig: this.context.llmConfig,
       image,
-      imageRepository: this.context.persistence.images
+      imageRepository: this.context.persistence.images,
+      environmentFactory: this.context.environmentFactory
     });
     this.agents.set(agentId, agent);
     this.imageToAgent.set(image.imageId, agentId);
@@ -2187,13 +2219,13 @@ class CommandHandler extends BaseEventHandler {
       const record = await this.ops.createImage(containerId, config);
       this.bus.emit(createResponse("image_create_response", {
         requestId,
-        record
+        record,
+        __subscriptions: [record.sessionId]
       }));
     } catch (err) {
       this.emitError("Failed to create image", err, requestId, { containerId });
       this.bus.emit(createResponse("image_create_response", {
         requestId,
-        record: null,
         error: err instanceof Error ? err.message : String(err)
       }));
     }
@@ -2251,7 +2283,6 @@ class CommandHandler extends BaseEventHandler {
       this.emitError("Failed to update image", err, requestId, { imageId });
       this.bus.emit(createResponse("image_update_response", {
         requestId,
-        record: null,
         error: err instanceof Error ? err.message : String(err)
       }));
     }
@@ -2263,7 +2294,8 @@ class CommandHandler extends BaseEventHandler {
       const images = await this.ops.listImages(containerId);
       this.bus.emit(createResponse("image_list_response", {
         requestId,
-        records: images
+        records: images,
+        __subscriptions: images.map((img) => img.sessionId)
       }));
     } catch (err) {
       this.emitError("Failed to list images", err, requestId, { containerId });
@@ -2281,7 +2313,8 @@ class CommandHandler extends BaseEventHandler {
       const image = await this.ops.getImage(imageId);
       this.bus.emit(createResponse("image_get_response", {
         requestId,
-        record: image
+        record: image,
+        __subscriptions: image?.sessionId ? [image.sessionId] : undefined
       }));
     } catch (err) {
       this.emitError("Failed to get image", err, requestId, { imageId });
@@ -2344,6 +2377,7 @@ class RuntimeImpl {
   basePath;
   commandHandler;
   defaultAgent;
+  environmentFactory;
   containerRegistry = new Map;
   constructor(config) {
     logger13.info("RuntimeImpl constructor start");
@@ -2351,6 +2385,7 @@ class RuntimeImpl {
     this.llmProvider = config.llmProvider;
     this.basePath = config.basePath;
     this.defaultAgent = config.defaultAgent;
+    this.environmentFactory = config.environmentFactory;
     logger13.info("Creating SystemBus");
     this.bus = new SystemBusImpl;
     this.llmConfig = this.llmProvider.provide();
@@ -2662,6 +2697,7 @@ class RuntimeImpl {
       bus: this.bus,
       llmConfig: this.llmConfig,
       basePath: this.basePath,
+      environmentFactory: this.environmentFactory,
       onDisposed: (containerId) => {
         this.containerRegistry.delete(containerId);
       }
@@ -2699,4 +2735,4 @@ export {
   RuntimeEnvironment
 };
 
-//# debugId=C63126293F6B51AD64756E2164756E21
+//# debugId=D9D9B299D6CF92E064756E2164756E21