opencode-varlock 0.0.8 → 0.0.10

package/dist/config.js

@@ -19,6 +19,7 @@ export const DEFAULT_CONFIG = {
             ".key",
             "credentials",
             ".pgpass",
+            "varlock.config",
         ],
         sensitiveGlobs: [
             "**/.env",
@@ -31,6 +32,8 @@ export const DEFAULT_CONFIG = {
             "**/credentials.*",
             "**/.pgpass",
             "secrets/**",
+            "**/varlock.config.json",
+            "**/.opencode/varlock.config.json",
         ],
         bashDenyPatterns: [],
         blockedReadTools: ["read", "grep", "glob", "view"],
@@ -47,6 +50,177 @@ export const DEFAULT_CONFIG = {
         namespace: "app",
     },
 };
+/**
+ * Validates a parsed config object against the expected schema.
+ * Returns an array of human-readable error strings (empty = valid).
+ */
+export function validateConfig(config, logger) {
+    const errors = [];
+    if (typeof config !== "object" || config === null) {
+        errors.push("Config must be an object");
+        return errors;
+    }
+    const c = config;
+    // Validate guard section
+    if (c.guard !== undefined) {
+        if (typeof c.guard !== "object" || c.guard === null) {
+            errors.push("guard must be an object");
+        }
+        else {
+            if (c.guard.enabled !== undefined &&
+                typeof c.guard.enabled !== "boolean") {
+                errors.push(`guard.enabled must be boolean, got ${typeof c.guard.enabled}`);
+            }
+            if (c.guard.sensitivePatterns !== undefined &&
+                !Array.isArray(c.guard.sensitivePatterns)) {
+                errors.push("guard.sensitivePatterns must be an array");
+            }
+            if (c.guard.sensitiveGlobs !== undefined &&
+                !Array.isArray(c.guard.sensitiveGlobs)) {
+                errors.push("guard.sensitiveGlobs must be an array");
+            }
+            if (c.guard.bashDenyPatterns !== undefined &&
+                !Array.isArray(c.guard.bashDenyPatterns)) {
+                errors.push("guard.bashDenyPatterns must be an array");
+            }
+            if (c.guard.blockedReadTools !== undefined &&
+                !Array.isArray(c.guard.blockedReadTools)) {
+                errors.push("guard.blockedReadTools must be an array");
+            }
+            if (c.guard.blockedWriteTools !== undefined &&
+                !Array.isArray(c.guard.blockedWriteTools)) {
+                errors.push("guard.blockedWriteTools must be an array");
+            }
+            // Validate array contents are strings
+            for (const arrKey of [
+                "sensitivePatterns",
+                "sensitiveGlobs",
+                "bashDenyPatterns",
+                "blockedReadTools",
+                "blockedWriteTools",
+            ]) {
+                if (Array.isArray(c.guard[arrKey])) {
+                    for (let i = 0; i < c.guard[arrKey].length; i++) {
+                        if (typeof c.guard[arrKey][i] !== "string") {
+                            errors.push(`guard.${arrKey}[${i}] must be a string`);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    // Validate env section
+    if (c.env !== undefined) {
+        if (typeof c.env !== "object" || c.env === null) {
+            errors.push("env must be an object");
+        }
+        else {
+            if (c.env.enabled !== undefined && typeof c.env.enabled !== "boolean") {
+                errors.push(`env.enabled must be boolean, got ${typeof c.env.enabled}`);
+            }
+            if (c.env.allowedRoot !== undefined &&
+                typeof c.env.allowedRoot !== "string") {
+                errors.push("env.allowedRoot must be a string");
+            }
+        }
+    }
+    // Validate varlock section
+    if (c.varlock !== undefined) {
+        if (typeof c.varlock !== "object" || c.varlock === null) {
+            errors.push("varlock must be an object");
+        }
+        else {
+            if (c.varlock.enabled !== undefined &&
+                typeof c.varlock.enabled !== "boolean") {
+                errors.push(`varlock.enabled must be boolean, got ${typeof c.varlock.enabled}`);
+            }
+            if (c.varlock.autoDetect !== undefined &&
+                typeof c.varlock.autoDetect !== "boolean") {
+                errors.push(`varlock.autoDetect must be boolean, got ${typeof c.varlock.autoDetect}`);
+            }
+            if (c.varlock.command !== undefined &&
+                typeof c.varlock.command !== "string") {
+                errors.push("varlock.command must be a string");
+            }
+            if (c.varlock.namespace !== undefined &&
+                typeof c.varlock.namespace !== "string") {
+                errors.push("varlock.namespace must be a string");
+            }
+        }
+    }
+    return errors;
+}
+/**
+ * Removes invalid keys from a parsed config so they won't be merged.
+ * Mutates the object in place and returns the list of keys that were removed.
+ */
+function sanitizeConfig(config) {
+    const removed = [];
+    const sections = [
+        {
+            name: "guard",
+            booleans: ["enabled"],
+            strings: [],
+            arrays: [
+                "sensitivePatterns",
+                "sensitiveGlobs",
+                "bashDenyPatterns",
+                "blockedReadTools",
+                "blockedWriteTools",
+            ],
+        },
+        {
+            name: "env",
+            booleans: ["enabled"],
+            strings: ["allowedRoot"],
+            arrays: [],
+        },
+        {
+            name: "varlock",
+            booleans: ["enabled", "autoDetect"],
+            strings: ["command", "namespace"],
+            arrays: [],
+        },
+    ];
+    for (const section of sections) {
+        const s = config[section.name];
+        if (s === undefined)
+            continue;
+        if (typeof s !== "object" || s === null) {
+            delete config[section.name];
+            removed.push(section.name);
+            continue;
+        }
+        for (const key of section.booleans) {
+            if (s[key] !== undefined && typeof s[key] !== "boolean") {
+                delete s[key];
+                removed.push(`${section.name}.${key}`);
+            }
+        }
+        for (const key of section.strings) {
+            if (s[key] !== undefined && typeof s[key] !== "string") {
+                delete s[key];
+                removed.push(`${section.name}.${key}`);
+            }
+        }
+        for (const key of section.arrays) {
+            if (s[key] !== undefined && !Array.isArray(s[key])) {
+                delete s[key];
+                removed.push(`${section.name}.${key}`);
+            }
+            else if (Array.isArray(s[key])) {
+                // Filter out non-string elements from arrays
+                const original = s[key];
+                const filtered = original.filter((v) => typeof v === "string");
+                if (filtered.length !== original.length) {
+                    s[key] = filtered;
+                    removed.push(`${section.name}.${key} (non-string elements removed)`);
+                }
+            }
+        }
+    }
+    return removed;
+}
 const CONFIG_FILENAMES = [
     "varlock.config.json",
     ".opencode/varlock.config.json",
@@ -61,6 +235,24 @@ export function loadConfig(cwd, overrides = {}, logger) {
                 const parsed = JSON.parse(raw);
                 delete parsed.$schema;
                 delete parsed.$comment;
+                // Validate and warn about any schema violations
+                const validationErrors = validateConfig(parsed, logger);
+                if (validationErrors.length > 0) {
+                    logger?.({
+                        level: "warn",
+                        message: "config validation warnings",
+                        extra: { filepath, errors: validationErrors },
+                    });
+                }
+                // Remove invalid values so they don't override safe defaults
+                const removedKeys = sanitizeConfig(parsed);
+                if (removedKeys.length > 0) {
+                    logger?.({
+                        level: "warn",
+                        message: "invalid config values removed before merge",
+                        extra: { filepath, removedKeys },
+                    });
+                }
                 merged = deepMerge(merged, parsed);
                 logger?.({
                     level: "info",
@@ -80,6 +272,26 @@ export function loadConfig(cwd, overrides = {}, logger) {
             }
         }
     }
+    // Validate and sanitize programmatic overrides the same way
+    if (overrides && typeof overrides === "object") {
+        const overridesObj = overrides;
+        const overrideErrors = validateConfig(overridesObj, logger);
+        if (overrideErrors.length > 0) {
+            logger?.({
+                level: "warn",
+                message: "config validation warnings in programmatic overrides",
+                extra: { errors: overrideErrors },
+            });
+        }
+        const removedKeys = sanitizeConfig(overridesObj);
+        if (removedKeys.length > 0) {
+            logger?.({
+                level: "warn",
+                message: "invalid override values removed before merge",
+                extra: { removedKeys },
+            });
+        }
+    }
     merged = deepMerge(merged, overrides);
     if (merged.env.allowedRoot && !isAbsolute(merged.env.allowedRoot)) {
         merged.env.allowedRoot = resolve(cwd, merged.env.allowedRoot);

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AA0C9C,KAAK,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACjC,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAAA;AAe/C,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,GAClB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAwFzD;AAsBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAuChD"}
+{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AA0J9C,KAAK,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACjC,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAAA;AAG/C,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,GAClB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAgMzD;AAyDD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAuChD"}

package/dist/guard.js

@@ -2,6 +2,16 @@
  * EnvGuard - tool.execute.before hook that prevents agents from
  * reading sensitive files or running commands that expose secrets.
  */
+/* ------------------------------------------------------------------ *
+ *  Task 6: Safe env file patterns that should NOT be blocked
+ * ------------------------------------------------------------------ */
+const SAFE_ENV_PATTERNS = [".env.schema", ".env.example", ".env.sample"];
+/* ------------------------------------------------------------------ *
+ *  Task 1: Block varlock CLI self-exfiltration
+ *  Task 8: Block set/compgen/declare/typeset variable listing
+ *  Task 10: Block targeted recursive grep for .env files
+ *  (Existing deny patterns preserved)
+ * ------------------------------------------------------------------ */
 const BUILTIN_BASH_DENY = [
     "cat .env",
     "less .env",
@@ -40,7 +50,24 @@ const BUILTIN_BASH_DENY = [
     'find . -name "*.env"',
     "curl.*env",
     "wget.*env",
+    // Task 1: varlock CLI self-exfiltration
+    "varlock printenv",
+    "varlock load --show-all",
+    "varlock load --format env",
+    "varlock load --format shell",
+    "varlock load -f env",
+    "varlock load -f shell",
+    // Task 8: compgen/typeset variable listing
+    "compgen -v",
+    "compgen -A variable",
+    "typeset -x",
+    // Task 10: recursive grep targeting .env files
+    "grep --include=*.env*",
+    "rg -g '*.env*'",
 ];
+/* ------------------------------------------------------------------ *
+ *  Existing: Regex patterns for runtime env-value reads via interpreters
+ * ------------------------------------------------------------------ */
 const ENV_VALUE_READ_PATTERNS = [
     /\bpython\d*\b[\s\S]*\bos\.getenv\s*\(/i,
     /\bpython\d*\b[\s\S]*\bos\.environ(?:\s*\[|\s*\.get\s*\()/i,
@@ -52,6 +79,44 @@ const ENV_VALUE_READ_PATTERNS = [
     /\bjava\b[\s\S]*\bSystem\.getenv\s*\(/i,
     /\bperl\b[\s\S]*\bENV\s*\{/i,
 ];
+/* ------------------------------------------------------------------ *
+ *  Task 2: Sensitive file read via interpreter (open(), File.read, etc.)
+ *  Catches python open('.env'), ruby File.read('.env'), node fs.readFileSync('.env'), etc.
+ * ------------------------------------------------------------------ */
+const SENSITIVE_FILE_SUFFIX_RE = "(?:\\.env\\b|\\.pem\\b|\\.key\\b|credentials|\\.pgpass|\\.secret)";
+const SENSITIVE_FILE_READ_VIA_INTERPRETER = [
+    // Python: open(), pathlib, Path()
+    new RegExp(`\\bpython\\d*\\b[\\s\\S]*\\bopen\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    new RegExp(`\\bpython\\d*\\b[\\s\\S]*pathlib[\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    new RegExp(`\\bpython\\d*\\b[\\s\\S]*\\bPath\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    // Ruby: File.read, File.open, IO.read
+    new RegExp(`\\bruby\\b[\\s\\S]*(?:File\\.(?:read|open)|IO\\.read)\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    // Node: fs.readFileSync, readFileSync, readFile
+    new RegExp(`\\bnode\\b[\\s\\S]*(?:readFileSync|readFile)\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    // Bun: Bun.file, readFileSync
+    new RegExp(`\\bbun\\b[\\s\\S]*(?:Bun\\.file|readFileSync)\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    // Perl: open()
+    new RegExp(`\\bperl\\b[\\s\\S]*\\bopen\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+    // PHP: file_get_contents, fopen, file
+    new RegExp(`\\bphp\\b[\\s\\S]*(?:file_get_contents|fopen|\\bfile\\b)\\s*\\([\\s\\S]*${SENSITIVE_FILE_SUFFIX_RE}`, "i"),
+];
+/* ------------------------------------------------------------------ *
+ *  Task 5: Encoding / eval bypass patterns — pipe to shell, eval subshell
+ * ------------------------------------------------------------------ */
+const PIPE_TO_SHELL_RE = /\|\s*(?:bash|sh|zsh|dash)\s*$/im;
+const EVAL_SUBSHELL_RE = /\beval\s+"\$\(/i;
+/* ------------------------------------------------------------------ *
+ *  Task 7: printf format string bypass — catches printf with $VAR reference
+ * ------------------------------------------------------------------ */
+const PRINTF_VAR_RE = /\bprintf\b[\s\S]*\$[A-Za-z_]/i;
+/* ------------------------------------------------------------------ *
+ *  Task 8: bare `set` piped or at end of command (set | grep, etc.)
+ * ------------------------------------------------------------------ */
+const SET_PIPE_RE = /\bset\s*(\||$|>)/im;
+/* ------------------------------------------------------------------ *
+ *  Task 9: bare `env` command detection (fixed from literal \n)
+ * ------------------------------------------------------------------ */
+const BARE_ENV_RE = /(?:^|\s|;|&&|\|\|)env\s*$/im;
 export function createEnvGuard(config) {
     const { sensitivePatterns, sensitiveGlobs, bashDenyPatterns, blockedReadTools, blockedWriteTools, } = config;
     const bashDeny = [...BUILTIN_BASH_DENY, ...bashDenyPatterns];
@@ -59,6 +124,20 @@ export function createEnvGuard(config) {
         source: g,
         regex: globToRegex(g),
     }));
+    /* ---------------------------------------------------------------- *
+     *  Task 4: Build shell redirect patterns dynamically from sensitivePatterns
+     * ---------------------------------------------------------------- */
+    const shellRedirectPatterns = [];
+    for (const sp of sensitivePatterns) {
+        // Skip safe patterns in redirect construction
+        if (SAFE_ENV_PATTERNS.some((safe) => sp.toLowerCase() === safe.toLowerCase())) {
+            continue;
+        }
+        const escaped = escapeRegex(sp);
+        shellRedirectPatterns.push(new RegExp(`\\b(?:read|mapfile|readarray)\\b[\\s\\S]*<[\\s\\S]*${escaped}`, "i"));
+        shellRedirectPatterns.push(new RegExp(`<\\s*\\S*${escaped}`, "i"));
+        shellRedirectPatterns.push(new RegExp(`\\bexec\\b[\\s\\S]*<[\\s\\S]*${escaped}`, "i"));
+    }
     return async (input, output) => {
         const args = output.args;
         if (blockedReadTools.includes(input.tool)) {
@@ -78,28 +157,90 @@ export function createEnvGuard(config) {
         if (input.tool === "bash") {
             const rawCommand = String(args.command ?? "");
             const cmd = rawCommand.toLowerCase();
+            /* -- Existing: runtime env-value read patterns -- */
             for (const pattern of ENV_VALUE_READ_PATTERNS) {
                 if (pattern.test(rawCommand)) {
                     throw new Error(`[varlock] Blocked: bash command appears to read environment variable values at runtime. ` +
                         `Use the load_env or load_secrets tool instead.`);
                 }
             }
+            /* -- Task 2: sensitive file read via interpreter -- */
+            for (const pattern of SENSITIVE_FILE_READ_VIA_INTERPRETER) {
+                if (pattern.test(rawCommand)) {
+                    throw new Error(`[varlock] Blocked: bash command appears to read a sensitive file via interpreter. ` +
+                        `Use the load_env or load_secrets tool instead.`);
+                }
+            }
+            /* -- Task 5: pipe-to-shell and eval subshell bypass -- */
+            if (PIPE_TO_SHELL_RE.test(rawCommand)) {
+                throw new Error(`[varlock] Blocked: bash command pipes output into a shell interpreter. ` +
+                    `This pattern is not allowed for security reasons.`);
+            }
+            if (EVAL_SUBSHELL_RE.test(rawCommand)) {
+                throw new Error(`[varlock] Blocked: bash command uses eval with command substitution. ` +
+                    `This pattern is not allowed for security reasons.`);
+            }
+            /* -- Task 7: printf with variable reference -- */
+            if (PRINTF_VAR_RE.test(rawCommand)) {
+                throw new Error(`[varlock] Blocked: bash command uses printf with a variable reference. ` +
+                    `Use the load_env or load_secrets tool instead.`);
+            }
+            /* -- Task 8: bare set piped/redirected -- */
+            if (SET_PIPE_RE.test(rawCommand)) {
+                throw new Error(`[varlock] Blocked: bash command uses "set" in a way that may expose variables. ` +
+                    `Use the load_env or load_secrets tool instead.`);
+            }
+            /* -- Task 9: bare env command -- */
+            if (BARE_ENV_RE.test(rawCommand)) {
+                throw new Error(`[varlock] Blocked: bare "env" command may expose environment variables. ` +
+                    `Use the load_env or load_secrets tool instead.`);
+            }
+            /* -- Existing + Task 6 safe-pattern check: string deny patterns -- */
             for (const pattern of bashDeny) {
                 if (cmd.includes(pattern.toLowerCase())) {
+                    // Task 6: If the command only references safe env files, allow it
+                    if (isSafeEnvReference(rawCommand)) {
+                        continue;
+                    }
                     throw new Error(`[varlock] Blocked: bash command matches deny pattern "${pattern}". ` +
                         `Use the load_env or load_secrets tool to access secrets.`);
                 }
             }
+            /* -- Existing + Task 3: file viewer/processor regex with sensitive patterns -- */
             for (const sp of sensitivePatterns) {
-                const fileAccessRe = new RegExp(`(cat|less|more|head|tail|bat|vim?|nano|code|type|get-content|select-string)\\s+\\S*${escapeRegex(sp)}`, "i");
+                // Task 6: skip safe env patterns
+                if (SAFE_ENV_PATTERNS.some((safe) => sp.toLowerCase() === safe.toLowerCase())) {
+                    continue;
+                }
+                // Task 3: expanded list of file processors
+                // Use [\s\S]* between command and pattern to match across flags/arguments
+                const fileAccessRe = new RegExp(`(cat|less|more|head|tail|bat|vim?|nano|code|type|get-content|select-string|sed|awk|cut|sort|tac|rev|paste|dd|tee|xargs|nl|fold|strings|xxd|od|hexdump|column)\\s[\\s\\S]*${escapeRegex(sp)}`, "i");
                 if (fileAccessRe.test(rawCommand)) {
+                    // Task 6: allow safe env file references
+                    if (isSafeEnvReference(rawCommand)) {
+                        continue;
+                    }
                     throw new Error(`[varlock] Blocked: bash command appears to read a sensitive file (*${sp}*). ` +
                         `Use the load_env or load_secrets tool instead.`);
                 }
             }
+            /* -- Task 4: shell redirect patterns -- */
+            for (const pattern of shellRedirectPatterns) {
+                if (pattern.test(rawCommand)) {
+                    if (isSafeEnvReference(rawCommand)) {
+                        continue;
+                    }
+                    throw new Error(`[varlock] Blocked: bash command uses shell redirects to read a sensitive file. ` +
+                        `Use the load_env or load_secrets tool instead.`);
+                }
+            }
             if (compiledGlobs.length > 0) {
                 const tokens = extractPathTokens(rawCommand);
                 for (const token of tokens) {
+                    // Task 6: skip safe env file tokens
+                    if (isSafeEnvToken(token)) {
+                        continue;
+                    }
                     for (const { source, regex } of compiledGlobs) {
                         if (regex.test(token)) {
                             throw new Error(`[varlock] Blocked: bash command references "${token}" which matches glob "${source}". ` +
@@ -111,8 +252,35 @@ export function createEnvGuard(config) {
         }
     };
 }
+/* ------------------------------------------------------------------ *
+ *  Task 6: Safe env pattern helpers
+ * ------------------------------------------------------------------ */
+/**
+ * Returns true if a path ends with a known safe env file suffix.
+ */
+function isSafeEnvToken(token) {
+    const lower = token.toLowerCase();
+    return SAFE_ENV_PATTERNS.some((safe) => lower.endsWith(safe.toLowerCase()));
+}
+/**
+ * Returns true if the command ONLY references safe env files (e.g. .env.example)
+ * and does NOT reference actual secret env files.
+ * We check if every .env mention in the command is a safe one.
+ */
+function isSafeEnvReference(command) {
+    // Find all .env references in the command
+    const envRefs = command.match(/\S*\.env\S*/gi);
+    if (!envRefs)
+        return false;
+    // Every .env reference must be a safe pattern
+    return envRefs.every((ref) => SAFE_ENV_PATTERNS.some((safe) => ref.toLowerCase().endsWith(safe.toLowerCase())));
+}
 function isSensitive(path, patterns, globs) {
     const lower = path.toLowerCase();
+    // Task 6: allow safe env files through
+    if (SAFE_ENV_PATTERNS.some((safe) => lower.endsWith(safe.toLowerCase()))) {
+        return false;
+    }
     if (patterns.some((p) => lower.includes(p.toLowerCase()))) {
         return true;
     }

package/dist/guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"guard.js","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"guard.js","sourceRoot":"","sources":["../src/guard.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH;;wEAEwE;AACxE,MAAM,iBAAiB,GAAG,CAAC,aAAa,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAExE;;;;;wEAKwE;AACxE,MAAM,iBAAiB,GAAG;IACxB,UAAU;IACV,WAAW;IACX,WAAW;IACX,WAAW;IACX,WAAW;IACX,UAAU;IACV,WAAW;IACX,UAAU;IACV,SAAS;IACT,WAAW;IACX,UAAU;IACV,QAAQ;IACR,SAAS;IACT,eAAe;IACf,OAAO;IACP,OAAO;IACP,WAAW;IACX,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,SAAS;IACT,gBAAgB;IAChB,eAAe;IACf,QAAQ;IACR,aAAa;IACb,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,SAAS;IACT,SAAS;IACT,UAAU;IACV,mBAAmB;IACnB,sBAAsB;IACtB,sBAAsB;IACtB,WAAW;IACX,WAAW;IAEX,wCAAwC;IACxC,kBAAkB;IAClB,yBAAyB;IACzB,2BAA2B;IAC3B,6BAA6B;IAC7B,qBAAqB;IACrB,uBAAuB;IAEvB,2CAA2C;IAC3C,YAAY;IACZ,qBAAqB;IACrB,YAAY;IAEZ,+CAA+C;IAC/C,uBAAuB;IACvB,gBAAgB;CACjB,CAAA;AAED;;wEAEwE;AACxE,MAAM,uBAAuB,GAAG;IAC9B,wCAAwC;IACxC,2DAA2D;IAC3D,kEAAkE;IAClE,iEAAiE;IACjE,uCAAuC;IACvC,6CAA6C;IAC7C,8BAA8B;IAC9B,uCAAuC;IACvC,4BAA4B;CAC7B,CAAA;AAED;;;wEAGwE;AACxE,MAAM,wBAAwB,GAC5B,mEAAmE,CAAA;AAErE,MAAM,mCAAmC,GAAa;IACpD,kCAAkC;IAClC,IAAI,MAAM,CACR,mDAAmD,wBAAwB,EAAE,EAC7E,GAAG,CACJ;IACD,IAAI,MAAM,CACR,4CAA4C,wBAAwB,EAAE,EACtE,GAAG,CACJ;IACD,IAAI,MAAM,CACR,mDAAmD,wBAAwB,EAAE,EAC7E,GAAG,CACJ;IACD,sCAAsC;IACtC,IAAI,MAAM,CACR,wEAAwE,wBAAwB,EAAE,EAClG,GAAG,CACJ;IACD,gDAAgD;IAChD,IAAI,MAAM,CACR,+DAA+D,wBAAwB,EAAE,EACzF,GAAG,CACJ;IACD,8BAA8B;IAC9B,IAAI,MAAM,CACR,gEAAgE,wBAAwB,EAAE,EAC1F,GAAG,CACJ;IACD,eAAe;IACf,IAAI,MAAM,CACR,6CAA6C,wBAAwB,EAAE,EACvE,GAAG,CACJ;IACD,sCAAsC;IACtC,IAAI,MAAM,CACR,2EAA2E,wBAAwB,EAAE,EACrG,GAAG,CACJ;CACF,CAAA;AAED;;wEAEwE;AACxE,MAAM,gBAAgB,GAAG,iCAAiC,CAAA;AAC1D,MAAM,gBAAgB,GAAG,iBAAiB,CAAA;AAE1C;;wEAEwE;AACxE,MAAM,aAAa,GAAG,+BAA+B,CAAA;AAErD;;wEAEwE;AACxE,MAAM,WAAW,GAAG,oBAAoB,CAAA;AAExC;;wEAEwE;AACxE,MAAM,WAAW,GAAG,6BAA6B,CAAA;AAMjD,MAAM,UAAU,cAAc,CAC5B,MAAmB;IAEnB,MAAM,EACJ,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,GAClB,GAAG,MAAM,CAAA;IAEV,MAAM,QAAQ,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,gBAAgB,CAAC,CAAA;IAC5D,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;KACtB,CAAC,CAAC,CAAA;IAEH;;0EAEsE;IACtE,MAAM,qBAAqB,GAAa,EAAE,CAAA;IAC1C,KAAK,MAAM,EAAE,IAAI,iBAAiB,EAAE,CAAC;QACnC,8CAA8C;QAC9C,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YAC9E,SAAQ;QACV,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,EAAE,CAAC,CAAA;QAC/B,qBAAqB,CAAC,IAAI,CACxB,IAAI,MAAM,CACR,sDAAsD,OAAO,EAAE,EAC/D,GAAG,CACJ,CACF,CAAA;QACD,qBAAqB,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,YAAY,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;QAClE,qBAAqB,CAAC,IAAI,CACxB,IAAI,MAAM,CAAC,gCAAgC,OAAO,EAAE,EAAE,GAAG,CAAC,CAC3D,CAAA;IACH,CAAC;IAED,OAAO,KAAK,EAAE,KAAgB,EAAE,MAAkB,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QAExB,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;YAC5E,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC;gBACpE,MAAM,IAAI,KAAK,CACb,4CAA4C,MAAM,KAAK;oBACrD,gDAAgD,CACnD,CAAA;YACH,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;YAC5D,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC;gBACpE,MAAM,IAAI,KAAK,CACb,uCAAuC,MAAM,KAAK;oBAChD,qDAAqD,CACxD,CAAA;YACH,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;YAC7C,MAAM,GAAG,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;YAEpC,qDAAqD;YACrD,KAAK,MAAM,OAAO,IAAI,uBAAuB,EAAE,CAAC;gBAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CACb,0FAA0F;wBACxF,gDAAgD,CACnD,CAAA;gBACH,CAAC;YACH,CAAC;YAED,uDAAuD;YACvD,KAAK,MAAM,OAAO,IAAI,mCAAmC,EAAE,CAAC;gBAC1D,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CACb,oFAAoF;wBAClF,gDAAgD,CACnD,CAAA;gBACH,CAAC;YACH,CAAC;YAED,0DAA0D;YAC1D,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CACb,yEAAyE;oBACvE,mDAAmD,CACtD,CAAA;YACH,CAAC;YACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CACb,uEAAuE;oBACrE,mDAAmD,CACtD,CAAA;YACH,CAAC;YAED,kDAAkD;YAClD,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CACb,yEAAyE;oBACvE,gDAAgD,CACnD,CAAA;YACH,CAAC;YAED,6CAA6C;YAC7C,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,iFAAiF;oBAC/E,gDAAgD,CACnD,CAAA;YACH,CAAC;YAED,oCAAoC;YACpC,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,0EAA0E;oBACxE,gDAAgD,CACnD,CAAA;YACH,CAAC;YAED,sEAAsE;YACtE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;oBACxC,kEAAkE;oBAClE,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;wBACnC,SAAQ;oBACV,CAAC;oBACD,MAAM,IAAI,KAAK,CACb,yDAAyD,OAAO,KAAK;wBACnE,0DAA0D,CAC7D,CAAA;gBACH,CAAC;YACH,CAAC;YAED,kFAAkF;YAClF,KAAK,MAAM,EAAE,IAAI,iBAAiB,EAAE,CAAC;gBACnC,iCAAiC;gBACjC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;oBAC9E,SAAQ;gBACV,CAAC;gBACD,2CAA2C;gBAC3C,0EAA0E;gBAC1E,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,4KAA4K,WAAW,CAAC,EAAE,CAAC,EAAE,EAC7L,GAAG,CACJ,CAAA;gBACD,IAAI,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClC,yCAAyC;oBACzC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;wBACnC,SAAQ;oBACV,CAAC;oBACD,MAAM,IAAI,KAAK,CACb,sEAAsE,EAAE,MAAM;wBAC5E,gDAAgD,CACnD,CAAA;gBACH,CAAC;YACH,CAAC;YAED,2CAA2C;YAC3C,KAAK,MAAM,OAAO,IAAI,qBAAqB,EAAE,CAAC;gBAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7B,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;wBACnC,SAAQ;oBACV,CAAC;oBACD,MAAM,IAAI,KAAK,CACb,iFAAiF;wBAC/E,gDAAgD,CACnD,CAAA;gBACH,CAAC;YACH,CAAC;YAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;gBAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC3B,oCAAoC;oBACpC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC1B,SAAQ;oBACV,CAAC;oBACD,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE,CAAC;wBAC9C,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;4BACtB,MAAM,IAAI,KAAK,CACb,+CAA+C,KAAK,yBAAyB,MAAM,KAAK;gCACtF,gDAAgD,CACnD,CAAA;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED;;wEAEwE;AAExE;;GAEG;AACH,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;IACjC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;AAC7E,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,OAAe;IACzC,0CAA0C;IAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAC9C,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAA;IAE1B,8CAA8C;IAC9C,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC3B,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9B,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAC/C,CACF,CAAA;AACH,CAAC;AAED,SAAS,WAAW,CAClB,IAAY,EACZ,QAAkB,EAClB,KAAqB;IAErB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;IAEhC,uCAAuC;IACvC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,CAAC,GAAG,CAAC,CAAA;IAET,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAElB,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACxB,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBACxB,MAAM,IAAI,UAAU,CAAA;oBACpB,CAAC,IAAI,CAAC,CAAA;gBACR,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,IAAI,CAAA;oBACd,CAAC,IAAI,CAAC,CAAA;gBACR,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,OAAO,CAAA;gBACjB,CAAC,EAAE,CAAA;YACL,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,MAAM,CAAA;YAChB,CAAC,EAAE,CAAA;QACL,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAA;YACf,CAAC,EAAE,CAAA;QACL,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,IAAI,SAAS,CAAA;YACnB,CAAC,EAAE,CAAA;QACL,CAAC;aAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,IAAI,GAAG,EAAE,CAAA;YACnB,CAAC,EAAE,CAAA;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,EAAE,CAAA;YACZ,CAAC,EAAE,CAAA;QACL,CAAC;IACH,CAAC;IAED,OAAO,IAAI,MAAM,CAAC,IAAI,MAAM,GAAG,EAAE,GAAG,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,MAAM,OAAO,GAAG,4DAA4D,CAAA;IAC5E,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,KAA6B,CAAA;IAEjC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,WAAW,CAAC,CAAS;IAC5B,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;AACjD,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { default } from "./plugin.js";
+export { createSecretRegistry, type SecretRegistry } from "./scrubber.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,oBAAoB,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAA"}

package/dist/index.js

@@ -1,2 +1,3 @@
 export { default } from "./plugin.js";
+export { createSecretRegistry } from "./scrubber.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,oBAAoB,EAAuB,MAAM,eAAe,CAAA"}

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAc,KAAK,YAAY,EAAE,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAA;AAQhG,eAAO,MAAM,aAAa,EAAE,MAE3B,CAAA;AAED,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,WAAW,CAAC,YAAY,CAAM,GACxC,MAAM,CA4ER;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAc,KAAK,YAAY,EAAE,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAA;AAShG,eAAO,MAAM,aAAa,EAAE,MAE3B,CAAA;AAED,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,WAAW,CAAC,YAAY,CAAM,GACxC,MAAM,CAwHR;AAED,eAAe,aAAa,CAAA"}

package/dist/plugin.js

@@ -1,6 +1,7 @@
 import { tool } from "@opencode-ai/plugin";
 import { loadConfig } from "./config.js";
 import { createEnvGuard } from "./guard.js";
+import { createSecretRegistry } from "./scrubber.js";
 import { createLoadEnvTool, createLoadSecretsTool, createSecretStatusTool, } from "./tools.js";
 export const VarlockPlugin = async (ctx) => {
     return createVarlockPlugin()(ctx);
@@ -36,12 +37,13 @@ export function createVarlockPlugin(overrides = {}) {
                 varlockAvailable = false;
             }
         }
+        const registry = createSecretRegistry();
         const tools = {};
         if (config.env.enabled) {
-            tools.load_env = createLoadEnvTool(config.env);
+            tools.load_env = createLoadEnvTool(config.env, registry);
         }
         if (varlockAvailable) {
-            tools.load_secrets = createLoadSecretsTool($, config.varlock);
+            tools.load_secrets = createLoadSecretsTool($, config.varlock, registry);
             tools.secret_status = createSecretStatusTool($, config.varlock);
         }
         const hookResult = {
@@ -70,6 +72,47 @@ export function createVarlockPlugin(overrides = {}) {
         if (config.guard.enabled) {
             hookResult["tool.execute.before"] = createEnvGuard(config.guard);
         }
+        hookResult["tool.execute.after"] = async (input, output) => {
+            // Scrub secret values from tool output
+            if (registry.size() > 0) {
+                if (typeof output.result === "string") {
+                    output.result = registry.scrub(output.result);
+                }
+                if (typeof output.error === "string") {
+                    output.error = registry.scrub(output.error);
+                }
+            }
+            // After file write/edit, run varlock scan to check for leaked secrets
+            if (varlockAvailable && (input.tool === "write" || input.tool === "edit")) {
+                const filePath = output.args?.filePath ?? output.args?.path ?? output.args?.file;
+                if (filePath) {
+                    try {
+                        const scanResult = await $ `${config.varlock.command} scan ${filePath}`.quiet();
+                        if (scanResult.exitCode !== 0) {
+                            await log({
+                                level: "warn",
+                                message: "varlock scan detected potential secret leak in written file",
+                                extra: { file: filePath },
+                            });
+                        }
+                    }
+                    catch {
+                        // scan not available or failed, non-critical
+                    }
+                }
+            }
+        };
+        hookResult["shell.env"] = async (_input, _output) => {
+            // Log which secret-managed env vars are being passed to shell
+            // This is observability, not blocking — the guard handles blocking
+            if (registry.size() > 0) {
+                await log({
+                    level: "debug",
+                    message: "shell execution with managed secrets in environment",
+                    extra: { managedVarCount: registry.size() },
+                });
+            }
+        };
         return hookResult;
     };
 }