@opencode/core 2.0.3 → 2.0.5

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

@@ -1,29 +1,29 @@
 import {
-  Service80,
-  node85
-} from "./mime-bhp9fn5h.js";
+  Service82,
+  node86
+} from "./instruction-discovery-wjck36vb.js";
 import {
   SessionTable2,
   SessionMessageTable2
-} from "./mime-a1bz86dw.js";
+} from "./instruction-discovery-a1bz86dw.js";
 import {
   decodeMessageRow2,
-  load2
-} from "./mime-vz9r8jjr.js";
+  load5
+} from "./instruction-discovery-f2kqmm63.js";
 import {
   fromRow2
-} from "./mime-ky3seynh.js";
+} from "./instruction-discovery-y6pbk9jp.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/session/store.ts
 var exports_store = {};
 __export(exports_store, {
-  ListInput: () => ListInput4,
-  Service: () => Service43,
+  ListInput: () => ListInput5,
+  Service: () => Service57,
   SessionStore: () => exports_store,
-  node: () => node46
+  node: () => node60
 });
 import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, notInArray, or, sql } from "drizzle-orm";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -50,13 +50,13 @@ var ListProjectInput = Schema.Struct({
   subpath: RelativePath.pipe(Schema.optional)
 });
 var ListAllInput = Schema.Struct(ListInputBase);
-var ListInput4 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
+var ListInput5 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
 
-class Service43 extends Context.Service()("@opencode/SessionStore") {
+class Service57 extends Context.Service()("@opencode/SessionStore") {
 }
-var layer = Layer.effect(Service43, Effect.gen(function* () {
-  const { db } = yield* Service80;
-  return Service43.of({
+var layer = Layer.effect(Service57, Effect.gen(function* () {
+  const { db } = yield* Service82;
+  return Service57.of({
     get: Effect.fnUntraced(function* (sessionID) {
       const row = yield* db.select().from(SessionTable2).where(eq(SessionTable2.id, sessionID)).get().pipe(Effect.orDie);
       return row ? fromRow2(row) : undefined;
@@ -98,7 +98,7 @@ var layer = Layer.effect(Service43, Effect.gen(function* () {
       const rows = yield* (input.limit === undefined ? query.all() : query.limit(input.limit).all()).pipe(Effect.orDie);
       return yield* Effect.forEach(direction === "previous" ? rows.toReversed() : rows, decodeMessageRow2);
     }),
-    context: Effect.fn("SessionStore.context")((sessionID) => load2(db, sessionID, "latest")),
+    context: Effect.fn("SessionStore.context")((sessionID) => load5(db, sessionID, "latest")),
     message: Effect.fn("SessionStore.message")(function* (messageID) {
       const row = yield* db.select().from(SessionMessageTable2).where(eq(SessionMessageTable2.id, messageID)).get().pipe(Effect.orDie);
       return row ? {
@@ -125,6 +125,6 @@ var layer = Layer.effect(Service43, Effect.gen(function* () {
     })
   });
 }));
-var node46 = makeGlobalNode({ service: Service43, layer, deps: [node85] });
+var node60 = makeGlobalNode({ service: Service57, layer, deps: [node86] });
 
-export { ListInput4, Service43, node46, exports_store };
+export { ListInput5, Service57, node60, exports_store };

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

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

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

@@ -1,47 +1,51 @@
 import {
   AbsolutePath2
-} from "./mime-922hggd3.js";
+} from "./instruction-discovery-922hggd3.js";
 import {
   WorktreeError2,
-  node76
-} from "./mime-mr645x8e.js";
-import {
-  ID13
-} from "./mime-rk0rec3h.js";
+  node82
+} from "./instruction-discovery-df9eyrmy.js";
 import {
   Slug2
-} from "./mime-gebd4c9n.js";
+} from "./instruction-discovery-gebd4c9n.js";
 import {
-  Service80,
-  node85
-} from "./mime-bhp9fn5h.js";
+  Service82,
+  node86
+} from "./instruction-discovery-wjck36vb.js";
 import {
-  Service79,
-  node84
-} from "./mime-3wjgak91.js";
+  Service81,
+  node85
+} from "./instruction-discovery-7kvy0jtg.js";
 import {
   ProjectTable2
-} from "./mime-8p4f9s12.js";
+} from "./instruction-discovery-8p4f9s12.js";
 import {
   WorktreeTable2
-} from "./mime-cfpkc3c9.js";
+} from "./instruction-discovery-cfpkc3c9.js";
+import {
+  ID16,
+  NotFoundError11
+} from "./instruction-discovery-jk6a9ave.js";
 import {
-  Service66,
-  node71
-} from "./mime-bawj3v5d.js";
+  Ref4
+} from "./instruction-discovery-88dkmhka.js";
+import {
+  Service69,
+  node72
+} from "./instruction-discovery-3vhfgt92.js";
 import {
   DirectoryUnavailableError2,
-  canonical3
-} from "./mime-th5km1p3.js";
+  canonical2
+} from "./instruction-discovery-gv6a8nnw.js";
 import {
-  make21
-} from "./mime-1h4ppwsj.js";
+  make20
+} from "./instruction-discovery-0e92bpf8.js";
 import {
-  create3
-} from "./mime-kg06axw8.js";
+  Service68
+} from "./instruction-discovery-emkjygpb.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/worktree.ts
 var exports_worktree2 = {};
@@ -49,19 +53,17 @@ __export(exports_worktree2, {
   CreateInput: () => CreateInput3,
   DestinationExistsError: () => DestinationExistsError2,
   DirectoryUnavailableError: () => DirectoryUnavailableError2,
-  Event: () => Event15,
-  Info: () => Info25,
+  Event: () => Event18,
+  Info: () => Info29,
   InvalidDirectoryError: () => InvalidDirectoryError2,
   List: () => List2,
   ListEntry: () => ListEntry3,
   OperationError: () => OperationError2,
-  RefreshResult: () => RefreshResult2,
   RemoveInput: () => RemoveInput2,
-  Service: () => Service65,
+  Service: () => Service67,
   SourceDirectoryNotFoundError: () => SourceDirectoryNotFoundError2,
   StrategyID: () => StrategyID2,
   StrategyUnavailableError: () => StrategyUnavailableError2,
-  UnsupportedLocationError: () => UnsupportedLocationError2,
   Worktree: () => exports_worktree2,
   node: () => node70
 });
@@ -69,8 +71,7 @@ import { Context, Effect, Layer, Schema } from "effect";
 import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
 import path from "path";
 import { FSUtil } from "@opencode/util/fs-util";
-import { makeLocationNode } from "@opencode/util/effect/app-node";
-import { Global } from "@opencode/util/global";
+import { Node } from "@opencode/util/effect/app-node";
 import { Worktree } from "@opencode/schema/worktree";
 import { AppProcess } from "@opencode/util/process";
 import { ChildProcess } from "effect/unstable/process";
@@ -78,15 +79,11 @@ import { OperationError as OperationError2 } from "@opencode/schema/worktree";
 var StrategyID2 = Worktree.StrategyID;
 var CreateInput3 = Worktree.CreateInput;
 var RemoveInput2 = Worktree.RemoveInput;
-var RefreshResult2 = Schema.Struct({
-  updated: Schema.Array(AbsolutePath2),
-  removed: Schema.Array(AbsolutePath2)
-}).annotate({ identifier: "Worktree.RefreshResult" });
-var Info25 = Worktree.Info;
+var Info29 = Worktree.Info;
 var List2 = Worktree.List;
 var ListEntry3 = Worktree.ListEntry;
 
-class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID13, directory: Schema.optional(AbsolutePath2) }) {
+class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID16, directory: Schema.optional(AbsolutePath2) }) {
 }
 
 class DestinationExistsError2 extends Schema.TaggedError()("Worktree.DestinationExistsError", { directory: AbsolutePath2 }) {
@@ -97,56 +94,48 @@ class InvalidDirectoryError2 extends Schema.TaggedError()("Worktree.InvalidDirec
 
 class StrategyUnavailableError2 extends Schema.TaggedError()("Worktree.StrategyUnavailableError", { strategy: StrategyID2 }) {
 }
+var Event18 = Worktree.Event;
 
-class UnsupportedLocationError2 extends Schema.TaggedError()("Worktree.UnsupportedLocationError", { directory: AbsolutePath2 }) {
-}
-var Event15 = Worktree.Event;
-
-class Service65 extends Context.Service()("@opencode/v2/Worktree") {
+class Service67 extends Context.Service()("@opencode/Worktree") {
 }
-var layer = Layer.effect(Service65, Effect.gen(function* () {
+var layer = Layer.effect(Service67, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const database = yield* Service80;
+  const database = yield* Service82;
   const db = database.db;
-  const bus = yield* Service79;
+  const bus = yield* Service81;
   const processService = yield* AppProcess.Service;
-  const location = yield* Service66;
-  const global = yield* Global.Service;
-  const projectID = location.project.id;
-  const local = location.workspaceID ? Effect.fail(new UnsupportedLocationError2({ directory: location.directory })) : Effect.void;
-  const gitStrategy = yield* make21;
-  const state = create3({
-    name: "worktree",
-    initial: () => ({
-      directory: AbsolutePath2.make(path.join(global.data, "worktree", projectID.slice(0, 6))),
-      strategies: new Map([[gitStrategy.id, gitStrategy]]),
-      selected: gitStrategy.id
-    }),
-    editor: (value) => ({
-      configure: (settings) => {
-        value.directory = settings.directory;
-      },
-      add: (strategy) => {
-        value.strategies.delete(strategy.id);
-        value.strategies.set(strategy.id, strategy);
-        value.selected = strategy.id;
-      }
-    })
+  const locations = yield* Service69;
+  const gitStrategy = yield* make20;
+  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 NotFoundError11({ projectID });
+    return row;
+  });
+  const load = Effect.fnUntraced(function* (directory, current) {
+    if (!(yield* fs.isDir(directory)))
+      return yield* new DirectoryUnavailableError2({ directory });
+    if (current?.directory === directory)
+      return current.get();
+    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, Service68).get();
   });
-  const changed = Effect.fnUntraced(function* (update) {
+  const changed = Effect.fnUntraced(function* (projectID, update) {
     if (update)
-      yield* bus.publish(Event15.Updated, { projectID });
+      yield* bus.publish(Event18.Updated, { projectID });
   });
   const ops = {
-    list: Effect.fnUntraced(function* () {
+    list: Effect.fnUntraced(function* (projectID) {
       const rows = yield* db.select({ directory: WorktreeTable2.directory, strategy: WorktreeTable2.strategy }).from(WorktreeTable2).where(eq(WorktreeTable2.project_id, projectID)).orderBy(desc(WorktreeTable2.time_created), asc(WorktreeTable2.directory)).all().pipe(Effect.orDie);
       return rows.map((row) => ({ directory: row.directory, strategy: row.strategy ?? undefined }));
     }),
-    find: Effect.fnUntraced(function* (directory) {
+    find: Effect.fnUntraced(function* (projectID, directory) {
       const row = yield* db.select({ directory: WorktreeTable2.directory, strategy: WorktreeTable2.strategy }).from(WorktreeTable2).where(and(eq(WorktreeTable2.project_id, projectID), eq(WorktreeTable2.directory, directory))).get().pipe(Effect.orDie);
       return row ? { directory: row.directory, strategy: row.strategy ?? undefined } : undefined;
     }),
-    create: (input, tx) => (tx ?? db).insert(WorktreeTable2).values({
+    create: (projectID, input, tx) => (tx ?? db).insert(WorktreeTable2).values({
       project_id: projectID,
       directory: input.directory,
       strategy: input.strategy
@@ -157,12 +146,11 @@ var layer = Layer.effect(Service65, Effect.gen(function* () {
       },
       setWhere: input.replace ? undefined : input.strategy ? isNull(WorktreeTable2.strategy) : sql`false`
     }).returning({ directory: WorktreeTable2.directory }).get().pipe(Effect.orDie, Effect.map((row) => row !== undefined)),
-    remove: (directory, tx) => (tx ?? db).delete(WorktreeTable2).where(and(eq(WorktreeTable2.project_id, projectID), eq(WorktreeTable2.directory, directory))).returning({ directory: WorktreeTable2.directory }).get().pipe(Effect.orDie, Effect.map((row) => row !== undefined))
+    remove: (projectID, directory, tx) => (tx ?? db).delete(WorktreeTable2).where(and(eq(WorktreeTable2.project_id, projectID), eq(WorktreeTable2.directory, directory))).returning({ directory: WorktreeTable2.directory }).get().pipe(Effect.orDie, Effect.map((row) => row !== undefined))
   };
-  const source = Effect.fnUntraced(function* (input) {
-    const sourceDirectory = input ?? location.project.directory;
-    const resolved = yield* canonical3(fs, sourceDirectory);
-    if ((yield* ops.find(resolved)) === undefined)
+  const source = Effect.fnUntraced(function* (projectID, sourceDirectory) {
+    const resolved = yield* canonical2(fs, sourceDirectory);
+    if ((yield* ops.find(projectID, resolved)) === undefined)
       return yield* new SourceDirectoryNotFoundError2({ projectID, directory: resolved });
     return resolved;
   });
@@ -172,12 +160,12 @@ var layer = Layer.effect(Service65, Effect.gen(function* () {
       return yield* new StrategyUnavailableError2({ strategy: id });
     return found;
   });
-  const create = Effect.fn("Worktree.create")(function* (input = {}) {
-    yield* local;
-    const current = state.get();
-    const selected = yield* getStrategy(input.strategy ?? current.selected, current.strategies);
-    const directory = input.directory ?? current.directory;
-    const sourceDirectory = yield* source(input.from);
+  const create = Effect.fn("Worktree.create")(function* (input, current) {
+    const row = yield* project(input.projectID);
+    const settings = yield* load(row.worktree, current);
+    const selected = yield* getStrategy(settings.selected, settings.strategies);
+    const directory = input.directory ?? settings.directory;
+    const sourceDirectory = yield* source(input.projectID, input.from ?? row.worktree);
     yield* fs.makeDirectory(directory, { recursive: true }).pipe(Effect.orDie);
     const name = input.name ?? Slug2.create();
     let suffix = 1;
@@ -193,14 +181,13 @@ var layer = Layer.effect(Service65, Effect.gen(function* () {
       sourceDirectory,
       branch: input.branch
     }).pipe(Effect.mapError((error) => operationError(selected.id, "create", error)));
-    const result = { directory: yield* canonical3(fs, created.directory) };
-    yield* changed(yield* ops.create({
+    const result = { directory: yield* canonical2(fs, created.directory) };
+    yield* changed(input.projectID, yield* ops.create(input.projectID, {
       directory: result.directory,
       strategy: selected.id,
       replace: true
     }));
-    const project = yield* db.select({ commands: ProjectTable2.commands }).from(ProjectTable2).where(eq(ProjectTable2.id, projectID)).get().pipe(Effect.orDie);
-    const command = project?.commands?.start?.trim();
+    const command = row.commands?.start?.trim();
     if (command) {
       const windows = process.platform === "win32";
       yield* processService.run(ChildProcess.make(windows ? command : "bash", windows ? [] : ["-lc", command], {
@@ -215,31 +202,39 @@ var layer = Layer.effect(Service65, Effect.gen(function* () {
       })).pipe(Effect.flatMap(AppProcess.requireSuccess));
     }
     return result;
-  });
-  const remove = Effect.fn("Worktree.remove")(function* (input) {
-    yield* local;
-    const worktreeDirectory = yield* canonical3(fs, input.directory);
-    const stored = yield* ops.find(worktreeDirectory);
+  }, Effect.scoped);
+  const remove = Effect.fn("Worktree.remove")(function* (input, current) {
+    const row = yield* project(input.projectID);
+    const worktreeDirectory = yield* canonical2(fs, input.directory);
+    const stored = yield* ops.find(input.projectID, worktreeDirectory);
     if (!stored?.strategy)
       return yield* new InvalidDirectoryError2({ directory: worktreeDirectory });
-    const strategy = yield* getStrategy(StrategyID2.make(stored.strategy), state.get().strategies);
+    const settings = yield* load(row.worktree, current);
+    const strategy = yield* getStrategy(StrategyID2.make(stored.strategy), settings.strategies);
     yield* strategy.remove({
       directory: worktreeDirectory,
       force: input.force
     }).pipe(Effect.mapError((error) => operationError(strategy.id, "remove", error)));
-    yield* changed(yield* ops.remove(worktreeDirectory));
-  });
-  const refresh = Effect.fn("Worktree.refresh")(function* () {
-    yield* local;
-    const stored = yield* ops.list();
+    yield* changed(input.projectID, yield* ops.remove(input.projectID, worktreeDirectory));
+  }, Effect.scoped);
+  const refresh = Effect.fn("Worktree.refresh")(function* (input, current) {
+    const row = yield* project(input.projectID);
+    const settings = yield* load(row.worktree, current);
+    const stored = yield* ops.list(input.projectID);
     const checked = yield* Effect.forEach(stored, (item) => fs.isDir(item.directory).pipe(Effect.map((exists) => ({ ...item, exists }))), { concurrency: "unbounded" });
-    const strategies = Array.from(state.get().strategies.values()).toReversed();
+    const strategies = Array.from(settings.strategies.values()).toReversed();
     const discovered = new Map;
-    if (checked.some((item) => item.directory === location.project.directory && item.exists)) {
+    const roots = new Set([
+      row.worktree,
+      ...checked.filter((item) => item.exists && !item.strategy).map((item) => item.directory)
+    ]);
+    for (const directory of roots) {
+      if (!(yield* fs.isDir(directory)))
+        continue;
       for (const strategy of strategies) {
-        const entries = yield* strategy.list(location.project.directory).pipe(Effect.mapError((error) => operationError(strategy.id, "list", error)), Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.succeed([])));
+        const entries = yield* strategy.list(directory).pipe(Effect.mapError((error) => operationError(strategy.id, "list", error)), Effect.catch((error) => Effect.logWarning("worktree discovery failed", { directory, strategy: strategy.id, error }).pipe(Effect.as([]))));
         for (const entry of entries) {
-          const directory = yield* canonical3(fs, entry.directory).pipe(Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.undefined));
+          const directory = yield* canonical2(fs, entry.directory).pipe(Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.undefined));
           if (!directory || discovered.has(directory))
             continue;
           discovered.set(directory, {
@@ -251,28 +246,25 @@ var layer = Layer.effect(Service65, Effect.gen(function* () {
     }
     const removed = checked.filter((item) => !item.exists).map((item) => item.directory);
     const changes = yield* db.transaction((tx) => Effect.all({
-      updated: Effect.filter(Array.from(discovered.values()), (item) => ops.create(item, tx)).pipe(Effect.map((items) => items.map((item) => item.directory))),
-      removed: Effect.filter(removed, (directory) => ops.remove(directory, tx))
+      updated: Effect.filter(Array.from(discovered.values()), (item) => ops.create(input.projectID, item, tx)).pipe(Effect.map((items) => items.map((item) => item.directory))),
+      removed: Effect.filter(removed, (directory) => ops.remove(input.projectID, directory, tx))
     })).pipe(Effect.orDie);
-    yield* changed(changes.updated.length > 0 || changes.removed.length > 0);
-    return changes;
-  });
-  return Service65.of({
-    transform: state.transform,
-    reload: state.reload,
-    list: Effect.fn("Worktree.list")(function* () {
-      yield* refresh();
-      return yield* ops.list();
+    yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0);
+  }, Effect.scoped);
+  return Service67.of({
+    list: Effect.fn("Worktree.list")(function* (input) {
+      yield* project(input.projectID);
+      return yield* ops.list(input.projectID);
     }),
     create,
     remove,
     refresh
   });
 }));
-var node70 = makeLocationNode({
-  service: Service65,
+var node70 = Node.makeGlobalNode({
+  service: Service67,
   layer,
-  deps: [FSUtil.node, node76, node84, node85, AppProcess.node, node71, Global.node]
+  deps: [FSUtil.node, node82, node85, node86, AppProcess.node, node72]
 });
 function operationError(strategy, operation, error) {
   if (error instanceof WorktreeError2 || error instanceof DirectoryUnavailableError2 || error instanceof Worktree.OperationError)
@@ -282,4 +274,4 @@ function operationError(strategy, operation, error) {
   });
 }
 
-export { StrategyID2, CreateInput3, RemoveInput2, RefreshResult2, Info25, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, UnsupportedLocationError2, Event15, Service65, node70, exports_worktree2, OperationError2 };
+export { StrategyID2, CreateInput3, RemoveInput2, Info29, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event18, Service67, node70, exports_worktree2, OperationError2 };

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

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

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

@@ -1,57 +1,57 @@
 import {
-  Service79,
-  node84
-} from "./mime-3wjgak91.js";
+  Service81,
+  node85
+} from "./instruction-discovery-7kvy0jtg.js";
 import {
-  Service66,
-  node71
-} from "./mime-bawj3v5d.js";
+  Service76,
+  node80
+} from "./instruction-discovery-88dkmhka.js";
 import {
-  Service58,
-  node61
-} from "./mime-3xz6hyac.js";
+  Service73,
+  node76
+} from "./instruction-discovery-cvnk88jx.js";
 import {
   cleanup3
-} from "./mime-gd4qta3r.js";
+} from "./instruction-discovery-gd4qta3r.js";
 import {
-  Service61,
+  Service66,
   args2,
-  node65
-} from "./mime-wgqr0wr2.js";
+  node69
+} from "./instruction-discovery-g35x6qc6.js";
 import {
-  Service69,
-  node74
-} from "./mime-9pm6y0s1.js";
+  Service58,
+  node61
+} from "./instruction-discovery-aq5y8b9e.js";
 import {
-  Service53,
-  node56
-} from "./mime-w49382pb.js";
+  Service37,
+  node40
+} from "./instruction-discovery-rzs3gq0x.js";
 import {
   SessionSchema2
-} from "./mime-xxynqx5z.js";
+} from "./instruction-discovery-mn7hgmyj.js";
 import {
   latest2,
-  Service55,
-  node58
-} from "./mime-6q31zrbr.js";
+  Service39,
+  node42
+} from "./instruction-discovery-h2vfddx5.js";
 import {
   MAX_LINES2,
   MAX_BYTES2
-} from "./mime-3mp8pt0x.js";
+} from "./instruction-discovery-1mr1eyme.js";
 import {
   __export
-} from "./mime-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/shell.ts
 var exports_shell4 = {};
 __export(exports_shell4, {
   DIRECTORY: () => DIRECTORY2,
-  NotFoundError: () => NotFoundError8,
+  NotFoundError: () => NotFoundError4,
   RETENTION: () => RETENTION2,
-  Service: () => Service52,
+  Service: () => Service36,
   Shell: () => exports_shell4,
   cleanup: () => cleanup2,
-  node: () => node55
+  node: () => node39
 });
 import path from "path";
 import { Context, Deferred, Duration, Effect, Fiber, Latch, Layer, Schema, Schedule, Stream } from "effect";
@@ -62,7 +62,7 @@ import { AppProcess } from "@opencode/util/process";
 import { makeGlobalNode, makeLocationNode } from "@opencode/util/effect/app-node";
 import { FSUtil } from "@opencode/util/fs-util";
 import { Global } from "@opencode/util/global";
-class NotFoundError8 extends Schema.TaggedError()("Shell.NotFoundError", {
+class NotFoundError4 extends Schema.TaggedError()("Shell.NotFoundError", {
   id: Shell.ID
 }) {
 }
@@ -70,7 +70,7 @@ var EXITED_LIMIT = 25;
 var RETENTION2 = Duration.days(7);
 var DIRECTORY2 = "shell";
 
-class Service52 extends Context.Service()("@opencode/Shell") {
+class Service36 extends Context.Service()("@opencode/Shell") {
 }
 var cleanup2 = Effect.fn("Shell.cleanup")(function* () {
   const fs = yield* FSUtil.Service;
@@ -86,15 +86,15 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var layer = () => Layer.effect(Service52, Effect.gen(function* () {
-  const bus = yield* Service79;
-  const location = yield* Service66;
+var layer = () => Layer.effect(Service36, Effect.gen(function* () {
+  const bus = yield* Service81;
+  const location = yield* Service76;
   const global = yield* Global.Service;
-  const shell = yield* Service61;
-  const environment = yield* Service58;
-  const hooks = yield* Service69;
-  const environments = yield* Service53;
-  const config = yield* Service55;
+  const shell = yield* Service66;
+  const environment = yield* Service73;
+  const hooks = yield* Service58;
+  const environments = yield* Service37;
+  const config = yield* Service39;
   const context = yield* Effect.context();
   const runFork = Effect.runForkWith(context);
   const commands = new Map;
@@ -115,7 +115,7 @@ var layer = () => Layer.effect(Service52, Effect.gen(function* () {
   const require2 = Effect.fnUntraced(function* (id) {
     const command = commands.get(id);
     if (!command)
-      return yield* new NotFoundError8({ id });
+      return yield* new NotFoundError4({ id });
     return command;
   });
   const removeCommand = Effect.fnUntraced(function* (id) {
@@ -128,7 +128,7 @@ var layer = () => Layer.effect(Service52, Effect.gen(function* () {
     commands.delete(id);
     if (command.timeoutFiber)
       yield* Fiber.interrupt(command.timeoutFiber);
-    yield* Deferred.fail(command.done, new NotFoundError8({ id }));
+    yield* Deferred.fail(command.done, new NotFoundError4({ id }));
     yield* Effect.promise(() => unlink(command.file).catch(() => {}));
     yield* bus.publish(Shell.Event.Deleted, { id });
   });
@@ -208,7 +208,7 @@ var layer = () => Layer.effect(Service52, Effect.gen(function* () {
     const invocation = {
       command: input.command,
       cwd: input.cwd ?? location.directory,
-      timeout: input.timeout,
+      timeout: input.timeout ?? 0,
       shell: input.shell ?? (yield* shell.resolve({ priority: "config" })),
       env: {
         ...sessionEnvironment ?? process.env,
@@ -314,22 +314,22 @@ var layer = () => Layer.effect(Service52, Effect.gen(function* () {
     const command = yield* Deferred.await(ready);
     return command.info;
   });
-  return Service52.of({ create, list, get, wait, result, timeout, output, remove });
+  return Service36.of({ create, list, get, wait, result, timeout, output, remove });
 }));
-var node55 = makeLocationNode({
-  service: Service52,
+var node39 = makeLocationNode({
+  service: Service36,
   layer: layer(),
   deps: [
-    node84,
-    node71,
+    node85,
+    node80,
     Global.node,
-    node65,
+    node69,
+    node76,
     node61,
-    node74,
-    node56,
-    node58,
+    node40,
+    node42,
     cleanupNode
   ]
 });
 
-export { NotFoundError8, RETENTION2, DIRECTORY2, Service52, cleanup2, node55, exports_shell4 };
+export { NotFoundError4, RETENTION2, DIRECTORY2, Service36, cleanup2, node39, exports_shell4 };