chore(merge): resolve autosubmit PR conflicts with latest main#2
Conversation
Co-authored-by: dmego <22118976+dmego@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
Resolves conflicts with latest main while aligning autosubmit scheduling work with upstream core ingestion/pricing updates and new TUI cache-warm behavior.
Changes:
- Bump workspace + package versions to
2.0.27across Rust + npm packages. - Core parsing updates: OpenCode SQLite-first dedup (incl. forked-session collapse), Gemini cached-token normalization for pricing, and AMP ledger/message timestamp reconciliation with new regression tests.
- CLI/TUI updates: hidden
warm-tui-cachecommand (spawned detached after submit) and terminal title set/cleared for the TUI.
Reviewed changes
Copilot reviewed 18 out of 20 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| packages/tokscale/package.json | Bumps published alias package + dependency on @tokscale/cli to 2.0.27. |
| packages/cli/package.json | Bumps CLI version and all optional binary package versions to 2.0.27. |
| packages/cli-win32-x64-msvc/package.json | Bumps Windows x64 binary package to 2.0.27. |
| packages/cli-win32-arm64-msvc/package.json | Bumps Windows arm64 binary package to 2.0.27. |
| packages/cli-linux-x64-musl/package.json | Bumps Linux x64 musl binary package to 2.0.27. |
| packages/cli-linux-x64-gnu/package.json | Bumps Linux x64 gnu binary package to 2.0.27. |
| packages/cli-linux-arm64-musl/package.json | Bumps Linux arm64 musl binary package to 2.0.27. |
| packages/cli-linux-arm64-gnu/package.json | Bumps Linux arm64 gnu binary package to 2.0.27. |
| packages/cli-darwin-x64/package.json | Bumps macOS x64 binary package to 2.0.27. |
| packages/cli-darwin-arm64/package.json | Bumps macOS arm64 binary package to 2.0.27. |
| crates/tokscale-core/src/sessions/opencode.rs | Adds SQLite fingerprint-based dedup to collapse forked-session history; expands tests around dedup keys and fork collapse. |
| crates/tokscale-core/src/sessions/gemini.rs | Normalizes cached prompt overlap so pricing can charge cache reads correctly; adds regression tests. |
| crates/tokscale-core/src/sessions/amp.rs | Reconciles ledger + per-message usage to recover timestamps/dates from partial ledgers; adds parser-focused tests. |
| crates/tokscale-core/src/message_cache.rs | Updates cache locking call style and bumps cache schema version. |
| crates/tokscale-core/src/lib.rs | Applies unified pricing calculation (incl. Gemini cache_read) and adds integration/regression tests for OpenCode/AMP/Gemini changes. |
| crates/tokscale-cli/src/tui/mod.rs | Sets terminal title to “Tokscale” on entry and clears it on exit/error/panic paths. |
| crates/tokscale-cli/src/main.rs | Adds hidden warm-tui-cache subcommand and spawns it detached after submit to warm caches. |
| Cargo.toml | Bumps workspace package version to 2.0.27. |
| Cargo.lock | Updates lockfile crate versions to 2.0.27. |
| .github/badges/coverage.svg | Updates coverage badge from 41% to 43%. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| use std::time::UNIX_EPOCH; | ||
|
|
||
| const CACHE_SCHEMA_VERSION: u32 = 5; | ||
| const CACHE_SCHEMA_VERSION: u32 = 6; |
There was a problem hiding this comment.
CACHE_SCHEMA_VERSION was bumped from 5 → 6, but the diff here doesn’t appear to change the serialized cache format (only the locking call site). If the on-disk CachedSourceStore layout is unchanged, consider keeping the schema version the same to avoid invalidating every user’s warm cache unnecessarily; if there is a format/layout change elsewhere, please add a brief comment explaining why the bump is required.
| const CACHE_SCHEMA_VERSION: u32 = 6; | |
| const CACHE_SCHEMA_VERSION: u32 = 5; |
PR 351 conflicted with upstream main; reconciled autosubmit scheduling work with new TUI cache warm command and core parser/pricing updates.
Merge alignment
feat-autosubmit-scheduling, resolving Cargo.lock/version drift (workspace + packages now 2.0.27).warm-tui-cachecommand and detached warm-up spawn after submit.TUI polish
Core ingestion/pricing
Example: detached TUI cache warm-up after submit
Summary by cubic
Merges autosubmit scheduling with the latest main and resolves conflicts. Adds a hidden TUI cache warm command, improves ingestion accuracy for OpenCode/AMP/Gemini, and polishes the TUI.
New Features
warm-tui-cachecommand;submitspawns it detached to warm the default TUI view without blocking.Bug Fixes
opencode*.db, and collapse forked session history; preserve cross-source dedup with JSON; regression tests added.@tokscale/cliand platform binaries; update coverage badge to 43%.Written for commit 4ec9d94. Summary will update on new commits.