diff --git a/CHANGELOG.md b/CHANGELOG.md index 333c24a..2e9c4ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ The version on `main` is always the next release. The first change to what ships `Cargo.toml`, `Cargo.lock`) after a release bumps it one step and opens its section here, and later changes add to that section until it ships; `scripts/version-check.py` holds them to it. +## [0.1.7] + +### Added + +- The dock has a **USAGE** section between MODEL and SESSION while a ChatGPT or Copilot plan reports + what is left of it. Each window the plan has gets a row with a bar, the share used and, when the + provider says, the time until it resets, such as `weekly ▓▓▓░░░░░░░ 30% · 3d 4h`. + ## [0.1.6] ### Added diff --git a/Cargo.lock b/Cargo.lock index 2c1cf9d..e7e81e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1690,7 +1690,7 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "luxe-cli" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "async-trait", @@ -1723,7 +1723,7 @@ dependencies = [ [[package]] name = "luxe-core" -version = "0.1.6" +version = "0.1.7" dependencies = [ "async-trait", "base16ct", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "luxe-dap" -version = "0.1.6" +version = "0.1.7" dependencies = [ "async-trait", "luxe-core", @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "luxe-lsp" -version = "0.1.6" +version = "0.1.7" dependencies = [ "async-trait", "base16ct", @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "luxe-mcp" -version = "0.1.6" +version = "0.1.7" dependencies = [ "async-trait", "futures-util", @@ -1812,7 +1812,7 @@ dependencies = [ [[package]] name = "luxe-providers" -version = "0.1.6" +version = "0.1.7" dependencies = [ "async-trait", "base64", @@ -1831,7 +1831,7 @@ dependencies = [ [[package]] name = "luxe-remote" -version = "0.1.6" +version = "0.1.7" dependencies = [ "axum", "base16ct", @@ -1854,7 +1854,7 @@ dependencies = [ [[package]] name = "luxe-tools" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "async-trait", @@ -1880,7 +1880,7 @@ dependencies = [ [[package]] name = "luxe-tui" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "arboard", diff --git a/Cargo.toml b/Cargo.toml index e9833ab..920bc9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["crates/*"] # Every crate here releases together from one workspace, so the versions move in lockstep and each # crate inherits this one. The internal `path` dependencies carry the same number explicitly — cargo # uses the path locally and the version on crates.io, and refuses to publish a path dep without one. -version = "0.1.6" +version = "0.1.7" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/evanwhittaker/luxe" diff --git a/crates/luxe-cli/Cargo.toml b/crates/luxe-cli/Cargo.toml index fd4e0c6..6263d62 100644 --- a/crates/luxe-cli/Cargo.toml +++ b/crates/luxe-cli/Cargo.toml @@ -18,14 +18,14 @@ name = "luxe" path = "src/main.rs" [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } -luxe-providers = { path = "../luxe-providers", version = "0.1.6" } -luxe-tools = { path = "../luxe-tools", version = "0.1.6" } -luxe-lsp = { path = "../luxe-lsp", version = "0.1.6" } -luxe-dap = { path = "../luxe-dap", version = "0.1.6" } -luxe-mcp = { path = "../luxe-mcp", version = "0.1.6" } -luxe-tui = { path = "../luxe-tui", version = "0.1.6" } -luxe-remote = { path = "../luxe-remote", version = "0.1.6", optional = true } +luxe-core = { path = "../luxe-core", version = "0.1.7" } +luxe-providers = { path = "../luxe-providers", version = "0.1.7" } +luxe-tools = { path = "../luxe-tools", version = "0.1.7" } +luxe-lsp = { path = "../luxe-lsp", version = "0.1.7" } +luxe-dap = { path = "../luxe-dap", version = "0.1.7" } +luxe-mcp = { path = "../luxe-mcp", version = "0.1.7" } +luxe-tui = { path = "../luxe-tui", version = "0.1.7" } +luxe-remote = { path = "../luxe-remote", version = "0.1.7", optional = true } # The pairing QR in the terminal. Without its defaults it is the encoder and text renderer alone, # with no dependencies. qrcode = { version = "0.14", default-features = false, optional = true } diff --git a/crates/luxe-cli/src/guide.md b/crates/luxe-cli/src/guide.md index d5add94..0625ef1 100644 --- a/crates/luxe-cli/src/guide.md +++ b/crates/luxe-cli/src/guide.md @@ -2493,6 +2493,7 @@ conversation, or in its place below 80 columns. | **FILES** | The project as a tree, with what changed marked in it. Click a file to [preview](#preview) it. | | **ELSEWHERE** | Files the session changed outside the project, when there are any | | **MODEL** | The provider, model, thinking level and [mode](agent.md#plan-then-build). Click the provider or the model to change it, or the mode to switch it. | +| **USAGE** | What is left of a ChatGPT or Copilot plan, one row for each window the plan has: a bar, the share used and, when the provider says, the time until it resets. It shows only once the plan has reported, after your first reply, and never on an API key. | | **SESSION** | Context used, tokens and cost, with what a review and compaction cost on rows of their own. A review's row shows its full cost once its guide or drafted summary is done. While a phone or another client has [joined](remote.md), a **joined** row names it. | `alt+d` shows or hides the dock, and `/dock left` or `/dock right` moves it. To set it for good: @@ -3337,7 +3338,8 @@ Usage on a ChatGPT or Copilot subscription is counted in full but never added to `plan ≈$0.42 of usage over 12 calls, covered by your subscription`. On a ChatGPT plan, the statusline shows how much of the plan is used, such as `12% weekly`, and `/cost` shows when it resets. On a Copilot plan it shows the month's allowance the same way, such as `19% -monthly`. +monthly`. The dock's [USAGE section](interface.md#the-dock) shows the same windows as a bar, with the +time until each resets when the provider says. luxe prices Copilot usage at Copilot's per-token rates, so the figure matches what Copilot reports for each request. A Copilot plan billed by the token spends its monthly allowance at those rates. diff --git a/crates/luxe-dap/Cargo.toml b/crates/luxe-dap/Cargo.toml index eff339b..9f100d0 100644 --- a/crates/luxe-dap/Cargo.toml +++ b/crates/luxe-dap/Cargo.toml @@ -11,7 +11,7 @@ homepage.workspace = true # Provides a native Debug Adapter Protocol client + the `debug` tool. [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-lsp/Cargo.toml b/crates/luxe-lsp/Cargo.toml index f4c7966..4c08a53 100644 --- a/crates/luxe-lsp/Cargo.toml +++ b/crates/luxe-lsp/Cargo.toml @@ -11,7 +11,7 @@ homepage.workspace = true # Provides a generic LSP client (rust-analyzer first). [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-mcp/Cargo.toml b/crates/luxe-mcp/Cargo.toml index 1f84fd1..3cd850a 100644 --- a/crates/luxe-mcp/Cargo.toml +++ b/crates/luxe-mcp/Cargo.toml @@ -13,7 +13,7 @@ homepage.workspace = true # no-HTTP rule forbids in core itself. The low-level stdio transport stays in luxe-core. [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-providers/Cargo.toml b/crates/luxe-providers/Cargo.toml index af5cf69..7c88b38 100644 --- a/crates/luxe-providers/Cargo.toml +++ b/crates/luxe-providers/Cargo.toml @@ -11,7 +11,7 @@ homepage.workspace = true # Provides LLM provider adapters (OpenAI-compat, Anthropic, Gemini). [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-remote/Cargo.toml b/crates/luxe-remote/Cargo.toml index 8a7cd72..39978b0 100644 --- a/crates/luxe-remote/Cargo.toml +++ b/crates/luxe-remote/Cargo.toml @@ -18,7 +18,7 @@ exclude = ["app-tests/"] # reqwest and the workspace's rustls. [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-tools/Cargo.toml b/crates/luxe-tools/Cargo.toml index 4403180..9a84991 100644 --- a/crates/luxe-tools/Cargo.toml +++ b/crates/luxe-tools/Cargo.toml @@ -11,7 +11,7 @@ homepage.workspace = true # Provides tool implementations (read, write, edit, bash, grep, glob, etc.). [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-tui/Cargo.toml b/crates/luxe-tui/Cargo.toml index 7f1701f..89c7fc8 100644 --- a/crates/luxe-tui/Cargo.toml +++ b/crates/luxe-tui/Cargo.toml @@ -8,7 +8,7 @@ repository.workspace = true homepage.workspace = true [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.6" } +luxe-core = { path = "../luxe-core", version = "0.1.7" } # `unstable-rendered-line-info` enables Paragraph::line_count, used for precise wrapping-aware # mouse hit-testing over word-wrapped surfaces (guide/dock/conversation clicks). It adds no crate; # the API is marked unstable upstream but is stable within our pinned minor (re-check on upgrade). diff --git a/docs/guide/interface.md b/docs/guide/interface.md index de58167..3e7a34c 100644 --- a/docs/guide/interface.md +++ b/docs/guide/interface.md @@ -145,6 +145,7 @@ conversation, or in its place below 80 columns. | **FILES** | The project as a tree, with what changed marked in it. Click a file to [preview](#preview) it. | | **ELSEWHERE** | Files the session changed outside the project, when there are any | | **MODEL** | The provider, model, thinking level and [mode](agent.md#plan-then-build). Click the provider or the model to change it, or the mode to switch it. | +| **USAGE** | What is left of a ChatGPT or Copilot plan, one row for each window the plan has: a bar, the share used and, when the provider says, the time until it resets. It shows only once the plan has reported, after your first reply, and never on an API key. | | **SESSION** | Context used, tokens and cost, with what a review and compaction cost on rows of their own. A review's row shows its full cost once its guide or drafted summary is done. While a phone or another client has [joined](remote.md), a **joined** row names it. | `alt+d` shows or hides the dock, and `/dock left` or `/dock right` moves it. To set it for good: diff --git a/docs/guide/providers.md b/docs/guide/providers.md index 6fa1393..062be13 100644 --- a/docs/guide/providers.md +++ b/docs/guide/providers.md @@ -146,7 +146,8 @@ Usage on a ChatGPT or Copilot subscription is counted in full but never added to `plan ≈$0.42 of usage over 12 calls, covered by your subscription`. On a ChatGPT plan, the statusline shows how much of the plan is used, such as `12% weekly`, and `/cost` shows when it resets. On a Copilot plan it shows the month's allowance the same way, such as `19% -monthly`. +monthly`. The dock's [USAGE section](interface.md#the-dock) shows the same windows as a bar, with the +time until each resets when the provider says. luxe prices Copilot usage at Copilot's per-token rates, so the figure matches what Copilot reports for each request. A Copilot plan billed by the token spends its monthly allowance at those rates.