[juliusmarminge]

Pi resolves ~ against the HOME (USERPROFILE on win32) in its own process environment. piUsageReader.directories computed that instance home but only used it for a --session-dir launch argument, so it passed HostProcess.HomeDirectory to resolvePiSessionsDir. As a result, the default ~/.pi/agent/sessions and / forms of PI_CODING_AGENT_DIR and PI_CODING_AGENT_SESSION_DIR resolved against the server's home. AgentSessionScanner's Pi terminal-session import had the same bug, since it called resolvePiSessionsDir with the server homeDir. The fix adds a small exported helper, piHome(environment, hostHome, platform), in packages/provider-pi/src/server/usage.ts, which returns the instance's HOME/USERPROFILE and falls back to the host home. Both the usage reader and the scanner now pass that home to resolvePiSessionsDir. The environment the scanner gets already merges the host environment, so when the instance sets no HOME it falls back to the host's HOME as before. The repro branch's three UsageService rows now pass. I added one instance (HOME plus PI_CODING_AGENT_DIR=/custom-pi) to the scanner's existing 'honors provider instance home directory environment variables' test; it fails on base and passes with the fix. No new regex or parser.

Fixes #34717

Reproduction on main

Commit origin/main 7462f23. Started an isolated dev server (T3CODE_DEV_SEED=0 vp run dev) whose settings.json gave the Pi provider instance one environment variable, HOME=/instance-home, with no launch arguments and no PI_CODING_AGENT_* variables. The server process's own home has no /.pi directory. Wrote one synthetic Pi session JSONL (session entry plus an assistant message with usage input 34717 and output 100, dated today) to /.pi/agent/sessions/proj/s.jsonl. Opened Usage > Tokens > 30 days in the web client: there was no Pi row, only providers from the server's home. Control: added PI_CODING_AGENT_SESSION_DIR=/.pi/agent/sessions (absolute) to the same instance and reloaded Usage: Pi appeared with 1 session and 34.8K tokens. So the session file is valid and only the home used to resolve the path is wrong. Also added three rows to the existing 'discovers Pi history in its default home and directory overrides' table in apps/server/src/usage/UsageService.test.ts (instance HOME with the default directory, with PI_CODING_AGENT_DIR=/custom-pi, and with PI_CODING_AGENT_SESSION_DIR=~/custom-sessions). Each fails on main, e.g. expected '/pi-home/.pi/agent/sessions', received '/.pi/agent/sessions'.

Evidence

Configure Pi with only an instance HOME override. Write one synthetic session under that home's default Pi sessions directory with 34,717 input and 100 output tokens, dated today. Open Usage > Tokens > 30 days, filter to Pi, and wait for the scan to finish. Both captures use Chromium at 1280×800, light theme, and fresh isolated state.

Before	After
7462f234e8: 0 tokens, 0 sessions	f3ec048244: Pi, 34.8K tokens, 1 session

Scenario and synthetic seed · Before recording · After recording

scenarios:prove exited 0: failsOnBase=true, passesOnHead=true. Captures were visually inspected.

AI-assisted; verified with the tests and tools listed above.

Not shown:

• The ~/ forms of PI_CODING_AGENT_DIR and PI_CODING_AGENT_SESSION_DIR were not exercised; this scenario covers default session discovery with an instance HOME.
• Windows USERPROFILE resolution was not exercised because this run used Linux.
• Terminal-session import also changes in this fix; this proof covers the reported Usage view only.

Tests

vp test run src/usage/UsageService.test.ts -t 'discovers Pi history' with the fix stashed: 1 failed (repro confirmed). vp test run src/usage/UsageService.test.ts src/project/AgentSessionScanner.test.ts with the fix: 120 passed. The new scanner row with the fix stashed: failed (missing pi-home workspace); with the fix: passed. vp run check:changed: format, lint, knip, graphql, typecheck (9 packages) and tests (3 files, 122 tests) all passed.

Not in this change

• The scanner's Claude/Codex home resolution (resolveClaudeConfigDir, the codex homePath) still expands ~ against the server home rather than an instance HOME; not part of this Pi report.

AI-assisted; verified with the tests and tools listed above.

[macroscopeapp]

Approvability

Verdict: Approved at f3ec048

Macroscope's review found this PR approvable — Pi usage and session discovery now use the configured instance home consistently, including Windows USERPROFILE, with the existing host-home fallback. This is a bounded local path-resolution correction without destructive or permission-changing effects.

^{You can add or adjust custom eligibility rules. Learn more.}

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.5 KiB	21.5 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	1	1	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	1	1	0 (0.0%)	8	✅

Baseline: 7462f23 · PR result: f3ec048 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

Pi session-directory resolution now uses the provider instance’s platform-aware home. Usage discovery and project scanning apply this home, with tests covering default and configured session paths.

Changes: Pi instance home session discovery

Layer / File(s)	Summary
Resolve Pi usage directories from launch home packages/provider-pi/src/server/usage.ts, apps/server/src/usage/UsageService.test.ts	piHome selects USERPROFILE on Windows or HOME on other platforms, with the host home as fallback. Usage directory resolution uses that launch home. Tests cover instance homes with default and explicit session directories.
Use instance home in project scanning apps/server/src/project/AgentSessionScanner.ts, apps/server/src/project/AgentSessionScanner.test.ts	Project scanning resolves Pi session directories using piHome. The scanner test covers a transcript beneath a tilde-expanded custom Pi directory.

Estimated code review effort: 2 (Simple) | ~12 minutes

Change: Bug fix · Severity of issue fixed: Medium

Possibly related PRs

• pingdotgg/t3code#27515: Adds Pi session discovery and defines resolvePiSessionsDir, which this change updates to use the instance home.

Suggested labels: bugfix, size:S

Suggested reviewers: stienswout, saphid, macroscopeapp

Merge Risk: Minimal · up to f3ec0

Pi usage and session import now look in the Pi instance's home, falling back to the host home. No merge-blocking risk was identified.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title names the main change: Pi usage and session import now resolve paths against the Pi instance's home instead of the server's home. It follows the conventional commit form and matches the diff…
Linked Issues check		Issue #34717 requires Usage to resolve Pi session directories against the Pi instance home. This covers the default sessions directory and the ~/ forms of PI_CODING_AGENT_DIR and PI_CODING_AGENT_SES…
Out of Scope Changes check		All changes connect to the Pi home-resolution objective. usage.ts adds the exported piHome helper and uses it in the usage reader. AgentSessionScanner.ts uses the same helper for Pi terminal-ses…
Description check		The description explains the problem, change, scope, linked issue, and verification. It identifies the root cause: Pi resolves ~ against the instance HOME, but the code used the server home. It adds…

Full details: Title check

Explanation

The title names the main change: Pi usage and session import now resolve paths against the Pi instance's home instead of the server's home. It follows the conventional commit form and matches the diff in the usage reader and AgentSessionScanner. It is specific, so the check passes.

Full details: Linked Issues check

Explanation

Issue #34717 requires Usage to resolve Pi session directories against the Pi instance home. This covers the default sessions directory and the ~/ forms of PI_CODING_AGENT_DIR and PI_CODING_AGENT_SESSION_DIR. At the reviewed head, piUsageReader.directories computes launchHome = piHome(environment, home, platform) and passes launchHome (not the host home) to resolvePiSessionsDir. piHome returns the instance HOME (USERPROFILE on win32) and falls back to the host home. The diff confirms this. The helper's Windows branch matches the issue's stated pattern. The issue lists Windows runtime scope as unknown, so it does not add a Windows requirement. Automated coverage: three UsageService rows and one AgentSessionScanner row. The PR reports that these fail on base and pass with the fix. I did not re-run the tests. The PR's real-app before/after evidence is pending. It is non-coding and does not affect this verdict. The scanner's Pi import also uses piHome, which the PR objectives describe as in scope.

Full details: Out of Scope Changes check

Explanation

All changes connect to the Pi home-resolution objective. usage.ts adds the exported piHome helper and uses it in the usage reader. AgentSessionScanner.ts uses the same helper for Pi terminal-session import. The scanner's platform local is a small refactor to avoid a second HostProcess.Platform read. UsageService.test.ts and AgentSessionScanner.test.ts add coverage for the Pi instance-home cases. The Claude/Codex home resolution is unchanged, and the PR states it is excluded. No unrelated changes were found in the reviewed diffs.

Full details: Description check

Explanation

The description explains the problem, change, scope, linked issue, and verification. It identifies the root cause: Pi resolves ~ against the instance HOME, but the code used the server home. It adds the piHome helper and applies it in the usage reader and AgentSessionScanner. It links issue #34717. The Verification section lists focused tests, a before-and-after reproduction on main, and screenshot and recording evidence. It also states that the real app’s ~/ forms, Windows USERPROFILE resolution, and terminal-session import were not tested. The PR title cannot be assessed because it was not supplied. The description says the change was AI-assisted but does not identify the model or harness. The scope section does not cite a maintainer approval comment. These gaps are minor, so the check passes.

Finishing Touches

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: factory/issue-34717
• File: .coderabbit.config.ts
• Commit: f3ec048
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: f724336a-c15d-48d7-8a9b-0a51c71ef436

Commits

Reviewing files that changed from the base of the PR and between 7462f23 and f3ec048.

Files selected for processing: 4

• apps/server/src/project/AgentSessionScanner.test.ts
• apps/server/src/project/AgentSessionScanner.ts
• apps/server/src/usage/UsageService.test.ts
• packages/provider-pi/src/server/usage.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 7 remain after this review.