@agentrux/agentrux-openclaw-plugin 0.3.6 → 0.3.7

package/dist/index.js

@@ -286,51 +286,24 @@ function default_1(api) {
     // =======================================================================
     if (api.registrationMode !== "full")
         return;
-    // Prevent multiple ingress starts (plugin loaded multiple times by OpenClaw)
+    // Guard: prevent duplicate startup. Set to true only after successful start.
     if (globalThis.__agentruxIngressStarted)
         return;
-    globalThis.__agentruxIngressStarted = true;
-    // Clear token cache on startup to pick up latest grant scopes
-    (0, http_client_1.invalidateToken)();
     const commandTopicId = pluginConfig.commandTopicId;
     const resultTopicId = pluginConfig.resultTopicId;
     const webhookSecret = pluginConfig.webhookSecret;
     const agentId = pluginConfig.agentId;
-    // Skip ingress if not configured
+    const ingressMode = pluginConfig.ingressMode || "webhook";
     if (!commandTopicId || !resultTopicId || !agentId) {
-        logger.info?.("[agentrux] Ingress not configured (missing commandTopicId/resultTopicId/agentId). Tools-only mode.");
-        return;
-    }
-    const creds = (0, credentials_1.loadCredentials)();
-    if (!creds) {
-        logger.warn?.("[agentrux] No credentials found. Run agentrux_activate first. Ingress disabled.");
+        logger.info?.("[agentrux] Ingress not configured. Tools-only mode.");
         return;
     }
-    // Initialize components
-    const cursor = (0, cursor_1.loadCursor)();
-    const queue = new queue_1.BoundedQueue(100);
-    const dispatcher = new dispatcher_1.Dispatcher({
-        commandTopicId,
-        resultTopicId,
-        agentId,
-        maxConcurrency: pluginConfig.maxConcurrency || 3,
-        subagentTimeoutMs: pluginConfig.subagentTimeoutMs || 120_000,
-        gatewayPort: 18789, // OpenClaw default gateway port
-    }, creds, cursor, queue, logger);
-    const ingressMode = pluginConfig.ingressMode || "webhook";
-    const poller = new poller_1.SafetyPoller(creds, commandTopicId, cursor, queue, pluginConfig.pollIntervalMs || 60_000, // default 60s
-    logger);
-    // SSE listener (only when ingressMode=sse)
-    const sseListener = ingressMode === "sse"
-        ? new sse_listener_1.SSEListener(creds, commandTopicId, queue, logger)
-        : null;
-    // --- Internal dispatch endpoint (subagent.run() in Gateway request context) ---
+    // --- /agentrux/dispatch (called by Dispatcher via localhost) ---
     api.registerHttpRoute({
         path: "/agentrux/dispatch",
         auth: "plugin",
         match: "exact",
         handler: async (req, res) => {
-            // Reject non-POST (e.g. HEAD from readiness probe)
             if (req.method !== "POST") {
                 res.statusCode = 405;
                 res.setHeader("Allow", "POST");
@@ -343,7 +316,7 @@ function default_1(api) {
                 req.on("data", (c) => chunks.push(c));
                 req.on("end", resolve);
                 req.on("error", reject);
-            }).catch(() => { }); // aborted/truncated request → empty body → 400 below
+            }).catch(() => { });
             const raw = Buffer.concat(chunks).toString();
             if (!raw) {
                 res.statusCode = 400;
@@ -362,10 +335,7 @@ function default_1(api) {
                 return true;
             }
             try {
-                // Track active session for attachment registry
                 activeSessionKey = params.sessionKey;
-                // OpenClaw 2026.3.24+: provider/model override is not authorized
-                // for plugin subagent runs. The agent's configured model is used.
                 const { runId } = await api.runtime.subagent.run({
                     sessionKey: params.sessionKey,
                     message: params.message,
@@ -374,8 +344,7 @@ function default_1(api) {
                     ...(params.extraSystemPrompt ? { extraSystemPrompt: params.extraSystemPrompt } : {}),
                 });
                 const waitResult = await api.runtime.subagent.waitForRun({
-                    runId,
-                    timeoutMs: params.timeoutMs || 60_000,
+                    runId, timeoutMs: params.timeoutMs || 60_000,
                 });
                 let responseText = "";
                 if (waitResult.status === "ok") {
@@ -391,10 +360,8 @@ function default_1(api) {
                     }
                 }
                 else {
-                    // Subagent failed (rate limit, timeout, etc.) — include reason in response
                     responseText = waitResult.error || waitResult.message || `Agent failed: ${waitResult.status}`;
                 }
-                // Collect attachments uploaded during this run
                 const attachments = consumeAttachments(params.sessionKey);
                 activeSessionKey = null;
                 res.statusCode = 200;
@@ -411,31 +378,58 @@ function default_1(api) {
             return true;
         },
     });
-    // --- Webhook endpoint (only when ingressMode=webhook) ---
-    if (ingressMode === "webhook" && webhookSecret) {
-        api.registerHttpRoute({
-            path: "/agentrux/webhook",
-            auth: "plugin",
-            match: "exact",
-            handler: (0, webhook_handler_1.createWebhookHandler)(queue, webhookSecret, commandTopicId),
-        });
-        logger.info?.("[agentrux] Webhook endpoint registered: /agentrux/webhook");
-    }
-    else if (ingressMode === "webhook" && !webhookSecret) {
-        logger.warn?.("[agentrux] ingressMode=webhook but webhookSecret not set. Falling back to poll-only.");
-    }
-    // --- Start Dispatcher + (Webhook|SSE) + Poller ---
-    // Gateway readiness probe: wait until /health responds.
-    // Even if /health comes up before plugin routes, the transport retry
-    // in callDispatchEndpoint (3 attempts, 2s/4s backoff) covers the gap.
+    // --- Async startup: credentials → construct → start ---
     (async () => {
         try {
+            // 1. Credentials: load or auto-activate
+            (0, http_client_1.invalidateToken)();
+            let creds = (0, credentials_1.loadCredentials)();
+            if (!creds) {
+                const activationCode = pluginConfig.activationCode;
+                if (!activationCode) {
+                    logger.warn?.("[agentrux] No credentials and no activationCode. Ingress disabled.");
+                    return;
+                }
+                logger.info?.("[agentrux] Auto-activating...");
+                const baseUrl = pluginConfig.baseUrl || "https://api.agentrux.com";
+                const r = await (0, http_client_1.httpJson)("POST", `${baseUrl}/auth/activate`, { activation_code: activationCode });
+                if (r.status !== 200 || !r.data.script_id) {
+                    logger.error?.(`[agentrux] Auto-activation failed (HTTP ${r.status}): ${JSON.stringify(r.data)}`);
+                    return;
+                }
+                creds = { base_url: baseUrl, script_id: r.data.script_id, clientSecret: r.data.client_secret };
+                (0, credentials_1.saveCredentials)(creds);
+                credentials = creds;
+                logger.info?.(`[agentrux] Activated: script_id=${r.data.script_id}`);
+            }
+            // 2. Construct
+            const cursor = (0, cursor_1.loadCursor)();
+            const queue = new queue_1.BoundedQueue(100);
+            const dispatcher = new dispatcher_1.Dispatcher({
+                commandTopicId, resultTopicId, agentId,
+                maxConcurrency: pluginConfig.maxConcurrency || 3,
+                subagentTimeoutMs: pluginConfig.subagentTimeoutMs || 120_000,
+                gatewayPort: 18789,
+                publishProcessingStatus: !!pluginConfig.publishProcessingStatus,
+            }, creds, cursor, queue, logger);
+            const poller = new poller_1.SafetyPoller(creds, commandTopicId, cursor, queue, pluginConfig.pollIntervalMs || 60_000, logger);
+            const sseListener = ingressMode === "sse"
+                ? new sse_listener_1.SSEListener(creds, commandTopicId, queue, logger) : null;
+            // Webhook (only if configured)
+            if (ingressMode === "webhook" && webhookSecret) {
+                api.registerHttpRoute({
+                    path: "/agentrux/webhook", auth: "plugin", match: "exact",
+                    handler: (0, webhook_handler_1.createWebhookHandler)(queue, webhookSecret, commandTopicId),
+                });
+            }
+            // 3. Wait for Gateway
             await waitForGateway(18789, 30_000, logger);
+            // 4. Start
             dispatcher.start().catch((e) => logger.error("[agentrux] Dispatcher failed:", e));
-            if (sseListener) {
+            if (sseListener)
                 sseListener.start().catch((e) => logger.error("[agentrux] SSE failed:", e));
-            }
             poller.start().catch((e) => logger.error("[agentrux] Poller failed:", e));
+            globalThis.__agentruxIngressStarted = true;
             logger.info(`[agentrux] Ingress started: mode=${ingressMode} topic=${commandTopicId} agent=${agentId} poll@${pluginConfig.pollIntervalMs || 60000}ms`);
         }
         catch (e) {
@@ -460,5 +454,5 @@ async function waitForGateway(port, timeoutMs, logger) {
             await new Promise((r) => setTimeout(r, 2000));
         }
     }
-    logger.warn("[agentrux] Gateway readiness timeout — starting Dispatcher anyway");
+    logger.warn("[agentrux] Gateway readiness timeout — starting anyway");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentrux/agentrux-openclaw-plugin",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "OpenClaw plugin for AgenTrux — Agent-to-Agent authenticated Pub/Sub",
   "keywords": [
     "openclaw",