@ory/argus 1.5.2 → 1.6.0

package/dist/testing.d.ts

@@ -5,7 +5,7 @@
  * common assertion patterns so that harness plugin tests focus on
  * harness-specific behavior rather than duplicating boilerplate.
  */
-import { vi } from "vitest";
+import { type Mock } from "vitest";
 import { OryAgentClient } from "./client.js";
 import type { ActivityEntry } from "./logger.js";
 import type { PermissionMode } from "./config.js";
@@ -13,8 +13,8 @@ export { runHarnessContractSuite, type HarnessContractAdapter, type ContractCont
 export interface SdkLazySessionContractAdapter {
     name: string;
     harness: string;
-    createSessionStarterMock: ReturnType<typeof vi.fn>;
-    ensureSessionMock: ReturnType<typeof vi.fn>;
+    createSessionStarterMock: Mock;
+    ensureSessionMock: Mock;
     createSubject(client: OryAgentClient, projectUrl?: string): {
         invoke(index: number): Promise<unknown>;
     };
@@ -40,7 +40,7 @@ export declare function createMockClient(overrides?: Partial<ConstructorParamete
 export declare function spyRecordDelegation(client: OryAgentClient, result?: {
     nodeId: string;
     delegationChain: string[];
-}): import("vitest").Mock<(input: import("./client.js").RecordDelegationInput, options?: {
+}): Mock<(input: import("./client.js").RecordDelegationInput, options?: {
     fetchImpl?: typeof fetch;
     activityAttributes?: Record<string, unknown>;
     agentToken?: string;
@@ -52,7 +52,7 @@ export declare function spyRecordDelegation(client: OryAgentClient, result?: {
  * Stub an internal API instance method on the client.
  * Returns a vi.fn mock so callers can assert on calls.
  */
-export declare function stubApi<K extends "frontend" | "oauth2" | "permission">(client: OryAgentClient, api: K, method: string, impl: (...args: unknown[]) => unknown): ReturnType<typeof vi.fn>;
+export declare function stubApi<K extends "frontend" | "oauth2" | "permission">(client: OryAgentClient, api: K, method: string, impl: (...args: unknown[]) => unknown): Mock;
 /** Successful session verification response (wraps Ory API shape). */
 export declare const MOCK_SESSION_RESPONSE: {
     data: {
@@ -76,7 +76,6 @@ export declare const MOCK_SESSION_RESPONSE: {
 /** Inactive session (same shape, active: false). */
 export declare const MOCK_INACTIVE_SESSION_RESPONSE: {
     data: {
-        active: boolean;
         id: string;
         authenticated_at: string;
         expires_at: string;
@@ -91,6 +90,7 @@ export declare const MOCK_INACTIVE_SESSION_RESPONSE: {
                 email: string;
             };
         };
+        active: boolean;
     };
 };
 /** Successful OAuth2 token introspection response. */
@@ -238,19 +238,19 @@ export declare function disconnectSecurity(which?: "neither" | "no-client-id" |
  */
 export declare function clearOryEnv(): void;
 /** Stub verifySession to succeed. */
-export declare function stubSessionSuccess(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubSessionSuccess(client: OryAgentClient): Mock;
 /** Stub verifySession to return inactive. */
-export declare function stubSessionInactive(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubSessionInactive(client: OryAgentClient): Mock;
 /** Stub verifySession to throw a network error. */
-export declare function stubSessionNetworkError(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubSessionNetworkError(client: OryAgentClient): Mock;
 /** Stub verifySession to throw MFA required. */
-export declare function stubSessionMfaRequired(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubSessionMfaRequired(client: OryAgentClient): Mock;
 /** Stub verifySession to throw session_inactive. */
-export declare function stubSessionExpired(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubSessionExpired(client: OryAgentClient): Mock;
 /** Stub introspectToken to succeed. */
-export declare function stubOAuth2Success(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubOAuth2Success(client: OryAgentClient): Mock;
 /** Stub introspectToken to return inactive. */
-export declare function stubOAuth2Inactive(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubOAuth2Inactive(client: OryAgentClient): Mock;
 /**
  * Set the mode the server-read stub reports. Also clears the in-memory
  * permission-mode cache so the new value takes effect immediately (tests run
@@ -258,26 +258,38 @@ export declare function stubOAuth2Inactive(client: OryAgentClient): import("vite
  */
 export declare function setTestPermissionMode(mode: PermissionMode): void;
 /** Stub checkPermission to allow. */
-export declare function stubPermissionAllowed(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable> & {
-    batch: import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubPermissionAllowed(client: OryAgentClient): import("vitest").MockInstance<import("../../../node_modules/vitest/dist/chunks/config.d.QBNYCgFU.js", { with: { "resolution-mode": "import" } }).v> & {
+    (...args: any[]): any;
+    new (...args: any[]): any;
+} & {} & {
+    batch: Mock;
 };
 /** Stub checkPermission to deny (the tool check; the mode check still answers `currentTestMode`). */
-export declare function stubPermissionDenied(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable> & {
-    batch: import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubPermissionDenied(client: OryAgentClient): import("vitest").MockInstance<import("../../../node_modules/vitest/dist/chunks/config.d.QBNYCgFU.js", { with: { "resolution-mode": "import" } }).v> & {
+    (...args: any[]): any;
+    new (...args: any[]): any;
+} & {} & {
+    batch: Mock;
 };
 /** Stub checkPermission to throw a network error. */
-export declare function stubPermissionNetworkError(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable> & {
-    batch: import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubPermissionNetworkError(client: OryAgentClient): import("vitest").MockInstance<import("../../../node_modules/vitest/dist/chunks/config.d.QBNYCgFU.js", { with: { "resolution-mode": "import" } }).v> & {
+    (...args: any[]): any;
+    new (...args: any[]): any;
+} & {} & {
+    batch: Mock;
 };
 /** Stub checkPermission to throw a rate-limit error. */
-export declare function stubPermissionRateLimited(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable> & {
-    batch: import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+export declare function stubPermissionRateLimited(client: OryAgentClient): import("vitest").MockInstance<import("../../../node_modules/vitest/dist/chunks/config.d.QBNYCgFU.js", { with: { "resolution-mode": "import" } }).v> & {
+    (...args: any[]): any;
+    new (...args: any[]): any;
+} & {} & {
+    batch: Mock;
 };
-/** Stub both checkPermission (server allow) and batchCheckPermission (both allow). */
-export declare function stubMcpAllowed(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
-/** Stub checkPermission to deny (server-only MCP check). */
-export declare function stubMcpServerDenied(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
-/** Stub batchCheckPermission: server allowed, tool denied. */
-export declare function stubMcpToolDenied(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
-/** Stub checkPermission to throw network error (MCP fail-open). */
-export declare function stubMcpNetworkError(client: OryAgentClient): import("vitest").Mock<import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Procedure | import(".pnpm/@vitest+spy@4.1.7/node_modules/@vitest/spy", { with: { "resolution-mode": "import" } }).Constructable>;
+/** Stub MCP checks so the server and the tool are both allowed. */
+export declare function stubMcpAllowed(client: OryAgentClient): Mock;
+/** Stub MCP checks so the server is denied (No access). */
+export declare function stubMcpServerDenied(client: OryAgentClient): Mock;
+/** Stub MCP checks so the server is allowed but the tool is denied (its tier is blocked). */
+export declare function stubMcpToolDenied(client: OryAgentClient): Mock;
+/** Stub MCP checks to throw a network error (MCP fail-open). */
+export declare function stubMcpNetworkError(client: OryAgentClient): Mock;

package/dist/testing.js

@@ -553,25 +553,47 @@ function stubPermissionRateLimited(client) {
     return Object.assign(check, { batch });
 }
 // ─── MCP Stub Presets ─────────────────────────────────────────────
-/** Stub both checkPermission (server allow) and batchCheckPermission (both allow). */
-function stubMcpAllowed(client) {
+/**
+ * Answer MCP gate checks tuple by tuple: the `McpServer` and `McpTool` use
+ * permits get the given answers, mode checks answer `currentTestMode`, block
+ * probes find no block, and any other use permit is allowed.
+ */
+function stubMcpDecision(client, answers) {
     ensurePermissionCredential(client);
-    stubApi(client, "permission", "checkPermission", checkPermissionResponder(exports.PERMISSION_ALLOWED));
-    return stubApi(client, "permission", "batchCheckPermission", () => Promise.resolve(exports.BATCH_BOTH_ALLOWED));
+    const answer = (tuple) => {
+        if (tuple.object === opl_js_1.PERMISSION_MODE_OBJECT && tuple.relation === opl_js_1.RELATION_ENFORCED_SUBJECTS) {
+            return currentTestMode === "enforce";
+        }
+        if (tuple.relation === "blockedSubjects")
+            return false;
+        if (tuple.namespace === "McpServer")
+            return answers.server;
+        if (tuple.namespace === "McpTool")
+            return answers.tool;
+        return true;
+    };
+    stubApi(client, "permission", "checkPermission", (params) => Promise.resolve(answer(params) ? exports.PERMISSION_ALLOWED : exports.PERMISSION_DENIED));
+    return stubApi(client, "permission", "batchCheckPermission", (request) => {
+        const tuples = request
+            .batchCheckPermissionBody?.tuples ?? [];
+        return Promise.resolve({ data: { results: tuples.map((tuple) => ({ allowed: answer(tuple) })) } });
+    });
+}
+/** Stub MCP checks so the server and the tool are both allowed. */
+function stubMcpAllowed(client) {
+    return stubMcpDecision(client, { server: true, tool: true });
 }
-/** Stub checkPermission to deny (server-only MCP check). */
+/** Stub MCP checks so the server is denied (No access). */
 function stubMcpServerDenied(client) {
-    ensurePermissionCredential(client);
-    return stubApi(client, "permission", "checkPermission", checkPermissionResponder(exports.PERMISSION_DENIED));
+    return stubMcpDecision(client, { server: false, tool: true });
 }
-/** Stub batchCheckPermission: server allowed, tool denied. */
+/** Stub MCP checks so the server is allowed but the tool is denied (its tier is blocked). */
 function stubMcpToolDenied(client) {
-    ensurePermissionCredential(client);
-    stubApi(client, "permission", "checkPermission", checkPermissionResponder(exports.PERMISSION_ALLOWED));
-    return stubApi(client, "permission", "batchCheckPermission", () => Promise.resolve(exports.BATCH_SERVER_ALLOWED_TOOL_DENIED));
+    return stubMcpDecision(client, { server: true, tool: false });
 }
-/** Stub checkPermission to throw network error (MCP fail-open). */
+/** Stub MCP checks to throw a network error (MCP fail-open). */
 function stubMcpNetworkError(client) {
     ensurePermissionCredential(client);
+    stubApi(client, "permission", "batchCheckPermission", () => Promise.reject(makeNetworkError()));
     return stubApi(client, "permission", "checkPermission", () => Promise.reject(makeNetworkError()));
 }

package/dist/types.d.ts

@@ -32,6 +32,19 @@ export interface PermissionCheck {
         object: string;
         relation: string;
     };
+    /**
+     * The MCP server an `McpServer` or `McpTool` check targets, as the harness
+     * reported it. Agent Security resolves it to the catalog server it checks.
+     */
+    mcp?: McpServerHint;
+}
+export interface McpServerHint {
+    /** The server name as the harness reports it. */
+    server: string;
+    /** The MCP tool name as the server defines it. */
+    tool?: string;
+    /** Hashed server identifiers from {@link mcpServerFingerprints}. */
+    fingerprints?: string[];
 }
 export interface PermissionResult {
     allowed: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ory/argus",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Ory Argus: the core API for building authentication, authorization, and audit into AI agent harness plugins, extensions, and custom integrations",
   "license": "Apache-2.0",
   "homepage": "https://ory.com",
@@ -62,10 +62,10 @@
     "!dist/**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@ory/client": "^1.22.37",
+    "@ory/client": "^1.22.66",
     "@vscode/tree-sitter-wasm": "^0.3.1",
-    "open": "^11.0.0",
-    "web-tree-sitter": "^0.26.11"
+    "open": "^11.0.4",
+    "web-tree-sitter": "^0.27.1"
   },
   "engines": {
     "node": ">=22"