@opencode/core 2.0.2 → 2.0.3

package/dist/chunks/{location-services-sxat3wmc.js → mime-gnq13918.js}

@@ -1,29 +1,29 @@
 import {
   Service55
-} from "./location-services-req99jdj.js";
+} from "./mime-6q31zrbr.js";
 import {
-  Service40
-} from "./location-services-bna2jm49.js";
+  Service68
+} from "./mime-nzwzy72p.js";
 import {
   observe2
-} from "./location-services-qsdy395h.js";
+} from "./mime-qsdy395h.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/config/plugin/image.ts
 var exports_image = {};
 __export(exports_image, {
   ConfigImagePlugin: () => exports_image,
-  Plugin: () => Plugin43
+  Plugin: () => Plugin32
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin43 = define({
+var Plugin32 = define({
   id: "opencode.config.image",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Service55;
-    const image = yield* Service40;
+    const image = yield* Service68;
     const loaded = yield* observe2(config, ctx.event, image.reload());
     yield* image.transform((editor) => {
       for (const entry of loaded.entries) {
@@ -43,4 +43,4 @@ var Plugin43 = define({
   })
 });
 
-export { Plugin43, exports_image };
+export { Plugin32, exports_image };

package/dist/chunks/{location-services-w79zsp0s.js → mime-gqrjg9m0.js}

@@ -1,7 +1,7 @@
 import {
   isCheckpoint2,
   decode2
-} from "./location-services-paegk39x.js";
+} from "./mime-bccb6npm.js";
 
 // src/session/runner/to-llm-message.ts
 import { Message, ToolCallPart, ToolResultPart } from "@opencode/ai";
@@ -173,6 +173,7 @@ function toLLMMessage(message, model, providerMetadataKey) {
   switch (message.type) {
     case "agent-switched":
     case "model-switched":
+    case "idle":
       return [];
     case "location-switched":
       return [

package/dist/chunks/{location-services-0pb75hch.js → mime-gqrsst1j.js}

@@ -1,8 +1,8 @@
 import {
-  ID18,
+  ID17,
   isAISDK2,
   packageName2
-} from "./location-services-33n3bzdy.js";
+} from "./mime-xnqxh1k4.js";
 
 // src/plugin/provider/google-vertex.ts
 import { Effect } from "effect";
@@ -39,7 +39,7 @@ var GoogleVertexPlugin2 = define({
       for (const item of evt.provider.list()) {
         if (!isAISDK2(item.provider.package))
           continue;
-        if (packageName2(item.provider.package) !== "@ai-sdk/google-vertex" && !(item.provider.id === ID18.googleVertex && packageName2(item.provider.package)?.includes("@ai-sdk/openai-compatible")))
+        if (packageName2(item.provider.package) !== "@ai-sdk/google-vertex" && !(item.provider.id === ID17.googleVertex && packageName2(item.provider.package)?.includes("@ai-sdk/openai-compatible")))
           continue;
         const project = resolveProject(item.provider.settings ?? {});
         const location = String(resolveLocation(item.provider.settings ?? {}));
@@ -56,13 +56,13 @@ var GoogleVertexPlugin2 = define({
       }
     });
     yield* ctx.aisdk.hook("sdk", Effect.fn(function* (evt) {
-      if (evt.model.providerID === ID18.googleVertex && evt.package.includes("@ai-sdk/openai-compatible")) {
+      if (evt.model.providerID === ID17.googleVertex && evt.package.includes("@ai-sdk/openai-compatible")) {
         evt.options.fetch = authFetch(evt.options.fetch);
         return;
       }
     }));
     yield* ctx.aisdk.hook("language", Effect.fn(function* (evt) {
-      if (evt.model.providerID !== ID18.googleVertex)
+      if (evt.model.providerID !== ID17.googleVertex)
         return;
       evt.language = evt.sdk.languageModel(String(evt.model.modelID ?? evt.model.id).trim());
     }));

package/dist/chunks/{location-services-zvt5dnpc.js → mime-gst7axd9.js}

@@ -1,18 +1,18 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/session/runner/index.ts
 var exports_runner = {};
 __export(exports_runner, {
   DrainResult: () => DrainResult2,
-  Service: () => Service44,
+  Service: () => Service37,
   SessionRunner: () => exports_runner
 });
 import { Context, Data } from "effect";
 var DrainResult2 = Data.taggedEnum();
 
-class Service44 extends Context.Service()("@opencode/SessionRunner") {
+class Service37 extends Context.Service()("@opencode/SessionRunner") {
 }
 
-export { DrainResult2, Service44, exports_runner };
+export { DrainResult2, Service37, exports_runner };

package/dist/chunks/{location-services-h43s0y1m.js → mime-gwk6svk5.js}

@@ -2,10 +2,10 @@ import {
   ephemeral2,
   Service79,
   node84
-} from "./location-services-69j49pks.js";
+} from "./mime-3wjgak91.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/plugin/sdk.ts
 var exports_sdk = {};

package/dist/chunks/{location-services-h03wrkyp.js → mime-h03wrkyp.js}

@@ -1,9 +1,9 @@
 import {
   SessionEvent2
-} from "./location-services-ec1grn59.js";
+} from "./mime-ec1grn59.js";
 import {
   tokens2
-} from "./location-services-tdstcens.js";
+} from "./mime-tdstcens.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Effect, Fiber, Iterable } from "effect";

package/dist/chunks/{location-services-h6vf3j39.js → mime-h6vf3j39.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/util/token.ts
 var exports_token = {};

package/dist/chunks/mime-h7v0c4h9.js

@@ -0,0 +1,97 @@
+import {
+  PATCH_CONTEXT_LINES2
+} from "./mime-tazgh4e4.js";
+import {
+  ID4,
+  Service32
+} from "./mime-hk1cyxmr.js";
+import {
+  SessionSchema2
+} from "./mime-xxynqx5z.js";
+import {
+  MessageNotFoundError2
+} from "./mime-ga6hqhxm.js";
+import {
+  SessionMessageTable2
+} from "./mime-a1bz86dw.js";
+import {
+  __export
+} from "./mime-9rqn6x4v.js";
+
+// src/session/diff.ts
+var exports_diff = {};
+__export(exports_diff, {
+  SessionDiff: () => exports_diff,
+  TurnRangeError: () => TurnRangeError2,
+  turn: () => turn2
+});
+import { and, asc, eq, gt, inArray, lt, or, sql } from "drizzle-orm";
+import { Effect, Schema } from "effect";
+import { Location } from "@opencode/schema/location";
+class TurnRangeError2 extends Schema.TaggedError()("Session.TurnRangeError", {
+  sessionID: SessionSchema2.ID,
+  field: Schema.Literals(["from", "to"]),
+  message: Schema.String
+}) {
+}
+var decodeLocation = Schema.decodeUnknownSync(Schema.fromJsonString(Location.Ref));
+var turn2 = Effect.fn("SessionDiff.turn")(function* (db, locations, input) {
+  const sessionID = input.session.id;
+  const rows = yield* db.select({ id: SessionMessageTable2.id, type: SessionMessageTable2.type, seq: SessionMessageTable2.seq }).from(SessionMessageTable2).where(and(eq(SessionMessageTable2.session_id, sessionID), or(inArray(SessionMessageTable2.type, ["user", "idle"]), input.from ? eq(SessionMessageTable2.id, input.from) : undefined, input.to ? eq(SessionMessageTable2.id, input.to) : undefined))).orderBy(asc(SessionMessageTable2.seq)).all().pipe(Effect.orDie);
+  const users = rows.filter((row) => row.type === "user");
+  const markers = rows.filter((row) => row.type === "idle");
+  const resolve = Effect.fn(function* (field, id) {
+    const row = rows.find((row) => row.id === id);
+    if (!row)
+      return yield* new MessageNotFoundError2({ sessionID, messageID: id });
+    if (row.type !== "user")
+      return yield* new TurnRangeError2({ sessionID, field, message: `Message ${id} is not a user message` });
+    return row;
+  });
+  const anchor = input.from ? yield* resolve("from", input.from) : users[users.length - 1];
+  if (!anchor)
+    return [];
+  const last = input.to ? yield* resolve("to", input.to) : anchor;
+  if (last.seq < anchor.seq)
+    return yield* new TurnRangeError2({ sessionID, field: "to", message: `Message ${last.id} precedes ${anchor.id}` });
+  const legacy = markers.length === 0;
+  const opened = markers.findLast((row) => row.seq < anchor.seq)?.seq ?? -1;
+  const start = legacy ? anchor.seq : users.find((row) => row.seq > opened)?.seq ?? anchor.seq;
+  const end = legacy ? users.find((row) => row.seq > last.seq)?.seq : markers.find((row) => row.seq > last.seq)?.seq;
+  const steps = yield* db.select({
+    seq: SessionMessageTable2.seq,
+    start: sql`json_extract(${SessionMessageTable2.data}, '$.snapshot.start')`,
+    end: sql`json_extract(${SessionMessageTable2.data}, '$.snapshot.end')`,
+    completed: sql`json_extract(${SessionMessageTable2.data}, '$.time.completed')`
+  }).from(SessionMessageTable2).where(and(eq(SessionMessageTable2.session_id, sessionID), eq(SessionMessageTable2.type, "assistant"), gt(SessionMessageTable2.seq, start), end === undefined ? undefined : lt(SessionMessageTable2.seq, end))).orderBy(asc(SessionMessageTable2.seq)).all().pipe(Effect.orDie);
+  const first = steps[0];
+  const final = steps[steps.length - 1];
+  const from = steps.find((step) => step.start)?.start;
+  if (!first || !final || !from)
+    return [];
+  const switches = yield* db.select({
+    seq: SessionMessageTable2.seq,
+    location: sql`json_extract(${SessionMessageTable2.data}, '$.location')`,
+    previous: sql`json_extract(${SessionMessageTable2.data}, '$.previous.location')`
+  }).from(SessionMessageTable2).where(and(eq(SessionMessageTable2.session_id, sessionID), eq(SessionMessageTable2.type, "location-switched"))).orderBy(asc(SessionMessageTable2.seq)).all().pipe(Effect.orDie);
+  if (switches.some((row) => row.seq > first.seq && row.seq < final.seq))
+    return yield* new TurnRangeError2({ sessionID, field: "to", message: "Turn range spans a location change" });
+  const before = switches.findLast((row) => row.seq < first.seq)?.location;
+  const after = switches.find((row) => row.seq > first.seq)?.previous;
+  const location = before ? decodeLocation(before) : after ? decodeLocation(after) : input.session.location;
+  const recorded = steps.findLast((step) => step.end)?.end;
+  return yield* Effect.gen(function* () {
+    const snapshot = yield* Service32;
+    const running = input.active && final.completed === null;
+    const to = running ? (yield* snapshot.capture()) ?? recorded : recorded;
+    if (!to)
+      return [];
+    return yield* snapshot.diff({
+      from: ID4.make(from),
+      to: ID4.make(to),
+      context: input.context ?? PATCH_CONTEXT_LINES2
+    });
+  }).pipe(Effect.provide(locations.get(location)));
+});
+
+export { TurnRangeError2, turn2, exports_diff };

package/dist/chunks/{location-services-6vgebzwc.js → mime-hdrc7pzh.js}

@@ -1,44 +1,44 @@
 import {
   Service79,
   node84
-} from "./location-services-69j49pks.js";
+} from "./mime-3wjgak91.js";
 import {
   create3
-} from "./location-services-kg06axw8.js";
+} from "./mime-kg06axw8.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/agent.ts
-var exports_agent4 = {};
-__export(exports_agent4, {
-  Agent: () => exports_agent4,
+var exports_agent3 = {};
+__export(exports_agent3, {
+  Agent: () => exports_agent3,
   Color: () => Color2,
-  Event: () => Event19,
-  ID: () => ID14,
-  Info: () => Info28,
+  Event: () => Event8,
+  ID: () => ID8,
+  Info: () => Info10,
   Name: () => Name3,
-  Service: () => Service72,
+  Service: () => Service44,
   defaultID: () => defaultID2,
-  node: () => node77
+  node: () => node47
 });
 import path from "path";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Array, Context, Effect, Layer } from "effect";
 import { Agent } from "@opencode/schema/agent";
 import { Global } from "@opencode/util/global";
-import { Event as Event19 } from "@opencode/schema/agent";
+import { Event as Event8 } from "@opencode/schema/agent";
 var SHELL_OUTPUT_GLOB = (data) => path.join(data, "shell", "*", "*");
 var TOOL_OUTPUT_GLOB = (data) => path.join(data, "tool-output", "*");
-var ID14 = Agent.ID;
+var ID8 = Agent.ID;
 var Name3 = Agent.Name;
-var defaultID2 = ID14.make("build");
+var defaultID2 = ID8.make("build");
 var Color2 = Agent.Color;
-var Info28 = Agent.Info;
+var Info10 = Agent.Info;
 
-class Service72 extends Context.Service()("@opencode/Agent") {
+class Service44 extends Context.Service()("@opencode/Agent") {
 }
-var layer = Layer.effect(Service72, Effect.gen(function* () {
+var layer = Layer.effect(Service44, Effect.gen(function* () {
   const bus = yield* Service79;
   const global = yield* Global.Service;
   const permissions = [
@@ -57,7 +57,7 @@ var layer = Layer.effect(Service72, Effect.gen(function* () {
         editor.default = id;
       },
       update: (id, fn) => {
-        const defaults = Info28.default(id);
+        const defaults = Info10.default(id);
         const current = editor.agents.get(id) ?? {
           ...defaults,
           permissions: [...defaults.permissions, ...permissions]
@@ -79,7 +79,7 @@ var layer = Layer.effect(Service72, Effect.gen(function* () {
     const configured = data.default ? selectable(data.agents.get(data.default)) : undefined;
     if (configured)
       return configured;
-    const build = selectable(data.agents.get(ID14.make("build")));
+    const build = selectable(data.agents.get(ID8.make("build")));
     if (build)
       return build;
     for (const agent of data.agents.values()) {
@@ -88,7 +88,7 @@ var layer = Layer.effect(Service72, Effect.gen(function* () {
         return fallback;
     }
   };
-  return Service72.of({
+  return Service44.of({
     transform: state.transform,
     reload: state.reload,
     get: Effect.fn("Agent.get")(function* (id) {
@@ -96,12 +96,12 @@ var layer = Layer.effect(Service72, Effect.gen(function* () {
     }),
     resolve: Effect.fnUntraced(function* (id) {
       if (id !== undefined)
-        return state.get().agents.get(ID14.make(id));
+        return state.get().agents.get(ID8.make(id));
       return selectedDefault();
     }),
     select: Effect.fn("Agent.select")(function* (id) {
       if (id !== undefined) {
-        const selected = ID14.make(id);
+        const selected = ID8.make(id);
         return { id: selected, info: state.get().agents.get(selected) };
       }
       const info = selectedDefault();
@@ -116,6 +116,6 @@ var layer = Layer.effect(Service72, Effect.gen(function* () {
     })
   });
 }));
-var node77 = makeLocationNode({ service: Service72, layer, deps: [node84, Global.node] });
+var node47 = makeLocationNode({ service: Service44, layer, deps: [node84, Global.node] });
 
-export { ID14, Name3, defaultID2, Color2, Info28, Service72, node77, exports_agent4, Event19 };
+export { ID8, Name3, defaultID2, Color2, Info10, Service44, node47, exports_agent3, Event8 };

package/dist/chunks/{location-services-db0ywk9p.js → mime-hf6kd63r.js}

@@ -1,43 +1,43 @@
 import {
   Service79
-} from "./location-services-69j49pks.js";
+} from "./mime-3wjgak91.js";
 import {
-  Service38
-} from "./location-services-42etq36e.js";
+  Service32
+} from "./mime-hk1cyxmr.js";
 import {
-  Error4
-} from "./location-services-nsme3wtk.js";
+  Error5
+} from "./mime-yz87v98p.js";
 import {
-  Service57
-} from "./location-services-76h67nm5.js";
+  Service54
+} from "./mime-3mp8pt0x.js";
 import {
   StepFailedError2
-} from "./location-services-qwkytnft.js";
+} from "./mime-ga6hqhxm.js";
 import {
   SessionEvent2
-} from "./location-services-ec1grn59.js";
+} from "./mime-ec1grn59.js";
 import {
   toSessionError2
-} from "./location-services-03g9n59p.js";
+} from "./mime-3bca72pz.js";
 import {
   calculateCost2
-} from "./location-services-tdstcens.js";
+} from "./mime-tdstcens.js";
 import {
   createLLMEventPublisher2
-} from "./location-services-h03wrkyp.js";
+} from "./mime-h03wrkyp.js";
 import {
   isRetryable2
-} from "./location-services-615073jg.js";
+} from "./mime-vc2f4mv3.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/session/runner/step.ts
 var exports_step = {};
 __export(exports_step, {
   Outcome: () => Outcome2,
   SessionStep: () => exports_step,
-  make: () => make9
+  make: () => make8
 });
 import {
   AIError,
@@ -51,11 +51,11 @@ var Outcome2 = Data.taggedEnum();
 var TOOLS_INTERRUPTED = { type: "aborted", message: "Tool execution interrupted" };
 var STEP_INTERRUPTED = { type: "aborted", message: "Step interrupted" };
 var RESULT_MISSING = { type: "tool.result-missing", message: "Provider did not return a tool result" };
-var make9 = Effect.gen(function* () {
+var make8 = Effect.gen(function* () {
   const bus = yield* Service79;
   const llm = yield* LLMClient.Service;
-  const snapshots = yield* Service38;
-  const toolOutput = yield* Service57;
+  const snapshots = yield* Service32;
+  const toolOutput = yield* Service54;
   const attempt = Effect.fn("SessionStep.attempt")(function* (input) {
     const startSnapshot = yield* snapshots.capture();
     const publisher = createLLMEventPublisher2(bus, {
@@ -70,7 +70,7 @@ var make9 = Effect.gen(function* () {
     const interruptTools = Effect.suspend(() => Fiber.interruptAll(toolRuns.map((run) => run.fiber)));
     const executeTool = (call) => {
       if (input.prepared.request.toolChoice?.type === "none")
-        return new Error4({ message: "Tools are disabled after the maximum agent steps" });
+        return new Error5({ message: "Tools are disabled after the maximum agent steps" });
       return input.prepared.executeTool({
         sessionID: input.sessionID,
         agent: input.agent,
@@ -205,4 +205,4 @@ var classifyToolExits = (settled, runs) => {
   return { interrupted: causes.some(Cause.hasInterrupts), declines, failure };
 };
 
-export { Outcome2, make9, exports_step };
+export { Outcome2, make8, exports_step };

package/dist/chunks/{location-services-42etq36e.js → mime-hk1cyxmr.js}

@@ -1,32 +1,32 @@
 import {
   AbsolutePath2,
   RelativePath2
-} from "./location-services-922hggd3.js";
+} from "./mime-922hggd3.js";
 import {
   Repository2,
   TreeID2,
-  Service76,
-  node81
-} from "./location-services-j26kwb45.js";
+  Service71,
+  node76
+} from "./mime-mr645x8e.js";
 import {
-  Service74,
-  node79
-} from "./location-services-k4e7wm7p.js";
+  Service66,
+  node71
+} from "./mime-bawj3v5d.js";
 import {
   create3
-} from "./location-services-kg06axw8.js";
+} from "./mime-kg06axw8.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./mime-9rqn6x4v.js";
 
 // src/snapshot.ts
 var exports_snapshot2 = {};
 __export(exports_snapshot2, {
-  Error: () => Error3,
+  Error: () => Error2,
   ID: () => ID4,
-  Service: () => Service38,
+  Service: () => Service32,
   Snapshot: () => exports_snapshot2,
-  node: () => node42,
+  node: () => node36,
   noopLayer: () => noopLayer2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -36,20 +36,20 @@ import { FSUtil } from "@opencode/util/fs-util";
 import { Global } from "@opencode/util/global";
 import { ID as ID4 } from "@opencode/schema/snapshot";
 import { Hash } from "@opencode/util/hash";
-class Error3 extends Schema.TaggedError()("Snapshot.Error", {
+class Error2 extends Schema.TaggedError()("Snapshot.Error", {
   operation: Schema.Literals(["capture", "files", "diff", "restore"]),
   message: Schema.String,
   cause: Schema.optional(Schema.Defect())
 }) {
 }
 
-class Service38 extends Context.Service()("@opencode/Snapshot") {
+class Service32 extends Context.Service()("@opencode/Snapshot") {
 }
-var layer = Layer.effect(Service38, Effect.gen(function* () {
+var layer = Layer.effect(Service32, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const git = yield* Service76;
+  const git = yield* Service71;
   const global = yield* Global.Service;
-  const location = yield* Service74;
+  const location = yield* Service66;
   const lifetime = yield* Scope.Scope;
   const state = create3({
     name: "snapshot",
@@ -63,7 +63,7 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
   const repositoryFiber = yield* Effect.cached(Effect.gen(function* () {
     const source = yield* git.repo.discover(location.project.directory);
     if (!source)
-      return yield* new Error3({ operation: "capture", message: "Project is not a Git repository" });
+      return yield* new Error2({ operation: "capture", message: "Project is not a Git repository" });
     const worktree = AbsolutePath2.make(yield* fs.realPath(source.worktree).pipe(Effect.orDie));
     const gitDirectory = AbsolutePath2.make(path.join(global.data, "snapshot", location.project.id, Hash.fast(worktree)));
     const snapshotRepository = (yield* fs.existsSafe(path.join(gitDirectory, "HEAD"))) ? new Repository2({ worktree, gitDirectory, commonDirectory: gitDirectory }) : yield* git.repo.create({ worktree, gitDirectory, seed: source }).pipe(Effect.mapError((cause) => failure("capture", cause)));
@@ -73,7 +73,7 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
   const scope = Effect.fnUntraced(function* (worktree) {
     const relative = path.relative(worktree, location.directory);
     if (relative.startsWith("..") || path.isAbsolute(relative))
-      return yield* new Error3({ operation: "capture", message: "Location is outside the project" });
+      return yield* new Error2({ operation: "capture", message: "Location is outside the project" });
     return RelativePath2.make(relative.replaceAll("\\", "/") || ".");
   });
   const enabled = () => location.vcs?.type === "git" && state.get().enabled;
@@ -90,57 +90,62 @@ var layer = Layer.effect(Service38, Effect.gen(function* () {
       }));
     }).pipe(Effect.catch((cause) => Effect.logWarning("failed to capture snapshot", { cause }).pipe(Effect.as(undefined))));
   });
-  const compare = Effect.fnUntraced(function* (operation, input) {
+  const comparison = Effect.fnUntraced(function* (operation, input) {
     const repo = yield* repository.pipe(Effect.mapError((cause) => failure(operation, cause)));
-    const comparison = {
+    return {
+      source: repo.source,
       repository: repo.snapshotRepository,
       from: TreeID2.make(input.from),
       to: TreeID2.make(input.to)
     };
-    const files = yield* git.tree.files(comparison).pipe(Effect.mapError((cause) => failure(operation, cause)));
-    const ignored = yield* git.index.ignored({ repository: repo.source, paths: files }).pipe(Effect.mapError((cause) => failure(operation, cause)));
-    return {
-      input: comparison,
-      files,
-      ignored
-    };
+  });
+  const ignored = Effect.fnUntraced(function* (operation, source, paths) {
+    return yield* git.index.ignored({ repository: source, paths }).pipe(Effect.mapError((cause) => failure(operation, cause)));
   });
   const files = Effect.fn("Snapshot.files")(function* (input) {
-    const comparison = yield* compare("files", input);
-    return comparison.files.filter((file) => !comparison.ignored.has(file));
+    const compared = yield* comparison("files", input);
+    const changed = yield* git.tree.files({ repository: compared.repository, from: compared.from, to: compared.to }).pipe(Effect.mapError((cause) => failure("files", cause)));
+    const skipped = yield* ignored("files", compared.source, changed);
+    return changed.filter((file) => !skipped.has(file));
   });
   const diff = Effect.fn("Snapshot.diff")(function* (input) {
-    const comparison = yield* compare("diff", input);
-    return yield* git.tree.diff({
-      ...comparison.input,
+    if (input.paths?.length === 0)
+      return [];
+    const compared = yield* comparison("diff", input);
+    const diffs = yield* git.tree.diff({
+      repository: compared.repository,
+      from: compared.from,
+      to: compared.to,
       context: input.context,
-      paths: (input.paths ?? comparison.files).filter((file) => !comparison.ignored.has(file))
+      paths: input.paths
     }).pipe(Effect.mapError((cause) => failure("diff", cause)));
+    const skipped = yield* ignored("diff", compared.source, diffs.map((file) => RelativePath2.make(file.file)));
+    return diffs.filter((file) => !skipped.has(RelativePath2.make(file.file)));
   });
   const plan = Effect.fnUntraced(function* (worktree, input) {
     const files = new Map;
     for (const [file, snapshot] of input.files) {
       const absolute = path.resolve(worktree, file);
       if (!FSUtil.contains(worktree, absolute))
-        return yield* new Error3({ operation: "restore", message: `Path escapes the project: ${file}` });
+        return yield* new Error2({ operation: "restore", message: `Path escapes the project: ${file}` });
       files.set(file, TreeID2.make(snapshot));
     }
     return files;
   });
   const restore = Effect.fn("Snapshot.restore")(function* (input) {
     if (!enabled())
-      return yield* new Error3({ operation: "restore", message: "Snapshots are disabled" });
+      return yield* new Error2({ operation: "restore", message: "Snapshots are disabled" });
     const repo = yield* repository.pipe(Effect.mapError((cause) => failure("restore", cause)));
     yield* git.tree.restore({ repository: repo.snapshotRepository, files: yield* plan(repo.worktree, input) }).pipe(Effect.mapError((cause) => failure("restore", cause)));
   });
-  return Service38.of({ transform: state.transform, reload: state.reload, capture, files, diff, restore });
+  return Service32.of({ transform: state.transform, reload: state.reload, capture, files, diff, restore });
 }).pipe(Effect.withSpan("Snapshot.boot")));
-var node42 = makeLocationNode({
-  service: Service38,
+var node36 = makeLocationNode({
+  service: Service32,
   layer,
-  deps: [FSUtil.node, node81, Global.node, node79]
+  deps: [FSUtil.node, node76, Global.node, node71]
 });
-var noopLayer2 = Layer.succeed(Service38, Service38.of({
+var noopLayer2 = Layer.succeed(Service32, Service32.of({
   transform: () => Effect.succeed({ dispose: Effect.void }),
   reload: () => Effect.void,
   capture: () => Effect.undefined,
@@ -149,13 +154,13 @@ var noopLayer2 = Layer.succeed(Service38, Service38.of({
   restore: () => Effect.void
 }));
 function failure(operation, cause) {
-  if (cause instanceof Error3 && cause.operation === operation)
+  if (cause instanceof Error2 && cause.operation === operation)
     return cause;
-  return new Error3({
+  return new Error2({
     operation,
     message: cause instanceof globalThis.Error ? cause.message : String(cause),
     cause
   });
 }
 
-export { ID4, Error3, Service38, node42, noopLayer2, exports_snapshot2 };
+export { ID4, Error2, Service32, node36, noopLayer2, exports_snapshot2 };