@hasna/economy 0.3.6 → 0.3.8

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this repository are tracked here. This project follows semantic versioning for published npm packages when practical.
 
+## @hasna/economy 0.3.7 - 2026-07-24
+
+Reconciliation release: `main` had diverged from the published npm line. The `0.3.x`
+code (`0.3.0`-`0.3.6`, the unified `Store` refactor plus the cloud/self_hosted service
+surfaces) shipped to npm from `feature`-line commits and was never merged back, while
+`main` (`0.2.52`) carried two merged-but-unpublished features. This release is a real
+three-way merge that keeps **both** histories.
+
+- Merged the published `v0.3.6` tag (`4f76834`) into `main`, preserving both parents.
+- Forward-ported **compact CLI/MCP output defaults** (#4) onto the `Store` surfaces:
+  `--limit`/`--verbose`/`--json` on `breakdown`, `budget list`, `project list`,
+  `pricing list`, `goal list`, `goal status`, `usage`, `subscriptions list`, `fleet`;
+  `limit`/`verbose`/`json` params on the `get_model_breakdown`, `get_project_breakdown`,
+  `get_account_breakdown`, `get_budget_status`, `get_pricing`, `get_goals`,
+  `list_machines`, `get_session_detail`, `get_usage`, `get_savings`, `sync` and
+  `set_subscription` MCP tools.
+- Forward-ported **token cost centers** (#5) onto the `Store` architecture: added
+  `EconomyStore.costCenterBreakdown()` (local SQLite + cloud `/v1` transports),
+  `cost_center_id` on `BudgetInput`, and the `breakdown --by cost-center|loop|app|repo`
+  CLI dimension plus the `get_cost_center_breakdown` MCP tool. The cloud transport
+  drops rows the API did not attribute to a cost center, so an un-upgraded serve
+  reports "no cost-center usage" instead of mislabelling model rows.
+- Dropped the main-only code the `0.3.x` refactor deliberately removed as the
+  forbidden DSN-on-client pattern: `src/lib/peer-sync.ts`, `src/lib/cloud-sync.ts`
+  (and with it the `cloud schedule install|status|remove` commands) and
+  `src/lib/fleet-sync.ts`. The MCP `sync` tool no longer reports `cloud_pushed` /
+  `cloud_pulled` because `SyncAllResult` no longer carries them.
+- Bumped strictly above the published `0.3.6` latest. (The `v0.3.6` tag commit itself
+  carried `package.json` version `0.3.5`; the `0.3.6` publish bumped the registry
+  without a follow-up commit.)
+
 ## @hasna/economy 0.2.43 - 2026-07-06
 
 - Added the self_hosted service surface: `economy-serve` foundation probes (`GET /health`, `/ready`, `/version` -> `{ status, version, mode }`) and a versioned `/v1` API covering summaries, sessions, breakdowns, budgets, goals, pricing, subscriptions, billing, and sync.

package/README.md

@@ -8,9 +8,9 @@ AI coding cost tracker for Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor,
 ## Features
 
 - Ingests local Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, and Hermes usage.
-- Tracks sessions, requests, projects, machines, models, cache tokens, budgets, goals, and provider billing.
+- Tracks sessions, requests, projects, machines, models, cache tokens, cost centers, budgets, goals, and provider billing.
 - Attributes usage to `@hasna/accounts` profiles when agents run under managed account/profile config dirs.
-- Breaks down API-equivalent, metered API, subscription-included, estimated, and unknown cost by account and coding agent.
+- Breaks down API-equivalent, metered API, subscription-included, estimated, and unknown cost by account, coding agent, and cost center.
 - Seeds editable model pricing with input, output, cache-read, 5-minute cache-write, 1-hour cache-write, and context-cache storage rates.
 - Handles tiered pricing such as Gemini long-prompt rates and OpenAI long-context rates.
 - Reconciles estimates against Anthropic, OpenAI, and Gemini billing sources.
@@ -39,6 +39,35 @@ Open the dashboard with:
 economy dashboard --port 3456
 ```
 
+## Documentation
+
+- [CLI reference](docs/cli.md)
+- [Ingestion sources and attribution](docs/ingestion.md)
+- [Configuration, storage modes, and deployment](docs/configuration.md)
+- [REST API](docs/rest-api.md)
+- [MCP server](docs/mcp.md)
+- [OTLP/HTTP sidecar](docs/otel.md)
+
+## CLI Output Defaults
+
+Economy CLI commands are compact by default so agent terminals do not fill their context with full records. High-cardinality list and status commands show essential columns, cap row counts, and print a hint when more rows are available.
+
+Use explicit detail paths when you need more:
+
+```bash
+economy sessions --limit 50
+economy session <id> --verbose
+economy accounts month --json
+economy usage month --verbose
+economy todos list --limit 20
+economy todos list --verbose
+economy todos show 9.7
+```
+
+`--json` remains the machine-readable path for commands that support it. Human output may truncate rows or long text; use `--json`, `--limit`, or a `show`/detail command for complete data. `--verbose` expands output where supported; its exact limit is command-specific (for example, `economy session --verbose` shows up to 50 requests).
+
+Status subcommands follow the same rule. For example, `economy goal status` prints a compact human summary by default and `economy goal status --limit 5` or `--verbose` controls how many goals are listed.
+
 ## Agent Integrations
 
 Use the MCP server for live cost context inside coding agents:
@@ -71,7 +100,7 @@ Gemini settings:
 }
 ```
 
-The MCP server exposes read tools for summaries, sessions, machines, pricing, daily spend, budgets, goals, provider billing, usage snapshots, savings, project/account/agent breakdowns, and subscriptions. It also exposes mutation tools for budgets, pricing rows, goals, and subscriptions so coding agents can manage Economy data through the same validated surface as the CLI and REST API.
+The MCP server exposes read tools for summaries, sessions, machines, pricing, daily spend, budgets, goals, provider billing, usage snapshots, savings, project/account/agent/cost-center breakdowns, and subscriptions. MCP tools are compact by default for agent context safety; high-cardinality tools accept `limit`, `verbose`, or `json=true` where raw structured output is useful. It also exposes mutation tools for budgets, pricing rows, goals, and subscriptions so coding agents can manage Economy data through the same validated surface as the CLI and REST API. See the [MCP guide](docs/mcp.md) for HTTP mode and the complete tool list.
 
 ## Ingest
 
@@ -92,8 +121,11 @@ economy sync --opencode
 economy sync --cursor
 economy sync --pi
 economy sync --hermes
+economy sync --loops
 ```
 
+`economy sync --loops` reads `~/.hasna/loops/loops.db` in read-only mode and imports OpenLoops orchestration/judge `goal_runs.tokens_used` into `loop:*` cost centers. It intentionally does not ingest dispatched coding-agent work from loops; heavy agent spend remains captured by the existing per-agent ingesters and can be analyzed alongside loop cost centers through account/profile attribution.
+
 Useful repair options:
 
 ```bash
@@ -102,7 +134,7 @@ economy sync --recalculate
 economy sync --backfill-machine
 ```
 
-Full sync also imports active project metadata from `@hasna/projects` when the registry is available. The Codex source reads both legacy `~/.codex/state_5.sqlite` and current Codewith `~/.codewith/state_5.sqlite` usage stores by default; explicit `HASNA_ECONOMY_CODEX_DB_PATH` and `HASNA_ECONOMY_CODEWITH_DB_PATH` values override those locations.
+Full sync also imports active project metadata from `@hasna/projects` when the registry is available. The Codex source reads both `~/.codex/state_5.sqlite` and the Codewith store at `~/.codewith/state_5.sqlite` by default; explicit `HASNA_ECONOMY_CODEX_DB_PATH` and `HASNA_ECONOMY_CODEWITH_DB_PATH` values override those locations.
 
 Account attribution is automatic when `@hasna/accounts` has a matching active, applied, or env-dir profile for the agent. Account identity is the email address plus coding agent, so `work@example.com` under Codex and Claude is reported as two accounts. You can also force attribution for a process with `ECONOMY_ACCOUNT=tool:name` or agent-specific overrides such as `ECONOMY_CODEX_ACCOUNT=codex:work`.
 
@@ -116,6 +148,26 @@ economy breakdown --by account
 
 Account breakdowns report `api_equivalent_usd` for the API list-price value of the usage, plus `billable_usd`/`metered_api_usd` for known direct API spend and `subscription_included_usd` for usage covered by a subscription.
 
+Cost-center breakdowns group spend across loops, apps, repos, services, and teams:
+
+```bash
+economy breakdown --by cost-center
+economy breakdown --by loop
+economy breakdown --by app
+economy breakdown --by repo
+```
+
+Apps and services can report usage through the local `economy-otel` sidecar:
+
+```bash
+economy-otel --port 4318
+curl -X POST http://127.0.0.1:4318/ingest \
+  -H 'content-type: application/json' \
+  -d '{"source":"app","cost_center":"alumia","cost_center_kind":"app","project_path":"/workspace/alumia","model":"gpt-5-mini","cost_usd":0.12,"input_tokens":1200,"output_tokens":300}'
+```
+
+Accepted `/ingest` attribution fields include `cost_center`, `cost_center_kind`, `cost_center_id`, `attribution_tag`, `project_path`, `repo`, `account_key`, `account_tool`, `account_name`, `account_email`, and explicit `cost_usd`. The [OTLP guide](docs/otel.md) documents both payload formats and all aliases.
+
 Subscription plans can be configured locally and are used by savings calculations:
 
 ```bash
@@ -144,7 +196,7 @@ OpenRouter-style model IDs ending in `:free` are treated as zero-cost variants e
 
 ## Billing
 
-Estimated costs can be reconciled with provider billing:
+Estimated costs can be reconciled with provider billing in local mode:
 
 ```bash
 economy billing sync --days 31
@@ -164,6 +216,7 @@ Gemini billing export files may be JSON arrays, JSON objects with `rows`, JSONL,
 ```bash
 economy budget set --period monthly --limit 50 --alert 80
 economy budget set --agent codex --period weekly --limit 25 --alert 70
+economy budget set --cost-center loop:fleet-evaluator --period weekly --limit 10
 economy budget list
 economy goal set --period month --limit 40
 economy goal set --agent gemini --period week --limit 15
@@ -172,7 +225,7 @@ economy config set webhook-url https://example.com/economy-webhook
 economy config webhook-test
 ```
 
-Budgets and goals can be global, project-scoped with `--project`, agent-scoped with `--agent`, or both. Valid agent scopes are `claude`, `takumi`, `codex`, `gemini`, `opencode`, `cursor`, `pi`, and `hermes`.
+Budgets can be global, project-scoped with `--project`, agent-scoped with `--agent`, cost-center scoped with `--cost-center`, or combined. Goals can be global, project-scoped, agent-scoped, or both. Valid agent scopes are `claude`, `takumi`, `codex`, `gemini`, `opencode`, `cursor`, `pi`, and `hermes`.
 
 Budget webhooks fire after sync when the alert threshold is crossed. Failed webhook deliveries are not marked as fired, so the next sync can retry them.
 
@@ -184,35 +237,16 @@ Start the server:
 economy-serve --port 3456
 ```
 
-Common endpoints:
-
-- `GET /health`
-- `GET /api/summary?period=today`
-- `GET /api/sessions?agent=codex&account=work@example.com&limit=20`
-- `GET /api/sessions/:id/requests`
-- `GET /api/models`
-- `GET /api/projects?period=month`
-- `GET /api/breakdown?by=agent&period=month`
-- `GET /api/accounts?period=month`
-- `GET /api/usage?period=month`
-- `GET /api/savings?period=month`
-- `GET /api/subscriptions`
-- `POST /api/subscriptions`
-- `DELETE /api/subscriptions/:id`
-- `GET /api/budgets`
-- `POST /api/budgets`
-- `DELETE /api/budgets/:id`
-- `GET /api/pricing`
-- `POST /api/pricing`
-- `DELETE /api/pricing/:model`
-- `GET /api/goals`
-- `POST /api/goals`
-- `DELETE /api/goals/:id`
-- `GET /api/billing?period=month`
-- `POST /api/sync`
-- `POST /api/billing/sync`
-
-Budget, goal, and subscription mutation endpoints validate agent scopes against `claude`, `takumi`, `codex`, `gemini`, `opencode`, `cursor`, `pi`, and `hermes`.
+The canonical API uses `/v1`; `/api` remains a legacy alias for the dashboard and older clients. For example:
+
+- `GET /health`, `/ready`, `/version`, and `/openapi.json`
+- `GET /v1/summary?period=today`
+- `GET /v1/sessions?agent=codex&account=work@example.com&limit=20`
+- `GET /v1/breakdown?by=cost-center&period=month`
+- `POST /v1/budgets`, `/v1/goals`, `/v1/pricing`, and `/v1/subscriptions`
+- `POST /v1/sync`, `/v1/billing/sync`, and `/v1/ingest`
+
+See the [REST API reference](docs/rest-api.md) for every route, response envelopes, authentication, and legacy aliases. The server publishes the current generated contract at `/openapi.json`.
 
 The server also serves the built dashboard when `dashboard/dist` is present. The dashboard includes account-scoped session filtering, subscription plan create/update/delete controls in Savings, and savings/usage/account tables for subscription-aware cost analysis.
 
@@ -236,22 +270,13 @@ economy menubar stop
 economy menubar uninstall
 ```
 
-## Cloud Sync
-
-Economy can push and pull local SQLite data through `@hasna/cloud` PostgreSQL sync:
-
-```bash
-economy cloud status
-economy cloud push
-economy cloud pull
-economy cloud sync
-```
-
 ## Data Directory
 
 Data is stored in `~/.hasna/economy/`.
 
-The main SQLite database lives at `~/.hasna/economy/economy.db`. Older `~/.economy/` data is auto-migrated on first open. Override the database path with `HASNA_ECONOMY_DB_PATH` or `ECONOMY_DB`.
+The main SQLite database lives at `~/.hasna/economy/economy.db`. Older `~/.economy/` data is copied on first open when the new directory does not exist. Override the database path with `HASNA_ECONOMY_DB_PATH` or `ECONOMY_DB`.
+
+For shared deployments, CLI and MCP can use a remote `/v1` API instead of local SQLite by setting `HASNA_ECONOMY_API_URL` and `HASNA_ECONOMY_API_KEY`. See [configuration](docs/configuration.md) for client resolution, server auth, Postgres mode, and all environment variables.
 
 ## Development
 
@@ -259,6 +284,7 @@ The main SQLite database lives at `~/.hasna/economy/economy.db`. Older `~/.econo
 bun test
 bun run typecheck
 bun run build
+bun scripts/sync-openapi.ts
 cd dashboard && bun run lint
 cd menubar && swift build -c release
 ```
@@ -267,19 +293,6 @@ cd menubar && swift build -c release
 
 Economy is published under the Apache-2.0 license. See [CONTRIBUTING.md](CONTRIBUTING.md) for local development and release hygiene, [SECURITY.md](SECURITY.md) for vulnerability reporting, [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) for community expectations, and [CHANGELOG.md](CHANGELOG.md) for release notes.
 
-## HTTP mode
-
-Shared Streamable HTTP transport for multi-agent sessions (stdio remains the default):
-
-```bash
-economy-mcp --http              # http://127.0.0.1:8860/mcp
-MCP_HTTP=1 economy-mcp            # same
-economy-mcp --http --port 8815    # explicit port
-```
-
-- Health: `GET http://127.0.0.1:8860/health` -> `{"status":"ok","name":"economy"}`
-- Override port with `MCP_HTTP_PORT` or `--port`
-
 ## License
 
 Apache-2.0 -- see [LICENSE](LICENSE)

package/dashboard/README.md

@@ -1,73 +1,26 @@
-# React + TypeScript + Vite
+# Economy dashboard
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+The dashboard is the React/Vite UI served by `economy-serve`. It covers overview, sessions, models, projects, budgets, goals, usage, accounts, savings, fleet, reconciliation, pricing, and provider billing.
 
-Currently, two official plugins are available:
+## Development
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+Run the API from the repository root, then start Vite:
 
-## React Compiler
-
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
-
-```js
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-
-      // Remove tseslint.configs.recommended and replace with this
-      tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      tseslint.configs.stylisticTypeChecked,
-
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
+```bash
+economy-serve --port 3456
+cd dashboard
+bun install
+bun run dev
 ```
 
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
+The development build uses `http://localhost:3456` by default. Set `VITE_API_URL` at build/dev time to use another origin. The dashboard currently calls the server's legacy-compatible `/api` routes; the public canonical API is `/v1`.
 
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x'
-import reactDom from 'eslint-plugin-react-dom'
+## Validation
 
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
+```bash
+bun test
+bun run lint
+bun run build
 ```
+
+The root package build writes production assets to `dashboard/dist`; `economy-serve` serves those assets and provides SPA fallback routing.

package/dist/cli/commands/extras.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extras.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/extras.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAsCnC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmR/D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+B5D"}
+{"version":3,"file":"extras.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/extras.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAgDnC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyS/D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyC5D"}

package/dist/cli/commands/todos.d.ts

@@ -20,6 +20,9 @@ export declare function printTodosOverview(): void;
 export declare function printTodosList(opts: {
     phase?: string;
     status?: TodoStatus;
+    limit?: number;
+    verbose?: boolean;
+    json?: boolean;
 }): void;
 export declare function printTodoShow(taskId: string): void;
 export declare function registerTodosCommand(program: Command): void;

package/dist/cli/commands/todos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"todos.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/todos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,MAAM,CAAA;AAE3D,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,QAAQ,EAAE,CAAA;CAClB;AAED,eAAO,MAAM,eAAe,iBAAiB,CAAA;AAC7C,eAAO,MAAM,YAAY,kOACmM,CAAA;AAE5N,eAAO,MAAM,cAAc,EAAE,SAAS,EAuqBrC,CAAA;AAkBD,wBAAgB,cAAc,IAAI,IAAI,CAkCrC;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAyBzC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,CAyBlF;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAmBlD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsC3D"}
+{"version":3,"file":"todos.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/todos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,MAAM,CAAA;AAE3D,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,QAAQ,EAAE,CAAA;CAClB;AAED,eAAO,MAAM,eAAe,iBAAiB,CAAA;AAC7C,eAAO,MAAM,YAAY,kOACmM,CAAA;AAE5N,eAAO,MAAM,cAAc,EAAE,SAAS,EAuqBrC,CAAA;AAgDD,wBAAgB,cAAc,IAAI,IAAI,CAoCrC;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CA0BzC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+DrI;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAmBlD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+C3D"}