plugin-agent-orchestrator 1.0.28 → 1.0.32

package/dist/server/skill-hub/plugin.js

@@ -55,6 +55,8 @@ var import_git_import = require("./actions/git-import");
 var import_json_fields = require("./utils/json-fields");
 var import_ExecutionSpanService = require("../services/ExecutionSpanService");
 var import_ai_manager = require("../utils/ai-manager");
+const SKILL_TASK_POLL_INTERVAL_MS = Number.parseInt(process.env.SKILL_HUB_TASK_POLL_INTERVAL_MS || "5000", 10);
+const SKILL_TASK_POLL_LIMIT = Number.parseInt(process.env.SKILL_HUB_TASK_POLL_LIMIT || "3", 10);
 function normalizeToolRuntime(runtime) {
   if (!runtime) return void 0;
   if (typeof runtime === "string") {
@@ -128,6 +130,10 @@ class SkillHubSubFeature {
   cleanupInterval = null;
   initEnvDoneCallback = null;
   initEnvProgressCallback = null;
+  skillTaskCallback = null;
+  initEnvTaskCallback = null;
+  skillTaskPoller = null;
+  skillTaskPolling = false;
   mcpController;
   skillRepoService;
   rateLimiter = new RateLimiter(
@@ -258,17 +264,20 @@ class SkillHubSubFeature {
         }
       }
     });
-    this.app.pubSubManager.subscribe("skill-hub.task", async (payload) => {
+    this.skillTaskCallback = async (payload) => {
       if (process.env.SKILL_HUB_SANDBOX === "false") return;
       await this.onQueueTask(payload);
-    });
-    this.app.pubSubManager.subscribe("skill-hub.init-env", async (payload) => {
+    };
+    this.app.pubSubManager.subscribe("skill-hub.task", this.skillTaskCallback);
+    this.initEnvTaskCallback = async (payload) => {
       if (process.env.SKILL_HUB_SANDBOX === "false") return;
       await this.workerEnvManager.executeInit(payload);
-    });
+    };
+    this.app.pubSubManager.subscribe("skill-hub.init-env", this.initEnvTaskCallback);
     this.app.on("afterStart", async () => {
       this.registerAITools();
       this.startCleanupInterval();
+      this.startSkillTaskPoller();
       await this.subscribeInitEnvDone();
       await this.skillManager.seedDefaults().catch((e) => {
         this.app.logger.error(`[skill-hub] Failed to seed default skills: ${e.message}`);
@@ -277,6 +286,14 @@ class SkillHubSubFeature {
   }
   async onQueueTask(message) {
     this.app.logger.info(`[skill-hub] Worker received queue task: ${message.id}`);
+    if (process.env.SKILL_HUB_SANDBOX === "false") {
+      return;
+    }
+    const claimed = await this.claimSkillExecution(message.id);
+    if (!claimed) {
+      this.app.logger.debug(`[skill-hub] Task ${message.id} ignored: already claimed or not pending.`);
+      return;
+    }
     const execution = await this.db.getRepository("skillExecutions").findOne({
       filter: { id: message.id },
       appends: ["skill"]
@@ -294,9 +311,52 @@ class SkillHubSubFeature {
     );
     await task.run();
   }
+  async claimSkillExecution(id) {
+    const model = this.db.getModel("skillExecutions");
+    const [affected] = await model.update(
+      { status: "running" },
+      {
+        where: {
+          id,
+          status: "pending"
+        }
+      }
+    );
+    return affected > 0;
+  }
+  startSkillTaskPoller() {
+    var _a, _b;
+    if (process.env.SKILL_HUB_SANDBOX === "false" || this.skillTaskPoller) {
+      return;
+    }
+    const tick = () => {
+      this.processPendingSkillExecutions().catch((error) => {
+        this.app.logger.warn(`[skill-hub] Pending task poll failed: ${(error == null ? void 0 : error.message) || error}`);
+      });
+    };
+    this.skillTaskPoller = setInterval(tick, SKILL_TASK_POLL_INTERVAL_MS);
+    (_b = (_a = this.skillTaskPoller).unref) == null ? void 0 : _b.call(_a);
+    setTimeout(tick, 1e3);
+  }
+  async processPendingSkillExecutions() {
+    if (this.skillTaskPolling) return;
+    this.skillTaskPolling = true;
+    try {
+      const records = await this.db.getRepository("skillExecutions").find({
+        filter: { status: "pending" },
+        sort: ["createdAt"],
+        limit: SKILL_TASK_POLL_LIMIT
+      });
+      for (const record of records) {
+        await this.onQueueTask({ id: String(record.get("id")) });
+      }
+    } finally {
+      this.skillTaskPolling = false;
+    }
+  }
   /**
    * Execute skill — called by both AI tool and REST test endpoint.
-   * Dispatches to worker via EventQueue, waits for result via PubSub.
+   * Dispatches to sandbox workers via PubSub, waits for result via PubSub.
    * Pushes progress to SSE via runtime.writer (if within AI tool context).
    * Includes rate limiting and graceful abort propagation.
    */
@@ -666,6 +726,18 @@ IMPORTANT: This skill is bound to a Skill Hub human-in-the-loop review template.
     }, CLEANUP_INTERVAL);
   }
   async beforeStop() {
+    if (this.skillTaskCallback) {
+      try {
+        await this.app.pubSubManager.unsubscribe("skill-hub.task", this.skillTaskCallback);
+      } catch {
+      }
+    }
+    if (this.initEnvTaskCallback) {
+      try {
+        await this.app.pubSubManager.unsubscribe("skill-hub.init-env", this.initEnvTaskCallback);
+      } catch {
+      }
+    }
     if (this.initEnvDoneCallback) {
       try {
         await this.app.pubSubManager.unsubscribe("skill-hub.init-env.done", this.initEnvDoneCallback);
@@ -682,6 +754,10 @@ IMPORTANT: This skill is bound to a Skill Hub human-in-the-loop review template.
       clearInterval(this.cleanupInterval);
       this.cleanupInterval = null;
     }
+    if (this.skillTaskPoller) {
+      clearInterval(this.skillTaskPoller);
+      this.skillTaskPoller = null;
+    }
   }
   // --- Handlers ---
   async handleClearStorage(ctx, next) {

package/dist/server/skill-hub/tasks/SkillExecutionTask.js

@@ -74,7 +74,9 @@ class SkillExecutionTask {
     var _a, _b, _c, _d, _e;
     const skill = this.execution.get("skill") || this.execution.skill;
     const execId = String(this.execution.get("id"));
-    await this.execution.update({ status: "running" });
+    if (this.execution.get("status") !== "running") {
+      await this.execution.update({ status: "running" });
+    }
     const abortController = new TaskAbortController();
     const abortChannel = `skill-hub.abort.${execId}`;
     const abortCallback = async () => {
@@ -290,7 +292,9 @@ class SkillExecutionTask {
     try {
       manifest = JSON.parse((0, import_fs.readFileSync)(manifestPath, "utf8"));
     } catch (error) {
-      throw new Error(`Generated skill install manifest is invalid JSON: ${error instanceof Error ? error.message : String(error)}`);
+      throw new Error(
+        `Generated skill install manifest is invalid JSON: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
     if (!(manifest == null ? void 0 : manifest.autoInstall)) return null;
     const skill = manifest.skill || {};
@@ -393,7 +397,9 @@ class SkillExecutionTask {
     const missing = packages.map((pkg) => pkg.trim()).filter((pkg) => !allowedSet.has(pkg.toLowerCase()));
     if (missing.length > 0) {
       throw new Error(
-        `Generated skill "${name}" requires ${language} package(s) not available in the Skill Hub worker environment: ${missing.join(", ")}. Add them to the worker environment and refresh/init Skill Hub before installing this skill.`
+        `Generated skill "${name}" requires ${language} package(s) not available in the Skill Hub worker environment: ${missing.join(
+          ", "
+        )}. Add them to the worker environment and refresh/init Skill Hub before installing this skill.`
       );
     }
   }