@opencode-ai/core 0.0.0-beta-19228 → 0.0.0-beta-19234

package/dist/chunks/{integration-t89cxbfz.js → worktree-z1sr0xrs.js}

@@ -1,17 +1,17 @@
 import {
   provider2,
   model2
-} from "./integration-0paq2nw3.js";
+} from "./worktree-0paq2nw3.js";
 import {
   aisdk2
-} from "./integration-chtrmnkp.js";
+} from "./worktree-zkj92s1w.js";
 import {
   Capabilities2,
   compatibility2
-} from "./integration-ey04d52n.js";
+} from "./worktree-k3skpd5n.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/v1/config/migrate.ts
 var exports_migrate = {};

package/dist/chunks/{integration-hha4zry8.js → worktree-ze4dnq9c.js}

@@ -1,41 +1,41 @@
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/v1/config/permission.ts
-var exports_permission = {};
-__export(exports_permission, {
+var exports_permission2 = {};
+__export(exports_permission2, {
   Action: () => Action2,
-  ConfigPermissionV1: () => exports_permission,
-  Info: () => Info16,
+  ConfigPermissionV1: () => exports_permission2,
+  Info: () => Info17,
   Object: () => Object2,
-  Rule: () => Rule2
+  Rule: () => Rule3
 });
 import { Schema, SchemaGetter } from "effect";
 var Action2 = Schema.Literals(["ask", "allow", "deny"]).annotate({ identifier: "PermissionActionConfig" });
 var Object2 = Schema.Record(Schema.String, Action2).annotate({ identifier: "PermissionObjectConfig" });
-var Rule2 = Schema.Union([Action2, Object2]).annotate({ identifier: "PermissionRuleConfig" });
+var Rule3 = Schema.Union([Action2, Object2]).annotate({ identifier: "PermissionRuleConfig" });
 var InputObject = Schema.StructWithRest(Schema.Struct({
-  read: Schema.optional(Rule2),
-  edit: Schema.optional(Rule2),
-  glob: Schema.optional(Rule2),
-  grep: Schema.optional(Rule2),
-  list: Schema.optional(Rule2),
-  bash: Schema.optional(Rule2),
-  task: Schema.optional(Rule2),
-  external_directory: Schema.optional(Rule2),
+  read: Schema.optional(Rule3),
+  edit: Schema.optional(Rule3),
+  glob: Schema.optional(Rule3),
+  grep: Schema.optional(Rule3),
+  list: Schema.optional(Rule3),
+  bash: Schema.optional(Rule3),
+  task: Schema.optional(Rule3),
+  external_directory: Schema.optional(Rule3),
   question: Schema.optional(Action2),
   webfetch: Schema.optional(Action2),
   websearch: Schema.optional(Action2),
-  lsp: Schema.optional(Rule2),
+  lsp: Schema.optional(Rule3),
   doom_loop: Schema.optional(Action2),
-  skill: Schema.optional(Rule2)
-}), [Schema.Record(Schema.String, Rule2)]);
+  skill: Schema.optional(Rule3)
+}), [Schema.Record(Schema.String, Rule3)]);
 var InputSchema = Schema.Union([Action2, InputObject]);
 var normalizeInput = (input) => typeof input === "string" ? { "*": input } : input;
-var Info16 = InputSchema.pipe(Schema.decodeTo(InputObject, {
+var Info17 = InputSchema.pipe(Schema.decodeTo(InputObject, {
   decode: SchemaGetter.transform(normalizeInput),
   encode: SchemaGetter.passthrough({ strict: false })
 })).annotate({ identifier: "PermissionConfig" });
 
-export { Action2, Object2, Rule2, Info16, exports_permission };
+export { Action2, Object2, Rule3, Info17, exports_permission2 };

package/dist/chunks/{integration-k2en0fft.js → worktree-zgsac5yt.js}

@@ -1,13 +1,13 @@
 import {
-  ID8,
+  ID13,
   Family2
-} from "./integration-ey04d52n.js";
+} from "./worktree-k3skpd5n.js";
 import {
-  Service44
-} from "./integration-d7rthvks.js";
+  Service62
+} from "./worktree-xpxmebhh.js";
 import {
   foldSettings2
-} from "./integration-30z9ekqv.js";
+} from "./worktree-hevn35yy.js";
 
 // src/plugin/provider/ollama.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";
@@ -45,12 +45,12 @@ var ShowResponse = Schema.Struct({
 });
 var discovery = new Map;
 var discoveryLock = Semaphore.makeUnsafe(1);
-function make6(origin = "http://127.0.0.1:11434", interval = "30 seconds") {
+function make7(origin = "http://127.0.0.1:11434", interval = "30 seconds") {
   return define({
     id: "opencode.provider.ollama",
     effect: Effect.fn(function* (ctx) {
       const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient);
-      const config = yield* Service44;
+      const config = yield* Service62;
       const source = { current: configured(yield* config.entries(), origin) };
       const loaded = { models: [], hash: "[]" };
       yield* ctx.integration.transform((integrations) => {
@@ -77,7 +77,7 @@ function make6(origin = "http://127.0.0.1:11434", interval = "30 seconds") {
         });
         for (const item of loaded.models) {
           catalog.model.update(providerID, item.model, (model) => {
-            model.modelID = ID8.make(item.model);
+            model.modelID = ID13.make(item.model);
             model.name = item.name || item.model;
             model.family = item.show.details?.family ? Family2.make(item.show.details.family) : item.details.family ? Family2.make(item.details.family) : undefined;
             model.capabilities = {
@@ -151,7 +151,7 @@ function make6(origin = "http://127.0.0.1:11434", interval = "30 seconds") {
     })
   });
 }
-var OllamaPlugin2 = make6();
+var OllamaPlugin2 = make7();
 function configured(entries, origin) {
   const settings = foldSettings2(entries, providerID, undefined);
   const baseURL = (typeof settings?.baseURL === "string" ? settings.baseURL : `${origin.replace(/\/+$/, "")}/v1`).replace(/\/+$/, "");
@@ -170,4 +170,4 @@ function configured(entries, origin) {
   return { baseURL, apiKey, tagsEndpoint, showEndpoint: url.toString() };
 }
 
-export { make6, OllamaPlugin2 };
+export { make7, OllamaPlugin2 };

package/dist/chunks/{integration-n0tc3be6.js → worktree-zh2rh6rn.js}

@@ -1,23 +1,23 @@
 import {
-  ID9,
+  ID14,
   aisdk2,
   mergeOverlay2
-} from "./integration-chtrmnkp.js";
+} from "./worktree-zkj92s1w.js";
 import {
-  ID8,
+  ID13,
   VariantID2,
   Family2,
-  Info20
-} from "./integration-ey04d52n.js";
+  Info26
+} from "./worktree-k3skpd5n.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/github-copilot/models.ts
-var exports_models2 = {};
-__export(exports_models2, {
-  CopilotModels: () => exports_models2,
-  get: () => get3
+var exports_models = {};
+__export(exports_models, {
+  CopilotModels: () => exports_models,
+  get: () => get2
 });
 import { Money } from "@opencode-ai/schema/money";
 import { Option, Schema } from "effect";
@@ -66,7 +66,7 @@ var RemoteModel = Schema.Struct({
 var Response = Schema.Struct({ data: Schema.Array(Schema.Unknown) });
 var decodeResponse = Schema.decodeUnknownSync(Response);
 var decodeModel = Schema.decodeUnknownOption(RemoteModel);
-async function get3(baseURL, headers, existing) {
+async function get2(baseURL, headers, existing) {
   const response = await fetch(`${baseURL}/models`, {
     headers,
     signal: AbortSignal.timeout(5000)
@@ -87,7 +87,7 @@ async function get3(baseURL, headers, existing) {
     result.set(id, build(id, current, baseURL, model));
   }
   for (const [id, model] of remote) {
-    const key = ID8.make(id);
+    const key = ID13.make(id);
     if (result.has(key))
       continue;
     result.set(key, build(key, model, baseURL));
@@ -111,11 +111,11 @@ function build(id, remote, baseURL, previous) {
   const usdPerMillion = prices && prices.batch_size > 0 ? 1e4 / prices.batch_size : 0;
   const version = remote.version.startsWith(`${remote.id}-`) ? remote.version.slice(remote.id.length + 1) : remote.version;
   const released = previous?.time.released || Date.parse(version);
-  return Info20.make({
-    ...Info20.default(ID9.githubCopilot, id),
+  return Info26.make({
+    ...Info26.default(ID14.githubCopilot, id),
     id,
-    modelID: ID8.make(remote.id),
-    providerID: ID9.githubCopilot,
+    modelID: ID13.make(remote.id),
+    providerID: ID14.githubCopilot,
     family: previous?.family ?? Family2.make(remote.capabilities.family),
     name: previous?.name ?? remote.name,
     package: aisdk2(messages ? "@ai-sdk/anthropic" : "@ai-sdk/github-copilot"),
@@ -190,4 +190,4 @@ function variants(remote, messages) {
   ];
 }
 
-export { get3, exports_models2 };
+export { get2, exports_models };

package/dist/chunks/{integration-4ha7507h.js → worktree-zh93cpfk.js}

@@ -1,29 +1,29 @@
 import {
   ephemeral2,
-  Service78,
-  node82
-} from "./integration-scmtthwv.js";
+  Service79,
+  node84
+} from "./worktree-dng5ka12.js";
 import {
-  Service71,
-  node74
-} from "./integration-m5kbf3jc.js";
+  Service73,
+  node78
+} from "./worktree-pq5hrpmt.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/wellknown.ts
 var exports_wellknown = {};
 __export(exports_wellknown, {
   Auth: () => Auth2,
   Config: () => Config2,
-  Event: () => Event10,
+  Event: () => Event15,
   Manifest: () => Manifest2,
   RemoteConfig: () => RemoteConfig2,
-  Service: () => Service46,
+  Service: () => Service65,
   WellKnown: () => exports_wellknown,
   inspect: () => inspect2,
-  node: () => node50,
-  resolve: () => resolve2
+  node: () => node69,
+  resolve: () => resolve3
 });
 import { Integration } from "@opencode-ai/schema/integration";
 import { Context, Effect, Layer, Ref, Schema, Semaphore } from "effect";
@@ -46,9 +46,9 @@ var Manifest2 = Schema.Struct({
   remote_config: Schema.optional(RemoteConfig2)
 }).annotate({ identifier: "WellKnown.Manifest" });
 
-class Service46 extends Context.Service()("@opencode/WellKnown") {
+class Service65 extends Context.Service()("@opencode/WellKnown") {
 }
-var Event10 = {
+var Event15 = {
   Updated: ephemeral2({ type: "wellknown.updated", schema: {} })
 };
 var inspect2 = Effect.fn("WellKnown.inspect")(function* (origin) {
@@ -56,7 +56,7 @@ var inspect2 = Effect.fn("WellKnown.inspect")(function* (origin) {
   const http = HttpClient.filterStatusOk(yield* HttpClient.HttpClient);
   return yield* http.execute(HttpClientRequest.get(url).pipe(HttpClientRequest.acceptJson)).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(Manifest2)), Effect.mapError((cause) => new Error(`Failed to load wellknown manifest from ${url}`, { cause })));
 });
-var resolve2 = Effect.fn("WellKnown.resolve")(function* (input) {
+var resolve3 = Effect.fn("WellKnown.resolve")(function* (input) {
   const manifest = yield* inspect2(input.origin);
   return yield* resolveEntry({ origin: input.origin, integrationID: Integration.ID.make(input.origin.replace(/\/+$/, "")), manifest }, input.variables ?? {});
 });
@@ -75,10 +75,10 @@ var resolveEntry = Effect.fnUntraced(function* (entry, variables) {
 });
 var sourcesKey = "wellknown:sources";
 var Sources = Schema.Array(Schema.String);
-var layer = Layer.effect(Service46, Effect.gen(function* () {
+var layer = Layer.effect(Service65, Effect.gen(function* () {
   const http = yield* HttpClient.HttpClient;
-  const kv = yield* Service71;
-  const bus = yield* Service78;
+  const kv = yield* Service73;
+  const bus = yield* Service79;
   const cache = yield* Ref.make(new Map);
   const lock = Semaphore.makeUnsafe(1);
   const loadEntry = Effect.fn("WellKnown.loadEntry")(function* (origin) {
@@ -109,10 +109,10 @@ var layer = Layer.effect(Service46, Effect.gen(function* () {
     if (!changed)
       return false;
     yield* Ref.set(cache, next);
-    yield* bus.publish(Event10.Updated, {});
+    yield* bus.publish(Event15.Updated, {});
     return true;
   }, (effect) => lock.withPermit(effect));
-  return Service46.of({
+  return Service65.of({
     entries: load,
     snapshot: () => Array.from(Ref.getUnsafe(cache).values()),
     refresh,
@@ -125,7 +125,7 @@ var layer = Layer.effect(Service46, Effect.gen(function* () {
       const origins = Schema.is(Sources)(sources) ? sources : [];
       yield* kv.set(sourcesKey, Array.from(new Set([...origins, origin])));
       yield* Ref.update(cache, (current) => new Map(current).set(origin, entry));
-      yield* bus.publish(Event10.Updated, {});
+      yield* bus.publish(Event15.Updated, {});
       return entry;
     }, (effect, _value) => lock.withPermit(effect)),
     remove: Effect.fn("WellKnown.remove")(function* (value) {
@@ -138,11 +138,11 @@ var layer = Layer.effect(Service46, Effect.gen(function* () {
         next.delete(origin);
         return next;
       });
-      yield* bus.publish(Event10.Updated, {});
+      yield* bus.publish(Event15.Updated, {});
     }, (effect, _value) => lock.withPermit(effect)),
     resolve: Effect.fn("WellKnown.resolveEntry")((entry, variables) => resolveEntry(entry, variables).pipe(Effect.provideService(HttpClient.HttpClient, http)))
   });
 }));
-var node50 = makeGlobalNode({ service: Service46, layer, deps: [httpClient, node74, node82] });
+var node69 = makeGlobalNode({ service: Service65, layer, deps: [httpClient, node78, node84] });
 
-export { Auth2, RemoteConfig2, Config2, Manifest2, Service46, Event10, inspect2, resolve2, node50, exports_wellknown };
+export { Auth2, RemoteConfig2, Config2, Manifest2, Service65, Event15, inspect2, resolve3, node69, exports_wellknown };

package/dist/chunks/{integration-whyqf77n.js → worktree-zht09bnk.js}

@@ -1,15 +1,15 @@
 import {
-  Service36
-} from "./integration-vmb983vf.js";
+  Service74
+} from "./worktree-fmanbg8s.js";
 import {
-  Service51
-} from "./integration-2h194s0m.js";
+  Service42
+} from "./worktree-enw72f67.js";
 import {
   awaitActivation2
-} from "./integration-pf31ssb9.js";
+} from "./worktree-rap9a73h.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/session/command.ts
 var exports_command3 = {};
@@ -19,8 +19,8 @@ __export(exports_command3, {
 });
 import { Effect } from "effect";
 var execute2 = Effect.fn("SessionCommand.execute")(function* (input) {
-  const instances = yield* Service51;
-  const commands = yield* awaitActivation2.pipe(Effect.andThen(Service36), instances.provide(input.session));
+  const instances = yield* Service42;
+  const commands = yield* awaitActivation2.pipe(Effect.andThen(Service74), instances.provide(input.session));
   yield* commands.execute({
     name: input.command,
     invocation: {

package/dist/chunks/{integration-chtrmnkp.js → worktree-zkj92s1w.js}

@@ -1,13 +1,13 @@
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/provider.ts
 var exports_provider3 = {};
 __export(exports_provider3, {
   AISDK_PREFIX: () => AISDK_PREFIX2,
-  ID: () => ID9,
-  Info: () => Info21,
+  ID: () => ID14,
+  Info: () => Info27,
   LoadError: () => LoadError3,
   Provider: () => exports_provider3,
   Request: () => Request3,
@@ -23,7 +23,7 @@ import { Effect, Schema } from "effect";
 import { Provider } from "@opencode-ai/schema/provider";
 import { isRecord } from "@opencode-ai/ai/utils/record";
 import { importModule, resolveModule } from "@opencode-ai/util/runtime-import";
-var ID9 = Provider.ID;
+var ID14 = Provider.ID;
 var AISDK_PREFIX2 = "aisdk:";
 var isAISDK2 = (value) => value?.startsWith(AISDK_PREFIX2) ?? false;
 var aisdk2 = (value) => isAISDK2(value) ? value : `${AISDK_PREFIX2}${value}`;
@@ -56,8 +56,13 @@ var builtins = new Map([
   ["@opencode-ai/ai/providers/azure", () => import("@opencode-ai/ai/providers/azure")],
   ["@opencode-ai/ai/providers/azure/chat", () => import("@opencode-ai/ai/providers/azure/chat")],
   ["@opencode-ai/ai/providers/azure/responses", () => import("@opencode-ai/ai/providers/azure/responses")],
+  ["@opencode-ai/ai/providers/baseten", () => import("@opencode-ai/ai/providers/baseten")],
   ["@opencode-ai/ai/providers/cerebras", () => import("@opencode-ai/ai/providers/cerebras")],
+  ["@opencode-ai/ai/providers/cloudflare-ai-gateway", () => import("@opencode-ai/ai/providers/cloudflare-ai-gateway")],
+  ["@opencode-ai/ai/providers/cloudflare-workers-ai", () => import("@opencode-ai/ai/providers/cloudflare-workers-ai")],
   ["@opencode-ai/ai/providers/deepinfra", () => import("@opencode-ai/ai/providers/deepinfra")],
+  ["@opencode-ai/ai/providers/deepseek", () => import("@opencode-ai/ai/providers/deepseek")],
+  ["@opencode-ai/ai/providers/fireworks", () => import("@opencode-ai/ai/providers/fireworks")],
   ["@opencode-ai/ai/providers/google", () => import("@opencode-ai/ai/providers/google")],
   ["@opencode-ai/ai/providers/google-vertex", () => import("@opencode-ai/ai/providers/google-vertex")],
   ["@opencode-ai/ai/providers/google-vertex/gemini", () => import("@opencode-ai/ai/providers/google-vertex/gemini")],
@@ -137,7 +142,7 @@ function mergeHeaders2(base, overlay) {
 }
 var Request3 = Provider.Request;
 var Settings2 = Provider.Settings;
-var Info21 = Provider.Info;
+var Info27 = Provider.Info;
 var importPackage = Effect.fn("Provider.importPackage")(function* (specifier, entrypoint, load = () => importModule(entrypoint)) {
   const module = yield* Effect.tryPromise({
     try: () => {
@@ -159,4 +164,4 @@ var importPackage = Effect.fn("Provider.importPackage")(function* (specifier, en
   return module;
 });
 
-export { ID9, AISDK_PREFIX2, isAISDK2, aisdk2, packageName2, LoadError3, loadPackage2, mergeOverlay2, mergeHeaders2, Request3, Settings2, Info21, exports_provider3 };
+export { ID14, AISDK_PREFIX2, isAISDK2, aisdk2, packageName2, LoadError3, loadPackage2, mergeOverlay2, mergeHeaders2, Request3, Settings2, Info27, exports_provider3 };

package/dist/chunks/{integration-t3jgv66k.js → worktree-zn2cbnfs.js}

@@ -1,18 +1,18 @@
 import {
   webSocketConstructor2
-} from "./integration-0e0xafbb.js";
+} from "./worktree-0e0xafbb.js";
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/session/model-transport.ts
 var exports_model_transport = {};
 __export(exports_model_transport, {
-  Service: () => Service35,
+  Service: () => Service31,
   SessionModelTransport: () => exports_model_transport,
-  layer: () => layer15,
+  layer: () => layer12,
   makeLayer: () => makeLayer2,
-  node: () => node39
+  node: () => node36
 });
 import {
   WebSocketTransport
@@ -31,7 +31,7 @@ var events = Metric.counter("opencode_session_websocket_events_total", {
 });
 var metric = (event, attributes = {}) => Metric.update(events.pipe(Metric.withAttributes({ event, ...attributes })), 1);
 
-class Service35 extends Context.Service()("@opencode/SessionModelTransport") {
+class Service31 extends Context.Service()("@opencode/SessionModelTransport") {
 }
 var transportError = (message, input) => new AIError({
   reason: new TransportError({ message, transport: "websocket", ...input })
@@ -55,7 +55,7 @@ var observationFrame = (observation) => {
   return Effect.fail(observation.error);
 };
 var observationTerminal = (observation) => observation.type !== "frame";
-var makeLayer2 = (connector) => Layer.effect(Service35, Effect.gen(function* () {
+var makeLayer2 = (connector) => Layer.effect(Service31, Effect.gen(function* () {
   const scope = yield* Scope.Scope;
   const states = new Map;
   const state = (sessionID) => {
@@ -331,11 +331,11 @@ var makeLayer2 = (connector) => Layer.effect(Service35, Effect.gen(function* ()
     }, { discard: true });
   });
   yield* Effect.addFinalizer(() => closeAll);
-  return Service35.of({ bind, close, closeAll });
+  return Service31.of({ bind, close, closeAll });
 }));
-var layer15 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
+var layer12 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
   open: (input) => WebSocketTransport.open(input).pipe(Effect.provideService(Socket.WebSocketConstructor, constructor))
 })));
-var node39 = makeGlobalNode({ service: Service35, layer: layer15, deps: [webSocketConstructor2] });
+var node36 = makeGlobalNode({ service: Service31, layer: layer12, deps: [webSocketConstructor2] });
 
-export { Service35, makeLayer2, layer15, node39, exports_model_transport };
+export { Service31, makeLayer2, layer12, node36, exports_model_transport };

package/dist/chunks/{integration-zxq2ej10.js → worktree-zxq2ej10.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./integration-9rqn6x4v.js";
+} from "./worktree-9rqn6x4v.js";
 
 // src/plugin/source-directory.ts
 var exports_source_directory = {};

package/dist/codemode/catalog.js

@@ -1,14 +1,14 @@
 import {
-  Tool2,
+  Tool3,
   Summary2,
   summarize2,
   namespaceLine2,
   exports_catalog
-} from "../chunks/integration-3fc6dm20.js";
+} from "../chunks/worktree-gdvy8fx6.js";
 export {
   exports_catalog as CodeModeCatalog,
   Summary2 as Summary,
-  Tool2 as Tool,
+  Tool3 as Tool,
   namespaceLine2 as namespaceLine,
   summarize2 as summarize
 };

package/dist/codemode/instructions.js

@@ -1,14 +1,14 @@
 import {
-  render2,
+  render3,
   update3,
   make14,
-  exports_instructions2
-} from "../chunks/integration-3qbt326n.js";
-import"../chunks/integration-3fc6dm20.js";
-import"../chunks/integration-mtcjf44p.js";
+  exports_instructions5
+} from "../chunks/worktree-mh0thj4x.js";
+import"../chunks/worktree-gdvy8fx6.js";
+import"../chunks/worktree-28pcbh69.js";
 export {
-  exports_instructions2 as CodeModeInstructions,
+  exports_instructions5 as CodeModeInstructions,
   make14 as make,
-  render2 as render,
+  render3 as render,
   update3 as update
 };

package/dist/codemode/tool.js

@@ -2,8 +2,8 @@ import {
   create2,
   catalog2,
   exports_tool2
-} from "../chunks/integration-72nftnjy.js";
-import"../chunks/integration-3t738kvx.js";
+} from "../chunks/worktree-72nftnjy.js";
+import"../chunks/worktree-3t738kvx.js";
 export {
   exports_tool2 as CodeModeTool,
   catalog2 as catalog,