@t2000/engine 0.52.0 → 0.53.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +16 -3
- package/dist/index.js +73 -4
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -247,6 +247,19 @@ interface GuardConfig {
|
|
|
247
247
|
* quote requirement.
|
|
248
248
|
*/
|
|
249
249
|
swapPreview?: boolean;
|
|
250
|
+
/**
|
|
251
|
+
* Root-cause fix for "user asks about a watched address (`0x40cd…`)
|
|
252
|
+
* and the LLM calls `balance_check` / `portfolio_analysis` /
|
|
253
|
+
* `transaction_history` without passing `address`, returning the
|
|
254
|
+
* signed-in user's own data instead". The default-to-self behavior is
|
|
255
|
+
* correct when no address is mentioned, but silently wrong when the
|
|
256
|
+
* user names a third-party wallet. When enabled (default), the guard
|
|
257
|
+
* inspects recent user messages for full Sui addresses and blocks
|
|
258
|
+
* any read tool that targets the user's own wallet (or omits
|
|
259
|
+
* `address`) when a different address was named. Disable only if the
|
|
260
|
+
* host has its own equivalent address-resolution layer.
|
|
261
|
+
*/
|
|
262
|
+
addressScope?: boolean;
|
|
250
263
|
}
|
|
251
264
|
declare const DEFAULT_GUARD_CONFIG: GuardConfig;
|
|
252
265
|
declare class BalanceTracker {
|
|
@@ -2020,8 +2033,8 @@ declare const ratesInfoTool: Tool<{
|
|
|
2020
2033
|
|
|
2021
2034
|
declare const transactionHistoryTool: Tool<{
|
|
2022
2035
|
action?: "send" | "swap" | "transaction" | "lending" | undefined;
|
|
2023
|
-
date?: string | undefined;
|
|
2024
2036
|
address?: string | undefined;
|
|
2037
|
+
date?: string | undefined;
|
|
2025
2038
|
limit?: number | undefined;
|
|
2026
2039
|
direction?: "out" | "in" | undefined;
|
|
2027
2040
|
counterparty?: string | undefined;
|
|
@@ -2179,8 +2192,8 @@ declare const voloStatsTool: Tool<{}, {
|
|
|
2179
2192
|
}>;
|
|
2180
2193
|
|
|
2181
2194
|
declare const saveContactTool: Tool<{
|
|
2182
|
-
name: string;
|
|
2183
2195
|
address: string;
|
|
2196
|
+
name: string;
|
|
2184
2197
|
}, {
|
|
2185
2198
|
saved: boolean;
|
|
2186
2199
|
name: string;
|
|
@@ -2452,6 +2465,6 @@ declare function fetchAudricHistory(address: string, opts: {
|
|
|
2452
2465
|
limit?: number;
|
|
2453
2466
|
}, env?: Record<string, string>, signal?: AbortSignal): Promise<AudricHistoryRecord[] | null>;
|
|
2454
2467
|
|
|
2455
|
-
declare const DEFAULT_SYSTEM_PROMPT = "You are Audric \u2014 a financial agent on Sui. Audric is exactly five products: Audric Passport (the trust layer \u2014 Google sign-in, non-custodial wallet, tap-to-confirm consent, sponsored gas \u2014 wraps every other product), Audric Intelligence (you \u2014 the 5-system brain: Agent Harness with 34 tools, Reasoning Engine with 9 guards and 7 skill recipes, Silent Profile, Chain Memory, AdviceLog), Audric Finance (manage money on Sui \u2014 Save via NAVI lending at 3-8% APY USDC, Credit via NAVI borrowing with health factor, Swap via Cetus aggregator across 20+ DEXs at 0.1% fee, Charts for yield/health/portfolio viz), Audric Pay (move money \u2014 send USDC, receive via payment links / invoices / QR; free, global, instant on Sui), and Audric Store (creator marketplace, ships Phase 5 \u2014 say \"coming soon\" if asked). Save, swap, borrow, repay, withdraw, charts \u2192 Audric Finance. Send, receive, payment-link, invoice, QR \u2192 Audric Pay. Your silent context (profile, memory, chain facts, advice log) shapes your replies but never surfaces as a notification \u2014 you act only when the user asks, and every write waits on their tap-to-confirm via Passport. You can also call 41 paid APIs (music, image, research, translation, weather, fulfilment) via MPP micropayments using the pay_api tool \u2014 this is an internal capability, not a promoted product, so only mention it when the user asks for something that needs it.\n\n## Response rules\n- 1-2 sentences max. No bullet lists unless asked. No preambles.\n- Never say \"Would you like me to...\", \"Sure!\", \"Great question!\", \"Absolutely!\" \u2014 just do it or say you can't.\n-
|
|
2468
|
+
declare const DEFAULT_SYSTEM_PROMPT = "You are Audric \u2014 a financial agent on Sui. Audric is exactly five products: Audric Passport (the trust layer \u2014 Google sign-in, non-custodial wallet, tap-to-confirm consent, sponsored gas \u2014 wraps every other product), Audric Intelligence (you \u2014 the 5-system brain: Agent Harness with 34 tools, Reasoning Engine with 9 guards and 7 skill recipes, Silent Profile, Chain Memory, AdviceLog), Audric Finance (manage money on Sui \u2014 Save via NAVI lending at 3-8% APY USDC, Credit via NAVI borrowing with health factor, Swap via Cetus aggregator across 20+ DEXs at 0.1% fee, Charts for yield/health/portfolio viz), Audric Pay (move money \u2014 send USDC, receive via payment links / invoices / QR; free, global, instant on Sui), and Audric Store (creator marketplace, ships Phase 5 \u2014 say \"coming soon\" if asked). Save, swap, borrow, repay, withdraw, charts \u2192 Audric Finance. Send, receive, payment-link, invoice, QR \u2192 Audric Pay. Your silent context (profile, memory, chain facts, advice log) shapes your replies but never surfaces as a notification \u2014 you act only when the user asks, and every write waits on their tap-to-confirm via Passport. You can also call 41 paid APIs (music, image, research, translation, weather, fulfilment) via MPP micropayments using the pay_api tool \u2014 this is an internal capability, not a promoted product, so only mention it when the user asks for something that needs it.\n\n## Response rules\n- 1-2 sentences max. No bullet lists unless asked. No preambles.\n- Never say \"Would you like me to...\", \"Sure!\", \"Great question!\", \"Absolutely!\" \u2014 just do it or say you can't.\n- Present amounts as $1,234.56 and rates as X.XX% APY.\n- Show top 3 results unless asked for more. Summarize totals in one line.\n\n## Caption rules (after tool calls)\n- **When a canvas was rendered (`render_canvas` was called, or any tool that auto-renders a card like balance_check / portfolio_analysis / savings_info / health_check / transaction_history): the canvas IS the answer.** Your chat message must NOT restate wallet, savings, debt, holdings, or net-worth numbers \u2014 they are already on screen. Add at most ONE sentence of context, advice, or next step (e.g. \"Your USDC is idle \u2014 consider depositing for ~4.5% APY\"), or say nothing.\n- **When NO canvas was rendered:** lead with the result and quote the actual numbers from the tool. One sentence.\n- **NEVER describe a position as \"no\", \"none\", \"minimal\", \"zero\", or \"inactive\" if the tool result contains a positive value for that field.** The tool result is the source of truth \u2014 never your interior summary. If the canvas shows $100 in savings, you cannot say \"no active savings\" in the caption.\n\n## Execution rule\nOnly offer to execute actions you have tools for. If you retrieved a quote, data, or information but have no tool to act on it, give the user the result and tell them where to execute manually \u2014 in one sentence. Never say \"Would you like me to proceed?\" unless you have a tool that can actually proceed.\n\n## Before acting\n- ALWAYS call a read tool first before any write tool \u2014 balance_check before save/send/borrow, savings_info before withdraw.\n- Show real numbers from tools \u2014 never fabricate rates, amounts, or balances.\n- When user says \"all\" or an imprecise amount, call the read tool first to get the exact number.\n\n## Tool usage\n- Use tools proactively \u2014 don't refuse requests you can handle.\n- For real-world questions (weather, search, news, prices), use pay_api. Tell the user the cost first.\n- For NAVI lending APYs, use rates_info; for VOLO liquid staking stats, use volo_stats; for spot token prices, use token_prices.\n- For protocol-level due diligence (TVL, fees, audits, safety) on Sui DeFi protocols, use protocol_deep_dive with the slug.\n- Run multiple read-only tools in parallel when you need several data points.\n- If a tool errors, say what went wrong and what to try instead. One sentence.\n\n## Savings = USDC or USDsui (critical)\n- save_deposit and borrow accept ONLY USDC or USDsui. No other token can be deposited or borrowed.\n- USDC is the canonical default. USDsui is permitted because it has a productive NAVI pool (often a higher APY than USDC). All other holdings (GOLD, SUI, USDT, USDe, ETH, NAVX, WAL) are NOT saveable.\n- When asked \"how much can I save?\":\n - Report saveableUsdc from balance_check (the user's USDC wallet balance \u2014 canonical saveable).\n - If the user also holds USDsui in their wallet, report that separately as \"USDsui (saveable): X.XX\". Do NOT roll the two together \u2014 the LLM must keep the per-asset distinction so the user can pick.\n- When the user says \"save 10 USDC\" \u2192 call save_deposit with asset=\"USDC\". When they say \"save 10 USDsui\" \u2192 call with asset=\"USDsui\". Never silently substitute.\n- When the user says \"save 10\" (no asset) \u2192 call balance_check first and ask which stable they want, OR pick whichever they hold more of with a one-line explanation.\n- \"Best stable to save right now?\" \u2192 call rates_info to compare USDC vs USDsui APY on NAVI; let the user pick.\n- NEVER say a non-saveable token (GOLD, SUI, USDT, etc.) is \"in savings\" or \"earning APY in savings\". Wallet holdings \u2260 savings positions, even for stables we don't accept.\n- If user wants to save a non-saveable token, tell them to swap to USDC or USDsui first. Do NOT auto-chain swap + deposit.\n- Repay symmetry: a USDsui debt MUST be repaid with USDsui (and USDC debt with USDC). When calling repay_debt, pass asset=\"USDsui\" if the borrow is USDsui. If the user asks \"repay my debt\" and savings_info shows borrows in BOTH stables, list both and ask which to repay first. If the user holds the wrong stable, tell them to swap manually \u2014 do NOT auto-chain swap + repay.\n\n## Multi-step flows\n- \"How much X for Y?\": swap_quote first, then swap_execute if user confirms.\n- \"Swap then save\": swap_execute \u2192 balance_check \u2192 save_deposit. Confirm each step.\n- \"Buy $X of token\": token_prices \u2192 calculate amount \u2192 swap_execute.\n- \"Best yield on SUI\": compare rates_info (NAVI lending) + volo_stats (vSUI liquid staking).\n- withdraw supports legacy positions: USDC, USDe, USDsui, SUI. Pass asset param to withdraw a specific token.\n- \"Deposit SUI to earn yield\": volo_stake for SUI liquid staking. save_deposit only accepts USDC or USDsui.\n- \"Is protocol X safe?\" / \"Tell me about NAVI\": protocol_deep_dive with the slug.\n- \"Full account report\" / \"account summary\" / \"give me everything\" / \"complete overview\": triggers the `account_report` recipe \u2014 when the recipe block appears, follow EVERY step including all six tool calls. Each step renders a distinct rich card; skipping a step means a missing card.\n\n## Safety\n- Never encourage risky financial behavior.\n- Warn when health factor < 1.5.\n- All amounts in USDC unless stated otherwise.";
|
|
2456
2469
|
|
|
2457
2470
|
export { type AddressPortfolio, AnthropicProvider, type AnthropicProviderConfig, type AudricHistoryRecord, type AudricPortfolioResult, type BalancePrices, type BalanceResult, BalanceTracker, type BuildToolOptions, CANVAS_TEMPLATES, type CanvasTemplate, type ChatParams, type CompactOptions, type ContentBlock, ContextBudget, type ContextBudgetConfig, type ConversationState, type ConversationStateStore, type CostSnapshot, CostTracker, type CostTrackerConfig, DEFAULT_GUARD_CONFIG, DEFAULT_PERMISSION_CONFIG, DEFAULT_SYSTEM_PROMPT, EarlyToolDispatcher, type EngineConfig, type EngineEvent, type GuardCheckResult, type GuardConfig, type GuardEvent, type GuardInjection, type GuardResult, type GuardRunnerState, type GuardTier, type GuardVerdict, type HealthFactorResult, type LLMProvider, type McpCallResult, McpClientManager, McpResponseCache, type McpServerConfig, type McpServerConnection, type McpToolAdapterConfig, type McpToolDescriptor, MemorySessionStore, type Message, NAVI_MCP_CONFIG, NAVI_MCP_URL, NAVI_SERVER_NAME, type NaviRawCoin, type NaviRawHealthFactor, type NaviRawPool, type NaviRawPosition, type NaviRawPositionsResponse, type NaviRawProtocolStats, type NaviRawRewardsResponse, type NaviReadOptions, NaviTools, type OutputConfig, PERMISSION_PRESETS, type PendingAction, type PendingActionModifiableField, type PendingReward, type PendingToolCall, type PermissionLevel, type PermissionOperation, type PermissionResponse, type PermissionRule, type PortfolioCoin, type PositionEntry, type PreflightResult, type ProtocolStats, type ProviderEvent, QueryEngine, READ_TOOLS, type RatesResult, type Recipe, type RecipePrerequisite, RecipeRegistry, type RecipeStep, type RecipeStepOnError, RetryTracker, type SSEEvent, type SavingsResult, type ServerPositionData, type SessionData, type SessionStore, type StateType, type StopReason, type SuiCoinBalance, type SystemBlock, type SystemPrompt, TOOL_FLAGS, TOOL_MODIFIABLE_FIELDS, type ThinkingConfig, type ThinkingEffort, type Tool, type ToolChoice, type ToolContext, type ToolDefinition, type ToolFlags, type ToolJsonSchema, type ToolResult, TxMutex, type UserFinancialProfile, type UserPermissionConfig, WRITE_TOOLS, type WalletCoin, activitySummaryTool, adaptAllMcpTools, adaptAllServerTools, adaptMcpTool, applyToolFlags, balanceCheckTool, borrowTool, budgetToolResult, buildCachedSystemPrompt, buildMcpTools, buildProactivenessInstructions, buildProfileContext, buildSelfEvaluationInstruction, buildStateContext, buildTool, claimRewardsTool, classifyEffort, clearPortfolioCache, clearPortfolioCacheFor, clearPriceMapCache, compactMessages, createGuardRunnerState, engineToSSE, estimateTokens, explainTxTool, extractConversationText, extractMcpText, fetchAddressPortfolio, fetchAudricHistory, fetchAudricPortfolio, fetchAvailableRewards, fetchBalance, fetchHealthFactor, fetchPositions, fetchProtocolStats, fetchRates, fetchSavings, fetchTokenPrices, fetchWalletCoins, findTool, getAudricApiBase, getDefaultTools, getMcpManager, getModifiableFields, getToolFlags, getWalletAddress, guardArtifactPreview, guardStaleData, hasNaviMcp, healthCheckTool, loadRecipes, microcompact, mppServicesTool, parseMcpJson, parseRecipe, parseSSE, payApiTool, portfolioAnalysisTool, protocolDeepDiveTool, ratesInfoTool, registerEngineTools, renderCanvasTool, repayDebtTool, requireAgent, resolvePermissionTier, resolveUsdValue, runGuards, runTools, saveContactTool, saveDepositTool, savingsInfoTool, sendTransferTool, serializeSSE, spendingAnalyticsTool, swapExecuteTool, swapQuoteTool, tokenPricesTool, toolNameToOperation, toolsToDefinitions, transactionHistoryTool, transformBalance, transformHealthFactor, transformPositions, transformRates, transformRewards, transformSavings, updateGuardStateAfterToolResult, validateHistory, voloStakeTool, voloStatsTool, voloUnstakeTool, webSearchTool, withdrawTool, yieldSummaryTool };
|
package/dist/index.js
CHANGED
|
@@ -4226,10 +4226,14 @@ var DEFAULT_SYSTEM_PROMPT = `You are Audric \u2014 a financial agent on Sui. Aud
|
|
|
4226
4226
|
## Response rules
|
|
4227
4227
|
- 1-2 sentences max. No bullet lists unless asked. No preambles.
|
|
4228
4228
|
- Never say "Would you like me to...", "Sure!", "Great question!", "Absolutely!" \u2014 just do it or say you can't.
|
|
4229
|
-
- Lead with the result. After tool calls, state the outcome with real numbers. Done.
|
|
4230
4229
|
- Present amounts as $1,234.56 and rates as X.XX% APY.
|
|
4231
4230
|
- Show top 3 results unless asked for more. Summarize totals in one line.
|
|
4232
4231
|
|
|
4232
|
+
## Caption rules (after tool calls)
|
|
4233
|
+
- **When a canvas was rendered (\`render_canvas\` was called, or any tool that auto-renders a card like balance_check / portfolio_analysis / savings_info / health_check / transaction_history): the canvas IS the answer.** Your chat message must NOT restate wallet, savings, debt, holdings, or net-worth numbers \u2014 they are already on screen. Add at most ONE sentence of context, advice, or next step (e.g. "Your USDC is idle \u2014 consider depositing for ~4.5% APY"), or say nothing.
|
|
4234
|
+
- **When NO canvas was rendered:** lead with the result and quote the actual numbers from the tool. One sentence.
|
|
4235
|
+
- **NEVER describe a position as "no", "none", "minimal", "zero", or "inactive" if the tool result contains a positive value for that field.** The tool result is the source of truth \u2014 never your interior summary. If the canvas shows $100 in savings, you cannot say "no active savings" in the caption.
|
|
4236
|
+
|
|
4233
4237
|
## Execution rule
|
|
4234
4238
|
Only offer to execute actions you have tools for. If you retrieved a quote, data, or information but have no tool to act on it, give the user the result and tell them where to execute manually \u2014 in one sentence. Never say "Would you like me to proceed?" unless you have a tool that can actually proceed.
|
|
4235
4239
|
|
|
@@ -4345,7 +4349,8 @@ var DEFAULT_GUARD_CONFIG = {
|
|
|
4345
4349
|
inputValidation: true,
|
|
4346
4350
|
addressSource: true,
|
|
4347
4351
|
assetIntent: true,
|
|
4348
|
-
swapPreview: true
|
|
4352
|
+
swapPreview: true,
|
|
4353
|
+
addressScope: true
|
|
4349
4354
|
};
|
|
4350
4355
|
var BalanceTracker = class {
|
|
4351
4356
|
lastBalanceAt = 0;
|
|
@@ -4650,6 +4655,48 @@ function guardAddressSource(tool, call, userText, contacts, walletAddress) {
|
|
|
4650
4655
|
message: `Safety check failed: the recipient address "${rawTo}" was not provided by the user (no saved contact matches, address is not the user's own wallet, and it does not appear verbatim in the user's recent messages). For safety, addresses must be supplied directly by the user \u2014 never reconstructed from memory or partial recall. Ask the user to paste the destination address again exactly.`
|
|
4651
4656
|
};
|
|
4652
4657
|
}
|
|
4658
|
+
var READ_TOOLS_WITH_ADDRESS_PARAM = /* @__PURE__ */ new Set([
|
|
4659
|
+
"balance_check",
|
|
4660
|
+
"portfolio_analysis",
|
|
4661
|
+
"transaction_history",
|
|
4662
|
+
"savings_info",
|
|
4663
|
+
"health_check",
|
|
4664
|
+
"spending_analytics",
|
|
4665
|
+
"yield_summary",
|
|
4666
|
+
"activity_summary",
|
|
4667
|
+
"explain_tx"
|
|
4668
|
+
]);
|
|
4669
|
+
var SUI_ADDRESS_IN_TEXT_REGEX = /0x[a-fA-F0-9]{60,64}/g;
|
|
4670
|
+
function guardAddressScope(tool, call, userText, walletAddress) {
|
|
4671
|
+
if (!READ_TOOLS_WITH_ADDRESS_PARAM.has(tool.name)) {
|
|
4672
|
+
return { verdict: "pass", gate: "address_scope", tier: "safety" };
|
|
4673
|
+
}
|
|
4674
|
+
const matches = userText.match(SUI_ADDRESS_IN_TEXT_REGEX);
|
|
4675
|
+
if (!matches || matches.length === 0) {
|
|
4676
|
+
return { verdict: "pass", gate: "address_scope", tier: "safety" };
|
|
4677
|
+
}
|
|
4678
|
+
const ownWallet = walletAddress ? normalizeAddress(walletAddress) : null;
|
|
4679
|
+
const thirdPartyAddresses = Array.from(
|
|
4680
|
+
new Set(matches.map(normalizeAddress).filter((a) => a !== ownWallet))
|
|
4681
|
+
);
|
|
4682
|
+
if (thirdPartyAddresses.length === 0) {
|
|
4683
|
+
return { verdict: "pass", gate: "address_scope", tier: "safety" };
|
|
4684
|
+
}
|
|
4685
|
+
const input = call.input;
|
|
4686
|
+
const callAddress = typeof input.address === "string" && input.address.length > 0 ? normalizeAddress(input.address) : null;
|
|
4687
|
+
if (callAddress && thirdPartyAddresses.includes(callAddress)) {
|
|
4688
|
+
return { verdict: "pass", gate: "address_scope", tier: "safety" };
|
|
4689
|
+
}
|
|
4690
|
+
const target = thirdPartyAddresses[0];
|
|
4691
|
+
const omittedHint = callAddress ? `with address: "${callAddress}"` : "without an `address` field (which defaults to the signed-in user)";
|
|
4692
|
+
const mentionedHint = thirdPartyAddresses.length === 1 ? `address ${target}` : `${thirdPartyAddresses.length} third-party addresses (first: ${target})`;
|
|
4693
|
+
return {
|
|
4694
|
+
verdict: "block",
|
|
4695
|
+
gate: "address_scope",
|
|
4696
|
+
tier: "safety",
|
|
4697
|
+
message: `Address-scope mismatch: the user's recent messages mention ${mentionedHint} but ${tool.name} was called ${omittedHint}. Re-issue ${tool.name} with \`address: "${target}"\` to inspect the wallet the user actually asked about. Never default to the signed-in user when the user named a different wallet.`
|
|
4698
|
+
};
|
|
4699
|
+
}
|
|
4653
4700
|
function guardArtifactPreview(result) {
|
|
4654
4701
|
if (!result || typeof result !== "object") return null;
|
|
4655
4702
|
const r = result;
|
|
@@ -4733,6 +4780,16 @@ function runGuards(tool, call, state, config, conversationContext, onGuardFired,
|
|
|
4733
4780
|
if (config.assetIntent !== false) {
|
|
4734
4781
|
results.push(guardAssetIntent(tool, call, conversationContext.recentUserText));
|
|
4735
4782
|
}
|
|
4783
|
+
if (config.addressScope !== false) {
|
|
4784
|
+
results.push(
|
|
4785
|
+
guardAddressScope(
|
|
4786
|
+
tool,
|
|
4787
|
+
call,
|
|
4788
|
+
conversationContext.recentUserText,
|
|
4789
|
+
identity?.walletAddress
|
|
4790
|
+
)
|
|
4791
|
+
);
|
|
4792
|
+
}
|
|
4736
4793
|
if (config.swapPreview !== false) {
|
|
4737
4794
|
results.push(guardSwapPreview(tool, call, state.swapQuoteTracker));
|
|
4738
4795
|
}
|
|
@@ -6389,8 +6446,20 @@ function validateHistory(messages) {
|
|
|
6389
6446
|
merged.push({ role: msg.role, content: [...msg.content] });
|
|
6390
6447
|
}
|
|
6391
6448
|
}
|
|
6392
|
-
while (merged.length > 0
|
|
6393
|
-
merged.
|
|
6449
|
+
while (merged.length > 0) {
|
|
6450
|
+
if (merged[0].role !== "user") {
|
|
6451
|
+
merged.shift();
|
|
6452
|
+
continue;
|
|
6453
|
+
}
|
|
6454
|
+
const cleaned = merged[0].content.filter((b) => b.type !== "tool_result");
|
|
6455
|
+
if (cleaned.length === 0) {
|
|
6456
|
+
merged.shift();
|
|
6457
|
+
continue;
|
|
6458
|
+
}
|
|
6459
|
+
if (cleaned.length !== merged[0].content.length) {
|
|
6460
|
+
merged[0] = { role: "user", content: cleaned };
|
|
6461
|
+
}
|
|
6462
|
+
break;
|
|
6394
6463
|
}
|
|
6395
6464
|
return merged;
|
|
6396
6465
|
}
|