Accept whole-number microcompact counts

Author: SqlRush

docs/cc-100-roadmap.md

@@ -592,7 +592,7 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：remote history response parser 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper 以及顶层 `message`/`content`/`text` envelope，可从 `message.content`、content-block array 和 `content.parts[].text` 中恢复 event page JSON（包括 fenced `json` code block），并保留 pagination 继续驱动 `before_id` 续抓。
 
-本轮补充：microcompact disk cache loader 现在读取 Go 默认、camelCase、snake_case 和相邻实现常见字段别名/包装形态，包括 `result`/`data`/`cache`/`value` wrapper、`content`/`text` summary、`cacheKey`/`key`/`hash` digest、cache-hit 别名、计数字段别名/数字字符串、RFC3339/Unix 秒/Unix 毫秒时间字段，以及 `createdAt` + `ttlSeconds`/`ttlMs`/`expiresIn`/`maxAge` 等相对 TTL 推导，提升 cached microcompact 文件在不同实现/版本间的恢复率。
+本轮补充：microcompact disk cache loader 现在读取 Go 默认、camelCase、snake_case 和相邻实现常见字段别名/包装形态，包括 `result`/`data`/`cache`/`value` wrapper、`content`/`text` summary、`cacheKey`/`key`/`hash` digest、cache-hit 别名、计数字段别名/数字字符串/whole-number JSON number、RFC3339/Unix 秒/Unix 毫秒时间字段，以及 `createdAt` + `ttlSeconds`/`ttlMs`/`expiresIn`/`maxAge` 等相对 TTL 推导，提升 cached microcompact 文件在不同实现/版本间的恢复率；fractional count 仍会被拒绝。
 
 本轮补充：microcompact disk cache loader 现在也接受 `cacheEntry`/`cache_entry`、`micro_compact`/`micro_compact_result` wrapper，以及 `summaryMarkdown`/`resultSummary`/`compressedText`、`cacheDigest`/`digestHash`/`fingerprint`、`summarizedCount`/`retainedCount`、`formatVersion` 和 `ttlMilliseconds`/`expiresInMilliseconds`/`maxAgeMilliseconds` 等相邻实现字段别名。
 

docs/claude-code-go-rewrite-plan.md

@@ -314,7 +314,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：compact runner 的 summary 响应现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper，可在构建 compact plan 前从 `message.content`、content-block array、`content.parts[].text` 和 fenced `json` code block 中恢复 visible summary text。
 - 本轮补充：remote history `SDKEvent` type 现在会把 provider-style aliases 归一化为现有 canonical 事件类型，包括 `assistant_message`/`assistant_delta`、`userMessage`/`humanMessage`、`system-event`、`result_event`/`finalResult`/`response.completed`、`errorEvent`/`failureEvent` 和 `status_update`/`statusMessage`/`progress`，single-object page 与 transcript materialization 不再因事件类型拼写相邻而丢消息。
 - 本轮补充：conversation runner 会在用户消息入队后基于 compact window 计算 token warning state，并在达到 warning/error/auto-compact/blocking 阈值时发出 `token_warning` event；warning state 接入 blocking-limit env override，auto-compact 判断接入既有 `CLAUDE_AUTOCOMPACT_PCT_OVERRIDE`，避免 warning 和 compact 阈值来源分叉。
-- 本轮补充：microcompact disk cache loader 现在读取 Go 默认、camelCase 和 snake_case 字段别名，并容忍计数字段的数字字符串，以及 RFC3339、Unix 秒、Unix 毫秒时间字段，提升 cached microcompact 文件在不同实现/版本间的恢复率。
+- 本轮补充：microcompact disk cache loader 现在读取 Go 默认、camelCase 和 snake_case 字段别名，并容忍计数字段的数字字符串、whole-number JSON number 和 whole-number 数字字符串，同时继续拒绝 fractional count，以及 RFC3339、Unix 秒、Unix 毫秒时间字段，提升 cached microcompact 文件在不同实现/版本间的恢复率。
 - 本轮补充：microcompact disk cache loader 现在接受 `cacheEntry`/`cache_entry`、`micro_compact`/`micro_compact_result` wrapper，以及 `summaryMarkdown`/`resultSummary`/`compressedText`、`cacheDigest`/`digestHash`/`fingerprint`、`summarizedCount`/`retainedCount`、`formatVersion` 和 `ttlMilliseconds`/`expiresInMilliseconds`/`maxAgeMilliseconds` 等相邻实现字段别名。
 - 本轮补充：microcompact disk cache loader 继续接受相邻 timestamp/expiry aliases，包括 `cachedAt`、`cacheCreatedAt`、`storedAt`、`generatedAt`、`updatedAt`、`timestamp`、`expiry`、`expirationTime`、`validUntil`、`notAfter`，以及 `timeToLiveSeconds`、`validForMs` 等相对 TTL 字段。
 - 本轮补充：microcompact disk cache loader 的相对 TTL 现在也接受分钟、小时和天级别名，例如 `ttlMinutes`、`expiresInHours`、`validForDays` 及 snake/camel 相邻形式，恢复 cached microcompact 过期时间时不再局限于秒/毫秒。

docs/first-second-parity-audit.md

@@ -123,7 +123,7 @@ M6 progress now includes:
 
 - `internal/memory`: recursive `.md` memory scanning, frontmatter parsing, newest-first capped manifests, root-to-leaf `CLAUDE.md` discovery/loading, and team-memory secret detection.
 - `internal/compact`: effective context window calculations, auto-compact thresholds, token warning state, compact summary prompt construction, compact API runner, compact boundary/summary plan generation, auto-compact window env override application, microcompact/cache primitives, persistent cached microcompact storage, structural/rich-content microcompact cache digests, cache version/TTL/prune handling for disk and in-memory caches, memory-cache write-through to disk, atomic cache writes, corrupt-cache fail-open behavior, and filename/digest mismatch pruning.
-- `internal/compact`: microcompact disk cache loading now accepts Go default, camelCase, snake_case, and adjacent cache field aliases/wrappers such as `result`/`data`/`cache`/`value` objects, `content`/`text` summary, `cacheKey`/`key`/`hash` digest, cache-hit aliases, numeric strings for count fields, RFC3339/Unix-seconds/Unix-millis time fields, and relative TTL fields such as `ttlSeconds`, `ttlMs`, `expiresIn`, and `maxAge`, so cached microcompact records from adjacent implementations remain usable.
+- `internal/compact`: microcompact disk cache loading now accepts Go default, camelCase, snake_case, and adjacent cache field aliases/wrappers such as `result`/`data`/`cache`/`value` objects, `content`/`text` summary, `cacheKey`/`key`/`hash` digest, cache-hit aliases, numeric strings and whole-number JSON/string numbers for count fields, RFC3339/Unix-seconds/Unix-millis time fields, and relative TTL fields such as `ttlSeconds`, `ttlMs`, `expiresIn`, and `maxAge`, so cached microcompact records from adjacent implementations remain usable.
 - `internal/compact`: microcompact disk cache loading also accepts adjacent cache-entry wrappers and aliases such as `cacheEntry`/`cache_entry`, `micro_compact`/`micro_compact_result`, `summaryMarkdown`/`resultSummary`/`compressedText`, `cacheDigest`/`digestHash`/`fingerprint`, `summarizedCount`/`retainedCount`, `formatVersion`, and millisecond TTL aliases such as `ttlMilliseconds`, `expiresInMilliseconds`, and `maxAgeMilliseconds`.
 - `internal/compact`: microcompact disk cache loading now also accepts adjacent timestamp aliases such as `cachedAt`, `cacheCreatedAt`, `storedAt`, `generatedAt`, `updatedAt`, `timestamp`, `expiry`, `expirationTime`, `validUntil`, `notAfter`, and relative TTL aliases such as `timeToLiveSeconds` and `validForMs`.
 - `internal/compact`: microcompact disk cache relative TTL loading now also accepts minute, hour, and day aliases such as `ttlMinutes`, `expiresInHours`, and `validForDays`, including adjacent snake/camel forms.
@@ -551,6 +551,7 @@ M7 progress now includes:
 - `internal/session`: prompt-history pasted image loading now accepts content-block-style `source`/`imageSource` objects, nested JSON:API/GraphQL-style source wrappers, data URL aliases, and source URL/URI/cache-path aliases; stored image entries with inline source data or a current-session image-cache file now restore base64 content into prompt image blocks instead of keeping only metadata, including same-ID cache fallback, media-type inference when history metadata omits the original MIME type, symlink escape guards before reading cached image bytes, and restored path re-indexing for later image metadata/source lookup.
 - `internal/compact`: microcompact disk cache loading now accepts broader summary-like direct and provider aliases including `body`, `markdown`, `description`/`details`, `finalSummary`, `summaryContent`, `plainText`/`displayText`, `answerText`, `refusal`, `resultText`, `completionText`, `responseText`, and `messageText`; provider summary recovery also follows wrapper-only `value`/`payload`/`data` chains without failing on non-summary metadata, preserving visible summaries through nested cache entries, JSON:API/resource envelopes, and provider-style response wrappers.
 - `internal/compact`: microcompact provider and cache summary extraction now unwraps inline fenced JSON payloads where the fence language and JSON object are on the same line, so SDK/model outputs no longer preserve the whole code fence as visible summary text.
+- `internal/compact`: microcompact count field loading now accepts whole-number JSON numbers and whole-number numeric strings, while fractional count values still fail validation.
 
 Still missing for full M6/M7 parity:
 

internal/compact/compact_test.go

@@ -314,6 +314,56 @@ func TestLoadMicroResultAcceptsAdjacentCacheFieldAliases(t *testing.T) {
 	}
 }
 
+func TestLoadMicroResultAcceptsWholeNumberCountFields(t *testing.T) {
+	cacheDir := filepath.Join(t.TempDir(), "micro")
+	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	digest := "whole-number-counts"
+	data := `{
+		"summary": "whole number counts summary",
+		"digest": "whole-number-counts",
+		"messagesSummarized": 7.0,
+		"messagesKept": "2.0",
+		"version": "microcompact.v1",
+		"createdAt": 100
+	}`
+	if err := os.WriteFile(microResultPath(cacheDir, digest), []byte(data), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	result, ok, err := LoadMicroResult(cacheDir, digest)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !ok {
+		t.Fatal("expected whole-number count cache result")
+	}
+	if result.MessagesSummarized != 7 || result.MessagesKept != 2 {
+		t.Fatalf("result = %#v", result)
+	}
+}
+
+func TestLoadMicroResultRejectsFractionalCountFields(t *testing.T) {
+	cacheDir := filepath.Join(t.TempDir(), "micro")
+	if err := os.MkdirAll(cacheDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	digest := "fractional-counts"
+	data := `{
+		"summary": "fractional counts summary",
+		"digest": "fractional-counts",
+		"messagesSummarized": 7.5,
+		"version": "microcompact.v1",
+		"createdAt": 100
+	}`
+	if err := os.WriteFile(microResultPath(cacheDir, digest), []byte(data), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	if _, _, err := LoadMicroResult(cacheDir, digest); err == nil {
+		t.Fatal("expected fractional count field to fail")
+	}
+}
+
 func TestLoadMicroResultAcceptsSummaryTextAliases(t *testing.T) {
 	cacheDir := filepath.Join(t.TempDir(), "micro")
 	if err := os.MkdirAll(cacheDir, 0o755); err != nil {

internal/compact/micro.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"math"
 	"os"
 	"path/filepath"
 	"sort"
@@ -859,23 +860,57 @@ func microParseJSONBool(raw json.RawMessage, field string) (bool, error) {
 }
 
 func microIntJSONField(fields map[string]json.RawMessage, names ...string) (int, bool, error) {
-	raw, _, ok := microRawJSONField(fields, names...)
+	raw, name, ok := microRawJSONField(fields, names...)
 	if !ok || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) {
 		return 0, false, nil
 	}
+	value, err := microParseJSONInt(raw, name)
+	if err != nil {
+		return 0, false, err
+	}
+	return value, true, nil
+}
+
+func microParseJSONInt(raw json.RawMessage, field string) (int, error) {
 	var value int
 	if err := json.Unmarshal(raw, &value); err == nil {
-		return value, true, nil
+		return value, nil
 	}
 	var text string
-	if err := json.Unmarshal(raw, &text); err != nil {
-		return 0, false, err
+	if err := json.Unmarshal(raw, &text); err == nil {
+		return microParseIntText(text, field)
 	}
-	parsed, err := strconv.Atoi(text)
+	decoder := json.NewDecoder(strings.NewReader(string(raw)))
+	decoder.UseNumber()
+	var number json.Number
+	if err := decoder.Decode(&number); err == nil {
+		return microParseIntText(number.String(), field)
+	}
+	return 0, fmt.Errorf("invalid int field %q", field)
+}
+
+func microParseIntText(text string, field string) (int, error) {
+	text = strings.TrimSpace(text)
+	if text == "" {
+		return 0, fmt.Errorf("empty int field %q", field)
+	}
+	parsed, err := strconv.ParseInt(text, 10, 0)
+	if err == nil {
+		return int(parsed), nil
+	}
+	value, err := strconv.ParseFloat(text, 64)
 	if err != nil {
-		return 0, false, err
+		return 0, err
+	}
+	if math.IsInf(value, 0) || math.IsNaN(value) || value != math.Trunc(value) {
+		return 0, fmt.Errorf("invalid int field %q: %q", field, text)
+	}
+	maxInt := int64(^uint(0) >> 1)
+	minInt := -maxInt - 1
+	if value > float64(maxInt) || value < float64(minInt) {
+		return 0, fmt.Errorf("int field %q out of range: %q", field, text)
 	}
-	return parsed, true, nil
+	return int(value), nil
 }
 
 func microTimeJSONField(fields map[string]json.RawMessage, names ...string) (time.Time, bool, error) {