mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
445 lines
13 KiB
TypeScript
445 lines
13 KiB
TypeScript
import { mkdtempSync, rmSync } from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { afterEach, describe, expect, it } from 'vitest'
|
|
import Database from '../sqlite/sync-database'
|
|
import { createUsageWorktreeResolver } from '../usage/usage-worktree-resolver'
|
|
import { parseOpenCodeUsageRow } from './opencode-usage-row-parsing'
|
|
import { selectUsageRows } from './opencode-usage-row-queries'
|
|
import {
|
|
OPENCODE_USAGE_FIXTURE_EPOCH_MS,
|
|
writeOpenCodeUsageDatabase,
|
|
type OpenCodeUsageFixtureSpec
|
|
} from './opencode-usage-sqlite-fixture'
|
|
import { parseOpenCodeUsageDatabase } from './scanner'
|
|
|
|
const WORKTREE = '/workspace/repo'
|
|
|
|
let tempDirs: string[] = []
|
|
|
|
afterEach(() => {
|
|
for (const dir of tempDirs) {
|
|
rmSync(dir, { recursive: true, force: true })
|
|
}
|
|
tempDirs = []
|
|
})
|
|
|
|
function createFixture(spec: OpenCodeUsageFixtureSpec): string {
|
|
const dir = mkdtempSync(join(tmpdir(), 'orca-opencode2-usage-'))
|
|
tempDirs.push(dir)
|
|
const path = join(dir, 'opencode.db')
|
|
writeOpenCodeUsageDatabase(path, spec)
|
|
return path
|
|
}
|
|
|
|
function readEvents(dbPath: string) {
|
|
const db = new Database(dbPath, { readonly: true, fileMustExist: true })
|
|
try {
|
|
return selectUsageRows(db).flatMap((row) => parseOpenCodeUsageRow(row) ?? [])
|
|
} finally {
|
|
db.close()
|
|
}
|
|
}
|
|
|
|
async function worktreeResolver() {
|
|
return createUsageWorktreeResolver([
|
|
{
|
|
repoId: 'repo-1',
|
|
worktreeId: 'repo-1::/workspace/repo',
|
|
path: WORKTREE,
|
|
displayName: 'Repo'
|
|
}
|
|
])
|
|
}
|
|
|
|
describe('OpenCode 2 session_v2 usage', () => {
|
|
it('reads sessions that exist only in session_v2', () => {
|
|
const path = createFixture({
|
|
generation: 'v2-only',
|
|
v2Sessions: [
|
|
{
|
|
id: 'ses_v2_1',
|
|
directory: WORKTREE,
|
|
cost: 0.5,
|
|
tokensInput: 100,
|
|
tokensOutput: 20,
|
|
tokensReasoning: 5,
|
|
tokensCacheRead: 900,
|
|
tokensCacheWrite: 300
|
|
}
|
|
]
|
|
})
|
|
|
|
expect(readEvents(path)).toEqual([
|
|
expect.objectContaining({
|
|
sessionId: 'ses_v2_1',
|
|
cwd: WORKTREE,
|
|
model: 'anthropic/claude-sonnet-4-5',
|
|
estimatedCostUsd: 0.5,
|
|
inputTokens: 1300,
|
|
outputTokens: 20,
|
|
reasoningOutputTokens: 5,
|
|
cachedInputTokens: 1200,
|
|
totalTokens: 1325
|
|
})
|
|
])
|
|
})
|
|
|
|
it('includes cache read and cache write tokens in the session total', () => {
|
|
const path = createFixture({
|
|
generation: 'v2-only',
|
|
v2Sessions: [
|
|
{
|
|
id: 'ses_cache',
|
|
directory: WORKTREE,
|
|
tokensInput: 10,
|
|
tokensOutput: 1,
|
|
tokensCacheRead: 5_000,
|
|
tokensCacheWrite: 2_000
|
|
}
|
|
]
|
|
})
|
|
|
|
const [event] = readEvents(path)
|
|
expect(event?.cachedInputTokens).toBe(7_000)
|
|
expect(event?.inputTokens).toBe(7_010)
|
|
expect(event?.totalTokens).toBe(7_011)
|
|
})
|
|
|
|
it('counts a migrated session once, from session_v2', () => {
|
|
const shared = {
|
|
id: 'ses_shared',
|
|
directory: WORKTREE,
|
|
tokensInput: 100,
|
|
tokensCacheRead: 40
|
|
}
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [shared],
|
|
v2Sessions: [
|
|
{ ...shared, tokensInput: 180, tokensCacheRead: 60 },
|
|
{ id: 'ses_v2_only', directory: WORKTREE, tokensInput: 7 }
|
|
]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events.map((event) => event.sessionId)).toEqual(['ses_shared', 'ses_v2_only'])
|
|
expect(events[0]?.inputTokens).toBe(240)
|
|
expect(events[0]?.cachedInputTokens).toBe(60)
|
|
})
|
|
|
|
it('keeps the legacy totals when session_v2 lacks the token columns', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
v2WithoutTokenColumns: true,
|
|
legacySessions: [{ id: 'ses_shared', directory: WORKTREE, tokensInput: 1000, cost: 5 }],
|
|
v2Sessions: [{ id: 'ses_shared', directory: WORKTREE }]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events.map((event) => event.sessionId)).toEqual(['ses_shared'])
|
|
expect(events[0]?.inputTokens).toBe(1000)
|
|
expect(events[0]?.estimatedCostUsd).toBe(5)
|
|
})
|
|
|
|
it('keeps the legacy totals when the migration recomputed session_v2 lower', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
// Migration drops undecodable messages, so v2 totals may be lower than frozen v1 totals.
|
|
legacySessions: [{ id: 'ses_shared', directory: WORKTREE, tokensInput: 900 }],
|
|
v2Sessions: [{ id: 'ses_shared', directory: WORKTREE, tokensInput: 120 }]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events.map((event) => event.sessionId)).toEqual(['ses_shared'])
|
|
expect(events[0]?.inputTokens).toBe(900)
|
|
})
|
|
|
|
it('resolves an identical migrated copy to session_v2', () => {
|
|
const shared = { id: 'ses_shared', directory: WORKTREE, tokensInput: 64 }
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [{ ...shared, model: '{"providerID":"anthropic","modelID":"legacy"}' }],
|
|
v2Sessions: [{ ...shared, model: '{"providerID":"anthropic","modelID":"v2"}' }]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events.map((event) => event.sessionId)).toEqual(['ses_shared'])
|
|
expect(events[0]?.inputTokens).toBe(64)
|
|
expect(events[0]?.model).toContain('v2')
|
|
})
|
|
|
|
it('keeps legacy sessions that never migrated', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [{ id: 'ses_legacy_only', directory: WORKTREE, tokensInput: 42 }],
|
|
v2Sessions: [{ id: 'ses_v2_1', directory: WORKTREE, tokensInput: 9 }]
|
|
})
|
|
|
|
expect(
|
|
readEvents(path)
|
|
.map((event) => event.sessionId)
|
|
.sort()
|
|
).toEqual(['ses_legacy_only', 'ses_v2_1'])
|
|
})
|
|
|
|
it('still reads an OpenCode 1 database unchanged', () => {
|
|
const path = createFixture({
|
|
generation: 'v1',
|
|
legacySessions: [
|
|
{
|
|
id: 'ses_v1',
|
|
directory: WORKTREE,
|
|
cost: 1.25,
|
|
tokensInput: 11,
|
|
tokensOutput: 3,
|
|
tokensCacheRead: 7,
|
|
tokensCacheWrite: 2
|
|
}
|
|
]
|
|
})
|
|
|
|
expect(readEvents(path)).toEqual([
|
|
expect.objectContaining({
|
|
sessionId: 'ses_v1',
|
|
estimatedCostUsd: 1.25,
|
|
inputTokens: 20,
|
|
outputTokens: 3,
|
|
cachedInputTokens: 9,
|
|
totalTokens: 23
|
|
})
|
|
])
|
|
})
|
|
|
|
it('reads assistant session_message rows when session_v2 carries no totals', () => {
|
|
const path = createFixture({
|
|
generation: 'v2-only',
|
|
v2Sessions: [{ id: 'ses_msg', directory: WORKTREE }]
|
|
})
|
|
const db = new Database(path)
|
|
db.prepare(
|
|
`INSERT INTO session_message (id, session_id, type, seq, time_created, time_updated, data)
|
|
VALUES ('msg-1', 'ses_msg', 'assistant', 1, ?, ?, ?)`
|
|
).run(
|
|
OPENCODE_USAGE_FIXTURE_EPOCH_MS,
|
|
OPENCODE_USAGE_FIXTURE_EPOCH_MS,
|
|
JSON.stringify({
|
|
tokens: { input: 60, output: 4, reasoning: 0, cache: { read: 12, write: 3 } },
|
|
cost: 0.02,
|
|
time: { created: OPENCODE_USAGE_FIXTURE_EPOCH_MS }
|
|
})
|
|
)
|
|
db.close()
|
|
|
|
expect(readEvents(path)).toEqual([
|
|
expect.objectContaining({ sessionId: 'ses_msg', inputTokens: 75, cachedInputTokens: 15 })
|
|
])
|
|
})
|
|
|
|
it('attributes session_v2 usage to the worktree that ran it', async () => {
|
|
const path = createFixture({
|
|
generation: 'v2-only',
|
|
v2Sessions: [
|
|
{ id: 'ses_in_worktree', directory: WORKTREE, tokensInput: 30 },
|
|
{ id: 'ses_elsewhere', directory: '/elsewhere/project', tokensInput: 40 }
|
|
]
|
|
})
|
|
|
|
const parsed = await parseOpenCodeUsageDatabase(path, await worktreeResolver())
|
|
const byId = new Map(parsed.sessions.map((session) => [session.sessionId, session]))
|
|
expect(byId.get('ses_in_worktree')).toMatchObject({
|
|
primaryWorktreeId: 'repo-1::/workspace/repo',
|
|
primaryRepoId: 'repo-1',
|
|
primaryProjectLabel: 'Repo',
|
|
totalInputTokens: 30
|
|
})
|
|
expect(byId.get('ses_elsewhere')).toMatchObject({
|
|
primaryWorktreeId: null,
|
|
primaryRepoId: null,
|
|
totalInputTokens: 40
|
|
})
|
|
})
|
|
|
|
it('keeps a session that only session_v2 has when a legacy twin is absent', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [{ id: 'ses_shared', directory: WORKTREE, tokensInput: 5 }],
|
|
v2Sessions: [
|
|
{ id: 'ses_shared', directory: WORKTREE, tokensInput: 5 },
|
|
{ id: 'ses_v2_only', directory: WORKTREE, cost: 3.25, tokensInput: 70 }
|
|
]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
const v2Only = events.find((event) => event.sessionId === 'ses_v2_only')
|
|
expect(v2Only).toMatchObject({ inputTokens: 70, estimatedCostUsd: 3.25, cwd: WORKTREE })
|
|
})
|
|
|
|
it('falls back to the project worktree when the session has no directory', async () => {
|
|
const path = createFixture({
|
|
generation: 'v2-only',
|
|
worktree: WORKTREE,
|
|
v2Sessions: [{ id: 'ses_no_dir', directory: '', tokensInput: 15 }]
|
|
})
|
|
|
|
const parsed = await parseOpenCodeUsageDatabase(path, await worktreeResolver())
|
|
expect(parsed.sessions[0]).toMatchObject({
|
|
sessionId: 'ses_no_dir',
|
|
primaryWorktreeId: 'repo-1::/workspace/repo'
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('OpenCode 2 migrated session column merge', () => {
|
|
const SHARED = 'ses_shared'
|
|
|
|
it('keeps a recorded cost the recomputed session_v2 row lost', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [{ id: SHARED, directory: WORKTREE, tokensInput: 100, cost: 12.5 }],
|
|
v2Sessions: [{ id: SHARED, directory: WORKTREE, tokensInput: 200, cost: 0 }]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events).toHaveLength(1)
|
|
expect(events[0]?.inputTokens).toBe(200)
|
|
expect(events[0]?.estimatedCostUsd).toBe(12.5)
|
|
})
|
|
|
|
it('attributes usage to the directory session_v2 records now', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [
|
|
{ id: SHARED, directory: '/old/pre-migration-path', title: 'Old title', tokensInput: 900 }
|
|
],
|
|
v2Sessions: [
|
|
{ id: SHARED, directory: '/new/current-path', title: 'New title', tokensInput: 120 }
|
|
]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events).toHaveLength(1)
|
|
expect(events[0]?.inputTokens).toBe(900)
|
|
expect(events[0]?.cwd).toBe('/new/current-path')
|
|
})
|
|
|
|
it('keeps the model session_v2 derived when the legacy row has none', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
// Migration derives a missing v1 model from the last user message.
|
|
legacySessions: [{ id: SHARED, directory: WORKTREE, model: null, tokensInput: 900 }],
|
|
v2Sessions: [
|
|
{
|
|
id: SHARED,
|
|
directory: WORKTREE,
|
|
model: '{"providerID":"anthropic","modelID":"claude-opus-4-1"}',
|
|
tokensInput: 120
|
|
}
|
|
]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events).toHaveLength(1)
|
|
expect(events[0]?.inputTokens).toBe(900)
|
|
expect(events[0]?.model).toBe('anthropic/claude-opus-4-1')
|
|
})
|
|
|
|
it('takes each usage column from whichever generation recorded more', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [
|
|
{ id: SHARED, directory: WORKTREE, tokensInput: 1000, tokensCacheRead: 0, cost: 1 }
|
|
],
|
|
v2Sessions: [
|
|
{ id: SHARED, directory: WORKTREE, tokensInput: 0, tokensCacheRead: 1200, cost: 2 }
|
|
]
|
|
})
|
|
|
|
const events = readEvents(path)
|
|
expect(events).toHaveLength(1)
|
|
expect(events[0]).toMatchObject({
|
|
inputTokens: 2200,
|
|
cachedInputTokens: 1200,
|
|
estimatedCostUsd: 2,
|
|
totalTokens: 2200
|
|
})
|
|
})
|
|
|
|
it('resolves a faithful migrated copy exactly as the v2 row alone', () => {
|
|
const session = {
|
|
id: SHARED,
|
|
directory: WORKTREE,
|
|
cost: 0.75,
|
|
tokensInput: 100,
|
|
tokensOutput: 20,
|
|
tokensReasoning: 5,
|
|
tokensCacheRead: 900,
|
|
tokensCacheWrite: 300
|
|
}
|
|
const migrated = readEvents(
|
|
createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [session],
|
|
v2Sessions: [session]
|
|
})
|
|
)
|
|
|
|
expect(migrated).toEqual(
|
|
readEvents(createFixture({ generation: 'v2-only', v2Sessions: [session] }))
|
|
)
|
|
})
|
|
|
|
it('leaves an OpenCode 1-only database untouched by the merge', () => {
|
|
const path = createFixture({
|
|
generation: 'v1',
|
|
legacySessions: [
|
|
{
|
|
id: 'ses_v1',
|
|
directory: WORKTREE,
|
|
cost: 1.25,
|
|
tokensInput: 11,
|
|
tokensOutput: 3,
|
|
tokensCacheRead: 7,
|
|
tokensCacheWrite: 2
|
|
}
|
|
]
|
|
})
|
|
|
|
expect(readEvents(path)).toEqual([
|
|
expect.objectContaining({
|
|
sessionId: 'ses_v1',
|
|
cwd: WORKTREE,
|
|
model: 'anthropic/claude-sonnet-4-5',
|
|
estimatedCostUsd: 1.25,
|
|
inputTokens: 20,
|
|
outputTokens: 3,
|
|
cachedInputTokens: 9,
|
|
totalTokens: 23
|
|
})
|
|
])
|
|
})
|
|
|
|
it('emits exactly one row per session id across both generations', () => {
|
|
const path = createFixture({
|
|
generation: 'migrated',
|
|
legacySessions: [
|
|
{ id: SHARED, directory: WORKTREE, tokensInput: 900 },
|
|
{ id: 'ses_legacy_only', directory: WORKTREE, tokensInput: 42 }
|
|
],
|
|
v2Sessions: [
|
|
{ id: SHARED, directory: WORKTREE, tokensInput: 120 },
|
|
{ id: 'ses_v2_only', directory: WORKTREE, tokensInput: 7 }
|
|
]
|
|
})
|
|
|
|
const db = new Database(path, { readonly: true, fileMustExist: true })
|
|
try {
|
|
const ids = selectUsageRows(db).map((row) => row.id)
|
|
expect(ids).toHaveLength(3)
|
|
expect(new Set(ids).size).toBe(3)
|
|
} finally {
|
|
db.close()
|
|
}
|
|
})
|
|
})
|