@blockrun/clawrouter 0.12.131 → 0.12.132

package/dist/index.js

@@ -81254,50 +81254,49 @@ var plugin = {
       return;
     }
     installSkillsToWorkspace(api.logger);
-    if (isCompletionMode()) {
-      api.registerProvider(blockrunProvider);
-      return;
-    }
     const proc = process;
     const alreadyRegistered = !!proc.__clawrouterRegistered;
     proc.__clawrouterRegistered = true;
-    if (!alreadyRegistered) {
-      api.registerProvider(blockrunProvider);
-      api.registerImageGenerationProvider(buildImageGenerationProvider());
-      api.registerMusicGenerationProvider(buildMusicGenerationProvider());
-      injectModelsConfig(api.logger);
-      injectAuthProfile(api.logger);
-      const runtimePort = getProxyPort();
-      if (!api.config.models) {
-        api.config.models = { providers: {} };
-      }
-      if (!api.config.models.providers) {
-        api.config.models.providers = {};
-      }
-      api.config.models.providers.blockrun = {
-        baseUrl: `http://127.0.0.1:${runtimePort}/v1`,
-        api: "openai-completions",
-        // apiKey is required by pi-coding-agent's ModelRegistry for providers with models.
-        apiKey: "x402-proxy-handles-auth",
-        models: OPENCLAW_MODELS
-      };
-      api.logger.info("BlockRun provider registered (55+ models via x402)");
-      try {
-        const proxyBaseUrl = `http://127.0.0.1:${runtimePort}`;
-        const partnerTools = buildPartnerTools(proxyBaseUrl);
-        for (const tool of partnerTools) {
-          api.registerTool(tool);
-        }
-        if (partnerTools.length > 0) {
-          api.logger.info(
-            `Registered ${partnerTools.length} partner tool(s): ${partnerTools.map((t) => t.name).join(", ")}`
-          );
-        }
-      } catch (err) {
-        api.logger.warn(
-          `Failed to register partner tools: ${err instanceof Error ? err.message : String(err)}`
+    if (isCompletionMode()) {
+      if (!alreadyRegistered) api.registerProvider(blockrunProvider);
+      return;
+    }
+    if (alreadyRegistered) return;
+    api.registerProvider(blockrunProvider);
+    api.registerImageGenerationProvider(buildImageGenerationProvider());
+    api.registerMusicGenerationProvider(buildMusicGenerationProvider());
+    injectModelsConfig(api.logger);
+    injectAuthProfile(api.logger);
+    const runtimePort = getProxyPort();
+    if (!api.config.models) {
+      api.config.models = { providers: {} };
+    }
+    if (!api.config.models.providers) {
+      api.config.models.providers = {};
+    }
+    api.config.models.providers.blockrun = {
+      baseUrl: `http://127.0.0.1:${runtimePort}/v1`,
+      api: "openai-completions",
+      // apiKey is required by pi-coding-agent's ModelRegistry for providers with models.
+      apiKey: "x402-proxy-handles-auth",
+      models: OPENCLAW_MODELS
+    };
+    api.logger.info("BlockRun provider registered (55+ models via x402)");
+    try {
+      const proxyBaseUrl = `http://127.0.0.1:${runtimePort}`;
+      const partnerTools = buildPartnerTools(proxyBaseUrl);
+      for (const tool of partnerTools) {
+        api.registerTool(tool);
+      }
+      if (partnerTools.length > 0) {
+        api.logger.info(
+          `Registered ${partnerTools.length} partner tool(s): ${partnerTools.map((t) => t.name).join(", ")}`
         );
       }
+    } catch (err) {
+      api.logger.warn(
+        `Failed to register partner tools: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
     api.registerCommand({
       name: "partners",
@@ -81334,7 +81333,6 @@ var plugin = {
     api.registerCommand(createStatsCommand());
     api.registerCommand(createExcludeCommand());
     api.logger.info("Commands registered: /wallet, /blockrun, /stats, /exclude");
-    if (alreadyRegistered) return;
     api.registerService({
       id: "clawrouter-proxy",
       start: () => {
@@ -81377,12 +81375,34 @@ var plugin = {
       api.logger.info("Not in gateway mode \u2014 proxy will start when gateway runs");
       return;
     }
-    startProxyInBackground(api).then(async () => {
-      const port = getProxyPort();
-      const healthy = await waitForProxyHealth(port, 15e3);
-      if (!healthy) {
-        api.logger.warn(`Proxy health check timed out, commands may not work immediately`);
+    const proxyPort = getProxyPort();
+    const portProbe = import("net").then(
+      (net) => new Promise((resolve) => {
+        const sock = net.connect({ host: "127.0.0.1", port: proxyPort }, () => {
+          sock.destroy();
+          resolve(true);
+        });
+        sock.on("error", () => resolve(false));
+        sock.setTimeout(500, () => {
+          sock.destroy();
+          resolve(false);
+        });
+      })
+    );
+    portProbe.then((portInUse) => {
+      if (portInUse) {
+        api.logger.info(
+          `Port ${proxyPort} already in use \u2014 skipping proxy startup (another instance running)`
+        );
+        return;
       }
+      return startProxyInBackground(api).then(async () => {
+        const port = getProxyPort();
+        const healthy = await waitForProxyHealth(port, 15e3);
+        if (!healthy) {
+          api.logger.warn(`Proxy health check timed out, commands may not work immediately`);
+        }
+      });
     }).catch((err) => {
       api.logger.error(
         `Failed to start BlockRun proxy: ${err instanceof Error ? err.message : String(err)}`