@opencode-ai/core 0.0.0-next-17428 → 0.0.0-next-17444

package/dist/chunks/{wellknown-wjrkb032.js → catalog-w49cz7xv.js}

@@ -1,17 +1,17 @@
 import {
   RipgrepBinary
-} from "./wellknown-h8ecejt5.js";
+} from "./catalog-h8ecejt5.js";
 import {
   exports_environment1 as exports_environment
-} from "./wellknown-jq70kwhh.js";
+} from "./catalog-jyscbp9m.js";
 import {
   NonNegativeInt,
   PositiveInt,
   RelativePath
-} from "./wellknown-j07kk359.js";
+} from "./catalog-j07kk359.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/ripgrep.ts
 var exports_ripgrep = {};

package/dist/chunks/{wellknown-6f3c0gvx.js → catalog-w7cys7gf.js}

@@ -1,15 +1,15 @@
 import {
   make
-} from "./wellknown-706a4azd.js";
+} from "./catalog-706a4azd.js";
 import {
   exports_config
-} from "./wellknown-z5wnp00d.js";
+} from "./catalog-s8qevcta.js";
 import {
   exports_location
-} from "./wellknown-wkc2sg7c.js";
+} from "./catalog-m712gcsw.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/formatter.ts
 var exports_formatter = {};

package/dist/chunks/{wellknown-w6055s4r.js → catalog-wady9nrb.js}

@@ -1,36 +1,31 @@
 import {
-  exports_oauth
-} from "./wellknown-xq1vkeee.js";
+  exports_environment1 as exports_environment
+} from "./catalog-jyscbp9m.js";
 import {
-  exports_client
-} from "./wellknown-657k7zj4.js";
+  exports_config
+} from "./catalog-s8qevcta.js";
 import {
   exports_integration
-} from "./wellknown-njsy6pae.js";
+} from "./catalog-gr504th9.js";
 import {
   exports_form
-} from "./wellknown-1swmyd9s.js";
-import {
-  exports_environment1 as exports_environment
-} from "./wellknown-jq70kwhh.js";
-import {
-  exports_config
-} from "./wellknown-z5wnp00d.js";
+} from "./catalog-6m63e6rk.js";
 import {
   exports_credential
-} from "./wellknown-q17rnp67.js";
+} from "./catalog-8cyga2ha.js";
 import {
   exports_location
-} from "./wellknown-wkc2sg7c.js";
+} from "./catalog-m712gcsw.js";
 import {
   exports_bus
-} from "./wellknown-w6y7qp8t.js";
+} from "./catalog-dktf68zy.js";
 import {
   exports_keyed_mutex
-} from "./wellknown-0kvmztkf.js";
+} from "./catalog-0kvmztkf.js";
 import {
-  __export
-} from "./wellknown-rvfvac9x.js";
+  __export,
+  __require
+} from "./catalog-rvfvac9x.js";
 
 // src/mcp/index.ts
 var exports_mcp = {};
@@ -219,7 +214,10 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       draft.method.update({
         integrationID,
         method: { id: methodID, type: "oauth", label: name },
-        authorize: () => exports_oauth.authorize({ name, config: remote, methodID })
+        authorize: () => Effect.gen(function* () {
+          const { MCPOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
+          return yield* MCPOAuth.authorize({ name, config: remote, methodID });
+        })
       });
     }).pipe(Scope.provide(scope));
   });
@@ -234,6 +232,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   const connectProvider = Effect.fnUntraced(function* (entry) {
     if (entry.config.type !== "remote" || !entry.integrationID)
       return;
+    const { MCPOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
     const remote = entry.config;
     const oauth = remote.oauth || undefined;
     const base = {
@@ -245,11 +244,11 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     const stored = yield* credentials.list(entry.integrationID);
     const found = stored.find((credential) => credential.value.type === "oauth");
     if (!found || found.value.type !== "oauth")
-      return exports_oauth.provider({ ...base, store: exports_oauth.memoryStore() });
+      return MCPOAuth.provider({ ...base, store: MCPOAuth.memoryStore() });
     const credentialID = found.id;
     const methodID = found.value.methodID;
     let current = found.value;
-    return exports_oauth.provider({
+    return MCPOAuth.provider({
       ...base,
       invalidate: async (scope) => {
         if (scope === "verifier" || scope === "discovery")
@@ -258,17 +257,17 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         await Effect.runPromise(credentials.remove(credentialID));
       },
       store: {
-        tokens: async () => current ? exports_oauth.toTokens(current) : undefined,
+        tokens: async () => current ? MCPOAuth.toTokens(current) : undefined,
         saveTokens: async (tokens) => {
-          current = exports_oauth.toCredential({
+          current = MCPOAuth.toCredential({
             methodID,
             serverUrl: remote.url,
             tokens,
-            client: current ? exports_oauth.clientFromCredential(current) : undefined
+            client: current ? MCPOAuth.clientFromCredential(current) : undefined
           });
           await Effect.runPromise(credentials.update(credentialID, { value: current }));
         },
-        clientInformation: async () => current ? exports_oauth.clientFromCredential(current) : undefined,
+        clientInformation: async () => current ? MCPOAuth.clientFromCredential(current) : undefined,
         saveClientInformation: async () => {},
         codeVerifier: async () => {
           return;
@@ -397,7 +396,8 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     const scope = yield* Scope.fork(root);
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
-    const result = yield* exports_client.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(exports_environment.Service, environment), Scope.provide(scope), Effect.exit);
+    const { MCPClient } = yield* Effect.promise(() => import("../mcp/client.js"));
+    const result = yield* MCPClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(exports_environment.Service, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
       entry.tools = result.value.tools.map((def) => toTool(name, entry, def));
@@ -414,7 +414,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     yield* Scope.close(scope, Exit.void);
     entry.scope = undefined;
     const error = Cause.squash(result.cause);
-    entry.status = error instanceof exports_client.NeedsAuthError ? { status: "needs_auth" } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
+    entry.status = error instanceof MCPClient.NeedsAuthError ? { status: "needs_auth" } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
     yield* Effect.logWarning("mcp connect failed", { server: name, status: entry.status });
     yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore);
   }).pipe(Effect.ensuring(Deferred.succeed(entry.startup, undefined)));

package/dist/chunks/{wellknown-wd268jeg.js → catalog-wd268jeg.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/session/prompt-cache-diagnostics.ts
 var exports_prompt_cache_diagnostics = {};

package/dist/chunks/{wellknown-we2zmhe4.js → catalog-we2zmhe4.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./wellknown-d6vvk673.js";
+} from "./catalog-d6vvk673.js";
 import {
   __require
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/plugin/provider/snowflake-cortex.ts
 import { Effect } from "effect";

package/dist/chunks/{wellknown-wf37p1a1.js → catalog-wf37p1a1.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/plugin/promise.ts
 var exports_promise = {};

package/dist/chunks/{wellknown-wmxdh12w.js → catalog-wmxdh12w.js}

@@ -1,6 +1,6 @@
 import {
   Timestamps
-} from "./wellknown-sem2g21k.js";
+} from "./catalog-sem2g21k.js";
 
 // src/kv/sql.ts
 import { sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{wellknown-wps8gh8n.js → catalog-wps8gh8n.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./wellknown-0zz82cjq.js";
+} from "./catalog-0zz82cjq.js";
 import {
   __require
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/plugin/provider/perplexity.ts
 var PerplexityPlugin = createProviderPlugin({

package/dist/chunks/{wellknown-wt193r4g.js → catalog-wt193r4g.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/state.ts
 var exports_state = {};

package/dist/chunks/{wellknown-54ec2rpx.js → catalog-wyzk30wf.js}

@@ -1,27 +1,27 @@
 import {
   exports_instructions
-} from "./wellknown-n7fgxfv6.js";
+} from "./catalog-bwkeshyk.js";
 import {
   exports_read_filesystem
-} from "./wellknown-scpmsk9g.js";
+} from "./catalog-3z9y63bn.js";
 import {
   exports_location_mutation
-} from "./wellknown-1ne78j78.js";
-import {
-  exports_permission
-} from "./wellknown-bt7xmf0d.js";
+} from "./catalog-pcj6jaw5.js";
 import {
   exports_environment1 as exports_environment
-} from "./wellknown-jq70kwhh.js";
+} from "./catalog-jyscbp9m.js";
+import {
+  exports_permission
+} from "./catalog-xc67d6rc.js";
 import {
   exports_location
-} from "./wellknown-wkc2sg7c.js";
+} from "./catalog-m712gcsw.js";
 import {
   AbsolutePath
-} from "./wellknown-j07kk359.js";
+} from "./catalog-j07kk359.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/tool/plugin/read.ts
 var exports_read = {};

package/dist/chunks/{wellknown-bt7xmf0d.js → catalog-xc67d6rc.js}

@@ -1,27 +1,27 @@
-import {
-  exports_store
-} from "./wellknown-axyymfph.js";
-import {
-  exports_error
-} from "./wellknown-s6by3cc4.js";
 import {
   exports_wildcard
-} from "./wellknown-y67x6rf6.js";
+} from "./catalog-y67x6rf6.js";
 import {
   exports_saved
-} from "./wellknown-vphy579y.js";
+} from "./catalog-sdesqhp6.js";
+import {
+  exports_store
+} from "./catalog-16ey40c1.js";
+import {
+  exports_error
+} from "./catalog-s6by3cc4.js";
 import {
   exports_agent
-} from "./wellknown-y2kycdcv.js";
+} from "./catalog-j9v2c738.js";
 import {
   exports_location
-} from "./wellknown-wkc2sg7c.js";
+} from "./catalog-m712gcsw.js";
 import {
   exports_bus
-} from "./wellknown-w6y7qp8t.js";
+} from "./catalog-dktf68zy.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/permission.ts
 var exports_permission = {};
@@ -48,7 +48,7 @@ __export(exports_permission, {
   AskResult: () => AskResult
 });
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
-import { Context, Deferred, Effect, Layer, Schema, Struct } from "effect";
+import { Context, Deferred, Effect, Layer, Schema } from "effect";
 import { Permission } from "@opencode-ai/schema/permission";
 import { Rule, Ruleset } from "@opencode-ai/schema/permission";
 import { Event } from "@opencode-ai/schema/permission";
@@ -56,11 +56,19 @@ var PermissionEffect = Permission.Effect;
 var missingAgentPermissions = [{ action: "*", resource: "*", effect: "deny" }];
 var ID = Permission.ID;
 var Source = Permission.Source;
+var RequestFields = {
+  sessionID: Permission.Request.fields.sessionID,
+  action: Permission.Request.fields.action,
+  resources: Permission.Request.fields.resources,
+  save: Permission.Request.fields.save,
+  metadata: Permission.Request.fields.metadata,
+  source: Permission.Request.fields.source
+};
 var Request = Permission.Request;
 var Reply = Permission.Reply;
 var AssertInput = Schema.Struct({
   id: ID.pipe(Schema.optional),
-  ...Struct.omit(Permission.Request.fields, ["id"]),
+  ...RequestFields,
   agent: exports_agent.ID.pipe(Schema.optional)
 }).annotate({ identifier: "Permission.AssertInput" });
 var ReplyInput = Schema.Struct({
@@ -102,13 +110,6 @@ function evaluate(action, resource, ...rulesets) {
     effect: "ask"
   };
 }
-function evaluateOpaque(action, rules) {
-  return rules.findLast((rule) => exports_wildcard.match(action, rule.action) && rule.resource === "*") ?? {
-    action,
-    resource: "*",
-    effect: "ask"
-  };
-}
 function merge(...rulesets) {
   return rulesets.flat();
 }
@@ -156,8 +157,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     return false;
   });
   function denied(input, rules) {
-    if (input.opaque)
-      return rules.some((rule) => rule.effect === "deny" && exports_wildcard.match(input.action, rule.action) && input.resources.some((resource) => resource === "*" || exports_wildcard.match(resource, rule.resource)));
     return input.resources.some((resource) => evaluate(input.action, resource, rules).effect === "deny");
   }
   function relevant(input, rules) {
@@ -165,17 +164,10 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   }
   const evaluateInput = Effect.fnUntraced(function* (input) {
     const rules = yield* configured(input.sessionID, input.agent);
-    if (input.resources.length === 0)
-      return { effect: "deny", rules };
     if (denied(input, rules))
       return { effect: "deny", rules };
-    if (input.opaque && rules.some((rule) => rule.effect !== "allow" && rule.resource !== "*" && exports_wildcard.match(input.action, rule.action)))
-      return { effect: "ask", rules };
-    const saved2 = yield* savedRules();
-    if (input.opaque && input.resources.every((resource) => saved2.some((rule) => exports_wildcard.match(input.action, rule.action) && rule.resource === resource)))
-      return { effect: "allow", rules: [...rules, ...saved2] };
-    const all = [...rules, ...saved2];
-    const effects = input.opaque ? [evaluateOpaque(input.action, all).effect] : input.resources.map((resource) => evaluate(input.action, resource, all).effect);
+    const all = [...rules, ...yield* savedRules()];
+    const effects = input.resources.map((resource) => evaluate(input.action, resource, all).effect);
     const effect = effects.includes("deny") ? "deny" : effects.includes("ask") ? "ask" : "allow";
     return { effect, rules: all };
   });
@@ -185,8 +177,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       sessionID: input.sessionID,
       action: input.action,
       resources: input.resources,
-      save: input.opaque ? input.resources : input.save,
-      opaque: input.opaque,
+      save: input.save,
       metadata: input.metadata,
       source: input.source
     };
@@ -259,9 +250,16 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     pending.delete(input.requestID);
     if (input.reply !== "always" || !existing.request.save?.length)
       return;
+    const rememberedRules = yield* savedRules();
     for (const [id, item] of pending) {
-      const result = yield* evaluateInput({ ...item.request, agent: item.agent }).pipe(Effect.catchTag("Session.NotFoundError", () => Effect.succeed(undefined)));
-      if (!result || result.effect !== "allow")
+      const input2 = { ...item.request };
+      const rules = yield* configured(item.request.sessionID, item.agent).pipe(Effect.catchTag("Session.NotFoundError", () => Effect.succeed(undefined)));
+      if (!rules)
+        continue;
+      if (denied(input2, rules))
+        continue;
+      const effective = [...rules, ...rememberedRules];
+      if (!item.request.resources.every((resource) => evaluate(item.request.action, resource, effective).effect === "allow"))
         continue;
       yield* bus.publish(Permission.Event.Replied, {
         sessionID: item.request.sessionID,

package/dist/chunks/{wellknown-xfd1xnk3.js → catalog-xfd1xnk3.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./wellknown-d6vvk673.js";
+} from "./catalog-d6vvk673.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/model.ts
 var exports_model = {};

package/dist/chunks/{wellknown-xfrawapx.js → catalog-xfrawapx.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};

package/dist/chunks/{wellknown-mmnmpsem.js → catalog-xgp46ta4.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./wellknown-bt7xmf0d.js";
+} from "./catalog-xc67d6rc.js";
 import {
   exports_agent
-} from "./wellknown-y2kycdcv.js";
+} from "./catalog-j9v2c738.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/plugin/agent.ts
 var exports_agent2 = {};

package/dist/chunks/{wellknown-xgv25zxy.js → catalog-xgv25zxy.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/session/generate.ts
 var exports_generate = {};

package/dist/chunks/{wellknown-20mhz48y.js → catalog-xk5wr58k.js}

@@ -1,19 +1,19 @@
 import {
   exports_protected
-} from "./wellknown-kg1345f7.js";
+} from "./catalog-kg1345f7.js";
 import {
   exports_ripgrep
-} from "./wellknown-wjrkb032.js";
+} from "./catalog-w49cz7xv.js";
 import {
   exports_location
-} from "./wellknown-wkc2sg7c.js";
+} from "./catalog-m712gcsw.js";
 import {
   PositiveInt,
   RelativePath
-} from "./wellknown-j07kk359.js";
+} from "./catalog-j07kk359.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/filesystem/search.ts
 var exports_search = {};

package/dist/chunks/{wellknown-tsxyhgjv.js → catalog-xrgme11k.js}

@@ -1,24 +1,24 @@
 import {
   fileDiff
-} from "./wellknown-c77ad0vh.js";
-import {
-  exports_formatter
-} from "./wellknown-6f3c0gvx.js";
+} from "./catalog-c77ad0vh.js";
 import {
   exports_location_mutation
-} from "./wellknown-1ne78j78.js";
+} from "./catalog-pcj6jaw5.js";
 import {
   exports_file_mutation
-} from "./wellknown-25552m23.js";
+} from "./catalog-n6djjn6b.js";
 import {
-  exports_permission
-} from "./wellknown-bt7xmf0d.js";
+  exports_formatter
+} from "./catalog-w7cys7gf.js";
 import {
   exports_environment1 as exports_environment
-} from "./wellknown-jq70kwhh.js";
+} from "./catalog-jyscbp9m.js";
+import {
+  exports_permission
+} from "./catalog-xc67d6rc.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/tool/plugin/write.ts
 var exports_write = {};

package/dist/chunks/{wellknown-xwftk1fd.js → catalog-xwftk1fd.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./wellknown-0zz82cjq.js";
+} from "./catalog-0zz82cjq.js";
 import {
   __require
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/plugin/provider/venice.ts
 var VenicePlugin = createProviderPlugin({

package/dist/chunks/{wellknown-k9y1gart.js → catalog-xxza29yq.js}

@@ -1,12 +1,12 @@
 import {
   exports_markdown
-} from "./wellknown-7wcmqxrc.js";
+} from "./catalog-7wcmqxrc.js";
 import {
   exports_config
-} from "./wellknown-z5wnp00d.js";
+} from "./catalog-s8qevcta.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/config/plugin/command.ts
 var exports_command = {};

package/dist/chunks/{wellknown-y0x38cee.js → catalog-y0x38cee.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/v1/config/provider-options.ts
 var exports_provider_options = {};

package/dist/chunks/{wellknown-2jtfzwaa.js → catalog-y23acc5q.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./wellknown-9qang0mx.js";
+} from "./catalog-01ebynez.js";
 import {
   exports_instructions
-} from "./wellknown-q4r4pzs4.js";
+} from "./catalog-8k8ks5a6.js";
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/skill/instructions.ts
 var exports_instructions2 = {};

package/dist/chunks/{wellknown-y67x6rf6.js → catalog-y67x6rf6.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./wellknown-rvfvac9x.js";
+} from "./catalog-rvfvac9x.js";
 
 // src/util/wildcard.ts
 var exports_wildcard = {};