@skilder-ai/runtime 0.9.5 → 0.9.6

package/dist/index.js

@@ -21889,7 +21889,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire: createRequire2 } = require("module");
     var getCallers = require_caller();
-    var { join: join6, isAbsolute: isAbsolute3, sep: sep3 } = require("node:path");
+    var { join: join6, isAbsolute: isAbsolute4, sep: sep3 } = require("node:path");
     var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -21988,7 +21988,7 @@ var require_transport = __commonJS({
       return buildStream(fixTarget(target), options, worker, sync);
       function fixTarget(origin) {
         origin = bundlerOverrides[origin] || origin;
-        if (isAbsolute3(origin) || origin.indexOf("file://") === 0) {
+        if (isAbsolute4(origin) || origin.indexOf("file://") === 0) {
           return origin;
         }
         if (origin === "pino/file") {
@@ -138862,6 +138862,7 @@ var OAuthProviderType = /* @__PURE__ */ ((OAuthProviderType2) => {
   OAuthProviderType2["GithubSignin"] = "GITHUB_SIGNIN";
   OAuthProviderType2["Google"] = "GOOGLE";
   OAuthProviderType2["GoogleSignin"] = "GOOGLE_SIGNIN";
+  OAuthProviderType2["Infomaniak"] = "INFOMANIAK";
   OAuthProviderType2["McpOauth"] = "MCP_OAUTH";
   OAuthProviderType2["Microsoft"] = "MICROSOFT";
   OAuthProviderType2["Zoho"] = "ZOHO";
@@ -153626,15 +153627,14 @@ var ToolServerService = class ToolServerService2 extends LifecycleService {
    * while Node.js errors appear on the first line.
    */
   extractStderrMessage(stderr) {
-    const lines = stderr.split("\n");
+    const lines = stderr.split("\n").map((l2) => l2.trim()).filter(Boolean);
+    if (lines.length === 0)
+      return "";
     if (this.isPythonServer) {
-      for (let i2 = lines.length - 1; i2 >= 0; i2--) {
-        const line = lines[i2].trim();
-        if (line)
-          return line;
-      }
+      return lines[lines.length - 1];
     }
-    return lines[0].trim();
+    const messageLine = lines.find((l2) => /^(?:[A-Z][\w]*Error|Error)\b/.test(l2));
+    return messageLine ?? lines[0];
   }
   async shutdown() {
     this.logger.info("Stopping");
@@ -154743,14 +154743,27 @@ var ToolService = class ToolService2 extends LifecycleService {
     this.mcpTools.delete(mcpServerId);
     this.mcpServerWorkspaces.delete(mcpServerId);
   }
-  // Subscribe to a tool and return the subscription
-  subscribeToTool(tool2, workspaceId) {
+  // Subscribe to a tool and return the subscription.
+  // Self-heal: if the consumer loop exits (normally or via throw), drop our
+  // bookkeeping entry so the next ensureToolsSubscribed() reconcile re-subscribes
+  // instead of skipping the tool as "already subscribed" while no one reads from
+  // the subject — that mismatch causes silent NATS request timeouts on the caller.
+  subscribeToTool(tool2, workspaceId, mcpServerId) {
     const subject = SkillCallToolRequest.subscribeToTool(tool2.id, workspaceId);
     this.logger.debug(`Subscribing to tool ${tool2.id} on subject: ${subject}`);
     const subscription = this.natsService.subscribe(subject);
-    this.handleToolCall(subscription).catch((err) => {
-      this.logger.error({ event: "tool_call_subscription_died", toolId: tool2.id, err }, "Tool call subscription loop terminated unexpectedly");
-    });
+    const onLoopEnd = (err) => {
+      if (err) {
+        this.logger.error({ event: "tool_call_subscription_died", toolId: tool2.id, mcpServerId, err }, "Tool call subscription loop terminated unexpectedly");
+      } else {
+        this.logger.debug({ event: "tool_call_subscription_ended", toolId: tool2.id, mcpServerId }, "Tool call subscription loop ended");
+      }
+      const serverToolSubs = this.toolSubscriptions.get(mcpServerId);
+      if (serverToolSubs && serverToolSubs.get(tool2.id) === subscription) {
+        serverToolSubs.delete(tool2.id);
+      }
+    };
+    this.handleToolCall(subscription).then(() => onLoopEnd(), (err) => onLoopEnd(err));
     return subscription;
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -155605,7 +155618,7 @@ ${result.stdout}
     for (const tool2 of tools) {
       if (tool2 && !serverToolSubs.has(tool2.id)) {
         this.logger.debug(`Subscribing to tool ${tool2.name} (${tool2.id})`);
-        const subscription = this.subscribeToTool(tool2, workspaceId);
+        const subscription = this.subscribeToTool(tool2, workspaceId, mcpServerId);
         serverToolSubs.set(tool2.id, subscription);
       } else if (tool2) {
         this.logger.debug(`Tool ${tool2.name} (${tool2.id}) already subscribed -> skipping`);
@@ -156458,6 +156471,9 @@ var start = () => {
 var projectRoot = (0, import_path4.resolve)(__dirname, "../../..");
 var packagePath = (0, import_path4.resolve)(__dirname, "../");
 loadEnv(projectRoot, packagePath, process.env.FORWARD_STDERR !== "false");
+if (process.env.MCP_SERVERS_PATH && !(0, import_path4.isAbsolute)(process.env.MCP_SERVERS_PATH)) {
+  process.env.MCP_SERVERS_PATH = (0, import_path4.resolve)(process.cwd(), process.env.MCP_SERVERS_PATH);
+}
 start();
 var mainService = container.get(MainService);
 mainService.start("index");