@cosmicdrift/kumiko-framework 0.265.0 → 0.268.0

package/src/pipeline/__tests__/dispatcher-utils.test.ts

@@ -51,6 +51,23 @@ describe("dispatcherSpanAttributes", () => {
       "kumiko.feature": "feat",
     });
   });
+
+  test("includes kumiko.user_origin when the user has one", () => {
+    const user = {
+      id: "u1",
+      tenantId: "tenant-1",
+      roles: [],
+      origin: "member-resolution" as const,
+    };
+    const attrs = dispatcherSpanAttributes("feat:query:task:list", "query", user, "feat");
+    expect(attrs["kumiko.user_origin"]).toBe("member-resolution");
+  });
+
+  test("omits kumiko.user_origin when the user has none", () => {
+    const user = createSystemUser("tenant-1");
+    const attrs = dispatcherSpanAttributes("feat:query:task:list", "query", user, "feat");
+    expect(attrs["kumiko.user_origin"]).toBeUndefined();
+  });
 });
 
 describe("prefixValidationPath", () => {

package/src/pipeline/__tests__/escape-hatch.integration.test.ts

@@ -19,7 +19,6 @@ const globalStoreTable = defineUnmanagedTable({
       primaryKey: true,
       defaultSql: "gen_random_uuid()",
     },
-    { name: "tenant_id", pgType: "uuid", notNull: true },
     { name: "note", pgType: "text", notNull: true },
   ],
 });
@@ -36,7 +35,6 @@ const escapeHatchFeature = defineFeature("escape-hatch-probe", (r) => {
     escapeHatch: { reason: "fw#2855 integration test — declared cross-tenant write" },
     handler: async (event, ctx) => {
       const row = await ctx.db.global(globalStoreTable).insertOne<{ id: string }>({
-        tenantId: event.user.tenantId,
         note: event.payload.note,
       });
       return { isSuccess: true as const, data: row };
@@ -49,7 +47,6 @@ const escapeHatchFeature = defineFeature("escape-hatch-probe", (r) => {
     access: { roles: ["User"] },
     handler: async (event, ctx) => {
       const row = await ctx.db.global(globalStoreTable).insertOne<{ id: string }>({
-        tenantId: event.user.tenantId,
         note: event.payload.note,
       });
       return { isSuccess: true as const, data: row };

package/src/pipeline/__tests__/system-identity-switch.test.ts

@@ -1,4 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
+import type { DbRunner } from "../../db/connection";
+import { createTenantDb, type TenantDb } from "../../db/tenant-db";
 import { createSystemUser, SYSTEM_ROLE, SYSTEM_USER_ID } from "../../engine";
 import type { SessionUser } from "../../engine/types";
 import type { TenantId } from "../../engine/types/identifiers";
@@ -8,7 +10,8 @@ import {
   type IdentitySwitch,
   isSystemIdentity,
   isSystemIdentitySwitchAllowed,
-  withHookIdentitySwitchGrant,
+  type WriteAsFn,
+  withHookEscapeHatchGrant,
 } from "../system-identity-switch";
 
 const TENANT = "00000000-0000-4000-8000-00000000ab01" as TenantId;
@@ -120,18 +123,14 @@ describe("createGatedIdentitySwitch", () => {
   });
 });
 
-describe("withHookIdentitySwitchGrant", () => {
+describe("withHookEscapeHatchGrant", () => {
   test("hook without escapeHatch does NOT inherit the handler's SYSTEM grant", async () => {
     const { ungated } = makeUngated();
     // Simulates dispatch-shared.ts's buildHandlerContext for a handler that
     // itself declared escapeHatch / is systemScope (allowSystemIdentity=true).
     const handlerCtx = { ...createGatedIdentitySwitch('handler "outer"', true, ungated) };
 
-    const hookCtx = withHookIdentitySwitchGrant(
-      handlerCtx,
-      'postSave hook of feature "f"',
-      undefined,
-    );
+    const hookCtx = withHookEscapeHatchGrant(handlerCtx, 'postSave hook of feature "f"', undefined);
 
     await expect(hookCtx.queryAs(systemUserById, "q", {})).rejects.toBeInstanceOf(
       AccessDeniedError,
@@ -143,7 +142,7 @@ describe("withHookIdentitySwitchGrant", () => {
     // Handler itself has NO escapeHatch (allowSystemIdentity=false).
     const handlerCtx = { ...createGatedIdentitySwitch('handler "outer"', false, ungated) };
 
-    const hookCtx = withHookIdentitySwitchGrant(handlerCtx, 'postSave hook of feature "f"', {
+    const hookCtx = withHookEscapeHatchGrant(handlerCtx, 'postSave hook of feature "f"', {
       reason: "test hook needs SYSTEM",
     });
 
@@ -155,7 +154,7 @@ describe("withHookIdentitySwitchGrant", () => {
   test("a non-system asUser is always allowed through the hook's own gate", async () => {
     const { ungated, queryAsMock } = makeUngated();
     const handlerCtx = { ...createGatedIdentitySwitch('handler "outer"', false, ungated) };
-    const hookCtx = withHookIdentitySwitchGrant(handlerCtx, "hook", undefined);
+    const hookCtx = withHookEscapeHatchGrant(handlerCtx, "hook", undefined);
 
     await hookCtx.queryAs(normalUser, "q", {});
     expect(queryAsMock).toHaveBeenCalledWith(normalUser, "q", {});
@@ -166,30 +165,76 @@ describe("withHookIdentitySwitchGrant", () => {
     const handlerCtx = { ...createGatedIdentitySwitch('handler "outer"', true, ungated), extra: 1 };
     const spread = { ...handlerCtx };
 
-    const hookCtx = withHookIdentitySwitchGrant(spread, "hook", { reason: "needs system" });
+    const hookCtx = withHookEscapeHatchGrant(spread, "hook", { reason: "needs system" });
     await hookCtx.queryAs(systemUserById, "q", {});
 
     expect(queryAsMock).toHaveBeenCalledWith(systemUserById, "q", {});
   });
 
-  test("a context without queryAs/writeAs is returned unchanged", () => {
-    const plainContext = { db: {} };
-    const result = withHookIdentitySwitchGrant(plainContext, "hook", { reason: "x" });
+  test("a context without queryAs/writeAs/db/dbOutsideTransaction is returned unchanged", () => {
+    const plainContext = { unrelated: 1 };
+    const result = withHookEscapeHatchGrant(plainContext, "hook", { reason: "x" });
     expect(result).toBe(plainContext);
   });
 
+  test("a deny-stubbed writeAs is not revived through a sibling queryAs's registered ungated pair", async () => {
+    // Like a member-resolution ctx: registered gated queryAs next to an unregistered deny-stub writeAs.
+    const { ungated, writeAsMock } = makeUngated();
+    const gatedIdentitySwitch = createGatedIdentitySwitch('handler "outer"', true, ungated);
+    const denyStubWriteAs: WriteAsFn = async () => {
+      throw new AccessDeniedError({
+        message: "read-only",
+        details: { reason: "member_resolution_read_only" },
+      });
+    };
+    const handlerCtx = { queryAs: gatedIdentitySwitch.queryAs, writeAs: denyStubWriteAs };
+
+    const hookCtx = withHookEscapeHatchGrant(handlerCtx, "hook", {
+      reason: "test hook needs SYSTEM",
+    });
+
+    await expect(hookCtx.writeAs(systemUserById, "w", {})).rejects.toBeInstanceOf(
+      AccessDeniedError,
+    );
+    expect(writeAsMock).not.toHaveBeenCalled();
+  });
+
   test("an ungated context not built by the dispatcher bridge fails closed (unit-test stub)", async () => {
     const stubQueryAs = mock(async (_user: SessionUser, _qn: string, _payload: unknown) => "ok");
     const stubContext = { queryAs: stubQueryAs };
 
-    const hookCtx = withHookIdentitySwitchGrant(stubContext, "hook", undefined);
+    const hookCtx = withHookEscapeHatchGrant(stubContext, "hook", undefined);
     await expect(hookCtx.queryAs(systemUserById, "q", {})).rejects.toBeInstanceOf(
       AccessDeniedError,
     );
     expect(stubQueryAs).not.toHaveBeenCalled();
 
-    const allowedHookCtx = withHookIdentitySwitchGrant(stubContext, "hook", { reason: "x" });
+    const allowedHookCtx = withHookEscapeHatchGrant(stubContext, "hook", { reason: "x" });
     await allowedHookCtx.queryAs(systemUserById, "q", {});
     expect(stubQueryAs).toHaveBeenCalledWith(systemUserById, "q", {});
   });
+
+  test("hook re-gates ctx.db.unsafeRaw() independently of the handler's own grant", () => {
+    const rawDb: DbRunner = {
+      unsafe: async () => [],
+      begin: async () => {
+        throw new Error("begin not used in this test");
+      },
+    } as DbRunner;
+    // Simulates buildHandlerContext granting the HANDLER its own unsafeRaw escapeHatch.
+    const handlerDb = createTenantDb(rawDb, TENANT, "tenant", undefined, undefined, undefined, {
+      unsafeRaw: { reason: "handler's own grant" },
+    });
+    const handlerCtx = { db: handlerDb };
+
+    const hookCtxWithoutEscapeHatch = withHookEscapeHatchGrant(handlerCtx, "hook", undefined) as {
+      db: TenantDb;
+    };
+    expect(() => hookCtxWithoutEscapeHatch.db.unsafeRaw("test reason")).toThrow(AccessDeniedError);
+
+    const hookCtxWithEscapeHatch = withHookEscapeHatchGrant(handlerCtx, "hook", {
+      reason: "hook's own grant",
+    }) as { db: TenantDb };
+    expect(hookCtxWithEscapeHatch.db.unsafeRaw("test reason")).toBe(rawDb);
+  });
 });

package/src/pipeline/__tests__/unsafe-raw-escape-hatch.integration.test.ts

@@ -0,0 +1,103 @@
+// fw#2858 — a write/query handler's `escapeHatch` also gates ctx.db.unsafeRaw(reason):
+// WITH it the raw query succeeds, WITHOUT it the same handler rejects with access_denied.
+// Real HTTP calls + setupTestStack — never createTestDispatcher. Modelled exactly on
+// escape-hatch.integration.test.ts (fw#2855).
+
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { z } from "zod";
+import { executeRawQuery } from "../../db/queries/raw-sql";
+import { defineFeature } from "../../engine";
+import { createTestUser, setupTestStack, type TestStack } from "../../stack";
+
+const unsafeRawFeature = defineFeature("unsafe-raw-probe", (r) => {
+  r.writeHandler({
+    name: "write-with-hatch",
+    schema: z.object({}),
+    access: { roles: ["User"] },
+    escapeHatch: { reason: "fw#2858 integration test — declared unsafeRaw write" },
+    handler: async (_event, ctx) => {
+      const runner = ctx.db.unsafeRaw("fw#2858 integration test — declared unsafeRaw write");
+      const rows = await executeRawQuery<{ one: number }>(runner, "SELECT 1 AS one");
+      return { isSuccess: true as const, data: { one: rows[0]?.one } };
+    },
+  });
+
+  r.writeHandler({
+    name: "write-without-hatch",
+    schema: z.object({}),
+    access: { roles: ["User"] },
+    handler: async (_event, ctx) => {
+      const runner = ctx.db.unsafeRaw("no escapeHatch declared — must throw before this runs");
+      const rows = await executeRawQuery<{ one: number }>(runner, "SELECT 1 AS one");
+      return { isSuccess: true as const, data: { one: rows[0]?.one } };
+    },
+  });
+
+  r.queryHandler({
+    name: "query-with-hatch",
+    schema: z.object({}),
+    access: { roles: ["User"] },
+    escapeHatch: { reason: "fw#2858 integration test — declared unsafeRaw query" },
+    handler: async (_query, ctx) => {
+      const runner = ctx.db.unsafeRaw("fw#2858 integration test — declared unsafeRaw query");
+      const rows = await executeRawQuery<{ one: number }>(runner, "SELECT 1 AS one");
+      return { one: rows[0]?.one };
+    },
+  });
+
+  r.queryHandler({
+    name: "query-without-hatch",
+    schema: z.object({}),
+    access: { roles: ["User"] },
+    handler: async (_query, ctx) => {
+      const runner = ctx.db.unsafeRaw("no escapeHatch declared — must throw before this runs");
+      const rows = await executeRawQuery<{ one: number }>(runner, "SELECT 1 AS one");
+      return { one: rows[0]?.one };
+    },
+  });
+});
+
+let stack: TestStack;
+const user = createTestUser({
+  id: 92,
+  tenantId: "11111111-0000-4000-8000-000000000092",
+  roles: ["User"],
+});
+
+beforeAll(async () => {
+  stack = await setupTestStack({ features: [unsafeRawFeature] });
+});
+
+afterAll(async () => {
+  await stack.cleanup();
+});
+
+describe("write/query handler escapeHatch gates ctx.db.unsafeRaw()", () => {
+  test("write WITH escapeHatch: unsafeRaw succeeds", async () => {
+    const result = await stack.http.writeOk<{ one: number }>(
+      "unsafe-raw-probe:write:write-with-hatch",
+      {},
+      user,
+    );
+    expect(result.one).toBe(1);
+  });
+
+  test("write WITHOUT escapeHatch: unsafeRaw fails with access_denied", async () => {
+    const err = await stack.http.writeErr("unsafe-raw-probe:write:write-without-hatch", {}, user);
+    expect(err.code).toBe("access_denied");
+  });
+
+  test("query WITH escapeHatch: unsafeRaw succeeds", async () => {
+    const result = await stack.http.queryOk<{ one: number }>(
+      "unsafe-raw-probe:query:query-with-hatch",
+      {},
+      user,
+    );
+    expect(result.one).toBe(1);
+  });
+
+  test("query WITHOUT escapeHatch: unsafeRaw fails with access_denied", async () => {
+    const err = await stack.http.queryErr("unsafe-raw-probe:query:query-without-hatch", {}, user);
+    expect(err.code).toBe("access_denied");
+  });
+});

package/src/pipeline/active-membership.ts

@@ -76,7 +76,9 @@ async function findMembership(
   return rawMemberships.find((m) => m.tenantId === tenantId);
 }
 
-function resolvePrincipalPlugin(registry: Registry): PrincipalStatusPlugin {
+// Exported so member-reader.ts (ctx.queryAsMember) can reach the registered
+// PrincipalStatusPlugin's resolveProfile without duplicating this lookup.
+export function resolvePrincipalPlugin(registry: Registry): PrincipalStatusPlugin {
   const usages = registry.getExtensionUsages(EXT_PRINCIPAL_STATUS);
   if (usages.length !== 1) {
     throw new InternalError({

package/src/pipeline/dispatch-shared.ts

@@ -16,13 +16,16 @@ import type {
   FetchForWritingArgs,
   HandlerContext,
   JobRunnerRef,
+  MemberReader,
   Registry,
   SessionUser,
   WriteResult,
 } from "../engine/types";
 import type { TenantId } from "../engine/types/identifiers";
 import {
+  AccessDeniedError,
   FeatureDisabledError,
+  FrameworkReasons,
   InternalError,
   VersionConflictError,
   type WriteErrorInfo,
@@ -76,7 +79,12 @@ import {
 } from "./dispatcher-utils";
 import type { IdempotencyGuard } from "./idempotency";
 import type { LifecycleHooks } from "./lifecycle-pipeline";
-import { createGatedIdentitySwitch, systemIdentitySwitchDenied } from "./system-identity-switch";
+import { createMemberReaderFn } from "./member-reader";
+import {
+  createGatedIdentitySwitch,
+  createGatedMemberReader,
+  systemIdentitySwitchDenied,
+} from "./system-identity-switch";
 import type { TenantTimezoneCache } from "./tenant-timezone-cache";
 
 // Framework/pipeline stays bundled-features-free, so this can't import the
@@ -151,6 +159,8 @@ async function appendDomainEvent(
   tx: DbTx | undefined,
   callerFeature: string | undefined,
 ): Promise<void> {
+  // Sink behind every append surface, so a resolved member stays read-only even via fetchForWriting handles.
+  if (user.origin === "member-resolution") throw memberResolutionReadOnlyDenied();
   const { registry } = ctx;
   const dbSource = resolveDbSource(ctx, tx);
   if (!dbSource) {
@@ -196,6 +206,59 @@ function createSystemScopedDbGuard(
   });
 }
 
+export function memberResolutionReadOnlyDenied(): AccessDeniedError {
+  return new AccessDeniedError({
+    message: "a resolved member principal (ctx.queryAsMember) cannot write — read-only",
+    details: { reason: FrameworkReasons.memberResolutionReadOnly },
+  });
+}
+
+async function denyMemberResolutionWrite(): Promise<never> {
+  throw memberResolutionReadOnlyDenied();
+}
+
+// JobRunnerRef's declared type only carries handleEvent, but callers
+// routinely bracket-access a fuller runner — a Proxy denies ANY property read.
+function denyingJobRunnerProxy(): JobRunnerRef {
+  return new Proxy({} as JobRunnerRef, {
+    get() {
+      throw memberResolutionReadOnlyDenied();
+    },
+  });
+}
+
+// Every write/side-effect surface throws, so "no writeAsMember" holds even
+// if a handler tries ctx.write directly on a resolved member principal.
+function applyMemberResolutionReadOnly(handlerContext: HandlerContext): HandlerContext {
+  return {
+    ...handlerContext,
+    // `db` itself stays open — same access the member's own HTTP request has;
+    // raw ctx.db writes inside a queried handler are not blocked by this.
+    dbOutsideTransaction: undefined,
+    write: denyMemberResolutionWrite,
+    writeAs: denyMemberResolutionWrite,
+    appendEvent: denyMemberResolutionWrite as AppendEventFn, // @cast-boundary engine-bridge
+    unsafeAppendEvent: denyMemberResolutionWrite,
+    tryAppendEvent: denyMemberResolutionWrite,
+    fetchForWriting: denyMemberResolutionWrite,
+    archiveStream: denyMemberResolutionWrite,
+    restoreStream: denyMemberResolutionWrite,
+    snapshotAggregate: denyMemberResolutionWrite,
+    queryAsMember: denyMemberResolutionWrite,
+    resolveActiveMembership: denyMemberResolutionWrite,
+    scheduleAfterCommit: () => {
+      throw memberResolutionReadOnlyDenied();
+    },
+    // A read as a member gets no system-scope DB, preSave pipeline or file storage.
+    runPreSave: undefined,
+    systemDb: undefined,
+    files: undefined,
+    derivatives: undefined,
+    ...(handlerContext.jobRunner && { jobRunner: denyingJobRunnerProxy() }),
+    ...(handlerContext.notify && { notify: denyMemberResolutionWrite }),
+  };
+}
+
 export async function buildHandlerContext(
   ctx: DispatchContext,
   type: string,
@@ -211,13 +274,10 @@ export async function buildHandlerContext(
   // but at this point we're the root of the pipeline — cast is safe.
   const dbSource = resolveDbSource(ctx, tx);
   const reqCtx = requestContext.get();
-  // db.global()'s write-gate — undefined for query/stream handlers, which can't declare escapeHatch.
-  const escapeHatch = registry.getWriteHandler(type)?.escapeHatch;
-  // Broader than `escapeHatch` above — a query handler can't reach db.global() but can still opt in here.
-  const allowSystemIdentity =
-    isSystem ||
-    (registry.getWriteHandler(type)?.escapeHatch ?? registry.getQueryHandler(type)?.escapeHatch) !==
-      undefined;
+  // global() writes are write-handler-only; SYSTEM identity switch and unsafeRaw accept write or query escapeHatch.
+  const writeEscapeHatch = registry.getWriteHandler(type)?.escapeHatch;
+  const handlerEscapeHatch = writeEscapeHatch ?? registry.getQueryHandler(type)?.escapeHatch;
+  const allowSystemIdentity = isSystem || handlerEscapeHatch !== undefined;
   const buildTenantScopedDb = (source: DbConnection | DbTx, signal: AbortSignal | undefined) =>
     createTenantDb(
       source,
@@ -226,7 +286,7 @@ export async function buildHandlerContext(
       context.tracer,
       context.meter,
       signal,
-      escapeHatch,
+      { globalWrites: writeEscapeHatch, unsafeRaw: handlerEscapeHatch },
     );
   // Propagate the request's AbortSignal so every TenantDb query throws when
   // the client has disconnected — handlers with many sequential queries skip
@@ -326,6 +386,17 @@ export async function buildHandlerContext(
     writeAs: (asUser: SessionUser, targetType: string, payload: unknown) =>
       executeWrite(ctx, targetType, payload, asUser, tx, bridgeSink),
   });
+  // Lazy — creates the reader (which fails closed on SYSTEM_TENANT_ID) only
+  // on first actual use, not on every HandlerContext build.
+  let ungatedMemberReader: MemberReader | undefined;
+  const queryAsMember = createGatedMemberReader(
+    `handler "${type}"`,
+    allowSystemIdentity,
+    (userId, qn, payload) => {
+      ungatedMemberReader ??= createMemberReaderFn(ctx, user.tenantId, tx);
+      return ungatedMemberReader(userId, qn, payload);
+    },
+  );
   const bridge = {
     query: (targetType: string, payload: unknown) =>
       executeQuery(ctx, targetType, payload, user, tx), // @wrapper-known semantic-alias
@@ -604,6 +675,9 @@ export async function buildHandlerContext(
       return resolveActiveMembershipFn(ctx, userId, tenantId, INTERACTIVE_SIGN_IN_POLICY); // @wrapper-known semantic-alias
     },
 
+    // Needs the same grant as a SYSTEM queryAs.
+    queryAsMember,
+
     // Feature-effective check for in-handler opt-in logic. Scope:
     // **current user's tenant** — for cross-tenant lookups (rare,
     // SysAdmin operations) read effectiveFeatures(otherTenantId) directly.
@@ -688,7 +762,7 @@ export async function buildHandlerContext(
     user.locale !== undefined && isValidLocaleTag(user.locale) ? user.locale : undefined;
   const locale = reqCtx?.locale ?? safeUserLocale ?? context.defaultLocale ?? DEFAULT_LOCALE;
 
-  return {
+  const handlerContext = {
     ...context,
     registry,
     db: exposedDb,
@@ -740,6 +814,11 @@ export async function buildHandlerContext(
     ...(includeDeleted && { includeDeleted: true }),
     ...bridge,
   } as HandlerContext; // @cast-boundary engine-bridge
+
+  // A resolved member principal is read-only by construction.
+  return user.origin === "member-resolution"
+    ? applyMemberResolutionReadOnly(handlerContext)
+    : handlerContext;
 }
 
 // Wrap handler execution in a dispatcher.handler span AND emit the standard

package/src/pipeline/dispatch-stream.ts

@@ -7,6 +7,7 @@ import {
   type DispatchContext,
   enforceRateLimit,
   ensureFeatureEnabled,
+  memberResolutionReadOnlyDenied,
   runStreamInstrumented,
 } from "./dispatch-shared";
 
@@ -35,6 +36,12 @@ async function* executeStreamInner(
   const handler = registry.getStreamHandler(type);
   if (!handler) throw new NotFoundError("handler", type);
 
+  // A resolved member principal (ctx.queryAsMember) is read-only — streams
+  // are excluded the same way executeWriteInner excludes writes.
+  if (user.origin === "member-resolution") {
+    throw memberResolutionReadOnlyDenied();
+  }
+
   await ensureFeatureEnabled(ctx, type, user.tenantId);
 
   if (handler.rateLimit !== undefined) {
@@ -96,11 +103,8 @@ async function* executeStreamInner(
     }
   } finally {
     unsubscribeAccessInvalidation?.();
-    // Consumer break / throw — always close the handler generator so its
-    // finally (cleanup) runs (for-await would do this). Do NOT swallow
-    // return() errors — close-time cleanup failures must surface to
-    // runStreamInstrumented (#1543). Skip the await after access-revoke
-    // abandonment (overlapping next+return deadlocks — see above).
+    // Close the generator so cleanup runs; skip awaiting return() after
+    // access-revoke abandonment — overlapping next()+return() can deadlock.
     if (iterator !== undefined && !abandonedForInvalidation) {
       await iterator.return?.(undefined);
     }

package/src/pipeline/dispatch-write.ts

@@ -27,6 +27,7 @@ import {
   CONFIG_WRITE_SET_TYPE,
   checkFeatureEnabled,
   enforceRateLimit,
+  memberResolutionReadOnlyDenied,
   runHandlerInstrumented,
   TENANT_TIMEZONE_CONFIG_KEY,
 } from "./dispatch-shared";
@@ -327,6 +328,12 @@ async function executeWriteInner(
   const handler = registry.getWriteHandler(type);
   if (!handler) return writeFailure(new NotFoundError("handler", type));
 
+  // Defense in depth — covers runBatch and a spread-copied user that kept
+  // `origin`, beyond buildHandlerContext's own ctx.write replacement.
+  if (user.origin === "member-resolution") {
+    return writeFailure(memberResolutionReadOnlyDenied());
+  }
+
   // Feature-toggle gate: disabled handlers must short-circuit before any
   // rate-limit/access/validation work — see executeQueryInner comment.
   const disabledErr = await checkFeatureEnabled(ctx, type, user.tenantId);

package/src/pipeline/dispatcher-utils.ts

@@ -49,6 +49,7 @@ export function dispatcherSpanAttributes(
     "kumiko.tenant_id": user.tenantId,
   };
   if (feature) attrs["kumiko.feature"] = feature;
+  if (user.origin) attrs["kumiko.user_origin"] = user.origin;
   return attrs;
 }
 

package/src/pipeline/dispatcher.ts

@@ -6,7 +6,9 @@ import type { EffectiveFeaturesResolver } from "../engine/tier-resolver-extensio
 import type {
   ActiveMembershipResult,
   AppContext,
+  DispatchWriteRef,
   JobRunnerRef,
+  MemberReader,
   Registry,
   SessionUser,
   WriteResult,
@@ -23,6 +25,7 @@ import { executeStream } from "./dispatch-stream";
 import { type HandlerType, resolveType } from "./dispatcher-utils";
 import type { IdempotencyGuard } from "./idempotency";
 import type { LifecycleHooks } from "./lifecycle-pipeline";
+import { createMemberReaderFn } from "./member-reader";
 import { createTenantTimezoneCache } from "./tenant-timezone-cache";
 
 // Re-export for callers that reach for dispatcher-adjacent types (tests,
@@ -97,8 +100,21 @@ export type Dispatcher = {
   // Membership check for interactive sign-in paths (login, MFA completion,
   // tenant switch) — single resolve implementation so callers can't independently drift.
   resolveActiveMembership(userId: string, tenantId: TenantId): Promise<ActiveMembershipResult>;
+  // Trusted server surface, ungated like resolveActiveMembership.
+  // Handler/hook ctx.queryAsMember uses buildHandlerContext's own gated reader instead.
+  createMemberReader(tenantId: TenantId): MemberReader;
 };
 
+// Adapts Dispatcher's (type, payload, user) call shape to DispatchWriteRef's
+// (user, qn, payload) — JobRunner.attachDispatcher needs the latter.
+export function dispatcherToWriteRef(dispatcher: Dispatcher): DispatchWriteRef {
+  return {
+    write: (user, qn, payload) => dispatcher.write(qn, payload, user),
+    queryAs: (user, qn, payload) => dispatcher.query(qn, payload, user),
+    createMemberReader: (tenantId) => dispatcher.createMemberReader(tenantId),
+  };
+}
+
 export function createDispatcher(
   registry: Registry,
   context: AppContext,
@@ -164,5 +180,7 @@ export function createDispatcher(
 
     resolveActiveMembership: (userId, tenantId) =>
       resolveActiveMembershipFn(ctx, userId, tenantId, INTERACTIVE_SIGN_IN_POLICY),
+
+    createMemberReader: (tenantId) => createMemberReaderFn(ctx, tenantId),
   };
 }

package/src/pipeline/index.ts

@@ -2,7 +2,7 @@ export type { ResolveAuthClaimsArgs } from "./auth-claims-resolver";
 export { resolveAuthClaims } from "./auth-claims-resolver";
 export { createCascadeDeleteHook } from "./cascade-handler";
 export type { Dispatcher } from "./dispatcher";
-export { createDispatcher } from "./dispatcher";
+export { createDispatcher, dispatcherToWriteRef } from "./dispatcher";
 export type { DistributedLock } from "./distributed-lock";
 export { createDistributedLock } from "./distributed-lock";
 export type { EntityCache, EntityCacheOptions } from "./entity-cache";