@gaganref/confect-server 10.3.1-fork.6 → 10.3.1-fork.60

package/src/ActionCall.ts

@@ -0,0 +1,83 @@
+import * as ReservedArgument from "./internal/reservedArgument.js";
+import * as ActionCall from "@confect/core/ActionCall";
+import type * as Ref from "@confect/core/Ref";
+import type { FunctionReference } from "convex/server";
+import * as Context from "effect/Context";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as ActionCtx from "./ActionCtx.js";
+import * as ActionRunner from "./ActionRunner.js";
+import type * as DatabaseSchema from "./DatabaseSchema.js";
+import type * as DataModel from "./DataModel.js";
+import type * as Handler from "./Handler.js";
+import * as MiddlewareImpl from "./MiddlewareImpl.js";
+import * as MutationRunner from "./MutationRunner.js";
+import * as QueryRunner from "./QueryRunner.js";
+import * as Scheduler from "./Scheduler.js";
+
+export class ActionCallAlreadyUsed extends Data.TaggedError(
+  "ActionCallAlreadyUsed",
+)<{}> {}
+export class ActionCallNotUsed extends Data.TaggedError(
+  "ActionCallNotUsed",
+)<{}> {}
+export class MissingFunctionType extends Data.TaggedError(
+  "MissingFunctionType",
+)<{}> {}
+export class NestedActionNotAllowed extends Data.TaggedError(
+  "NestedActionNotAllowed",
+)<{}> {}
+
+export class SchedulingNotAllowed extends Data.TaggedError(
+  "SchedulingNotAllowed",
+)<{}> {}
+
+export const layer = <S extends DatabaseSchema.AnyWithProps>(schema: S) =>
+  MiddlewareImpl.make(schema, ActionCall.Middleware, (effect) =>
+    Effect.gen(function* () {
+      const ctx = yield* ActionCtx.ActionCtx<
+        DataModel.ToConvex<DataModel.FromSchema<S>>,
+        DatabaseSchema.Scope<S>
+      >();
+      let claimed = false;
+      const call: ActionCall.Call = <
+        Target extends Ref.AnyQuery | Ref.AnyMutation,
+      >(
+        ref: Target,
+        ...args: Ref.OptionalArgs<NoInfer<Target>>
+      ) =>
+        Effect.suspend(() => {
+          if (claimed) return Effect.die(new ActionCallAlreadyUsed());
+          claimed = true;
+          if (ref.functionType !== "query" && ref.functionType !== "mutation")
+            return Effect.die(new MissingFunctionType());
+          return ReservedArgument.runWithCodec(
+            ref,
+            (args[0] ?? {}) as Ref.Args<Target>,
+            (native, encoded) =>
+              ref.functionType === "query"
+                ? ctx.runQuery(
+                    native as FunctionReference<"query">,
+                    encoded as never,
+                  )
+                : ctx.runMutation(
+                    native as FunctionReference<"mutation">,
+                    encoded as never,
+                  ),
+          );
+        }).pipe(Effect.withSpan("ActionCall.call"));
+      return yield* effect.pipe(
+        Effect.provideService(ActionCall.ActionCall, call),
+        Effect.updateContext(
+          (context: Context.Context<Handler.ActionServices<S>>) =>
+            Context.omit(
+              QueryRunner.QueryRunner,
+              MutationRunner.MutationRunner,
+              ActionRunner.ActionRunner,
+              ActionCtx.ActionCtx(),
+              Scheduler.Scheduler,
+            )(context),
+        ),
+      );
+    }),
+  );

package/src/ActionRunner.ts

@@ -1,4 +1,5 @@
-import * as Ref from "@confect/core/Ref";
+import * as ReservedArgument from "./internal/reservedArgument.js";
+import type * as Ref from "@confect/core/Ref";
 import { type GenericActionCtx } from "convex/server";
 import * as Effect from "effect/Effect";
 import * as Context from "effect/Context";
@@ -18,7 +19,7 @@ const make = (runAction: GenericActionCtx<any>["runAction"]) => ({
     Ref.Error<Action> | Schema.SchemaError
   > =>
     run(
-      Ref.runWithCodec(
+      ReservedArgument.runWithCodec(
         action,
         (args[0] ?? {}) as Ref.Args<Action>,
         (functionReference, encodedArgs) =>

package/src/Auth.ts

@@ -1,4 +1,8 @@
-import type { Auth as ConvexAuth } from "convex/server";
+import type {
+  Auth as ConvexAuth,
+  MutationAuth as ConvexMutationAuth,
+  SignJwtOptions,
+} from "convex/server";
 import * as Context from "effect/Context";
 import { flow } from "effect/Function";
 import * as Effect from "effect/Effect";
@@ -28,6 +32,24 @@ export class Auth extends Context.Service<Auth, ReturnType<typeof make>>()(
 
 export const layer = (auth: ConvexAuth) => Layer.succeed(Auth, make(auth));
 
+/**
+ * Mutation-only deployment signing, available in applications and components.
+ */
+export class MutationAuth extends Context.Service<
+  MutationAuth,
+  {
+    readonly signJwt: (options: SignJwtOptions) => Effect.Effect<string>;
+  }
+>()("@confect/server/Auth/MutationAuth") {}
+
+/**
+ * SDK rejections remain defects, as with the other native auth operations.
+ */
+export const mutationLayer = (auth: ConvexMutationAuth) =>
+  Layer.succeed(MutationAuth, {
+    signJwt: (options) => Effect.promise(() => auth.signJwt(options)),
+  });
+
 export type ForTarget<Target extends DatabaseSchema.Target> =
   Target["kind"] extends "component" ? never : Auth;
 

package/src/Callback.ts

@@ -1,6 +1,7 @@
 import * as Callback from "@confect/core/Callback";
 import * as MiddlewareSpec from "@confect/core/MiddlewareSpec";
-import * as Ref from "@confect/core/Ref";
+import type * as Ref from "@confect/core/Ref";
+import { getFunctionReference } from "@confect/core/RefInternal";
 import {
   compileAst,
   UnsupportedPropertySignatureKeyTypeError,
@@ -305,7 +306,7 @@ export const create = Effect.fn("Callback.create")(function* <
     yield* Effect.fromResult(verify(contract, ref));
   }
   const text = yield* Effect.promise(() =>
-    createFunctionHandle(Ref.getFunctionReference(ref)),
+    createFunctionHandle(getFunctionReference(ref)),
   );
   return yield* Schema.decodeEffect(Callback.handle(contract))(text).pipe(
     Effect.orDie,

package/src/ConvexFunctionDefinitions.ts

@@ -63,7 +63,7 @@ export const buildForGroup = <Group extends GroupSpec.AnyWithProps>(
   databaseSchema: DatabaseSchema.AnyWithProps,
   groupLayer: Layer.Layer<GroupImpl.GroupImpl<"Finalized">>,
 ): ForGroup<Group> => {
-  const { functionRegistryItems, middlewareRegistryItems } =
+  const { functionRegistryItems, middlewareRegistryItems, observability } =
     GroupRegistry.make(groupLayer);
   return mapLeaves<
     FunctionRegistryItem.AnyWithProps,
@@ -83,6 +83,7 @@ export const buildForGroup = <Group extends GroupSpec.AnyWithProps>(
             databaseSchema,
             confect,
             ResolvedMiddleware.resolve(confect, middlewareRegistryItems),
+            observability,
           ),
         ),
         Match.exhaustive,

package/src/CronJobs.ts

@@ -1,4 +1,5 @@
 import { Ref } from "@confect/core";
+import { getFunctionReference } from "@confect/core/RefInternal";
 import type { CronJob as ConvexCronJob } from "convex/server";
 import { cronJobs as makeConvexCrons, type Crons } from "convex/server";
 import { pipe } from "effect/Function";
@@ -35,7 +36,7 @@ const Proto = {
       crons: { ...this.convexCronJobs.crons },
     });
 
-    const functionReference = Ref.getFunctionReference(cronJob.ref);
+    const functionReference = getFunctionReference(cronJob.ref);
     const encodedArgs = Ref.encodeArgsSync(cronJob.ref, cronJob.args);
 
     Match.value(cronJob.schedule).pipe(

package/src/DatabaseWriter.ts

@@ -10,11 +10,14 @@ import { pipe } from "effect/Function";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
+import * as Result from "effect/Result";
 import * as DatabaseSchema from "./DatabaseSchema.js";
 import type * as DataModel from "./DataModel.js";
 import type { DocumentByName as DocumentByName_ } from "./DataModel.js";
 import * as Document from "./Document.js";
+import * as DocumentPatch from "./internal/DocumentPatch.js";
 import * as QueryInitializer from "./QueryInitializer.js";
 import type * as Table from "./Table.js";
 
@@ -97,11 +100,54 @@ export type DatabaseWriterTag<
   DatabaseWriterService<DatabaseSchema_, Docs>
 >;
 
+/**
+ * Decoded documents surrounding one successful write.
+ */
+export type Change<S extends DatabaseSchema.AnyWithProps> = {
+  [Name in DataModel.TableNames<DataModel.FromSchema<S>>]: {
+    readonly tableName: Name;
+  } & (
+    | {
+        readonly operation: "insert";
+        readonly oldDoc: null;
+        readonly newDoc: DocumentByName_<DataModel.FromSchema<S>, Name>;
+      }
+    | {
+        readonly operation: "update";
+        readonly oldDoc: DocumentByName_<DataModel.FromSchema<S>, Name>;
+        readonly newDoc: DocumentByName_<DataModel.FromSchema<S>, Name>;
+      }
+    | {
+        readonly operation: "delete";
+        readonly oldDoc: DocumentByName_<DataModel.FromSchema<S>, Name>;
+        readonly newDoc: null;
+      }
+  );
+}[DataModel.TableNames<DataModel.FromSchema<S>>];
+
+/**
+ * Runs after the write, in its transaction. A defect aborts the mutation.
+ *
+ * Only writes through this writer are observed. Raw `ctx.db`, `MutationCtx`
+ * writes and a second `DatabaseWriter.make` bypass the hook, so a host that
+ * relies on it keeps raw writers out of its functions. Component writers and
+ * nested `runMutation` calls each need their own hook installation.
+ *
+ * Concurrent writes to one document (for example under `Effect.all`) can
+ * interleave the read-write-read steps. Await them sequentially when the hook
+ * needs exact per-write snapshots. The writer takes no lock, because a hook
+ * that writes through the same writer would deadlock under one.
+ */
+export type Hook<S extends DatabaseSchema.AnyWithProps> = (
+  change: Change<S>,
+) => Effect.Effect<void>;
+
 export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
   databaseSchema: DatabaseSchema_,
   convexDatabaseWriter: GenericDatabaseWriter<
     DataModel.ToConvex<DataModel.FromSchema<DatabaseSchema_>>
   >,
+  hook?: Hook<DatabaseSchema_>,
 ): DatabaseWriterService<DatabaseSchema_> => {
   type DataModel_ = DataModel.FromSchema<DatabaseSchema_>;
 
@@ -131,38 +177,108 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
       return id as unknown as DataModel.Id<DataModel_, TableName>;
     });
 
+    // A codec whose encoding spans fields cannot encode a patch on its own, so
+    // the patch is merged into the decoded document and the result replaces it.
+    const replacePatched = (
+      id: DataModel.Id<DataModel_, TableName>,
+      patchedValues: PatchValue<
+        Document.WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
+      >,
+    ) =>
+      Effect.gen(function* () {
+        const originalDecodedDoc = yield* QueryInitializer.getById<
+          Table.AnyWithProps,
+          TableName
+        >(
+          convexDatabaseWriter as any,
+          tableDef,
+        )(id as unknown as GenericId<TableName>);
+
+        const updatedEncodedDoc = yield* pipe(
+          patchedValues,
+          Record.reduce(originalDecodedDoc, (acc, value, key) =>
+            value === undefined
+              ? Record.remove(acc, key)
+              : Record.set(acc, key, value),
+          ),
+          Document.encode(tableDef),
+        );
+
+        yield* Effect.promise(() =>
+          convexDatabaseWriter.replace(
+            id as unknown as GenericId<TableName>,
+            updatedEncodedDoc as Expand<
+              BetterOmit<
+                DocumentByName<DataModel.ToConvex<DataModel_>, TableName>,
+                "_creationTime" | "_id"
+              >
+            >,
+          ),
+        );
+      });
+
     const patch = Effect.fn("DatabaseWriter.patch")(function* (
       id: DataModel.Id<DataModel_, TableName>,
       patchedValues: PatchValue<
         Document.WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
       >,
     ) {
-      const originalDecodedDoc = yield* QueryInitializer.getById<
-        Table.AnyWithProps,
-        TableName
-      >(
-        convexDatabaseWriter as any,
-        tableDef,
-      )(id as unknown as GenericId<TableName>);
+      const encodePatch = DocumentPatch.encoder(tableDef);
+      if (encodePatch === undefined) {
+        return yield* replacePatched(id, patchedValues);
+      }
 
-      const updatedEncodedDoc = yield* pipe(
-        patchedValues,
-        Record.reduce(originalDecodedDoc, (acc, value, key) =>
-          value === undefined
-            ? Record.remove(acc, key)
-            : Record.set(acc, key, value),
+      const storedDoc = yield* pipe(
+        Effect.promise(() =>
+          convexDatabaseWriter.get(id as unknown as GenericId<TableName>),
+        ),
+        Effect.andThen((value) =>
+          Effect.fromResult(
+            Result.fromNullishOr(
+              value,
+              () =>
+                new QueryInitializer.GetByIdFailure({
+                  tableName,
+                  id,
+                }),
+            ),
+          ),
+        ),
+      );
+      // The patch must encode and the patched document must decode. When
+      // either fails, the stored document decides whose fault that is.
+      const encodedPatch = yield* pipe(
+        encodePatch(patchedValues),
+        Effect.mapError(({ message }) => message),
+        Effect.tap((delta) =>
+          pipe(
+            { ...storedDoc, ...delta },
+            Record.filter(Predicate.isNotUndefined),
+            Document.decode(tableDef),
+            Effect.mapError(({ parseError }) => parseError),
+          ),
+        ),
+        Effect.catch((parseError) =>
+          pipe(
+            Document.decode(storedDoc, tableDef),
+            Effect.andThen(
+              Effect.fail(
+                new Document.DocumentEncodeError({
+                  tableName,
+                  id,
+                  parseError,
+                }),
+              ),
+            ),
+          ),
         ),
-        Document.encode(tableDef),
       );
 
       yield* Effect.promise(() =>
-        convexDatabaseWriter.replace(
+        convexDatabaseWriter.patch(
           id as unknown as GenericId<TableName>,
-          updatedEncodedDoc as Expand<
-            BetterOmit<
-              DocumentByName<DataModel.ToConvex<DataModel_>, TableName>,
-              "_creationTime" | "_id"
-            >
+          encodedPatch as Partial<
+            DocumentByName<DataModel.ToConvex<DataModel_>, TableName>
           >,
         ),
       );
@@ -194,11 +310,52 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
         convexDatabaseWriter.delete(id as unknown as GenericId<TableName>),
       );
 
+    const accessor = { insert, patch, replace, delete: delete_ };
+    if (hook === undefined) return accessor;
+
+    const read = (id: DataModel.Id<DataModel_, TableName>) =>
+      QueryInitializer.getById<Table.AnyWithProps, TableName>(
+        convexDatabaseWriter as any,
+        tableDef,
+      )(id as unknown as GenericId<TableName>);
+    const notify = (
+      operation: "insert" | "update" | "delete",
+      oldDoc: unknown,
+      newDoc: unknown,
+    ) =>
+      hook({ tableName, operation, oldDoc, newDoc } as Change<DatabaseSchema_>);
+    const update =
+      <A extends ReadonlyArray<unknown>, E, BeforeError>(
+        before: (
+          id: DataModel.Id<DataModel_, TableName>,
+        ) => Effect.Effect<unknown, BeforeError>,
+        write: (
+          id: DataModel.Id<DataModel_, TableName>,
+          ...args: A
+        ) => Effect.Effect<void, E>,
+      ) =>
+      (id: DataModel.Id<DataModel_, TableName>, ...args: A) =>
+        Effect.gen(function* () {
+          const oldDoc = yield* before(id);
+          yield* write(id, ...args);
+          yield* notify("update", oldDoc, yield* read(id).pipe(Effect.orDie));
+        });
+
     return {
-      insert,
-      patch,
-      replace,
-      delete: delete_,
+      insert: (document: Parameters<typeof insert>[0]) =>
+        Effect.gen(function* () {
+          const id = yield* insert(document);
+          yield* notify("insert", null, yield* read(id).pipe(Effect.orDie));
+          return id;
+        }),
+      patch: update(read, patch),
+      replace: update((id) => read(id).pipe(Effect.orDie), replace),
+      delete: (id: DataModel.Id<DataModel_, TableName>) =>
+        Effect.gen(function* () {
+          const oldDoc = yield* read(id).pipe(Effect.orDie);
+          yield* delete_(id);
+          yield* notify("delete", oldDoc, null);
+        }),
     };
   };
 
@@ -225,8 +382,9 @@ export const layer = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
   convexDatabaseWriter: GenericDatabaseWriter<
     DataModel.ToConvex<DataModel.FromSchema<DatabaseSchema_>>
   >,
+  hook?: Hook<DatabaseSchema_>,
 ) =>
   Layer.succeed(
     DatabaseWriter<DatabaseSchema_>(),
-    make(databaseSchema, convexDatabaseWriter),
+    make(databaseSchema, convexDatabaseWriter, hook),
   );

package/src/FunctionRegistryItem.ts

@@ -29,6 +29,7 @@ export interface ConfectFunctionRegistryItem {
   readonly [TypeId]: TypeId;
   readonly _tag: "Confect";
   readonly name: string;
+  readonly reservedArgument?: string;
   readonly functionVisibility: FunctionVisibility;
   readonly functionType: FunctionType;
   readonly args: Schema.Codec<any, any>;
@@ -64,6 +65,9 @@ export const make = ({
       const item = Object.assign(Object.create(FunctionRegistryItemProto), {
         _tag: "Confect" as const,
         name: functionSpec.name,
+        ...(functionSpec.reservedArgument === undefined
+          ? {}
+          : { reservedArgument: functionSpec.reservedArgument }),
         functionVisibility: functionSpec.functionVisibility,
         functionType: functionSpec.runtimeAndFunctionType.functionType,
         middlewareAttachments: [

package/src/GroupImpl.ts

@@ -5,6 +5,7 @@ import * as RegistryItems from "./RegistryItems.js";
 import * as Array from "effect/Array";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Data from "effect/Data";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
@@ -111,10 +112,20 @@ export const make = <
     FunctionImpl.FromGroupSpec<Group> | MiddlewareImpl.FromGroupSpec<Group>
   >;
 
-const findUnfinalizedGroupImpl = <S>(
-  context: Context.Context<S>,
-): Option.Option<AnyUnfinalized> =>
-  Array.findFirst(context.mapUnsafe.values(), isUnfinalizedGroupImpl);
+const findGroupImpl = <S>(context: Context.Context<S>): Option.Option<Any> =>
+  Array.findFirst(context.mapUnsafe.values(), isGroupImpl);
+
+export class MissingRequiredMiddlewareError extends Data.TaggedError(
+  "MissingRequiredMiddlewareError",
+)<{
+  readonly missing: ReadonlyArray<RegistryItems.MissingMiddleware>;
+}> {
+  override get message(): string {
+    return `GroupImpl.finalize: ${this.missing.map(({ functionName, middlewareKey }) => `${functionName} requires middleware "${middlewareKey}"`).join("\n")}`;
+  }
+}
+
+type Finalizable = Layer.Layer<AnyUnfinalized> | Layer.Layer<AnyFinalized>;
 
 /**
  * Mark a `GroupImpl` layer as fully implemented. The parameter type defaults
@@ -127,20 +138,52 @@ const findUnfinalizedGroupImpl = <S>(
  * registered into this group's scope are snapshotted onto the produced service
  * value's `registeredFunctionNames` field, so consumers can verify impl
  * completeness against a `GroupSpec`'s expected functions without having to
- * inspect the `Registry` themselves.
+ * inspect the `Registry` themselves. Pass `{ required }` to check every
+ * registered function's middleware at layer build, including internal
+ * functions. This form also accepts a finalized layer so generated registration
+ * can enforce the backend declaration without changing authored impls. Pass
+ * `groupPath` to qualify uncovered function names in the diagnostic.
  */
-export const finalize = (
+export function finalize(options: {
+  readonly groupPath?: string;
+  readonly required: ReadonlyArray<
+    Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">
+  >;
+}): (group: Finalizable) => Layer.Layer<GroupImpl<"Finalized">>;
+export function finalize(
   group: Layer.Layer<GroupImpl<"Unfinalized">>,
+): Layer.Layer<GroupImpl<"Finalized">>;
+export function finalize(
+  input:
+    | Finalizable
+    | {
+        readonly groupPath?: string;
+        readonly required: ReadonlyArray<
+          Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">
+        >;
+      },
+):
+  | Layer.Layer<GroupImpl<"Finalized">>
+  | ((group: Finalizable) => Layer.Layer<GroupImpl<"Finalized">>) {
+  return "required" in input
+    ? (group) => finalizeWith(group, input.required, input.groupPath)
+    : finalizeWith(input, []);
+}
+
+const finalizeWith = (
+  group: Layer.Layer<never>,
+  required: ReadonlyArray<Pick<MiddlewareSpec.AnyMiddlewareSpec, "key">>,
+  groupPath = "",
 ): Layer.Layer<GroupImpl<"Finalized">> =>
   Layer.flatMap(group, (context): Layer.Layer<GroupImpl<"Finalized">> =>
-    findUnfinalizedGroupImpl(context).pipe(
+    findGroupImpl(context).pipe(
       Option.match({
         onNone: () =>
           Layer.effect(
             GroupImpl<"Finalized">({ finalizationStatus: "Finalized" }),
             Effect.die(
               new Error(
-                "GroupImpl.finalize: no Unfinalized GroupImpl service was found in the layer's context.",
+                "GroupImpl.finalize: no GroupImpl service was found in the layer's context.",
               ),
             ),
           ),
@@ -150,6 +193,16 @@ export const finalize = (
             Effect.gen(function* () {
               const registry = yield* Registry.Registry;
               const items = yield* Ref.get(registry);
+              const missing = RegistryItems.missingRequired(
+                items,
+                required,
+                groupPath,
+              );
+              if (missing.length > 0) {
+                return yield* Effect.die(
+                  new MissingRequiredMiddlewareError({ missing }),
+                );
+              }
               return {
                 [TypeId]: TypeId,
                 finalizationStatus: "Finalized" as const,

package/src/GroupRegistry.ts

@@ -1,3 +1,4 @@
+import * as RegisteredFunction from "./RegisteredFunction.js";
 import * as Effect from "effect/Effect";
 import type * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
@@ -9,9 +10,12 @@ import * as MiddlewareRegistryItem from "./MiddlewareRegistryItem.js";
 export const make = (
   groupLayer: Layer.Layer<GroupImpl.GroupImpl<"Finalized">>,
 ) => {
-  const registryItems = Effect.gen(function* () {
+  const { registryItems, observability } = Effect.gen(function* () {
     const registry = yield* Registry.Registry;
-    return yield* Ref.get(registry);
+    return {
+      registryItems: yield* Ref.get(registry),
+      observability: yield* RegisteredFunction.Observability,
+    };
   }).pipe(
     Effect.provide(groupLayer),
     Effect.provideService(
@@ -21,7 +25,7 @@ export const make = (
     Effect.runSync,
   );
 
-  return partitionRegistryItems(registryItems);
+  return { ...partitionRegistryItems(registryItems), observability };
 };
 
 const partitionRegistryItems = (registryItems: RegistryItems.RegistryItems) => {

package/src/Handler.ts

@@ -1,3 +1,4 @@
+import type { ActionCall } from "@confect/core/ActionCall";
 import type { FunctionSpec, RuntimeAndFunctionType } from "@confect/core";
 import type * as FunctionProvenance from "@confect/core/FunctionProvenance";
 import type * as NodeServices from "@effect/platform-node/NodeServices";
@@ -94,6 +95,7 @@ export type MutationServices<
 > =
   | DatabaseReader.DatabaseReader<DatabaseSchema_>
   | DatabaseWriter.DatabaseWriter<DatabaseSchema_>
+  | Auth.MutationAuth
   | (DatabaseSchema_["target"]["kind"] extends "component" ? never : Auth.Auth)
   | Scheduler.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
   | StorageReader.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
@@ -114,9 +116,7 @@ export type MutationServices<
 /**
  * Shared by both action runtimes.
  */
-export type ActionServices<
-  DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
-> =
+type RawActionServices<DatabaseSchema_ extends DatabaseSchema.AnyWithProps> =
   | Scheduler.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
   | (DatabaseSchema_["target"]["kind"] extends "component" ? never : Auth.Auth)
   | StorageReader.ForScope<DatabaseSchema.Scope<DatabaseSchema_>>
@@ -134,6 +134,22 @@ export type ActionServices<
       DatabaseSchema.Scope<DatabaseSchema_>
     >;
 
+export type ActionServices<S extends DatabaseSchema.AnyWithProps, R = never> = [
+  Extract<R, ActionCall>,
+] extends [never]
+  ? RawActionServices<S>
+  : Exclude<
+      RawActionServices<S>,
+      | Scheduler.ForScope<DatabaseSchema.Scope<S>>
+      | QueryRunner.QueryRunner
+      | MutationRunner.MutationRunner
+      | ActionRunner.ActionRunner
+      | ActionCtx.ActionCtx<
+          DataModel.ToConvex<DataModel.FromSchema<S>>,
+          DatabaseSchema.Scope<S>
+        >
+    >;
+
 export type ConfectProvenanceQuery<
   DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
   FunctionSpec_ extends
@@ -153,7 +169,7 @@ export type ConvexRuntimeAction<
   FunctionSpec_ extends
     FunctionSpec.AnyWithPropsWithFunctionType<RuntimeAndFunctionType.AnyAction>,
   R = never,
-> = Base<FunctionSpec_, ActionServices<DatabaseSchema_> | R>;
+> = Base<FunctionSpec_, ActionServices<DatabaseSchema_, R> | R>;
 
 export type NodeRuntimeAction<
   DatabaseSchema_ extends DatabaseSchema.AnyWithProps,
@@ -162,7 +178,7 @@ export type NodeRuntimeAction<
   R = never,
 > = Base<
   FunctionSpec_,
-  ActionServices<DatabaseSchema_> | NodeServices.NodeServices | R
+  ActionServices<DatabaseSchema_, R> | NodeServices.NodeServices | R
 >;
 
 type Base<FunctionSpec_ extends FunctionSpec.AnyWithProps, R> = (