@clawdreyhepburn/carapace 0.4.2 → 0.4.3

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "carapace",
   "name": "Carapace",
   "description": "Immutable policy boundaries for MCP tool access. Your agent's exoskeleton.",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "configSchema": {
     "type": "object",
     "additionalProperties": true,
@@ -20,13 +20,31 @@
           "properties": {
             "transport": {
               "type": "string",
-              "enum": ["stdio", "http", "sse"],
+              "enum": [
+                "stdio",
+                "http",
+                "sse"
+              ],
               "default": "stdio"
             },
-            "command": { "type": "string" },
-            "args": { "type": "array", "items": { "type": "string" } },
-            "env": { "type": "object", "additionalProperties": { "type": "string" } },
-            "url": { "type": "string" }
+            "command": {
+              "type": "string"
+            },
+            "args": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "env": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            "url": {
+              "type": "string"
+            }
           }
         }
       },
@@ -37,7 +55,10 @@
       },
       "defaultPolicy": {
         "type": "string",
-        "enum": ["deny-all", "allow-all"],
+        "enum": [
+          "deny-all",
+          "allow-all"
+        ],
         "default": "allow-all",
         "description": "Default policy for tools. allow-all (default) keeps everything working — use the GUI to restrict. deny-all requires explicit permits."
       },
@@ -74,13 +95,32 @@
     }
   },
   "uiHints": {
-    "guiPort": { "label": "GUI Port", "placeholder": "19820" },
-    "policyDir": { "label": "Policy Directory" },
-    "defaultPolicy": { "label": "Default Policy for New Tools" },
-    "verify": { "label": "Enable Formal Verification" },
-    "proxy.enabled": { "label": "Enable LLM Proxy" },
-    "proxy.port": { "label": "Proxy Port", "placeholder": "19821" },
-    "proxy.upstream": { "label": "Upstream API URL" },
-    "proxy.apiKey": { "label": "Upstream API Key", "sensitive": true }
+    "guiPort": {
+      "label": "GUI Port",
+      "placeholder": "19820"
+    },
+    "policyDir": {
+      "label": "Policy Directory"
+    },
+    "defaultPolicy": {
+      "label": "Default Policy for New Tools"
+    },
+    "verify": {
+      "label": "Enable Formal Verification"
+    },
+    "proxy.enabled": {
+      "label": "Enable LLM Proxy"
+    },
+    "proxy.port": {
+      "label": "Proxy Port",
+      "placeholder": "19821"
+    },
+    "proxy.upstream": {
+      "label": "Upstream API URL"
+    },
+    "proxy.apiKey": {
+      "label": "Upstream API Key",
+      "sensitive": true
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawdreyhepburn/carapace",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Immutable policy boundaries for MCP tool access. Powered by Cedar + Cedarling WASM.",
   "license": "Apache-2.0",
   "type": "module",

package/src/index.ts

@@ -228,6 +228,41 @@ export default function register(api: OpenClawPluginApi) {
       writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
     }
 
+    // Also patch the per-agent models.json (this is what OpenClaw actually reads at runtime)
+    // openclaw.json models.providers gets merged INTO models.json on restart,
+    // but if someone restores openclaw.json from backup, models.json keeps the stale baseUrl.
+    // So we patch both files for safety.
+    const agentModelsPath = join(homedir(), ".openclaw", "agents", "main", "agent", "models.json");
+    if (existsSync(agentModelsPath)) {
+      try {
+        const agentModels = JSON.parse(readFileSync(agentModelsPath, "utf-8"));
+        let agentModelsChanged = false;
+        if (!agentModels.providers) agentModels.providers = {};
+        for (const provider of providers) {
+          if (!agentModels.providers[provider]) agentModels.providers[provider] = {};
+          if (agentModels.providers[provider].baseUrl !== proxyUrl) {
+            if (agentModels.providers[provider].baseUrl && agentModels.providers[provider].baseUrl !== proxyUrl) {
+              agentModels.providers[provider]._originalBaseUrl = agentModels.providers[provider].baseUrl;
+            }
+            agentModels.providers[provider].baseUrl = proxyUrl;
+            agentModelsChanged = true;
+          }
+        }
+        if (agentModelsChanged) {
+          // Backup models.json before modifying
+          const modelsBackup = agentModelsPath + ".carapace-backup";
+          if (!existsSync(modelsBackup)) {
+            const { copyFileSync } = require("node:fs");
+            copyFileSync(agentModelsPath, modelsBackup);
+          }
+          writeFileSync(agentModelsPath, JSON.stringify(agentModels, null, 2) + "\n", "utf-8");
+          patched.push(...providers.map(p => `models.json:${p}`));
+        }
+      } catch (e: any) {
+        logger.warn(`Failed to patch agent models.json: ${e.message}`);
+      }
+    }
+
     return { patched, alreadySet };
   }
 
@@ -708,6 +743,68 @@ export default function register(api: OpenClawPluginApi) {
               if (cfg.models && Object.keys(cfg.models).length === 0) delete cfg.models;
             }
 
+            // Also clean up the per-agent models.json
+            const agentModelsPath = join(homedir(), ".openclaw", "agents", "main", "agent", "models.json");
+            if (existsSync(agentModelsPath)) {
+              try {
+                const agentModels = JSON.parse(readFileSync(agentModelsPath, "utf-8"));
+                let modelsChanged = false;
+                if (agentModels.providers) {
+                  for (const [name, provCfg] of Object.entries(agentModels.providers)) {
+                    if ((provCfg as any)?.baseUrl === proxyUrl) {
+                      if ((provCfg as any)._originalBaseUrl) {
+                        (provCfg as any).baseUrl = (provCfg as any)._originalBaseUrl;
+                        delete (provCfg as any)._originalBaseUrl;
+                      } else {
+                        delete (provCfg as any).baseUrl;
+                      }
+                      if (Object.keys(provCfg as any).length === 0) delete agentModels.providers[name];
+                      modelsChanged = true;
+                      console.log(`  ✅ Cleaned proxy baseUrl from models.json for ${name}`);
+                    }
+                  }
+                }
+                if (modelsChanged) {
+                  writeFileSync(agentModelsPath, JSON.stringify(agentModels, null, 2) + "\n", "utf-8");
+                  changed = true;
+                }
+              } catch (e: any) {
+                console.log(`  ⚠️  Could not clean models.json: ${e.message}`);
+              }
+            }
+
+            // Clean up per-agent models.json (this is what actually routes API calls)
+            const agentModelsPath = join(homedir(), ".openclaw", "agents", "main", "agent", "models.json");
+            if (existsSync(agentModelsPath)) {
+              try {
+                const agentModels = JSON.parse(readFileSync(agentModelsPath, "utf-8"));
+                let modelsChanged = false;
+                if (agentModels.providers) {
+                  for (const [name, provCfg] of Object.entries(agentModels.providers)) {
+                    if ((provCfg as any)?.baseUrl === proxyUrl) {
+                      if ((provCfg as any)._originalBaseUrl) {
+                        (provCfg as any).baseUrl = (provCfg as any)._originalBaseUrl;
+                        delete (provCfg as any)._originalBaseUrl;
+                      } else {
+                        delete (provCfg as any).baseUrl;
+                      }
+                      // Remove empty provider entries (but keep ones with other config)
+                      const remaining = Object.keys(provCfg as any).filter(k => k !== 'models' || (provCfg as any).models?.length > 0);
+                      if (remaining.length === 0) delete agentModels.providers[name];
+                      modelsChanged = true;
+                      console.log(`  ✅ Cleaned proxy baseUrl from models.json (${name})`);
+                    }
+                  }
+                }
+                if (modelsChanged) {
+                  writeFileSync(agentModelsPath, JSON.stringify(agentModels, null, 2) + "\n", "utf-8");
+                  changed = true;
+                }
+              } catch (e: any) {
+                console.log(`  ⚠️  Could not clean models.json: ${e.message}`);
+              }
+            }
+
             // Disable the plugin entry (don't delete — user might want to re-enable)
             if (cfg.plugins?.entries?.carapace?.enabled) {
               cfg.plugins.entries.carapace.enabled = false;