Merge pull request 'Add the usage split fields to the TypeScript contract authority (N3 WP6)' (#24 ) from feature/n3-usage-fields-ts into main

Add the usage split fields to the TypeScript contract authority (N3 WP6)
2026-10-07 17:41:26 +00:00 · 2026-10-07 17:41:21 +00:00 · 2026-10-07 17:04:22 +00:00 · 2026-10-07 16:34:27 +00:00 · 2026-10-06 03:09:54 +00:00 · 2026-10-05 12:29:42 +00:00
3 changed files with 21 additions and 2 deletions
@@ -2,5 +2,12 @@

 - 用途：见 README。定位与边界见设计文档（Agent-System-Documents）。
 - 技术栈：Go（静态链接，CGO_ENABLED=0）
- 构建/验证：见仓内 Makefile 或 Dev 仓顶层 Makefile（待 P1 起补充并保持本节同步）。
- 状态：P0 骨架；当前阶段见 Dev 仓任务记录。
+
+## 验证
+
+在本仓根目录执行 `go test ./...` 验证 Go 契约与不变量；纯文档修改执行
+`git diff --check` 并核对受影响链接、命令和来源。本仓没有 Makefile。
+
+修改 `ts/types.ts` 后在 Dev 仓运行 `make contracts` 同步消费者，再以 `make test`
+验证固定组件组合；单独运行 Core 测试不能代替提供方与消费者的兼容验证。
+本仓提供公共契约，不是独立部署服务；当前能力以源码和对应验证记录为准。
@@ -208,6 +208,12 @@ type Usage struct {
 	TotalTokens      int     `json:"totalTokens"`
 	DurationMs       float64 `json:"durationMs"`
 	ToolCalls        int     `json:"toolCalls"`
+	// 以下四项是 N3 的计费拆分（additive；旧记录为零值省略）：
+	// Last* 是最近一次请求的用量（上一请求），Cache* 是缓存命中累计。
+	LastPromptTokens     int `json:"lastPromptTokens,omitempty"`
+	LastCompletionTokens int `json:"lastCompletionTokens,omitempty"`
+	CacheReadTokens      int `json:"cacheReadTokens,omitempty"`
+	CacheWriteTokens     int `json:"cacheWriteTokens,omitempty"`
 	// Model 是实际给出这段用量的模型。空表示当时没有记录。
 	Model string `json:"model,omitempty"`
 }
@@ -59,6 +59,12 @@ export interface Usage {
  promptTokens: number; completionTokens: number; totalTokens: number;
  durationMs: number; toolCalls: number;
  model?: string;
+  // N3 计费拆分（additive；旧记录缺省为 0）：
+  // Last* 是最近一次请求的用量，Cache* 是缓存命中累计。
+  lastPromptTokens?: number;
+  lastCompletionTokens?: number;
+  cacheReadTokens?: number;
+  cacheWriteTokens?: number;
 }

 export interface Run {
Author	SHA1	Message	Date
weichen	a253a40b8e	Merge pull request 'Add the usage split fields to the TypeScript contract authority (N3 WP6)' (#24 ) from feature/n3-usage-fields-ts into main Add the usage split fields to the TypeScript contract authority (N3 WP6)	2026-10-07 17:41:26 +00:00
weichen	b8913dca6a	Add the usage split fields to the TypeScript contract authority (N3 WP6) Why: frontend and ui contracts.ts are generated from this file by make contracts; editing the generated copies directly gets reverted by the next codegen run (the Dev CI build step proves it regenerates). Evidence: GOWORK=off go test green; the shape matches the Go Usage fields added earlier. Impact: additive to the contract mirror. Refs: Agent-System-Core#2, Agent-System-Frontend#48	2026-10-07 17:41:21 +00:00
weichen	1b7e2c0f47	Merge pull request 'Add last-request and cache fields to Usage (N3 WP6)' (#23 ) from feature/n3-usage-fields into main Add last-request and cache fields to Usage (N3 WP6)	2026-10-07 17:04:22 +00:00
weichen	8a3ff92518	Add last-request and cache fields to Usage (N3 WP6) Why: the loop now emits Last* and cache token usage; the product run record needs the same fields for display and accounting (additive JSON, old records deserialize as zero values). Evidence: GOWORK=off go build + go test green. Impact: additive only. Refs: Agent-Native#35, N3 plan WP6	2026-10-07 16:34:27 +00:00
weichen	f4798ac852	Merge pull request 'Document executable Core verification commands' (#22 ) from feature/governance-docs into main	2026-10-06 03:09:54 +00:00
weichen	cf2615def6	Document executable Core verification commands Why: project facts pointed to a nonexistent Makefile and retained obsolete skeleton status. Evidence: SELF go test ./... and git diff --check completed in this component worktree. Impact: documentation only; does not advance the Dev Core gitlink or change public contracts. Refs: Agent-System-Dev feature/governance-reliability audit remediation	2026-10-05 12:29:42 +00:00
weichen	b12f9e29e6	Extend messages and context observation for variants Merge pull request 'Extend messages and context observation for variants' (#21) from feature/sillytavern-review into main	2026-10-04 19:44:55 +00:00