@opencode/core 0.0.0-dev-19323 → 0.0.0-dev-19329

package/dist/chunks/{formatter-v2e5xjra.js → websearch-tm3xsw7s.js}

@@ -3,34 +3,34 @@ import {
   WrongKind2,
   Failed2,
   typeFollowing2
-} from "./formatter-2a5m3afh.js";
+} from "./websearch-2a5m3afh.js";
 import {
   execDefaults2
-} from "./formatter-1dazxqgg.js";
+} from "./websearch-1dazxqgg.js";
 import {
   makeLocalDriver2
-} from "./formatter-b6gygkdw.js";
+} from "./websearch-b6gygkdw.js";
 import {
   makeMemoryDriver2
-} from "./formatter-aaet6srn.js";
+} from "./websearch-aaet6srn.js";
 import {
-  Service73,
-  node78
-} from "./formatter-as2ntxq9.js";
+  Service75,
+  node80
+} from "./websearch-wgwah134.js";
 import {
-  Service53,
-  node57
-} from "./formatter-7czvajng.js";
+  Service61,
+  node65
+} from "./websearch-378w8nm6.js";
 import {
   __export
-} from "./formatter-9rqn6x4v.js";
+} from "./websearch-9rqn6x4v.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};
 __export(exports_environment2, {
   EnvironmentService: () => exports_environment2,
-  Service: () => Service52,
-  node: () => node56
+  Service: () => Service48,
+  node: () => node51
 });
 import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,13 +43,13 @@ __export(exports_environment3, {
   Environment: () => exports_environment3,
   Failed: () => Failed2,
   NotFound: () => NotFound2,
-  Service: () => Service52,
+  Service: () => Service48,
   WrongKind: () => WrongKind2,
   execDefaults: () => execDefaults2,
   makeFiles: () => makeFiles2,
   makeLocalDriver: () => makeLocalDriver2,
   makeMemoryDriver: () => makeMemoryDriver2,
-  node: () => node56,
+  node: () => node51,
   typeFollowing: () => typeFollowing2
 });
 var makeFiles2 = (driver) => ({
@@ -58,19 +58,19 @@ var makeFiles2 = (driver) => ({
 });
 
 // src/environment/environment.ts
-class Service52 extends Context.Service()("@opencode/Environment") {
+class Service48 extends Context.Service()("@opencode/Environment") {
 }
-var layer = Layer.effect(Service52, Effect.gen(function* () {
+var layer = Layer.effect(Service48, Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const location = yield* Service73;
-  const workspace = yield* Service53;
+  const location = yield* Service75;
+  const workspace = yield* Service61;
   const driver = location.workspaceID ? yield* workspace.connect(location.workspaceID).pipe(Effect.mapError((cause) => new Error(`Failed to bind Environment to workspace ${location.workspaceID}`, { cause })), Effect.orDie) : makeLocalDriver2(spawner);
-  return Service52.of({ files: makeFiles2(driver), spawner: driver.spawner });
+  return Service48.of({ files: makeFiles2(driver), spawner: driver.spawner });
 }));
-var node56 = makeLocationNode({
-  service: Service52,
+var node51 = makeLocationNode({
+  service: Service48,
   layer,
-  deps: [CrossSpawnSpawner.node, node78, node57]
+  deps: [CrossSpawnSpawner.node, node80, node65]
 });
 
-export { Service52, node56, exports_environment2, makeFiles2, exports_environment3 };
+export { Service48, node51, exports_environment2, makeFiles2, exports_environment3 };

package/dist/chunks/{formatter-y1jmkgm7.js → websearch-tmhsdwgv.js}

@@ -1,30 +1,40 @@
 import {
   Service79
-} from "./formatter-8fawk0wq.js";
+} from "./websearch-b14zgdmq.js";
 import {
   OAuth3,
-  Event13
-} from "./formatter-0rz3ymjm.js";
+  Event20
+} from "./websearch-dgksc2sd.js";
 import {
-  ID5,
+  ID6,
   MethodID2
-} from "./formatter-jy5b41x9.js";
+} from "./websearch-g00y01sj.js";
 import {
-  ID11,
+  ID8,
   mergeOverlay2,
   mergeHeaders2
-} from "./formatter-jtp7wgq3.js";
+} from "./websearch-942f7qpg.js";
+import {
+  ID11,
+  Input14,
+  Response2
+} from "./websearch-afsmvzt6.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Equal, Schema, Semaphore, Stream } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
-import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 import { ConfigProvider } from "@opencode/schema/config/provider";
 import { Money } from "@opencode/schema/money";
 var defaultServer = "https://opencode.ai/console";
 var clientID = "opencode-cli";
 var methodID = MethodID2.make("device");
-var RemoteResponse = Schema.Struct({ providers: Schema.Record(Schema.String, ConfigProvider.Info) });
+var RemoteResponse = Schema.Struct({
+  providers: Schema.Record(Schema.String, ConfigProvider.Info),
+  websearch: Schema.Struct({
+    providerID: ID11
+  }).pipe(Schema.optional)
+});
 var Device = Schema.Struct({
   device_code: Schema.String,
   user_code: Schema.String,
@@ -43,7 +53,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: ID5.make("opencode"),
+    integrationID: ID6.make("opencode"),
     method: {
       id: methodID,
       type: "oauth",
@@ -69,8 +79,7 @@ function oauth(http) {
       };
     }),
     refresh: (credential) => Effect.gen(function* () {
-      const server = typeof credential.metadata?.server === "string" ? credential.metadata.server : defaultServer;
-      const token = yield* post(http, `${server}/auth/device/token`, { grant_type: "refresh_token", refresh_token: credential.refresh, client_id: clientID }, Token);
+      const token = yield* post(http, `${serverUrl(credential)}/auth/device/token`, { grant_type: "refresh_token", refresh_token: credential.refresh, client_id: clientID }, Token);
       return {
         ...credential,
         access: token.access_token,
@@ -87,14 +96,14 @@ var OpencodePlugin2 = define({
     const bus = yield* Service79;
     const http = yield* HttpClient.HttpClient;
     const loading = Semaphore.makeUnsafe(1);
-    let snapshot = { connected: false, providers: undefined };
+    let snapshot = { config: undefined, connection: undefined };
     const load = Effect.fn("OpencodePlugin.load")(function* () {
       const connection = yield* ctx.integration.connection.active("opencode");
       const credential = connection ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.orElseSucceed(() => {
         return;
       })) : undefined;
-      const providers = credential ? yield* fetchProviders(http, credential).pipe(Effect.catch((cause) => Effect.logWarning("failed to load OpenCode provider config", { cause }).pipe(Effect.as(undefined)))) : undefined;
-      return { connected: connection !== undefined, providers };
+      const config = credential ? yield* fetchConfig(http, credential).pipe(Effect.catch((cause) => Effect.logWarning("failed to load OpenCode provider config", { cause }).pipe(Effect.as(undefined)))) : undefined;
+      return { config, connection };
     });
     yield* ctx.integration.transform((editor) => {
       editor.update("opencode", (integration) => {
@@ -105,12 +114,12 @@ var OpencodePlugin2 = define({
     });
     snapshot = yield* load();
     yield* ctx.catalog.transform((catalog) => {
-      for (const [providerID, item] of Object.entries(snapshot.providers ?? {})) {
+      for (const [providerID, item] of Object.entries(snapshot.config?.providers ?? {})) {
         const source = catalog.provider.get(item.canonical ?? providerID);
         catalog.provider.update(providerID, (provider) => {
           if (source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), { id: provider.id });
-          provider.integrationID = ID5.make("opencode");
+          provider.integrationID = ID6.make("opencode");
           if (item.canonical !== undefined)
             provider.canonical = item.canonical;
           if (item.name !== undefined)
@@ -173,10 +182,10 @@ var OpencodePlugin2 = define({
           });
         }
       }
-      const item = catalog.provider.get(ID11.opencode);
+      const item = catalog.provider.get(ID8.opencode);
       if (!item)
         return;
-      const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connected || item.provider.settings?.apiKey);
+      const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey);
       catalog.provider.update(item.provider.id, (provider) => {
         if (!hasKey) {
           provider.activation = "enabled";
@@ -193,26 +202,64 @@ var OpencodePlugin2 = define({
         });
       }
     });
+    yield* ctx.websearch.transform((editor) => {
+      const descriptor = snapshot.config?.websearch;
+      const connection = snapshot.connection;
+      if (!descriptor || !connection)
+        return;
+      editor.add({
+        id: descriptor.providerID,
+        name: "OpenCode",
+        execute: (input) => Effect.gen(function* () {
+          const active = yield* ctx.integration.connection.active("opencode");
+          if (!active || (connection.type === "credential" ? active.type !== "credential" || active.id !== connection.id : active.type !== "env" || active.name !== connection.name)) {
+            return yield* Effect.fail(new Error("OpenCode Console connection changed"));
+          }
+          const credential = yield* ctx.integration.connection.resolve(active);
+          if (!credential)
+            return yield* Effect.fail(new Error("OpenCode Console is not connected"));
+          const metadata = credential.metadata;
+          const orgID = typeof metadata?.orgID === "string" ? metadata.orgID : undefined;
+          const token = credential.type === "oauth" ? credential.access : credential.key;
+          const server = yield* normalizeServer(serverUrl(credential));
+          const request = yield* HttpClientRequest.post(`${server}/api/websearch`).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token), HttpClientRequest.setHeaders(orgID ? { "x-org-id": orgID } : {}), HttpClientRequest.schemaBodyJson(Input14)({
+            query: input.query,
+            providerID: descriptor.providerID
+          }));
+          const response = yield* HttpClient.withScope(HttpClient.filterStatusOk(http)).execute(request).pipe(Effect.provideService(FetchHttpClient.RequestInit, { redirect: "error" }), Effect.flatMap(HttpClientResponse.schemaBodyJson(Response2)), Effect.scoped, Effect.timeoutOrElse({
+            duration: Duration.seconds(25),
+            orElse: () => Effect.fail(new Error("OpenCode web search request timed out"))
+          }));
+          if (response.providerID !== descriptor.providerID) {
+            return yield* Effect.fail(new Error(`OpenCode web search returned provider ${response.providerID} instead of ${descriptor.providerID}`));
+          }
+          return response.results;
+        })
+      });
+      editor.default.set(descriptor.providerID);
+    });
     const apply = Effect.fn("OpencodePlugin.apply")(function* (next) {
       snapshot = next;
-      yield* ctx.catalog.reload();
+      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(Event13.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID5.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event20.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID6.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);
   })
 });
-function fetchProviders(http, value) {
+function fetchConfig(http, value) {
   const metadata = value.metadata;
-  const server = typeof metadata?.server === "string" ? metadata.server : defaultServer;
   const orgID = typeof metadata?.orgID === "string" ? metadata.orgID : undefined;
   const token = value.type === "oauth" ? value.access : value.key;
-  return http.execute(HttpClientRequest.get(`${server}/api/v2/config`).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token), HttpClientRequest.setHeaders(orgID ? { "x-org-id": orgID } : {}))).pipe(Effect.flatMap((response) => {
+  return http.execute(HttpClientRequest.get(`${serverUrl(value)}/api/v2/config`).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token), HttpClientRequest.setHeaders(orgID ? { "x-org-id": orgID } : {}))).pipe(Effect.flatMap((response) => {
     if (response.status === 404)
       return Effect.undefined;
-    return HttpClientResponse.filterStatusOk(response).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(RemoteResponse)), Effect.map((remote) => remote.providers));
+    return HttpClientResponse.filterStatusOk(response).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(RemoteResponse)));
   }));
 }
+function serverUrl(value) {
+  return typeof value.metadata?.server === "string" ? value.metadata.server : defaultServer;
+}
 function withoutCredentials(body) {
   return body && Object.fromEntries(Object.entries(body).filter(([key]) => !["apiKey", "authToken", "accessToken"].includes(key)));
 }

package/dist/chunks/{formatter-56n5z1rw.js → websearch-tnrgf8qg.js}

@@ -1,33 +1,33 @@
 import {
   Service79,
   node84
-} from "./formatter-8fawk0wq.js";
+} from "./websearch-b14zgdmq.js";
 import {
   create3
-} from "./formatter-kg06axw8.js";
+} from "./websearch-kg06axw8.js";
 import {
   __export
-} from "./formatter-9rqn6x4v.js";
+} from "./websearch-9rqn6x4v.js";
 
 // src/command.ts
-var exports_command4 = {};
-__export(exports_command4, {
-  Command: () => exports_command4,
-  Event: () => Event7,
+var exports_command5 = {};
+__export(exports_command5, {
+  Command: () => exports_command5,
+  Event: () => Event10,
   ExecutionError: () => ExecutionError2,
-  Info: () => Info5,
-  NotFoundError: () => NotFoundError3,
-  Service: () => Service34,
-  layer: () => layer18,
-  node: () => node39
+  Info: () => Info18,
+  NotFoundError: () => NotFoundError6,
+  Service: () => Service52,
+  layer: () => layer23,
+  node: () => node55
 });
 import { Command } from "@opencode/schema/command";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
-import { Event as Event7 } from "@opencode/schema/command";
-var Info5 = Command.Info;
+import { Event as Event10 } from "@opencode/schema/command";
+var Info18 = Command.Info;
 
-class NotFoundError3 extends Schema.TaggedError()("Command.NotFoundError", {
+class NotFoundError6 extends Schema.TaggedError()("Command.NotFoundError", {
   command: Schema.String,
   message: Schema.String
 }) {
@@ -39,9 +39,9 @@ class ExecutionError2 extends Schema.TaggedError()("Command.ExecutionError", {
 }) {
 }
 
-class Service34 extends Context.Service()("@opencode/Command") {
+class Service52 extends Context.Service()("@opencode/Command") {
 }
-var layer18 = Layer.effect(Service34, Effect.gen(function* () {
+var layer23 = Layer.effect(Service52, Effect.gen(function* () {
   const bus = yield* Service79;
   const state = create3({
     name: "command",
@@ -51,11 +51,11 @@ var layer18 = Layer.effect(Service34, Effect.gen(function* () {
     }),
     notify: () => bus.publish(Command.Event.Updated, {}).pipe(Effect.asVoid)
   });
-  const info = (definition) => Info5.make({
+  const info = (definition) => Info18.make({
     name: definition.name,
     description: definition.description
   });
-  return Service34.of({
+  return Service52.of({
     reload: state.reload,
     transform: state.transform,
     get: Effect.fn("Command.get")((name) => Effect.sync(() => {
@@ -66,14 +66,14 @@ var layer18 = Layer.effect(Service34, Effect.gen(function* () {
     execute: Effect.fn("Command.execute")(function* (input) {
       const definition = state.get().get(input.name);
       if (!definition)
-        return yield* new NotFoundError3({ command: input.name, message: `Command not found: ${input.name}` });
+        return yield* new NotFoundError6({ command: input.name, message: `Command not found: ${input.name}` });
       return yield* definition.execute(input.invocation).pipe(Effect.tapError((error) => Effect.logError("command execution failed", { command: input.name, error })), Effect.mapError((error) => new ExecutionError2({ command: input.name, message: errorMessage(error) })));
     })
   });
 }));
-var node39 = makeLocationNode({
-  service: Service34,
-  layer: layer18,
+var node55 = makeLocationNode({
+  service: Service52,
+  layer: layer23,
   deps: [node84]
 });
 function errorMessage(error) {
@@ -86,4 +86,4 @@ function errorMessage(error) {
   return "Command execution failed";
 }
 
-export { Info5, NotFoundError3, ExecutionError2, Service34, layer18, node39, exports_command4, Event7 };
+export { Info18, NotFoundError6, ExecutionError2, Service52, layer23, node55, exports_command5, Event10 };