permdock 0.6.0 → 0.7.0

package/dist/mcp/index.js

@@ -1,21 +1,21 @@
 import { r as isRecord, t as compact } from "../compact-CAf557ZB.js";
 import { n as freezeDeep } from "../freeze-CrU8nQeX.js";
-import { i as stepUpOf } from "../problem-details-cn5X30gZ.js";
-import { t as describe } from "../describe-BybMRY7A.js";
-import { m as annotationsFor } from "../permission-registry-Br4jSNVi.js";
-import { t as actorMayCallTool } from "../delegation-j6-rc37o.js";
+import { i as stepUpOf, o as statusProblem } from "../problem-details-cn5X30gZ.js";
+import { t as describe } from "../describe-DZlnEtLy.js";
+import { m as annotationsFor } from "../permission-registry-DpPtSKNZ.js";
+import { t as actorMayCallTool } from "../delegation-C5rOdTp5.js";
 import { n as resourceRef } from "../resource-ref-CaS9yVPi.js";
-import { a as hasScope, c as withApp, i as challengeScope, o as scopesReaching } from "../permdock-BrAscV28.js";
+import { i as challengeScope, l as withApp, o as hasScope, s as scopesReaching } from "../permdock-BfWEeMqk.js";
 import { t as anonymousSubject } from "../subject-BGoM5o8B.js";
-import { t as composeWraps } from "../wrap-gX61EtpB.js";
-import { l as protectedResourceMetadataUrl, r as bearerChallenge } from "../problem-CTviyH5L.js";
+import { t as composeWraps } from "../wrap-CiSc_KCq.js";
+import { a as methodNotAllowed, c as problemResponse, l as protectedResourceMetadataUrl, r as bearerChallenge } from "../problem-CTviyH5L.js";
 import { t as clientNameOf } from "../clients-DjU5ABMy.js";
-import { n as mapClaimsToSubject } from "../map-claims-D3oRmTk0.js";
-import { r as instanceOptions } from "../build-instance-Bu_eDqYw.js";
-import { n as createAgentKernel, r as refusalText } from "../kernel-D0NVb1cK.js";
+import { r as mapClaimsToSubject } from "../map-claims-etGIS_Dv.js";
+import { r as instanceOptions } from "../build-instance-DxE7czo9.js";
+import { i as refusalText, n as createAgentKernel } from "../kernel-DVExUwkp.js";
 import { t as boundedMap } from "../lru-8q4WZjBV.js";
 import { t as delegationFrom } from "../delegation-input-FTxMK3ji.js";
-import { n as deniedToolRefusal, r as toolErrorResult, t as approvalToolRefusal } from "../tool-refusal-CMLN5xhn.js";
+import { n as deniedToolRefusal, r as toolErrorResult, t as approvalToolRefusal } from "../tool-refusal-reAhIzdl.js";
 //#region src/mcp/mcp-auth.ts
 /** `_meta` key on `tools/call`, `resources/read` and `prompts/get` carrying an approval token. */
 const APPROVAL_META_KEY = "dev.permdock/approval";
@@ -383,6 +383,13 @@ function requirePermission(kind, name, config) {
 	if (!isRecord(permission) || typeof permission["key"] !== "string") throw new TypeError(`permdock/mcp: ${kind} ${name} has no permission; every guarded registration needs one.`);
 	return permission;
 }
+const UI_SCHEME = "ui://";
+/** The MCP Apps view a tool links through `_meta.ui.resourceUri`. */
+function uiResourceUri(meta) {
+	const ui = isRecord(meta) ? meta["ui"] : void 0;
+	const uri = isRecord(ui) ? ui["resourceUri"] : void 0;
+	return typeof uri === "string" && uri.startsWith(UI_SCHEME) ? uri : void 0;
+}
 function guardUpdates(registered, wrap, rename, currentName) {
 	const update = registered.update.bind(registered);
 	registered.update = (updates) => {
@@ -400,21 +407,23 @@ function protectServer(checks, server, enforcement) {
 	const toolScopes = /* @__PURE__ */ new Map();
 	const prompts = /* @__PURE__ */ new Map();
 	const resources = /* @__PURE__ */ new Map();
+	const views = /* @__PURE__ */ new Set();
+	const uiLinks = /* @__PURE__ */ new Map();
 	const templates = [];
 	const lastListed = boundedMap(SESSIONS_PER_SERVER);
 	const toolPermission = (name) => tools.get(name);
 	const toolDeclared = (name) => toolScopes.get(name);
 	const promptPermission = (name) => prompts.get(name);
 	const resourcePermission = (uri) => {
-		const direct = resources.get(uri);
+		const direct = resources.get(uri) ?? uiLinks.get(uri)?.permission;
 		if (direct !== void 0) return direct;
 		return templates.find((entry) => entry.template.uriTemplate.match(uri) !== null)?.permission;
 	};
 	const templatePermission = (uriTemplate) => templates.find((entry) => entry.template.uriTemplate.toString() === uriTemplate)?.permission;
-	const listFilter = (field, keyOf, permissionOf, remember) => async (result, rawContext) => {
+	const listFilter = (field, keyOf, permissionOf, remember, hidden = () => false) => async (result, rawContext) => {
 		if (!isRecord(result) || !Array.isArray(result[field])) return result;
 		const context = contextOf(rawContext);
-		const entries = result[field];
+		const entries = result[field].filter((entry) => !hidden(keyOf(entry)));
 		const shown = await visible(checks, context, permissionOf, entries.map(keyOf), remember ? toolDeclared : void 0, remember);
 		const kept = entries.filter((entry) => shown.has(keyOf(entry)));
 		if (remember) lastListed.set(sessionKey(context), [...shown].toSorted().join(","));
@@ -430,7 +439,7 @@ function protectServer(checks, server, enforcement) {
 	const filters = {
 		"tools/list": listFilter("tools", (entry) => entry.name, toolPermission, true),
 		"prompts/list": listFilter("prompts", (entry) => entry.name, promptPermission, false),
-		"resources/list": listFilter("resources", (entry) => entry.uri, resourcePermission, false),
+		"resources/list": listFilter("resources", (entry) => entry.uri, resourcePermission, false, (uri) => views.has(uri) && resourcePermission(uri) === void 0),
 		"resources/templates/list": listFilter("resourceTemplates", (entry) => entry.uriTemplate, templatePermission, false)
 	};
 	const inner = server.server;
@@ -484,6 +493,9 @@ function protectServer(checks, server, enforcement) {
 	};
 	const registerTool = (name, config, handler) => {
 		const permission = toolPermissionOf(name, config);
+		const view = uiResourceUri(config["_meta"]);
+		const linked = view === void 0 ? void 0 : uiLinks.get(view);
+		if (view !== void 0 && linked !== void 0 && linked.permission.key !== permission.key) throw new TypeError(`permdock/mcp: tools ${linked.tool} and ${name} link ${view} under different permissions; give the resource its own permission.`);
 		const { permission: _permission, data, scopeChallenge, longRunning: rawLongRunning, oauthScopes: rawScopes, ...passthrough } = config;
 		const load = data;
 		const longRunning = rawLongRunning === true;
@@ -501,6 +513,10 @@ function protectServer(checks, server, enforcement) {
 		}, wrapTool(tool, permission, reach, load, handler, longRunning));
 		tools.set(name, permission);
 		if (declared !== void 0) toolScopes.set(name, declared);
+		if (view !== void 0 && linked === void 0) uiLinks.set(view, {
+			tool: name,
+			permission
+		});
 		guardUpdates(registered, (callback) => wrapTool(tool, permission, reach, load, callback, longRunning), (from, to) => {
 			tools.delete(from);
 			toolScopes.delete(from);
@@ -528,18 +544,30 @@ function protectServer(checks, server, enforcement) {
 	};
 	const originalResource = server.registerResource.bind(server);
 	const registerResource = (name, uriOrTemplate, config, read) => {
-		const permission = requirePermission("resource", name, config);
+		const own = config["permission"] === void 0 && typeof uriOrTemplate === "string" && uriOrTemplate.startsWith(UI_SCHEME) ? void 0 : requirePermission("resource", name, config);
+		/** A `ui://` view without its own permission takes the one of the tool linking it; unlinked, it denies. */
+		const permissionNow = () => own ?? (typeof uriOrTemplate === "string" ? uiLinks.get(uriOrTemplate)?.permission : void 0);
 		const { permission: _permission, data, scopeChallenge, ...passthrough } = config;
 		const load = data;
-		const wrap = (callback) => guard(checks, permission, load, callback, (params) => params.slice(0, -1), throwRefusal, { capabilities });
+		const ownChallenge = scopeChallenge;
+		const wrap = (callback) => (...params) => {
+			const permission = permissionNow();
+			if (permission === void 0) return Promise.reject(/* @__PURE__ */ new Error(`Denied: resource ${name} is linked to no guarded tool.`));
+			return guard(checks, permission, load, callback, (args) => args.slice(0, -1), throwRefusal, { capabilities })(...params);
+		};
 		const registered = originalResource(name, uriOrTemplate, {
 			...passthrough,
-			scopeChallenge: challengeFor(scopeChallenge, scopesReaching(checks.policy, permission), challengeScope(checks.policy, permission))
+			scopeChallenge: (context) => {
+				const permission = permissionNow();
+				return permission === void 0 ? ownChallenge?.(context) : challengeFor(ownChallenge, scopesReaching(checks.policy, permission), challengeScope(checks.policy, permission))(context);
+			}
 		}, wrap(read));
-		if (typeof uriOrTemplate === "string") resources.set(uriOrTemplate, permission);
-		else templates.push({
+		if (typeof uriOrTemplate === "string") {
+			if (own === void 0) views.add(uriOrTemplate);
+			else resources.set(uriOrTemplate, own);
+		} else if (own !== void 0) templates.push({
 			template: uriOrTemplate,
-			permission
+			permission: own
 		});
 		guardUpdates(registered, wrap);
 		return registered;
@@ -628,4 +656,105 @@ function createPermDock(policy, given) {
 	return { protectServer: ((server, enforcement) => protectServer(checks, server, enforcement)) };
 }
 //#endregion
-export { APPROVAL_META_KEY, createPermDock, subjectFromMcp };
+//#region src/mcp/resource-guard.ts
+/** The `error_description` of every `invalid_token` challenge (RFC 6750 section 3.1). */
+const INVALID_TOKEN = "The access token is invalid";
+const BEARER = /^Bearer +([\w~+/.-]+=*)$/iu;
+function tokenScopes(claims) {
+	const { scope, scp } = claims;
+	if (typeof scope === "string") return scope.split(" ").filter((name) => name !== "");
+	return Array.isArray(scp) ? scp.filter((name) => typeof name === "string") : [];
+}
+function refuse(status, challenge, detail) {
+	return {
+		ok: false,
+		response: problemResponse(statusProblem(status, detail), void 0, void 0, { "WWW-Authenticate": challenge })
+	};
+}
+/**
+* The resource-server check in front of an MCP endpoint (MCP authorization,
+* RFC 6750, RFC 9728): reads the bearer token from `Authorization`, verifies
+* it for `resource`, refuses a revoked one and checks `scopes`. It answers
+* the `McpAuthInfo` the SDK's handlers read, or the `401` or `403` response
+* with a `WWW-Authenticate` challenge naming the metadata URL. A token in the
+* query string is never read. Never throws.
+*/
+function mcpResourceGuard(options) {
+	const resource = new URL(String(options.resource));
+	const resourceMetadata = options.resourceMetadataUrl ?? protectedResourceMetadataUrl(resource);
+	const required = options.scopes ?? [];
+	const invalid = () => refuse(401, bearerChallenge({
+		error: "invalid_token",
+		description: INVALID_TOKEN,
+		resourceMetadata
+	}), "invalid access token");
+	return async (request) => {
+		const header = request.headers.get("authorization");
+		if (header === null || header.trim() === "") return refuse(401, `Bearer resource_metadata="${resourceMetadata}"`, "access token required");
+		const token = BEARER.exec(header.trim())?.[1];
+		if (token === void 0) return invalid();
+		let claims;
+		try {
+			const verified = await options.verifier.verify(token, compact({
+				audience: resource.href,
+				issuer: options.issuer
+			}));
+			if (!verified.ok) return invalid();
+			claims = verified.claims;
+			if (options.revoked !== void 0 && await options.revoked(claims)) return invalid();
+		} catch {
+			return invalid();
+		}
+		const scopes = tokenScopes(claims);
+		if (required.some((scope) => !scopes.includes(scope))) return refuse(403, bearerChallenge({
+			error: "insufficient_scope",
+			scopes: required,
+			resourceMetadata
+		}), "insufficient scope");
+		const clientId = claims["client_id"] ?? claims["azp"];
+		return {
+			ok: true,
+			authInfo: compact({
+				token,
+				clientId: typeof clientId === "string" ? clientId : void 0,
+				scopes,
+				expiresAt: claims.exp,
+				resource,
+				resourceMetadataUrl: resourceMetadata,
+				extra: { claims }
+			})
+		};
+	};
+}
+/**
+* The RFC 9728 Protected Resource Metadata document as a Fetch handler, for
+* `/.well-known/oauth-protected-resource<path>`. `bearer_methods_supported`
+* is `header`, the only method `mcpResourceGuard` reads. Any origin may read it.
+*/
+function protectedResourceMetadata(options) {
+	const body = JSON.stringify(compact({
+		resource: new URL(String(options.resource)).href,
+		authorization_servers: options.authorizationServers,
+		scopes_supported: options.scopesSupported,
+		bearer_methods_supported: ["header"],
+		resource_name: options.resourceName,
+		resource_documentation: options.resourceDocumentation
+	}));
+	return (request) => {
+		if (request.method === "OPTIONS") return new Response(null, {
+			status: 204,
+			headers: {
+				"access-control-allow-origin": "*",
+				"access-control-allow-methods": "GET, OPTIONS"
+			}
+		});
+		if (request.method !== "GET" && request.method !== "HEAD") return methodNotAllowed("GET, HEAD, OPTIONS");
+		return new Response(request.method === "HEAD" ? null : body, { headers: {
+			"content-type": "application/json",
+			"access-control-allow-origin": "*",
+			"cache-control": "public, max-age=3600"
+		} });
+	};
+}
+//#endregion
+export { APPROVAL_META_KEY, createPermDock, mcpResourceGuard, protectedResourceMetadata, subjectFromMcp };

package/dist/{migrate-CIq4-E9F.js → migrate-Dodel0IJ.js}

@@ -1,15 +1,15 @@
 import { r as isRecord } from "./compact-CAf557ZB.js";
 import { i as dateAt } from "./time-DkWjdL98.js";
-import { a as describeError } from "./errors-CWTY6uih.js";
+import { a as describeError } from "./errors-DpP_U6Bf.js";
 import { o as sqlFiles } from "./files-D_JIzUrP.js";
-import { r as escapeSqlIdent, s as quoteSqlLiteral } from "./sql-B5T1IL83.js";
-import "./sources-vs5dGOsS.js";
+import { r as escapeSqlIdent, s as quoteSqlLiteral } from "./sql-B96movIM.js";
+import "./sources-B-zYB4GS.js";
 import { a as RETIRE_MARKER } from "./markers-C6joDI3o.js";
-import { r as refuseDirty, t as applyFiles } from "./files-C5ZI27eV.js";
-import { f as writeOutputFiles, n as dataMigrationFile } from "./output-files-DhRBBE4n.js";
-import { r as HELPERS } from "./shared-BAK8t4Uo.js";
-import { o as sqlStatements } from "./deciding-columns-Sq12mEA6.js";
-import { i as retireSql, r as retirePlan } from "./retire-CALjIQ7e.js";
+import { r as refuseDirty, t as applyFiles } from "./files-acUbNwWt.js";
+import { f as writeOutputFiles, n as dataMigrationFile } from "./output-files-CCMdcFWb.js";
+import { r as HELPERS } from "./shared-fMKOv8hP.js";
+import { o as sqlStatements } from "./deciding-columns-DRo2QM6E.js";
+import { i as retireSql, r as retirePlan } from "./retire-Wj6dkyDE.js";
 import { existsSync, readFileSync } from "node:fs";
 import { relative, resolve } from "node:path";
 import { parse } from "pgsql-parser";
@@ -84,6 +84,29 @@ function callEnd(text, start) {
 	}
 	return -1;
 }
+/** The top-level arguments of the call at `start`, as written; `end` is past its closing paren. */
+function argTexts(text, start, end) {
+	const open = text.indexOf("(", start);
+	const args = [];
+	let from = open + 1;
+	let depth = 0;
+	for (let index = open; index < end; index += 1) {
+		const char = text[index];
+		if (char === "'" || char === "\"") {
+			index = Math.max(text.indexOf(char, index + 1), index);
+			continue;
+		}
+		if (char === "(" || char === "[") depth += 1;
+		else if (char === ")" || char === "]") {
+			depth -= 1;
+			if (depth === 0) args.push(text.slice(from, index));
+		} else if (char === "," && depth === 1) {
+			args.push(text.slice(from, index));
+			from = index + 1;
+		}
+	}
+	return args.map((arg) => arg.trim());
+}
 const IDENTIFIER = String.raw`(?:"(?:[^"]|"")+"|[A-Za-z_][\w$]*)`;
 const COLUMN = new RegExp(String.raw`${IDENTIFIER}(?:\s*\.\s*${IDENTIFIER})*`, "uy");
 function columnText(text, start) {
@@ -125,6 +148,8 @@ var Rewriter = class {
 	#target;
 	#text;
 	#at;
+	/** The written arguments of the call being rewritten. */
+	#args = [];
 	constructor(config, target, text) {
 		this.#config = config;
 		this.#target = target;
@@ -146,9 +171,12 @@ var Rewriter = class {
 		if (this.#target.granted.get(scope)?.has(key) !== true) return skip("not-granted-on-scope", [...this.#target.granted.values()].some((keys) => keys.has(key)) ? `no role grants ${key} on ${scope}, so the helper would always deny` : `${key} has no unconditional allow row in role_permissions: a conditional, time-bounded or deny-mixed grant splits its grant key, so the helper would always deny`);
 		return { to: literal(key) };
 	}
-	#column(arg) {
+	#column(arg, index) {
 		const location = child(child(arg, "ColumnRef"), "location");
-		if (typeof location !== "number") return skip("not-a-column", "the id is an expression, not a plain column; rewrite it by hand");
+		if (typeof location !== "number") {
+			const written = this.#args[index];
+			return written === void 0 || written === "" ? skip("not-a-column", "the id is an expression whose text could not be read; rewrite it by hand") : { to: `(${written})` };
+		}
 		const text = columnText(this.#text, this.#at(location));
 		return text === void 0 ? skip("not-a-column", "the id could not be read as a column") : { to: text };
 	}
@@ -158,8 +186,8 @@ var Rewriter = class {
 		const key = this.#key(keyArg, scope);
 		return "to" in key ? { to: `${helper}(${key.to})` } : key;
 	}
-	#row(scope, idArg, keyArg) {
-		const column = this.#column(idArg);
+	#row(scope, idArg, keyArg, idIndex) {
+		const column = this.#column(idArg, idIndex);
 		if (!("to" in column)) return column;
 		const ids = this.#ids(scope, keyArg);
 		return "to" in ids ? { to: `(${column.to} in (select ${ids.to}))` } : ids;
@@ -175,7 +203,7 @@ var Rewriter = class {
 	#membership(scope, idArg) {
 		const helper = this.#helper(`member_${scope}_ids`);
 		if (helper === void 0) return skip("missing-helper", `rls generate writes no member_${scope}_ids: ${scope} has no membership source`);
-		const column = this.#column(idArg);
+		const column = this.#column(idArg, 0);
 		return "to" in column ? { to: `(${column.to} in (select ${helper}()))` } : column;
 	}
 	#role(scope, idArg, roleArgs) {
@@ -190,7 +218,7 @@ var Rewriter = class {
 			if (!this.#target.roles.has(declared)) return skip("unknown-role", `${value} maps to ${declared}, which no role grants; add it to rls.roleValues or declare the role`);
 			mapped.push(declared);
 		}
-		const column = this.#column(idArg);
+		const column = this.#column(idArg, 0);
 		return "to" in column ? { to: `(${column.to} in (select ${helper}(array[${mapped.map(literal).join(", ")}])))` } : column;
 	}
 	#scoped(args, selected) {
@@ -198,14 +226,15 @@ var Rewriter = class {
 		const named = stringConst(scopeArg);
 		if (named === void 0) return skip("unknown-scope", "the scope is not a string literal; rewrite it by hand");
 		if (this.#config.globalScopes?.includes(named) === true || isNullConst(idArg)) return this.#global(keyArg, selected);
-		return this.#row(this.#config.scopes?.[named] ?? named, idArg, keyArg);
+		return this.#row(this.#config.scopes?.[named] ?? named, idArg, keyArg, 1);
 	}
 	/** `selected`: the call is already a `select` target, so `permdock_has` needs no wrapping subquery. */
 	rewrite(call, selected) {
 		const { helper, args } = call;
+		this.#args = argTexts(this.#text, call.start, call.end);
 		switch (helper.form) {
 			case "ids": return this.#ids(helper.scope, args[0]);
-			case "row": return this.#row(helper.scope, args[0], args[1]);
+			case "row": return this.#row(helper.scope, args[0], args[1], 0);
 			case "membership": return this.#membership(helper.scope, args[0]);
 			case "role": return this.#role(helper.scope, args[0], args.slice(1));
 			case "scoped": return this.#scoped(args, selected);
@@ -246,6 +275,24 @@ function bodyStrings(statement) {
 	}
 	return found;
 }
+/** What `call`, written inside a function body, becomes: the rewrite that its place keeps from being applied. */
+async function suggest(call, config, target) {
+	const sql = `select ${call}`;
+	let tree;
+	try {
+		tree = await parse(sql);
+	} catch {
+		return;
+	}
+	const target0 = list(child(child(child(list(child(tree, "stmts"))[0], "stmt"), "SelectStmt"), "targetList"))[0];
+	const node = child(child(child(target0, "ResTarget"), "val"), "FuncCall");
+	if (!isRecord(node)) return;
+	const rewriter = new Rewriter(config, target, sql);
+	const found = rewriter.call(node);
+	if (found === void 0 || found.end === -1) return;
+	const outcome = rewriter.rewrite(found, true);
+	return "to" in outcome ? outcome.to : void 0;
+}
 /** Rewrites the configured helper calls in one file's policies; everything else is reported. */
 async function migrateSql(file, text, config, target) {
 	const rewrites = [];
@@ -332,13 +379,19 @@ async function migrateSql(file, text, config, target) {
 		if (kind !== void 0 && BODY_STATEMENTS.has(kind)) {
 			for (const body of bodyStrings(child(statement, kind))) {
 				const bodyStart = text.indexOf(body, statementStart);
-				for (const match of body.matchAll(called)) skipped.push({
-					file,
-					line: lineOf(text, (bodyStart === -1 ? statementStart : bodyStart) + (match.index ?? 0)),
-					call: match[1] ?? "",
-					reason: "function-body",
-					detail: "the call is inside a function body, which runs with its own privileges; rewrite it by hand"
-				});
+				for (const match of body.matchAll(called)) {
+					const matchAt = match.index ?? 0;
+					const end = callEnd(body, matchAt);
+					const suggestion = end === -1 ? void 0 : await suggest(body.slice(matchAt, end), config, target);
+					skipped.push({
+						file,
+						line: lineOf(text, (bodyStart === -1 ? statementStart : bodyStart) + matchAt),
+						call: match[1] ?? "",
+						reason: "function-body",
+						detail: "the call is inside a function body, which runs with its own privileges; rewrite it by hand",
+						...suggestion === void 0 ? {} : { suggestion }
+					});
+				}
 			}
 			continue;
 		}
@@ -359,7 +412,7 @@ function describeRetire(plan) {
 	});
 }
 function describe(report, write) {
-	const lines = [...report.rewrites.map((item) => `${item.file}:${String(item.line)}  ${item.from}  ->  ${item.to}`), ...report.skipped.map((item) => `skipped ${item.file}:${String(item.line)}  ${item.call}: ${item.detail}`)];
+	const lines = [...report.rewrites.map((item) => `${item.file}:${String(item.line)}  ${item.from}  ->  ${item.to}`), ...report.skipped.map((item) => `skipped ${item.file}:${String(item.line)}  ${item.call}: ${item.detail}${item.suggestion === void 0 ? "" : `; use ${item.suggestion}`}`)];
 	const files = new Set(report.rewrites.map((item) => item.file)).size;
 	const unknown = report.skipped.filter((item) => item.reason === "unknown-key").length;
 	lines.push(`rls migrate: ${write ? "rewrote" : "would rewrite"} ${String(report.rewrites.length)} call(s) in ${String(files)} file(s), skipped ${String(report.skipped.length)}${unknown === 0 ? "" : `, ${String(unknown)} with an unknown key`}${write ? "" : "; drop --dry-run to apply them"}`);

package/dist/nest/index.d.ts

@@ -1,9 +1,9 @@
-import { T as Policy, rr as Principal } from "../policy-types-n0uRTsW8.js";
-import { w as Permission } from "../vocabulary-CN8H_9UF.js";
-import { r as PermDock } from "../permdock-SV8ZINYT.js";
+import { T as Policy, sr as Principal } from "../policy-types-B-F-qAZk.js";
+import { u as Permission } from "../permission-types-DhNEmoRG.js";
+import { a as PermDock } from "../permdock-Dco6dyCK.js";
 import { n as RevocationFeed } from "../revocations-R07lFBnX.js";
-import { D as ConnectionOptions, T as Connection, f as InvalidSignatureError, i as OpenApiHooks, o as ProtectOptions, v as discoverViaSignatureAgent, x as webBotAuthVerifier } from "../server-types-CKQiCnON.js";
-import { t as ServerAdapterOptions } from "../bind-DOyrv6zi.js";
+import { D as ConnectionOptions, T as Connection, f as InvalidSignatureError, i as OpenApiHooks, o as ProtectOptions, v as discoverViaSignatureAgent, x as webBotAuthVerifier } from "../server-types-C4gZUEZy.js";
+import { t as ServerAdapterOptions } from "../bind-JDuvxjuW.js";
 import { r as sendResponse, t as NodeRequest } from "../http-B_LphE5Y.js";
 import { CanActivate, DynamicModule, ExceptionFilter, ExecutionContext, Type } from "@nestjs/common";
 //#region src/nest/http.d.ts

package/dist/nest/index.js

@@ -2,9 +2,9 @@ import { t as compact } from "../compact-CAf557ZB.js";
 import { n as PermDockValidationError } from "../validation-error-ZfUHbKvf.js";
 import { n as PermDockDeniedError, r as PermDockRevokedError, t as PermDockApprovalRequiredError } from "../errors-BKy0EfhN.js";
 import { c as writeReply, r as hasCredentials } from "../http-BBoKefeS.js";
-import { d as discoverViaSignatureAgent, m as webBotAuthVerifier, u as InvalidSignatureError } from "../evaluations-beAooV0n.js";
-import { t as problemFromError } from "../map-error-Dr70oA_3.js";
-import { a as socketConnection, r as bindKernel } from "../bind-CAvgUuKs.js";
+import { l as InvalidSignatureError, p as webBotAuthVerifier, u as discoverViaSignatureAgent } from "../evaluations-DReoiVBw.js";
+import { t as problemFromError } from "../map-error-BQGyDm_M.js";
+import { a as socketConnection, r as bindKernel } from "../bind-D1nO6fiC.js";
 import { a as onRevoked, n as closeReason, t as POLICY_VIOLATION } from "../stream-CvdUS9V1.js";
 import { n as sendResponse, r as toRequest$1, t as isServerResponse } from "../http-ujKm0JXE.js";
 import { Catch, Controller, Get, Inject, Injectable, Module, Post, Req, Res, createParamDecorator } from "@nestjs/common";

package/dist/next/index.d.ts

@@ -1,12 +1,12 @@
-import { In as DenialReason, Nn as Decision, T as Policy, Vt as Snapshot, ar as Subject, j as PolicyVocabulary, rr as Principal } from "../policy-types-n0uRTsW8.js";
-import { w as Permission } from "../vocabulary-CN8H_9UF.js";
-import { r as PermDock } from "../permdock-SV8ZINYT.js";
-import { m as ApprovalStore } from "../types-BdtSDbBO.js";
-import { t as InstanceOptions } from "../instance-options-BsVpyGIk.js";
-import { n as PermDockWrap } from "../wrap-C5jC6sKI.js";
-import { o as OtelWrap } from "../types-lUlG3TVd.js";
-import { n as DescribeMessages } from "../describe-B5qgDvEW.js";
-import { a as snapshotHeaders, i as cacheLifeFor, n as SnapshotHeaders, o as snapshotTag, r as SnapshotHeadersOptions, t as CacheLifeForOptions } from "../snapshot-cache-PXI-vGpY.js";
+import { Bn as DenialReason, Gt as Snapshot, Ln as Decision, T as Policy, j as PolicyVocabulary, lr as Subject, sr as Principal } from "../policy-types-B-F-qAZk.js";
+import { u as Permission } from "../permission-types-DhNEmoRG.js";
+import { a as PermDock } from "../permdock-Dco6dyCK.js";
+import { m as ApprovalStore } from "../types-DC44-hqb.js";
+import { t as InstanceOptions } from "../instance-options-CU0YQCLH.js";
+import { n as PermDockWrap } from "../wrap-B6R0cMRL.js";
+import { o as OtelWrap } from "../types-CIeZcG8v.js";
+import { n as DescribeMessages } from "../describe-O0SwYIK8.js";
+import { a as snapshotHeaders, i as cacheLifeFor, n as SnapshotHeaders, o as snapshotTag, r as SnapshotHeadersOptions, t as CacheLifeForOptions } from "../snapshot-cache-Pahd3IYJ.js";
 import { ReactElement, ReactNode } from "react";
 //#region src/next/types.d.ts
 type NextSubjectInput = unknown;

package/dist/next/index.js

@@ -1,9 +1,9 @@
 import { t as compact } from "../compact-CAf557ZB.js";
-import { c as withApp } from "../permdock-BrAscV28.js";
-import { n as wrapPermDock } from "../wrap-gX61EtpB.js";
-import { n as snapshotHeaders, r as snapshotTag, t as cacheLifeFor } from "../snapshot-cache-DZHQ0KF6.js";
-import { n as resolveOrNull, t as buildInstance } from "../build-instance-Bu_eDqYw.js";
-import { o as evaluationsHandler, v as NO_GRANT } from "../evaluations-beAooV0n.js";
+import { l as withApp } from "../permdock-BfWEeMqk.js";
+import { n as wrapPermDock } from "../wrap-CiSc_KCq.js";
+import { n as snapshotHeaders, r as snapshotTag, t as cacheLifeFor } from "../snapshot-cache-DT2Kx1F8.js";
+import { n as resolveOrNull, t as buildInstance } from "../build-instance-DxE7czo9.js";
+import { _ as NO_GRANT, o as evaluationsHandler } from "../evaluations-DReoiVBw.js";
 import { cache } from "react";
 import { jsx } from "react/jsx-runtime";
 import { forbidden, unauthorized, unstable_rethrow } from "#next/navigation";

package/dist/next/plugin.d.ts

@@ -1,4 +1,4 @@
-import { a as PermDockPluginOptions } from "../types-Dfv0aTER.js";
+import { a as PermDockPluginOptions } from "../types-BWZybqs9.js";
 //#region src/cli/plugin.d.ts
 /** Any object: Next's `NextConfig` is an interface, so no index signature. */
 type NextConfigLike = object;

package/dist/next/plugin.js

@@ -1,5 +1,5 @@
-import { a as describeError } from "../errors-CWTY6uih.js";
-import { n as createCollectScheduler, r as report, t as collectOnce } from "../watch-vea54PRw.js";
+import { a as describeError } from "../errors-DpP_U6Bf.js";
+import { n as createCollectScheduler, r as report, t as collectOnce } from "../watch-C-4VmFlL.js";
 //#region src/cli/plugin.ts
 const PHASE_BUILD = "phase-production-build";
 const PHASE_DEV = "phase-development-server";

package/dist/node/index.d.ts

@@ -1,8 +1,8 @@
-import { T as Policy, j as PolicyVocabulary, rr as Principal } from "../policy-types-n0uRTsW8.js";
-import { w as Permission } from "../vocabulary-CN8H_9UF.js";
-import { r as PermDock } from "../permdock-SV8ZINYT.js";
-import { f as InvalidSignatureError, i as OpenApiHooks, o as ProtectOptions, r as Guard, s as ScopeGuard, v as discoverViaSignatureAgent, x as webBotAuthVerifier } from "../server-types-CKQiCnON.js";
-import { t as ServerAdapterOptions } from "../bind-DOyrv6zi.js";
+import { T as Policy, j as PolicyVocabulary, sr as Principal } from "../policy-types-B-F-qAZk.js";
+import { u as Permission } from "../permission-types-DhNEmoRG.js";
+import { a as PermDock } from "../permdock-Dco6dyCK.js";
+import { f as InvalidSignatureError, i as OpenApiHooks, o as ProtectOptions, r as Guard, s as ScopeGuard, v as discoverViaSignatureAgent, x as webBotAuthVerifier } from "../server-types-C4gZUEZy.js";
+import { t as ServerAdapterOptions } from "../bind-JDuvxjuW.js";
 import { i as toRequest, n as isServerResponse, r as sendResponse, t as NodeRequest } from "../http-B_LphE5Y.js";
 import { IncomingMessage, ServerResponse } from "node:http";
 //#region src/node/create.d.ts

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { d as discoverViaSignatureAgent, m as webBotAuthVerifier, u as InvalidSignatureError } from "../evaluations-beAooV0n.js";
-import { r as bindKernel } from "../bind-CAvgUuKs.js";
+import { l as InvalidSignatureError, p as webBotAuthVerifier, u as discoverViaSignatureAgent } from "../evaluations-DReoiVBw.js";
+import { r as bindKernel } from "../bind-D1nO6fiC.js";
 import { n as sendResponse, r as toRequest, t as isServerResponse } from "../http-ujKm0JXE.js";
 //#region src/node/create.ts
 const nodeRequest = (req) => req;

package/dist/openai/index.d.ts

@@ -1,8 +1,8 @@
-import { T as Policy, j as PolicyVocabulary, rr as Principal } from "../policy-types-n0uRTsW8.js";
-import { w as Permission } from "../vocabulary-CN8H_9UF.js";
-import { r as PermDock } from "../permdock-SV8ZINYT.js";
-import { u as ApprovalRequest } from "../types-BdtSDbBO.js";
-import { o as AgentAdapterOptions, t as AgentPermDock } from "../create-CBMmFie-.js";
+import { T as Policy, j as PolicyVocabulary, sr as Principal } from "../policy-types-B-F-qAZk.js";
+import { u as Permission } from "../permission-types-DhNEmoRG.js";
+import { a as PermDock } from "../permdock-Dco6dyCK.js";
+import { u as ApprovalRequest } from "../types-DC44-hqb.js";
+import { o as AgentAdapterOptions, t as AgentPermDock } from "../create-UTnUVETj.js";
 //#region src/openai/create.d.ts
 /** The app context passed to `run(agent, input, { context })`. */
 type OpenAiContext = {

package/dist/openai/index.js

@@ -1,7 +1,7 @@
 import { t as compact } from "../compact-CAf557ZB.js";
-import { c as withApp } from "../permdock-BrAscV28.js";
-import { t as approvalTokenOf } from "../kernel-D0NVb1cK.js";
-import { t as agentRuntime } from "../create-CGm28gyI.js";
+import { l as withApp } from "../permdock-BfWEeMqk.js";
+import { t as approvalTokenOf } from "../kernel-DVExUwkp.js";
+import { t as agentRuntime } from "../create-Cb86Z8Im.js";
 //#region src/openai/create.ts
 function appContext(runContext) {
 	const context = runContext?.context;

package/dist/openapi/index.d.ts

@@ -1,6 +1,6 @@
-import { T as Policy, rr as Principal, ur as Condition } from "../policy-types-n0uRTsW8.js";
-import { E as PermissionTree, w as Permission } from "../vocabulary-CN8H_9UF.js";
-import { a as ProblemDetails } from "../errors-DH5QEGXh.js";
+import { T as Policy, mr as Condition, sr as Principal } from "../policy-types-B-F-qAZk.js";
+import { f as PermissionTree, u as Permission } from "../permission-types-DhNEmoRG.js";
+import { a as ProblemDetails } from "../errors-B_Qg9D3e.js";
 import { StandardJSONSchemaV1, StandardSchemaV1 } from "@standard-schema/spec";
 //#region src/openapi/types.d.ts
 type OpenApiTarget = "3.1" | "3.2" | "3.3";
@@ -158,6 +158,14 @@ type SecurityForOptions = {
   readonly scheme?: string;
   /** Any one of the permissions suffices: one requirement per scope instead of one with every scope. */
   readonly anyOf?: boolean;
+  readonly security?: true;
+};
+/** `security: false` emits only `x-permdock-permissions`, for an API whose `security` is set elsewhere, such as OIDC-only bearer auth. */
+type SecurityExtensionOptions = Omit<SecurityForOptions, "security"> & {
+  readonly security: false;
+};
+type SecurityExtensionFor = {
+  readonly "x-permdock-permissions": readonly string[];
 };
 type SecurityFor = {
   readonly security: readonly OpenApiSecurityRequirement[];
@@ -171,6 +179,8 @@ export declare function permissionsExtension(permissions: Permission | readonly
  * Unlike `permdock openapi emit`, it never drops `security` for a public
  * permission: that needs the policy.
  */
+export declare function securityFor(permission: Permission | readonly Permission[], options: SecurityExtensionOptions): SecurityExtensionFor;
 export declare function securityFor(permission: Permission | readonly Permission[], options?: SecurityForOptions): SecurityFor;
+export declare function securityFor(permission: Permission | readonly Permission[], options?: SecurityForOptions | SecurityExtensionOptions): SecurityFor | SecurityExtensionFor;
 //#endregion
-export type { OpenApiDescribe, OpenApiDocsHints, OpenApiFactory, OpenApiOverlayOptions, OpenApiPermDock, OpenApiPermDockOptions, OpenApiSchemeOptions, OpenApiSecurityRequirement, OpenApiTarget, OperationEntry, OperationPermissions, OverlayOperation, OverlayVersion, SchemeType, SecurityFor, SecurityForOptions, SecurityProfileName };
+export type { OpenApiDescribe, OpenApiDocsHints, OpenApiFactory, OpenApiOverlayOptions, OpenApiPermDock, OpenApiPermDockOptions, OpenApiSchemeOptions, OpenApiSecurityRequirement, OpenApiTarget, OperationEntry, OperationPermissions, OverlayOperation, OverlayVersion, SchemeType, SecurityExtensionFor, SecurityExtensionOptions, SecurityFor, SecurityForOptions, SecurityProfileName };

package/dist/openapi/index.js

@@ -1,3 +1,3 @@
 import { n as GNAP_RESERVED, r as PROFILE_NAMES, t as DRAFT_PINS } from "../pins-8ILTftC9.js";
-import { a as operationPermissionsFromOpenApi, c as openapiVersion, i as operationPermissions, l as securitySchemesOf, n as securityFor, o as createPermDock, r as problemDetails, s as catalogOf, t as permissionsExtension } from "../openapi-B7HZ0f-r.js";
+import { a as operationPermissionsFromOpenApi, c as openapiVersion, i as operationPermissions, l as securitySchemesOf, n as securityFor, o as createPermDock, r as problemDetails, s as catalogOf, t as permissionsExtension } from "../openapi-Ddb4628T.js";
 export { DRAFT_PINS, GNAP_RESERVED, PROFILE_NAMES, catalogOf, createPermDock, openapiVersion, operationPermissions, operationPermissionsFromOpenApi, permissionsExtension, problemDetails, securityFor, securitySchemesOf };