@opencode/core 2.0.14 → 2.0.16

package/dist/chunks/{model-resolver-58jf3t5q.js → event-logger-dsvbxzrp.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./model-resolver-y71avatq.js";
+} from "./event-logger-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./model-resolver-fb5x04t9.js";
+} from "./event-logger-4rzfcrmm.js";
 import {
-  Event17,
-  Service71,
-  node75
-} from "./model-resolver-g0jvtwam.js";
+  Event21,
+  Service82,
+  node86
+} from "./event-logger-4nsq4evv.js";
 import {
   Service79,
   node83
-} from "./model-resolver-cggswk6d.js";
+} from "./event-logger-fv5sjpfb.js";
 import {
-  Service52,
-  node56
-} from "./model-resolver-ckd8zaaf.js";
+  Service55,
+  node58
+} from "./event-logger-najthaah.js";
 import {
-  ID18,
-  Service82,
-  node86
-} from "./model-resolver-nz2zjb46.js";
+  ID15,
+  Service78,
+  node82
+} from "./event-logger-1bry463v.js";
 import {
   reconcile2,
   create3
-} from "./model-resolver-rdw6cm16.js";
+} from "./event-logger-rdw6cm16.js";
 import {
-  ID10,
+  ID14,
   MethodID2,
-  Service70,
-  node74
-} from "./model-resolver-fbfs1p3d.js";
+  Service77,
+  node81
+} from "./event-logger-0p8kebmq.js";
 import {
   __export
-} from "./model-resolver-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
   NotFoundError: () => NotFoundError5,
-  Options: () => Options6,
+  Options: () => Options5,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service39,
+  Service: () => Service42,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured6,
-  layer: () => layer17,
-  node: () => node42
+  configured: () => configured5,
+  layer: () => layer16,
+  node: () => node45
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -93,21 +93,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service39 extends Context.Service()("@opencode/MCP") {
+class Service42 extends Context.Service()("@opencode/MCP") {
 }
-var Options6 = Schema.Struct({
+var Options5 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
+var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
   const location = yield* Service79;
-  const environment = yield* Service52;
+  const environment = yield* Service55;
   const bus = yield* Service83;
-  const forms = yield* Service82;
-  const integration = yield* Service70;
-  const credentials = yield* Service71;
+  const forms = yield* Service78;
+  const integration = yield* Service77;
+  const credentials = yield* Service82;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -119,7 +119,7 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID10.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
         method: { id: methodID, type: "oauth", label: name },
         authorize: () => Effect.gen(function* () {
           const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service71, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service82, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -151,12 +151,12 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
     if (entry.config.type !== "remote" || !entry.integrationID)
       return;
     const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service71, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service82, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID18.create();
+        const formID = ID15.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -221,6 +221,25 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
     yield* startServer(name, entry);
   }).pipe(locks.withLock(name));
   const recovering = (name, entry, connection, run) => run(connection).pipe(Effect.catchIf((error) => ("_tag" in error) && error._tag === "MCP.SessionExpiredError", (error) => recover(name, entry, connection).pipe(Effect.flatMap(() => entry.client ? run(entry.client) : Effect.fail(error)))));
+  const loadCatalog = (name, entry, connection) => recovering(name, entry, connection, (connection) => Effect.all({
+    resources: connection.resources(),
+    templates: connection.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
+  }, { concurrency: "unbounded" })).pipe(Effect.map((catalog) => ResourceCatalog2.make({
+    resources: catalog.resources.map((resource) => Resource2.make({
+      server: name,
+      name: resource.name,
+      uri: resource.uri,
+      description: resource.description,
+      mimeType: resource.mimeType
+    })),
+    templates: catalog.templates.map((template) => ResourceTemplate2.make({
+      server: name,
+      name: template.name,
+      uriTemplate: template.uriTemplate,
+      description: template.description,
+      mimeType: template.mimeType
+    }))
+  })));
   const watch = (name, entry, connection) => {
     const live = whenLive(name, entry, connection);
     connection.onClose(() => live(Effect.gen(function* () {
@@ -240,7 +259,7 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service52, environment), Scope.provide(scope));
+    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service55, environment), Scope.provide(scope));
     const result = yield* (entry.config.type === "remote" ? endpointLoads.withLock(entry.config.url)(load) : load).pipe(Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
@@ -365,7 +384,7 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event17.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event21.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
   const state = create3({
     name: "mcp",
     initial: () => ({
@@ -391,7 +410,7 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service39.of({
+  return Service42.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -464,42 +483,23 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
       return { ...result, server: target.name, name: input.name };
     }),
     resourceCatalog: Effect.fn("MCP.resourceCatalog")(function* () {
-      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => {
-        if (!entry.client)
-          return Effect.succeed({ resources: [], templates: [] });
-        return Effect.all({
-          resources: entry.client.resources().pipe(Effect.orElseSucceed(() => [])),
-          templates: entry.client.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
-        }, { concurrency: "unbounded" }).pipe(Effect.map((catalog) => ({
-          resources: catalog.resources.map((resource) => Resource2.make({
-            server: name,
-            name: resource.name,
-            uri: resource.uri,
-            description: resource.description,
-            mimeType: resource.mimeType
-          })),
-          templates: catalog.templates.map((template) => ResourceTemplate2.make({
-            server: name,
-            name: template.name,
-            uriTemplate: template.uriTemplate,
-            description: template.description,
-            mimeType: template.mimeType
-          }))
-        })));
-      }, { concurrency: "unbounded" });
-      return ResourceCatalog2.make({
-        resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
-        templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
-      });
+      const empty = ResourceCatalog2.make({ resources: [], templates: [] });
+      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => entry.client ? loadCatalog(name, entry, entry.client).pipe(Effect.orElseSucceed(() => empty)) : Effect.succeed(empty), { concurrency: "unbounded" });
+      return mergeCatalogs(catalogs);
+    }),
+    resources: Effect.fn("MCP.resources")(function* (input) {
+      const target = yield* requireServer(input.server);
+      yield* target.entry.startup.await;
+      if (!target.entry.client)
+        return ResourceCatalog2.make({ resources: [], templates: [] });
+      return mergeCatalogs([yield* loadCatalog(target.name, target.entry, target.entry.client)]);
     }),
     readResource: Effect.fn("MCP.readResource")(function* (input) {
       const target = yield* requireServer(input.server);
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri })).pipe(Effect.orElseSucceed(() => {
-        return;
-      }));
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri }));
       if (!result)
         return;
       return ResourceContent2.make({
@@ -510,14 +510,20 @@ var layer17 = (options) => Layer.effect(Service39, Effect.gen(function* () {
     })
   });
 }));
-function configured6(options) {
+function mergeCatalogs(catalogs) {
+  return ResourceCatalog2.make({
+    resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
+    templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
+  });
+}
+function configured5(options) {
   return makeLocationNode({
-    service: Service39,
-    layer: layer17(options),
-    deps: [node83, node56, node87, node86, node74, node75]
+    service: Service42,
+    layer: layer16(options),
+    deps: [node83, node58, node87, node82, node81, node86]
   });
 }
-var node42 = configured6();
+var node45 = configured5();
 function toElicitationField(key, property, required) {
   const machineTitle = /^(boolean|string|number|integer|array|object)(\s+with\b.*|\s+in\b.*)?$/i;
   const title = property.title && !machineTitle.test(property.title.trim()) ? property.title : property.description ?? key;
@@ -568,4 +574,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service39, Options6, layer17, configured6, node42, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service42, Options5, layer16, configured5, node45, exports_mcp4 };

package/dist/chunks/event-logger-dyzt9za5.js

@@ -0,0 +1,89 @@
+import {
+  Service83,
+  node87
+} from "./event-logger-4rzfcrmm.js";
+import {
+  Service78,
+  node82
+} from "./event-logger-1bry463v.js";
+import {
+  Service80,
+  node84
+} from "./event-logger-0fnt4z85.js";
+import {
+  Ref4,
+  Service79,
+  node83
+} from "./event-logger-fv5sjpfb.js";
+import {
+  canonical3
+} from "./event-logger-wqj2xpp0.js";
+import {
+  SessionEvent2
+} from "./event-logger-ec1grn59.js";
+import {
+  Service68,
+  node72
+} from "./event-logger-p2qeza37.js";
+import {
+  Service21,
+  node24
+} from "./event-logger-jjg31dbj.js";
+import {
+  __export
+} from "./event-logger-9rqn6x4v.js";
+
+// src/location-lifecycle.ts
+var exports_location_lifecycle = {};
+__export(exports_location_lifecycle, {
+  LocationLifecycle: () => exports_location_lifecycle,
+  Service: () => Service15,
+  node: () => node17
+});
+import { Context, Effect, Layer, Schema } from "effect";
+import { makeLocationNode } from "@opencode/util/effect/app-node";
+import { LocationEvent } from "@opencode/schema/location-event";
+var isSessionEvent = Schema.is(SessionEvent2.Durable);
+
+class Service15 extends Context.Service()("@opencode/LocationLifecycle") {
+}
+var layer = Layer.effect(Service15, Effect.gen(function* () {
+  const bus = yield* Service83;
+  const location = yield* Service79;
+  const permission = yield* Service68;
+  const forms = yield* Service78;
+  const rpc = yield* Service21;
+  const project = yield* Service80;
+  const scope = yield* Effect.scope;
+  yield* project.activate(location.project.id);
+  const unsubscribe = yield* bus.listen((event) => {
+    if (!isSessionEvent(event) || !event.location)
+      return Effect.void;
+    const ref = canonical3(event.location);
+    if (ref.directory !== location.directory || ref.workspaceID !== location.workspaceID)
+      return Effect.void;
+    return project.activate(location.project.id).pipe(Effect.forkIn(scope), Effect.asVoid);
+  });
+  yield* Effect.addFinalizer(() => unsubscribe);
+  let closed = false;
+  const shutdown = yield* Effect.cached(Effect.gen(function* () {
+    closed = true;
+    yield* permission.close;
+    yield* forms.close;
+    yield* rpc.close;
+    yield* bus.publish(LocationEvent.Shutdown, {}, {
+      location: Ref4.make({ directory: location.directory, workspaceID: location.workspaceID })
+    });
+  }).pipe(Effect.uninterruptible));
+  return Service15.of({
+    isClosed: () => closed,
+    shutdown
+  });
+}));
+var node17 = makeLocationNode({
+  service: Service15,
+  layer,
+  deps: [node87, node83, node72, node84, node82, node24]
+});
+
+export { Service15, node17, exports_location_lifecycle };

package/dist/chunks/{model-resolver-4b6qd0e2.js → event-logger-e0k7xjnp.js}

@@ -1,12 +1,12 @@
 import {
   makeWithDefaults2
-} from "./model-resolver-4hndnerf.js";
+} from "./event-logger-gmc59x4c.js";
 import {
   apply3
-} from "./model-resolver-5a56x6pe.js";
+} from "./event-logger-0bb1qdg3.js";
 import {
   __export
-} from "./model-resolver-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/database/database.ts
 var exports_database = {};

package/dist/chunks/{model-resolver-dm8zbqys.js → event-logger-e33fphm7.js}

@@ -1,22 +1,22 @@
 import {
   Service83
-} from "./model-resolver-fb5x04t9.js";
+} from "./event-logger-4rzfcrmm.js";
 import {
   Service79
-} from "./model-resolver-cggswk6d.js";
+} from "./event-logger-fv5sjpfb.js";
 import {
   PromptsChanged2,
-  Service39
-} from "./model-resolver-58jf3t5q.js";
+  Service42
+} from "./event-logger-dsvbxzrp.js";
 import {
   __export
-} from "./model-resolver-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/plugin/command.ts
-var exports_command2 = {};
-__export(exports_command2, {
-  CommandPlugin: () => exports_command2,
-  Plugin: () => Plugin30
+var exports_command = {};
+__export(exports_command, {
+  CommandPlugin: () => exports_command,
+  Plugin: () => Plugin9
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect, Stream } from "effect";
@@ -193,11 +193,11 @@ If you're uncertain about something and can't verify it with these tools, say "I
 `;
 
 // src/plugin/command.ts
-var Plugin30 = define({
+var Plugin9 = define({
   id: "opencode.command",
   effect: Effect.fn(function* (ctx) {
     const location = yield* Service79;
-    const mcp = yield* Service39;
+    const mcp = yield* Service42;
     const bus = yield* Service83;
     const loaded = { prompts: [] };
     yield* bus.subscribe(PromptsChanged2).pipe(Stream.runForEach(() => mcp.prompts().pipe(Effect.tap((prompts) => Effect.sync(() => loaded.prompts = prompts)), Effect.andThen(ctx.command.reload()))), Effect.forkScoped({ startImmediately: true }));
@@ -280,4 +280,4 @@ function sanitize(value) {
 var argsRegex = /(?:\[Image\s+\d+\]|"[^"]*"|'[^']*'|[^\s"']+)/gi;
 var quoteTrimRegex = /^["']|["']$/g;
 
-export { Plugin30, exports_command2 };
+export { Plugin9, exports_command };

package/dist/chunks/{model-resolver-xct4z947.js → event-logger-ec6m7bjn.js}

@@ -1,71 +1,71 @@
 import {
   AbsolutePath2
-} from "./model-resolver-922hggd3.js";
+} from "./event-logger-922hggd3.js";
 import {
   WorktreeError2,
   node85
-} from "./model-resolver-c488s98d.js";
+} from "./event-logger-jf9anmv7.js";
 import {
   Slug2
-} from "./model-resolver-gebd4c9n.js";
+} from "./event-logger-gebd4c9n.js";
 import {
   Service84,
   node88
-} from "./model-resolver-4b6qd0e2.js";
+} from "./event-logger-e0k7xjnp.js";
 import {
   Service83,
   node87
-} from "./model-resolver-fb5x04t9.js";
+} from "./event-logger-4rzfcrmm.js";
 import {
   ProjectTable2
-} from "./model-resolver-8p4f9s12.js";
+} from "./event-logger-wd3x2cqz.js";
 import {
   WorktreeTable2
-} from "./model-resolver-cfpkc3c9.js";
+} from "./event-logger-94ek1h2f.js";
 import {
   ID16,
-  NotFoundError10
-} from "./model-resolver-s96k9d5p.js";
+  NotFoundError11
+} from "./event-logger-0fnt4z85.js";
 import {
   Ref4
-} from "./model-resolver-cggswk6d.js";
+} from "./event-logger-fv5sjpfb.js";
 import {
-  Service61,
-  node65
-} from "./model-resolver-whxapjwv.js";
+  Service66,
+  node70
+} from "./event-logger-wqj2xpp0.js";
 import {
   DirectoryUnavailableError2,
   canonical2
-} from "./model-resolver-gv6a8nnw.js";
+} from "./event-logger-gv6a8nnw.js";
 import {
   make12
-} from "./model-resolver-t44e5ekz.js";
+} from "./event-logger-wargq46t.js";
 import {
-  Service23
-} from "./model-resolver-sd9tm8pe.js";
+  Service18
+} from "./event-logger-y87mwaek.js";
 import {
   __export
-} from "./model-resolver-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/worktree.ts
 var exports_worktree2 = {};
 __export(exports_worktree2, {
-  CreateInput: () => CreateInput3,
+  CreateInput: () => CreateInput2,
   DestinationExistsError: () => DestinationExistsError2,
   DirectoryUnavailableError: () => DirectoryUnavailableError2,
-  Event: () => Event6,
-  Info: () => Info4,
+  Event: () => Event3,
+  Info: () => Info3,
   InvalidDirectoryError: () => InvalidDirectoryError2,
   List: () => List2,
   ListEntry: () => ListEntry3,
   OperationError: () => OperationError2,
   RemoveInput: () => RemoveInput2,
-  Service: () => Service22,
+  Service: () => Service17,
   SourceDirectoryNotFoundError: () => SourceDirectoryNotFoundError2,
   StrategyID: () => StrategyID2,
   StrategyUnavailableError: () => StrategyUnavailableError2,
   Worktree: () => exports_worktree2,
-  node: () => node25
+  node: () => node20
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
@@ -77,9 +77,9 @@ import { AppProcess } from "@opencode/util/process";
 import { ChildProcess } from "effect/unstable/process";
 import { OperationError as OperationError2 } from "@opencode/schema/worktree";
 var StrategyID2 = Worktree.StrategyID;
-var CreateInput3 = Worktree.CreateInput;
+var CreateInput2 = Worktree.CreateInput;
 var RemoveInput2 = Worktree.RemoveInput;
-var Info4 = Worktree.Info;
+var Info3 = Worktree.Info;
 var List2 = Worktree.List;
 var ListEntry3 = Worktree.ListEntry;
 
@@ -94,22 +94,22 @@ class InvalidDirectoryError2 extends Schema.TaggedError()("Worktree.InvalidDirec
 
 class StrategyUnavailableError2 extends Schema.TaggedError()("Worktree.StrategyUnavailableError", { strategy: StrategyID2 }) {
 }
-var Event6 = Worktree.Event;
+var Event3 = Worktree.Event;
 
-class Service22 extends Context.Service()("@opencode/Worktree") {
+class Service17 extends Context.Service()("@opencode/Worktree") {
 }
-var layer = Layer.effect(Service22, Effect.gen(function* () {
+var layer = Layer.effect(Service17, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const database = yield* Service84;
   const db = database.db;
   const bus = yield* Service83;
   const processService = yield* AppProcess.Service;
-  const locations = yield* Service61;
+  const locations = yield* Service66;
   const gitStrategy = yield* make12;
   const project = Effect.fnUntraced(function* (projectID) {
     const row = yield* db.select().from(ProjectTable2).where(eq(ProjectTable2.id, projectID)).get().pipe(Effect.orDie);
     if (!row)
-      return yield* new NotFoundError10({ projectID });
+      return yield* new NotFoundError11({ projectID });
     return row;
   });
   const load = Effect.fnUntraced(function* (directory, current) {
@@ -120,11 +120,11 @@ var layer = Layer.effect(Service22, Effect.gen(function* () {
     const { Plugin } = yield* Effect.promise(() => import("../plugin.js"));
     const context = yield* locations.contextEffect(Ref4.make({ directory }));
     yield* Context.get(context, Plugin.Service).awaitActivation;
-    return Context.get(context, Service23).get();
+    return Context.get(context, Service18).get();
   });
   const changed = Effect.fnUntraced(function* (projectID, update) {
     if (update)
-      yield* bus.publish(Event6.Updated, { projectID });
+      yield* bus.publish(Event3.Updated, { projectID });
   });
   const ops = {
     list: Effect.fnUntraced(function* (projectID) {
@@ -251,7 +251,7 @@ var layer = Layer.effect(Service22, Effect.gen(function* () {
     })).pipe(Effect.orDie);
     yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0);
   }, Effect.scoped);
-  return Service22.of({
+  return Service17.of({
     list: Effect.fn("Worktree.list")(function* (input) {
       yield* project(input.projectID);
       return yield* ops.list(input.projectID);
@@ -261,10 +261,10 @@ var layer = Layer.effect(Service22, Effect.gen(function* () {
     refresh
   });
 }));
-var node25 = Node.makeGlobalNode({
-  service: Service22,
+var node20 = Node.makeGlobalNode({
+  service: Service17,
   layer,
-  deps: [FSUtil.node, node85, node87, node88, AppProcess.node, node65]
+  deps: [FSUtil.node, node85, node87, node88, AppProcess.node, node70]
 });
 function operationError(strategy, operation, error) {
   if (error instanceof WorktreeError2 || error instanceof DirectoryUnavailableError2 || error instanceof Worktree.OperationError)
@@ -274,4 +274,4 @@ function operationError(strategy, operation, error) {
   });
 }
 
-export { StrategyID2, CreateInput3, RemoveInput2, Info4, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event6, Service22, node25, exports_worktree2, OperationError2 };
+export { StrategyID2, CreateInput2, RemoveInput2, Info3, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event3, Service17, node20, exports_worktree2, OperationError2 };