opencode-cache-hit 0.1.0 → 0.2.1

package/src/agents-view.tsx

@@ -3,15 +3,11 @@ import { For, Show } from "solid-js"
 import { TokenDetailRows } from "./cache-hit-rows.tsx"
 import type { CacheHitMetrics } from "./use-cache-hit-metrics.ts"
 import { aggregateSubAgents } from "./stats.ts"
+import { computeSubsSaved } from "./pricing.ts"
 import { formatTokenCount } from "./format-tokens.ts"
-import { TuiMetricRow, truncateVisual, type PanelLayout } from "./tui-panel/index.ts"
-import type { SubAgentSummary } from "./types.ts"
-
-function agentRowLabel(id: string, gauge: number): string {
-  const tail = id.length > 10 ? id.slice(-8) : id
-  const raw = id.length > 10 ? "\u2026" + tail : tail
-  return truncateVisual(raw, Math.max(6, gauge - 14))
-}
+import { formatSubAgentLabel, modelRowColor } from "./format-model.ts"
+import { TuiMetricRow, type PanelLayout } from "./tui-panel/index.ts"
+import type { ProviderInfo, SubAgentSummary } from "./types.ts"
 
 function subHasActivity(sub: SubAgentSummary): boolean {
   return sub.cost > 0 || sub.cacheRead > 0 || sub.cacheWrite > 0 || sub.input > 0
@@ -20,14 +16,27 @@ function subHasActivity(sub: SubAgentSummary): boolean {
 export function AgentsView(props: {
   m: CacheHitMetrics
   layout: PanelLayout
+  providers: ReadonlyArray<ProviderInfo>
   formatCost: (n: number) => string
 }) {
   const { m, layout } = props
   const total = () => aggregateSubAgents(m.subs())
 
+  const subsSaved = () => computeSubsSaved(m.subs(), props.providers)
+
   return (
     <>
-      <TokenDetailRows pal={m.pal()} layout={layout} t={m.t()} snap={total()} />
+      <TokenDetailRows pal={m.pal()} layout={layout} t={m.t()} snap={total()}>
+        <Show when={subsSaved() > 0}>
+          <TuiMetricRow
+            pal={m.pal()}
+            layout={layout}
+            label={m.t().saved}
+            value={props.formatCost(subsSaved())}
+            fg={m.pal().success}
+          />
+        </Show>
+      </TokenDetailRows>
       <Show when={total().cost > 0}>
         <TuiMetricRow
           pal={m.pal()}
@@ -43,9 +52,14 @@ export function AgentsView(props: {
             <TuiMetricRow
               pal={m.pal()}
               layout={layout}
-              label={"  " + agentRowLabel(sub.id, layout.gauge())}
+              label={
+                "  " +
+                formatSubAgentLabel(sub, layout.gauge(), props.formatCost, m.t().tok)
+              }
               value={sub.cost > 0 ? props.formatCost(sub.cost) : formatTokenCount(sub.input)}
               unit={sub.cost > 0 ? "" : m.t().tok}
+              labelFg={modelRowColor(sub.model, sub.providerID, m.pal())}
+              valueFg={m.pal().muted}
             />
           </Show>
         )}

package/src/cache-ttl-view.tsx

@@ -0,0 +1,128 @@
+/**
+ * Cache TTL elapsed time display.
+ * Inspired by opencode-cache-timer (https://github.com/nero-sensei/opencode-cache-timer)
+ * by nero-sensei.
+ */
+/** @jsxImportSource @opentui/solid */
+import { createMemo, createSignal, onCleanup, Show, type Accessor } from "solid-js"
+import type { AssistantMessage } from "./types.ts"
+import type { CacheTTLConfig } from "./plugin-config.ts"
+import { parseDuration } from "./plugin-config.ts"
+import type { PanelPalette, PanelLayout } from "./tui-panel/index.ts"
+
+const SECOND = 1000
+const MINUTE = 60 * SECOND
+const HOUR = 60 * MINUTE
+
+const DEFAULT_TTL_MS = 5 * MINUTE
+
+const BUILT_IN_TTL: Record<string, number> = {
+  anthropic: 5 * MINUTE,
+  openai: 5 * MINUTE,
+  deepseek: 2 * HOUR,
+  google: 1 * HOUR,
+  xai: 5 * MINUTE,
+  minimax: 5 * MINUTE,
+  xiaomi: 5 * MINUTE,
+  qwen: 5 * MINUTE,
+  moonshot: 5 * MINUTE,
+}
+
+function findLastCacheActivity(messages: Accessor<AssistantMessage[]>): AssistantMessage | null {
+  const msgs = messages()
+  for (let i = msgs.length - 1; i >= 0; i--) {
+    const m = msgs[i]
+    if (
+      m.role === "assistant" &&
+      m.time?.completed !== undefined &&
+      ((m.tokens?.cache?.read ?? 0) > 0 || (m.tokens?.cache?.write ?? 0) > 0)
+    ) {
+      return m
+    }
+  }
+  return null
+}
+
+function getTTL(
+  providerID: string,
+  modelID: string,
+  config: CacheTTLConfig,
+): number {
+  const userProviders = config.providers
+  const specific = userProviders[`${providerID}:${modelID}`]
+  if (specific !== undefined) {
+    const parsed = parseDuration(specific)
+    if (parsed !== null) return parsed
+  }
+  const userProvider = userProviders[providerID]
+  if (userProvider !== undefined) {
+    const parsed = parseDuration(userProvider)
+    if (parsed !== null) return parsed
+  }
+  const builtIn = BUILT_IN_TTL[providerID]
+  if (builtIn !== undefined) return builtIn
+  return DEFAULT_TTL_MS
+}
+
+function formatElapsed(ms: number): string {
+  if (ms <= 0) return "0s"
+  const totalSeconds = Math.floor(ms / 1000)
+  const hours = Math.floor(totalSeconds / 3600)
+  const minutes = Math.floor((totalSeconds % 3600) / 60)
+  const seconds = totalSeconds % 60
+  if (hours > 0) return `${hours}h ${minutes}m`
+  if (minutes > 0) return `${minutes}m ${seconds}s`
+  return `${seconds}s`
+}
+
+export function CacheTTLView(props: {
+  messages: Accessor<AssistantMessage[]>
+  config: CacheTTLConfig
+  pal: PanelPalette
+  layout: PanelLayout
+  label: string
+}) {
+  const [now, setNow] = createSignal(Date.now())
+  const tick = setInterval(() => setNow(Date.now()), 1000)
+  onCleanup(() => clearInterval(tick))
+
+  const lastCache = createMemo(() => findLastCacheActivity(props.messages))
+
+  const ttlMs = createMemo(() => {
+    const m = lastCache()
+    if (!m || !m.providerID) return DEFAULT_TTL_MS
+    return getTTL(m.providerID, m.modelID ?? "", props.config)
+  })
+
+  const elapsed = createMemo(() => {
+    const m = lastCache()
+    if (!m || m.time.completed === undefined) return null
+    return now() - m.time.completed
+  })
+
+  const statusIcon = createMemo(() => {
+    const e = elapsed()
+    const ttl = ttlMs()
+    if (e === null) return ""
+    if (e < ttl) return "●"
+    if (e < ttl * 2) return "◐"
+    return "○"
+  })
+
+  const statusColor = createMemo(() => {
+    const e = elapsed()
+    const ttl = ttlMs()
+    if (e === null) return props.pal.textMuted
+    if (e < ttl) return props.pal.success
+    if (e < ttl * 2) return props.pal.warning
+    return props.pal.error
+  })
+
+  return (
+    <Show when={elapsed() !== null}>
+      <text fg={statusColor()}>
+        {props.layout.row(props.label, `${statusIcon()} ${formatElapsed(elapsed()!)}`, "")}
+      </text>
+    </Show>
+  )
+}

package/src/format-cost.ts

@@ -26,7 +26,7 @@ export const CURRENCY_PRESETS: Record<CurrencyCode, { symbol: string; decimals:
 export const DEFAULT_COST_DISPLAY: CostDisplayConfig = {
   currency: "CNY",
   costUnit: "USD",
-  rate: 7.2,
+  rate: 6.77,
 }
 
 function resolveExchangeRate(cfg: CostDisplayConfig): number {
@@ -73,6 +73,76 @@ export function normalizeCostDisplay(raw: unknown): CostDisplayConfig {
   return cfg
 }
 
+/** Resolved params for static HTML dashboards (timeline-dashboard.ts). */
+export type CostDisplayEmbed = {
+  currency: CurrencyCode
+  costUnit: CurrencyCode
+  rate: number
+  symbol: string
+  decimals: number
+  minDisplay: number
+  /** Chart axis / table header, e.g. "Cost (¥)". */
+  chartLabel: string
+  /** Empty when display currency matches JSONL cost unit. */
+  costNote: string
+}
+
+function currencyOrDefault(code: unknown): CurrencyCode {
+  return typeof code === "string" && code in CURRENCY_PRESETS ? (code as CurrencyCode) : DEFAULT_COST_DISPLAY.currency
+}
+
+/** Guarantee finite rate/symbol/decimals for HTML embed + Chart.js. */
+export function sanitizeCostDisplayEmbed(embed: CostDisplayEmbed): CostDisplayEmbed {
+  const currency = currencyOrDefault(embed.currency)
+  const costUnit = currencyOrDefault(embed.costUnit)
+  const preset = CURRENCY_PRESETS[currency]
+  let rate = embed.rate
+  if (!Number.isFinite(rate) || rate <= 0) {
+    rate = costUnit === currency ? 1 : (DEFAULT_COST_DISPLAY.rate ?? 1)
+  }
+  const symbol =
+    typeof embed.symbol === "string" && embed.symbol.length > 0 ? embed.symbol : preset.symbol
+  const decimals =
+    typeof embed.decimals === "number" && embed.decimals >= 0 && Number.isFinite(embed.decimals)
+      ? embed.decimals
+      : preset.decimals
+  const minDisplay =
+    typeof embed.minDisplay === "number" && embed.minDisplay > 0 && Number.isFinite(embed.minDisplay)
+      ? embed.minDisplay
+      : preset.minDisplay
+  const chartLabel = `Cost (${symbol})`
+  const costNote =
+    costUnit === currency ? "" : `JSONL cost is ${costUnit}; displayed as ${currency} @ ${rate}`
+  return { currency, costUnit, rate, symbol, decimals, minDisplay, chartLabel, costNote }
+}
+
+export function buildCostDisplayEmbed(config: CostDisplayConfig | unknown): CostDisplayEmbed {
+  const cfg = normalizeCostDisplay(config)
+  const currency = currencyOrDefault(cfg.currency)
+  const preset = CURRENCY_PRESETS[currency]
+  const symbol = cfg.symbol ?? preset.symbol
+  const decimals = cfg.decimals ?? preset.decimals
+  const minDisplay = cfg.minDisplay ?? preset.minDisplay
+  const costUnit = currencyOrDefault(cfg.costUnit ?? cfg.convert?.from ?? DEFAULT_COST_DISPLAY.costUnit)
+  const rate = costUnit === currency ? 1 : resolveExchangeRate({ ...cfg, currency, costUnit })
+  return sanitizeCostDisplayEmbed({
+    currency,
+    costUnit,
+    rate,
+    symbol,
+    decimals,
+    minDisplay,
+    chartLabel: `Cost (${symbol})`,
+    costNote:
+      costUnit === currency ? "" : `JSONL cost is ${costUnit}; displayed as ${currency} @ ${rate}`,
+  })
+}
+
+/** No config file / partial config / invalid fields → safe embed for dashboards. */
+export function normalizeCostDisplayEmbed(raw: unknown): CostDisplayEmbed {
+  return buildCostDisplayEmbed(raw)
+}
+
 export function createCostFormatter(config: CostDisplayConfig): (amountUsd: number) => string {
   const preset = CURRENCY_PRESETS[config.currency]
   const symbol = config.symbol ?? preset.symbol
@@ -88,3 +158,15 @@ export function createCostFormatter(config: CostDisplayConfig): (amountUsd: numb
     return "~" + symbol + v.toFixed(decimals)
   }
 }
+
+export function createRateFormatter(config: CostDisplayConfig): (perMillion: number) => string {
+  const preset = CURRENCY_PRESETS[config.currency]
+  const symbol = config.symbol ?? preset.symbol
+  const unit = config.costUnit ?? config.convert?.from ?? "USD"
+  const rate = unit === config.currency ? 1 : resolveExchangeRate(config)
+
+  return (perMillion: number) => {
+    const v = perMillion * rate
+    return symbol + v.toFixed(2)
+  }
+}

package/src/format-model.ts

@@ -0,0 +1,227 @@
+import { formatTokenCount } from "./format-tokens.ts"
+import { shortModelName } from "./stats.ts"
+import type { PanelPalette } from "./tui-panel/palette.ts"
+import { toneBrandHex } from "./tui-panel/palette.ts"
+import { UNIT_GAP, truncateVisual, visualWidth } from "./tui-panel/layout.ts"
+import type { SubAgentSummary } from "./types.ts"
+
+const INDENT_COLS = 2
+const MIN_ROW_GAP = 1
+const MIN_LABEL_BUDGET = 6
+const ID_TAIL_DEFAULT = 6
+const ID_TAIL_MIN = 4
+
+export type ModelFamilyId =
+  | "claude"
+  | "deepseek"
+  | "openai"
+  | "gemini"
+  | "qwen"
+  | "glm"
+  | "kimi"
+  | "minimax"
+  | "grok"
+  | "mimo"
+  | "meta"
+  | "mistral"
+
+/**
+ * Approximate vendor brand colors (pre-toning). Tuned for recognition on dark terminals.
+ * Applied via `toneBrandHex` — not the panel semantic keys (`warning`, `primary`, …).
+ */
+export const MODEL_BRAND_HEX: Record<ModelFamilyId, string> = {
+  claude: "#D4A574",
+  deepseek: "#4D6BFE",
+  openai: "#10A37F",
+  gemini: "#5B8DEF",
+  qwen: "#6157E5",
+  glm: "#2F67F6",
+  kimi: "#5B8FF9",
+  minimax: "#FF6B35",
+  grok: "#A8ADB8",
+  mimo: "#7C6FE8",
+  meta: "#0668E1",
+  mistral: "#FF8200",
+}
+
+/** Fallback hues for unknown providers (also toned; never panel `success` green). */
+const UNKNOWN_BRAND_HEX = ["#8B9DAF", "#9CAF8B", "#A89BBF", "#B0A080"] as const
+
+type ModelFamilyRule = {
+  id: ModelFamilyId
+  match: (name: string, providerID: string) => boolean
+}
+
+/**
+ * Built-in model/provider families (label stays full `displayModelName`).
+ * First match wins — order from more specific vendor slugs to broad prefixes.
+ */
+export const MODEL_FAMILY_RULES: readonly ModelFamilyRule[] = [
+  {
+    id: "claude",
+    match: (n, p) =>
+      p === "anthropic" ||
+      n.startsWith("claude-") ||
+      /(^|-)(sonnet|opus|haiku)(-|$)/i.test(n),
+  },
+  {
+    id: "deepseek",
+    match: (n, p) => p === "deepseek" || n.startsWith("deepseek-"),
+  },
+  {
+    id: "openai",
+    match: (n, p) =>
+      p === "openai" ||
+      n.startsWith("gpt-") ||
+      /^o[13](-|$)/.test(n) ||
+      n.startsWith("chatgpt-"),
+  },
+  {
+    id: "gemini",
+    match: (n, p) => p === "google" || n.startsWith("gemini-"),
+  },
+  {
+    id: "qwen",
+    match: (n, p) => p === "qwen" || p === "alibaba" || n.startsWith("qwen"),
+  },
+  {
+    id: "glm",
+    match: (n, p) =>
+      p === "zhipu" ||
+      p === "zhipuai" ||
+      n.startsWith("glm-") ||
+      n.includes("chatglm"),
+  },
+  {
+    id: "kimi",
+    match: (n, p) => p === "moonshot" || n.startsWith("kimi-"),
+  },
+  {
+    id: "minimax",
+    match: (n, p) => p === "minimax" || n.startsWith("minimax"),
+  },
+  {
+    id: "grok",
+    match: (n, p) => p === "x-ai" || p === "xai" || n.startsWith("grok-"),
+  },
+  {
+    id: "mimo",
+    match: (n, p) => p === "mimo" || n.startsWith("mimo-"),
+  },
+  {
+    id: "meta",
+    match: (n, p) => p === "meta" || n.startsWith("llama-") || n.includes("meta-llama"),
+  },
+  {
+    id: "mistral",
+    match: (n, p) => p === "mistral" || n.startsWith("mistral-") || n.startsWith("codestral-"),
+  },
+]
+
+/** Strip release-date tails only — same spirit as main-session `modelShort`. */
+export function stripModelDateSuffix(name: string): string {
+  return name.replace(/-20\d{6,}$/, "").replace(/-\d{8}$/, "")
+}
+
+/** Sub-agent label text: `shortModelName` + date trim; row layout truncates visually. */
+export function displayModelName(modelId: string): string {
+  const name = shortModelName(modelId)
+  if (!name) return ""
+  return stripModelDateSuffix(name)
+}
+
+/** @deprecated alias */
+export function compactModelLabel(modelId: string, _providerID = ""): string {
+  return displayModelName(modelId)
+}
+
+function normalizeForFamilyMatch(s: string): string {
+  return s.toLowerCase()
+}
+
+function findFamilyRule(name: string, providerID: string): ModelFamilyRule | undefined {
+  const n = normalizeForFamilyMatch(name)
+  const p = normalizeForFamilyMatch(providerID)
+  return MODEL_FAMILY_RULES.find((r) => r.match(n, p))
+}
+
+export function modelFamilyId(modelId: string, providerID: string): ModelFamilyId | null {
+  const name = shortModelName(modelId)
+  if (!name) return null
+  return findFamilyRule(name, providerID)?.id ?? null
+}
+
+function stableHash(s: string): number {
+  let h = 5381
+  for (let i = 0; i < s.length; i++) h = (h * 33) ^ s.charCodeAt(i)
+  return h >>> 0
+}
+
+/** Sub-agent label color from vendor brand hex (toned for TUI). */
+export function modelRowColor(modelId: string, providerID: string, pal: PanelPalette): string {
+  const fallback = pal.muted
+  const family = modelFamilyId(modelId, providerID)
+  if (family) return toneBrandHex(MODEL_BRAND_HEX[family], fallback)
+  const name = shortModelName(modelId)
+  const key = providerID || name.split("-")[0] || name
+  const idx = stableHash(key) % UNKNOWN_BRAND_HEX.length
+  return toneBrandHex(UNKNOWN_BRAND_HEX[idx]!, fallback)
+}
+
+export function sessionIdTail(id: string, tailLen: number): string {
+  if (!id) return ""
+  if (id.length <= tailLen) return id
+  return "\u2026" + id.slice(-tailLen)
+}
+
+export function subAgentLabelBudget(gauge: number, value: string, unit: string): number {
+  const rightW = visualWidth(value) + (unit ? visualWidth(unit) + UNIT_GAP : 0)
+  return Math.max(MIN_LABEL_BUDGET, gauge - rightW - INDENT_COLS - MIN_ROW_GAP)
+}
+
+/** Sub-agent label: `{model} …{idTail}` — model first; truncation keeps model prefix. */
+export function formatSubAgentLabel(
+  sub: SubAgentSummary,
+  gauge: number,
+  formatCost: (n: number) => string,
+  tokUnit: string,
+): string {
+  const value = sub.cost > 0 ? formatCost(sub.cost) : formatTokenCount(sub.input)
+  const unit = sub.cost > 0 ? "" : tokUnit
+  const budget = subAgentLabelBudget(gauge, value, unit)
+
+  if (!shortModelName(sub.model)) {
+    return truncateVisual(sessionIdTail(sub.id, ID_TAIL_DEFAULT), budget)
+  }
+
+  const model = displayModelName(sub.model)
+  return joinModelAndSessionId(model, sub.id, budget)
+}
+
+function joinModelAndSessionId(model: string, id: string, budget: number): string {
+  if (!model) {
+    return truncateVisual(sessionIdTail(id, ID_TAIL_DEFAULT), budget)
+  }
+
+  const tryPair = (tailLen: number, trimModel: boolean): string | null => {
+    const idPart = sessionIdTail(id, tailLen)
+    const idBlockW = visualWidth(idPart) + 1
+    if (budget <= idBlockW) return null
+    const modelPart = trimModel ? truncateVisual(model, budget - idBlockW) : model
+    if (!modelPart) return null
+    const combined = modelPart + " " + idPart
+    return visualWidth(combined) <= budget ? combined : null
+  }
+
+  for (const tailLen of [ID_TAIL_DEFAULT, ID_TAIL_MIN]) {
+    const full = tryPair(tailLen, false)
+    if (full) return full
+  }
+
+  for (const tailLen of [ID_TAIL_MIN, ID_TAIL_DEFAULT]) {
+    const trimmed = tryPair(tailLen, true)
+    if (trimmed) return trimmed
+  }
+
+  return truncateVisual(model, budget)
+}

package/src/i18n.ts

@@ -10,7 +10,11 @@ export type UiStrings = {
   out: string
   reasoning: string
   cost: string
-  withAgents: string
+  saved: string
+  rate: string
+  rateIn: string
+  rateOut: string
+  rateCache: string
   hitFolded: string
   noData: string
   secDetail: string
@@ -19,6 +23,7 @@ export type UiStrings = {
   secAgents: string
   /** Shown in Agents section header: totals are child sessions only, not the parent session. */
   agentsScopeHint: string
+  secTTL: string
   tok: string
 }
 
@@ -32,7 +37,11 @@ const EN: UiStrings = {
   out: "Out:",
   reasoning: "Reason:",
   cost: "Cost:",
-  withAgents: "w/ Agents:",
+  saved: "Saved:",
+  rate: "Rate:",
+  rateIn: "/M in",
+  rateOut: "/M out",
+  rateCache: "/M cache",
   hitFolded: "hit",
   noData: "Waiting for cache data...",
   secDetail: "Detail",
@@ -40,6 +49,7 @@ const EN: UiStrings = {
   model: "Model:",
   secAgents: "Agents",
   agentsScopeHint: " · sub-sessions",
+  secTTL: "TTL:",
   tok: "tok",
 }
 
@@ -53,7 +63,11 @@ const ZH: UiStrings = {
   out: "输出:",
   reasoning: "推理:",
   cost: "费用:",
-  withAgents: "含 Agents:",
+  saved: "节省:",
+  rate: "单价:",
+  rateIn: "/M 输入",
+  rateOut: "/M 输出",
+  rateCache: "/M 缓存",
   hitFolded: "命中",
   noData: "等待缓存数据...",
   secDetail: "明细",
@@ -61,6 +75,7 @@ const ZH: UiStrings = {
   model: "模型:",
   secAgents: "子 Agent",
   agentsScopeHint: " · 仅子会话",
+  secTTL: "存活:",
   tok: "tok",
 }
 

package/src/load-config.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "node:fs"
-import { dirname, join } from "node:path"
+import { homedir } from "node:os"
+import { join } from "node:path"
 import { fileURLToPath } from "node:url"
 import {
   type PluginConfig,
@@ -9,6 +10,11 @@ import {
 
 /** Parent of `src/` (plugin package root). Do not wrap in `dirname` — `..` already resolves there. */
 export const PLUGIN_ROOT = fileURLToPath(new URL("..", import.meta.url))
+
+/** Preferred config: ~/.config/opencode/cache-hit.json (survives plugin updates). */
+export const XDG_CONFIG_PATH = join(homedir(), ".config", "opencode", "cache-hit.json")
+
+/** Legacy config: plugin-root `cache-hit.config.json` (for npm cache / local installs). */
 export const CONFIG_PATH = join(PLUGIN_ROOT, "cache-hit.config.json")
 
 function cloneDefault(): PluginConfig {
@@ -19,11 +25,24 @@ function cloneDefault(): PluginConfig {
   }
 }
 
-export function loadPluginConfig(): PluginConfig {
-  if (!existsSync(CONFIG_PATH)) return cloneDefault()
+function tryRead(path: string): PluginConfig | null {
   try {
-    return normalizePluginConfig(JSON.parse(readFileSync(CONFIG_PATH, "utf8")))
+    return normalizePluginConfig(JSON.parse(readFileSync(path, "utf8")))
   } catch {
-    return cloneDefault()
+    return null
+  }
+}
+
+export function loadPluginConfig(): PluginConfig {
+  // 1. XDG config dir (preferred — persists across updates)
+  if (existsSync(XDG_CONFIG_PATH)) {
+    const cfg = tryRead(XDG_CONFIG_PATH)
+    if (cfg) return cfg
+  }
+  // 2. Legacy plugin-root config (backward compatible)
+  if (existsSync(CONFIG_PATH)) {
+    const cfg = tryRead(CONFIG_PATH)
+    if (cfg) return cfg
   }
+  return cloneDefault()
 }