@zhin.js/agent 0.1.20 → 0.1.22

package/lib/zhin-agent/turn-metrics.d.ts

@@ -0,0 +1,20 @@
+import type { Usage } from '@zhin.js/ai';
+export type ZhinAgentTurnPath = 'chat' | 'fast' | 'agent' | 'multimodal' | 'rate_limited';
+export interface ZhinAgentTurnMetrics {
+    /** 主 agent + 本轮 spawn 的子 agent 合计 */
+    usage: Usage;
+    /** 仅主 agent（无子 agent 时与 usage 相同） */
+    mainUsage?: Usage;
+    /** 本轮 spawn 的子 agent 合计 */
+    subagentUsage?: Usage;
+    path: ZhinAgentTurnPath;
+    iterations?: number;
+    model?: string;
+}
+export declare function addUsage(target: Usage, source?: Usage): void;
+export declare const EMPTY_USAGE: Usage;
+/** AI Handler 层统一汇总日志（紧凑 key-value） */
+export declare function formatAiHandlerCompleteLog(metrics: ZhinAgentTurnMetrics, totalMs: number): string;
+/** @deprecated 使用 formatCompactUsage from @zhin.js/logger */
+export declare function formatZhinAgentTurnUsage(usage: Usage, subagentUsage?: Usage): string;
+//# sourceMappingURL=turn-metrics.d.ts.map

package/lib/zhin-agent/turn-metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-metrics.d.ts","sourceRoot":"","sources":["../../src/zhin-agent/turn-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGzC,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,YAAY,GAAG,cAAc,CAAC;AAE1F,MAAM,WAAW,oBAAoB;IACnC,qCAAqC;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,qCAAqC;IACrC,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,2BAA2B;IAC3B,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,GAAG,IAAI,CAK5D;AAED,eAAO,MAAM,WAAW,EAAE,KAIzB,CAAC;AAEF,uCAAuC;AACvC,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAQjG;AAED,6DAA6D;AAC7D,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAEpF"}

package/lib/zhin-agent/turn-metrics.js

@@ -0,0 +1,28 @@
+import { formatCompactLog, formatCompactUsage } from '@zhin.js/logger';
+export function addUsage(target, source) {
+    if (!source)
+        return;
+    target.prompt_tokens += source.prompt_tokens;
+    target.completion_tokens += source.completion_tokens;
+    target.total_tokens += source.total_tokens;
+}
+export const EMPTY_USAGE = {
+    prompt_tokens: 0,
+    completion_tokens: 0,
+    total_tokens: 0,
+};
+/** AI Handler 层统一汇总日志（紧凑 key-value） */
+export function formatAiHandlerCompleteLog(metrics, totalMs) {
+    return formatCompactLog('AI Handler', {
+        total_ms: Math.round(totalMs),
+        usage: formatCompactUsage(metrics.usage, metrics.subagentUsage),
+        mode: metrics.path,
+        iter: metrics.iterations,
+        model: metrics.model,
+    });
+}
+/** @deprecated 使用 formatCompactUsage from @zhin.js/logger */
+export function formatZhinAgentTurnUsage(usage, subagentUsage) {
+    return formatCompactUsage(usage, subagentUsage);
+}
+//# sourceMappingURL=turn-metrics.js.map

package/lib/zhin-agent/turn-metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-metrics.js","sourceRoot":"","sources":["../../src/zhin-agent/turn-metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAgBvE,MAAM,UAAU,QAAQ,CAAC,MAAa,EAAE,MAAc;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC;IAC7C,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB,CAAC;IACrD,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAU;IAChC,aAAa,EAAE,CAAC;IAChB,iBAAiB,EAAE,CAAC;IACpB,YAAY,EAAE,CAAC;CAChB,CAAC;AAEF,uCAAuC;AACvC,MAAM,UAAU,0BAA0B,CAAC,OAA6B,EAAE,OAAe;IACvF,OAAO,gBAAgB,CAAC,YAAY,EAAE;QACpC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7B,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC;QAC/D,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC,CAAC;AACL,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,wBAAwB,CAAC,KAAY,EAAE,aAAqB;IAC1E,OAAO,kBAAkB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AAClD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/agent",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Zhin AI Agent — session, ZhinAgent, init; composes @zhin.js/core providers and tools",
   "type": "module",
   "main": "./lib/index.js",
@@ -18,13 +18,23 @@
   "dependencies": {
     "he": "^1.2.0",
     "js-yaml": "^4.1.0",
-    "@zhin.js/ai": "1.1.20",
-    "@zhin.js/core": "1.1.22"
+    "@zhin.js/ai": "1.1.22",
+    "@zhin.js/core": "1.1.24",
+    "@zhin.js/logger": "0.1.64"
+  },
+  "peerDependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0"
+  },
+  "peerDependenciesMeta": {
+    "@modelcontextprotocol/sdk": {
+      "optional": true
+    }
   },
   "devDependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@types/he": "^1.2.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^25.7.0",
+    "@types/node": "^25.8.0",
     "rimraf": "^6.0.0",
     "typescript": "^6.0.3"
   },

package/lib/builtin/read-memory-tool.d.ts

@@ -1,14 +0,0 @@
-import type { Tool, ToolContext, ToolParametersSchema, ToolResult } from '@zhin.js/core';
-import { BuiltinBaseTool } from './builtin-base-tool.js';
-export declare const READ_MEMORY_PARAMETERS: ToolParametersSchema;
-export declare class ReadMemoryBuiltinTool extends BuiltinBaseTool {
-    private readonly dataDir;
-    readonly name = "read_memory";
-    readonly description = "\u8BFB\u53D6\u6301\u4E45\u5316\u8BB0\u5FC6\uFF08AGENTS.md\uFF09\u3002\u8BB0\u5FC6\u8DE8\u4F1A\u8BDD\u4FDD\u6301\u3002scope: global\uFF08\u5171\u4EAB\uFF09\u6216 chat\uFF08\u6309\u804A\u5929\u9694\u79BB\uFF09";
-    readonly parameters: ToolParametersSchema<Record<string, any>>;
-    readonly kind = "memory";
-    constructor(dataDir: string);
-    run(args: Record<string, unknown>, _context?: ToolContext): Promise<ToolResult>;
-}
-export declare function createReadMemoryTool(dataDir: string): Tool;
-//# sourceMappingURL=read-memory-tool.d.ts.map

package/lib/builtin/read-memory-tool.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"read-memory-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/read-memory-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,sBAAsB,EAAE,oBAWpC,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,eAAe;IAO5C,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,WAAW,qNAC0C;IAC9D,QAAQ,CAAC,UAAU,4CAA0B;IAC7C,QAAQ,CAAC,IAAI,YAAY;gBAEI,OAAO,EAAE,MAAM;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;CAWtF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE1D"}

package/lib/builtin/read-memory-tool.js

@@ -1,49 +0,0 @@
-/**
- * read_memory — 读取持久化记忆（AGENTS.md）
- */
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { errMsg } from '../discovery/utils.js';
-import { BuiltinBaseTool } from './builtin-base-tool.js';
-export const READ_MEMORY_PARAMETERS = {
-    type: 'object',
-    properties: {
-        scope: {
-            type: 'string',
-            description: "'global' 或 'chat'（默认 chat）",
-            enum: ['global', 'chat'],
-        },
-        chat_id: { type: 'string', description: '聊天 ID（chat scope 时使用）' },
-    },
-    required: ['scope'],
-};
-export class ReadMemoryBuiltinTool extends BuiltinBaseTool {
-    dataDir;
-    name = 'read_memory';
-    description = '读取持久化记忆（AGENTS.md）。记忆跨会话保持。scope: global（共享）或 chat（按聊天隔离）';
-    parameters = READ_MEMORY_PARAMETERS;
-    kind = 'memory';
-    constructor(dataDir) {
-        super();
-        this.dataDir = dataDir;
-        this.tags.push('memory', 'agents');
-        this.keywords.push('记忆', '记住', '回忆', '之前', '上次', 'memory');
-    }
-    async run(args, _context) {
-        try {
-            const memPath = args.scope === 'global'
-                ? path.join(this.dataDir, 'AGENTS.md')
-                : path.join(this.dataDir, 'groups', args.chat_id || 'default', 'AGENTS.md');
-            if (!fs.existsSync(memPath))
-                return 'No memory stored yet.';
-            return await fs.promises.readFile(memPath, 'utf-8');
-        }
-        catch (e) {
-            return `Error: ${errMsg(e)}`;
-        }
-    }
-}
-export function createReadMemoryTool(dataDir) {
-    return new ReadMemoryBuiltinTool(dataDir).toTool();
-}
-//# sourceMappingURL=read-memory-tool.js.map

package/lib/builtin/read-memory-tool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"read-memory-tool.js","sourceRoot":"","sources":["../../src/builtin/read-memory-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAyB;IAC1D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,4BAA4B;YACzC,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;SACzB;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,EAAE;KAClE;IACD,QAAQ,EAAE,CAAC,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IAO3B;IANpB,IAAI,GAAG,aAAa,CAAC;IACrB,WAAW,GAClB,2DAA2D,CAAC;IACrD,UAAU,GAAG,sBAAsB,CAAC;IACpC,IAAI,GAAG,QAAQ,CAAC;IAEzB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,QAAsB;QAC7D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,KAAK,QAAQ;gBACrC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;gBACtC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAG,IAAI,CAAC,OAAkB,IAAI,SAAS,EAAE,WAAW,CAAC,CAAC;YAC1F,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;gBAAE,OAAO,uBAAuB,CAAC;YAC5D,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;AACrD,CAAC"}

package/lib/builtin/write-memory-tool.d.ts

@@ -1,14 +0,0 @@
-import type { Tool, ToolContext, ToolParametersSchema, ToolResult } from '@zhin.js/core';
-import { BuiltinBaseTool } from './builtin-base-tool.js';
-export declare const WRITE_MEMORY_PARAMETERS: ToolParametersSchema;
-export declare class WriteMemoryBuiltinTool extends BuiltinBaseTool {
-    private readonly dataDir;
-    readonly name = "write_memory";
-    readonly description = "\u5199\u5165\u6301\u4E45\u5316\u8BB0\u5FC6\u3002\u5F53\u7528\u6237\u8BF4\"\u8BB0\u4F4F\u2026\"\u3001\"\u8BB0\u5F55\u2026\"\u65F6\u4F7F\u7528\u6B64\u5DE5\u5177";
-    readonly parameters: ToolParametersSchema<Record<string, any>>;
-    readonly kind = "memory";
-    constructor(dataDir: string);
-    run(args: Record<string, unknown>, _context?: ToolContext): Promise<ToolResult>;
-}
-export declare function createWriteMemoryTool(dataDir: string): Tool;
-//# sourceMappingURL=write-memory-tool.d.ts.map

package/lib/builtin/write-memory-tool.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"write-memory-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/write-memory-tool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAO,MAAM,uBAAuB,EAAE,oBAYrC,CAAC;AAEF,qBAAa,sBAAuB,SAAQ,eAAe;IAM7C,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC,QAAQ,CAAC,IAAI,kBAAkB;IAC/B,QAAQ,CAAC,WAAW,oKAAmC;IACvD,QAAQ,CAAC,UAAU,4CAA2B;IAC9C,QAAQ,CAAC,IAAI,YAAY;gBAEI,OAAO,EAAE,MAAM;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;CAYtF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE3D"}

package/lib/builtin/write-memory-tool.js

@@ -1,50 +0,0 @@
-/**
- * write_memory — 写入持久化记忆（AGENTS.md）
- */
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { errMsg } from '../discovery/utils.js';
-import { BuiltinBaseTool } from './builtin-base-tool.js';
-export const WRITE_MEMORY_PARAMETERS = {
-    type: 'object',
-    properties: {
-        content: { type: 'string', description: '要保存的记忆内容（Markdown）' },
-        scope: {
-            type: 'string',
-            description: "'global' 或 'chat'（默认 chat）",
-            enum: ['global', 'chat'],
-        },
-        chat_id: { type: 'string', description: '聊天 ID' },
-    },
-    required: ['content'],
-};
-export class WriteMemoryBuiltinTool extends BuiltinBaseTool {
-    dataDir;
-    name = 'write_memory';
-    description = '写入持久化记忆。当用户说"记住…"、"记录…"时使用此工具';
-    parameters = WRITE_MEMORY_PARAMETERS;
-    kind = 'memory';
-    constructor(dataDir) {
-        super();
-        this.dataDir = dataDir;
-        this.tags.push('memory', 'agents');
-        this.keywords.push('记住', '保存', 'remember', '记录');
-    }
-    async run(args, _context) {
-        try {
-            const memPath = args.scope === 'global'
-                ? path.join(this.dataDir, 'AGENTS.md')
-                : path.join(this.dataDir, 'groups', args.chat_id || 'default', 'AGENTS.md');
-            await fs.mkdir(path.dirname(memPath), { recursive: true });
-            await fs.writeFile(memPath, String(args.content), 'utf-8');
-            return `✅ Memory saved (${args.scope || 'chat'} scope)`;
-        }
-        catch (e) {
-            return `Error: ${errMsg(e)}`;
-        }
-    }
-}
-export function createWriteMemoryTool(dataDir) {
-    return new WriteMemoryBuiltinTool(dataDir).toTool();
-}
-//# sourceMappingURL=write-memory-tool.js.map

package/lib/builtin/write-memory-tool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"write-memory-tool.js","sourceRoot":"","sources":["../../src/builtin/write-memory-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,uBAAuB,GAAyB;IAC3D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,oBAAoB,EAAE;QAC9D,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,4BAA4B;YACzC,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;SACzB;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE;KAClD;IACD,QAAQ,EAAE,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,OAAO,sBAAuB,SAAQ,eAAe;IAM5B;IALpB,IAAI,GAAG,cAAc,CAAC;IACtB,WAAW,GAAG,+BAA+B,CAAC;IAC9C,UAAU,GAAG,uBAAuB,CAAC;IACrC,IAAI,GAAG,QAAQ,CAAC;IAEzB,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;QAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B,EAAE,QAAsB;QAC7D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,KAAK,QAAQ;gBACrC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;gBACtC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAG,IAAI,CAAC,OAAkB,IAAI,SAAS,EAAE,WAAW,CAAC,CAAC;YAC1F,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;YAC3D,OAAO,mBAAoB,IAAI,CAAC,KAAgB,IAAI,MAAM,SAAS,CAAC;QACtE,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;AACtD,CAAC"}