@opencode/core 0.0.0-beta-19378 → 0.0.0-beta-19381

package/dist/chunks/{location-activity-hk7m1wkp.js → ripgrep-3sxvqcgp.js}

@@ -1,54 +1,54 @@
 import {
-  ID9,
+  ID8,
   Info23,
   SessionSchema2
-} from "./location-activity-mf9m2v67.js";
+} from "./ripgrep-pxt4kznk.js";
 import {
   RelativePath2
-} from "./location-activity-922hggd3.js";
+} from "./ripgrep-922hggd3.js";
 import {
   Service80,
   node85
-} from "./location-activity-z1gbfdnk.js";
+} from "./ripgrep-s3d361zp.js";
 import {
   isSynced2,
   Service79,
   node84
-} from "./location-activity-z1bm4ydg.js";
+} from "./ripgrep-0d2qkrjy.js";
 import {
-  Service76,
-  node81
-} from "./location-activity-v34bn7tb.js";
+  Service77,
+  node82
+} from "./ripgrep-80n2194z.js";
 import {
-  Service57,
-  node60
-} from "./location-activity-eqkxs06z.js";
+  Service39,
+  node42
+} from "./ripgrep-zcqf6png.js";
 import {
   SessionEvent2
-} from "./location-activity-ec1grn59.js";
+} from "./ripgrep-ec1grn59.js";
 import {
   SessionMessageTable2
-} from "./location-activity-5c4hm403.js";
+} from "./ripgrep-5c4hm403.js";
 import {
-  node59
-} from "./location-activity-vm4enn8p.js";
+  node41
+} from "./ripgrep-a7j8tqav.js";
 import {
   current2
-} from "./location-activity-gnx4ytbv.js";
+} from "./ripgrep-fab8hzt3.js";
 import {
   snapshot2
-} from "./location-activity-4n7xph43.js";
+} from "./ripgrep-7cbawamr.js";
 import {
   Slug2
-} from "./location-activity-gebd4c9n.js";
+} from "./ripgrep-gebd4c9n.js";
 import {
   SessionAlreadyProjected2,
-  node24
-} from "./location-activity-wanayg32.js";
+  node29
+} from "./ripgrep-sfah34qq.js";
 import {
   Metadata2,
   node63
-} from "./location-activity-z8gyv9zj.js";
+} from "./ripgrep-zgnck06n.js";
 import {
   NotFoundError8,
   MessageNotFoundError2,
@@ -61,50 +61,50 @@ import {
   BusyError2,
   InboxConflictError2,
   SkillNotFoundError2
-} from "./location-activity-7nhrbb6w.js";
+} from "./ripgrep-c769d21z.js";
 import {
-  ListInput5,
-  Service64,
-  node68
-} from "./location-activity-sr6y54hj.js";
+  ListInput3,
+  Service53,
+  node56
+} from "./ripgrep-29c8gkgr.js";
 import {
-  Service58,
-  node61
-} from "./location-activity-wjz6wxx4.js";
+  Service40,
+  node43
+} from "./ripgrep-x9p92xwv.js";
 import {
-  Service53,
-  node57
-} from "./location-activity-haw4zzv8.js";
+  Service35,
+  node39
+} from "./ripgrep-mrngs3tk.js";
 import {
   llmClient2
-} from "./location-activity-5t3nmthw.js";
+} from "./ripgrep-5t3nmthw.js";
 import {
-  Service20,
-  node23
-} from "./location-activity-jyq96w4f.js";
+  Service24,
+  node28
+} from "./ripgrep-n5hw7tw3.js";
 import {
   generate3
-} from "./location-activity-5ej0vzhk.js";
+} from "./ripgrep-tc6vzjsq.js";
 import {
   execute2
-} from "./location-activity-2mnmazsw.js";
+} from "./ripgrep-ffatf9pa.js";
 import {
   DestinationNotFoundError2,
   DestinationNotDirectoryError2,
   DestinationUnavailableError2,
-  Service19,
-  node22
-} from "./location-activity-1njc6h9e.js";
+  Service21,
+  node25
+} from "./ripgrep-b00bre06.js";
 import {
-  Service29,
-  node33
-} from "./location-activity-g3v9p4fy.js";
+  Service46,
+  node49
+} from "./ripgrep-4c2df9zx.js";
 import {
-  make12
-} from "./location-activity-b4rsyp8d.js";
+  make13
+} from "./ripgrep-hgyqz33r.js";
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/session.ts
 var exports_session = {};
@@ -115,7 +115,7 @@ __export(exports_session, {
   DestinationNotDirectoryError: () => DestinationNotDirectoryError2,
   DestinationNotFoundError: () => DestinationNotFoundError2,
   DestinationUnavailableError: () => DestinationUnavailableError2,
-  ID: () => ID9,
+  ID: () => ID8,
   InboxConflictError: () => InboxConflictError2,
   Info: () => Info23,
   ListAnchor: () => ListAnchor2,
@@ -124,12 +124,12 @@ __export(exports_session, {
   MessageNotFoundError: () => MessageNotFoundError2,
   NotFoundError: () => NotFoundError8,
   PromptConflictError: () => PromptConflictError2,
-  Service: () => Service13,
+  Service: () => Service20,
   Session: () => exports_session,
   SessionSchema: () => SessionSchema2,
   SkillNotFoundError: () => SkillNotFoundError2,
   SyntheticConflictError: () => SyntheticConflictError2,
-  node: () => node17
+  node: () => node24
 });
 import { Effect, Layer, Schema, Context, Stream } from "effect";
 import { LLMClient } from "@opencode/ai";
@@ -139,26 +139,26 @@ import { Model } from "@opencode/schema/model";
 import path from "path";
 import { Node } from "@opencode/util/effect/app-node";
 import { FSUtil } from "@opencode/util/fs-util";
-var ListInput2 = ListInput5;
-class Service13 extends Context.Service()("@opencode/Session") {
+var ListInput2 = ListInput3;
+class Service20 extends Context.Service()("@opencode/Session") {
 }
-var layer = Layer.effect(Service13, Effect.gen(function* () {
+var layer = Layer.effect(Service20, Effect.gen(function* () {
   const app = yield* Metadata2;
   const database = yield* Service80;
   const db = database.db;
   const bus = yield* Service79;
-  const projects = yield* Service76;
-  const execution = yield* Service53;
+  const projects = yield* Service77;
+  const execution = yield* Service35;
   const llm = yield* LLMClient.Service;
-  const transport = yield* Service20;
-  const store = yield* Service64;
-  const instances = yield* Service57;
-  const moves = yield* Service19;
-  const jobs = yield* Service58;
-  const environments = yield* Service29;
-  const sessions = yield* make12();
+  const transport = yield* Service24;
+  const store = yield* Service53;
+  const instances = yield* Service39;
+  const moves = yield* Service21;
+  const jobs = yield* Service40;
+  const environments = yield* Service46;
+  const sessions = yield* make13();
   const isDurableSessionEvent = Schema.is(SessionEvent2.Durable);
-  const result = Service13.of({
+  const result = Service20.of({
     create: Effect.fn("Session.create")(function* (input) {
       const sessionID = input.id ?? SessionSchema2.ID.create();
       const recorded = yield* store.get(sessionID);
@@ -259,11 +259,11 @@ var layer = Layer.effect(Service13, Effect.gen(function* () {
     prompt: (input) => sessions.forSession(input.sessionID).prompt(input),
     generate: Effect.fn("Session.generate")(function* (input) {
       const session = yield* result.get(input.sessionID);
-      return yield* generate3({ session, prompt: input.prompt }).pipe(Effect.provideService(Service57, instances), Effect.provideService(Service80, database), Effect.provideService(LLMClient.Service, llm));
+      return yield* generate3({ session, prompt: input.prompt }).pipe(Effect.provideService(Service39, instances), Effect.provideService(Service80, database), Effect.provideService(LLMClient.Service, llm));
     }),
     command: Effect.fn("Session.command")(function* (input) {
       const session = yield* result.get(input.sessionID);
-      return yield* execute2({ ...input, session }).pipe(Effect.provideService(Service57, instances));
+      return yield* execute2({ ...input, session }).pipe(Effect.provideService(Service39, instances));
     }),
     shell: (input) => sessions.forSession(input.sessionID).shell(input),
     skill: (input) => sessions.forSession(input.sessionID).skill(input),
@@ -303,26 +303,26 @@ var layer = Layer.effect(Service13, Effect.gen(function* () {
   });
   return result;
 }));
-var node17 = Node.makeGlobalNode({
-  service: Service13,
+var node24 = Node.makeGlobalNode({
+  service: Service20,
   layer,
   deps: [
-    node61,
-    node33,
+    node43,
+    node49,
     node85,
     node84,
-    node81,
-    node57,
-    node23,
+    node82,
+    node39,
+    node28,
     llmClient2,
-    node68,
-    node60,
-    node59,
-    node22,
-    node24,
+    node56,
+    node42,
+    node41,
+    node25,
+    node29,
     FSUtil.node,
     node63
   ]
 });
 
-export { ListAnchor2, ListInput2, Service13, node17, exports_session };
+export { ListAnchor2, ListInput2, Service20, node24, exports_session };

package/dist/chunks/{location-activity-3tvqynh2.js → ripgrep-3tvqynh2.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/database/v1-migration.ts
 var exports_v1_migration = {};

package/dist/chunks/{location-activity-rqvnyjvr.js → ripgrep-4890d2ba.js}

@@ -3,28 +3,28 @@ import {
   UnsupportedPackageError3,
   UnresolvedProviderVariablesError3,
   UnsupportedCompactionError3,
-  Service67,
-  node71
-} from "./location-activity-f1cnfddz.js";
+  Service61,
+  node65
+} from "./ripgrep-2fbtx2rb.js";
 import {
   SessionSchema2
-} from "./location-activity-mf9m2v67.js";
+} from "./ripgrep-pxt4kznk.js";
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/session/runner/model.ts
 var exports_model = {};
 __export(exports_model, {
   ModelNotSelectedError: () => ModelNotSelectedError2,
   ModelUnavailableError: () => ModelUnavailableError2,
-  Service: () => Service55,
+  Service: () => Service37,
   SessionRunnerModel: () => exports_model,
   UnresolvedProviderVariablesError: () => UnresolvedProviderVariablesError2,
   UnsupportedCompactionError: () => UnsupportedCompactionError2,
   UnsupportedPackageError: () => UnsupportedPackageError2,
   VariantUnavailableError: () => VariantUnavailableError2,
-  node: () => node58,
+  node: () => node40,
   resolved: () => resolved2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -51,7 +51,7 @@ var UnsupportedPackageError2 = UnsupportedPackageError3;
 var UnresolvedProviderVariablesError2 = UnresolvedProviderVariablesError3;
 var UnsupportedCompactionError2 = UnsupportedCompactionError3;
 
-class Service55 extends Context.Service()("@opencode/SessionRunnerModel") {
+class Service37 extends Context.Service()("@opencode/SessionRunnerModel") {
 }
 var resolved2 = (model, options) => ({
   model,
@@ -65,9 +65,9 @@ var resolved2 = (model, options) => ({
   limit: options.limit,
   compaction: options.compaction
 });
-var layer = Layer.effect(Service55, Effect.gen(function* () {
-  const resolver = yield* Service67;
-  return Service55.of({
+var layer = Layer.effect(Service37, Effect.gen(function* () {
+  const resolver = yield* Service61;
+  return Service37.of({
     resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session, available) {
       if (!session.model) {
         const resolved = yield* resolver.resolve();
@@ -85,6 +85,6 @@ var layer = Layer.effect(Service55, Effect.gen(function* () {
     })
   });
 }));
-var node58 = makeLocationNode({ service: Service55, layer, deps: [node71] });
+var node40 = makeLocationNode({ service: Service37, layer, deps: [node65] });
 
-export { ModelNotSelectedError2, ModelUnavailableError2, VariantUnavailableError2, UnsupportedPackageError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service55, resolved2, node58, exports_model };
+export { ModelNotSelectedError2, ModelUnavailableError2, VariantUnavailableError2, UnsupportedPackageError2, UnresolvedProviderVariablesError2, UnsupportedCompactionError2, Service37, resolved2, node40, exports_model };

package/dist/chunks/{location-activity-5xasq6s3.js → ripgrep-4ayvwj3v.js}

@@ -1,24 +1,24 @@
 import {
   Service79
-} from "./location-activity-z1bm4ydg.js";
+} from "./ripgrep-0d2qkrjy.js";
 import {
   OAuth3,
-  Event18
-} from "./location-activity-gcvdmamd.js";
+  Event17
+} from "./ripgrep-wm6gh047.js";
 import {
-  ID11,
+  ID9,
   MethodID2
-} from "./location-activity-396sg1zz.js";
+} from "./ripgrep-ep1rz70n.js";
 import {
   ID15,
   mergeOverlay2,
   mergeHeaders2
-} from "./location-activity-2d6j2h4j.js";
+} from "./ripgrep-2d6j2h4j.js";
 import {
-  ID5,
+  ID14,
   Input14,
   Response2
-} from "./location-activity-0xrr2dv7.js";
+} from "./ripgrep-wg38wxpd.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Equal, Schema, Semaphore, Stream } from "effect";
@@ -32,7 +32,7 @@ var methodID = MethodID2.make("device");
 var RemoteResponse = Schema.Struct({
   providers: Schema.Record(Schema.String, ConfigProvider.Info),
   websearch: Schema.Struct({
-    providerID: ID5
+    providerID: ID14
   }).pipe(Schema.optional)
 });
 var Device = Schema.Struct({
@@ -45,7 +45,8 @@ var Device = Schema.Struct({
 var Token = Schema.Struct({
   access_token: Schema.String,
   refresh_token: Schema.String,
-  expires_in: Schema.Number
+  expires_in: Schema.Number,
+  org_id: Schema.optional(Schema.NullOr(Schema.String))
 });
 var TokenPending = Schema.Struct({ error: Schema.String });
 var DeviceToken = Schema.Union([Token, TokenPending]);
@@ -53,7 +54,7 @@ var User = Schema.Struct({ id: Schema.String, email: Schema.String });
 var Org = Schema.Struct({ id: Schema.String, name: Schema.String });
 function oauth(http) {
   return {
-    integrationID: ID11.make("opencode"),
+    integrationID: ID9.make("opencode"),
     method: {
       id: methodID,
       type: "oauth",
@@ -61,7 +62,7 @@ function oauth(http) {
     },
     authorize: (answer) => Effect.gen(function* () {
       const server = yield* normalizeServer(answer.server ?? defaultServer);
-      const device = yield* post(http, `${server}/auth/device/code`, { client_id: clientID }, Device);
+      const device = yield* post(http, `${server}/auth/device/code`, { client_id: clientID, supports_org_scope: true }, Device);
       const verification = yield* Effect.try({
         try: () => {
           const url = new URL(device.verification_uri_complete, `${server}/`);
@@ -84,7 +85,12 @@ function oauth(http) {
         ...credential,
         access: token.access_token,
         refresh: token.refresh_token,
-        expires: Date.now() + token.expires_in * 1000
+        expires: Date.now() + token.expires_in * 1000,
+        metadata: token.org_id == null ? credential.metadata : {
+          ...credential.metadata,
+          orgID: token.org_id,
+          orgName: credential.metadata?.orgID === token.org_id && typeof credential.metadata.orgName === "string" ? credential.metadata.orgName : token.org_id
+        }
       };
     }),
     label: (credential) => typeof credential.metadata?.orgName === "string" ? credential.metadata.orgName : undefined
@@ -119,7 +125,7 @@ var OpencodePlugin2 = define({
         catalog.provider.update(providerID, (provider) => {
           if (source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), { id: provider.id });
-          provider.integrationID = ID11.make("opencode");
+          provider.integrationID = ID9.make("opencode");
           if (item.canonical !== undefined)
             provider.canonical = item.canonical;
           if (item.name !== undefined)
@@ -243,7 +249,7 @@ var OpencodePlugin2 = define({
       yield* Effect.all([ctx.catalog.reload(), ctx.websearch.reload()], { concurrency: 2, discard: true });
     });
     const refresh = () => loading.withPermit(load().pipe(Effect.andThen(apply)));
-    yield* bus.subscribe(Event18.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID11.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event17.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID9.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
     yield* Effect.sleep(Duration.minutes(10)).pipe(Effect.andThen(loading.withPermit(load().pipe(Effect.flatMap((next) => Equal.equals(snapshot, next) ? Effect.void : apply(next))))), Effect.forever, Effect.forkScoped);
   })
 });
@@ -301,7 +307,10 @@ function credential(http, server, token) {
       get(http, `${server}/api/user`, token.access_token, User),
       get(http, `${server}/api/orgs`, token.access_token, Schema.Array(Org))
     ], { concurrency: 2 });
-    const org = orgs.toSorted((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id))[0];
+    const org = token.org_id == null ? orgs.toSorted((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id))[0] : orgs.find((org) => org.id === token.org_id);
+    if (token.org_id != null && !org) {
+      return yield* Effect.fail(new Error(`OpenCode organization not found: ${token.org_id}`));
+    }
     return OAuth3.make({
       type: "oauth",
       methodID,
@@ -322,7 +331,7 @@ function get(http, url, token, schema) {
   return HttpClient.filterStatusOk(http).execute(HttpClientRequest.get(url).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token))).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)));
 }
 function post(http, url, body, schema, statusOk = true) {
-  return HttpClientRequest.post(url).pipe(HttpClientRequest.acceptJson, HttpClientRequest.schemaBodyJson(Schema.Record(Schema.String, Schema.String))(body), Effect.flatMap((request) => http.execute(request)), Effect.flatMap((response) => statusOk ? HttpClientResponse.filterStatusOk(response) : Effect.succeed(response)), Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)));
+  return HttpClientRequest.post(url).pipe(HttpClientRequest.acceptJson, HttpClientRequest.schemaBodyJson(Schema.Record(Schema.String, Schema.Union([Schema.String, Schema.Boolean])))(body), Effect.flatMap((request) => http.execute(request)), Effect.flatMap((response) => statusOk ? HttpClientResponse.filterStatusOk(response) : Effect.succeed(response)), Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)));
 }
 
 export { OpencodePlugin2 };

package/dist/chunks/{location-activity-g3v9p4fy.js → ripgrep-4c2df9zx.js}

@@ -1,22 +1,22 @@
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/session/environment.ts
 var exports_environment = {};
 __export(exports_environment, {
-  Service: () => Service29,
+  Service: () => Service46,
   SessionEnvironment: () => exports_environment,
-  node: () => node33
+  node: () => node49
 });
 import { Context, Effect, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
 
-class Service29 extends Context.Service()("@opencode/SessionEnvironment") {
+class Service46 extends Context.Service()("@opencode/SessionEnvironment") {
 }
-var layer = Layer.sync(Service29, () => {
+var layer = Layer.sync(Service46, () => {
   const environments = new Map;
-  return Service29.of({
+  return Service46.of({
     get: (sessionID) => Effect.sync(() => environments.get(sessionID)),
     set: (sessionID, variables) => Effect.sync(() => {
       environments.set(sessionID, { ...variables });
@@ -26,6 +26,6 @@ var layer = Layer.sync(Service29, () => {
     })
   });
 });
-var node33 = makeGlobalNode({ service: Service29, layer, deps: [] });
+var node49 = makeGlobalNode({ service: Service46, layer, deps: [] });
 
-export { Service29, node33, exports_environment };
+export { Service46, node49, exports_environment };

package/dist/chunks/{location-activity-gnn6hezp.js → ripgrep-4eetnmxa.js}

@@ -1,12 +1,12 @@
 import {
   migrations2
-} from "./location-activity-348jnv36.js";
+} from "./ripgrep-a2kk223a.js";
 import {
   schema_gen_default
-} from "./location-activity-twg0f83k.js";
+} from "./ripgrep-twg0f83k.js";
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/database/migration.ts
 var exports_migration = {};

package/dist/chunks/{location-activity-00a34zy0.js → ripgrep-50ztztte.js}

@@ -1,29 +1,29 @@
 import {
-  Service44
-} from "./location-activity-w24zfv24.js";
+  Service48
+} from "./ripgrep-2stzc2h4.js";
 import {
-  Service51
-} from "./location-activity-4j4p0yst.js";
+  Service58
+} from "./ripgrep-qpprd5ad.js";
 import {
   observe2
-} from "./location-activity-qsdy395h.js";
+} from "./ripgrep-qsdy395h.js";
 import {
   __export
-} from "./location-activity-9rqn6x4v.js";
+} from "./ripgrep-9rqn6x4v.js";
 
 // src/config/plugin/image.ts
 var exports_image = {};
 __export(exports_image, {
   ConfigImagePlugin: () => exports_image,
-  Plugin: () => Plugin9
+  Plugin: () => Plugin14
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin9 = define({
+var Plugin14 = define({
   id: "opencode.config.image",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service44;
-    const image = yield* Service51;
+    const config = yield* Service48;
+    const image = yield* Service58;
     const loaded = yield* observe2(config, ctx.event, image.reload());
     yield* image.transform((editor) => {
       for (const entry of loaded.entries) {
@@ -43,4 +43,4 @@ var Plugin9 = define({
   })
 });
 
-export { Plugin9, exports_image };
+export { Plugin14, exports_image };