@classytic/arc 2.19.0 → 2.20.0

package/dist/{init-Bqpt1Hxf.mjs → init-YH_nslQR.mjs}

@@ -1,6 +1,8 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { accessSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { accessSync, existsSync, readFileSync } from "node:fs";
 import * as readline from "node:readline";
 import { execSync, spawn } from "node:child_process";
 //#region src/cli/commands/init/templates/adapter.ts
@@ -929,11 +931,32 @@ ${config.adapter === "mongokit" ? `    await mongoose.connection.collection('use
 }
 //#endregion
 //#region src/cli/commands/init/dependency-plan.ts
+/**
+* Single source of truth for scaffolded project dependencies.
+*
+* Two layers keep the scaffold from ever contradicting the arc release
+* that ships it:
+*
+*   1. The static table below — tracks published npm latest, bumped on
+*      release. Serves as the offline fallback.
+*   2. A runtime overlay from arc's OWN package.json (version + declared
+*      peer floors). The 2.20.0 review found the static pins had drifted
+*      (`arc ^2.18.5` + `primitives ^0.6.0` while arc 2.20 peers demand
+*      >=0.9.0 → ERESOLVE on the first `arc init` a new user runs).
+*      Deriving from the installed package.json makes that class of
+*      breakage structurally impossible: the scaffold always pins the
+*      arc version actually running and ranges that satisfy its peers.
+*
+* Used by both `packageJsonTemplate` (declares the deps in the generated
+* `package.json` so `npm install` works without a pre-pass) and
+* `installDependencies` (runs the package manager's `install` against
+* the declared ranges). One source — no drift.
+*/
 const SCAFFOLD_DEP_VERSIONS = {
 	core: {
-		"@classytic/arc": "^2.18.5",
-		"@classytic/primitives": "^0.6.0",
-		"@classytic/repo-core": "^0.6.0",
+		"@classytic/arc": "^2.20.0",
+		"@classytic/primitives": "^0.9.1",
+		"@classytic/repo-core": "^0.7.0",
 		"@fastify/cors": "^11.2.0",
 		"@fastify/helmet": "^13.0.2",
 		"@fastify/rate-limit": "^10.3.0",
@@ -970,6 +993,64 @@ const SCAFFOLD_DEP_VERSIONS = {
 	typesJwt: { "@types/bcryptjs": "^3.0.0" }
 };
 /**
+* Locate arc's own package.json by walking up from the executing file.
+* A path walk (vs `require.resolve('@classytic/arc/package.json')`) works
+* regardless of bundle chunk layout and of package.json not being in the
+* exports map. Returns undefined when not found — callers fall back to
+* the static table.
+*/
+function readOwnPackageJson() {
+	try {
+		let dir = dirname(fileURLToPath(import.meta.url));
+		for (let depth = 0; depth < 6; depth++) {
+			const candidate = join(dir, "package.json");
+			if (existsSync(candidate)) {
+				const parsed = JSON.parse(readFileSync(candidate, "utf8"));
+				if (parsed.name === "@classytic/arc") return parsed;
+			}
+			const parent = dirname(dir);
+			if (parent === dir) break;
+			dir = parent;
+		}
+	} catch {}
+}
+/** First x.y.z triple in a range string, or undefined. */
+function parseFloor(range) {
+	const m = /(\d+)\.(\d+)\.(\d+)/.exec(range);
+	if (!m) return void 0;
+	return [
+		Number(m[1]),
+		Number(m[2]),
+		Number(m[3])
+	];
+}
+function floorLessThan(a, b) {
+	if (a[0] !== b[0]) return a[0] < b[0];
+	if (a[1] !== b[1]) return a[1] < b[1];
+	return a[2] < b[2];
+}
+/**
+* Overlay live truth from arc's own package.json onto the static pins:
+*   - `@classytic/arc` pins the exact running version (`^<version>`).
+*   - Any scaffolded dep that is also an arc peer gets raised to `^<peer
+*     floor>` when the static pin's floor is BELOW the declared peer floor
+*     (never lowered — static pins may legitimately be ahead of the floor).
+*/
+function overlayLiveArcVersions(dependencies) {
+	const own = readOwnPackageJson();
+	if (!own) return;
+	if (own.version && dependencies["@classytic/arc"]) dependencies["@classytic/arc"] = `^${own.version}`;
+	const peers = own.peerDependencies ?? {};
+	for (const [name, staticRange] of Object.entries(dependencies)) {
+		const peerRange = peers[name];
+		if (!peerRange) continue;
+		const peerFloor = parseFloor(peerRange);
+		const staticFloor = parseFloor(staticRange);
+		if (!peerFloor || !staticFloor) continue;
+		if (floorLessThan(staticFloor, peerFloor)) dependencies[name] = `^${peerFloor.join(".")}`;
+	}
+}
+/**
 * Resolve the dependency manifest for a scaffold configuration.
 *
 * Returns sorted records (alphabetical by package name) so the generated
@@ -987,6 +1068,7 @@ function resolveScaffoldDependencies(config) {
 	}
 	if (config.adapter === "mongokit") Object.assign(dependencies, SCAFFOLD_DEP_VERSIONS.adapterMongokit);
 	if (config.typescript) Object.assign(devDependencies, SCAFFOLD_DEP_VERSIONS.devTypescript);
+	overlayLiveArcVersions(dependencies);
 	return {
 		dependencies: sortByKey(dependencies),
 		devDependencies: sortByKey(devDependencies)
@@ -3022,7 +3104,7 @@ async function gatherConfig(options) {
 		output: process.stdout
 	});
 	const question = (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
-	const nonInteractive = !!options.name;
+	const nonInteractive = !!options.name || !process.stdin.isTTY;
 	try {
 		const name = options.name || await question("Project name: ") || "my-arc-app";
 		let adapter = options.adapter || "mongokit";

package/dist/integrations/index.d.mts

@@ -1,7 +1,7 @@
 import { c as WebSocketClient, l as WebSocketMessage, u as WebSocketPluginOptions } from "../websocket-MlYlrYq0.mjs";
 import { EventGatewayOptions } from "./event-gateway.mjs";
 import { JobDefinition, JobDispatchOptions, JobDispatcher, JobMeta, JobsPluginOptions, QueueStats } from "./jobs.mjs";
-import { c as McpAuthResult, d as PromptDefinition, g as ToolDefinition, h as ToolContext, l as McpPluginOptions, m as ToolAnnotations, n as CallToolResult, o as CrudOperation, r as CreateMcpServerConfig, t as BetterAuthHandler, u as McpResourceConfig } from "../types-DpvSF5Hh.mjs";
+import { c as McpAuthResult, d as PromptDefinition, g as ToolDefinition, h as ToolContext, l as McpPluginOptions, m as ToolAnnotations, n as CallToolResult, o as CrudOperation, r as CreateMcpServerConfig, t as BetterAuthHandler, u as McpResourceConfig } from "../types-C9b2HR5W.mjs";
 import { StreamlinePluginOptions, WorkflowLike, WorkflowRunLike } from "./streamline.mjs";
 import { WebhookDeliveryRecord, WebhookManager, WebhookPluginOptions, WebhookStore, WebhookSubscription } from "./webhooks.mjs";
 export type { BetterAuthHandler, CallToolResult, CreateMcpServerConfig, CrudOperation, EventGatewayOptions, JobDefinition, JobDispatchOptions, JobDispatcher, JobMeta, JobsPluginOptions, McpAuthResult, McpPluginOptions, McpResourceConfig, PromptDefinition, QueueStats, StreamlinePluginOptions, ToolAnnotations, ToolContext, ToolDefinition, WebSocketClient, WebSocketMessage, WebSocketPluginOptions, WebhookDeliveryRecord, WebhookManager, WebhookPluginOptions, WebhookStore, WebhookSubscription, WorkflowLike, WorkflowRunLike };

package/dist/integrations/mcp/index.d.mts

@@ -1,7 +1,7 @@
-import { V as ResourceDefinition, bt as IControllerResponse, xt as IRequestContext } from "../../index-CUTG2Cuo.mjs";
+import { V as ResourceDefinition, bt as IControllerResponse, xt as IRequestContext } from "../../index-_--GyzcO.mjs";
 import { i as RequestScope } from "../../types-LNebCoJx.mjs";
 import { c as PermissionCheck } from "../../fields-C7ahdGYf.mjs";
-import { a as CrudDescriptionOverride, c as McpAuthResult, d as PromptDefinition, f as PromptResult, g as ToolDefinition, h as ToolContext, i as CrudDescriptionMeta, l as McpPluginOptions, m as ToolAnnotations, n as CallToolResult, o as CrudOperation, p as SessionEntry, r as CreateMcpServerConfig, s as McpAuthResolver, t as BetterAuthHandler, u as McpResourceConfig } from "../../types-DpvSF5Hh.mjs";
+import { a as CrudDescriptionOverride, c as McpAuthResult, d as PromptDefinition, f as PromptResult, g as ToolDefinition, h as ToolContext, i as CrudDescriptionMeta, l as McpPluginOptions, m as ToolAnnotations, n as CallToolResult, o as CrudOperation, p as SessionEntry, r as CreateMcpServerConfig, s as McpAuthResolver, t as BetterAuthHandler, u as McpResourceConfig } from "../../types-C9b2HR5W.mjs";
 import { ErrorContract } from "@classytic/repo-core/errors";
 import { FastifyPluginAsync } from "fastify";
 import { z } from "zod";

package/dist/integrations/mcp/index.mjs

@@ -1,4 +1,4 @@
-import { a as defaultCrudDescription, c as mcpHandlerAdapter, d as toCallToolResult, f as toCallToolSuccess, h as resolveToolCollisions, i as fieldRulesToZod, l as permissionDeniedResult, m as createMcpServer, n as mcpPlugin, o as resolveCrudDescription, p as buildRequestContext, r as resourceToTools, s as invokeController, t as filterResourcesForMcp, u as toCallToolError } from "../../mcpPlugin-C088Nd-G.mjs";
+import { a as defaultCrudDescription, c as mcpHandlerAdapter, d as toCallToolResult, f as toCallToolSuccess, h as resolveToolCollisions, i as fieldRulesToZod, l as permissionDeniedResult, m as createMcpServer, n as mcpPlugin, o as resolveCrudDescription, p as buildRequestContext, r as resourceToTools, s as invokeController, t as filterResourcesForMcp, u as toCallToolError } from "../../mcpPlugin-CuW6L_uD.mjs";
 //#region src/integrations/mcp/defineTool.ts
 /**
 * Define a type-safe MCP tool.

package/dist/integrations/mcp/testing.d.mts

@@ -1,4 +1,4 @@
-import { c as McpAuthResult, l as McpPluginOptions } from "../../types-DpvSF5Hh.mjs";
+import { c as McpAuthResult, l as McpPluginOptions } from "../../types-C9b2HR5W.mjs";
 
 //#region src/integrations/mcp/testing.d.ts
 interface TestMcpClientOptions {

package/dist/integrations/mcp/testing.mjs

@@ -1,4 +1,4 @@
-import { m as createMcpServer, r as resourceToTools, t as filterResourcesForMcp } from "../../mcpPlugin-C088Nd-G.mjs";
+import { m as createMcpServer, r as resourceToTools, t as filterResourcesForMcp } from "../../mcpPlugin-CuW6L_uD.mjs";
 //#region src/integrations/mcp/testing.ts
 /**
 * @classytic/arc/mcp/testing — MCP Test Utilities

package/dist/integrations/streamline.d.mts

@@ -28,8 +28,12 @@ interface WorkflowLike {
     start(input: unknown, options?: WorkflowStartOptions): Promise<WorkflowRunLike>;
     execute(runId: string): Promise<WorkflowRunLike>;
     resume(runId: string, payload?: unknown): Promise<WorkflowRunLike>;
-    cancel(runId: string): Promise<WorkflowRunLike>;
-    pause?(runId: string): Promise<WorkflowRunLike>;
+    cancel(runId: string, options?: {
+      reason?: string;
+    }): Promise<WorkflowRunLike>;
+    pause?(runId: string, options?: {
+      reason?: string;
+    }): Promise<WorkflowRunLike>;
     rewindTo?(runId: string, stepId: string): Promise<WorkflowRunLike>;
     get(runId: string): Promise<WorkflowRunLike | null>;
     waitFor?(runId: string, options?: {
@@ -39,7 +43,9 @@ interface WorkflowLike {
   };
   start(input: unknown, options?: WorkflowStartOptions): Promise<WorkflowRunLike>;
   resume(runId: string, payload?: unknown): Promise<WorkflowRunLike>;
-  cancel(runId: string): Promise<WorkflowRunLike>;
+  cancel(runId: string, options?: {
+    reason?: string;
+  }): Promise<WorkflowRunLike>;
   get(runId: string): Promise<WorkflowRunLike | null>;
   shutdown?(): void;
   /** Streamline container for event bridging + repository access (streamline >=2.1) */
@@ -114,6 +120,12 @@ interface WorkflowRunLike {
    * toward dead-letter.
    */
   recoveryAttempts?: number;
+  /**
+   * Streamline >= 2.7 — operator-supplied cancellation reason, set when
+   * `cancel(runId, { reason })` was called. Absent on runs cancelled without
+   * a reason or under older streamline. Surfaced so dashboards can show WHY.
+   */
+  cancellationReason?: string;
 }
 /**
  * Streamline >= 2.3.3 dead-letter discriminator. The run.status stays
@@ -148,7 +160,7 @@ interface StreamlinePluginOptions {
    *   - Step events: started, completed, failed, waiting, skipped,
    *     retry-scheduled, compensated
    *   - Workflow lifecycle: started, completed, failed, waiting, resumed,
-   *     cancelled, recovered, retry, compensating
+   *     cancelled, recovered, retry, compensating, paused (>= 2.7)
    *   - Engine telemetry: engine:error, scheduler:error,
    *     scheduler:circuit-open
    *
@@ -231,7 +243,7 @@ interface StreamlinePluginOptions {
  * adds can be bridged by updating this list; arc never breaks just
  * because streamline extended its bus.
  */
-declare const STREAMLINE_BUS_EVENTS: readonly ["step:started", "step:completed", "step:failed", "step:waiting", "step:skipped", "step:retry-scheduled", "step:compensated", "workflow:started", "workflow:completed", "workflow:failed", "workflow:waiting", "workflow:resumed", "workflow:cancelled", "workflow:recovered", "workflow:retry", "workflow:compensating", "engine:error", "scheduler:error", "scheduler:circuit-open"];
+declare const STREAMLINE_BUS_EVENTS: readonly ["step:started", "step:completed", "step:failed", "step:waiting", "step:skipped", "step:retry-scheduled", "step:compensated", "workflow:started", "workflow:completed", "workflow:failed", "workflow:waiting", "workflow:resumed", "workflow:cancelled", "workflow:recovered", "workflow:retry", "workflow:compensating", "workflow:paused", "engine:error", "scheduler:error", "scheduler:circuit-open"];
 /**
  * Non-durable streaming frames from streamline >= 2.6's `ctx.stream(frame)`
  * (LLM tokens, percent-complete, live previews).

package/dist/integrations/streamline.mjs

@@ -45,6 +45,7 @@ const STREAMLINE_BUS_EVENTS = [
 	"workflow:recovered",
 	"workflow:retry",
 	"workflow:compensating",
+	"workflow:paused",
 	"engine:error",
 	"scheduler:error",
 	"scheduler:circuit-open"
@@ -80,7 +81,7 @@ const STREAMLINE_TERMINAL_EVENTS = [
 * emit no further bus events, so the SSE handler sends its snapshot and
 * closes immediately rather than holding a connection open on a dead run.
 */
-const TERMINAL_RUN_STATUSES = new Set([
+const TERMINAL_RUN_STATUSES = /* @__PURE__ */ new Set([
 	"done",
 	"failed",
 	"cancelled"
@@ -130,7 +131,7 @@ const streamlinePluginImpl = async (fastify, options) => {
 				code: "arc.streamline.invalid_body",
 				workflowId: id
 			});
-			const envelopeKeys = new Set([
+			const envelopeKeys = /* @__PURE__ */ new Set([
 				"input",
 				"meta",
 				"idempotencyKey",
@@ -223,11 +224,13 @@ const streamlinePluginImpl = async (fastify, options) => {
 			if (!await checkPerm("cancel", request)) throw new ForbiddenError();
 			const { runId } = request.params;
 			await assertRunVisible(request, runId);
-			const run = await wf.cancel(runId);
+			const { reason: cancelReason } = request.body ?? {};
+			const run = await wf.cancel(runId, cancelReason !== void 0 ? { reason: cancelReason } : void 0);
 			if (bridgeEvents && fastify.events?.publish) try {
 				await fastify.events.publish(`workflow.${id}.cancelled`, {
 					runId: run._id,
-					workflowId: id
+					workflowId: id,
+					...cancelReason !== void 0 ? { reason: cancelReason } : {}
 				});
 			} catch (err) {
 				fastify.log.warn({
@@ -271,7 +274,8 @@ const streamlinePluginImpl = async (fastify, options) => {
 		if (wf.engine.pause) fastify.post(`${routePrefix}/runs/:runId/pause`, { preHandler: authPreHandler }, async (request, _reply) => {
 			const { runId } = request.params;
 			await assertRunVisible(request, runId);
-			return await wf.engine.pause?.(runId);
+			const { reason: pauseReason } = request.body ?? {};
+			return await wf.engine.pause?.(runId, pauseReason !== void 0 ? { reason: pauseReason } : void 0);
 		});
 		if (wf.engine.rewindTo) fastify.post(`${routePrefix}/runs/:runId/rewind`, { preHandler: authPreHandler }, async (request, _reply) => {
 			const { runId } = request.params;

package/dist/{loadResourcesFromEntry-BTlFEx05.mjs → loadResourcesFromEntry-OMCvIEE7.mjs}

@@ -1,4 +1,4 @@
-import { t as ResourceRegistry } from "./ResourceRegistry-5fKZwhK_.mjs";
+import { t as ResourceRegistry } from "./ResourceRegistry-7RnrEWNP.mjs";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 //#region src/cli/utils/loadResourcesFromEntry.ts

package/dist/{mcpPlugin-C088Nd-G.mjs → mcpPlugin-CuW6L_uD.mjs}

@@ -1,14 +1,15 @@
 import { p as isArcError, t as ArcError } from "./errors-DkO8Nk6-.mjs";
-import { t as BaseController } from "./BaseController-Dy6EQHjM.mjs";
-import { N as normalizePermissionResult } from "./permissions-BPB1xqGf.mjs";
-import { i as resolvePipelineSteps, t as resolveActionPermission } from "./actionPermissions-D7NGwcAR.mjs";
+import { c as getOrgId, g as getUserId } from "./types-bHblZ9YN.mjs";
+import { t as BaseController } from "./BaseController-D-MHZ27_.mjs";
+import { N as normalizePermissionResult } from "./permissions-CgbOLJZG.mjs";
 import { t as executePipeline } from "./pipe-BOLmGIxa.mjs";
-import { t as pluralize } from "./pluralize-DccFV9R7.mjs";
-import { i as shouldRejectAdditionalProperties, r as schemaIRToZodShape, t as normalizeSchemaIR } from "./schemaIR-D1MJwqmp.mjs";
-import { n as validateAggregations } from "./validate-CRcaWzp2.mjs";
-import { n as executeAggregation } from "./buildHandler-B0qvAguf.mjs";
-import { isHttpError, toErrorContract } from "@classytic/repo-core/errors";
+import { i as resolvePipelineSteps, t as resolveActionPermission } from "./actionPermissions-C9RMiIpc.mjs";
+import { n as validateAggregations } from "./validate-C2mGgSXg.mjs";
+import { n as executeAggregation } from "./buildHandler-D_2ULWxZ.mjs";
+import { t as pluralize } from "./pluralize-BhrgwZb9.mjs";
+import { r as shouldRejectAdditionalProperties, t as normalizeSchemaIR } from "./schemaIR-ajetw3Fv.mjs";
 import { createHash, randomUUID } from "node:crypto";
+import { isHttpError, toErrorContract } from "@classytic/repo-core/errors";
 import fp from "fastify-plugin";
 import { z } from "zod";
 //#region src/integrations/mcp/createMcpServer.ts
@@ -264,7 +265,7 @@ function buildRequestContext(input, auth, operation, policyFilters, scopeOverrid
 * them explicitly here rather than asking the parser at runtime — Arc must
 * not import MongoKit internals just to know what an operator looks like.
 */
-const OPERATOR_SUFFIXES = new Set([
+const OPERATOR_SUFFIXES = /* @__PURE__ */ new Set([
 	"eq",
 	"ne",
 	"gt",
@@ -671,12 +672,20 @@ function resolveCrudDescription(override, meta) {
 * // shape = { name: z.string(), price: z.number() }
 * ```
 */
+/**
+* Projection (`select`) field — reused by the list shape AND the single-entity
+* `get` shape. The controller honors `select` on `getById` identically to list
+* (both flow through `QueryResolver.resolve`), so exposing it on `get` gives an
+* MCP agent the same field-projection it already has on list.
+*/
+const PROJECTION_FIELD = z.string().optional().describe("Comma-separated field list to project (e.g. 'name,price'). Prefix with '-' to exclude (e.g. '-description').");
 const PAGINATION_SHAPE = {
-	page: z.number().int().min(1).optional().describe("Page number (1-based)"),
+	page: z.number().int().min(1).optional().describe("Page number (1-based). Ignored when `cursor` is set."),
 	limit: z.number().int().min(1).max(100).optional().describe("Items per page (max 100)"),
+	cursor: z.string().optional().describe("Opaque keyset cursor from a previous page's `next`. Pass it to fetch the following page; when set, `page` is ignored (cursor/keyset pagination — stable under concurrent inserts)."),
 	sort: z.string().optional().describe("Sort field, prefix with - for descending"),
 	search: z.string().optional().describe("Full-text search query"),
-	select: z.string().optional().describe("Comma-separated field list to project (e.g. 'name,price'). Prefix with '-' to exclude (e.g. '-description')."),
+	select: PROJECTION_FIELD,
 	populate: z.string().optional().describe("Comma-separated relation paths to hydrate (e.g. 'supplier,category'). Follows Mongoose populate syntax when the adapter is MongoKit.")
 };
 /**
@@ -688,7 +697,7 @@ function fieldRulesToZod(fieldRules, options = {}) {
 	const { mode = "create", hiddenFields = [], readonlyFields = [], extraHideFields = [] } = options;
 	if (mode === "list") return buildListShape(fieldRules, options);
 	if (!fieldRules) return {};
-	const allHidden = new Set([...hiddenFields, ...extraHideFields]);
+	const allHidden = /* @__PURE__ */ new Set([...hiddenFields, ...extraHideFields]);
 	const allReadonly = new Set(readonlyFields);
 	const shape = {};
 	for (const [name, rule] of Object.entries(fieldRules)) {
@@ -738,7 +747,7 @@ function typeToZod(type) {
 	}
 }
 /** Operators that apply to numeric/date fields */
-const COMPARISON_OPS = new Set([
+const COMPARISON_OPS = /* @__PURE__ */ new Set([
 	"gt",
 	"gte",
 	"lt",
@@ -761,7 +770,7 @@ function opDescription(op, fieldName) {
 /** Build list/query shape with filterable fields, operators, and pagination */
 function buildListShape(fieldRules, options) {
 	const { filterableFields = [], hiddenFields = [], extraHideFields = [], allowedOperators } = options;
-	const allHidden = new Set([...hiddenFields, ...extraHideFields]);
+	const allHidden = /* @__PURE__ */ new Set([...hiddenFields, ...extraHideFields]);
 	const shape = { ...PAGINATION_SHAPE };
 	if (!fieldRules) return shape;
 	for (const name of filterableFields) {
@@ -917,6 +926,61 @@ async function forwardResponse(reply, response) {
 	reply.send(await response.text());
 }
 //#endregion
+//#region src/core/schemaIRZod.ts
+/**
+* Schema IR → Zod adapter — the MCP-facing half of [schemaIR.ts](./schemaIR.ts).
+*
+* Lives in its OWN module (not schemaIR.ts) because it is the only part that
+* needs zod at runtime. schemaIR.ts is statically imported by
+* `createActionRouter`, which every actions-bearing resource loads at boot —
+* a top-level `import { z } from "zod"` there made zod a de-facto REQUIRED
+* dependency for any host using `actions:`, despite zod being an optional
+* peer (boot crash when absent, even with plain-JSON-Schema action bodies
+* and no MCP). Only MCP code imports this module, and the MCP integration
+* already hard-requires zod (the SDK does), so the top-level import is
+* correct HERE and a bug THERE.
+*/
+/**
+* Emit a flat Zod shape from the IR. The MCP SDK wraps the returned record
+* in `z.object()` internally, so we return the bare shape (same contract
+* as `ToolDefinition.inputSchema`).
+*
+* `additionalProperties: false` is honored at the MCP handler layer rather
+* than baked into the Zod shape — the SDK's input validation happens before
+* the handler runs, and flat shapes can't express `.strict()` mode.
+* `shouldRejectAdditionalProperties(ir)` (schemaIR.ts) returns the flag so
+* callers can gate their handler on it.
+*/
+function schemaIRToZodShape(ir) {
+	const requiredSet = new Set(ir.required);
+	const result = {};
+	for (const [name, prop] of Object.entries(ir.properties)) {
+		const desc = typeof prop.description === "string" && prop.description.length > 0 ? prop.description : name;
+		const base = jsonSchemaPropToZod(prop);
+		result[name] = requiredSet.has(name) ? base.describe(desc) : base.optional().describe(desc);
+	}
+	return result;
+}
+/**
+* Convert a single JSON Schema property to a Zod type. Understands enum,
+* numeric/integer/boolean/array/object, and falls back to string for
+* unrecognized types (matches MCP's "strings for opaque fields" convention).
+*
+* Internal — use `schemaIRToZodShape` which wires this up with required/optional
+* + description handling.
+*/
+function jsonSchemaPropToZod(schema) {
+	if (Array.isArray(schema.enum) && schema.enum.length > 0) return z.enum(schema.enum);
+	switch (typeof schema.type === "string" ? schema.type : "string") {
+		case "number":
+		case "integer": return z.number();
+		case "boolean": return z.boolean();
+		case "array": return z.array(z.unknown());
+		case "object": return z.record(z.string(), z.unknown());
+		default: return z.string();
+	}
+}
+//#endregion
 //#region src/integrations/mcp/action-tools.ts
 /**
 * Convert an action's `schema` field into a Zod shape for MCP input.
@@ -942,7 +1006,7 @@ function convertActionSchemaToZod(raw) {
 */
 function createActionToolHandler(actionName, handler, permissions, resourceName, _resourcePermissions, rawSchema, idLess = false) {
 	const ir = rawSchema ? normalizeSchemaIR(rawSchema) : void 0;
-	const allowedKeys = (ir ? shouldRejectAdditionalProperties(ir) : false) && ir ? new Set([...idLess ? [] : ["id"], ...Object.keys(ir.properties)]) : void 0;
+	const allowedKeys = (ir ? shouldRejectAdditionalProperties(ir) : false) && ir ? /* @__PURE__ */ new Set([...idLess ? [] : ["id"], ...Object.keys(ir.properties)]) : void 0;
 	return async (input, ctx) => {
 		const session = ctx.session;
 		if (allowedKeys) {
@@ -1239,7 +1303,10 @@ function buildInputSchema(op, fieldRules, opts) {
 			mode: "list",
 			...opts
 		});
-		case "get": return getIdShape();
+		case "get": return {
+			...getIdShape(),
+			select: PROJECTION_FIELD
+		};
 		case "create":
 			if (!fieldRules && opts.adapterBodies?.createBody) {
 				const shape = jsonSchemaToZodShape(opts.adapterBodies.createBody, "create");
@@ -1424,14 +1491,17 @@ function createCustomRouteHandler(route, controller, hasId, options) {
 			const reqCtx = buildRequestContext(input, session, operationKindForRoute(route.method, hasId), permResult?.filters, permResult?.scope);
 			if (typeof route.handler === "function") {
 				const fn = route.handler;
-				if (pipelineSteps.length > 0) return toCallToolResult(await executePipeline(pipelineSteps, {
-					...reqCtx,
-					resource: resourceName,
-					operation: operationName
-				}, async (ctx) => {
-					const raw = await fn(ctx);
-					return raw !== null && typeof raw === "object" && "data" in raw ? raw : { data: raw };
-				}, operationName));
+				if (pipelineSteps.length > 0) {
+					const pipeCtx = {
+						...reqCtx,
+						resource: resourceName,
+						operation: operationName
+					};
+					return toCallToolResult(await executePipeline(pipelineSteps, pipeCtx, async (ctx) => {
+						const raw = await fn(ctx);
+						return raw !== null && typeof raw === "object" && "data" in raw ? raw : { data: raw };
+					}, operationName));
+				}
 				const out = await fn(reqCtx);
 				return toCallToolResult(out !== null && typeof out === "object" && "data" in out ? out : { data: out });
 			}
@@ -1452,13 +1522,7 @@ function createCustomRouteHandler(route, controller, hasId, options) {
 			};
 			return toCallToolResult(await method(reqCtx));
 		} catch (err) {
-			return {
-				content: [{
-					type: "text",
-					text: `Error: ${err instanceof Error ? err.message : String(err)}`
-				}],
-				isError: true
-			};
+			return toCallToolError(err instanceof Error ? err : new Error(String(err)));
 		}
 	};
 }
@@ -1472,13 +1536,7 @@ function createMcpHandlerPassthrough(mcpHandler) {
 		try {
 			return await mcpHandler(input);
 		} catch (err) {
-			return {
-				content: [{
-					type: "text",
-					text: `Error: ${err instanceof Error ? err.message : String(err)}`
-				}],
-				isError: true
-			};
+			return toCallToolError(err instanceof Error ? err : new Error(String(err)));
 		}
 	};
 }
@@ -1655,14 +1713,18 @@ function resourceToTools(resource, config = {}) {
 	if (resource.aggregations && Object.keys(resource.aggregations).length > 0) {
 		const repoForAgg = resource.controller?.repository;
 		const buildOptionsFromSession = (session) => {
-			const s = session;
+			const auth = session ?? null;
+			const scope = buildScope(auth);
 			const out = {};
-			const orgId = s?.scope?.organizationId;
+			const orgId = getOrgId(scope);
 			if (orgId) out.organizationId = orgId;
-			const userId = s?.scope?.userId ?? s?.user?.id;
+			const userId = getUserId(scope);
 			if (userId) out.userId = userId;
-			if (s?.user) out.user = s.user;
-			if (s?.requestId) out.requestId = s.requestId;
+			if (auth?.userId) out.user = {
+				id: auth.userId,
+				roles: auth.roles ?? [],
+				orgRoles: auth.orgRoles ?? []
+			};
 			return out;
 		};
 		tools.push(...buildAggregationTools({
@@ -1713,13 +1775,29 @@ function registerSchemaResources(server, resources, overrides) {
 				name: r.name,
 				displayName: r.displayName,
 				operations: getOps(r, overrides?.[r.name]?.operations),
-				fields: r.schemaOptions?.fieldRules ?? {},
+				fields: visibleFieldRules(r.schemaOptions?.fieldRules),
 				filterableFields: schemaOpts?.filterableFields ?? [],
 				presets: r._appliedPresets ?? []
 			}, null, 2)
 		}] }));
 	}
 }
+/**
+* Strip `hidden: true` / `systemManaged: true` entries before serializing —
+* the schema-discovery resource must not re-expose exactly what
+* `fieldRulesToZod` strips from tool input schemas (tenant keys, internal
+* scoring fields, ...). Same visibility rule, one discovery surface.
+*/
+function visibleFieldRules(fieldRules) {
+	if (!fieldRules) return {};
+	const out = {};
+	for (const [name, rule] of Object.entries(fieldRules)) {
+		const flags = rule ?? {};
+		if (flags.hidden === true || flags.systemManaged === true) continue;
+		out[name] = rule;
+	}
+	return out;
+}
 function getOps(r, override) {
 	let ops = [
 		"list",
@@ -1901,10 +1979,16 @@ const mcpPluginImpl = async (fastify, options) => {
 		const more = allTools.length > 5 ? ` (+${allTools.length - 5} more)` : "";
 		fastify.log.warn(`[arc/mcp] MCP server registered at "${prefix}" with auth DISABLED. Anyone who can reach this URL has full access to ${allTools.length} tools across ${enabledResources.length} resources: ${toolList}${more}. Pass \`auth: betterAuthInstance\` or \`auth: async (headers) => ...\` to gate access. Safe only for stdio transports, local development, or explicitly-public read-only APIs.`);
 	}
-	fastify.get(`${prefix}/health`, async (_request, reply) => {
-		reply.send({
+	fastify.get(`${prefix}/health`, async (request, reply) => {
+		const liveness = {
 			status: "ok",
-			mode: stateful ? "stateful" : "stateless",
+			mode: stateful ? "stateful" : "stateless"
+		};
+		if (options.auth) {
+			if (!await resolveMcpAuth(request.headers, options.auth)) return reply.send(liveness);
+		}
+		reply.send({
+			...liveness,
 			tools: allTools.length,
 			resources: enabledResources.length,
 			toolNames: allTools.map((t) => t.name),
@@ -1991,9 +2075,22 @@ function registerStatelessRoutes(fastify, prefix, options, createServer, Transpo
 	});
 }
 function registerStatefulRoutes(fastify, prefix, options, cache, createServer, Transport) {
-	/** Check if the requesting principal owns the session */
+	/**
+	* Check if the requesting principal owns the session. FAIL-CLOSED:
+	*
+	*   - `authResult === null` (failed/absent credentials) NEVER owns a
+	*     session — pre-2.20 this returned `true`, so an unauthenticated
+	*     caller with a leaked `Mcp-Session-Id` could attach to the victim's
+	*     SSE stream, terminate the session, and (via the auth-snapshot
+	*     refresh) wipe `entry.auth` to null — after which ANY principal
+	*     passed ownership and took over the session.
+	*   - `entry.auth === null` under configured auth is equally a deny:
+	*     POST 401s before creating a session, so an auth-mode session always
+	*     has an owner snapshot; a missing one means corrupted state.
+	*/
 	function isSessionOwner(entry, authResult) {
-		if (!options.auth || !entry.auth || !authResult) return true;
+		if (!options.auth) return true;
+		if (!authResult || !entry.auth) return false;
 		const prev = entry.auth;
 		return prev.userId === authResult.userId && prev.organizationId === authResult.organizationId && prev.clientId === authResult.clientId;
 	}
@@ -2053,6 +2150,7 @@ function registerStatefulRoutes(fastify, prefix, options, cache, createServer, T
 		if (!entry) return reply.code(403).send({ error: "Unauthorized" });
 		if (options.auth) {
 			const authResult = await resolveMcpAuth(request.headers, options.auth);
+			if (!authResult) return reply.code(401).send({ error: "Unauthorized" });
 			if (!isSessionOwner(entry, authResult)) return reply.code(403).send({ error: "Unauthorized" });
 			entry.auth = authResult;
 			entry.authRef.current = authResult;
@@ -2067,6 +2165,7 @@ function registerStatefulRoutes(fastify, prefix, options, cache, createServer, T
 		if (!entry) return reply.code(204).send();
 		if (options.auth) {
 			const authResult = await resolveMcpAuth(request.headers, options.auth);
+			if (!authResult) return reply.code(401).send({ error: "Unauthorized" });
 			if (!isSessionOwner(entry, authResult)) return reply.code(403).send({ error: "Unauthorized" });
 			entry.auth = authResult;
 			entry.authRef.current = authResult;

package/dist/middleware/index.d.mts

@@ -1,4 +1,4 @@
-import { I as MiddlewareHandler, L as RequestWithExtras, Q as MiddlewareConfig } from "../index-CUTG2Cuo.mjs";
+import { I as MiddlewareHandler, L as RequestWithExtras, Q as MiddlewareConfig } from "../index-_--GyzcO.mjs";
 import { RouteHandlerMethod } from "fastify";
 
 //#region src/middleware/middleware.d.ts

package/dist/middleware/index.mjs

@@ -1,4 +1,4 @@
-import { t as CRUD_OPERATIONS } from "../constants-gaEeMlz-.mjs";
+import { t as CRUD_OPERATIONS } from "../constants-DNre0wRg.mjs";
 import { t as multipartBody } from "../multipartBody-CHEQSZ6G.mjs";
 //#region src/middleware/middleware.ts
 /**