@opencode/core 0.0.0-dev-19391 → 0.0.0-dev-19392

package/dist/chunks/{git-kkz4yv35.js → repository-37wraq67.js}

@@ -1,28 +1,28 @@
 import {
-  Service69
-} from "./git-2f3d9t1j.js";
+  Service53
+} from "./repository-0chgf8x9.js";
 import {
   match2
-} from "./git-y1fvbwt7.js";
+} from "./repository-y1fvbwt7.js";
 import {
   observe2
-} from "./git-qsdy395h.js";
+} from "./repository-qsdy395h.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/config/plugin/policy.ts
 var exports_policy = {};
 __export(exports_policy, {
   ConfigPolicyPlugin: () => exports_policy,
-  Plugin: () => Plugin43
+  Plugin: () => Plugin29
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin43 = define({
+var Plugin29 = define({
   id: "opencode.config.policy",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service69;
+    const config = yield* Service53;
     const loaded = yield* observe2(config, ctx.event, ctx.catalog.reload());
     yield* ctx.catalog.transform((catalog) => {
       const policies = loaded.entries.filter((entry) => entry.type === "document").toReversed().flatMap((entry) => entry.info.experimental?.policies ?? []);
@@ -35,4 +35,4 @@ var Plugin43 = define({
   })
 });
 
-export { Plugin43, exports_policy };
+export { Plugin29, exports_policy };

package/dist/chunks/{git-9gyd2w40.js → repository-39r80e1r.js}

@@ -1,7 +1,7 @@
 import {
   isCheckpoint2,
   decode2
-} from "./git-hrndf12w.js";
+} from "./repository-mfhfdr54.js";
 
 // src/session/runner/to-llm-message.ts
 import { Message, ToolCallPart, ToolResultPart } from "@opencode/ai";

package/dist/chunks/{git-0fgcnd78.js → repository-3a6d4gwd.js}

@@ -1,27 +1,27 @@
 import {
-  Service55
-} from "./git-s6h26ryx.js";
+  Service42
+} from "./repository-02e0y54q.js";
 import {
-  Service18
-} from "./git-9smnhnck.js";
+  Service20
+} from "./repository-c08088rs.js";
 import {
   text2,
   deliver2
-} from "./git-x1ezjp6w.js";
+} from "./repository-x1ezjp6w.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/session/subagent-job.ts
 var exports_subagent_job = {};
 __export(exports_subagent_job, {
   SubagentJob: () => exports_subagent_job,
-  make: () => make10
+  make: () => make6
 });
 import { Effect, Scope } from "effect";
-var make10 = Effect.gen(function* () {
-  const sessions = yield* Service18;
-  const jobs = yield* Service55;
+var make6 = Effect.gen(function* () {
+  const sessions = yield* Service20;
+  const jobs = yield* Service42;
   const scope = yield* Scope.Scope;
   const notifications = new Set;
   const notify = Effect.fn("SubagentJob.notify")(function* (recovery, startedAt) {
@@ -58,4 +58,4 @@ var make10 = Effect.gen(function* () {
   };
 });
 
-export { make10, exports_subagent_job };
+export { make6, exports_subagent_job };

package/dist/chunks/{git-2qp6y8xf.js → repository-3cfzdc8e.js}

@@ -1,16 +1,16 @@
 import {
   PositiveInt2
-} from "./git-922hggd3.js";
+} from "./repository-922hggd3.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/v1/config/attachment.ts
 var exports_attachment = {};
 __export(exports_attachment, {
   ConfigAttachmentV1: () => exports_attachment,
   Image: () => Image2,
-  Info: () => Info20
+  Info: () => Info16
 });
 import { Schema } from "effect";
 var Image2 = Schema.Struct({
@@ -27,8 +27,8 @@ var Image2 = Schema.Struct({
     description: "Maximum base64 payload bytes for an image attachment (default: 5242880)"
   })
 }).annotate({ identifier: "ImageAttachmentConfig" });
-var Info20 = Schema.Struct({
+var Info16 = Schema.Struct({
   image: Schema.optional(Image2).annotate({ description: "Image attachment configuration" })
 }).annotate({ identifier: "AttachmentConfig" });
 
-export { Image2, Info20, exports_attachment };
+export { Image2, Info16, exports_attachment };

package/dist/chunks/{git-3fc6dm20.js → repository-3fc6dm20.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/codemode/catalog.ts
 var exports_catalog = {};

package/dist/chunks/{git-dh4vxs71.js → repository-3g5b63xy.js}

@@ -1,35 +1,35 @@
 import {
-  ID12,
-  Service67
-} from "./git-17rjwhd8.js";
+  ID9,
+  Service59
+} from "./repository-q0efknh2.js";
 import {
-  Service75
-} from "./git-ezys8rkd.js";
+  Service76
+} from "./repository-z399x6eb.js";
 import {
-  Service69
-} from "./git-2f3d9t1j.js";
+  Service53
+} from "./repository-0chgf8x9.js";
 import {
-  Service54,
+  Service72,
   args2
-} from "./git-n7t5qjpz.js";
+} from "./repository-rm2yqhr0.js";
 import {
-  Service18
-} from "./git-9smnhnck.js";
+  Service20
+} from "./repository-c08088rs.js";
 import {
-  make10
-} from "./git-0fgcnd78.js";
+  make6
+} from "./repository-3a6d4gwd.js";
 import {
   parseOption2
-} from "./git-5daktx2q.js";
+} from "./repository-5daktx2q.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/config/plugin/command.ts
-var exports_command2 = {};
-__export(exports_command2, {
-  ConfigCommandPlugin: () => exports_command2,
-  Plugin: () => Plugin41
+var exports_command = {};
+__export(exports_command, {
+  ConfigCommandPlugin: () => exports_command,
+  Plugin: () => Plugin30
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { ConfigCommand } from "@opencode/schema/config/command";
@@ -41,10 +41,10 @@ import { Effect, Option, PubSub, Schema, Stream } from "effect";
 import { ChildProcess } from "effect/unstable/process";
 import { FSUtil } from "@opencode/util/fs-util";
 var decodeCommand = Schema.decodeUnknownOption(ConfigCommand.Info);
-var Plugin41 = define({
+var Plugin30 = define({
   id: "opencode.config.command",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service69;
+    const config = yield* Service53;
     const fs = yield* FSUtil.Service;
     const loadEntry = Effect.fnUntraced(function* (entry) {
       if (entry.type === "document")
@@ -54,12 +54,12 @@ var Plugin41 = define({
       const commands = yield* loadDirectory(fs, entry.path);
       return [{ commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) }];
     });
-    const location = yield* Service75;
+    const location = yield* Service76;
     const processes = yield* AppProcess.Service;
-    const shell = yield* Service54;
-    const sessions = yield* Service18;
-    const agents = yield* Service67;
-    const subagents = yield* make10;
+    const shell = yield* Service72;
+    const sessions = yield* Service20;
+    const agents = yield* Service59;
+    const subagents = yield* make6;
     const load = Effect.fn("ConfigCommandPlugin.load")(function* () {
       return yield* Effect.forEach(yield* config.entries(), loadEntry).pipe(Effect.map((documents) => documents.flat()));
     });
@@ -80,7 +80,7 @@ var Plugin41 = define({
             name,
             description: command.description,
             execute: (input) => Effect.gen(function* () {
-              const agent = command.agent === undefined ? undefined : ID12.make(command.agent);
+              const agent = command.agent === undefined ? undefined : ID9.make(command.agent);
               const commandAgent = agent === undefined ? undefined : (yield* ctx.agent.get({ agentID: agent })).data;
               const model = command.model === undefined ? commandAgent?.model : {
                 id: Model.ID.make(command.model.model),
@@ -204,4 +204,4 @@ var placeholderRegex = /\$(\d+)/g;
 var quoteTrimRegex = /^["']|["']$/g;
 var shellRegex = /!`([^`]+)`/g;
 
-export { Plugin41, exports_command2 };
+export { Plugin30, exports_command };

package/dist/chunks/{git-3hepkmqq.js → repository-3hepkmqq.js}

@@ -1,6 +1,6 @@
 import {
   Timestamps2
-} from "./git-qfa1cgps.js";
+} from "./repository-qfa1cgps.js";
 
 // src/kv/sql.ts
 import { sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{git-msn3ckcs.js → repository-3r9tyhmb.js}

@@ -1,20 +1,20 @@
 import {
   AbsolutePath2
-} from "./git-922hggd3.js";
+} from "./repository-922hggd3.js";
 import {
   root2
-} from "./git-dn02v3xn.js";
+} from "./repository-2az9q9m5.js";
 import {
-  Service75,
-  node80
-} from "./git-ezys8rkd.js";
+  Service76,
+  node81
+} from "./repository-z399x6eb.js";
 import {
-  Service64,
-  node69
-} from "./git-xsz6vv8y.js";
+  Service56,
+  node59
+} from "./repository-c5ws0z31.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/file-access.ts
 var exports_file_access = {};
@@ -22,9 +22,9 @@ __export(exports_file_access, {
   FileAccess: () => exports_file_access,
   Kind: () => Kind2,
   ResolveInput: () => ResolveInput2,
-  Service: () => Service16,
+  Service: () => Service17,
   externalDirectoryPermission: () => externalDirectoryPermission2,
-  node: () => node19,
+  node: () => node20,
   resolvePath: () => resolvePath2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,7 +43,7 @@ var externalDirectoryPermission2 = (input) => ({
   save: [input.save]
 });
 
-class Service16 extends Context.Service()("@opencode/FileAccess") {
+class Service17 extends Context.Service()("@opencode/FileAccess") {
 }
 var resolvePath2 = (directory, input, home = Global.Path.home) => {
   const normalized = FSUtil.windowsPath(input);
@@ -55,10 +55,10 @@ var invocation = (context) => ({
   agent: context.agent,
   source: { type: "tool", messageID: context.messageID, id: context.id }
 });
-var layer = Layer.effect(Service16, Effect.gen(function* () {
+var layer = Layer.effect(Service17, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service75;
-  const permission = yield* Service64;
+  const location = yield* Service76;
+  const permission = yield* Service56;
   const resolve = Effect.fn("FileAccess.resolve")(function* (input) {
     const absolute = AbsolutePath2.make(resolvePath2(location.directory, input.path));
     const worktree = path.resolve(location.project.directory);
@@ -107,8 +107,8 @@ var layer = Layer.effect(Service16, Effect.gen(function* () {
     });
     return target;
   });
-  return Service16.of({ resolve, authorizeExternal, authorizeRead });
+  return Service17.of({ resolve, authorizeExternal, authorizeRead });
 }));
-var node19 = makeLocationNode({ service: Service16, layer, deps: [FSUtil.node, node80, node69] });
+var node20 = makeLocationNode({ service: Service17, layer, deps: [FSUtil.node, node81, node59] });
 
-export { Kind2, ResolveInput2, externalDirectoryPermission2, Service16, resolvePath2, node19, exports_file_access };
+export { Kind2, ResolveInput2, externalDirectoryPermission2, Service17, resolvePath2, node20, exports_file_access };

package/dist/chunks/{git-3smtnn6g.js → repository-3smtnn6g.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/mime.ts
 var exports_mime = {};

package/dist/chunks/{git-3tvqynh2.js → repository-3tvqynh2.js}

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

package/dist/chunks/{git-2gnzn4g6.js → repository-3vaccfnm.js}

@@ -1,72 +1,72 @@
 import {
-  Service50
-} from "./git-6c0cft2p.js";
+  Service74
+} from "./repository-w68crq9a.js";
 import {
-  Service45,
+  Service73,
   readText2,
   syncTextBom2
-} from "./git-y1p1x618.js";
+} from "./repository-343vvr6y.js";
 import {
-  Service74
-} from "./git-8n0zdm8f.js";
+  Service13
+} from "./repository-wg3j617h.js";
 import {
-  Service64
-} from "./git-xsz6vv8y.js";
+  Service56
+} from "./repository-c5ws0z31.js";
 import {
-  Service16
-} from "./git-msn3ckcs.js";
+  Service17
+} from "./repository-3r9tyhmb.js";
 import {
   fileDiff2
-} from "./git-6prwharc.js";
+} from "./repository-6prwharc.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/tool/plugin/write.ts
 var exports_write = {};
 __export(exports_write, {
-  Input: () => Input7,
-  Output: () => Output5,
-  Plugin: () => Plugin22,
+  Input: () => Input11,
+  Output: () => Output7,
+  Plugin: () => Plugin12,
   WriteTool: () => exports_write,
-  name: () => name7,
-  toModelContent: () => toModelContent4
+  name: () => name11,
+  toModelContent: () => toModelContent6
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import { Bom } from "@opencode/util/bom";
-var name7 = "write";
-var Input7 = Schema.Struct({
+var name11 = "write";
+var Input11 = Schema.Struct({
   path: Schema.String.annotate({
     description: "Path to the file to write to"
   }),
   content: Schema.String.annotate({ description: "Content to write to the file" })
 });
-var Output5 = Schema.Struct({
+var Output7 = Schema.Struct({
   operation: Schema.Literal("write"),
   target: Schema.String,
   resource: Schema.String,
   existed: Schema.Boolean
 });
-var toModelContent4 = (output) => `${output.existed ? "Wrote" : "Created"} file successfully: ${output.resource}`;
-var Plugin22 = {
+var toModelContent6 = (output) => `${output.existed ? "Wrote" : "Created"} file successfully: ${output.resource}`;
+var Plugin12 = {
   id: "opencode.tool.write",
   effect: Effect.fn("WriteTool.Plugin")(function* (ctx) {
-    const access = yield* Service16;
-    const fileMutation = yield* Service45;
-    const environment = yield* Service50;
-    const formatter = yield* Service74;
-    const permission = yield* Service64;
+    const access = yield* Service17;
+    const fileMutation = yield* Service73;
+    const environment = yield* Service74;
+    const formatter = yield* Service13;
+    const permission = yield* Service56;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name7,
+      name: name11,
       options: { codemode: false, permission: "edit" },
       description: `Writes a file to the local filesystem, overwriting if one exists.
 
 Missing parent directories are created automatically.
 
 Use this tool to create new files or overwrite existing files. For partial changes, use the edit tool instead.`,
-      input: Input7,
-      output: Output5,
+      input: Input11,
+      output: Output7,
       execute: (input, context) => Effect.gen(function* () {
         const source = {
           type: "tool",
@@ -93,9 +93,9 @@ Use this tool to create new files or overwrite existing files. For partial chang
           yield* syncTextBom2(environment.files, target.absolute, bom);
         }
         return result;
-      }).pipe(Effect.map((output) => ({ output, content: toModelContent4(output) })), Effect.mapError((error) => new ToolFailure({ message: `Unable to write ${input.path}`, error })))
+      }).pipe(Effect.map((output) => ({ output, content: toModelContent6(output) })), Effect.mapError((error) => new ToolFailure({ message: `Unable to write ${input.path}`, error })))
     })).pipe(Effect.orDie);
   })
 };
 
-export { name7, Input7, Output5, toModelContent4, Plugin22, exports_write };
+export { name11, Input11, Output7, toModelContent6, Plugin12, exports_write };

package/dist/chunks/{git-stzp5pqk.js → repository-45yvhxnf.js}

@@ -1,10 +1,10 @@
 import {
-  Service78
-} from "./git-xcmxfd3t.js";
+  Service79
+} from "./repository-xqpzppg3.js";
 import {
-  Service15,
+  Service18,
   Event3
-} from "./git-hsbe2v8d.js";
+} from "./repository-fmnw6ddm.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode/plugin/effect/plugin";
@@ -14,8 +14,8 @@ import { Effect, Stream } from "effect";
 var ModelsDevPlugin2 = define({
   id: "opencode.models.dev",
   effect: Effect.fn(function* (ctx) {
-    const modelsDev = yield* Service15;
-    const bus = yield* Service78;
+    const modelsDev = yield* Service18;
+    const bus = yield* Service79;
     const loaded = { data: snapshots(yield* modelsDev.get()) };
     yield* ctx.integration.transform((integrations) => {
       for (const provider of loaded.data) {

package/dist/chunks/{git-h5dbjsx9.js → repository-48974jce.js}

@@ -1,54 +1,54 @@
+import {
+  Service79,
+  node84
+} from "./repository-xqpzppg3.js";
 import {
   Service78,
   node83
-} from "./git-xcmxfd3t.js";
-import {
-  Service77,
-  node82
-} from "./git-9edcvf27.js";
+} from "./repository-jefma2gq.js";
 import {
-  Service75,
-  node80
-} from "./git-ezys8rkd.js";
+  Service76,
+  node81
+} from "./repository-z399x6eb.js";
 import {
   awaitActivation2
-} from "./git-q509s3k3.js";
+} from "./repository-dxj72tfx.js";
 import {
-  Service70,
-  node75
-} from "./git-wnpvrkxy.js";
+  Service54,
+  node57
+} from "./repository-kedqt550.js";
 import {
-  node20
-} from "./git-dng8y5a3.js";
+  node22
+} from "./repository-77e0zb3k.js";
 import {
-  Service9,
-  node12
-} from "./git-p1wf2k30.js";
+  Service12,
+  node15
+} from "./repository-t0x5rdq8.js";
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/filesystem/location-watcher.ts
-var exports_location_watcher = {};
-__export(exports_location_watcher, {
-  LocationWatcher: () => exports_location_watcher,
-  Service: () => Service5,
-  node: () => node7
+var exports_location_watcher2 = {};
+__export(exports_location_watcher2, {
+  LocationWatcher: () => exports_location_watcher2,
+  Service: () => Service11,
+  node: () => node14
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Cause, Context, Effect, Exit, Layer, Scope, Semaphore, Stream } from "effect";
 import { FileSystem } from "@opencode/schema/filesystem";
 import path from "path";
 import { FSUtil } from "@opencode/util/fs-util";
-class Service5 extends Context.Service()("@opencode/LocationWatcher") {
+class Service11 extends Context.Service()("@opencode/LocationWatcher") {
 }
-var layer = Layer.effect(Service5, Effect.gen(function* () {
-  const location = yield* Service75;
-  const watcher = yield* Service70;
-  const bus = yield* Service78;
+var layer = Layer.effect(Service11, Effect.gen(function* () {
+  const location = yield* Service76;
+  const watcher = yield* Service54;
+  const bus = yield* Service79;
   const fs = yield* FSUtil.Service;
-  const git = yield* Service77;
-  const policy = yield* Service9;
+  const git = yield* Service78;
+  const policy = yield* Service12;
   const publish = (update) => bus.publish(FileSystem.Event.Changed, {
     file: update.path,
     event: update.type === "create" ? "add" : update.type === "update" ? "change" : "unlink"
@@ -100,12 +100,12 @@ var layer = Layer.effect(Service5, Effect.gen(function* () {
     yield* awaitActivation2;
     yield* reconcile();
   }).pipe(Effect.catchCauseIf((cause) => !Cause.hasInterrupts(cause), (cause) => Effect.logError("failed to start location watcher", { cause })), Effect.forkScoped({ startImmediately: true }));
-  return Service5.of({});
+  return Service11.of({});
 }));
-var node7 = makeLocationNode({
-  service: Service5,
+var node14 = makeLocationNode({
+  service: Service11,
   layer,
-  deps: [node75, FSUtil.node, node80, node82, node83, node20, node12]
+  deps: [node57, FSUtil.node, node81, node83, node84, node22, node15]
 });
 
-export { Service5, node7, exports_location_watcher };
+export { Service11, node14, exports_location_watcher2 };

package/dist/chunks/{git-pck3w1ab.js → repository-49hrpkdk.js}

@@ -1,13 +1,13 @@
 import {
   __export
-} from "./git-9rqn6x4v.js";
+} from "./repository-9rqn6x4v.js";
 
 // src/tool/plugin/opencode.ts
 var exports_opencode = {};
 __export(exports_opencode, {
   MoveInput: () => MoveInput2,
   OpenCodeTools: () => exports_opencode,
-  Plugin: () => Plugin19,
+  Plugin: () => Plugin7,
   RenameInput: () => RenameInput2
 });
 import { SystemPart, ToolFailure } from "@opencode/ai";
@@ -26,7 +26,7 @@ var MoveInput2 = Schema.Struct({
   })
 });
 var MoveOutput = Schema.Struct({ sessionID: Session.ID, directory: AbsolutePath });
-var Plugin19 = {
+var Plugin7 = {
   id: "opencode.tools",
   effect: Effect.fn("OpenCodeTools.Plugin")(function* (ctx) {
     yield* ctx.session.hook("context", (event) => Effect.sync(() => {
@@ -74,4 +74,4 @@ var Plugin19 = {
   })
 };
 
-export { RenameInput2, MoveInput2, Plugin19, exports_opencode };
+export { RenameInput2, MoveInput2, Plugin7, exports_opencode };

package/dist/chunks/{git-chg3p55r.js → repository-4hgtqqtz.js}

@@ -1,12 +1,12 @@
 import {
   jitCompatCheck2
-} from "./git-emrn6kk6.js";
+} from "./repository-emrn6kk6.js";
 import {
   SQLiteEffectDatabase2
-} from "./git-fkzsndak.js";
+} from "./repository-8x8j0yap.js";
 import {
   EffectSQLiteSession2
-} from "./git-5fbvx1w6.js";
+} from "./repository-kq4ab4h1.js";
 
 // src/database/drizzle/effect-sqlite/driver.ts
 import * as Effect from "effect/Effect";
@@ -20,7 +20,7 @@ class EffectSQLiteDatabase2 extends SQLiteEffectDatabase2 {
   static [entityKind] = "EffectSQLiteDatabase";
 }
 var DefaultServices2 = Layer.merge(EffectCache.Default, EffectLogger.Default);
-var make22 = Effect.fn("SQLiteDrizzle.make")(function* (config = {}) {
+var make23 = Effect.fn("SQLiteDrizzle.make")(function* (config = {}) {
   const client = yield* SqlClient;
   const cache = yield* EffectCache;
   const logger = yield* EffectLogger;
@@ -37,6 +37,6 @@ var make22 = Effect.fn("SQLiteDrizzle.make")(function* (config = {}) {
   db.$cache.invalidate = cache.onMutate;
   return db;
 });
-var makeWithDefaults2 = (config = {}) => make22(config).pipe(Effect.provide(DefaultServices2));
+var makeWithDefaults2 = (config = {}) => make23(config).pipe(Effect.provide(DefaultServices2));
 
-export { EffectSQLiteDatabase2, DefaultServices2, make22, makeWithDefaults2 };
+export { EffectSQLiteDatabase2, DefaultServices2, make23, makeWithDefaults2 };