Commit 128abb4
Merge upstream waypoint C (kenn-io kenn-io#991 export v1 + kit-ui/service layer)
Waypoint C of the staged upstream catch-up (specs/merge-upstream-waypoints.md).
Merges u/main up to 725a3d0 (126 commits: export v1 foundation, the
export.PricingResolver cost model, a service layer for usage summaries, the
kit-ui component library + TopBar/theme, i18n, pairwise usage comparison, new
Activity/RecentEdits nav) into our branch.
Pricing (thread the fork's 1h cache-write rate through export.PricingResolver
without touching the frozen export v1 wire contract):
- Add an internal, non-serialized CacheWrite1hPerMTok to export.ModelRates
(no canonical_json key, no EffectiveModelRate field -> digest/wire stay
byte-identical), populated from db.ModelPricing.CacheCreation1hPerMTok in
loadPricingMap/modelPricingRates with the defensive 5m fallback.
- Restore the 5m/1h split in dailyUsageAmounts and sessionRowCost via a new
parseEphemeralCacheSplit helper (upstream's rewritten token parser skips the
nested cache_creation object), computing cost inline so 1h bills at its rate.
- Drop the now-orphaned db.modelRates struct; the export resolver is the single
cost source.
Usage summary: re-home the snapshot exporter's BuildUsageSummary onto the new
service layer (service.BuildUsageSummaryResult + usageSummaryResponseFromService),
since the fold*/computeCacheStats helpers moved into internal/service.
Frontend: adopt kit-ui's TopBar header, filtering the nav `tabs` to hide
curation routes in snapshot mode (replaces the old {#if !SNAPSHOT} nav);
adopt kit-ui theme getters/setters in ui.svelte.ts; keep the fork's 24-color
golden-angle + org-theming projectColor over kit-ui's hashColor; coexist the
longestPrompts panel with the new pairwise-comparison panel in the usage store
(Endpoint now spans summary|comparison|pairwise|topSessions|longestPrompts).
CLI: `usage projects` and `usage longest-prompts` adopt the paired
--format/--json convention upstream now enforces.
Deferred (unchanged from B): 1h-cache parity for the PostgreSQL and DuckDB cost
paths; SetSessionPrivate stays read-only on the PG store.
Green: go build/vet/test (except the snapshot test needing a git `origin`
remote), svelte-check, 1770 vitest tests, make build.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>926 files changed
Lines changed: 163369 additions & 30547 deletions
File tree
- .agents/skills
- localization-paraglide
- agents
- references
- testing-without-tautologies
- agents
- .claude/skills
- .github/workflows
- cmd
- agentsview
- testdata
- benchgate
- testfixture
- desktop
- scripts
- src-tauri
- capabilities
- src
- docs
- assets
- internal
- screenshots
- tests
- scripts
- frontend
- e2e
- helpers
- pages
- messages
- project.inlang
- scripts
- src
- lib
- api
- generated
- models
- services
- types
- components
- activity
- analytics
- command-palette
- common
- content
- debug
- filters
- import
- insights
- layout
- modals
- pinned
- recentedits
- settings
- sidebar
- system
- trash
- trends
- usage
- i18n
- stores
- utils
- virtual
- internal
- activity
- config
- cursorusage
- testdata
- dbtest
- db
- git
- duckdb
- export
- importer
- insight
- mcp
- parsertest
- parser
- postgres
- pricing
- remotesync
- server
- service
- sessionwatch
- ssh
- sync
- timeutil
- scripts
- testdata/golden
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
Lines changed: 180 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
0 commit comments