@opencode-ai/core 0.0.0-dev-17534 → 0.0.0-dev-17582

package/dist/chunks/websearch-4ag1d7wn.js

@@ -0,0 +1,139 @@
+import {
+  exports_config
+} from "./websearch-4h5ccvmb.js";
+import {
+  exports_model
+} from "./websearch-1px4xhxb.js";
+import {
+  exports_provider
+} from "./websearch-8twz6z1z.js";
+
+// src/plugin/provider/vllm.ts
+import { define } from "@opencode-ai/plugin/effect/plugin";
+import { Duration, Effect, Schedule, Schema, Semaphore, Stream } from "effect";
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+var providerID = "vllm";
+var RemoteModel = Schema.Struct({
+  id: Schema.String,
+  owned_by: Schema.String,
+  max_model_len: Schema.NullOr(Schema.Int)
+});
+var Response = Schema.Struct({ data: Schema.Array(RemoteModel) });
+var discovery = new Map;
+var discoveryLock = Semaphore.makeUnsafe(1);
+function make(origin = "http://127.0.0.1:8000", interval = "30 seconds") {
+  return define({
+    id: "opencode.provider.vllm",
+    effect: Effect.fn(function* (ctx) {
+      const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient);
+      const config = yield* exports_config.Service;
+      const source = { current: configured(yield* config.entries(), origin) };
+      const loaded = { models: [], hash: "[]" };
+      yield* ctx.integration.transform((integrations) => {
+        if (loaded.models.length === 0)
+          return;
+        integrations.remove(providerID);
+      });
+      yield* ctx.catalog.transform((catalog) => {
+        if (loaded.models.length === 0)
+          return;
+        for (const model of catalog.provider.get(providerID)?.models.values() ?? []) {
+          catalog.model.remove(providerID, model.id);
+        }
+        catalog.provider.update(providerID, (provider) => {
+          provider.name = "vLLM";
+          provider.package = "@opencode-ai/ai/providers/openai-compatible";
+          provider.settings = {
+            baseURL: source.current.baseURL,
+            provider: providerID,
+            apiKey: source.current.apiKey ?? ""
+          };
+          provider.integrationID = undefined;
+          provider.activation = "enabled";
+        });
+        for (const item of loaded.models) {
+          catalog.model.update(providerID, item.id, (model) => {
+            model.modelID = exports_model.ID.make(item.id);
+            model.name = item.id;
+            model.capabilities = { tools: false, input: ["text"], output: ["text"] };
+            model.limit = { context: item.max_model_len ?? 0, output: 0 };
+          });
+        }
+      });
+      const discover = Effect.fn("VLLMPlugin.discover")(function* () {
+        const current = source.current;
+        if (!current.healthEndpoint || !current.modelsEndpoint)
+          return;
+        return yield* discoveryLock.withPermit(Effect.gen(function* () {
+          const endpoint = `${current.healthEndpoint}
+${current.modelsEndpoint}`;
+          const cached = discovery.get(endpoint);
+          if (cached && cached.apiKey === current.apiKey && Date.now() - cached.checked < Duration.toMillis(interval))
+            return { source: current, models: cached.models };
+          discovery.set(endpoint, {
+            checked: Date.now(),
+            apiKey: current.apiKey,
+            models: cached && cached.apiKey === current.apiKey ? cached.models : undefined
+          });
+          const request = (endpoint2) => current.apiKey ? HttpClientRequest.get(endpoint2).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(current.apiKey)) : HttpClientRequest.get(endpoint2).pipe(HttpClientRequest.acceptJson);
+          yield* http.execute(request(current.healthEndpoint)).pipe(Effect.timeout("1 second"));
+          const response = yield* http.execute(request(current.modelsEndpoint)).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(Response)), Effect.timeout("1 second"));
+          const models = response.data.filter((model) => model.owned_by === providerID && model.id.length > 0).toSorted((a, b) => a.id.localeCompare(b.id));
+          discovery.set(endpoint, { checked: Date.now(), apiKey: current.apiKey, models });
+          return { source: current, models };
+        }));
+      });
+      const refresh = Effect.fn("VLLMPlugin.refresh")(function* () {
+        const result = yield* discover();
+        if (!result?.models || result.source !== source.current)
+          return;
+        const hash = JSON.stringify(result.models);
+        if (hash === loaded.hash)
+          return;
+        loaded.models = result.models;
+        loaded.hash = hash;
+        yield* ctx.integration.reload();
+        yield* ctx.catalog.reload();
+      });
+      yield* refresh().pipe(Effect.ignore, Effect.repeat(Schedule.spaced(interval)), Effect.forkScoped);
+      const reload = Effect.fn("VLLMPlugin.reload")(function* () {
+        const next = configured(yield* config.entries(), origin);
+        if (next.baseURL === source.current.baseURL && next.apiKey === source.current.apiKey && next.healthEndpoint === source.current.healthEndpoint && next.modelsEndpoint === source.current.modelsEndpoint)
+          return;
+        source.current = next;
+        loaded.models = [];
+        loaded.hash = "[]";
+        yield* ctx.integration.reload();
+        yield* ctx.catalog.reload();
+        yield* refresh().pipe(Effect.ignore);
+      });
+      yield* ctx.event.subscribe().pipe(Stream.filter((event) => event.type === "config.updated"), Stream.runForEach(reload), Effect.forkScoped({ startImmediately: true }));
+    })
+  });
+}
+var VLLMPlugin = make();
+function configured(entries, origin) {
+  const settings = entries.filter((entry) => entry.type === "document").flatMap((entry) => {
+    const settings2 = entry.info.providers?.[providerID]?.settings;
+    return settings2 ? [settings2] : [];
+  }).reduce((result, item) => exports_provider.mergeOverlay(result, item), undefined);
+  const baseURL = (typeof settings?.baseURL === "string" ? settings.baseURL : `${origin.replace(/\/+$/, "")}/v1`).replace(/\/+$/, "");
+  const apiKey = typeof settings?.apiKey === "string" ? settings.apiKey : undefined;
+  if (!URL.canParse(baseURL))
+    return { baseURL, apiKey };
+  const models = new URL(baseURL);
+  if (models.protocol !== "http:" && models.protocol !== "https:")
+    return { baseURL, apiKey };
+  models.pathname = `${models.pathname.replace(/\/+$/, "")}/models`;
+  models.search = "";
+  models.hash = "";
+  const health = new URL(baseURL);
+  const path = health.pathname.replace(/\/+$/, "");
+  const prefix = path.endsWith("/v1") ? path.slice(0, -3) : path;
+  health.pathname = `${prefix}/health`;
+  health.search = "";
+  health.hash = "";
+  return { baseURL, apiKey, healthEndpoint: health.toString(), modelsEndpoint: models.toString() };
+}
+
+export { make, VLLMPlugin };

package/dist/chunks/{location-mutation-z6x3syjm.js → websearch-4ax2r61g.js}

@@ -1,18 +1,18 @@
-import {
-  exports_mcp
-} from "./location-mutation-ntaxv5rr.js";
 import {
   exports_tool
-} from "./location-mutation-c2ybg4ge.js";
+} from "./websearch-hvqcyvjd.js";
+import {
+  exports_mcp
+} from "./websearch-8wkhz4wr.js";
 import {
   exports_permission
-} from "./location-mutation-ygk63920.js";
+} from "./websearch-2q9bjvm8.js";
 import {
   exports_bus
-} from "./location-mutation-hxe9x5q4.js";
+} from "./websearch-ckqcetpa.js";
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/tool/mcp.ts
 var exports_mcp2 = {};

package/dist/chunks/{location-mutation-gkr8ps6a.js → websearch-4h5ccvmb.js}

@@ -1,30 +1,30 @@
 import {
-  exports_normalize
-} from "./location-mutation-w41606j9.js";
+  exports_watcher
+} from "./websearch-y980s7ka.js";
 import {
   exports_variable
-} from "./location-mutation-eyk9wdct.js";
+} from "./websearch-eyk9wdct.js";
 import {
-  exports_watcher
-} from "./location-mutation-k6vwd7kr.js";
+  exports_normalize
+} from "./websearch-jw61kez2.js";
 import {
   exports_wellknown
-} from "./location-mutation-52tx0krd.js";
+} from "./websearch-s5zqn0xe.js";
 import {
   exports_credential
-} from "./location-mutation-ehshw193.js";
+} from "./websearch-ma1d0wnv.js";
 import {
   exports_location
-} from "./location-mutation-8f2w0exz.js";
+} from "./websearch-jjq7wvgp.js";
 import {
   AbsolutePath
-} from "./location-mutation-j07kk359.js";
+} from "./websearch-j07kk359.js";
 import {
   exports_bus
-} from "./location-mutation-hxe9x5q4.js";
+} from "./websearch-ckqcetpa.js";
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/config.ts
 var exports_config = {};
@@ -62,7 +62,7 @@ function latest(entries, key) {
   return entries.filter((entry) => entry.type === "document").findLast((entry) => entry.info[key] !== undefined)?.info[key];
 }
 
-class UpdateError extends Schema.TaggedErrorClass()("Config.UpdateError", {
+class UpdateError extends Schema.TaggedError()("Config.UpdateError", {
   message: Schema.String,
   cause: Schema.optional(Schema.Defect())
 }) {

package/dist/chunks/{location-mutation-ey2chqfm.js → websearch-4nec8eyz.js}

@@ -1,112 +1,115 @@
-import {
-  exports_generate
-} from "./location-mutation-xgv25zxy.js";
 import {
   exports_projector
-} from "./location-mutation-qcp2qhqa.js";
+} from "./websearch-j2s807q1.js";
 import {
   exports_execution
-} from "./location-mutation-etb5k4qg.js";
+} from "./websearch-7drfgzqd.js";
 import {
-  exports_model_transport
-} from "./location-mutation-42q4drvy.js";
+  exports_revert
+} from "./websearch-nm4cb4h2.js";
 import {
   exports_inbox
-} from "./location-mutation-0y8x2ncc.js";
+} from "./websearch-5g7qz6sn.js";
 import {
-  exports_revert
-} from "./location-mutation-a4jfd1a6.js";
+  exports_model_transport
+} from "./websearch-42q4drvy.js";
 import {
-  Slug
-} from "./location-mutation-df3v2q6j.js";
+  exports_generate
+} from "./websearch-xgv25zxy.js";
+import {
+  exports_command
+} from "./websearch-m32yazy2.js";
 import {
   exports_shell
-} from "./location-mutation-w6c90kys.js";
+} from "./websearch-56jrf0jv.js";
 import {
-  exports_job
-} from "./location-mutation-gpee7ppy.js";
+  exports_environment
+} from "./websearch-6ky7rqk7.js";
 import {
-  exports_command
-} from "./location-mutation-6fpz3e44.js";
-import {
-  exports_app
-} from "./location-mutation-50jxp3hw.js";
+  exports_location_service_map
+} from "./websearch-zdkg1k91.js";
 import {
   exports_image
-} from "./location-mutation-w7ye0a3g.js";
+} from "./websearch-pbebj8jk.js";
+import {
+  Slug
+} from "./websearch-df3v2q6j.js";
+import {
+  exports_app
+} from "./websearch-50jxp3hw.js";
 import {
   exports_skill
-} from "./location-mutation-c563ykwj.js";
+} from "./websearch-yd27s2y4.js";
+import {
+  exports_job
+} from "./websearch-gpee7ppy.js";
 import {
   exports_store
-} from "./location-mutation-we6mq5tr.js";
+} from "./websearch-r7eqrdms.js";
 import {
   fromRow
-} from "./location-mutation-rrmxx8ha.js";
-import {
-  exports_instruction_state
-} from "./location-mutation-ddjpbqb0.js";
-import {
-  SessionMessageTable,
-  SessionTable
-} from "./location-mutation-9d2xhdr4.js";
+} from "./websearch-y4pa1h9m.js";
 import {
   ForkEmptyError,
   MessageDecodeError,
   NotFoundError
-} from "./location-mutation-s6by3cc4.js";
+} from "./websearch-p27xxkqg.js";
+import {
+  exports_instruction_state
+} from "./websearch-5pnhvvbf.js";
 import {
   exports_message
-} from "./location-mutation-25pxtba7.js";
+} from "./websearch-25pxtba7.js";
+import {
+  SessionMessageTable,
+  SessionTable
+} from "./websearch-9d2xhdr4.js";
 import {
   SessionEvent
-} from "./location-mutation-a83yvq99.js";
+} from "./websearch-a83yvq99.js";
+import {
+  exports_agent
+} from "./websearch-bkm10e2q.js";
 import {
   ID,
   Info,
   exports_schema
-} from "./location-mutation-y8rs54ne.js";
-import {
-  exports_agent
-} from "./location-mutation-922sag1z.js";
-import {
-  exports_workspace
-} from "./location-mutation-pq5tzw8c.js";
-import {
-  exports_model
-} from "./location-mutation-xfd1xnk3.js";
+} from "./websearch-y8rs54ne.js";
 import {
   exports_mime
-} from "./location-mutation-dhphtf1x.js";
+} from "./websearch-dhphtf1x.js";
 import {
-  exports_location_service_map
-} from "./location-mutation-zdkg1k91.js";
+  exports_workspace
+} from "./websearch-v2y4nm8b.js";
 import {
   exports_location
-} from "./location-mutation-8f2w0exz.js";
+} from "./websearch-jjq7wvgp.js";
 import {
   exports_project
-} from "./location-mutation-shwpj262.js";
+} from "./websearch-0vcctnjy.js";
 import {
   upsertProject
-} from "./location-mutation-88jbfw8z.js";
+} from "./websearch-88jbfw8z.js";
 import {
   AbsolutePath,
   PositiveInt,
   RelativePath
-} from "./location-mutation-j07kk359.js";
+} from "./websearch-j07kk359.js";
 import {
   exports_bus
-} from "./location-mutation-hxe9x5q4.js";
+} from "./websearch-ckqcetpa.js";
 import {
   exports_database
-} from "./location-mutation-0f6fy6zy.js";
+} from "./websearch-w0yv1t8e.js";
 import {
   exports_keyed_mutex
-} from "./location-mutation-0kvmztkf.js";
+} from "./websearch-0kvmztkf.js";
+import {
+  exports_model
+} from "./websearch-1px4xhxb.js";
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/session.ts
 var exports_session = {};
@@ -161,50 +164,50 @@ var ListProjectInput = Schema.Struct({
 });
 var ListAllInput = Schema.Struct(ListInputBase);
 var ListInput = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
-class PromptConflictError extends Schema.TaggedErrorClass()("Session.PromptConflictError", {
+class PromptConflictError extends Schema.TaggedError()("Session.PromptConflictError", {
   sessionID: exports_schema.ID,
   messageID: exports_message.ID
 }) {
 }
 
-class SyntheticConflictError extends Schema.TaggedErrorClass()("Session.SyntheticConflictError", {
+class SyntheticConflictError extends Schema.TaggedError()("Session.SyntheticConflictError", {
   sessionID: exports_schema.ID,
   inputID: exports_message.ID
 }) {
 }
 
-class AttachmentError extends Schema.TaggedErrorClass()("Session.AttachmentError", {
+class AttachmentError extends Schema.TaggedError()("Session.AttachmentError", {
   uri: Schema.String,
   message: Schema.String
 }) {
 }
 
-class CompactionConflictError extends Schema.TaggedErrorClass()("Session.CompactionConflictError", {
+class CompactionConflictError extends Schema.TaggedError()("Session.CompactionConflictError", {
   sessionID: exports_schema.ID,
   inputID: exports_message.ID
 }) {
 }
 
-class BusyError extends Schema.TaggedErrorClass()("Session.BusyError", {
+class BusyError extends Schema.TaggedError()("Session.BusyError", {
   sessionID: exports_schema.ID
 }) {
 }
 
-class InboxConflictError extends Schema.TaggedErrorClass()("Session.InboxConflictError", {
+class InboxConflictError extends Schema.TaggedError()("Session.InboxConflictError", {
   sessionID: exports_schema.ID,
   inboxID: exports_message.ID
 }) {
 }
 
-class SkillNotFoundError extends Schema.TaggedErrorClass()("Session.SkillNotFoundError", {
+class SkillNotFoundError extends Schema.TaggedError()("Session.SkillNotFoundError", {
   skill: exports_skill.ID
 }) {
 }
 
-class DestinationNotFoundError extends Schema.TaggedErrorClass()("Session.DestinationNotFoundError", { directory: AbsolutePath }) {
+class DestinationNotFoundError extends Schema.TaggedError()("Session.DestinationNotFoundError", { directory: AbsolutePath }) {
 }
 
-class DestinationNotDirectoryError extends Schema.TaggedErrorClass()("Session.DestinationNotDirectoryError", { directory: AbsolutePath }) {
+class DestinationNotDirectoryError extends Schema.TaggedError()("Session.DestinationNotDirectoryError", { directory: AbsolutePath }) {
 }
 var MessageNotFoundError = exports_revert.MessageNotFoundError;
 
@@ -222,6 +225,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const locations = yield* exports_location_service_map.Service;
   const fs = yield* FSUtil.Service;
   const jobs = yield* exports_job.Service;
+  const environments = yield* exports_environment.Service;
   const scope = yield* Scope.Scope;
   const activeShells = new Set;
   const shellLocks = exports_keyed_mutex.makeUnsafe();
@@ -314,6 +318,12 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         return yield* new NotFoundError({ sessionID });
       return session;
     }),
+    environment: Effect.fn("Session.environment")(function* (input) {
+      yield* result.get(input.sessionID);
+      if (input.variables !== undefined)
+        yield* environments.set(input.sessionID, input.variables);
+      return yield* environments.get(input.sessionID);
+    }),
     remove: Effect.fn("Session.remove")(function* (sessionID) {
       const session = yield* result.get(sessionID);
       yield* execution.interrupt(sessionID);
@@ -321,6 +331,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       yield* closeTransport(session);
       const children = yield* result.list({ parentID: sessionID });
       yield* Effect.forEach(children.data, (child) => result.remove(child.id), { concurrency: 1, discard: true });
+      yield* environments.clear(sessionID);
       yield* bus.publish(SessionEvent.Deleted, { sessionID });
       yield* bus.remove(sessionID);
     }),
@@ -451,7 +462,12 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         yield* execution.awaitIdle(input.sessionID);
         const started = yield* Effect.gen(function* () {
           const shell = yield* exports_shell.Service;
-          return yield* shell.create({ command: input.command, cwd: session.location.directory, timeout: 0 }).pipe(Effect.orDie);
+          return yield* shell.create({
+            command: input.command,
+            cwd: session.location.directory,
+            timeout: 0,
+            metadata: { sessionID: input.sessionID }
+          }).pipe(Effect.orDie);
         }).pipe(Effect.provide(locations.get(session.location)));
         yield* bus.publish(SessionEvent.Shell.Started, {
           sessionID: input.sessionID,
@@ -795,6 +811,7 @@ var node = makeGlobalNode({
   layer: layer.pipe(Layer.orDie),
   deps: [
     exports_job.node,
+    exports_environment.node,
     exports_database.node,
     exports_bus.node,
     exports_project.node,

package/dist/chunks/{location-mutation-4s2xwh5d.js → websearch-4s2xwh5d.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./location-mutation-v9bfv94f.js";
+} from "./websearch-v9bfv94f.js";
 import {
   PositiveInt
-} from "./location-mutation-j07kk359.js";
+} from "./websearch-j07kk359.js";
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/v1/config/agent.ts
 var exports_agent = {};

package/dist/chunks/{location-mutation-03cgxhm0.js → websearch-4yx9qn5q.js}

@@ -1,17 +1,17 @@
 import {
   exports_model
-} from "./location-mutation-1fa5c3hq.js";
-import {
-  exports_integration
-} from "./location-mutation-zswn1d1m.js";
+} from "./websearch-gsmwjeh0.js";
 import {
   exports_permission
-} from "./location-mutation-ygk63920.js";
+} from "./websearch-2q9bjvm8.js";
 import {
   AgentNotFoundError,
   StepFailedError,
   UserInterruptedError
-} from "./location-mutation-s6by3cc4.js";
+} from "./websearch-p27xxkqg.js";
+import {
+  exports_integration
+} from "./websearch-nkezjycm.js";
 
 // src/session/to-session-error.ts
 import { AIError, ToolFailure } from "@opencode-ai/ai";

package/dist/chunks/{location-mutation-4zzdwbaz.js → websearch-4zzdwbaz.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./location-mutation-0zz82cjq.js";
+} from "./websearch-0zz82cjq.js";
 import {
   __require
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/plugin/provider/alibaba.ts
 var AlibabaPlugin = createProviderPlugin({

package/dist/chunks/{location-mutation-50jxp3hw.js → websearch-50jxp3hw.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/app.ts
 var exports_app = {};

package/dist/chunks/{location-mutation-52jzav25.js → websearch-52jzav25.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/session/prompt-cache-key.ts
 var exports_prompt_cache_key = {};

package/dist/chunks/{location-mutation-w6c90kys.js → websearch-56jrf0jv.js}

@@ -1,25 +1,31 @@
+import {
+  exports_environment as exports_environment2
+} from "./websearch-6ky7rqk7.js";
 import {
   exports_hooks
-} from "./location-mutation-0dwyqmzq.js";
+} from "./websearch-0dwyqmzq.js";
 import {
   exports_select
-} from "./location-mutation-04kwjb53.js";
-import {
-  exports_environment1 as exports_environment
-} from "./location-mutation-x7vqvsas.js";
+} from "./websearch-04kwjb53.js";
 import {
   exports_config
-} from "./location-mutation-gkr8ps6a.js";
+} from "./websearch-4h5ccvmb.js";
+import {
+  exports_schema
+} from "./websearch-y8rs54ne.js";
+import {
+  exports_environment1 as exports_environment
+} from "./websearch-7mfhcadw.js";
 import {
   exports_location
-} from "./location-mutation-8f2w0exz.js";
+} from "./websearch-jjq7wvgp.js";
 import {
   exports_bus
-} from "./location-mutation-hxe9x5q4.js";
+} from "./websearch-ckqcetpa.js";
 import {
   __export,
   __require
-} from "./location-mutation-rvfvac9x.js";
+} from "./websearch-rvfvac9x.js";
 
 // src/shell.ts
 var exports_shell = {};
@@ -39,7 +45,7 @@ import { Shell } from "@opencode-ai/schema/shell";
 import { AppProcess } from "@opencode-ai/util/process";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import { Global } from "@opencode-ai/util/global";
-class NotFoundError extends Schema.TaggedErrorClass()("Shell.NotFoundError", {
+class NotFoundError extends Schema.TaggedError()("Shell.NotFoundError", {
   id: Shell.ID
 }) {
 }
@@ -54,6 +60,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   const global = yield* Global.Service;
   const environment = yield* exports_environment.Service;
   const hooks = yield* exports_hooks.Service;
+  const environments = yield* exports_environment2.Service;
   const context = yield* Effect.context();
   const runFork = Effect.runForkWith(context);
   const sessions = new Map;
@@ -141,13 +148,15 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     };
   });
   const create = Effect.fn("Shell.create")(function* (input, before) {
+    const sessionID = input.metadata?.sessionID;
+    const sessionEnvironment = location.workspaceID === undefined && Schema.is(exports_schema.ID)(sessionID) ? yield* environments.get(sessionID) : undefined;
     const invocation = {
       command: input.command,
       cwd: input.cwd ?? location.directory,
       timeout: input.timeout,
       shell: yield* resolve(),
       env: {
-        ...process.env,
+        ...sessionEnvironment ?? process.env,
         TERM: "xterm-256color",
         OPENCODE_TERMINAL: "1"
       }
@@ -239,7 +248,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         session2.timeoutFiber = runFork(Effect.sleep(Duration.millis(duration)).pipe(Effect.flatMap(() => finish("timeout", undefined, handle.kill().pipe(Effect.catch(() => Effect.void)))), Effect.catch(() => Effect.void)));
       });
       yield* session2.timeout(invocation.timeout);
-      runFork(handle.exitCode.pipe(Effect.flatMap((code) => finish("exited", code)), Effect.catch(() => Effect.void)));
+      runFork(handle.exitCode.pipe(Effect.flatMap((code) => finish("exited", code)), Effect.catch(() => finish("exited"))));
       yield* bus.publish(Shell.Event.Created, { info });
       yield* Deferred.succeed(ready, session2);
       yield* Deferred.await(session2.done).pipe(Effect.catch(() => Effect.void));
@@ -253,7 +262,15 @@ function configured(options) {
   return makeLocationNode({
     service: Service,
     layer: layer(options),
-    deps: [exports_bus.node, exports_location.node, exports_config.node, Global.node, exports_environment.node, exports_hooks.node]
+    deps: [
+      exports_bus.node,
+      exports_location.node,
+      exports_config.node,
+      Global.node,
+      exports_environment.node,
+      exports_hooks.node,
+      exports_environment2.node
+    ]
   });
 }
 var node = configured();