Skip to content

Make Codex and Claude Code subscriptions go further: a local model router that gives routine agent work to economical models and keeps your strongest model for the hard parts.

fix: retain Jev upstream billing usage in decision logs (#32)

澄潭97607bbb51b5
diff --git a/decision-extensions/extensions/jev-decider/README.md b/decision-extensions/extensions/jev-decider/README.md
index 57074573..702e8427 100644
--- a/decision-extensions/extensions/jev-decider/README.md
+++ b/decision-extensions/extensions/jev-decider/README.md
@@ -167,6 +167,14 @@ are also recorded. Missing competence retains the existing non-blocking behavior
These explain the rule, not model-generated reasoning. Request text, credentials and
raw upstream bodies are not logged. Embedded hosts must enable `jev_decider` at INFO.
+`decision_completed.upstream_usage` preserves valid upstream-reported `input_tokens`,
+`output_tokens`, and `cost` (USD on OpenRouter), including a response whose decision
+answer is subsequently rejected. Only these numeric fields are logged; arbitrary usage
+fields are excluded. Missing/invalid usage is `null`, and omitted fields remain unknown,
+not zero. A reported zero is preserved. Usage does not alter the decision response,
+branch choice or retry behavior. Include failed-call usage when totaling decision cost;
+timeouts and rejected/malformed responses without usage cannot establish a zero charge.
+
### Running tests
The suite starts the real HTTP handler and a controlled upstream server. It does not read a real key or access the network:
diff --git a/decision-extensions/extensions/jev-decider/README.zh-CN.md b/decision-extensions/extensions/jev-decider/README.zh-CN.md
index b7aac789..e36ad339 100644
--- a/decision-extensions/extensions/jev-decider/README.zh-CN.md
+++ b/decision-extensions/extensions/jev-decider/README.zh-CN.md
@@ -114,6 +114,12 @@ HiRoute 的智能省钱计划配置:
启动日志记录智能省钱的有效定义哈希;每次决策日志记录实际 `criteria_source`(default/policy/request)和
`criteria_sha256`,不记录定义正文。比对不同实验时应同时固定需求、可见历史、定义哈希、模型和阈值。
+`decision_completed.upstream_usage` 保留上游实际报告的 `input_tokens`、`output_tokens` 和
+`cost`(OpenRouter 为美元),即使随后判定答案无效也保留,便于把失败调用纳入费用。
+仅记录这三个合法数值字段,不记录 usage 中的其他字段;缺失/非法用量为 `null`,缺字段仍是未知,
+不会补成零。上游明确报告的零会保留。用量不改变响应合同、分支选择或重试;超时及没有用量的
+拒绝/非法响应不能当作零费用。通过 `X-Jev-Decision-Id` 对应现有决策日志即可,无需新存储。
+
## 上下文边界
服务接收完整、非空的 `latest_user` 和保留的 `visible_conversation`。一次决策可能因为没有可继承分支、追加了用户消息,或 ContextHold 不再有候选保持而开始;服务不识别压缩。因此 `latest_user` 可以与上一执行轮次相同,也可以是客户端生成的摘要/继续消息,这种形状本身不是用户反馈。每个 visible 项是已封存的路由执行轮次;仅因进入下一决策边界而封存的项可以是 `unknown`,但仍可能包含可评分的实际推进。
diff --git a/decision-extensions/extensions/jev-decider/jev_decider/server.py b/decision-extensions/extensions/jev-decider/jev_decider/server.py
index 6589ae30..906eca93 100644
--- a/decision-extensions/extensions/jev-decider/jev_decider/server.py
+++ b/decision-extensions/extensions/jev-decider/jev_decider/server.py
@@ -488,10 +488,31 @@ async def _bounded_response(response: Any) -> bytes:
return bytes(body)
+def reported_usage(upstream: Any) -> dict[str, int | float] | None:
+ """Keep only reported numeric billing facts, never guess a missing charge."""
+ usage = upstream.get("usage") if isinstance(upstream, dict) else None
+ if not isinstance(usage, dict):
+ return None
+ result: dict[str, int | float] = {}
+ for name in ("input_tokens", "output_tokens"):
+ value = usage.get(name)
+ if type(value) is int and value >= 0:
+ result[name] = value
+ cost = usage.get("cost")
+ if type(cost) in (int, float) and cost >= 0:
+ try:
+ if math.isfinite(cost):
+ result["cost"] = cost
+ except OverflowError:
+ pass
+ return result or None
+
+
async def decide(request: web.Request) -> web.Response:
decision_id = uuid.uuid4().hex
started = time.monotonic()
- trace: dict[str, Any] = {"decision_id": decision_id, "phase": "authentication"}
+ trace: dict[str, Any] = {"decision_id": decision_id, "phase": "authentication",
+ "upstream_usage": None}
settings: Settings = request.app[SETTINGS]
log_event("decision_started", decision_id=decision_id, mode=settings.mode, model=settings.model)
@@ -556,6 +577,7 @@ async def decide(request: web.Request) -> web.Response:
status=502,
)
upstream = strict_json(await _bounded_response(upstream_response))
+ trace["upstream_usage"] = reported_usage(upstream)
trace["phase"] = "decision"
result = decision_response(settings, state, upstream, target_trimmed, trace)
return finish(result)
diff --git a/decision-extensions/extensions/jev-decider/tests/test_server.py b/decision-extensions/extensions/jev-decider/tests/test_server.py
index cd6db44a..e6366d7d 100644
--- a/decision-extensions/extensions/jev-decider/tests/test_server.py
+++ b/decision-extensions/extensions/jev-decider/tests/test_server.py
@@ -323,6 +323,53 @@ class DeciderHttpTests(unittest.IsolatedAsyncioTestCase):
self.assertEqual(result["error"], "upstream_timeout")
self.assertEqual(result["event"], "decision_completed")
+ async def test_logged_upstream_usage_is_reported_not_exposed_in_decision(self) -> None:
+ self.answer["usage"] = {"input_tokens": 476, "output_tokens": 0,
+ "cost": 0.000019992, "private": "USAGE_PRIVATE_SENTINEL"}
+ client = await self.client(self.settings())
+ with self.assertLogs("jev_decider", level="INFO") as captured:
+ response = await client.post("/v1/decisions", json=input_body())
+ self.assertEqual(response.status, 200)
+ self.assertEqual(await response.json(), {"branch_id": "smart_saving_simple"})
+ result = json.loads(captured.records[-1].getMessage())
+ self.assertEqual(result["decision_id"], response.headers["X-Jev-Decision-Id"])
+ self.assertEqual(result["upstream_usage"], {"input_tokens": 476, "output_tokens": 0,
+ "cost": 0.000019992})
+ self.assertNotIn("USAGE_PRIVATE_SENTINEL", " ".join(captured.output))
+ self.assertEqual(len(self.calls), 1)
+
+ async def test_missing_or_invalid_usage_never_blocks_or_invents_zero_cost(self) -> None:
+ client = await self.client(self.settings())
+ cases = [(None, None), ([], None), ("raw-usage", None), ({}, None),
+ ({"input_tokens": True, "output_tokens": -1, "cost": False}, None),
+ ({"input_tokens": 4.5, "output_tokens": "2", "cost": -1}, None),
+ ({"input_tokens": 7, "cost": float("nan")}, {"input_tokens": 7}),
+ ({"output_tokens": 2, "cost": float("inf")}, {"output_tokens": 2}),
+ ({"cost": 10 ** 309}, None),
+ ({"input_tokens": 0, "output_tokens": 0, "cost": 0},
+ {"input_tokens": 0, "output_tokens": 0, "cost": 0})]
+ for usage, expected in cases:
+ with self.subTest(usage=usage):
+ self.answer["usage"] = usage
+ with self.assertLogs("jev_decider", level="INFO") as captured:
+ response = await client.post("/v1/decisions", json=input_body())
+ self.assertEqual(response.status, 200)
+ self.assertEqual(await response.json(), {"branch_id": "smart_saving_simple"})
+ result = json.loads(captured.records[-1].getMessage())
+ self.assertEqual(result["upstream_usage"], expected)
+ self.assertEqual(len(self.calls), len(cases))
+
+ async def test_paid_usage_is_retained_when_the_upstream_choice_is_invalid(self) -> None:
+ self.answer = {"answers": {}, "usage": {"input_tokens": 120, "cost": 0.00000504}}
+ client = await self.client(self.settings())
+ with self.assertLogs("jev_decider", level="INFO") as captured:
+ response = await client.post("/v1/decisions", json=input_body())
+ self.assertEqual(response.status, 502)
+ self.assertEqual(await response.json(), {"error": "upstream_invalid"})
+ result = json.loads(captured.records[-1].getMessage())
+ self.assertEqual(result["upstream_usage"], {"input_tokens": 120, "cost": 0.00000504})
+ self.assertEqual(len(self.calls), 1)
+
async def test_openapi_route_is_served_without_legacy_aliases(self) -> None:
document = json.loads(
(Path(__file__).resolve().parents[3] / "api/decision.openapi.json").read_text()