@opencode/core 2.0.32 → 2.1.0

package/dist/chunks/{instance-eb2yw134.js → shell-2fxx0rz9.js}

@@ -1,23 +1,23 @@
 import {
-  Service38,
-  node41
-} from "./instance-agt7xfc2.js";
+  Service45,
+  node48
+} from "./shell-8bee7htz.js";
 import {
-  Key4,
+  Key3,
   removed2,
-  make20,
+  make21,
   diffByKey2
-} from "./instance-02nrjc1r.js";
+} from "./shell-s8d7rejh.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/reference/instructions.ts
 var exports_instructions5 = {};
 __export(exports_instructions5, {
   ReferenceInstructions: () => exports_instructions5,
-  Service: () => Service37,
-  node: () => node40
+  Service: () => Service34,
+  node: () => node37
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -57,19 +57,19 @@ var update = (previous, current) => {
 `);
 };
 
-class Service37 extends Context.Service()("@opencode/ReferenceInstructions") {
+class Service34 extends Context.Service()("@opencode/ReferenceInstructions") {
 }
-var layer = Layer.effect(Service37, Effect.gen(function* () {
-  const references = yield* Service38;
-  return Service37.of({
+var layer = Layer.effect(Service34, Effect.gen(function* () {
+  const references = yield* Service45;
+  return Service34.of({
     load: Effect.fn("ReferenceInstructions.load")(function* () {
       const available = (yield* references.list()).filter((reference) => reference.description !== undefined).map((reference) => ({
         name: reference.name,
         path: reference.path,
         description: reference.description
       })).toSorted((a, b) => a.name.localeCompare(b.name));
-      return make20({
-        key: Key4.make("core/reference-guidance"),
+      return make21({
+        key: Key3.make("core/reference-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),
         read: Effect.succeed(available.length === 0 ? removed2 : available),
         render: {
@@ -81,6 +81,6 @@ var layer = Layer.effect(Service37, Effect.gen(function* () {
     })
   });
 }));
-var node40 = makeLocationNode({ service: Service37, layer, deps: [node41] });
+var node37 = makeLocationNode({ service: Service34, layer, deps: [node48] });
 
-export { Service37, node40, exports_instructions5 };
+export { Service34, node37, exports_instructions5 };

package/dist/chunks/{instance-e5wkangg.js → shell-2g93jbb8.js}

@@ -1,8 +1,8 @@
 import {
-  ID9,
-  Service66,
-  node69
-} from "./instance-6vzwhms5.js";
+  ID16,
+  Service82,
+  node86
+} from "./shell-50d2yybn.js";
 import {
   ID8,
   isAISDK2,
@@ -15,24 +15,24 @@ import {
   encoding2,
   mergeOverlay2,
   mergeHeaders2,
-  Service65,
-  node68
-} from "./instance-2ysm8pgm.js";
+  Service64,
+  node67
+} from "./shell-5xghjtfa.js";
 import {
-  Service63,
-  node66
-} from "./instance-9jgxs1bn.js";
+  Service54,
+  node56
+} from "./shell-9vbreq9z.js";
 import {
   ID7,
   VariantID2,
   Ref2,
-  Service64,
-  node67,
+  Service63,
+  node66,
   supportsText2
-} from "./instance-p6p9qpe8.js";
+} from "./shell-3atk1qyf.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/model-resolver.ts
 var exports_model_resolver = {};
@@ -41,15 +41,15 @@ __export(exports_model_resolver, {
   ModelConfigurationError: () => ModelConfigurationError2,
   ModelInitializationError: () => ModelInitializationError2,
   ModelResolver: () => exports_model_resolver,
-  Service: () => Service62,
+  Service: () => Service53,
   UnresolvedProviderVariablesError: () => UnresolvedProviderVariablesError2,
   UnsupportedCompactionError: () => UnsupportedCompactionError2,
   UnsupportedPackageError: () => UnsupportedPackageError2,
   VariantUnavailableError: () => VariantUnavailableError2,
   fromCatalogModel: () => fromCatalogModel2,
   hasPackage: () => hasPackage2,
-  layer: () => layer25,
-  node: () => node65,
+  layer: () => layer22,
+  node: () => node55,
   resolveModel: () => resolveModel2,
   withVariant: () => withVariant2
 });
@@ -122,7 +122,7 @@ class UnsupportedCompactionError2 extends Schema.TaggedError()("SessionRunnerMod
   }
 }
 
-class Service62 extends Context.Service()("@opencode/ModelResolver") {
+class Service53 extends Context.Service()("@opencode/ModelResolver") {
 }
 var withVariant2 = (model, variantID) => {
   const id = variantID === "default" ? undefined : variantID;
@@ -147,16 +147,14 @@ var fromCatalogModel2 = (model, credential, dependencies) => resolveCatalogModel
 }));
 var resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(function* (model, credential, dependencies) {
   const resolved = prepareRuntimeModel(model);
-  const configuration = credential?.type === "key" ? credential.configuration : undefined;
-  const configured = { ...resolved.settings, ...credential?.metadata, ...configuration };
+  const configured = { ...resolved.settings, ...credential?.metadata };
   if (isAISDK2(resolved.package)) {
     const loadAISDK = dependencies?.loadAISDK;
     if (!loadAISDK)
       return yield* unsupported(resolved);
     const settings = yield* prepareProviderSettings(resolved, mergeOverlay2(resolved.settings, {
       ...nativeCredentialSettings(resolved, resolved.package ?? "", credential),
-      ...credential?.metadata,
-      ...configuration
+      ...credential?.metadata
     }) ?? {});
     return yield* loadAISDK({ ...resolved, settings }).pipe(Effect.mapError((error) => initialization(resolved, "init", error.cause)));
   }
@@ -271,15 +269,15 @@ var causeMessage = (cause) => {
 };
 var resolveModel2 = (model, variant, credential, dependencies) => withVariant2(model, variant).pipe(Effect.flatMap((model) => fromCatalogModel2(model, credential, dependencies)));
 var hasPackage2 = (model) => Boolean(model.package);
-var layer25 = Layer.effect(Service62, Effect.gen(function* () {
-  const providers = yield* Service65;
-  const models = yield* Service64;
-  const integrations = yield* Service66;
+var layer22 = Layer.effect(Service53, Effect.gen(function* () {
+  const providers = yield* Service64;
+  const models = yield* Service63;
+  const integrations = yield* Service82;
   const npm = yield* Npm.Service;
-  const aisdk = yield* Service63;
+  const aisdk = yield* Service54;
   const load = Effect.fn("ModelResolver.resolveModel")(function* (selected, variant) {
     const provider = yield* providers.get(selected.providerID);
-    const connection = yield* integrations.connection.active(provider?.integrationID ?? ID9.make(selected.providerID));
+    const connection = yield* integrations.connection.active(provider?.integrationID ?? ID16.make(selected.providerID));
     const credential = connection ? yield* integrations.connection.resolve(connection) : undefined;
     const selectedVariant = yield* withVariant2(selected, variant);
     const runtimeInfo = {
@@ -306,7 +304,7 @@ var layer25 = Layer.effect(Service62, Effect.gen(function* () {
       chunkTimeout: timeout2(provider?.settings?.chunkTimeout)
     };
   });
-  return Service62.of({
+  return Service53.of({
     resolve: Effect.fn("ModelResolver.resolve")(function* (requested) {
       const selected = requested ? yield* models.get(requested.providerID, requested.id) : yield* models.default().pipe(Effect.flatMap((model) => model && hasPackage2(model) ? Effect.succeed(model) : Effect.map(models.available(), (models) => models.find((model) => hasPackage2(model) && supportsText2(model)))));
       if (!selected)
@@ -323,10 +321,10 @@ function usesAPIKeyAuth(packageName) {
   const name = packageName2(packageName);
   return name === "@ai-sdk/openai" || name === "@ai-sdk/anthropic" || name === "@ai-sdk/cerebras" || name === "@ai-sdk/deepinfra" || name === "@ai-sdk/openai-compatible" || name === "@ai-sdk/google" || name === "@ai-sdk/groq" || name === "@ai-sdk/mistral" || name === "@ai-sdk/togetherai" || name === "@ai-sdk/xai" || name === "@openrouter/ai-sdk-provider" || name === "@ai-sdk/azure" || name === "@opencode/ai/providers/openai" || name?.startsWith("@opencode/ai/providers/openai/") === true || name === "@opencode/ai/providers/anthropic" || name === "@opencode/ai/providers/anthropic-compatible" || name === "@opencode/ai/providers/baseten" || name === "@opencode/ai/providers/cerebras" || name === "@opencode/ai/providers/cloudflare-ai-gateway" || name === "@opencode/ai/providers/cloudflare-workers-ai" || name === "@opencode/ai/providers/deepinfra" || name === "@opencode/ai/providers/deepseek" || name === "@opencode/ai/providers/fireworks" || name === "@opencode/ai/providers/openai-compatible" || name === "@opencode/ai/providers/google" || name === "@opencode/ai/providers/google/interactions" || name === "@opencode/ai/providers/groq" || name === "@opencode/ai/providers/mistral" || name === "@opencode/ai/providers/togetherai" || name === "@opencode/ai/providers/vercel-ai-gateway" || name === "@opencode/ai/providers/xai" || name === "@opencode/ai/providers/openrouter" || name === "@opencode/ai/providers/azure" || name?.startsWith("@opencode/ai/providers/azure/") === true;
 }
-var node65 = makeLocationNode({
-  service: Service62,
-  layer: layer25,
-  deps: [node68, node67, node69, Npm.node, node66]
+var node55 = makeLocationNode({
+  service: Service53,
+  layer: layer22,
+  deps: [node67, node66, node86, Npm.node, node56]
 });
 
-export { VariantUnavailableError2, UnsupportedPackageError2, InitializationPhase2, ModelConfigurationError2, ModelInitializationError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service62, withVariant2, fromCatalogModel2, resolveModel2, hasPackage2, layer25, node65, exports_model_resolver };
+export { VariantUnavailableError2, UnsupportedPackageError2, InitializationPhase2, ModelConfigurationError2, ModelInitializationError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service53, withVariant2, fromCatalogModel2, resolveModel2, hasPackage2, layer22, node55, exports_model_resolver };

package/dist/chunks/{instance-2k8khapm.js → shell-2k8khapm.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/v1/config/plugin.ts
 var exports_plugin3 = {};

package/dist/chunks/{instance-ydjrys25.js → shell-2ndqr24s.js}

@@ -1,16 +1,16 @@
 import {
   ID8,
   mergeOverlay2
-} from "./instance-2ysm8pgm.js";
+} from "./shell-5xghjtfa.js";
 import {
   ID7,
   VariantID2,
-  Info16,
+  Info17,
   compatibility2
-} from "./instance-p6p9qpe8.js";
+} from "./shell-3atk1qyf.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/modal/models.ts
 var exports_models = {};
@@ -94,8 +94,8 @@ function limit(value, fallback) {
 function build(id, remote, baseURL, previous) {
   const cost = previous?.cost[0];
   const input = previous?.limit.input;
-  return Info16.make({
-    ...Info16.default(providerID, id),
+  return Info17.make({
+    ...Info17.default(providerID, id),
     id,
     modelID: ID7.make(remote.id),
     providerID,

package/dist/chunks/{instance-j3ftvw7y.js → shell-2qhkdr5r.js}

@@ -1,16 +1,16 @@
 import {
   parseOption2
-} from "./instance-8m6m0r52.js";
+} from "./shell-8m6m0r52.js";
 import {
   AbsolutePath2
-} from "./instance-z5v4ffb3.js";
+} from "./shell-z5v4ffb3.js";
 import {
-  ID6,
+  ID5,
   Name2
-} from "./instance-qzfs27nc.js";
+} from "./shell-8rnv749x.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/config/plugin/skill-file.ts
 var exports_skill_file = {};
@@ -62,7 +62,7 @@ function parse2(directory, filepath, content) {
   return {
     _tag: "Parsed",
     skill: {
-      id: ID6.make(id),
+      id: ID5.make(id),
       name: Name2.make(frontmatter.name ?? id),
       ...frontmatter.description === undefined ? {} : { description: frontmatter.description },
       ...autoinvoke === undefined ? {} : { autoinvoke },

package/dist/chunks/{instance-99kqc9z2.js → shell-2sq5abjd.js}

@@ -1,12 +1,12 @@
 import {
   SessionEvent2
-} from "./instance-ec1grn59.js";
+} from "./shell-ec1grn59.js";
 import {
   tokens2
-} from "./instance-tdstcens.js";
+} from "./shell-tdstcens.js";
 import {
   contentFilterError2
-} from "./instance-prvmgnqy.js";
+} from "./shell-v6abvp0h.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Effect, Fiber, Iterable } from "effect";
@@ -81,17 +81,17 @@ var createLLMEventPublisher2 = (bus, input) => {
       assistantMessageID: yield* startAssistant()
     });
   });
-  const providerState = (metadata) => metadata?.[input.providerMetadataKey];
+  const native = (metadata) => metadata?.[input.providerMetadataKey];
   const fragments = (name, ended, delta, single = false) => {
     const chunks = new Map;
     let nextOrdinal = 0;
-    const start = (id, state) => Effect.suspend(() => {
+    const start = (id, native) => Effect.suspend(() => {
       if (chunks.has(id))
         return Effect.die(new Error(`Duplicate ${name} start: ${id}`));
       if (single && chunks.size > 0)
         return Effect.die(new Error(`${name} start before end: ${id}`));
       const ordinal = nextOrdinal++;
-      chunks.set(id, { ordinal, values: [], pending: "", state });
+      chunks.set(id, { ordinal, values: [], pending: "", native });
       return Effect.succeed(ordinal);
     });
     const publishDelta = Effect.fnUntraced(function* (id) {
@@ -107,15 +107,15 @@ var createLLMEventPublisher2 = (bus, input) => {
       yield* delta(id, value, current.ordinal);
       return;
     }, Effect.uninterruptible);
-    const append = Effect.fnUntraced(function* (id, value, state) {
+    const append = Effect.fnUntraced(function* (id, value, native) {
       const current = chunks.get(id);
       if (!current)
         return yield* Effect.die(new Error(`${name} delta before start: ${id}`));
       current.values.push(value);
       if (delta)
         current.pending += value;
-      if (state !== undefined)
-        current.state = { ...current.state, ...state };
+      if (native !== undefined)
+        current.native = { ...current.native, ...native };
       if (current.pending && !current.timer) {
         current.timer = yield* Effect.gen(function* () {
           while (current.pending) {
@@ -128,14 +128,14 @@ var createLLMEventPublisher2 = (bus, input) => {
       }
       return current.ordinal;
     });
-    const end = Effect.fnUntraced(function* (id, state, value) {
+    const end = Effect.fnUntraced(function* (id, native, value) {
       const current = chunks.get(id);
       if (!current)
         return yield* Effect.die(new Error(`${name} end before start: ${id}`));
       if (current.timer)
         yield* Fiber.interrupt(current.timer);
       yield* publishDelta(id);
-      yield* ended(id, value ?? current.values.join(""), current.ordinal, state === undefined ? current.state : { ...current.state, ...state });
+      yield* ended(id, value ?? current.values.join(""), current.ordinal, native === undefined ? current.native : { ...current.native, ...native });
       chunks.delete(id);
       return;
     });
@@ -152,13 +152,13 @@ var createLLMEventPublisher2 = (bus, input) => {
     });
     return { start, append, end, flush, publishPending, has: (id) => chunks.has(id) };
   };
-  const text = fragments("text", (_textID, value, ordinal, state) => Effect.gen(function* () {
+  const text = fragments("text", (_textID, value, ordinal, native) => Effect.gen(function* () {
     yield* bus.publish(SessionEvent2.Text.Ended, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
       text: value,
-      state
+      native
     });
   }), (_textID, value, ordinal) => Effect.gen(function* () {
     yield* bus.publish(SessionEvent2.Text.Delta, {
@@ -168,13 +168,13 @@ var createLLMEventPublisher2 = (bus, input) => {
       delta: value
     });
   }), true);
-  const reasoning = fragments("reasoning", (_reasoningID, value, ordinal, state) => Effect.gen(function* () {
+  const reasoning = fragments("reasoning", (_reasoningID, value, ordinal, native) => Effect.gen(function* () {
     yield* bus.publish(SessionEvent2.Reasoning.Ended, {
       sessionID: input.sessionID,
       assistantMessageID: yield* currentAssistantMessageID(),
       ordinal,
       text: value,
-      state
+      native
     });
   }), (_reasoningID, value, ordinal) => Effect.gen(function* () {
     yield* bus.publish(SessionEvent2.Reasoning.Delta, {
@@ -305,7 +305,7 @@ var createLLMEventPublisher2 = (bus, input) => {
       error: stepFailure,
       finish: stepSettlement?.finish === "content-filter" ? stepSettlement.finish : undefined,
       rawFinish: stepSettlement?.rawFinish,
-      providerState: stepSettlement?.providerState,
+      native: stepSettlement?.native,
       ...details
     });
   });
@@ -317,7 +317,7 @@ var createLLMEventPublisher2 = (bus, input) => {
         return;
       case "text-start":
         outputStarted = true;
-        const startedTextOrdinal = yield* text.start(event.id, providerState(event.providerMetadata));
+        const startedTextOrdinal = yield* text.start(event.id, native(event.providerMetadata));
         yield* publishPendingDeltas();
         yield* bus.publish(SessionEvent2.Text.Started, {
           sessionID: input.sessionID,
@@ -326,27 +326,27 @@ var createLLMEventPublisher2 = (bus, input) => {
         });
         return;
       case "text-delta":
-        yield* text.append(event.id, event.text, providerState(event.providerMetadata));
+        yield* text.append(event.id, event.text, native(event.providerMetadata));
         return;
       case "text-end":
-        yield* text.end(event.id, providerState(event.providerMetadata), event.text);
+        yield* text.end(event.id, native(event.providerMetadata), event.text);
         return;
       case "reasoning-start":
         outputStarted = true;
-        const startedReasoningOrdinal = yield* reasoning.start(event.id, providerState(event.providerMetadata));
+        const startedReasoningOrdinal = yield* reasoning.start(event.id, native(event.providerMetadata));
         yield* publishPendingDeltas();
         yield* bus.publish(SessionEvent2.Reasoning.Started, {
           sessionID: input.sessionID,
           assistantMessageID: yield* startAssistant(),
           ordinal: startedReasoningOrdinal,
-          state: providerState(event.providerMetadata)
+          native: native(event.providerMetadata)
         });
         return;
       case "reasoning-delta":
-        yield* reasoning.append(event.id, event.text, providerState(event.providerMetadata));
+        yield* reasoning.append(event.id, event.text, native(event.providerMetadata));
         return;
       case "reasoning-end":
-        yield* reasoning.end(event.id, providerState(event.providerMetadata), event.text);
+        yield* reasoning.end(event.id, native(event.providerMetadata), event.text);
         return;
       case "tool-input-start":
         outputStarted = true;
@@ -387,7 +387,7 @@ var createLLMEventPublisher2 = (bus, input) => {
           id: event.id,
           input: asRecord(event.input),
           executed: tool.providerExecuted,
-          state: providerState(event.providerMetadata)
+          native: native(event.providerMetadata)
         });
         return;
       }
@@ -404,7 +404,6 @@ var createLLMEventPublisher2 = (bus, input) => {
         }
         tool.settled = true;
         const executed = event.providerExecuted === true || tool.providerExecuted;
-        const resultState = providerState(event.providerMetadata);
         if (event.result.type === "error") {
           yield* bus.publish(SessionEvent2.Tool.Failed, {
             sessionID: input.sessionID,
@@ -413,7 +412,7 @@ var createLLMEventPublisher2 = (bus, input) => {
             error: { type: "tool.execution", message: stringify(event.result.value) },
             ...failureSnapshot(tool),
             executed,
-            resultState
+            native: native(event.providerMetadata)
           });
           return;
         }
@@ -423,7 +422,7 @@ var createLLMEventPublisher2 = (bus, input) => {
           id: event.id,
           content: hostedContent(event.result),
           executed,
-          resultState
+          native: native(event.providerMetadata)
         });
         return;
       }
@@ -443,7 +442,7 @@ var createLLMEventPublisher2 = (bus, input) => {
           error: event.message === `Unknown tool: ${event.name}` ? { type: "tool.unknown", message: event.message } : { type: "tool.execution", message: event.message },
           ...failureSnapshot(tool),
           executed: tool.providerExecuted,
-          resultState: providerState(event.providerMetadata)
+          native: native(event.providerMetadata)
         });
         return;
       }
@@ -454,7 +453,7 @@ var createLLMEventPublisher2 = (bus, input) => {
         stepSettlement = {
           finish: event.reason.normalized,
           rawFinish: event.reason.raw,
-          providerState: providerState(event.providerMetadata),
+          native: native(event.providerMetadata),
           tokens: tokens2(event.usage)
         };
         if (event.reason.normalized === "content-filter") {

package/dist/chunks/{instance-4hxt5e23.js → shell-37kervd6.js}

@@ -1,28 +1,28 @@
 import {
-  Service54
-} from "./instance-k74v33jx.js";
+  Service59
+} from "./shell-387dpq4s.js";
 import {
-  Service82
-} from "./instance-jhx7q1qc.js";
+  Service78
+} from "./shell-bj7p7j85.js";
 import {
-  Service53
-} from "./instance-t5d9whg0.js";
+  Service58
+} from "./shell-2exgm5zs.js";
 import {
   unavailable3
-} from "./instance-02nrjc1r.js";
+} from "./shell-s8d7rejh.js";
 import {
   File2,
-  Service74
-} from "./instance-x20m8gm2.js";
+  Service43
+} from "./shell-432psgyy.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./shell-9rqn6x4v.js";
 
 // src/config/plugin/instruction.ts
 var exports_instruction = {};
 __export(exports_instruction, {
   ConfigInstructionPlugin: () => exports_instruction,
-  Plugin: () => Plugin18
+  Plugin: () => Plugin43
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { FSUtil } from "@opencode/util/fs-util";
@@ -31,17 +31,17 @@ import { sameDirectory } from "@opencode/util/path";
 import path, { dirname, join } from "path";
 import { Effect, FiberMap, PubSub, Semaphore, Stream } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/http";
-var Plugin18 = define({
+var Plugin43 = define({
   id: "opencode.config.instruction",
   effect: Effect.fn(function* (ctx) {
-    const discovery = yield* Service74;
+    const discovery = yield* Service43;
     yield* Effect.gen(function* () {
-      const config = yield* Service53;
+      const config = yield* Service58;
       const fs = yield* FSUtil.Service;
       const global = yield* Global.Service;
       const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient);
-      const location = yield* Service82;
-      const watcher = yield* Service54;
+      const location = yield* Service78;
+      const watcher = yield* Service59;
       const changes = yield* PubSub.sliding(1);
       const watches = yield* FiberMap.make();
       const lock = Semaphore.makeUnsafe(1);
@@ -66,16 +66,13 @@ var Plugin18 = define({
         yield* updates.pipe(Stream.runForEach(publish), Effect.forkScoped({ startImmediately: true }));
       }
       const read = Effect.fn("ConfigInstructionPlugin.read")(function* (filepath) {
-        const content = yield* fs.readFileStringSafe(filepath);
-        if (content !== undefined)
-          return new File2({ path: filepath, content });
-        yield* Effect.logDebug("instruction file skipped", { path: filepath, reason: "unavailable" });
+        return yield* fs.readFileString(filepath).pipe(Effect.map((content) => new File2({ path: filepath, content })), Effect.catchIf((error) => error.reason._tag === "NotFound" || FSUtil.isAccessDenied(error), (error) => Effect.logDebug("instruction file skipped", { path: filepath, reason: error.reason._tag }).pipe(Effect.as(error.reason._tag === "NotFound" ? undefined : "denied"))));
       });
       const globalSource = Effect.fn("ConfigInstructionPlugin.globalSource")(function* () {
         if (!discovery.global || !(yield* fs.isFile(globalFile)))
           return [];
         const file = yield* read(globalFile);
-        return file ? [file] : [];
+        return file instanceof File2 ? [file] : [];
       });
       const projectSource = Effect.fn("ConfigInstructionPlugin.projectSource")(function* () {
         if (!project)
@@ -85,7 +82,7 @@ var Plugin18 = define({
         const files = yield* Effect.forEach(discovered, read, { concurrency: "unbounded" });
         if (files.some((file) => file === undefined))
           return unavailable3;
-        return files.filter((file) => file !== undefined);
+        return files.filter((file) => file instanceof File2);
       });
       const match = Effect.fn("ConfigInstructionPlugin.match")(function* (source) {
         const expanded = source.startsWith("~/") ? path.join(global.home, source.slice(2)) : source;
@@ -114,7 +111,7 @@ var Plugin18 = define({
               continue;
             watched.add(resolved);
             const file = yield* read(resolved);
-            if (file)
+            if (file instanceof File2)
               files.push(file);
           }
         }
@@ -177,4 +174,4 @@ function isUrl(source) {
   return URL.canParse(source) && /^https?:$/.test(new URL(source).protocol);
 }
 
-export { Plugin18, exports_instruction };
+export { Plugin43, exports_instruction };