@opencode-ai/core 0.0.0-beta-17823 → 0.0.0-beta-17898

package/dist/chunks/{bus-n0pq9mwy.js → shell-0bmdcyan.js}

@@ -1,22 +1,19 @@
 import {
   fromRow
-} from "./bus-pksqhf5j.js";
+} from "./shell-6nx0wney.js";
 import {
   exports_history
-} from "./bus-ra765m8n.js";
+} from "./shell-gqqtsjcv.js";
 import {
   SessionMessageTable,
   SessionTable
-} from "./bus-9d2xhdr4.js";
-import {
-  exports_message
-} from "./bus-25pxtba7.js";
+} from "./shell-ygy0xbqa.js";
 import {
   exports_database
-} from "./bus-kyy2az1w.js";
+} from "./shell-1pzxdzrs.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/session/store.ts
 var exports_store = {};
@@ -26,27 +23,24 @@ __export(exports_store, {
   Service: () => Service
 });
 import { and, eq, isNotNull, isNull, sql } from "drizzle-orm";
-import { Context, Effect, Layer, Schema } from "effect";
+import { Context, Effect, Layer } from "effect";
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
 import { Session } from "@opencode-ai/schema/session";
 class Service extends Context.Service()("@opencode/SessionStore") {
 }
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const { db } = yield* exports_database.Service;
-  const decodeMessage = Schema.decodeUnknownEffect(exports_message.Info);
   return Service.of({
     get: Effect.fnUntraced(function* (sessionID) {
       const row = yield* db.select().from(SessionTable).where(eq(SessionTable.id, sessionID)).get().pipe(Effect.orDie);
       return row ? fromRow(row) : undefined;
     }),
-    context: Effect.fn("SessionStore.context")(function* (sessionID) {
-      return yield* exports_history.load(db, sessionID);
-    }),
+    context: Effect.fn("SessionStore.context")((sessionID) => exports_history.load(db, sessionID)),
     message: Effect.fn("SessionStore.message")(function* (messageID) {
       const row = yield* db.select().from(SessionMessageTable).where(eq(SessionMessageTable.id, messageID)).get().pipe(Effect.orDie);
       return row ? {
         sessionID: Session.ID.make(row.session_id),
-        message: yield* decodeMessage({ ...row.data, id: row.id, type: row.type }).pipe(Effect.orDie)
+        message: yield* exports_history.decodeMessageRow(row).pipe(Effect.orDie)
       } : undefined;
     }),
     listSuspended: Effect.fn("SessionStore.listSuspended")(function* () {

package/dist/chunks/{bus-0kvmztkf.js → shell-0kvmztkf.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/effect/keyed-mutex.ts
 var exports_keyed_mutex = {};

package/dist/chunks/{bus-cake6fs9.js → shell-0rn5nyg1.js}

@@ -1,12 +1,12 @@
 import {
   exports_models_dev
-} from "./bus-q33mk6d8.js";
-import {
-  exports_bus
-} from "./bus-ded9e5ma.js";
+} from "./shell-3172p7em.js";
 import {
   exports_provider
-} from "./bus-sfbv6a2b.js";
+} from "./shell-djkt4gex.js";
+import {
+  exports_bus
+} from "./shell-z24ajzga.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";

package/dist/chunks/{bus-xd2xkk7n.js → shell-0v6jcyd7.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./bus-704hbswx.js";
+} from "./shell-x3rvp8nk.js";
 import {
   exports_instructions
-} from "./bus-ec8vrfw5.js";
+} from "./shell-ec8vrfw5.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/skill/instructions.ts
 var exports_instructions2 = {};
@@ -62,8 +62,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       const agent = selection.info;
       if (!agent)
         return exports_instructions.empty;
-      const permitted = exports_skill.available(yield* skills.list(), agent);
-      const available = permitted.flatMap((skill) => skill.description === undefined || skill.autoinvoke === false ? [] : [{ id: skill.id, name: skill.name, description: skill.description }]).toSorted((a, b) => a.id.localeCompare(b.id));
+      const available = exports_skill.available(yield* skills.list(), agent).flatMap((skill) => skill.description === undefined || skill.autoinvoke === false ? [] : [{ id: skill.id, name: skill.name, description: skill.description }]).toSorted((a, b) => a.id.localeCompare(b.id));
       return exports_instructions.make({
         key: exports_instructions.Key.make("core/skill-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),

package/dist/chunks/{bus-n744begs.js → shell-0vem89v9.js}

@@ -1,16 +1,16 @@
 import {
   SessionEvent
-} from "./bus-a83yvq99.js";
+} from "./shell-a83yvq99.js";
 import {
   InstructionBlobTable,
   InstructionStateTable
-} from "./bus-9d2xhdr4.js";
+} from "./shell-ygy0xbqa.js";
 import {
   exports_instructions
-} from "./bus-ec8vrfw5.js";
+} from "./shell-ec8vrfw5.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/session/instruction-state.ts
 var exports_instruction_state = {};

package/dist/chunks/{bus-n2w8fz38.js → shell-0vgt3zn6.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./bus-sfbv6a2b.js";
+} from "./shell-djkt4gex.js";
 import {
   __require
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/plugin/provider/google-vertex.ts
 import { Effect } from "effect";

package/dist/chunks/{bus-18pv8fg3.js → shell-18pv8fg3.js}

@@ -1,9 +1,9 @@
 import {
   PositiveInt
-} from "./bus-j07kk359.js";
+} from "./shell-j07kk359.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/v1/config/provider.ts
 var exports_provider = {};

package/dist/chunks/{bus-wh0zhxcg.js → shell-1a3a2s70.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./bus-sfbv6a2b.js";
+} from "./shell-djkt4gex.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/model.ts
 var exports_model = {};

package/dist/chunks/{bus-gwj8nfkp.js → shell-1geabwjm.js}

@@ -1,19 +1,19 @@
+import {
+  exports_state
+} from "./shell-qhdqjp31.js";
 import {
   exports_location
-} from "./bus-19qgjfzv.js";
+} from "./shell-nbnrtycc.js";
 import {
   exports_git
-} from "./bus-zjvgdt9p.js";
+} from "./shell-b7hsw5bk.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./bus-j07kk359.js";
-import {
-  exports_state
-} from "./bus-f2kz495y.js";
+} from "./shell-j07kk359.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/snapshot.ts
 var exports_snapshot = {};
@@ -139,7 +139,7 @@ var node = makeLocationNode({
 var noopLayer = Layer.succeed(Service, Service.of({
   transform: () => Effect.succeed({ dispose: Effect.void }),
   reload: () => Effect.void,
-  capture: () => Effect.succeed(undefined),
+  capture: () => Effect.undefined,
   files: () => Effect.succeed([]),
   diff: () => Effect.succeed([]),
   restore: () => Effect.void

package/dist/chunks/{bus-kyy2az1w.js → shell-1pzxdzrs.js}

@@ -1,12 +1,12 @@
-import {
-  exports_migration
-} from "./bus-sgvnccme.js";
 import {
   exports_drizzle
-} from "./bus-d1vv73bz.js";
+} from "./shell-mfng8748.js";
+import {
+  exports_migration
+} from "./shell-220t9fan.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/database/database.ts
 var exports_database = {};

package/dist/chunks/{bus-md8xze4k.js → shell-1yr8gs1w.js}

@@ -1,18 +1,18 @@
 import {
   exports_form
-} from "./bus-ftqx1cne.js";
+} from "./shell-s3mcfgz8.js";
 import {
   exports_credential
-} from "./bus-4qce6znw.js";
+} from "./shell-6js9hgcv.js";
 import {
   exports_state
-} from "./bus-f2kz495y.js";
+} from "./shell-qhdqjp31.js";
 import {
   exports_bus
-} from "./bus-ded9e5ma.js";
+} from "./shell-z24ajzga.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/integration.ts
 var exports_integration = {};
@@ -456,12 +456,12 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         if (!method)
           return yield* Effect.die(new Error(`Key method not found: ${input.integrationID}`));
         const answer = input.answer ?? {};
-        if (method.type === "key" && method.form) {
+        if (method.form) {
           const invalid = exports_form.validateFields(method.form) ?? exports_form.validateAnswer(method.form, answer);
           if (invalid)
             return yield* new AuthorizationError({ cause: new Error(invalid) });
         }
-        if (method.type === "key" && !method.form && Object.keys(answer).length > 0) {
+        if (!method.form && Object.keys(answer).length > 0) {
           return yield* new AuthorizationError({ cause: new Error("Key method does not accept a form answer") });
         }
         yield* credentials.create({

package/dist/chunks/{bus-4hc8axh8.js → shell-209jfnqy.js}

@@ -1,42 +1,30 @@
 import {
-  toLLMMessages
-} from "./bus-d0r2hzy0.js";
-import {
-  exports_model_headers
-} from "./bus-1xksxgzs.js";
+  exports_question
+} from "./shell-vvsfcjpt.js";
 import {
-  exports_model_http
-} from "./bus-93qdgxxd.js";
+  toLLMMessages
+} from "./shell-jf35ek5b.js";
 import {
   exports_system_prompt
-} from "./bus-v80zsxnb.js";
-import {
-  exports_model_hook
-} from "./bus-vxz5qdmp.js";
-import {
-  exports_prompt_cache_key
-} from "./bus-52jzav25.js";
-import {
-  exports_question
-} from "./bus-w7shx321.js";
+} from "./shell-v80zsxnb.js";
 import {
   exports_model_transport
-} from "./bus-48wxp1m2.js";
+} from "./shell-4j7te1s0.js";
 import {
-  exports_tool
-} from "./bus-ven12e56.js";
+  exports_app
+} from "./shell-50jxp3hw.js";
 import {
-  exports_hooks
-} from "./bus-v2wshkax.js";
+  exports_tool
+} from "./shell-9jn94c6e.js";
 import {
   exports_permission
-} from "./bus-6k923qe9.js";
+} from "./shell-wyd1zrpn.js";
 import {
-  exports_app
-} from "./bus-50jxp3hw.js";
+  exports_hooks
+} from "./shell-v2wshkax.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/session/model-request.ts
 var exports_model_request = {};
@@ -49,8 +37,9 @@ __export(exports_model_request, {
   SessionModelRequest: () => exports_model_request,
   Service: () => Service
 });
-import { LLM, Message, SystemPart } from "@opencode-ai/ai";
-import { Cause, Config, Context, Effect, Layer, Result } from "effect";
+import { HttpOptions, LanguageModel, LLM, LLMRequest, Message, SystemPart } from "@opencode-ai/ai";
+import { Cause, Config, Context, Effect, Layer, Result, Stream } from "effect";
+import { HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 var IMAGE_BYTES_TRIGGER = 25 * 1024 * 1024;
 var IMAGE_BYTES_TARGET = 15 * 1024 * 1024;
@@ -148,6 +137,49 @@ var boundImages = (messages) => {
     })
   }));
 };
+var sessionHeaders = (session, app) => ({
+  "x-session-affinity": session.id,
+  "X-Session-Id": session.id,
+  ...session.parentID ? { "x-parent-session-id": session.parentID } : {},
+  "User-Agent": exports_app.useragent(app),
+  "x-opencode-project": session.projectID,
+  "x-opencode-session": session.id,
+  "x-opencode-client": app.name
+});
+var promptCacheKey = (sessionID) => /^ses_[0-9a-f]{64}$/.test(sessionID) ? sessionID.slice(4) : sessionID;
+var applyModelHooks = (hooks, scope, request) => Effect.gen(function* () {
+  const currentBaseURL = request.model.route.endpoint.baseURL;
+  const event = yield* hooks.trigger("session", "model.request", {
+    ...scope,
+    baseURL: typeof currentBaseURL === "string" ? currentBaseURL : undefined,
+    headers: { ...request.http?.headers }
+  });
+  const route = event.baseURL !== undefined && event.baseURL !== currentBaseURL ? request.model.route.with({ endpoint: { baseURL: event.baseURL } }) : request.model.route;
+  return LLMRequest.update(request, {
+    model: route === request.model.route ? request.model : LanguageModel.update(request.model, { route }),
+    http: new HttpOptions({
+      body: request.http?.body,
+      headers: Object.keys(event.headers).length === 0 ? undefined : event.headers,
+      query: request.http?.query
+    })
+  });
+});
+var httpMiddleware = (hooks, scope) => (request, handler) => Effect.gen(function* () {
+  const before = yield* hooks.trigger("session", "http.request", {
+    ...scope,
+    request: yield* HttpClientRequest.toWeb(request)
+  });
+  let sent = HttpClientRequest.fromWeb(before.request);
+  if (before.request.body)
+    sent = HttpClientRequest.bodyUint8Array(sent, new Uint8Array(yield* Effect.promise(() => before.request.clone().arrayBuffer())), before.request.headers.get("content-type") ?? undefined);
+  const response = yield* handler(sent);
+  const after = yield* hooks.trigger("session", "http.response", {
+    ...scope,
+    request: before.request,
+    response: new Response([204, 205, 304].includes(response.status) ? null : yield* Stream.toReadableStreamEffect(response.stream), { status: response.status, headers: response.headers })
+  });
+  return HttpClientResponse.fromWeb(sent, after.response);
+}).pipe(Effect.mapError((cause) => cause instanceof Error ? cause : new Error(String(cause))));
 
 class Service extends Context.Service()("@opencode/SessionModelRequest") {
 }
@@ -180,27 +212,27 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         return [];
       return [[name, { ...tool, description: definition.description, inputSchema: definition.input }]];
     }));
-    const request = yield* exports_model_hook.apply(hooks, { sessionID: session.id, agent: input.scope.agentID, model: resolved.ref }, LLM.request({
+    const request = yield* applyModelHooks(hooks, { sessionID: session.id, agent: input.scope.agentID, model: resolved.ref }, LLM.request({
       model,
       http: {
-        headers: exports_model_headers.make(session, app)
+        headers: sessionHeaders(session, app)
       },
-      promptCacheKey: exports_prompt_cache_key.make(session.fork?.sessionID ?? session.id),
+      promptCacheKey: promptCacheKey(session.fork?.sessionID ?? session.id),
       system: context.system,
       messages: boundImages(unsupportedParts(context.messages, resolved.capabilities)),
       tools: Array.from(hooked, ([name, tool]) => ({ ...tool, name })),
       toolChoice: input.toolChoice
     }));
-    const webSocketEligible = !(yield* hooks.has("session", "http.request", resolved.ref.providerID)) && !(yield* hooks.has("session", "http.response", resolved.ref.providerID));
+    const hasHttpHooks = (yield* hooks.has("session", "http.request", resolved.ref.providerID)) || (yield* hooks.has("session", "http.response", resolved.ref.providerID));
     const webSocket = resolved.capabilities.responsesWebsockets === true ? yield* Config.boolean(responsesWebSocketFlag(resolved.ref.providerID)).pipe(Config.withDefault(false), Effect.orDie) : false;
-    const http = webSocketEligible ? undefined : exports_model_http.middleware(hooks, {
+    const http = hasHttpHooks ? httpMiddleware(hooks, {
       sessionID: session.id,
       agent: input.scope.agentID,
       model: resolved.ref
-    });
+    }) : undefined;
     const options = {
       ...http ? { http } : {},
-      ...input.webSocket === "session" && webSocket && webSocketEligible && resolved.capabilities.responsesWebsockets === true ? { webSocket: transport.bind(session.id) } : {}
+      ...input.webSocket === "session" && webSocket && !hasHttpHooks ? { webSocket: transport.bind(session.id) } : {}
     };
     const executeTool = (input2) => {
       const tool = hooked.get(input2.call.name);

package/dist/chunks/{bus-sgvnccme.js → shell-220t9fan.js}

@@ -1,12 +1,12 @@
-import {
-  migrations
-} from "./bus-9bpmq09z.js";
 import {
   schema_gen_default
-} from "./bus-ecxv0vtt.js";
+} from "./shell-z8fm0r70.js";
+import {
+  migrations
+} from "./shell-2r0r061q.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/database/migration.ts
 var exports_migration = {};
@@ -63,22 +63,13 @@ function applyOnly(db, input) {
         yield* migration.up(tx);
         yield* tx.run(sql`INSERT INTO ${sql.identifier("migration")} (id, time_completed) VALUES (${migration.id}, ${Date.now()})`);
       }));
-      if (migration.foreignKeys !== false) {
-        yield* apply2.pipe(Effect.tapError((error) => Effect.logError("database migration failed", {
-          migration: migration.id,
-          durationMs: Date.now() - started,
-          error
-        })));
-        yield* Effect.logInfo("database migration completed", {
-          migration: migration.id,
-          durationMs: Date.now() - started
-        });
-        continue;
-      }
-      const relaxForeignKeys = supportsForeignKeyToggle ? db.run(sql`PRAGMA foreign_keys = OFF`) : db.run(sql`PRAGMA defer_foreign_keys = ON`);
-      const restoreForeignKeys = supportsForeignKeyToggle ? db.run(sql`PRAGMA foreign_keys = ON`) : Effect.void;
-      yield* relaxForeignKeys;
-      yield* apply2.pipe(Effect.ensuring(restoreForeignKeys.pipe(Effect.orDie)), Effect.tapError((error) => Effect.logError("database migration failed", {
+      const run = migration.foreignKeys !== false ? apply2 : Effect.gen(function* () {
+        const relaxForeignKeys = supportsForeignKeyToggle ? db.run(sql`PRAGMA foreign_keys = OFF`) : db.run(sql`PRAGMA defer_foreign_keys = ON`);
+        const restoreForeignKeys = supportsForeignKeyToggle ? db.run(sql`PRAGMA foreign_keys = ON`) : Effect.void;
+        yield* relaxForeignKeys;
+        yield* apply2.pipe(Effect.ensuring(restoreForeignKeys.pipe(Effect.orDie)));
+      });
+      yield* run.pipe(Effect.tapError((error) => Effect.logError("database migration failed", {
         migration: migration.id,
         durationMs: Date.now() - started,
         error

package/dist/chunks/{bus-25pxtba7.js → shell-25pxtba7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/session/message.ts
 var exports_message = {};

package/dist/chunks/{bus-2nmyybe0.js → shell-2nmyybe0.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./shell-rvfvac9x.js";
 
 // src/v1/config/formatter.ts
 var exports_formatter = {};