@drakon-systems/multi-clawd 1.8.4 → 1.8.5

package/README.md

@@ -367,7 +367,7 @@ openclaw plugins install (Get-Location).Path
 **Or let your agent install it.** Running an OpenClaw assistant or Claude
 Code on the target machine already? Paste it this and go make coffee:
 
-> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.8.3/SETUP-AGENT.md
+> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.8.5/SETUP-AGENT.md
 > and follow it to set up multi-clawd on this machine. I own a second
 > Claude account — ask me when you need me to log in.
 

package/dist/index.js

@@ -12,6 +12,7 @@ import { decideStickySelection } from "./sticky.js";
 import { mergeHealthStates, parseStoredState, recordCredentialFailure, } from "./shim-core.js";
 import { createTokenRefResolver, isSecretRefShape, } from "./token-resolution.js";
 import { resolveSecretRefValues } from "openclaw/plugin-sdk/secret-ref-runtime";
+import { resolvePoolExecutionArgs } from "./tool-cap.js";
 import { addAlert, alertKeysWithPrefix, clearAlert, pendingAlertText, } from "./alerts.js";
 import { healthStateFile, clearAccountCredentialFailure } from "./credential-state.js";
 export { healthStateFile, clearAccountCredentialFailure };
@@ -389,7 +390,9 @@ export function buildBackend(account, execMode) {
         },
         bundleMcp: true,
         bundleMcpMode: "claude-config-file",
-        nativeToolMode: "always-on",
+        nativeToolMode: "selectable",
+        toolAvailabilityEnforcement: "execution-args",
+        resolveExecutionArgs: resolvePoolExecutionArgs,
         sideQuestionToolMode: "disabled",
         ownsNativeCompaction: true,
         config: {

package/dist/tool-cap.js

@@ -0,0 +1,120 @@
+export const OPENCLAW_MCP_TOOL_PREFIX = "mcp__openclaw__";
+const TOOLS_ARG = "--tools";
+const ALLOWED_TOOLS_ARG = "--allowedTools";
+const DISALLOWED_TOOLS_ARG = "--disallowedTools";
+const SETTING_SOURCES_ARG = "--setting-sources";
+const SETTINGS_ARG = "--settings";
+const DISABLE_SLASH_COMMANDS_ARG = "--disable-slash-commands";
+const NO_CHROME_ARG = "--no-chrome";
+const STRICT_MCP_CONFIG_ARG = "--strict-mcp-config";
+const DENY_MCP_TOOLS_VALUE = "mcp__*";
+export const RESTRICTED_SETTINGS = JSON.stringify({
+    disableAllHooks: true,
+    enabledPlugins: {},
+    autoMemoryEnabled: false,
+    claudeMdExcludes: ["**/CLAUDE.md", "**/CLAUDE.local.md", "**/.claude/rules/**"],
+});
+const RESTRICTED_VARIADIC_VALUE_ARGS = new Set([
+    TOOLS_ARG,
+    ALLOWED_TOOLS_ARG,
+    "--allowed-tools",
+    DISALLOWED_TOOLS_ARG,
+    "--disallowed-tools",
+    "--add-dir",
+    "--file",
+]);
+const RESTRICTED_VALUE_ARGS = new Set([
+    "--permission-mode",
+    SETTING_SOURCES_ARG,
+    SETTINGS_ARG,
+    "--agent",
+    "--agents",
+    "--managed-settings",
+    "--plugin-dir",
+    "--plugin-dir-no-mcp",
+    "--plugin-url",
+    "--system-prompt",
+    "--system-prompt-file",
+    "--append-system-prompt",
+    "--append-system-prompt-file",
+]);
+const RESTRICTED_BARE_ARGS = new Set([
+    "--bare",
+    "--safe-mode",
+    DISABLE_SLASH_COMMANDS_ARG,
+    "--chrome",
+    NO_CHROME_ARG,
+    STRICT_MCP_CONFIG_ARG,
+    "--dangerously-skip-permissions",
+    "--allow-dangerously-skip-permissions",
+    "--ide",
+]);
+export function stripClaudeArgs(args, policy) {
+    const normalized = [];
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = args[i] ?? "";
+        const equalsIndex = arg.indexOf("=");
+        const argName = equalsIndex > 0 ? arg.slice(0, equalsIndex) : arg;
+        if (policy.bare?.has(argName))
+            continue;
+        if (policy.variadicValue?.has(argName)) {
+            if (equalsIndex < 0) {
+                while (typeof args[i + 1] === "string" && !args[i + 1]?.startsWith("-"))
+                    i += 1;
+            }
+            continue;
+        }
+        if (policy.value?.has(argName)) {
+            if (equalsIndex < 0) {
+                const maybeValue = args[i + 1];
+                if (typeof maybeValue === "string" && !maybeValue.startsWith("-"))
+                    i += 1;
+            }
+            continue;
+        }
+        normalized.push(arg);
+    }
+    return normalized;
+}
+function collectPreservedDenials(baseArgs) {
+    const preserved = [];
+    for (let i = 0; i < baseArgs.length; i += 1) {
+        const arg = baseArgs[i] ?? "";
+        if (arg === DISALLOWED_TOOLS_ARG || arg === "--disallowed-tools") {
+            while (typeof baseArgs[i + 1] === "string" && !baseArgs[i + 1]?.startsWith("-")) {
+                i += 1;
+                preserved.push(...(baseArgs[i] ?? "").split(","));
+            }
+        }
+        else if (arg.startsWith(`${DISALLOWED_TOOLS_ARG}=`) || arg.startsWith("--disallowed-tools=")) {
+            preserved.push(...arg.slice(arg.indexOf("=") + 1).split(","));
+        }
+    }
+    return preserved;
+}
+export function resolveRestrictedExecutionArgs(baseArgs, availability) {
+    const preservedDenials = collectPreservedDenials(baseArgs);
+    const normalized = stripClaudeArgs(baseArgs, {
+        bare: RESTRICTED_BARE_ARGS,
+        variadicValue: RESTRICTED_VARIADIC_VALUE_ARGS,
+        value: RESTRICTED_VALUE_ARGS,
+    });
+    normalized.push(SETTING_SOURCES_ARG, "", SETTINGS_ARG, RESTRICTED_SETTINGS, DISABLE_SLASH_COMMANDS_ARG, NO_CHROME_ARG, STRICT_MCP_CONFIG_ARG, TOOLS_ARG, availability.native.join(","));
+    if (availability.openClaw.length > 0) {
+        normalized.push(ALLOWED_TOOLS_ARG, availability.openClaw.map((toolName) => `${OPENCLAW_MCP_TOOL_PREFIX}${toolName}`).join(","));
+    }
+    const denials = [
+        ...new Set([
+            ...preservedDenials.map((entry) => entry.trim()).filter(Boolean),
+            ...(availability.openClaw.length === 0 ? [DENY_MCP_TOOLS_VALUE] : []),
+        ]),
+    ].sort();
+    if (denials.length > 0)
+        normalized.push(DISALLOWED_TOOLS_ARG, denials.join(","));
+    return normalized;
+}
+export function resolvePoolExecutionArgs(ctx) {
+    return ctx.toolAvailability
+        ? resolveRestrictedExecutionArgs(ctx.baseArgs, ctx.toolAvailability)
+        : ctx.baseArgs;
+}

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "multi-clawd",
   "name": "multi-clawd",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "description": "Register additional Claude Code logins (Max/Pro accounts) as first-class OpenClaw CLI backends for cross-account failover, keeping the full skills/MCP harness on every account.",
   "cliBackends": [
     "claw1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakon-systems/multi-clawd",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "Multi-account Claude Code failover for OpenClaw — register additional Claude (Max/Pro) logins as first-class CLI backends and keep the full skills/MCP harness across every account. Also imports those accounts' setup tokens into Hermes Agent's Anthropic credential pool.",
   "type": "module",
   "license": "MIT",