[codex] fix Amp exported thread usage parsing

[makoMakoGo]

Summary

• Replace legacy Amp ~/.local/share/amp/threads/T-*.json scanning with amp threads list/export collection.
• Parse exported messages[].usage model/token/timestamp fields and let the existing pricing service calculate cost from tokens.
• Update tokscale clients to show the Amp CLI export source instead of the removed local thread path.

Root Cause

Amp no longer persists the token-bearing thread JSON files where tokscale expected them. The current usable data is available from amp threads export, so the old scanner source reported zero sessions on machines with only the new Amp storage layout.

Validation

• cargo fmt --check
• cargo test -q -p tokscale-core
• cargo test -q -p tokscale-cli
• cargo run -q -p tokscale-cli -- --client amp --json --no-spinner -> 161 Amp messages, priced from model/token usage
• cargo run -q -p tokscale-cli -- clients -> Amp source amp threads list/export, 161 messages

Summary by CodeRabbit

发行说明

• Bug 修复与改进

  • 优化了 AMP 客户端数据收集机制，提升数据准确性和可靠性
  • 改进错误处理流程，增强系统稳定性
  • 调整了特定场景下的数据采集逻辑

• 测试

  • 补充回归测试覆盖，确保数据采集的正确性

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: d23bec00-faa5-4e1e-93e2-5e86848dc987

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix-amp-export-sessions

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[gemini-code-assist]

Code Review

This pull request transitions the Amp client from scanning local JSON files to using the Amp CLI (amp threads list and amp threads export) for retrieving session data. Key changes include updating the Amp client configuration, modifying core parsing functions to return Result types for improved error handling, and implementing a new CLI-based parser in sessions/amp.rs. Feedback focuses on making the Amp CLI integration more robust by handling process failures gracefully, avoiding potential race conditions and resource leaks in temporary log file management, and optimizing performance by parallelizing thread exports.

[coderabbitai]

🧹 Nitpick comments (2)

crates/tokscale-core/src/clients.rs (1)

216-224: 💤 Low value

建议添加注释说明 Amp 配置的特殊性。

Amp 的配置与其他客户端不同：relative 指向二进制文件而非数据目录，pattern 为空。添加简短注释可以帮助未来维护者理解这是 CLI 采集方式的设计意图，而非配置错误。

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@crates/tokscale-core/src/clients.rs` around lines 216 - 224, 在 clients.rs 中为
Amp = 5 的配置添加一行简短注释，说明该变体与其他客户端不同：relative 指向 CLI 二进制而不是数据目录，pattern 为空且
parse_local/headless/submit_default 的组合表示这是通过命令行采集（而非文件系统数据目录）的特殊配置；在
Amp、PathRoot::Home、relative 和 pattern 附近插入该注释以便未来维护者理解这是设计意图而非配置错误。

crates/tokscale-core/src/sessions/amp.rs (1)

86-120: ⚖️ Poor tradeoff

run_amp 缺少超时机制，可能导致无限阻塞。

如果 amp CLI 因网络或服务端问题挂起，Command::output() 会无限等待。考虑使用超时机制（例如通过 wait_timeout crate 或 tokio::time::timeout）来避免潜在的阻塞。

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@crates/tokscale-core/src/sessions/amp.rs` around lines 86 - 120, run_amp
currently uses Command::output() and can block indefinitely; change it to spawn
the child (Command::spawn()) and implement a synchronous timeout (e.g. the
wait_timeout crate) so the child is waited on only for a bounded duration, and
if the timeout expires you kill the child and collect/return its output as an
AmpCliError indicating a timeout. Specifically: replace the Command::output()
usage in run_amp with Command::spawn(), use Child::wait_timeout(...) to wait for
the configured duration, if it returns None call Child::kill() and then
Child::wait() and read remaining stdout/stderr from the child's pipes, and
finally return Err(AmpCliError::new(...)) describing the timeout (include
AMP_COMMAND, args.join(" "), and available stdout/stderr); keep existing success
path when Child exits with success. Ensure you enable/pipe stdout and stderr on
spawn and add the wait_timeout dependency or equivalent.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@crates/tokscale-core/src/clients.rs`:
- Around line 216-224: 在 clients.rs 中为 Amp = 5
的配置添加一行简短注释，说明该变体与其他客户端不同：relative 指向 CLI 二进制而不是数据目录，pattern 为空且
parse_local/headless/submit_default 的组合表示这是通过命令行采集（而非文件系统数据目录）的特殊配置；在
Amp、PathRoot::Home、relative 和 pattern 附近插入该注释以便未来维护者理解这是设计意图而非配置错误。

In `@crates/tokscale-core/src/sessions/amp.rs`:
- Around line 86-120: run_amp currently uses Command::output() and can block
indefinitely; change it to spawn the child (Command::spawn()) and implement a
synchronous timeout (e.g. the wait_timeout crate) so the child is waited on only
for a bounded duration, and if the timeout expires you kill the child and
collect/return its output as an AmpCliError indicating a timeout. Specifically:
replace the Command::output() usage in run_amp with Command::spawn(), use
Child::wait_timeout(...) to wait for the configured duration, if it returns None
call Child::kill() and then Child::wait() and read remaining stdout/stderr from
the child's pipes, and finally return Err(AmpCliError::new(...)) describing the
timeout (include AMP_COMMAND, args.join(" "), and available stdout/stderr); keep
existing success path when Child exits with success. Ensure you enable/pipe
stdout and stderr on spawn and add the wait_timeout dependency or equivalent.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0046904f-2e3b-4958-8b99-611482899978

📥 Commits

Reviewing files that changed from the base of the PR and between 9417904 and 3a19988.

📒 Files selected for processing (5)

• crates/tokscale-cli/src/main.rs
• crates/tokscale-core/src/clients.rs
• crates/tokscale-core/src/lib.rs
• crates/tokscale-core/src/scanner.rs
• crates/tokscale-core/src/sessions/amp.rs

[makoMakoGo]

Addressed the Amp client config nitpick by documenting that the configured path is only a local CLI marker and that usage is collected through amp threads list/export.

I am intentionally not adding a timeout to run_amp in this PR. A fixed timeout would introduce a new command boundary without an agreed value, and a slow or failing Amp export should remain visible as an explicit error rather than being converted into silent partial data.