@opencode/core 2.0.3 → 2.0.5

package/dist/chunks/{mime-4nncm24z.js → instruction-discovery-tmp7mf59.js}

@@ -1,32 +1,32 @@
 import {
-  Service79,
-  node84
-} from "./mime-3wjgak91.js";
+  Service81,
+  node85
+} from "./instruction-discovery-7kvy0jtg.js";
 import {
-  Service26,
-  node30
-} from "./mime-53c48grp.js";
+  Service33,
+  node36
+} from "./instruction-discovery-q2bxhs6b.js";
 import {
-  Service41,
-  node44
-} from "./mime-z3zadmjk.js";
+  Service55,
+  node58
+} from "./instruction-discovery-zmz7rfv6.js";
 import {
-  Service67,
-  node72
-} from "./mime-yz87v98p.js";
+  Service34,
+  node37
+} from "./instruction-discovery-vcye14pz.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/tool/mcp.ts
 var exports_mcp3 = {};
 __export(exports_mcp3, {
   McpTool: () => exports_mcp3,
-  Service: () => Service25,
-  layer: () => layer10,
+  Service: () => Service27,
+  layer: () => layer12,
   name: () => name13,
   namespace: () => namespace2,
-  node: () => node29
+  node: () => node30
 });
 import { ToolFailure } from "@opencode/ai";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -35,30 +35,24 @@ import { makeLocationNode } from "@opencode/util/effect/app-node";
 var namespace2 = (server) => server.replace(/[^a-zA-Z0-9_-]/g, "_");
 var name13 = (server, tool) => `${namespace2(server)}_${tool.replace(/[^a-zA-Z0-9_-]/g, "_")}`;
 
-class Service25 extends Context.Service()("@opencode/McpTool") {
+class Service27 extends Context.Service()("@opencode/McpTool") {
 }
-var layer10 = Layer.effect(Service25, Effect.gen(function* () {
-  const mcp = yield* Service26;
-  const tools = yield* Service67;
-  const bus = yield* Service79;
-  const permission = yield* Service41;
+var layer12 = Layer.effect(Service27, Effect.gen(function* () {
+  const mcp = yield* Service33;
+  const tools = yield* Service34;
+  const bus = yield* Service81;
+  const permission = yield* Service55;
   const lock = Semaphore.makeUnsafe(1);
   let discovered = [];
   const initial = yield* lock.withPermit(Effect.gen(function* () {
     discovered = yield* mcp.tools();
     yield* tools.transform((editor) => {
       for (const tool of discovered) {
-        const schema = tool.inputSchema ?? {};
         editor.add({
           name: tool.name,
           options: { namespace: namespace2(tool.server), codemode: tool.codemode !== false },
           description: tool.description ?? "",
-          input: {
-            ...schema,
-            type: "object",
-            properties: schema.properties ?? {},
-            additionalProperties: false
-          },
+          input: tool.inputSchema ?? { type: "object", properties: {} },
           output: tool.outputSchema ?? {},
           execute: (input, context) => Effect.gen(function* () {
             yield* permission.assert({
@@ -124,12 +118,12 @@ var layer10 = Layer.effect(Service25, Effect.gen(function* () {
   yield* bus.subscribe(McpEvent.ToolsChanged).pipe(Stream.runForEach(() => PubSub.publish(changes, undefined)), Effect.forkScoped({ startImmediately: true }));
   const updates = yield* PubSub.subscribe(changes);
   yield* Stream.fromSubscription(updates).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reconcile), Effect.forkScoped({ startImmediately: true }));
-  return Service25.of({ flush: Effect.asVoid(Fiber.await(initial)) });
+  return Service27.of({ flush: Effect.asVoid(Fiber.await(initial)) });
 }));
-var node29 = makeLocationNode({
-  service: Service25,
-  layer: layer10,
-  deps: [node72, node30, node84, node44]
+var node30 = makeLocationNode({
+  service: Service27,
+  layer: layer12,
+  deps: [node37, node36, node85, node58]
 });
 
-export { namespace2, name13, Service25, layer10, node29, exports_mcp3 };
+export { namespace2, name13, Service27, layer12, node30, exports_mcp3 };

package/dist/chunks/{mime-0f9vejxt.js → instruction-discovery-tr16pgkv.js}

@@ -1,24 +1,24 @@
 import {
   ephemeral2,
-  Service79,
-  node84
-} from "./mime-3wjgak91.js";
+  Service81,
+  node85
+} from "./instruction-discovery-7kvy0jtg.js";
 import {
-  Key3,
+  Key4,
   unavailable3,
   removed2,
-  make17,
+  make19,
   diffByKey2
-} from "./mime-02a7j1yb.js";
+} from "./instruction-discovery-gbt6w4kb.js";
 import {
   AbsolutePath2
-} from "./mime-922hggd3.js";
+} from "./instruction-discovery-922hggd3.js";
 import {
   create3
-} from "./mime-kg06axw8.js";
+} from "./instruction-discovery-rdw6cm16.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/instruction-discovery.ts
 var exports_instruction_discovery = {};
@@ -26,11 +26,11 @@ __export(exports_instruction_discovery, {
   Event: () => Event9,
   File: () => File2,
   InstructionDiscovery: () => exports_instruction_discovery,
-  Options: () => Options4,
-  Service: () => Service45,
-  configured: () => configured4,
-  layer: () => layer17,
-  node: () => node48
+  Options: () => Options9,
+  Service: () => Service46,
+  configured: () => configured9,
+  layer: () => layer21,
+  node: () => node50
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -41,19 +41,19 @@ class File2 extends Schema.Class("InstructionDiscovery.File")({
 }) {
 }
 var Files = Schema.Array(File2);
-var key = Key3.make("core/instructions");
+var key = Key4.make("core/instructions");
 var Event9 = {
   Updated: ephemeral2({ type: "instruction-discovery.updated", schema: {} })
 };
-var Options4 = Schema.Struct({
+var Options9 = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
   global: Schema.optional(Schema.Boolean)
 });
 
-class Service45 extends Context.Service()("@opencode/InstructionDiscovery") {
+class Service46 extends Context.Service()("@opencode/InstructionDiscovery") {
 }
-var layer17 = (options) => Layer.effect(Service45, Effect.gen(function* () {
-  const bus = yield* Service79;
+var layer21 = (options) => Layer.effect(Service46, Effect.gen(function* () {
+  const bus = yield* Service81;
   const state = create3({
     name: "instruction-discovery",
     initial: () => ({ files: new Map, available: true }),
@@ -74,7 +74,7 @@ var layer17 = (options) => Layer.effect(Service45, Effect.gen(function* () {
     }),
     notify: () => bus.publish(Event9.Updated, {}).pipe(Effect.asVoid)
   });
-  const source = (value) => make17({
+  const source = (value) => make19({
     key,
     codec: Schema.toCodecJson(Files),
     read: Effect.succeed(value),
@@ -90,7 +90,7 @@ var layer17 = (options) => Layer.effect(Service45, Effect.gen(function* () {
       return unavailable3;
     return Array.from(current.files.values());
   });
-  return Service45.of({
+  return Service46.of({
     project: options?.project !== false,
     global: options?.global !== false,
     transform: state.transform,
@@ -104,14 +104,14 @@ var layer17 = (options) => Layer.effect(Service45, Effect.gen(function* () {
     })
   });
 }));
-function configured4(options) {
+function configured9(options) {
   return makeLocationNode({
-    service: Service45,
-    layer: layer17(options),
-    deps: [node84]
+    service: Service46,
+    layer: layer21(options),
+    deps: [node85]
   });
 }
-var node48 = configured4();
+var node50 = configured9();
 function render(files) {
   return files.map((file) => `Instructions from: ${file.path}
 ${file.content}`).join(`
@@ -142,4 +142,4 @@ ${render([after])}`;
 `);
 }
 
-export { File2, Event9, Options4, Service45, layer17, configured4, node48, exports_instruction_discovery };
+export { File2, Event9, Options9, Service46, layer21, configured9, node50, exports_instruction_discovery };

package/dist/chunks/{mime-1ajjaskr.js → instruction-discovery-ts9rs282.js}

@@ -1,33 +1,33 @@
 import {
-  Service80,
-  node85
-} from "./mime-bhp9fn5h.js";
+  Service82,
+  node86
+} from "./instruction-discovery-wjck36vb.js";
 import {
   PermissionTable2
-} from "./mime-f828m53h.js";
+} from "./instruction-discovery-f828m53h.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/permission/saved.ts
 var exports_saved = {};
 __export(exports_saved, {
   AddInput: () => AddInput2,
-  ID: () => ID7,
-  Info: () => Info8,
-  ListInput: () => ListInput3,
+  ID: () => ID5,
+  Info: () => Info18,
+  ListInput: () => ListInput4,
   PermissionSaved: () => exports_saved,
-  Service: () => Service42,
-  node: () => node45
+  Service: () => Service56,
+  node: () => node59
 });
 import { eq } from "drizzle-orm";
-import { Context, Effect, Layer, Schema } from "effect";
+import { Context, DateTime, Effect, Layer, Schema } from "effect";
 import { Project } from "@opencode/schema/project";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
 import { PermissionSaved } from "@opencode/schema/permission-saved";
-var ID7 = PermissionSaved.ID;
-var Info8 = PermissionSaved.Info;
-var ListInput3 = Schema.Struct({
+var ID5 = PermissionSaved.ID;
+var Info18 = PermissionSaved.Info;
+var ListInput4 = Schema.Struct({
   projectID: Project.ID.pipe(Schema.optional)
 }).annotate({ identifier: "PermissionSaved.ListInput" });
 var AddInput2 = Schema.Struct({
@@ -36,24 +36,28 @@ var AddInput2 = Schema.Struct({
   resources: Schema.Array(Schema.String)
 }).annotate({ identifier: "PermissionSaved.AddInput" });
 
-class Service42 extends Context.Service()("@opencode/PermissionSaved") {
+class Service56 extends Context.Service()("@opencode/PermissionSaved") {
 }
-var layer = Layer.effect(Service42, Effect.gen(function* () {
-  const db = (yield* Service80).db;
+var layer = Layer.effect(Service56, Effect.gen(function* () {
+  const db = (yield* Service82).db;
   const list = Effect.fnUntraced(function* (input) {
     const rows = yield* db.select().from(PermissionTable2).where(input?.projectID ? eq(PermissionTable2.project_id, input.projectID) : undefined).all().pipe(Effect.orDie);
     return rows.map((row) => ({
       id: row.id,
       projectID: row.project_id,
       action: row.action,
-      resource: row.resource
+      resource: row.resource,
+      time: {
+        created: DateTime.makeUnsafe(row.time_created),
+        updated: DateTime.makeUnsafe(row.time_updated)
+      }
     }));
   });
   const add = Effect.fn("PermissionSaved.add")(function* (input) {
     if (!input.resources.length)
       return;
     yield* db.insert(PermissionTable2).values(input.resources.map((resource) => ({
-      id: ID7.create(),
+      id: ID5.create(),
       project_id: input.projectID,
       action: input.action,
       resource
@@ -62,8 +66,8 @@ var layer = Layer.effect(Service42, Effect.gen(function* () {
   const remove = Effect.fn("PermissionSaved.remove")(function* (id) {
     yield* db.delete(PermissionTable2).where(eq(PermissionTable2.id, id)).run().pipe(Effect.orDie);
   });
-  return Service42.of({ list, add, remove });
+  return Service56.of({ list, add, remove });
 }));
-var node45 = makeGlobalNode({ service: Service42, layer, deps: [node85] });
+var node59 = makeGlobalNode({ service: Service56, layer, deps: [node86] });
 
-export { ID7, Info8, ListInput3, AddInput2, Service42, node45, exports_saved };
+export { ID5, Info18, ListInput4, AddInput2, Service56, node59, exports_saved };

package/dist/chunks/{mime-3zpd0x8a.js → instruction-discovery-ttdfrrk2.js}

@@ -1,18 +1,18 @@
 import {
   AbsolutePath2
-} from "./mime-922hggd3.js";
+} from "./instruction-discovery-922hggd3.js";
 import {
-  Service66
-} from "./mime-bawj3v5d.js";
+  Service76
+} from "./instruction-discovery-88dkmhka.js";
 import {
   Service14
-} from "./mime-ar6rwxgq.js";
+} from "./instruction-discovery-fw3v8b4w.js";
 import {
-  Service10
-} from "./mime-z3af23pk.js";
+  Service7
+} from "./instruction-discovery-ab258zec.js";
 import {
   NotFound2
-} from "./mime-2a5m3afh.js";
+} from "./instruction-discovery-2a5m3afh.js";
 import {
   MEDIA_MIMES2,
   BinaryFileError2,
@@ -24,25 +24,25 @@ import {
   TextPage2,
   ListPage2,
   Service6
-} from "./mime-ggch0ev5.js";
+} from "./instruction-discovery-f7n6j563.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/tool/plugin/read.ts
 var exports_read = {};
 __export(exports_read, {
-  Input: () => Input4,
-  Plugin: () => Plugin18,
+  Input: () => Input2,
+  Plugin: () => Plugin2,
   ReadTool: () => exports_read,
-  name: () => name4,
-  toModelContent: () => toModelContent4
+  name: () => name2,
+  toModelContent: () => toModelContent2
 });
 import { basename, dirname, join } from "path";
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import { FSUtil } from "@opencode/util/fs-util";
-var name4 = "read";
+var name2 = "read";
 var FILENAME = "AGENTS.md";
 var LocationInput = Schema.Struct({
   path: Schema.String.annotate({ description: "File or directory to read" }),
@@ -53,21 +53,21 @@ var LocationInput = Schema.Struct({
     description: "The maximum number of lines or directory entries to read (defaults to 2000)"
   })
 });
-var Input4 = LocationInput;
+var Input2 = LocationInput;
 var Output = Schema.Union([FileContent2, TextPage2, ListPage2]);
-var Plugin18 = {
+var Plugin2 = {
   id: "opencode.tool.read",
   effect: Effect.fn("ReadTool.Plugin")(function* (ctx) {
     const reader = yield* Service6;
     const access = yield* Service14;
-    const sessionInstructions = yield* Service10;
+    const sessionInstructions = yield* Service7;
     const fs = yield* FSUtil.Service;
-    const location = yield* Service66;
+    const location = yield* Service76;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name4,
+      name: name2,
       options: { codemode: false },
       description: "Read the contents of a file or directory. Supports text files, images, and PDFs. Images and PDFs are presented directly to the model. Each text line is prefixed by its 1-based line number as <line>: <content>. The prefix is for reference and is not part of the file content. Directory entries are returned one per line. Use offset and limit to read large files or directories in sections. Prefer one larger read over many small slices, and use grep to find specific content in large files.",
-      input: Input4,
+      input: Input2,
       output: Output,
       execute: (input, context) => {
         return Effect.gen(function* () {
@@ -112,7 +112,7 @@ var Plugin18 = {
           return { output: result.content, path: result.path };
         }).pipe(Effect.map((result) => ({
           output: result.output,
-          content: toModelContent4(result.path, input.offset, result.output),
+          content: toModelContent2(result.path, input.offset, result.output),
           metadata: { truncated: result.output.type === "file" ? false : result.output.truncated }
         })), Effect.mapError((error) => {
           if (error instanceof ToolFailure)
@@ -144,7 +144,7 @@ ${suggestions.join(`
     });
   })
 };
-var toModelContent4 = (path, offset, output) => {
+var toModelContent2 = (path, offset, output) => {
   if (output.type === "file" && output.encoding === "base64")
     return [
       { type: "text", text: output.mime === "application/pdf" ? "PDF read successfully" : "Image read successfully" },
@@ -180,4 +180,4 @@ var toModelContent4 = (path, offset, output) => {
 `);
 };
 
-export { name4, Input4, Plugin18, toModelContent4, exports_read };
+export { name2, Input2, Plugin2, toModelContent2, exports_read };

package/dist/chunks/{mime-tvtrv512.js → instruction-discovery-tvtrv512.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/id/id.ts
 var exports_id = {};

package/dist/chunks/{mime-s6khr2z3.js → instruction-discovery-v5w6sppg.js}

@@ -1,28 +1,29 @@
 import {
-  Service79,
-  node84
-} from "./mime-3wjgak91.js";
+  Service81,
+  node85
+} from "./instruction-discovery-7kvy0jtg.js";
 import {
-  Key4,
-  Service77,
-  node82
-} from "./mime-y1hy1c31.js";
+  Key3,
+  Service64,
+  node67
+} from "./instruction-discovery-444wcx0m.js";
 import {
   create3
-} from "./mime-kg06axw8.js";
+} from "./instruction-discovery-rdw6cm16.js";
 import {
   validateAnswer2,
   validateFields2
-} from "./mime-g7nm1tr2.js";
+} from "./instruction-discovery-0a3qk1rf.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/integration.ts
 var exports_integration = {};
 __export(exports_integration, {
   Attempt: () => Attempt2,
   AttemptID: () => AttemptID2,
+  AttemptNotFoundError: () => AttemptNotFoundError2,
   AttemptStatus: () => AttemptStatus2,
   AuthorizationError: () => AuthorizationError2,
   CodeRequiredError: () => CodeRequiredError2,
@@ -30,17 +31,17 @@ __export(exports_integration, {
   CommandAttemptStatus: () => CommandAttemptStatus2,
   CommandMethod: () => CommandMethod2,
   EnvMethod: () => EnvMethod2,
-  Event: () => Event18,
-  ID: () => ID14,
-  Info: () => Info29,
+  Event: () => Event14,
+  ID: () => ID10,
+  Info: () => Info25,
   Integration: () => exports_integration,
   KeyMethod: () => KeyMethod2,
   Method: () => Method2,
   MethodID: () => MethodID2,
   OAuthMethod: () => OAuthMethod2,
   Ref: () => Ref3,
-  Service: () => Service76,
-  node: () => node81
+  Service: () => Service62,
+  node: () => node65
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import {
@@ -61,8 +62,8 @@ import {
 import { Integration } from "@opencode/schema/integration";
 import { AppProcess } from "@opencode/util/process";
 import { ChildProcess } from "effect/unstable/process";
-import { Event as Event18 } from "@opencode/schema/integration";
-var ID14 = Integration.ID;
+import { Event as Event14 } from "@opencode/schema/integration";
+var ID10 = Integration.ID;
 var MethodID2 = Integration.MethodID;
 var AttemptID2 = Integration.AttemptID;
 var OAuthMethod2 = Integration.OAuthMethod;
@@ -70,7 +71,7 @@ var CommandMethod2 = Integration.CommandMethod;
 var KeyMethod2 = Integration.KeyMethod;
 var EnvMethod2 = Integration.EnvMethod;
 var Method2 = Integration.Method;
-var Info29 = Integration.Info;
+var Info25 = Integration.Info;
 var Attempt2 = Integration.Attempt;
 var AttemptStatus2 = Integration.AttemptStatus;
 var CommandAttempt2 = Integration.CommandAttempt;
@@ -83,18 +84,30 @@ class CodeRequiredError2 extends Schema.TaggedError()("Integration.CodeRequired"
 
 class AuthorizationError2 extends Schema.TaggedError()("Integration.Authorization", {
   cause: Schema.Defect()
+}) {
+  get message() {
+    const cause = this.cause;
+    if (cause instanceof Error && cause.message)
+      return cause.message;
+    return "Authorization failed";
+  }
+}
+
+class AttemptNotFoundError2 extends Schema.TaggedError()("Integration.AttemptNotFound", {
+  integrationID: ID10,
+  attemptID: AttemptID2
 }) {
 }
 var Ref3 = Integration.Ref;
 
-class Service76 extends Context.Service()("@opencode/Integration") {
+class Service62 extends Context.Service()("@opencode/Integration") {
 }
 var attemptLifetime = Duration.toMillis(Duration.minutes(10));
 var terminalRetention = Duration.toMillis(Duration.minutes(1));
 var scrubInterval = Duration.seconds(30);
-var layer = Layer.effect(Service76, Effect.gen(function* () {
-  const credentials = yield* Service77;
-  const bus = yield* Service79;
+var layer = Layer.effect(Service62, Effect.gen(function* () {
+  const credentials = yield* Service64;
+  const bus = yield* Service81;
   const processes = yield* AppProcess.Service;
   const scope = yield* Scope.Scope;
   const attempts = SynchronizedRef.makeUnsafe(new Map);
@@ -187,7 +200,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     const env = (entry?.methods ?? []).filter((method) => method.type === "env").flatMap((method) => method.names.filter((name) => process.env[name])).map((name) => ({ type: "env", name }));
     return [...credentials, ...env];
   };
-  const project = (entry, connections) => Info29.make({
+  const project = (entry, connections) => Info25.make({
     id: entry.ref.id,
     name: entry.ref.name,
     ...entry.ref.metadata === undefined ? {} : { metadata: entry.ref.metadata },
@@ -271,7 +284,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     const persistence = yield* createCredential({
       integrationID: attempt.integrationID,
       label: attempt.label,
-      value: Key4.make({ type: "key", key: exit.value })
+      value: Key3.make({ type: "key", key: exit.value })
     }).pipe(Effect.asVoid, Effect.exit);
     const settledAt = yield* Clock.currentTimeMillis;
     const terminal = Exit.isSuccess(persistence) ? {
@@ -417,9 +430,10 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     }).pipe(Scope.provide(attemptScope), Effect.exit, Effect.flatMap((exit) => settleCommand(attemptID, exit)), Effect.forkIn(attemptScope, { startImmediately: true }));
     return CommandAttempt2.make({ attemptID, time });
   });
-  return Service76.of({
+  return Service62.of({
     transform: state.transform,
     reload: state.reload,
+    revision: state.revision,
     get: Effect.fn("Integration.get")(function* (id) {
       const entry = state.get().integrations.get(id);
       if (!entry)
@@ -438,7 +452,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
       resolve: Effect.fn("Integration.connection.resolve")(function* (connection) {
         if (connection.type === "env") {
           const key = process.env[connection.name];
-          return key ? Key4.make({ type: "key", key }) : undefined;
+          return key ? Key3.make({ type: "key", key }) : undefined;
         }
         const credential = yield* credentials.get(connection.id);
         if (!credential)
@@ -471,7 +485,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
         yield* createCredential({
           integrationID: input.integrationID,
           label: input.label,
-          value: Key4.make({
+          value: Key3.make({
             type: "key",
             key: input.key,
             ...Object.keys(answer).length > 0 ? { configuration: answer } : {}
@@ -487,7 +501,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
       status: Effect.fn("Integration.oauth.status")(function* (input) {
         const attempt = (yield* SynchronizedRef.get(attempts)).get(input.attemptID);
         if (!attempt || attempt.integrationID !== input.integrationID)
-          return yield* Effect.die(new Error(`OAuth attempt not found: ${input.attemptID}`));
+          return yield* new AttemptNotFoundError2(input);
         if (attempt.status === "failed") {
           return { status: attempt.status, message: attempt.message ?? "Authorization failed", time: attempt.time };
         }
@@ -505,7 +519,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
           return [match, new Map(current).set(input.attemptID, { ...match, completing: true })];
         });
         if (!attempt)
-          return yield* Effect.die(new Error(`OAuth attempt not found: ${input.attemptID}`));
+          return yield* new AttemptNotFoundError2(input);
         if (attempt.status !== "pending")
           return;
         if (attempt.authorization.mode === "code" && input.code === undefined) {
@@ -537,7 +551,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
       status: Effect.fn("Integration.command.status")(function* (input) {
         const attempt = (yield* SynchronizedRef.get(commandAttempts)).get(input.attemptID);
         if (!attempt || attempt.integrationID !== input.integrationID)
-          return yield* Effect.die(new Error(`Command attempt not found: ${input.attemptID}`));
+          return yield* new AttemptNotFoundError2(input);
         if (attempt.status === "pending") {
           return {
             status: attempt.status,
@@ -565,10 +579,10 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     }
   });
 }));
-var node81 = makeLocationNode({
-  service: Service76,
+var node65 = makeLocationNode({
+  service: Service62,
   layer,
-  deps: [node82, node84, AppProcess.node]
+  deps: [node67, node85, AppProcess.node]
 });
 
-export { ID14, MethodID2, AttemptID2, OAuthMethod2, CommandMethod2, KeyMethod2, EnvMethod2, Method2, Info29, Attempt2, AttemptStatus2, CommandAttempt2, CommandAttemptStatus2, CodeRequiredError2, AuthorizationError2, Ref3, Service76, node81, exports_integration, Event18 };
+export { ID10, MethodID2, AttemptID2, OAuthMethod2, CommandMethod2, KeyMethod2, EnvMethod2, Method2, Info25, Attempt2, AttemptStatus2, CommandAttempt2, CommandAttemptStatus2, CodeRequiredError2, AuthorizationError2, AttemptNotFoundError2, Ref3, Service62, node65, exports_integration, Event14 };