@opencode/core 0.0.0-dev-20544 → 0.0.0-dev-20545

package/dist/chunks/{location-lifecycle-g8nb572c.js → instance-8t24cbvq.js}

@@ -1,131 +1,131 @@
 import {
   Metadata2,
-  node68
-} from "./location-lifecycle-fg14c903.js";
+  node77
+} from "./instance-5w6ne2rj.js";
 import {
   Service83,
   node87
-} from "./location-lifecycle-38571c3c.js";
+} from "./instance-7fev5bf3.js";
 import {
-  ID9,
-  Service64,
-  node66
-} from "./location-lifecycle-hdcxjhkc.js";
+  ID11,
+  Service72,
+  node75
+} from "./instance-s5ycvqz4.js";
 import {
-  ID17,
+  ID15,
   OAuth3
-} from "./location-lifecycle-ewwc48x6.js";
+} from "./instance-591tt0pk.js";
 import {
-  ID16,
+  ID14,
   MethodID2,
   AttemptID2,
   Method2,
-  Service80,
-  node84
-} from "./location-lifecycle-mthz10xn.js";
+  Service77,
+  node81
+} from "./instance-5tfaxb87.js";
 import {
   AbsolutePath2
-} from "./location-lifecycle-z5v4ffb3.js";
+} from "./instance-z5v4ffb3.js";
 import {
-  Info23,
-  Ref3,
-  Service77,
-  node81
-} from "./location-lifecycle-910czmnb.js";
+  Info27,
+  Ref4,
+  Service80,
+  node84
+} from "./instance-7yv1mt9k.js";
 import {
-  ID11,
-  Service67,
-  node70
-} from "./location-lifecycle-bddk7pqm.js";
+  ID13,
+  Service76,
+  node80
+} from "./instance-7194gzej.js";
 import {
-  Service37,
-  node39
-} from "./location-lifecycle-1ksexcmn.js";
+  Service48,
+  node50
+} from "./instance-376p29j7.js";
 import {
-  Service29,
-  node32
-} from "./location-lifecycle-84wsetqv.js";
+  Service57,
+  node60
+} from "./instance-kjy61nvr.js";
 import {
-  Service70,
-  node73
-} from "./location-lifecycle-k1crjkkb.js";
+  Service65,
+  node68
+} from "./instance-q2j5s8dw.js";
 import {
-  Service59,
-  node61
-} from "./location-lifecycle-z6kn09km.js";
+  Service73,
+  node76
+} from "./instance-53hf21x2.js";
 import {
-  ID10,
-  Service66,
-  node69
-} from "./location-lifecycle-te0t49k2.js";
+  ID12,
+  Service75,
+  node79
+} from "./instance-pjrgfx8h.js";
 import {
-  ID13
-} from "./location-lifecycle-9tkrmsrp.js";
+  ID6
+} from "./instance-ft7xzmdp.js";
 import {
-  Service21,
-  node24
-} from "./location-lifecycle-4ht2td90.js";
+  Service29,
+  node32
+} from "./instance-yb4dmmj4.js";
 import {
-  Service63,
-  node65
-} from "./location-lifecycle-pn3cc07s.js";
+  Service71,
+  node74
+} from "./instance-7s451enq.js";
 import {
-  Service60,
-  node62
-} from "./location-lifecycle-b4q8b87x.js";
+  Service68,
+  node71
+} from "./instance-waygyjme.js";
 import {
-  Service41,
-  node43
-} from "./location-lifecycle-jdayrf5p.js";
+  Service34,
+  node37
+} from "./instance-vxrjwa88.js";
 import {
-  Source3,
-  Service30,
-  node33
-} from "./location-lifecycle-2tzrr9s8.js";
+  Source4,
+  Service39,
+  node42
+} from "./instance-4e5rkyrj.js";
 import {
-  Info9,
-  Service42,
-  node44
-} from "./location-lifecycle-hw3b7921.js";
+  Info5,
+  Service36,
+  node39
+} from "./instance-xcgk3b6z.js";
 import {
-  Service16,
-  node19
-} from "./location-lifecycle-g08z8dq8.js";
+  Service18,
+  node21
+} from "./instance-zvrmf40e.js";
 import {
-  Service49,
-  node51
-} from "./location-lifecycle-dwm69vz7.js";
+  Service17,
+  node20
+} from "./instance-a2w6wz9q.js";
 import {
-  Service58,
-  node60
-} from "./location-lifecycle-5sb37669.js";
+  Service67,
+  node70
+} from "./instance-k94btaq8.js";
 import {
-  Service38,
-  node40
-} from "./location-lifecycle-qd53sc6s.js";
+  Service53,
+  node55
+} from "./instance-aj957cmm.js";
 import {
-  ID5,
-  Service48,
-  node50
-} from "./location-lifecycle-cm3wj67j.js";
+  ID3,
+  Service15,
+  node18
+} from "./instance-vcx8s22q.js";
 import {
-  Service44,
-  node46
-} from "./location-lifecycle-gbvvt2rd.js";
+  Service60,
+  node63
+} from "./instance-n2p07nz6.js";
 import {
   StrategyID2,
-  Info10,
+  Info11,
   ListEntry3,
-  Service43,
-  node45
-} from "./location-lifecycle-1y3ncvm9.js";
+  Service59,
+  node62
+} from "./instance-kfyxfe2e.js";
 import {
-  Service14,
-  node17
-} from "./location-lifecycle-6x0v3epy.js";
+  Service37,
+  node40
+} from "./instance-4vntt73x.js";
 import {
   __export
-} from "./location-lifecycle-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/plugin/host.ts
 var exports_host = {};
@@ -143,49 +143,49 @@ var mutable = (value) => value;
 var isRpcEvent = (event) => event.type.startsWith("rpc.");
 var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test") {
   const app = yield* Metadata2;
-  const agents = yield* Service64;
-  const aisdk = yield* Service37;
-  const providers = yield* Service67;
-  const models = yield* Service66;
-  const commands = yield* Service29;
+  const agents = yield* Service72;
+  const aisdk = yield* Service48;
+  const providers = yield* Service76;
+  const models = yield* Service75;
+  const commands = yield* Service57;
   const bus = yield* Service83;
-  const integration = yield* Service80;
-  const kv = yield* Service70;
-  const mcp = yield* Service21;
-  const location = yield* Service77;
-  const reference = yield* Service30;
-  const rpc = yield* Service58;
-  const skill = yield* Service42;
-  const tools = yield* Service41;
-  const vcs = yield* Service38;
-  const websearch = yield* Service48;
-  const generate = yield* Service14;
-  const permission = yield* Service60;
-  const hooks = yield* Service63;
-  const sessions = yield* Service16;
-  const persistentPty = yield* Service49;
-  const locations = yield* Service59;
-  const worktrees = yield* Service43;
-  const worktreeStrategies = yield* Service44;
+  const integration = yield* Service77;
+  const kv = yield* Service65;
+  const mcp = yield* Service29;
+  const location = yield* Service80;
+  const reference = yield* Service39;
+  const rpc = yield* Service67;
+  const skill = yield* Service36;
+  const tools = yield* Service34;
+  const vcs = yield* Service53;
+  const websearch = yield* Service15;
+  const generate = yield* Service37;
+  const permission = yield* Service68;
+  const hooks = yield* Service71;
+  const sessions = yield* Service18;
+  const persistentPty = yield* Service17;
+  const locations = yield* Service73;
+  const worktrees = yield* Service59;
+  const worktreeStrategies = yield* Service60;
   const currentWorktreeStrategies = location.workspaceID ? undefined : worktreeStrategies;
-  const locationInfo = () => new Info23({
+  const locationInfo = () => new Info27({
     directory: location.directory,
     workspaceID: location.workspaceID,
     project: location.project
   });
-  const locationRef = (input) => input?.location === undefined ? undefined : Ref3.make({
+  const locationRef = (input) => input?.location === undefined ? undefined : Ref4.make({
     directory: AbsolutePath2.make(input.location.directory ?? location.directory),
-    workspaceID: input.location.workspace === undefined ? location.workspaceID : ID13.make(input.location.workspace)
+    workspaceID: input.location.workspace === undefined ? location.workspaceID : ID6.make(input.location.workspace)
   });
   const isCurrentLocation = (ref) => ref.directory === location.directory && ref.workspaceID === location.workspaceID;
   const response = (effect) => effect.pipe(Effect.map((data) => ({ location: locationInfo(), data })));
-  const decodeWorktree = Schema.decodeUnknownEffect(Info10);
+  const decodeWorktree = Schema.decodeUnknownEffect(Info11);
   const decodeWorktrees = Schema.decodeUnknownEffect(Schema.Array(ListEntry3));
   const listAgents = Effect.fn("PluginHost.listAgents")((ref) => Effect.gen(function* () {
-    const location = yield* Service77;
-    const agents = yield* Service64;
+    const location = yield* Service80;
+    const agents = yield* Service72;
     return {
-      location: new Info23({
+      location: new Info27({
         directory: location.directory,
         workspaceID: location.workspaceID,
         project: location.project
@@ -217,10 +217,10 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       transform: (callback) => agents.transform((editor) => {
         callback({
           list: () => mutable(editor.list()),
-          get: (id) => mutable(editor.get(ID9.make(id))),
-          default: (id) => editor.default(id === undefined ? undefined : ID9.make(id)),
-          update: (id, update) => editor.update(ID9.make(id), update),
-          remove: (id) => editor.remove(ID9.make(id))
+          get: (id) => mutable(editor.get(ID11.make(id))),
+          default: (id) => editor.default(id === undefined ? undefined : ID11.make(id)),
+          update: (id, update) => editor.update(ID11.make(id), update),
+          remove: (id) => editor.remove(ID11.make(id))
         });
       })
     },
@@ -254,22 +254,22 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
     },
     provider: {
       list: () => response(providers.available()),
-      get: (input) => providers.get(ID11.make(input.providerID)).pipe(Effect.flatMap((provider) => provider === undefined ? Effect.fail(new Error(`Provider not found: ${input.providerID}`)) : response(Effect.succeed(provider)))),
+      get: (input) => providers.get(ID13.make(input.providerID)).pipe(Effect.flatMap((provider) => provider === undefined ? Effect.fail(new Error(`Provider not found: ${input.providerID}`)) : response(Effect.succeed(provider)))),
       reload: providers.reload,
       transform: (callback) => providers.transform((editor) => {
         callback({
           list: editor.list,
-          get: (id) => editor.get(ID11.make(id)),
+          get: (id) => editor.get(ID13.make(id)),
           add: (definition) => editor.add({
             ...definition,
-            sourceConnection: definition.sourceConnection?.type === "credential" ? { ...definition.sourceConnection, id: ID17.make(definition.sourceConnection.id) } : definition.sourceConnection
+            sourceConnection: definition.sourceConnection?.type === "credential" ? { ...definition.sourceConnection, id: ID15.make(definition.sourceConnection.id) } : definition.sourceConnection
           }),
-          update: (id, update) => editor.update(ID11.make(id), update),
-          remove: (id) => editor.remove(ID11.make(id)),
+          update: (id, update) => editor.update(ID13.make(id), update),
+          remove: (id) => editor.remove(ID13.make(id)),
           models: {
-            set: (id, models) => editor.models.set(ID11.make(id), models),
-            update: (providerID, modelID, update) => editor.models.update(ID11.make(providerID), ID10.make(modelID), update),
-            remove: (providerID, modelID) => editor.models.remove(ID11.make(providerID), ID10.make(modelID))
+            set: (id, models) => editor.models.set(ID13.make(id), models),
+            update: (providerID, modelID, update) => editor.models.update(ID13.make(providerID), ID12.make(modelID), update),
+            remove: (providerID, modelID) => editor.models.remove(ID13.make(providerID), ID12.make(modelID))
           }
         });
       })
@@ -279,17 +279,17 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       default: () => response(models.default()),
       reload: models.reload,
       transform: (callback) => models.transform((editor) => callback({
-        list: (providerID) => editor.list(providerID === undefined ? undefined : ID11.make(providerID)),
-        get: (providerID, modelID) => editor.get(ID11.make(providerID), ID10.make(modelID)),
-        update: (providerID, modelID, update) => editor.update(ID11.make(providerID), ID10.make(modelID), update),
-        remove: (providerID, modelID) => editor.remove(ID11.make(providerID), ID10.make(modelID)),
+        list: (providerID) => editor.list(providerID === undefined ? undefined : ID13.make(providerID)),
+        get: (providerID, modelID) => editor.get(ID13.make(providerID), ID12.make(modelID)),
+        update: (providerID, modelID, update) => editor.update(ID13.make(providerID), ID12.make(modelID), update),
+        remove: (providerID, modelID) => editor.remove(ID13.make(providerID), ID12.make(modelID)),
         default: {
           get: editor.default.get,
-          set: (providerID, modelID) => editor.default.set(ID11.make(providerID), ID10.make(modelID))
+          set: (providerID, modelID) => editor.default.set(ID13.make(providerID), ID12.make(modelID))
         },
         provider: {
           list: editor.provider.list,
-          get: (id) => editor.provider.get(ID11.make(id))
+          get: (id) => editor.provider.get(ID13.make(id))
         }
       }))
     },
@@ -312,14 +312,14 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
     integration: {
       list: () => response(integration.list()),
       get: Effect.fn(function* (input) {
-        const item = yield* integration.get(ID16.make(input.integrationID));
+        const item = yield* integration.get(ID14.make(input.integrationID));
         if (!item)
           return yield* Effect.fail(new Error(`Integration not found: ${input.integrationID}`));
         return yield* response(Effect.succeed(item));
       }),
       connect: {
         key: (input) => integration.connection.key({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           key: input.key,
           answer: input.answer,
           label: input.label
@@ -327,60 +327,60 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       },
       oauth: {
         connect: (input) => response(integration.oauth.connect({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           methodID: MethodID2.make(input.methodID),
           answer: input.answer,
           label: input.label
         })),
         status: (input) => response(integration.oauth.status({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           attemptID: AttemptID2.make(input.attemptID)
         })),
         complete: (input) => integration.oauth.complete({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           attemptID: AttemptID2.make(input.attemptID),
           code: input.code
         }),
         cancel: (input) => integration.oauth.cancel({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           attemptID: AttemptID2.make(input.attemptID)
         })
       },
       command: {
         connect: (input) => response(integration.command.connect({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           methodID: MethodID2.make(input.methodID),
           label: input.label
         })),
         status: (input) => response(integration.command.status({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           attemptID: AttemptID2.make(input.attemptID)
         })),
         cancel: (input) => integration.command.cancel({
-          integrationID: ID16.make(input.integrationID),
+          integrationID: ID14.make(input.integrationID),
           attemptID: AttemptID2.make(input.attemptID)
         })
       },
       reload: integration.reload,
       connection: {
-        active: (id) => integration.connection.active(ID16.make(id)),
-        resolve: (connection) => integration.connection.resolve(connection.type === "credential" ? { ...connection, id: ID17.make(connection.id) } : connection),
+        active: (id) => integration.connection.active(ID14.make(id)),
+        resolve: (connection) => integration.connection.resolve(connection.type === "credential" ? { ...connection, id: ID15.make(connection.id) } : connection),
         status: (input) => integration.connection.status({
-          integrationID: ID16.make(input.integrationID),
-          connection: input.connection.type === "credential" ? { ...input.connection, id: ID17.make(input.connection.id) } : input.connection,
+          integrationID: ID14.make(input.integrationID),
+          connection: input.connection.type === "credential" ? { ...input.connection, id: ID15.make(input.connection.id) } : input.connection,
           status: input.status
         })
       },
       transform: (callback) => integration.transform((editor) => {
         callback({
           list: () => mutable(editor.list()),
-          get: (id) => mutable(editor.get(ID16.make(id))),
-          update: (id, update) => editor.update(ID16.make(id), update),
-          remove: (id) => editor.remove(ID16.make(id)),
+          get: (id) => mutable(editor.get(ID14.make(id))),
+          update: (id, update) => editor.update(ID14.make(id), update),
+          remove: (id) => editor.remove(ID14.make(id)),
           method: {
-            list: (id) => editor.method.list(ID16.make(id)),
+            list: (id) => editor.method.list(ID14.make(id)),
             update: (input) => editor.method.update(methodImplementation(input)),
-            remove: (id, method) => editor.method.remove(ID16.make(id), Schema.decodeUnknownSync(Method2)(method))
+            remove: (id, method) => editor.method.remove(ID14.make(id), Schema.decodeUnknownSync(Method2)(method))
           }
         });
       })
@@ -390,10 +390,10 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
         const ref = locationRef(input);
         if (ref && !isCurrentLocation(ref))
           return Effect.gen(function* () {
-            const location = yield* Service77;
-            const mcp = yield* Service21;
+            const location = yield* Service80;
+            const mcp = yield* Service29;
             return {
-              location: new Info23({
+              location: new Info27({
                 directory: location.directory,
                 workspaceID: location.workspaceID,
                 project: location.project
@@ -428,7 +428,7 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       reload: reference.reload,
       transform: (callback) => reference.transform((editor) => {
         callback({
-          add: (name, source) => editor.add(name, Schema.decodeUnknownSync(Source3)(source)),
+          add: (name, source) => editor.add(name, Schema.decodeUnknownSync(Source4)(source)),
           remove: editor.remove,
           list: editor.list,
           get: editor.get
@@ -442,7 +442,7 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
         callback({
           list: () => mutable(editor.list()),
           get: editor.get,
-          add: (value) => editor.add(Schema.decodeUnknownSync(Info9)(value)),
+          add: (value) => editor.add(Schema.decodeUnknownSync(Info5)(value)),
           update: editor.update,
           remove: editor.remove
         });
@@ -473,19 +473,19 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
       providers: () => response(websearch.providers()),
       query: (input) => response(websearch.query({
         query: input.query,
-        providerID: input.providerID === undefined ? undefined : ID5.make(input.providerID)
+        providerID: input.providerID === undefined ? undefined : ID3.make(input.providerID)
       })),
       reload: websearch.reload,
       transform: (callback) => websearch.transform((editor) => {
         callback({
           add: (definition) => editor.add({
-            id: ID5.make(definition.id),
+            id: ID3.make(definition.id),
             name: definition.name,
             execute: definition.execute
           }),
           default: {
             get: editor.default.get,
-            set: (selection) => editor.default.set(selection === false || selection === "random" ? selection : ID5.make(selection))
+            set: (selection) => editor.default.set(selection === false || selection === "random" ? selection : ID3.make(selection))
           }
         });
       })
@@ -515,7 +515,7 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
         metadata: input?.metadata,
         permissions: input?.permissions,
         ...input?.parentID === undefined ? {
-          location: input?.location ?? Ref3.make({ directory: location.directory, workspaceID: location.workspaceID })
+          location: input?.location ?? Ref4.make({ directory: location.directory, workspaceID: location.workspaceID })
         } : { parentID: input.parentID }
       }),
       get: (input) => sessions.get(input.sessionID),
@@ -545,31 +545,31 @@ var make12 = Effect.fn("PluginHost.make")(function* (plugin, pluginID = "test")
   return context;
 });
 var requirements3 = LayerNode.group([
+  node77,
+  node75,
+  node50,
+  node80,
+  node79,
+  node60,
+  node87,
+  node81,
   node68,
-  node66,
-  node39,
-  node70,
-  node69,
   node32,
-  node87,
   node84,
-  node73,
-  node24,
-  node81,
-  node33,
-  node60,
-  node44,
-  node43,
-  node40,
-  node50,
-  node45,
-  node46,
-  node17,
+  node42,
+  node70,
+  node39,
+  node37,
+  node55,
+  node18,
   node62,
-  node65,
-  node19,
-  node51,
-  node61
+  node63,
+  node40,
+  node71,
+  node74,
+  node21,
+  node20,
+  node76
 ]);
 function storage2(kv, pluginID) {
   const namespace = `plugin:${pluginID.split("").map((value) => value.charCodeAt(0).toString(16).padStart(4, "0")).join("")}:`;
@@ -596,7 +596,7 @@ function methodImplementation(input) {
   if ("authorize" in input) {
     const refresh = input.refresh;
     return {
-      integrationID: ID16.make(input.integrationID),
+      integrationID: ID14.make(input.integrationID),
       method: { ...input.method, id: MethodID2.make(input.method.id) },
       authorize: (answer) => input.authorize(answer).pipe(Effect.map((authorization) => {
         if (authorization.mode === "auto") {
@@ -616,18 +616,18 @@ function methodImplementation(input) {
   }
   if (input.method.type === "env") {
     return {
-      integrationID: ID16.make(input.integrationID),
+      integrationID: ID14.make(input.integrationID),
       method: input.method
     };
   }
   if (input.method.type === "command") {
     return {
-      integrationID: ID16.make(input.integrationID),
+      integrationID: ID14.make(input.integrationID),
       method: { ...input.method, id: MethodID2.make(input.method.id) }
     };
   }
   return {
-    integrationID: ID16.make(input.integrationID),
+    integrationID: ID14.make(input.integrationID),
     method: input.method
   };
 }

package/dist/chunks/{location-lifecycle-gs88pkvr.js → instance-8y62cfgq.js}

@@ -1,21 +1,21 @@
 import {
   convertToOpenAICompatibleChatMessages2
-} from "./location-lifecycle-fxgpk5d8.js";
+} from "./instance-fxgpk5d8.js";
 import {
   getResponseMetadata2
-} from "./location-lifecycle-g4wezp1m.js";
+} from "./instance-g4wezp1m.js";
 import {
   mapOpenAICompatibleFinishReason2
-} from "./location-lifecycle-x61499pn.js";
+} from "./instance-x61499pn.js";
 import {
   openaiCompatibleProviderOptions2
-} from "./location-lifecycle-af5trqkr.js";
+} from "./instance-af5trqkr.js";
 import {
   defaultOpenAICompatibleErrorStructure2
-} from "./location-lifecycle-afrmfg78.js";
+} from "./instance-afrmfg78.js";
 import {
   prepareTools2
-} from "./location-lifecycle-x0ckcb58.js";
+} from "./instance-x0ckcb58.js";
 
 // src/github-copilot/chat/openai-compatible-chat-language-model.ts
 import {

package/dist/chunks/{location-lifecycle-9ae44cfy.js → instance-909p1r3q.js}

@@ -1,20 +1,20 @@
 import {
   __export
-} from "./location-lifecycle-9rqn6x4v.js";
+} from "./instance-9rqn6x4v.js";
 
 // src/instance/service.ts
 var exports_service2 = {};
 __export(exports_service2, {
   Instance: () => exports_service2,
-  Service: () => Service34,
-  node: () => node36
+  Service: () => Service46,
+  node: () => node48
 });
 import { Context } from "effect";
 import { Node } from "@opencode/util/effect/app-node";
 import { LayerNode } from "@opencode/util/effect/layer-node";
 
-class Service34 extends Context.Service()("@opencode/Instance") {
+class Service46 extends Context.Service()("@opencode/Instance") {
 }
-var node36 = LayerNode.unbound(Service34, Node.tags.values.global);
+var node48 = LayerNode.unbound(Service46, Node.tags.values.global);
 
-export { Service34, node36, exports_service2 };
+export { Service46, node48, exports_service2 };