@blockrun/clawrouter 0.7.0 → 0.8.1

package/dist/index.js

@@ -3502,80 +3502,138 @@ function isCompletionMode() {
   return args.some((arg, i) => arg === "completion" && i >= 1 && i <= 3);
 }
 function injectModelsConfig(logger) {
-  const configPath = join5(homedir4(), ".openclaw", "openclaw.json");
-  if (!existsSync(configPath)) {
-    logger.info("OpenClaw config not found, skipping models injection");
-    return;
+  const configDir = join5(homedir4(), ".openclaw");
+  const configPath = join5(configDir, "openclaw.json");
+  let config = {};
+  let needsWrite = false;
+  if (!existsSync(configDir)) {
+    try {
+      mkdirSync(configDir, { recursive: true });
+      logger.info("Created OpenClaw config directory");
+    } catch (err) {
+      logger.info(`Failed to create config dir: ${err instanceof Error ? err.message : String(err)}`);
+      return;
+    }
   }
-  try {
-    const config = JSON.parse(readFileSync(configPath, "utf-8"));
-    let needsWrite = false;
-    if (!config.models) config.models = {};
-    if (!config.models.providers) config.models.providers = {};
-    const proxyPort = getProxyPort();
-    const expectedBaseUrl = `http://127.0.0.1:${proxyPort}/v1`;
-    if (!config.models.providers.blockrun) {
-      config.models.providers.blockrun = {
-        baseUrl: expectedBaseUrl,
-        api: "openai-completions",
-        // apiKey is required by pi-coding-agent's ModelRegistry for providers with models.
-        // We use a placeholder since the proxy handles real x402 auth internally.
-        apiKey: "x402-proxy-handles-auth",
-        models: OPENCLAW_MODELS
-      };
-      needsWrite = true;
-    } else {
-      if (config.models.providers.blockrun.baseUrl !== expectedBaseUrl) {
-        config.models.providers.blockrun.baseUrl = expectedBaseUrl;
-        needsWrite = true;
-      }
-      if (!config.models.providers.blockrun.apiKey) {
-        config.models.providers.blockrun.apiKey = "x402-proxy-handles-auth";
-        needsWrite = true;
-      }
-      const currentModels = config.models.providers.blockrun.models;
-      if (!currentModels || currentModels.length !== OPENCLAW_MODELS.length) {
-        config.models.providers.blockrun.models = OPENCLAW_MODELS;
+  if (existsSync(configPath)) {
+    try {
+      const content = readFileSync(configPath, "utf-8").trim();
+      if (content) {
+        config = JSON.parse(content);
+      } else {
+        logger.info("OpenClaw config is empty, initializing");
         needsWrite = true;
       }
+    } catch (err) {
+      logger.info(`Failed to parse config (will recreate): ${err instanceof Error ? err.message : String(err)}`);
+      config = {};
+      needsWrite = true;
     }
-    if (!config.agents) config.agents = {};
-    if (!config.agents.defaults) config.agents.defaults = {};
-    if (!config.agents.defaults.model) config.agents.defaults.model = {};
-    if (config.agents.defaults.model.primary !== "blockrun/auto") {
-      config.agents.defaults.model.primary = "blockrun/auto";
+  } else {
+    logger.info("OpenClaw config not found, creating");
+    needsWrite = true;
+  }
+  if (!config.models) {
+    config.models = {};
+    needsWrite = true;
+  }
+  const models = config.models;
+  if (!models.providers) {
+    models.providers = {};
+    needsWrite = true;
+  }
+  const proxyPort = getProxyPort();
+  const expectedBaseUrl = `http://127.0.0.1:${proxyPort}/v1`;
+  const providers = models.providers;
+  if (!providers.blockrun) {
+    providers.blockrun = {
+      baseUrl: expectedBaseUrl,
+      api: "openai-completions",
+      // apiKey is required by pi-coding-agent's ModelRegistry for providers with models.
+      // We use a placeholder since the proxy handles real x402 auth internally.
+      apiKey: "x402-proxy-handles-auth",
+      models: OPENCLAW_MODELS
+    };
+    logger.info("Injected BlockRun provider config");
+    needsWrite = true;
+  } else {
+    const blockrun = providers.blockrun;
+    let fixed = false;
+    if (!blockrun.baseUrl || blockrun.baseUrl !== expectedBaseUrl) {
+      blockrun.baseUrl = expectedBaseUrl;
+      fixed = true;
+    }
+    if (!blockrun.api) {
+      blockrun.api = "openai-completions";
+      fixed = true;
+    }
+    if (!blockrun.apiKey) {
+      blockrun.apiKey = "x402-proxy-handles-auth";
+      fixed = true;
+    }
+    const currentModels = blockrun.models;
+    if (!currentModels || !Array.isArray(currentModels) || currentModels.length !== OPENCLAW_MODELS.length) {
+      blockrun.models = OPENCLAW_MODELS;
+      fixed = true;
+    }
+    if (fixed) {
+      logger.info("Fixed incomplete BlockRun provider config");
       needsWrite = true;
     }
-    const KEY_MODEL_ALIASES = [
-      { id: "auto", alias: "auto" },
-      { id: "free", alias: "free" },
-      { id: "sonnet", alias: "sonnet" },
-      { id: "opus", alias: "opus" },
-      { id: "haiku", alias: "haiku" },
-      { id: "grok", alias: "grok" },
-      { id: "deepseek", alias: "deepseek" },
-      { id: "kimi", alias: "kimi" },
-      { id: "gemini", alias: "gemini" },
-      { id: "flash", alias: "flash" },
-      { id: "gpt", alias: "gpt" },
-      { id: "reasoner", alias: "reasoner" }
-    ];
-    if (!config.agents) config.agents = {};
-    if (!config.agents.defaults) config.agents.defaults = {};
-    if (!config.agents.defaults.models) config.agents.defaults.models = {};
-    const allowlist = config.agents.defaults.models;
-    for (const m of KEY_MODEL_ALIASES) {
-      const fullId = `blockrun/${m.id}`;
-      if (!allowlist[fullId]) {
-        allowlist[fullId] = { alias: m.alias };
-        needsWrite = true;
-      }
+  }
+  if (!config.agents) {
+    config.agents = {};
+    needsWrite = true;
+  }
+  const agents = config.agents;
+  if (!agents.defaults) {
+    agents.defaults = {};
+    needsWrite = true;
+  }
+  const defaults = agents.defaults;
+  if (!defaults.model) {
+    defaults.model = {};
+    needsWrite = true;
+  }
+  const model = defaults.model;
+  if (!model.primary) {
+    model.primary = "blockrun/auto";
+    logger.info("Set default model to blockrun/auto (first install)");
+    needsWrite = true;
+  }
+  const KEY_MODEL_ALIASES = [
+    { id: "auto", alias: "auto" },
+    { id: "free", alias: "free" },
+    { id: "sonnet", alias: "sonnet" },
+    { id: "opus", alias: "opus" },
+    { id: "haiku", alias: "haiku" },
+    { id: "grok", alias: "grok" },
+    { id: "deepseek", alias: "deepseek" },
+    { id: "kimi", alias: "kimi" },
+    { id: "gemini", alias: "gemini" },
+    { id: "flash", alias: "flash" },
+    { id: "gpt", alias: "gpt" },
+    { id: "reasoner", alias: "reasoner" }
+  ];
+  if (!defaults.models) {
+    defaults.models = {};
+    needsWrite = true;
+  }
+  const allowlist = defaults.models;
+  for (const m of KEY_MODEL_ALIASES) {
+    const fullId = `blockrun/${m.id}`;
+    if (!allowlist[fullId]) {
+      allowlist[fullId] = { alias: m.alias };
+      needsWrite = true;
     }
-    if (needsWrite) {
+  }
+  if (needsWrite) {
+    try {
       writeFileSync(configPath, JSON.stringify(config, null, 2));
       logger.info("Smart routing enabled (blockrun/auto)");
+    } catch (err) {
+      logger.info(`Failed to write config: ${err instanceof Error ? err.message : String(err)}`);
     }
-  } catch {
   }
 }
 function injectAuthProfile(logger) {
@@ -3830,7 +3888,10 @@ var plugin = {
     if (!agents.defaults) agents.defaults = {};
     const defaults = agents.defaults;
     if (!defaults.model) defaults.model = {};
-    defaults.model.primary = "blockrun/auto";
+    const model = defaults.model;
+    if (!model.primary) {
+      model.primary = "blockrun/auto";
+    }
     api.logger.info("BlockRun provider registered (30+ models via x402)");
     createWalletCommand().then((walletCommand) => {
       api.registerCommand(walletCommand);