@dxos/compute 0.8.4-main.03d5cd7b56 → 0.8.4-main.05e74ebcff

package/dist/lib/neutral/index.mjs

@@ -16,13 +16,13 @@ import {
   TriggerStateNotFoundError,
   getHandler,
   getHandlerByKey
-} from "./chunk-JTZYM2QW.mjs";
+} from "./chunk-LF2ANNYW.mjs";
 import {
   Operation_exports,
   PersistentOperation,
   deserialize,
   invoke
-} from "./chunk-VIRNEVFD.mjs";
+} from "./chunk-SEBWOTOU.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -31,19 +31,24 @@ import {
 var Blueprint_exports = {};
 __export(Blueprint_exports, {
   Blueprint: () => Blueprint,
+  Blueprint_v0_1_0: () => Blueprint_v0_1_0,
   NotFoundError: () => NotFoundError,
   Registry: () => Registry,
   RegistryService: () => RegistryService,
+  getKey: () => getKey,
+  getVersion: () => getVersion,
   make: () => make2,
+  migrations: () => migrations,
   resolve: () => resolve2,
   toolDefinitions: () => toolDefinitions,
   upsert: () => upsert
 });
 import * as Context2 from "effect/Context";
 import * as Effect3 from "effect/Effect";
+import * as Layer2 from "effect/Layer";
 import * as Schema3 from "effect/Schema";
 import { ToolId } from "@dxos/ai";
-import { Annotation, Database as Database3, Filter, Obj, Type } from "@dxos/echo";
+import { Annotation, Database as Database3, Filter as Filter2, Migration, Obj, Type } from "@dxos/echo";
 import { BaseError } from "@dxos/errors";
 import { log as log2 } from "@dxos/log";
 
@@ -106,7 +111,7 @@ __export(OperationRegistry_exports, {
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { Database, Query } from "@dxos/echo";
+import { Database, Filter, Query } from "@dxos/echo";
 var Service = class extends Context.Tag("@dxos/operation/OperationRegistry")() {
 };
 var resolve = Effect.serviceFunctionEffect(Service, (service) => service.resolve);
@@ -114,9 +119,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const database = yield* Database.Service;
   const handlerSet = yield* OperationHandlerProvider;
   return {
-    resolve: (key) => Database.runQueryFirst(Query.type(PersistentOperation, {
-      key
-    })).pipe(Effect.flatten, Effect.map(deserialize), Effect.catchTag("NoSuchElementException", () => getHandlerByKey(handlerSet, key)), Effect.option).pipe(Effect.provideService(Database.Service, database))
+    resolve: (key) => Database.runQueryFirst(Query.select(Filter.and(Filter.type(PersistentOperation), Filter.key(key)))).pipe(Effect.flatten, Effect.map(deserialize), Effect.catchTag("NoSuchElementException", () => getHandlerByKey(handlerSet, key)), Effect.option).pipe(Effect.provideService(Database.Service, database))
   };
 }));
 
@@ -191,14 +194,6 @@ var processTemplate = (template) => Effect2.gen(function* () {
 // src/Blueprint.ts
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/compute/compute/src/Blueprint.ts";
 var Blueprint = Schema3.Struct({
-  /**
-  * Global registry ID.
-  * NOTE: The `key` property refers to the original registry entry.
-  */
-  // TODO(burdon): Create Format type for DXN-like ids, such as this and schema type.
-  key: Schema3.String.annotations({
-    description: "Unique registration key for the blueprint"
-  }),
   /**
   * Human-readable name of the blueprint.
   */
@@ -236,18 +231,30 @@ var Blueprint = Schema3.Struct({
   mcpServers: Schema3.optional(Schema3.Array(McpServer))
 }).pipe(Type.object({
   typename: "org.dxos.type.blueprint",
-  version: "0.1.0"
+  version: "0.2.0"
 }), Annotation.LabelAnnotation.set([
   "name"
 ]), Annotation.IconAnnotation.set({
   icon: "ph--blueprint--regular",
   hue: "sky"
 }));
-var make2 = ({ tools = [], instructions = make(), ...props }) => Obj.make(Blueprint, {
+var make2 = ({ key, version, tools = [], instructions = make(), ...props }) => Obj.make(Blueprint, {
+  [Obj.Meta]: {
+    key,
+    version
+  },
   tools,
   instructions,
   ...props
 });
+var getKey = (blueprint) => {
+  const key = Obj.getMeta(blueprint).key;
+  if (key === void 0) {
+    throw new Error("Blueprint is missing the meta key.");
+  }
+  return key;
+};
+var getVersion = (blueprint) => Obj.getMeta(blueprint).version;
 var toolDefinitions = ({ tools = [], operations = [] }) => [
   ...operations.map((op) => ToolId.make(op.meta.key)),
   ...tools.map((tool) => ToolId.make(tool))
@@ -257,12 +264,13 @@ var Registry = class {
   constructor(blueprints) {
     const seen = /* @__PURE__ */ new Set();
     blueprints.forEach((blueprint) => {
-      if (seen.has(blueprint.key)) {
+      const key = getKey(blueprint);
+      if (seen.has(key)) {
         log2.warn("duplicate blueprint", {
-          key: blueprint.key
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 89, S: this });
+          key
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 104, S: this });
       } else {
-        seen.add(blueprint.key);
+        seen.add(key);
         this._blueprints.push(blueprint);
       }
     });
@@ -272,16 +280,20 @@ var Registry = class {
     return this._blueprints;
   }
   getByKey(key) {
-    return this._blueprints.find((blueprint) => blueprint.key === key);
+    return this._blueprints.find((blueprint) => Obj.getMeta(blueprint).key === key);
   }
   query() {
     return this._blueprints;
   }
   updateBlueprints() {
     return Effect3.gen(this, function* () {
-      const blueprints = yield* Database3.runQuery(Filter.type(Blueprint));
+      const blueprints = yield* Database3.runQuery(Filter2.type(Blueprint));
       for (const blueprint of blueprints) {
-        const registryBlueprint = this.getByKey(blueprint.key);
+        const blueprintKey = Obj.getMeta(blueprint).key;
+        if (!blueprintKey) {
+          continue;
+        }
+        const registryBlueprint = this.getByKey(blueprintKey);
         if (!registryBlueprint) {
           continue;
         }
@@ -295,7 +307,21 @@ var Registry = class {
     }).pipe(Effect3.orDie);
   }
 };
-var RegistryService = class extends Context2.Tag("@dxos/blueprints/RegistryService")() {
+var RegistryService = class _RegistryService extends Context2.Tag("@dxos/blueprints/RegistryService")() {
+  static notAvailable = Layer2.succeed(_RegistryService, {
+    get blueprints() {
+      throw new Error("Blueprint registry not available");
+    },
+    getByKey(_key) {
+      throw new Error("Blueprint registry not available");
+    },
+    query() {
+      throw new Error("Blueprint registry not available");
+    },
+    updateBlueprints() {
+      throw new Error("Blueprint registry not available");
+    }
+  });
 };
 var resolve2 = (key) => Effect3.gen(function* () {
   const registry = yield* RegistryService;
@@ -310,9 +336,7 @@ var resolve2 = (key) => Effect3.gen(function* () {
   return blueprint;
 });
 var upsert = (key) => Effect3.gen(function* () {
-  const local = yield* Database3.runQuery(Filter.type(Blueprint, {
-    key
-  }));
+  const local = yield* Database3.runQuery(Filter2.and(Filter2.type(Blueprint), Filter2.key(key)));
   if (local.length > 0) {
     return local[0];
   }
@@ -322,6 +346,45 @@ var upsert = (key) => Effect3.gen(function* () {
 });
 var NotFoundError = class extends BaseError.extend("BlueprintNotFound", "Blueprint not found") {
 };
+var Blueprint_v0_1_0 = Schema3.Struct({
+  /**
+  * Global registry ID.
+  * NOTE: The `key` property refers to the original registry entry.
+  */
+  key: Schema3.String.annotations({
+    description: "Unique registration key for the blueprint"
+  }),
+  name: Schema3.String.annotations({
+    description: "Human-readable name of the blueprint"
+  }),
+  description: Schema3.optional(Schema3.String),
+  instructions: Template,
+  tools: Schema3.Array(ToolId),
+  agentCanEnable: Schema3.optional(Schema3.Boolean),
+  mcpServers: Schema3.optional(Schema3.Array(McpServer))
+}).pipe(Type.object({
+  typename: "org.dxos.type.blueprint",
+  version: "0.1.0"
+}));
+var _migration = Migration.define({
+  from: Blueprint_v0_1_0,
+  to: Blueprint,
+  transform: async (from) => ({
+    [Obj.Meta]: {
+      key: from.key,
+      version: "0.1.0"
+    },
+    name: from.name,
+    description: from.description,
+    instructions: from.instructions,
+    tools: from.tools,
+    agentCanEnable: from.agentCanEnable,
+    mcpServers: from.mcpServers
+  })
+});
+var migrations = [
+  _migration
+];
 
 // src/Credential.ts
 var Credential_exports = {};
@@ -345,6 +408,23 @@ var CredentialsService = class _CredentialsService extends Context3.Tag("@dxos/f
   });
 };
 
+// src/LayerSpec.ts
+var LayerSpec_exports = {};
+__export(LayerSpec_exports, {
+  TypeId: () => TypeId,
+  make: () => make4
+});
+var TypeId = "~@dxos/functions/LayerSpec";
+var make4 = (opts, make11) => {
+  return {
+    [TypeId]: TypeId,
+    affinity: opts.affinity,
+    requires: opts.requires,
+    provides: opts.provides,
+    make: make11
+  };
+};
+
 // src/Process.ts
 var Process_exports = {};
 __export(Process_exports, {
@@ -356,7 +436,7 @@ __export(Process_exports, {
   State: () => State,
   fromOperation: () => fromOperation,
   isProcess: () => isProcess,
-  make: () => make4,
+  make: () => make5,
   prettyProcessTree: () => prettyProcessTree
 });
 import * as Context5 from "effect/Context";
@@ -368,20 +448,28 @@ import { log as log4 } from "@dxos/log";
 // src/Trace.ts
 var Trace_exports = {};
 __export(Trace_exports, {
+  CommonRuntimeName: () => CommonRuntimeName,
   Event: () => Event,
   EventType: () => EventType,
   Message: () => Message,
   MessageData: () => MessageData,
   Meta: () => Meta,
   OperationEnd: () => OperationEnd,
+  OperationInput: () => OperationInput,
+  OperationOutput: () => OperationOutput,
   OperationStart: () => OperationStart,
+  RuntimeName: () => RuntimeName,
   StatusUpdate: () => StatusUpdate,
   TraceService: () => TraceService,
   TraceSink: () => TraceSink,
   emitStatus: () => emitStatus,
+  flatten: () => flatten3,
+  isEdgeRuntime: () => isEdgeRuntime,
   isOfType: () => isOfType,
   layerConsole: () => layerConsole,
   layerNoop: () => layerNoop,
+  mergeSinks: () => mergeSinks,
+  noopSink: () => noopSink,
   noopWriter: () => noopWriter,
   testTraceService: () => testTraceService,
   write: () => write,
@@ -389,7 +477,7 @@ __export(Trace_exports, {
 });
 import * as Context4 from "effect/Context";
 import * as Effect5 from "effect/Effect";
-import * as Layer2 from "effect/Layer";
+import * as Layer3 from "effect/Layer";
 import * as Schema4 from "effect/Schema";
 import { Annotation as Annotation2, Obj as Obj2, Type as Type2 } from "@dxos/echo";
 import { log as log3 } from "@dxos/log";
@@ -421,11 +509,26 @@ var Event = Schema4.Struct({
 var isOfType = (eventType, event) => {
   return event.type === eventType.key;
 };
+var RuntimeName = Schema4.String.pipe(Schema4.brand("@dxos/compute/Trace/RuntimeName"));
+var CommonRuntimeName = {
+  /**
+  * Web app / CLI / Desktop app / Mobile app.
+  */
+  local: RuntimeName.make("local"),
+  edgeIntrinsic: RuntimeName.make("edge-intrinsic"),
+  edgeWorkerLoader: RuntimeName.make("edge-worker-loader"),
+  edgeWorkerForPlatforms: RuntimeName.make("edge-worker-for-platforms")
+};
 var Meta = Schema4.Struct({
   pid: Schema4.optional(Schema4.String),
   parentPid: Schema4.optional(Schema4.String),
   processName: Schema4.optional(Schema4.String),
   /**
+  * Space the message was produced in.
+  * Stored as a string to avoid circular dependency on `@dxos/keys`.
+  */
+  space: Schema4.optional(Schema4.String),
+  /**
   * ID of the conversation feed object if present.
   */
   conversationId: Schema4.optional(Obj2.ID),
@@ -436,8 +539,13 @@ var Meta = Schema4.Struct({
   /**
   * ID of the tool call that created the current process.
   */
-  toolCallId: Schema4.optional(Schema4.String)
+  toolCallId: Schema4.optional(Schema4.String),
+  /**
+  * Extensible name informing which runtime executed the code that produced the event.
+  */
+  runtimeName: Schema4.optional(RuntimeName)
 });
+var isEdgeRuntime = (name) => name === CommonRuntimeName.edgeIntrinsic || name === CommonRuntimeName.edgeWorkerLoader || name === CommonRuntimeName.edgeWorkerForPlatforms;
 var MessageData = Schema4.Struct({
   meta: Meta,
   isEphemeral: Schema4.Boolean,
@@ -450,24 +558,49 @@ var Message = MessageData.pipe(Type2.object({
   icon: "ph--note--regular",
   hue: "rose"
 }));
+var flatten3 = (message) => {
+  return message.events.map((event) => ({
+    ...event,
+    meta: message.meta,
+    isEphemeral: message.isEphemeral
+  }));
+};
 var TraceSink = class extends Context4.Tag("@dxos/functions/TraceSink")() {
 };
 var noopWriter = {
   write: () => {
   }
 };
-var writerLayerNoop = Layer2.succeed(TraceService, noopWriter);
-var layerNoop = Layer2.succeed(TraceSink, {
+var writerLayerNoop = Layer3.succeed(TraceService, noopWriter);
+var noopSink = {
   write: () => {
   }
-});
-var layerConsole = Layer2.succeed(TraceSink, {
+};
+var layerNoop = Layer3.succeed(TraceSink, noopSink);
+var layerConsole = Layer3.succeed(TraceSink, {
   write: (message) => {
     console.log(message);
   }
 });
-var testTraceService = (opts = {}) => Layer2.effect(TraceService, Effect5.gen(function* () {
+var mergeSinks = (sinks) => {
+  if (sinks.length === 0) {
+    return noopSink;
+  }
+  return {
+    write: (message) => {
+      for (const sink of sinks) {
+        try {
+          sink.write(message);
+        } catch (err) {
+          console.error("[trace] sink.write threw", err);
+        }
+      }
+    }
+  };
+};
+var testTraceService = (opts = {}) => Layer3.effect(TraceService, Effect5.gen(function* () {
   const sink = yield* TraceSink;
+  const clock = opts.clock ?? Date.now;
   return {
     write: (event, data) => {
       sink.write(Obj2.make(Message, {
@@ -476,7 +609,7 @@ var testTraceService = (opts = {}) => Layer2.effect(TraceService, Effect5.gen(fu
         events: [
           {
             type: event.key,
-            timestamp: Date.now(),
+            timestamp: clock(),
             data
           }
         ]
@@ -506,6 +639,28 @@ var OperationEnd = EventType("operation.end", {
   }),
   isEphemeral: false
 });
+var OperationInput = EventType("operation.input", {
+  schema: Schema4.Struct({
+    /** Operation key. */
+    key: Schema4.String,
+    /** Human-readable operation name. */
+    name: Schema4.optional(Schema4.String),
+    /** Raw operation input. Shape determined by the operation definition. */
+    input: Schema4.Unknown
+  }),
+  isEphemeral: true
+});
+var OperationOutput = EventType("operation.output", {
+  schema: Schema4.Struct({
+    /** Operation key. */
+    key: Schema4.String,
+    /** Human-readable operation name. */
+    name: Schema4.optional(Schema4.String),
+    /** Raw operation output. Shape determined by the operation definition. */
+    output: Schema4.Unknown
+  }),
+  isEphemeral: true
+});
 var StatusUpdate = EventType("status.update", {
   schema: Schema4.Struct({
     /** Human-readable status message. */
@@ -522,7 +677,7 @@ var __dxlog_file4 = "/__w/dxos/dxos/packages/core/compute/compute/src/Process.ts
 var ID = Schema5.String.pipe(Schema5.brand("ProcessId"));
 var ProcessTypeId = "~@dxos/functions/Process";
 var isProcess = (executable) => typeof executable === "object" && executable !== null && ProcessTypeId in executable;
-var make4 = (opts, create) => {
+var make5 = (opts, create) => {
   assertArgument(/^[a-z0-9]([a-z0-9.\-/]*[a-z0-9])?$/i.test(opts.key), "key", "Invalid key");
   return {
     [ProcessTypeId]: {},
@@ -536,7 +691,7 @@ var make4 = (opts, create) => {
     })))
   };
 };
-var fromOperation = (op, handler) => make4({
+var fromOperation = (op, handler) => make5({
   key: op.meta.key,
   input: op.input,
   output: op.output,
@@ -553,10 +708,20 @@ var fromOperation = (op, handler) => make4({
         key: op.meta.key,
         name: op.meta.name
       });
+      yield* write(OperationInput, {
+        key: op.meta.key,
+        name: op.meta.name,
+        input
+      });
       const opHandler = yield* getHandler(handler, op).pipe(Effect6.orDie);
       const output = yield* opHandler.handler(input).pipe(Effect6.orDie, Effect6.withSpan(op.meta.key));
       ctx.submitOutput(output);
       ctx.succeed();
+      yield* write(OperationOutput, {
+        key: op.meta.key,
+        name: op.meta.name,
+        output
+      });
       yield* write(OperationEnd, {
         key: op.meta.key,
         name: op.meta.name,
@@ -659,41 +824,25 @@ var prettyProcessTree = (tree) => {
 var Routine_exports = {};
 __export(Routine_exports, {
   Routine: () => Routine,
-  make: () => make5
+  make: () => make6
 });
 import * as Schema6 from "effect/Schema";
 import { Annotation as Annotation3, JsonSchema, Obj as Obj3, Ref as Ref2, Type as Type3 } from "@dxos/echo";
 var Routine = Schema6.Struct({
-  /**
-  * Name of the routine.
-  */
   name: Schema6.optional(Schema6.String),
-  /**
-  * Description of the routine's purpose and functionality.
-  * Allows AI agents to execute routines automatically as tools.
-  */
   description: Schema6.optional(Schema6.String),
-  /**
-  * Input schema of the routine.
-  */
-  input: JsonSchema.JsonSchema.pipe(Annotation3.FormInputAnnotation.set(false)),
-  /**
-  * Output schema of the routine.
-  */
-  output: JsonSchema.JsonSchema.pipe(Annotation3.FormInputAnnotation.set(false)),
-  /**
-  * Natural language instructions for the routine.
-  * These should provide concrete course of action for the AI to follow.
-  */
+  input: JsonSchema.JsonSchema.pipe(Annotation3.FormInputAnnotation.set(false)).annotations({
+    description: "Input schema"
+  }),
+  output: JsonSchema.JsonSchema.pipe(Annotation3.FormInputAnnotation.set(false)).annotations({
+    description: "Output schema"
+  }),
   // TODO(burdon): Form editor.
-  instructions: Template.pipe(Annotation3.FormInputAnnotation.set(false)),
-  /**
-  * Blueprints that the routine may utilize.
-  */
+  instructions: Template.pipe(Annotation3.FormInputAnnotation.set(false)).annotations({
+    description: "Agent instructions"
+  }),
   blueprints: Schema6.Array(Ref2.Ref(Blueprint)),
-  /**
-  * Additional context that the routine may utilize.
-  */
+  // TODO(burdon): Change to map?
   context: Schema6.Array(Schema6.Any).pipe(Annotation3.FormInputAnnotation.set(false))
 }).pipe(Type3.object({
   typename: "org.dxos.type.routine",
@@ -704,23 +853,23 @@ var Routine = Schema6.Struct({
   icon: "ph--scroll--regular",
   hue: "sky"
 }));
-var make5 = (params) => Obj3.make(Routine, {
-  name: params.name,
-  description: params.description,
-  input: JsonSchema.toJsonSchema(params.input ?? Schema6.Void),
-  output: JsonSchema.toJsonSchema(params.output ?? Schema6.Void),
+var make6 = ({ name, description, input, output, instructions, blueprints = [], context = [] }) => Obj3.make(Routine, {
+  name,
+  description,
+  input: JsonSchema.toJsonSchema(input ?? Schema6.Void),
+  output: JsonSchema.toJsonSchema(output ?? Schema6.Void),
   instructions: make({
-    source: params.instructions
+    source: instructions
   }),
-  blueprints: params.blueprints ?? [],
-  context: params.context ?? []
+  blueprints,
+  context
 });
 
 // src/Script.ts
 var Script_exports = {};
 __export(Script_exports, {
   Script: () => Script,
-  make: () => make6
+  make: () => make7
 });
 import * as Schema7 from "effect/Schema";
 import { Annotation as Annotation4, Obj as Obj4, Ref as Ref3, Type as Type4 } from "@dxos/echo";
@@ -742,7 +891,7 @@ var Script = Schema7.Struct({
   icon: "ph--code--regular",
   hue: "sky"
 }));
-var make6 = ({ source = "", ...props } = {}) => Obj4.make(Script, {
+var make7 = ({ source = "", ...props } = {}) => Obj4.make(Script, {
   ...props,
   source: Ref3.make(Text2.make({
     content: source
@@ -758,15 +907,16 @@ __export(ServiceResolver_exports, {
   fromContext: () => fromContext,
   fromRequirements: () => fromRequirements,
   layerRequirements: () => layerRequirements,
-  make: () => make8,
+  make: () => make9,
+  provide: () => provide,
   resolve: () => resolve3,
   resolveAll: () => resolveAll,
-  succeed: () => succeed2
+  succeed: () => succeed3
 });
 import * as Context6 from "effect/Context";
 import * as Effect7 from "effect/Effect";
 import * as Either from "effect/Either";
-import * as Layer3 from "effect/Layer";
+import * as Layer4 from "effect/Layer";
 import * as Option from "effect/Option";
 var ServiceResolverTypeId = "~@dxos/functions/ServiceResolver";
 var ServiceResolver = Context6.GenericTag("@dxos/functions/ServiceResolver");
@@ -775,8 +925,8 @@ var resolveAll = (tags, context) => Effect7.gen(function* () {
   const services = yield* Effect7.forEach(tags, (tag) => resolve3(tag, context).pipe(Effect7.map((service) => Context6.make(tag, service))));
   return Context6.mergeAll(...services);
 });
-var succeed2 = (tag, getService) => {
-  return make8((tag1, context) => {
+var succeed3 = (tag, getService) => {
+  return make9((tag1, context) => {
     if (tag1.key !== tag.key) {
       return Effect7.fail(new ServiceNotAvailableError(`Service not available: ${String(tag.key ?? tag)}`));
     }
@@ -784,11 +934,11 @@ var succeed2 = (tag, getService) => {
     return service;
   });
 };
-var make8 = (resolveFn) => ({
+var make9 = (resolveFn) => ({
   [ServiceResolverTypeId]: ServiceResolverTypeId,
   resolve: resolveFn
 });
-var fromContext = (ctx) => make8((tag, context) => Effect7.gen(function* () {
+var fromContext = (ctx) => make9((tag, context) => Effect7.gen(function* () {
   const service = Context6.getOption(ctx, tag);
   if (Option.isNone(service)) {
     return yield* Effect7.fail(new ServiceNotAvailableError(String(tag.key ?? tag)));
@@ -797,7 +947,7 @@ var fromContext = (ctx) => make8((tag, context) => Effect7.gen(function* () {
 }));
 var fromRequirements = (...tags) => Effect7.contextWith((parentCtx) => {
   const available = new Set(tags.map((tag) => tag.key));
-  return make8((tag, context) => Effect7.gen(function* () {
+  return make9((tag, context) => Effect7.gen(function* () {
     let result = Context6.empty();
     if (!available.has(tag.key)) {
       return yield* Effect7.fail(new ServiceNotAvailableError(String(tag.key ?? tag)));
@@ -809,8 +959,9 @@ var fromRequirements = (...tags) => Effect7.contextWith((parentCtx) => {
     return service.value;
   }));
 });
-var layerRequirements = (...tags) => Layer3.effect(ServiceResolver, fromRequirements(...tags));
-var compose = (...resolvers) => make8((tag, context) => Effect7.gen(function* () {
+var layerRequirements = (...tags) => Layer4.effect(ServiceResolver, fromRequirements(...tags));
+var provide = (context, ...tags) => Layer4.scopedContext(resolveAll(tags, context));
+var compose = (...resolvers) => make9((tag, context) => Effect7.gen(function* () {
   for (const resolver of resolvers) {
     const single = yield* resolver.resolve(tag, context).pipe(Effect7.either);
     if (Either.isRight(single)) {
@@ -819,7 +970,7 @@ var compose = (...resolvers) => make8((tag, context) => Effect7.gen(function* ()
   }
   return yield* Effect7.fail(new ServiceNotAvailableError(String(tag.key ?? tag)));
 }));
-var empty2 = make8((tag, context) => {
+var empty2 = make9((tag, context) => {
   return Effect7.fail(new ServiceNotAvailableError(String(tag.key ?? tag)));
 });
 
@@ -834,7 +985,7 @@ __export(Trigger_exports, {
   TimerSpec: () => TimerSpec,
   Trigger: () => Trigger,
   WebhookSpec: () => WebhookSpec,
-  make: () => make9,
+  make: () => make10,
   specEmail: () => specEmail,
   specFeed: () => specFeed,
   specQueue: () => specQueue,
@@ -869,9 +1020,9 @@ var QueueSpec = Schema8.Struct({
   // TODO(dmaretskyi): Rename to `feed` and change to a reference.
   queue: DXN.Schema
 });
-var specQueue = (queueDxn) => ({
+var specQueue = (queueDXN) => ({
   kind: "queue",
-  queue: queueDxn
+  queue: queueDXN
 });
 var specFeed = (feed) => specQueue(Feed.getQueueDxn(feed)?.toString() ?? failedInvariant(new Error("Could not extract DXN from feed")));
 var SubscriptionSpec = Schema8.Struct({
@@ -989,7 +1140,7 @@ var TriggerSchema = Schema8.Struct({
   hue: "yellow"
 }), SystemTypeAnnotation.set(true));
 var Trigger = TriggerSchema;
-var make9 = (props) => Obj5.make(Trigger, props);
+var make10 = (props) => Obj5.make(Trigger, props);
 
 // src/TriggerEvent.ts
 var TriggerEvent_exports = {};
@@ -1053,6 +1204,7 @@ export {
   InvalidOperationInputError,
   InvalidOperationOutputError,
   InvokerNotInitializedError,
+  LayerSpec_exports as LayerSpec,
   McpServer_exports as McpServer,
   NoHandlerError,
   Operation_exports as Operation,