mirror of
https://github.com/AgentSeal/codeburn.git
synced 2026-08-25 00:14:40 +00:00
0fee325b24
Conflict resolution rules applied: - packages/cli/src/daily-cache.ts (the only textual conflict): kept the BASE side of the version constants and their coordination comment verbatim (DAILY_CACHE_VERSION / MIN_SUPPORTED_VERSION stay at 26 — this change moves when the watermark advances, not what any cached day contains, so no re-derive is owed). Kept the BASE widened re-derive window (DAILY_CACHE_RETENTION_DAYS, with its straddle/tz comment) and layered this branch's completeness logic on top of it: capture the parse result (freshProjects) so sessionComplete() can read the tag off the exact array, priorWatermark hold-back on a partial parse, complete: parseWasComplete, and the watermarkTrusted stamp. - packages/cli/src/parser.ts: auto-merged; #929's per-call slicing and #930's discovery changes are intact, and this branch's read-only-path additions (readOnlyServedStale on the stale/missing-cache-entry arms, network providers served from cache instead of re-fetched, hydration completeness tagged onto the result array) attach to the post-#929 code paths. Re-read end to end after the merge. - packages/cli/tests/cache-refresh-lock*.test.ts, vitest.config.ts, package.json: kept the base config values (testTimeout 30s, retry 2, the lock-quarantine test/test:locks scripts, #1068's inode fix, #921's retries) and added this branch's corrupt-lock arms on top. The new describe's retry is 3, not 6, per review. Added the new corrupt-body file to test:locks: the base `test` script excludes tests/cache-refresh-lock*, so the new file would otherwise run in no suite. - Everything else auto-merged as a union; no hunk from either side dropped. |
||
|---|---|---|
| .. | ||
| antigravity-cli-current | ||
| codebuff-parity/manicode/projects/parity-proj/chats/2026-04-14T10-00-00.000Z | ||
| codewhale-parity/sessions | ||
| cursor-agent/workspace-less/projects/agent-transcripts/1031d227-0c67-4e17-8954-0b6e2b3322f0 | ||
| droid-parity/sessions/proj-a | ||
| gemini-parity | ||
| grok-parity/%2FUsers%2Ftest/019edf9c-0000-7000-8000-000000000001 | ||
| kimi-parity | ||
| kimicode-parity/home/sessions/wd_myproj_0123456789ab/session_S1 | ||
| lingtai-parity/agent-x | ||
| mux-parity | ||
| open-design/namespaces/release-stable/data/runs | ||
| openclaw-parity/.openclaw/agents/myagent/sessions | ||
| openclaw-parity-noid/.openclaw/agents/anon/sessions | ||
| pi-parity | ||
| qwen-parity/-Users-t-alpha-repo/chats | ||
| security | ||
| zerostack | ||
| cache-refresh-corrupt-owner.ts | ||
| cache-refresh-slow-owner.ts | ||
| cache-refresh-worker.ts | ||
| mock-discovery-register.mjs | ||
| mock-idp.ts | ||
| privacy-key-first-use-worker.ts | ||