mirror of
https://github.com/superdesigndev/treg.git
synced 2026-10-02 03:24:35 +08:00
Conflicts resolved: - resolve.py: main's authorization-method ladder (chosen_tool / chosen_secret / methods) kept, with the frozen settlement basis and async descriptor computed before `common` as before. - routers/call.py: main moved the access dry-run to application/call/access.py; the price-range and usage-settlement wording is ported there. - Migration renumbered: main shipped 0010 (oauth authorization_method), so the async task table is 0011 on top of it; docs and models references updated. - catalog_validate: PARAM_MULTIPLEXED is the union (instagram + minimax + openrouter). - catalog_ingest: main's carried-field tuple, still gated by carry_capability for `capability`. - cli: both `-p/--query` and `--authorization-method`. - Fragments (catalog, auth-secrets, data-model) keep both sections; MAP regenerated. sqlite: 2543 passed. Postgres (CI subset, local postgres:16): 269 passed.