@dexto/core 1.7.1 → 1.8.0

package/dist/telemetry/exporters.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { ExportResultCode } from "@opentelemetry/core";
 function normalizeUrlPath(url) {
   try {

package/dist/telemetry/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import {
   Telemetry
 } from "./telemetry.js";

package/dist/telemetry/schemas.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { z } from "zod";
 const OtelConfigurationSchema = z.object({
   serviceName: z.string().optional(),

package/dist/telemetry/telemetry.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { context as otlpContext, trace, propagation } from "@opentelemetry/api";
 import { logger } from "../logger/logger.js";
 import { TelemetryError } from "./errors.js";

package/dist/telemetry/utils.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { propagation } from "@opentelemetry/api";
 import { Telemetry } from "./telemetry.js";
 import { getHostRuntimeAttributes, getHostRuntimeContextFromBaggage } from "../runtime/index.js";

package/dist/test-utils/in-memory-storage.cjs

@@ -30,11 +30,9 @@ var in_memory_storage_exports = {};
 __export(in_memory_storage_exports, {
   createInMemoryBlobStore: () => createInMemoryBlobStore,
   createInMemoryCache: () => createInMemoryCache,
-  createInMemoryDatabase: () => createInMemoryDatabase,
-  createInMemoryStorageManager: () => createInMemoryStorageManager
+  createInMemoryDatabase: () => createInMemoryDatabase
 });
 module.exports = __toCommonJS(in_memory_storage_exports);
-var import_storage_manager = require("../storage/storage-manager.js");
 var import_crypto = require("crypto");
 var import_fs = require("fs");
 var import_os = __toESM(require("os"), 1);
@@ -95,6 +93,13 @@ class InMemoryDatabase {
   async set(key, value) {
     this.data.set(key, value);
   }
+  async setIfAbsent(key, value) {
+    if (this.data.has(key)) {
+      return { value: this.data.get(key), inserted: false };
+    }
+    this.data.set(key, value);
+    return { value, inserted: true };
+  }
   async delete(key) {
     this.data.delete(key);
   }
@@ -267,22 +272,9 @@ function createInMemoryDatabase() {
 function createInMemoryBlobStore() {
   return new InMemoryBlobStore();
 }
-async function createInMemoryStorageManager(logger) {
-  const manager = new import_storage_manager.StorageManager(
-    {
-      cache: createInMemoryCache(),
-      database: createInMemoryDatabase(),
-      blobStore: createInMemoryBlobStore()
-    },
-    logger
-  );
-  await manager.connect();
-  return manager;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createInMemoryBlobStore,
   createInMemoryCache,
-  createInMemoryDatabase,
-  createInMemoryStorageManager
+  createInMemoryDatabase
 });

package/dist/test-utils/in-memory-storage.js

@@ -1,5 +1,4 @@
-import "../chunk-PTJYTZNU.js";
-import { StorageManager } from "../storage/storage-manager.js";
+import "../chunk-C6A6W6XS.js";
 import { createHash, randomUUID } from "crypto";
 import { promises as fs } from "fs";
 import os from "os";
@@ -60,6 +59,13 @@ class InMemoryDatabase {
   async set(key, value) {
     this.data.set(key, value);
   }
+  async setIfAbsent(key, value) {
+    if (this.data.has(key)) {
+      return { value: this.data.get(key), inserted: false };
+    }
+    this.data.set(key, value);
+    return { value, inserted: true };
+  }
   async delete(key) {
     this.data.delete(key);
   }
@@ -232,21 +238,8 @@ function createInMemoryDatabase() {
 function createInMemoryBlobStore() {
   return new InMemoryBlobStore();
 }
-async function createInMemoryStorageManager(logger) {
-  const manager = new StorageManager(
-    {
-      cache: createInMemoryCache(),
-      database: createInMemoryDatabase(),
-      blobStore: createInMemoryBlobStore()
-    },
-    logger
-  );
-  await manager.connect();
-  return manager;
-}
 export {
   createInMemoryBlobStore,
   createInMemoryCache,
-  createInMemoryDatabase,
-  createInMemoryStorageManager
+  createInMemoryDatabase
 };

package/dist/test-utils/session-state-stores.cjs

@@ -20,42 +20,40 @@ var session_state_stores_exports = {};
 __export(session_state_stores_exports, {
   createInMemoryMessageQueueStore: () => createInMemoryMessageQueueStore,
   createInMemorySessionApprovalStore: () => createInMemorySessionApprovalStore,
-  createInMemorySessionStateStorage: () => createInMemorySessionStateStorage,
   createInMemorySessionToolPreferencesStore: () => createInMemorySessionToolPreferencesStore
 });
 module.exports = __toCommonJS(session_state_stores_exports);
-var import_session_approval_store = require("../approval/session-approval-store.js");
+var import_queue_clone = require("../session/queue-clone.js");
+var import_in_memory = require("../storage/stores/in-memory.js");
 var import_session_tool_preferences_store = require("../tools/session-tool-preferences-store.js");
-var import_in_memory_storage = require("./in-memory-storage.js");
-function createInMemorySessionStateStorage() {
-  const cache = (0, import_in_memory_storage.createInMemoryCache)();
-  const database = (0, import_in_memory_storage.createInMemoryDatabase)();
-  return {
-    getCache: () => cache,
-    getDatabase: () => database
-  };
+function createInMemorySessionApprovalStore(logger) {
+  void logger;
+  return new import_in_memory.InMemoryDextoStores().getStore("approvals");
 }
-function createInMemorySessionApprovalStore(logger, storageManager = createInMemorySessionStateStorage()) {
-  return new import_session_approval_store.SessionApprovalStore(storageManager, logger);
-}
-function createInMemorySessionToolPreferencesStore(logger, storageManager = createInMemorySessionStateStorage()) {
-  return new import_session_tool_preferences_store.SessionToolPreferencesStore(storageManager, logger);
+function createInMemorySessionToolPreferencesStore(logger) {
+  return new import_session_tool_preferences_store.SessionToolPreferencesStore(
+    new import_in_memory.InMemoryDextoStores().getStore("toolPreferences"),
+    logger
+  );
 }
 function createInMemoryMessageQueueStore() {
   const queues = /* @__PURE__ */ new Map();
   return {
-    async load(sessionId) {
-      return structuredClone(queues.get(sessionId) ?? []);
+    async load(input) {
+      return (0, import_queue_clone.cloneQueuedMessages)(queues.get(input.sessionId) ?? []);
     },
-    async save(sessionId, queue) {
-      if (queue.length === 0) {
-        queues.delete(sessionId);
+    async save(input) {
+      if (input.queue.length === 0) {
+        queues.delete(input.sessionId);
         return;
       }
-      queues.set(sessionId, structuredClone(queue));
+      queues.set(input.sessionId, (0, import_queue_clone.cloneQueuedMessages)(input.queue));
+    },
+    async delete(input) {
+      queues.delete(input.sessionId);
     },
-    async delete(sessionId) {
-      queues.delete(sessionId);
+    async listSessionIds() {
+      return Array.from(queues.keys());
     }
   };
 }
@@ -63,6 +61,5 @@ function createInMemoryMessageQueueStore() {
 0 && (module.exports = {
   createInMemoryMessageQueueStore,
   createInMemorySessionApprovalStore,
-  createInMemorySessionStateStorage,
   createInMemorySessionToolPreferencesStore
 });

package/dist/test-utils/session-state-stores.js

@@ -1,42 +1,40 @@
-import "../chunk-PTJYTZNU.js";
-import { SessionApprovalStore } from "../approval/session-approval-store.js";
+import "../chunk-C6A6W6XS.js";
+import { cloneQueuedMessages } from "../session/queue-clone.js";
+import { InMemoryDextoStores } from "../storage/stores/in-memory.js";
 import { SessionToolPreferencesStore } from "../tools/session-tool-preferences-store.js";
-import { createInMemoryCache, createInMemoryDatabase } from "./in-memory-storage.js";
-function createInMemorySessionStateStorage() {
-  const cache = createInMemoryCache();
-  const database = createInMemoryDatabase();
-  return {
-    getCache: () => cache,
-    getDatabase: () => database
-  };
+function createInMemorySessionApprovalStore(logger) {
+  void logger;
+  return new InMemoryDextoStores().getStore("approvals");
 }
-function createInMemorySessionApprovalStore(logger, storageManager = createInMemorySessionStateStorage()) {
-  return new SessionApprovalStore(storageManager, logger);
-}
-function createInMemorySessionToolPreferencesStore(logger, storageManager = createInMemorySessionStateStorage()) {
-  return new SessionToolPreferencesStore(storageManager, logger);
+function createInMemorySessionToolPreferencesStore(logger) {
+  return new SessionToolPreferencesStore(
+    new InMemoryDextoStores().getStore("toolPreferences"),
+    logger
+  );
 }
 function createInMemoryMessageQueueStore() {
   const queues = /* @__PURE__ */ new Map();
   return {
-    async load(sessionId) {
-      return structuredClone(queues.get(sessionId) ?? []);
+    async load(input) {
+      return cloneQueuedMessages(queues.get(input.sessionId) ?? []);
     },
-    async save(sessionId, queue) {
-      if (queue.length === 0) {
-        queues.delete(sessionId);
+    async save(input) {
+      if (input.queue.length === 0) {
+        queues.delete(input.sessionId);
         return;
       }
-      queues.set(sessionId, structuredClone(queue));
+      queues.set(input.sessionId, cloneQueuedMessages(input.queue));
+    },
+    async delete(input) {
+      queues.delete(input.sessionId);
     },
-    async delete(sessionId) {
-      queues.delete(sessionId);
+    async listSessionIds() {
+      return Array.from(queues.keys());
     }
   };
 }
 export {
   createInMemoryMessageQueueStore,
   createInMemorySessionApprovalStore,
-  createInMemorySessionStateStorage,
   createInMemorySessionToolPreferencesStore
 };

package/dist/tools/{confirmation → approval}/allowed-tools-provider/factory.cjs

@@ -29,7 +29,7 @@ function createAllowedToolsProvider(config, logger) {
     case "memory":
       return new import_in_memory.InMemoryAllowedToolsProvider();
     case "storage":
-      return new import_storage.StorageAllowedToolsProvider(config.storageManager, logger);
+      return new import_storage.StorageAllowedToolsProvider(config.toolPreferenceStore, logger);
     default: {
       const _exhaustive = config;
       throw import_errors.ToolError.configInvalid(

package/dist/tools/{confirmation → approval}/allowed-tools-provider/factory.d.ts

@@ -1,11 +1,11 @@
 import type { AllowedToolsProvider } from './types.js';
-import type { StorageManager } from '../../../storage/index.js';
+import type { ToolPreferenceStore } from '../../../storage/index.js';
 import type { Logger } from '../../../logger/v2/types.js';
 export type AllowedToolsConfig = {
     type: 'memory';
 } | {
     type: 'storage';
-    storageManager: StorageManager;
+    toolPreferenceStore: ToolPreferenceStore;
 };
 /**
  * Create an AllowedToolsProvider based on configuration.

package/dist/tools/approval/allowed-tools-provider/factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/tools/approval/allowed-tools-provider/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAU1D,MAAM,MAAM,kBAAkB,GACxB;IACI,IAAI,EAAE,QAAQ,CAAC;CAClB,GACD;IACI,IAAI,EAAE,SAAS,CAAC;IAChB,mBAAmB,EAAE,mBAAmB,CAAC;CAC5C,CAAC;AAER;;GAEG;AACH,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,MAAM,GACf,oBAAoB,CActB"}

package/dist/tools/{confirmation → approval}/allowed-tools-provider/factory.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { InMemoryAllowedToolsProvider } from "./in-memory.js";
 import { StorageAllowedToolsProvider } from "./storage.js";
 import { ToolError } from "../../errors.js";
@@ -7,7 +7,7 @@ function createAllowedToolsProvider(config, logger) {
     case "memory":
       return new InMemoryAllowedToolsProvider();
     case "storage":
-      return new StorageAllowedToolsProvider(config.storageManager, logger);
+      return new StorageAllowedToolsProvider(config.toolPreferenceStore, logger);
     default: {
       const _exhaustive = config;
       throw ToolError.configInvalid(

package/dist/tools/approval/allowed-tools-provider/in-memory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in-memory.d.ts","sourceRoot":"","sources":["../../../../src/tools/approval/allowed-tools-provider/in-memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,qBAAa,4BAA6B,YAAW,oBAAoB;IACrE;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAmD;gBAEpD,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IAMvC,OAAO,CAAC,MAAM;IAUR,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CAGlE"}

package/dist/tools/{confirmation → approval}/allowed-tools-provider/in-memory.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 class InMemoryAllowedToolsProvider {
   /**
    * Map key is sessionId (undefined => global approvals). Value is a set of

package/dist/tools/approval/allowed-tools-provider/storage.cjs

@@ -0,0 +1,66 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var storage_exports = {};
+__export(storage_exports, {
+  StorageAllowedToolsProvider: () => StorageAllowedToolsProvider
+});
+module.exports = __toCommonJS(storage_exports);
+class StorageAllowedToolsProvider {
+  constructor(toolPreferenceStore, logger) {
+    this.toolPreferenceStore = toolPreferenceStore;
+    this.logger = logger;
+  }
+  logger;
+  async allowTool(toolName, sessionId) {
+    await this.toolPreferenceStore.allowTool({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+    this.logger.debug(
+      `Added allowed tool '${toolName}' for session '${sessionId ?? "global"}'`
+    );
+  }
+  async disallowTool(toolName, sessionId) {
+    await this.toolPreferenceStore.disallowTool({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+  }
+  async isToolAllowed(toolName, sessionId) {
+    const allowed = await this.toolPreferenceStore.isToolAllowed({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+    this.logger.debug(
+      `Checked allowed tool '${toolName}' in session '${sessionId ?? "global"}' - allowed=${allowed}`
+    );
+    return allowed;
+  }
+  async getAllowedTools(sessionId) {
+    return new Set(
+      await this.toolPreferenceStore.listAllowedTools({
+        ...sessionId !== void 0 && { sessionId }
+      })
+    );
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  StorageAllowedToolsProvider
+});

package/dist/tools/{confirmation → approval}/allowed-tools-provider/storage.d.ts

@@ -1,19 +1,13 @@
-import type { StorageManager } from '../../../storage/index.js';
+import type { ToolPreferenceStore } from '../../../storage/index.js';
 import type { AllowedToolsProvider } from './types.js';
 import type { Logger } from '../../../logger/v2/types.js';
 /**
- * Storage-backed implementation that persists allowed tools in the Dexto
- * storage manager. The key scheme is:
- *   allowedTools:<sessionId>          – approvals scoped to a session
- *   allowedTools:global               – global approvals (sessionId undefined)
- *
- * Using the database backend for persistence.
+ * Storage-backed implementation that persists allowed tools in the typed tool-preference store.
  */
 export declare class StorageAllowedToolsProvider implements AllowedToolsProvider {
-    private storageManager;
+    private toolPreferenceStore;
     private logger;
-    constructor(storageManager: StorageManager, logger: Logger);
-    private buildKey;
+    constructor(toolPreferenceStore: ToolPreferenceStore, logger: Logger);
     allowTool(toolName: string, sessionId?: string): Promise<void>;
     disallowTool(toolName: string, sessionId?: string): Promise<void>;
     isToolAllowed(toolName: string, sessionId?: string): Promise<boolean>;

package/dist/tools/approval/allowed-tools-provider/storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/tools/approval/allowed-tools-provider/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AACH,qBAAa,2BAA4B,YAAW,oBAAoB;IAIhE,OAAO,CAAC,mBAAmB;IAH/B,OAAO,CAAC,MAAM,CAAS;gBAGX,mBAAmB,EAAE,mBAAmB,EAChD,MAAM,EAAE,MAAM;IAKZ,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU9D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrE,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;CAOlE"}

package/dist/tools/approval/allowed-tools-provider/storage.js

@@ -0,0 +1,43 @@
+import "../../../chunk-C6A6W6XS.js";
+class StorageAllowedToolsProvider {
+  constructor(toolPreferenceStore, logger) {
+    this.toolPreferenceStore = toolPreferenceStore;
+    this.logger = logger;
+  }
+  logger;
+  async allowTool(toolName, sessionId) {
+    await this.toolPreferenceStore.allowTool({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+    this.logger.debug(
+      `Added allowed tool '${toolName}' for session '${sessionId ?? "global"}'`
+    );
+  }
+  async disallowTool(toolName, sessionId) {
+    await this.toolPreferenceStore.disallowTool({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+  }
+  async isToolAllowed(toolName, sessionId) {
+    const allowed = await this.toolPreferenceStore.isToolAllowed({
+      toolName,
+      ...sessionId !== void 0 && { sessionId }
+    });
+    this.logger.debug(
+      `Checked allowed tool '${toolName}' in session '${sessionId ?? "global"}' - allowed=${allowed}`
+    );
+    return allowed;
+  }
+  async getAllowedTools(sessionId) {
+    return new Set(
+      await this.toolPreferenceStore.listAllowedTools({
+        ...sessionId !== void 0 && { sessionId }
+      })
+    );
+  }
+}
+export {
+  StorageAllowedToolsProvider
+};

package/dist/tools/approval/allowed-tools-provider/types.cjs

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/tools/approval/allowed-tools-provider/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/tools/approval/allowed-tools-provider/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAC/B;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/D,0BAA0B;IAC1B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElE;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtE,iEAAiE;IACjE,eAAe,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC9D,CAAC"}