multicorn-shield 1.11.1 → 1.12.1

package/dist/openclaw-hook/HOOK.md

@@ -33,9 +33,11 @@ metadata:
 >     "entries": {
 >       "multicorn-shield": {
 >         "enabled": true,
->         "env": {
->           "MULTICORN_API_KEY": "mcs_your_key_here",
->           "MULTICORN_BASE_URL": "https://api.multicorn.ai"
+>         "config": {
+>           "apiKey": "${MULTICORN_API_KEY}",
+>           "baseUrl": "https://api.multicorn.ai",
+>           "agentName": "openclaw",
+>           "failMode": "closed"
 >         }
 >       }
 >     }

package/dist/openclaw-hook/handler.js

@@ -184,7 +184,7 @@ function handleHttpError(status, logger, retryDelaySeconds) {
   if (status === 401 || status === 403) {
     if (!authErrorLogged) {
       authErrorLogged = true;
-      const errorMsg = "[multicorn-shield] ERROR: Authentication failed. Your MULTICORN_API_KEY is invalid or expired. Check the key in your OpenClaw config (~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.env.MULTICORN_API_KEY). Get a valid key from your Multicorn dashboard (Settings \u2192 API Keys).";
+      const errorMsg = "[multicorn-shield] ERROR: Authentication failed. Your MULTICORN_API_KEY is invalid or expired. Check the key in ~/.multicorn/config.json (from npx multicorn-shield init) or ~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.config.apiKey. Get a valid key from your Multicorn dashboard (Settings \u2192 API Keys).";
       process.stderr.write(`${errorMsg}
 `);
     }

package/dist/openclaw-plugin/multicorn-shield.js

@@ -189,7 +189,7 @@ function handleHttpError(status, logger, retryDelaySeconds) {
   if (status === 401 || status === 403) {
     if (!authErrorLogged) {
       authErrorLogged = true;
-      const errorMsg = "[multicorn-shield] ERROR: Authentication failed. Your MULTICORN_API_KEY is invalid or expired. Check the key in your OpenClaw config (~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.env.MULTICORN_API_KEY). Get a valid key from your Multicorn dashboard (Settings \u2192 API Keys).";
+      const errorMsg = "[multicorn-shield] ERROR: Authentication failed. Your MULTICORN_API_KEY is invalid or expired. Check the key in ~/.multicorn/config.json (from npx multicorn-shield init) or ~/.openclaw/openclaw.json \u2192 plugins.entries.multicorn-shield.config.apiKey. Get a valid key from your Multicorn dashboard (Settings \u2192 API Keys).";
       logger?.error(errorMsg);
       process.stderr.write(`${errorMsg}
 `);
@@ -491,20 +491,41 @@ function agentNameFromOpenclawPlatform(cfg) {
   }
   return void 0;
 }
+var ENV_REF_PATTERN = /^\$\{([A-Z_][A-Z0-9_]*)\}$/;
+function resolveConfigString(value) {
+  const raw = asString(value);
+  if (raw === void 0) return void 0;
+  const match = ENV_REF_PATTERN.exec(raw.trim());
+  if (match === null) return raw;
+  const envName = match[1];
+  if (envName === void 0) return void 0;
+  const fromEnv = process.env[envName];
+  return typeof fromEnv === "string" && fromEnv.length > 0 ? fromEnv : void 0;
+}
+function parseFailMode(value) {
+  if (value === "open") return "open";
+  if (value === "closed") return "closed";
+  return "closed";
+}
 function readConfig() {
   const pc = pluginConfig ?? {};
-  const resolvedApiKey = asString(cachedMulticornConfig?.apiKey) ?? asString(process.env["MULTICORN_API_KEY"]) ?? "";
-  const resolvedBaseUrl = asString(cachedMulticornConfig?.baseUrl) ?? asString(process.env["MULTICORN_BASE_URL"]) ?? "https://api.multicorn.ai";
+  const fromFileKey = asString(cachedMulticornConfig?.apiKey);
+  const fromPluginKey = resolveConfigString(pc["apiKey"]);
+  const fromEnvKey = asString(process.env["MULTICORN_API_KEY"]);
+  let apiKey = fromFileKey ?? fromPluginKey ?? fromEnvKey ?? "";
+  const fromPluginBase = resolveConfigString(pc["baseUrl"]);
+  const fromFileBase = asString(cachedMulticornConfig?.baseUrl);
+  const fromEnvBase = asString(process.env["MULTICORN_BASE_URL"]);
+  const baseUrl = fromPluginBase ?? fromFileBase ?? fromEnvBase ?? "https://api.multicorn.ai";
   const agentName = asString(pc["agentName"]) ?? process.env["MULTICORN_AGENT_NAME"] ?? agentNameFromOpenclawPlatform(cachedMulticornConfig) ?? asString(cachedMulticornConfig?.agentName) ?? null;
-  const failMode = "closed";
-  let apiKey = resolvedApiKey;
+  const failMode = parseFailMode(pc["failMode"]);
   if (apiKey.length > 0 && (!apiKey.startsWith("mcs_") || apiKey.length < 16)) {
     pluginLogger?.error(
       "Invalid API key format. Key must start with mcs_ and be at least 16 characters."
     );
     apiKey = "";
   }
-  return { apiKey, baseUrl: resolvedBaseUrl, agentName, failMode };
+  return { apiKey, baseUrl, agentName, failMode };
 }
 function asString(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
@@ -919,4 +940,4 @@ function resetState() {
   hasLoggedFirstAction = false;
 }
 
-export { afterToolCall, beforeToolCall, plugin, readConfig, register, resetState, resolveAgentName };
+export { afterToolCall, beforeToolCall, plugin, readConfig, register, resetState, resolveAgentName, resolveConfigString };

package/dist/openclaw-plugin/openclaw.plugin.json

@@ -9,7 +9,7 @@
     "properties": {
       "apiKey": {
         "type": "string",
-        "pattern": "^mcs_.{12,}$",
+        "pattern": "^(mcs_.{12,}|\\$\\{MULTICORN_API_KEY\\})$",
         "minLength": 16
       },
       "baseUrl": {

package/dist/server.js

@@ -1,6 +1,6 @@
 import { createServer } from 'http';
 import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
+import { randomUUID, createHash } from 'crypto';
 import { isIP } from 'net';
 import { readFileSync } from 'fs';
 import { join, dirname } from 'path';
@@ -1275,7 +1275,8 @@ var AGGREGATOR_UPSTREAM_TIMEOUT_MS = UPSTREAM_TIMEOUT_MS;
 // ../multicorn-proxy/src/multicorn-mcp.ts
 var MULTICORN_MCP_SENTINEL2 = "multicorn://mcp";
 var GOOGLE_API_TIMEOUT_MS = 15e3;
-var SAMPLE_NOTE = "\n\nThis is sample data. Connect your Google account in the Shield dashboard to see your real emails, events, and files.";
+var GOOGLE_NOT_CONNECTED = "Google is not connected. Open your Shield dashboard and connect your Google account to use this tool.";
+var SLACK_NOT_AVAILABLE = "Slack is not available yet. Multicorn does not support connecting a Slack account, so this tool cannot be used.";
 var TOOLS = [
   {
     name: "gmail_read_inbox",
@@ -1516,9 +1517,9 @@ async function executeToolCall(toolName, args, ctx) {
     case "delete_file":
       return workspaceDelete(args, ctx);
     case "slack_read_messages":
-      return slackReadMessages(args);
+      return slackReadMessages();
     case "slack_send_message":
-      return slackSendMessage(args);
+      return slackSendMessage();
     default:
       return Promise.resolve(null);
   }
@@ -1588,7 +1589,7 @@ async function gmailReadInbox(args, ctx) {
   const query = typeof args["query"] === "string" ? args["query"] : "";
   const limit = typeof args["limit"] === "number" && args["limit"] > 0 ? Math.floor(args["limit"]) : 5;
   if (ctx.google === void 0) {
-    return textResult(sampleGmailReadInbox(query, limit) + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const listUrl = new URL("https://gmail.googleapis.com/gmail/v1/users/me/messages");
@@ -1639,7 +1640,7 @@ async function gmailSendEmail(args, ctx) {
   const subject = typeof args["subject"] === "string" ? args["subject"] : "";
   const body = typeof args["body"] === "string" ? args["body"] : "";
   if (ctx.google === void 0) {
-    return textResult(`Email sent to ${to} with subject '${subject}'` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const raw = buildRawEmail(to, subject, body);
@@ -1665,7 +1666,7 @@ async function gmailDeleteThread(args, ctx) {
     return errorResult("A thread_id is required to delete a thread.");
   }
   if (ctx.google === void 0) {
-    return textResult(`Thread '${threadId}' moved to trash` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const url = `https://gmail.googleapis.com/gmail/v1/users/me/threads/${encodeURIComponent(threadId)}/trash`;
@@ -1681,7 +1682,7 @@ async function gmailDeleteEmail(args, ctx) {
     return errorResult("A message_id is required to delete an email.");
   }
   if (ctx.google === void 0) {
-    return textResult(`Email '${messageId}' moved to Trash` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const url = `https://gmail.googleapis.com/gmail/v1/users/me/messages/${encodeURIComponent(messageId)}/trash`;
@@ -1732,7 +1733,7 @@ async function fetchEventsForCalendar(calendarId, start, end, timeZone, auth) {
 async function calendarListEvents(args, ctx) {
   const dateArg = typeof args["date"] === "string" ? args["date"] : void 0;
   if (ctx.google === void 0) {
-    return textResult(sampleCalendarListEvents() + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     let timeZone;
@@ -1845,7 +1846,7 @@ async function calendarCreateEvent(args, ctx) {
   const durationMinutes = typeof args["duration_minutes"] === "number" && args["duration_minutes"] > 0 ? Math.floor(args["duration_minutes"]) : 60;
   const location = typeof args["location"] === "string" ? args["location"] : void 0;
   if (ctx.google === void 0) {
-    return textResult(`Event '${title}' created for ${date}` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const startDate = parseEventStart(date);
@@ -1888,7 +1889,7 @@ async function calendarUpdateEvent(args, ctx) {
   const durationMinutes = typeof args["duration_minutes"] === "number" && args["duration_minutes"] > 0 ? Math.floor(args["duration_minutes"]) : void 0;
   const location = typeof args["location"] === "string" ? args["location"] : void 0;
   if (ctx.google === void 0) {
-    return textResult(`Event '${eventId}' updated` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const eventBody = {};
@@ -1921,7 +1922,7 @@ async function calendarDeleteEvent(args, ctx) {
     return errorResult("An event_id is required to delete an event.");
   }
   if (ctx.google === void 0) {
-    return textResult(`Event '${eventId}' deleted` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const url = `https://www.googleapis.com/calendar/v3/calendars/primary/events/${encodeURIComponent(eventId)}`;
@@ -1934,7 +1935,7 @@ async function calendarDeleteEvent(args, ctx) {
 async function driveSearchFiles(args, ctx) {
   const query = typeof args["query"] === "string" ? args["query"] : "";
   if (ctx.google === void 0) {
-    return textResult(sampleDriveSearchFiles(query) + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const url = new URL("https://www.googleapis.com/drive/v3/files");
@@ -1963,7 +1964,7 @@ async function driveWriteFile(args, ctx) {
   const name = typeof args["name"] === "string" ? args["name"] : "";
   const content = typeof args["content"] === "string" ? args["content"] : "";
   if (ctx.google === void 0) {
-    return textResult(`File '${name}' saved to Drive` + SAMPLE_NOTE);
+    return errorResult(GOOGLE_NOT_CONNECTED);
   }
   try {
     const boundary = `multicorn-${Math.random().toString(36).slice(2)}`;
@@ -1987,86 +1988,11 @@ ${content}\r
     return googleErrorResult(err);
   }
 }
-function slackReadMessages(args) {
-  const messages = [
-    { channel: "general", author: "Sam Patel", text: "Launch is confirmed for next Tuesday. Marketing assets are ready." },
-    { channel: "engineering", author: "Alex Chen", text: "PR #247 merged. Deployment starts at 4pm." },
-    { channel: "random", author: "Jordan Kim", text: "Friday social is at the rooftop bar this week!" }
-  ];
-  const channel = typeof args["channel"] === "string" ? args["channel"].toLowerCase().replace(/^#/, "") : "";
-  let filtered = messages;
-  if (channel.length > 0) {
-    filtered = messages.filter((m) => m.channel === channel);
-  }
-  const text = filtered.length === 0 ? `No recent messages in #${channel}.` : filtered.map((m) => `#${m.channel} \u2014 ${m.author}: "${m.text}"`).join("\n");
-  return Promise.resolve(textResult(text));
-}
-function slackSendMessage(args) {
-  const channel = typeof args["channel"] === "string" ? args["channel"].replace(/^#/, "") : "";
-  return Promise.resolve(textResult(`Message sent to #${channel}`));
-}
-function sampleGmailReadInbox(query, limit) {
-  const emails = [
-    {
-      from: "Alex Chen <alex@acme.co>",
-      subject: "Q3 planning doc ready for review",
-      date: "yesterday",
-      threadId: "thread_sample_q3",
-      preview: "Hey team, I've finished the Q3 planning document..."
-    },
-    {
-      from: "Jordan Kim <jordan@acme.co>",
-      subject: "Design review at 2pm",
-      date: "today",
-      threadId: "thread_sample_design",
-      preview: "Quick reminder about the design review..."
-    },
-    {
-      from: "Acme Weekly <newsletter@acme.co>",
-      subject: "This week at Acme",
-      date: "2 days ago",
-      threadId: "thread_sample_weekly",
-      preview: "Product launch update, new hires, and Friday social..."
-    }
-  ];
-  const q = query.toLowerCase();
-  let filtered = emails;
-  if (q.length > 0) {
-    filtered = emails.filter(
-      (e) => e.subject.toLowerCase().includes(q) || e.from.toLowerCase().includes(q) || e.preview.toLowerCase().includes(q)
-    );
-  }
-  filtered = filtered.slice(0, limit);
-  return filtered.length === 0 ? "No emails found matching your query." : filtered.map(
-    (e) => `From: ${e.from}
-Subject: ${e.subject}
-Date: ${e.date}
-Thread ID: ${e.threadId}
-Preview: ${e.preview}`
-  ).join("\n\n");
-}
-function sampleCalendarListEvents() {
-  return [
-    "9:00 AM \u2014 Daily standup (15 min, recurring) [Event ID: evt_sample_standup]",
-    "11:00 AM \u2014 1:1 with Alex Chen (30 min) [Event ID: evt_sample_1on1]",
-    "12:30 PM \u2014 Team lunch at Sushi Place (60 min) [Event ID: evt_sample_lunch]",
-    "3:00 PM \u2014 Sprint demo (45 min, Friday) [Event ID: evt_sample_demo]"
-  ].join("\n");
-}
-function sampleDriveSearchFiles(query) {
-  const files = [
-    { name: "Q3 Planning.docx", modified: "Modified yesterday", shared: "shared with team" },
-    { name: "Budget 2026.xlsx", modified: "Modified 3 days ago", shared: "shared with finance" },
-    { name: "Meeting Notes - Sprint Review.md", modified: "Modified today", shared: "" },
-    { name: "Product Roadmap.pdf", modified: "Modified last week", shared: "shared with leadership" },
-    { name: "Onboarding Checklist.docx", modified: "Modified 2 weeks ago", shared: "" }
-  ];
-  const q = query.toLowerCase();
-  let filtered = files;
-  if (q.length > 0) {
-    filtered = files.filter((f) => f.name.toLowerCase().includes(q));
-  }
-  return filtered.length === 0 ? "No files found matching your query." : filtered.map((f) => `${f.name} \u2014 ${f.modified}${f.shared ? `, ${f.shared}` : ""}`).join("\n");
+function slackReadMessages() {
+  return errorResult(SLACK_NOT_AVAILABLE);
+}
+function slackSendMessage() {
+  return errorResult(SLACK_NOT_AVAILABLE);
 }
 var WORKSPACE_TIMEOUT_MS = 1e4;
 var WORKSPACE_AUTH_HEADER = "X-Multicorn-Key";
@@ -3331,6 +3257,21 @@ data: ${JSON.stringify({ error: message })}
     }
   };
 }
+function buildUnauthenticatedRejectLogContext(input) {
+  const requestIdHeader = input.req.headers["x-request-id"];
+  const requestId = typeof requestIdHeader === "string" && requestIdHeader.length > 0 ? requestIdHeader : randomUUID();
+  const contentLengthHeader = input.req.headers["content-length"];
+  const headerContentLength = typeof contentLengthHeader === "string" ? Number.parseInt(contentLengthHeader, 10) : Number.NaN;
+  const contentLength = Number.isFinite(headerContentLength) ? headerContentLength : input.bodyByteLength;
+  return {
+    method: input.req.method ?? "UNKNOWN",
+    path: input.path,
+    status: 401,
+    contentLength,
+    requestId,
+    parsedMethod: input.parsedMethod
+  };
+}
 
 // ../multicorn-proxy/src/server.ts
 var ROUTE_RE = /^\/r\/([^/]+)\/([^/]+)(.*)$/;
@@ -3424,11 +3365,15 @@ function main() {
                 const body = await bufferFromRequest(req, MCP_PROXY_MAX_BODY_BYTES);
                 const bodyText = body.toString("utf8");
                 const rpc = body.length > 0 ? parseJsonRpcLine(bodyText) : null;
-                logger.info("[DEBUG] Unauthenticated POST body", {
-                  url: redactedUrl,
-                  bodyPreview: bodyText.slice(0, 500),
-                  parsedMethod: rpc?.method ?? null
-                });
+                logger.info(
+                  "Unauthenticated request rejected",
+                  buildUnauthenticatedRejectLogContext({
+                    req,
+                    path: redactedUrl,
+                    bodyByteLength: body.length,
+                    parsedMethod: rpc?.method ?? null
+                  })
+                );
                 if (body.length > 0) {
                   const handshakeKind = classifyUnauthenticatedMcpHandshake(rpc);
                   if (handshakeKind === "initialize" && rpc !== null) {

package/dist/shield-extension.js

@@ -22405,18 +22405,9 @@ var INIT_WIZARD_PLATFORM_REGISTRY = [
   },
   { slug: "other-mcp", displayName: "Local MCP / Other", section: "hosted" }
 ];
-(() => {
-  const itemsFor = (section) => INIT_WIZARD_PLATFORM_REGISTRY.filter((e) => e.section === section).map((e) => ({
-    platform: e.slug,
-    label: e.displayName
-  }));
-  return [
-    { title: "Recommended (native plugin)", items: itemsFor("native") },
-    { title: "Hosted proxy (MCP only)", items: itemsFor("hosted") }
-  ];
-})();
+var INIT_WIZARD_PICKER_NATIVE_SLUGS = INIT_WIZARD_PLATFORM_REGISTRY.filter((e) => e.section === "native").map((e) => e.slug);
 Object.fromEntries(
-  INIT_WIZARD_PLATFORM_REGISTRY.map((e, i) => [i + 1, e.slug])
+  INIT_WIZARD_PICKER_NATIVE_SLUGS.map((slug, i) => [i + 1, slug])
 );
 
 // src/extension/config-reader.ts
@@ -22518,7 +22509,7 @@ async function writeExtensionBackup(claudeDesktopConfigPath, mcpServers) {
 
 // package.json
 var package_default = {
-  version: "1.11.1"};
+  version: "1.12.1"};
 
 // src/package-meta.ts
 var PACKAGE_VERSION = package_default.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multicorn-shield",
-  "version": "1.11.1",
+  "version": "1.12.1",
   "description": "The control layer for AI agents: permissions, consent, spending limits, and audit logging.",
   "license": "MIT",
   "author": "Multicorn AI Pty Ltd",
@@ -79,7 +79,8 @@
     "prepare": "husky || true",
     "release:patch": "npm version patch && pnpm publish",
     "release:minor": "npm version minor && pnpm publish",
-    "release:major": "npm version major && pnpm publish"
+    "release:major": "npm version major && pnpm publish",
+    "local": "pnpm build &&node dist/multicorn-shield.js init --base-url http://localhost:8080"
   },
   "lint-staged": {
     "*.ts": [
@@ -107,6 +108,7 @@
     "@size-limit/file": "^11.1.6",
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^3.0.5",
+    "ajv": "^8.18.0",
     "eslint": "^9.19.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-unicorn": "^57.0.0",

package/plugins/codex-cli/hooks/scripts/codex-cli-hooks-shared.cjs

@@ -42,6 +42,46 @@ var path__namespace = /*#__PURE__*/ _interopNamespace(path);
 
 var AUTH_HEADER = "X-Multicorn-Key";
 var AUDIT_METADATA_MAX_CHARS = 1e4;
+var GOOGLE_USER_DATA_FIELD_NAMES = /* @__PURE__ */ new Set([
+  "to",
+  "subject",
+  "body",
+  "query",
+  "name",
+  "content",
+  "title",
+  "description",
+  "location",
+  "attendees",
+  "summary",
+]);
+function redactGoogleUserDataValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => redactGoogleUserDataValue(item));
+  }
+  if (typeof value === "object" && value !== null) {
+    const record = value;
+    const out = {};
+    for (const [key, val] of Object.entries(record)) {
+      out[key] = GOOGLE_USER_DATA_FIELD_NAMES.has(key.toLowerCase())
+        ? "[REDACTED]"
+        : redactGoogleUserDataValue(val);
+    }
+    return out;
+  }
+  return value;
+}
+function redactGoogleUserDataInText(text) {
+  let out = text;
+  out = out.replace(/\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g, "[REDACTED]");
+  out = out.replace(
+    /(\b(?:to|from|subject|body|query|preview|attendees):\s*)([^\n]+)/gi,
+    "$1[REDACTED]",
+  );
+  out = out.replace(/\bwith subject\s+'[^']*'/gi, "with subject '[REDACTED]'");
+  out = out.replace(/\bwith subject\s+"[^"]*"/gi, 'with subject "[REDACTED]"');
+  return out;
+}
 function redactSecretsForAudit(serialized) {
   let out = serialized;
   out = out.replace(/\bsk-[a-zA-Z0-9]{20,}\b/g, "[REDACTED]");
@@ -64,7 +104,14 @@ function truncateForAudit(serialized, maxChars = AUDIT_METADATA_MAX_CHARS) {
 }
 function serializeHookAuditFragment(value) {
   try {
-    const raw = typeof value === "string" ? value : JSON.stringify(value === void 0 ? null : value);
+    if (typeof value === "string") {
+      return truncateForAudit(redactGoogleUserDataInText(redactSecretsForAudit(value)));
+    }
+    const redacted = redactGoogleUserDataValue(value);
+    const raw =
+      typeof redacted === "string"
+        ? redacted
+        : JSON.stringify(redacted === void 0 ? null : redacted);
     return truncateForAudit(redactSecretsForAudit(raw));
   } catch {
     return "[unserializable]";
@@ -263,6 +310,8 @@ exports.formatShieldNetworkError = formatShieldNetworkError;
 exports.isLocalHostname = isLocalHostname;
 exports.loadCodexCliConfig = loadCodexCliConfig;
 exports.readHttpApiKeyRefusalHostname = readHttpApiKeyRefusalHostname;
+exports.redactGoogleUserDataInText = redactGoogleUserDataInText;
+exports.redactGoogleUserDataValue = redactGoogleUserDataValue;
 exports.redactSecretsForAudit = redactSecretsForAudit;
 exports.resolveCodexCliAgentName = resolveCodexCliAgentName;
 exports.serializeHookAuditFragment = serializeHookAuditFragment;

package/plugins/opencode/multicorn-shield.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  buildOpenCodeParametersMetadata,
+  buildOpenCodeResultMetadata,
+} from "./multicorn-shield.js";
+
+describe("OpenCode audit metadata", () => {
+  it("does not persist gmail_send_email recipient, subject or body in parameters", () => {
+    const metadata = buildOpenCodeParametersMetadata({
+      to: "alice@example.com",
+      subject: "Project update",
+      body: "Here are the confidential numbers for Q3.",
+    });
+
+    expect(metadata).not.toContain("alice@example.com");
+    expect(metadata).not.toContain("Project update");
+    expect(metadata).not.toContain("confidential numbers");
+    expect(metadata).toContain("[REDACTED]");
+  });
+
+  it("does not persist gmail result text with addresses or subjects", () => {
+    const metadata = buildOpenCodeResultMetadata(
+      "Email sent to alice@example.com with subject 'Project update'.",
+    );
+
+    expect(metadata).not.toContain("alice@example.com");
+    expect(metadata).not.toContain("Project update");
+    expect(metadata).toContain("[REDACTED]");
+  });
+});

package/plugins/opencode/multicorn-shield.ts

@@ -11,6 +11,8 @@ import * as fs from "node:fs";
 import { homedir } from "node:os";
 import * as path from "node:path";
 
+import { serializeHookAuditFragment } from "../../src/hooks/codex-cli-hooks-shared.js";
+
 const MULTICORN_CONFIG = path.join(homedir(), ".multicorn", "config.json");
 const HTTP_MS = 10_000;
 const PLATFORM = "opencode";
@@ -230,37 +232,14 @@ function blockedMessage(
   return `Shield: Action blocked. Required permission: ${service} (${actionType}). Grant access at ${approvalsUrl}`;
 }
 
-function scrubMetadataArgs(args: unknown): string {
-  try {
-    if (typeof args !== "object" || args === null) return "{}";
-    const clone = { ...(args as Record<string, unknown>) };
-    const contentKey = clone["content"];
-    if (typeof contentKey === "string") {
-      clone["content"] = "[" + contentKey.length.toString() + " chars redacted]";
-    }
-    const cmd = clone["command"];
-    if (typeof cmd === "string" && cmd.length > 200) {
-      clone["command"] = cmd.slice(0, 200) + "... [truncated]";
-    }
-    let out = JSON.stringify(clone);
-    if (out.length > 4096) out = out.slice(0, 4096);
-    return out;
-  } catch {
-    return "{}";
-  }
+/** Builds redacted parameters metadata for OpenCode audit rows. */
+export function buildOpenCodeParametersMetadata(args: unknown): string {
+  return serializeHookAuditFragment(args);
 }
 
-function scrubResultSnippet(text: unknown): string {
-  if (typeof text !== "string") return "";
-  let s = text;
-  s = s.replace(/\bsk-[A-Za-z0-9_-]{8,}\b/g, "[REDACTED]");
-  s = s.replace(/\bmcs_[A-Za-z0-9_-]+\b/g, "[REDACTED]");
-  s = s.replace(/\bghp_[A-Za-z0-9]{20,}\b/g, "[REDACTED]");
-  s = s.replace(/Bearer\s+[^\s]+/gi, "[REDACTED]");
-  if (s.length > 500) {
-    return s.slice(0, 500) + "[truncated]";
-  }
-  return s;
+/** Builds redacted result metadata for OpenCode audit rows. */
+export function buildOpenCodeResultMetadata(output: unknown): string {
+  return serializeHookAuditFragment(output);
 }
 
 async function shieldPostActions(
@@ -327,7 +306,7 @@ async function shieldBeforeDecision(
   /** @type {Record<string, unknown>} */
   const metadata = {
     tool_name: toolName,
-    parameters: scrubMetadataArgs(args),
+    parameters: buildOpenCodeParametersMetadata(args),
     source: PLATFORM,
   };
 
@@ -474,7 +453,7 @@ export const MulticornShieldPlugin: Plugin = (input: PluginInput): Promise<Hooks
       if (typeof output === "object" && "output" in output) {
         const rawOut = (output as Record<string, unknown>)["output"];
         if (typeof rawOut === "string") {
-          snippet = scrubResultSnippet(rawOut);
+          snippet = buildOpenCodeResultMetadata(rawOut);
         }
       }