@opencode-ai/core 0.0.0-beta-18721 → 0.0.0-beta-18866

package/dist/chunks/{workspace-w47r4rby.js → reference-0bw2p3eg.js}

@@ -3,28 +3,28 @@ import {
   EffectSQLiteDatabase,
   make,
   makeWithDefaults
-} from "./workspace-y6vap6bx.js";
+} from "./reference-vczm1m9n.js";
 import {
   EffectSQLiteSession,
   EffectSQLiteTransaction,
   managesTransactionsNatively
-} from "./workspace-sc0wbnjs.js";
+} from "./reference-hyfbxc6f.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/database/drizzle/index.ts
 var exports_drizzle = {};
 __export(exports_drizzle, {
-  managesTransactionsNatively: () => managesTransactionsNatively,
-  makeWithDefaults: () => makeWithDefaults,
-  make: () => make,
-  EffectSQLiteTransaction: () => EffectSQLiteTransaction,
-  EffectSQLiteSession: () => EffectSQLiteSession,
-  EffectSQLiteDatabase: () => EffectSQLiteDatabase,
-  EffectLogger: () => EffectLogger,
+  DefaultServices: () => DefaultServices,
   EffectDrizzleSqlite: () => exports_drizzle,
-  DefaultServices: () => DefaultServices
+  EffectLogger: () => EffectLogger,
+  EffectSQLiteDatabase: () => EffectSQLiteDatabase,
+  EffectSQLiteSession: () => EffectSQLiteSession,
+  EffectSQLiteTransaction: () => EffectSQLiteTransaction,
+  make: () => make,
+  makeWithDefaults: () => makeWithDefaults,
+  managesTransactionsNatively: () => managesTransactionsNatively
 });
 import { EffectLogger } from "drizzle-orm/effect-core";
 

package/dist/chunks/{workspace-eg3ntwpk.js → reference-0emrnx66.js}

@@ -1,25 +1,25 @@
 import {
   exports_store
-} from "./workspace-se07g09y.js";
+} from "./reference-bwqptwn6.js";
 import {
   SessionEvent
-} from "./workspace-a83yvq99.js";
+} from "./reference-a83yvq99.js";
 import {
   exports_location
-} from "./workspace-ngk06vjf.js";
+} from "./reference-pp6802x5.js";
 import {
   exports_bus
-} from "./workspace-vkgwd1zr.js";
+} from "./reference-jghhn6h0.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/session/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
-  node: () => node,
+  Service: () => Service,
   SessionInstructions: () => exports_instructions,
-  Service: () => Service
+  node: () => node
 });
 import { relative } from "path";
 import { Context, Effect, Layer, Option, Ref, Schema } from "effect";

package/dist/chunks/{workspace-f7q7a28y.js → reference-0enfz0ma.js}

@@ -1,26 +1,26 @@
-import {
-  exports_id
-} from "./workspace-58xdvehb.js";
 import {
   exports_file_retention
-} from "./workspace-hp6rpdnc.js";
+} from "./reference-p1m5qwvv.js";
+import {
+  exports_id
+} from "./reference-x4az4y7r.js";
 import {
   exports_state
-} from "./workspace-x89rah0x.js";
+} from "./reference-b7rje112.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/tool-output.ts
 var exports_tool_output = {};
 __export(exports_tool_output, {
-  node: () => node,
-  ToolOutput: () => exports_tool_output,
-  Service: () => Service,
-  RETENTION: () => RETENTION,
-  MAX_LINES: () => MAX_LINES,
+  DIRECTORY: () => DIRECTORY,
   MAX_BYTES: () => MAX_BYTES,
-  DIRECTORY: () => DIRECTORY
+  MAX_LINES: () => MAX_LINES,
+  RETENTION: () => RETENTION,
+  Service: () => Service,
+  ToolOutput: () => exports_tool_output,
+  node: () => node
 });
 import path from "path";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";

package/dist/chunks/{workspace-57ej80dx.js → reference-0gpahtwn.js}

@@ -1,19 +1,19 @@
 import {
   definition,
   normalizedName
-} from "./workspace-f1jj19e8.js";
+} from "./reference-f1jj19e8.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/codemode/tool.ts
 var exports_tool = {};
 __export(exports_tool, {
-  create: () => create,
+  CodeModeTool: () => exports_tool,
   catalog: () => catalog,
-  CodeModeTool: () => exports_tool
+  create: () => create
 });
-import { CodeMode, Tool, toolError } from "@opencode-ai/codemode";
+import { CodeMode, Namespace, Tool, toolError } from "@opencode-ai/codemode";
 import { Effect, Ref, Schema, Semaphore } from "effect";
 var ExecuteFile = Schema.Struct({
   data: Schema.String,
@@ -40,7 +40,7 @@ var description = [
   "Await every call whose completion matters; pending calls are interrupted when execution ends. Run independent calls concurrently with `Promise.all`."
 ].join(`
 `);
-var create = (registrations, executeTool) => {
+var create = (inventory, executeTool) => {
   return {
     name: "execute",
     description,
@@ -52,7 +52,7 @@ var create = (registrations, executeTool) => {
       const calls = yield* Ref.make([]);
       const lock = Semaphore.makeUnsafe(1);
       const updateCalls = (update) => lock.withPermit(Ref.updateAndGet(calls, update).pipe(Effect.flatMap((toolCalls2) => context.progress({ toolCalls: toolCalls2 }))));
-      const result = yield* runtime(registrations, (name, tool, input) => Effect.gen(function* () {
+      const result = yield* runtime(inventory, (name, tool, input) => Effect.gen(function* () {
         const index = yield* Ref.getAndUpdate(callIndex, (index2) => index2 + 1);
         const executed = yield* executeTool(name, tool, input, context);
         const content2 = typeof executed.content === "string" ? [{ type: "text", text: executed.content }] : executed.content ?? [];
@@ -115,24 +115,101 @@ var create = (registrations, executeTool) => {
     })
   };
 };
-var catalog = (registrations) => {
-  const pinned = new Set(Array.from(registrations.values()).filter((registration) => registration.options?.pinned === true).map(qualifiedName));
-  return runtime(registrations, () => Effect.fail(toolError("Execute context is unavailable"))).catalog().map((entry) => ({ ...entry, pinned: pinned.has(entry.path) }));
+var catalog = (inventory) => {
+  const pinned = new Set(Array.from(inventory.tools.values()).filter((registration) => registration.options?.pinned === true).map(qualifiedName));
+  const root = { children: new Map };
+  for (const namespace of inventory.namespaces?.values() ?? [])
+    getNode(root, namespace.name).namespace = namespace;
+  for (const tool of runtime(inventory, () => Effect.fail(toolError("Execute context is unavailable"))).catalog())
+    getNode(root, tool.path).tool = {
+      type: "tool",
+      name: tool.path.split(".").at(-1) ?? tool.path,
+      description: tool.description,
+      signature: tool.signature,
+      pinned: pinned.has(tool.path)
+    };
+  return {
+    tools: renderCatalog(root)
+  };
 };
-function runtime(registrations, executeTool, hooks) {
-  const tools = {};
-  for (const [name, registration] of registrations) {
+function renderCatalog(root) {
+  return Array.from(root.children).toSorted(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).flatMap(([name, node]) => {
+    const tools = renderCatalog(node);
+    const namespace = node.namespace === undefined && tools.length === 0 ? undefined : {
+      type: "namespace",
+      name,
+      ...node.namespace?.description === undefined ? {} : { description: node.namespace.description },
+      tools
+    };
+    if (node.tool === undefined)
+      return namespace === undefined ? [] : [namespace];
+    if (namespace === undefined)
+      return [node.tool];
+    return [node.tool, namespace];
+  });
+}
+function runtime(inventory, executeTool, hooks) {
+  const root = { children: new Map };
+  for (const namespace of inventory.namespaces?.values() ?? [])
+    getNode(root, namespace.name).namespace = namespace;
+  for (const [name, registration] of inventory.tools) {
     const child = definition(registration);
-    const path = qualifiedName(registration);
-    tools[path] = Tool.make({
+    getNode(root, qualifiedName(registration)).tool = Tool.make({
       description: child.description,
       input: child.inputSchema,
       output: child.outputSchema ?? Schema.NullOr(Schema.String),
       execute: (input) => executeTool(name, registration, input)
     });
   }
+  const tools = renderTools(root);
   return CodeMode.make({ tools, ...hooks });
 }
+function getNode(root, path) {
+  return path.split(".").reduce((parent, name) => {
+    const child = parent.children.get(name) ?? { children: new Map };
+    parent.children.set(name, child);
+    return child;
+  }, root);
+}
+function renderTools(root) {
+  const callables = new Map;
+  const tools = renderChildren(root, [], callables);
+  for (const [path, tool] of callables)
+    tools[path] = tool;
+  return tools;
+}
+function renderChildren(node, path, callables) {
+  return Object.fromEntries(Array.from(node.children).flatMap(([name, child]) => {
+    const next = [...path, name];
+    if (path.length === 0 && child.tool !== undefined && (child.namespace !== undefined || child.children.size > 0)) {
+      const tools = {};
+      flattenTools(child, next, tools);
+      return Object.entries(tools);
+    }
+    return [[name, renderEntry(child, next, callables)]];
+  }));
+}
+function renderEntry(node, path, callables) {
+  const tools = renderChildren(node, path, callables);
+  if (node.tool !== undefined && (node.namespace !== undefined || node.children.size > 0))
+    callables.set(path.join("."), node.tool);
+  if (node.namespace !== undefined)
+    return Namespace.make({
+      description: node.namespace.description,
+      tools
+    });
+  if (node.tool === undefined)
+    return tools;
+  if (node.children.size === 0)
+    return node.tool;
+  return tools;
+}
+function flattenTools(node, path, tools) {
+  if (node.tool !== undefined)
+    tools[path.join(".")] = node.tool;
+  for (const [name, child] of node.children)
+    flattenTools(child, [...path, name], tools);
+}
 function qualifiedName(registration) {
   const normalized = normalizedName(registration);
   if (registration.options?.namespace === undefined)

package/dist/chunks/{workspace-wfdy75zv.js → reference-0kz3ajyp.js}

@@ -1,73 +1,70 @@
 import {
-  exports_instructions as exports_instructions4
-} from "./workspace-ccf4e63x.js";
-import {
-  exports_mcp
-} from "./workspace-jjebnzjz.js";
-import {
-  exports_model_request
-} from "./workspace-rhm13qbw.js";
+  exports_instruction_entry
+} from "./reference-80jq34sk.js";
 import {
   exports_instructions as exports_instructions3
-} from "./workspace-xxpvz42q.js";
+} from "./reference-567c56db.js";
+import {
+  exports_builtins
+} from "./reference-t253hdyx.js";
 import {
   exports_instructions as exports_instructions2
-} from "./workspace-aqznnwa7.js";
+} from "./reference-136c8mz3.js";
+import {
+  exports_mcp
+} from "./reference-893c53jd.js";
 import {
   exports_instructions as exports_instructions5
-} from "./workspace-d6e56n2n.js";
+} from "./reference-46azr2y9.js";
 import {
-  exports_builtins
-} from "./workspace-dy6avzyr.js";
+  exports_instructions as exports_instructions4
+} from "./reference-x7g08g2m.js";
 import {
-  exports_supervisor
-} from "./workspace-nyjqweqz.js";
+  exports_model_request
+} from "./reference-3529n0tr.js";
 import {
-  exports_instruction_discovery
-} from "./workspace-zzjh79ge.js";
+  exports_model
+} from "./reference-ftjbsen0.js";
 import {
-  exports_tool
-} from "./workspace-zwavn0q8.js";
+  exports_catalog
+} from "./reference-m8dxe63b.js";
 import {
-  exports_instruction_entry
-} from "./workspace-spxah02e.js";
+  exports_tool
+} from "./reference-f85kjf82.js";
 import {
-  exports_model
-} from "./workspace-6yzphrxy.js";
+  exports_instruction_discovery
+} from "./reference-khswz5rb.js";
 import {
   exports_store
-} from "./workspace-se07g09y.js";
+} from "./reference-bwqptwn6.js";
 import {
   exports_history
-} from "./workspace-9kmcw9m3.js";
+} from "./reference-z427xjvx.js";
 import {
   AgentNotFoundError
-} from "./workspace-cgqn2mrm.js";
-import {
-  exports_instructions
-} from "./workspace-ec8vrfw5.js";
-import {
-  exports_catalog
-} from "./workspace-vd1d8tva.js";
+} from "./reference-2sqw2jjm.js";
 import {
   exports_agent
-} from "./workspace-xanq1mxd.js";
+} from "./reference-wghtbf73.js";
+import {
+  exports_instructions
+} from "./reference-c54e84vp.js";
 import {
   exports_location
-} from "./workspace-ngk06vjf.js";
+} from "./reference-pp6802x5.js";
 import {
   exports_database
-} from "./workspace-gbf8gmfy.js";
+} from "./reference-xwpxh8hr.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/session/context.ts
 var exports_context = {};
 __export(exports_context, {
-  node: () => node,
+  Service: () => Service,
   SessionContext: () => exports_context,
-  Service: () => Service
+  node: () => node
 });
 import { Model } from "@opencode-ai/schema/model";
 import { Context, Effect, Layer } from "effect";
@@ -82,12 +79,11 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const discovery = yield* exports_instruction_discovery.Service;
   const entries = yield* exports_instruction_entry.Service;
   const location = yield* exports_location.Service;
-  const mcpInstructions = yield* exports_instructions4.Service;
+  const mcpInstructions = yield* exports_instructions3.Service;
   const mcpTools = yield* exports_mcp.Service;
   const models = yield* exports_model.Service;
   const modelRequests = yield* exports_model_request.Service;
-  const plugins = yield* exports_supervisor.Service;
-  const referenceInstructions = yield* exports_instructions2.Service;
+  const referenceInstructions = yield* exports_instructions4.Service;
   const skillInstructions = yield* exports_instructions5.Service;
   const store = yield* exports_store.Service;
   const registry = yield* exports_tool.Service;
@@ -128,7 +124,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
     if (session.location.directory !== location.directory || session.location.workspaceID !== location.workspaceID)
       return yield* Effect.interrupt;
-    yield* plugins.flush;
     yield* mcpTools.flush;
     const agent = yield* agents.select(session.agent);
     if (!agent.info)
@@ -147,7 +142,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       agent: { ...agent, info: agent.info },
       instructions: exports_instructions.combine([
         loaded.builtins,
-        exports_instructions3.make(loaded.tools.codeModeCatalog),
+        exports_instructions2.make(loaded.tools.codeModeCatalog),
         loaded.discovery,
         loaded.skills,
         loaded.references,
@@ -183,10 +178,9 @@ var node = makeLocationNode({
     exports_instruction_discovery.node,
     exports_instruction_entry.node,
     exports_location.node,
-    exports_instructions4.node,
+    exports_instructions3.node,
     exports_mcp.node,
-    exports_supervisor.node,
-    exports_instructions2.node,
+    exports_instructions4.node,
     exports_model.node,
     exports_model_request.node,
     exports_store.node,

package/dist/chunks/{workspace-4zzdwbaz.js → reference-0pc4kdn1.js}

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

package/dist/chunks/{workspace-2m0hgr65.js → reference-0rz7yd7x.js}

@@ -1,13 +1,13 @@
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/session/runner/index.ts
 var exports_runner = {};
 __export(exports_runner, {
-  SessionRunner: () => exports_runner,
+  DrainResult: () => DrainResult,
   Service: () => Service,
-  DrainResult: () => DrainResult
+  SessionRunner: () => exports_runner
 });
 import { Context, Data } from "effect";
 var DrainResult = Data.taggedEnum();

package/dist/chunks/{workspace-xxpvz42q.js → reference-136c8mz3.js}

@@ -1,20 +1,20 @@
 import {
   exports_catalog
-} from "./workspace-57tzwnz4.js";
+} from "./reference-rr7wbarq.js";
 import {
   exports_instructions
-} from "./workspace-ec8vrfw5.js";
+} from "./reference-c54e84vp.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/codemode/instructions.ts
 var exports_instructions2 = {};
 __export(exports_instructions2, {
-  update: () => update,
-  render: () => render,
+  CodeModeInstructions: () => exports_instructions2,
   make: () => make,
-  CodeModeInstructions: () => exports_instructions2
+  render: () => render,
+  update: () => update
 });
 import { searchSignature, toolExpression } from "@opencode-ai/codemode";
 import { Effect, Schema } from "effect";
@@ -33,9 +33,7 @@ function render(catalog) {
   if (catalog.total === 0)
     return "No Code Mode tools are currently available. Later Code Mode catalog updates may add or remove tools. Do not call `execute` unless there is at least one available Code Mode tool.";
   const tools = catalog.namespaces.flatMap((namespace) => {
-    const count = namespace.count === 1 ? "1 tool" : `${namespace.count} tools`;
-    const label = namespace.entries.length === namespace.count ? count : namespace.entries.length === 0 ? `${count}, none shown` : `${count}, ${namespace.entries.length} shown`;
-    return [`- ${namespace.name} (${label})`, ...namespace.entries.map((entry) => entry.line)];
+    return [exports_catalog.namespaceLine(namespace), ...namespace.entries.map((entry) => entry.line)];
   });
   return `${prompt(catalog.shown < catalog.total)}
 
@@ -52,6 +50,9 @@ ${render(current)}`;
   const currentComplete = current.shown === current.total;
   if (previousComplete !== currentComplete)
     return replacement;
+  const descriptions = exports_instructions.diffByKey(previous.namespaces.filter((namespace) => namespace.description !== undefined), current.namespaces.filter((namespace) => namespace.description !== undefined), (namespace) => namespace.name, (before, after) => before.description !== after.description);
+  if (descriptions.added.length > 0 || descriptions.removed.length > 0 || descriptions.changed.length > 0)
+    return replacement;
   const diff = exports_instructions.diffByKey(previous.namespaces.flatMap((namespace) => namespace.entries), current.namespaces.flatMap((namespace) => namespace.entries), (entry) => entry.path, (before, after) => before.line !== after.line);
   const entriesChanged = diff.added.length > 0 || diff.removed.length > 0 || diff.changed.length > 0;
   if (!currentComplete) {
@@ -107,8 +108,8 @@ ${render(current)}`;
 }
 var key = exports_instructions.Key.make("core/codemode");
 var codec = Schema.toCodecJson(exports_catalog.Summary);
-var make = (entries) => {
-  const catalog = entries === undefined ? exports_instructions.removed : exports_catalog.summarize(entries);
+var make = (inventory) => {
+  const catalog = inventory === undefined ? exports_instructions.removed : exports_catalog.summarize(inventory);
   return exports_instructions.make({
     key,
     codec,