multicorn-shield 0.1.3 → 0.1.6

package/dist/multicorn-proxy.js

@@ -128,6 +128,11 @@ function validateScopeAccess(grantedScopes, requested) {
     reason: `No permissions granted for service "${requested.service}". The agent has not been authorised to access this service. Request scope "${formatScope(requested)}" via the consent screen.`
   };
 }
+function hasScope(grantedScopes, requested) {
+  return grantedScopes.some(
+    (granted) => granted.service === requested.service && granted.permissionLevel === requested.permissionLevel
+  );
+}
 
 // src/logger/action-logger.ts
 function createActionLogger(config) {
@@ -639,9 +644,9 @@ function openBrowser(url) {
   const cmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
   spawn(cmd, [url], { detached: true, stdio: "ignore" }).unref();
 }
-async function waitForConsent(agentId, agentName, apiKey, baseUrl, dashboardUrl, logger) {
-  const detectedScopes = detectScopeHints();
-  const consentUrl = buildConsentUrl(agentName, detectedScopes, dashboardUrl);
+async function waitForConsent(agentId, agentName, apiKey, baseUrl, dashboardUrl, logger, scope) {
+  const scopeStrings = scope ? [`${scope.service}:${scope.permissionLevel}`] : detectScopeHints();
+  const consentUrl = buildConsentUrl(agentName, scopeStrings, dashboardUrl);
   logger.info("Opening consent page in your browser.", { url: consentUrl });
   process.stderr.write(
     `
@@ -693,11 +698,12 @@ async function resolveAgentRecord(agentName, apiKey, baseUrl, logger) {
   return { ...agent, scopes };
 }
 function buildConsentUrl(agentName, scopes, dashboardUrl) {
+  const base = dashboardUrl.replace(/\/+$/, "");
   const params = new URLSearchParams({ agent: agentName });
   if (scopes.length > 0) {
     params.set("scopes", scopes.join(","));
   }
-  return `${dashboardUrl}/consent?${params.toString()}`;
+  return `${base}/consent?${params.toString()}`;
 }
 function detectScopeHints() {
   return [];
@@ -746,7 +752,9 @@ function createProxyServer(config) {
   let consentInProgress = false;
   const pendingLines = [];
   let draining = false;
+  let stopped = false;
   async function refreshScopes() {
+    if (stopped) return;
     if (agentId.length === 0) return;
     try {
       const scopes = await fetchGrantedScopes(agentId, config.apiKey, config.baseUrl);
@@ -761,18 +769,24 @@ function createProxyServer(config) {
       });
     }
   }
-  async function ensureConsent() {
-    if (grantedScopes.length > 0 || consentInProgress) return;
+  async function ensureConsent(requestedScope) {
     if (agentId.length === 0) return;
+    if (requestedScope !== void 0) {
+      if (hasScope(grantedScopes, requestedScope) || consentInProgress) return;
+    } else {
+      if (grantedScopes.length > 0 || consentInProgress) return;
+    }
     consentInProgress = true;
     try {
+      const scopeParam = requestedScope !== void 0 ? { service: requestedScope.service, permissionLevel: requestedScope.permissionLevel } : void 0;
       const scopes = await waitForConsent(
         agentId,
         config.agentName,
         config.apiKey,
         config.baseUrl,
         config.dashboardUrl,
-        config.logger
+        config.logger,
+        scopeParam
       );
       grantedScopes = scopes;
       await saveCachedScopes(config.agentName, agentId, scopes);
@@ -786,7 +800,6 @@ function createProxyServer(config) {
     if (request.method !== "tools/call") return null;
     const toolParams = extractToolCallParams(request);
     if (toolParams === null) return null;
-    await ensureConsent();
     const service = extractServiceFromToolName(toolParams.name);
     const action = extractActionFromToolName(toolParams.name);
     const requestedScope = { service, permissionLevel: "execute" };
@@ -797,20 +810,24 @@ function createProxyServer(config) {
       allowed: validation.allowed
     });
     if (!validation.allowed) {
-      if (actionLogger !== null) {
-        if (!config.agentName || config.agentName.trim().length === 0) {
-          process.stderr.write("[multicorn-proxy] Cannot log action: agent name not resolved\n");
-        } else {
-          await actionLogger.logAction({
-            agent: config.agentName,
-            service,
-            actionType: action,
-            status: "blocked"
-          });
+      await ensureConsent(requestedScope);
+      const revalidation = validateScopeAccess(grantedScopes, requestedScope);
+      if (!revalidation.allowed) {
+        if (actionLogger !== null) {
+          if (!config.agentName || config.agentName.trim().length === 0) {
+            process.stderr.write("[multicorn-proxy] Cannot log action: agent name not resolved\n");
+          } else {
+            await actionLogger.logAction({
+              agent: config.agentName,
+              service,
+              actionType: action,
+              status: "blocked"
+            });
+          }
         }
+        const blocked = buildBlockedResponse(request.id, service, "execute", config.dashboardUrl);
+        return JSON.stringify(blocked);
       }
-      const blocked = buildBlockedResponse(request.id, service, "execute", config.dashboardUrl);
-      return JSON.stringify(blocked);
     }
     if (spendingChecker !== null) {
       const costCents = extractCostCents(toolParams.arguments);
@@ -880,6 +897,7 @@ function createProxyServer(config) {
     void drainQueue();
   }
   async function stop() {
+    stopped = true;
     if (refreshTimer !== null) {
       clearInterval(refreshTimer);
       refreshTimer = null;

package/dist/openclaw-hook/handler.js

@@ -295,6 +295,9 @@ function deriveDashboardUrl(baseUrl) {
 function buildConsentUrl(agentName, dashboardUrl, scope) {
   const base = dashboardUrl.replace(/\/+$/, "");
   const params = new URLSearchParams({ agent: agentName });
+  if (scope) {
+    params.set("scopes", `${scope.service}:${scope.permissionLevel}`);
+  }
   return `${base}/consent?${params.toString()}`;
 }
 function openBrowser(url) {
@@ -312,7 +315,7 @@ ${url}
 }
 async function waitForConsent(agentId, agentName, apiKey, baseUrl, scope, logger) {
   const dashboardUrl = deriveDashboardUrl(baseUrl);
-  const consentUrl = buildConsentUrl(agentName, dashboardUrl);
+  const consentUrl = buildConsentUrl(agentName, dashboardUrl, scope);
   process.stderr.write(
     `[multicorn-shield] Opening consent page...
 ${consentUrl}
@@ -337,6 +340,13 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+// src/scopes/scope-validator.ts
+function hasScope(grantedScopes2, requested) {
+  return grantedScopes2.some(
+    (granted) => granted.service === requested.service && granted.permissionLevel === requested.permissionLevel
+  );
+}
+
 // src/openclaw/hook/handler.ts
 var agentRecord = null;
 var grantedScopes = [];
@@ -399,11 +409,20 @@ async function ensureAgent(agentName, apiKey, baseUrl, failMode) {
   }
   return "ready";
 }
-async function ensureConsent(agentName, apiKey, baseUrl) {
-  if (grantedScopes.length > 0 || consentInProgress || agentRecord === null) return;
+async function ensureConsent(agentName, apiKey, baseUrl, scope) {
+  if (agentRecord === null) return;
+  if (scope !== void 0) {
+    const requestedScope = {
+      service: scope.service,
+      permissionLevel: scope.permissionLevel
+    };
+    if (hasScope(grantedScopes, requestedScope) || consentInProgress) return;
+  } else {
+    if (grantedScopes.length > 0 || consentInProgress) return;
+  }
   consentInProgress = true;
   try {
-    const scopes = await waitForConsent(agentRecord.id, agentName, apiKey, baseUrl);
+    const scopes = await waitForConsent(agentRecord.id, agentName, apiKey, baseUrl, scope);
     grantedScopes = scopes;
     await saveCachedScopes(agentName, agentRecord.id, scopes).catch(() => {
     });
@@ -413,6 +432,7 @@ async function ensureConsent(agentName, apiKey, baseUrl) {
 }
 function isPermitted(event) {
   const mapping = mapToolToScope(event.context.toolName);
+  if (!grantedScopes || grantedScopes.length === 0) return false;
   return grantedScopes.some(
     (scope) => scope.service === mapping.service && scope.permissionLevel === mapping.permissionLevel
   );
@@ -437,8 +457,14 @@ var handler = async (event) => {
   if (readiness === "skip") {
     return;
   }
-  await ensureConsent(agentName, config.apiKey, config.baseUrl);
   const mapping = mapToolToScope(event.context.toolName);
+  const requestedScope = {
+    service: mapping.service,
+    permissionLevel: mapping.permissionLevel
+  };
+  if (!hasScope(grantedScopes, requestedScope)) {
+    await ensureConsent(agentName, config.apiKey, config.baseUrl, mapping);
+  }
   const permitted = isPermitted(event);
   if (!permitted) {
     const capitalizedService = mapping.service.charAt(0).toUpperCase() + mapping.service.slice(1);

package/dist/openclaw-plugin/index.js

@@ -479,6 +479,13 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+// src/scopes/scope-validator.ts
+function hasScope(grantedScopes2, requested) {
+  return grantedScopes2.some(
+    (granted) => granted.service === requested.service && granted.permissionLevel === requested.permissionLevel
+  );
+}
+
 // src/openclaw/plugin/index.ts
 var agentRecord = null;
 var grantedScopes = [];
@@ -492,6 +499,20 @@ function readConfig() {
   const pc = pluginConfig ?? {};
   let resolvedApiKey = asString(pc["apiKey"]) ?? process.env["MULTICORN_API_KEY"] ?? "";
   let resolvedBaseUrl = asString(pc["baseUrl"]) ?? process.env["MULTICORN_BASE_URL"] ?? "";
+  if (!resolvedApiKey) {
+    try {
+      const multicornConfigPath = path.join(os.homedir(), ".multicorn", "config.json");
+      const multicornConfigContent = fs.readFileSync(multicornConfigPath, "utf-8");
+      const multicornConfig = JSON.parse(multicornConfigContent);
+      if (multicornConfig && typeof multicornConfig.apiKey === "string" && multicornConfig.apiKey.length > 0) {
+        resolvedApiKey = multicornConfig.apiKey;
+        if (!resolvedBaseUrl) {
+          resolvedBaseUrl = multicornConfig.baseUrl ?? "https://api.multicorn.ai";
+        }
+      }
+    } catch {
+    }
+  }
   if (!resolvedApiKey) {
     try {
       const configPath = path.join(os.homedir(), ".openclaw", "openclaw.json");
@@ -587,7 +608,16 @@ async function ensureAgent(agentName, apiKey, baseUrl, failMode) {
   return "ready";
 }
 async function ensureConsent(agentName, apiKey, baseUrl, scope) {
-  if (grantedScopes.length > 0 || consentInProgress || agentRecord === null) return;
+  if (agentRecord === null) return;
+  if (scope !== void 0) {
+    const requestedScope = {
+      service: scope.service,
+      permissionLevel: scope.permissionLevel
+    };
+    if (hasScope(grantedScopes, requestedScope) || consentInProgress) return;
+  } else {
+    if (grantedScopes.length > 0 || consentInProgress) return;
+  }
   consentInProgress = true;
   try {
     const scopes = await waitForConsent(
@@ -766,7 +796,11 @@ async function beforeToolCall(event, ctx) {
       blockReason: "Approval request timed out after 5 minutes."
     };
   }
-  if (grantedScopes.length === 0 && agentRecord !== null) {
+  const requestedScope = {
+    service: mapping.service,
+    permissionLevel: mapping.permissionLevel
+  };
+  if (!hasScope(grantedScopes, requestedScope) && agentRecord !== null) {
     await ensureConsent(agentName, config.apiKey, config.baseUrl, mapping);
   }
   const capitalizedService = mapping.service.charAt(0).toUpperCase() + mapping.service.slice(1);
@@ -809,7 +843,7 @@ var plugin = {
     const config = readConfig();
     if (config.apiKey.length === 0) {
       api.logger.error(
-        "Multicorn Shield: No API key found. Set MULTICORN_API_KEY in your OpenClaw config (~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.env.MULTICORN_API_KEY). Get a key from your Multicorn dashboard (Settings \u2192 API Keys)."
+        "Multicorn Shield: No API key found. Run `npx multicorn-proxy init` to set up your API key, or set MULTICORN_API_KEY in your OpenClaw config (~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.env.MULTICORN_API_KEY). Get a key from your Multicorn dashboard (Settings \u2192 API Keys)."
       );
     } else {
       api.logger.info(`Multicorn Shield connecting to ${config.baseUrl}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multicorn-shield",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "The control layer for AI agents: permissions, consent, spending limits, and audit logging.",
   "license": "MIT",
   "type": "module",