From a0666d6c8174bf85a8424a3305bc7becbe8d1bb2 Mon Sep 17 00:00:00 2001 From: Evan Whittaker Date: Tue, 20 Oct 2026 13:51:34 -0500 Subject: [PATCH] luxe 0.1.4: remembered models, wheel-driven lists, and a steadier phone app - luxe starts on the model you last chose in this project, then the last one anywhere. Signing in opens the model picker instead of choosing for you. - Every list in a modal takes the mouse wheel and a draggable scrollbar. - The phone app shows reasoning in full, stays put while you read back through a long session, and shows a question's answer on its card. - On Windows, luxe update replaces the running luxe, and a signed-in install no longer sees setup again. - The file tree no longer shows "engine busy" in a large project, loop output is easier to follow, and the name is written lowercase. The CHANGELOG has the full list. --- .config/nextest.toml | 2 +- .gitattributes | 2 +- .gitignore | 2 +- AGENTS.md | 8 +- CHANGELOG.md | 41 +- CONTRIBUTING.md | 15 +- Cargo.lock | 19 +- Cargo.toml | 6 +- README.md | 34 +- SECURITY.md | 4 +- crates/luxe-cli/Cargo.toml | 24 +- crates/luxe-cli/examples/tool_bench.rs | 2 +- .../luxe-cli/src/activity_projector/tests.rs | 2 +- crates/luxe-cli/src/cli.rs | 73 +- crates/luxe-cli/src/cli/args.rs | 6 +- crates/luxe-cli/src/cli/args/commands.rs | 14 +- crates/luxe-cli/src/cli/auth_command.rs | 8 +- crates/luxe-cli/src/cli/commands.rs | 2 +- crates/luxe-cli/src/cli/docs_command.rs | 6 +- crates/luxe-cli/src/cli/doctor_command.rs | 4 +- crates/luxe-cli/src/cli/join_command.rs | 6 +- crates/luxe-cli/src/cli/join_command/tests.rs | 6 +- crates/luxe-cli/src/cli/models_command.rs | 2 +- crates/luxe-cli/src/cli/remote_command.rs | 2 +- .../luxe-cli/src/cli/remote_command/setup.rs | 4 +- crates/luxe-cli/src/cli/rpc/translate.rs | 4 +- .../luxe-cli/src/cli/rpc/translate/tests.rs | 2 +- crates/luxe-cli/src/cli/tui.rs | 4 +- crates/luxe-cli/src/cli/update_command.rs | 66 +- .../luxe-cli/src/cli/update_command/aside.rs | 118 +++ .../luxe-cli/src/cli/update_command/tests.rs | 9 +- .../luxe-cli/src/cli/wire_command/secrets.rs | 2 +- crates/luxe-cli/src/cli/wire_command/tests.rs | 2 +- crates/luxe-cli/src/cli/worktree.rs | 2 +- crates/luxe-cli/src/config_editor.rs | 4 +- crates/luxe-cli/src/engine_setup.rs | 11 +- crates/luxe-cli/src/engine_setup/config.rs | 6 +- crates/luxe-cli/src/engine_setup/provider.rs | 8 +- .../src/engine_setup/provider/tests.rs | 6 +- crates/luxe-cli/src/engine_setup/services.rs | 10 +- crates/luxe-cli/src/engine_setup/session.rs | 10 +- crates/luxe-cli/src/engine_setup/settings.rs | 18 +- crates/luxe-cli/src/engine_setup/tests.rs | 41 +- crates/luxe-cli/src/engine_setup/tools.rs | 6 +- .../luxe-cli/src/engine_setup/tools/tests.rs | 2 +- crates/luxe-cli/src/guide.md | 673 +++++++++--------- crates/luxe-cli/src/guide_check.rs | 26 +- crates/luxe-cli/src/logging.rs | 18 +- crates/luxe-cli/src/logging/tests.rs | 8 +- crates/luxe-cli/src/loop_run.rs | 4 +- crates/luxe-cli/src/loop_view.rs | 267 +++++-- crates/luxe-cli/src/loop_view/paint.rs | 193 +++++ crates/luxe-cli/src/loop_view/screen.rs | 177 +++++ crates/luxe-cli/src/model_catalog.rs | 4 +- crates/luxe-cli/src/model_catalog/tests.rs | 2 +- crates/luxe-cli/src/output.rs | 4 +- crates/luxe-cli/src/pull_request_watch.rs | 4 +- crates/luxe-cli/src/review_agent.rs | 2 +- crates/luxe-cli/src/workspace_data.rs | 2 +- crates/luxe-cli/src/workspace_data/changes.rs | 2 +- .../luxe-cli/src/workspace_data/external.rs | 2 +- crates/luxe-cli/src/workspace_data/tests.rs | 6 +- .../luxe-cli/src/workspace_runtime/tests.rs | 2 +- crates/luxe-cli/tests/mcp_commands/main.rs | 6 +- crates/luxe-cli/tests/rpc_stdio.rs | 2 +- crates/luxe-core/Cargo.toml | 4 +- crates/luxe-core/src/activity.rs | 2 +- crates/luxe-core/src/auth.rs | 4 +- crates/luxe-core/src/briefs.rs | 8 +- crates/luxe-core/src/cache_warming.rs | 2 +- crates/luxe-core/src/compaction/budget.rs | 4 +- crates/luxe-core/src/config.rs | 20 +- .../luxe-core/src/config/config.schema.json | 22 +- crates/luxe-core/src/config/display.rs | 2 +- crates/luxe-core/src/config/display/diff.rs | 2 +- crates/luxe-core/src/config/integrations.rs | 12 +- crates/luxe-core/src/config/merge.rs | 2 +- crates/luxe-core/src/config/tests.rs | 2 +- crates/luxe-core/src/config/tests/schema.rs | 2 +- crates/luxe-core/src/config/write.rs | 2 +- crates/luxe-core/src/context.rs | 14 +- crates/luxe-core/src/context/tests.rs | 6 +- crates/luxe-core/src/context_report.rs | 2 +- crates/luxe-core/src/engine.rs | 2 +- crates/luxe-core/src/engine/answering.rs | 2 +- crates/luxe-core/src/engine/config.rs | 12 +- .../src/engine/dispatch/permission.rs | 2 +- .../src/engine/dispatch/test_nudge.rs | 2 +- crates/luxe-core/src/engine/drafting.rs | 2 +- crates/luxe-core/src/engine/drafting/tests.rs | 2 +- crates/luxe-core/src/engine/error.rs | 4 +- .../luxe-core/src/engine/github_overview.rs | 2 +- .../src/engine/guided_review/baseline.rs | 2 +- .../src/engine/guided_review/target.rs | 2 +- crates/luxe-core/src/engine/lifecycle.rs | 2 +- .../src/engine/nested_instructions.rs | 2 +- crates/luxe-core/src/engine/posting.rs | 2 +- crates/luxe-core/src/engine/prompt.rs | 4 +- .../src/engine/review_desk/publishing.rs | 2 +- .../src/engine/review_desk/storage.rs | 4 +- .../src/engine/review_desk/tests/edits.rs | 4 +- crates/luxe-core/src/engine/settings.rs | 5 +- crates/luxe-core/src/engine/turn.rs | 2 +- crates/luxe-core/src/engine/turn/commit.rs | 4 +- crates/luxe-core/src/engine/turn/report.rs | 8 +- crates/luxe-core/src/engine/turn/request.rs | 2 +- crates/luxe-core/src/event/action.rs | 10 +- crates/luxe-core/src/event/events.rs | 8 +- crates/luxe-core/src/event/tests/decoding.rs | 2 +- crates/luxe-core/src/external_work.rs | 4 +- crates/luxe-core/src/fetched.rs | 2 +- crates/luxe-core/src/file_diff.rs | 6 +- crates/luxe-core/src/formatter.rs | 2 +- crates/luxe-core/src/formatter/tests.rs | 4 +- crates/luxe-core/src/fs_atomic.rs | 2 +- crates/luxe-core/src/github.rs | 10 +- .../luxe-core/src/github/gh/tests/branches.rs | 4 +- .../luxe-core/src/github/gh/tests/threads.rs | 2 +- crates/luxe-core/src/github/overview.rs | 2 +- crates/luxe-core/src/github/refresh.rs | 2 +- crates/luxe-core/src/github/remote/tests.rs | 2 +- .../luxe-core/src/guided_review/attention.rs | 2 +- crates/luxe-core/src/guided_review/context.rs | 4 +- .../src/guided_review/context/tests.rs | 4 +- crates/luxe-core/src/guided_review/exclude.rs | 8 +- .../src/guided_review/feedback_message.rs | 2 +- .../guided_review/feedback_message/tests.rs | 2 +- .../guided_review/feedback_session/finding.rs | 4 +- .../feedback_session/submissions.rs | 2 +- .../luxe-core/src/guided_review/guide_plan.rs | 2 +- .../loader/tests/capture_tests.rs | 4 +- .../loader/tests/commit_tests.rs | 2 +- .../loader/tests/dispatch_tests.rs | 16 +- .../loader/tests/pull_request_tests.rs | 2 +- .../loader/tests/source_tests.rs | 12 +- .../guided_review/loader/tests/turn_tests.rs | 2 +- crates/luxe-core/src/guided_review/model.rs | 4 +- crates/luxe-core/src/guided_review/posting.rs | 2 +- .../src/guided_review/posting/tests.rs | 2 +- .../luxe-core/src/guided_review/provenance.rs | 6 +- .../src/guided_review/provenance/tests.rs | 2 +- .../src/guided_review/pull_request_draft.rs | 4 +- .../src/guided_review/remediation.rs | 10 +- .../src/guided_review/remediation/tests.rs | 2 +- .../luxe-core/src/guided_review/seen_store.rs | 2 +- .../src/guided_review/source_store.rs | 2 +- crates/luxe-core/src/hook.rs | 2 +- crates/luxe-core/src/hooks/herdr.rs | 8 +- crates/luxe-core/src/hooks/plan_reminder.rs | 2 +- .../luxe-core/src/hooks/self_continuation.rs | 14 +- .../src/hooks/self_continuation/tests.rs | 21 + crates/luxe-core/src/instructions.rs | 14 +- crates/luxe-core/src/instructions/nested.rs | 4 +- .../src/instructions/nested/tests.rs | 2 +- crates/luxe-core/src/instructions/tests.rs | 4 +- crates/luxe-core/src/json_file.rs | 8 +- crates/luxe-core/src/local_endpoint.rs | 10 +- .../luxe-core/src/local_endpoint/ancestry.rs | 2 +- crates/luxe-core/src/local_endpoint/live.rs | 14 +- crates/luxe-core/src/local_endpoint/tests.rs | 2 +- .../luxe-core/src/local_endpoint/windows.rs | 2 +- crates/luxe-core/src/loop_controller.rs | 2 +- crates/luxe-core/src/loop_state.rs | 4 +- crates/luxe-core/src/mcp_client.rs | 6 +- crates/luxe-core/src/mcp_config.rs | 16 +- crates/luxe-core/src/mcp_config/tests.rs | 16 +- crates/luxe-core/src/mcp_stdio.rs | 2 +- crates/luxe-core/src/mcp_stdio/tests.rs | 4 +- crates/luxe-core/src/mention_source.rs | 2 +- crates/luxe-core/src/oauth_loopback.rs | 2 +- crates/luxe-core/src/oauth_loopback/tests.rs | 2 +- crates/luxe-core/src/omarchy.rs | 14 +- crates/luxe-core/src/omarchy/tests.rs | 4 +- crates/luxe-core/src/permission.rs | 2 +- crates/luxe-core/src/permission/defaults.rs | 8 +- .../src/permission/defaults/tests.rs | 2 +- crates/luxe-core/src/permission/tests.rs | 2 +- crates/luxe-core/src/program.rs | 2 +- crates/luxe-core/src/program/nesting.rs | 16 +- crates/luxe-core/src/program/nesting/tests.rs | 2 +- crates/luxe-core/src/program/process.rs | 16 +- crates/luxe-core/src/program/process/tests.rs | 2 +- crates/luxe-core/src/program/tests.rs | 2 +- crates/luxe-core/src/project.rs | 14 +- crates/luxe-core/src/project/tests.rs | 4 +- crates/luxe-core/src/project_files.rs | 2 +- crates/luxe-core/src/provider/error.rs | 2 +- crates/luxe-core/src/provider/error/tests.rs | 2 +- crates/luxe-core/src/provider/model.rs | 14 +- crates/luxe-core/src/provider/pricing.rs | 2 +- crates/luxe-core/src/redact/tests.rs | 2 +- crates/luxe-core/src/runtime_state.rs | 64 +- crates/luxe-core/src/runtime_state/tests.rs | 59 +- crates/luxe-core/src/session.rs | 4 +- crates/luxe-core/src/session/claim.rs | 4 +- crates/luxe-core/src/session/entry.rs | 6 +- .../src/session/jsonl/cache/tests.rs | 2 +- crates/luxe-core/src/session/tests.rs | 2 +- crates/luxe-core/src/settings.rs | 4 +- crates/luxe-core/src/skills.rs | 2 +- crates/luxe-core/src/skills/tests.rs | 8 +- crates/luxe-core/src/theme.rs | 8 +- crates/luxe-core/src/theme/tests.rs | 4 +- crates/luxe-core/src/todo.rs | 2 +- crates/luxe-core/src/tool_catalog.rs | 4 +- crates/luxe-core/src/update.rs | 16 +- crates/luxe-core/src/user_dirs.rs | 20 +- crates/luxe-core/src/user_dirs/tests.rs | 4 +- crates/luxe-core/src/workspace.rs | 2 +- crates/luxe-core/src/workspace/tests.rs | 4 +- crates/luxe-core/src/worktree.rs | 2 +- crates/luxe-core/src/worktree/push_route.rs | 4 +- crates/luxe-core/src/worktree/tests.rs | 4 +- .../tests/engine/baseline_retention.rs | 2 +- crates/luxe-core/tests/engine/compaction.rs | 2 +- crates/luxe-core/tests/engine/fixtures.rs | 4 +- crates/luxe-core/tests/engine/interruption.rs | 2 +- crates/luxe-core/tests/engine/models.rs | 2 +- .../tests/engine/remediation/reports.rs | 8 +- .../luxe-core/tests/engine/review_restore.rs | 8 +- .../tests/engine/review_restore/ownership.rs | 6 +- crates/luxe-core/tests/engine/turns.rs | 2 +- crates/luxe-core/tests/engine_inbox.rs | 2 +- crates/luxe-core/tests/event_serialization.rs | 2 +- crates/luxe-core/tests/file_diff.rs | 4 +- .../tests/integration_agentic_loop.rs | 4 +- .../tests/integration_branch_rerun.rs | 2 +- .../tests/integration_capstone_engine.rs | 2 +- .../tests/integration_capstone_multi_phase.rs | 2 +- .../tests/integration_context_report.rs | 2 +- .../luxe-core/tests/integration_doom_loop.rs | 2 +- .../luxe-core/tests/integration_drafting.rs | 2 +- .../luxe-core/tests/integration_drive_loop.rs | 2 +- .../tests/integration_model_metadata.rs | 2 +- crates/luxe-core/tests/integration_modes.rs | 2 +- .../tests/integration_output_budget.rs | 2 +- .../tests/integration_prompt_cache_prefix.rs | 2 +- .../tests/integration_prompt_hook.rs | 6 +- .../tests/integration_provider_retry.rs | 2 +- .../tests/integration_resume_briefing.rs | 2 +- .../tests/integration_startup_notices.rs | 2 +- .../luxe-core/tests/integration_steering.rs | 4 +- .../tests/integration_streaming_dispatch.rs | 4 +- .../luxe-core/tests/integration_thinking.rs | 2 +- .../tests/integration_usage_ledger.rs | 4 +- crates/luxe-core/tests/permission/fixtures.rs | 2 +- .../tests/permission/rules_and_modes.rs | 2 +- .../tests/pull_request_review/posting.rs | 2 +- .../pull_request_review/support/harness.rs | 2 +- .../pull_request_review/support/remote.rs | 4 +- .../luxe-core/tests/session_switch/guide.rs | 4 +- crates/luxe-core/tests/session_switch/main.rs | 4 +- crates/luxe-dap/Cargo.toml | 4 +- crates/luxe-dap/src/adapter.rs | 2 +- crates/luxe-dap/tests/integration_debug.rs | 2 +- crates/luxe-dap/tests/integration_real_gdb.rs | 6 +- crates/luxe-lsp/Cargo.toml | 4 +- crates/luxe-lsp/src/graph/cache.rs | 2 +- crates/luxe-lsp/src/graph/testing.rs | 2 +- crates/luxe-lsp/src/registry.rs | 6 +- crates/luxe-lsp/src/registry/tests.rs | 2 +- crates/luxe-lsp/src/workspace.rs | 2 +- crates/luxe-lsp/src/workspace/start.rs | 2 +- crates/luxe-lsp/src/workspace/tests.rs | 4 +- .../tests/integration_client/failures.rs | 2 +- .../tests/integration_real_lsp/main.rs | 6 +- .../integration_real_lsp/other_servers.rs | 16 +- crates/luxe-mcp/Cargo.toml | 4 +- crates/luxe-mcp/src/lib.rs | 4 +- crates/luxe-mcp/src/oauth.rs | 6 +- crates/luxe-mcp/src/secret.rs | 8 +- crates/luxe-mcp/src/token_store/tests.rs | 2 +- crates/luxe-mcp/src/tool.rs | 2 +- crates/luxe-mcp/tests/integration_http.rs | 4 +- crates/luxe-providers/Cargo.toml | 4 +- .../luxe-providers/src/anthropic/request.rs | 2 +- .../src/anthropic/request/cache.rs | 2 +- .../src/anthropic/request/messages.rs | 2 +- .../src/anthropic/request/tests.rs | 2 +- .../luxe-providers/src/anthropic/sse/tests.rs | 2 +- .../src/anthropic/tests/thinking.rs | 2 +- crates/luxe-providers/src/auth.rs | 2 +- crates/luxe-providers/src/auth/catalog.rs | 10 +- .../luxe-providers/src/auth/catalog/table.rs | 19 +- .../src/auth/catalog/table/foundry.rs | 2 +- .../luxe-providers/src/auth/catalog/tests.rs | 48 +- crates/luxe-providers/src/auth/config_file.rs | 20 +- crates/luxe-providers/src/auth/oauth.rs | 6 +- .../src/auth/oauth/openai_codex.rs | 8 +- crates/luxe-providers/src/auth/service.rs | 36 +- .../luxe-providers/src/auth/service/models.rs | 16 - .../src/auth/service/refresh.rs | 4 +- .../luxe-providers/src/auth/service/tests.rs | 20 +- crates/luxe-providers/src/auth/source.rs | 2 +- crates/luxe-providers/src/auth/store.rs | 4 +- crates/luxe-providers/src/catalog.rs | 2 +- crates/luxe-providers/src/catalog/alias.rs | 12 +- crates/luxe-providers/src/catalog/resolve.rs | 12 +- .../src/catalog/resolve/tests.rs | 4 +- crates/luxe-providers/src/catalog/schema.rs | 4 +- crates/luxe-providers/src/chat_template.rs | 4 +- crates/luxe-providers/src/config.rs | 12 +- crates/luxe-providers/src/config/tests.rs | 6 +- crates/luxe-providers/src/copilot.rs | 6 +- crates/luxe-providers/src/copilot/tests.rs | 8 +- crates/luxe-providers/src/http.rs | 2 +- crates/luxe-providers/src/lib.rs | 2 +- .../src/openai_compat/request.rs | 4 +- .../src/openai_compat/tests/request.rs | 4 +- .../src/openai_compat/tests/wire.rs | 2 +- crates/luxe-providers/src/sampling.rs | 6 +- crates/luxe-providers/src/wire.rs | 2 +- .../luxe-providers/tests/live_codex_probe.rs | 2 +- .../tests/live_foundry_probe.rs | 4 +- crates/luxe-remote/Cargo.toml | 4 +- crates/luxe-remote/app-tests/answers.test.mjs | 43 ++ crates/luxe-remote/app-tests/e2e/host.mjs | 14 +- .../luxe-remote/app-tests/e2e/screenshots.mjs | 127 ++++ crates/luxe-remote/app-tests/models.test.mjs | 4 +- .../app-tests/service-worker.test.mjs | 2 +- .../luxe-remote/app-tests/transcript.test.mjs | 37 +- crates/luxe-remote/app/answers.js | 54 ++ crates/luxe-remote/app/details.js | 2 +- crates/luxe-remote/app/dock.css | 2 +- crates/luxe-remote/app/fonts/LICENSES.md | 4 +- crates/luxe-remote/app/generated/wordmark.svg | 4 +- crates/luxe-remote/app/index.html | 4 +- crates/luxe-remote/app/items.js | 35 +- crates/luxe-remote/app/models.js | 2 +- crates/luxe-remote/app/notifications.js | 4 +- crates/luxe-remote/app/session.js | 31 +- crates/luxe-remote/app/sessions.js | 2 +- crates/luxe-remote/app/style.css | 63 +- crates/luxe-remote/app/transcript.js | 2 +- crates/luxe-remote/app/wordmark.js | 4 +- .../luxe-remote/app/worker/service-worker.js | 2 +- crates/luxe-remote/src/app.rs | 6 +- crates/luxe-remote/src/app/tests.rs | 4 +- crates/luxe-remote/src/devices.rs | 2 +- crates/luxe-remote/src/folders.rs | 10 +- crates/luxe-remote/src/home_screen.rs | 8 +- crates/luxe-remote/src/home_screen/tests.rs | 10 +- crates/luxe-remote/src/launch.rs | 14 +- crates/luxe-remote/src/launch/tests.rs | 4 +- crates/luxe-remote/src/lib.rs | 4 +- crates/luxe-remote/src/pair.html | 4 +- crates/luxe-remote/src/push.rs | 2 +- crates/luxe-remote/src/push/notice.rs | 7 +- crates/luxe-remote/src/push/notice/tests.rs | 2 +- crates/luxe-remote/src/push/watch/tests.rs | 2 +- crates/luxe-remote/src/relay.rs | 2 +- crates/luxe-remote/src/render.rs | 4 +- crates/luxe-remote/src/render/tests.rs | 2 +- crates/luxe-remote/src/service.rs | 2 +- crates/luxe-remote/src/service/systemd.rs | 2 +- crates/luxe-remote/src/tests.rs | 6 +- crates/luxe-remote/src/tests/home_screen.rs | 2 +- crates/luxe-tools/Cargo.toml | 4 +- crates/luxe-tools/src/astgrep.rs | 2 +- crates/luxe-tools/src/astgrep/render.rs | 2 +- crates/luxe-tools/src/bash/tests.rs | 2 +- crates/luxe-tools/src/edit.rs | 4 +- crates/luxe-tools/src/exa_mcp.rs | 6 +- crates/luxe-tools/src/git/checks.rs | 2 +- crates/luxe-tools/src/git/tests.rs | 2 +- crates/luxe-tools/src/grep.rs | 2 +- crates/luxe-tools/src/process.rs | 4 +- crates/luxe-tools/src/process/tests.rs | 2 +- crates/luxe-tools/src/read.rs | 2 +- crates/luxe-tools/src/screenshot.rs | 4 +- crates/luxe-tools/src/ssrf.rs | 2 +- crates/luxe-tools/src/tavily.rs | 2 +- crates/luxe-tools/src/test_runner/tests.rs | 2 +- crates/luxe-tools/src/web/clone.rs | 4 +- crates/luxe-tools/src/web/clone/tests.rs | 2 +- crates/luxe-tools/src/web/fetch.rs | 4 +- crates/luxe-tools/src/write.rs | 4 +- crates/luxe-tools/tests/mutation_guards.rs | 2 +- crates/luxe-tui/Cargo.toml | 4 +- crates/luxe-tui/examples/fixture_svg/color.rs | 2 +- .../luxe-tui/examples/fixture_svg/geometry.rs | 2 +- crates/luxe-tui/examples/fixture_svg/main.rs | 2 +- crates/luxe-tui/examples/fixture_svg/tests.rs | 2 +- crates/luxe-tui/examples/shiki_theme.rs | 4 +- crates/luxe-tui/examples/theme_css.rs | 4 +- crates/luxe-tui/examples/ui_fixture.rs | 6 +- crates/luxe-tui/examples/wordmark_svg.rs | 10 +- crates/luxe-tui/src/app.rs | 1 + crates/luxe-tui/src/app/auth.rs | 57 +- crates/luxe-tui/src/app/commands/slash.rs | 2 +- .../src/app/commands/tests/answering.rs | 2 +- .../src/app/commands/tests/palette.rs | 2 +- .../src/app/commands/tests/review_target.rs | 2 +- crates/luxe-tui/src/app/configuration.rs | 2 +- crates/luxe-tui/src/app/construct.rs | 6 +- crates/luxe-tui/src/app/events/transcript.rs | 2 +- crates/luxe-tui/src/app/events/turn.rs | 6 +- crates/luxe-tui/src/app/messages.rs | 15 +- crates/luxe-tui/src/app/messages/changes.rs | 4 +- crates/luxe-tui/src/app/messages/files.rs | 44 +- .../src/app/messages/thread_answers.rs | 2 +- crates/luxe-tui/src/app/msg.rs | 5 + crates/luxe-tui/src/app/navigation.rs | 2 +- crates/luxe-tui/src/app/outbox.rs | 4 +- crates/luxe-tui/src/app/overlay_lists.rs | 96 +++ .../luxe-tui/src/app/overlay_lists/tests.rs | 165 +++++ crates/luxe-tui/src/app/pickers.rs | 51 +- crates/luxe-tui/src/app/selection.rs | 2 +- crates/luxe-tui/src/app/setup.rs | 2 +- crates/luxe-tui/src/app/tests/composer.rs | 2 +- crates/luxe-tui/src/app/tests/dashboard.rs | 2 +- crates/luxe-tui/src/app/tests/mentions.rs | 4 +- crates/luxe-tui/src/app/tests/notify.rs | 4 +- crates/luxe-tui/src/app/tests/pickers.rs | 37 +- crates/luxe-tui/src/auth_wizard.rs | 5 + crates/luxe-tui/src/auth_wizard/render.rs | 2 +- .../luxe-tui/src/auth_wizard/render/lists.rs | 11 +- crates/luxe-tui/src/auth_wizard/tests.rs | 1 - crates/luxe-tui/src/changes.rs | 2 +- crates/luxe-tui/src/commands.rs | 6 +- crates/luxe-tui/src/commands/built_in.rs | 14 +- crates/luxe-tui/src/commands/tests.rs | 2 +- crates/luxe-tui/src/configuration.rs | 19 +- crates/luxe-tui/src/configuration/settings.rs | 5 + .../src/configuration/settings/render.rs | 16 +- crates/luxe-tui/src/configuration/setup.rs | 27 +- .../src/configuration/setup/render.rs | 27 +- crates/luxe-tui/src/configuration/tests.rs | 2 +- crates/luxe-tui/src/context_files.rs | 4 +- crates/luxe-tui/src/files/listings.rs | 5 + crates/luxe-tui/src/fixture.rs | 4 +- crates/luxe-tui/src/fixture/auth.rs | 3 +- crates/luxe-tui/src/glyphs.rs | 19 +- crates/luxe-tui/src/glyphs/detect.rs | 18 +- crates/luxe-tui/src/glyphs/state.rs | 28 +- crates/luxe-tui/src/glyphs/tests.rs | 2 +- crates/luxe-tui/src/graphics/store/tests.rs | 2 +- .../src/guided_review/state/finding_draft.rs | 2 +- crates/luxe-tui/src/herdr.rs | 16 +- crates/luxe-tui/src/launcher.rs | 6 +- crates/luxe-tui/src/lib.rs | 2 +- crates/luxe-tui/src/main_loop.rs | 28 +- crates/luxe-tui/src/main_loop/click.rs | 3 + crates/luxe-tui/src/main_loop/keys.rs | 4 +- .../luxe-tui/src/main_loop/tests/routing.rs | 13 + crates/luxe-tui/src/markdown/fence.rs | 2 +- crates/luxe-tui/src/mention_flyout.rs | 5 + crates/luxe-tui/src/mention_flyout/render.rs | 4 +- crates/luxe-tui/src/mention_flyout/tests.rs | 6 +- crates/luxe-tui/src/model_picker.rs | 61 +- crates/luxe-tui/src/model_picker/meta.rs | 35 + crates/luxe-tui/src/modes.rs | 4 +- crates/luxe-tui/src/mouse.rs | 25 + crates/luxe-tui/src/notify/tests.rs | 22 +- crates/luxe-tui/src/palette.rs | 313 +------- crates/luxe-tui/src/palette/render.rs | 315 ++++++++ crates/luxe-tui/src/palette/tests.rs | 2 + crates/luxe-tui/src/picker/layout.rs | 10 + crates/luxe-tui/src/picker/tests.rs | 4 + crates/luxe-tui/src/picker/view.rs | 10 +- crates/luxe-tui/src/pull_request.rs | 2 +- crates/luxe-tui/src/ref_provider.rs | 2 +- crates/luxe-tui/src/selection.rs | 2 +- crates/luxe-tui/src/session_picker.rs | 19 +- crates/luxe-tui/src/slash_args.rs | 4 +- crates/luxe-tui/src/slash_flyout.rs | 7 + crates/luxe-tui/src/statusline/layout.rs | 2 +- crates/luxe-tui/src/statusline/segments.rs | 2 +- crates/luxe-tui/src/statusline/tests.rs | 2 +- crates/luxe-tui/src/tabstop.rs | 4 +- crates/luxe-tui/src/theme_picker.rs | 21 +- crates/luxe-tui/src/view.rs | 2 +- crates/luxe-tui/src/view/blocks.rs | 2 +- crates/luxe-tui/src/view/dock.rs | 2 +- crates/luxe-tui/src/view/dock/elsewhere.rs | 2 +- crates/luxe-tui/src/view/dock/files.rs | 2 +- crates/luxe-tui/src/view/dock/telemetry.rs | 102 +-- crates/luxe-tui/src/view/dock/tests/rail.rs | 127 ++-- crates/luxe-tui/src/view/frame_pins.txt | 140 ++-- crates/luxe-tui/src/view/guided_review.rs | 2 +- .../src/view/guided_review/brief/notices.rs | 2 +- .../src/view/guided_review/context/summary.rs | 2 +- .../guided_review/diff_render/annotations.rs | 2 +- .../src/view/guided_review/feedback_window.rs | 2 +- .../src/view/guided_review/tests/feedback.rs | 2 +- crates/luxe-tui/src/widgets.rs | 4 +- crates/luxe-tui/src/widgets/language_glyph.rs | 8 +- crates/luxe-tui/src/widgets/provider_glyph.rs | 90 +++ crates/luxe-tui/src/widgets/scrollbar.rs | 25 + .../src/workspace_dock/sections/tests.rs | 2 +- crates/luxe-tui/src/workspace_layout.rs | 10 +- crates/luxe-tui/tests/clipboard_live.rs | 2 +- crates/luxe-tui/tests/frame_gutter.rs | 8 +- crates/luxe-tui/tests/glyph_tiers.rs | 2 +- crates/luxe-tui/tests/render/dock.rs | 4 +- crates/luxe-tui/tests/render/files.rs | 58 ++ crates/luxe-tui/tests/render/reveal.rs | 2 +- crates/luxe-tui/tests/render/routing.rs | 11 +- dist-workspace.toml | 4 +- docs/brand/voice.md | 12 +- docs/guide/agent.md | 12 +- docs/guide/appearance.md | 20 +- docs/guide/cli.md | 10 +- docs/guide/commands.md | 12 +- docs/guide/configuration.md | 43 +- docs/guide/custom-providers.md | 54 +- docs/guide/environment.md | 18 +- docs/guide/extending.md | 24 +- docs/guide/github.md | 16 +- docs/guide/guided-review.md | 18 +- docs/guide/hooks.md | 14 +- docs/guide/images/commands-palette.svg | 65 +- docs/guide/images/configuration-settings.svg | 72 +- docs/guide/images/interface-peek.svg | 28 +- docs/guide/images/mentions-picker.svg | 31 +- docs/guide/images/quickstart-setup.svg | 63 +- docs/guide/index.md | 20 +- docs/guide/install.md | 37 +- docs/guide/interface.md | 16 +- docs/guide/loop.md | 23 +- docs/guide/mcp.md | 12 +- docs/guide/mention-sources.md | 12 +- docs/guide/mentions.md | 2 +- docs/guide/phone/remote-permission.png | Bin 0 -> 77027 bytes docs/guide/phone/remote-turn.png | Bin 0 -> 80649 bytes docs/guide/project-context.md | 22 +- docs/guide/providers.md | 27 +- docs/guide/quickstart.md | 14 +- docs/guide/recipes.md | 46 +- docs/guide/remote.md | 29 +- docs/guide/rpc.md | 44 +- docs/guide/security.md | 54 +- docs/guide/sessions.md | 18 +- docs/guide/skills.md | 8 +- docs/guide/tools.md | 30 +- docs/guide/troubleshooting.md | 18 +- scripts/cast-still.py | 2 +- scripts/docs-check.py | 2 +- scripts/fn-length-allowlist.txt | 2 +- scripts/glyph-survey.py | 16 +- scripts/publish-clean.sh | 4 +- scripts/remediation-eval.py | 4 +- scripts/remote-fonts.sh | 4 +- scripts/site-assets.sh | 4 +- scripts/site-drive.py | 8 +- scripts/site-fonts.sh | 6 +- scripts/site-record.sh | 22 +- scripts/site-smoke.mjs | 4 +- scripts/tool-bench.sh | 6 +- scripts/tui-drive.sh | 2 +- scripts/update-models-snapshot.sh | 2 +- web/README.md | 2 +- web/astro.config.mjs | 2 +- web/demo-scripts/flagship.rec | 4 +- web/demo-scripts/gh/gh | 2 +- web/package.json | 2 +- web/public/fonts/LICENSES.md | 2 +- web/public/fonts/coverage.txt | 2 + web/public/fonts/fallback-ok.txt | 4 +- .../fonts/jetbrains-mono-nfm-bold.woff2 | Bin 11344 -> 11484 bytes .../fonts/jetbrains-mono-nfm-italic.woff2 | Bin 11928 -> 12004 bytes .../fonts/jetbrains-mono-nfm-regular.woff2 | Bin 11416 -> 11476 bytes web/public/install.ps1 | 2 +- .../assets/generated/changes-wide.luxe.svg | 33 +- .../assets/generated/chat-question.luxe.svg | 18 +- .../assets/generated/chat-streaming.luxe.svg | 18 +- .../assets/generated/chat-thinking.luxe.svg | 18 +- web/src/assets/generated/chat-tools.luxe.svg | 18 +- web/src/assets/generated/dock-wide.luxe.svg | 32 +- web/src/assets/generated/mark.svg | 4 +- web/src/assets/generated/peek-beside.luxe.svg | 103 ++- web/src/assets/generated/tile.svg | 4 +- web/src/assets/generated/wordmark.svg | 4 +- web/src/components/Demo.svelte | 2 +- web/src/components/Shot.astro | 4 +- web/src/components/Still.astro | 6 +- web/src/components/ThemeGallery.svelte | 4 +- web/src/components/Wordmark.astro | 4 +- web/src/content.config.ts | 2 +- web/src/data/tool-bench.json | 2 +- web/src/layouts/Base.astro | 6 +- web/src/pages/404.astro | 2 +- web/src/pages/brand.astro | 18 +- web/src/pages/docs/[...slug].astro | 2 +- web/src/pages/index.astro | 80 ++- web/src/pages/llms.txt.ts | 4 +- web/src/pages/press-shots.astro | 2 +- web/src/pages/social-card.astro | 2 +- web/src/pages/tools.astro | 26 +- web/src/styles/base.css | 4 +- web/src/styles/prose.css | 15 + 591 files changed, 4926 insertions(+), 2942 deletions(-) create mode 100644 crates/luxe-cli/src/cli/update_command/aside.rs create mode 100644 crates/luxe-cli/src/loop_view/paint.rs create mode 100644 crates/luxe-cli/src/loop_view/screen.rs create mode 100644 crates/luxe-remote/app-tests/answers.test.mjs create mode 100644 crates/luxe-remote/app-tests/e2e/screenshots.mjs create mode 100644 crates/luxe-remote/app/answers.js create mode 100644 crates/luxe-tui/src/app/overlay_lists.rs create mode 100644 crates/luxe-tui/src/app/overlay_lists/tests.rs create mode 100644 crates/luxe-tui/src/model_picker/meta.rs create mode 100644 crates/luxe-tui/src/palette/render.rs create mode 100644 crates/luxe-tui/src/widgets/provider_glyph.rs create mode 100644 docs/guide/phone/remote-permission.png create mode 100644 docs/guide/phone/remote-turn.png diff --git a/.config/nextest.toml b/.config/nextest.toml index 8cba98c..693ab4a 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -1,6 +1,6 @@ # Nextest configuration — https://nexte.st/docs/configuration/ # -# The point of this file is a per-test timeout safety net. Luxe's test *execution* is fast +# The point of this file is a per-test timeout safety net. luxe's test *execution* is fast # (~30s for the whole workspace once compiled), but a genuinely hung or runaway test — e.g. a # process-spawning integration test that never reaps its child, or the historical review-gate # fork bomb — could otherwise wedge the machine for many minutes. Nextest kills any test that diff --git a/.gitattributes b/.gitattributes index 6432485..41fc5ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,7 +14,7 @@ # Development-process artifacts — excluded from published release archives. # -# These are Luxe's own planning spine, journal, and dogfooding memory. Luxe never +# These are luxe's own planning spine, journal, and dogfooding memory. luxe never # *requires* them at runtime (every reader treats them as read-if-present), so a fresh # consumer repo starts clean. `git archive` (and scripts/publish-clean.sh) drop them via # the `export-ignore` attribute below; the files stay in this development repo for history. diff --git a/.gitignore b/.gitignore index a3f78a3..ff74a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ __pycache__/ .DS_Store Thumbs.db -# Luxe-specific +# luxe-specific .luxe/ # Verification captures — throwaway evidence for one session, megabytes of it. .pi/agent-loop/screenshots/ diff --git a/AGENTS.md b/AGENTS.md index 236e252..8f2efae 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,6 +1,6 @@ # AGENTS.md -Rules for working on Luxe: only what you'd get wrong without being told. It's sent with every +Rules for working on luxe: only what you'd get wrong without being told. It's sent with every request, so keep it short; the long version is [`CONTRIBUTING.md`](CONTRIBUTING.md). ## Commands @@ -52,7 +52,7 @@ cargo run -p luxe-cli -- --headless -p "..." # one prompt, no UI - A UI talks to core over channels only: `Action` in, `Event` out. It never calls a provider or a tool and never blocks the runtime. - Behavior that cuts across the loop is a `Hook`, not a special case in the loop. -- One owner per platform question: `user_dirs` (home and Luxe's folders), `program` (finding +- One owner per platform question: `user_dirs` (home and luxe's folders), `program` (finding programs and shells, detaching, killing a process tree), `paths` (path to string), `fs_atomic` (safe file replace), `luxe-lsp::uri` (`file://` URLs). @@ -108,7 +108,7 @@ Enforce these in code (the permission engine or a hook), never in prompt text. `gate.commands`, MCP and language servers need `--trust-project` (or global `lsp.project_servers`), so "always" approvals save globally. `project_tooling_allowed` is the one switch for project binaries; reuse it. Language servers still run `build.rs` and proc macros, so - never say Luxe runs no repo code. + never say luxe runs no repo code. - Secrets: `0600` files, `$ENV` or `!command`, held in `secrecy::SecretString`, scrubbed from tool results, logs and wire captures by `redact::process_secrets()`. - No telemetry. Every outbound call is one the user asked for or can turn off, sends nothing about @@ -159,7 +159,7 @@ Enforce these in code (the permission engine or a hook), never in prompt text. - Glyphs decorate; they never carry meaning alone. Every icon sits beside its words. Prefer block elements, which every terminal draws. - `web/src/assets/generated/` comes from Rust and CI checks it; `captures/` are real sessions from - `scripts/site-record.sh`. Change how Luxe looks and you owe a `site-assets.sh` run and a + `scripts/site-record.sh`. Change how luxe looks and you owe a `site-assets.sh` run and a re-record. - The wordmark constants in `luxe-tui/src/widgets/wordmark/art.rs` are the logo: one drawing, no alternatives. diff --git a/CHANGELOG.md b/CHANGELOG.md index 35aa74d..d304310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -Every release of Luxe, newest first. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), -and versions follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html). While Luxe is below +Every release of luxe, newest first. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +and versions follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html). While luxe is below 1.0, a minor bump (0.x.0) may break config, flags or the `--rpc` protocol, and a patch bump never does. @@ -9,6 +9,43 @@ 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.4] + +### Added + +- luxe remembers the model you last chose in each project, and starts there. A project you haven't + chosen in yet starts on the model you last chose anywhere, then on `default_model`. +- The mouse wheel and the scrollbar work in every list in a modal: the model picker, the palette, + themes, sessions, providers, settings and the `/` and `@` flyouts. Both move the cursor, so Enter + never picks a row you can't see. +- The dock's telemetry row starts with the provider, beside its own mark where the font has one. + +### Changed + +- The name is written lowercase everywhere, as **luxe**, even to start a sentence. The dot in + **luxe.** belongs to the logo. +- `luxe --help` opens with "A coding agent for your terminal." +- Signing in no longer picks a model for you. The model picker opens at the top of its list, and + nothing changes until you choose. +- Loop output marks each phase with a colored rail and each iteration with a bracket inside it. In + a terminal a tool's line shows `○` while it runs, then a green `✓` or a red `✗`. +- The phone app shows a turn's reasoning in full, as the interface does. It was cut to three lines + with nothing to say there was more. +- A phone notification for a question reads "The agent has a question for you". + +### Fixed + +- On Windows, `luxe update` replaces the running luxe. Windows won't overwrite a program while + it runs, so the old copy is moved aside and deleted at the next launch. +- A luxe that's already signed in no longer opens first-run setup, even if setup was never + finished. Quitting it partway left nothing saved, so it came back at the next launch. +- Opening a large project in the file tree no longer shows "engine busy". It asked for every + changed folder at once and overflowed the queue; it now asks for a few at a time. +- The phone app stays where you are while you read back through a long session. Each new item + dropped the oldest from the top of the page, which moved everything you were reading. +- A question answered from the phone app shows its answer on its card, as the interface does. It + was hidden behind a tap, as raw text. + ## [0.1.3] ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3426989..166430c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to Luxe +# Contributing to luxe -Process and tooling for people working on Luxe itself. The rules an agent has to hold to are in +Process and tooling for people working on luxe itself. The rules an agent has to hold to are in [`AGENTS.md`](AGENTS.md), deliberately kept short because it rides in every request; this file is the long version, for humans, and nothing here is loaded into a prompt. @@ -11,18 +11,18 @@ editing a page, and a test fails until you do. ## Licensing your contribution -Luxe is dual licensed under MIT (`LICENSE-MIT`) or Apache-2.0 (`LICENSE-APACHE`), at the user's +luxe is dual licensed under MIT (`LICENSE-MIT`) or Apache-2.0 (`LICENSE-APACHE`), at the user's option. Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. ## AI assistance -AI help is welcome. Luxe is built with plenty of it, much of it Luxe working on itself. Three things +AI help is welcome. luxe is built with plenty of it, much of it luxe working on itself. Three things to hold to: - **Say so.** Name the tool and how much of the change it wrote in the pull request: "written with - Luxe on Claude Sonnet 5.5, then reviewed and edited by me", or "asked ChatGPT how the cache works, + luxe on Claude Sonnet 5.5, then reviewed and edited by me", or "asked ChatGPT how the cache works, wrote the fix myself". Tab completion doesn't count. A commit can carry the Linux kernel's `Assisted-by: AGENT:MODEL` trailer. - **Understand it.** You should be able to explain what your change does and how it fits without @@ -280,7 +280,7 @@ python3 scripts/voice-check.py --review The Tools page's bars are recorded, not generated: `scripts/tool-bench.sh NAME=REPO:CASES ...` runs each tool and the shell command it replaces in each checkout you name (the cases are in -`scripts/tool-bench/`), then in Luxe itself, and writes `web/src/data/tool-bench.json` naming every +`scripts/tool-bench/`), then in luxe itself, and writes `web/src/data/tool-bench.json` naming every repository's commit. Each shell row is also put through the other agents' own output limits, since that, not the raw output, is what their models are sent. Nothing checks the file; run it on committed trees when a tool's output changes. The page draws from the first repository. @@ -327,6 +327,7 @@ npm ci # TypeScript, Playwright, and the vendo npm run check # tsc npm test # unit tests cargo build -p luxe-cli && npm run e2e # end to end; LUXE_BIN picks another luxe +node e2e/screenshots.mjs # the guide's phone shots, into docs/guide/phone/ ``` Every iOS browser is WebKit, so check the app there. Playwright's WebKit build wants Ubuntu's ICU, @@ -386,7 +387,7 @@ packages and builds every crate the way the registry will, dependencies first. ## Development-only files -A development checkout carries planning files, design notes and evaluation rigs that Luxe never +A development checkout carries planning files, design notes and evaluation rigs that luxe never needs at runtime. They are marked `export-ignore` in `.gitattributes`, and `scripts/publish-clean.sh ` writes a release tree without them, then scans what it wrote for anything that must not ship. diff --git a/Cargo.lock b/Cargo.lock index 86e7c88..7568502 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1690,7 +1690,7 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "luxe-cli" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "async-trait", @@ -1717,12 +1717,13 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", + "unicode-width", "uuid", ] [[package]] name = "luxe-core" -version = "0.1.3" +version = "0.1.4" dependencies = [ "async-trait", "base16ct", @@ -1753,7 +1754,7 @@ dependencies = [ [[package]] name = "luxe-dap" -version = "0.1.3" +version = "0.1.4" dependencies = [ "async-trait", "luxe-core", @@ -1767,7 +1768,7 @@ dependencies = [ [[package]] name = "luxe-lsp" -version = "0.1.3" +version = "0.1.4" dependencies = [ "async-trait", "base16ct", @@ -1791,7 +1792,7 @@ dependencies = [ [[package]] name = "luxe-mcp" -version = "0.1.3" +version = "0.1.4" dependencies = [ "async-trait", "futures-util", @@ -1811,7 +1812,7 @@ dependencies = [ [[package]] name = "luxe-providers" -version = "0.1.3" +version = "0.1.4" dependencies = [ "async-trait", "base64", @@ -1830,7 +1831,7 @@ dependencies = [ [[package]] name = "luxe-remote" -version = "0.1.3" +version = "0.1.4" dependencies = [ "axum", "base16ct", @@ -1853,7 +1854,7 @@ dependencies = [ [[package]] name = "luxe-tools" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "async-trait", @@ -1879,7 +1880,7 @@ dependencies = [ [[package]] name = "luxe-tui" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "arboard", diff --git a/Cargo.toml b/Cargo.toml index e7b588d..87ddd92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ 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.3" +version = "0.1.4" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/evanwhittaker/luxe" homepage = "https://luxe.dev" -# Bound by the dependencies: uuid needs 1.89, and ratatui, image and darling 1.88. Luxe's own floor +# Bound by the dependencies: uuid needs 1.89, and ratatui, image and darling 1.88. luxe's own floor # is lower (`user_dirs` relies on `std::env::home_dir`, which returned `$HOME` on Windows before # 1.85). The `msrv` CI job builds the workspace on exactly this version, so the number cannot drift. rust-version = "1.89" @@ -106,7 +106,7 @@ image = { version = "0.25", default-features = false, features = [ [workspace.lints.rust] # `deny`, not `forbid`, so an audited exception can carry its own `#[allow]`, which is the line a # reviewer has to look at. The shipped program has one: `program::detach_from_terminal`, whose -# `pre_exec(setsid)` is how a spawned command leaves Luxe's terminal (std's `Command::setsid` is not +# `pre_exec(setsid)` is how a spawned command leaves luxe's terminal (std's `Command::setsid` is not # stable). The others are the counting allocators in luxe-tui's frame-budget test and render-perf # example, which never ship. unsafe_code = "deny" diff --git a/README.md b/README.md index a5941d5..154a6db 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@

- Luxe + luxe

-Luxe is a coding agent for your terminal, written in Rust. It works in your project with the model +luxe is a coding agent for your terminal, written in Rust. It works in your project with the model you choose, then reads back what it changed as a Guided Review, so you can comment, ask for fixes, and open the pull request without leaving the terminal. -![Luxe adding a command with a test, reviewing the change chapter by chapter, and drafting the pull request](docs/images/luxe.gif) +![luxe adding a command with a test, reviewing the change chapter by chapter, and drafting the pull request](docs/images/luxe.gif) *One take on Claude Sonnet 5.5, with only the waits cut: it writes `todo overdue` with a test, the change is read back in three chapters, and the pull request is drafted from the review.* @@ -40,13 +40,13 @@ change is read back in three chapters, and the pull request is drafted from the the turn fails, and `--format json` streams its messages, tool calls and each call's token usage. With nobody to answer, a call that would ask is allowed; `--on-ask deny` refuses it instead. `luxe --rpc` speaks the whole protocol. -- **Extended with files and programs**, never code loaded into Luxe: skills, hooks, MCP servers, - your own `@` sources, and an [RPC protocol](https://luxe.dev/docs/rpc/) for driving Luxe from +- **Extended with files and programs**, never code loaded into luxe: skills, hooks, MCP servers, + your own `@` sources, and an [RPC protocol](https://luxe.dev/docs/rpc/) for driving luxe from your own program. -Luxe connects to 24 providers and any OpenAI-compatible endpoint. Sign in with a ChatGPT or GitHub +luxe connects to 24 providers and any OpenAI-compatible endpoint. Sign in with a ChatGPT or GitHub Copilot subscription or an OpenRouter account, or bring an API key; Anthropic and Google take API -keys only. There is no telemetry: every connection Luxe makes is one you asked for or can turn off, +keys only. There is no telemetry: every connection luxe makes is one you asked for or can turn off, and [the guide lists them](https://luxe.dev/docs/security/#what-luxe-sends-over-the-network). ![A Guided Review: the guide on the left, the hunk being read on the right](docs/guide/images/review-guide.svg) @@ -76,16 +76,16 @@ cargo build --release ./target/release/luxe --version ``` -Luxe runs on Linux, macOS and Windows, in any UTF-8 terminal; on Windows, use Windows Terminal and +luxe runs on Linux, macOS and Windows, in any UTF-8 terminal; on Windows, use Windows Terminal and install [Git for Windows](https://gitforwindows.org/) so the agent has a POSIX shell. You also need a model to talk to: an API key or a subscription. Your settings and credentials live in `~/.config/luxe/` (`%APPDATA%\luxe` on Windows). Icons come from a [Nerd Font](https://www.nerdfonts.com/) when you have one, in its **Mono** build; -without one, Luxe draws plain characters, and every icon has a word beside it. See +without one, luxe draws plain characters, and every icon has a word beside it. See [Fonts](https://luxe.dev/docs/install/#fonts). -Luxe uses these when they are installed, and works without them: +luxe uses these when they are installed, and works without them: | | For | | --- | --- | @@ -95,7 +95,7 @@ Luxe uses these when they are installed, and works without them: | A debug adapter per language | The `debug` tool | | [ast-grep](https://ast-grep.github.io) | Search and replace by code structure | -`luxe doctor` checks which of them Luxe can use on your machine, and how to install the rest. +`luxe doctor` checks which of them luxe can use on your machine, and how to install the rest. ## Quickstart @@ -110,7 +110,7 @@ Luxe uses these when they are installed, and works without them: `luxe --worktree` does the same in a worktree, so your checkout is never touched. 2. **Answer setup.** The first launch asks for a theme, a provider, which tools the agent can use, - and what Luxe opens on. Sign in with a subscription or paste an API key; a key already in your + and what luxe opens on. Sign in with a subscription or paste an API key; a key already in your environment, such as `ANTHROPIC_API_KEY`, is found on its own. Choose a model when the picker opens. @@ -132,9 +132,9 @@ on the screen you are on, and `ctrl+c` quits; the session is already saved. The ## Documentation -The guide is at [luxe.dev/docs](https://luxe.dev/docs/), and built into Luxe for the version you +The guide is at [luxe.dev/docs](https://luxe.dev/docs/), and built into luxe for the version you have: `luxe docs`, `luxe docs hooks`, `luxe docs --search "on_ask"`. Ask the agent how to do -something in Luxe and it reads the answer from the same pages. +something in luxe and it reads the answer from the same pages. | To | Read | | --- | --- | @@ -148,7 +148,7 @@ something in Luxe and it reads the answer from the same pages. | Give the agent your project's conventions | [Project context](https://luxe.dev/docs/project-context/) | | Change the theme, keys or statusline | [Configuration](https://luxe.dev/docs/configuration/) | | Control what the agent may do | [Security and permissions](https://luxe.dev/docs/security/) | -| Add tools, skills, hooks or your own front end | [Extending Luxe](https://luxe.dev/docs/extending/) | +| Add tools, skills, hooks or your own front end | [Extending luxe](https://luxe.dev/docs/extending/) | | Look up a flag or an environment variable | [Command line](https://luxe.dev/docs/cli/), [Environment variables](https://luxe.dev/docs/environment/) | | Fix something that is not working | [Troubleshooting](https://luxe.dev/docs/troubleshooting/) | @@ -161,11 +161,11 @@ Every page is also plain markdown in [`docs/guide/`](docs/guide/), and the site and the demos are made; [`AGENTS.md`](AGENTS.md) has the rules an agent working here holds to. Problems and questions go to [GitHub issues](https://github.com/evanwhittaker/luxe/issues). -Luxe is built with AI assistance, much of it Luxe working on itself. Every change still passes the +luxe is built with AI assistance, much of it luxe working on itself. Every change still passes the full test suite and CI before it merges, and its maintainer decides what does. If AI helped with yours, [say so](CONTRIBUTING.md#ai-assistance). -Luxe draws on Pi, by earendil-works, and on OpenCode, and on the unidirectional data flow of Elm +luxe draws on Pi, by earendil-works, and on OpenCode, and on the unidirectional data flow of Elm and Ratatui. ## License diff --git a/SECURITY.md b/SECURITY.md index 82f4fcf..1201161 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,13 +1,13 @@ # Security -Luxe runs a model's commands on your machine, so a hole in it matters. If you find one, please tell +luxe runs a model's commands on your machine, so a hole in it matters. If you find one, please tell me privately before anyone else. ## Reporting [Open a private advisory](https://github.com/evanwhittaker/luxe/security/advisories/new) on GitHub, or email [contact@luxe.dev](mailto:contact@luxe.dev). Say what you did, what happened, and the -Luxe version (`luxe --version`). A transcript or a minimal repository that shows it helps most. +luxe version (`luxe --version`). A transcript or a minimal repository that shows it helps most. I'll answer within a few days, keep you posted while it's fixed, and credit you in the advisory and the release notes unless you'd rather not be named. Please give the fix time to ship before you diff --git a/crates/luxe-cli/Cargo.toml b/crates/luxe-cli/Cargo.toml index c30b8a3..173738a 100644 --- a/crates/luxe-cli/Cargo.toml +++ b/crates/luxe-cli/Cargo.toml @@ -3,7 +3,7 @@ name = "luxe-cli" version.workspace = true edition.workspace = true license.workspace = true -description = "A beautiful coding agent for your terminal." +description = "A coding agent for your terminal." repository.workspace = true homepage.workspace = true readme = "../../README.md" @@ -18,14 +18,14 @@ name = "luxe" path = "src/main.rs" [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.3" } -luxe-providers = { path = "../luxe-providers", version = "0.1.3" } -luxe-tools = { path = "../luxe-tools", version = "0.1.3" } -luxe-lsp = { path = "../luxe-lsp", version = "0.1.3" } -luxe-dap = { path = "../luxe-dap", version = "0.1.3" } -luxe-mcp = { path = "../luxe-mcp", version = "0.1.3" } -luxe-tui = { path = "../luxe-tui", version = "0.1.3" } -luxe-remote = { path = "../luxe-remote", version = "0.1.3", optional = true } +luxe-core = { path = "../luxe-core", version = "0.1.4" } +luxe-providers = { path = "../luxe-providers", version = "0.1.4" } +luxe-tools = { path = "../luxe-tools", version = "0.1.4" } +luxe-lsp = { path = "../luxe-lsp", version = "0.1.4" } +luxe-dap = { path = "../luxe-dap", version = "0.1.4" } +luxe-mcp = { path = "../luxe-mcp", version = "0.1.4" } +luxe-tui = { path = "../luxe-tui", version = "0.1.4" } +luxe-remote = { path = "../luxe-remote", version = "0.1.4", 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 } @@ -48,18 +48,20 @@ reqwest = { workspace = true } # `luxe auth login` reads an API key without echoing it, which needs raw mode on the real terminal. # Pinned to luxe-tui's version so there is exactly one crossterm in the tree. crossterm = "0.29" +# The loop view cuts each line to the terminal's width, so it can redraw a line in place +unicode-width = { workspace = true } # Streaming the update manifest with a size cap, and comparing the version it reports. futures = { workspace = true } semver = { workspace = true } [dev-dependencies] tempfile = "3" -# The guide check: what Luxe would silently ignore in a config example +# The guide check: what luxe would silently ignore in a config example serde_ignored = "0.1" [features] default = ["clipboard-images", "remote"] -# `luxe remote`, the only server in Luxe. A packager can leave it out to ship a Luxe with no +# `luxe remote`, the only server in luxe. A packager can leave it out to ship a luxe with no # server code at all. remote = ["dep:luxe-remote", "dep:qrcode"] clipboard = ["luxe-tui/clipboard"] diff --git a/crates/luxe-cli/examples/tool_bench.rs b/crates/luxe-cli/examples/tool_bench.rs index 9a978a7..192f2a6 100644 --- a/crates/luxe-cli/examples/tool_bench.rs +++ b/crates/luxe-cli/examples/tool_bench.rs @@ -11,7 +11,7 @@ //! model is sent a raw 900 KB `git log`: the honest comparison is with what a harness forwards. //! //! `TOOL_BENCH_CASES` names a JSON file of cases (`id`, `shell`, `tool`, `args`) for measuring in a -//! repository other than this one; without it, the cases below measure Luxe itself. +//! repository other than this one; without it, the cases below measure luxe itself. use std::process::Command; use std::sync::Arc; diff --git a/crates/luxe-cli/src/activity_projector/tests.rs b/crates/luxe-cli/src/activity_projector/tests.rs index 7f9cab3..ab2065d 100644 --- a/crates/luxe-cli/src/activity_projector/tests.rs +++ b/crates/luxe-cli/src/activity_projector/tests.rs @@ -62,7 +62,7 @@ fn a_failed_call_summarizes_its_own_error() { "edited before reading the file", ), ( - "Error: 'src/lib.rs' exists and has no read on record for this Luxe run \ + "Error: 'src/lib.rs' exists and has no read on record for this luxe run \ (read-before-write guard), so overwriting it would be blind.", "overwrote a file it hadn't read", ), diff --git a/crates/luxe-cli/src/cli.rs b/crates/luxe-cli/src/cli.rs index c4fc572..bab837d 100644 --- a/crates/luxe-cli/src/cli.rs +++ b/crates/luxe-cli/src/cli.rs @@ -40,6 +40,44 @@ pub(crate) fn auth_service() -> luxe_tui::auth_wizard::AuthServiceHandle { std::sync::Arc::new(luxe_providers::auth::ProviderAuth::new()) } +/// Carries the flags that shape this run, rather than where it starts, onto `settings`. +fn apply_run_flags(args: &Args, settings: &mut crate::engine_setup::AgentSettings) { + settings.resume = resume_from_args(args); + settings.permission_mode = permission_mode_from_args(args); + settings.trust_project = args.trust_project; + settings.disable_tools = args.no_tool.clone(); + settings.enable_tools = args.with_tool.clone(); + apply_thinking_flag(args.thinking.as_deref(), settings); + settings.auto_approve = args.auto_approve; + if let Some(on_ask) = args.on_ask { + settings.on_ask = on_ask.into(); + } + if args.auto_approve && !args.prompts_a_human() && args.starts_an_engine() { + settings.startup_notices.push( + "--auto-approve: an unattended run already allows an `ask`. `--on-ask deny` is how to \ + make one refuse instead." + .to_string(), + ); + } + if args.plan { + settings.initial_mode = Some(luxe_core::mode::PLAN.to_string()); + } +} + +/// Pins the thinking level `--thinking` names; a level luxe doesn't know is reported and ignored. +fn apply_thinking_flag(raw: Option<&str>, settings: &mut crate::engine_setup::AgentSettings) { + let Some(raw) = raw else { + return; + }; + match args::parse_thinking_level(raw) { + Some(level) => { + settings.initial_thinking = Some(level); + settings.thinking_forced = true; + } + None => eprintln!("luxe: ignoring unknown --thinking level '{raw}'"), + } +} + /// Top-level dispatch: parse args and route to the requested mode. pub(crate) async fn run(mut args: Args) -> anyhow::Result<()> { // The guide is in the binary and needs nothing else: no project, no settings, no network @@ -58,34 +96,7 @@ pub(crate) async fn run(mut args: Args) -> anyhow::Result<()> { let root = enter_project(&mut args, &invoked_from)?; // Resolve provider/model/auth once (CLI flags > env > config) and share it downstream. let mut settings = crate::engine_setup::AgentSettings::resolve(root, args.overrides()); - settings.resume = resume_from_args(&args); - settings.permission_mode = permission_mode_from_args(&args); - settings.trust_project = args.trust_project; - settings.disable_tools = args.no_tool.clone(); - settings.enable_tools = args.with_tool.clone(); - if let Some(raw) = args.thinking.as_deref() { - match args::parse_thinking_level(raw) { - Some(level) => { - settings.initial_thinking = Some(level); - settings.thinking_forced = true; - } - None => eprintln!("luxe: ignoring unknown --thinking level '{raw}'"), - } - } - settings.auto_approve = args.auto_approve; - if let Some(on_ask) = args.on_ask { - settings.on_ask = on_ask.into(); - } - if args.auto_approve && !args.prompts_a_human() && args.starts_an_engine() { - settings.startup_notices.push( - "--auto-approve: an unattended run already allows an `ask`. `--on-ask deny` is how to \ - make one refuse instead." - .to_string(), - ); - } - if args.plan { - settings.initial_mode = Some(luxe_core::mode::PLAN.to_string()); - } + apply_run_flags(&args, &mut settings); if args.starts_an_engine() { enter_worktree(&args, &mut settings).await?; @@ -104,9 +115,13 @@ pub(crate) async fn run(mut args: Args) -> anyhow::Result<()> { // loop run needs the right context window just as much. Best-effort and non-blocking. crate::model_catalog::spawn_refresh(); - // Ask, at most daily, whether a newer Luxe exists. The answer lands in a cache and is read by + // Ask, at most daily, whether a newer luxe exists. The answer lands in a cache and is read by // the *next* launch's dashboard, so nothing here is on the path to a first token. crate::update_check::spawn_check(&settings.state_root); + // The copy a Windows update moved aside; nothing to find anywhere else + if cfg!(windows) { + update_command::remove_leftover(); + } if let Some(cmd) = args.command { match cmd { diff --git a/crates/luxe-cli/src/cli/args.rs b/crates/luxe-cli/src/cli/args.rs index 67e8013..fd1dada 100644 --- a/crates/luxe-cli/src/cli/args.rs +++ b/crates/luxe-cli/src/cli/args.rs @@ -8,7 +8,7 @@ mod permission_mode; pub(crate) use commands::*; pub(crate) use permission_mode::PermissionModeArg; -/// Luxe's command line. `--help` shows the crate description from `Cargo.toml`, not this doc. +/// luxe's command line. `--help` shows the crate description from `Cargo.toml`, not this doc. #[derive(Parser, Debug)] #[command(name = "luxe", version, about)] pub(crate) struct Args { @@ -17,7 +17,7 @@ pub(crate) struct Args { pub(crate) headless: bool, /// Speak the JSONL front-end protocol on stdio: wire actions in, events out. For editor - /// plugins, alternative UIs, and anything driving Luxe as a session rather than a one-shot. + /// plugins, alternative UIs, and anything driving luxe as a session rather than a one-shot. /// See `docs/guide/rpc.md`. #[arg(long, conflicts_with = "headless")] pub(crate) rpc: bool, @@ -279,7 +279,7 @@ impl Args { } } -/// Parse a `--thinking` level name into a `ThinkingLevel`, accepting the same spellings Luxe +/// Parse a `--thinking` level name into a `ThinkingLevel`, accepting the same spellings luxe /// displays (`off`..`ultra`, plus `max` as an alias for `ultra`). Returns `None` for unknown input. pub(crate) fn parse_thinking_level(raw: &str) -> Option { let name = raw.trim().to_ascii_lowercase(); diff --git a/crates/luxe-cli/src/cli/args/commands.rs b/crates/luxe-cli/src/cli/args/commands.rs index 7cf3c19..68be462 100644 --- a/crates/luxe-cli/src/cli/args/commands.rs +++ b/crates/luxe-cli/src/cli/args/commands.rs @@ -7,13 +7,13 @@ use clap::{Parser, Subcommand}; pub(crate) enum SubCommand { /// Sign in to a provider, check credentials, or sign out. Auth(AuthArgs), - /// Read Luxe's user guide, for this version. + /// Read luxe's user guide, for this version. Docs(DocsArgs), /// Check which language servers, debug adapters and tools work on this machine. Doctor, - /// Set Luxe up: a theme, a provider, the tools and the start screen. + /// Set luxe up: a theme, a provider, the tools and the start screen. Init(InitArgs), - /// Join a session another Luxe on this machine is running, speaking the `--rpc` protocol on + /// Join a session another luxe on this machine is running, speaking the `--rpc` protocol on /// stdin and stdout. Join(JoinArgs), /// Serve your sessions to your own phone or tablet, through Tailscale. @@ -27,7 +27,7 @@ pub(crate) enum SubCommand { Models(ModelsArgs), /// List this project's sessions. Sessions(SessionsArgs), - /// Update Luxe with the command for however it was installed. + /// Update luxe with the command for however it was installed. Update(UpdateArgs), /// Summarize a `LUXE_WIRE_LOG` capture. Wire(WireArgs), @@ -109,10 +109,10 @@ pub(crate) struct ModelsArgs { pub(crate) command: ModelsCommand, } -/// Models subcommand — what Luxe knows about a model, and where it learned it. +/// Models subcommand — what luxe knows about a model, and where it learned it. #[derive(Subcommand, Debug)] pub(crate) enum ModelsCommand { - /// List known models for the providers Luxe can route to. + /// List known models for the providers luxe can route to. List { /// Only this provider. #[arg(long)] @@ -148,7 +148,7 @@ pub(crate) struct InitArgs { /// Join arguments. #[derive(Parser, Debug)] pub(crate) struct JoinArgs { - /// The session: its id or the start of it, or the process id of the Luxe running it. Omit + /// The session: its id or the start of it, or the process id of the luxe running it. Omit /// it to join the one running in this folder. pub(crate) target: Option, /// List the sessions running on this machine that can be joined, and exit. diff --git a/crates/luxe-cli/src/cli/auth_command.rs b/crates/luxe-cli/src/cli/auth_command.rs index 776ccf2..6992480 100644 --- a/crates/luxe-cli/src/cli/auth_command.rs +++ b/crates/luxe-cli/src/cli/auth_command.rs @@ -105,17 +105,11 @@ fn report_success(service: &ProviderAuth, outcome: &LoginOutcome) { field("models", note); } field("saved to", &luxe_core::paths::home_relative(&service.store_path())); - if let Some(model) = &outcome.suggested_model { - field("model", &format!("{model} {}", style::dim("(now the default)"))); - } // Advice sits apart from the summary: it's about what to do later, not what just happened. for advice in &outcome.advice { outln!("\n {}", style::dim(advice)); } - match outcome.suggested_model { - Some(_) => outln!("\nRun `luxe` to start, or `/model` to pick another."), - None => outln!("\nRun `luxe` to start, then `/model` to pick a model."), - } + outln!("\nRun `luxe` to start, then `/model` to pick a model."); } /// `luxe auth list` — every provider and how it's configured. diff --git a/crates/luxe-cli/src/cli/commands.rs b/crates/luxe-cli/src/cli/commands.rs index 8bbc947..d0bfac1 100644 --- a/crates/luxe-cli/src/cli/commands.rs +++ b/crates/luxe-cli/src/cli/commands.rs @@ -172,7 +172,7 @@ async fn start_loop( event_rx, running_rx, kickoff, - crate::loop_view::LoopView::new(quiet), + crate::loop_view::LoopView::new(quiet, phase), ) .await?; Ok(()) diff --git a/crates/luxe-cli/src/cli/docs_command.rs b/crates/luxe-cli/src/cli/docs_command.rs index f086736..8c33c28 100644 --- a/crates/luxe-cli/src/cli/docs_command.rs +++ b/crates/luxe-cli/src/cli/docs_command.rs @@ -2,7 +2,7 @@ //! //! The guide ships in the binary, so it works offline and always describes the version installed: //! `scripts/guide-bundle.sh` writes every page of `docs/guide/` into `src/guide.md`, and this reads -//! that bundle. The agent is told the command exists, so asking Luxe how to configure Luxe gets an +//! that bundle. The agent is told the command exists, so asking luxe how to configure luxe gets an //! answer from the manual rather than a guess. use crate::cli::args::DocsArgs; @@ -11,7 +11,7 @@ use crate::cli::args::DocsArgs; const BUNDLE: &str = include_str!("../guide.md"); /// The sidebar's groups, in reading order. `web/src/content.config.ts` holds the same list. -const GROUPS: [&str; 5] = ["Get started", "Using Luxe", "Customize", "Extend", "Reference"]; +const GROUPS: [&str; 5] = ["Get started", "Using luxe", "Customize", "Extend", "Reference"]; /// The most lines `--search` prints, so a common word cannot flood a tool result. const SEARCH_LIMIT: usize = 40; @@ -74,7 +74,7 @@ pub(crate) fn run(args: &DocsArgs) -> anyhow::Result<()> { /// Every page, under its group, with its summary and how to read it. fn index(pages: &[Page]) -> String { let mut out = String::from( - "Luxe's user guide, for this version. `luxe docs ` prints a page; \ + "luxe's user guide, for this version. `luxe docs ` prints a page; \ `luxe docs --search ` finds lines across all of them.\n", ); for group in GROUPS { diff --git a/crates/luxe-cli/src/cli/doctor_command.rs b/crates/luxe-cli/src/cli/doctor_command.rs index e0c5dcf..b7f5223 100644 --- a/crates/luxe-cli/src/cli/doctor_command.rs +++ b/crates/luxe-cli/src/cli/doctor_command.rs @@ -1,6 +1,6 @@ //! `luxe doctor` — is the tooling on this machine actually going to work? //! -//! Luxe launches language servers and debug adapters; it does not install them, and it does not +//! luxe launches language servers and debug adapters; it does not install them, and it does not //! bundle them: installation would mean owning each language's package manager and update policy. //! A broken or absent one can otherwise stay invisible until a tool call comes back empty. //! @@ -63,7 +63,7 @@ async fn language_servers() { let configured: std::collections::HashSet = user.keys().cloned().collect(); for language in registry.merge_patches(user) { say(&format!( - " FAIL {language:<12} lsp-servers.json gives no `command`, and Luxe ships none" + " FAIL {language:<12} lsp-servers.json gives no `command`, and luxe ships none" )); } let mut languages: Vec<(&String, &ServerEntry)> = registry.iter().collect(); diff --git a/crates/luxe-cli/src/cli/join_command.rs b/crates/luxe-cli/src/cli/join_command.rs index a7070e2..97eb1f4 100644 --- a/crates/luxe-cli/src/cli/join_command.rs +++ b/crates/luxe-cli/src/cli/join_command.rs @@ -1,6 +1,6 @@ -//! `luxe join` — a session another Luxe is running, over stdin and stdout. +//! `luxe join` — a session another luxe is running, over stdin and stdout. //! -//! The running Luxe shares its session on a local endpoint (`cli::share`), and this command is the +//! The running luxe shares its session on a local endpoint (`cli::share`), and this command is the //! plain way in: it picks the session from the records in the runtime folder, connects, and copies //! bytes both ways. What crosses is the `--rpc` protocol untouched, so a client written for //! `luxe --rpc` drives a joined session by launching `luxe join` instead. @@ -63,7 +63,7 @@ fn nothing_to_join(running: &[LiveSession], target: Option<&str>, cwd: &str) -> }; if running.is_empty() { return format!( - "{wanted}, and none is running on this machine that can be joined. A Luxe shares \ + "{wanted}, and none is running on this machine that can be joined. A luxe shares \ its session unless `joinable` is off or LUXE_JOINABLE=0." ); } diff --git a/crates/luxe-cli/src/cli/join_command/tests.rs b/crates/luxe-cli/src/cli/join_command/tests.rs index cb889d6..0ba4797 100644 --- a/crates/luxe-cli/src/cli/join_command/tests.rs +++ b/crates/luxe-cli/src/cli/join_command/tests.rs @@ -21,7 +21,7 @@ fn sessions() -> Vec { /// With no target, the session running in this folder is the one joined. /// /// The break this catches: ignoring the folder, so `luxe join` in one project lands in another's -/// session, or refuses because more than one Luxe is running somewhere. +/// session, or refuses because more than one luxe is running somewhere. #[test] fn no_target_joins_the_session_running_here() { let all = sessions(); @@ -39,7 +39,7 @@ fn two_sessions_in_the_folder_are_listed_not_guessed() { assert!(error.contains("aaab-2222") && error.contains("cccc-3333"), "{error}"); } -/// A target names a session by the start of its id or by its Luxe's process id. +/// A target names a session by the start of its id or by its luxe's process id. /// /// The break this catches: matching the id exactly, so the short form the listing invites fails, /// or not accepting a pid, which is what `ps` and herdr show. @@ -62,7 +62,7 @@ fn an_ambiguous_or_empty_target_is_refused() { /// Nothing to join says why, and how sharing is turned back on when nothing is running. /// -/// The break this catches: a bare "not found" when every Luxe has `joinable` off, which leaves the +/// The break this catches: a bare "not found" when every luxe has `joinable` off, which leaves the /// reader with nothing to try. #[test] fn nothing_to_join_says_what_is_running() { diff --git a/crates/luxe-cli/src/cli/models_command.rs b/crates/luxe-cli/src/cli/models_command.rs index 88e59ef..8a2c3a8 100644 --- a/crates/luxe-cli/src/cli/models_command.rs +++ b/crates/luxe-cli/src/cli/models_command.rs @@ -1,6 +1,6 @@ //! `luxe models` — inspect and refresh the model catalog. //! -//! Exists mostly for one question: *why does Luxe think my model has a 128k window?* `show` +//! Exists mostly for one question: *why does luxe think my model has a 128k window?* `show` //! answers it directly by printing which layer won each field, so a stale cache, a missing //! provider mapping, and a forgotten config override are all distinguishable at a glance. diff --git a/crates/luxe-cli/src/cli/remote_command.rs b/crates/luxe-cli/src/cli/remote_command.rs index 18a844b..d08d445 100644 --- a/crates/luxe-cli/src/cli/remote_command.rs +++ b/crates/luxe-cli/src/cli/remote_command.rs @@ -46,7 +46,7 @@ async fn serve(port: u16, allow: Vec, devices: DeviceBook) -> anyhow::Re let logins = allowed_logins(tailnet, allow)?; let access = Access { logins: logins.clone(), devices }; let bridge = bridge(port, access, machine).await?; - outln!("Luxe remote is listening on http://{}. Ctrl-C stops it.", bridge.address()); + outln!("luxe remote is listening on http://{}. Ctrl-C stops it.", bridge.address()); outln!("It lets in {}, from a paired device.", logins.join(", ")); bridge .serve(async { diff --git a/crates/luxe-cli/src/cli/remote_command/setup.rs b/crates/luxe-cli/src/cli/remote_command/setup.rs index 0401641..911d87f 100644 --- a/crates/luxe-cli/src/cli/remote_command/setup.rs +++ b/crates/luxe-cli/src/cli/remote_command/setup.rs @@ -1,5 +1,5 @@ //! `luxe remote setup` — from nothing to a paired phone, asking before each step that changes -//! something outside Luxe. +//! something outside luxe. //! //! Four steps: Tailscale is there and signed in; Serve carries `https:///` to the //! bridge; a user service runs the bridge at login; and an invitation to scan. Each step that is @@ -108,7 +108,7 @@ fn service_step(port: u16, tailnet: &Tailnet, allow: Vec) { return; } if !confirm("Run the bridge whenever you're signed in, as a user service?") { - outln!("Skipped. Run `luxe remote` yourself whenever your devices should reach Luxe."); + outln!("Skipped. Run `luxe remote` yourself whenever your devices should reach luxe."); return; } let launch = diff --git a/crates/luxe-cli/src/cli/rpc/translate.rs b/crates/luxe-cli/src/cli/rpc/translate.rs index c2562a3..7d7b8ae 100644 --- a/crates/luxe-cli/src/cli/rpc/translate.rs +++ b/crates/luxe-cli/src/cli/rpc/translate.rs @@ -75,7 +75,7 @@ impl GithubWrites { match self { Self::Allowed => None, Self::NotEnabled => Some(format!( - "{kind} publishes to GitHub, which this session does not allow: start Luxe with \ + "{kind} publishes to GitHub, which this session does not allow: start luxe with \ --github-writes to let a client do that" )), Self::ReadOnly => Some(format!( @@ -151,7 +151,7 @@ fn session_refusal(wire: &WireAction, policy: &Policy) -> Option { let switches = matches!(wire, WireAction::NewSession | WireAction::LoadSession(_)); if policy.joined && switches { let reason = "would switch the session the terminal is showing: switch it there, or start \ - another Luxe"; + another luxe"; return Some(format!("{kind} {reason}")); } None diff --git a/crates/luxe-cli/src/cli/rpc/translate/tests.rs b/crates/luxe-cli/src/cli/rpc/translate/tests.rs index e6b320e..04771eb 100644 --- a/crates/luxe-cli/src/cli/rpc/translate/tests.rs +++ b/crates/luxe-cli/src/cli/rpc/translate/tests.rs @@ -447,7 +447,7 @@ fn github_writes_need_the_flag_and_read_only_refuses_them_anyway() { ] }; for (gate, needle) in [ - (GithubWrites::NotEnabled, "start Luxe with --github-writes"), + (GithubWrites::NotEnabled, "start luxe with --github-writes"), (GithubWrites::ReadOnly, "read-only"), ] { for wire in writes() { diff --git a/crates/luxe-cli/src/cli/tui.rs b/crates/luxe-cli/src/cli/tui.rs index 8b8b446..dc482fd 100644 --- a/crates/luxe-cli/src/cli/tui.rs +++ b/crates/luxe-cli/src/cli/tui.rs @@ -11,7 +11,7 @@ fn footer_note(repo_root: &std::path::Path) -> Option { crate::update_check::cached_notice(repo_root).map(|_| UPDATE_HINT.to_string()) } -/// What the dashboard says when a newer Luxe exists. +/// What the dashboard says when a newer luxe exists. const UPDATE_HINT: &str = "Update available · /update"; /// Whether the startup dashboard should be shown. @@ -295,7 +295,7 @@ async fn starting_status( /// mid-session shows up without relaunching. The probe is the same menu built after asking every /// connected local server what it is serving — a list that changes the moment somebody loads a /// model, and that only the endpoint knows. An Azure resource is the same question asked of a -/// cloud: what is deployed there changes in a portal Luxe never sees. A server that is off leaves +/// cloud: what is deployed there changes in a portal luxe never sees. A server that is off leaves /// the record standing. fn model_menu_sources( settings: &crate::engine_setup::AgentSettings, diff --git a/crates/luxe-cli/src/cli/update_command.rs b/crates/luxe-cli/src/cli/update_command.rs index 53593c7..4121a53 100644 --- a/crates/luxe-cli/src/cli/update_command.rs +++ b/crates/luxe-cli/src/cli/update_command.rs @@ -1,8 +1,8 @@ //! `luxe update` — run the update this install's owner provides, then check that it took. //! //! The policy is [`luxe_core::update`]'s: which owner installed this copy, which commands update -//! it, and a refusal where Luxe cannot know them. This runs those commands one program at a time -//! with the terminal attached, so the reader sees the package manager's own output, and Luxe never +//! it, and a refusal where luxe cannot know them. This runs those commands one program at a time +//! with the terminal attached, so the reader sees the package manager's own output, and luxe never //! writes a binary itself. `/update` on the dashboard comes here too, once the TUI has handed the //! terminal back. @@ -10,6 +10,8 @@ use anyhow::{anyhow, bail, Context}; use luxe_core::update::{self, InstallSource}; use std::path::{Path, PathBuf}; +pub(crate) use aside::remove_leftover; + /// Checks for a newer release now and, unless `check_only`, runs the update and checks the result. pub(crate) async fn run(check_only: bool) -> anyhow::Result<()> { let current = luxe_core::version::VERSION; @@ -17,50 +19,62 @@ pub(crate) async fn run(check_only: bool) -> anyhow::Result<()> { .await .map_err(|error| anyhow!("could not check for a newer release: {error}"))?; if !update::is_newer(&latest, current) { - println!("Luxe {current} is the newest release."); + println!("luxe {current} is the newest release."); return Ok(()); } - println!("Luxe {latest} is available (you have {current})."); + println!("luxe {latest} is available (you have {current})."); let source = InstallSource::detect(); match (source.update_steps(), check_only) { - (Some(steps), false) if !cfg!(windows) => { - run_steps(steps).await?; - report(installed_now(&latest).await) - } + (Some(steps), false) => update_with(steps, &latest).await, _ => { - println!("{}", instructions(source, check_only, cfg!(windows))); + println!("{}", instructions(source, check_only)); Ok(()) } } } -/// What to tell a reader Luxe will not run an update for: they asked only to check, Windows cannot -/// replace the running program, or no owner's command is known. -fn instructions(source: InstallSource, check_only: bool, windows: bool) -> String { +/// Runs the owner's steps over this copy, then checks the `luxe` a shell finds now. +/// +/// Windows won't let a running program's file be overwritten, and `luxe update` is itself a +/// running luxe. It does allow a rename, so the running copy steps aside first and the owner +/// writes a new file where it was. +async fn update_with(steps: &[&[&str]], latest: &str) -> anyhow::Result<()> { + let exe = std::env::current_exe().context("could not find the running luxe")?; + let aside = match cfg!(windows) { + true => Some(aside::MovedAside::move_running(&exe)?), + false => None, + }; + let ran = run_steps(steps, exe.parent()).await; + if let Some(aside) = &aside { + aside.restore_if_missing()?; + } + ran?; + report(installed_now(latest, &exe).await) +} + +/// What to tell a reader luxe will not run an update for: they asked only to check, or no owner's +/// command is known. +fn instructions(source: InstallSource, check_only: bool) -> String { match source.update_command() { - Some(command) if !check_only && windows => format!( - "Windows can't replace Luxe while it runs, so run this once it has exited: {command}" - ), Some(_) if check_only => format!("Run `luxe update`, or {}.", source.advice()), _ => format!("To update: {}.", source.advice()), } } -/// Runs each step in turn, the terminal attached, stopping at the first that fails. -async fn run_steps(steps: &[&[&str]]) -> anyhow::Result<()> { +/// Runs each step in turn, the terminal attached, stopping at the first that fails. `beside` is +/// the running binary's directory. +async fn run_steps(steps: &[&[&str]], beside: Option<&Path>) -> anyhow::Result<()> { for step in steps { let Some((program, args)) = step.split_first() else { continue }; let line = step.join(" "); println!("Running: {line}"); - let beside = - std::env::current_exe().ok().and_then(|exe| exe.parent().map(Path::to_path_buf)); - let status = tokio::process::Command::new(program_path(program, beside.as_deref())) + let status = tokio::process::Command::new(program_path(program, beside)) .args(args) .status() .await .with_context(|| format!("could not start `{program}`"))?; if !status.success() { - bail!("`{line}` failed ({status}), so Luxe is unchanged"); + bail!("`{line}` failed ({status}), so luxe is unchanged"); } } Ok(()) @@ -108,15 +122,15 @@ fn outcome(found: Option<&Path>, updated: &Path, reported: Option<&str>, latest: } } -/// The `luxe` a shell would run now, and the outcome it shows. -async fn installed_now(latest: &str) -> Outcome { +/// The `luxe` a shell would run now, and the outcome it shows. `updated` is where the running copy +/// was, read before a Windows update moved it aside. +async fn installed_now(latest: &str, updated: &Path) -> Outcome { let found = luxe_core::program::resolve("luxe"); let reported = match &found { Some(path) => version_of(path).await, None => None, }; - let updated = std::env::current_exe().unwrap_or_default(); - outcome(found.as_deref(), &updated, reported.as_deref(), latest) + outcome(found.as_deref(), updated, reported.as_deref(), latest) } /// The version `path --version` prints, as `luxe 0.2.0`. @@ -150,5 +164,7 @@ fn report(outcome: Outcome) -> anyhow::Result<()> { Ok(()) } +mod aside; + #[cfg(test)] mod tests; diff --git a/crates/luxe-cli/src/cli/update_command/aside.rs b/crates/luxe-cli/src/cli/update_command/aside.rs new file mode 100644 index 0000000..2697f43 --- /dev/null +++ b/crates/luxe-cli/src/cli/update_command/aside.rs @@ -0,0 +1,118 @@ +//! Moving the running copy aside — how `luxe update` gets out of its own way on Windows. +//! +//! Windows locks a running program's file against being overwritten or deleted, but not against +//! being renamed. The running `luxe.exe` becomes `luxe.exe.old`, the owner's updater writes a new +//! `luxe.exe`, and the next launch deletes the leftover once nothing is running from it. Nothing +//! here writes a binary: it only renames the one that is already there. + +use anyhow::Context; +use std::path::{Path, PathBuf}; + +/// The running copy, renamed out of the way of the update. +pub(super) struct MovedAside { + from: PathBuf, + to: PathBuf, +} + +impl MovedAside { + /// Renames `exe` to its leftover name, clearing a leftover a previous update left behind. + pub(super) fn move_running(exe: &Path) -> anyhow::Result { + let to = leftover_path(exe); + remove_if_present(&to).with_context(|| { + format!("could not remove {}, left by an earlier update", to.display()) + })?; + std::fs::rename(exe, &to).with_context(|| { + format!("could not move the running {} aside to update it", exe.display()) + })?; + Ok(Self { from: exe.to_path_buf(), to }) + } + + /// Puts the running copy back when the update left nothing where it was, so a failed update + /// never leaves the reader without a `luxe`. + pub(super) fn restore_if_missing(&self) -> anyhow::Result<()> { + if self.from.exists() { + return Ok(()); + } + std::fs::rename(&self.to, &self.from).with_context(|| { + format!( + "the update left no luxe behind and {} could not be moved back to {}", + self.to.display(), + self.from.display() + ) + }) + } +} + +/// Deletes the copy an earlier update moved aside, if there is one. Called at launch, when the +/// old copy has exited. Still running elsewhere is normal (another session), so a failure is +/// only logged and the next launch tries again. +pub(crate) fn remove_leftover() { + let Ok(exe) = std::env::current_exe() else { return }; + let leftover = leftover_path(&exe); + if let Err(error) = remove_if_present(&leftover) { + tracing::debug!(%error, path = %leftover.display(), "leftover from an update is still in use"); + } +} + +/// `luxe.exe` beside itself as `luxe.exe.old`. +fn leftover_path(exe: &Path) -> PathBuf { + let mut name = exe.file_name().unwrap_or_default().to_os_string(); + name.push(".old"); + exe.with_file_name(name) +} + +/// Removes `path`; already gone is success. +fn remove_if_present(path: &Path) -> std::io::Result<()> { + match std::fs::remove_file(path) { + Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()), + other => other, + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn installed() -> (tempfile::TempDir, PathBuf) { + let dir = tempfile::tempdir().expect("tempdir"); + let exe = dir.path().join("luxe.exe"); + std::fs::write(&exe, b"old").expect("a stand-in binary"); + (dir, exe) + } + + #[test] + fn the_leftover_sits_beside_the_binary() { + assert_eq!(leftover_path(Path::new("/bin/luxe.exe")), PathBuf::from("/bin/luxe.exe.old")); + } + + /// The update writes a new file where the old one was, and the old one is left to delete. + #[test] + fn an_update_that_wrote_a_new_copy_keeps_it() { + let (_dir, exe) = installed(); + let aside = MovedAside::move_running(&exe).expect("moved"); + assert!(!exe.exists(), "the name is free for the updater"); + std::fs::write(&exe, b"new").expect("the updater's copy"); + aside.restore_if_missing().expect("nothing to restore"); + assert_eq!(std::fs::read(&exe).expect("read"), b"new"); + assert_eq!(std::fs::read(leftover_path(&exe)).expect("read"), b"old"); + } + + /// A failed update puts the running copy back rather than leaving no `luxe` at all. + #[test] + fn an_update_that_wrote_nothing_puts_the_old_copy_back() { + let (_dir, exe) = installed(); + let aside = MovedAside::move_running(&exe).expect("moved"); + aside.restore_if_missing().expect("restored"); + assert_eq!(std::fs::read(&exe).expect("read"), b"old"); + assert!(!leftover_path(&exe).exists()); + } + + /// A leftover from the last update is cleared, not a reason to refuse this one. + #[test] + fn a_leftover_from_last_time_is_replaced() { + let (_dir, exe) = installed(); + std::fs::write(leftover_path(&exe), b"older").expect("a leftover"); + MovedAside::move_running(&exe).expect("moved"); + assert_eq!(std::fs::read(leftover_path(&exe)).expect("read"), b"old"); + } +} diff --git a/crates/luxe-cli/src/cli/update_command/tests.rs b/crates/luxe-cli/src/cli/update_command/tests.rs index f441320..fe3ac0c 100644 --- a/crates/luxe-cli/src/cli/update_command/tests.rs +++ b/crates/luxe-cli/src/cli/update_command/tests.rs @@ -69,13 +69,8 @@ fn no_luxe_on_path_or_no_version_cannot_be_judged() { /// Only the reader's own command is ever named, and a check offers `luxe update` beside it. #[test] fn the_instructions_name_the_owners_command_or_none() { - let check = instructions(InstallSource::Cargo, true, false); + let check = instructions(InstallSource::Cargo, true); assert!(check.contains("luxe update") && check.contains("cargo install"), "{check}"); - let download = instructions(InstallSource::Archive, false, false); + let download = instructions(InstallSource::Archive, false); assert!(download.contains("download it from"), "{download}"); - let windows = instructions(InstallSource::Cargo, false, true); - assert!( - windows.contains("once it has exited") && windows.contains("cargo install"), - "{windows}" - ); } diff --git a/crates/luxe-cli/src/cli/wire_command/secrets.rs b/crates/luxe-cli/src/cli/wire_command/secrets.rs index 8284548..5eca0d1 100644 --- a/crates/luxe-cli/src/cli/wire_command/secrets.rs +++ b/crates/luxe-cli/src/cli/wire_command/secrets.rs @@ -7,7 +7,7 @@ const SECRET_PREFIXES: &[&str] = &["sk-", "sk_live_", "ghp_", "gho_", "xoxb-", " /// Minimum run of key-shaped characters after a prefix before it counts as a credential. /// -/// Without this, reading Luxe's own `redact.rs` — whose source *contains* every prefix — reports a +/// Without this, reading luxe's own `redact.rs` — whose source *contains* every prefix — reports a /// leak on every audit. The prefix alone is prose; the prefix plus a key is a secret. const SECRET_BODY: usize = 16; diff --git a/crates/luxe-cli/src/cli/wire_command/tests.rs b/crates/luxe-cli/src/cli/wire_command/tests.rs index cf2ce53..a66b28a 100644 --- a/crates/luxe-cli/src/cli/wire_command/tests.rs +++ b/crates/luxe-cli/src/cli/wire_command/tests.rs @@ -184,7 +184,7 @@ fn a_bold_label_outside_the_tools_section_is_not_a_duplicate() { #[test] fn a_credential_prefix_in_prose_is_not_a_leak_but_a_real_key_is() { - // Reading Luxe's own redact.rs puts every prefix in a tool result; that is not a leak. + // Reading luxe's own redact.rs puts every prefix in a tool result; that is not a leak. assert!(looks_like_credential("patterns like sk- and ghp_ and AKIA").is_none()); assert!(looks_like_credential("Authorization: Bearer short").is_none()); let leak = looks_like_credential("key=sk-abcdefghijklmnopqrstuvwxyz0123") diff --git a/crates/luxe-cli/src/cli/worktree.rs b/crates/luxe-cli/src/cli/worktree.rs index d8c847e..bcf7486 100644 --- a/crates/luxe-cli/src/cli/worktree.rs +++ b/crates/luxe-cli/src/cli/worktree.rs @@ -248,7 +248,7 @@ pub(super) fn worktree_notice( ) } -/// Leaves the session's worktree and removes it, saying how it went on the terminal Luxe has +/// Leaves the session's worktree and removes it, saying how it went on the terminal luxe has /// just handed back. pub(super) async fn remove_worktree(project: &std::path::Path, path: &std::path::Path) { if let Err(error) = std::env::set_current_dir(project) { diff --git a/crates/luxe-cli/src/config_editor.rs b/crates/luxe-cli/src/config_editor.rs index 9975929..611d089 100644 --- a/crates/luxe-cli/src/config_editor.rs +++ b/crates/luxe-cli/src/config_editor.rs @@ -1,4 +1,4 @@ -//! Config editor handoff — opens one of Luxe's files outside the alternate screen. +//! Config editor handoff — opens one of luxe's files outside the alternate screen. //! //! The TUI returns control before this runs, so terminal editors inherit a normal terminal. //! When the editor exits, the CLI rebuilds the TUI and reloads the updated configuration. @@ -47,7 +47,7 @@ pub(crate) async fn open_config_file(path: PathBuf) -> anyhow::Result { /// credential file created world-readable is a credential file leaked. fn ensure_file(path: PathBuf) -> anyhow::Result { if path == Config::global_path() { - return Config::ensure_global_file().context("creating Luxe user config"); + return Config::ensure_global_file().context("creating luxe user config"); } if path.exists() { return Ok(path); diff --git a/crates/luxe-cli/src/engine_setup.rs b/crates/luxe-cli/src/engine_setup.rs index 3fb6ac9..5909b7a 100644 --- a/crates/luxe-cli/src/engine_setup.rs +++ b/crates/luxe-cli/src/engine_setup.rs @@ -135,7 +135,7 @@ pub(crate) async fn build_engine( let model = settings.launch_model(); - // Provider routing: the adapter the settings selected, plus a registry of every provider Luxe + // Provider routing: the adapter the settings selected, plus a registry of every provider luxe // knows about, so an in-session model switch *or* a mid-session `/login` reaches the right one. let provider = build_active_adapter(settings); let providers = build_provider_registry(settings, &provider); @@ -183,8 +183,9 @@ pub(crate) async fn build_engine( external_work: Some(services::shared_external_work()), review_context_files: config.review.context_files.clone(), review_exclude: config.review.exclude.clone(), - // A real session remembers what the user picked; embedders and tests leave no trace. - remember_runtime_state: config.agent.remember_model(), + // A real session remembers what the user picked, here and anywhere; embedders and tests + // leave no trace. + remember_choices_in: config.agent.remember_model().then(|| settings.work_root.clone()), cache_warming: config.agent.cache_warming(), // Ground Guided Review in real structure (relevant files + test gaps) from the warm graph. review_insight_provider: Some(Arc::new(crate::review_insight::GraphReviewInsight::new( @@ -322,8 +323,8 @@ fn assemble_hooks( (hook_registry, session_end_budget) } -/// The hook that reports the agent's state to the Herdr pane Luxe runs in, so its sidebar tracks -/// Luxe. `None` outside Herdr, under `LUXE_HERDR=0`, or with `"herdr": false`. +/// The hook that reports the agent's state to the Herdr pane luxe runs in, so its sidebar tracks +/// luxe. `None` outside Herdr, under `LUXE_HERDR=0`, or with `"herdr": false`. fn herdr_hook(config: &luxe_core::config::Config) -> Option { config.herdr().then(luxe_core::hooks::herdr::HerdrHook::detect).flatten() } diff --git a/crates/luxe-cli/src/engine_setup/config.rs b/crates/luxe-cli/src/engine_setup/config.rs index 080893d..48d5446 100644 --- a/crates/luxe-cli/src/engine_setup/config.rs +++ b/crates/luxe-cli/src/engine_setup/config.rs @@ -1,7 +1,7 @@ //! Configuration loading — auth/models, permissions, command hooks, and env resolution. //! //! Every reader treats its file as read-if-present: a missing or malformed config degrades to -//! defaults rather than failing, so Luxe runs the same with or without user config. +//! defaults rather than failing, so luxe runs the same with or without user config. use std::path::PathBuf; @@ -65,7 +65,7 @@ pub(crate) fn load_luxe_config() -> ModelsConfig { /// Warn if a secrets file is readable by group or other. /// -/// Luxe writes its own secret files `0600` (MCP token store, review stores), but `auth.json`/ +/// luxe writes its own secret files `0600` (MCP token store, review stores), but `auth.json`/ /// `models.json` are user-authored, so we can only nudge: ssh and aws-cli take the same stance /// (warn/refuse on loose credential permissions). Unix-only; a no-op elsewhere. #[cfg(unix)] @@ -230,7 +230,7 @@ pub(crate) fn global_permissions_path() -> PathBuf { luxe_config_dir().join("permissions.json") } -/// Luxe's own config directory. See [`luxe_core::user_dirs::luxe_config_dir`], the one owner. +/// luxe's own config directory. See [`luxe_core::user_dirs::luxe_config_dir`], the one owner. pub(crate) fn luxe_config_dir() -> PathBuf { luxe_core::user_dirs::luxe_config_dir() } diff --git a/crates/luxe-cli/src/engine_setup/provider.rs b/crates/luxe-cli/src/engine_setup/provider.rs index 7ecb73a..d949d8a 100644 --- a/crates/luxe-cli/src/engine_setup/provider.rs +++ b/crates/luxe-cli/src/engine_setup/provider.rs @@ -1,4 +1,4 @@ -//! Provider adapter construction — the active adapter plus a registry of every provider Luxe can +//! Provider adapter construction — the active adapter plus a registry of every provider luxe can //! route to, so an in-session model switch or a mid-session `/login` reaches the right backend. use std::collections::HashMap; @@ -88,7 +88,7 @@ pub(super) fn active_auth( /// the provider's own variable, then the key its block names. /// /// One chain for the provider a session starts on and every one it can switch to, so the key that -/// goes out never depends on how the session got there. A provider Luxe does not know has no +/// goes out never depends on how the session got there. A provider luxe does not know has no /// variable of its own, only the `OPENAI_API_KEY` fallback, so its configured key comes first: an /// OpenAI key must not go to someone else's endpoint in place of the key written for it. Keys stay /// as written; the source expands them per request. @@ -108,7 +108,7 @@ fn provider_auth(store: AuthStore, name: &str, config: Option<&ProviderConfig>) /// Assemble the provider registry the engine routes through on an in-session model switch. /// -/// Every provider Luxe knows about is registered: the built-in catalog plus anything declared in +/// Every provider luxe knows about is registered: the built-in catalog plus anything declared in /// `~/.config/luxe/{auth,models}.json`. That is what makes `/login` take effect mid-session — the /// adapter is already there, and its store-backed auth source finds the new credential on the next /// turn. A provider with no credential registers too, and answers with an actionable auth error @@ -154,7 +154,7 @@ pub(crate) fn build_provider_registry( /// A `--model` that names its provider, `anthropic/claude-opus-5-5`, split into the two. /// -/// Only when the prefix is a provider Luxe knows, built in or configured, and no other provider +/// Only when the prefix is a provider luxe knows, built in or configured, and no other provider /// was named: under `--provider openrouter`, `anthropic/claude-x` is OpenRouter's own id, slash and /// all. Without the split the whole string went to the default provider as an id, which is the /// form the "no model selected" error tells you to type. diff --git a/crates/luxe-cli/src/engine_setup/provider/tests.rs b/crates/luxe-cli/src/engine_setup/provider/tests.rs index 43f5ea9..3638683 100644 --- a/crates/luxe-cli/src/engine_setup/provider/tests.rs +++ b/crates/luxe-cli/src/engine_setup/provider/tests.rs @@ -7,7 +7,7 @@ fn the_catalog_decides_which_adapter_a_known_provider_uses() { assert_eq!(resolve_api("openai", None), ApiKind::OpenaiResponses); assert_eq!(resolve_api("openai-codex", None), ApiKind::OpenaiCodex); assert_eq!(resolve_api("groq", None), ApiKind::OpenaiCompletions); - // Luxe's historical default provider name is an alias of `openai`. + // luxe's historical default provider name is an alias of `openai`. assert_eq!(resolve_api("openai_compat", None), ApiKind::OpenaiResponses); // An unknown provider is assumed to speak the most common dialect. assert_eq!(resolve_api("some-proxy", None), ApiKind::OpenaiCompletions); @@ -266,7 +266,7 @@ async fn the_launch_providers_command_key_runs_for_each_request() { } /// Launch and a `/model` switch find a provider's key by one chain: a sign-in first, then the -/// provider's own variable, then the key its block names, and for a provider Luxe does not know, +/// provider's own variable, then the key its block names, and for a provider luxe does not know, /// its block before `OPENAI_API_KEY`. So a configured key always beats a key meant for another /// provider, and which one goes out never depends on how the session reached the provider. #[test] @@ -329,7 +329,7 @@ fn launch_and_a_model_switch_send_the_same_key() { ); } -/// Which key each kind of provider settles on with nothing stored: a provider Luxe does not know +/// Which key each kind of provider settles on with nothing stored: a provider luxe does not know /// takes the key written for it before the `OPENAI_API_KEY` fallback, and one it knows takes its /// own variable first. #[test] diff --git a/crates/luxe-cli/src/engine_setup/services.rs b/crates/luxe-cli/src/engine_setup/services.rs index 84331b1..ecbf893 100644 --- a/crates/luxe-cli/src/engine_setup/services.rs +++ b/crates/luxe-cli/src/engine_setup/services.rs @@ -1,7 +1,7 @@ //! Warm, process-wide service singletons — the LSP client, code graph, DAP debugger, and //! diagnostics cache — plus the per-project session store. //! -//! Luxe runs one project per process, so each service is a `OnceLock` singleton reused across +//! luxe runs one project per process, so each service is a `OnceLock` singleton reused across //! every tool call and hook instead of being spawned per request. use std::sync::Arc; @@ -56,7 +56,7 @@ pub(crate) fn tool_statuses() -> Vec { /// Three inputs, and the judgement is here rather than in `luxe-lsp` so it can be read and tested /// in one place: the user's preference, whether a front-end can prompt, and `--trust-project`. /// -/// `interactive` carries the whole argument for the default. Luxe is a coding agent someone sits +/// `interactive` carries the whole argument for the default. luxe is a coding agent someone sits /// in front of; the loop is a feature, not the usual way it runs. With a person there, using the /// server the project pinned is ordinary work — and `node_modules/.bin` exists only because /// `npm install` already ran that project's install scripts, which is arbitrary code and a wider @@ -96,7 +96,7 @@ pub(crate) fn project_tooling_allowed() -> bool { /// The process-wide warm LSP service. A singleton (like [`shared_diagnostics_store`]) so the tools, /// the diagnostics-on-edit hook, and the workspace collector (which reads running-server state for -/// `/lsp`) all share one instance. Luxe runs one project per process; the collector scopes +/// `/lsp`) all share one instance. luxe runs one project per process; the collector scopes /// running servers to the active root. pub(crate) fn build_lsp_service() -> SharedLspService { static SERVICE: std::sync::OnceLock = std::sync::OnceLock::new(); @@ -112,7 +112,7 @@ pub(crate) fn build_lsp_service() -> SharedLspService { /// The process-wide warm code graph service, shared by the `impact` / `module_report` tools and the /// graph-invalidation hook. Singleton like the LSP/DAP services; rooted at the workspace on first -/// use (Luxe runs one project per process). +/// use (luxe runs one project per process). pub(crate) fn build_graph_service( repo_root: &std::path::Path, ) -> Arc { @@ -223,7 +223,7 @@ fn read_config_text(path: &std::path::Path) -> Result, String> { /// /// A shared handle at the binary boundary: it lets the (core) hook publish per-file diagnostics /// that the (core-agnostic) collector reads for the Context Dock without threading a channel -/// through every front-end. Luxe runs one project per process; the collector filters entries to the +/// through every front-end. luxe runs one project per process; the collector filters entries to the /// active root, so a project switch never leaks another tree's diagnostics. pub(crate) fn shared_diagnostics_store() -> luxe_core::lsp::DiagnosticsStore { static STORE: std::sync::OnceLock = diff --git a/crates/luxe-cli/src/engine_setup/session.rs b/crates/luxe-cli/src/engine_setup/session.rs index 6c3b769..182b616 100644 --- a/crates/luxe-cli/src/engine_setup/session.rs +++ b/crates/luxe-cli/src/engine_setup/session.rs @@ -169,7 +169,7 @@ pub(super) fn attach_session( Ok((session_id, claim)) } -/// Claim `session_id` for this process, or say which Luxe has it open and how to get there. +/// Claim `session_id` for this process, or say which luxe has it open and how to get there. fn claim_session( store: &luxe_core::session::JsonlSessionStore, session_id: &SessionId, @@ -181,7 +181,7 @@ fn claim_session( } } -/// Why `session` can't be opened here right now, when another Luxe has it open. +/// Why `session` can't be opened here right now, when another luxe has it open. /// /// Asked before leaving the session that's running, so the reader stays where they are rather /// than landing outside the TUI. This process's own claims don't count against it. @@ -195,7 +195,7 @@ pub(crate) fn open_elsewhere_now(state_root: &std::path::Path, session: &str) -> } } -/// Where the session is open, when the Luxe that has it says so, and what to do about it. +/// Where the session is open, when the luxe that has it says so, and what to do about it. fn open_elsewhere(id: &SessionId) -> String { let runtime = luxe_core::user_dirs::luxe_runtime_dir(); let holder = luxe_core::local_endpoint::live_sessions(&runtime) @@ -207,7 +207,7 @@ fn open_elsewhere(id: &SessionId) -> String { }; // `luxe join` is not offered: it speaks the protocol, so a person running it sees JSON format!( - "session {id} is already open in another Luxe{place}. Carry on there, or close it \ + "session {id} is already open in another luxe{place}. Carry on there, or close it \ there first" ) } @@ -299,7 +299,7 @@ mod tests { }; let refused = attach_session(&settings, &mut store).expect_err("held elsewhere"); - let expected = format!("session {id} is already open in another Luxe"); + let expected = format!("session {id} is already open in another luxe"); assert!(refused.to_string().contains(&expected), "{refused}"); assert!(open_elsewhere_now(dir.path(), &id.0).is_some()); drop(other_process); diff --git a/crates/luxe-cli/src/engine_setup/settings.rs b/crates/luxe-cli/src/engine_setup/settings.rs index e5d7f38..f60175e 100644 --- a/crates/luxe-cli/src/engine_setup/settings.rs +++ b/crates/luxe-cli/src/engine_setup/settings.rs @@ -153,16 +153,17 @@ impl AgentSettings { /// Resolve settings, letting `cli` overrides win over env and config. pub(crate) fn resolve(repo_root: PathBuf, cli: CliOverrides) -> Self { let config = load_luxe_config(); - // What the last session picked, unless the user asked us not to remember. It sits *below* - // the CLI and the environment (a one-off `--model` must stay a one-off) and *above* the - // configured default, which is the point: the default is where you start, not where you are - // pinned. + // What the last session picked in this project, or anywhere when this project has no pick + // of its own, unless the user asked us not to remember. It sits *below* the CLI and the + // environment (a one-off `--model` must stay a one-off) and *above* the configured + // default, which is the point: the default is where you start, not where you are pinned. let ui_config = luxe_core::config::Config::load(&repo_root); let remembered = ui_config .agent .remember_model() .then(luxe_core::runtime_state::RuntimeState::load) .unwrap_or_default(); + let last_chosen = remembered.model_for(&repo_root); let named_provider = cli.provider.or_else(|| env_nonempty("LUXE_PROVIDER")); let from_flag_or_env = cli.model.clone().or_else(|| env_nonempty("LUXE_MODEL")); @@ -175,17 +176,14 @@ impl AgentSettings { }; let provider = named_provider .or(provider_in_model) - .or_else(|| remembered.model.as_ref().map(|model| model.provider.clone())) + .or_else(|| last_chosen.map(|model| model.provider.clone())) .or_else(|| config.default_provider.clone()) .unwrap_or_else(|| "openai_compat".to_string()); // A remembered model only applies to the provider it was chosen for: pairing last session's // Anthropic model id with a locally forced provider would resolve to nothing. - let remembered_model = remembered - .model - .as_ref() - .filter(|model| model.provider == provider) - .map(|model| model.id.clone()); + let remembered_model = + last_chosen.filter(|model| model.provider == provider).map(|model| model.id.clone()); // A configured `default_model` belongs to the provider it was configured alongside. Pairing // it with a provider forced on the command line produces combinations that don't exist — // `claude-sonnet-5` on Codex — so it only applies when that provider can actually serve it. diff --git a/crates/luxe-cli/src/engine_setup/tests.rs b/crates/luxe-cli/src/engine_setup/tests.rs index 672527d..eb74881 100644 --- a/crates/luxe-cli/src/engine_setup/tests.rs +++ b/crates/luxe-cli/src/engine_setup/tests.rs @@ -131,7 +131,7 @@ fn tool_registry_has_builtins_and_lsp() { /// The loop is opt-in, so nothing it owns may reach an ordinary session. /// /// `loop_control` was registered unconditionally, and since it is not a core tool it landed in -/// the "available on demand" catalog of every prompt Luxe sent — offering a plain chat session a +/// the "available on demand" catalog of every prompt luxe sent — offering a plain chat session a /// tool for advancing phases of an autonomous run that was not happening. #[test] fn loop_control_is_absent_unless_a_loop_is_driving() { @@ -189,6 +189,7 @@ fn a_remembered_model_beats_the_configured_default_but_not_a_flag() { provider: "anthropic".into(), id: "claude-opus-5".into(), }), + project_models: Vec::new(), thinking: Some(luxe_core::provider::ThinkingLevel::High), recent_commands: Vec::new(), panes: Default::default(), @@ -213,6 +214,40 @@ fn a_remembered_model_beats_the_configured_default_but_not_a_flag() { assert_eq!(overridden.chosen().r#ref.id, "claude-sonnet-5"); } +/// The model last chosen in this project outranks the one last chosen anywhere, and a project with +/// no pick of its own starts on the latter. +#[test] +fn a_projects_own_pick_beats_the_last_one_anywhere() { + use luxe_core::runtime_state::{ProjectModel, RememberedModel, RuntimeState}; + let _guard = ENV_LOCK.lock().unwrap_or_else(|error| error.into_inner()); + let home = tempfile::tempdir().expect("temp home"); + let state = home.path().join("state"); + std::fs::create_dir_all(&state).expect("state dir"); + let here = tempfile::tempdir().expect("temp project"); + let model = + |provider: &str, id: &str| RememberedModel { provider: provider.into(), id: id.into() }; + RuntimeState { + model: Some(model("anthropic", "claude-opus-5")), + project_models: vec![ProjectModel { + project: luxe_core::paths::display(here.path()), + model: model("openai", "gpt-5.6"), + }], + ..RuntimeState::default() + } + .save_to(&state.join("state.json")) + .expect("write state"); + let _state_dir = EnvGuard::set("LUXE_STATE_DIR", state.to_str().expect("utf-8 path")); + + let in_project = AgentSettings::resolve(here.path().to_path_buf(), CliOverrides::default()); + assert_eq!( + (in_project.provider.as_str(), in_project.chosen().r#ref.id.as_str()), + ("openai", "gpt-5.6") + ); + let elsewhere = tempfile::tempdir().expect("another project"); + let fresh = AgentSettings::resolve(elsewhere.path().to_path_buf(), CliOverrides::default()); + assert_eq!(fresh.chosen().r#ref.id, "claude-opus-5", "no pick here, so the last anywhere"); +} + /// A remembered model must not be pasted onto a different provider. #[test] fn a_remembered_model_is_ignored_when_the_provider_is_forced_elsewhere() { @@ -226,6 +261,7 @@ fn a_remembered_model_is_ignored_when_the_provider_is_forced_elsewhere() { provider: "anthropic".into(), id: "claude-opus-5".into(), }), + project_models: Vec::new(), thinking: None, recent_commands: Vec::new(), panes: Default::default(), @@ -359,7 +395,7 @@ impl Drop for EnvGuard { } } -/// Nothing configured means nothing chosen. Luxe used to reach for whichever id the provider +/// Nothing configured means nothing chosen. luxe used to reach for whichever id the provider /// catalog named first, which is a literal in the binary: it goes stale as models turn over, /// and the first thing a fresh install did with it was send it. #[test] @@ -541,6 +577,7 @@ fn a_models_own_thinking_level_outranks_the_remembered_one() { luxe_core::runtime_state::RuntimeState { schema_version: luxe_core::runtime_state::RUNTIME_STATE_SCHEMA_VERSION, model: None, + project_models: Vec::new(), thinking: Some(ThinkingLevel::XHigh), recent_commands: Vec::new(), panes: Default::default(), diff --git a/crates/luxe-cli/src/engine_setup/tools.rs b/crates/luxe-cli/src/engine_setup/tools.rs index eb4ec63..8196854 100644 --- a/crates/luxe-cli/src/engine_setup/tools.rs +++ b/crates/luxe-cli/src/engine_setup/tools.rs @@ -54,7 +54,7 @@ pub(crate) struct ToolDenyReport { removed: Vec, /// Essential, so the request was refused refused: Vec, - /// A tool Luxe knows, not registered on this machine + /// A tool luxe knows, not registered on this machine unavailable: Vec, /// No tool of that name anywhere, with the nearest one when there is a near miss unknown: Vec<(DeniedTool, Option<&'static str>)>, @@ -162,7 +162,7 @@ pub(crate) fn apply_tool_deny_list( report } -/// Every tool Luxe can register, whatever this machine happens to have installed. +/// Every tool luxe can register, whatever this machine happens to have installed. /// /// The set that makes "no such tool" tellable from "not here": four tools register only where /// their program exists (`debug`, `screenshot`, `ast_grep`) or where something is configured @@ -344,7 +344,7 @@ pub(crate) async fn register_mcp_tools(registry: &mut ToolRegistry, repo_root: & /// The MCP servers this run may start, and the ids of any the project declared that it may not. /// /// A stdio server in `.mcp.json` is a command the repository chose, and an `eager` one must not -/// start the moment Luxe opens a cloned tree, headless included. It answers to the gate project +/// start the moment luxe opens a cloned tree, headless included. It answers to the gate project /// language servers and formatters already use, not a second one. pub(crate) fn mcp_servers_for_run( repo_root: &std::path::Path, diff --git a/crates/luxe-cli/src/engine_setup/tools/tests.rs b/crates/luxe-cli/src/engine_setup/tools/tests.rs index f9466c1..fe2c719 100644 --- a/crates/luxe-cli/src/engine_setup/tools/tests.rs +++ b/crates/luxe-cli/src/engine_setup/tools/tests.rs @@ -108,7 +108,7 @@ fn the_deny_list_classifies_what_a_real_run_asks_for() { assert_eq!( report.unavailable.iter().map(|d| d.name.as_str()).collect::>(), ["mcp"], - "a tool Luxe knows that this run never registered is not a typo" + "a tool luxe knows that this run never registered is not a typo" ); assert_eq!(report.unknown.len(), 1); assert_eq!(report.unknown[0].0.name, "websearch"); diff --git a/crates/luxe-cli/src/guide.md b/crates/luxe-cli/src/guide.md index e0070d9..040760b 100644 --- a/crates/luxe-cli/src/guide.md +++ b/crates/luxe-cli/src/guide.md @@ -4,7 +4,7 @@ title: "How the agent works" summary: "How the agent writes to you, asks you questions, plans, and gets a second opinion." order: 11 -group: "Using Luxe" +group: "Using luxe" --- ## How it writes @@ -62,7 +62,7 @@ nor the tools, so it does not re-read the conversation at full price. In plan mode the agent asks its open questions one at a time, then writes the plan as one `## Phase N` section per phase, numbered from 0, which is the shape [`luxe loop`](loop.md) works -through. When a turn writes the plan, Luxe asks what next: +through. When a turn writes the plan, luxe asks what next: - **Build it here**, with the planning conversation still in context - **Build it in a fresh session**, starting from `PLAN.md` alone @@ -115,10 +115,12 @@ In order, the first that is set: 1. `--model` and `--thinking` on the command line 2. `LUXE_MODEL` and `LUXE_PROVIDER` in the environment -3. The model you last chose -4. `default_model` in `models.json` +3. The model you last chose in this project +4. The model you last chose anywhere +5. `default_model` in `models.json` -Luxe never picks a model for you. With none of these set, sending a message opens the model picker, +luxe never picks a model for you, and signing in doesn't either: the model picker opens at the top +of the list for you to choose. With none of these set, sending a message opens the model picker, and `--headless` and the loop refuse to start. To always start from your configured default rather than your last choice: @@ -153,13 +155,13 @@ Every setting on this page goes in `~/.config/luxe/config.json`, or a project's `/theme` previews each theme as you move through the list. `enter` keeps one and saves it to your config; `esc` puts back the theme you had. -Luxe's own theme is `luxe`, a warm graphite with a brass accent. Every accent clears a 4.5:1 +luxe's own theme is `luxe`, a warm graphite with a brass accent. Every accent clears a 4.5:1 contrast ratio against the background, and body text 7:1. The others are dark versions of community favorites and of Omarchy's themes: | | | | --- | --- | -| Luxe | `luxe` | +| luxe | `luxe` | | Editors | `jetbrains` (Darcula), `vscode` (Visual Studio 2017 Dark), `xcode` (Default Dark) | | Community | `aura`, `ayu`, `catppuccin`, `dracula`, `everforest`, `github` (Dark Dimmed), `gruvbox`, `kanagawa`, `monokai`, `noctis-bordo`, `nord`, `one-dark`, `panda`, `rose-pine`, `tokyo-night`, `vesper`, `zenburn` | | Omarchy | `ethereal`, `hackerman`, `last-horizon`, `lumon`, `matte-black`, `miasma`, `osaka-jade`, `retro-82`, `ristretto`, `solitude`, `vantablack` | @@ -168,7 +170,7 @@ community favorites and of Omarchy's themes: { "theme": "nord" } ``` -An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all on +An unknown name falls back to `luxe`, and luxe says so when the session opens. See them all on [luxe.dev](https://luxe.dev/#craft). Code is colored by the theme too: in answers, tool cards, diffs and the preview, keywords take the @@ -196,7 +198,7 @@ The names are the ones a theme file uses; [`luxe.json`](https://github.com/evanw lists every one. One more name is optional: `modePlan`, the color [plan mode](agent.md#plan-then-build) wears on the -composer and the menus and questions around it. Without it, Luxe picks the first of the theme's +composer and the menus and questions around it. Without it, luxe picks the first of the theme's other colors that reads as different from its accent. ### Make a theme @@ -218,12 +220,12 @@ for a complete one. ### On Omarchy -Leave `theme` unset, or set it to `omarchy`, and Luxe wears your desktop's theme and changes with +Leave `theme` unset, or set it to `omarchy`, and luxe wears your desktop's theme and changes with it, within a couple of seconds, in a running session. It uses, in order: 1. A `luxe.json` in the current Omarchy theme. To give every theme one, write a template at `~/.config/omarchy/themed/luxe.json.tpl` and Omarchy renders it from each theme's colors. -2. Luxe's built-in theme of the same name, when both are dark. +2. luxe's built-in theme of the same name, when both are dark. 3. A theme made on the spot from the Omarchy theme's `colors.toml`, with text lifted until it is readable. This is how a light Omarchy theme comes out. @@ -279,12 +281,12 @@ When the bar runs out of room, it drops modules in this order: `cwd`, `tokens`, ## Icons and fonts -`glyphs` sets which icons Luxe draws. Every icon has a word beside it, so nothing is lost at any +`glyphs` sets which icons luxe draws. Every icon has a word beside it, so nothing is lost at any setting. | `glyphs` | Draws | Needs | | --- | --- | --- | -| `auto` | `nerd` when Luxe can confirm your font has every icon, otherwise `unicode` | | +| `auto` | `nerd` when luxe can confirm your font has every icon, otherwise `unicode` | | | `nerd` | Nerd Font icons | A Nerd Font | | `nerd_wide` | The same icons, each given two cells | A Nerd Font whose icons are drawn wide | | `unicode` | Plain shapes: `■ ► ▪ ○ ●` | UTF-8 | @@ -299,7 +301,7 @@ which brings its own. On macOS and Windows without fontconfig, it picks `unicode have a Nerd Font. If icons sit flush against the word beside them, you have the wide build of your Nerd Font: switch to its `Mono` build (see [Fonts](install.md#fonts)), or set `nerd_wide`. -Fonts that draw every character Luxe uses, measured against the font files: +Fonts that draw every character luxe uses, measured against the font files: | Font | Missing | Width | | --- | --- | --- | @@ -375,7 +377,7 @@ Screenshots and images the agent reads are drawn in the conversation where the t ``` Double-click an image, or select its message (`alt+k`) and press `alt+i`, to view it full-window. -`/images` says which setting is in effect and why. A change to `images` applies the next time Luxe +`/images` says which setting is in effect and why. A change to `images` applies the next time luxe starts. ## The start screen @@ -454,7 +456,7 @@ luxe --headless -p "list the TODO comments in src/" --format text ``` A headless run needs `-p` and a model: `--model`, `LUXE_MODEL`, your last choice or `default_model` -in `models.json`. It refuses to start without either. It exits with status 1 when the turn fails or Luxe stops before the turn ends, so a +in `models.json`. It refuses to start without either. It exits with status 1 when the turn fails or luxe stops before the turn ends, so a script can tell a failure from an answer without reading the output. ## Commands @@ -466,15 +468,15 @@ script can tell a failure from an answer without reading the output. | `luxe auth status [provider]` | A credential's type, where it came from, and when it expires | | `luxe auth logout ` | Remove a stored credential | | `luxe models list` | Models you can use. `--provider ` filters, `--configured` lists only the models `models.json` or `auth.json` names. | -| `luxe models show ` | What Luxe knows about a model, and where each value came from. A bare ID uses the active provider. | +| `luxe models show ` | What luxe knows about a model, and where each value came from. A bare ID uses the active provider. | | `luxe models refresh` | Refresh the model catalog. `--force` even if it is fresh. | | `luxe sessions list` | Sessions in this project, newest first | -| `luxe join [id]` | Join a session another Luxe is running, speaking the [RPC protocol](rpc.md#join-a-running-session) on stdin and stdout. The id can be its start, or the Luxe's process id; without one, it joins the session running in this folder. | +| `luxe join [id]` | Join a session another luxe is running, speaking the [RPC protocol](rpc.md#join-a-running-session) on stdin and stdout. The id can be its start, or the luxe's process id; without one, it joins the session running in this folder. | | `luxe join --list` | Sessions running on this machine that can be joined | | `luxe remote` | Serve this machine's sessions to your own phone or tablet. Listens on this machine only, for Tailscale Serve to carry to your devices, and lets in this machine's tailnet owner from a paired device. | | `luxe remote --port ` | The port it listens on (default 4519) | | `luxe remote --allow ` | Also let this tailnet login in, as Tailscale names it (`alex@github`). Repeatable. | -| `luxe remote setup` | Check Tailscale, offer to publish the bridge on your tailnet with Tailscale Serve, offer to run it at login as a user service, then show a QR code to pair a device. Each step that changes something outside Luxe asks first. | +| `luxe remote setup` | Check Tailscale, offer to publish the bridge on your tailnet with Tailscale Serve, offer to run it at login as a user service, then show a QR code to pair a device. Each step that changes something outside luxe asks first. | | `luxe remote pair` | Show a QR code and link that pair one phone or tablet. They work once, within ten minutes. | | `luxe remote devices` | The paired devices | | `luxe remote devices revoke ` | Unpair a device. Its open sessions close within a few seconds. | @@ -491,7 +493,7 @@ script can tell a failure from an answer without reading the output. | `luxe loop fresh` | Reset the run's turn count; see [Autonomous runs](loop.md#start-a-run) | | `luxe docs [page]` | Read this guide, offline and for the installed version. `--search ` finds lines across every page. | | `luxe doctor` | Check which tools, language servers and debug adapters work | -| `luxe update` | Update Luxe with the command for however it was installed; see [Updates](configuration.md#updates). `--check` only reports. | +| `luxe update` | Update luxe with the command for however it was installed; see [Updates](configuration.md#updates). `--check` only reports. | | `luxe init` | Set up a theme, a provider, the tools and the start screen, and write them to `~/.config/luxe/config.json`. `--defaults` skips the questions, `--force` starts from an empty file; see [Editing](configuration.md#editing). | | `luxe wire ` | Summarize a `LUXE_WIRE_LOG` capture; see [Troubleshooting](troubleshooting.md#see-what-is-sent-to-the-model). `--tools` breaks the tool schemas' size down per tool. | @@ -501,7 +503,7 @@ Every command also takes the model and permission flags above. title: "Commands and keys" summary: "The Command Palette, slash commands, Help, every default key, and how to rebind them." order: 4 -group: "Using Luxe" +group: "Using luxe" --- ## Command Palette and slash commands @@ -525,7 +527,7 @@ list says what the command does and the arguments it takes. Past the command, the list shows the arguments it takes, such as `/diff turn` or `/diff pr `, and narrows as you type. `tab` fills in the one under the cursor. `enter` runs it when nothing is missing, and fills it in when it still needs a value. `esc` puts the -list away for that command. In the composer, a command Luxe knows is highlighted, and so are the +list away for that command. In the composer, a command luxe knows is highlighted, and so are the words of it you have typed, like `pr` in `/diff pr 142`. A command that stays plain is misspelled. ## Slash commands @@ -565,8 +567,8 @@ words of it you have typed, like `pr` in `/diff pr 142`. A command that stays pl | `/login`, `/logout` | Add or remove a provider's credential | | `/auth` | Which providers you are signed in to, and how | | `/reload` | Re-read your config and keys without restarting | -| `/quit` | Leave Luxe. The session is already saved. | -| `/update` | Leave Luxe and update it, as `luxe update` does | +| `/quit` | Leave luxe. The session is already saved. | +| `/update` | Leave luxe and update it, as `luxe update` does | The Command Palette also lists commands with no slash form, such as **Copy message**, **Swap the sidebar's side** and, in a review, **Send comments**. @@ -699,7 +701,7 @@ Put your bindings in `~/.config/luxe/keybindings.json`, or open it from **Config ## Alt keys on a Mac A Mac has no Alt key. Its Option key types characters instead: `option+o` is `ø`, `option+p` is -`π`. Most of Luxe's `alt` keys need your terminal to send Option as Alt: +`π`. Most of luxe's `alt` keys need your terminal to send Option as Alt: | Terminal | Setting | | --- | --- | @@ -711,19 +713,19 @@ A Mac has no Alt key. Its Option key types characters instead: `option+o` is `ø | Alacritty | `option_as_alt = "Both"` under `[window]` | Ghostty already does this on the "U.S." keyboard layouts. On the others it sends the character and -marks it as an Alt key. On "ABC", the Mac's default English layout, Luxe reads that back as the key +marks it as an Alt key. On "ABC", the Mac's default English layout, luxe reads that back as the key you pressed, so `option+o` opens a file from the preview without any setting. On other layouts, set the option above. @@@ page: configuration --- title: "Configuration" -summary: "Where Luxe's files live, what a project can set, and every key in config.json." +summary: "Where luxe's files live, what a project can set, and every key in config.json." order: 1 group: "Customize" --- -Luxe works with no configuration. Everything here is optional, and most of it can be set from inside -Luxe: **Configuration** (on the start screen, or `/config`) signs you in and opens these files in +luxe works with no configuration. Everything here is optional, and most of it can be set from inside +luxe: **Configuration** (on the start screen, or `/config`) signs you in and opens these files in your editor, [`/settings`](#settings) changes the settings you use most, `/theme` sets the theme, and `/model` the model. @@ -752,7 +754,7 @@ in `.luxe/` at its root. ### What a project cannot change A project's `.luxe/config.json` overrides yours key by key, with a few exceptions. These run -programs, reach the network, or decide what a repository is trusted with, so Luxe reads them from +programs, reach the network, or decide what a repository is trusted with, so luxe reads them from your own config only: - `launchers` and `mentions`, which run programs @@ -761,7 +763,7 @@ your own config only: - `agent.on_ask`, which a project can set to `deny` but not to `allow` - `agent.cache_warming`, which a project can turn down but not up, since it spends your money -Project `gate.commands` also run programs. Luxe ignores them and warns unless you start with +Project `gate.commands` also run programs. luxe ignores them and warns unless you start with `--trust-project`. With trust, a nonempty project list replaces your global list. Otherwise, the loop uses your global commands. Move the list to your own config if you don't want to trust the project. @@ -772,8 +774,8 @@ project. screen) and writes the answers to `config.json`, changing only those keys. It also writes a `config.schema.json` beside it so your editor can complete and check every key. `--defaults` writes a file that chooses nothing, without asking, and so does a run with no terminal; with a -`config.json` already there, either one needs `--force`, which removes the old file first. Luxe ignores a key it does -not know, so an old config always loads on a newer Luxe; check the spelling if a setting seems to +`config.json` already there, either one needs `--force`, which removes the old file first. luxe ignores a key it does +not know, so an old config always loads on a newer luxe; check the spelling if a setting seems to do nothing. `/reload` (`ctrl+shift+r`) applies changes to `config.json` and `keybindings.json` without @@ -799,7 +801,7 @@ change writes one key to your `config.json` and leaves the rest of the file as i Each value says where it comes from: `default`, `global` (your `config.json`), or `project` (this project's `.luxe/config.json`, which wins over yours, so it is changed there). Most settings take -effect at once; the rest say they take effect the next time Luxe starts. That includes the Tools +effect at once; the rest say they take effect the next time luxe starts. That includes the Tools page, because the tools the agent is offered are fixed for a run. In a window too small for the panel, it says so instead, and only `esc` works until the window fits. @@ -832,22 +834,22 @@ are doing. The notification goes through your terminal, as an escape sequence it turns into a desktop notification, so it works over ssh and needs nothing installed. Ghostty, iTerm2, kitty, WezTerm, -Warp and foot show them; Luxe recognizes those and sends nothing to a terminal it does not know. If -yours shows them and Luxe does not recognize it, name the sequence: `"notification_method": "osc9"` +Warp and foot show them; luxe recognizes those and sends nothing to a terminal it does not know. If +yours shows them and luxe does not recognize it, name the sequence: `"notification_method": "osc9"` (the common one) or `"osc777"`. Inside tmux, add `set -g allow-passthrough on` to your tmux configuration. Your terminal may also have to be allowed to send notifications in your system's settings. ### herdr -Inside a [herdr](https://herdr.dev) pane, Luxe tells herdr whether it is working, idle, or waiting +Inside a [herdr](https://herdr.dev) pane, luxe tells herdr whether it is working, idle, or waiting on you, and why: `Approve bash`, or the question it asked. herdr shows that in its sidebar, raises -its own notification when Luxe finishes or needs you (set in herdr's `[ui.toast]`), and reports it +its own notification when luxe finishes or needs you (set in herdr's `[ui.toast]`), and reports it to `herdr agent wait`. After a herdr restart, the pane reopens the same session with -`luxe --resume`. Luxe sends no escape-sequence notifications inside herdr, because herdr keeps +`luxe --resume`. luxe sends no escape-sequence notifications inside herdr, because herdr keeps them for itself. -[Recipes](recipes.md#luxe-colors-in-herdr) has a Luxe palette for herdr's theme. +[Recipes](recipes.md#luxe-colors-in-herdr) has a luxe palette for herdr's theme. This is local to your machine and on by default. Outside herdr nothing is sent. `LUXE_HERDR=0` in the environment stops the reports, and so does the config: @@ -858,7 +860,7 @@ This is local to your machine and on by default. Outside herdr nothing is sent. ### Joining a session -A running Luxe lets another program on this machine join its session: `luxe join`, a script, or +A running luxe lets another program on this machine join its session: `luxe join`, a script, or whatever you build on [the RPC protocol](rpc.md#join-a-running-session). Only your user account can connect, and nothing listens on the network. To turn it off: @@ -871,11 +873,11 @@ it back on once yours has. ### Updates -Once a day, Luxe checks whether a newer release exists, and when one does the start screen says +Once a day, luxe checks whether a newer release exists, and when one does the start screen says *Update available · /update*. The check sends nothing about you or your machine; the comparison happens locally. -`/update`, or `luxe update` in a shell, updates Luxe with the command for however you installed +`/update`, or `luxe update` in a shell, updates luxe with the command for however you installed it, showing each one before it runs: | Installed with | `luxe update` runs | @@ -884,9 +886,10 @@ it, showing each one before it runs: | Homebrew | `brew update`, then `brew upgrade luxe` | | Cargo | `cargo install --locked --force luxe-cli` | -Luxe never downloads or replaces its own program; whatever installed it does. A copy your system's +luxe never downloads or replaces its own program; whatever installed it does. A copy your system's package manager owns is left to it, and a downloaded archive points you at the releases page. On -Windows, Luxe can't be replaced while it runs, so it prints the command to run once it has exited. +Windows, a running program can't be overwritten, so luxe first renames itself to `luxe.exe.old`, +and the next launch deletes it. Afterwards it checks that the `luxe` your shell finds is the new version, and says so if another copy earlier on your `PATH` is in the way. `luxe update --check` only reports. @@ -912,9 +915,9 @@ or lazygit: } ``` -Luxe keeps running underneath and redraws when the program exits. Text the program writes to the +luxe keeps running underneath and redraws when the program exits. Text the program writes to the file named by `$LUXE_HANDOFF` is put in the composer, so a gh-dash command can send -`#123 look at this` to Luxe. A launcher's key wins over any other binding. +`#123 look at this` to luxe. A launcher's key wins over any other binding. ## Reference @@ -995,13 +998,13 @@ order: 6 group: "Extend" --- -Luxe knows how to reach every provider in [Models and providers](providers.md), and the +luxe knows how to reach every provider in [Models and providers](providers.md), and the [models.dev](https://models.dev) catalog tells it each model's context window, output limit, thinking levels and price. This page is for what neither covers: your own endpoint, a model the catalog does not know, or a local server that needs its requests shaped a particular way. Everything here goes in `~/.config/luxe/models.json`. `luxe models show /` shows what -Luxe resolved for a model, and where each value came from. +luxe resolved for a model, and where each value came from. ## Add an endpoint @@ -1028,7 +1031,7 @@ Then `luxe --model gateway/qwen3-coder-480b`, or choose it in `/model`. | Provider key | Does | | --- | --- | | `base_url` | The endpoint, including its version, such as `/v1` | -| `api_key` | The key: the value, `$VAR`, `${VAR}` or `$env:VAR`, or `!command`, which runs each time a request needs the key. An unset `${VAR}` is empty, as in `mcp.json`, and Luxe logs which one. | +| `api_key` | The key: the value, `$VAR`, `${VAR}` or `$env:VAR`, or `!command`, which runs each time a request needs the key. An unset `${VAR}` is empty, as in `mcp.json`, and luxe logs which one. | | `api` | The API it speaks: `openai-completions` (the default), `openai-responses`, `anthropic-messages` | | `auth` | How the key is sent: `bearer`, `x-api-key`, `api-key`, or `foundry` for both of the last two | | `models_dev` | The models.dev provider to take model details from, when the names differ | @@ -1036,12 +1039,12 @@ Then `luxe --model gateway/qwen3-coder-480b`, or choose it in `/model`. | `sampling_params` | Samplers for every model it serves; see [Samplers](#samplers) | A provider in `models.json` replaces the same provider's block in `auth.json` whole, so keep a -provider's key and endpoint in one file. A provider Luxe already knows keeps everything you do not -write. A key in a provider Luxe knows is used when its own variable, such as `OPENAI_API_KEY`, is +provider's key and endpoint in one file. A provider luxe already knows keeps everything you do not +write. A key in a provider luxe knows is used when its own variable, such as `OPENAI_API_KEY`, is unset; for one it does not know, the key you write comes first and `OPENAI_API_KEY` is the fallback. A key you signed in with comes before either. -A file Luxe cannot parse is skipped with a warning in the log, and a misspelled key is ignored, so +A file luxe cannot parse is skipped with a warning in the log, and a misspelled key is ignored, so check the result with `luxe models show /` after editing. ## Model settings @@ -1054,7 +1057,7 @@ each replace the catalog's whole: a `cost` you write drops the catalog's long-pr | Key | Does | | --- | --- | | `context_window` | The model's context window, in tokens | -| `max_tokens` | The most it may write in one reply. Defaults to the model's own limit from the catalog. Luxe lowers it per request to what the window has left, so setting the real limit is safe; setting a lower one is how replies get cut off. | +| `max_tokens` | The most it may write in one reply. Defaults to the model's own limit from the catalog. luxe lowers it per request to what the window has left, so setting the real limit is safe; setting a lower one is how replies get cut off. | | `name` | The name shown in the picker and statusline | | `reasoning` | Whether it can think | | `thinking` | The level a session starts at for this model | @@ -1064,14 +1067,14 @@ each replace the catalog's whole: a `cost` you write drops the catalog's long-pr | `compat`, `sampling_params` | Override the provider's, key by key | A model the catalog does not know gets a 128k context window and no output limit until you set -them. Anthropic endpoints require a limit, so there Luxe asks for 128k. If the model allows less, -Anthropic's refusal names its real limit, and Luxe retries with that and uses it for the rest of the +them. Anthropic endpoints require a limit, so there luxe asks for 128k. If the model allows less, +Anthropic's refusal names its real limit, and luxe retries with that and uses it for the rest of the session. ## Thinking levels -`thinking_level_map` says what each of Luxe's levels sends to the model. `null` marks a level the -model cannot do, removing it from `/thinking`; a level Luxe needs falls back to the nearest one that +`thinking_level_map` says what each of luxe's levels sends to the model. `null` marks a level the +model cannot do, removing it from `/thinking`; a level luxe needs falls back to the nearest one that is left. `ultra` is the name for a provider's `max`. ```json title="~/.config/luxe/models.json" @@ -1097,12 +1100,12 @@ is left. `ultra` is the name for a provider's `max`. A level you do not map sends its own name, and `off` sends `none`; `xhigh` and `ultra` are offered only once mapped. Setting a map also marks the model as one that reasons. -An endpoint Luxe does not know sends no thinking setting at all until its `compat` says how: for +An endpoint luxe does not know sends no thinking setting at all until its `compat` says how: for most OpenAI-compatible servers, `"thinking_format": "openai"`, which sends `reasoning_effort` on every request, `off` included. See [Request format](#request-format). -For Anthropic models, Luxe uses adaptive thinking with an effort level where the model supports -it, and a token budget for older ones. If a model refuses how thinking was requested, Luxe tries +For Anthropic models, luxe uses adaptive thinking with an effort level where the model supports +it, and a token budget for older ones. If a model refuses how thinking was requested, luxe tries the other way once and remembers it for the session. `compat.force_adaptive_thinking` forces adaptive thinking for an endpoint the catalog does not know. @@ -1140,7 +1143,7 @@ to every model the provider serves; on a model, only the keys you write override | `force_adaptive_thinking` | Use Anthropic's adaptive thinking | | `supports_long_cache_retention` | Ask Anthropic to keep cached prompts for an hour rather than five minutes. Each cache write costs 2x input instead of 1.25x. Off by default, since not every Anthropic-compatible endpoint accepts it. | | `stream_tool_arguments` | Stream a `write` call's file from Anthropic as it is written, so its card fills in live. On by default; turn off for an endpoint that rejects a tool's `eager_input_streaming` field. | -| `defer_tool_loading` | Load a tool the agent asks for with `activate_tools` where it asked, so the cached prompt stays cached. On by default. Luxe stops on its own for an endpoint that refuses it; turn it off for one that accepts it and then misbehaves. Anthropic and Responses endpoints only. | +| `defer_tool_loading` | Load a tool the agent asks for with `activate_tools` where it asked, so the cached prompt stays cached. On by default. luxe stops on its own for an endpoint that refuses it; turn it off for one that accepts it and then misbehaves. Anthropic and Responses endpoints only. | | `copilot_headers`, `openrouter_headers` | Send those services' identifying headers. With `copilot_headers`, each model also goes to the Copilot endpoint it takes. | | `use_responses_api` | Use OpenAI's Responses API. Provider only; prefer `"api": "openai-responses"`. | @@ -1154,7 +1157,7 @@ provider's. A local model's card often gives a sampling recipe with settings the OpenAI format has no field for, such as `top_k`, `min_p` and `repeat_penalty`. `sampling_params` is added to the request as written, -after Luxe's own fields, so its values win: +after luxe's own fields, so its values win: ```json title="~/.config/luxe/models.json" { @@ -1202,9 +1205,9 @@ sent as written. LM Studio ignores `chat_template_kwargs`; use `"thinking_format ## Model details -Luxe takes a model's details from three places, each overriding the one before, value by value: +luxe takes a model's details from three places, each overriding the one before, value by value: -1. The models.dev catalog built into Luxe, which works offline +1. The models.dev catalog built into luxe, which works offline 2. A fresher copy, refreshed in the background into `~/.cache/luxe/models-dev.json` 3. Your `models.json` @@ -1221,7 +1224,7 @@ anthropic/claude-opus-5 cost /Mtok $5.00/$25.00 [models.dev] ``` -Each value names where it came from: `snapshot` for the catalog built into Luxe, `models.dev` for +Each value names where it came from: `snapshot` for the catalog built into luxe, `models.dev` for the refreshed copy, `config` for your `models.json`, and `default` where none of them said. | Variable | Does | @@ -1235,7 +1238,7 @@ the refreshed copy, `config` for your `models.json`, and `default` where none of ### Keyless sign-in with Microsoft Entra ID -If your Foundry resource has key sign-in turned off, give Luxe a command that prints a token: +If your Foundry resource has key sign-in turned off, give luxe a command that prints a token: ```json title="~/.config/luxe/models.json" { @@ -1255,9 +1258,9 @@ Run `az login` first. Only the Claude provider needs `auth`; the others already token. The command runs for each request and nothing is kept, so a token from `az`, which lasts about an hour, is replaced as it expires and a long session carries on. -### Choose which deployments Luxe offers +### Choose which deployments luxe offers -Luxe records what a resource has deployed in each provider's `served_models`, and the model behind +luxe records what a resource has deployed in each provider's `served_models`, and the model behind any deployment named something else in `deployments`, which is where it looks up the context window and price. If your key cannot list deployments, or you want to choose the list yourself, turn discovery off and write both: @@ -1274,7 +1277,7 @@ discovery off and write both: } ``` -`discover_deployments: false` on any of the three providers stops Luxe asking the resource at all. +`discover_deployments: false` on any of the three providers stops luxe asking the resource at all. ### Thinking on partner models @@ -1296,21 +1299,21 @@ Use `reasoning_effort` only: Foundry refuses DeepSeek's own `thinking` format. F report these models' thinking tokens, so `/cost` counts them as output. A Foundry deployment can have a different context window and price from the vendor's own API. -Luxe uses Azure's figures for Foundry models. +luxe uses Azure's figures for Foundry models. ## OpenRouter -- Luxe asks OpenRouter to cache prompts for Claude models, which it otherwise does not, and which +- luxe asks OpenRouter to cache prompts for Claude models, which it otherwise does not, and which makes later turns of a session far cheaper. `"cache_control_format": null` in the provider's `compat` stops it. -- Some models on OpenRouter cannot turn thinking off. For those, Luxe leaves the setting out and +- Some models on OpenRouter cannot turn thinking off. For those, luxe leaves the setting out and the model thinks at its own default. `luxe models show openrouter/` says `never off`. -- Luxe identifies itself to OpenRouter with its `HTTP-Referer` and `X-Title` headers, which carry +- luxe identifies itself to OpenRouter with its `HTTP-Referer` and `X-Title` headers, which carry nothing about you. `"openrouter_headers": false` in `compat` drops them. @@@ page: environment --- title: "Environment variables" -summary: "The environment variables you can set, and the ones Luxe sets." +summary: "The environment variables you can set, and the ones luxe sets." order: 3 group: "Reference" --- @@ -1338,10 +1341,10 @@ config file turned off. | Variable | Does | | --- | --- | | `LUXE_CONFIG_DIR` | Where configuration and credentials live, instead of `~/.config/luxe` | -| `LUXE_STATE_DIR` | Where Luxe keeps its state, such as the model you last chose, MCP sign-ins and the logs of commands that only report, instead of `~/.local/state/luxe` | +| `LUXE_STATE_DIR` | Where luxe keeps its state, such as the model you last chose, MCP sign-ins and the logs of commands that only report, instead of `~/.local/state/luxe` | | `XDG_CONFIG_HOME`, `XDG_STATE_HOME`, `XDG_CACHE_HOME` | Honored on every platform; see [Install](install.md#where-luxe-keeps-files) | -When Luxe works out where its files go, a path in one of these, or in `HOME`, that is not valid +When luxe works out where its files go, a path in one of these, or in `HOME`, that is not valid UTF-8 is ignored, as if the variable were unset. ## Model catalog @@ -1368,7 +1371,7 @@ UTF-8 is ignored, as if the variable were unset. | `LUXE_LAZY_TOOLS` | `1` | `0` sends every tool's description with every request | | `LUXE_CORE_TOOLS` | | The tools sent with every request, comma-separated; the rest load when needed | | `LUXE_DAP_STOP_TIMEOUT_SECS` | `30` | How long the debugger waits for a program to stop | -| `LUXE_MAX_DEPTH` | `2` | How deeply Luxe may run inside itself, as with [subagents](recipes.md#subagents) | +| `LUXE_MAX_DEPTH` | `2` | How deeply luxe may run inside itself, as with [subagents](recipes.md#subagents) | | `LUXE_WEB_ALLOW_PRIVATE` | | `1` lets `web_fetch` and `screenshot` reach your local network and files | | `LUXE_WEB_TIMEOUT_SECS` | `30` | How long one fetch may take. Past 60, raise `LUXE_TOOL_TIMEOUT_SECS` too. | | `BRAVE_API_KEY`, `TAVILY_API_KEY`, `EXA_API_KEY`, `FIRECRAWL_API_KEY` | | Search providers, and Firecrawl for pages built with JavaScript; see [Tools](tools.md#web) | @@ -1377,12 +1380,12 @@ UTF-8 is ignored, as if the variable were unset. | Variable | Does | | --- | --- | -| `LUXE_EDITOR`, then `VISUAL`, then `EDITOR` | The editor Luxe opens files in | +| `LUXE_EDITOR`, then `VISUAL`, then `EDITOR` | The editor luxe opens files in | | `LUXE_FILE_MANAGER`, then `FILE_MANAGER` | The file manager `O` in the dock's file tree opens a folder in. Without either, the first of yazi, lf, ranger and nnn that is installed, then your desktop's own. | | `LUXE_HERDR` | `0` stops reporting state to [Herdr](recipes.md#run-luxe-in-herdr) | | `LUXE_UPDATE_CHECK` | `0` turns off the update check | | `LUXE_JOINABLE` | `0` stops other programs [joining](configuration.md#joining-a-session) this run's session | -| `LUXE_RUNTIME_DIR` | Where a running Luxe keeps the socket and record that let a program join it, instead of `luxe` in `$XDG_RUNTIME_DIR` on Linux or `$TMPDIR` on macOS, or `run` in the state folder | +| `LUXE_RUNTIME_DIR` | Where a running luxe keeps the socket and record that let a program join it, instead of `luxe` in `$XDG_RUNTIME_DIR` on Linux or `$TMPDIR` on macOS, or `run` in the state folder | ## Diagnostics @@ -1391,22 +1394,22 @@ UTF-8 is ignored, as if the variable were unset. | `LUXE_LOG` | What goes in the log, such as `debug` or `luxe_core=debug`. `RUST_LOG` works too. See [Logs](troubleshooting.md#logs). | | `LUXE_WIRE_LOG` | A file to record every request sent to the model; see [Troubleshooting](troubleshooting.md#see-what-is-sent-to-the-model) | -## Set by Luxe +## Set by luxe | Variable | Is | | --- | --- | -| `LUXE_DEPTH` | How deeply this run is nested inside another Luxe | -| `LUXE_REVIEW_GATE_ACTIVE` | Set for a loop's [gate commands](loop.md#check-each-phase), so a Luxe they start does not run a gate of its own | +| `LUXE_DEPTH` | How deeply this run is nested inside another luxe | +| `LUXE_REVIEW_GATE_ACTIVE` | Set for a loop's [gate commands](loop.md#check-each-phase), so a luxe they start does not run a gate of its own | | `LUXE_HANDOFF` | For a [launcher](configuration.md#launchers): a file whose contents go in the composer when the program exits | @@@ page: extending --- -title: "Extending Luxe" +title: "Extending luxe" summary: "Which kind of extension you need, how to install one, and what stays stable across updates." order: 1 group: "Extend" --- -Luxe extends through files and programs, never through code loaded into Luxe itself. A file carries +luxe extends through files and programs, never through code loaded into luxe itself. A file carries instructions or settings; a program carries behavior, and runs with the same access you have. Installing an extension is copying a file. @@ -1414,13 +1417,13 @@ Installing an extension is copying a file. | To | Use | Runs | | --- | --- | --- | -| Change how Luxe looks, or which tools exist | [Configuration](configuration.md) and [themes](appearance.md#make-a-theme) | Nothing | +| Change how luxe looks, or which tools exist | [Configuration](configuration.md) and [themes](appearance.md#make-a-theme) | Nothing | | Teach the agent a procedure or house style | [Skills](skills.md) and [`AGENTS.md`](project-context.md) | Nothing | | Point the agent at your tracker or runbooks with `@` | [Mention sources](mention-sources.md) | Your program, when its tab opens | | Give the agent new tools | [An MCP server](mcp.md) | Your program, when the agent calls it | | Block, rewrite, audit or react to what the agent does | [Hooks](hooks.md) | Your program, at points in a turn | -| Use an endpoint or model Luxe does not know | [Custom providers](custom-providers.md) | Nothing, or your `!command` for a key | -| Drive Luxe from your own program, or build a new front end: conversation, Guided Review and GitHub | [The RPC protocol](rpc.md) | Your program, driving Luxe | +| Use an endpoint or model luxe does not know | [Custom providers](custom-providers.md) | Nothing, or your `!command` for a key | +| Drive luxe from your own program, or build a new front end: conversation, Guided Review and GitHub | [The RPC protocol](rpc.md) | Your program, driving luxe | | Open another terminal tool with a key | [Launchers](configuration.md#launchers) | Your program, on a key | The rows are in order of effort; the first that fits is usually right. [Recipes](recipes.md) puts @@ -1465,7 +1468,7 @@ releases. `.luxe/` writes its own `.gitignore`, which keeps everything in it out of Git except `permissions.json`, `mcp.json`, `hooks.json` and `skills/`. To share more with your team, such as the -project's `config.json`, write that `.gitignore` yourself: Luxe rewrites its own copy, but leaves +project's `config.json`, write that `.gitignore` yourself: luxe rewrites its own copy, but leaves alone one it did not write. ## Trust @@ -1474,11 +1477,11 @@ alone one it did not write. `gate.commands` run only with `--trust-project`, and its permission rules can only make yours stricter. MCP servers, language servers and formatters it brings start, by default, only in an interactive session or with `--trust-project`; `lsp.project_servers` in your own config changes -that, see [Tools](tools.md#a-server-the-project-installed). This is about which programs Luxe starts. A +that, see [Tools](tools.md#a-server-the-project-installed). This is about which programs luxe starts. A language server itself may run project code, as rust-analyzer does with `build.rs`, so open an -unfamiliar repository in Luxe the way you would build it. +unfamiliar repository in luxe the way you would build it. -**A repository can still write instructions.** Its `AGENTS.md` and skills reach the model. Luxe +**A repository can still write instructions.** Its `AGENTS.md` and skills reach the model. luxe removes text a reviewer cannot see, but plain text is still instructions, so read an unfamiliar repository's `AGENTS.md` as you would its `Makefile`. @@ -1487,7 +1490,7 @@ repository's `AGENTS.md` as you would its `Makefile`. | | Across updates | | --- | --- | | `config.json`, `models.json`, `keybindings.json`, `lsp-servers.json`, `debug-adapters.json` | **Only added to.** An old file always loads. An unknown key is ignored, and no key changes meaning. | -| Sessions in `.luxe/sessions/` | A newer Luxe reads every older session. An older Luxe skips what it does not know in a newer one. | +| Sessions in `.luxe/sessions/` | A newer luxe reads every older session. An older luxe skips what it does not know in a newer one. | | The RPC protocol | Adding to it changes nothing. Removing or renaming anything changes `protocol_version`. | | Hook points | Added, never renamed. An unknown point skips that hook alone, with a warning in the log. | | Tool arguments | A renamed argument still accepts its old name. | @@ -1498,9 +1501,9 @@ Before 1.0, a minor release may change the RPC protocol and the hook points, and will say so. Config files and sessions keep the stronger promise regardless, since they are the two you cannot regenerate. -## What Luxe will not add +## What luxe will not add -- **Plugins loaded into Luxe.** A plugin would have all of Luxe's access, however it was sandboxed. +- **Plugins loaded into luxe.** A plugin would have all of luxe's access, however it was sandboxed. - **A network listener for RPC.** It would turn a local program into a service that needs authentication. @@@ page: github @@ -1508,11 +1511,11 @@ you cannot regenerate. title: "Git and GitHub" summary: "Worktrees, issues, opening and merging pull requests, review threads, and stacks." order: 7 -group: "Using Luxe" +group: "Using luxe" --- Everything that talks to GitHub goes through the GitHub CLI, `gh`, signed in with your own account -(`gh auth login`). Without it, the rest of Luxe works and these features say why they cannot. +(`gh auth login`). Without it, the rest of luxe works and these features say why they cannot. ## Work in a worktree @@ -1541,7 +1544,7 @@ worktree stays out of `git status`. luxe --issue 123 ``` -Luxe reads issue #123, makes a worktree on a branch named for it (`123-short-title`), and starts a +luxe reads issue #123, makes a worktree on a branch named for it (`123-short-title`), and starts a session there. The issue and its latest comments go to the agent with your first message, so "fix it" is enough. They are treated as the reporter's words to weigh, not as instructions. @@ -1558,13 +1561,13 @@ luxe --from-pr 142 # resume the session already working on it A plain `git push` from the worktree updates the pull request, including one from a fork. A fork's branch that has to be renamed here, such as its `main` checked out as `mara/main`, gets a remote of its own (`mara-push-main`) for that push, so pushes from the fork's other branches are not -redirected. Luxe refuses a pull request that is merged or closed, that your account cannot push to, +redirected. luxe refuses a pull request that is merged or closed, that your account cannot push to, or whose author turned off edits by maintainers. ## Open a pull request Review the work with [Guided Review](guided-review.md), finish (`alt+enter`), and choose **Open pull -request**. Luxe drafts the title and description from the review, with `Closes #123` when the +request**. luxe drafts the title and description from the review, with `Closes #123` when the session started from an issue. ![The pull request, drafted from the review](images/quickstart-pull-request.svg) @@ -1622,7 +1625,7 @@ you can see a match before you search for it. ![Editing a search in /github](images/github-search.svg) -A changed tab is marked with `*` and keeps your search until you close Luxe. `x` puts back the +A changed tab is marked with `*` and keeps your search until you close luxe. `x` puts back the tab's own search, and so does running an empty search. The tabs always stay in this repository. A `repo:`, `org:` or `user:` you type is ignored. @@ -1714,9 +1717,9 @@ After the bottom pull request is squash-merged, keep its branch until `/stack` h one. Deleting it through the API, with `gh pr merge --delete-branch`, makes GitHub close the pull requests based on it. -## How often Luxe checks GitHub +## How often luxe checks GitHub -Luxe reads the pull request after anything that could change it, such as a push or `/pr`, and on +luxe reads the pull request after anything that could change it, such as a push or `/pr`, and on an interval otherwise: every 15 seconds while checks run, every minute once things settle, and every five minutes when the terminal has been in the background for a while. Each read costs one point of the 5,000 an hour your `gh` sign-in allows. @@ -1732,7 +1735,7 @@ your own config only, not a project's. title: "Guided Review" summary: "Read a change chapter by chapter, comment for the agent, and finish with a commit, fixes or a pull request." order: 6 -group: "Using Luxe" +group: "Using luxe" --- Guided Review reads a change back to you in the order it makes sense, split into chapters. Each @@ -1743,9 +1746,9 @@ the agent as work to do. ## Open a review -Press `ctrl+g`, or run `/diff`. Luxe writes the guide first; when `review ready` shows above the +Press `ctrl+g`, or run `/diff`. luxe writes the guide first; when `review ready` shows above the composer, press `ctrl+g` again to open it. Asked for while a turn is running, the review waits for -the turn to end. A review you already have opens at once, and one you had open when Luxe stopped +the turn to end. A review you already have opens at once, and one you had open when luxe stopped comes back with your comments. | Review | Command | @@ -1758,7 +1761,7 @@ comes back with your comments. Inside a review, `s` changes what it covers: uncommitted changes, the last turn, a base or a commit. A pull request takes `/diff pr`. If the agent committed its work, so nothing is uncommitted, -`ctrl+g` and `/diff` review the last turn instead. Luxe remembers what you have already reviewed in +`ctrl+g` and `/diff` review the last turn instead. luxe remembers what you have already reviewed in each project, so the next review leads with what is new since then. ## Read it @@ -1805,7 +1808,7 @@ To leave project bookkeeping out of every review: ``` The patterns take `*`, `**`, `?` and a trailing `/`, and a project's list replaces your own. -Excluded files are counted in the guide. Luxe's own `.luxe/` is never reviewed. +Excluded files are counted in the guide. luxe's own `.luxe/` is never reviewed. A review leaves out a file it cannot hold, so the rest is still reviewable: in the last turn, any file over 1 MiB, unreadable, or not a regular file; in uncommitted changes or a base, a new file @@ -1832,7 +1835,7 @@ so you can verify it, at any time. The agent ends a fix by reporting on each comment: fixed, not fixed, or needs clarification, with a note. The note shows under the comment, and a comment it calls fixed waits for you to verify it, -since a claim is not proof. If the agent leaves its report out, Luxe asks for it once. A comment +since a claim is not proof. If the agent leaves its report out, luxe asks for it once. A comment the agent still says nothing about reads `no word from the agent`, with the reason in Feedback, and stays where you left it. @@ -1886,8 +1889,8 @@ agent opened. It needs the GitHub CLI, `gh`, signed in. | `enter` | Post it | Line comments are listed under their files with the diff they sit on, the way GitHub shows them. -Questions you asked the agent stay in Luxe and are never posted. On your own pull request, GitHub -only takes a comment, so that is all Luxe offers. +Questions you asked the agent stay in luxe and are never posted. On your own pull request, GitHub +only takes a comment, so that is all luxe offers. A drafted summary opens in the preview for you to read and edit. Anything the agent says beside it, such as a part of the change it did not read, appears under it as a note. Once the review is @@ -1896,7 +1899,7 @@ posted, the guide's foot says **Posted to GitHub** with the verdict, and `o` ope ### Fix it yourself To change someone else's pull request rather than comment on it, press `alt+u` (or `w` in the post -preview). Luxe asks GitHub whether you can push to it, then checks it out in a worktree of its own +preview). luxe asks GitHub whether you can push to it, then checks it out in a worktree of its own and starts a session there, with your comments as the agent's first task. A plain `git push` then updates the pull request. @@@ page: hooks @@ -1937,7 +1940,7 @@ case "$cmd" in esac ``` -A project's `.luxe/hooks.json` runs only when you start Luxe with `--trust-project`, since opening a +A project's `.luxe/hooks.json` runs only when you start luxe with `--trust-project`, since opening a repository should never run its commands. When both are loaded, a project's hooks run after yours. ### Hook settings @@ -1951,7 +1954,7 @@ repository should never run its commands. When both are loaded, a project's hook `on_timeout: "deny"` makes a guard fail closed. `"ask"` puts the question to you instead, at `BeforeToolUse`; at other points it acts as `allow`. A -`decision` Luxe does not recognize, a typo or different casing included, gets the same treatment, +`decision` luxe does not recognize, a typo or different casing included, gets the same treatment, with a warning in the log, and its `args` and `context` are dropped. ## Matchers @@ -1976,10 +1979,10 @@ points without a tool call ignore the matcher. | Point | Runs | stdin | Can | | --- | --- | --- | --- | | `SessionStart` | A session starts or resumes, including a switch to it from another session | `{"Other": null}` | | -| `SessionEnd` | A session ends, including a switch to another session; Luxe waits for the hook | `{"Other": null}` | | +| `SessionEnd` | A session ends, including a switch to another session; luxe waits for the hook | `{"Other": null}` | | | `UserPromptSubmit` | You send a message, including one sent while the agent works | `{"Other": {"content": "…"}}` | block it, add context | | `BeforeAgentStart` | A turn is about to start | `{"Other": null}` | | -| `AgentStart` | Luxe is about to call the model | `{"Other": null}` | | +| `AgentStart` | luxe is about to call the model | `{"Other": null}` | | | `BeforeToolUse` | Before each tool call | `{"ToolUse": {"tool_name": "bash", "args": {…}}}` | block it, ask you, rewrite it | | `AfterToolUse` | After each tool call | `{"ToolResult": {"tool_name": "bash", "result": "…", "is_error": false}}` | add context to the result | | `FileChanged` | `write`, `edit`, an applied rename or code action, or an `ast_grep` rewrite changed a file | `{"FileChanged": {"path": "/abs/file", "operation": "edit"}}` | | @@ -2001,7 +2004,7 @@ that hook alone, with a warning naming the nearest real point. | Field | Where | Does | | --- | --- | --- | -| `decision` | Required in any answer | `deny` blocks the call or message. `ask` raises a permission prompt, at `BeforeToolUse`. `allow`, or no output at all, means no opinion. An answer without `decision` counts as one Luxe cannot read. | +| `decision` | Required in any answer | `deny` blocks the call or message. `ask` raises a permission prompt, at `BeforeToolUse`. `allow`, or no output at all, means no opinion. An answer without `decision` counts as one luxe cannot read. | | `reason` | with `deny` or `ask` | Shown to the model when a call is blocked, to you when a message is blocked, and on the prompt | | `args` | `BeforeToolUse` | New values for the call's arguments. Keys you leave out keep their values. | | `context` | `AfterToolUse`, `UserPromptSubmit` | Text added to the tool result, or saved with your message, for the model to see | @@ -2054,7 +2057,7 @@ saved. Read a hook script before installing it, as you would anything on your `P } ``` -Luxe already adds language server errors after every edit; a hook like this is for a different +luxe already adds language server errors after every edit; a hook like this is for a different check. **Refuse messages that contain an internal token:** @@ -2078,7 +2081,7 @@ command is destructive. ## Coming from Claude Code -| Claude Code | Luxe | +| Claude Code | luxe | | --- | --- | | `PreToolUse`, `PostToolUse` | `BeforeToolUse`, `AfterToolUse` | | `UserPromptSubmit` with `additionalContext` | `UserPromptSubmit` with `context` | @@ -2092,16 +2095,16 @@ command is destructive. @@@ page: index --- title: "Overview" -summary: "What Luxe is, and where to find what you need." +summary: "What luxe is, and where to find what you need." order: 0 group: "Get started" --- -Luxe is a coding agent for your terminal. It works in your project with the model you choose, +luxe is a coding agent for your terminal. It works in your project with the model you choose, then walks you through what it changed so you can review it and open a pull request without leaving the terminal. -New to Luxe? [Install](install.md) it, then follow the [Quickstart](quickstart.md). The rest of the +New to luxe? [Install](install.md) it, then follow the [Quickstart](quickstart.md). The rest of the guide is reference, for when you need it. ## Find what you need @@ -2117,10 +2120,10 @@ guide is reference, for when you need it. | Resume a session, or see what fills the context | [Sessions and context](sessions.md) | | See what the agent can use | [Tools](tools.md) | | Let the agent work through a plan on its own | [Autonomous runs](loop.md) | -| Reach your sessions from your phone or tablet | [Luxe on your phone](remote.md) | +| Reach your sessions from your phone or tablet | [luxe on your phone](remote.md) | | Change the theme, keys or statusline | [Configuration](configuration.md) | | Give the agent your project's conventions | [Project context](project-context.md) | -| Add tools, skills or your own commands | [Extending Luxe](extending.md), [Recipes](recipes.md) | +| Add tools, skills or your own commands | [Extending luxe](extending.md), [Recipes](recipes.md) | | Control what the agent may do | [Security and permissions](security.md) | | Look up a command, flag or environment variable | [Command line](cli.md), [Environment variables](environment.md) | | Fix something that is not working | [Troubleshooting](troubleshooting.md) | @@ -2128,14 +2131,14 @@ guide is reference, for when you need it. ## Help - **Help** (`/help`) lists every key for the screen you are on, with any you have rebound. -- `luxe doctor` checks which language servers, debuggers and tools Luxe can use on your machine. +- `luxe doctor` checks which language servers, debuggers and tools luxe can use on your machine. - [Troubleshooting](troubleshooting.md) covers common problems and how to report a bug. - Problems and questions: [GitHub issues](https://github.com/evanwhittaker/luxe/issues). -## Ask Luxe +## Ask luxe -This guide is built into Luxe, for the version you have installed. Ask the agent how to do -something in Luxe, such as *how do I add an MCP server?*, and it reads the answer from the guide +This guide is built into luxe, for the version you have installed. Ask the agent how to do +something in luxe, such as *how do I add an MCP server?*, and it reads the answer from the guide rather than guessing. You can read it yourself too: ```bash @@ -2149,11 +2152,11 @@ luxe docs --search "on_ask" Every page is also plain markdown, at the same address with `.md` on the end: `https://luxe.dev/docs/install.md`. [`llms.txt`](https://luxe.dev/llms.txt) lists every page with a one-line summary, and [`llms-full.txt`](https://luxe.dev/llms-full.txt) is the whole guide in one -file. Inside Luxe, `luxe docs` serves the same pages offline. +file. Inside luxe, `luxe docs` serves the same pages offline. @@@ page: install --- title: "Install" -summary: "Install Luxe, check your setup, and pick a font." +summary: "Install luxe, check your setup, and pick a font." order: 1 group: "Get started" --- @@ -2177,6 +2180,11 @@ With Homebrew, on macOS or Linux: brew install evanwhittaker/tap/luxe ``` +Homebrew finishes with a line that names the installed version; run `luxe --version` +to check. Since Homebrew 6, a tap has to be trusted before its code runs. The full name above +trusts luxe's formula for you, but Homebrew can still stop on *another* tap you already have. If it +names one, trust it with `brew trust /`, or remove it with `brew untap`. + With Cargo, which builds it, so you need Rust 1.89 or newer ([rustup](https://rustup.rs) installs one): @@ -2196,7 +2204,7 @@ about your policy is saved. Any of them installs the `luxe` command; `luxe --version` checks it worked. -To update, run `luxe update`, or `/update` inside Luxe. Luxe checks once a day for a newer release +To update, run `luxe update`, or `/update` inside luxe. luxe checks once a day for a newer release and says so on the start screen; see [Updates](configuration.md#updates) for how it updates and how to turn the check off. @@ -2220,17 +2228,17 @@ cargo build --release ## Requirements -Luxe runs natively on Linux, macOS and Windows. Only a terminal and a model are required. +luxe runs natively on Linux, macOS and Windows. Only a terminal and a model are required. | | | | --- | --- | | **Terminal** | Any current terminal with UTF-8. On Windows, use Windows Terminal. | | **Model** | An API key, a ChatGPT, Copilot or OpenRouter subscription, or a local server such as LM Studio or Ollama. See [Providers](providers.md). | -| **Git** | For reviewing changes and working in worktrees. Without a repository, Luxe runs with nothing to review. | +| **Git** | For reviewing changes and working in worktrees. Without a repository, luxe runs with nothing to review. | | **GitHub CLI** | Optional. `gh`, signed in, for issues and pull requests. | | **A Nerd Font** | Optional, for icons. See [Fonts](#fonts). | -Luxe also uses these when they are installed: +luxe also uses these when they are installed: - `ast-grep`, for structural search. - A language server per language, for code intelligence. See [Code @@ -2243,7 +2251,7 @@ Luxe also uses these when they are installed: luxe doctor ``` -`luxe doctor` lists the tools, language servers and debug adapters Luxe found, which ones work, and +`luxe doctor` lists the tools, language servers and debug adapters luxe found, which ones work, and how to install what is missing: ``` @@ -2259,7 +2267,7 @@ Language servers ## Fonts -Luxe draws its icons from a [Nerd Font](https://www.nerdfonts.com/) when your terminal has one. +luxe draws its icons from a [Nerd Font](https://www.nerdfonts.com/) when your terminal has one. Without one, it falls back to plain characters on its own, and every icon has a word beside it, so nothing becomes unreadable. @@ -2287,7 +2295,7 @@ desktop's font instead. To check what a name resolves to: fc-match -f '%{file}\n' "JetBrainsMono NFM" ``` -JetBrains Mono lacks six symbols Luxe draws (`ℹ︎ ↳︎ ↺︎ ⏸︎ ✔︎ ✖︎`), and your system fills them in +JetBrains Mono lacks six symbols luxe draws (`ℹ︎ ↳︎ ↺︎ ⏸︎ ✔︎ ✖︎`), and your system fills them in from another font. For every character from one face, use **IosevkaTerm** or **Adwaita Mono**: ```bash @@ -2298,26 +2306,26 @@ scoop install nerd-fonts/IosevkaTerm-NF-Mono nerd-fonts/AdwaitaMono-NF-Mono ``` To use the wider icons anyway, set `"glyphs": "nerd_wide"` in -[`config.json`](configuration.md), and Luxe gives each icon two cells. +[`config.json`](configuration.md), and luxe gives each icon two cells. ## On Windows -Install [Git for Windows](https://gitforwindows.org/). Luxe finds its `bash` even though it is not +Install [Git for Windows](https://gitforwindows.org/). luxe finds its `bash` even though it is not on `PATH`, and the agent needs a POSIX shell for most commands. Without one, commands run through `cmd.exe`, which handles `cargo test` or `npm run build` but not much else. -If WSL is installed, Luxe skips the `bash.exe` in `System32`, which would run commands inside Linux +If WSL is installed, luxe skips the `bash.exe` in `System32`, which would run commands inside Linux against a different filesystem. Python on Windows is `py` or `python`. `python3` is usually the Microsoft Store's placeholder, so -Luxe tries `py -3` first. For the Python debugger, run `py -m pip install debugpy`. The agent's +luxe tries `py -3` first. For the Python debugger, run `py -m pip install debugpy`. The agent's commands run Python in UTF-8 mode (`PYTHONUTF8=1`) unless you have set it yourself, so output with characters outside your code page doesn't crash them. -Windows Terminal keeps a column at the right edge for its scrollbar. To give it to Luxe, set +Windows Terminal keeps a column at the right edge for its scrollbar. To give it to luxe, set **Scrollbar visibility** to **Hidden** in your profile's **Appearance** settings. -## Where Luxe keeps files +## Where luxe keeps files | | Linux and macOS | Windows | | --- | --- | --- | @@ -2327,10 +2335,10 @@ Windows Terminal keeps a column at the right edge for its scrollbar. To give it An `XDG_CONFIG_HOME`, `XDG_STATE_HOME` or `XDG_CACHE_HOME` you have set wins on every platform. `LUXE_CONFIG_DIR` moves every configuration file, API key and provider sign-in. `LUXE_STATE_DIR` -moves the state Luxe keeps for you: the model you last chose, MCP sign-ins, and the logs of +moves the state luxe keeps for you: the model you last chose, MCP sign-ins, and the logs of commands that only report, such as `luxe auth`. -Inside a project, Luxe keeps its sessions, logs and caches in `.luxe/`, with a `.gitignore` that +Inside a project, luxe keeps its sessions, logs and caches in `.luxe/`, with a `.gitignore` that keeps all of it out of Git except the files a team may want to share: `permissions.json`, `mcp.json`, `hooks.json` and `skills/`. @@@ page: interface @@ -2338,7 +2346,7 @@ keeps all of it out of Git except the files a team may want to share: `permissio title: "The interface" summary: "The start screen, the conversation, the composer, the dock, the statusline and the preview." order: 3 -group: "Using Luxe" +group: "Using luxe" --- ![The dock beside the preview, showing one file's diff](images/interface-peek.svg) @@ -2350,7 +2358,7 @@ This page names the keys for each part of the screen. All of them, and how to re ## The start screen -Luxe opens on a prompt. Type and press `enter` to ask in a new session, or choose a row from the +luxe opens on a prompt. Type and press `enter` to ask in a new session, or choose a row from the list under it with `↑`/`↓` and `enter`. | Row | Opens | @@ -2361,7 +2369,7 @@ list under it with `↑`/`↓` and `enter`. | **Sessions…** | Every session in this project, searchable. `/sessions` opens it too, here or in a session. | | **Review changes** | A [Guided Review](guided-review.md) of your uncommitted changes, when there are any | | **Configuration** | Providers, credentials, [settings](configuration.md#settings) and config files, once a provider is set up | -| **Quit** | Leaves Luxe. `ctrl+c` does too, here and in a session, even mid-turn, unless a prompt or menu is open, which it answers instead. | +| **Quit** | Leaves luxe. `ctrl+c` does too, here and in a session, even mid-turn, unless a prompt or menu is open, which it answers instead. | | **RECENT** | Your other recent sessions | Typing narrows the list. The first row becomes **Ask in a new session**, and under it come the @@ -2395,7 +2403,7 @@ screen and opens a new session. **Start screen** in `/settings` sets the same ke ![The minimal start screen](images/interface-launcher-minimal.svg) -Luxe works on the project it was started in. To switch projects, `cd` there and run `luxe`. +luxe works on the project it was started in. To switch projects, `cd` there and run `luxe`. ## The conversation @@ -2494,7 +2502,7 @@ conversation, or in its place below 80 columns. `mode` is `auto` (beside the conversation when there is room), `shown` or `hidden`. Drag the line between the dock and the conversation to make the dock wider or narrower. It stays -that width the next time Luxe starts; double-click the line to put it back. +that width the next time luxe starts; double-click the line to put it back. ### Files @@ -2600,12 +2608,12 @@ scrollbar to scroll, or press anywhere on it to jump. The lines between panes move: the dock's, the preview's, and the one beside a review's guide. A line lights under the pointer; drag it to resize the pane beside it, or double-click it to put the pane -back to its own width. Luxe remembers the widths for next time. +back to its own width. luxe remembers the widths for next time. Drag across the conversation or the composer to select, and the selection is copied when you let go. Click a message to copy all of it. `ctrl+insert` or `ctrl+shift+c` copies a selection too. -Your terminal's own copy key reaches Luxe only if the terminal passes it through. Either hold +Your terminal's own copy key reaches luxe only if the terminal passes it through. Either hold `shift` (`option` on macOS) while dragging, to make a selection the terminal copies itself, or let the copy key fall through when the terminal has nothing selected. In Ghostty: @@ -2613,7 +2621,7 @@ the copy key fall through when the terminal has nothing selected. In Ghostty: keybind = performable:control+insert=copy_to_clipboard ``` -Luxe copies to the desktop clipboard, and over SSH through the terminal (OSC 52). Inside tmux, +luxe copies to the desktop clipboard, and over SSH through the terminal (OSC 52). Inside tmux, that needs `set -g set-clipboard on`. `/mouse off` hands the mouse back to the terminal for the session, and `"mouse": false` in @@ -2624,7 +2632,7 @@ notch scrolls, from 1 to 20 lines (3 by default). title: "Autonomous runs" summary: "Let the agent work through a phased plan on its own, with tests and a reviewer at each phase." order: 12 -group: "Using Luxe" +group: "Using luxe" --- `luxe loop` runs the agent on its own, phase by phase through your plan. A phase only counts as done @@ -2677,7 +2685,7 @@ A run uses your session's model, or `--model`. Only one run at a time works in a ## Check each phase -When the agent says a phase is done, Luxe checks it before moving on: +When the agent says a phase is done, luxe checks it before moving on: 1. **Your commands.** Each must pass. 2. **A reviewer**, if `gate.review` is on and the commands passed. It runs in a fresh session, so @@ -2720,13 +2728,22 @@ phase with `luxe loop phase --set `. A run prints one line per step, timed from its start: ```text - 19s write logstats.py - 49s test python3 -m unittest -q - 1m09s phase 0 claimed complete — running the gate - 1m31s the acceptance commands passed — asking the reviewer - 2m34s phase 0 accepted — now on phase 1 + 0s ┃ phase 0 + 0s ┃ ┌ start + 19s ┃ │ ✓ write logstats.py + 49s ┃ │ ✗ test python3 -m unittest -q · failed + 1m09s ┃ │ phase 0 claimed complete — running the gate + 1m31s ┃ │ the acceptance commands passed — asking the reviewer + 2m34s ┃ │ phase 0 accepted — now on phase 1 + 2m40s ┃ └ turn ended · 6 tools · 2m40s + 2m41s ┃ phase 1 + 2m41s ┃ ┌ iteration 1 ``` +The heavy rail on the left marks the phase, in a color of its own, and the bracket inside it marks +each iteration. In a terminal, a tool's line shows `○` while it runs, then turns green with `✓` or +red with `✗` when it ends. Piped to a file there's no color, and a failure gets a line of its own. + `luxe loop status` shows what it has cost, by model: ```text @@ -2760,7 +2777,7 @@ group: "Extend" --- An [MCP](https://modelcontextprotocol.io) server gives the agent new tools: a browser, a database, -your issue tracker. Luxe reaches every server through one `mcp` tool, so a server's tools cost +your issue tracker. luxe reaches every server through one `mcp` tool, so a server's tools cost nothing in a request until the agent looks for them: ```text @@ -2798,14 +2815,14 @@ removed by editing that file. `luxe mcp list` starts nothing: it shows every con disabled ones included, and marks a project's entries `not started (project)`, with or without `--trust-project`. In a session, `/mcp` shows each server, how it connects and its tools. -Luxe also reads `~/.config/mcp/mcp.json`, and a project's `.mcp.json` and `.luxe/mcp.json`. Where +luxe also reads `~/.config/mcp/mcp.json`, and a project's `.mcp.json` and `.luxe/mcp.json`. Where two files name the same server, the project's wins. ### Server settings | Key | Does | | --- | --- | -| `command`, `args`, `env` | Start a local server. An `env` value can use `${VAR}` or `$env:VAR`; an unset one is empty, and Luxe logs which. | +| `command`, `args`, `env` | Start a local server. An `env` value can use `${VAR}` or `$env:VAR`; an unset one is empty, and luxe logs which. | | `url`, `headers` | Connect to a remote server. `headers` take `${VAR}` the same way. | | `auth` | Sign in: see [below](#sign-in) | | `lifecycle` | `lazy` (the default) connects on first use and disconnects when idle. `eager` connects at start; `keep_alive` stays connected. | @@ -2829,7 +2846,7 @@ A remote server signs in with a token or with OAuth. } ``` -For OAuth, sign in once in a browser, and Luxe refreshes the token from then on: +For OAuth, sign in once in a browser, and luxe refreshes the token from then on: ```bash luxe mcp login --id linear @@ -2837,7 +2854,7 @@ luxe mcp login --id linear The agent never starts a sign-in. Tokens are kept in `~/.local/state/luxe/mcp-auth.json`, readable only by you. With `LUXE_STATE_DIR` set they are kept there instead, so a moved state directory does -not share the default one's sign-ins. If that file stops being valid JSON, Luxe moves it to +not share the default one's sign-ins. If that file stops being valid JSON, luxe moves it to `mcp-auth.json.bad` (or a dated name, if one is already there) rather than write over it, and you sign in again. @@ -2910,7 +2927,7 @@ A server's descriptions and results are treated as information, never as instruc ### Servers a project brings -A project's `.mcp.json` names programs that would run on your machine. Luxe starts a project's +A project's `.mcp.json` names programs that would run on your machine. luxe starts a project's servers in an interactive session, or with `--trust-project`, but not in a headless or loop run. To decide for every run, set `lsp.project_servers` in your own config; see [Tools](tools.md#a-server-the-project-installed). @@ -2950,14 +2967,14 @@ row, and the agent receives the text your program gave for it. | `icon` | One Nerd Font glyph for the tab, as the character or a JSON escape. Without one, the tab shows a tag; without a Nerd Font, a plain mark. | Sources are read from your own config only, since each one runs a program. Their tabs come after -Luxe's own: Files, Skills, GitHub and MCP, whose kinds `file`, `skill`, `github` and `mcp` are +luxe's own: Files, Skills, GitHub and MCP, whose kinds `file`, `skill`, `github` and `mcp` are taken. Two sources with the same kind get one tab, the first's. ## What the program prints -Luxe runs the program, in the project, the first time its tab opens, and lists what it prints: one -JSON object per line. The rows are kept until Luxe exits, so a new ticket, or a change to your -script, shows up the next time you start Luxe. The program has no terminal and no stdin, so it +luxe runs the program, in the project, the first time its tab opens, and lists what it prints: one +JSON object per line. The rows are kept until luxe exits, so a new ticket, or a change to your +script, shows up the next time you start luxe. The program has no terminal and no stdin, so it cannot prompt for a sign-in. ```json @@ -2977,7 +2994,7 @@ wrong. If the program fails, the tab shows the last line it wrote to stderr, or and it runs again the next time the tab opens. Make `text` enough for the agent to find the rest: a title and a link, or an ID it can look up with -a CLI or an MCP server. A mention you type by hand, or one not picked since Luxe started, reaches +a CLI or an MCP server. A mention you type by hand, or one not picked since luxe started, reaches the agent as `Jira PROJ-12` alone. What a tracker says is other people's words, and it reaches your model provider once you mention it. @@ -2998,13 +3015,13 @@ jq -c --arg site "$site" '.issues[] | { ``` Make it executable (`chmod +x`), put it on your `PATH`, and add the Jira entry above. For Asana, -see [Recipes](recipes.md#asana). Or ask Luxe to write one for the tracker you use. +see [Recipes](recipes.md#asana). Or ask luxe to write one for the tracker you use. @@@ page: mentions --- title: "Mentions" summary: "Point the agent at a file, skill, issue, MCP server or your own tracker with `@`." order: 5 -group: "Using Luxe" +group: "Using luxe" --- Type `@` at the start of a word in the composer to mention something. The picker opens on your @@ -3054,7 +3071,7 @@ In `/github`, `c` inserts a mention of the pull request or issue under the curso @@@ page: project-context --- title: "Project context" -summary: "Give the agent your project's conventions in AGENTS.md, and how Luxe finds the project." +summary: "Give the agent your project's conventions in AGENTS.md, and how luxe finds the project." order: 3 group: "Customize" --- @@ -3065,12 +3082,12 @@ Put your project's conventions in an `AGENTS.md` at its root, and the agent read every session. In a project folder a `CLAUDE.md` works too; when both exist, `AGENTS.md` is used. The global files below are read only by those names, so `~/.claude/CLAUDE.md` is not. -Luxe reads, in order: +luxe reads, in order: 1. `~/.agents/AGENTS.md`, the file many people keep for every agent they use -2. `~/.config/luxe/agents.md`, for every project in Luxe +2. `~/.config/luxe/agents.md`, for every project in luxe 3. `AGENTS.md` at the top of the repository -4. One `AGENTS.md` per folder down to where you started Luxe +4. One `AGENTS.md` per folder down to where you started luxe So a monorepo can keep shared rules at the root and package rules beside the code, and `luxe` started in `packages/app` reads both. Nothing above the repository is read. Outside a repository, @@ -3086,7 +3103,7 @@ agent is told with your next message. An `AGENTS.md` in a folder below the repository's top, but not on the way to where you started, joins when the agent first opens, writes or searches a path in that folder. It's added to that -tool result, once, and Luxe shows **Following** and the file's path. The system prompt doesn't +tool result, once, and luxe shows **Following** and the file's path. The system prompt doesn't change, so the cache holds. Ignored folders, such as `node_modules`, are skipped. If a rewind or a compaction drops the file, it joins again the next time the agent goes there. `LUXE_NESTED_INSTRUCTIONS=0` turns this off. @@ -3094,7 +3111,7 @@ compaction drops the file, it joins again the next time the agent goes there. **Project context** lists every file a turn reads, and says whose rules each one carries: **global**, **project** or **folder** context. Type `context` on the start screen and open it. `enter` opens a file in your editor, or creates one from a template. The template's guidance is in -comments, which Luxe removes and reports, so replace them with your own lines. +comments, which luxe removes and reports, so replace them with your own lines. ### Duplicates @@ -3130,7 +3147,7 @@ lists and architecture overviews do not; the agent reads those from the code. An `AGENTS.md` over 24,000 characters is cut off, with a note telling the agent to read the rest of the file itself. -### What Luxe removes +### What luxe removes Two kinds of text are removed from `AGENTS.md` and skill files before the agent sees them, because neither is visible to someone reviewing the file: @@ -3141,13 +3158,13 @@ neither is visible to someone reviewing the file: and soft hyphens and other marks that draw nothing, written as characters or as references such as `‮` -A file that repeats one link label so often that Luxe cannot check every definition is left out -entirely. For an `AGENTS.md`, Luxe says what it removed or left out when it starts; a skill file is +A file that repeats one link label so often that luxe cannot check every definition is left out +entirely. For an `AGENTS.md`, luxe says what it removed or left out when it starts; a skill file is cleaned without a notice. ## Where the project begins -Luxe works on one project, found by walking up from where you started it: +luxe works on one project, found by walking up from where you started it: 1. Inside a repository (`.git`, `.jj` or `.hg`), the nearest folder with a `.luxe/` in it, up to the top of the repository @@ -3165,14 +3182,14 @@ mkdir -p packages/app/.luxe The package keeps its own sessions and still reads the `AGENTS.md` at the top of the repository. -Outside a repository, a `.luxe/` claims only its own folder. Luxe writes one wherever it runs, so +Outside a repository, a `.luxe/` claims only its own folder. luxe writes one wherever it runs, so starting it once in `~/.config` does not make `~/.config/herdr` part of that project. @@@ page: providers --- title: "Models and providers" summary: "Sign in to a provider, choose a model and thinking level, and run local models." order: 9 -group: "Using Luxe" +group: "Using luxe" --- ## Sign in @@ -3239,7 +3256,7 @@ used from other programs. GitHub Copilot serves Claude through Anthropic's Messages API, its newer GPT, Grok and MAI models only through its Responses API, and the rest through chat completions. Copilot says which model -takes which, and Luxe sends each one where it belongs. Claude goes to Messages even though chat +takes which, and luxe sends each one where it belongs. Claude goes to Messages even though chat completions would take it, because only Messages keeps its thinking, its effort level and the prompt cache for the whole conversation. The models offered are your plan's own, kept current each time the sign-in refreshes. Signing in turns on any model your plan offers that you have not been @@ -3263,8 +3280,9 @@ A command runs each time a request needs the key. ## Choose a model `/model` opens the model picker: every model your providers can serve, configured providers first. -Type to search. The session carries on with the new model, even across providers, and Luxe -remembers your choice for next time. +Type to search. The session carries on with the new model, even across providers, and luxe +remembers your choice for next time, in this project and as your latest anywhere +([which model a session starts on](agent.md#which-model-a-session-starts-on)). From the command line, `--model` takes a model ID, or `provider/id` to pick the provider too: @@ -3272,7 +3290,7 @@ From the command line, `--model` takes a model ID, or `provider/id` to pick the luxe --model anthropic/claude-opus-5 ``` -To see what Luxe knows about a model, or list what you can use: +To see what luxe knows about a model, or list what you can use: ```bash luxe models show anthropic/claude-opus-5 # context window, output limit, thinking levels, price @@ -3280,8 +3298,8 @@ luxe models list --provider anthropic # every model; * is active, + is conf luxe models refresh --force # update the model catalog now ``` -Luxe ships with the [models.dev](https://models.dev) catalog built in and refreshes it in the -background, so a model released after your copy of Luxe still has the right context window and +luxe ships with the [models.dev](https://models.dev) catalog built in and refreshes it in the +background, so a model released after your copy of luxe still has the right context window and price. ## Thinking @@ -3290,7 +3308,7 @@ price. **Medium**, **High**, **XHigh** or **Ultra**. Levels the model does not support are grayed out. `--thinking high` sets it at launch. -Luxe remembers the level per model, since `high` on a frontier model and on a small local one cost +luxe remembers the level per model, since `high` on a frontier model and on a small local one cost very different amounts of time. To give a model its own starting level: ```json title="~/.config/luxe/models.json" @@ -3312,7 +3330,7 @@ ChatGPT plan, the statusline shows how much of the plan is used, such as `12% we shows when it resets. On a Copilot plan it shows the month's allowance the same way, such as `19% monthly`. -Luxe prices Copilot usage at Copilot's per-token rates, so the figure matches what Copilot reports +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. A ChatGPT subscription serves its own set of models, different from OpenAI's API, and `/model` @@ -3336,7 +3354,7 @@ For reasoning controls, chat templates and sampling settings on a local server, ## Microsoft Foundry -One Foundry resource and key serve three APIs, which Luxe treats as three providers. Signing in to +One Foundry resource and key serve three APIs, which luxe treats as three providers. Signing in to one configures all three: ```bash @@ -3352,7 +3370,7 @@ choose a model with the provider that serves it: | `foundry-anthropic` | Claude | `luxe --model foundry-anthropic/claude-sonnet-5` | | `foundry-completions` | DeepSeek, Grok, Llama, Mistral, Phi and Cohere | `luxe --model foundry-completions/deepseek-v4-pro` | -`/model` lists what your resource has deployed, not every model Azure offers. Luxe asks the +`/model` lists what your resource has deployed, not every model Azure offers. luxe asks the resource for its deployments when you sign in and again each time you open `/model`, and sorts them onto the right provider by the model each one runs. `luxe models refresh` asks too. If a resource cannot list its deployments, `/model` shows Azure's catalog marked `unverified`, and you can @@ -3363,8 +3381,8 @@ Entra ID, see [Custom providers](custom-providers.md#keyless-sign-in-with-micros ## When a provider stalls -Luxe waits 60 seconds for a provider to start answering, and 180 seconds between parts of a reply. -If a provider is overloaded, rate limited or unreachable before it has sent anything, Luxe tries +luxe waits 60 seconds for a provider to start answering, and 180 seconds between parts of a reply. +If a provider is overloaded, rate limited or unreachable before it has sent anything, luxe tries again after 2, 4 and 8 seconds, showing `retrying (2/3)` above the composer. Once a reply has started, a failure ends the turn rather than paying for the reply twice. A bad key or a refused request is not retried. @@ -3385,7 +3403,7 @@ group: "Get started" This walks through one change from start to finish: connect a model, ask for something, review what the agent did, and open a pull request. -## 1. Start Luxe in your project +## 1. Start luxe in your project ```bash cd your-project @@ -3397,14 +3415,14 @@ Reviewing changes and opening a pull request need a Git repository. A pull reque branch other than the one it merges into; `luxe --worktree` makes one for you, in a [worktree](github.md#work-in-a-worktree) of its own. -The first time, Luxe asks four questions: a theme, a provider, which tools the agent can use, and -what Luxe opens on. Each one previews or explains itself, and `enter` moves on. `s` skips setup and +The first time, luxe asks four questions: a theme, a provider, which tools the agent can use, and +what luxe opens on. Each one previews or explains itself, and `enter` moves on. `s` skips setup and keeps none of the answers, though a provider you signed in to stays signed in. Your answers go to `~/.config/luxe/config.json`, and `/settings` or `luxe init` changes them later. ![Setup, on its theme step](images/quickstart-setup.svg) -After that, Luxe opens on the start screen: a prompt, with your last session, your other sessions +After that, luxe opens on the start screen: a prompt, with your last session, your other sessions and **Configuration** listed under it, or **Set up a provider** first if you have none yet. Type to ask something or to find a session or a command, or use `↑`/`↓` and `enter` to open a row. @@ -3425,7 +3443,7 @@ and pick one: When it connects, the model picker opens. Choose a model, and change it any time with `/model`. -An API key in your environment works too. Luxe finds `ANTHROPIC_API_KEY`, `OPENAI_API_KEY`, +An API key in your environment works too. luxe finds `ANTHROPIC_API_KEY`, `OPENAI_API_KEY`, `GEMINI_API_KEY` and the rest, and offers that provider's models. To sign in from a script or a machine without the interface, use the CLI: @@ -3458,7 +3476,7 @@ place on a narrow one. ## 4. Review the change -Press `ctrl+g` to start a **Guided Review**. Luxe writes a guide to the change, split into +Press `ctrl+g` to start a **Guided Review**. luxe writes a guide to the change, split into chapters, each with what changed, why, and how it was checked, next to the code. When `review ready` shows above the prompt, press `ctrl+g` again to open it. @@ -3477,7 +3495,7 @@ Comments go to the agent as work to do when you finish with **Request fixes**. ## 5. Open a pull request This needs the GitHub CLI, `gh`, signed in (`gh auth login`): **Open pull request** is offered once -`gh` says the branch has none. Finish the review (`alt+enter`) and choose it. Luxe drafts the title +`gh` says the branch has none. Finish the review (`alt+enter`) and choose it. luxe drafts the title and description from the review. The heading says what happens before it opens, such as "commits and pushes first". The pull request pictured came from a session that took up an issue ([`luxe --issue 123`](github.md#start-from-an-issue)), so its branch is named for the issue and its @@ -3614,7 +3632,7 @@ and the agent can look it up through the MCP server. See [Mention sources](menti ## Subagents A subagent is a separate context that does one job and returns a summary, which is what a headless -Luxe run is: +luxe run is: ```bash luxe --headless --read-only --model openai/gpt-5.6 --format json \ @@ -3637,7 +3655,7 @@ To let the agent start one itself, wrap that command in an MCP server with a - Return the subagent's stderr when it fails, so the agent sees why. - Give a subagent that writes its own worktree, with `git worktree add`, so it stays out of yours. -Luxe refuses to nest more than two levels deep, since an agent that starts two subagents per turn +luxe refuses to nest more than two levels deep, since an agent that starts two subagents per turn would multiply fast. `LUXE_MAX_DEPTH` raises the limit. ## A guard that asks a model @@ -3690,10 +3708,10 @@ fi - **Nobody answers in a headless run**, so its `ask` is allowed there. Use `--on-ask deny`, or `"hook_ask": "deny"` in `permissions.json`, to make it hold. -## Run Luxe in Herdr +## Run luxe in Herdr [Herdr](https://herdr.dev) keeps coding agents in panes and shows which ones are working, waiting -on you, or done. Luxe reports its state to Herdr on its own when it runs in a Herdr pane: +on you, or done. luxe reports its state to Herdr on its own when it runs in a Herdr pane: **working** during a turn, **blocked** when it needs you, and **done** when the turn ends. ```bash @@ -3710,11 +3728,11 @@ curl -fsSL https://raw.githubusercontent.com/ogulcancelik/herdr/master/SKILL.md -o ~/.config/luxe/skills/herdr/SKILL.md ``` -`LUXE_HERDR=0` or `{ "herdr": false }` in Luxe's config turns the reporting off. +`LUXE_HERDR=0` or `{ "herdr": false }` in luxe's config turns the reporting off. -### Luxe colors in Herdr +### luxe colors in Herdr -Herdr has no theme files — it takes a built-in theme plus per-token overrides. This is Luxe's +Herdr has no theme files — it takes a built-in theme plus per-token overrides. This is luxe's own palette in those tokens, so the pane and the multiplexer around it read as one program: ```toml title="~/.config/herdr/config.toml" @@ -3722,12 +3740,12 @@ own palette in those tokens, so the pane and the multiplexer around it read as o name = "vesper" # the closest built-in; every token below is overridden anyway [theme.custom] -accent = "#ddc084" # champagne, the one color Luxe leads with +accent = "#ddc084" # champagne, the one color luxe leads with text = "#e4dfd6" subtext0 = "#97938c" overlay0 = "#4d4a45" overlay1 = "#97938c" -sidebar_bg = "#12100e" # the base surface, same as Luxe's background +sidebar_bg = "#12100e" # the base surface, same as luxe's background panel_bg = "#12100e" # the tab bar sits on it too, so the chrome is one field surface0 = "#201e1a" surface1 = "#2e2b27" @@ -3739,7 +3757,7 @@ yellow = "#ddc084" # working — an agent at work glows in the accent green = "#81caa0" # idle / done red = "#e68485" # blocked, needs you peach = "#faaa51" # interrupted -blue = "#85c7d7" # Luxe has one cool hue, so blue and teal share it +blue = "#85c7d7" # luxe has one cool hue, so blue and teal share it teal = "#85c7d7" [ui] @@ -3747,18 +3765,18 @@ accent = "#ddc084" # borders and navigation chrome, which read off their ``` Reload it in place with `prefix+shift+r`, or `herdr server reload-config`. For any of the other -[themes](appearance.md) Luxe ships, the hexes are in its theme file and the token names above do +[themes](appearance.md) luxe ships, the hexes are in its theme file and the token names above do not change. The one token worth a second thought is `panel_bg`: Herdr draws the active tab as `panel_bg` text on an `accent` fill, so it has to stay dark enough to read there. Lifting it to `#201e1a` gives the tab bar a surface of its own if you prefer the chrome delineated. -## Luxe from your phone +## luxe from your phone Your sessions keep running on your computer, and your phone or tablet reaches them over [Tailscale](https://tailscale.com), a private network between your own devices. Nothing is opened to -the internet. This is the terminal over SSH; [Luxe on your phone](remote.md) is Luxe's own way in. +the internet. This is the terminal over SSH; [luxe on your phone](remote.md) is luxe's own way in. 1. Install Tailscale on the computer and on the phone, and sign in to the same account on both. 2. On the computer, turn on SSH. On Linux and macOS, Tailscale can do it for you: @@ -3768,10 +3786,10 @@ the internet. This is the terminal over SSH; [Luxe on your phone](remote.md) is ``` On Windows, turn on the OpenSSH Server in Settings, under Optional features. -3. Run Luxe in [Herdr](#run-luxe-in-herdr), so your sessions outlive the terminal you started +3. Run luxe in [Herdr](#run-luxe-in-herdr), so your sessions outlive the terminal you started them in. 4. On the phone, connect with an SSH app such as Blink Shell or Termius, using the computer's - Tailscale name, and run `herdr`. It attaches to the panes you left, with Luxe where it was. + Tailscale name, and run `herdr`. It attaches to the panes you left, with luxe where it was. ```bash mosh you@desk -- herdr @@ -3781,24 +3799,24 @@ mosh you@desk -- herdr cellular. It needs `mosh` installed on the computer too, which Linux and macOS have and Windows does not; plain `ssh` works everywhere. -On an iPad with a keyboard, this is Luxe as you know it. On a phone, Luxe fits a narrow screen, +On an iPad with a keyboard, this is luxe as you know it. On a phone, luxe fits a narrow screen, and Herdr marks which session is waiting on you. -### A notification when Luxe needs you +### A notification when luxe needs you -[Luxe on your phone](remote.md#notifications) has notifications built in. Without it, a +[luxe on your phone](remote.md#notifications) has notifications built in. Without it, a [hook](hooks.md) can post to [ntfy](https://ntfy.sh), whose app shows it on your phone: ```json title="~/.config/luxe/hooks.json" { "PermissionRequested": [ - { "command": ["curl", "-s", "-d", "Luxe is waiting for an approval", "https://ntfy.sh/your-topic"] } + { "command": ["curl", "-s", "-d", "luxe is waiting for an approval", "https://ntfy.sh/your-topic"] } ], "BeforeToolUse": [ - { "matcher": "question", "command": ["curl", "-s", "-d", "Luxe has a question", "https://ntfy.sh/your-topic"] } + { "matcher": "question", "command": ["curl", "-s", "-d", "luxe has a question", "https://ntfy.sh/your-topic"] } ], "AgentEnd": [ - { "command": ["curl", "-s", "-d", "Luxe finished", "https://ntfy.sh/your-topic"] } + { "command": ["curl", "-s", "-d", "luxe finished", "https://ntfy.sh/your-topic"] } ] } ``` @@ -3811,11 +3829,11 @@ and Herdr marks which session is waiting on you. ## A local model in LM Studio 1. Load a model in LM Studio and start its server. -2. In Luxe, open **Configuration** and choose **Connect a local or custom model**, then +2. In luxe, open **Configuration** and choose **Connect a local or custom model**, then **LM Studio**. Leave the endpoint blank for the default. 3. Choose the model in the picker that opens. -LM Studio ignores the chat-template settings Luxe sends a local server by default, so for +LM Studio ignores the chat-template settings luxe sends a local server by default, so for thinking levels to reach the model, send them as `reasoning_effort`, and start each session at a sensible level. Connecting already wrote an `lmstudio` provider to `models.json`, so add these keys to it rather than replacing the file: @@ -3834,19 +3852,22 @@ to it rather than replacing the file: [Custom providers](custom-providers.md) covers samplers and request formats. @@@ page: remote --- -title: "Luxe on your phone" +title: "luxe on your phone" summary: "Reach the sessions running on your computer from your own phone or tablet, over Tailscale." order: 13 -group: "Using Luxe" +group: "Using luxe" --- `luxe remote` lets your phone or tablet see the sessions running on your computer, join one, and start new ones. It listens on your computer only. [Tailscale](https://tailscale.com), a private network between your own devices, carries it to them over HTTPS, so nothing is opened to the -internet and there is no Luxe server in between. +internet and there is no luxe server in between. On the phone it's an app in the browser, drawn like the interface in your theme. For the whole -terminal, editor included, [Luxe from your phone](recipes.md#luxe-from-your-phone) works over SSH. +terminal, editor included, [luxe from your phone](recipes.md#luxe-from-your-phone) works over SSH. + +![On an iPhone, an edit waiting for permission](phone/remote-permission.png) +![The same turn finished: its tool cards and the reply](phone/remote-turn.png) ## Set it up @@ -3859,11 +3880,11 @@ terminal, editor included, [Luxe from your phone](recipes.md#luxe-from-your-phon 3. Scan the QR code it shows with the phone's camera, and give the device a name. 4. On an iPhone or iPad, add it to the Home Screen: in Safari, Share, then Add to Home Screen. It - opens full screen with the Luxe mark as its icon, and keeps the sign-in Safari had when you + opens full screen with the luxe mark as its icon, and keeps the sign-in Safari had when you added it. An app added before pairing asks for the invitation link instead: copy it from `luxe remote pair` and paste it in. -Setup takes four steps, and asks before each one that changes something outside Luxe: +Setup takes four steps, and asks before each one that changes something outside luxe: | Step | Does | | --- | --- | @@ -3886,9 +3907,9 @@ The service is your own, and needs no administrator: | --- | --- | | Linux | A systemd user unit, `~/.config/systemd/user/luxe-remote.service` | | macOS | A launch agent, `~/Library/LaunchAgents/dev.luxe.remote.plist` | -| Windows | `Luxe remote` under `HKCU\Software\Microsoft\Windows\CurrentVersion\Run` | +| Windows | `luxe remote` under `HKCU\Software\Microsoft\Windows\CurrentVersion\Run` | -Without it, run `luxe remote` in a terminal, and your devices reach Luxe while it runs. +Without it, run `luxe remote` in a terminal, and your devices reach luxe while it runs. ## Devices @@ -3914,13 +3935,13 @@ luxe remote setup --allow sam@github Each computer runs its own bridge at its own address, so one phone can reach several: set each up as above, with Tailscale signed in to the same account, and pair the phone with each. Every one is its own app on the Home Screen, named for the computer as Tailscale names it (`desk` for -`desk.tail1234.ts.net`), with the name beside the Luxe mark in its session list and after the -project in its notifications, "luxe · desk". Luxe finds Tailscale by the `tailscale` command, so +`desk.tail1234.ts.net`), with the name beside the luxe mark in its session list and after the +project in its notifications, "luxe · desk". luxe finds Tailscale by the `tailscale` command, so on a Mac check that `tailscale version` works in Terminal before running setup. ## What your device sees -Every Luxe running on the computer as you: the interface, `luxe --rpc`, and any started from your +Every luxe running on the computer as you: the interface, `luxe --rpc`, and any started from your device. A device that joins a session is a guest, as in [joining a session](rpc.md#join-a-running-session): it sees the conversation so far and every live event, and can answer prompts and send messages. It can't switch or end the session, or publish to GitHub. @@ -3984,8 +4005,8 @@ to `false` is out of reach, from your device too. ## Starting a session -Tap **New** on the session list to start Luxe in a folder: one where Luxe is running now, one with -a [herdr](recipes.md#run-luxe-in-herdr) pane, one where the bridge has seen Luxe run, or any path +Tap **New** on the session list to start luxe in a folder: one where luxe is running now, one with +a [herdr](recipes.md#run-luxe-in-herdr) pane, one where the bridge has seen luxe run, or any path you type. What you type narrows the folders it offers, by name and then by path. They're only the ones above: it never looks through your home folder. @@ -4036,12 +4057,12 @@ session needs a paired device as well. [Security](security.md#luxe-remote) has t @@@ page: rpc --- title: "The RPC protocol" -summary: "Drive Luxe from your own program: an editor plugin, a dashboard, or a front end of your own." +summary: "Drive luxe from your own program: an editor plugin, a dashboard, or a front end of your own." order: 7 group: "Extend" --- -`luxe --rpc` runs Luxe without its interface and speaks JSON over stdin and stdout, one object per +`luxe --rpc` runs luxe without its interface and speaks JSON over stdin and stdout, one object per line. Use it to build an editor plugin, a dashboard, a CI adapter, or a whole new front end, in any language. @@ -4051,7 +4072,7 @@ luxe --rpc --github-writes # also lets your client publish to GitHub ``` A client is trusted like the interface it replaces: it answers permission prompts, and it cannot -loosen any permission rule. Nothing listens on the network. Your client either started Luxe, or +loosen any permission rule. Nothing listens on the network. Your client either started luxe, or [joined a session](#join-a-running-session) open in the interface on the same machine. ## A session @@ -4104,7 +4125,7 @@ for line in luxe.stdout: elif kind == "turn_ended": print() send("close") - # Ignore everything else, so the client keeps working with newer versions of Luxe. + # Ignore everything else, so the client keeps working with newer versions of luxe. ``` Three rules make a working client: read `ready` first, answer both kinds of prompt, and ignore @@ -4119,7 +4140,7 @@ client above works with `["luxe", "join"]` in place of `["luxe", "--rpc"]`. ```bash luxe join --list # sessions running on this machine luxe join # the one running in this folder -luxe join 5898d57b # one by the start of its id, or by its Luxe's process id +luxe join 5898d57b # one by the start of its id, or by its luxe's process id ``` After `ready` comes the session so far: `session_loaded` with the transcript, the latest @@ -4132,7 +4153,7 @@ A joined client is a guest in someone else's session: - **Either side can answer a prompt.** The first answer counts, and `prompt_closed` tells everyone to put the prompt away. The interface says which client answered. - **It can't switch or end the session.** `new_session` and `load_session` are refused with - `action_rejected`. `close`, or the end of your stdin, disconnects you and leaves Luxe running. + `action_rejected`. `close`, or the end of your stdin, disconnects you and leaves luxe running. - **GitHub writes are off**, and `ready` says `"github_writes": false`. - **Keep reading.** A client that falls far behind gets a `notice` and is disconnected. Join again for a fresh copy of the session. @@ -4142,7 +4163,7 @@ leaves, by the name it gives in `introduce` if it sends one within a second of c its process id. A device the bridge introduces as `yours`, paired by you, is listed but not announced: you know your own phone joined, and a phone reconnects often. -A running Luxe lists its session in a file in its [runtime folder](environment.md#integrations), +A running luxe lists its session in a file in its [runtime folder](environment.md#integrations), `.json`, with the `address` to connect to: a Unix socket, or a named pipe on Windows. Connect there yourself to skip `luxe join`. To stop sessions being joined, set [`joinable`](configuration.md#joining-a-session) to `false`. @@ -4176,12 +4197,12 @@ To stop sessions being joined, set [`joinable`](configuration.md#joining-a-sessi | `load_file_diff` | `{"request_id": "…", "path": "src/main.rs"}` | One file's change, outside any review; answered by `file_diff_loaded` | | `list_directory` | `{"request_id": "…", "path": "src"}` | One project folder's entries, without what `.gitignore` ignores unless `"include_ignored": true`, which marks each such entry `"ignored": true`; answered by `directory_listed` | | `read_project_file` | `{"request_id": "…", "path": "src/main.rs"}` | One project file's text, up to 2 MB; answered by `project_file_read` | -| `introduce` | `{"name": "iPhone"}` | A joined client's name, which the interface uses when it says who joined or answered. Add `"watch_only": true` as your first line to read without being announced; Luxe then drops everything else you send. `"yours": true` says the person at the terminal paired it, so it's listed without a line in the conversation. Refused from the client that started the session. | +| `introduce` | `{"name": "iPhone"}` | A joined client's name, which the interface uses when it says who joined or answered. Add `"watch_only": true` as your first line to read without being announced; luxe then drops everything else you send. `"yours": true` says the person at the terminal paired it, so it's listed without a line in the conversation. Refused from the client that started the session. | | `close` | | Shut down, stopping a turn in flight the way `cancel` does. The stream ends after it. | ### Guided Review -A review is loaded with `load_guided_review`. Luxe answers with `guided_review_loaded`, which +A review is loaded with `load_guided_review`. luxe answers with `guided_review_loaded`, which carries the whole review (its `id`, `revision_id`, files, hunks and chapters), and then always `review_session_restored`, which carries its comments. Everything below names the review by its `id`. An action for a review that is no longer the open one is refused. @@ -4218,7 +4239,7 @@ goes in `edit`, beside `request_id` and `review_id`: as `review_session_saved` while it runs: the agent's answer to a question, and its report on a fix, are recorded on the comments. You can keep editing while it works. -Each comment's `thread` says who said what, by `author`: `reviewer`, `agent`, or `system` for Luxe's +Each comment's `thread` says who said what, by `author`: `reviewer`, `agent`, or `system` for luxe's own word. A fix turn that ends with no report on a comment leaves a `system` entry saying why, and the comment stays `open`. @@ -4239,7 +4260,7 @@ the comment stays `open`. | `prepare_thread_answers` | `{"request_id", "review_id"}` | Whether your fixes are pushed yet, on your own pull request; answered by `thread_answers_prepared` | | `answer_threads` | `{"request_id", "review_id", "answers": [{"finding_id", "reply", "resolve"}]}` | Reply to and resolve its threads, each named by the comment it became. **A GitHub write.** | -The `open_*` and `post_*` actions confirm a preview by its `request_id`. Luxe keeps what it +The `open_*` and `post_*` actions confirm a preview by its `request_id`. luxe keeps what it prepared, so you send back only what a person can change: a title, a description, a verdict. `post_pull_request_review` is refused if the comments changed after the `session_revision` you drew the preview from, so what posts is what you showed. A failed open or post can be confirmed again; @@ -4258,16 +4279,16 @@ These go through your own `gh`, as the interface's `/github` and `/pr` do. `repo | `read_github_conversation` | `{"number": 142, "pull_request": true}` | Everything said on it; answered by `github_conversation_read` | | `draft_github_reply` | `{"request_id": "…", "number": 142, "pull_request": true, "target": {…}, "conversation": […]}` | The agent drafts a reply in a turn that changes nothing; answered by `github_reply_drafted`. `target` and `conversation` are what `github_conversation_read` gave you. | | `check_pull_request_fix` | `{"number": 142}` | Whether it can be checked out here to fix; answered by `pull_request_fix_checked` | -| `plan_restack` | `{"request_id": "restack:…"}` | What restacking this branch's stack would do; answered by `restack_planned`. Luxe keeps the plan. | +| `plan_restack` | `{"request_id": "restack:…"}` | What restacking this branch's stack would do; answered by `restack_planned`. luxe keeps the plan. | | `check_worktree_removal` | | What the session's worktree has not committed; answered by `worktree_removal_checked` | -| `set_focus` | `{"focused": false}` | Whether your window has focus. Luxe checks GitHub less often while it does not. | +| `set_focus` | `{"focused": false}` | Whether your window has focus. luxe checks GitHub less often while it does not. | | `link_pull_request` | `{"number": 142, "url": "…"}` | Record that this session worked on that pull request | | `post_github_comment` | `{"number": 142, "thread": "PRRT_…", "body": "Fixed."}` | Post a reply in a thread, or a comment without `thread`; answered by `github_comment_posted`. **A GitHub write.** | | `change_pull_request` | `{"number": 142, "write": {"change": "mark_ready"}}` | `update_branch`, `mark_ready`, `merge`, `enable_auto_merge` or `disable_auto_merge`; answered by `pull_request_changed`. **A GitHub write.** | | `restack` | `{"request_id": "restack:…"}` | Push the plan `plan_restack` made under that id, exactly as planned; answered by `restacked` or `restack_failed`. **A GitHub write.** | -You confirm a restack by its id, not by sending the plan back: Luxe pushes the plan it showed you. A -newer `plan_restack` replaces the older plan, and a plan is pushed once. Before pushing, Luxe checks +You confirm a restack by its id, not by sending the plan back: luxe pushes the plan it showed you. A +newer `plan_restack` replaces the older plan, and a plan is pushed once. Before pushing, luxe checks that every moving branch here is where the plan saw it, checked out where it was, and clean, and refuses with `restack_failed` otherwise. A push that did not finish is also `restack_failed`, and its message says to check the branches on GitHub, since some may have moved. If the push succeeds @@ -4292,7 +4313,7 @@ There are around sixty. These are the ones a front end is built on: | `kind` | Is | | --- | --- | -| `ready` | The handshake: protocol version, Luxe version, session ID, directory | +| `ready` | The handshake: protocol version, luxe version, session ID, directory | | `token_delta`, `thinking_delta` | The reply and reasoning as they stream. `block` orders them. | | `tool_call_composing` | The model has started writing a tool call. Optional; useful for showing a `write` filling in. | | `tool_started`, `tool_progress`, `tool_completed`, `tool_ended` | A tool call's progress, by `call_id`. `tool_completed` carries its output. | @@ -4302,7 +4323,7 @@ There are around sixty. These are the ones a front end is built on: | `question_asked` | **Answer it** with `answer_question` | | `turn_started` | A turn began, from any client. It comes before the turn's message is saved, and `turn_ended` always follows. A client joining mid-turn gets it as part of catching up. | | `turn_ended` | The turn finished; `reason` says why | -| `provider_retrying` | The provider failed before answering, and Luxe is trying again | +| `provider_retrying` | The provider failed before answering, and luxe is trying again | | `state_changed` | Model, thinking level, mode, and whether a turn is running | | `plan_written` | Plan mode wrote `path`. The interface offers the plan's next step when the turn ends. | | `review_started`, `review_finished` | A requested review began on `model`, and came back with a `verdict` (`continue`, `fix` or `unavailable`) and `findings`. On `fix` the findings also become the agent's next turn. | @@ -4324,7 +4345,7 @@ Guided Review, as the interface sees it: | `guided_review_guide_updated` | Better chapters and a summary replaced the first ones, for the same pinned revision | | `review_session_restored` | The comments and progress that go with the review just loaded. It always follows `guided_review_loaded`, after a restart too. | | `open_review_shown` | The answer to `show_open_review`, under its `request_id`: the open `review` and its `session`, or neither when no review is open. `reading` says what each chapter asks of the reader: `needs_review` items, and the `reason` when one thing accounts for all of them. | -| `review_session_saved`, `review_session_save_failed` | A change to them was stored, or refused. Luxe reports its own changes this way too: a turn starting, the agent's report, a review posted. | +| `review_session_saved`, `review_session_save_failed` | A change to them was stored, or refused. luxe reports its own changes this way too: a turn starting, the agent's report, a review posted. | | `review_feedback_turn_dispatched`, `review_feedback_turn_completed`, `review_feedback_turn_failed` | Feedback you sent reaching the agent, and how its turn went | | `review_questions_answered`, `remediation_reported` | The agent's answer to a question, and its report on a fix | | `review_committed`, `review_commit_failed` | Committing a review's chapters | @@ -4366,7 +4387,7 @@ list is closed. - Nothing listens on the network. A [joined](#join-a-running-session) session takes connections on a local socket or pipe that only your user account can open, and turns away any program the agent itself started, so the agent can't answer its own prompts. -- Permission rules are enforced inside Luxe. A client cannot weaken a `deny`: reading `.env` is +- Permission rules are enforced inside luxe. A client cannot weaken a `deny`: reading `.env` is refused here as everywhere. - Prompts go to your client to answer. To approve everything, send `set_permission_auto_approve` or start with `--auto-approve`. `--on-ask` is refused, since your client can answer. @@ -4375,27 +4396,27 @@ list is closed. ### GitHub writes Your client can read GitHub without asking. To let it publish there (post a comment or a review, -answer threads, open, change, merge or restack a pull request), start Luxe with `--github-writes`. +answer threads, open, change, merge or restack a pull request), start luxe with `--github-writes`. Without it, those actions are refused with `action_rejected`, and `ready` says `"github_writes": false` so you can hide them. - **Read-only wins.** With `--read-only`, or a read-only mode in your permissions file, the writes are refused even with the flag, and so is `commit_review_chapters`. -- **It is a flag, not a setting.** Whoever starts Luxe decides, for that session. No config file +- **It is a flag, not a setting.** Whoever starts luxe decides, for that session. No config file turns it on, and a project cannot. - **It covers your client, not the agent.** The agent's own GitHub writes are permission rules: they ask first, and the prompt comes to your client. See [Security](security.md#when-you-step-away). -Luxe is not a sandbox. To isolate it, run it in a [container](security.md#isolation). +luxe is not a sandbox. To isolate it, run it in a [container](security.md#isolation). @@@ page: security --- title: "Security and permissions" -summary: "What the agent may do, the rules and prompts that decide it, secrets, and what Luxe sends over the network." +summary: "What the agent may do, the rules and prompts that decide it, secrets, and what luxe sends over the network." order: 1 group: "Reference" --- -The agent reads and writes files and runs commands on your machine. Luxe lets ordinary work through +The agent reads and writes files and runs commands on your machine. luxe lets ordinary work through without asking, keeps a few guardrails on at all times, and gives you rules to tighten the rest. For real isolation, run it in a [container](#isolation). @@ -4495,7 +4516,7 @@ open. They don't sandbox a language server, which can index other files and runs code. A project's `.luxe/permissions.json` can only make your rules stricter, never looser, unless you -start Luxe with `--trust-project`. +start luxe with `--trust-project`. ## The permission prompt @@ -4541,11 +4562,11 @@ which then sees the conversation and can answer its prompts. That makes who may question: - **Only your user account.** The socket sits in a folder only you can open, only you can use it, - and Luxe checks the account of whatever connects. On Windows the named pipe admits your account + and luxe checks the account of whatever connects. On Windows the named pipe admits your account alone, and refuses remote clients. Nothing listens on the network. - **Not the agent.** A program the agent started, at any depth, is turned away, so it can't - approve its own prompts. Luxe checks the joining process's ancestry. It can't see past a program + approve its own prompts. luxe checks the joining process's ancestry. It can't see past a program that detaches from its parent, such as one started with `setsid` and left running after its parent exits, so treat this as a tripwire, not a wall. A command that would do that should be something your rules ask about. @@ -4556,19 +4577,19 @@ Anything running as you can already read your sessions on disk and your credenti adds a way to steer, not a way to read. To turn it off, set [`joinable`](configuration.md#joining-a-session) to `false`. -## Luxe remote +## luxe remote -[`luxe remote`](remote.md) is the one part of Luxe that answers network requests, and it is off +[`luxe remote`](remote.md) is the one part of luxe that answers network requests, and it is off until you run it. It puts your sessions in reach of your phone, so it takes two things to get in: - **Your Tailscale login.** The bridge listens on this machine only (`127.0.0.1`) and refuses to listen anywhere else. Tailscale Serve carries it to your tailnet over HTTPS and adds the login of whoever is asking, replacing any the request brought. A request without one didn't come through - Serve and is refused, and so is a login other than yours or one you `--allow`. Luxe never uses + Serve and is refused, and so is a login other than yours or one you `--allow`. luxe never uses Tailscale Funnel, which would publish it to the internet. - **A paired device.** Any program on this machine can reach a local port and claim a login, so every session also needs the credential a device gets when it pairs. An invitation works once, - within ten minutes. Luxe keeps only a hash of each invitation and credential, in + within ten minutes. luxe keeps only a hash of each invitation and credential, in `~/.config/luxe/remote.json`. The device keeps its credential in a cookie scripts can't read, sent only over HTTPS and never with a request from another site; a request a page on another site makes is refused too. @@ -4582,28 +4603,28 @@ Notifications are off until you turn them on in the app, one device at a time, a answer anything: a notification says what is waiting and where, such as "Approve bash" over the folder's name, never the command, and answering takes the app. While any device has them on, the bridge joins each running session to watch for prompts. It joins watch-only: the terminal doesn't -announce it, and Luxe drops anything it sends, so a client nobody sees can't act. Each +announce it, and luxe drops anything it sends, so a client nobody sees can't act. Each notification is sealed so only that device can read it (RFC 8291) and posted to the push service the device's browser picked; the push service sees when, not what. The bridge posts only to Apple's, Google's, Mozilla's and Microsoft's push services, so a paired device can't aim it at anything else on your network. It signs with a key of its own, kept in `remote.json`, and revoking a device ends its notifications. -The bridge starts Luxe only in a folder a device asks for, as you, in a herdr pane when herdr is -already running and as its own `luxe --rpc` otherwise. A packager can build Luxe without the +The bridge starts luxe only in a folder a device asks for, as you, in a herdr pane when herdr is +already running and as its own `luxe --rpc` otherwise. A packager can build luxe without the `remote` feature, which leaves out the bridge entirely. -A session is open in one Luxe at a time. A second `luxe --resume` of a session the interface +A session is open in one luxe at a time. A second `luxe --resume` of a session the interface already has, or a resume from the session list, is refused and says which process has it. The lock is the operating system's, so a crash never leaves a session stuck. ## Secrets -- Credentials are stored in `~/.config/luxe/auth.json`, readable only by you. Luxe warns if +- Credentials are stored in `~/.config/luxe/auth.json`, readable only by you. luxe warns if `auth.json` or `models.json` can be read by others. - A key is found in this order: `--api-key` or `LUXE_API_KEY`, then what you signed in with, then the provider's own variable, then a provider block in `auth.json` or `models.json`. For a provider - Luxe does not know, the block comes before `OPENAI_API_KEY`. The order is the same for the + luxe does not know, the block comes before `OPENAI_API_KEY`. The order is the same for the provider a session starts on and for one you switch to in `/model`. - A key can be `$VAR` or `!command` rather than the value, so it never sits in a file. A command runs when a key is needed, so treat these files like your shell's startup file. It runs from your @@ -4611,7 +4632,7 @@ is the operating system's, so a crash never leaves a session stuck. needs a graphical prompt. - Anything that looks like a secret (API keys, tokens, private keys, passwords in URLs) is removed from tool output before the model, the transcript, hooks or the log see it. So is every key and - token Luxe itself has used or loaded, whatever it looks like, including `$VAR` and `!command` + token luxe itself has used or loaded, whatever it looks like, including `$VAR` and `!command` keys and MCP tokens, as long as it is at least 8 characters. - MCP sign-in tokens are kept in `~/.local/state/luxe/mcp-auth.json`, outside your config folder, so a dotfiles repository never carries them. @@ -4665,23 +4686,23 @@ Opening a repository should not run its code. So, without `--trust-project`: [Tools](tools.md#a-server-the-project-installed). Its `AGENTS.md` and skills, including the ones it commits in `.agents/skills/`, still reach the -model, because your own project's are the point of the feature. Luxe removes text a reviewer +model, because your own project's are the point of the feature. luxe removes text a reviewer cannot see, comments and invisible Unicode, and leaves out a file it cannot finish checking; see -[What Luxe removes](project-context.md#what-luxe-removes). Plain text is still instructions, so read +[What luxe removes](project-context.md#what-luxe-removes). Plain text is still instructions, so read an unfamiliar repository's `AGENTS.md` as you would its `Makefile`. Text from GitHub, such as issues and comments, is filtered the same way and given to the agent as someone else's words, not as instructions. So are MCP servers' descriptions and results. A language server can run project code itself: rust-analyzer runs `build.rs`. Treat opening a -repository in Luxe like building it. +repository in luxe like building it. -A repository the agent fetches with `web_fetch` is different: you never chose to open it. Luxe +A repository the agent fetches with `web_fetch` is different: you never chose to open it. luxe clones it into `.luxe/gh-cache/` with symbolic links flattened to plain files, and starts no language server or formatter there; see [Tools](tools.md#github-repositories). ### Isolation -Rules are a policy, not a sandbox. For hard isolation, run Luxe in a container that mounts only the +Rules are a policy, not a sandbox. For hard isolation, run luxe in a container that mounts only the project: ```bash @@ -4692,9 +4713,9 @@ docker run --rm -it -v "$PWD":/work -w /work -e ANTHROPIC_API_KEY ` | @@ -4782,7 +4803,7 @@ threshold. A price you set in `models.json` replaces the catalog's, tiers and al Anthropic keeps a cached prompt for five minutes after it was last read. A turn that waits longer than that, on a slow command, a permission prompt or a question, loses the cache, and the next request pays to write the whole conversation again: about $2 on a 400k-token Opus session. So while -a turn runs, Luxe re-sends its last request with a one-token reply just before the five minutes are +a turn runs, luxe re-sends its last request with a one-token reply just before the five minutes are up. That costs a cache read, a tenth of the write it saves. `agent.cache_warming` decides when: @@ -4794,7 +4815,7 @@ up. That costs a cache read, a tenth of the write it saves. | `off` | Never | A refresh goes out only when it is expected to save at least $0.05, so a short conversation is -never refreshed. Between turns Luxe cannot know you will reply, so `idle` refreshes only a large +never refreshed. Between turns luxe cannot know you will reply, so `idle` refreshes only a large conversation. On real sessions it lost money overall, which is why it is not the default. Refreshes are never sent on a subscription plan, or for an Anthropic model using a fixed thinking budget, whose cache would change on replay. Their cost shows under **cache warming** in `/cost`. @@ -4824,7 +4845,7 @@ more on every turn instead of on each pause. | tool schemas | The tools the agent can call | `tools.disabled`; see [Tools](tools.md) | | instructions | Your `AGENTS.md` files | A shorter file; see [Project context](project-context.md) | | skills | The list of skills the agent can load | Fewer, or shorter descriptions | -| harness | Luxe's own instructions | Nothing; this is fixed | +| harness | luxe's own instructions | Nothing; this is fixed | | appended | One-time context added to a resumed session, such as what changed while you were away | `/new` | The largest single items are named under a row, which is usually how you find a `read` or `bash` @@ -4832,7 +4853,7 @@ call that should have been narrower. The total is what the provider reported for ## Compaction -When a conversation fills 90% of the usable window, Luxe summarizes it and carries on, keeping the +When a conversation fills 90% of the usable window, luxe summarizes it and carries on, keeping the most recent part word for word. The summary records the goal, constraints, progress, decisions, next steps and the files the session touched. You see a line like `Compacted the conversation — 82k → 21k of context.` @@ -4841,7 +4862,7 @@ next steps and the files the session touched. You see a line like conversation that already fits in what `keep_recent` keeps has nothing to summarize, and `/compact` says so. -Before summarizing, from 80% full, Luxe first replaces old tool output in the request with a short +Before summarizing, from 80% full, luxe first replaces old tool output in the request with a short placeholder. The session file keeps everything; only what is sent changes. To change when and how it happens: @@ -4869,7 +4890,7 @@ To change when and how it happens: | `summarizer` | the session's model | The model that writes the summary, as `provider/id`, on a provider you have set up. A smaller, cheaper model is usually enough, and `/cost` prices its spend as it does any other model's. | This works in a project's `.luxe/config.json` too, and so does `agent.cache_warming`, which a project -can turn down but not up. The compaction settings in `/settings` apply the next time Luxe starts. +can turn down but not up. The compaction settings in `/settings` apply the next time luxe starts. ## Long command output @@ -4906,7 +4927,7 @@ One folder per skill, with a `SKILL.md` in it: | `.luxe/skills//` | This project. Git sees it too, since `.luxe/` keeps `skills/` out of what it ignores. | `.agents/skills/` is where Codex, OpenCode, Pi, GitHub Copilot and the `npx skills` installer put -skills, so one installed for any of them works here too. Luxe reads a repository's `.agents/skills/` +skills, so one installed for any of them works here too. luxe reads a repository's `.agents/skills/` from the top of the repository down to the project. When two skills share a name, whatever its case, the one lower in the table wins, so a project's skill replaces your own, and between nested `.agents/skills/` folders the deeper one wins. A skill reached twice through a symbolic link counts @@ -4939,8 +4960,8 @@ with a note telling the agent to read the rest of the file. The agent loads a skill when its description fits the task. To ask for one yourself, mention it: `@`, `tab` to **Skills**, and `enter`, as in *split this into a stack with @[skill:gh-stack]*. -**Project context** lists the skills Luxe found: type `skills` on the start screen and open it. A -`SKILL.md` placed directly in `skills/`, without its own folder, is skipped, and Luxe names it at +**Project context** lists the skills luxe found: type `skills` on the start screen and open it. A +`SKILL.md` placed directly in `skills/`, without its own folder, is skipped, and luxe names it at startup. The list in the agent's instructions is read with a session's first message, and again when you resume one. The `@` picker and the `skill` tool look again every time, so a skill added mid-session can be mentioned or loaded at once. @@ -4961,7 +4982,7 @@ itself, one level too high. A skill's text reaches the model as instructions, so read a skill before installing it, as you would a script. The same goes for a repository you clone: its `.agents/skills/` and -`.luxe/skills/` reach the model without `--trust-project`. Luxe removes comments and invisible +`.luxe/skills/` reach the model without `--trust-project`. luxe removes comments and invisible characters from skill files, as it does from [`AGENTS.md`](project-context.md#what-luxe-removes), but without a notice. @@@ page: tools @@ -4969,7 +4990,7 @@ but without a notice. title: "Tools" summary: "What the agent can use: files, the shell, tests, Git, code intelligence, a debugger and the web." order: 10 -group: "Using Luxe" +group: "Using luxe" --- ## What the agent can use @@ -5017,7 +5038,7 @@ the file: { "tools": { "disabled": ["web_search", "screenshot"] } } ``` -A change applies the next time Luxe starts, since the tools the agent is offered are fixed for a +A change applies the next time luxe starts, since the tools the agent is offered are fixed for a run. For one session, `luxe --no-tool web_search` turns a tool off and `luxe --with-tool web_search` @@ -5038,7 +5059,7 @@ their config, in the file's directory or one above it: | TypeScript, JavaScript | biome | `biome.json` or `biome.jsonc` | | TOML | taplo | `taplo.toml` or `.taplo.toml` | -A formatter that is not installed is skipped. When Luxe pipes a file through one (taplo), an empty +A formatter that is not installed is skipped. When luxe pipes a file through one (taplo), an empty answer, or a file that changed again while it ran, leaves the file as it was. To turn formatting off: @@ -5059,12 +5080,12 @@ reported as having had no effect; one stopped partway says so, since it may have A command that starts something and leaves it running, such as a dev server, returns when the command itself ends. The server keeps running. -Tools work from the directory Luxe was started in. A `cd` inside one `bash` call does not carry over -to the next, so start Luxe in the project you want to work on. +Tools work from the directory luxe was started in. A `cd` inside one `bash` call does not carry over +to the next, so start luxe in the project you want to work on. ## Code intelligence -After every edit, Luxe asks the file's language server for errors and warnings and adds the ones +After every edit, luxe asks the file's language server for errors and warnings and adds the ones the edit introduced to the result the agent sees, so it can fix what it broke before moving on. Problems that were already in the file are counted, not listed. The result also names changed code that no test covers. Set `LUXE_LSP_ON_EDIT=0` to turn both off. @@ -5075,7 +5096,7 @@ while the change is fresh. A file that was already long says nothing more. Funct in Rust, Python, Go, TypeScript and JavaScript; files in any language. Set `LUXE_SIZE_CHECK=0` to turn this off, for a project whose own conventions differ. -Luxe launches these language servers when they are installed: +luxe launches these language servers when they are installed: | Language | Server | Install | | --- | --- | --- | @@ -5096,13 +5117,13 @@ anywhere else, or inside a [fetched repository](#github-repositories), is refuse every file is written or none is, and the result says which edits didn't fit their file and which file operations, such as creating or renaming one, it left undone. -`/lsp` shows which servers are running, and `luxe doctor` starts each one to check it works. Luxe +`/lsp` shows which servers are running, and `luxe doctor` starts each one to check it works. luxe never installs a server itself. When one is missing, the result tells the agent the command that installs it, which runs through `bash` under your rules like any other. ### A server the project installed -Luxe prefers the copy a project installed for itself, in its `node_modules/.bin` or virtual +luxe prefers the copy a project installed for itself, in its `node_modules/.bin` or virtual environment, since that version matches the project. The same goes for formatters such as `ruff` and `biome`, and for MCP servers a project declares. Runs with nobody watching, such as `--headless` and the loop, use only what you installed yourself unless you pass `--trust-project`. @@ -5132,14 +5153,14 @@ use a container rather than relying on this setting. } ``` -An entry for a language Luxe already knows changes only what it names, so +An entry for a language luxe already knows changes only what it names, so `{ "rust": { "command": "rust-analyzer-nightly" } }` swaps the binary and keeps the rest. `alternatives` lists other servers to try, in order, when the first will not start. ## Debugger The `debug` tool drives a real debugger, so the agent can set breakpoints, step through code and -inspect variables rather than add print statements. After three failing test runs in a row, Luxe +inspect variables rather than add print statements. After three failing test runs in a row, luxe suggests it. `LUXE_DEBUG_NUDGE=0` turns that suggestion off. | Language | Adapter | @@ -5163,9 +5184,9 @@ with `lldb-dap`: ] ``` -`transport` is `stdio` (the default) or `tcp_dial_in`, for an adapter that connects back to Luxe: +`transport` is `stdio` (the default) or `tcp_dial_in`, for an adapter that connects back to luxe: put `${DAP_ADDR}` in its `command` where it takes the address, as Delve's -`dlv dap --client-addr ${DAP_ADDR}` does, and Luxe replaces it with `host:port`. +`dlv dap --client-addr ${DAP_ADDR}` does, and luxe replaces it with `host:port`. `addr_placeholder` names a different placeholder. A breakpoint the adapter could not set is listed under the launch, with the adapter's reason. An @@ -5192,7 +5213,7 @@ server works. Other machines on your network, cloud metadata addresses and `file including through an IPv6 address that carries one of them. A page elsewhere can't redirect a fetch to your machine, and a fetch reads at most 10 MB. `screenshot` loads only the host you asked for, so a redirect, frame or image from any other host fails to load, and it runs the browser on a fresh -profile, sandboxed unless Luxe runs as root or in a container. `LUXE_WEB_ALLOW_PRIVATE=1` lifts the +profile, sandboxed unless luxe runs as root or in a container. `LUXE_WEB_ALLOW_PRIVATE=1` lifts the address checks, allows `file://` in `screenshot`, and lets it load other hosts. A fetch gives up after 30 seconds, or `LUXE_WEB_TIMEOUT_SECS`, within the call's 60-second limit. @@ -5206,7 +5227,7 @@ of reading the page, so the agent can search the real files. The clone is shallo only, and goes into `.luxe/gh-cache/owner/repo` in your project, which git ignores. Reading it never asks permission, because it is inside the project. -A repository you did not write sits inside one you did, so Luxe keeps it inert: +A repository you did not write sits inside one you did, so luxe keeps it inert: - Symbolic links are checked out as plain files holding the link's target. A link cannot point the agent at your `.env`, or anywhere else outside the clone. @@ -5230,7 +5251,7 @@ other page from the web. To read repositories as web pages instead: @@@ page: troubleshooting --- title: "Troubleshooting" -summary: "Common problems, where Luxe logs, and what to include in a bug report." +summary: "Common problems, where luxe logs, and what to include in a bug report." order: 4 group: "Reference" --- @@ -5241,23 +5262,23 @@ group: "Reference" luxe doctor ``` -It lists the tools, language servers and debug adapters Luxe found, starts each language server to +It lists the tools, language servers and debug adapters luxe found, starts each language server to check that it works, and shows how to install or fix what does not. ## Common problems | Problem | Fix | | --- | --- | -| **No model selected**, or `--headless` refuses to start | Choose one with `/model`, or pass `--model provider/id`. Luxe never picks one for you. | +| **No model selected**, or `--headless` refuses to start | Choose one with `/model`, or pass `--model provider/id`. luxe never picks one for you. | | The model picker is empty | No provider is set up. Open **Configuration** (`c`), or set a provider's key in the environment. | | A provider keeps failing with `retrying (3/3)` | It is overloaded or unreachable. See [When a provider stalls](providers.md#when-a-provider-stalls) for the time limits. | -| A setting does nothing | Luxe ignores keys it does not know, so check the spelling. `luxe init` and `/settings` write a `config.schema.json` your editor can check against. A project's file cannot change some settings; see [Configuration](configuration.md#what-a-project-cannot-change). | +| A setting does nothing | luxe ignores keys it does not know, so check the spelling. `luxe init` and `/settings` write a `config.schema.json` your editor can check against. A project's file cannot change some settings; see [Configuration](configuration.md#what-a-project-cannot-change). | | Icons show as boxes, or sit flush against their words | See [Fonts](install.md#fonts), and the `glyphs` setting in [Appearance](appearance.md#icons-and-fonts). | | Your terminal's copy key does nothing | The terminal keeps it. Hold `shift` while dragging, or let the key pass through; see [Mouse and clipboard](interface.md#mouse-and-clipboard). | | Images do not appear | Your terminal may not draw them. `/images` says why; see [Images](appearance.md#images). | | A language server is not used | `luxe doctor` says whether it starts. A server a project installed is used only when you are watching; see [Tools](tools.md#a-server-the-project-installed). | | A project's hooks or MCP servers do not run | They need `--trust-project`, or an interactive session for MCP servers. See [Security](security.md#untrusted-repositories). | -| Luxe opened the wrong folder as the project | Inside a repository, a `.luxe/` between you and its top scopes the project there. Remove it, or start Luxe somewhere else. See [Where the project begins](project-context.md#where-the-project-begins). | +| luxe opened the wrong folder as the project | Inside a repository, a `.luxe/` between you and its top scopes the project there. Remove it, or start luxe somewhere else. See [Where the project begins](project-context.md#where-the-project-begins). | | `/pr` or `/github` says GitHub is unavailable | Install the GitHub CLI and sign in: `gh auth login`. A private repository also needs `gh auth setup-git`. | | A key binding does not work | Your terminal may not send that key. Rebind it; see [Commands and keys](commands.md#rebind-keys). | | On a Mac, some `alt` keys type a character such as `ø` or `π` | Your terminal treats Option as a key that types characters. Set it to act as Alt; see [Alt keys on a Mac](commands.md#alt-keys-on-a-mac). | @@ -5268,9 +5289,9 @@ A session logs to `.luxe/logs/luxe.log` in the project. Commands that only repor `luxe auth`, `luxe doctor` and `luxe models`, log to `logs/luxe.log` in the state directory: `~/.local/state/luxe/` (`%LOCALAPPDATA%\luxe\` on Windows), or wherever `LUXE_STATE_DIR` or `XDG_STATE_HOME` puts it. On macOS and Linux, a log is readable only by you. One past 5 MB is moved -to `luxe.log.1` the next time Luxe starts, replacing the one before. +to `luxe.log.1` the next time luxe starts, replacing the one before. -The log shows Luxe's own activity at `info` and everything else at `warn`. For more: +The log shows luxe's own activity at `info` and everything else at `warn`. For more: ```bash LUXE_LOG=debug luxe # everything @@ -5279,7 +5300,7 @@ LUXE_LOG=luxe_core::hooks=debug luxe # one part, in detail ## See what is sent to the model -`LUXE_WIRE_LOG` records every request Luxe sends and every reply, with credentials removed. +`LUXE_WIRE_LOG` records every request luxe sends and every reply, with credentials removed. `luxe wire` summarizes it: what fills each request, whether the cached part stays the same between turns, and whether anything is sent twice. @@ -5300,7 +5321,7 @@ Open an issue at [github.com/evanwhittaker/luxe](https://github.com/evanwhittake - The relevant part of `.luxe/logs/luxe.log` If the interface itself draws wrongly, such as stray characters or a half-drawn screen, record the -raw output, which shows what Luxe actually wrote: +raw output, which shows what luxe actually wrote: ```bash script -f /tmp/luxe.tty -c luxe # replay with `cat` or `scriptreplay` diff --git a/crates/luxe-cli/src/guide_check.rs b/crates/luxe-cli/src/guide_check.rs index d0fc87a..a2434b6 100644 --- a/crates/luxe-cli/src/guide_check.rs +++ b/crates/luxe-cli/src/guide_check.rs @@ -1,9 +1,9 @@ //! Guide check — the user guide's config examples, flags and slash commands, held against the code. //! -//! `docs/guide/` is what a user copies from and what an agent follows. Luxe ignores a config key it -//! does not know, on purpose, so an old config loads on a new Luxe; the cost is that a misspelled +//! `docs/guide/` is what a user copies from and what an agent follows. luxe ignores a config key it +//! does not know, on purpose, so an old config loads on a new luxe; the cost is that a misspelled //! or invented key in the docs loads too, and does nothing. These tests load every example the -//! guide names a file for as that file, and fail on anything Luxe would ignore. +//! guide names a file for as that file, and fail on anything luxe would ignore. //! //! A code block opts in by naming its file in the fence, ` ```json title="config.json" `, which is //! also what the site shows above the block. `scripts/docs-check.py` covers links and voice. @@ -76,7 +76,7 @@ fn blocks(page: &str, text: &str) -> Vec { blocks } -/// The keys Luxe would ignore reading `text` as `T`, as paths like `dock.mode`. +/// The keys luxe would ignore reading `text` as `T`, as paths like `dock.mode`. fn ignored(text: &str) -> Result, String> { let value: serde_json::Value = serde_json::from_str(text).map_err(|error| error.to_string())?; let mut paths = Vec::new(); @@ -85,7 +85,7 @@ fn ignored(text: &str) -> Result, String> { Ok(paths) } -/// The keys Luxe would ignore in an `auth.json`: every top-level key is a provider's credential, +/// The keys luxe would ignore in an `auth.json`: every top-level key is a provider's credential, /// except the configuration keys it shares with `models.json`. fn auth_file(text: &str) -> Result, String> { const CONFIGURATION: &[&str] = @@ -153,7 +153,7 @@ fn check_file(title: &str, text: &str) -> Result<(), String> { if unknown.is_empty() { Ok(()) } else { - Err(format!("Luxe would ignore {}", unknown.join(", "))) + Err(format!("luxe would ignore {}", unknown.join(", "))) } } @@ -174,7 +174,7 @@ fn every_named_config_example_loads() { } assert!( failures.is_empty(), - "config examples Luxe would not read as written:\n{}", + "config examples luxe would not read as written:\n{}", failures.join("\n") ); } @@ -235,7 +235,7 @@ fn shell_words(line: &str) -> Vec { words } -/// What is wrong with a `luxe …` command line, if anything: a flag or subcommand Luxe lacks. +/// What is wrong with a `luxe …` command line, if anything: a flag or subcommand luxe lacks. fn check_command_line(root: &clap::Command, line: &str) -> Result<(), String> { let mut path: Vec<&clap::Command> = vec![root]; let words = shell_words(line); @@ -286,14 +286,14 @@ fn every_command_line_in_the_guide_exists() { } } } - assert!(failures.is_empty(), "command lines Luxe would refuse:\n{}", failures.join("\n")); + assert!(failures.is_empty(), "command lines luxe would refuse:\n{}", failures.join("\n")); } /// Paths that look like a slash command in a code span. const NOT_COMMANDS: &[&str] = &["/tmp", "/etc", "/usr", "/dev", "/home", "/var", "/opt", "/bin", "/proc"]; -/// Every slash command the guide names is one Luxe has. +/// Every slash command the guide names is one luxe has. #[test] fn every_slash_command_in_the_guide_exists() { let registry = luxe_tui::commands::CommandRegistry::all(); @@ -329,10 +329,10 @@ fn every_slash_command_in_the_guide_exists() { } } } - assert!(failures.is_empty(), "slash commands Luxe does not have:\n{}", failures.join("\n")); + assert!(failures.is_empty(), "slash commands luxe does not have:\n{}", failures.join("\n")); } -/// The command reference lists every slash command Luxe has, and every key it binds by default, so a +/// The command reference lists every slash command luxe has, and every key it binds by default, so a /// new command or binding cannot ship undocumented. #[test] fn the_command_reference_is_complete() { @@ -350,7 +350,7 @@ fn the_command_reference_is_complete() { assert!(missing.is_empty(), "commands.md does not mention:\n{}", missing.join("\n")); } -/// The configuration reference names every key `config.json` takes, from the schema Luxe writes +/// The configuration reference names every key `config.json` takes, from the schema luxe writes /// beside it, so a new setting cannot ship undocumented. #[test] fn the_configuration_reference_is_complete() { diff --git a/crates/luxe-cli/src/logging.rs b/crates/luxe-cli/src/logging.rs index ca266df..aa0924a 100644 --- a/crates/luxe-cli/src/logging.rs +++ b/crates/luxe-cli/src/logging.rs @@ -11,7 +11,7 @@ //! ranks a directory holding one above a nearer checkout, so a stray left in `/tmp` re-roots every //! repository beneath it. //! -//! Level is controlled by `LUXE_LOG` (or `RUST_LOG`). The default is `info` for Luxe's own crates +//! Level is controlled by `LUXE_LOG` (or `RUST_LOG`). The default is `info` for luxe's own crates //! and `warn` for everything else — a normal run leaves a readable account of what the agent did, //! without `hyper` and `rustls` narrating every socket. Init is best-effort: logging must never //! crash or block the app. @@ -54,7 +54,7 @@ impl<'a> MakeWriter<'a> for RedactingFile { } } -/// Luxe's own crates, which is what the default filter turns up. +/// luxe's own crates, which is what the default filter turns up. /// /// Spelled out rather than matched by prefix because `EnvFilter` has no glob for a target prefix, and /// a filter that quietly matched nothing would look exactly like a quiet run. @@ -69,7 +69,7 @@ const LUXE_TARGETS: [&str; 8] = [ "luxe_tools", ]; -/// The default filter: Luxe at `info`, everything else at `warn`. +/// The default filter: luxe at `info`, everything else at `warn`. /// /// Two things have to be true at once. A normal run should leave an account someone can read — which /// `warn` did not, and which is why routine loop behavior had drifted up to `warn!` just to be @@ -167,22 +167,22 @@ fn open_log(dir: &Path, rotate_at: u64) -> io::Result<(File, Option)> #[cfg(unix)] std::os::unix::fs::OpenOptionsExt::mode(&mut options, 0o600); let file = options.open(&path)?; - // a log an older Luxe created at the umask's default is tightened too + // a log an older luxe created at the umask's default is tightened too #[cfg(unix)] file.set_permissions(std::os::unix::fs::PermissionsExt::from_mode(0o600))?; Ok((file, rotated)) } -/// Drop a self-ignoring `.gitignore` into `.luxe/`, and upgrade one Luxe wrote itself. +/// Drop a self-ignoring `.gitignore` into `.luxe/`, and upgrade one luxe wrote itself. /// -/// The directory ignores itself (the trick pytest/ruff/venv use), so running Luxe inside any repo +/// The directory ignores itself (the trick pytest/ruff/venv use), so running luxe inside any repo /// needs no root-`.gitignore` edit or global git config. The rule is an *allowlist*: everything is /// machine-local by default (`*` — sessions, logs, caches, review memory, per-user UI prefs), with /// explicit exceptions for the handful of project-config files a team may want to version /// (`permissions.json`, `mcp.json`, `hooks.json`, `skills/`). Ignoring by default is the safe -/// direction: a new artifact kind Luxe writes later stays out of git until someone opts it in. +/// direction: a new artifact kind luxe writes later stays out of git until someone opts it in. /// -/// A file Luxe did not author is never touched, so a user's own curation survives. +/// A file luxe did not author is never touched, so a user's own curation survives. fn ensure_self_ignored(luxe_dir: &Path) { let ignore = luxe_dir.join(".gitignore"); match std::fs::read_to_string(&ignore) { @@ -219,7 +219,7 @@ const SELF_IGNORE_BODY: &str = "\ # and luxe keeps it out of its own reviews and changes lists for the same reason. * -# Exceptions: project config you may want to version and share. Luxe rewrites +# Exceptions: project config you may want to version and share. luxe rewrites # this file while its first line says it made it; to choose for yourself, replace # the file, first line included, with your own. !permissions.json diff --git a/crates/luxe-cli/src/logging/tests.rs b/crates/luxe-cli/src/logging/tests.rs index 21c4887..930e3c0 100644 --- a/crates/luxe-cli/src/logging/tests.rs +++ b/crates/luxe-cli/src/logging/tests.rs @@ -1,9 +1,9 @@ use super::*; use std::io::Write; -/// Luxe's own crates are visible at `info`, and dependencies are not. +/// luxe's own crates are visible at `info`, and dependencies are not. /// -/// The break this catches is the one that shipped: with a bare `warn` default, nothing Luxe +/// The break this catches is the one that shipped: with a bare `warn` default, nothing luxe /// logged at `info` was ever seen, so routine loop behavior drifted up to `warn!` just to be /// visible — an ordinary steer arrived labeled as a warning. Widening it to `info` for /// everything instead would swap that for a firehose, because `hyper` and `rustls` narrate every @@ -46,7 +46,7 @@ fn the_default_filter_shows_luxe_at_info_and_nothing_else() { let seen = seen.lock().expect("not poisoned").clone(); assert!( seen.contains(&"luxe_core@INFO".to_string()), - "Luxe's own routine logging must be visible: {seen:?}" + "luxe's own routine logging must be visible: {seen:?}" ); assert!(!seen.contains(&"luxe_core@DEBUG".to_string()), "debug stays opt-in: {seen:?}"); assert!( @@ -153,7 +153,7 @@ fn self_ignore_hides_the_whole_directory_and_never_clobbers() { } /// A log holds what the agent read and ran, so a new one is readable by its owner only, and one an -/// older Luxe left at the umask's default is tightened when it is next opened. +/// older luxe left at the umask's default is tightened when it is next opened. #[cfg(unix)] #[test] fn a_log_file_is_owner_only() { diff --git a/crates/luxe-cli/src/loop_run.rs b/crates/luxe-cli/src/loop_run.rs index fc71dbf..218df60 100644 --- a/crates/luxe-cli/src/loop_run.rs +++ b/crates/luxe-cli/src/loop_run.rs @@ -179,7 +179,7 @@ mod tests { external_work: None, review_context_files: Vec::new(), review_exclude: Vec::new(), - remember_runtime_state: false, + remember_choices_in: None, cache_warming: luxe_core::cache_warming::CacheWarming::Off, review_insight_provider: None, github: None, @@ -197,7 +197,7 @@ mod tests { event_rx, running_rx, "Continue building.".into(), - crate::loop_view::LoopView::new(true), + crate::loop_view::LoopView::new(true, 0), ) .await }); diff --git a/crates/luxe-cli/src/loop_view.rs b/crates/luxe-cli/src/loop_view.rs index db6e5bc..c4abd79 100644 --- a/crates/luxe-cli/src/loop_view.rs +++ b/crates/luxe-cli/src/loop_view.rs @@ -14,12 +14,20 @@ //! Timed from the run's own start rather than the wall clock. "Twenty minutes in and still on //! phase 0" is the shape of the question being asked, and the absolute time is in the log for //! anything forensic. +//! +//! Each line is led by guides for the phase and iteration it belongs to ([`paint`]), and a tool +//! call's line takes the color of its result once it has one ([`screen`]). -use crate::output::outln; +mod paint; +mod screen; + +use paint::{CallState, Depth, Edge, Paint}; +use screen::{Printed, Screen}; use std::collections::HashMap; use std::time::Instant; use luxe_core::event::Event; +use luxe_core::hooks::self_continuation::parse_iteration_notice; use luxe_core::message::{ContentBlock, Role}; /// Longest assistant line echoed into the view. @@ -43,16 +51,47 @@ pub(crate) struct LoopView { tools_this_turn: usize, /// When the turn now running began. turn_started: Option, + /// The phase the run is on, once known + phase: Option, + /// Whether an iteration's rail is open + in_iteration: bool, + /// The phase the run started on, until its first turn opens it: no iteration notice does + start_phase: Option, + /// Calls that have started and not ended, with their line and what it said + running: HashMap, + paint: Paint, + screen: Screen, +} + +/// A started call's line, kept to redraw it with the result. +struct RunningCall { + printed: Printed, + /// When in the run it was printed, so the redraw keeps its time + at: std::time::Duration, + name: String, + label: String, + depth: Depth, } impl LoopView { - pub(crate) fn new(quiet: bool) -> Self { + /// A view for a run starting on `phase`, in color on a terminal. + pub(crate) fn new(quiet: bool, phase: u32) -> Self { + Self::with(quiet, Some(phase), Paint::detect(), Screen::detect()) + } + + fn with(quiet: bool, start_phase: Option, paint: Paint, screen: Screen) -> Self { Self { quiet, started: Instant::now(), labels: HashMap::new(), tools_this_turn: 0, turn_started: None, + phase: None, + in_iteration: false, + start_phase, + running: HashMap::new(), + paint, + screen, } } @@ -64,9 +103,14 @@ impl LoopView { match event { // A hook talking: the phase moved, the gate refused, the run is blocked. These are the // lines the whole view exists for. - Event::Notice(message) => self.line("", message), + Event::Notice(message) => match parse_iteration_notice(message) { + Some((iteration, phase)) => { + self.open_iteration(phase, &format!("iteration {iteration}")) + } + None => self.note(message), + }, Event::ProviderRetrying { attempt, attempts, reason } => { - self.line("", &format!("retrying ({attempt}/{attempts}): {reason}")); + self.note(&format!("retrying ({attempt}/{attempts}): {reason}")); } // Only the assistant's. The steer that opens each iteration and the gate's refusals // arrive as user messages the engine wrote to itself, and the notices above already @@ -78,7 +122,8 @@ impl LoopView { for block in &message.content { match block { ContentBlock::Text(text) if !text.trim().is_empty() => { - self.line("· ", &bounded(first_line(text), MAX_SAID)); + let said = format!("· {}", bounded(first_line(text), MAX_SAID)); + self.within(&said); } ContentBlock::ToolCall { id, name, arguments } => { let label = luxe_core::describe_call( @@ -92,49 +137,114 @@ impl LoopView { } } } - Event::ToolStarted { call_id, name } => { - if luxe_core::activity::is_bookkeeping(name) { - return; - } - self.tools_this_turn += 1; - match self.labels.get(call_id) { - Some(label) if !label.is_empty() => self.line(" ", &format!("{name} {label}")), - _ => self.line(" ", name), - } - } - Event::ToolEnded { call_id, is_error } if *is_error => { - let label = self.labels.get(call_id).cloned().unwrap_or_default(); - self.line(" ", format!("failed: {label}").trim_end()); - } - Event::CompactionDone { tokens_before, tokens_after } => self.line( - "", - &format!("compacted {} → {}", thousands(*tokens_before), thousands(*tokens_after)), - ), - Event::Error(message) => self.line("", &format!("error: {}", first_line(message))), - Event::TurnEnded { reason } => { - let took = self.turn_started.take().map(|at| at.elapsed()).unwrap_or_default(); - let tools = std::mem::take(&mut self.tools_this_turn); - self.labels.clear(); - let ended = match reason { - // Every ordinary ending says the same thing; the interesting ones name - // themselves — a runaway guard, a cancel, a turn that failed. - luxe_core::StopReason::EndTurn => "turn ended".to_string(), - other => format!("turn ended: {other:?}"), - }; - self.line("", &format!("{ended} · {tools} tools · {}", duration(took))); - } + Event::ToolStarted { call_id, name } => self.tool_started(call_id, name), + Event::ToolEnded { call_id, is_error } => self.tool_ended(call_id, *is_error), + Event::CompactionDone { tokens_before, tokens_after } => self.note(&format!( + "compacted {} → {}", + thousands(*tokens_before), + thousands(*tokens_after) + )), + Event::Error(message) => self.note(&format!("error: {}", first_line(message))), + Event::TurnEnded { reason } => self.turn_ended(reason), _ => {} } } - /// Note that a turn has begun, so the line closing it can say how long it took. + /// Note that a turn has begun, so the line closing it can say how long it took. The run's + /// first turn opens its phase here, since no iteration notice comes before it. pub(crate) fn turn_started(&mut self) { self.turn_started = Some(Instant::now()); + if self.quiet { + return; + } + if let Some(phase) = self.start_phase.take() { + self.open_iteration(phase, "start"); + } } - /// One line: how long the run has been going, then what happened. - fn line(&self, indent: &str, message: &str) { - outln!("{:>9} {indent}{message}", duration(self.started.elapsed())); + fn tool_started(&mut self, call_id: &str, name: &str) { + if luxe_core::activity::is_bookkeeping(name) { + return; + } + self.tools_this_turn += 1; + let label = self.labels.get(call_id).cloned().unwrap_or_default(); + let depth = self.body_depth(); + let at = self.started.elapsed(); + let printed = self.print(depth, &self.paint.tool(name, &label, CallState::Running)); + let call = RunningCall { printed, at, name: name.to_string(), label, depth }; + self.running.insert(call_id.to_string(), call); + } + + /// Redraws the call's line in its result's color. Where it can't be redrawn, a failure gets a + /// line of its own and a success needs none. + fn tool_ended(&mut self, call_id: &str, is_error: bool) { + let Some(call) = self.running.remove(call_id) else { return }; + let state = if is_error { CallState::Failed } else { CallState::Succeeded }; + let line = self.paint.tool(&call.name, &call.label, state); + let stamped = self.stamped(call.at, call.depth, &line); + let redrawn = self.paint.in_color() && self.screen.rewrite(call.printed, &stamped); + if !redrawn && is_error { + self.print(self.body_depth(), &line); + } + } + + fn turn_ended(&mut self, reason: &luxe_core::StopReason) { + let took = self.turn_started.take().map(|at| at.elapsed()).unwrap_or_default(); + let tools = std::mem::take(&mut self.tools_this_turn); + self.labels.clear(); + self.running.clear(); + let ended = match reason { + // Every ordinary ending says the same thing; the interesting ones name + // themselves — a runaway guard, a cancel, a turn that failed. + luxe_core::StopReason::EndTurn => "turn ended".to_string(), + other => format!("turn ended: {other:?}"), + }; + let summary = self.paint.dim(&format!("{ended} · {tools} tools · {}", duration(took))); + let depth = match (self.phase, self.in_iteration) { + (Some(phase), true) => Depth::Iteration(phase, Edge::Close), + _ => self.body_depth(), + }; + self.in_iteration = false; + self.print(depth, &summary); + } + + /// Opens an iteration, under a heading first when it starts a new phase. + fn open_iteration(&mut self, phase: u32, label: &str) { + if self.phase != Some(phase) { + self.print(Depth::Phase(phase), &self.paint.phase_heading(phase)); + self.phase = Some(phase); + } + self.in_iteration = true; + self.print(Depth::Iteration(phase, Edge::Open), label); + } + + /// A line inside whatever is open. + fn within(&mut self, text: &str) { + self.print(self.body_depth(), text); + } + + /// A hook's or the engine's notice: inside the iteration when one is open. + fn note(&mut self, text: &str) { + self.within(text); + } + + /// The depth a body line sits at now. + fn body_depth(&self) -> Depth { + match (self.phase, self.in_iteration) { + (Some(phase), true) => Depth::Iteration(phase, Edge::Within), + (Some(phase), false) => Depth::Phase(phase), + (None, _) => Depth::Run, + } + } + + /// One line: how long the run has been going, the guides, then what happened. + fn print(&mut self, depth: Depth, text: &str) -> Printed { + let line = self.stamped(self.started.elapsed(), depth, text); + self.screen.print(&line) + } + + fn stamped(&self, elapsed: std::time::Duration, depth: Depth, text: &str) -> String { + format!("{:>9} {}{text}", duration(elapsed), self.paint.guides(depth)) } } @@ -218,7 +328,7 @@ mod tests { /// still built labels would be a memory cost for output nobody asked for. #[test] fn a_quiet_view_does_not_even_look() { - let mut view = LoopView::new(true); + let mut view = recording(true); view.observe(&Event::MessageCommitted { session_id: "s".into(), entry_id: luxe_core::session::EntryId::new(), @@ -232,7 +342,7 @@ mod tests { /// A turn's tool count belongs to that turn, and starts again with the next one. #[test] fn each_turn_counts_its_own_tools() { - let mut view = LoopView::new(false); + let mut view = recording(false); view.turn_started(); view.observe(&Event::ToolStarted { call_id: "a".into(), name: "read".into() }); view.observe(&Event::ToolStarted { call_id: "b".into(), name: "edit".into() }); @@ -243,14 +353,83 @@ mod tests { assert!(view.labels.is_empty(), "and does not inherit the last turn's labels"); } - /// Luxe's own bookkeeping is not work anyone asked to watch. + /// luxe's own bookkeeping is not work anyone asked to watch. #[test] fn activating_a_tool_is_not_a_step_worth_a_line() { - let mut view = LoopView::new(false); + let mut view = recording(false); view.observe(&Event::ToolStarted { call_id: "c".into(), name: luxe_core::tool::ACTIVATE_TOOLS_NAME.into(), }); assert_eq!(view.tools_this_turn, 0); } + + /// A plain view of a run starting on phase 0, its lines kept. + fn recording(quiet: bool) -> LoopView { + LoopView::with(quiet, Some(0), Paint::plain(), Screen::recording()) + } + + /// What the view printed, past the time column. + fn printed(view: &LoopView) -> Vec { + view.screen.lines().iter().map(|line| line[11..].to_string()).collect() + } + + fn notice(text: &str) -> Event { + Event::Notice(text.into()) + } + + fn ended(view: &mut LoopView, call_id: &str, is_error: bool) { + view.observe(&Event::ToolEnded { call_id: call_id.into(), is_error }); + } + + /// The first turn opens its phase and iteration itself; the turn's end closes the iteration. + #[test] + fn the_first_turn_is_bracketed_under_its_phase() { + let mut view = recording(false); + view.turn_started(); + view.observe(&Event::ToolStarted { call_id: "a".into(), name: "read".into() }); + view.observe(&Event::TurnEnded { reason: luxe_core::StopReason::EndTurn }); + let lines = printed(&view); + assert_eq!(lines[..3], ["┃ phase 0", "┃ ┌ start", "┃ │ ○ read"], "{lines:?}"); + assert!(lines[3].starts_with("┃ └ turn ended · 1 tools"), "{lines:?}"); + } + + /// An iteration in the same phase opens without a heading; a new phase gets one first. + #[test] + fn a_new_phase_gets_a_heading_and_the_same_phase_does_not() { + let mut view = recording(false); + view.turn_started(); + view.observe(¬ice("iteration 2 · phase 0")); + view.observe(¬ice("iteration 3 · phase 1")); + let lines = printed(&view); + assert_eq!(lines[2..], ["┃ ┌ iteration 2", "┃ phase 1", "┃ ┌ iteration 3"], "{lines:?}"); + } + + /// Other notices sit inside the open iteration, and between iterations on the phase rail. + #[test] + fn a_notice_sits_at_the_depth_it_arrives() { + let mut view = recording(false); + view.turn_started(); + view.observe(¬ice("phase 0 claimed complete — running the gate")); + view.observe(&Event::TurnEnded { reason: luxe_core::StopReason::EndTurn }); + view.observe(¬ice("phase 0 accepted — now on phase 1")); + let lines = printed(&view); + assert_eq!(lines[2], "┃ │ phase 0 claimed complete — running the gate", "{lines:?}"); + assert_eq!(lines[4], "┃ phase 0 accepted — now on phase 1", "{lines:?}"); + } + + /// Where the line can't be redrawn, a failure still gets a line saying so, and a success + /// adds nothing to the call's own line. + #[test] + fn without_a_redraw_only_a_failure_adds_a_line() { + let mut view = recording(false); + view.turn_started(); + view.observe(&Event::ToolStarted { call_id: "a".into(), name: "read".into() }); + view.observe(&Event::ToolStarted { call_id: "b".into(), name: "bash".into() }); + ended(&mut view, "a", false); + ended(&mut view, "b", true); + let lines = printed(&view); + assert_eq!(lines.len(), 5, "{lines:?}"); + assert_eq!(lines[4], "┃ │ ✗ bash · failed", "{lines:?}"); + } } diff --git a/crates/luxe-cli/src/loop_view/paint.rs b/crates/luxe-cli/src/loop_view/paint.rs new file mode 100644 index 0000000..56364ee --- /dev/null +++ b/crates/luxe-cli/src/loop_view/paint.rs @@ -0,0 +1,193 @@ +//! Paint — how a loop line looks: the guides that lead it, and its colors when there are any. +//! +//! The guides work like an editor's indent guides. A phase draws a heavy rail down the left, in +//! a color of its own; an iteration draws a light one inside it, opened with `┌` and closed with +//! `└`. Scrolled back through a long run, or seen in a minimap, each phase is a band of one color +//! and each iteration a bracket within it. Colors come from the terminal's own sixteen, so its +//! theme picks the shades, and the guides are plain characters, so a log without color keeps them. + +use crossterm::style::{Color, Stylize}; + +/// Phase rail colors, cycled by phase number so two neighboring phases never share one. +const PHASE_COLORS: [Color; 4] = [Color::Cyan, Color::Magenta, Color::Blue, Color::Yellow]; + +/// Where a line sits in the run, which decides the guides leading it. +#[derive(Clone, Copy, PartialEq, Eq, Debug)] +pub(super) enum Depth { + /// Before the run has a phase + Run, + /// Inside a phase, between iterations + Phase(u32), + /// Inside an iteration of a phase. + /// + /// Args: the phase, and which edge of the iteration the line is. + Iteration(u32, Edge), +} + +/// Which part of an iteration a line is: its opening, its body, or its closing line. +#[derive(Clone, Copy, PartialEq, Eq, Debug)] +pub(super) enum Edge { + /// `┌`, the iteration's first line + Open, + /// `│`, every line between + Within, + /// `└`, the turn's summary + Close, +} + +/// How a tool call has gone so far. +#[derive(Clone, Copy, PartialEq, Eq, Debug)] +pub(super) enum CallState { + /// Started, no result yet + Running, + /// Ended without an error + Succeeded, + /// Ended in an error + Failed, +} + +/// Draws loop lines, in color or not. +#[derive(Clone, Copy, Debug)] +pub(super) struct Paint { + color: bool, +} + +impl Paint { + /// Color when stdout is a terminal that wants it: not `NO_COLOR`, not `TERM=dumb`. + pub(super) fn detect() -> Self { + use std::io::IsTerminal; + let no_color = std::env::var_os("NO_COLOR").is_some_and(|value| !value.is_empty()); + let dumb = std::env::var("TERM").is_ok_and(|term| term == "dumb"); + Self { color: std::io::stdout().is_terminal() && !no_color && !dumb } + } + + /// No color at all, as a pipe or a log gets. + #[cfg(test)] + pub(super) fn plain() -> Self { + Self { color: false } + } + + /// Whether this paints in color. + pub(super) fn in_color(self) -> bool { + self.color + } + + /// The guides for a line at `depth`, each followed by a space. + pub(super) fn guides(self, depth: Depth) -> String { + match depth { + Depth::Run => String::new(), + Depth::Phase(phase) => format!("{} ", self.rail(phase)), + Depth::Iteration(phase, edge) => { + format!("{} {} ", self.rail(phase), self.dim(edge_glyph(edge))) + } + } + } + + /// The line that opens a phase: its number in the phase's color. + pub(super) fn phase_heading(self, phase: u32) -> String { + let text = format!("phase {phase}"); + match self.color { + true => text.with(phase_color(phase)).bold().to_string(), + false => text, + } + } + + /// A tool call: a mark and the tool's name colored by how it went, then what it was asked. + /// A failure says so in words too, so the color never carries it alone. + pub(super) fn tool(self, name: &str, label: &str, state: CallState) -> String { + let (mark, color) = match state { + CallState::Running => ("○", None), + CallState::Succeeded => ("✓", Some(Color::Green)), + CallState::Failed => ("✗", Some(Color::Red)), + }; + let head = format!("{mark} {name}"); + let head = match (self.color, color) { + (true, Some(color)) => head.with(color).bold().to_string(), + (true, None) => head.bold().to_string(), + (false, _) => head, + }; + let failed = match state { + CallState::Failed => format!(" · {}", self.colored("failed", Color::Red)), + _ => String::new(), + }; + format!("{head} {label}").trim_end().to_string() + &failed + } + + /// Secondary text: a turn's summary, the iteration rail. + pub(super) fn dim(self, text: &str) -> String { + match self.color { + true => text.dim().to_string(), + false => text.to_string(), + } + } + + fn colored(self, text: &str, color: Color) -> String { + match self.color { + true => text.with(color).to_string(), + false => text.to_string(), + } + } + + fn rail(self, phase: u32) -> String { + self.colored("┃", phase_color(phase)) + } +} + +fn phase_color(phase: u32) -> Color { + PHASE_COLORS[phase as usize % PHASE_COLORS.len()] +} + +fn edge_glyph(edge: Edge) -> &'static str { + match edge { + Edge::Open => "┌", + Edge::Within => "│", + Edge::Close => "└", + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn each_depth_draws_its_own_guides() { + let paint = Paint::plain(); + assert_eq!(paint.guides(Depth::Run), ""); + assert_eq!(paint.guides(Depth::Phase(2)), "┃ "); + assert_eq!(paint.guides(Depth::Iteration(2, Edge::Open)), "┃ ┌ "); + assert_eq!(paint.guides(Depth::Iteration(2, Edge::Within)), "┃ │ "); + assert_eq!(paint.guides(Depth::Iteration(2, Edge::Close)), "┃ └ "); + } + + /// Without color a failure still reads as one, and a success has no word to need. + #[test] + fn a_failed_call_says_so_in_words() { + let paint = Paint::plain(); + assert_eq!(paint.tool("read", "a.rs", CallState::Running), "○ read a.rs"); + assert_eq!(paint.tool("read", "a.rs", CallState::Succeeded), "✓ read a.rs"); + assert_eq!( + paint.tool("bash", "cargo test", CallState::Failed), + "✗ bash cargo test · failed" + ); + assert_eq!(paint.tool("todo", "", CallState::Succeeded), "✓ todo", "no trailing space"); + } + + /// The tool's name takes the result's color; a plain view has no escapes at all. + #[test] + fn the_name_is_colored_by_the_result() { + let paint = Paint { color: true }; + let ok = paint.tool("read", "a.rs", CallState::Succeeded); + let failed = paint.tool("read", "a.rs", CallState::Failed); + assert!(ok.contains(&"✓ read".with(Color::Green).bold().to_string()), "{ok:?}"); + assert!(failed.contains(&"✗ read".with(Color::Red).bold().to_string()), "{failed:?}"); + assert!(!Paint::plain().tool("read", "a.rs", CallState::Failed).contains('\x1b')); + } + + /// Neighboring phases never share a rail color, so a phase boundary shows in a minimap. + #[test] + fn neighboring_phases_differ() { + for phase in 0..8 { + assert_ne!(phase_color(phase), phase_color(phase + 1), "{phase}"); + } + } +} diff --git a/crates/luxe-cli/src/loop_view/screen.rs b/crates/luxe-cli/src/loop_view/screen.rs new file mode 100644 index 0000000..3b1f915 --- /dev/null +++ b/crates/luxe-cli/src/loop_view/screen.rs @@ -0,0 +1,177 @@ +//! Screen — where loop lines go, and taking one back to redraw it. +//! +//! A tool call is printed when it starts, because "is it still going?" is the first question about +//! an unattended run, and its result only exists once it ends. On a terminal the start line is +//! redrawn in place with the result. That's only safe when every line is exactly one row, so on a +//! terminal each line is cut to the width rather than left to wrap, and a resize since the line +//! was printed means it's left alone. A pipe or a file never gets a redraw. + +use crate::output::{out, outln}; +use unicode_width::UnicodeWidthChar; + +/// A line already printed, and what's needed to find it again. +#[derive(Clone, Copy, Debug)] +pub(super) struct Printed { + /// How many lines came before it + index: u64, + /// The terminal's width when it was printed + width: Option, +} + +/// The terminal or pipe the view prints to. +pub(super) struct Screen { + /// Whether lines may be cut to the width and redrawn + terminal: bool, + /// Lines printed so far + printed: u64, + /// Where a test's lines go instead of stdout + recorded: Option>, +} + +impl Screen { + /// A terminal when stdout is one. + pub(super) fn detect() -> Self { + use std::io::IsTerminal; + Self { terminal: std::io::stdout().is_terminal(), printed: 0, recorded: None } + } + + /// A pipe that keeps its lines for a test to read. + #[cfg(test)] + pub(super) fn recording() -> Self { + Self { terminal: false, printed: 0, recorded: Some(Vec::new()) } + } + + /// What a [`Screen::recording`] was given. + #[cfg(test)] + pub(super) fn lines(&self) -> &[String] { + self.recorded.as_deref().unwrap_or_default() + } + + /// Prints `line` as one row, and says where it went. + pub(super) fn print(&mut self, line: &str) -> Printed { + let width = self.width(); + let printed = Printed { index: self.printed, width }; + self.printed += 1; + if let Some(recorded) = &mut self.recorded { + recorded.push(line.to_string()); + return printed; + } + match width { + Some(cells) => outln!("{}", fit(line, usize::from(cells))), + None => outln!("{line}"), + } + printed + } + + /// Redraws an earlier line in place. False, and nothing written, when it can't be trusted to + /// land on the same row: not a terminal, a resize since, or scrolled past the top. + pub(super) fn rewrite(&mut self, at: Printed, line: &str) -> bool { + let Some(cells) = self.width().filter(|now| Some(*now) == at.width) else { return false }; + let up = self.printed - at.index; + let rows = crossterm::terminal::size().map_or(0, |(_, rows)| u64::from(rows)); + if up == 0 || up >= rows { + return false; + } + // Up to the line, clear it, draw, then back down to where the next line goes + out!("\x1b[{up}A\r\x1b[2K{}\x1b[{up}B\r", fit(line, usize::from(cells))); + true + } + + fn width(&self) -> Option { + match self.terminal { + true => crossterm::terminal::size().ok().map(|(cols, _)| cols), + false => None, + } + } +} + +/// `line` cut to fit in `width` cells, so it never wraps. Escape sequences pass through uncounted, +/// and a cut line ends in `…` and, if it had color, a reset. +pub(super) fn fit(line: &str, width: usize) -> String { + if visible_width(line) <= width { + return line.to_string(); + } + let (cut, _) = scan(line, width.saturating_sub(1)); + let reset = if line.contains('\x1b') { "\x1b[0m" } else { "" }; + format!("{cut}…{reset}") +} + +/// Where the scanner is: in text, just past an escape, or inside a `CSI` sequence. +#[derive(Clone, Copy)] +enum Scan { + Text, + Escape, + Csi, +} + +/// `line` up to `budget` visible cells, with every escape sequence kept, and the cells it used. +fn scan(line: &str, budget: usize) -> (String, usize) { + let mut kept = String::with_capacity(line.len()); + let mut used = 0; + let mut state = Scan::Text; + for ch in line.chars() { + state = match (state, ch) { + (Scan::Text, '\x1b') => Scan::Escape, + (Scan::Escape, '[') => Scan::Csi, + (Scan::Escape, _) => Scan::Text, + (Scan::Csi, '@'..='~') => Scan::Text, + (Scan::Csi, _) => Scan::Csi, + (Scan::Text, text) => { + let cells = text.width().unwrap_or(0); + if used + cells > budget { + break; + } + used += cells; + Scan::Text + } + }; + kept.push(ch); + } + (kept, used) +} + +fn visible_width(line: &str) -> usize { + scan(line, usize::MAX).1 +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_line_that_fits_is_left_alone() { + assert_eq!(fit("○ read a.rs", 40), "○ read a.rs"); + assert_eq!(fit("exactly", 7), "exactly"); + } + + /// One cell short of the width plus the ellipsis is the width, so the row never wraps. + #[test] + fn a_long_line_is_cut_to_the_width() { + assert_eq!(fit("abcdefghij", 6), "abcde…"); + assert_eq!(visible_width(&fit("abcdefghij", 6)), 6); + } + + /// Escapes take no cells: a colored line that fits isn't cut, and a cut one is reset. + #[test] + fn escapes_are_not_counted() { + let green = "\x1b[32m✓ read\x1b[39m a.rs"; + assert_eq!(visible_width(green), "✓ read a.rs".chars().count()); + assert_eq!(fit(green, 11), green); + assert_eq!(fit(green, 5), "\x1b[32m✓ re…\x1b[0m"); + } + + /// A wide character counts as the two cells it takes. + #[test] + fn wide_characters_count_double() { + assert_eq!(visible_width("日本"), 4); + assert_eq!(fit("日本語", 5), "日本…"); + } + + /// A pipe never redraws: there's no row to go back to. + #[test] + fn a_pipe_never_redraws() { + let mut screen = Screen::recording(); + let line = screen.print("○ read a.rs"); + assert!(!screen.rewrite(line, "✓ read a.rs")); + } +} diff --git a/crates/luxe-cli/src/model_catalog.rs b/crates/luxe-cli/src/model_catalog.rs index df70c35..2647679 100644 --- a/crates/luxe-cli/src/model_catalog.rs +++ b/crates/luxe-cli/src/model_catalog.rs @@ -1,7 +1,7 @@ //! Model catalog wiring — cache location, refresh scheduling, and the `/model` menu. //! //! Metadata itself is resolved by [`luxe_providers::catalog`]; this module owns the parts that -//! depend on where Luxe keeps files and when it's allowed to touch the network. Resolution is +//! depend on where luxe keeps files and when it's allowed to touch the network. Resolution is //! always offline-safe — it reads the embedded snapshot plus a local cache and never blocks — //! while [`spawn_refresh`] keeps that cache current in the background. @@ -71,7 +71,7 @@ pub(crate) fn build_menu(settings: &AgentSettings) -> ModelMenu { push(&mut entries, resolve_model(&config, provider, id).0, true); } - // Then everything the catalog knows for providers Luxe can actually route to: the ones with a + // Then everything the catalog knows for providers luxe can actually route to: the ones with a // config block, anything the user has signed in to (a Copilot login is worthless if its models // never appear), and the launch's own provider when the launch itself carries the credentials // to reach it. diff --git a/crates/luxe-cli/src/model_catalog/tests.rs b/crates/luxe-cli/src/model_catalog/tests.rs index 5143134..08f3a24 100644 --- a/crates/luxe-cli/src/model_catalog/tests.rs +++ b/crates/luxe-cli/src/model_catalog/tests.rs @@ -187,7 +187,7 @@ fn an_unconfigured_machine_has_no_models_to_choose_between() { let with_key = AgentSettings::resolve(std::path::PathBuf::from("."), Default::default()); let catalog = build_menu(&with_key).catalog; std::env::remove_var("ANTHROPIC_API_KEY"); - assert!(!catalog.is_empty(), "an ambient key is a provider Luxe can route to"); + assert!(!catalog.is_empty(), "an ambient key is a provider luxe can route to"); assert!( catalog.iter().all(|entry| entry.info.r#ref.provider == "anthropic"), "and only that provider's models: {:?}", diff --git a/crates/luxe-cli/src/output.rs b/crates/luxe-cli/src/output.rs index 83c9c13..f6fd11b 100644 --- a/crates/luxe-cli/src/output.rs +++ b/crates/luxe-cli/src/output.rs @@ -5,9 +5,9 @@ //! idiom. //! //! The usual cure — resetting `SIGPIPE` to its default so the process dies silently — is wrong -//! here. Luxe writes to hook, MCP and LSP pipes and relies on `EPIPE` arriving as an error: the +//! here. luxe writes to hook, MCP and LSP pipes and relies on `EPIPE` arriving as an error: the //! command-hook runner deliberately tolerates a hook that exits without reading its stdin, and a -//! default `SIGPIPE` would kill Luxe at that line instead. So the pipe stays ignored and the +//! default `SIGPIPE` would kill luxe at that line instead. So the pipe stays ignored and the //! writing goes through one place, where a reader that has gone away is a quiet, successful end of //! output. //! diff --git a/crates/luxe-cli/src/pull_request_watch.rs b/crates/luxe-cli/src/pull_request_watch.rs index c65edf8..bcae29c 100644 --- a/crates/luxe-cli/src/pull_request_watch.rs +++ b/crates/luxe-cli/src/pull_request_watch.rs @@ -249,10 +249,10 @@ async fn look( fn unavailable(error: &GitHubError) -> Option { let reason = match error { GitHubError::NotInstalled => { - "The GitHub CLI (`gh`) is not installed, so Luxe cannot see this branch's pull request." + "The GitHub CLI (`gh`) is not installed, so luxe cannot see this branch's pull request." } GitHubError::NotAuthenticated { .. } => { - "The GitHub CLI is not signed in. Run `gh auth login`, and Luxe picks it up the next \ + "The GitHub CLI is not signed in. Run `gh auth login`, and luxe picks it up the next \ time the terminal has focus." } GitHubError::NotGitHub => "This repository has no remote on GitHub.", diff --git a/crates/luxe-cli/src/review_agent.rs b/crates/luxe-cli/src/review_agent.rs index 208f9e6..46360b3 100644 --- a/crates/luxe-cli/src/review_agent.rs +++ b/crates/luxe-cli/src/review_agent.rs @@ -1,6 +1,6 @@ //! The reviewer as an agent — a real turn, with the real tools, in a session of its own. //! -//! A review is a model driving Luxe. It gets the same pipeline every other turn gets: the tool +//! A review is a model driving luxe. It gets the same pipeline every other turn gets: the tool //! registry, the permission engine, per-tool deadlines, cancellation, the hook chain. What makes it //! a *review* is how its engine is built — the reviewer's model, the reviewer's tools and no others, //! and a mode that refuses every write — and the brief it is handed, which says who it is. diff --git a/crates/luxe-cli/src/workspace_data.rs b/crates/luxe-cli/src/workspace_data.rs index 9a67be8..9291373 100644 --- a/crates/luxe-cli/src/workspace_data.rs +++ b/crates/luxe-cli/src/workspace_data.rs @@ -313,7 +313,7 @@ fn bounded_text(text: &str, limit: usize) -> String { value } -/// Luxe's own project directory, excluded from what it reports as *your* changes. +/// luxe's own project directory, excluded from what it reports as *your* changes. const LUXE_PROJECT_DIR: &str = ".luxe"; async fn project_identity(root: &Path) -> ProjectIdentity { diff --git a/crates/luxe-cli/src/workspace_data/changes.rs b/crates/luxe-cli/src/workspace_data/changes.rs index ef30555..9020101 100644 --- a/crates/luxe-cli/src/workspace_data/changes.rs +++ b/crates/luxe-cli/src/workspace_data/changes.rs @@ -17,7 +17,7 @@ pub(super) async fn collect_change_summary(root: PathBuf) -> WorkspaceChangesSum let counts = numstat.as_deref().map(parse_numstat).unwrap_or_default(); let files = parse_status(&status) .into_iter() - // Luxe's own project directory — sessions, logs, tasks, review artifacts — is not the + // luxe's own project directory — sessions, logs, tasks, review artifacts — is not the // user's work. Listing it made the dock's count disagree with the review's forever. .filter(|(path, _)| !path.starts_with(LUXE_PROJECT_DIR)) .map(|(path, status)| { diff --git a/crates/luxe-cli/src/workspace_data/external.rs b/crates/luxe-cli/src/workspace_data/external.rs index 178267f..a44efbc 100644 --- a/crates/luxe-cli/src/workspace_data/external.rs +++ b/crates/luxe-cli/src/workspace_data/external.rs @@ -32,7 +32,7 @@ pub(super) async fn collect_external_summary( } let changes = collect_change_summary(root.clone()).await; // A repository that *contains* the project — an edit in a sibling directory of a checkout - // Luxe was opened one level inside — reports the project's own files too. Those already + // luxe was opened one level inside — reports the project's own files too. Those already // have a section, and listing them twice would double every number on the screen. let mut files = changes.files; files.retain(|file| !luxe_core::paths::contains(project_root, &root.join(&file.path))); diff --git a/crates/luxe-cli/src/workspace_data/tests.rs b/crates/luxe-cli/src/workspace_data/tests.rs index fe308a9..a810412 100644 --- a/crates/luxe-cli/src/workspace_data/tests.rs +++ b/crates/luxe-cli/src/workspace_data/tests.rs @@ -118,7 +118,7 @@ fn git_repo_with_a_commit(root: &Path) { } /// A checkout is asked the same question the project is asked, which is the whole point of -/// recording the root instead of the file: this change is made with the shell, so nothing Luxe +/// recording the root instead of the file: this change is made with the shell, so nothing luxe /// tracks per-file could have seen it. #[tokio::test] async fn an_external_checkout_is_reported_by_git() { @@ -130,7 +130,7 @@ async fn an_external_checkout_is_reported_by_git() { let work = ExternalWork::new(); work.observe(&sibling.join("lib.rs")); - // Not through any Luxe tool — exactly what the per-file ledger cannot know about. + // Not through any luxe tool — exactly what the per-file ledger cannot know about. std::fs::write(sibling.join("lib.rs"), "alpha\nbeta\ngamma\n").unwrap(); let summary = collect_external_summary(work.record(), &project).await; @@ -143,7 +143,7 @@ async fn an_external_checkout_is_reported_by_git() { assert_eq!(summary.total_files, 1); } -/// A repository Luxe was opened *inside* reports the project's own files too. They already have +/// A repository luxe was opened *inside* reports the project's own files too. They already have /// a section, and counting them twice would double every number on screen. #[tokio::test] async fn a_parent_checkout_does_not_report_the_project_twice() { diff --git a/crates/luxe-cli/src/workspace_runtime/tests.rs b/crates/luxe-cli/src/workspace_runtime/tests.rs index f84e409..3610c3c 100644 --- a/crates/luxe-cli/src/workspace_runtime/tests.rs +++ b/crates/luxe-cli/src/workspace_runtime/tests.rs @@ -119,7 +119,7 @@ async fn bridge_tracks_real_engine_startup_and_new_sessions() { external_work: None, review_context_files: Vec::new(), review_exclude: Vec::new(), - remember_runtime_state: false, + remember_choices_in: None, cache_warming: luxe_core::cache_warming::CacheWarming::Off, review_insight_provider: None, github: None, diff --git a/crates/luxe-cli/tests/mcp_commands/main.rs b/crates/luxe-cli/tests/mcp_commands/main.rs index d39710a..2301be1 100644 --- a/crates/luxe-cli/tests/mcp_commands/main.rs +++ b/crates/luxe-cli/tests/mcp_commands/main.rs @@ -15,15 +15,15 @@ fn project_server(project: &Path) { std::fs::write(project.join(".mcp.json"), config.to_string()).unwrap(); } -/// Whether Luxe launched the project's server. The marker is the proof when the child gets that far, -/// but the child is this test binary starting up again, and on a slow runner Luxe can give up on the +/// Whether luxe launched the project's server. The marker is the proof when the child gets that far, +/// but the child is this test binary starting up again, and on a slow runner luxe can give up on the /// closed connection before that startup reaches the write; its report of the attempt is the proof /// then. A refused server is never launched, so neither can appear. fn started(project: &Path, stdout: &str) -> bool { project.join("mcp-ran").exists() || stdout.contains("project-marker: failed to connect") } -/// Whether Luxe refused to start the project's server: it says so, naming it. Checked alongside the +/// Whether luxe refused to start the project's server: it says so, naming it. Checked alongside the /// absent marker, which alone would also pass for a server launched too slowly to have written it. fn refused(project: &Path, stdout: &str) -> bool { stdout.contains("Not starting project MCP servers: project-marker") diff --git a/crates/luxe-cli/tests/rpc_stdio.rs b/crates/luxe-cli/tests/rpc_stdio.rs index 059b9d8..b10995d 100644 --- a/crates/luxe-cli/tests/rpc_stdio.rs +++ b/crates/luxe-cli/tests/rpc_stdio.rs @@ -272,7 +272,7 @@ fn changed_repository() -> tempfile::TempDir { }; git(&["init", "--quiet", "--initial-branch=main"]); git(&["config", "user.email", "tests@example.invalid"]); - git(&["config", "user.name", "Luxe Tests"]); + git(&["config", "user.name", "luxe Tests"]); std::fs::write(project.path().join("total.rs"), "fn total() -> u32 {\n 1\n}\n").unwrap(); git(&["add", "total.rs"]); git(&["commit", "--quiet", "-m", "initial"]); diff --git a/crates/luxe-core/Cargo.toml b/crates/luxe-core/Cargo.toml index dc1e847..8acb24f 100644 --- a/crates/luxe-core/Cargo.toml +++ b/crates/luxe-core/Cargo.toml @@ -3,7 +3,7 @@ name = "luxe-core" version.workspace = true edition.workspace = true license.workspace = true -description = "Luxe's engine: the agent loop, session model, context assembly, permissions, and the Provider/Tool/Hook traits" +description = "luxe's engine: the agent loop, session model, context assembly, permissions, and the Provider/Tool/Hook traits" repository.workspace = true homepage.workspace = true @@ -66,7 +66,7 @@ globset = "0.4" [target.'cfg(unix)'.dependencies] rustix = { version = "1", features = ["process", "stdio", "system"] } -# Pointing stdin at the null device on Windows, and keeping the pipe Luxe took out of every child: +# Pointing stdin at the null device on Windows, and keeping the pipe luxe took out of every child: # no safe API does either, and without it every child of `luxe --rpc` stalls behind the protocol # read. See `program::take_stdin`. Job objects end a command's whole tree on a timeout, where # Windows has no process group to signal; see `program::TreeGuard`. A session's named pipe needs a diff --git a/crates/luxe-core/src/activity.rs b/crates/luxe-core/src/activity.rs index ba58213..9983449 100644 --- a/crates/luxe-core/src/activity.rs +++ b/crates/luxe-core/src/activity.rs @@ -211,7 +211,7 @@ impl ToolActivity { } } -/// Whether a tool is Luxe's own housekeeping rather than work someone asked for. +/// Whether a tool is luxe's own housekeeping rather than work someone asked for. /// /// Only [`crate::tool::ACTIVATE_TOOLS_NAME`], and only because *we* tier the registry: the model /// asks for a deferred tool's schema before it can call it, which is a fact about our request diff --git a/crates/luxe-core/src/auth.rs b/crates/luxe-core/src/auth.rs index 33e9e7f..8808403 100644 --- a/crates/luxe-core/src/auth.rs +++ b/crates/luxe-core/src/auth.rs @@ -189,7 +189,7 @@ pub enum LoginScope { /// Every configurable provider, with every method it offers. #[default] Any, - /// Providers whose subscription Luxe is allowed to sign in to. + /// Providers whose subscription luxe is allowed to sign in to. Subscription, /// Providers that take a key you already have. ApiKey, @@ -360,8 +360,6 @@ pub struct LoginOutcome { /// A local server takes no credential, and "API key" would be a claim the file contradicts. pub kind: Option, pub account: Option, - /// A model id worth defaulting to, when the flow learned one. - pub suggested_model: Option, /// Factual summary lines about what now exists (e.g. "17 models available"). pub notes: Vec, /// Advice that only makes sense once the credential exists, shown apart from the summary. diff --git a/crates/luxe-core/src/briefs.rs b/crates/luxe-core/src/briefs.rs index f21549c..1c70f14 100644 --- a/crates/luxe-core/src/briefs.rs +++ b/crates/luxe-core/src/briefs.rs @@ -1,7 +1,7 @@ -//! Briefs — the messages Luxe writes to the agent itself, told apart from the reader's own. +//! Briefs — the messages luxe writes to the agent itself, told apart from the reader's own. //! //! A draft, a question from a review and a batch of review comments each reach the agent as a -//! user message Luxe composed: the instructions, the evidence, the IDs a report has to echo. The +//! user message luxe composed: the instructions, the evidence, the IDs a report has to echo. The //! transcript is the reader's conversation, and a page of plumbing in their own colors reads as //! something they said. So a front-end shows one line saying what happened instead — or, for a //! question from a review, just the question, since those words *are* the reader's — and the @@ -90,7 +90,7 @@ const FINDING_ID: &str = " Finding ID: "; const EVIDENCE: &str = " Evidence: "; const REVIEWER: &str = " Reviewer: "; /// The lines that follow a comment's body; none of them is the reader's question. -const AFTER_BODY: [&str; 4] = [" Source: ", " Proposed fix: ", " Agent: ", " Luxe: "]; +const AFTER_BODY: [&str; 4] = [" Source: ", " Proposed fix: ", " Agent: ", " luxe: "]; /// How review feedback closes. const CLOSING: &str = "Do not rewrite unrelated code."; @@ -158,7 +158,7 @@ pub fn review_questions(text: &str) -> Vec { /// How a draft's fence opens, its newline included. const DRAFT_FENCE: &str = "```luxe-draft\n"; -/// An answer as the reader sees it: without what the agent wrote for Luxe to read. +/// An answer as the reader sees it: without what the agent wrote for luxe to read. /// /// A fix's remediation report goes, since the review shows it comment by comment, and the prose /// around it stays. An answer carrying a draft goes whole: the draft opens in the card or composer diff --git a/crates/luxe-core/src/cache_warming.rs b/crates/luxe-core/src/cache_warming.rs index f5dd60f..f4f6111 100644 --- a/crates/luxe-core/src/cache_warming.rs +++ b/crates/luxe-core/src/cache_warming.rs @@ -14,7 +14,7 @@ //! //! # Design //! -//! Same policy as Pi's, checked against Luxe's own ledgers: +//! Same policy as Pi's, checked against luxe's own ledgers: //! //! - **While a turn runs** the next request is certain, so a refresh pays whenever a read costs //! less than the write it saves. Across 2,980 recorded Claude calls this rescued 12 of 14 waits diff --git a/crates/luxe-core/src/compaction/budget.rs b/crates/luxe-core/src/compaction/budget.rs index e5712b9..9610117 100644 --- a/crates/luxe-core/src/compaction/budget.rs +++ b/crates/luxe-core/src/compaction/budget.rs @@ -32,7 +32,7 @@ pub fn estimate_message_tokens(messages: &[Message]) -> u64 { /// Estimate the tokens a request spends before any conversation: the system prompt and the tool /// schemas. /// -/// Far from negligible — Luxe's harness plus two dozen JSON schemas is tens of thousands of +/// Far from negligible — luxe's harness plus two dozen JSON schemas is tens of thousands of /// tokens, and leaving it out of a prompt figure is how a request that "fits" turns into a 400. pub fn estimate_prefix_tokens(system: Option<&str>, tools: &[ToolSchema]) -> u64 { let system = system.map(|text| text.len() as u64 / 4).unwrap_or(0); @@ -176,7 +176,7 @@ pub fn usable_context_window(context_window: u64, max_tokens: u32, reserve_token /// percent on a 200K prompt is thousands of tokens out. Mirrors Pi's margin. pub const CONTEXT_SAFETY_TOKENS: u32 = 4_096; -/// The smallest output cap Luxe will ask for once the window is full. Useless as an answer, but a +/// The smallest output cap luxe will ask for once the window is full. Useless as an answer, but a /// request that asks for zero (or a negative) output is a hard rejection rather than a short reply. const MIN_MAX_TOKENS: u32 = 1; diff --git a/crates/luxe-core/src/config.rs b/crates/luxe-core/src/config.rs index 192239b..66cf044 100644 --- a/crates/luxe-core/src/config.rs +++ b/crates/luxe-core/src/config.rs @@ -2,7 +2,7 @@ //! //! Loads `~/.config/luxe/config.json` (global) and `/.luxe/config.json` //! (project-local), merges them (project wins), and falls back to defaults on any -//! parse error. Unknown fields are ignored so a newer Luxe's config keeps working +//! parse error. Unknown fields are ignored so a newer luxe's config keeps working //! with an older build and vice versa. //! //! The schema is published via [`Config::schema_json`] for editor autocomplete @@ -31,7 +31,7 @@ pub use integrations::*; use merge::{merge_color_overrides, merge_disabled}; pub use write::{value_at, ConfigLayers, ConfigWriteError, Layer}; -/// The theme a launch lands on when nothing else decides: Luxe's own. +/// The theme a launch lands on when nothing else decides: luxe's own. /// /// A default theme is the product's face, so it is the one drawn for it rather than a neutral /// stand-in. An explicit setting and a matching desktop theme both still win. @@ -75,7 +75,7 @@ pub struct Config { /// use default (silent), because a modern terminal turns a bell into a window-manager attention /// request, which pulls focus off whatever the reader walked away to do. pub bell: Option, - /// Report the agent's state to herdr when Luxe runs in one of its panes. `None` = use default + /// Report the agent's state to herdr when luxe runs in one of its panes. `None` = use default /// (on). pub herdr: Option, /// Let another front-end on this machine join a running session. `None` = use default (on). @@ -105,9 +105,9 @@ pub struct Config { pub compaction: CompactionConfig, /// Language-server behavior pub lsp: LspConfig, - /// Whether Luxe checks for a newer release + /// Whether luxe checks for a newer release pub update: UpdateConfig, - /// How Luxe keeps up with GitHub + /// How luxe keeps up with GitHub pub github: GithubConfig, /// Whether sessions work in worktrees of their own pub worktree: WorktreeConfig, @@ -137,7 +137,7 @@ impl Config { } } - /// Whether Luxe opens on the start screen (default: yes). + /// Whether luxe opens on the start screen (default: yes). pub fn dashboard_shown(&self) -> bool { !matches!(self.dashboard, Some(DashboardSetting::Enabled(false))) } @@ -186,7 +186,7 @@ impl Config { self.notifications.as_ref().is_some_and(Notifications::any) } - /// Whether the agent's state is reported to herdr when Luxe runs inside it (default: yes). + /// Whether the agent's state is reported to herdr when luxe runs inside it (default: yes). pub fn herdr(&self) -> bool { self.herdr.unwrap_or(true) } @@ -202,7 +202,7 @@ impl Config { /// Resolves the active theme name, falling back to the current desktop theme when known. /// - /// An explicit Luxe setting always wins. Without one, the desktop's theme is used when the + /// An explicit luxe setting always wins. Without one, the desktop's theme is used when the /// registry carries one (Omarchy's, see [`crate::omarchy`]), because matching the desktop beats /// showing off, and anything else lands on [`DEFAULT_THEME`]. pub fn resolved_theme_name(&self, registry: &ThemeRegistry) -> String { @@ -242,7 +242,7 @@ impl Config { resolved } - /// The JSON Schema for the config files: the checked-in `config.schema.json`, which Luxe writes + /// The JSON Schema for the config files: the checked-in `config.schema.json`, which luxe writes /// beside the user's config so an editor can complete and check every key. pub fn schema_json() -> &'static str { include_str!("config/config.schema.json") @@ -349,7 +349,7 @@ mod activity_bar_config_tests { assert_eq!(config.theme.as_deref(), Some("nord"), "and the rest of the file still lands"); } - /// A source's kind is the one set, or its name folded; it may not take one of Luxe's own tabs', + /// A source's kind is the one set, or its name folded; it may not take one of luxe's own tabs', /// and it needs a program to run. #[test] fn a_mention_source_has_a_kind_of_its_own() { diff --git a/crates/luxe-core/src/config/config.schema.json b/crates/luxe-core/src/config/config.schema.json index c0b20f5..cb9464b 100644 --- a/crates/luxe-core/src/config/config.schema.json +++ b/crates/luxe-core/src/config/config.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "title": "Luxe config", + "title": "luxe config", "type": "object", "properties": { "$schema": { @@ -9,7 +9,7 @@ }, "theme": { "type": "string", - "description": "Theme name: a built-in (luxe, catppuccin, nord, tokyo-night, and more — /theme lists them all), the name of a file in themes/, or omarchy to follow the Omarchy desktop's theme. When omitted, Luxe follows Omarchy when it is running there, and uses luxe otherwise." + "description": "Theme name: a built-in (luxe, catppuccin, nord, tokyo-night, and more — /theme lists them all), the name of a file in themes/, or omarchy to follow the Omarchy desktop's theme. When omitted, luxe follows Omarchy when it is running there, and uses luxe otherwise." }, "colors": { "type": "object", @@ -54,7 +54,7 @@ "type": "string", "enum": ["auto", "nerd", "nerd_wide", "unicode", "ascii"], "default": "auto", - "description": "How much glyph fidelity the TUI asks for. Icons are decoration \u2014 the words beside them carry the meaning \u2014 so every setting is fully usable. nerd draws Material Design icons from a Nerd Font (the look Luxe ships with); nerd_wide draws the same icons with a second cell of clearance, for a Nerd Font's non-Mono cut, whose icons carry two cells of ink behind a one-cell advance and so paint over the space after them; unicode uses Geometric Shapes and Arrows only, so no patched font is needed; ascii reduces to plain punctuation for a minimal or non-UTF-8 terminal. auto (default) picks nerd where those glyphs can actually be drawn \u2014 kitty bundles its own symbol font, and elsewhere fontconfig is asked whether any installed font provides them \u2014 and unicode otherwise. auto never picks nerd_wide: both cuts of a face report the same advance, so there is nothing to measure." + "description": "How much glyph fidelity the TUI asks for. Icons are decoration \u2014 the words beside them carry the meaning \u2014 so every setting is fully usable. nerd draws Material Design icons from a Nerd Font (the look luxe ships with); nerd_wide draws the same icons with a second cell of clearance, for a Nerd Font's non-Mono cut, whose icons carry two cells of ink behind a one-cell advance and so paint over the space after them; unicode uses Geometric Shapes and Arrows only, so no patched font is needed; ascii reduces to plain punctuation for a minimal or non-UTF-8 terminal. auto (default) picks nerd where those glyphs can actually be drawn \u2014 kitty bundles its own symbol font, and elsewhere fontconfig is asked whether any installed font provides them \u2014 and unicode otherwise. auto never picks nerd_wide: both cuts of a face report the same advance, so there is nothing to measure." }, "images": { "type": "string", @@ -108,7 +108,7 @@ "herdr": { "type": "boolean", "default": true, - "description": "When Luxe runs in a herdr pane, report whether it is working, idle or waiting on you, so herdr's sidebar, notifications and `herdr agent wait` follow it. On by default; nothing is sent outside herdr." + "description": "When luxe runs in a herdr pane, report whether it is working, idle or waiting on you, so herdr's sidebar, notifications and `herdr agent wait` follow it. On by default; nothing is sent outside herdr." }, "joinable": { "type": "boolean", @@ -147,7 +147,7 @@ "type": "array", "items": { "type": "string" }, "default": [], - "description": "Project-relative globs a review leaves out, e.g. [\"PROGRESS.md\", \"docs/design/**\"]. Luxe's own .luxe/ directory is always excluded and needs no entry. Supports *, ** and ?; a trailing / matches a directory and everything under it. Excluded files are counted and named in the Brief, never silently dropped." + "description": "Project-relative globs a review leaves out, e.g. [\"PROGRESS.md\", \"docs/design/**\"]. luxe's own .luxe/ directory is always excluded and needs no entry. Supports *, ** and ?; a trailing / matches a directory and everything under it. Excluded files are counted and named in the Brief, never silently dropped." } }, "additionalProperties": false @@ -183,7 +183,7 @@ "remember_model": { "type": "boolean", "default": true, - "description": "Remember the model and thinking level picked in a session and use them next launch. Precedence: --model/--thinking flag, then LUXE_MODEL/LUXE_PROVIDER, then what you last picked, then default_model in models.json — and nothing under that, because Luxe never picks a model for you. Set false to always start from the configured default." + "description": "Remember the model and thinking level picked in a session and use them next launch. Precedence: --model/--thinking flag, then LUXE_MODEL/LUXE_PROVIDER, then what you last picked, then default_model in models.json — and nothing under that, because luxe never picks a model for you. Set false to always start from the configured default." }, "on_ask": { "type": "string", @@ -195,7 +195,7 @@ "type": "string", "enum": ["off", "streaming", "idle"], "default": "streaming", - "description": "When Luxe keeps a conversation's prompt cache alive through a long wait, by re-sending the last request with a one-token cap just before the cache entry expires (five minutes on Anthropic, unless supports_long_cache_retention asks for an hour). A refresh is a cache read of the prompt; the write it saves is usually ten times that. streaming (the default) does it while a turn is running — a slow tool, a permission prompt, a question — where the next request is certain. idle also does it for up to 30 minutes after a turn ends, where a reply is a guess, so a refresh is sent only on a conversation large enough to make the guess pay. off never does. Either way nothing is sent unless it is expected to save at least $0.05, never on a subscription plan, and its cost shows on /cost as cache warming. A project's config may turn this down and may not turn it up." + "description": "When luxe keeps a conversation's prompt cache alive through a long wait, by re-sending the last request with a one-token cap just before the cache entry expires (five minutes on Anthropic, unless supports_long_cache_retention asks for an hour). A refresh is a cache read of the prompt; the write it saves is usually ten times that. streaming (the default) does it while a turn is running — a slow tool, a permission prompt, a question — where the next request is certain. idle also does it for up to 30 minutes after a turn ends, where a reply is a guess, so a refresh is sent only on a conversation large enough to make the guess pay. off never does. Either way nothing is sent unless it is expected to save at least $0.05, never on a subscription plan, and its cost shows on /cost as cache warming. A project's config may turn this down and may not turn it up." }, "default_mode": { "type": "string", @@ -289,7 +289,7 @@ }, "launchers": { "type": "array", - "description": "Programs a key hands the terminal to — gh-dash, lazygit, anything that takes over a terminal and gives it back. Luxe keeps running underneath, a turn included, and redraws when the program exits; text the program writes to the file named by $LUXE_HANDOFF lands in the composer. Read from the global config only: a key that runs a program a repository named is arbitrary execution.", + "description": "Programs a key hands the terminal to — gh-dash, lazygit, anything that takes over a terminal and gives it back. luxe keeps running underneath, a turn included, and redraws when the program exits; text the program writes to the file named by $LUXE_HANDOFF lands in the composer. Read from the global config only: a key that runs a program a repository named is arbitrary execution.", "items": { "type": "object", "properties": { @@ -319,7 +319,7 @@ }, "github": { "type": "object", - "description": "How Luxe keeps up with GitHub: the checked-out branch's pull request, and what /github lists. The refresh interval is read from the global config only — how often Luxe calls out on a timer is not a decision a repository you cloned makes; a project may add its own /github sections.", + "description": "How luxe keeps up with GitHub: the checked-out branch's pull request, and what /github lists. The refresh interval is read from the global config only — how often luxe calls out on a timer is not a decision a repository you cloned makes; a project may add its own /github sections.", "properties": { "refresh_secs": { "type": "integer", @@ -345,12 +345,12 @@ }, "update": { "type": "object", - "description": "Whether Luxe checks for a newer release. Read from the global config only — whether Luxe reaches the network on your behalf is not a decision a repository you cloned makes.", + "description": "Whether luxe checks for a newer release. Read from the global config only — whether luxe reaches the network on your behalf is not a decision a repository you cloned makes.", "properties": { "check": { "type": "boolean", "default": true, - "description": "Look for a newer release, at most once a day, and mention it under the dashboard's footer. Luxe never updates itself; the notice names the command that matches how you installed it. The request sends nothing about you — no version, no platform, no identifier — and every failure is silent. Set false, or LUXE_UPDATE_CHECK=0, to turn it off." + "description": "Look for a newer release, at most once a day, and mention it under the dashboard's footer. luxe never updates itself; the notice names the command that matches how you installed it. The request sends nothing about you — no version, no platform, no identifier — and every failure is silent. Set false, or LUXE_UPDATE_CHECK=0, to turn it off." } }, "additionalProperties": false diff --git a/crates/luxe-core/src/config/display.rs b/crates/luxe-core/src/config/display.rs index 4d034d8..5073830 100644 --- a/crates/luxe-core/src/config/display.rs +++ b/crates/luxe-core/src/config/display.rs @@ -283,7 +283,7 @@ pub enum NotificationMethod { /// The moments that send a desktop notification: all of them, none, or a list. /// /// Read leniently, like every other key: a value that is neither a boolean nor a list is treated as -/// unset and a name Luxe does not know is skipped, so one typo never takes the whole config with it. +/// unset and a name luxe does not know is skipped, so one typo never takes the whole config with it. #[derive(Debug, Clone, PartialEq, Eq, Serialize)] #[serde(untagged)] pub enum Notifications { diff --git a/crates/luxe-core/src/config/display/diff.rs b/crates/luxe-core/src/config/display/diff.rs index f78b43f..c43011b 100644 --- a/crates/luxe-core/src/config/display/diff.rs +++ b/crates/luxe-core/src/config/display/diff.rs @@ -3,7 +3,7 @@ use super::{known_or, Lenient}; use serde::{Deserialize, Serialize}; -/// How a diff is drawn, wherever Luxe draws one. +/// How a diff is drawn, wherever luxe draws one. /// /// One setting for three surfaces — the `edit`/`write` tool card, the peeked file beside the /// conversation, and Guided Review. They differ only in how much room they have, and diff --git a/crates/luxe-core/src/config/integrations.rs b/crates/luxe-core/src/config/integrations.rs index bf75797..8d86de7 100644 --- a/crates/luxe-core/src/config/integrations.rs +++ b/crates/luxe-core/src/config/integrations.rs @@ -71,7 +71,7 @@ impl MentionSource { !kind.is_empty() && !self.reserved() && !self.command.trim().is_empty() } - /// Whether its kind is one Luxe's own tabs use, which leaves it without a tab of its own. + /// Whether its kind is one luxe's own tabs use, which leaves it without a tab of its own. /// /// Worth telling the reader rather than only skipping: `mcp` joined the list after sources /// could be named anything, so a source that worked yesterday can be the one it displaced. @@ -80,7 +80,7 @@ impl MentionSource { } } -/// The reference kinds Luxe's own `@` tabs use: `@[file:…]`, `@[skill:…]`, `@[github:…]`, +/// The reference kinds luxe's own `@` tabs use: `@[file:…]`, `@[skill:…]`, `@[github:…]`, /// `@[mcp:…]`. pub const RESERVED_MENTION_KINDS: [&str; 4] = ["file", "skill", "github", "mcp"]; @@ -102,7 +102,7 @@ impl WorktreeConfig { /// GitHub preferences. /// -/// Read from the global config only, like [`UpdateConfig`]: how often Luxe calls out on a timer is +/// Read from the global config only, like [`UpdateConfig`]: how often luxe calls out on a timer is /// the reader's decision, not one a repository they cloned gets to make. #[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)] #[serde(default)] @@ -152,7 +152,7 @@ impl GithubConfig { /// Update-notice preferences. /// -/// Luxe never updates itself; the only question here is whether it may *notice* that it is behind. +/// luxe never updates itself; the only question here is whether it may *notice* that it is behind. /// The check fetches a public manifest and sends nothing about you — see `luxe_core::update` — but /// it is still an outbound request, so it gets a switch like every other one. #[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)] @@ -186,7 +186,7 @@ pub struct LspConfig { pub project_servers: Option, } -/// Whether Luxe may launch a language server out of the project's `node_modules/.bin`. +/// Whether luxe may launch a language server out of the project's `node_modules/.bin`. /// /// npm puts a dev dependency there rather than on `PATH`, so for the JavaScript servers it is /// routinely the only copy that matches the project — `svelteserver` has to agree with the Svelte @@ -223,7 +223,7 @@ pub struct ReviewConfig { /// `PLAN.md`/`AGENTS.md`. Each must resolve inside the opened project. #[serde(default)] pub context_files: Vec, - /// Project-relative globs a review leaves out, on top of Luxe's own `.luxe/` directory. + /// Project-relative globs a review leaves out, on top of luxe's own `.luxe/` directory. /// /// For bookkeeping a repo carries but nobody reviews — a loop's `PROGRESS.md`, a planning /// directory, another agent's memory. Excluded files are *counted and named*, never silently diff --git a/crates/luxe-core/src/config/merge.rs b/crates/luxe-core/src/config/merge.rs index 23ba4b8..e9126de 100644 --- a/crates/luxe-core/src/config/merge.rs +++ b/crates/luxe-core/src/config/merge.rs @@ -259,7 +259,7 @@ impl Layered for LspConfig { } impl Layered for UpdateConfig { - // `global` only, same reasoning in a lower key: whether Luxe reaches the network on your + // `global` only, same reasoning in a lower key: whether luxe reaches the network on your // behalf is your decision, not a decision a repository you cloned makes. fn layered(global: Self, project: Self) -> Self { let Self { check: _ } = project; diff --git a/crates/luxe-core/src/config/tests.rs b/crates/luxe-core/src/config/tests.rs index cd8d7cf..c5f24b8 100644 --- a/crates/luxe-core/src/config/tests.rs +++ b/crates/luxe-core/src/config/tests.rs @@ -98,7 +98,7 @@ fn partial_config_round_trips() { assert_eq!(config.dock, DockConfig::default()); } -/// Every leniently read setting, through its resolver: each value it knows, one from a newer Luxe, +/// Every leniently read setting, through its resolver: each value it knows, one from a newer luxe, /// and none at all. #[test] fn every_lenient_setting_resolves_known_unknown_and_absent_values() { diff --git a/crates/luxe-core/src/config/tests/schema.rs b/crates/luxe-core/src/config/tests/schema.rs index a352b5a..872f196 100644 --- a/crates/luxe-core/src/config/tests/schema.rs +++ b/crates/luxe-core/src/config/tests/schema.rs @@ -5,7 +5,7 @@ use super::*; #[test] fn schema_is_valid_json() { let schema: serde_json::Value = serde_json::from_str(Config::schema_json()).unwrap(); - assert_eq!(schema["title"], "Luxe config"); + assert_eq!(schema["title"], "luxe config"); assert!(schema.get("properties").is_some()); assert!(schema["properties"].get("$schema").is_some()); assert!(schema["properties"].get("notifications").is_some()); diff --git a/crates/luxe-core/src/config/write.rs b/crates/luxe-core/src/config/write.rs index add579e..c7fe647 100644 --- a/crates/luxe-core/src/config/write.rs +++ b/crates/luxe-core/src/config/write.rs @@ -138,7 +138,7 @@ impl Config { } /// Edit the global config under [`JsonFile`]'s lock. Called from the UI thread; the wait for the -/// lock is bounded (a few seconds), and only another Luxe writing the same file at that moment, or +/// lock is bounded (a few seconds), and only another luxe writing the same file at that moment, or /// one that crashed holding the lock, makes it wait at all. fn edit_global(edit: impl FnOnce(&mut Map)) -> Result { let path = Config::global_path(); diff --git a/crates/luxe-core/src/context.rs b/crates/luxe-core/src/context.rs index 49bb047..3122dd0 100644 --- a/crates/luxe-core/src/context.rs +++ b/crates/luxe-core/src/context.rs @@ -27,10 +27,10 @@ use std::path::PathBuf; #[cfg(test)] const HARNESS_TOOLS: &[&str] = &["question", "todo"]; -/// Where questions about Luxe itself are answered: its own guide, built into the binary and run +/// Where questions about luxe itself are answered: its own guide, built into the binary and run /// through `bash`. Static text, so the prompt stays byte-identical between turns; without it, a -/// model asked how to configure Luxe answers from what other harnesses do. -const LUXE_DOCS: &str = " Questions about Luxe itself are answered by its guide: `luxe docs`."; +/// model asked how to configure luxe answers from what other harnesses do. +const LUXE_DOCS: &str = " Questions about luxe itself are answered by its guide: `luxe docs`."; /// Purpose-built tools paired with the shell command a model reaches for instead. /// @@ -239,7 +239,7 @@ impl SystemPromptBuilder { format!( "## Tools\n\ - Every tool in Luxe is designed to beat the shell command it replaces by providing \ + Every tool in luxe is designed to beat the shell command it replaces by providing \ structured, bounded output for a fraction of the context. They also make your actions \ easier for the user to read, which improves clarity and efficiency. So, always reach \ for the purpose-built tool before `bash`, which should be reserved for everything they \ @@ -294,7 +294,7 @@ pub(crate) fn shared_len(sections: &[MeasuredSection]) -> usize { } /// The `## Memory` section: the repository as what outlives the conversation, and where to ask -/// about Luxe itself when the agent can run `luxe docs`. +/// about luxe itself when the agent can run `luxe docs`. fn memory_section(ctx: &PromptContext) -> String { let docs = if ctx.tools.iter().any(|tool| tool == "bash") { LUXE_DOCS } else { "" }; format!( @@ -335,7 +335,7 @@ fn plans_section() -> String { /// Who the agent is, in every session and every mode. pub(crate) const DEFAULT_ROLE: &str = - "You are an agentic engineering assistant operating in Luxe, a coding \ + "You are an agentic engineering assistant operating in luxe, a coding \ agent harness. Build features incrementally with small, safe diffs, and verify them before calling \ the work done."; @@ -382,7 +382,7 @@ own conventions say otherwise: - Comments should say *why*, never *what*. - Use specific names and types: no `data`, `handler`, or `Manager`. - Errors should be detailed and never swallowed. -- Luxe features specialized tools to read, write, and debug code. Use them."; +- luxe features specialized tools to read, write, and debug code. Use them."; /// What makes a test worth having. const TESTING: &str = "## Testing diff --git a/crates/luxe-core/src/context/tests.rs b/crates/luxe-core/src/context/tests.rs index 3e2b170..34c6904 100644 --- a/crates/luxe-core/src/context/tests.rs +++ b/crates/luxe-core/src/context/tests.rs @@ -26,7 +26,7 @@ fn ctx() -> PromptContext { } } -/// An agent that can run commands is told where Luxe's own guide is, so a question about Luxe +/// An agent that can run commands is told where luxe's own guide is, so a question about luxe /// is answered from it; one that cannot run `luxe docs` is not told about it. #[test] fn the_prompt_points_at_luxes_own_guide() { @@ -122,7 +122,7 @@ fn the_harness_names_no_tool_it_cannot_offer() { /// It is product, not taste. A model asked for something it cannot determine will reach for a /// plausible answer instead of admitting the gap, and a fabricated one is worse than a refusal /// precisely because nothing distinguishes it from a real one — so each clause here is a -/// specific shape that failure takes, and losing any of them silently makes Luxe less +/// specific shape that failure takes, and losing any of them silently makes luxe less /// trustworthy rather than merely less tidy. #[test] fn the_honesty_contract_is_always_on() { @@ -285,7 +285,7 @@ fn no_live_work_state_reaches_the_cached_prefix() { /// It is product, not taste: "write a test" is an instruction a model already follows, and /// following only that is what produced the hollow suites this section exists to prevent. Each /// clause below is one of those failure shapes, so losing any of them silently is a -/// regression in what Luxe writes rather than in how it reads. +/// regression in what luxe writes rather than in how it reads. #[test] fn the_testing_contract_is_always_on() { { diff --git a/crates/luxe-core/src/context_report.rs b/crates/luxe-core/src/context_report.rs index 1106486..6d2c7a8 100644 --- a/crates/luxe-core/src/context_report.rs +++ b/crates/luxe-core/src/context_report.rs @@ -187,7 +187,7 @@ pub struct ContextComposition { pub cache_write_pct: Option, /// Enabled MCP servers, and the tokens their single gateway tool costs. /// - /// A line rather than a part: Luxe exposes every server through one gateway tool, so the + /// A line rather than a part: luxe exposes every server through one gateway tool, so the /// category the rest of the field warns about is always near zero here — and a row that always /// reads zero teaches nothing. pub mcp: Option, diff --git a/crates/luxe-core/src/engine.rs b/crates/luxe-core/src/engine.rs index fad44b3..def8c8f 100644 --- a/crates/luxe-core/src/engine.rs +++ b/crates/luxe-core/src/engine.rs @@ -81,7 +81,7 @@ pub struct Engine { /// Mutable session id — updated when loading/resuming a session so the next turn chains /// from the resumed state, matching the `--resume` path. session_id: tokio::sync::Mutex, - /// This process's claim on `session_id`, which keeps a second Luxe from writing it too + /// This process's claim on `session_id`, which keeps a second luxe from writing it too session_claim: std::sync::Mutex>, last_turn_baseline: tokio::sync::Mutex>, active_guided_review: Arc>, diff --git a/crates/luxe-core/src/engine/answering.rs b/crates/luxe-core/src/engine/answering.rs index 44604b1..367743a 100644 --- a/crates/luxe-core/src/engine/answering.rs +++ b/crates/luxe-core/src/engine/answering.rs @@ -120,7 +120,7 @@ fn threads_of( impl Engine { /// Reports what in the working tree is not committed, asked fresh from git rather than read - /// from the last snapshot, which may predate a file made outside Luxe. + /// from the last snapshot, which may predate a file made outside luxe. pub(crate) fn check_worktree_removal(&self, event_tx: &mpsc::Sender) { let root = self.config.guided_review_project_root.clone(); let event_tx = event_tx.clone(); diff --git a/crates/luxe-core/src/engine/config.rs b/crates/luxe-core/src/engine/config.rs index 2848bc6..efeb085 100644 --- a/crates/luxe-core/src/engine/config.rs +++ b/crates/luxe-core/src/engine/config.rs @@ -53,7 +53,7 @@ pub struct EngineConfig { /// /// `None` disables runtime review loading for embedding and test callers. pub guided_review_project_root: Option, - /// The directory Luxe was launched in, when that is not the project root. + /// The directory luxe was launched in, when that is not the project root. /// /// The one thing the *shell's* directory still answers after [`crate::project::discover`] has /// moved the process to the top of the working copy: which instruction files apply. A monorepo @@ -72,9 +72,13 @@ pub struct EngineConfig { pub review_context_files: Vec, /// Project-relative globs a review leaves out (`review.exclude`), on top of `.luxe/`. pub review_exclude: Vec, - /// Whether an in-session model/thinking choice is remembered for the next launch - /// (`agent.remember_model`). Off for embedders and tests, which should leave no trace. - pub remember_runtime_state: bool, + /// The project an in-session model or thinking choice is remembered for, for the next launch + /// (`agent.remember_model`). + /// + /// A model is kept for this project and as the latest anywhere, so the next launch here starts + /// on it and a project never opened before starts on it too. `None` for embedders and tests, + /// which should leave no trace. + pub remember_choices_in: Option, /// When the prompt cache is kept warm through a long wait (`agent.cache_warming`). /// /// Only matters for a provider whose `prompt_cache_ttl` answers, so an embedder's or a test's diff --git a/crates/luxe-core/src/engine/dispatch/permission.rs b/crates/luxe-core/src/engine/dispatch/permission.rs index 5f4e4f6..54503bc 100644 --- a/crates/luxe-core/src/engine/dispatch/permission.rs +++ b/crates/luxe-core/src/engine/dispatch/permission.rs @@ -223,7 +223,7 @@ impl Engine { /// or stopping. What it should do is hand the command to the person. pub(super) fn deny_message(request: &crate::permission::PermissionRequest) -> String { if crate::permission::defaults::runs_as_root(request) { - return "Blocked: Luxe does not run commands as root. A command that needs root needs the \ + return "Blocked: luxe does not run commands as root. A command that needs root needs the \ user's attention and consent, so they run it: give them the exact command in a \ fenced code block, ask them to run it in their own terminal, and continue once \ they say it is done. Do not look for another way to run it here." diff --git a/crates/luxe-core/src/engine/dispatch/test_nudge.rs b/crates/luxe-core/src/engine/dispatch/test_nudge.rs index 4b02560..bfa5b1e 100644 --- a/crates/luxe-core/src/engine/dispatch/test_nudge.rs +++ b/crates/luxe-core/src/engine/dispatch/test_nudge.rs @@ -4,7 +4,7 @@ use super::*; impl Engine { /// Nudge toward the `debug` tool when tests keep failing — runtime reinforcement for models - /// that default to print-and-retry (the debugger is a Luxe differentiator, but under-used). + /// that default to print-and-retry (the debugger is a luxe differentiator, but under-used). /// Fires once per failing streak (≥3 consecutive failing test runs); a passing test resets it. /// Disable with `LUXE_DEBUG_NUDGE=0`. pub(super) async fn maybe_nudge_debugger(&self, is_test: bool, result: &mut ToolResultData) { diff --git a/crates/luxe-core/src/engine/drafting.rs b/crates/luxe-core/src/engine/drafting.rs index c3476d8..833985a 100644 --- a/crates/luxe-core/src/engine/drafting.rs +++ b/crates/luxe-core/src/engine/drafting.rs @@ -2,7 +2,7 @@ //! //! A draft is an ordinary turn in this session, so it is written by the agent that did the work, //! with the transcript it already holds in the prompt cache. What the turn adds is appended once, -//! as one message, never in the system prompt: the thing being answered in full, Luxe's own evidence +//! as one message, never in the system prompt: the thing being answered in full, luxe's own evidence //! about it — the code at the line now, the commits since, the review comment it became and whether //! the fix was verified — and the rest of the conversation as a digest, sent whole the first time //! and only what is new after, until compaction or a session load forgets what was sent. diff --git a/crates/luxe-core/src/engine/drafting/tests.rs b/crates/luxe-core/src/engine/drafting/tests.rs index ff30807..b658c52 100644 --- a/crates/luxe-core/src/engine/drafting/tests.rs +++ b/crates/luxe-core/src/engine/drafting/tests.rs @@ -155,7 +155,7 @@ async fn a_thread_brief_carries_the_code_now_and_the_commits_since() { let dir = tempfile::tempdir().unwrap(); let root = dir.path(); git(root, &["init", "--quiet", "-b", "main"]); - git(root, &["config", "user.name", "Luxe Tests"]); + git(root, &["config", "user.name", "luxe Tests"]); git(root, &["config", "user.email", "tests@luxe.local"]); let lines: Vec = (1..=20).map(|n| format!("line {n}")).collect(); std::fs::write(root.join("router.rs"), lines.join("\n")).unwrap(); diff --git a/crates/luxe-core/src/engine/error.rs b/crates/luxe-core/src/engine/error.rs index a1c391c..ee30d8c 100644 --- a/crates/luxe-core/src/engine/error.rs +++ b/crates/luxe-core/src/engine/error.rs @@ -22,7 +22,7 @@ pub enum EngineError { /// /// The gate, rather than the courtesy: a front-end should ask before it submits, and this is /// what holds when one does not. See [`crate::provider::ModelRef::is_unset`]. - #[error("no model selected — pick one with /model, or start Luxe with --model ")] + #[error("no model selected — pick one with /model, or start luxe with --model ")] NoModel, } @@ -48,7 +48,7 @@ mod tests { let session = SessionError::Other("gone".into()); let session_said = format!("session error: {session}"); let no_model = - "no model selected — pick one with /model, or start Luxe with --model "; + "no model selected — pick one with /model, or start luxe with --model "; let cases: [(EngineError, String, bool); 5] = [ (provider.into(), provider_said, false), (session.into(), session_said, false), diff --git a/crates/luxe-core/src/engine/github_overview.rs b/crates/luxe-core/src/engine/github_overview.rs index 7259fb3..a4d42e8 100644 --- a/crates/luxe-core/src/engine/github_overview.rs +++ b/crates/luxe-core/src/engine/github_overview.rs @@ -5,7 +5,7 @@ //! repository and number asked about, so a reply that lands after the reader moved on is matched //! to nothing rather than drawn over the wrong row. //! -//! An issue's answer also says whether one of your sessions took it up — Luxe's own knowledge, read +//! An issue's answer also says whether one of your sessions took it up — luxe's own knowledge, read //! from the session store, which GitHub has no way to know. use super::posting::sentence; diff --git a/crates/luxe-core/src/engine/guided_review/baseline.rs b/crates/luxe-core/src/engine/guided_review/baseline.rs index 88fc90b..5fe8730 100644 --- a/crates/luxe-core/src/engine/guided_review/baseline.rs +++ b/crates/luxe-core/src/engine/guided_review/baseline.rs @@ -41,7 +41,7 @@ impl Engine { } } - /// What this engine leaves out of a review: Luxe's own directory, plus `review.exclude`. + /// What this engine leaves out of a review: luxe's own directory, plus `review.exclude`. pub(crate) fn review_exclusions(&self) -> crate::guided_review::ReviewExclusions { crate::guided_review::ReviewExclusions::new(&self.config.review_exclude) } diff --git a/crates/luxe-core/src/engine/guided_review/target.rs b/crates/luxe-core/src/engine/guided_review/target.rs index 473e22a..fb3b927 100644 --- a/crates/luxe-core/src/engine/guided_review/target.rs +++ b/crates/luxe-core/src/engine/guided_review/target.rs @@ -43,7 +43,7 @@ pub(super) fn pull_request_failure(error: &PullRequestResolveError) -> GuidedRev GuidedReviewFailure::unavailable(format!("Could not run `gh`: {source}.")) } GitHubError::Unreadable(_) => GuidedReviewFailure::unavailable( - "`gh` answered with something Luxe could not read. Updating the GitHub CLI may fix it.", + "`gh` answered with something luxe could not read. Updating the GitHub CLI may fix it.", ), GitHubError::RateLimited => GuidedReviewFailure::unavailable( "GitHub's rate limit for this account is spent. It refills within the hour.", diff --git a/crates/luxe-core/src/engine/lifecycle.rs b/crates/luxe-core/src/engine/lifecycle.rs index 98d7d9c..001efaf 100644 --- a/crates/luxe-core/src/engine/lifecycle.rs +++ b/crates/luxe-core/src/engine/lifecycle.rs @@ -190,7 +190,7 @@ impl Engine { .read() .map_err(|_| SessionError::Other("session store lock poisoned".to_string()))?; let entries = store.load(&id)?; - // Before anything changes, so a session open in another Luxe leaves this one as it was + // Before anything changes, so a session open in another luxe leaves this one as it was let claim = store.claim(&id)?; let leaf = crate::session::latest_leaf(&entries); let active = match leaf.as_ref() { diff --git a/crates/luxe-core/src/engine/nested_instructions.rs b/crates/luxe-core/src/engine/nested_instructions.rs index 9864a15..0a51670 100644 --- a/crates/luxe-core/src/engine/nested_instructions.rs +++ b/crates/luxe-core/src/engine/nested_instructions.rs @@ -74,7 +74,7 @@ impl Engine { } } -/// The nested files `call` reached, from Luxe launched at `launch`. +/// The nested files `call` reached, from luxe launched at `launch`. /// /// Relative paths resolve the way the tool resolved them, against where tools run. fn reached(launch: &std::path::Path, call: &ToolCallInfo) -> Vec { diff --git a/crates/luxe-core/src/engine/posting.rs b/crates/luxe-core/src/engine/posting.rs index ec3fa45..0def27e 100644 --- a/crates/luxe-core/src/engine/posting.rs +++ b/crates/luxe-core/src/engine/posting.rs @@ -267,7 +267,7 @@ pub(super) fn sentence(error: &GitHubError) -> String { } GitHubError::Run { source, .. } => format!("Could not run `gh`: {source}."), GitHubError::Unreadable(_) => { - "`gh` answered with something Luxe could not read. Updating the GitHub CLI may fix it." + "`gh` answered with something luxe could not read. Updating the GitHub CLI may fix it." .into() } GitHubError::RateLimited => { diff --git a/crates/luxe-core/src/engine/prompt.rs b/crates/luxe-core/src/engine/prompt.rs index 9925fe3..21b8c0c 100644 --- a/crates/luxe-core/src/engine/prompt.rs +++ b/crates/luxe-core/src/engine/prompt.rs @@ -12,7 +12,7 @@ impl Engine { pub(super) async fn assemble_prompt( &self, ) -> Result<(Vec, Option), EngineError> { - // Two directories, and they differ whenever Luxe is launched below the project root: the + // Two directories, and they differ whenever luxe is launched below the project root: the // one the launch named, which only decides which `AGENTS.md` files apply, and the one every // tool actually runs in. The prompt reports the second as `cwd`: a session opened in // `packages/app` must not be told it is there while `pwd` answers with the root, and a @@ -147,7 +147,7 @@ fn build_deferred_tools_section(catalog: &[(String, String)]) -> String { out } -/// Hand-written catalog lines for Luxe's own deferred tools, shorter than anything +/// Hand-written catalog lines for luxe's own deferred tools, shorter than anything /// [`catalog_line`] can cut from a description. A tool not listed here, an MCP server's or a newer /// one, gets the generated line. const CATALOG_SUMMARIES: &[(&str, &str)] = &[ diff --git a/crates/luxe-core/src/engine/review_desk/publishing.rs b/crates/luxe-core/src/engine/review_desk/publishing.rs index ed0a95d..3b12b5d 100644 --- a/crates/luxe-core/src/engine/review_desk/publishing.rs +++ b/crates/luxe-core/src/engine/review_desk/publishing.rs @@ -69,7 +69,7 @@ impl ReviewDesk { } if interrupted > 0 { effects.push(Effect::Event(Event::Notice( - "A review feedback turn was cut off when Luxe last stopped. It can be sent again \ + "A review feedback turn was cut off when luxe last stopped. It can be sent again \ from the review." .into(), ))); diff --git a/crates/luxe-core/src/engine/review_desk/storage.rs b/crates/luxe-core/src/engine/review_desk/storage.rs index 0365c2d..ef6cb9c 100644 --- a/crates/luxe-core/src/engine/review_desk/storage.rs +++ b/crates/luxe-core/src/engine/review_desk/storage.rs @@ -126,13 +126,13 @@ impl ReviewDesk { "Review comments cannot be saved without a project.".to_string() } SaveError::Store(ReviewSessionStoreError::RevisionConflict { .. }) => { - // Another Luxe on this project wrote first. Holding on to the older revision would + // Another luxe on this project wrote first. Holding on to the older revision would // refuse every later change too, so take theirs and say so. if let Some(stored) = self.load(&review_id).await { self.session = Some(stored); self.persisted = true; } - "Another Luxe changed this review's comments at the same time, so this change was \ + "Another luxe changed this review's comments at the same time, so this change was \ not saved. The review shows theirs now; make the change again." .to_string() } diff --git a/crates/luxe-core/src/engine/review_desk/tests/edits.rs b/crates/luxe-core/src/engine/review_desk/tests/edits.rs index f8d61fd..ddf602c 100644 --- a/crates/luxe-core/src/engine/review_desk/tests/edits.rs +++ b/crates/luxe-core/src/engine/review_desk/tests/edits.rs @@ -245,7 +245,7 @@ async fn carried_comments_join_and_only_the_ones_still_placed_are_sent() { assert!(submitted(&effects).is_some()); } -/// A revision conflict (another Luxe wrote first) refuses the edit, takes the stored session, +/// A revision conflict (another luxe wrote first) refuses the edit, takes the stored session, /// and lets the next edit through. /// /// The break this catches: holding on to the older revision, which refuses every edit after it too. @@ -261,7 +261,7 @@ async fn a_revision_conflict_takes_the_stored_session_and_recovers() { let (request_id, effects) = edit(&mut desk, ReviewEdit::SetOutcome { outcome: ReviewOutcome::Accepted }).await; - assert!(refusal_for(&effects, &request_id).contains("Another Luxe")); + assert!(refusal_for(&effects, &request_id).contains("Another luxe")); let restored = effects.iter().find_map(|effect| match effect { Effect::Event(Event::ReviewSessionRestored { session }) => Some(session.outcome), _ => None, diff --git a/crates/luxe-core/src/engine/settings.rs b/crates/luxe-core/src/engine/settings.rs index 44a2540..cecdc7f 100644 --- a/crates/luxe-core/src/engine/settings.rs +++ b/crates/luxe-core/src/engine/settings.rs @@ -195,8 +195,9 @@ impl Engine { event_tx: &mpsc::Sender, ) { debug!(model = %model.r#ref, "switching active model"); - if self.config.remember_runtime_state { + if let Some(project) = &self.config.remember_choices_in { crate::runtime_state::RuntimeState::remember_model( + project, &model.r#ref.provider, &model.r#ref.id, ); @@ -217,7 +218,7 @@ impl Engine { event_tx: &mpsc::Sender, ) { debug!(?level, "setting thinking level"); - if self.config.remember_runtime_state { + if self.config.remember_choices_in.is_some() { crate::runtime_state::RuntimeState::remember_thinking(level); } *self.before_mode.lock().await = None; diff --git a/crates/luxe-core/src/engine/turn.rs b/crates/luxe-core/src/engine/turn.rs index 9049872..d16caba 100644 --- a/crates/luxe-core/src/engine/turn.rs +++ b/crates/luxe-core/src/engine/turn.rs @@ -292,7 +292,7 @@ impl Engine { *self.draft_answer.lock().await = committed.text.clone(); } // The checkpoint that delivers a steer only runs at the top of an iteration, so ending here - // would leave it buffered until the user's next submission — a message they watched Luxe + // would leave it buffered until the user's next submission — a message they watched luxe // accept and then apparently ignore. Each continuation consumes the buffer, so this can // only extend the turn as often as the user actually types. if !self.pending_steers.lock().await.is_empty() { diff --git a/crates/luxe-core/src/engine/turn/commit.rs b/crates/luxe-core/src/engine/turn/commit.rs index 5ea4a65..4fabab5 100644 --- a/crates/luxe-core/src/engine/turn/commit.rs +++ b/crates/luxe-core/src/engine/turn/commit.rs @@ -33,7 +33,7 @@ impl Engine { /// /// Every committed message is announced with `MessageCommitted`, the reader's own words too: /// a client joined to the session didn't type them, and the front-end that did reconciles the - /// copy it already shows. A message Luxe composed (review feedback, a draft's brief) has no + /// copy it already shows. A message luxe composed (review feedback, a draft's brief) has no /// such copy anywhere, so it's announced the same way. pub(super) async fn commit_user_message( &self, @@ -142,7 +142,7 @@ impl Engine { /// Reports a provider call that came back with nothing, and says why the turn stops. /// /// A cancel is the user's own doing and the UI has already said so; anything else is the - /// model answering with silence, which looked exactly like Luxe hanging — the spinner + /// model answering with silence, which looked exactly like luxe hanging — the spinner /// stopped, no message appeared, and the next thing the reader saw was a `400` from the turn /// after it. pub(super) async fn report_empty_reply(&self, event_tx: &mpsc::Sender) -> StopReason { diff --git a/crates/luxe-core/src/engine/turn/report.rs b/crates/luxe-core/src/engine/turn/report.rs index c3102c9..c8fc618 100644 --- a/crates/luxe-core/src/engine/turn/report.rs +++ b/crates/luxe-core/src/engine/turn/report.rs @@ -2,7 +2,7 @@ //! //! A fix request ends with the report the agent is to fill in. The turn reads everything the agent //! said in it, every message rather than only the last, as the turn is about to end. A report that -//! reads goes to the review. When there is none Luxe can use, Luxe appends one message saying what +//! reads goes to the review. When there is none luxe can use, luxe appends one message saying what //! was wrong, with the template again, and the turn goes on for the answer: once, so a model that //! cannot comply costs a call rather than a loop. Whatever still has no word from the agent when //! the turn ends, however it ended, goes to the review desk, which notes it on the comment. @@ -16,9 +16,9 @@ use crate::guided_review::FindingId; pub(super) struct ReportWatch { /// Every assistant text the turn committed, in order said: Vec, - /// Whether Luxe has asked for the report this turn + /// Whether luxe has asked for the report this turn asked: bool, - /// Why the last reading found no report Luxe could use + /// Why the last reading found no report luxe could use problem: Option<&'static str>, /// The comments the delivered report spoke for; `None` until one is delivered covered: Option>, @@ -141,7 +141,7 @@ const NO_REPORT: &str = "it wrote no report"; /// No `Submission:` line, which is how a retried submission finds the message it already sent. fn report_request(context: &RemediationTurnContext, reason: &str) -> String { format!( - "{REPORT_REQUEST}\nYour reply did not give the report Luxe reads to update the review: \ + "{REPORT_REQUEST}\nYour reply did not give the report luxe reads to update the review: \ {reason}. Do not redo any work. Reply with just this block, one line per \ comment in the order they were sent, each status set to fixed, not_fixed or \ needs_clarification and each note saying what you did, in one sentence.\n\n{}", diff --git a/crates/luxe-core/src/engine/turn/request.rs b/crates/luxe-core/src/engine/turn/request.rs index c996ebc..4ee35f0 100644 --- a/crates/luxe-core/src/engine/turn/request.rs +++ b/crates/luxe-core/src/engine/turn/request.rs @@ -133,7 +133,7 @@ impl Engine { /// on the way in is an estimate — char/4 for anything not yet measured, a tokenizer we do not /// have for the rest — so a prompt can clear the threshold and still be rejected, and a /// mid-turn tool result large enough to do it arrives *after* the last check. Failing there - /// ends the turn on the one error whose remedy Luxe already implements. + /// ends the turn on the one error whose remedy luxe already implements. /// /// The retry summarizes on the provider's authority rather than the threshold's: the window is /// full because the endpoint says so, whatever the local arithmetic believed. Once only, and diff --git a/crates/luxe-core/src/event/action.rs b/crates/luxe-core/src/event/action.rs index 9136e91..4c3e102 100644 --- a/crates/luxe-core/src/event/action.rs +++ b/crates/luxe-core/src/event/action.rs @@ -168,7 +168,7 @@ pub enum Action { squash: bool, }, /// Draft the pull request the open review would open, answered by `pull_request_prepared`. - /// Luxe keeps the draft for `open_pull_request`. + /// luxe keeps the draft for `open_pull_request`. PreparePullRequest { /// Names the draft request_id: crate::guided_review::PullRequestOpenId, @@ -189,7 +189,7 @@ pub enum Action { draft: bool, }, /// Draft the open review as a stack, one pull request per chapter, answered by - /// `stack_prepared`. Luxe keeps the layers for `open_stack`. + /// `stack_prepared`. luxe keeps the layers for `open_stack`. PrepareStack { /// Names the stack request_id: crate::guided_review::PullRequestOpenId, @@ -205,7 +205,7 @@ pub enum Action { draft: bool, }, /// Read what posting the open pull request review needs, answered by - /// `pull_request_post_prepared`. Luxe keeps it for `post_pull_request_review`. + /// `pull_request_post_prepared`. luxe keeps it for `post_pull_request_review`. PreparePullRequestPost { /// Names the preview request_id: crate::guided_review::PullRequestPostId, @@ -293,7 +293,7 @@ pub enum Action { repository: Option, }, /// Work out what restacking the checked-out branch's stack would do, answered by - /// `restack_planned`. Luxe keeps the plan for the `restack` that confirms it. + /// `restack_planned`. luxe keeps the plan for the `restack` that confirms it. PlanRestack { /// Names the plan request_id: crate::restack::RestackId, @@ -331,7 +331,7 @@ pub enum Action { /// Project-relative file path: String, }, - /// Whether the client's window has focus, which paces Luxe's background GitHub refreshes. + /// Whether the client's window has focus, which paces luxe's background GitHub refreshes. SetFocus { /// Whether it now has focus focused: bool, diff --git a/crates/luxe-core/src/event/events.rs b/crates/luxe-core/src/event/events.rs index 849acd5..69af54c 100644 --- a/crates/luxe-core/src/event/events.rs +++ b/crates/luxe-core/src/event/events.rs @@ -516,17 +516,17 @@ pub enum Event { /// The answer to `show_open_review`. Boxed: it carries a whole review. OpenReviewShown(Box), /// The open review's feedback session changed and was stored. Every change arrives this way, - /// whoever made it: an `EditReview`, answered under its `request_id`, or something Luxe did + /// whoever made it: an `EditReview`, answered under its `request_id`, or something luxe did /// itself (a turn dispatched, a report recorded, a review posted), under a fresh one. ReviewSessionSaved { - /// The edit this answers, or a fresh id for a change Luxe made itself. + /// The edit this answers, or a fresh id for a change luxe made itself. request_id: ReviewSessionSaveRequestId, /// Complete authoritative state returned by the expected-revision store. session: Box, }, /// A change to the feedback session was refused or could not be stored, and nothing changed. ReviewSessionSaveFailed { - /// The edit this answers, or a fresh id for a change Luxe made itself. + /// The edit this answers, or a fresh id for a change luxe made itself. request_id: ReviewSessionSaveRequestId, /// Logical review whose mutable state was not persisted. review_id: ReviewId, @@ -586,7 +586,7 @@ pub enum Event { Ready { /// Wire protocol version — [`crate::PROTOCOL_VERSION`]. protocol_version: u32, - /// The Luxe build serving this session. + /// The luxe build serving this session. luxe_version: String, /// Session the stream is attached to. session_id: String, diff --git a/crates/luxe-core/src/event/tests/decoding.rs b/crates/luxe-core/src/event/tests/decoding.rs index 134648d..84fb6d8 100644 --- a/crates/luxe-core/src/event/tests/decoding.rs +++ b/crates/luxe-core/src/event/tests/decoding.rs @@ -6,7 +6,7 @@ use super::*; /// read it before the derived ones replaced them. /// /// The break this catches: the mirror enums decode only what their attributes say, so a -/// `#[serde(default)]` missing there turns a frame a client or an older Luxe sends into an error. +/// `#[serde(default)]` missing there turns a frame a client or an older luxe sends into an error. /// Every row leaves out a field that is not an `Option`, which decodes as `None` regardless. #[test] fn what_a_sender_may_leave_out_still_decodes() { diff --git a/crates/luxe-core/src/external_work.rs b/crates/luxe-core/src/external_work.rs index bc897a2..e809cbd 100644 --- a/crates/luxe-core/src/external_work.rs +++ b/crates/luxe-core/src/external_work.rs @@ -11,7 +11,7 @@ //! //! # What it can and cannot see //! -//! Only paths Luxe's own file tools name. A `bash` command that deletes a file elsewhere is +//! Only paths luxe's own file tools name. A `bash` command that deletes a file elsewhere is //! invisible here, which is why an external path inside a Git worktree is recorded as a *root* //! instead — Git then reports that tree the same way it reports the project, and catches what the //! shell did too. `ExternalWork::roots` is the honest answer for a checkout; `ExternalWork::loose` @@ -129,7 +129,7 @@ impl ExternalWork { /// Called *before* the change, so the first call for a path is the only one that can see what /// was there; later calls leave the retained baseline alone. A path inside a Git worktree is /// recorded as its root instead of as a file, because Git can then report that tree completely - /// rather than only the parts Luxe touched. + /// rather than only the parts luxe touched. pub fn observe(&self, path: &Path) { let Ok(mut state) = self.state.lock() else { return; diff --git a/crates/luxe-core/src/fetched.rs b/crates/luxe-core/src/fetched.rs index 83a28cc..06df9dc 100644 --- a/crates/luxe-core/src/fetched.rs +++ b/crates/luxe-core/src/fetched.rs @@ -2,7 +2,7 @@ //! //! A clone lives inside the project so the agent can read and search it without tripping the //! external-directory guard. That makes it the one directory in the tree whose contents came from a -//! stranger rather than from the person running Luxe, so anything that would *run* repository code +//! stranger rather than from the person running luxe, so anything that would *run* repository code //! on the user's behalf — a language server rooted there, a formatter loading its plugins — checks //! [`contains`] and stays out. This module is the single answer to where that directory is and //! whether a path is inside it. diff --git a/crates/luxe-core/src/file_diff.rs b/crates/luxe-core/src/file_diff.rs index a10cb3c..00c06a8 100644 --- a/crates/luxe-core/src/file_diff.rs +++ b/crates/luxe-core/src/file_diff.rs @@ -6,7 +6,7 @@ //! This module answers that second question with one `git diff`, parsed by the review's own //! [`parse_unified_diff`] into the review's own [`ReviewFile`], and nothing kept afterwards. //! -//! Reusing the review's content model is the point: there is one diff data model in Luxe, so the +//! Reusing the review's content model is the point: there is one diff data model in luxe, so the //! Changes pane and the review cannot disagree about what a hunk is, and escalating from one to //! the other shows the same lines. What this does *not* share is the capture: no private index //! snapshot, no stability re-read, no artifact on disk, no chaptering. A glance is allowed to be @@ -110,7 +110,7 @@ pub enum FileDiffFailure { #[error("this file is not text, so there are no lines to show")] NotText, /// Git produced a diff the review parser rejected. - #[error("git produced a diff Luxe could not read: {0}")] + #[error("git produced a diff luxe could not read: {0}")] Unreadable(String), } @@ -228,7 +228,7 @@ async fn capture_loose( requested: &str, baseline: Option<&ExternalBaseline>, ) -> Result { - // A baseline of `Unretained` and no record at all are the same answer to the reader: Luxe + // A baseline of `Unretained` and no record at all are the same answer to the reader: luxe // cannot say what this file used to hold, so it will not pretend to. let Some(baseline @ (ExternalBaseline::Absent | ExternalBaseline::Text { .. })) = baseline else { diff --git a/crates/luxe-core/src/formatter.rs b/crates/luxe-core/src/formatter.rs index 901fb16..9d7e689 100644 --- a/crates/luxe-core/src/formatter.rs +++ b/crates/luxe-core/src/formatter.rs @@ -289,7 +289,7 @@ pub async fn run_formatter( /// looks — on a 2024 crate it formats to the wrong style edition and refuses to parse syntax that /// edition added, which reads as a broken file rather than a wrong flag. `rustfmt.toml` first, /// because that is the project speaking about formatting specifically; then the manifest; then the -/// last edition Luxe can safely assume. +/// last edition luxe can safely assume. /// /// A line scan rather than a TOML parse, deliberately: one key, three well-known file names, and no /// dependency worth adding for it. Anything it cannot read falls back rather than guessing. diff --git a/crates/luxe-core/src/formatter/tests.rs b/crates/luxe-core/src/formatter/tests.rs index 657af83..479ccbc 100644 --- a/crates/luxe-core/src/formatter/tests.rs +++ b/crates/luxe-core/src/formatter/tests.rs @@ -126,7 +126,7 @@ fn rustfmt_spec_is_correct() { } /// The edition on the command line overrides the project's own `rustfmt.toml`, so a constant -/// there is not a default — it is Luxe overruling the repository about its own formatting. +/// there is not a default — it is luxe overruling the repository about its own formatting. #[test] fn rust_is_formatted_against_the_edition_the_project_declares() { let project = tempfile::tempdir().expect("temp dir"); @@ -150,7 +150,7 @@ fn rust_is_formatted_against_the_edition_the_project_declares() { assert_eq!(edition_of(&FormatterRegistry::for_project(project.path(), false)), "2018"); // rustfmt reads `rustfmt.toml` itself, so what it says has to win over the manifest — - // otherwise the flag Luxe passes silently overrules it. + // otherwise the flag luxe passes silently overrules it. std::fs::write(project.path().join("rustfmt.toml"), "edition = \"2015\"\n").expect("write"); assert_eq!(edition_of(&FormatterRegistry::for_project(project.path(), false)), "2015"); } diff --git a/crates/luxe-core/src/fs_atomic.rs b/crates/luxe-core/src/fs_atomic.rs index b10c0dd..84788cd 100644 --- a/crates/luxe-core/src/fs_atomic.rs +++ b/crates/luxe-core/src/fs_atomic.rs @@ -57,7 +57,7 @@ pub fn replace_with_mode(path: &Path, bytes: &[u8], mode: Option) -> io::Re /// Replace `path` keeping whatever mode the file already has, or owner-only when it is new. /// /// For a config file that may hold a secret but that the user owns: a mode they chose stays theirs, -/// and a file Luxe creates starts tight. +/// and a file luxe creates starts tight. pub fn replace_preserving_mode(path: &Path, bytes: &[u8]) -> io::Result<()> { replace_with_mode(path, bytes, existing_mode(path)) } diff --git a/crates/luxe-core/src/github.rs b/crates/luxe-core/src/github.rs index 90cb1b4..8ac19e9 100644 --- a/crates/luxe-core/src/github.rs +++ b/crates/luxe-core/src/github.rs @@ -1,4 +1,4 @@ -//! GitHub — the one seam between Luxe and GitHub. +//! GitHub — the one seam between luxe and GitHub. //! //! Everything that reads or writes a pull request or an issue goes through [`GitHub`], so there is //! one module that knows `gh` exists. [`GhCli`] is the implementation: it runs the user's own `gh` @@ -41,7 +41,7 @@ use async_trait::async_trait; use serde::{Deserialize, Serialize}; use std::path::Path; -/// What Luxe needs from a code host: every role, as the engine holds it. +/// What luxe needs from a code host: every role, as the engine holds it. /// /// Deliberately small: each method is something a caller in the tree actually uses, so the traits /// grow with the features rather than ahead of them. The methods live in role traits, so code that @@ -310,7 +310,7 @@ impl Repository { /// [`classify_failure`], so rewording an error here never changes behavior somewhere else. #[derive(Debug, thiserror::Error)] pub enum GitHubError { - /// `gh` is not installed anywhere Luxe can find it. + /// `gh` is not installed anywhere luxe can find it. #[error("the GitHub CLI (`gh`) is not installed")] NotInstalled, /// `gh` is installed but has no working sign-in for the host. @@ -340,8 +340,8 @@ pub enum GitHubError { #[source] source: std::io::Error, }, - /// `gh` answered with output Luxe could not read. - #[error("gh answered with something Luxe could not read")] + /// `gh` answered with output luxe could not read. + #[error("gh answered with something luxe could not read")] Unreadable(#[source] serde_json::Error), /// GitHub refused for rate: this sign-in's hourly budget, or its secondary limit, is spent. #[error("GitHub's rate limit for this account is spent")] diff --git a/crates/luxe-core/src/github/gh/tests/branches.rs b/crates/luxe-core/src/github/gh/tests/branches.rs index 6dbf6d6..c602270 100644 --- a/crates/luxe-core/src/github/gh/tests/branches.rs +++ b/crates/luxe-core/src/github/gh/tests/branches.rs @@ -43,7 +43,7 @@ fn a_search_lists_pull_requests_and_issues_with_where_they_are() { let deleted = SEARCH_ISSUES.replacen("\"author\":{\"login\":", "\"author\":null,\"x\":{\"login\":", 1); assert_eq!(parse_search(&deleted).unwrap().items[0].author, "", "a deleted account"); - // A frame from a Luxe that sent no state reads as open, not as an error + // A frame from a luxe that sent no state reads as open, not as an error let older = r#"{"pull_request":true,"number":1,"title":"T","url":"u","repository":"a/b","author":"","draft":false,"updated_at":""}"#; let item: ListItem = serde_json::from_str(older).unwrap(); assert_eq!(item.state, PullRequestState::Open); @@ -72,7 +72,7 @@ fn what_merged_below_a_stack_is_read_with_where_it_went() { pub(super) const STATUS_UNSTACKED: &str = include_str!("../../fixtures/branch_status_unstacked.json"); -/// A real chain of Luxe's own, read from the middle: seven below down to `master`, two above, +/// A real chain of luxe's own, read from the middle: seven below down to `master`, two above, /// and the evidence that checks wait for trunk — the bottom one has them, this one none. #[test] fn a_pull_request_in_the_middle_of_a_stack_knows_where_it_sits() { diff --git a/crates/luxe-core/src/github/gh/tests/threads.rs b/crates/luxe-core/src/github/gh/tests/threads.rs index aabd37a..e4ffa4c 100644 --- a/crates/luxe-core/src/github/gh/tests/threads.rs +++ b/crates/luxe-core/src/github/gh/tests/threads.rs @@ -135,7 +135,7 @@ fn the_conversation_comes_with_the_threads() { assert!(before.conversation.is_empty() && !before.threads.is_empty()); } -/// On a real pull request the reader answered the first comment from Luxe, so it and the answer +/// On a real pull request the reader answered the first comment from luxe, so it and the answer /// stay quiet, and the review's summary is what is still asked. #[test] fn an_answered_comment_on_a_real_pull_request_asks_nothing() { diff --git a/crates/luxe-core/src/github/overview.rs b/crates/luxe-core/src/github/overview.rs index f351ece..4152633 100644 --- a/crates/luxe-core/src/github/overview.rs +++ b/crates/luxe-core/src/github/overview.rs @@ -321,7 +321,7 @@ pub struct IssueOverview { pub conversation_count: usize, } -/// A session of yours that took an issue up, which only Luxe knows about. +/// A session of yours that took an issue up, which only luxe knows about. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct LocalSession { /// The session's id, which resuming it names diff --git a/crates/luxe-core/src/github/refresh.rs b/crates/luxe-core/src/github/refresh.rs index b2597a7..00c43d5 100644 --- a/crates/luxe-core/src/github/refresh.rs +++ b/crates/luxe-core/src/github/refresh.rs @@ -1,7 +1,7 @@ //! Refresh — when to ask GitHub about the branch's pull request again. //! //! GitHub has no push channel a local program can subscribe to, so the status row is kept current -//! two ways: right away after anything Luxe saw happen, and on an interval otherwise. This module +//! two ways: right away after anything luxe saw happen, and on an interval otherwise. This module //! is the interval, and only the arithmetic of it — the workspace runtime tells it what happened //! and asks when to look next, so every rule here is testable without a clock or a network. //! diff --git a/crates/luxe-core/src/github/remote/tests.rs b/crates/luxe-core/src/github/remote/tests.rs index 8614232..adda66a 100644 --- a/crates/luxe-core/src/github/remote/tests.rs +++ b/crates/luxe-core/src/github/remote/tests.rs @@ -117,7 +117,7 @@ fn remotes_are_read_from_git_remote_v() { fn the_matching_remote_is_found_by_where_it_points() { let remotes = vec![ ("origin".to_string(), "git@github.com:me/luxe.git".to_string()), - ("upstream".to_string(), "https://github.com/Someone/Luxe".to_string()), + ("upstream".to_string(), "https://github.com/Someone/luxe".to_string()), ]; assert_eq!( matching_remote(&remotes, "github.com", "someone", "luxe"), diff --git a/crates/luxe-core/src/guided_review/attention.rs b/crates/luxe-core/src/guided_review/attention.rs index 6ab9dd2..9661d82 100644 --- a/crates/luxe-core/src/guided_review/attention.rs +++ b/crates/luxe-core/src/guided_review/attention.rs @@ -4,7 +4,7 @@ //! for everything it can be expected to disclose and the wrong one for the rest. That line decides //! what belongs here: a file edited without ever being read, a credential-shaped addition, a //! weakened gate. The agent cannot report the first — it does not know — and has every incentive to -//! soften the other two. Luxe can see all three because it is the harness that produced the change. +//! soften the other two. luxe can see all three because it is the harness that produced the change. //! //! Who wrote a change is deliberately not here: read off the transcript it is a guess, wrong often //! enough to cost more than it tells anyone, since a formatter, a pasted file, or a path spelled diff --git a/crates/luxe-core/src/guided_review/context.rs b/crates/luxe-core/src/guided_review/context.rs index 978bc11..5ef7617 100644 --- a/crates/luxe-core/src/guided_review/context.rs +++ b/crates/luxe-core/src/guided_review/context.rs @@ -114,8 +114,8 @@ impl ReviewContextDraft { /// /// `extra_planning` names additional project-relative planning files (from `review.context_files`); /// each is optional and read only when it resolves inside the opened project. The defaults are - /// deliberately Luxe's own: a file belonging to the harness Luxe is *developed* with is excluded - /// from release archives, so in any shipped Luxe it would never exist. + /// deliberately luxe's own: a file belonging to the harness luxe is *developed* with is excluded + /// from release archives, so in any shipped luxe it would never exist. pub fn from_project_local_sources( title: impl Into, project_root: &Path, diff --git a/crates/luxe-core/src/guided_review/context/tests.rs b/crates/luxe-core/src/guided_review/context/tests.rs index c6311cc..904cce3 100644 --- a/crates/luxe-core/src/guided_review/context/tests.rs +++ b/crates/luxe-core/src/guided_review/context/tests.rs @@ -53,8 +53,8 @@ fn review_targets_round_trip_without_literal_diff_payloads() { } /// Context comes from the project's own artifacts. It used to read `.pi/agent-loop/PLAN.md` — -/// a file belonging to the harness Luxe is developed with, excluded from release archives — -/// so a shipped Luxe always produced empty excerpts. +/// a file belonging to the harness luxe is developed with, excluded from release archives — +/// so a shipped luxe always produced empty excerpts. #[test] fn draft_collects_project_local_sources_in_stable_categories() { let project = tempfile::tempdir().unwrap(); diff --git a/crates/luxe-core/src/guided_review/exclude.rs b/crates/luxe-core/src/guided_review/exclude.rs index af1d6cb..a84e2a7 100644 --- a/crates/luxe-core/src/guided_review/exclude.rs +++ b/crates/luxe-core/src/guided_review/exclude.rs @@ -1,6 +1,6 @@ //! Review exclusions — what a review leaves out, and why that is safe to do. //! -//! Two things a repository carries that nobody reviews: Luxe's own `.luxe/` directory (sessions, +//! Two things a repository carries that nobody reviews: luxe's own `.luxe/` directory (sessions, //! logs, caches, screenshots, task and review memory — byproducts of the tool running, not changes //! to the project), and whatever bookkeeping a given project keeps that its reviewers already //! ignore. The first is excluded always and needs no configuration; the second is `review.exclude`. @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; -/// Luxe's own project directory. Never reviewed, never configurable. +/// luxe's own project directory. Never reviewed, never configurable. pub const LUXE_PROJECT_DIR: &str = ".luxe"; /// What a review leaves out of the diff it presents. @@ -37,13 +37,13 @@ impl ReviewExclusions { is_luxe_artifact(path) || self.patterns.iter().any(|pattern| matches_glob(pattern, path)) } - /// Whether anything beyond Luxe's own directory is configured. + /// Whether anything beyond luxe's own directory is configured. pub fn is_empty(&self) -> bool { self.patterns.is_empty() } } -/// Whether a path is a byproduct of Luxe running rather than a change to the project. +/// Whether a path is a byproduct of luxe running rather than a change to the project. pub fn is_luxe_artifact(path: &str) -> bool { path == LUXE_PROJECT_DIR || path.starts_with(&format!("{LUXE_PROJECT_DIR}/")) diff --git a/crates/luxe-core/src/guided_review/feedback_message.rs b/crates/luxe-core/src/guided_review/feedback_message.rs index ac81c3d..b376143 100644 --- a/crates/luxe-core/src/guided_review/feedback_message.rs +++ b/crates/luxe-core/src/guided_review/feedback_message.rs @@ -84,7 +84,7 @@ pub fn format_review_feedback_message( pub(crate) const REPORT_INSTRUCTION: &str = "End your reply with this block, exactly as shown, one \ line per comment in the order above. Set each status to fixed, not_fixed or \ - needs_clarification, and replace each note with one sentence on what you did. Luxe reads it to \ + needs_clarification, and replace each note with one sentence on what you did. luxe reads it to \ update the review; the reviewer sees your prose, not this."; /// A finding's words as the agent reads them: the reader's own as they are, and a GitHub diff --git a/crates/luxe-core/src/guided_review/feedback_message/tests.rs b/crates/luxe-core/src/guided_review/feedback_message/tests.rs index 4d6703f..299a75d 100644 --- a/crates/luxe-core/src/guided_review/feedback_message/tests.rs +++ b/crates/luxe-core/src/guided_review/feedback_message/tests.rs @@ -138,7 +138,7 @@ fn formatter_keeps_review_evidence_deterministic_and_structured() { assert!(message.contains("Do not rewrite unrelated code.")); // the report a fix request asks for is the last thing it says, with the real IDs in it, - // and filled in it is a report Luxe accepts + // and filled in it is a report luxe accepts let template = crate::guided_review::remediation_report_template(std::slice::from_ref( &finding.finding_id, )); diff --git a/crates/luxe-core/src/guided_review/feedback_session/finding.rs b/crates/luxe-core/src/guided_review/feedback_session/finding.rs index e487ac4..512d7d9 100644 --- a/crates/luxe-core/src/guided_review/feedback_session/finding.rs +++ b/crates/luxe-core/src/guided_review/feedback_session/finding.rs @@ -176,7 +176,7 @@ pub enum FindingMessageAuthor { Reviewer, /// A remediation report from the active agent. Agent, - /// Luxe-generated lifecycle evidence. + /// luxe-generated lifecycle evidence. System, } @@ -186,7 +186,7 @@ impl FindingMessageAuthor { match self { Self::Reviewer => "Reviewer", Self::Agent => "Agent", - Self::System => "Luxe", + Self::System => "luxe", } } } diff --git a/crates/luxe-core/src/guided_review/feedback_session/submissions.rs b/crates/luxe-core/src/guided_review/feedback_session/submissions.rs index abb710c..6121624 100644 --- a/crates/luxe-core/src/guided_review/feedback_session/submissions.rs +++ b/crates/luxe-core/src/guided_review/feedback_session/submissions.rs @@ -187,7 +187,7 @@ impl ReviewSession { Ok(()) } - /// Notes, in Luxe's own name, that a fix turn ended with no word from the agent on these + /// Notes, in luxe's own name, that a fix turn ended with no word from the agent on these /// comments, and why. /// /// Without it a comment the agent was asked to fix looks exactly as if it had been ignored. The diff --git a/crates/luxe-core/src/guided_review/guide_plan.rs b/crates/luxe-core/src/guided_review/guide_plan.rs index 1bbf414..f29f886 100644 --- a/crates/luxe-core/src/guided_review/guide_plan.rs +++ b/crates/luxe-core/src/guided_review/guide_plan.rs @@ -420,7 +420,7 @@ const BRIEF_INSTRUCTION: &str = "Also add a top-level \"brief\": {\"intent\", \" Its reader has already seen the conversation, so don't repeat it. `intent` is one or two \ sentences on the problem being solved. `account` is up to five short claims about what the \ change does, each one something a reviewer can check in the diff. Don't report on your own \ - testing; Luxe states that from the record.\n"; + testing; luxe states that from the record.\n"; /// The request describing one batch, or `None` when it cannot be serialized. fn batch_prompt( diff --git a/crates/luxe-core/src/guided_review/loader/tests/capture_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/capture_tests.rs index 5b3f7b2..0b9a28d 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/capture_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/capture_tests.rs @@ -10,7 +10,7 @@ async fn repository() -> (tempfile::TempDir, LocalGit) { let project = tempfile::tempdir().unwrap(); let git = LocalGit::new(project.path()); git.run("initialize repository", &["init", "--quiet"]).await.unwrap(); - git.run("name the author", &["config", "user.name", "Luxe Tests"]).await.unwrap(); + git.run("name the author", &["config", "user.name", "luxe Tests"]).await.unwrap(); git.run("mail the author", &["config", "user.email", "tests@luxe.invalid"]).await.unwrap(); std::fs::write(project.path().join("keep.txt"), "kept\n").unwrap(); commit_all(&git, "initial").await; @@ -154,7 +154,7 @@ async fn a_commit_of_empty_and_binary_additions_loads_whole() { assert!(!review.chapters.is_empty()); } -/// Luxe's own rendering of an empty file that is gone parses as the deletion it describes. +/// luxe's own rendering of an empty file that is gone parses as the deletion it describes. #[test] fn an_empty_whole_file_deletion_parses() { let rendered = crate::guided_review::render_whole_file_deletion(Path::new("gone.txt"), ""); diff --git a/crates/luxe-core/src/guided_review/loader/tests/commit_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/commit_tests.rs index 887df29..556373d 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/commit_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/commit_tests.rs @@ -11,7 +11,7 @@ async fn project_with_changes() -> (tempfile::TempDir, LocalGit) { // In the repository, not as `-c` flags on the setup commit: the commit under test is made by // *product* code, which rightly never invents an author. A machine with no global identity — a // CI runner, a fresh container — then fails at the assertion rather than at the fixture. - git.run("configure author", &["config", "user.name", "Luxe Tests"]).await.unwrap(); + git.run("configure author", &["config", "user.name", "luxe Tests"]).await.unwrap(); git.run("configure author", &["config", "user.email", "tests@luxe.local"]).await.unwrap(); std::fs::write(project.path().join("lib.rs"), "let a = 1;\n").unwrap(); std::fs::write(project.path().join("notes.md"), "old\n").unwrap(); diff --git a/crates/luxe-core/src/guided_review/loader/tests/dispatch_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/dispatch_tests.rs index 001f648..7c03f4b 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/dispatch_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/dispatch_tests.rs @@ -181,7 +181,7 @@ async fn base_target_resolves_a_local_merge_base_and_rejects_unsafe_input() { "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -240,7 +240,7 @@ async fn commit_target_records_first_parent_and_root_semantics() { "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -273,7 +273,7 @@ async fn commit_target_records_first_parent_and_root_semantics() { "create follow-up commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -315,7 +315,7 @@ async fn merge_commit_target_uses_only_its_first_parent() { "commit base", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -333,7 +333,7 @@ async fn merge_commit_target_uses_only_its_first_parent() { "commit feature", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -351,7 +351,7 @@ async fn merge_commit_target_uses_only_its_first_parent() { "commit main", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -369,7 +369,7 @@ async fn merge_commit_target_uses_only_its_first_parent() { "merge feature", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "merge", @@ -539,7 +539,7 @@ async fn commit(git: &LocalGit, message: &str) { "create commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", diff --git a/crates/luxe-core/src/guided_review/loader/tests/pull_request_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/pull_request_tests.rs index 2d1579a..6afbf42 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/pull_request_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/pull_request_tests.rs @@ -11,7 +11,7 @@ fn git(dir: &Path, args: &[&str]) -> String { } fn identify(dir: &Path) { - git(dir, &["config", "user.name", "Luxe Tests"]); + git(dir, &["config", "user.name", "luxe Tests"]); git(dir, &["config", "user.email", "tests@luxe.local"]); } diff --git a/crates/luxe-core/src/guided_review/loader/tests/source_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/source_tests.rs index 3015246..6c9e23e 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/source_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/source_tests.rs @@ -41,7 +41,7 @@ async fn complete_head_worktree_source_has_one_tracked_stream_and_sorted_untrack "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -292,7 +292,7 @@ async fn provenance_marks_staged_and_unstaged_changes_without_a_patch() { "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -324,7 +324,7 @@ async fn index_delete_and_worktree_recreate_remains_a_final_state_noop() { "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -364,7 +364,7 @@ async fn tracked_capture_compares_the_head_to_the_final_worktree_state() { "create initial commit", &[ "-c", - "user.name=Luxe Tests", + "user.name=luxe Tests", "-c", "user.email=tests@luxe.invalid", "commit", @@ -453,7 +453,7 @@ async fn unborn_worktree_resolves_to_the_empty_tree() { ); } -/// Luxe's own directory is a byproduct of the tool running, never the user's change. +/// luxe's own directory is a byproduct of the tool running, never the user's change. /// /// It arrived in reviews two ways: as an untracked path (`.luxe/.gitignore` used to un-ignore /// itself, which is all Git needs to report the whole directory), and — for anyone who committed @@ -488,7 +488,7 @@ async fn an_untracked_file_the_policy_cannot_hold_is_left_out_and_named() { git.run("stage initial file", &["add", "tracked.txt"]).await.unwrap(); git.run( "commit initial file", - &["-c", "user.name=Luxe", "-c", "user.email=luxe@example.invalid", "commit", "-qm", "base"], + &["-c", "user.name=luxe", "-c", "user.email=luxe@example.invalid", "commit", "-qm", "base"], ) .await .unwrap(); diff --git a/crates/luxe-core/src/guided_review/loader/tests/turn_tests.rs b/crates/luxe-core/src/guided_review/loader/tests/turn_tests.rs index dd1ff15..26e7f52 100644 --- a/crates/luxe-core/src/guided_review/loader/tests/turn_tests.rs +++ b/crates/luxe-core/src/guided_review/loader/tests/turn_tests.rs @@ -39,7 +39,7 @@ async fn last_turn_preserves_preexisting_dirty_and_untracked_content() { git.run("configure test identity", &["config", "user.email", "tests@example.invalid"]) .await .unwrap(); - git.run("configure test name", &["config", "user.name", "Luxe Tests"]).await.unwrap(); + git.run("configure test name", &["config", "user.name", "luxe Tests"]).await.unwrap(); std::fs::write(project.path().join("tracked.txt"), "committed\n").unwrap(); git.run("stage fixture", &["add", "tracked.txt"]).await.unwrap(); git.run("commit fixture", &["commit", "--quiet", "-m", "fixture"]).await.unwrap(); diff --git a/crates/luxe-core/src/guided_review/model.rs b/crates/luxe-core/src/guided_review/model.rs index 6e2326e..fc8378e 100644 --- a/crates/luxe-core/src/guided_review/model.rs +++ b/crates/luxe-core/src/guided_review/model.rs @@ -58,7 +58,7 @@ pub enum ReviewBase { /// First parent, absent for a root commit. parent_oid: Option, }, - /// Complete pre-turn baseline retained by Luxe. + /// Complete pre-turn baseline retained by luxe. TurnBaseline { /// Immutable baseline revision identifier. revision_id: ReviewRevisionId, @@ -201,7 +201,7 @@ pub struct ReviewStats { pub binary_files: u64, /// Number of explicit non-text file items. pub non_text_files: u64, - /// Files left out of the review by `review.exclude` or as Luxe's own artifacts. + /// Files left out of the review by `review.exclude` or as luxe's own artifacts. /// /// Counted, never silent: a review that shows less than the diff has to say so. #[serde(default)] diff --git a/crates/luxe-core/src/guided_review/posting.rs b/crates/luxe-core/src/guided_review/posting.rs index a15dc43..4ea2ff7 100644 --- a/crates/luxe-core/src/guided_review/posting.rs +++ b/crates/luxe-core/src/guided_review/posting.rs @@ -2,7 +2,7 @@ //! //! The reviewer's comments become a single review with a verdict, the way they would submit one on //! the site. Where each comment lands is decided here, against GitHub's own patches rather than -//! Luxe's diff: the two usually agree, and a comment that assumed so and was wrong would be refused +//! luxe's diff: the two usually agree, and a comment that assumed so and was wrong would be refused //! (`Line could not be resolved`) and take the whole review with it. //! //! Nothing is added to the reviewer's words. A comment that cannot sit on a line goes in the diff --git a/crates/luxe-core/src/guided_review/posting/tests.rs b/crates/luxe-core/src/guided_review/posting/tests.rs index 7fe1f57..26ee9a1 100644 --- a/crates/luxe-core/src/guided_review/posting/tests.rs +++ b/crates/luxe-core/src/guided_review/posting/tests.rs @@ -48,7 +48,7 @@ fn review() -> GuidedReview { } } -/// GitHub's patch agrees with Luxe's diff unless a test says otherwise. +/// GitHub's patch agrees with luxe's diff unless a test says otherwise. fn patches_matching(review: &GuidedReview) -> Vec { review .files diff --git a/crates/luxe-core/src/guided_review/provenance.rs b/crates/luxe-core/src/guided_review/provenance.rs index 99becd8..8941566 100644 --- a/crates/luxe-core/src/guided_review/provenance.rs +++ b/crates/luxe-core/src/guided_review/provenance.rs @@ -2,7 +2,7 @@ //! //! A diff shows the result; the process is where the review-critical signals live. A skipped test, //! a file edited without ever being read, a weakened gate, work nobody asked for — none of those -//! appear in the patch. Luxe is the harness, so it can read them off its own transcript instead of +//! appear in the patch. luxe is the harness, so it can read them off its own transcript instead of //! inferring intent from filenames. //! //! This is bounded, redacted, UI-neutral data. It grounds the chaptering prompt and renders as the @@ -53,7 +53,7 @@ impl CommandRun { } } -/// Whether a command line reads as a test run across the ecosystems Luxe drives. +/// Whether a command line reads as a test run across the ecosystems luxe drives. fn looks_like_test_command(command: &str) -> bool { let lowered = command.to_ascii_lowercase(); [ @@ -118,7 +118,7 @@ impl TurnProvenance { match message.role { Role::User => { if let Some(text) = message_text(message) { - // Feedback submissions are Luxe talking to itself, not a user request. + // Feedback submissions are luxe talking to itself, not a user request. if !text.starts_with("Guided review feedback") { provenance.requests.push(bounded(&text, MAX_ACCOUNT_CHARS)); } diff --git a/crates/luxe-core/src/guided_review/provenance/tests.rs b/crates/luxe-core/src/guided_review/provenance/tests.rs index 6503728..8d49b62 100644 --- a/crates/luxe-core/src/guided_review/provenance/tests.rs +++ b/crates/luxe-core/src/guided_review/provenance/tests.rs @@ -204,7 +204,7 @@ fn a_path_outside_the_project_is_not_recorded() { assert!(provenance.written_paths.is_empty(), "nothing outside the project is attributed"); } -/// The `test` tool is the one Luxe tells models to prefer, and its command is auto-detected, +/// The `test` tool is the one luxe tells models to prefer, and its command is auto-detected, /// so an argument-less call still ran the suite. #[test] fn the_test_tool_counts_as_a_command_that_verifies() { diff --git a/crates/luxe-core/src/guided_review/pull_request_draft.rs b/crates/luxe-core/src/guided_review/pull_request_draft.rs index 447d3b5..37134cf 100644 --- a/crates/luxe-core/src/guided_review/pull_request_draft.rs +++ b/crates/luxe-core/src/guided_review/pull_request_draft.rs @@ -3,10 +3,10 @@ //! A branch's Guided Review already says what changed and why, chapter by chapter, in the order it //! makes sense. That is the description a pull request usually lacks, so it becomes the draft: the //! review's intent, each chapter with its reasons, and `Closes #n` when the session took up an -//! issue. Anyone reading it on GitHub gets the story, with or without Luxe. +//! issue. Anyone reading it on GitHub gets the story, with or without luxe. //! //! It is a draft. The reader edits it in a preview before anything is sent, and nothing is added -//! that they did not see: no signature, no marker, nothing about Luxe. +//! that they did not see: no signature, no marker, nothing about luxe. use super::{ChapterKind, GuidedReview}; diff --git a/crates/luxe-core/src/guided_review/remediation.rs b/crates/luxe-core/src/guided_review/remediation.rs index f34f360..4d3489a 100644 --- a/crates/luxe-core/src/guided_review/remediation.rs +++ b/crates/luxe-core/src/guided_review/remediation.rs @@ -84,13 +84,13 @@ pub enum RemediationReportError { /// The report describes a different immutable source revision. #[error("remediation report has a different source revision")] WrongRevision, - /// Not one entry names a comment that was sent with a status Luxe reads. + /// Not one entry names a comment that was sent with a status luxe reads. #[error("remediation report names no submitted finding with a known status")] NothingUsable, } impl RemediationReportError { - /// What went wrong, as the tail of a sentence: told to the agent when Luxe asks again, and to + /// What went wrong, as the tail of a sentence: told to the agent when luxe asks again, and to /// the reviewer on each comment the report did not cover. pub fn reason(&self) -> &'static str { match self { @@ -232,7 +232,7 @@ fn first_json_value(text: &str) -> Result<(Value, usize), serde_json::Error> { /// /// A review or revision the report names must be the turn's, prefix or no prefix, or the whole /// report is refused: it is about something else. One it leaves out is the turn's. Inside it, an entry for a comment that was not sent, a second entry for -/// the same comment, or a status Luxe cannot read is dropped and the rest are kept. A report left +/// the same comment, or a status luxe cannot read is dropped and the rest are kept. A report left /// with nothing is [`RemediationReportError::NothingUsable`]. fn read_report( value: &Value, @@ -260,7 +260,7 @@ fn read_report( findings.push(result); } Some(_) => tracing::debug!("dropped a second report entry for one comment"), - None => tracing::debug!(%entry, "dropped a report entry Luxe cannot use"), + None => tracing::debug!(%entry, "dropped a report entry luxe cannot use"), } } if findings.is_empty() { @@ -273,7 +273,7 @@ fn read_report( }) } -/// One entry, when it names a comment that was sent and has a status Luxe reads. +/// One entry, when it names a comment that was sent and has a status luxe reads. fn read_result(entry: &Value, known: &[FindingId]) -> Option { let named = entry.get("finding_id")?.as_str()?.trim(); // the known ID, never one built out of what the model wrote diff --git a/crates/luxe-core/src/guided_review/remediation/tests.rs b/crates/luxe-core/src/guided_review/remediation/tests.rs index 4aa959a..9d56b46 100644 --- a/crates/luxe-core/src/guided_review/remediation/tests.rs +++ b/crates/luxe-core/src/guided_review/remediation/tests.rs @@ -26,7 +26,7 @@ fn extract(text: &str) -> Result, RemediationReportErr fn statuses(text: &str) -> Vec<(String, RemediationStatus)> { extract(text) - .expect("a report Luxe can use") + .expect("a report luxe can use") .expect("a report") .findings .into_iter() diff --git a/crates/luxe-core/src/guided_review/seen_store.rs b/crates/luxe-core/src/guided_review/seen_store.rs index 1ca33e9..0e3f070 100644 --- a/crates/luxe-core/src/guided_review/seen_store.rs +++ b/crates/luxe-core/src/guided_review/seen_store.rs @@ -207,7 +207,7 @@ mod tests { number, repository: repository.map(str::to_owned), }; - store.record(&pr(7, Some("Upstream/Luxe")), seen(&["a"])).unwrap(); + store.record(&pr(7, Some("Upstream/luxe")), seen(&["a"])).unwrap(); store.record(&pr(7, None), seen(&["b"])).unwrap(); assert_eq!(store.load(&pr(7, Some("upstream/luxe"))).unwrap().item_ids, vec!["a"]); diff --git a/crates/luxe-core/src/guided_review/source_store.rs b/crates/luxe-core/src/guided_review/source_store.rs index c43a01f..14a6167 100644 --- a/crates/luxe-core/src/guided_review/source_store.rs +++ b/crates/luxe-core/src/guided_review/source_store.rs @@ -90,7 +90,7 @@ pub enum SourceStoreError { /// Underlying JSON error. error: serde_json::Error, }, - /// The artifact uses a schema this Luxe version does not understand. + /// The artifact uses a schema this luxe version does not understand. #[error("review source artifact uses unsupported schema {schema_version}")] UnsupportedSchema { /// Schema version found in the manifest. diff --git a/crates/luxe-core/src/hook.rs b/crates/luxe-core/src/hook.rs index db3a928..d5b6d9f 100644 --- a/crates/luxe-core/src/hook.rs +++ b/crates/luxe-core/src/hook.rs @@ -87,7 +87,7 @@ impl HookPoint { Self::PermissionResolved, ]; - /// The one spelling Luxe writes and documents, matching how the variant serializes. + /// The one spelling luxe writes and documents, matching how the variant serializes. /// /// Exhaustive on purpose: a new variant does not compile until it has a name here. pub fn canonical_name(&self) -> &'static str { diff --git a/crates/luxe-core/src/hooks/herdr.rs b/crates/luxe-core/src/hooks/herdr.rs index ee9a9e7..a493350 100644 --- a/crates/luxe-core/src/hooks/herdr.rs +++ b/crates/luxe-core/src/hooks/herdr.rs @@ -5,9 +5,9 @@ //! at a glance, which agent is running, which needs a decision, and which is ready to review. //! //! Herdr recognizes most agents by *process detection* + screen scraping, which requires a Herdr -//! binary update per new agent. Instead Luxe acts as a **custom socket integration** (Herdr's -//! supported extension path): when Luxe runs inside a Herdr pane (`HERDR_ENV=1`), this hook reports -//! Luxe's own lifecycle to Herdr via the `herdr pane report-agent` CLI. That makes Luxe a +//! binary update per new agent. Instead luxe acts as a **custom socket integration** (Herdr's +//! supported extension path): when luxe runs inside a Herdr pane (`HERDR_ENV=1`), this hook reports +//! luxe's own lifecycle to Herdr via the `herdr pane report-agent` CLI. That makes luxe a //! first-class, correctly-tracked agent in the sidebar without Herdr needing to know the `luxe` //! process at all. //! @@ -136,7 +136,7 @@ impl HerdrReporter for CliHerdrReporter { } } -/// Reports Luxe's lifecycle to Herdr. Registered only when running inside a Herdr pane. +/// Reports luxe's lifecycle to Herdr. Registered only when running inside a Herdr pane. pub struct HerdrHook { reporter: Box, /// Last state sent, to suppress redundant reports (a turn fires `AgentStart` many times). diff --git a/crates/luxe-core/src/hooks/plan_reminder.rs b/crates/luxe-core/src/hooks/plan_reminder.rs index aae251b..7f5e831 100644 --- a/crates/luxe-core/src/hooks/plan_reminder.rs +++ b/crates/luxe-core/src/hooks/plan_reminder.rs @@ -271,7 +271,7 @@ mod tests { assert_eq!(run(&hook, "read", 1).await.len(), 1); } - /// Loading a deferred tool's schema is Luxe's own request-budget bookkeeping, not a step in the + /// Loading a deferred tool's schema is luxe's own request-budget bookkeeping, not a step in the /// task — so it cannot be the work a plan has fallen behind. #[tokio::test] async fn bookkeeping_calls_are_not_work_the_plan_fell_behind() { diff --git a/crates/luxe-core/src/hooks/self_continuation.rs b/crates/luxe-core/src/hooks/self_continuation.rs index 0691159..2b98f14 100644 --- a/crates/luxe-core/src/hooks/self_continuation.rs +++ b/crates/luxe-core/src/hooks/self_continuation.rs @@ -273,11 +273,23 @@ impl Hook for SelfContinuationHook { info!(iteration, "continuing the loop"); debug!(%steer, "self-continuation steer"); // The one marker that makes a run readable from outside: where it is, each time it moves. - cx.notify(format!("iteration {iteration} · phase {}", state.current_phase)); + cx.notify(iteration_notice(iteration, state.current_phase)); HookOutcome::ContinueLoop { message: steer } } } +/// The notice that opens each iteration: `iteration 4 · phase 1`. +pub fn iteration_notice(iteration: u64, phase: u32) -> String { + format!("iteration {iteration} · phase {phase}") +} + +/// The iteration and phase an [`iteration_notice`] names, or `None` for any other notice. Beside +/// the writer so a front-end drawing the run's structure never guesses at the wording. +pub fn parse_iteration_notice(notice: &str) -> Option<(u64, u32)> { + let (iteration, phase) = notice.strip_prefix("iteration ")?.split_once(" · phase ")?; + Some((iteration.parse().ok()?, phase.parse().ok()?)) +} + #[cfg(test)] mod tests; diff --git a/crates/luxe-core/src/hooks/self_continuation/tests.rs b/crates/luxe-core/src/hooks/self_continuation/tests.rs index adfc8bd..ae7677a 100644 --- a/crates/luxe-core/src/hooks/self_continuation/tests.rs +++ b/crates/luxe-core/src/hooks/self_continuation/tests.rs @@ -209,3 +209,24 @@ async fn test_self_continuation_hook_stopped_sentinel() { // STOP sentinel exists -> Continue. assert!(matches!(outcome, HookOutcome::Continue)); } + +/// The notice is pinned as a literal, since the loop view reads it, and the parser reads it back. +#[test] +fn the_iteration_notice_reads_back() { + assert_eq!(iteration_notice(4, 1), "iteration 4 · phase 1"); + assert_eq!(parse_iteration_notice("iteration 4 · phase 1"), Some((4, 1))); +} + +/// Every other notice, a near miss included, is not an iteration. +#[test] +fn other_notices_are_not_iterations() { + for notice in [ + "phase 0 accepted — now on phase 1", + "iteration 4", + "iteration x · phase 1", + "iteration 4 · phase one", + "", + ] { + assert_eq!(parse_iteration_notice(notice), None, "{notice}"); + } +} diff --git a/crates/luxe-core/src/instructions.rs b/crates/luxe-core/src/instructions.rs index 8ed3eb7..217539c 100644 --- a/crates/luxe-core/src/instructions.rs +++ b/crates/luxe-core/src/instructions.rs @@ -71,7 +71,7 @@ impl Sanitized { } if self.withheld { return Some(format!( - "{name}: left out of the prompt — it repeats link definitions more often than Luxe \ + "{name}: left out of the prompt — it repeats link definitions more often than luxe \ can check for hidden text" )); } @@ -132,7 +132,7 @@ const PLACEHOLDER: char = '\u{7f}'; /// The whole text of a withheld file, so every caller passes the reason on rather than an empty /// string. -const WITHHELD: &str = "[withheld: this file repeats link definitions more often than Luxe can \ +const WITHHELD: &str = "[withheld: this file repeats link definitions more often than luxe can \ check for hidden text]"; /// Characters that put text on the page without putting it in front of anyone. @@ -175,7 +175,7 @@ pub enum ContextScope { Global, /// The top of the checkout, or the project directory when there is none Project, - /// A folder below that, on the way down to where Luxe was launched + /// A folder below that, on the way down to where luxe was launched Folder, } @@ -226,7 +226,7 @@ pub fn context_files(cwd: &std::path::Path) -> Vec { /// Marks each file that repeats an earlier one, by identity first and then by text. /// -/// Byte-identical text is the only overlap Luxe settles on its own. Two files that say *mostly* +/// Byte-identical text is the only overlap luxe settles on its own. Two files that say *mostly* /// the same thing are two files someone wrote, and choosing between their sentences is the /// author's job. fn dedupe(found: impl Iterator) -> Vec { @@ -263,15 +263,15 @@ pub fn project_context_file(cwd: &std::path::Path) -> std::path::PathBuf { top.unwrap_or_else(|| cwd.to_path_buf()).join(INSTRUCTION_FILES[0]) } -/// The global instruction file Luxe creates when asked: `~/.config/luxe/agents.md`. +/// The global instruction file luxe creates when asked: `~/.config/luxe/agents.md`. pub fn global_context_file() -> std::path::PathBuf { crate::user_dirs::luxe_config_dir().join("agents.md") } -/// Every global instruction file Luxe reads, broadest first, whether or not it exists. +/// Every global instruction file luxe reads, broadest first, whether or not it exists. /// /// `~/.agents/AGENTS.md` is the file a growing number of people keep for *every* agent they run, -/// and Luxe's own sits after it so the Luxe-specific word lands later. Somebody who symlinked one to +/// and luxe's own sits after it so the luxe-specific word lands later. Somebody who symlinked one to /// the other gets it once. pub fn global_context_files() -> Vec { let shared = crate::user_dirs::home_dir().map(|home| home.join(".agents").join("AGENTS.md")); diff --git a/crates/luxe-core/src/instructions/nested.rs b/crates/luxe-core/src/instructions/nested.rs index c565839..9d4b2a6 100644 --- a/crates/luxe-core/src/instructions/nested.rs +++ b/crates/luxe-core/src/instructions/nested.rs @@ -1,7 +1,7 @@ //! Nested instructions — the `AGENTS.md` files off the launch chain, read when work reaches them. //! -//! The system prompt carries the files from the top of the checkout down to where Luxe started, -//! and it's written once per session. A file in a folder off that chain (`web/AGENTS.md` when Luxe +//! The system prompt carries the files from the top of the checkout down to where luxe started, +//! and it's written once per session. A file in a folder off that chain (`web/AGENTS.md` when luxe //! started at the root) can't join it without rewriting the prompt every later request is cached //! against. So it rides on the result of the first tool call that reaches its folder: an append, //! like any other result. Whether the model already has one is read off the conversation by the diff --git a/crates/luxe-core/src/instructions/nested/tests.rs b/crates/luxe-core/src/instructions/nested/tests.rs index 1bc6796..a3caf58 100644 --- a/crates/luxe-core/src/instructions/nested/tests.rs +++ b/crates/luxe-core/src/instructions/nested/tests.rs @@ -12,7 +12,7 @@ fn checkout(files: &[&str]) -> tempfile::TempDir { dir } -/// What [`nested_files`] names for `target`, from Luxe launched at `launch`, both under `root`. +/// What [`nested_files`] names for `target`, from luxe launched at `launch`, both under `root`. fn shown(root: &Path, launch: &str, target: &str) -> Vec { let files = nested_files(&root.join(launch), &root.join(target)); files.into_iter().map(|file| file.shown).collect() diff --git a/crates/luxe-core/src/instructions/tests.rs b/crates/luxe-core/src/instructions/tests.rs index 44646cb..cf03c59 100644 --- a/crates/luxe-core/src/instructions/tests.rs +++ b/crates/luxe-core/src/instructions/tests.rs @@ -649,7 +649,7 @@ fn identical_text_is_carried_once_and_different_text_is_not_touched() { assert!(found[0].is_loaded()); assert!(!found[1].is_loaded()); assert_eq!(found[1].duplicate_of, Some(root.join("AGENTS.md")), "a byte-identical copy"); - assert!(found[2].is_loaded(), "overlap is the author's to settle, not Luxe's"); + assert!(found[2].is_loaded(), "overlap is the author's to settle, not luxe's"); } /// Two empty files are not "the same instructions" in any sense worth reporting. @@ -682,7 +682,7 @@ fn a_directory_prefers_agents_md_but_accepts_claude_md() { fn the_global_files_put_the_shared_one_first() { let files = global_context_files(); assert!(global_context_file().ends_with(std::path::Path::new("luxe").join("agents.md"))); - assert_eq!(files.last(), Some(&global_context_file()), "Luxe's own comes last"); + assert_eq!(files.last(), Some(&global_context_file()), "luxe's own comes last"); if let Some(home) = crate::user_dirs::home_dir() { assert_eq!(files.first(), Some(&home.join(".agents").join("AGENTS.md"))); } diff --git a/crates/luxe-core/src/json_file.rs b/crates/luxe-core/src/json_file.rs index 7080587..9f7d8cd 100644 --- a/crates/luxe-core/src/json_file.rs +++ b/crates/luxe-core/src/json_file.rs @@ -2,10 +2,10 @@ //! //! The provider credential store, the config and permissions writers and the MCP token store all //! edit a file a human owns, which sets the rules: never lose a key we don't understand, never -//! leave a half-written file behind, and never race another Luxe process (a token refresh in one +//! leave a half-written file behind, and never race another luxe process (a token refresh in one //! and a `/login` in another). //! -//! The lock is a directory. `create_dir` is atomic everywhere Luxe runs and needs no dependency; a +//! The lock is a directory. `create_dir` is atomic everywhere luxe runs and needs no dependency; a //! lock older than `LOCK_STALE` is assumed to belong to a killed process and is broken, because //! refusing to ever write again is the worse failure. @@ -88,7 +88,7 @@ impl JsonFile { /// Parse as a JSON object, treating an absent, empty, or malformed file as "nothing yet". /// - /// Reads are forgiving on purpose: a syntax error in a config file must not stop Luxe from + /// Reads are forgiving on purpose: a syntax error in a config file must not stop luxe from /// starting, only from writing. pub fn read(&self) -> Option> { let text = std::fs::read_to_string(&self.path).ok()?; @@ -124,7 +124,7 @@ impl JsonFile { Ok(outcome) } - /// [`Self::modify`] for a file Luxe writes for itself, where one that does not parse is moved + /// [`Self::modify`] for a file luxe writes for itself, where one that does not parse is moved /// aside rather than refused: to `.bad`, or `.bad-` when that is taken, so an /// earlier one survives. The move happens under the lock, so two writers meeting the same broken /// file cannot set each other's work aside. Returns where the broken file went. diff --git a/crates/luxe-core/src/local_endpoint.rs b/crates/luxe-core/src/local_endpoint.rs index bbcb52b..64deb48 100644 --- a/crates/luxe-core/src/local_endpoint.rs +++ b/crates/luxe-core/src/local_endpoint.rs @@ -1,6 +1,6 @@ -//! local_endpoint — the way into a running Luxe from the same machine, and the list of them. +//! local_endpoint — the way into a running luxe from the same machine, and the list of them. //! -//! Each interactive Luxe serves its protocol here, so another front-end (the `luxe remote` bridge, +//! Each interactive luxe serves its protocol here, so another front-end (the `luxe remote` bridge, //! `luxe join`, a script) can join the session it is running. It is local IPC, not network I/O: a //! Unix socket in a folder only this user can open, or on Windows a named pipe only this user can //! open and no other machine can reach. This module is the one owner of those platform details. @@ -28,14 +28,14 @@ pub trait LocalIo: AsyncRead + AsyncWrite + Unpin + Send {} impl LocalIo for T {} -/// A connection to or from a running Luxe. +/// A connection to or from a running luxe. pub type LocalStream = Box; /// A client that connected, with its process id where the platform reports one. pub struct Joined { /// The connection pub stream: LocalStream, - /// The client's process id, for the check that it is not one of this Luxe's own children + /// The client's process id, for the check that it is not one of this luxe's own children pub peer: Option, } @@ -61,7 +61,7 @@ impl EndpointError { } } -/// This Luxe's endpoint, open for clients until it is dropped. +/// This luxe's endpoint, open for clients until it is dropped. pub struct EndpointListener(platform::Listener); impl EndpointListener { diff --git a/crates/luxe-core/src/local_endpoint/ancestry.rs b/crates/luxe-core/src/local_endpoint/ancestry.rs index e622d22..e57ef69 100644 --- a/crates/luxe-core/src/local_endpoint/ancestry.rs +++ b/crates/luxe-core/src/local_endpoint/ancestry.rs @@ -1,6 +1,6 @@ //! Ancestry — whether a process was started, at any depth, by another. //! -//! The tripwire that keeps a Luxe's own children (the agent's `bash`, a hook) from joining its +//! The tripwire that keeps a luxe's own children (the agent's `bash`, a hook) from joining its //! session and answering their own prompts. A tripwire, not a wall: a process that detaches itself //! leaves the chain, and the documentation says so. Blocking: run it off the async runtime. diff --git a/crates/luxe-core/src/local_endpoint/live.rs b/crates/luxe-core/src/local_endpoint/live.rs index 2959cec..111bd15 100644 --- a/crates/luxe-core/src/local_endpoint/live.rs +++ b/crates/luxe-core/src/local_endpoint/live.rs @@ -1,17 +1,17 @@ //! Live sessions — which Luxes on this machine can be joined, and where. //! -//! Each running Luxe with an endpoint leaves a small record in the runtime folder, named for its -//! process, and takes it away when it stops. A record left by a Luxe that died is found out by the +//! Each running luxe with an endpoint leaves a small record in the runtime folder, named for its +//! process, and takes it away when it stops. A record left by a luxe that died is found out by the //! one test that matters: its endpoint no longer answers. use serde::{Deserialize, Serialize}; use std::io; use std::path::{Path, PathBuf}; -/// One running Luxe that can be joined. +/// One running luxe that can be joined. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct LiveSession { - /// The Luxe's process id + /// The luxe's process id pub pid: u32, /// Session it is running pub session_id: String, @@ -23,7 +23,7 @@ pub struct LiveSession { pub luxe_version: String, } -/// This Luxe's record in the runtime folder, removed when dropped. +/// This luxe's record in the runtime folder, removed when dropped. pub struct Publication { path: PathBuf, } @@ -39,7 +39,7 @@ impl LiveSession { } impl Publication { - /// Rewrites the record, as when the Luxe moves to another session. + /// Rewrites the record, as when the luxe moves to another session. pub fn update(&self, session: &LiveSession) -> io::Result<()> { let bytes = serde_json::to_vec_pretty(session).map_err(io::Error::other)?; crate::fs_atomic::replace_private(&self.path, &bytes) @@ -64,7 +64,7 @@ pub fn live_sessions(dir: &Path) -> Vec { found } -/// [`live_sessions`] whose Luxe is still running: one that crashed leaves its record behind. +/// [`live_sessions`] whose luxe is still running: one that crashed leaves its record behind. /// /// Checked by process id rather than by connecting, since a connection is a client joining, and the /// terminal running the session says so each time. diff --git a/crates/luxe-core/src/local_endpoint/tests.rs b/crates/luxe-core/src/local_endpoint/tests.rs index 0376553..af04d5a 100644 --- a/crates/luxe-core/src/local_endpoint/tests.rs +++ b/crates/luxe-core/src/local_endpoint/tests.rs @@ -35,7 +35,7 @@ async fn the_socket_is_private_and_goes_with_the_listener() { assert_eq!(mode(&run), 0o700, "the folder"); assert_eq!(mode(&socket), 0o600, "the socket"); drop(listener); - assert!(!socket.exists(), "a stopped Luxe leaves no socket behind"); + assert!(!socket.exists(), "a stopped luxe leaves no socket behind"); assert!(connect(&socket.to_string_lossy()).await.is_err()); } diff --git a/crates/luxe-core/src/local_endpoint/windows.rs b/crates/luxe-core/src/local_endpoint/windows.rs index 286744e..66ff94c 100644 --- a/crates/luxe-core/src/local_endpoint/windows.rs +++ b/crates/luxe-core/src/local_endpoint/windows.rs @@ -4,7 +4,7 @@ //! the anonymous account, and reading is the whole transcript; and a pipe can be opened across the //! network while the Server service runs. So every instance is created with a descriptor granting //! this user alone, remote clients are refused, and the first instance must be new, so nothing can -//! claim the name before Luxe does. +//! claim the name before luxe does. use super::{EndpointError, Joined, LocalStream}; use std::path::Path; diff --git a/crates/luxe-core/src/loop_controller.rs b/crates/luxe-core/src/loop_controller.rs index 19f23a0..1965cdf 100644 --- a/crates/luxe-core/src/loop_controller.rs +++ b/crates/luxe-core/src/loop_controller.rs @@ -349,7 +349,7 @@ impl LoopStatus { /// /// The flag alone cannot answer it: a killed run leaves `running: true` behind and has no way /// to correct it. An unrecorded owner reads as running, because that is what the file says and - /// there is nothing to contradict it — a state written by an older Luxe, or a run marked + /// there is nothing to contradict it — a state written by an older luxe, or a run marked /// resumable and not yet started. pub fn is_live(&self) -> bool { self.running && !matches!(self.liveness, crate::loop_state::LoopLiveness::Gone { .. }) diff --git a/crates/luxe-core/src/loop_state.rs b/crates/luxe-core/src/loop_state.rs index df6f36d..b76d732 100644 --- a/crates/luxe-core/src/loop_state.rs +++ b/crates/luxe-core/src/loop_state.rs @@ -116,7 +116,7 @@ pub enum LoopLiveness { /// The machine that wrote the record host: String, }, - /// Nothing was recorded: a state file written before Luxe kept this, or a run marked + /// Nothing was recorded: a state file written before luxe kept this, or a run marked /// resumable by `luxe loop resume`, which flags the state without driving anything. Unrecorded, } @@ -328,7 +328,7 @@ mod owner_tests { assert_eq!(state.owned_by_another_process(), None); } - /// A state file written before Luxe recorded an owner still loads, and claims nothing. + /// A state file written before luxe recorded an owner still loads, and claims nothing. #[test] fn a_state_without_an_owner_makes_no_claim() { let older = r#"{"running":true,"iteration":3,"current_phase":1,"max_turns_per_run":50, diff --git a/crates/luxe-core/src/mcp_client.rs b/crates/luxe-core/src/mcp_client.rs index d3a417f..732d434 100644 --- a/crates/luxe-core/src/mcp_client.rs +++ b/crates/luxe-core/src/mcp_client.rs @@ -32,7 +32,7 @@ pub enum McpTransport { /// Working directory for the process. cwd: Option, /// Extra environment variables for the child process. Values support `${VAR}` and - /// `$env:VAR` interpolation against Luxe's own environment. + /// `$env:VAR` interpolation against luxe's own environment. #[serde(default)] env: std::collections::HashMap, }, @@ -114,7 +114,7 @@ pub enum McpAuth { /// /// Spelled `oauth`, as every example in the docs writes it. `snake_case` alone made it /// `o_auth`, so a hand-written `"kind": "oauth"` failed to parse and took the whole file with it; - /// `o_auth` is still read, since that is what Luxe itself would have written. + /// `o_auth` is still read, since that is what luxe itself would have written. #[serde(rename = "oauth", alias = "o_auth")] OAuth(OAuthConfig), } @@ -276,7 +276,7 @@ pub struct McpToolResult { pub error: Option, } -/// The MCP protocol version Luxe speaks, on both transports and the OAuth probe. +/// The MCP protocol version luxe speaks, on both transports and the OAuth probe. pub const MCP_PROTOCOL_VERSION: &str = "2025-06-18"; /// Expands `${VAR}` and `$env:VAR` from the environment, left to right, whichever marker comes diff --git a/crates/luxe-core/src/mcp_config.rs b/crates/luxe-core/src/mcp_config.rs index 9b8a28d..2ae836f 100644 --- a/crates/luxe-core/src/mcp_config.rs +++ b/crates/luxe-core/src/mcp_config.rs @@ -92,7 +92,7 @@ struct StandardServer { enabled: bool, #[serde(default)] timeout_secs: Option, - /// Luxe's own addition to the shape: other hosts ignore it, and without it an OAuth server + /// luxe's own addition to the shape: other hosts ignore it, and without it an OAuth server /// written the way `docs/guide/mcp.md` shows lost its auth without a word #[serde(default)] auth: Option, @@ -102,7 +102,7 @@ fn default_true() -> bool { true } -/// Read a config file in either the Luxe (`servers`) or standard (`mcpServers`) shape. A missing, +/// Read a config file in either the luxe (`servers`) or standard (`mcpServers`) shape. A missing, /// empty, or unparseable file yields no servers (so a stray file never blocks launch), and says so. fn load_any(path: &Path) -> Vec { let Ok(text) = std::fs::read_to_string(path) else { return Vec::new() }; @@ -117,8 +117,8 @@ fn load_any(path: &Path) -> Vec { /// The servers `text` names in either shape, or why it names none it meant to. /// -/// A Luxe-shape file that fails to parse also reads as an empty standard one, so when the -/// standard shape finds nothing the Luxe error is the one that explains the file. +/// A luxe-shape file that fails to parse also reads as an empty standard one, so when the +/// standard shape finds nothing the luxe error is the one that explains the file. fn parse_any(text: &str) -> Result, String> { let luxe = serde_json::from_str::(text); if let Ok(file) = &luxe { @@ -224,11 +224,11 @@ impl McpConfigStore { /// precedence (project overrides user-global; luxe-owned overrides the shared standard file): /// /// 1. `~/.config/mcp/mcp.json` (standard, user-global) — lowest - /// 2. `~/.config/luxe/mcp.json` (Luxe, user-global) + /// 2. `~/.config/luxe/mcp.json` (luxe, user-global) /// 3. `.mcp.json` (standard, project) - /// 4. `.luxe/mcp.json` (Luxe, project) — highest + /// 4. `.luxe/mcp.json` (luxe, project) — highest /// - /// Both the Luxe shape (`{ "servers": [...] }`) and the standard shape + /// Both the luxe shape (`{ "servers": [...] }`) and the standard shape /// (`{ "mcpServers": { id: {...} } }`, as written by Cursor/Claude/Codex) are understood, so an /// existing MCP setup works with no conversion. pub fn resolved(repo_root: &Path) -> Vec { @@ -266,7 +266,7 @@ impl McpConfigStore { [repo_root.join(".mcp.json"), repo_root.join(".luxe").join("mcp.json")] } - /// The shared `mcp/mcp.json` other clients read, then Luxe's own. + /// The shared `mcp/mcp.json` other clients read, then luxe's own. fn user_sources() -> Vec { let shared = crate::user_dirs::config_home().map(|home| home.join("mcp").join("mcp.json")); let own = crate::user_dirs::luxe_config_home().map(|luxe| luxe.join("mcp.json")); diff --git a/crates/luxe-core/src/mcp_config/tests.rs b/crates/luxe-core/src/mcp_config/tests.rs index 81a99bc..8246010 100644 --- a/crates/luxe-core/src/mcp_config/tests.rs +++ b/crates/luxe-core/src/mcp_config/tests.rs @@ -85,7 +85,7 @@ fn resolved_merges_sources_with_project_luxe_winning() { r#"{ "mcpServers": { "shared": { "command": "a" }, "only-std": { "command": "b" } } }"#, ) .unwrap(); - // Luxe project file overrides `shared` and adds `only-luxe`. + // luxe project file overrides `shared` and adds `only-luxe`. std::fs::create_dir_all(root.join(".luxe")).unwrap(); McpConfigStore::for_repo(root).add(stdio("only-luxe")).unwrap(); let mut shared = stdio("shared"); @@ -101,7 +101,7 @@ fn resolved_merges_sources_with_project_luxe_winning() { resolved.sort_by(|a, b| a.id.cmp(&b.id)); let ids: Vec<&str> = resolved.iter().map(|s| s.id.as_str()).collect(); assert_eq!(ids, ["only-luxe", "only-std", "shared"]); - // The Luxe project entry wins for `shared`. + // The luxe project entry wins for `shared`. let shared = resolved.iter().find(|s| s.id == "shared").unwrap(); assert_eq!(shared.name, "overridden"); } @@ -109,7 +109,7 @@ fn resolved_merges_sources_with_project_luxe_winning() { /// A cloned repository's `.mcp.json` must not choose what runs on a run that refuses the /// project's own tooling. /// -/// An `eager` server in one used to spawn the moment Luxe opened the tree, headless included, +/// An `eager` server in one used to spawn the moment luxe opened the tree, headless included, /// with nothing asked — the same hole `.luxe/hooks.json` is closed against. #[test] fn a_refused_project_cannot_start_its_own_servers() { @@ -236,8 +236,8 @@ fn the_standard_shape_keeps_its_auth() { assert_eq!(oauth.redirect_uri.as_deref(), Some("http://127.0.0.1:8765/callback")); } -/// `"kind": "oauth"` is the spelling in every example, and it parses in Luxe's own shape; the -/// `o_auth` Luxe used to write still does; and it is written back as `oauth`. Pinned against +/// `"kind": "oauth"` is the spelling in every example, and it parses in luxe's own shape; the +/// `o_auth` luxe used to write still does; and it is written back as `oauth`. Pinned against /// the literal, because a round trip through the same enum passes whatever the spelling is. #[test] fn oauth_is_spelled_oauth() { @@ -287,7 +287,7 @@ fn a_secret_is_hidden_from_debug_and_survives_a_rewrite() { ); } -/// A file Luxe creates is owner-only, since it can hold a secret; a mode the user chose stays. +/// A file luxe creates is owner-only, since it can hold a secret; a mode the user chose stays. #[cfg(unix)] #[test] fn saving_starts_private_and_keeps_a_chosen_mode() { @@ -302,9 +302,9 @@ fn saving_starts_private_and_keeps_a_chosen_mode() { assert_eq!(mode(store.path()), 0o644, "a mode the user set is theirs"); } -/// A Luxe-shape file with one entry that does not parse is reported, not read as no servers. +/// A luxe-shape file with one entry that does not parse is reported, not read as no servers. /// -/// The break this catches: the failed Luxe parse fell through to the standard shape, which read +/// The break this catches: the failed luxe parse fell through to the standard shape, which read /// the same file as an empty `mcpServers` map, so every server in it vanished without a log line. #[test] fn a_luxe_file_with_one_bad_entry_is_reported() { diff --git a/crates/luxe-core/src/mcp_stdio.rs b/crates/luxe-core/src/mcp_stdio.rs index 249c155..4229a0f 100644 --- a/crates/luxe-core/src/mcp_stdio.rs +++ b/crates/luxe-core/src/mcp_stdio.rs @@ -171,7 +171,7 @@ impl McpStdioClient { impl Drop for McpStdioClient { /// `kill_on_drop` reaches only the server. A server that delegates spawns work of its own — - /// a headless Luxe, a browser — and that went on running, writing files, after the session + /// a headless luxe, a browser — and that went on running, writing files, after the session /// that asked for it had exited. fn drop(&mut self) { self.kill_group_if_running(); diff --git a/crates/luxe-core/src/mcp_stdio/tests.rs b/crates/luxe-core/src/mcp_stdio/tests.rs index f956548..5fba0a6 100644 --- a/crates/luxe-core/src/mcp_stdio/tests.rs +++ b/crates/luxe-core/src/mcp_stdio/tests.rs @@ -108,7 +108,7 @@ for line in sys.stdin: std::env::set_var("LUXE_TEST_REAL_TOKEN", "supersecret"); let mut env = std::collections::HashMap::new(); - // The value uses `${VAR}` interpolation against Luxe's env. + // The value uses `${VAR}` interpolation against luxe's env. env.insert("LUXE_TEST_TOKEN".to_string(), "${LUXE_TEST_REAL_TOKEN}".to_string()); let config = McpServerConfig { @@ -236,7 +236,7 @@ for line in sys.stdin: assert!(error.to_string().len() < 30_000, "a bounded tail: {}", error.to_string().len()); } -/// `initialize` offers the protocol version Luxe speaks. +/// `initialize` offers the protocol version luxe speaks. #[tokio::test] async fn initialize_offers_the_current_protocol_version() { if std::process::Command::new("python3").arg("--version").output().is_err() { diff --git a/crates/luxe-core/src/mention_source.rs b/crates/luxe-core/src/mention_source.rs index a5fa94e..e7bc5f3 100644 --- a/crates/luxe-core/src/mention_source.rs +++ b/crates/luxe-core/src/mention_source.rs @@ -1,6 +1,6 @@ //! Mention sources — a program the `@` picker lists references from. //! -//! Luxe knows files and GitHub. Everything else a person works from — Jira issues, Asana tasks, a +//! luxe knows files and GitHub. Everything else a person works from — Jira issues, Asana tasks, a //! runbook index — is a program they point it at: it prints one JSON object a line, and each line //! becomes a row in a tab of its own. A picked row goes into the composer as `@[kind:id]` and //! reaches the model as the row's `text`, a reference and never the thing itself; the agent looks diff --git a/crates/luxe-core/src/oauth_loopback.rs b/crates/luxe-core/src/oauth_loopback.rs index edae920..c292e74 100644 --- a/crates/luxe-core/src/oauth_loopback.rs +++ b/crates/luxe-core/src/oauth_loopback.rs @@ -280,7 +280,7 @@ pub fn page(title: &str, message: &str, accent: &str) -> String { format!( "\ \ - Luxe -

Pair this device with Luxe

+

Pair this device with luxe

diff --git a/crates/luxe-remote/src/push.rs b/crates/luxe-remote/src/push.rs index ee3d125..99e01d4 100644 --- a/crates/luxe-remote/src/push.rs +++ b/crates/luxe-remote/src/push.rs @@ -3,7 +3,7 @@ //! Web Push, as iOS has offered it to home-screen web apps since 16.4: a device that opted in //! gives the bridge a subscription, and the bridge posts each notification, sealed so only that //! device can read it, straight to the push service the subscription names (Apple's, for an -//! iPhone). There is no Luxe server in between, and the push service sees when, not what. +//! iPhone). There is no luxe server in between, and the push service sees when, not what. //! //! [`watch`] hears what the sessions are waiting for, and [`notify`] takes each notice to every //! subscribed device that doesn't have that session open in front of it. diff --git a/crates/luxe-remote/src/push/notice.rs b/crates/luxe-remote/src/push/notice.rs index 3926816..ee791dd 100644 --- a/crates/luxe-remote/src/push/notice.rs +++ b/crates/luxe-remote/src/push/notice.rs @@ -77,7 +77,10 @@ impl Reading { fn prompt(&self, event: &Event) -> Option { let (id, body) = match event { Event::PermissionRequested { id, tool, .. } => (id.as_str(), format!("Approve {tool}")), - Event::QuestionAsked { id, .. } => (id.as_str(), "Luxe has a question".to_string()), + // The agent asks, not the app: luxe is the title the notification already carries + Event::QuestionAsked { id, .. } => { + (id.as_str(), "The agent has a question for you".to_string()) + } _ => return None, }; Some(Heard::Prompt(id.to_string(), self.notice(body, true))) @@ -102,7 +105,7 @@ impl Reading { /// Whether `event` shows a turn running. The engine says so with `TurnStarted`, which comes /// first; the message that opened the turn, or anything it streams, stands in for it from a -/// session whose Luxe predates that event. +/// session whose luxe predates that event. fn is_turn_sign(event: &Event) -> bool { match event { Event::TurnStarted diff --git a/crates/luxe-remote/src/push/notice/tests.rs b/crates/luxe-remote/src/push/notice/tests.rs index 7b4e61f..aa3b67d 100644 --- a/crates/luxe-remote/src/push/notice/tests.rs +++ b/crates/luxe-remote/src/push/notice/tests.rs @@ -38,7 +38,7 @@ fn a_prompt_says_what_waits_and_never_the_detail() { let asked = reading().read(&event(PERMISSION), now); assert_eq!(asked, Some(Heard::Prompt("perm:1".into(), notice("Approve bash", true)))); let asked = reading().read(&event(QUESTION), now); - let expected = Heard::Prompt("ask:1".into(), notice("Luxe has a question", true)); + let expected = Heard::Prompt("ask:1".into(), notice("The agent has a question for you", true)); assert_eq!(asked, Some(expected)); assert_eq!(reading().read(&event(CLOSED), now), Some(Heard::Closed("perm:1".into()))); } diff --git a/crates/luxe-remote/src/push/watch/tests.rs b/crates/luxe-remote/src/push/watch/tests.rs index 74d2738..51bc09c 100644 --- a/crates/luxe-remote/src/push/watch/tests.rs +++ b/crates/luxe-remote/src/push/watch/tests.rs @@ -80,7 +80,7 @@ async fn a_prompt_answered_in_time_is_never_sent() { let (mut heard, mut joined, _watcher) = watched(&mut session).await; say(&mut joined, &[PERMISSION, QUESTION, CLOSED]).await; let notice = heard.recv().await.expect("a notice"); - assert_eq!(notice.body, "Luxe has a question"); + assert_eq!(notice.body, "The agent has a question for you"); tokio::time::sleep(PROMPT_GRACE * 2).await; assert!(heard.try_recv().is_err(), "the answered prompt was sent"); } diff --git a/crates/luxe-remote/src/relay.rs b/crates/luxe-remote/src/relay.rs index b071049..c1dee5f 100644 --- a/crates/luxe-remote/src/relay.rs +++ b/crates/luxe-remote/src/relay.rs @@ -106,7 +106,7 @@ async fn line_to_device( } /// Whether `line` is the session refusing the bridge's `introduce`. Only a session started before -/// its Luxe knew the action does, and it carries on without the device's name; the refusal is of a +/// its luxe knew the action does, and it carries on without the device's name; the refusal is of a /// frame the device never sent, so showing it there reads as a fault. Decoded only when it could /// be one, so every other line still passes untouched. fn refuses_introduction(line: &str) -> bool { diff --git a/crates/luxe-remote/src/render.rs b/crates/luxe-remote/src/render.rs index 8ac79ad..61ff291 100644 --- a/crates/luxe-remote/src/render.rs +++ b/crates/luxe-remote/src/render.rs @@ -2,7 +2,7 @@ //! //! Markdown, highlighted code, tool glyphs and the status line's wording are the TUI's, and the //! bridge doesn't depend on the TUI, so `luxe-cli` hands one in as a [`Renderer`]. What a user -//! message shows (the reader's own words, and a brief Luxe wrote to the agent as one line saying +//! message shows (the reader's own words, and a brief luxe wrote to the agent as one line saying //! so) is core's call (`luxe_core::briefs`), so that is made here. The bridge keeps no session //! state, so the app asks: once for a finished message, and a few times a second for one still //! growing or a status that changed. @@ -283,7 +283,7 @@ pub(crate) struct Rendered { /// `piece` as the app's HTML. pub(crate) fn render(renderer: &dyn Renderer, piece: &Piece) -> String { match piece { - // what the agent wrote for Luxe to read (a remediation report, a draft) isn't the reader's + // what the agent wrote for luxe to read (a remediation report, a draft) isn't the reader's Piece::Answer { text } => renderer.markdown(&briefs::for_the_reader(text), Voice::Answer), Piece::Reasoning { text } => renderer.markdown(text, Voice::Reasoning), Piece::User { content } => user_message(content) + &images_attached(renderer, content), diff --git a/crates/luxe-remote/src/render/tests.rs b/crates/luxe-remote/src/render/tests.rs index 7ce9656..e477b48 100644 --- a/crates/luxe-remote/src/render/tests.rs +++ b/crates/luxe-remote/src/render/tests.rs @@ -135,7 +135,7 @@ fn words_alone_say_nothing_is_attached() { assert_eq!(html, "

hi

"); } -/// The break this catches: a brief Luxe wrote shown whole, as a page of instructions in the +/// The break this catches: a brief luxe wrote shown whole, as a page of instructions in the /// reader's colors. #[test] fn a_brief_shows_as_one_line() { diff --git a/crates/luxe-remote/src/service.rs b/crates/luxe-remote/src/service.rs index 996738e..2f442e3 100644 --- a/crates/luxe-remote/src/service.rs +++ b/crates/luxe-remote/src/service.rs @@ -46,7 +46,7 @@ pub enum ServiceError { detail: String, }, /// Nowhere to put a service: no home folder, or a platform without a per-user service manager - #[error("this system has no per-user service manager Luxe knows how to use")] + #[error("this system has no per-user service manager luxe knows how to use")] Unsupported, } diff --git a/crates/luxe-remote/src/service/systemd.rs b/crates/luxe-remote/src/service/systemd.rs index c70a15d..5f72e5d 100644 --- a/crates/luxe-remote/src/service/systemd.rs +++ b/crates/luxe-remote/src/service/systemd.rs @@ -6,7 +6,7 @@ use super::Launch; const TEMPLATE: &str = "[Unit] -Description=Luxe remote: your sessions on your own devices +Description=luxe remote: your sessions on your own devices After=network-online.target [Service] diff --git a/crates/luxe-remote/src/tests.rs b/crates/luxe-remote/src/tests.rs index 7e1180a..72124aa 100644 --- a/crates/luxe-remote/src/tests.rs +++ b/crates/luxe-remote/src/tests.rs @@ -22,7 +22,7 @@ type DeviceSocket = const SESSION: &str = "5898d57b-0000-4000-8000-000000000001"; const OWNER: &str = "alex@github"; -/// A session as a running Luxe shares it: an endpoint, and its record beside it. +/// A session as a running luxe shares it: an endpoint, and its record beside it. struct FakeSession { listener: EndpointListener, _record: Publication, @@ -170,7 +170,7 @@ async fn the_bridge_listens_on_loopback_only() { /// The list names running sessions and keeps their local address on this machine. /// -/// The break this catches: listing a record whose Luxe has died, which the app shows as a session +/// The break this catches: listing a record whose luxe has died, which the app shows as a session /// that fails to open; or sending the endpoint's path, which means nothing off this machine. #[tokio::test] async fn the_list_shows_running_sessions_without_their_address() { @@ -286,7 +286,7 @@ async fn starting_in_a_folder_that_isnt_there_is_refused() { assert!(refused.text().await.unwrap().contains("isn't a folder")); } -/// The folders a device can start in include the ones Luxe is running in, counted. +/// The folders a device can start in include the ones luxe is running in, counted. /// /// The break this catches: listing only remembered folders, so a project open at the desk right /// now is missing from the phone's list until it's been seen once before. diff --git a/crates/luxe-remote/src/tests/home_screen.rs b/crates/luxe-remote/src/tests/home_screen.rs index 5334e8e..95f2b4c 100644 --- a/crates/luxe-remote/src/tests/home_screen.rs +++ b/crates/luxe-remote/src/tests/home_screen.rs @@ -30,7 +30,7 @@ impl Renderer for Sketch { /// paired with two computers keeps two apps it can tell apart. /// /// The break this catches: the name set on the bridge but never reaching the routes that read it, -/// so both computers' apps are added as "Luxe". +/// so both computers' apps are added as "luxe". #[tokio::test] async fn a_named_bridge_serves_an_app_named_for_its_computer() { let bridge = harness_with(|bridge| bridge.named("desk")).await; diff --git a/crates/luxe-tools/Cargo.toml b/crates/luxe-tools/Cargo.toml index 05129f2..ef2f5b9 100644 --- a/crates/luxe-tools/Cargo.toml +++ b/crates/luxe-tools/Cargo.toml @@ -3,7 +3,7 @@ name = "luxe-tools" version.workspace = true edition.workspace = true license.workspace = true -description = "Built-in tools for Luxe: read, write, edit, bash, glob, grep, git, web fetch, and test running" +description = "Built-in tools for luxe: read, write, edit, bash, glob, grep, git, web fetch, and test running" repository.workspace = true homepage.workspace = true @@ -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.3" } +luxe-core = { path = "../luxe-core", version = "0.1.4" } thiserror = { workspace = true } tracing = { workspace = true } serde = { workspace = true } diff --git a/crates/luxe-tools/src/astgrep.rs b/crates/luxe-tools/src/astgrep.rs index 9fab745..bd8df90 100644 --- a/crates/luxe-tools/src/astgrep.rs +++ b/crates/luxe-tools/src/astgrep.rs @@ -368,7 +368,7 @@ fn parse_match(value: &serde_json::Value) -> Result Ok(AstGrepMatch { file: PathBuf::from(file), range: (start as usize, end as usize), - // ast-grep reports 0-based lines; every other Luxe surface is 1-based. + // ast-grep reports 0-based lines; every other luxe surface is 1-based. line: line as usize + 1, column: column as usize, text: text.to_string(), diff --git a/crates/luxe-tools/src/astgrep/render.rs b/crates/luxe-tools/src/astgrep/render.rs index 29f7543..cbfabcc 100644 --- a/crates/luxe-tools/src/astgrep/render.rs +++ b/crates/luxe-tools/src/astgrep/render.rs @@ -1,4 +1,4 @@ -//! ast-grep output — what a call reports, and what an applied rewrite tells the rest of Luxe. +//! ast-grep output — what a call reports, and what an applied rewrite tells the rest of luxe. use super::*; diff --git a/crates/luxe-tools/src/bash/tests.rs b/crates/luxe-tools/src/bash/tests.rs index 3f1d834..8bb4176 100644 --- a/crates/luxe-tools/src/bash/tests.rs +++ b/crates/luxe-tools/src/bash/tests.rs @@ -434,7 +434,7 @@ const UNDER_A_TERMINAL: &str = "LUXE_TEST_UNDER_A_TERMINAL"; /// The omacvm incident, end to end: a background job that changes the terminal's settings, as a /// spinner does with `stty -echo < /dev/tty`, then a foreground `echo`. /// -/// Before commands left Luxe's terminal, the kernel suspended the whole process group for that, +/// Before commands left luxe's terminal, the kernel suspended the whole process group for that, /// foreground shell included, and the call timed out having "printed nothing". Reproducing it /// takes a real controlling terminal and a process not run by nextest (which runs tests where /// none of this happens), so this re-runs its own test binary under `script(1)`. diff --git a/crates/luxe-tools/src/edit.rs b/crates/luxe-tools/src/edit.rs index fbf7bdd..caaec32 100644 --- a/crates/luxe-tools/src/edit.rs +++ b/crates/luxe-tools/src/edit.rs @@ -43,7 +43,7 @@ fn edit_schema() -> ToolSchema { disambiguate, or set `replaceAll` to change every occurrence. Multiple \ edits apply atomically (all-or-nothing) and must not overlap. Trailing \ whitespace and a uniformly shifted indent are tolerated and reported. You \ - must have seen the file in this Luxe run — with `read`, lines of it from \ + must have seen the file in this luxe run — with `read`, lines of it from \ `grep`, or printed by `cat`, `sed -n` or a search in `bash` — and it must \ not have changed \ on disk since (read-before-edit + staleness guards); otherwise read it \ @@ -299,7 +299,7 @@ impl EditTool { let Some(tracker) = &self.tracker else { return Ok(()) }; match tracker.status(&cx.session_id, full_path) { ReadStatus::Unseen => Err(ToolResultData::error(format!( - "Error: no read of '{shown}' is on record for this Luxe run \ + "Error: no read of '{shown}' is on record for this luxe run \ ({READ_BEFORE_EDIT}). The record is per process, so a resumed \ session starts empty even where the transcript shows an earlier read. \ Use the `read` tool, then retry — nothing was written." diff --git a/crates/luxe-tools/src/exa_mcp.rs b/crates/luxe-tools/src/exa_mcp.rs index 84f67d4..4812450 100644 --- a/crates/luxe-tools/src/exa_mcp.rs +++ b/crates/luxe-tools/src/exa_mcp.rs @@ -2,7 +2,7 @@ //! //! Exa hosts a public MCP endpoint that answers `tools/call` over JSON-RPC with no credential. //! That is what makes search a *default capability* rather than a setup step: a user installs -//! Luxe and the model can research immediately. A configured `BRAVE_API_KEY`/`TAVILY_API_KEY`/ +//! luxe and the model can research immediately. A configured `BRAVE_API_KEY`/`TAVILY_API_KEY`/ //! `EXA_API_KEY` still wins, since an explicit choice outranks the fallback, but having none does //! not mean having no web search. //! @@ -21,7 +21,7 @@ const MCP_URL: &str = "https://mcp.exa.ai/mcp"; /// The MCP tool that exposes filters, extra queries, and highlight extraction. const ADVANCED_TOOL: &str = "web_search_advanced_exa"; -/// Identifies Luxe to Exa, so the endpoint's operators can see who its traffic is. +/// Identifies luxe to Exa, so the endpoint's operators can see who its traffic is. const SOURCE_HEADER: &str = "luxe"; /// Longest highlight payload requested per result. Enough to answer from, short enough that ten @@ -103,7 +103,7 @@ impl SearchBackend for ExaMcpBackend { } } -/// Map Luxe's options onto Exa's argument names. +/// Map luxe's options onto Exa's argument names. fn build_arguments(query: &str, n: usize, options: &SearchOptions) -> serde_json::Value { let mut arguments = serde_json::json!({ "query": query, diff --git a/crates/luxe-tools/src/git/checks.rs b/crates/luxe-tools/src/git/checks.rs index 8d0d026..dc3f518 100644 --- a/crates/luxe-tools/src/git/checks.rs +++ b/crates/luxe-tools/src/git/checks.rs @@ -1,7 +1,7 @@ //! `git` `checks` — why CI is failing, bounded. //! //! `gh run view --log-failed` prints every line of every failing step: 3,671 lines for one Clippy -//! step of Luxe's own, with the error in the last dozen. This reads the same logs through GitHub +//! step of luxe's own, with the error in the last dozen. This reads the same logs through GitHub //! and keeps the tail of each failing step, says how much it left out, and also lists the failing //! checks that are not Actions jobs at all — a commit status from another CI, which that command //! cannot see. Reading only; re-running a job stays behind the permission engine's `ask`. diff --git a/crates/luxe-tools/src/git/tests.rs b/crates/luxe-tools/src/git/tests.rs index 65c7a70..16d7302 100644 --- a/crates/luxe-tools/src/git/tests.rs +++ b/crates/luxe-tools/src/git/tests.rs @@ -565,7 +565,7 @@ fn init_repo(path: &std::path::Path) -> bool { }; run(&["init", "--quiet"]) && run(&["config", "user.email", "test@luxe.invalid"]) - && run(&["config", "user.name", "Luxe Test"]) + && run(&["config", "user.name", "luxe Test"]) // A signing key the machine may not have would fail every commit here. && run(&["config", "commit.gpgsign", "false"]) } diff --git a/crates/luxe-tools/src/grep.rs b/crates/luxe-tools/src/grep.rs index d95f092..8d264d2 100644 --- a/crates/luxe-tools/src/grep.rs +++ b/crates/luxe-tools/src/grep.rs @@ -105,7 +105,7 @@ const GREP_MAX_LINES: usize = 200; /// Character budget for one search, the second half of the bound the schema promises. /// -/// Sized against Luxe's own tree, where a broad pattern's 200 rows measure ~21 KB and the worst +/// Sized against luxe's own tree, where a broad pattern's 200 rows measure ~21 KB and the worst /// measured — one reaching generated assets — came to 72 KB. So this leaves an ordinary search /// untouched and cuts the pathological one to a third. const GREP_MAX_CHARS: usize = 24_000; diff --git a/crates/luxe-tools/src/process.rs b/crates/luxe-tools/src/process.rs index 9eb6000..b382475 100644 --- a/crates/luxe-tools/src/process.rs +++ b/crates/luxe-tools/src/process.rs @@ -83,10 +83,10 @@ fn shell_command(command: &str, cwd: &Path) -> Command { child } -/// The `PYTHONUTF8` a command gets, when Luxe sets one: on Windows, unless the user chose. +/// The `PYTHONUTF8` a command gets, when luxe sets one: on Windows, unless the user chose. /// /// Python there writes to a pipe in the console's code page, cp1252, so a script printing `✓` -/// fails with `UnicodeEncodeError` under Luxe and works in the user's terminal. UTF-8 mode is what +/// fails with `UnicodeEncodeError` under luxe and works in the user's terminal. UTF-8 mode is what /// Python does everywhere else. fn python_utf8(inherited: Option<&std::ffi::OsStr>, windows: bool) -> Option<&'static str> { (windows && inherited.is_none()).then_some("1") diff --git a/crates/luxe-tools/src/process/tests.rs b/crates/luxe-tools/src/process/tests.rs index 2ba7cbb..96a09e2 100644 --- a/crates/luxe-tools/src/process/tests.rs +++ b/crates/luxe-tools/src/process/tests.rs @@ -1,6 +1,6 @@ use super::*; -/// Windows Python writes cp1252 into a pipe, so a `✓` in a test's output crashed it under Luxe. +/// Windows Python writes cp1252 into a pipe, so a `✓` in a test's output crashed it under luxe. #[test] fn windows_commands_get_python_utf8_mode() { assert_eq!(python_utf8(None, true), Some("1")); diff --git a/crates/luxe-tools/src/read.rs b/crates/luxe-tools/src/read.rs index f0008fb..224e178 100644 --- a/crates/luxe-tools/src/read.rs +++ b/crates/luxe-tools/src/read.rs @@ -259,7 +259,7 @@ impl ReadTool { /// `lines[start..end]` as a result, each line numbered, kept under [`READ_MAX_CHARS`] by cutting at /// a line boundary. /// -/// Numbered because Luxe's other tools take line numbers as input (`lsp_navigation` positions, +/// Numbered because luxe's other tools take line numbers as input (`lsp_navigation` positions, /// `debug` breakpoints, `read`'s own `offset`), and a line the agent has to count to is one it gets /// wrong. A result that stops early closes with the exact `offset` to continue from. The line cap /// cannot bound a minified file, one enormous line, so the character budget is counted as lines diff --git a/crates/luxe-tools/src/screenshot.rs b/crates/luxe-tools/src/screenshot.rs index 7a357be..87bbcb3 100644 --- a/crates/luxe-tools/src/screenshot.rs +++ b/crates/luxe-tools/src/screenshot.rs @@ -273,10 +273,10 @@ pub fn is_available() -> bool { capture::desktop_capture_available(capture::detect_backend()) || browser::is_available() } -/// Modes that photograph whatever is on the reader's screen, rather than a page Luxe rendered. +/// Modes that photograph whatever is on the reader's screen, rather than a page luxe rendered. /// /// The distinction the permission engine and the unattended guard are both drawn on: `url` shows a -/// model a document it asked Luxe to load, and these show it the desktop — a password manager, a +/// model a document it asked luxe to load, and these show it the desktop — a password manager, a /// private message, a colleague on a shared display. fn captures_the_desktop(mode: &str) -> bool { matches!(mode, "fullscreen" | "region" | "window") diff --git a/crates/luxe-tools/src/ssrf.rs b/crates/luxe-tools/src/ssrf.rs index 3ab3077..da0954e 100644 --- a/crates/luxe-tools/src/ssrf.rs +++ b/crates/luxe-tools/src/ssrf.rs @@ -13,7 +13,7 @@ //! CGNAT, ULA. Reaching these is lateral movement: credentials the user never handed over, or a //! machine that merely shares their network. Denied, and a much stronger claim than the tool's //! convenience. -//! - **This machine** — loopback. Luxe is a coding agent with an unrestricted `bash`, so +//! - **This machine** — loopback. luxe is a coding agent with an unrestricted `bash`, so //! `curl http://127.0.0.1:4321` is already one tool call away and permitted by default. Refusing //! the same origin to `web_fetch` and `screenshot` grants no protection whatsoever; it only breaks //! the thing `screenshot mode=url` exists to do, and the model works around it with `bash` and a diff --git a/crates/luxe-tools/src/tavily.rs b/crates/luxe-tools/src/tavily.rs index a16f8e9..33d63de 100644 --- a/crates/luxe-tools/src/tavily.rs +++ b/crates/luxe-tools/src/tavily.rs @@ -1,4 +1,4 @@ -//! Tavily — a search API built for agents, so it takes Luxe's whole option set as parameters. +//! Tavily — a search API built for agents, so it takes luxe's whole option set as parameters. //! //! Domain include/exclude, a recency window and a result cap are all first-class here, and the //! `content` field on each result is already the query-relevant extract rather than a meta diff --git a/crates/luxe-tools/src/test_runner/tests.rs b/crates/luxe-tools/src/test_runner/tests.rs index da4ff08..4e7e3a3 100644 --- a/crates/luxe-tools/src/test_runner/tests.rs +++ b/crates/luxe-tools/src/test_runner/tests.rs @@ -296,7 +296,7 @@ async fn a_filtered_run_says_it_proves_nothing_about_what_it_skipped() { /// Probes with a real run rather than `--version`, because those are different questions: an /// installed pytest that autoloads a broken third-party plugin answers `--version` happily and /// then dies during collection, which failed this test on a machine where nothing was wrong with -/// Luxe. Probe the capability you need, not a proxy for it. +/// luxe. Probe the capability you need, not a proxy for it. async fn pytest_can_run(dir: &Path) -> bool { let Some(python) = luxe_core::program::resolve("python3") else { return false; diff --git a/crates/luxe-tools/src/web/clone.rs b/crates/luxe-tools/src/web/clone.rs index 083dd5b..e836708 100644 --- a/crates/luxe-tools/src/web/clone.rs +++ b/crates/luxe-tools/src/web/clone.rs @@ -94,7 +94,7 @@ async fn fetch_into( let cache = luxe_core::fetched::cache_dir(root); let Some(dest) = checkout_dir(&cache, owner, repo) else { return ToolResultData::error(format!( - "`{owner}/{repo}` is not a GitHub repository name Luxe will clone." + "`{owner}/{repo}` is not a GitHub repository name luxe will clone." )); }; { @@ -252,7 +252,7 @@ fn clone_command(git: &Path, source: &str, staging: &Path, cwd: &Path) -> tokio: } /// A fresh staging directory name under `cache`, carrying the time it was made so [`tidy`] can tell -/// a leftover from a clone still running in another Luxe. +/// a leftover from a clone still running in another luxe. fn staging_dir(cache: &Path, owner: &str, repo: &str) -> PathBuf { let nanos = SystemTime::now().duration_since(UNIX_EPOCH).map_or(0, |since| since.as_nanos()); let secs = nanos / 1_000_000_000; diff --git a/crates/luxe-tools/src/web/clone/tests.rs b/crates/luxe-tools/src/web/clone/tests.rs index abc2c58..8c81d7b 100644 --- a/crates/luxe-tools/src/web/clone/tests.rs +++ b/crates/luxe-tools/src/web/clone/tests.rs @@ -124,7 +124,7 @@ fn the_limits_are_the_ones_the_guide_promises() { assert_eq!(STAGING_STALE_AFTER, Duration::from_secs(3_600)); } -/// A staging directory carries the second it was made, which is all that stops one Luxe from +/// A staging directory carries the second it was made, which is all that stops one luxe from /// tidying away a clone another is still making. #[test] fn a_staging_directory_made_just_now_survives_tidying() { diff --git a/crates/luxe-tools/src/web/fetch.rs b/crates/luxe-tools/src/web/fetch.rs index ff6520d..ec01068 100644 --- a/crates/luxe-tools/src/web/fetch.rs +++ b/crates/luxe-tools/src/web/fetch.rs @@ -3,13 +3,13 @@ use super::*; /// Default polite user agent. -pub(super) const UA_DEFAULT: &str = concat!("Luxe/", env!("CARGO_PKG_VERSION")); +pub(super) const UA_DEFAULT: &str = concat!("luxe/", env!("CARGO_PKG_VERSION")); /// Browser-like user agent for the bot-protection-bypass fallback. pub(super) const UA_STEALTH: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"; /// Whether `web_fetch` may read from the machine it runs on. /// -/// It may. Luxe ships an unrestricted `bash`, so `curl http://127.0.0.1:4321` is already a tool call +/// It may. luxe ships an unrestricted `bash`, so `curl http://127.0.0.1:4321` is already a tool call /// away — refusing the same origin here protects nothing and costs the ordinary case of reading your /// own dev server. The boundary that *is* real (private LAN, cloud metadata) is unaffected; see /// [`crate::ssrf`]. diff --git a/crates/luxe-tools/src/write.rs b/crates/luxe-tools/src/write.rs index 1671311..fd30881 100644 --- a/crates/luxe-tools/src/write.rs +++ b/crates/luxe-tools/src/write.rs @@ -20,7 +20,7 @@ fn write_schema() -> ToolSchema { name: "write".to_string(), description: "Write a whole file, creating parent directories as needed. Best for NEW \ files; for targeted changes to an existing file use `edit`. Overwriting an \ - existing file requires having `read` it in this Luxe run (and it not \ + existing file requires having `read` it in this luxe run (and it not \ having changed since) so you don't clobber content you never saw." .to_string(), parameters: json!({ @@ -79,7 +79,7 @@ impl WriteTool { } match tracker.status(&cx.session_id, full_path) { ReadStatus::Unseen => Err(ToolResultData::error(format!( - "Error: '{shown}' exists and has no read on record for this Luxe run \ + "Error: '{shown}' exists and has no read on record for this luxe run \ ({READ_BEFORE_WRITE}), so overwriting it would be blind. \ The record is per process, so a resumed session starts empty \ even where the transcript shows an earlier read. Read it (or \ diff --git a/crates/luxe-tools/tests/mutation_guards.rs b/crates/luxe-tools/tests/mutation_guards.rs index b9974bf..0fa242c 100644 --- a/crates/luxe-tools/tests/mutation_guards.rs +++ b/crates/luxe-tools/tests/mutation_guards.rs @@ -138,7 +138,7 @@ async fn a_rejection_explains_that_the_read_record_is_per_process() { .run(json!({ "path": "f.txt", "edits": [{ "oldText": "hello", "newText": "hi" }] }), &cx) .await; let message = text(&rejected); - assert!(message.contains("this Luxe run"), "names the scope: {message}"); + assert!(message.contains("this luxe run"), "names the scope: {message}"); assert!(message.contains("resumed session"), "names the resume case: {message}"); assert!(message.contains("nothing was written"), "says the file is untouched: {message}"); diff --git a/crates/luxe-tui/Cargo.toml b/crates/luxe-tui/Cargo.toml index d17cc62..0afbdce 100644 --- a/crates/luxe-tui/Cargo.toml +++ b/crates/luxe-tui/Cargo.toml @@ -3,12 +3,12 @@ name = "luxe-tui" version.workspace = true edition.workspace = true license.workspace = true -description = "Terminal UI for Luxe, built on ratatui: conversation, guided review, dashboard, and themes" +description = "Terminal UI for luxe, built on ratatui: conversation, guided review, dashboard, and themes" repository.workspace = true homepage.workspace = true [dependencies] -luxe-core = { path = "../luxe-core", version = "0.1.3" } +luxe-core = { path = "../luxe-core", version = "0.1.4" } # `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/crates/luxe-tui/examples/fixture_svg/color.rs b/crates/luxe-tui/examples/fixture_svg/color.rs index c8e83a3..c64791a 100644 --- a/crates/luxe-tui/examples/fixture_svg/color.rs +++ b/crates/luxe-tui/examples/fixture_svg/color.rs @@ -8,7 +8,7 @@ pub(super) fn hex(color: Color) -> Option { Color::Rgb(red, green, blue) => (red, green, blue), Color::Indexed(index) => indexed_rgb(index), Color::Reset => return None, - // The sixteen named colors belong to the terminal's palette. Luxe's own themes are pure + // The sixteen named colors belong to the terminal's palette. luxe's own themes are pure // RGB, so this is only reached by a user theme; xterm's defaults are the least surprising // stand-in available. named => indexed_rgb(named_index(named)?), diff --git a/crates/luxe-tui/examples/fixture_svg/geometry.rs b/crates/luxe-tui/examples/fixture_svg/geometry.rs index dd420d3..6a539f9 100644 --- a/crates/luxe-tui/examples/fixture_svg/geometry.rs +++ b/crates/luxe-tui/examples/fixture_svg/geometry.rs @@ -123,7 +123,7 @@ fn block_element(block: &Block, x: f64, y: f64, fill: &str) -> String { /// Which cell edges a box-drawing glyph reaches, and whether its corner is rounded. /// -/// `(up, right, down, left)`. Only the light set: it is what Luxe draws with, and a heavy or double +/// `(up, right, down, left)`. Only the light set: it is what luxe draws with, and a heavy or double /// rule would need its own stroke width rather than a flag here. type Arms = (bool, bool, bool, bool); diff --git a/crates/luxe-tui/examples/fixture_svg/main.rs b/crates/luxe-tui/examples/fixture_svg/main.rs index 92a1474..0cb23a0 100644 --- a/crates/luxe-tui/examples/fixture_svg/main.rs +++ b/crates/luxe-tui/examples/fixture_svg/main.rs @@ -1,6 +1,6 @@ //! fixture_svg — a production render, exported as vector. //! -//! The site needs pictures of Luxe, and a screenshot is the worst way to get one: it is a raster at +//! The site needs pictures of luxe, and a screenshot is the worst way to get one: it is a raster at //! somebody's DPI, its text cannot be selected or searched, it weighs ten times what it should, and //! it puts a terminal and a font in the pipeline where neither belongs. The render is already a //! grid of glyphs and colors, so it can be drawn directly. diff --git a/crates/luxe-tui/examples/fixture_svg/tests.rs b/crates/luxe-tui/examples/fixture_svg/tests.rs index c708b50..726bec0 100644 --- a/crates/luxe-tui/examples/fixture_svg/tests.rs +++ b/crates/luxe-tui/examples/fixture_svg/tests.rs @@ -76,7 +76,7 @@ fn cell_fraction_glyphs_are_drawn_not_typeset() { for glyph in ['\u{e0b8}', '\u{e0ba}', '\u{e0bc}', '\u{e0be}'] { assert!(is_drawn(glyph), "U+{:04X} should be geometry", glyph as u32); } - // Letters and the geometric shapes Luxe uses as marks stay text: any font has them, and + // Letters and the geometric shapes luxe uses as marks stay text: any font has them, and // they carry meaning that should remain selectable. for glyph in ['a', '\u{276f}', '\u{25cf}', '\u{25c6}'] { assert!(!is_drawn(glyph), "U+{:04X} should be typeset", glyph as u32); diff --git a/crates/luxe-tui/examples/shiki_theme.rs b/crates/luxe-tui/examples/shiki_theme.rs index 7e19b7b..c4e2d5f 100644 --- a/crates/luxe-tui/examples/shiki_theme.rs +++ b/crates/luxe-tui/examples/shiki_theme.rs @@ -1,7 +1,7 @@ //! shiki_theme — luxe's palette as a syntax theme for the website's code blocks. //! //! The docs describe a terminal program; highlighting their code in somebody else's palette is a -//! small lie about what Luxe looks like. This writes a TextMate theme from the same JSON the TUI +//! small lie about what luxe looks like. This writes a TextMate theme from the same JSON the TUI //! loads, so the code on the page is colored by the product's own tokens. //! //! It is also the palette's hardest test. A theme with six accents can hide a weak one behind a @@ -32,7 +32,7 @@ fn theme_json(name: &str, theme: &HashMap) -> String { let hex = |token: &str| -> String { match theme.get(token) { Some(ColorValue::Rgb(red, green, blue)) => format!("#{red:02x}{green:02x}{blue:02x}"), - // Every token this maps is RGB in Luxe's own themes; anything else would be a theme + // Every token this maps is RGB in luxe's own themes; anything else would be a theme // this generator was not written for, and inventing a color would hide that. _ => panic!("{name}.{token} is not an RGB color"), } diff --git a/crates/luxe-tui/examples/theme_css.rs b/crates/luxe-tui/examples/theme_css.rs index 280fda8..053830e 100644 --- a/crates/luxe-tui/examples/theme_css.rs +++ b/crates/luxe-tui/examples/theme_css.rs @@ -96,7 +96,7 @@ fn stylesheet(dark: &HashMap) -> String { out.push_str(":root {\n color-scheme: dark;\n"); out.push_str(&block(dark, true)); // The canvas a baked-in capture sits on. A recording is the terminal's own background in every - // cell Luxe paints, so a plate in any other color turns the painted cells into rectangles; with + // cell luxe paints, so a plate in any other color turns the painted cells into rectangles; with // one theme on the page these are the page's own colors, named for what they are for. let _ = writeln!( out, @@ -178,7 +178,7 @@ mod tests { /// Every exported token reaches the stylesheet. A token that resolves to an ANSI index or the /// terminal default has no hex to give, which is fine in a terminal and useless on a page — so - /// Luxe's own theme must not contain one. + /// luxe's own theme must not contain one. #[test] fn every_exported_token_has_a_color() { let dark = luxe(); diff --git a/crates/luxe-tui/examples/ui_fixture.rs b/crates/luxe-tui/examples/ui_fixture.rs index 2907fd3..3ab0dbf 100644 --- a/crates/luxe-tui/examples/ui_fixture.rs +++ b/crates/luxe-tui/examples/ui_fixture.rs @@ -25,7 +25,7 @@ fn main() -> Result<()> { } let mut app = seeded_app(&theme, scenario).map_err(anyhow::Error::msg)?; // `LUXE_FIXTURE_DESKTOP=` paints the frame in an Omarchy theme from this machine, turned - // into Luxe's the way a session following the desktop does, so a theme no built-in matches can + // into luxe's the way a session following the desktop does, so a theme no built-in matches can // be judged without applying it if let Ok(name) = env::var("LUXE_FIXTURE_DESKTOP") { app.theme_styles = desktop_styles(&name)?; @@ -42,7 +42,7 @@ fn main() -> Result<()> { } let scenario_name = scenario.name(); - execute!(io::stdout(), SetTitle(format!("Luxe fixture: {scenario_name}")))?; + execute!(io::stdout(), SetTitle(format!("luxe fixture: {scenario_name}")))?; let mut terminal = terminal::init()?; let result = run(&mut terminal, &mut app); terminal::restore()?; @@ -400,7 +400,7 @@ fn desktop_styles(name: &str) -> Result { let desktop = luxe_core::omarchy::DesktopTheme { name: name.to_owned(), dir }; let registry = luxe_core::theme::ThemeRegistry::new().with_desktop(Some(&desktop)); let Some(resolved) = registry.resolve(luxe_core::omarchy::DESKTOP_THEME) else { - bail!("{name} has no colors Luxe can read") + bail!("{name} has no colors luxe can read") }; Ok(luxe_tui::theme::styles::ThemeStyles::from_resolved(&resolved, name)) } diff --git a/crates/luxe-tui/examples/wordmark_svg.rs b/crates/luxe-tui/examples/wordmark_svg.rs index 364e5f3..286085d 100644 --- a/crates/luxe-tui/examples/wordmark_svg.rs +++ b/crates/luxe-tui/examples/wordmark_svg.rs @@ -84,8 +84,8 @@ fn tile(rows: &[&str], (plate_color, ink): (String, String)) -> String { format!( "\n \ - Luxe\n \ + width=\"{side}\" height=\"{side}\" role=\"img\" aria-label=\"luxe\">\n \ + luxe\n \ \n \ \n \ \n \ @@ -111,9 +111,9 @@ fn svg(rows: &[&str], letters: std::ops::Range) -> String { out.push_str(&format!( "\n" + role=\"img\" aria-label=\"luxe\">\n" )); - out.push_str(" Luxe\n"); + out.push_str(" luxe\n"); for (index, path) in paths.iter().enumerate() { let step = index + letters.start + 1; out.push_str(&format!( @@ -293,7 +293,7 @@ mod tests { assert!(svg.trim_end().ends_with("")); assert_eq!(svg.matches(" = service.stored().into_iter().map(|option| option.id).collect(); let message = match stored.is_empty() { - true => "Nothing is signed in. /login sets a provider up.".to_string(), + true => "Not signed in to any provider · /login to add one".to_string(), false => format!("Usage: /logout — signed in: {}", stored.join(", ")), }; self.push_convo(ConvoBlock::System(message)); @@ -167,14 +167,18 @@ impl App { /// flow does not stop to be congratulated. What the login had to say (the account, how many /// models it reached, any advice that only makes sense now) becomes the picker's opening line, /// and the transcript keeps the whole of it for a reader who scrolls back. + /// + /// The picker opens at the top with nothing chosen: which model to run is the reader's call, + /// and a cursor already resting on one reads as luxe recommending it. fn finish_login(&mut self, outcome: luxe_core::auth::LoginOutcome) { self.close_auth_wizard(); - let adopted = self.adopt_login(&outcome); self.refresh_configuration(); let configured = self.provider_configured(); self.set_provider_configured(configured); - self.push_convo(ConvoBlock::System(login_report(&outcome, adopted.as_deref()))); - self.open_model_picker_with(login_note(&outcome, adopted.as_deref())); + self.push_convo(ConvoBlock::System(login_report(&outcome))); + let current = Some(self.status.model.as_str()).filter(|model| !model.is_empty()); + let note = login_note(&outcome, current); + self.open_model_picker_at_top(note); } /// Re-read what is configured, so the Configuration summary reflects a login that just landed. @@ -184,45 +188,19 @@ impl App { configuration.refresh(&service.providers()); } } - - /// Switch the session onto a provider that was just configured, answering what it landed on. - /// - /// Without this, a login only takes effect on the next launch: the engine keeps routing to - /// whatever was active when the session started. The catalog is rebuilt first so a model that - /// only exists because of this login can be found. - fn adopt_login(&mut self, outcome: &luxe_core::auth::LoginOutcome) -> Option { - if let Some(sources) = &self.model_sources { - self.model_catalog = (sources.build)().catalog; - } - let provider = outcome.provider_id.as_str(); - let entry = self.model_catalog.iter().find(|entry| { - entry.info.r#ref.provider == provider - && outcome.suggested_model.as_deref().is_some_and(|id| entry.info.r#ref.id == id) - }); - // Fall back to any model for that provider, so a login always leaves a usable session. - let info = entry - .or_else(|| { - self.model_catalog.iter().find(|entry| entry.info.r#ref.provider == provider) - }) - .map(|entry| entry.info.clone())?; - let display = info.display().to_string(); - self.apply_model_selection(info); - Some(display) - } } -/// What the model picker says at the top of itself after a login. Args: `(outcome, adopted)`. +/// What the model picker says at the top of itself after a login. Args: `(outcome, current)`. /// /// Two lines at most, because the reader is on their way to choosing a model and this is a caption -/// rather than a report — the whole of it is in the transcript ([`login_report`]). `adopted` is -/// the model the login already left the session on, which is the row the cursor is sitting on; -/// saying so is what stops it reading as a choice the reader has not made yet. -fn login_note(outcome: &luxe_core::auth::LoginOutcome, adopted: Option<&str>) -> Vec { +/// rather than a report — the whole of it is in the transcript ([`login_report`]). `current` is +/// the model the session was already on, which Esc keeps. +fn login_note(outcome: &luxe_core::auth::LoginOutcome, current: Option<&str>) -> Vec { // No count of the models, and none of their names: they are the rows underneath this line. vec![ format!("{}.", configured_headline(outcome)), - match adopted { - Some(model) => format!("Now on {model} — enter keeps it, or choose another."), + match current { + Some(model) => format!("Choose a model, or esc to stay on {model}."), None => "Choose a model to finish setting up.".to_string(), }, ] @@ -242,16 +220,13 @@ fn configured_headline(outcome: &luxe_core::auth::LoginOutcome) -> String { } } -/// The whole of what a login had to say, for the transcript. Args: `(outcome, adopted)`. -fn login_report(outcome: &luxe_core::auth::LoginOutcome, adopted: Option<&str>) -> String { +/// The whole of what a login had to say, for the transcript. +fn login_report(outcome: &luxe_core::auth::LoginOutcome) -> String { let mut lines = vec![format!("{}.", configured_headline(outcome))]; if let Some(account) = &outcome.account { lines.push(format!("Account: {account}")); } lines.extend(outcome.notes.iter().cloned()); - if let Some(model) = adopted { - lines.push(format!("Model: {model}")); - } lines.extend(outcome.advice.iter().cloned()); lines.join("\n") } diff --git a/crates/luxe-tui/src/app/commands/slash.rs b/crates/luxe-tui/src/app/commands/slash.rs index 14b4997..d79e839 100644 --- a/crates/luxe-tui/src/app/commands/slash.rs +++ b/crates/luxe-tui/src/app/commands/slash.rs @@ -318,7 +318,7 @@ fn worktree_command(app: &mut App, arguments: Option<&str>) { ), (Some("remove"), Some(_), Some(root)) => { // Asked of git now, not read from the last snapshot, which may predate a file made - // outside Luxe + // outside luxe if app.send_action(Action::CheckWorktreeRemoval, "check the worktree") { app.worktree_removal_check = Some(root); } diff --git a/crates/luxe-tui/src/app/commands/tests/answering.rs b/crates/luxe-tui/src/app/commands/tests/answering.rs index 6f86383..ffc7e83 100644 --- a/crates/luxe-tui/src/app/commands/tests/answering.rs +++ b/crates/luxe-tui/src/app/commands/tests/answering.rs @@ -257,7 +257,7 @@ fn preparing_and_failing_reach_the_preview() { } /// `/worktree` says where the session works. `remove` asks git, through the engine, what is -/// uncommitted right now — a snapshot can predate a file made outside Luxe — and is refused, +/// uncommitted right now — a snapshot can predate a file made outside luxe — and is refused, /// naming it, unless nothing is; then the session ends with its worktree to remove. #[test] fn worktree_says_where_and_removes_only_committed_work() { diff --git a/crates/luxe-tui/src/app/commands/tests/palette.rs b/crates/luxe-tui/src/app/commands/tests/palette.rs index 15df289..e8cd362 100644 --- a/crates/luxe-tui/src/app/commands/tests/palette.rs +++ b/crates/luxe-tui/src/app/commands/tests/palette.rs @@ -50,7 +50,7 @@ fn every_listed_command_runs_where_it_is_listed() { "{place} lists {:?}, and running it does nothing", entry.command.name ); - // What would leave Luxe is recorded, never launched: this loop runs every command + // What would leave luxe is recorded, never launched: this loop runs every command // on every run of the suite, and it once opened a browser tab each time let crate::app::ExternalOpener::Recorded(opened) = &app.opener else { panic!("{place}: a test app must not be able to launch anything"); diff --git a/crates/luxe-tui/src/app/commands/tests/review_target.rs b/crates/luxe-tui/src/app/commands/tests/review_target.rs index 4d1f544..c55bc43 100644 --- a/crates/luxe-tui/src/app/commands/tests/review_target.rs +++ b/crates/luxe-tui/src/app/commands/tests/review_target.rs @@ -586,7 +586,7 @@ fn edited_draft_ctrl_enter_sends_the_new_wording() { } /// The composer is the one place a reviewer writes prose, and it was push/pop-char only. It now -/// runs on Luxe's real editor: a cursor you can move, word operations, and Unicode safety. +/// runs on luxe's real editor: a cursor you can move, word operations, and Unicode safety. #[test] fn the_comment_composer_supports_real_editing() { use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; diff --git a/crates/luxe-tui/src/app/configuration.rs b/crates/luxe-tui/src/app/configuration.rs index d8df098..033f35c 100644 --- a/crates/luxe-tui/src/app/configuration.rs +++ b/crates/luxe-tui/src/app/configuration.rs @@ -105,7 +105,7 @@ impl App { }, ConfigFile { name: "models.json", - detail: "Providers, models, and which one Luxe starts on", + detail: "Providers, models, and which one luxe starts on", path: luxe_core::user_dirs::luxe_config_file("models.json"), }, ConfigFile { name: "auth.json", detail: "Credentials — written 0600", path: auth }, diff --git a/crates/luxe-tui/src/app/construct.rs b/crates/luxe-tui/src/app/construct.rs index 81ed2ed..8c892f0 100644 --- a/crates/luxe-tui/src/app/construct.rs +++ b/crates/luxe-tui/src/app/construct.rs @@ -154,7 +154,7 @@ impl App { /// a configured theme that names nothing. /// /// A theme that falls back looks like a theme that is not very different, so a warning in the log -/// alone left someone tuning a file Luxe had never read. +/// alone left someone tuning a file luxe had never read. pub(crate) fn theme_notices(config: &Config, registry: &ThemeRegistry) -> Vec { let mut notices: Vec = registry.problems().iter().map(|problem| format!("theme not loaded — {problem}")).collect(); @@ -175,7 +175,7 @@ pub(crate) fn theme_notices(config: &Config, registry: &ThemeRegistry) -> Vec Vec { config @@ -184,7 +184,7 @@ pub(crate) fn mention_notices(config: &Config) -> Vec { .filter(|source| source.reserved()) .map(|source| { format!( - "mention source `{}` is not listed — `@[{}:…]` belongs to Luxe's own tab. Give it a \ + "mention source `{}` is not listed — `@[{}:…]` belongs to luxe's own tab. Give it a \ `kind` of its own in {}", source.name, source.kind(), diff --git a/crates/luxe-tui/src/app/events/transcript.rs b/crates/luxe-tui/src/app/events/transcript.rs index f2390a2..edb2f11 100644 --- a/crates/luxe-tui/src/app/events/transcript.rs +++ b/crates/luxe-tui/src/app/events/transcript.rs @@ -463,7 +463,7 @@ fn history_preview(value: &str) -> String { } /// A user message as the transcript shows it: the reader's words as they wrote them, and a brief -/// Luxe wrote to the agent as one line saying what happened. +/// luxe wrote to the agent as one line saying what happened. /// /// A question from a review is the exception, since its words *are* the reader's: it shows what /// they asked, under where they asked it, so the answer below it is not an answer to nothing. diff --git a/crates/luxe-tui/src/app/events/turn.rs b/crates/luxe-tui/src/app/events/turn.rs index 70c5da0..4077eca 100644 --- a/crates/luxe-tui/src/app/events/turn.rs +++ b/crates/luxe-tui/src/app/events/turn.rs @@ -192,7 +192,7 @@ fn follow_reported_model(app: &mut App, reported: &luxe_core::event::ModelRef) { /// Rings the bell and sends a desktop notification for `event`, each where the reader asked for it. /// -/// The bell answers every moment, since asking for one is asking to be told when Luxe needs you; +/// The bell answers every moment, since asking for one is asking to be told when luxe needs you; /// the notification answers the moments `notifications` names. Headless has nobody to tell. pub(super) fn alert(app: &App, event: NotificationEvent, body: &str) { if app.headless { @@ -223,8 +223,8 @@ fn notify_reader(app: &App, body: &str) { } let project = app.project_root.as_deref().and_then(std::path::Path::file_name); let title = match project { - Some(name) => format!("Luxe · {}", name.to_string_lossy()), - None => "Luxe".to_string(), + Some(name) => format!("luxe · {}", name.to_string_lossy()), + None => "luxe".to_string(), }; app.notifier.notify(&title, body); } diff --git a/crates/luxe-tui/src/app/messages.rs b/crates/luxe-tui/src/app/messages.rs index 332a2f2..0a6e329 100644 --- a/crates/luxe-tui/src/app/messages.rs +++ b/crates/luxe-tui/src/app/messages.rs @@ -185,11 +185,8 @@ fn reduce_inner(app: &mut App, msg: Msg) { app.toggle_block_details_at(index); } Msg::ScrollDock { up } => app.dock.scroll_by(up, app.dock_scroll_max.get()), - Msg::ScrollContextFiles { up } => { - if let Some(files) = app.overlays.context_files.as_mut() { - files.scroll_by(up); - } - } + Msg::ScrollContextFiles { up } => scroll_context_files(app, up), + Msg::ScrollOverlayList { list, up } => app.walk_overlay_list(list, up), Msg::ScrollDockList { list, up } => { app.dock.scroll_list_by(list, up, app.dock_list_metrics(list)); } @@ -444,6 +441,13 @@ fn reduce_inner(app: &mut App, msg: Msg) { } } +/// Scrolls the context files overlay, when it's open. +fn scroll_context_files(app: &mut App, up: bool) { + if let Some(files) = app.overlays.context_files.as_mut() { + files.scroll_by(up); + } +} + /// Moves the surface behind a scrollbar to where its track was pressed or dragged. fn drag_scrollbar(app: &mut App, region: crate::mouse::ScrollRegionId, row: u16, height: u16) { use crate::mouse::ScrollRegionId; @@ -476,6 +480,7 @@ fn drag_scrollbar(app: &mut App, region: crate::mouse::ScrollRegionId, row: u16, ScrollRegionId::DockList(list) => { app.dock.drag_list(list, row, height, app.dock_list_metrics(list)); } + ScrollRegionId::OverlayList(list) => app.drag_overlay_list(list, row, height), ScrollRegionId::Dock | ScrollRegionId::ContextFiles => {} } } diff --git a/crates/luxe-tui/src/app/messages/changes.rs b/crates/luxe-tui/src/app/messages/changes.rs index 59e030a..be7d079 100644 --- a/crates/luxe-tui/src/app/messages/changes.rs +++ b/crates/luxe-tui/src/app/messages/changes.rs @@ -167,7 +167,7 @@ fn request_text(app: &mut App) { view.text_request = None; view.text = crate::changes::TextLoad::Failed( luxe_core::project_files::ProjectFileFailure::Unreadable( - "Luxe is not accepting requests".into(), + "luxe is not accepting requests".into(), ), ); } @@ -227,7 +227,7 @@ fn request_capture(app: &mut App) { if let Some(view) = app.changes.as_mut() { view.request = None; view.load = crate::changes::ChangesLoad::Failed( - luxe_core::file_diff::FileDiffFailure::Git("Luxe is not accepting requests".into()), + luxe_core::file_diff::FileDiffFailure::Git("luxe is not accepting requests".into()), ); } app.push_convo(ConvoBlock::System("Could not read that file's changes.".to_string())); diff --git a/crates/luxe-tui/src/app/messages/files.rs b/crates/luxe-tui/src/app/messages/files.rs index 4571426..9389d12 100644 --- a/crates/luxe-tui/src/app/messages/files.rs +++ b/crates/luxe-tui/src/app/messages/files.rs @@ -18,30 +18,48 @@ pub(crate) fn changed(app: &App) -> Vec { .unwrap_or_default() } -/// Asks for every listing the tree is about to need and does not have. +/// Most listings the tree has asked for and not had back. /// -/// Called whenever what is open, or what changed, may have moved. A refused send leaves the folder -/// unasked, so the next sync tries again rather than the tree waiting on an answer that is never -/// coming. +/// A change across the project stales every open folder at once, and asking for all of them in one +/// go would fill the engine's queue ahead of what the reader sends next: a steer, a cancel. Each +/// landed listing syncs again, so the rest follow as these come back. +pub(crate) const MAX_LISTINGS_IN_FLIGHT: usize = 8; + +/// Asks for the listings the tree is about to need and does not have, a few at a time. +/// +/// Called whenever what is open, or what changed, may have moved, and on every landed listing. +/// The reader didn't ask for these, so a refused send says nothing; it leaves the folder unasked, +/// and the next sync tries again rather than the tree waiting on an answer that is never coming. pub(crate) fn sync(app: &mut App) { if app.workspace.is_none() { return; } let changes = changed(app); app.files.refresh_if_changed(&changes); - for folder in app.files.wanted(&changes) { - let request_id = ListingRequestId::new(); - let action = Action::ListDirectory { - request_id: request_id.clone(), - path: folder.clone(), - include_ignored: app.files.show_ignored, - }; - if app.send_action(action, "list a folder") { - app.files.requested(&folder, request_id); + let room = MAX_LISTINGS_IN_FLIGHT.saturating_sub(app.files.in_flight()); + for folder in app.files.wanted(&changes).into_iter().take(room) { + // A full queue refuses the rest of this burst too + if !ask_for_listing(app, &folder) { + break; } } } +/// Asks the engine for one folder's listing and notes it as in flight. Answers whether it went. +fn ask_for_listing(app: &mut App, folder: &str) -> bool { + let request_id = ListingRequestId::new(); + let action = Action::ListDirectory { + request_id: request_id.clone(), + path: folder.to_string(), + include_ignored: app.files.show_ignored, + }; + if !app.send_quietly(action, "list a folder") { + return false; + } + app.files.requested(folder, request_id); + true +} + /// Applies a landed listing or its failure. Answers whether the event was the tree's. pub(crate) fn apply(app: &mut App, event: &luxe_core::event::Event) -> bool { use luxe_core::event::Event; diff --git a/crates/luxe-tui/src/app/messages/thread_answers.rs b/crates/luxe-tui/src/app/messages/thread_answers.rs index a7cab4f..b57584a 100644 --- a/crates/luxe-tui/src/app/messages/thread_answers.rs +++ b/crates/luxe-tui/src/app/messages/thread_answers.rs @@ -60,7 +60,7 @@ pub(super) fn confirm(app: &mut App) { }) .collect(); if to_send.is_empty() { - app.status.flash_toast("Nothing to send: space resolves a thread, c writes a reply"); + app.status.flash_toast("Nothing to send · space resolve · c reply"); return; } let Some(review_id) = app.guided_review.as_ref().map(|review| review.id.clone()) else { diff --git a/crates/luxe-tui/src/app/msg.rs b/crates/luxe-tui/src/app/msg.rs index dae62c4..9c45c58 100644 --- a/crates/luxe-tui/src/app/msg.rs +++ b/crates/luxe-tui/src/app/msg.rs @@ -117,6 +117,11 @@ pub enum Msg { ScrollContextFiles { up: bool, }, + /// Walks a modal list's cursor one row (mouse wheel over it). + ScrollOverlayList { + list: crate::mouse::OverlayList, + up: bool, + }, /// Scrolls one of the dock's lists by one step (mouse wheel over that section). ScrollDockList { list: crate::workspace_dock::DockList, diff --git a/crates/luxe-tui/src/app/navigation.rs b/crates/luxe-tui/src/app/navigation.rs index bb9f0b5..165ec0e 100644 --- a/crates/luxe-tui/src/app/navigation.rs +++ b/crates/luxe-tui/src/app/navigation.rs @@ -122,7 +122,7 @@ fn run_command(app: &mut App, command: crate::commands::Command) { // The mode outlives the session, so it is chosen here rather than in a session made for it id::MODE => super::commands::dispatch(app, command), id::SESSIONS => app.open_sessions(), - // Leaves Luxe, so a session started for it would only be left empty + // Leaves luxe, so a session started for it would only be left empty id::UPDATE => app.outbox.update = true, _ if command.slash_name() == Some("/quit") => { app.should_quit = true; diff --git a/crates/luxe-tui/src/app/outbox.rs b/crates/luxe-tui/src/app/outbox.rs index 7d96092..3713807 100644 --- a/crates/luxe-tui/src/app/outbox.rs +++ b/crates/luxe-tui/src/app/outbox.rs @@ -16,7 +16,7 @@ pub struct Outbox { /// A file the reader chose to edit. The editor needs the terminal back, so the TUI exits and /// the CLI runs it, the same way the Configuration surface's own `EditFile` does. pub editor_file: Option, - /// The session's worktree, to remove once Luxe has left it: only the loop can end the session + /// The session's worktree, to remove once luxe has left it: only the loop can end the session /// and only the CLI can remove the directory the process is standing in pub worktree_removal: Option, /// A pull request to check out and fix in a new session, with the comments that go with it @@ -25,7 +25,7 @@ pub struct Outbox { pub issue: Option, /// A session of yours to leave this one for, and what the reader carries into it pub resume: Option, - /// Whether to leave and update Luxe + /// Whether to leave and update luxe pub update: bool, /// Text to hand to the reader's editor and bring back pub text_edit: Option, diff --git a/crates/luxe-tui/src/app/overlay_lists.rs b/crates/luxe-tui/src/app/overlay_lists.rs new file mode 100644 index 0000000..ad4bfbb --- /dev/null +++ b/crates/luxe-tui/src/app/overlay_lists.rs @@ -0,0 +1,96 @@ +//! Overlay lists — what the wheel and the scrollbar do to a modal list that follows its cursor. +//! +//! Every such list draws the window around its cursor rather than keeping a scroll offset of its +//! own, so both gestures move the cursor: a notch walks it a row, the way the arrows do, and a press +//! or drag on the bar puts it at that point of the list. A view that drifted off its cursor would +//! leave Enter choosing a row nobody can see. + +use super::App; +use crate::configuration::ConfigOutcome; +use crate::mouse::OverlayList; + +impl App { + /// Where `list`'s cursor is and how many rows it has, while it is open. + pub(crate) fn overlay_cursor(&self, list: OverlayList) -> Option<(usize, usize)> { + let overlays = &self.overlays; + match list { + OverlayList::Models => { + overlays.model_picker.as_ref().map(|picker| (picker.cursor(), picker.match_count())) + } + OverlayList::Providers => overlays + .auth_wizard + .as_ref() + .and_then(|wizard| Some((wizard.selected_row(), wizard.provider_rows()?))), + OverlayList::Palette => { + overlays.palette.as_ref().map(|palette| (palette.selected(), palette.match_count())) + } + OverlayList::Themes => { + overlays.theme_picker.as_ref().map(|picker| (picker.cursor(), picker.len())) + } + OverlayList::Sessions => overlays + .session_picker + .as_ref() + .map(|picker| (picker.cursor(), picker.match_count())), + OverlayList::Slash => overlays + .slash_flyout + .as_ref() + .map(|flyout| (flyout.cursor(), flyout.filtered_items().len())), + OverlayList::Mention => overlays + .mention + .as_ref() + .map(|mention| (mention.cursor(), mention.filtered_items().len())), + OverlayList::Configuration => { + overlays.configuration.as_ref().map(|it| it.list_cursor()) + } + } + } + + /// Puts `list`'s cursor on `row`, previewing a theme the way arrowing onto it does. + fn put_overlay_cursor(&mut self, list: OverlayList, row: usize) { + let overlays = &mut self.overlays; + match list { + OverlayList::Models => overlays.model_picker.as_mut().map(|picker| picker.select(row)), + OverlayList::Providers => { + overlays.auth_wizard.as_mut().map(|wizard| wizard.select_provider(row)) + } + OverlayList::Palette => overlays.palette.as_mut().map(|palette| palette.select(row)), + OverlayList::Themes => { + let preview = overlays.theme_picker.as_mut().and_then(|picker| picker.select(row)); + preview.map(|theme| self.preview_theme(&theme)) + } + OverlayList::Sessions => { + overlays.session_picker.as_mut().map(|picker| picker.select(row)) + } + OverlayList::Slash => overlays.slash_flyout.as_mut().map(|flyout| flyout.select(row)), + OverlayList::Mention => overlays.mention.as_mut().map(|mention| mention.select(row)), + OverlayList::Configuration => { + let moved = overlays.configuration.as_mut().map(|surface| surface.select(row)); + // Repaints in the setup theme under the cursor, as a key onto it does + moved.map(|()| self.apply_configuration_outcome(ConfigOutcome::Consumed)) + } + }; + } + + /// Walks `list`'s cursor one row, stopping at either end rather than wrapping as the arrows + /// do: a wheel spun past the last row would otherwise fling the reader back to the top. + pub(crate) fn walk_overlay_list(&mut self, list: OverlayList, up: bool) { + let Some((cursor, rows)) = self.overlay_cursor(list) else { return }; + let row = match up { + true => cursor.saturating_sub(1), + false => (cursor + 1).min(rows.saturating_sub(1)), + }; + if row != cursor { + self.put_overlay_cursor(list, row); + } + } + + /// Puts `list`'s cursor at the point of the list that `row` of a `height`-tall bar stands for. + pub(crate) fn drag_overlay_list(&mut self, list: OverlayList, row: u16, height: u16) { + let Some((_, rows)) = self.overlay_cursor(list) else { return }; + let target = crate::widgets::drag_offset(row, height, rows.saturating_sub(1)); + self.put_overlay_cursor(list, target); + } +} + +#[cfg(test)] +mod tests; diff --git a/crates/luxe-tui/src/app/overlay_lists/tests.rs b/crates/luxe-tui/src/app/overlay_lists/tests.rs new file mode 100644 index 0000000..c69ff01 --- /dev/null +++ b/crates/luxe-tui/src/app/overlay_lists/tests.rs @@ -0,0 +1,165 @@ +use crate::app::App; +use crate::fixture::{seeded_app, FixtureScenario}; +use crate::model_picker::{ModelEntry, ModelPickerState}; +use crate::mouse::{MouseTarget, OverlayList, ScrollRegionId}; +use crossterm::event::{KeyModifiers, MouseButton, MouseEvent, MouseEventKind}; +use luxe_core::provider::{ModelInfo, ModelRef}; +use ratatui::{backend::TestBackend, layout::Rect, Terminal}; + +/// An app with the model picker open over `count` models, drawn once so its regions are published. +fn picker_over(count: usize) -> App { + let mut app = seeded_app("nord", FixtureScenario::ChatIdle).expect("a seeded app"); + let models = (0..count) + .map(|index| ModelEntry { + info: ModelInfo { + r#ref: ModelRef::new("p", format!("m{index:02}")), + ..Default::default() + }, + label: format!("Model {index:02}"), + configured: true, + unverified: false, + }) + .collect(); + app.overlays.model_picker = Some(ModelPickerState::open(models, None)); + draw(&mut app); + app +} + +fn draw(app: &mut App) { + let mut terminal = Terminal::new(TestBackend::new(120, 30)).expect("a terminal"); + terminal.draw(|frame| crate::view::render(frame, app)).expect("a frame"); +} + +/// Routes one mouse event at `(column, row)` the way the event loop does, and applies it. +fn mouse(app: &mut App, kind: MouseEventKind, (column, row): (u16, u16)) { + let event = MouseEvent { kind, column, row, modifiers: KeyModifiers::NONE }; + match crate::main_loop::route_mouse(app, &event) { + crate::main_loop::RouteAction::Msg(message) => app.update(*message), + crate::main_loop::RouteAction::None => {} + other => panic!("a modal list should take the gesture itself: {other:?}"), + } +} + +/// The first published click target `pick` accepts, with its rect. +fn target(app: &App, pick: impl Fn(&MouseTarget) -> bool) -> Option<(Rect, MouseTarget)> { + let hit = app.hit.borrow(); + let found = + hit.clicks().find(|(_, target)| pick(target)).map(|(rect, target)| (rect, target.clone())); + found +} + +fn models_cursor(app: &App) -> usize { + app.overlay_cursor(OverlayList::Models).expect("the picker is open").0 +} + +/// A cell on the picker's first row. +fn first_row(app: &App) -> (u16, u16) { + let (rect, _) = target(app, |it| *it == MouseTarget::ModelRow(0)).expect("a first row"); + (rect.x + 2, rect.y) +} + +/// The wheel over the picker walks its cursor a row a notch, and stops at the top rather than +/// wrapping to the bottom the way the arrows do. +/// +/// The break this catches: no region published, so a notch fell through to the transcript behind +/// the modal and the list never moved. +#[test] +fn the_wheel_walks_the_model_picker_and_stops_at_its_ends() { + let mut app = picker_over(40); + let at = first_row(&app); + mouse(&mut app, MouseEventKind::ScrollDown, at); + mouse(&mut app, MouseEventKind::ScrollDown, at); + assert_eq!(models_cursor(&app), 2, "two notches down, two rows down"); + for _ in 0..3 { + mouse(&mut app, MouseEventKind::ScrollUp, at); + } + assert_eq!(models_cursor(&app), 0, "the top holds instead of wrapping to the bottom"); +} + +/// A long list draws a bar in a column of its own, and a press low on the bar takes the cursor to +/// the end of the list. +#[test] +fn the_model_pickers_bar_takes_a_column_and_steers_the_cursor() { + let mut app = picker_over(40); + let region = ScrollRegionId::OverlayList(OverlayList::Models); + let (lane, _) = + target(&app, |it| matches!(it, MouseTarget::Scrollbar { region: r, .. } if *r == region)) + .expect("a long list draws its bar"); + let (row, _) = target(&app, |it| *it == MouseTarget::ModelRow(0)).expect("a first row"); + assert!(row.right() <= lane.x, "rows stop short of the bar: {row:?} vs {lane:?}"); + + let bottom = (lane.x, lane.bottom() - 1); + mouse(&mut app, MouseEventKind::Down(MouseButton::Left), bottom); + mouse(&mut app, MouseEventKind::Up(MouseButton::Left), bottom); + assert_eq!(models_cursor(&app), 39, "the bottom of the bar is the end of the list"); +} + +/// A list that fits draws no bar, and the wheel over it still moves its cursor rather than the +/// transcript behind it. +#[test] +fn a_short_list_draws_no_bar_but_still_takes_the_wheel() { + let mut app = picker_over(4); + assert!(target(&app, |it| matches!(it, MouseTarget::Scrollbar { .. })).is_none()); + let at = first_row(&app); + mouse(&mut app, MouseEventKind::ScrollDown, at); + assert_eq!(models_cursor(&app), 1); +} + +/// The wheel over the theme picker previews what it lands on, as arrowing there does. +#[test] +fn the_wheel_over_the_theme_picker_previews_the_theme() { + let mut app = seeded_app("nord", FixtureScenario::ChatIdle).expect("a seeded app"); + let themes = vec!["nord".to_string(), "dracula".to_string(), "gruvbox".to_string()]; + app.overlays.theme_picker = Some(crate::theme_picker::ThemePickerState::open(themes, "nord")); + draw(&mut app); + let nord = app.theme_styles.accent; + let (rect, _) = target(&app, |it| *it == MouseTarget::ThemeRow(0)).expect("a theme row"); + mouse(&mut app, MouseEventKind::ScrollDown, (rect.x + 2, rect.y)); + assert_eq!(app.overlay_cursor(OverlayList::Themes), Some((1, 3))); + assert_ne!(app.theme_styles.accent, nord, "landing on a theme previews it"); +} + +/// Setup's theme step takes the wheel through the configuration surface, and repaints in the theme +/// it lands on the way the arrows do. +#[test] +fn the_wheel_over_setups_themes_previews_each_one() { + let mut wheeled = seeded_app("nord", FixtureScenario::Setup).expect("a seeded app"); + draw(&mut wheeled); + let before = wheeled.theme_styles.clone(); + let (rect, _) = target(&wheeled, |it| *it == MouseTarget::ConfigRow(0)).expect("a theme row"); + // Two rows, since the first one down is the theme already showing + for _ in 0..2 { + mouse(&mut wheeled, MouseEventKind::ScrollDown, (rect.x + 2, rect.y)); + } + + let mut arrowed = seeded_app("nord", FixtureScenario::Setup).expect("a seeded app"); + let down = crossterm::event::KeyEvent::new(crossterm::event::KeyCode::Down, KeyModifiers::NONE); + for _ in 0..2 { + match crate::main_loop::route_key(&mut arrowed, &down) { + crate::main_loop::RouteAction::Configuration(outcome) => { + arrowed.apply_configuration_outcome(outcome) + } + other => panic!("setup takes the arrow itself: {other:?}"), + } + } + let cursor = |app: &App| app.overlay_cursor(OverlayList::Configuration); + assert_eq!(cursor(&wheeled), cursor(&arrowed), "a notch moves as far as the arrow"); + assert_ne!(wheeled.theme_styles, before, "and the app repaints"); + assert_eq!(wheeled.theme_styles, arrowed.theme_styles, "in the same theme the arrow shows"); +} + +/// The login wizard's provider list takes the wheel too, and only while it is on that list. +#[test] +fn the_wheel_walks_the_login_providers() { + let mut app = seeded_app("nord", FixtureScenario::ChatIdle).expect("a seeded app"); + crate::fixture::seed_login_wizard(&mut app, crate::fixture::LoginFixture::Providers); + draw(&mut app); + let (rect, _) = + target(&app, |it| *it == MouseTarget::AuthProviderRow(0)).expect("a provider row"); + mouse(&mut app, MouseEventKind::ScrollDown, (rect.x + 2, rect.y)); + assert_eq!(app.overlay_cursor(OverlayList::Providers).map(|(cursor, _)| cursor), Some(1)); + + let mut methods = seeded_app("nord", FixtureScenario::ChatIdle).expect("a seeded app"); + crate::fixture::seed_login_wizard(&mut methods, crate::fixture::LoginFixture::Methods); + assert_eq!(methods.overlay_cursor(OverlayList::Providers), None, "a method list is not it"); +} diff --git a/crates/luxe-tui/src/app/pickers.rs b/crates/luxe-tui/src/app/pickers.rs index 6ea10bc..e6db37c 100644 --- a/crates/luxe-tui/src/app/pickers.rs +++ b/crates/luxe-tui/src/app/pickers.rs @@ -36,29 +36,30 @@ impl App { /// The same, opening with something to say first. Args: `(note)`. pub(crate) fn open_model_picker_with(&mut self, note: Vec) { + let active = self.active_model_info.as_ref().map(|info| info.r#ref.clone()); + self.open_model_picker_on(note, active); + } + + /// The same, with the cursor on the first row rather than the model in use. Args: `(note)`. + pub(crate) fn open_model_picker_at_top(&mut self, note: Vec) { + self.open_model_picker_on(note, None); + } + + /// Opens the picker with the cursor on `start`, or the top. Args: `(note, start)`. + fn open_model_picker_on( + &mut self, + note: Vec, + start: Option, + ) { if let Some(sources) = &self.model_sources { self.model_catalog = (sources.build)().catalog; } if self.model_catalog.is_empty() { - match self.provider_configured() { - true => self.push_convo(ConvoBlock::System( - "No models available to switch to — add models under \"models\" in your Luxe \ - config." - .to_string(), - )), - false => { - self.push_convo(ConvoBlock::System( - "No provider is configured, so there are no models to choose from yet." - .to_string(), - )); - self.open_configuration(); - } - } + self.explain_no_models(); return; } - let active = self.active_model_info.as_ref().map(|info| info.r#ref.clone()); self.overlays.model_picker = Some( - crate::model_picker::ModelPickerState::open(self.model_catalog.clone(), active) + crate::model_picker::ModelPickerState::open(self.model_catalog.clone(), start) .with_note(note), ); // Drawn from what is on disk, then corrected by whatever a local server says when it @@ -68,6 +69,22 @@ impl App { self.model_sources.as_ref().is_some_and(|sources| sources.probe.is_some()); } + /// Says why there is no picker, and sends a machine with no provider to setup. + fn explain_no_models(&mut self) { + if self.provider_configured() { + self.push_convo(ConvoBlock::System( + "No models available to switch to — add models under \"models\" in your luxe \ + config." + .to_string(), + )); + return; + } + self.push_convo(ConvoBlock::System( + "No provider is configured, so there are no models to choose from yet.".to_string(), + )); + self.open_configuration(); + } + /// Apply a catalog rebuilt off the frame, leaving an open picker where the reader had it. pub fn apply_model_catalog_refresh(&mut self, catalog: Vec) { if catalog == self.model_catalog { @@ -81,7 +98,7 @@ impl App { /// Whether a turn has a model to run on. /// - /// Luxe chooses none on the reader's behalf, so a session can legitimately open with nothing + /// luxe chooses none on the reader's behalf, so a session can legitimately open with nothing /// selected — the dashboard's first screen is one of the places you pick. The engine refuses a /// turn either way ([`luxe_core::engine::EngineError::NoModel`]); this is what lets the UI ask /// before the reader's message leaves the composer. diff --git a/crates/luxe-tui/src/app/selection.rs b/crates/luxe-tui/src/app/selection.rs index 536ac49..3328948 100644 --- a/crates/luxe-tui/src/app/selection.rs +++ b/crates/luxe-tui/src/app/selection.rs @@ -1,6 +1,6 @@ //! Text-selection handling — mouse drags over the transcript, the composer and the Changes pane. //! -//! Mouse capture takes the terminal's own click-drag selection away, so Luxe provides it: a press +//! Mouse capture takes the terminal's own click-drag selection away, so luxe provides it: a press //! anchors, a drag extends, and a release copies (the copy-on-select behavior a terminal would //! have given you). A press that lands twice on the same cell escalates to the word under it and //! then to the whole line, the other two gestures capture costs. The composer keeps its selection diff --git a/crates/luxe-tui/src/app/setup.rs b/crates/luxe-tui/src/app/setup.rs index 3aaa52f..5337185 100644 --- a/crates/luxe-tui/src/app/setup.rs +++ b/crates/luxe-tui/src/app/setup.rs @@ -43,7 +43,7 @@ impl App { } /// Write what setup gathered, and go where finishing goes: the start screen on a first run, - /// out of Luxe under `luxe init`. + /// out of luxe under `luxe init`. pub(crate) fn finish_setup(&mut self, choices: SetupChoices) { let mode = self.setup_mode(); if let Err(error) = write_choices(&choices) { diff --git a/crates/luxe-tui/src/app/tests/composer.rs b/crates/luxe-tui/src/app/tests/composer.rs index 3fa3240..24a1372 100644 --- a/crates/luxe-tui/src/app/tests/composer.rs +++ b/crates/luxe-tui/src/app/tests/composer.rs @@ -62,7 +62,7 @@ fn printable_input_bypasses_legacy_plain_character_shortcuts() { /// A submission with no model chosen opens the picker and keeps the draft. /// -/// Luxe picks no model for the reader, so this is a state a session can legitimately be in. The +/// luxe picks no model for the reader, so this is a state a session can legitimately be in. The /// engine refuses such a turn anyway; the point of asking here is that the reader's message is /// still in the composer when they come back from the picker, rather than gone into a turn that /// was never going to run. diff --git a/crates/luxe-tui/src/app/tests/dashboard.rs b/crates/luxe-tui/src/app/tests/dashboard.rs index 6edfe63..25a416d 100644 --- a/crates/luxe-tui/src/app/tests/dashboard.rs +++ b/crates/luxe-tui/src/app/tests/dashboard.rs @@ -417,7 +417,7 @@ fn the_mode_command_on_the_start_screen_stays_on_it() { assert!(matches!(actions.as_slice(), [Action::SetMode(mode)] if mode == "plan"), "{actions:?}"); } -/// `/update` on the start screen leaves Luxe for the CLI's update, which needs the terminal, and +/// `/update` on the start screen leaves luxe for the CLI's update, which needs the terminal, and /// starts no session on the way out. #[test] fn the_update_command_on_the_start_screen_leaves_to_update() { diff --git a/crates/luxe-tui/src/app/tests/mentions.rs b/crates/luxe-tui/src/app/tests/mentions.rs index c979dc1..f6f2c44 100644 --- a/crates/luxe-tui/src/app/tests/mentions.rs +++ b/crates/luxe-tui/src/app/tests/mentions.rs @@ -147,7 +147,7 @@ fn test_mention_picker_opens_at_start() { /// The Files tab keeps up with the disk: opening the picker asks for a fresh read, the read lands /// in the open picker with the cursor still on its file, and Ctrl+R asks again. A file made or -/// moved outside Luxe used to be unreachable until the session was reloaded. +/// moved outside luxe used to be unreachable until the session was reloaded. #[test] fn the_files_tab_reads_the_disk_again_and_keeps_its_place() { let (tx, _rx) = mpsc::channel(8); @@ -535,7 +535,7 @@ fn test_multi_mention_submit_does_not_panic() { } } -/// A mention source whose kind is one of Luxe's own tabs' — `mcp` above all, reserved after sources +/// A mention source whose kind is one of luxe's own tabs' — `mcp` above all, reserved after sources /// existed — says why it has no tab, at startup, instead of quietly not having one. #[test] fn a_mention_source_on_a_reserved_kind_says_so_at_startup() { diff --git a/crates/luxe-tui/src/app/tests/notify.rs b/crates/luxe-tui/src/app/tests/notify.rs index 4ac8bb3..48d849a 100644 --- a/crates/luxe-tui/src/app/tests/notify.rs +++ b/crates/luxe-tui/src/app/tests/notify.rs @@ -22,8 +22,8 @@ async fn a_turn_end_notifies_only_while_the_terminal_is_in_the_background() { assert_eq!( *calls.lock().unwrap(), vec![ - ("Luxe · widget".to_string(), "Turn finished".to_string()), - ("Luxe · widget".to_string(), "Turn failed: rate limited".to_string()), + ("luxe · widget".to_string(), "Turn finished".to_string()), + ("luxe · widget".to_string(), "Turn failed: rate limited".to_string()), ], "the focused turn end sent nothing" ); diff --git a/crates/luxe-tui/src/app/tests/pickers.rs b/crates/luxe-tui/src/app/tests/pickers.rs index 616de7c..d5ff2b7 100644 --- a/crates/luxe-tui/src/app/tests/pickers.rs +++ b/crates/luxe-tui/src/app/tests/pickers.rs @@ -105,13 +105,10 @@ fn command_palette_filters_and_dispatches() { assert!(app.editor.current_input().is_empty(), "palette text must not leak to the editor"); } -/// A login has to leave the session able to run a turn, on a model that provider serves. -/// -/// The suggested model is the flow's own answer and wins; without one, any model of that -/// provider beats leaving the session on whatever it launched with. What must never happen is -/// adopting *another* provider's model because the ids happened to line up. +/// A finished login opens the picker at its top row and leaves the session's model alone: which +/// model to run is the reader's call, and luxe has no favorite to land them on. #[tokio::test] -async fn a_finished_login_lands_the_session_on_a_model_that_provider_serves() { +async fn a_finished_login_opens_the_picker_at_the_top_and_chooses_nothing() { use crate::model_picker::{ModelEntry, ModelMenu}; use luxe_core::auth::{CredentialKind, LoginOutcome}; use luxe_core::provider::{ModelInfo, ModelRef}; @@ -127,15 +124,16 @@ async fn a_finished_login_lands_the_session_on_a_model_that_provider_serves() { entry("openai", "gpt-5.4"), entry("openai", "gpt-5.6"), ]; - let outcome = |suggested: Option<&str>| LoginOutcome { + let outcome = || LoginOutcome { provider_id: "openai".into(), provider_name: "OpenAI".into(), kind: Some(CredentialKind::ApiKey), account: Some("acct-1".into()), - suggested_model: suggested.map(str::to_string), notes: vec!["2 models available".into()], advice: vec!["Enable it once in VS Code.".into()], }; + let finished = || Msg::Auth(crate::auth_wizard::AuthUiMsg::Finished(Ok(outcome()))); + let picker = |app: &App| app.overlays.model_picker.as_ref().expect("the picker opens").clone(); let app_with = |catalog: Vec| { let (tx, _rx) = mpsc::channel(8); let mut app = App::new( @@ -155,21 +153,20 @@ async fn a_finished_login_lands_the_session_on_a_model_that_provider_serves() { app }; - // The flow named one, so that is the one. + // A first login: nothing chosen, the cursor on the first row, and a caption saying so let mut app = app_with(catalog.clone()); - app.update(Msg::Auth(crate::auth_wizard::AuthUiMsg::Finished(Ok(outcome(Some("gpt-5.6")))))); - assert_eq!(app.status.model, "gpt-5.6"); + app.update(finished()); + assert_eq!(app.status.model, "", "the login picks no model for the reader"); + assert_eq!(picker(&app).cursor(), 0, "the picker starts at its top"); + assert!(picker(&app).note().iter().any(|line| line.contains("Choose a model to finish"))); - // It named none, so any model of *that* provider does. + // A second provider while one is in use: still the top, and Esc keeps what is running let mut app = app_with(catalog.clone()); - app.update(Msg::Auth(crate::auth_wizard::AuthUiMsg::Finished(Ok(outcome(None))))); - assert!(app.status.model.starts_with("gpt-5."), "got {}", app.status.model); - - // It named one this provider does not serve, which is not a reason to leave the session on - // somebody else's model. - let mut app = app_with(vec![entry("anthropic", "claude-sonnet-5")]); - app.update(Msg::Auth(crate::auth_wizard::AuthUiMsg::Finished(Ok(outcome(Some("gpt-5.6")))))); - assert_eq!(app.status.model, "", "no model of that provider is no model"); + app.apply_model_selection(catalog[2].info.clone()); + app.update(finished()); + assert_eq!(app.status.model, "gpt-5.6", "the session stays on what it was on"); + assert_eq!(picker(&app).cursor(), 0, "not on the model in use either"); + assert!(picker(&app).note().iter().any(|line| line.contains("esc to stay on gpt-5.6"))); // And the whole of what the login said survives in the transcript, where the picker's // two-line caption cannot carry it. diff --git a/crates/luxe-tui/src/auth_wizard.rs b/crates/luxe-tui/src/auth_wizard.rs index b7bdc3d..8f4a9bb 100644 --- a/crates/luxe-tui/src/auth_wizard.rs +++ b/crates/luxe-tui/src/auth_wizard.rs @@ -196,6 +196,11 @@ impl AuthWizardState { &self.providers } + /// How many providers the list shows, while the wizard is on that list. + pub(crate) fn provider_rows(&self) -> Option { + matches!(self.stage, Stage::Provider { .. }).then(|| self.visible_providers().len()) + } + /// Highlighted row in the current list stage. pub fn selected_row(&self) -> usize { match &self.stage { diff --git a/crates/luxe-tui/src/auth_wizard/render.rs b/crates/luxe-tui/src/auth_wizard/render.rs index 6c28c59..ea12ab4 100644 --- a/crates/luxe-tui/src/auth_wizard/render.rs +++ b/crates/luxe-tui/src/auth_wizard/render.rs @@ -118,7 +118,7 @@ impl AuthWizardState { match self.scope() { LoginScope::Any => None, LoginScope::Subscription => { - Some("Signs in to a plan you already pay for. Luxe never sees your password.") + Some("Signs in to a plan you already pay for. luxe never sees your password.") } LoginScope::ApiKey => { Some("Paste a key from the provider's console. Stored 0600 in auth.json.") diff --git a/crates/luxe-tui/src/auth_wizard/render/lists.rs b/crates/luxe-tui/src/auth_wizard/render/lists.rs index 8112d29..98ed4ca 100644 --- a/crates/luxe-tui/src/auth_wizard/render/lists.rs +++ b/crates/luxe-tui/src/auth_wizard/render/lists.rs @@ -51,7 +51,9 @@ impl AuthWizardState { let rows = chunks[2].height as usize; let selected = self.selected_row(); let start = selected.saturating_sub(rows.saturating_sub(1)); - let row_width = usize::from(chunks[2].width); + let width = + crate::widgets::list_rows_width(chunks[2].width, visible.len(), chunks[2].height); + let row_width = usize::from(width); // One window drives both the rows drawn and the rows clickable let shown: Vec<(usize, &luxe_core::auth::ProviderOption)> = visible .iter() @@ -64,18 +66,21 @@ impl AuthWizardState { .iter() .map(|(row, option)| self.provider_row(option, *row == selected, row_width, theme)) .collect(); - frame.render_widget(List::new(items), chunks[2]); + frame.render_widget(List::new(items), Rect { width, ..chunks[2] }); let mut regions = hit.borrow_mut(); for (offset, _) in &shown { let y = chunks[2].y.saturating_add((offset - start) as u16); if y < chunks[2].bottom() { regions.push( - Rect::new(chunks[2].x, y, chunks[2].width, 1), + Rect::new(chunks[2].x, y, width, 1), MouseTarget::AuthProviderRow(*offset), ); } } + let list = crate::mouse::OverlayList::Providers; + let window = (start, visible.len()); + crate::widgets::list_scrollbar(frame, &mut regions, chunks[2], list, window, theme); } } diff --git a/crates/luxe-tui/src/auth_wizard/tests.rs b/crates/luxe-tui/src/auth_wizard/tests.rs index 15bcb9d..b0c51f3 100644 --- a/crates/luxe-tui/src/auth_wizard/tests.rs +++ b/crates/luxe-tui/src/auth_wizard/tests.rs @@ -193,7 +193,6 @@ fn a_finished_login_hands_the_outcome_back_and_ends_the_wizard() { provider_name: "OpenAI".into(), kind: Some(luxe_core::auth::CredentialKind::ApiKey), account: None, - suggested_model: None, notes: vec!["12 models available".into()], advice: Vec::new(), }))); diff --git a/crates/luxe-tui/src/changes.rs b/crates/luxe-tui/src/changes.rs index a99ec21..6971125 100644 --- a/crates/luxe-tui/src/changes.rs +++ b/crates/luxe-tui/src/changes.rs @@ -380,7 +380,7 @@ impl ChangesView { /// The path one step from the visible file, wrapping at both ends. /// - /// Wraps because the list is short and circular movement is what every other picker in Luxe + /// Wraps because the list is short and circular movement is what every other picker in luxe /// does; stopping dead at the last file would read as a broken key. A visible file that has /// left the list — reverted while it was open — steps back *onto* the list rather than off it. pub(crate) fn step(&self, forward: bool) -> Option { diff --git a/crates/luxe-tui/src/commands.rs b/crates/luxe-tui/src/commands.rs index 20ae260..13f8994 100644 --- a/crates/luxe-tui/src/commands.rs +++ b/crates/luxe-tui/src/commands.rs @@ -1,4 +1,4 @@ -//! commands — the one list of what Luxe can do, for the palette and the slash flyout. +//! commands — the one list of what luxe can do, for the palette and the slash flyout. //! //! Both doors read this registry: `Ctrl+K` lists everything that can run where you are, `/` lists //! the ones with a slash trigger. A command is data — a name you would say out loud, a sentence @@ -369,7 +369,7 @@ pub struct CommandRegistry { } impl CommandRegistry { - /// Every command Luxe knows. + /// Every command luxe knows. pub fn all() -> Self { Self::from_sources([built_in()]) } @@ -383,7 +383,7 @@ impl CommandRegistry { /// Joins lists of commands into one, the first to claim an id keeping it. /// - /// The built-ins come first, so nothing added later can take over a name Luxe already answers + /// The built-ins come first, so nothing added later can take over a name luxe already answers /// to. pub fn from_sources(sources: impl IntoIterator>) -> Self { let mut commands: Vec = Vec::new(); diff --git a/crates/luxe-tui/src/commands/built_in.rs b/crates/luxe-tui/src/commands/built_in.rs index e69cfaa..124e75f 100644 --- a/crates/luxe-tui/src/commands/built_in.rs +++ b/crates/luxe-tui/src/commands/built_in.rs @@ -1,9 +1,9 @@ -//! The built-ins — every command Luxe ships. +//! The built-ins — every command luxe ships. use super::{id, Command, Need}; use luxe_core::keymap::UiAction; -/// Every command Luxe ships, in no particular order: a menu sorts them. +/// Every command luxe ships, in no particular order: a menu sorts them. /// /// Left out on purpose, because they are keys rather than commands and the key card lists them: /// moving around a review or a diff, block selection, scrolling, the editor's own mechanics @@ -17,10 +17,10 @@ pub(super) fn built_in() -> Vec { // === Anywhere === Command::action(UiAction::Quit) .with_slash("/quit") - .summary("Leaves Luxe; the session is saved as it goes, so nothing is lost.") + .summary("Leaves luxe; the session is saved as it goes, so nothing is lost.") .keywords(&["exit", "close"]), - Command::slash(id::UPDATE, "Update Luxe", "/update") - .summary("Quits Luxe and updates it with the command for however you installed it.") + Command::slash(id::UPDATE, "Update luxe", "/update") + .summary("Quits luxe and updates it with the command for however you installed it.") .detail( "The same as `luxe update`: each command is shown before it runs, in this \ terminal. A copy your system's package manager owns is left to it.", @@ -43,7 +43,7 @@ pub(super) fn built_in() -> Vec { .needs(&[Chat]) .summary("Opens the model picker; the session carries on with whichever you choose.") .detail( - "Every model Luxe knows for the providers it can reach, yours first. The context \ + "Every model luxe knows for the providers it can reach, yours first. The context \ window, output cap, reasoning levels and pricing move with it.", ) .keywords(&["switch", "provider", "llm"]), @@ -402,7 +402,7 @@ pub(super) fn built_in() -> Vec { .keywords(&["api key", "credentials"]), Command::slash(id::LOGOUT, "Sign out", "/logout") .needs(&[Chat]) - .summary("Removes the credential Luxe stored for a provider.") + .summary("Removes the credential luxe stored for a provider.") .detail("Bare, it lists what is signed in.") .usage(&[("/logout ", "")]) .keywords(&["credentials"]), diff --git a/crates/luxe-tui/src/commands/tests.rs b/crates/luxe-tui/src/commands/tests.rs index 9187a7f..a690c3b 100644 --- a/crates/luxe-tui/src/commands/tests.rs +++ b/crates/luxe-tui/src/commands/tests.rs @@ -302,7 +302,7 @@ fn filtering_a_menu_keeps_its_recent_lead_honest() { } /// The first list to claim an id or a slash trigger keeps it, so nothing added after the -/// built-ins can take over a name Luxe already answers to. +/// built-ins can take over a name luxe already answers to. #[test] fn a_later_source_cannot_take_a_built_in_id_or_trigger() { let impostor = |id: &'static str, slash: &'static str| { diff --git a/crates/luxe-tui/src/configuration.rs b/crates/luxe-tui/src/configuration.rs index d31ab40..617843f 100644 --- a/crates/luxe-tui/src/configuration.rs +++ b/crates/luxe-tui/src/configuration.rs @@ -1,4 +1,4 @@ -//! Configuration — the surface that answers *how do I set Luxe up?* +//! Configuration — the surface that answers *how do I set luxe up?* //! //! One place for every way in: a subscription, a key, a server on this machine, or the files //! themselves. It is what the dashboard's `Configuration` row opens, what `/config` reaches @@ -10,7 +10,7 @@ //! overlays: keys in, a [`ConfigOutcome`] out, and the app owns what happens next. //! //! The menu asks for the **method** before the provider, which is the inverse of the wizard's own -//! order. `/login openai` knows its provider; someone who has just installed Luxe knows they have a +//! order. `/login openai` knows its provider; someone who has just installed luxe knows they have a //! ChatGPT plan. Each row hands the wizard a [`LoginScope`], so the list it opens is short and every //! row in it starts its flow on Enter. @@ -38,7 +38,7 @@ pub enum ConfigChoice { LocalOrCustom, /// The settings pages: appearance, the conversation, layout, tools and the agent. Settings, - /// Open one of Luxe's configuration files in an editor. + /// Open one of luxe's configuration files in an editor. EditFiles, } @@ -242,6 +242,19 @@ impl ConfigurationState { } } + /// The cursor and the row count of whichever list is showing. + pub(crate) fn list_cursor(&self) -> (usize, usize) { + match self.stage { + Stage::Menu => (self.selected, ConfigChoice::ROWS.len()), + Stage::Files => (self.file_selected, self.files.len()), + Stage::Settings => self + .settings + .as_ref() + .map_or((0, 0), |settings| (settings.selected(), settings.selectable_count())), + Stage::Setup => self.setup.as_ref().map_or((0, 0), SetupState::step_list), + } + } + /// The configuration files on offer. pub fn files(&self) -> &[ConfigFile] { &self.files diff --git a/crates/luxe-tui/src/configuration/settings.rs b/crates/luxe-tui/src/configuration/settings.rs index 512e0f9..004cec4 100644 --- a/crates/luxe-tui/src/configuration/settings.rs +++ b/crates/luxe-tui/src/configuration/settings.rs @@ -170,6 +170,11 @@ impl SettingsState { self.selectable().iter().position(|row| *row == self.cursor).unwrap_or(0) } + /// How many rows the cursor can land on. + pub(crate) fn selectable_count(&self) -> usize { + self.selectable().len() + } + /// Handle a keypress. pub fn on_key(&mut self, key: &KeyEvent) -> ConfigOutcome { self.notice = None; diff --git a/crates/luxe-tui/src/configuration/settings/render.rs b/crates/luxe-tui/src/configuration/settings/render.rs index 94f7f05..659b675 100644 --- a/crates/luxe-tui/src/configuration/settings/render.rs +++ b/crates/luxe-tui/src/configuration/settings/render.rs @@ -178,7 +178,8 @@ impl SettingsState { scroll = scroll.min(rows.len().saturating_sub(height)); self.scroll.set(scroll); - let width = usize::from(list.width); + let columns = crate::widgets::list_rows_width(list.width, rows.len(), list.height); + let width = usize::from(columns); let selectable = self.selectable(); let mut regions = hit.borrow_mut(); let lines: Vec> = rows @@ -190,16 +191,17 @@ impl SettingsState { let selected = index == self.cursor; if let Some(position) = selectable.iter().position(|at| *at == index) { let y = list.y + (index - scroll) as u16; - regions.push( - Rect::new(list.x, y, list.width, 1), - MouseTarget::ConfigRow(position), - ); + regions + .push(Rect::new(list.x, y, columns, 1), MouseTarget::ConfigRow(position)); } self.row_line(*row, width, selected, theme) }) .collect(); + let shown = (scroll, rows.len()); + let surface = crate::mouse::OverlayList::Configuration; + crate::widgets::list_scrollbar(f, &mut regions, list, surface, shown, theme); drop(regions); - f.render_widget(Paragraph::new(lines), list); + f.render_widget(Paragraph::new(lines), Rect { width: columns, ..list }); } fn row_line( @@ -302,7 +304,7 @@ impl SettingsState { let mut head = vec![ Span::styled(tool.name, theme.text.add_modifier(Modifier::BOLD)), Span::styled(" tools.disabled", theme.accent), - Span::styled(" · Takes effect the next time Luxe starts", theme.muted), + Span::styled(" · Takes effect the next time luxe starts", theme.muted), ]; head.push(Span::styled(source_note(layer), layer_style(layer, theme))); lines.push(Line::from(head)); diff --git a/crates/luxe-tui/src/configuration/setup.rs b/crates/luxe-tui/src/configuration/setup.rs index 531afe6..0e80dec 100644 --- a/crates/luxe-tui/src/configuration/setup.rs +++ b/crates/luxe-tui/src/configuration/setup.rs @@ -134,7 +134,7 @@ const SIGN_IN: [ConfigChoice; 3] = impl SetupState { /// Open on the first step, with every answer pre-set to what `config` already says. /// - /// `themes` is every theme by name; `desktop` the one the desktop is wearing, when Luxe can + /// `themes` is every theme by name; `desktop` the one the desktop is wearing, when luxe can /// follow one; `active` the theme in force right now. pub fn open( mode: SetupMode, @@ -150,7 +150,7 @@ impl SetupState { offered.extend(themes.into_iter().map(Some)); let theme = match config.theme.as_deref() { Some(name) => offered.iter().position(|offer| offer.as_deref() == Some(name)), - // Nothing chosen yet: the desktop's when there is one, Luxe's own otherwise + // Nothing chosen yet: the desktop's when there is one, luxe's own otherwise None if desktop.is_some() => Some(0), None => offered.iter().position(|offer| offer.as_deref() == Some("luxe")), } @@ -269,20 +269,21 @@ impl SetupState { self.advance(configured) } - fn step_cursor(&mut self, delta: isize) -> ConfigOutcome { - let (cursor, rows) = match self.step { - Step::Theme => (&mut self.theme, self.themes.len()), - Step::Provider => (&mut self.provider, SIGN_IN.len() + 1), - Step::Tools => (&mut self.tool, self.tools.len()), - Step::Start => (&mut self.start, StartScreen::ALL.len()), - }; - *cursor = cursor.saturating_add_signed(delta).min(rows.saturating_sub(1)); + /// The cursor and the row count of the step showing. + pub(crate) fn step_list(&self) -> (usize, usize) { match self.step { - Step::Theme => ConfigOutcome::PreviewTheme(self.previewed_theme()), - _ => ConfigOutcome::Consumed, + Step::Theme => (self.theme, self.themes.len()), + Step::Provider => (self.provider, SIGN_IN.len() + 1), + Step::Tools => (self.tool, self.tools.len()), + Step::Start => (self.start, StartScreen::ALL.len()), } } + fn step_cursor(&mut self, delta: isize) -> ConfigOutcome { + let (cursor, rows) = self.step_list(); + self.select(cursor.saturating_add_signed(delta).min(rows.saturating_sub(1))) + } + /// Enter: the provider step's sign-in rows open the wizard; everywhere else, on to the next /// step, and from the last one, done. fn advance(&mut self, configured: bool) -> ConfigOutcome { @@ -350,7 +351,7 @@ mod tests { assert_eq!(setup.choices().theme.as_deref(), Some("nord")); let plain = fresh(None); - assert_eq!(plain.choices().theme.as_deref(), Some("luxe"), "no desktop: Luxe's own"); + assert_eq!(plain.choices().theme.as_deref(), Some("luxe"), "no desktop: luxe's own"); } #[test] diff --git a/crates/luxe-tui/src/configuration/setup/render.rs b/crates/luxe-tui/src/configuration/setup/render.rs index 160b91d..62f8485 100644 --- a/crates/luxe-tui/src/configuration/setup/render.rs +++ b/crates/luxe-tui/src/configuration/setup/render.rs @@ -21,6 +21,9 @@ pub(in crate::configuration) const PANEL_WIDTH: u16 = 112; /// Width of the theme list and the tool list, beside what each explains. const LIST_WIDTH: u16 = 34; +/// Which list the wheel and the bar move on a setup step: the surface's, whichever step it is on. +const SETUP_LIST: crate::mouse::OverlayList = crate::mouse::OverlayList::Configuration; + impl SetupState { /// Rows the panel would like, which leaves the wordmark what is left. pub fn panel_height(area: Rect) -> u16 { @@ -37,8 +40,8 @@ impl SetupState { configured: &[String], ) { let title = match self.mode { - SetupMode::FirstRun => "Welcome to Luxe", - SetupMode::Init => "Set up Luxe", + SetupMode::FirstRun => "Welcome to luxe", + SetupMode::Init => "Set up luxe", }; let block = crate::widgets::titled_panel(Icon::Config.glyph(), title, theme) .padding(Padding::horizontal(1)); @@ -111,6 +114,9 @@ impl SetupState { let start = (self.theme + 1).saturating_sub(height).min(self.themes.len().saturating_sub(height)); let mut regions = hit.borrow_mut(); + let shown = (start, self.themes.len()); + crate::widgets::list_scrollbar(f, &mut regions, list, SETUP_LIST, shown, theme); + let rows = crate::widgets::list_rows_width(list.width, self.themes.len(), list.height); let lines: Vec> = self .themes .iter() @@ -119,7 +125,7 @@ impl SetupState { .take(height) .map(|(index, offer)| { regions.push( - Rect::new(list.x, list.y + (index - start) as u16, list.width, 1), + Rect::new(list.x, list.y + (index - start) as u16, rows, 1), MouseTarget::ConfigRow(index), ); let chosen = index == self.theme; @@ -136,11 +142,11 @@ impl SetupState { ), Span::styled(label, theme.label_on(chosen)), ]; - selection_row(spans, usize::from(list.width), chosen, theme) + selection_row(spans, usize::from(rows), chosen, theme) }) .collect(); drop(regions); - f.render_widget(Paragraph::new(lines), list); + f.render_widget(Paragraph::new(lines), Rect { width: rows, ..list }); let sample = Rect { x: list.right() + 3, @@ -234,11 +240,14 @@ impl SetupState { hit: &std::cell::RefCell, ) { let list = Rect { width: (LIST_WIDTH + 18).min(body.width), ..body }; - let width = usize::from(list.width); let height = usize::from(list.height); let start = (self.tool + 1).saturating_sub(height).min(self.tools.len().saturating_sub(height)); let mut regions = hit.borrow_mut(); + let shown = (start, self.tools.len()); + crate::widgets::list_scrollbar(f, &mut regions, list, SETUP_LIST, shown, theme); + let rows = crate::widgets::list_rows_width(list.width, self.tools.len(), list.height); + let width = usize::from(rows); let lines: Vec> = self .tools .iter() @@ -247,7 +256,7 @@ impl SetupState { .take(height) .map(|(index, (tool, enabled))| { regions.push( - Rect::new(list.x, list.y + (index - start) as u16, list.width, 1), + Rect::new(list.x, list.y + (index - start) as u16, rows, 1), MouseTarget::ConfigRow(index), ); let chosen = index == self.tool; @@ -270,7 +279,7 @@ impl SetupState { }) .collect(); drop(regions); - f.render_widget(Paragraph::new(lines), list); + f.render_widget(Paragraph::new(lines), Rect { width: rows, ..list }); let side = Rect { x: list.right() + 3, @@ -319,7 +328,7 @@ impl SetupState { ) { f.render_widget( Paragraph::new(Line::from(Span::styled( - "What Luxe opens on when you run it in a project.", + "What luxe opens on when you run it in a project.", theme.muted, ))), Rect { height: 1, ..body }, diff --git a/crates/luxe-tui/src/configuration/tests.rs b/crates/luxe-tui/src/configuration/tests.rs index 0806c7b..723e3bd 100644 --- a/crates/luxe-tui/src/configuration/tests.rs +++ b/crates/luxe-tui/src/configuration/tests.rs @@ -117,7 +117,7 @@ fn the_cursor_stops_at_both_ends_of_each_list() { } /// "Configured" and "signed in" are not the same claim: an environment variable is the user's -/// shell rather than something Luxe stored, and the summary has to say which. +/// shell rather than something luxe stored, and the summary has to say which. #[test] fn the_summary_names_every_credential_and_where_it_came_from() { let providers = vec![ diff --git a/crates/luxe-tui/src/context_files.rs b/crates/luxe-tui/src/context_files.rs index 07ebe37..ce99294 100644 --- a/crates/luxe-tui/src/context_files.rs +++ b/crates/luxe-tui/src/context_files.rs @@ -10,7 +10,7 @@ //! so a project carrying forty skills has a long list rather than rows nobody can reach. Past that //! what it wants is a filter box — still not a submenu. //! -//! It sits beside [`crate::configuration`] rather than inside it on purpose. Those are Luxe's own +//! It sits beside [`crate::configuration`] rather than inside it on purpose. Those are luxe's own //! settings — a theme, a credential, a keymap. These belong to the *project*: a different author, //! a different lifecycle, and they travel with the repository rather than the machine. //! @@ -277,7 +277,7 @@ impl ContextFilesState { /// dashboard disagree with the prompt. /// /// `cwd` is the project root, which paths are shown relative to; `instructions_from` is where the -/// instruction walk starts, which is where Luxe was launched — the same directory the prompt walks +/// instruction walk starts, which is where luxe was launched — the same directory the prompt walks /// from, or the list would come up short of what a turn reads. pub fn discover(cwd: &Path, instructions_from: &Path) -> Vec { let found = luxe_core::instructions::context_files(instructions_from); diff --git a/crates/luxe-tui/src/files/listings.rs b/crates/luxe-tui/src/files/listings.rs index 6c07226..11549d0 100644 --- a/crates/luxe-tui/src/files/listings.rs +++ b/crates/luxe-tui/src/files/listings.rs @@ -31,6 +31,11 @@ impl FilesTree { wanted } + /// How many listings have been asked for and not yet answered. + pub fn in_flight(&self) -> usize { + self.listings.values().filter(|listing| listing.request.is_some()).count() + } + /// Records that `folder`'s listing was asked for under `request`. pub fn requested(&mut self, folder: &str, request: ListingRequestId) { self.generation += 1; diff --git a/crates/luxe-tui/src/fixture.rs b/crates/luxe-tui/src/fixture.rs index 402e378..0d23cc4 100644 --- a/crates/luxe-tui/src/fixture.rs +++ b/crates/luxe-tui/src/fixture.rs @@ -60,8 +60,8 @@ pub use workspace::seed_plan_usage; /// A light palette, for the light-mode paths no built-in reaches any more. /// -/// Luxe ships dark themes only, but a reader's own theme file can be light, and the code that picks -/// ink for a light canvas still has to be right for them. This is Catppuccin Latte as Luxe shipped +/// luxe ships dark themes only, but a reader's own theme file can be light, and the code that picks +/// ink for a light canvas still has to be right for them. This is Catppuccin Latte as luxe shipped /// it until the light themes were retired, kept so those paths keep a test that can fail. pub const LIGHT_THEME_JSON: &str = include_str!("fixture/light-theme.json"); diff --git a/crates/luxe-tui/src/fixture/auth.rs b/crates/luxe-tui/src/fixture/auth.rs index 8683e6e..52d3740 100644 --- a/crates/luxe-tui/src/fixture/auth.rs +++ b/crates/luxe-tui/src/fixture/auth.rs @@ -65,7 +65,7 @@ impl luxe_core::auth::AuthService for FixtureAuth { CredentialStatus::Env("ANTHROPIC_API_KEY".into()), Some( "API key only. Anthropic's terms forbid using a Claude Pro/Max subscription \ - from a third-party harness, so Luxe does not offer that sign-in.", + from a third-party harness, so luxe does not offer that sign-in.", ), ), option( @@ -272,7 +272,6 @@ pub fn seed_login_wizard(app: &mut App, which: LoginFixture) { provider_name: "OpenAI".into(), kind: Some(CredentialKind::ApiKey), account: None, - suggested_model: Some("gpt-5.6".into()), notes: vec!["47 models available (gpt-4.1, gpt-5, gpt-5-mini, …)".into()], advice: Vec::new(), })))); diff --git a/crates/luxe-tui/src/glyphs.rs b/crates/luxe-tui/src/glyphs.rs index 97f6d84..28382a4 100644 --- a/crates/luxe-tui/src/glyphs.rs +++ b/crates/luxe-tui/src/glyphs.rs @@ -6,7 +6,7 @@ //! So each icon is declared once in the `icons!` table below, by *meaning*, with all three of its //! renderings beside it: //! -//! - [`GlyphTier::Nerd`] — Material Design icons from a patched font, the look Luxe ships with. +//! - [`GlyphTier::Nerd`] — Material Design icons from a patched font, the look luxe ships with. //! - [`GlyphTier::Unicode`] — Geometric Shapes, Arrows and two Dingbats: no private use anywhere, //! nothing newer than Unicode 1.1 outside a couple of shapes, and every entry one cell wide. //! - [`GlyphTier::Ascii`] — plain punctuation, for SSH into a minimal box, a CI log, or a terminal @@ -66,7 +66,8 @@ pub use format::{configured_glyph, icon_cells, icon_gap, icon_label, icon_prefix pub use spinner::spinner; #[cfg(test)] pub(crate) use spinner::spinner_ticks_per_frame; -pub use state::{braille, resolve_vocabulary, set_braille, set_tier, tier}; +pub use state::RECENT_BRANDS; +pub use state::{braille, brands, resolve_vocabulary, set_braille, set_brands, set_tier, tier}; use unicode_width::UnicodeWidthStr; #[cfg(test)] use { @@ -171,6 +172,20 @@ icons! { Model => ["\u{f06a9}", "●", "%"], /// Model reasoning Thinking => ["\u{f0335}", "●", "~"], + /// Who serves the model, when it has no mark of its own (`md-cloud_outline`) + Provider => ["\u{f0163}", "○", "@"], + /// Google, serving Gemini (`md-google`) + ProviderGoogle => ["\u{f02ad}", "○", "@"], + /// Microsoft Azure, serving Foundry (`md-microsoft_azure`) + ProviderAzure => ["\u{f0805}", "○", "@"], + /// Amazon Bedrock (`md-aws`) + ProviderAws => ["\u{f0e0f}", "○", "@"], + /// OpenAI (`cod-openai`), one of the [`RECENT_BRANDS`] + ProviderOpenAi => ["\u{ec81}", "○", "@"], + /// Anthropic (`cod-claude`), one of the [`RECENT_BRANDS`] + ProviderAnthropic => ["\u{ec82}", "○", "@"], + /// GitHub Copilot (`cod-copilot`), one of the [`RECENT_BRANDS`] + ProviderCopilot => ["\u{ec1e}", "○", "@"], // === Dashboard menu === Find => ["\u{f021e}", "○", "/"], NewSession => ["\u{f0214}", "►", "+"], diff --git a/crates/luxe-tui/src/glyphs/detect.rs b/crates/luxe-tui/src/glyphs/detect.rs index 989b7b9..7a64780 100644 --- a/crates/luxe-tui/src/glyphs/detect.rs +++ b/crates/luxe-tui/src/glyphs/detect.rs @@ -1,7 +1,7 @@ //! Glyph detection — what the terminal and its fonts can draw: braille, Nerd Font icons, kitty. use super::spinner::SPINNER_BRAILLE; -use super::{GlyphTier, EVERY_ICON}; +use super::{GlyphTier, EVERY_ICON, RECENT_BRANDS}; /// Whether the terminal in front of the reader can draw the braille sweep. /// @@ -109,8 +109,20 @@ pub(super) fn nerd_icons_available() -> bool { return true; } // Derived from the table, so an icon added in a range nothing else uses extends the probe - // rather than slipping past it. - fontconfig_has_all(EVERY_ICON.iter().filter_map(|icon| icon.at(GlyphTier::Nerd).chars().next())) + // rather than slipping past it. The recent brands are asked about on their own + let probed = EVERY_ICON.iter().filter(|icon| !RECENT_BRANDS.contains(icon)); + fontconfig_has_all(probed.filter_map(|icon| icon.at(GlyphTier::Nerd).chars().next())) +} + +/// Whether one installed font has every recent brand mark, which only Nerd Fonts 3.5 and later do. +/// +/// fontconfig is the only way to ask, so without it (stock macOS, Windows) the answer is no and +/// each brand falls back to a mark every v3 font has. Not kitty's shortcut either: the symbol font +/// it bundles is as old as the kitty. +pub(super) fn brands_available() -> bool { + fontconfig_has_all( + RECENT_BRANDS.iter().filter_map(|icon| icon.at(GlyphTier::Nerd).chars().next()), + ) } /// Whether this is kitty — the one terminal that answers the question above by itself. diff --git a/crates/luxe-tui/src/glyphs/state.rs b/crates/luxe-tui/src/glyphs/state.rs index 492368b..d3860b0 100644 --- a/crates/luxe-tui/src/glyphs/state.rs +++ b/crates/luxe-tui/src/glyphs/state.rs @@ -1,7 +1,7 @@ //! Glyph state — the vocabulary and braille switch every glyph call reads, set once at startup. -use super::detect::braille_available; -use super::GlyphTier; +use super::detect::{braille_available, brands_available}; +use super::{GlyphTier, Icon}; use luxe_core::config::GlyphStyle; use std::sync::atomic::{AtomicU8, Ordering}; @@ -21,8 +21,30 @@ static BRAILLE: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::n /// and `/reload`. Setting the tier and forgetting the sweep is the mistake this exists to make /// impossible. pub fn resolve_vocabulary(preference: GlyphStyle) { - set_tier(GlyphTier::resolve(preference)); + let tier = GlyphTier::resolve(preference); + set_tier(tier); set_braille(braille_available()); + set_brands(matches!(tier, GlyphTier::Nerd | GlyphTier::NerdWide) && brands_available()); +} + +/// Brand marks newer than the rest of the vocabulary: OpenAI's and Claude's arrived in Nerd Fonts +/// 3.5, Copilot's after 3.0. They stay out of the nerd-tier probe, so an older font keeps every +/// other icon, and are drawn only when [`brands`] says a font on the machine has them. +pub const RECENT_BRANDS: &[Icon] = + &[Icon::ProviderOpenAi, Icon::ProviderAnthropic, Icon::ProviderCopilot]; + +/// Whether the [`RECENT_BRANDS`] may be drawn. Off by default for the same reason as [`BRAILLE`]: +/// a test or a site asset draws the same on any machine. +static BRANDS: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false); + +/// Whether the recent brand marks are drawn, rather than the mark each falls back to. +pub fn brands() -> bool { + BRANDS.load(Ordering::Relaxed) +} + +/// Turns the recent brand marks on or off. Exposed for tests and for the startup probe. +pub fn set_brands(available: bool) { + BRANDS.store(available, Ordering::Relaxed); } /// Whether the spinner is currently drawing its braille sweep. diff --git a/crates/luxe-tui/src/glyphs/tests.rs b/crates/luxe-tui/src/glyphs/tests.rs index 3566abd..65bd162 100644 --- a/crates/luxe-tui/src/glyphs/tests.rs +++ b/crates/luxe-tui/src/glyphs/tests.rs @@ -501,7 +501,7 @@ fn each_sweep_keeps_the_cadence_it_was_drawn_for() { /// The process tier is what the ~150 render sites read, so moving it has to move them. #[test] fn the_process_tier_selects_the_vocabulary() { - assert_eq!(tier(), GlyphTier::Nerd, "the default is the look Luxe ships with"); + assert_eq!(tier(), GlyphTier::Nerd, "the default is the look luxe ships with"); for at in TIERS { set_tier(at); assert_eq!(tier(), at, "{at:?} does not survive the round trip"); diff --git a/crates/luxe-tui/src/graphics/store/tests.rs b/crates/luxe-tui/src/graphics/store/tests.rs index b53adbb..4772f4c 100644 --- a/crates/luxe-tui/src/graphics/store/tests.rs +++ b/crates/luxe-tui/src/graphics/store/tests.rs @@ -226,7 +226,7 @@ fn the_text_tier_paints_nothing_and_admits_it() { assert!(!store.paint_row(&mut buf, (0, 0), &ImageKey::new("missing"), fit, 0, Color::Reset)); } -/// Ids are global to the terminal, so two Luxe windows must not hand out the same one from the +/// Ids are global to the terminal, so two luxe windows must not hand out the same one from the /// first frame and quietly replace each other's images. #[test] fn image_ids_stay_inside_the_protocols_range() { diff --git a/crates/luxe-tui/src/guided_review/state/finding_draft.rs b/crates/luxe-tui/src/guided_review/state/finding_draft.rs index a528999..1fab1a8 100644 --- a/crates/luxe-tui/src/guided_review/state/finding_draft.rs +++ b/crates/luxe-tui/src/guided_review/state/finding_draft.rs @@ -25,7 +25,7 @@ pub(crate) struct FindingDraft { carried_fix: Option, /// The real editor backing the comment. /// - /// This is the one place a reviewer writes prose, so it reuses Luxe's composer wholesale and + /// This is the one place a reviewer writes prose, so it reuses luxe's composer wholesale and /// behaves like every other text input: a cursor, arrow keys, word operations. editor: crate::editor::Editor, /// Why the last save was rejected, cleared by the next edit. Shown on screen, or `Ctrl+Enter` diff --git a/crates/luxe-tui/src/herdr.rs b/crates/luxe-tui/src/herdr.rs index 5dc35c0..68d46f0 100644 --- a/crates/luxe-tui/src/herdr.rs +++ b/crates/luxe-tui/src/herdr.rs @@ -1,10 +1,10 @@ -//! herdr — the agent's state, reported to herdr when Luxe runs in one of its panes. +//! herdr — the agent's state, reported to herdr when luxe runs in one of its panes. //! //! herdr is a terminal workspace manager for coding agents. It shows each agent's state in its //! sidebar, rolls it up to tabs and workspaces, and raises its own notification when an agent //! finishes or needs a decision. That last part matters here: herdr emulates the terminal in each -//! pane and keeps an `OSC 9` for itself, so the desktop notification Luxe writes through the -//! terminal never leaves the pane. Reporting the state is how a reader inside herdr hears from Luxe. +//! pane and keeps an `OSC 9` for itself, so the desktop notification luxe writes through the +//! terminal never leaves the pane. Reporting the state is how a reader inside herdr hears from luxe. //! //! The state is derived from the app on every pass of the loop ([`crate::app::App::agent_state`]) //! rather than pushed from each place it changes, and only a change is sent: `working` while a turn @@ -54,7 +54,7 @@ impl AgentState { } } -/// The pane Luxe runs in, and the herdr that owns it. +/// The pane luxe runs in, and the herdr that owns it. #[derive(Debug, Clone, PartialEq, Eq)] struct Pane { /// `$HERDR_BIN_PATH`: the binary of the herdr that owns the pane, which may not be on `PATH` @@ -63,7 +63,7 @@ struct Pane { id: String, } -/// The pane herdr says Luxe runs in, or `None` outside herdr. +/// The pane herdr says luxe runs in, or `None` outside herdr. /// /// All of it or nothing: herdr's own guidance is to report only when `HERDR_ENV=1` and the rest /// are set, so a shell that merely inherited one variable reports nowhere. @@ -128,7 +128,7 @@ fn release_args(pane: &str, seq: u64) -> Vec { args } -/// Whether a session id can travel in a resume command: what Luxe writes, nothing a shell or herdr +/// Whether a session id can travel in a resume command: what luxe writes, nothing a shell or herdr /// would read as more than one plain word. fn resumable(id: &str) -> bool { !id.is_empty() && id.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')) @@ -148,7 +148,7 @@ fn message_text(message: &str) -> String { } } -/// Report numbers: rising across reports, and across restarts of Luxe, which a clock gives for free. +/// Report numbers: rising across reports, and across restarts of luxe, which a clock gives for free. #[derive(Debug, Default)] struct Sequence { last: u64, @@ -164,7 +164,7 @@ impl Sequence { } } -/// Reports the agent's state to the herdr pane Luxe runs in. +/// Reports the agent's state to the herdr pane luxe runs in. pub struct Reporter { pane: Pane, /// What was last handed to the worker, so an unchanged state is not sent again diff --git a/crates/luxe-tui/src/launcher.rs b/crates/luxe-tui/src/launcher.rs index 0f26474..4880fb7 100644 --- a/crates/luxe-tui/src/launcher.rs +++ b/crates/luxe-tui/src/launcher.rs @@ -1,11 +1,11 @@ //! Launcher — a key that hands the terminal to another program and takes it back. //! -//! gh-dash, lazygit, anything that takes over a terminal. Luxe gives the terminal up whole — the +//! gh-dash, lazygit, anything that takes over a terminal. luxe gives the terminal up whole — the //! alternate screen, raw mode, mouse, the keyboard protocol — and stops reading it, so every key is //! the program's; the engine keeps running underneath, a turn included, and what it reports is -//! applied without drawing. When the program exits, Luxe takes the terminal back and redraws it. +//! applied without drawing. When the program exits, luxe takes the terminal back and redraws it. //! Text the program writes to the file `$LUXE_HANDOFF` names lands in the composer, which is how a -//! gh-dash command sends `#123 look at this` into Luxe. +//! gh-dash command sends `#123 look at this` into luxe. use crossterm::event::{EventStream, KeyEvent}; use luxe_core::config::Launcher; diff --git a/crates/luxe-tui/src/lib.rs b/crates/luxe-tui/src/lib.rs index e1bb9ae..5ca199f 100644 --- a/crates/luxe-tui/src/lib.rs +++ b/crates/luxe-tui/src/lib.rs @@ -1,4 +1,4 @@ -//! Luxe TUI — ratatui front-end for the Luxe agent. +//! luxe TUI — ratatui front-end for the luxe agent. //! //! This crate wraps the headless core in an interactive terminal UI. It is a thin //! subscriber to the core `Event` stream: it holds no business logic, only rendering diff --git a/crates/luxe-tui/src/main_loop.rs b/crates/luxe-tui/src/main_loop.rs index 0ccec31..e6da09f 100644 --- a/crates/luxe-tui/src/main_loop.rs +++ b/crates/luxe-tui/src/main_loop.rs @@ -50,7 +50,7 @@ pub const ANIMATION_TICK: Duration = Duration::from_millis(33); /// Why the TUI returned control to the CLI. #[derive(Debug, Clone, PartialEq, Eq)] pub enum TuiExit { - /// The user quit Luxe. + /// The user quit luxe. Quit, /// Open a file in the reader's editor, then come back. /// @@ -72,7 +72,7 @@ pub enum TuiExit { /// /// Args: `(launch)` — the session, and the draft and mode the reader carries into it. ResumeSession(ResumeLaunch), - /// Leave Luxe and run `luxe update`, which needs the terminal for the package manager. + /// Leave luxe and run `luxe update`, which needs the terminal for the package manager. Update, } @@ -149,18 +149,30 @@ pub(crate) fn startup_surface( } } -/// Whether this is the first launch on the machine: no `config.json` yet, and someone at the -/// keyboard to ask. +/// Whether this is the first launch on the machine: no `config.json` and no stored login yet, and +/// someone at the keyboard to ask. /// /// Strict on purpose. A question asked of a terminal nobody is watching stops a container or a CI /// job until something answers it, so anything not interactive never sees it — and skipping it /// writes the file, so it is asked once. fn is_first_run(headless: bool) -> bool { use std::io::IsTerminal; - !headless - && std::io::stdin().is_terminal() - && std::io::stdout().is_terminal() - && !luxe_core::config::Config::global_path().exists() + let interactive = + !headless && std::io::stdin().is_terminal() && std::io::stdout().is_terminal(); + first_run_from( + interactive, + luxe_core::config::Config::global_path().exists(), + luxe_core::user_dirs::luxe_config_file("auth.json").exists(), + ) +} + +/// [`is_first_run`] over what it found. A stored login counts as having run before: a build that +/// never wrote `config.json` (one from before setup existed, or one quit mid-setup) still signed +/// someone in, and walking them through setup again after an update reads as a lost install. +/// +/// Args: `(interactive, config file exists, auth file exists)`. +fn first_run_from(interactive: bool, config_exists: bool, login_exists: bool) -> bool { + interactive && !config_exists && !login_exists } /// Run the TUI event loop. diff --git a/crates/luxe-tui/src/main_loop/click.rs b/crates/luxe-tui/src/main_loop/click.rs index 56eafb1..a74aa71 100644 --- a/crates/luxe-tui/src/main_loop/click.rs +++ b/crates/luxe-tui/src/main_loop/click.rs @@ -306,6 +306,9 @@ pub(super) fn wheel(app: &App, col: u16, row: u16, up: bool) -> RouteAction { RouteAction::msg(Msg::ScrollChanges { up, lines: crate::changes::SCROLL_STEP }) } Some(ScrollRegionId::ContextFiles) => RouteAction::msg(Msg::ScrollContextFiles { up }), + Some(ScrollRegionId::OverlayList(list)) => { + RouteAction::msg(Msg::ScrollOverlayList { list, up }) + } // Their bars steer them, but their wheel is still the view's Some(ScrollRegionId::ReviewFeedback | ScrollRegionId::PullRequestBody) | None => { scroll_for_view(app, up) diff --git a/crates/luxe-tui/src/main_loop/keys.rs b/crates/luxe-tui/src/main_loop/keys.rs index e69d273..0fe7e1d 100644 --- a/crates/luxe-tui/src/main_loop/keys.rs +++ b/crates/luxe-tui/src/main_loop/keys.rs @@ -65,7 +65,7 @@ pub fn route_key(app: &mut App, key: &KeyEvent) -> RouteAction { let routed = match app.current_view { // A surface opened *from* the dashboard owns the keys while it is up, and Esc closes it - // rather than quitting Luxe — the surface underneath is what the reader came from. + // rather than quitting luxe — the surface underneath is what the reader came from. ViewMode::Dashboard if !app.dashboard_owns_input() => None, ViewMode::Dashboard => dashboard_key(app, key), // The model picker is the last step of setting a provider up, so while it is open it owns @@ -253,7 +253,7 @@ pub(crate) fn collect_exit_for_tests(app: &mut App, exit: &mut TuiExit) { /// A surface that picked a file to edit cannot run the editor itself — it needs the terminal back, /// and only this loop can hand it over — and a worktree cannot be removed while the process stands /// in it. Collected after engine events as well as keys: the removal is decided by the engine's -/// answer, and one that waited for the next key press left Luxe running until something was typed. +/// answer, and one that waited for the next key press left luxe running until something was typed. pub(super) fn collect_exit(app: &mut App, exit: &mut TuiExit) { if let Some(parked) = app.outbox.exit() { *exit = parked; diff --git a/crates/luxe-tui/src/main_loop/tests/routing.rs b/crates/luxe-tui/src/main_loop/tests/routing.rs index ae42844..4cf2f1b 100644 --- a/crates/luxe-tui/src/main_loop/tests/routing.rs +++ b/crates/luxe-tui/src/main_loop/tests/routing.rs @@ -184,6 +184,19 @@ fn setup_takes_the_screen_only_when_no_dashboard_can_point_at_it() { ); } +/// The first-run questions are for a new machine. Each sign of an earlier install, on its own, +/// keeps them away; so does a terminal nobody is watching. +#[test] +fn the_first_run_is_skipped_by_any_sign_of_an_earlier_install() { + assert!(first_run_from(true, false, false), "a fresh, watched terminal is asked"); + assert!(!first_run_from(true, true, false), "a config file means it ran before"); + assert!( + !first_run_from(true, false, true), + "a stored login means it ran before, config file or not" + ); + assert!(!first_run_from(false, false, false), "nobody is there to answer"); +} + /// Every Configuration row is the app's to apply except the editor handoff, which needs the /// terminal back — so that one, and only that one, ends the TUI. #[test] diff --git a/crates/luxe-tui/src/markdown/fence.rs b/crates/luxe-tui/src/markdown/fence.rs index 4216092..7a70208 100644 --- a/crates/luxe-tui/src/markdown/fence.rs +++ b/crates/luxe-tui/src/markdown/fence.rs @@ -65,7 +65,7 @@ fn framed_fence( let ends_at = rendered.iter().map(Line::width).max().unwrap_or(0); // The language the fence declared, if it declared one worth naming. An // unlabeled fence gets a rule with nothing on its left rather than the word - // "text", which would be Luxe guessing on the author's behalf. + // "text", which would be luxe guessing on the author's behalf. let lead = fence_language(code_lang) .map(|language| { // The language's own mark where the terminal can draw one, and the bare diff --git a/crates/luxe-tui/src/mention_flyout.rs b/crates/luxe-tui/src/mention_flyout.rs index 5b67cc7..f1d3ab8 100644 --- a/crates/luxe-tui/src/mention_flyout.rs +++ b/crates/luxe-tui/src/mention_flyout.rs @@ -328,6 +328,11 @@ impl MentionFlyoutState { self.nav.select(filtered_index); } + /// The cursor's row among the filtered items. + pub(crate) fn cursor(&self) -> usize { + self.nav.selected() + } + /// Get the current query. pub fn query(&self) -> &str { self.nav.query() diff --git a/crates/luxe-tui/src/mention_flyout/render.rs b/crates/luxe-tui/src/mention_flyout/render.rs index da1d1de..ab2c377 100644 --- a/crates/luxe-tui/src/mention_flyout/render.rs +++ b/crates/luxe-tui/src/mention_flyout/render.rs @@ -30,8 +30,7 @@ pub fn render_mention_flyout( let empty = match (tab, listed) { (MentionTab::Files, _) => "No matching files", (MentionTab::Skills, Some(Listed { entries, .. })) if entries.is_empty() => { - "No skills yet: one is a folder holding a SKILL.md, in ~/.config/luxe/skills/ or the \ - project's .luxe/skills/" + "No skills found · add /SKILL.md to ~/.config/luxe/skills/ or .luxe/skills/" } (MentionTab::Skills, _) => "No matching skills", (MentionTab::Mcp, _) => "No matching servers", @@ -96,6 +95,7 @@ pub fn render_mention_flyout( detail: None, // The same height on every tab, so switching tabs never moves the frame rows: Some(crate::picker::TABBED_ROWS), + list: crate::mouse::OverlayList::Mention, }, ); } diff --git a/crates/luxe-tui/src/mention_flyout/tests.rs b/crates/luxe-tui/src/mention_flyout/tests.rs index 8929fbf..5caf8de 100644 --- a/crates/luxe-tui/src/mention_flyout/tests.rs +++ b/crates/luxe-tui/src/mention_flyout/tests.rs @@ -186,7 +186,7 @@ fn the_skills_tab_says_what_its_empty_means() { state }; let none = drawn(&open(Vec::new())); - assert!(none.contains("No skills yet: one is a folder holding a SKILL.md"), "{none}"); + assert!(none.contains("No skills found · add /SKILL.md"), "{none}"); let bare = luxe_core::skills::SkillDoc { name: "tidy".into(), description: String::new(), @@ -196,7 +196,7 @@ fn the_skills_tab_says_what_its_empty_means() { assert_eq!(state.selected_candidate().unwrap().detail, None, "no description, no detail"); state.set_query("zzzq"); let unmatched = drawn(&state); - assert!(unmatched.contains("No matching skills") && !unmatched.contains("No skills yet")); + assert!(unmatched.contains("No matching skills") && !unmatched.contains("No skills found")); } fn server(id: &str, tools: Option<&[&str]>, signed_in: Option) -> luxe_core::McpServerStatus { @@ -387,7 +387,7 @@ fn an_empty_tab_says_so_in_the_middle() { first_list_row + crate::picker::TABBED_ROWS - 1 - said[said.len() - 1], ); assert!(above.abs_diff(below) <= 1, "centered down: {above} above, {below} below"); - assert!(rows.iter().any(|row| row.contains("No skills yet")), "{rows:#?}"); + assert!(rows.iter().any(|row| row.contains("No skills found")), "{rows:#?}"); } /// A match lights where it landed: a skill's name or its description, a GitHub row's title or diff --git a/crates/luxe-tui/src/model_picker.rs b/crates/luxe-tui/src/model_picker.rs index 997f2d4..854cee1 100644 --- a/crates/luxe-tui/src/model_picker.rs +++ b/crates/luxe-tui/src/model_picker.rs @@ -19,6 +19,9 @@ use ratatui::{ }; use unicode_width::UnicodeWidthStr; +mod meta; +use meta::meta_suffix; + /// Panel label, shared by the rendered title and the modal-width computation. const TITLE: &str = "Select model"; @@ -136,6 +139,12 @@ impl ModelPickerState { self } + /// What the picker says above its list. + #[cfg(test)] + pub(crate) fn note(&self) -> &[String] { + &self.note + } + /// Rows the note costs: its lines plus the blank one under them. fn note_rows(&self) -> u16 { match self.note.is_empty() { @@ -215,6 +224,11 @@ impl ModelPickerState { self.items.get(self.nav.selected_item_index()?) } + /// The cursor's row among the visible matches. + pub(crate) fn cursor(&self) -> usize { + self.nav.selected() + } + /// Number of visible matches. pub fn match_count(&self) -> usize { self.nav.match_count() @@ -384,18 +398,21 @@ impl ModelPickerState { .saturating_add(1) .saturating_sub(capacity) .min(self.nav.filtered_indices().len().saturating_sub(capacity)); - let end = start.saturating_add(capacity).min(self.nav.filtered_indices().len()); - let available = - area.width.saturating_sub(2 + crate::widgets::SELECTION_FRAME as u16) as usize; + let total = self.nav.filtered_indices().len(); + let end = start.saturating_add(capacity).min(total); + let width = crate::widgets::list_rows_width(area.width, total, area.height); + let available = width.saturating_sub(2 + crate::widgets::SELECTION_FRAME as u16) as usize; { let mut regions = hit.borrow_mut(); for offset in 0..end.saturating_sub(start) { let row_y = area.y.saturating_add(offset as u16); regions.push( - Rect::new(area.x, row_y, area.width, 1), + Rect::new(area.x, row_y, width, 1), crate::mouse::MouseTarget::ModelRow(start + offset), ); } + let list = crate::mouse::OverlayList::Models; + crate::widgets::list_scrollbar(frame, &mut regions, area, list, (start, total), theme); } let items: Vec = self.nav.filtered_indices()[start..end] @@ -438,45 +455,13 @@ impl ModelPickerState { } ListItem::new(crate::widgets::selection_row( spans, - usize::from(area.width), + usize::from(width), selected, theme, )) }) .collect(); - frame.render_widget(List::new(items), area); - } -} - -/// The parenthesized metadata suffix for a model row (` (200k ctx · reasoning · catalog)`), -/// or empty when the model carries none. Shared by the row renderer and the width calculation -/// so the fitted modal width matches what is drawn. -fn meta_suffix(entry: &ModelEntry) -> String { - let mut meta = Vec::new(); - if entry.info.context_window > 0 { - meta.push(format!("{} ctx", human_tokens(entry.info.context_window))); - } - if entry.info.reasoning { - meta.push("reasoning".to_string()); - } - match (entry.configured, entry.unverified) { - (_, true) => meta.push("unverified".to_string()), - (false, false) => meta.push("catalog".to_string()), - (true, false) => {} - } - if meta.is_empty() { - String::new() - } else { - format!(" ({})", meta.join(" · ")) - } -} - -/// `1.0M` / `200k` / `8192` — million-token windows read badly as `1000k`. -fn human_tokens(tokens: u32) -> String { - match tokens { - t if t >= 1_000_000 => format!("{:.1}M", t as f64 / 1_000_000.0), - t if t >= 10_000 => format!("{}k", t / 1_000), - t => t.to_string(), + frame.render_widget(List::new(items), Rect { width, ..area }); } } diff --git a/crates/luxe-tui/src/model_picker/meta.rs b/crates/luxe-tui/src/model_picker/meta.rs new file mode 100644 index 0000000..a44a96a --- /dev/null +++ b/crates/luxe-tui/src/model_picker/meta.rs @@ -0,0 +1,35 @@ +//! Model row metadata — the context window, reasoning and source notes after a model's name. + +use super::ModelEntry; + +/// The parenthesized metadata suffix for a model row (` (200k ctx · reasoning · catalog)`), +/// or empty when the model carries none. Shared by the row renderer and the width calculation +/// so the fitted modal width matches what is drawn. +pub(super) fn meta_suffix(entry: &ModelEntry) -> String { + let mut meta = Vec::new(); + if entry.info.context_window > 0 { + meta.push(format!("{} ctx", human_tokens(entry.info.context_window))); + } + if entry.info.reasoning { + meta.push("reasoning".to_string()); + } + match (entry.configured, entry.unverified) { + (_, true) => meta.push("unverified".to_string()), + (false, false) => meta.push("catalog".to_string()), + (true, false) => {} + } + if meta.is_empty() { + String::new() + } else { + format!(" ({})", meta.join(" · ")) + } +} + +/// `1.0M` / `200k` / `8192` — million-token windows read badly as `1000k`. +fn human_tokens(tokens: u32) -> String { + match tokens { + t if t >= 1_000_000 => format!("{:.1}M", t as f64 / 1_000_000.0), + t if t >= 10_000 => format!("{}k", t / 1_000), + t => t.to_string(), + } +} diff --git a/crates/luxe-tui/src/modes.rs b/crates/luxe-tui/src/modes.rs index 4f05281..07de17a 100644 --- a/crates/luxe-tui/src/modes.rs +++ b/crates/luxe-tui/src/modes.rs @@ -22,7 +22,7 @@ pub fn icon(mode: &str) -> Icon { /// The color a mode's composer border and title wear. /// /// Plan wears its own; every other mode, a custom one included, wears the border accent every -/// other panel does, as its icon is build's, so a session that never plans looks the way Luxe +/// other panel does, as its icon is build's, so a session that never plans looks the way luxe /// always has. pub(crate) fn accent(mode: &str, styles: &ThemeStyles) -> Style { match mode { @@ -61,7 +61,7 @@ mod tests { assert_eq!(accent(luxe_core::mode::BUILD, &theme), theme.border_accent); } - /// A mode Luxe does not know looks like one thing, not half build and half plan. + /// A mode luxe does not know looks like one thing, not half build and half plan. /// /// The break this catches: the icon fell back to build and the color to plan, so a custom /// mode wore build's icon in plan's color. diff --git a/crates/luxe-tui/src/mouse.rs b/crates/luxe-tui/src/mouse.rs index a5be64d..1d64171 100644 --- a/crates/luxe-tui/src/mouse.rs +++ b/crates/luxe-tui/src/mouse.rs @@ -97,6 +97,31 @@ pub enum ScrollRegionId { ReviewFeedback, /// The pull request opening's description. PullRequestBody, + /// A modal list whose window follows its cursor (walks its rows). + /// + /// Args: which list. + OverlayList(OverlayList), +} + +/// A modal list whose window follows its cursor, which its wheel and its bar both move. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum OverlayList { + /// The model picker + Models, + /// The login wizard's providers + Providers, + /// The command palette + Palette, + /// The theme picker + Themes, + /// The session picker + Sessions, + /// The `/` flyout, its commands or a command's forms + Slash, + /// The `@` flyout's open tab + Mention, + /// Whichever list the configuration surface is showing: settings, or a setup step + Configuration, } /// A clickable target, resolved from the cursor position to an action on left-click. diff --git a/crates/luxe-tui/src/notify/tests.rs b/crates/luxe-tui/src/notify/tests.rs index 1c94f35..127f7ae 100644 --- a/crates/luxe-tui/src/notify/tests.rs +++ b/crates/luxe-tui/src/notify/tests.rs @@ -119,21 +119,21 @@ fn a_notifier_exists_only_when_notifications_are_on_and_knows_about_tmux() { fn the_sequence_reaches_a_terminal_and_never_a_redirected_stream() { let notifier = TerminalNotifier { protocol: Protocol::Osc9, tmux: false }; let mut sink = Vec::new(); - notifier.write_to(&mut sink, false, "Luxe", "done"); + notifier.write_to(&mut sink, false, "luxe", "done"); assert!(sink.is_empty(), "not a terminal: nothing written"); - notifier.write_to(&mut sink, true, "Luxe", "done"); - assert_eq!(sink, b"\x1b]9;Luxe: done\x07"); + notifier.write_to(&mut sink, true, "luxe", "done"); + assert_eq!(sink, b"\x1b]9;luxe: done\x07"); } #[test] fn each_protocol_is_written_as_its_terminals_expect() { assert_eq!( - sequence(Protocol::Osc9, false, "Luxe · app", "Turn finished"), - "\x1b]9;Luxe · app: Turn finished\x07" + sequence(Protocol::Osc9, false, "luxe · app", "Turn finished"), + "\x1b]9;luxe · app: Turn finished\x07" ); assert_eq!( - sequence(Protocol::Osc777, false, "Luxe; app", "Turn failed: a; b"), - "\x1b]777;notify;Luxe, app;Turn failed: a; b\x07", + sequence(Protocol::Osc777, false, "luxe; app", "Turn failed: a; b"), + "\x1b]777;notify;luxe, app;Turn failed: a; b\x07", "the title cannot carry the field separator; the last field can" ); } @@ -141,8 +141,8 @@ fn each_protocol_is_written_as_its_terminals_expect() { #[test] fn inside_tmux_the_sequence_is_wrapped_for_passthrough() { assert_eq!( - sequence(Protocol::Osc9, true, "Luxe", "done"), - "\x1bPtmux;\x1b\x1b]9;Luxe: done\x07\x1b\\" + sequence(Protocol::Osc9, true, "luxe", "done"), + "\x1bPtmux;\x1b\x1b]9;luxe: done\x07\x1b\\" ); } @@ -151,10 +151,10 @@ fn inside_tmux_the_sequence_is_wrapped_for_passthrough() { #[test] fn outside_text_cannot_end_the_sequence_or_start_its_own() { let hostile = "boom\x07\x1b]52;c;cHduZWQ=\x07\nsecond line\r\u{9b}31m"; - let written = sequence(Protocol::Osc9, false, "Luxe", hostile); + let written = sequence(Protocol::Osc9, false, "luxe", hostile); let inner = &written["\x1b]9;".len()..written.len() - 1]; assert!(!inner.chars().any(char::is_control), "{written:?}"); - assert_eq!(inner, "Luxe: boom ]52;c;cHduZWQ= second line 31m"); + assert_eq!(inner, "luxe: boom ]52;c;cHduZWQ= second line 31m"); } #[test] diff --git a/crates/luxe-tui/src/palette.rs b/crates/luxe-tui/src/palette.rs index b4fa1a8..cec65d7 100644 --- a/crates/luxe-tui/src/palette.rs +++ b/crates/luxe-tui/src/palette.rs @@ -6,11 +6,12 @@ //! name, slash trigger and keywords; the rule under the recent lead is drawn only while the query //! is empty, because once you type, order is the matcher's. -use crate::glyphs::Icon; use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use crate::commands::{Command, Menu, MenuEntry}; -use crate::picker::{Slot, Split, Window}; + +mod render; +pub use render::render_palette; /// Outcome of a palette keypress. #[derive(Clone, Debug, PartialEq, Eq)] @@ -124,6 +125,11 @@ impl PaletteState { self.selected } + /// How many entries the query leaves. + pub(crate) fn match_count(&self) -> usize { + self.filtered.len() + } + /// The filtered position the rule under the recent lead follows, while one is drawn. /// /// Only unfiltered, and only with something on both sides of it. @@ -192,308 +198,5 @@ impl PaletteState { } } -// === Rendering === - -/// Panel label, shared by the rendered title and the modal-width computation. -const TITLE: &str = "Command palette"; -/// Rows the list shows before it scrolls. -const MAX_ROWS: usize = 14; -/// The narrowest the detail pane may be and still read as prose rather than a column of words. -const DETAIL_MIN: u16 = 34; -/// The prose width the pane is sized for when there is room, and the list's half matches it. -const DETAIL_WIDTH: u16 = 50; - -/// How wide the modal is, and whether it splits for a pane, decided once per frame. -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -struct Layout { - modal_width: u16, - /// `None` when there is no room for the pane and the selected summary gets a row instead - split: Option, -} - -/// How many rows the list wants, which with a pane beside it is as many as the longest story any -/// command tells. -fn list_rows( - state: &PaletteState, - layout: &Layout, - theme: &crate::theme::styles::ThemeStyles, -) -> usize { - match layout.split { - // With a pane beside it the modal is as tall as the longest story any command tells, so - // nothing is clipped and it does not jump as the cursor moves from three lines to twelve - Some(Split { pane: width, .. }) => state - .menu - .entries - .iter() - .map(|entry| { - crate::picker::wrapped_rows( - &crate::command_detail::lines(entry, theme), - width.into(), - ) - }) - .max() - .unwrap_or(0) - .max(MAX_ROWS), - None => state.filtered.len().clamp(1, MAX_ROWS) + usize::from(state.divider().is_some()), - } -} - -/// The search field and its rule, with the cursor at the end of the query. -fn render_search( - frame: &mut ratatui::Frame, - area: ratatui::layout::Rect, - state: &PaletteState, - theme: &crate::theme::styles::ThemeStyles, -) { - use ratatui::{ - style::Modifier, - text::{Line, Span}, - widgets::{Block, Borders, Paragraph}, - }; - use unicode_width::UnicodeWidthStr; - - let search = Paragraph::new(Line::from(vec![ - Span::styled(" Search: ", theme.accent.add_modifier(Modifier::BOLD)), - Span::styled(state.query.clone(), theme.text), - ])) - .block(Block::default().borders(Borders::BOTTOM).border_style(theme.border_muted)); - frame.render_widget(search, area); - let cursor_x = area - .x - .saturating_add(9) - .saturating_add(UnicodeWidthStr::width(state.query.as_str()) as u16) - .min(area.right().saturating_sub(1)); - frame.set_cursor_position((cursor_x, area.y)); -} - -/// Renders the searchable command palette as a centered modal. -pub fn render_palette( - frame: &mut ratatui::Frame, - area: ratatui::layout::Rect, - state: &PaletteState, - theme: &crate::theme::styles::ThemeStyles, - hit: &std::cell::RefCell, -) { - use ratatui::{ - layout::{Constraint, Direction, Rect}, - widgets::{Clear, Paragraph}, - }; - - if area.width < 28 || area.height < 8 { - return; - } - - let layout = layout(state, area.width); - let rows = list_rows(state, &layout, theme); - let summary_rows = u16::from(layout.split.is_none()); - // Borders, the search field and its rule, the list, the summary when there is no pane, the - // footer - let desired_height = rows as u16 + 4 + summary_rows + crate::widgets::FOOTER_ROWS; - let modal_height = desired_height.max(9).min(area.height.saturating_sub(2)); - let modal_area = Rect::new( - area.x + area.width.saturating_sub(layout.modal_width) / 2, - area.y + area.height.saturating_sub(modal_height) / 2, - layout.modal_width, - modal_height, - ); - frame.render_widget(Clear, modal_area); - - let block = crate::widgets::titled_panel(Icon::Palette.glyph(), TITLE, theme); - let inner = block.inner(modal_area); - frame.render_widget(block, modal_area); - - let chunks = ratatui::layout::Layout::default() - .direction(Direction::Vertical) - .constraints([ - Constraint::Length(2), - Constraint::Min(1), - Constraint::Length(summary_rows), - Constraint::Length(crate::widgets::FOOTER_ROWS), - ]) - .split(inner); - - render_search(frame, chunks[0], state, theme); - - let body = chunks[1]; - let list_area = Rect { width: layout.split.map_or(body.width, |split| split.list), ..body }; - render_list(frame, list_area, state, theme, hit); - - match (layout.split, state.selected_entry()) { - (Some(split), Some(entry)) => crate::picker::render_pane( - frame, - body, - split.list, - split.pane, - &crate::command_detail::lines(entry, theme), - theme, - ), - (Some(split), None) => { - crate::picker::render_pane(frame, body, split.list, split.pane, &[], theme) - } - (None, Some(entry)) => frame.render_widget( - Paragraph::new(crate::command_detail::summary_line(entry, theme)), - chunks[2], - ), - (None, None) => {} - } - - let count = format!( - "{}/{}", - state.selected.saturating_add(1).min(state.filtered.len()), - state.filtered.len() - ); - crate::widgets::render_footer( - frame, - chunks[3], - "enter run · ↑/↓ choose · esc close", - Some(&count), - theme, - ); -} - -/// The list: a window of rows around the cursor, with the rule under the recent lead when one is -/// drawn, each row a click target for its filtered position. -fn render_list( - frame: &mut ratatui::Frame, - area: ratatui::layout::Rect, - state: &PaletteState, - theme: &crate::theme::styles::ThemeStyles, - hit: &std::cell::RefCell, -) { - use ratatui::{ - layout::Rect, - text::{Line, Span}, - widgets::{List, ListItem, Paragraph}, - }; - - if state.filtered.is_empty() { - frame.render_widget(Paragraph::new(" No matching commands").style(theme.muted), area); - return; - } - let divider = state.divider(); - let window = Window::new(state.filtered.len(), divider, state.selected, area.height as usize); - let row_width = usize::from(area.width); - let mut items = Vec::new(); - for (offset, slot) in window.slots().enumerate() { - let row_y = area.y.saturating_add(offset as u16); - match slot { - Slot::Rule => items.push(ListItem::new(Line::from(Span::styled( - "─".repeat(row_width), - theme.border_muted, - )))), - Slot::Row(position) => { - hit.borrow_mut().push( - Rect::new(area.x, row_y, area.width, 1), - crate::mouse::MouseTarget::PaletteRow(position), - ); - let entry = state.entry_at(position).expect("the window stays inside the list"); - let selected = position == state.selected; - items.push(ListItem::new(row( - entry, - &state.matched_at(position), - selected, - row_width, - theme, - ))); - } - } - } - frame.render_widget(List::new(items), area); -} - -/// One command row: the cursor, the name, its slash trigger, and its key pushed to the right edge. -/// -/// Matched characters take the accent in the name and the trigger alike, since both are searched — -/// a row found through its `/auth` must not draw with nothing lit at all. -fn row( - entry: &MenuEntry, - matched: &std::collections::HashSet, - selected: bool, - row_width: usize, - theme: &crate::theme::styles::ThemeStyles, -) -> ratatui::text::Line<'static> { - use ratatui::{style::Modifier, text::Span}; - use unicode_width::UnicodeWidthStr; - - let lit = theme.accent.add_modifier(Modifier::BOLD); - let paint = |text: &str, offset: usize, base| -> Vec> { - text.chars() - .enumerate() - .map(|(index, character)| { - let style = if matched.contains(&(offset + index)) { lit } else { base }; - Span::styled(character.to_string(), style) - }) - .collect() - }; - let name = entry.command.name.as_ref(); - let name_chars = name.chars().count(); - let mut spans = - vec![Span::styled(crate::glyphs::Mark::Cursor.gutter(selected), theme.accent_on(selected))]; - spans.extend(paint(name, 0, theme.label_on(selected))); - let mut used = UnicodeWidthStr::width(name); - if let Some(slash) = entry.command.slash_name() { - spans.push(Span::raw(" ")); - // The haystack carries the trigger without its slash, so the slash itself is never lit - // and the trigger's first letter is the character after the name's trailing space - spans.push(Span::styled("/", theme.muted)); - spans.extend(paint(slash.trim_start_matches('/'), name_chars + 1, theme.muted)); - used += 2 + UnicodeWidthStr::width(slash); - } - let room = row_width.saturating_sub(crate::widgets::SELECTION_FRAME + 2); - if let Some(chord) = entry.chord.as_deref() { - let chord_width = UnicodeWidthStr::width(chord); - if used + 2 + chord_width <= room { - spans.push(Span::raw(" ".repeat(room - used - chord_width))); - spans.push(Span::styled(chord.to_owned(), theme.muted)); - } - } - crate::widgets::selection_row(spans, row_width, selected, theme) -} - -/// The natural width of a row: its frame, the cursor column, the name, the trigger and the key. -fn row_width(entry: &MenuEntry) -> usize { - use unicode_width::UnicodeWidthStr; - crate::widgets::SELECTION_FRAME - + 2 - + UnicodeWidthStr::width(entry.command.name.as_ref()) - + entry.command.slash_name().map_or(0, |slash| 2 + UnicodeWidthStr::width(slash)) - + entry.chord.as_deref().map_or(0, |chord| 2 + UnicodeWidthStr::width(chord)) -} - -/// How wide the modal is, and where it splits, given `available` terminal columns. -/// -/// Measured over every entry, not the filtered ones, so the modal holds still as the query -/// narrows. With room for a pane the modal is two equal halves — each as wide as the longest row -/// or a comfortable line of prose, whichever is more — so the rule sits on its middle column, as -/// it does in the slash flyout. The pane appears only when both halves fit. -fn layout(state: &PaletteState, available: u16) -> Layout { - use unicode_width::UnicodeWidthStr; - let widest_row = state.menu.entries.iter().map(row_width).max().unwrap_or(0) as u16; - let total = state.menu.entries.len(); - let footer = UnicodeWidthStr::width( - format!(" {total}/{total} · enter run · ↑/↓ choose · esc close ").as_str(), - ) as u16; - let title = crate::widgets::panel_title_width(Icon::Palette.glyph(), TITLE) as u16; - let max_width = available.saturating_sub(4).max(28); - // The pane's half carries its gap, its text and a cell before the frame - let half = widest_row.max(title).max(DETAIL_WIDTH + PANE_SPACING); - let fits = |half: u16| Split::around(half).saturating_add(2) <= max_width; - let half = if fits(half) { half } else { max_width.saturating_sub(3) / 2 }; - let inner = Split::around(half); - let split = Split::of(inner); - if split.list >= widest_row && split.pane >= DETAIL_MIN { - let modal_width = inner.saturating_add(2).max(footer + 2); - return Layout { modal_width, split: Some(split) }; - } - let natural = widest_row.max(footer).max(title); - // Borders, and one cell of breathing room on the right - let modal_width = natural.saturating_add(3).clamp(28, max_width); - Layout { modal_width, split: None } -} - -/// What the pane's half spends besides its text: the gap after the rule, and a cell before the -/// frame. -const PANE_SPACING: u16 = crate::picker::PANE_GUTTER; - #[cfg(test)] mod tests; diff --git a/crates/luxe-tui/src/palette/render.rs b/crates/luxe-tui/src/palette/render.rs new file mode 100644 index 0000000..dde5b1d --- /dev/null +++ b/crates/luxe-tui/src/palette/render.rs @@ -0,0 +1,315 @@ +//! Palette rendering — the modal, its search field, the list and the detail pane beside it. +//! +//! Reads [`PaletteState`] and draws it; the click targets and the scrollbar it publishes are how +//! the mouse reaches back into the state. + +use super::PaletteState; +use crate::commands::MenuEntry; +use crate::glyphs::Icon; +use crate::picker::{Slot, Split, Window}; + +/// Panel label, shared by the rendered title and the modal-width computation. +const TITLE: &str = "Command palette"; +/// Rows the list shows before it scrolls. +const MAX_ROWS: usize = 14; +/// The narrowest the detail pane may be and still read as prose rather than a column of words. +const DETAIL_MIN: u16 = 34; +/// The prose width the pane is sized for when there is room, and the list's half matches it. +const DETAIL_WIDTH: u16 = 50; + +/// How wide the modal is, and whether it splits for a pane, decided once per frame. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +struct Layout { + modal_width: u16, + /// `None` when there is no room for the pane and the selected summary gets a row instead + split: Option, +} + +/// How many rows the list wants, which with a pane beside it is as many as the longest story any +/// command tells. +fn list_rows( + state: &PaletteState, + layout: &Layout, + theme: &crate::theme::styles::ThemeStyles, +) -> usize { + match layout.split { + // With a pane beside it the modal is as tall as the longest story any command tells, so + // nothing is clipped and it does not jump as the cursor moves from three lines to twelve + Some(Split { pane: width, .. }) => state + .menu + .entries + .iter() + .map(|entry| { + crate::picker::wrapped_rows( + &crate::command_detail::lines(entry, theme), + width.into(), + ) + }) + .max() + .unwrap_or(0) + .max(MAX_ROWS), + None => state.filtered.len().clamp(1, MAX_ROWS) + usize::from(state.divider().is_some()), + } +} + +/// The search field and its rule, with the cursor at the end of the query. +fn render_search( + frame: &mut ratatui::Frame, + area: ratatui::layout::Rect, + state: &PaletteState, + theme: &crate::theme::styles::ThemeStyles, +) { + use ratatui::{ + style::Modifier, + text::{Line, Span}, + widgets::{Block, Borders, Paragraph}, + }; + use unicode_width::UnicodeWidthStr; + + let search = Paragraph::new(Line::from(vec![ + Span::styled(" Search: ", theme.accent.add_modifier(Modifier::BOLD)), + Span::styled(state.query.clone(), theme.text), + ])) + .block(Block::default().borders(Borders::BOTTOM).border_style(theme.border_muted)); + frame.render_widget(search, area); + let cursor_x = area + .x + .saturating_add(9) + .saturating_add(UnicodeWidthStr::width(state.query.as_str()) as u16) + .min(area.right().saturating_sub(1)); + frame.set_cursor_position((cursor_x, area.y)); +} + +/// Renders the searchable command palette as a centered modal. +pub fn render_palette( + frame: &mut ratatui::Frame, + area: ratatui::layout::Rect, + state: &PaletteState, + theme: &crate::theme::styles::ThemeStyles, + hit: &std::cell::RefCell, +) { + use ratatui::{ + layout::{Constraint, Direction, Rect}, + widgets::{Clear, Paragraph}, + }; + + if area.width < 28 || area.height < 8 { + return; + } + + let layout = layout(state, area.width); + let rows = list_rows(state, &layout, theme); + let summary_rows = u16::from(layout.split.is_none()); + // Borders, the search field and its rule, the list, the summary when there is no pane, the + // footer + let desired_height = rows as u16 + 4 + summary_rows + crate::widgets::FOOTER_ROWS; + let modal_height = desired_height.max(9).min(area.height.saturating_sub(2)); + let modal_area = Rect::new( + area.x + area.width.saturating_sub(layout.modal_width) / 2, + area.y + area.height.saturating_sub(modal_height) / 2, + layout.modal_width, + modal_height, + ); + frame.render_widget(Clear, modal_area); + + let block = crate::widgets::titled_panel(Icon::Palette.glyph(), TITLE, theme); + let inner = block.inner(modal_area); + frame.render_widget(block, modal_area); + + let chunks = ratatui::layout::Layout::default() + .direction(Direction::Vertical) + .constraints([ + Constraint::Length(2), + Constraint::Min(1), + Constraint::Length(summary_rows), + Constraint::Length(crate::widgets::FOOTER_ROWS), + ]) + .split(inner); + + render_search(frame, chunks[0], state, theme); + + let body = chunks[1]; + let list_area = Rect { width: layout.split.map_or(body.width, |split| split.list), ..body }; + render_list(frame, list_area, state, theme, hit); + + match (layout.split, state.selected_entry()) { + (Some(split), Some(entry)) => crate::picker::render_pane( + frame, + body, + split.list, + split.pane, + &crate::command_detail::lines(entry, theme), + theme, + ), + (Some(split), None) => { + crate::picker::render_pane(frame, body, split.list, split.pane, &[], theme) + } + (None, Some(entry)) => frame.render_widget( + Paragraph::new(crate::command_detail::summary_line(entry, theme)), + chunks[2], + ), + (None, None) => {} + } + + let count = format!( + "{}/{}", + state.selected.saturating_add(1).min(state.filtered.len()), + state.filtered.len() + ); + crate::widgets::render_footer( + frame, + chunks[3], + "enter run · ↑/↓ choose · esc close", + Some(&count), + theme, + ); +} + +/// The list: a window of rows around the cursor, with the rule under the recent lead when one is +/// drawn, each row a click target for its filtered position. +fn render_list( + frame: &mut ratatui::Frame, + area: ratatui::layout::Rect, + state: &PaletteState, + theme: &crate::theme::styles::ThemeStyles, + hit: &std::cell::RefCell, +) { + use ratatui::{ + layout::Rect, + text::{Line, Span}, + widgets::{List, ListItem, Paragraph}, + }; + + if state.filtered.is_empty() { + frame.render_widget(Paragraph::new(" No matching commands").style(theme.muted), area); + return; + } + let divider = state.divider(); + let window = Window::new(state.filtered.len(), divider, state.selected, area.height as usize); + let lines = Window::lines(state.filtered.len(), divider); + let width = crate::widgets::list_rows_width(area.width, lines, area.height); + let row_width = usize::from(width); + let mut items = Vec::new(); + for (offset, slot) in window.slots().enumerate() { + let row_y = area.y.saturating_add(offset as u16); + match slot { + Slot::Rule => items.push(ListItem::new(Line::from(Span::styled( + "─".repeat(row_width), + theme.border_muted, + )))), + Slot::Row(position) => { + hit.borrow_mut().push( + Rect::new(area.x, row_y, width, 1), + crate::mouse::MouseTarget::PaletteRow(position), + ); + let entry = state.entry_at(position).expect("the window stays inside the list"); + let selected = position == state.selected; + items.push(ListItem::new(row( + entry, + &state.matched_at(position), + selected, + row_width, + theme, + ))); + } + } + } + frame.render_widget(List::new(items), Rect { width, ..area }); + let list = crate::mouse::OverlayList::Palette; + let shown = (window.top(), lines); + crate::widgets::list_scrollbar(frame, &mut hit.borrow_mut(), area, list, shown, theme); +} + +/// One command row: the cursor, the name, its slash trigger, and its key pushed to the right edge. +/// +/// Matched characters take the accent in the name and the trigger alike, since both are searched — +/// a row found through its `/auth` must not draw with nothing lit at all. +pub(super) fn row( + entry: &MenuEntry, + matched: &std::collections::HashSet, + selected: bool, + row_width: usize, + theme: &crate::theme::styles::ThemeStyles, +) -> ratatui::text::Line<'static> { + use ratatui::{style::Modifier, text::Span}; + use unicode_width::UnicodeWidthStr; + + let lit = theme.accent.add_modifier(Modifier::BOLD); + let paint = |text: &str, offset: usize, base| -> Vec> { + text.chars() + .enumerate() + .map(|(index, character)| { + let style = if matched.contains(&(offset + index)) { lit } else { base }; + Span::styled(character.to_string(), style) + }) + .collect() + }; + let name = entry.command.name.as_ref(); + let name_chars = name.chars().count(); + let mut spans = + vec![Span::styled(crate::glyphs::Mark::Cursor.gutter(selected), theme.accent_on(selected))]; + spans.extend(paint(name, 0, theme.label_on(selected))); + let mut used = UnicodeWidthStr::width(name); + if let Some(slash) = entry.command.slash_name() { + spans.push(Span::raw(" ")); + // The haystack carries the trigger without its slash, so the slash itself is never lit + // and the trigger's first letter is the character after the name's trailing space + spans.push(Span::styled("/", theme.muted)); + spans.extend(paint(slash.trim_start_matches('/'), name_chars + 1, theme.muted)); + used += 2 + UnicodeWidthStr::width(slash); + } + let room = row_width.saturating_sub(crate::widgets::SELECTION_FRAME + 2); + if let Some(chord) = entry.chord.as_deref() { + let chord_width = UnicodeWidthStr::width(chord); + if used + 2 + chord_width <= room { + spans.push(Span::raw(" ".repeat(room - used - chord_width))); + spans.push(Span::styled(chord.to_owned(), theme.muted)); + } + } + crate::widgets::selection_row(spans, row_width, selected, theme) +} + +/// The natural width of a row: its frame, the cursor column, the name, the trigger and the key. +fn row_width(entry: &MenuEntry) -> usize { + use unicode_width::UnicodeWidthStr; + crate::widgets::SELECTION_FRAME + + 2 + + UnicodeWidthStr::width(entry.command.name.as_ref()) + + entry.command.slash_name().map_or(0, |slash| 2 + UnicodeWidthStr::width(slash)) + + entry.chord.as_deref().map_or(0, |chord| 2 + UnicodeWidthStr::width(chord)) +} + +/// How wide the modal is, and where it splits, given `available` terminal columns. +/// +/// Measured over every entry, not the filtered ones, so the modal holds still as the query +/// narrows. With room for a pane the modal is two equal halves — each as wide as the longest row +/// or a comfortable line of prose, whichever is more — so the rule sits on its middle column, as +/// it does in the slash flyout. The pane appears only when both halves fit. +fn layout(state: &PaletteState, available: u16) -> Layout { + use unicode_width::UnicodeWidthStr; + let widest_row = state.menu.entries.iter().map(row_width).max().unwrap_or(0) as u16; + let total = state.menu.entries.len(); + let footer = UnicodeWidthStr::width( + format!(" {total}/{total} · enter run · ↑/↓ choose · esc close ").as_str(), + ) as u16; + let title = crate::widgets::panel_title_width(Icon::Palette.glyph(), TITLE) as u16; + let max_width = available.saturating_sub(4).max(28); + // The pane's half carries its gap, its text and a cell before the frame + let half = widest_row.max(title).max(DETAIL_WIDTH + PANE_SPACING); + let fits = |half: u16| Split::around(half).saturating_add(2) <= max_width; + let half = if fits(half) { half } else { max_width.saturating_sub(3) / 2 }; + let inner = Split::around(half); + let split = Split::of(inner); + if split.list >= widest_row && split.pane >= DETAIL_MIN { + let modal_width = inner.saturating_add(2).max(footer + 2); + return Layout { modal_width, split: Some(split) }; + } + let natural = widest_row.max(footer).max(title); + // Borders, and one cell of breathing room on the right + let modal_width = natural.saturating_add(3).clamp(28, max_width); + Layout { modal_width, split: None } +} + +/// What the pane's half spends besides its text: the gap after the rule, and a cell before the +/// frame. +const PANE_SPACING: u16 = crate::picker::PANE_GUTTER; diff --git a/crates/luxe-tui/src/palette/tests.rs b/crates/luxe-tui/src/palette/tests.rs index 9d0b453..5f03bd2 100644 --- a/crates/luxe-tui/src/palette/tests.rs +++ b/crates/luxe-tui/src/palette/tests.rs @@ -1,5 +1,7 @@ +use super::render::row; use super::*; use crate::commands::{CommandContext, CommandRegistry, Surface}; +use crate::picker::{Slot, Window}; use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use luxe_core::keymap::KeyMap; diff --git a/crates/luxe-tui/src/picker/layout.rs b/crates/luxe-tui/src/picker/layout.rs index 3284b58..e81d859 100644 --- a/crates/luxe-tui/src/picker/layout.rs +++ b/crates/luxe-tui/src/picker/layout.rs @@ -100,6 +100,16 @@ impl Window { Self { divider, start, end: (start + capacity).min(lines) } } + /// The first line on screen, for the bar beside the window. + pub(crate) fn top(self) -> usize { + self.start + } + + /// Every line the list has, a rule included, for the bar beside the window. + pub(crate) fn lines(len: usize, divider: Option) -> usize { + len + usize::from(divider.is_some()) + } + /// Each line on screen, top to bottom. pub(crate) fn slots(self) -> impl Iterator { (self.start..self.end).map(move |line| match self.divider { diff --git a/crates/luxe-tui/src/picker/tests.rs b/crates/luxe-tui/src/picker/tests.rs index a01328d..ed3ef60 100644 --- a/crates/luxe-tui/src/picker/tests.rs +++ b/crates/luxe-tui/src/picker/tests.rs @@ -273,6 +273,7 @@ fn render_picker_draws_title_rows_selection_and_hit_regions() { divider: None, detail: None, rows: None, + list: crate::mouse::OverlayList::Slash, }, ); }) @@ -343,6 +344,7 @@ fn a_row_too_long_for_the_flyout_clips_rather_than_losing_its_cap() { divider: None, detail: None, rows: None, + list: crate::mouse::OverlayList::Slash, }, ); }) @@ -400,6 +402,7 @@ fn tabs_sit_above_the_list_and_move_it_down() { divider: None, detail: None, rows: None, + list: crate::mouse::OverlayList::Slash, }, ) }) @@ -450,6 +453,7 @@ fn tabs_sit_above_the_list_and_move_it_down() { divider: None, detail: None, rows: None, + list: crate::mouse::OverlayList::Slash, }, ) }) diff --git a/crates/luxe-tui/src/picker/view.rs b/crates/luxe-tui/src/picker/view.rs index 41aea83..b2561e0 100644 --- a/crates/luxe-tui/src/picker/view.rs +++ b/crates/luxe-tui/src/picker/view.rs @@ -65,6 +65,8 @@ where /// Rows the list keeps whatever it holds, so moving between tabs never moves the frame, with /// an empty or loading message in the middle of them; `None` fits the list to its rows pub rows: Option, + /// Which list the wheel and the bar move + pub list: crate::mouse::OverlayList, } /// Rows a picker with tabs keeps. Odd, so an empty tab's message has a middle row to sit on; nine, @@ -127,19 +129,23 @@ pub fn render_picker( }; let capacity = flyout_height.saturating_sub(2 + tab_rows + footer_rows) as usize; let window = Window::new(view.item_count, divider, view.selected, capacity); + let lines = Window::lines(view.item_count, divider); + let rows_width = crate::widgets::list_rows_width(list_width, lines, capacity as u16); let items = build_picker_window( &view, &window, hit, - (flyout_area, list_width, pane_width, tab_rows), + (flyout_area, rows_width, pane_width, tab_rows), theme, ); let body = render_picker_header(f, flyout_area, &view, theme); let list_area = Rect { width: list_width.min(body.width), ..body }; match (view.item_count, view.rows) { (0, Some(_)) => render_centered(f, list_area, view.empty_message, theme), - _ => f.render_widget(List::new(items), list_area), + _ => f.render_widget(List::new(items), Rect { width: rows_width.min(body.width), ..body }), } + let shown = (window.top(), lines); + crate::widgets::list_scrollbar(f, &mut hit.borrow_mut(), list_area, view.list, shown, theme); if let (Some(detail), Some(width)) = (view.detail, pane_width) { render_pane(f, body, list_width, width, &detail(view.selected), theme); } diff --git a/crates/luxe-tui/src/pull_request.rs b/crates/luxe-tui/src/pull_request.rs index 7b4d4a0..6c3d2cf 100644 --- a/crates/luxe-tui/src/pull_request.rs +++ b/crates/luxe-tui/src/pull_request.rs @@ -52,7 +52,7 @@ pub(crate) fn wants_attention(pr: &PullRequestStatus) -> bool { pub(crate) fn report(presence: &PullRequestPresence) -> String { match presence { PullRequestPresence::Unknown => { - "Luxe has not heard from GitHub about this branch yet; it is asking now.".into() + "luxe has not heard from GitHub about this branch yet; it is asking now.".into() } PullRequestPresence::None => "This branch has no pull request on GitHub.".into(), PullRequestPresence::Unavailable { reason } => reason.clone(), diff --git a/crates/luxe-tui/src/ref_provider.rs b/crates/luxe-tui/src/ref_provider.rs index 93184d3..07db10a 100644 --- a/crates/luxe-tui/src/ref_provider.rs +++ b/crates/luxe-tui/src/ref_provider.rs @@ -89,7 +89,7 @@ impl FileRefProvider { /// list was given rather than read. /// /// Read again off the render thread whenever the picker opens, since a file created or moved - /// outside Luxe never produces a workspace snapshot and would stay impossible to mention. + /// outside luxe never produces a workspace snapshot and would stay impossible to mention. pub fn set_listing(&mut self, files: Vec) { if !self.given { self.set_files(files); diff --git a/crates/luxe-tui/src/selection.rs b/crates/luxe-tui/src/selection.rs index 34e6416..5aaa3ec 100644 --- a/crates/luxe-tui/src/selection.rs +++ b/crates/luxe-tui/src/selection.rs @@ -1,6 +1,6 @@ //! Text selection — grid selection shared by the transcript and the composer. //! -//! Capturing the mouse means the terminal's own click-drag selection never fires, so Luxe draws +//! Capturing the mouse means the terminal's own click-drag selection never fires, so luxe draws //! and owns the selection itself: a drag records an anchor and a moving cursor over a surface's //! rendered lines, the view paints the covered cells, and releasing copies the text out. Positions //! are `(line, column)` in *terminal cells*, matching what the user actually sees, so wide glyphs diff --git a/crates/luxe-tui/src/session_picker.rs b/crates/luxe-tui/src/session_picker.rs index b3cd2f5..2ccf5e8 100644 --- a/crates/luxe-tui/src/session_picker.rs +++ b/crates/luxe-tui/src/session_picker.rs @@ -112,6 +112,11 @@ impl SessionPickerState { self.nav.query() } + /// The cursor's row among the visible matches. + pub(crate) fn cursor(&self) -> usize { + self.nav.selected() + } + /// Returns the number of visible matches. pub fn match_count(&self) -> usize { self.nav.match_count() @@ -354,19 +359,23 @@ impl SessionPickerState { .saturating_add(1) .saturating_sub(capacity) .min(self.nav.filtered_indices().len().saturating_sub(capacity)); - let end = start.saturating_add(capacity).min(self.nav.filtered_indices().len()); + let total = self.nav.filtered_indices().len(); + let end = start.saturating_add(capacity).min(total); + let width = crate::widgets::list_rows_width(area.width, total, area.height); // Two cells for the cursor column, and the frame the selected row is cut with. let available_width = - area.width.saturating_sub(4 + crate::widgets::SELECTION_FRAME as u16) as usize; + width.saturating_sub(4 + crate::widgets::SELECTION_FRAME as u16) as usize; { let mut regions = hit.borrow_mut(); for offset in 0..end.saturating_sub(start) { let row_y = area.y.saturating_add(offset as u16); regions.push( - Rect::new(area.x, row_y, area.width, 1), + Rect::new(area.x, row_y, width, 1), crate::mouse::MouseTarget::SessionRow(start + offset), ); } + let list = crate::mouse::OverlayList::Sessions; + crate::widgets::list_scrollbar(frame, &mut regions, area, list, (start, total), theme); } let items: Vec = self.nav.filtered_indices()[start..end] @@ -392,13 +401,13 @@ impl SessionPickerState { Span::styled(gap, background), Span::styled(session.age.clone(), theme.muted.patch(background)), ], - usize::from(area.width), + usize::from(width), selected, theme, )) }) .collect(); - frame.render_widget(List::new(items), area); + frame.render_widget(List::new(items), Rect { width, ..area }); } /// Renders a multi-line preview of the selected session: a heading, the session title + age, diff --git a/crates/luxe-tui/src/slash_args.rs b/crates/luxe-tui/src/slash_args.rs index 1c4f278..a329737 100644 --- a/crates/luxe-tui/src/slash_args.rs +++ b/crates/luxe-tui/src/slash_args.rs @@ -130,14 +130,14 @@ pub(crate) fn fill(trigger: &str, words: &[Word<'_>], typed: &str) -> Option usize { + self.nav.selected() + } + /// Get the selected command (if any). pub fn selected_command(&self) -> Option<&Command> { if let Some(arguments) = self.arguments.as_ref() { @@ -361,6 +366,7 @@ pub fn render_slash_flyout( divider: state.divider(), detail: Some(&detail), rows: None, + list: crate::mouse::OverlayList::Slash, }, ); } @@ -406,6 +412,7 @@ fn render_arguments( divider: None, detail: None, rows: None, + list: crate::mouse::OverlayList::Slash, }, ); } diff --git a/crates/luxe-tui/src/statusline/layout.rs b/crates/luxe-tui/src/statusline/layout.rs index d2c0fac..7e8f3e5 100644 --- a/crates/luxe-tui/src/statusline/layout.rs +++ b/crates/luxe-tui/src/statusline/layout.rs @@ -21,7 +21,7 @@ pub(super) fn fit_segments( ) { // Least actionable first. Token counts are trivia next to the percentage that says whether the // window is about to run out; a path repeats the project name; and of the two identities, the - // project is the one that tells two Luxe windows apart, so the branch goes first. + // project is the one that tells two luxe windows apart, so the branch goes first. let removal_order: &[SegmentKind] = if context_replacement { &[ SegmentKind::Cwd, diff --git a/crates/luxe-tui/src/statusline/segments.rs b/crates/luxe-tui/src/statusline/segments.rs index 56fdb85..7d1305f 100644 --- a/crates/luxe-tui/src/statusline/segments.rs +++ b/crates/luxe-tui/src/statusline/segments.rs @@ -340,7 +340,7 @@ fn right_segment(module: StatuslineModule, app: &App, palette: Palette) -> Optio )) } // The bar's right anchor is where a reader looks to see what is answering, so it answers - // either way. Luxe chooses no model on the reader's behalf, and a module that simply + // either way. luxe chooses no model on the reader's behalf, and a module that simply // vanished would leave the one session where that matters with nothing to explain a // refused turn. StatuslineModule::Model => { diff --git a/crates/luxe-tui/src/statusline/tests.rs b/crates/luxe-tui/src/statusline/tests.rs index 4b287b3..ae8faee 100644 --- a/crates/luxe-tui/src/statusline/tests.rs +++ b/crates/luxe-tui/src/statusline/tests.rs @@ -16,7 +16,7 @@ fn model_and_reasoning_icons_come_from_the_shared_catalog() { /// A session with no model chosen says so where a session with one names it. /// -/// Luxe picks none on the reader's behalf, so this is a state the bar has to report. It used to +/// luxe picks none on the reader's behalf, so this is a state the bar has to report. It used to /// drop the module entirely, which left the one reader who needed an explanation — their turn /// is about to be refused — looking at a bar with nothing on its right-hand end. #[test] diff --git a/crates/luxe-tui/src/tabstop.rs b/crates/luxe-tui/src/tabstop.rs index 7e93c56..8e63649 100644 --- a/crates/luxe-tui/src/tabstop.rs +++ b/crates/luxe-tui/src/tabstop.rs @@ -1,4 +1,4 @@ -//! Tab stops — how wide a tab is, everywhere Luxe draws one. +//! Tab stops — how wide a tab is, everywhere luxe draws one. //! //! A tab is the one character the two halves of a render disagree about. `unicode-width` scores it //! zero, ratatui's buffer drops it, and the terminal would advance the cursor to its own stop if it @@ -12,7 +12,7 @@ use unicode_width::UnicodeWidthChar; -/// Cells a tab advances to, everywhere Luxe draws one. +/// Cells a tab advances to, everywhere luxe draws one. /// /// Four rather than eight because a diff already spends cells on two line-number columns and a /// sign, and a Go or Make file indented four levels at eight cells apiece has nothing left for the diff --git a/crates/luxe-tui/src/theme_picker.rs b/crates/luxe-tui/src/theme_picker.rs index fc70b17..00f982e 100644 --- a/crates/luxe-tui/src/theme_picker.rs +++ b/crates/luxe-tui/src/theme_picker.rs @@ -87,6 +87,16 @@ impl ThemePickerState { } } + /// The cursor's row. + pub(crate) fn cursor(&self) -> usize { + self.selected + } + + /// How many themes the list holds. + pub(crate) fn len(&self) -> usize { + self.themes.len() + } + /// Move the cursor to `index`, previewing what lands under it. pub fn select(&mut self, index: usize) -> Option { (index < self.themes.len() && index != self.selected).then(|| { @@ -164,6 +174,8 @@ impl ThemePickerState { self.selected, usize::from(chunks[0].height), ); + let total = self.themes.len(); + let width = crate::widgets::list_rows_width(chunks[0].width, total, chunks[0].height); let shown: Vec = window .slots() .filter_map(|slot| match slot { @@ -188,7 +200,7 @@ impl ThemePickerState { } ListItem::new(crate::widgets::selection_row( spans, - usize::from(chunks[0].width), + usize::from(width), selected, theme, )) @@ -200,12 +212,15 @@ impl ThemePickerState { for (row, &index) in shown.iter().enumerate() { let row_y = chunks[0].y.saturating_add(row as u16); regions.push( - Rect::new(chunks[0].x, row_y, chunks[0].width, 1), + Rect::new(chunks[0].x, row_y, width, 1), crate::mouse::MouseTarget::ThemeRow(index), ); } + let list = crate::mouse::OverlayList::Themes; + let window = (window.top(), total); + crate::widgets::list_scrollbar(frame, &mut regions, chunks[0], list, window, theme); } - frame.render_widget(List::new(items), chunks[0]); + frame.render_widget(List::new(items), Rect { width, ..chunks[0] }); crate::widgets::render_footer(frame, chunks[1], FOOTER, None, theme); } } diff --git a/crates/luxe-tui/src/view.rs b/crates/luxe-tui/src/view.rs index 08e86a4..b61bec1 100644 --- a/crates/luxe-tui/src/view.rs +++ b/crates/luxe-tui/src/view.rs @@ -1,4 +1,4 @@ -//! View — ratatui rendering for Luxe's TUI surfaces. +//! View — ratatui rendering for luxe's TUI surfaces. //! //! [`render`] routes a frame to the surface the app is on. The chat frame is measured first //! (`frame_layout`), then drawn back to front: the dock and the conversation, the composer and diff --git a/crates/luxe-tui/src/view/blocks.rs b/crates/luxe-tui/src/view/blocks.rs index 03dc25d..c0ef793 100644 --- a/crates/luxe-tui/src/view/blocks.rs +++ b/crates/luxe-tui/src/view/blocks.rs @@ -129,7 +129,7 @@ pub(super) fn lines(block: &ConvoBlock, ctx: &BlockContext<'_>) -> Vec user_lines(text, attached, chips, style, ctx), ConvoBlock::Image { key, .. } => image_lines(key, ctx, style), ConvoBlock::Assistant(text) => { - // What the agent wrote for Luxe — a remediation report, a draft — is shown where it lands + // What the agent wrote for luxe — a remediation report, a draft — is shown where it lands let text = &*luxe_core::briefs::for_the_reader(text); if text.trim().is_empty() { return Vec::new(); diff --git a/crates/luxe-tui/src/view/dock.rs b/crates/luxe-tui/src/view/dock.rs index ca892cf..1748511 100644 --- a/crates/luxe-tui/src/view/dock.rs +++ b/crates/luxe-tui/src/view/dock.rs @@ -46,8 +46,8 @@ use { plan::{plan_follow, plan_row_grants, subject_rows, todo_lines, PLAN_LOOKAHEAD}, plan::{PLAN_ROWS_MAX, PLAN_WRAP_ROWS}, ratatui::style::Modifier, - telemetry::TELEMETRY_LABEL_WIDTH, telemetry::{telemetry_label_width, telemetry_lines, telemetry_value_width, token_value}, + telemetry::{TELEMETRY_LABEL_WIDTH, WIDEST_TELEMETRY_LABEL}, tree::tree_row_line, }; diff --git a/crates/luxe-tui/src/view/dock/elsewhere.rs b/crates/luxe-tui/src/view/dock/elsewhere.rs index df4b817..763fd76 100644 --- a/crates/luxe-tui/src/view/dock/elsewhere.rs +++ b/crates/luxe-tui/src/view/dock/elsewhere.rs @@ -225,7 +225,7 @@ fn external_row_line( /// /// The branch is not decoration here. A worktree's row lists everything Git reports there, /// including changes this session did not make, and naming the branch is what tells a reader they -/// are looking at another repository's whole working tree rather than at a list of Luxe's edits. +/// are looking at another repository's whole working tree rather than at a list of luxe's edits. /// A folded place trades it for the count, which is what a heading standing alone has to say, and /// recedes, since folded reads as dealt with. A branch never takes more than a third of the row: /// the place is what the row is for. diff --git a/crates/luxe-tui/src/view/dock/files.rs b/crates/luxe-tui/src/view/dock/files.rs index e3f20f7..5ea8126 100644 --- a/crates/luxe-tui/src/view/dock/files.rs +++ b/crates/luxe-tui/src/view/dock/files.rs @@ -45,7 +45,7 @@ pub(super) fn files_row_cap(available_height: usize, reserved: usize) -> usize { /// reader loses a review they were about to open — the counts and the markers all disappear at /// once, with nothing left saying there was anything to see. /// -/// The turn's own baseline outlives the commit (Luxe retains the before and after content on disk, +/// The turn's own baseline outlives the commit (luxe retains the before and after content on disk, /// not a Git range), so the way in is still open; only the sign of it was missing. fn committed_notice(app: &App) -> Option>> { if !app.worktree_emptied || app.review.last_turn.is_none() { diff --git a/crates/luxe-tui/src/view/dock/telemetry.rs b/crates/luxe-tui/src/view/dock/telemetry.rs index abba872..5867fa3 100644 --- a/crates/luxe-tui/src/view/dock/telemetry.rs +++ b/crates/luxe-tui/src/view/dock/telemetry.rs @@ -60,20 +60,24 @@ pub(super) fn footer_lines( if lines.len() == 1 { lines.clear(); } - let rows = telemetry_start - .map(|start| { - vec![ - (start + MODEL_ROW, crate::mouse::MouseTarget::DockModelRow), - (start + MODE_ROW, crate::mouse::MouseTarget::DockModeRow), - ] - }) - .unwrap_or_default(); + let rows = telemetry_start.map(clickable_rows).unwrap_or_default(); (lines, rows) } -/// Where the model and mode rows sit in [`telemetry_lines`], under its heading. -const MODEL_ROW: usize = 1; -const MODE_ROW: usize = 3; +/// The telemetry rows a click lands on, for a block starting at line `start`. The provider and the +/// model are one choice in the picker, so both rows open it. +fn clickable_rows(start: usize) -> Vec<(usize, crate::mouse::MouseTarget)> { + vec![ + (start + PROVIDER_ROW, crate::mouse::MouseTarget::DockModelRow), + (start + MODEL_ROW, crate::mouse::MouseTarget::DockModelRow), + (start + MODE_ROW, crate::mouse::MouseTarget::DockModeRow), + ] +} + +/// Where the provider, model and mode rows sit in [`telemetry_lines`], under its heading. +const PROVIDER_ROW: usize = 1; +const MODEL_ROW: usize = 2; +const MODE_ROW: usize = 4; /// Builds the live activity line (spinner + label + elapsed) for the dock footer. /// @@ -108,34 +112,29 @@ fn activity_line(app: &App, presentation: DockPresentation) -> Option usize { let gap = match row { 0..48 => 2, @@ -189,27 +188,21 @@ pub(super) fn token_value(totals: &luxe_core::usage::UsageTotals, room: usize) - /// and its row is the pointer's way into the picker; SESSION waits for a turn to measure, so an /// idle, pre-turn dock stays short. pub(super) fn telemetry_lines(app: &App) -> Vec> { - let status = &app.status; - // Who is serving it takes the label column the rest of the block uses, so MODEL reads as one - // grid with SESSION rather than as a headline with rows under it — and it is the one thing - // about the model that its name does not say. Until the engine has announced a model there - // is no provider to name, so the row falls back to saying what it is; leaving the column - // empty would put the value somewhere no other row's value sits. - let served_by = if status.provider.is_empty() { "model" } else { status.provider.as_str() }; let row = row_width(app); - let column = telemetry_label_width(row, served_by.width()); - let mut lines = model_telemetry(app, served_by, row, column); + let column = telemetry_label_width(row, WIDEST_TELEMETRY_LABEL); + let mut lines = model_telemetry(app, row, column); lines.extend(session_telemetry(app, row, column)); lines } /// The MODEL block: who serves it, the model, its thinking level, the mode, and auto-approval. -fn model_telemetry(app: &App, served_by: &str, row: usize, column: usize) -> Vec> { +fn model_telemetry(app: &App, row: usize, column: usize) -> Vec> { let styles = &app.theme_styles; let status = &app.status; let mut lines: Vec> = Vec::new(); lines.push(section_heading_line(Section::Model, app)); + lines.push(provider_row(app, row, column)); let room = telemetry_value_width(row, column).saturating_sub(icon_cells(Icon::Model.glyph())); // Nothing chooses a model for the reader, so this row says which it is either way — and stays // the affordance that opens the picker, which is the whole reason a reader with none needs it. @@ -218,7 +211,7 @@ fn model_telemetry(app: &App, served_by: &str, row: usize, column: usize) -> Vec false => (truncate_cells(&status.model, room), styles.text), }; lines.push(telemetry_affordance( - served_by, + "model", icon_label(Icon::Model.glyph(), &name), ink, column, @@ -261,6 +254,27 @@ fn model_telemetry(app: &App, served_by: &str, row: usize, column: usize) -> Vec lines } +/// Who serves the model, wearing that provider's mark. Always drawn, so the rows under it keep +/// their place: before the engine names a provider it says `none`, dimmed. +fn provider_row(app: &App, row: usize, column: usize) -> Line<'static> { + let styles = &app.theme_styles; + let provider = app.status.provider.as_str(); + let icon = crate::widgets::provider_icon(provider).glyph(); + let room = telemetry_value_width(row, column).saturating_sub(icon_cells(icon)); + let (name, ink) = match provider.is_empty() { + true => ("none".to_string(), styles.dim), + false => (truncate_cells(provider, room), styles.text), + }; + telemetry_affordance( + "provider", + icon_label(icon, &name), + ink, + column, + app, + &crate::mouse::MouseTarget::DockModelRow, + ) +} + /// The SESSION block, once a turn has something to measure or someone has joined: the window, /// tokens, cost, what the review and compaction spent of it, and who's joined. fn session_telemetry(app: &App, row: usize, column: usize) -> Vec> { diff --git a/crates/luxe-tui/src/view/dock/tests/rail.rs b/crates/luxe-tui/src/view/dock/tests/rail.rs index 9d644a1..6aa6b7f 100644 --- a/crates/luxe-tui/src/view/dock/tests/rail.rs +++ b/crates/luxe-tui/src/view/dock/tests/rail.rs @@ -233,7 +233,7 @@ fn every_telemetry_value_opens_on_one_column_clear_of_the_badge() { .unwrap_or_else(|| panic!("no {label} row in {rendered:?}")); UnicodeWidthStr::width(&row[..row.len() - row.trim_start_matches(label).trim_start().len()]) }; - for label in ["anthropic", "thinking", "context", "tokens", "cost", "compaction"] { + for label in ["provider", "model", "thinking", "context", "tokens", "cost", "compaction"] { assert_eq!(value_at(label), TELEMETRY_LABEL_WIDTH, "{label} in {rendered:?}"); } @@ -275,10 +275,13 @@ fn the_token_row_sheds_its_footnote_rather_than_the_rail() { "a session with room keeps its footnote: {large}" ); - // At the top of the range the footnote goes, and the counts never do. - let vast = token_value(&totals(999_900_000, 999_900_000, 999_900_000), room); - assert_eq!(vast, "↑999.9M ↓999.9M", "the two counts are the row"); - assert!(vast.width() <= room, "{vast} still overruns"); + // The default rail now seats all three even at the top of the range + let vast = totals(999_900_000, 999_900_000, 999_900_000); + assert!(token_value(&vast, room).width() <= room, "the widest still overruns"); + + // In a tighter row the footnote goes, and the counts never do + let tight = "↑999.9M ↓999.9M ↺999.9M".width() - 1; + assert_eq!(token_value(&vast, tight), "↑999.9M ↓999.9M", "the two counts are the row"); // Nothing to report is not the same as no room to report it. assert_eq!(token_value(&totals(900_000, 42_000, 0), room), "↑900k ↓42k"); @@ -317,74 +320,85 @@ fn every_telemetry_row_fits_the_rail() { ); } - // The other end of the same budget: the column has to seat the longest provider anyone has - // put in front of it, or this is all arithmetic about nothing. - assert!( - TELEMETRY_LABEL_WIDTH > "foundry-anthropic".width(), - "a gateway-prefixed provider is cut, which is the whole reason for the column's width" - ); + // A gateway-prefixed provider reads in full as a value on the default rail app.status.provider = "foundry-anthropic".into(); - app.status.model = "Claude Fable 5.1 (EU)".into(); let rendered: Vec = telemetry_lines(&app).iter().map(text).collect(); assert!( - rendered.iter().any(|row| row.starts_with("foundry-anthropic ")), + rendered + .iter() + .any(|row| row.starts_with("provider") && row.ends_with("foundry-anthropic")), "the provider is elided: {rendered:?}" ); - // And the third end: the label column is a split, so taking a cell from the value is - // taking it from a model's name. Both of these elide, and a column that seated every - // provider id ever written would leave the names — where the variety actually is — paying - // for it on every row of every session. + // The label column is paid for out of a model's name, so a routine one fits whole let name_room = telemetry_value_width(DEFAULT_ROW, TELEMETRY_LABEL_WIDTH) .saturating_sub(icon_cells(Icon::Model.glyph())); assert!( - name_room >= "Claude Sonnet 4.6".width(), + name_room >= "Claude Sonnet 4.6 (EU)".width(), "a routine model name does not fit in {name_room} cells" ); } -/// The model row is a row like the others: who serves it on the left, what it is on the right. -/// -/// It used to be the block's headline — the one line in MODEL and SESSION with no label column, -/// so its icon sat where every other row's *label* starts and the grid broke at the top. The -/// provider is what the column was missing: the one fact about the model its name does not say. +/// The column is sized to our own labels, so it has to seat the widest of them, a cost source's. #[test] -fn the_model_row_is_labeled_by_who_serves_it() { +fn the_label_column_seats_every_label() { + use luxe_core::usage::UsageSource; + let sources = [UsageSource::Agent, UsageSource::Review, UsageSource::Compaction]; + let labels = sources.iter().map(|source| source.label()).chain([ + UsageSource::CacheWarm.label(), + "provider", + "approvals", + ]); + for label in labels { + assert!(label.width() <= WIDEST_TELEMETRY_LABEL, "{label} is wider than the column"); + } +} + +/// The provider is a row of its own, label left and value right like every other row, directly +/// above the model it serves, and wears its own mark. +#[test] +fn the_provider_is_its_own_row_above_the_model() { let mut app = app(); app.status.model = "claude-sonnet-5".into(); app.status.provider = "anthropic".into(); let rendered: Vec = telemetry_lines(&app).iter().map(text).collect(); - let model = rendered.iter().find(|row| row.contains("claude-sonnet-5")).expect("a model"); - assert!(model.starts_with("anthropic"), "{model:?}"); + let model = rendered.iter().position(|row| row.contains("claude-sonnet-5")).expect("a model"); + assert!(rendered[model].starts_with("model "), "{:?}", rendered[model]); assert!( - model.ends_with(&crate::glyphs::icon_label(Icon::Model.glyph(), "claude-sonnet-5")), - "the value keeps its own mark: {model:?}" + rendered[model] + .ends_with(&crate::glyphs::icon_label(Icon::Model.glyph(), "claude-sonnet-5")), + "the value keeps its own mark: {:?}", + rendered[model] ); + let provider = &rendered[model - 1]; + let mark = crate::widgets::provider_icon("anthropic").glyph(); + assert!(provider.starts_with("provider "), "{provider:?}"); + assert!(provider.ends_with(&crate::glyphs::icon_label(mark, "anthropic")), "{provider:?}"); } -/// A provider longer than the column is cut rather than allowed to shove the value out of it — -/// provider ids are whatever a config names them, and the grid is the whole point of the block. +/// A provider longer than its value column is cut at the rail's edge, and keeps the column. #[test] -fn a_long_provider_is_cut_to_its_column() { +fn a_long_provider_is_cut_in_its_value_column() { let mut app = app(); app.status.model = "claude-sonnet-5".into(); - app.status.provider = "a-self-hosted-gateway".into(); + app.status.provider = "a-self-hosted-gateway-with-a-very-long-name".into(); let rendered: Vec = telemetry_lines(&app).iter().map(text).collect(); - let model = rendered.iter().find(|row| row.contains(Icon::Model.glyph())).expect("a model"); - let opens_at = model.find(Icon::Model.glyph()).expect("the value's mark"); + let provider = rendered.iter().find(|row| row.starts_with("provider")).expect("a provider"); + let value = provider.trim_start_matches("provider").trim_start(); assert_eq!( - UnicodeWidthStr::width(&model[..opens_at]), + UnicodeWidthStr::width(&provider[..provider.len() - value.len()]), TELEMETRY_LABEL_WIDTH, - "the value moved off its column: {model:?}" + "the value moved off its column: {provider:?}" ); + assert!(UnicodeWidthStr::width(provider.as_str()) <= DEFAULT_ROW, "{provider:?} overruns"); + assert!(!provider.contains("very-long-name"), "nothing was cut: {provider:?}"); } -/// A rail dragged wide gives the grid air and the provider its whole name; the default rail -/// keeps the column it has always had. +/// A rail dragged wide gives the grid air; the default rail keeps its floor. #[test] -fn a_wide_rail_widens_the_grid_and_seats_a_long_provider() { +fn a_wide_rail_widens_the_grid() { let mut app = app(); app.status.model = "claude-opus-5".into(); app.status.provider = "foundry-anthropic".into(); @@ -393,7 +407,7 @@ fn a_wide_rail_widens_the_grid_and_seats_a_long_provider() { telemetry_lines(app) .iter() .map(text) - .filter(|row| row.starts_with("foundry-anthropic") || row.starts_with("context")) + .filter(|row| row.starts_with("provider") || row.starts_with("context")) .map(|row| { let label = row.split_whitespace().next().unwrap_or_default().to_string(); let value = row[label.len()..].trim_start(); @@ -401,42 +415,35 @@ fn a_wide_rail_widens_the_grid_and_seats_a_long_provider() { }) .collect() }; - assert_eq!(value_column(&app), [TELEMETRY_LABEL_WIDTH; 2], "the default rail is unchanged"); + assert_eq!(value_column(&app), [TELEMETRY_LABEL_WIDTH; 2], "the default rail is the floor"); app.dock_rail.set(crate::workspace_layout::DOCK_MAX_WIDTH); let wide = value_column(&app); - assert_eq!(wide, [21; 2], "seventeen cells of provider, four of air, one grid: {wide:?}"); - - app.status.provider = "a-self-hosted-gateway-provider".into(); - let rendered: Vec = telemetry_lines(&app).iter().map(text).collect(); - assert!( - rendered.iter().any(|row| row.starts_with("a-self-hosted-gateway-provider ")), - "a wide rail seats the whole name: {rendered:?}" - ); - for row in &rendered { - assert!(UnicodeWidthStr::width(row.as_str()) <= row_width(&app), "{row:?} overruns"); - } + assert_eq!(wide, [WIDEST_TELEMETRY_LABEL + 4; 2], "four cells of air, one grid: {wide:?}"); } #[test] fn the_label_column_grows_only_where_there_is_room() { - assert_eq!(telemetry_label_width(40, 17), TELEMETRY_LABEL_WIDTH); - assert_eq!(telemetry_label_width(40, 30), TELEMETRY_LABEL_WIDTH, "cut, as it always was"); + let widest = WIDEST_TELEMETRY_LABEL; + assert_eq!(telemetry_label_width(40, widest), TELEMETRY_LABEL_WIDTH); + assert_eq!(telemetry_label_width(40, 30), 16, "never past two fifths of the row"); assert_eq!(telemetry_label_width(78, 8), TELEMETRY_LABEL_WIDTH, "short labels keep the floor"); - assert_eq!(telemetry_label_width(78, 17), 21); + assert_eq!(telemetry_label_width(78, widest), widest + 4); assert_eq!(telemetry_label_width(78, 60), 31, "never past two fifths of the row"); } -/// Before the engine has said anything there is no provider to name, and a blank label column -/// would leave the value sitting where no other row's value sits. +/// Before the engine has said anything there is no provider to name, so the row says `none` +/// rather than vanishing and moving every row under it. #[test] -fn a_model_with_no_provider_yet_still_labels_its_row() { +fn a_model_with_no_provider_yet_keeps_its_rows() { let mut app = app(); app.status.model = "claude-sonnet-5".into(); let rendered: Vec = telemetry_lines(&app).iter().map(text).collect(); - let model = rendered.iter().find(|row| row.contains("claude-sonnet-5")).expect("a model"); - assert!(model.starts_with("model"), "{model:?}"); + let model = rendered.iter().position(|row| row.contains("claude-sonnet-5")).expect("a model"); + assert!(rendered[model].starts_with("model"), "{:?}", rendered[model]); + assert!(rendered[model - 1].starts_with("provider"), "{rendered:?}"); + assert!(rendered[model - 1].ends_with("none"), "{rendered:?}"); } /// One block for what the session consumed, so the window is not a section of its own. diff --git a/crates/luxe-tui/src/view/frame_pins.txt b/crates/luxe-tui/src/view/frame_pins.txt index 775cdda..c91d05c 100644 --- a/crates/luxe-tui/src/view/frame_pins.txt +++ b/crates/luxe-tui/src/view/frame_pins.txt @@ -13,61 +13,61 @@ DashboardMinimal@64x20: frame=939001adda3bcbb4 hits=0f39b6e30d251353 Configuration@140x44: frame=73fbef3e76d36c7c hits=03493dafb9356d07 Configuration@100x30: frame=644345f8e6340004 hits=04d865ae91d0aa35 Configuration@64x20: frame=28ea511ad251f8c2 hits=77b9c8af75245265 -Setup@140x44: frame=d61d62a149232446 hits=36aaf8db347382c4 -Setup@100x30: frame=1a7c35ff007f3aef hits=2d10b9f0a226a5e0 -Setup@64x20: frame=2df799477067503a hits=1b0ef6d44f0cf1bd -SetupTools@140x44: frame=7f80f916b3e06e49 hits=2c443d3127ccc230 -SetupTools@100x30: frame=1985e10dacdabc20 hits=ee965f337121049c -SetupTools@64x20: frame=8b216818fd028690 hits=a19d86f6dbe23c71 -Settings@140x44: frame=fe898302ba994a90 hits=cd87fca5b2ba4ec8 -Settings@100x30: frame=91f4280764fa0bd6 hits=375d168bbed52454 -Settings@64x20: frame=d476c9a9f087e724 hits=e62f026c0e6c2c68 -SettingsTools@140x44: frame=64c3ec0635cedb70 hits=da22dfea81800160 -SettingsTools@100x30: frame=d2c93a7dd4398630 hits=a1f07d9572d622b1 -SettingsTools@64x20: frame=013360d54995a40d hits=b6f0fa676ba137f1 -ChatIdle@140x44: frame=659adbd49eb40384 hits=9a0a159710153729 +Setup@140x44: frame=9ee06904109e2e42 hits=4967dcab05ea9bae +Setup@100x30: frame=66763485ecbb7edd hits=f82015c482806682 +Setup@64x20: frame=b57b7459a02ec4d2 hits=2805bc66d9d1fb97 +SetupTools@140x44: frame=62fcaf1fe8de1c29 hits=fe46e4a47674954c +SetupTools@100x30: frame=405fbeeafe01e8d3 hits=3956f37fd5c677ba +SetupTools@64x20: frame=85a5e02524e92762 hits=1671b40783b4805f +Settings@140x44: frame=0509bf03eebc60b0 hits=1fbfce715d19422f +Settings@100x30: frame=39045d87eeb5db36 hits=2f6854de9f605c01 +Settings@64x20: frame=125e6bc55b79d4a0 hits=f39d9d6dc36254de +SettingsTools@140x44: frame=6d10321950d2e310 hits=6616bccda6cac2cb +SettingsTools@100x30: frame=271c31ac292537cf hits=a88a7c38aea25a39 +SettingsTools@64x20: frame=dcdf73ac9e80be44 hits=56896b2217e7b7f8 +ChatIdle@140x44: frame=8f3a6a0a2f0b92d2 hits=a0cf286ea7fd1d55 ChatIdle@100x30: frame=37277ebdbb0d0104 hits=f28115f769459349 ChatIdle@64x20: frame=d5330f1c309a6918 hits=1fd57df076a5e100 -ChatThinking@140x44: frame=914d2bbef64e8920 hits=57dd670de9e41750 +ChatThinking@140x44: frame=cb85f56ee191ef52 hits=57dd670de9e41750 ChatThinking@100x30: frame=713f52d8af6e9871 hits=91183601e552563c ChatThinking@64x20: frame=8552649903cdc808 hits=eb606a4e4cfb053a -ChatStreaming@140x44: frame=c7896b8809869a65 hits=06bab310faee6d54 +ChatStreaming@140x44: frame=ba8453d7ed81f1c7 hits=06bab310faee6d54 ChatStreaming@100x30: frame=cc3ae2d95405065a hits=c63f95971c6a18fc ChatStreaming@64x20: frame=970c22c578c362aa hits=a16a29ea4502d9fb -ChatTools@140x44: frame=d25d186d4f95cc4e hits=db1de58363be363c +ChatTools@140x44: frame=bbdd9c65f51351f8 hits=db1de58363be363c ChatTools@100x30: frame=7cd8b091af2f6451 hits=9d228eaa9af30b84 ChatTools@64x20: frame=0233bef5bd8bc8b0 hits=9b2b3231b63926ce -ChatCardBodies@140x44: frame=758842a9d0e7c640 hits=0c7b7867a8415fd2 +ChatCardBodies@140x44: frame=2eb2cc123501a3b2 hits=0c7b7867a8415fd2 ChatCardBodies@100x30: frame=d1c442c5eaa6af7c hits=434a845e1880132c ChatCardBodies@64x20: frame=5638628d5920489e hits=328a37efc8b251f0 -ChatWideProse@140x44: frame=766695a5e1a4e777 hits=94dbf7b32b37b330 +ChatWideProse@140x44: frame=115e6bb44eef9beb hits=94dbf7b32b37b330 ChatWideProse@100x30: frame=4ffb6880f5abff90 hits=bddfef30519a2a3a ChatWideProse@64x20: frame=d2f917fcaa50aeca hits=b3b75080bd6ccea1 -ChatToolError@140x44: frame=1d2febb26904d212 hits=0247483feb740b19 +ChatToolError@140x44: frame=205e8b9d2ec06764 hits=0247483feb740b19 ChatToolError@100x30: frame=bf5d84f32dfbbe41 hits=e17adbd05e6a6d3b ChatToolError@64x20: frame=329c49dd3a8bdd5d hits=e4e4f40e90cb3bca -ChatToolRun@140x44: frame=c68d55e2d8b22582 hits=f1514e1cf2ab0514 +ChatToolRun@140x44: frame=23a4d42a0f8ad56c hits=f1514e1cf2ab0514 ChatToolRun@100x30: frame=94c5a5920231ad6d hits=ed4e206d929f1002 ChatToolRun@64x20: frame=b58a55ad577d37b3 hits=116fb38474c732bb -ChatQuestion@140x44: frame=15b112dccad9caa1 hits=3d24e8bf8375f597 +ChatQuestion@140x44: frame=4854f6da0d4e8bed hits=3d24e8bf8375f597 ChatQuestion@100x30: frame=089f5cfe357b006e hits=0f98bb30ff5537bf ChatQuestion@64x20: frame=78a535c57f876301 hits=7681468669569173 -ChatPlan@140x44: frame=9df66741fe062711 hits=7796221e13dac2ac +ChatPlan@140x44: frame=c7cc574df002e27c hits=d76108ca7f13f116 ChatPlan@100x30: frame=d61c241010275e79 hits=79c1409c0f886542 ChatPlan@64x20: frame=97082e9d92c7616d hits=cb490269d9d6b6d3 -ChatPlanReady@140x44: frame=b18f1105c54ae15f hits=23da509548f232f0 +ChatPlanReady@140x44: frame=b30ca9958f2cad32 hits=23da509548f232f0 ChatPlanReady@100x30: frame=7e20e1b0a94d94b3 hits=b7ea73f584bfc4ef ChatPlanReady@64x20: frame=0e3d9399fae48508 hits=f077305e4d966dff -ChatTurn@140x44: frame=5524de78f71527eb hits=4a67edb8228eb613 +ChatTurn@140x44: frame=b45b4bb827842816 hits=4a67edb8228eb613 ChatTurn@100x30: frame=22919d1047132c86 hits=b8ded94d236c0817 ChatTurn@64x20: frame=91595c7c8fb3a9de hits=bc965e96875bbfe6 -ChatPermission@140x44: frame=54ddeb5522ffcb19 hits=063b591e442cd221 +ChatPermission@140x44: frame=8289b864f67fe472 hits=063b591e442cd221 ChatPermission@100x30: frame=b2c0e21530b64523 hits=200049ec7749eeb8 ChatPermission@64x20: frame=9f98f5664f85406f hits=abbd7bfaa97a4ed0 -ChatPalette@140x44: frame=3022f8834ce418f2 hits=bf9355f178f8e332 -ChatPalette@100x30: frame=cacc9b3e033c0401 hits=eae72d9c1c194fee -ChatPalette@64x20: frame=085c324962ef0357 hits=888344c2d380ae7f -ChatScreenshot@140x44: frame=5aec1b106f841d81 hits=1489393a2950d711 +ChatPalette@140x44: frame=19faed2faa7a9b54 hits=40cfef8a8401b132 +ChatPalette@100x30: frame=2ceacd7336e193e2 hits=c4aaaf53ba134bb2 +ChatPalette@64x20: frame=ca770995ab283020 hits=23d605e8cac60ffe +ChatScreenshot@140x44: frame=40919b4019a285d8 hits=1489393a2950d711 ChatScreenshot@100x30: frame=709f9e4b32a7c8f6 hits=f8537762de7b55a2 ChatScreenshot@64x20: frame=0a22c420e0e4092e hits=1e33d25e6f2a5032 GuidedReviewError@140x44: frame=4cfe3be8529e0715 hits=e84eb4945912e2b4 @@ -145,28 +145,28 @@ GuidedReviewNoise@64x20: frame=3528c31dc7357be3 hits=31b20cc44e89c2c4 GuidedReviewRefreshing@140x44: frame=1668abd1d9025883 hits=9df927e0266ef722 GuidedReviewRefreshing@100x30: frame=4317b6bf215040e7 hits=295bff8546ac5c6b GuidedReviewRefreshing@64x20: frame=09ab7d15dbf61722 hits=7bc94e825dcae38d -SessionPicker@140x44: frame=912f8377d1180acc hits=9ff439d2a4207bb1 -SessionPicker@100x30: frame=88899dac0687cbcc hits=1b25f7bbb1167a3d -SessionPicker@64x20: frame=f83d9954bc28b0a4 hits=e1458e2ef219e1d3 -ChatPending@140x44: frame=5ff40dac179e081a hits=d71099c1d790fd9d +SessionPicker@140x44: frame=912f8377d1180acc hits=a8942d3fdbcd05fa +SessionPicker@100x30: frame=88899dac0687cbcc hits=245cbe04c33898e1 +SessionPicker@64x20: frame=054360868f390170 hits=4bf7f0b37b2cfe0e +ChatPending@140x44: frame=b3d3a6a0888d6dcc hits=bffa58bed6da097d ChatPending@100x30: frame=af25fbea80bc33e0 hits=aed87b5034e6d516 ChatPending@64x20: frame=6cf055d281a6e059 hits=a326dcaa5154d3d5 -ChatPaste@140x44: frame=a8d0b4eb15876387 hits=c7b811a92cf2a0be +ChatPaste@140x44: frame=a114c31fca3067b3 hits=fdaff3e47dccb21c ChatPaste@100x30: frame=1bc91697dbb32003 hits=ab8dbf94c139d6b6 ChatPaste@64x20: frame=9a087a91b9e245db hits=c81a12575eed6a9b -DockWide@140x44: frame=64c9fcc0a72267ba hits=d1b078de1c2ba7f1 +DockWide@140x44: frame=1dbfc5a41a3416b6 hits=a826df811d38f497 DockWide@100x30: frame=690c39c8c1842982 hits=dab83cf7c7b0dcf4 DockWide@64x20: frame=c2743913ce96feb2 hits=9a683e49f6050f6a -DockPullRequest@140x44: frame=a72cb3bc1796768d hits=3b00f944c7d994d9 +DockPullRequest@140x44: frame=6a0782c8b8f2ea02 hits=3d025fbcee7cebb1 DockPullRequest@100x30: frame=d9977f7217a61374 hits=0ca570204cd54d62 DockPullRequest@64x20: frame=5f381b5f389b3bbf hits=8defa6fb47bd7b1c -DockOverlay@140x44: frame=64c9fcc0a72267ba hits=d1b078de1c2ba7f1 +DockOverlay@140x44: frame=1dbfc5a41a3416b6 hits=a826df811d38f497 DockOverlay@100x30: frame=690c39c8c1842982 hits=dab83cf7c7b0dcf4 DockOverlay@64x20: frame=c2743913ce96feb2 hits=9a683e49f6050f6a -DockCompact@140x44: frame=64c9fcc0a72267ba hits=d1b078de1c2ba7f1 +DockCompact@140x44: frame=1dbfc5a41a3416b6 hits=a826df811d38f497 DockCompact@100x30: frame=690c39c8c1842982 hits=dab83cf7c7b0dcf4 DockCompact@64x20: frame=c2743913ce96feb2 hits=9a683e49f6050f6a -ChangesWide@140x44: frame=975a9cb87847b355 hits=5d6424db7af8b13b +ChangesWide@140x44: frame=a97fe98d1e004a98 hits=f56f82edef818dc4 ChangesWide@100x30: frame=7f799b893667c928 hits=5ebcfa50c83c624f ChangesWide@64x20: frame=3531cf4c1d3f2402 hits=a39e334a4bdaa029 ChangesNarrow@140x44: frame=4d45021ad9fb0fa7 hits=de2158bdae6d8dfb @@ -178,12 +178,12 @@ ChangesFailed@64x20: frame=8d0caaba450a4f3a hits=e16f1ab1fbfea007 ChangesExternal@140x44: frame=fc75aaae10ddb262 hits=d5c3115642e748ad ChangesExternal@100x30: frame=522c8250b0f50ac4 hits=3dd17e6200cfb4b5 ChangesExternal@64x20: frame=d257ba5dbedfc85f hits=a8e0be5b4625e2bc -ChatTools+palette: frame=85cc5ae977de2fa6 hits=ca2a2a735278a5bd -ChatTools+slash: frame=a3ce4c3a7d03f8d0 hits=8adf06de80ecdcb2 -ChatTools+mention: frame=33c4a73f189a3dcc hits=c1b8d78b51a767b7 +ChatTools+palette: frame=c829d2f08b78c950 hits=fa6287559ab11768 +ChatTools+slash: frame=994b21c60891c86e hits=c2817c90b9b6135b +ChatTools+mention: frame=33c4a73f189a3dcc hits=a2bdd891f205d6cd ChatTools+model: frame=98b419f1ad7ab1ea hits=c1b8d78b51a767b7 ChatTools+thinking: frame=3f2738927b6db1ef hits=b78e78ebc5c1a7dc -ChatTools+theme: frame=1b1a5f40ea00f08f hits=a38042688ec71863 +ChatTools+theme: frame=1b1a5f40ea00f08f hits=a78b8d6b414df96c ChatTools+auth: frame=3a06199e21845eef hits=c1b8d78b51a767b7 ChatTools+permission: frame=95b9f5bbdfe1bf17 hits=e455918b91b5d273 ChatTools+question: frame=c49b4cf700798f0d hits=c4d62e93c9c4be28 @@ -197,11 +197,11 @@ ChatTools+configuration: frame=644345f8e6340004 hits=04d865ae91d0aa35 ChatTools+image: frame=43dd64619ec6ac3d hits=0c880222e467f603 ChatTools+keys: frame=d3c4357fcb28c0cd hits=c1b8d78b51a767b7 Dashboard+palette: frame=c30b575f2402e1d9 hits=de7bc67135fb88ec -Dashboard+slash: frame=bd9dfaabce289d81 hits=452e35ccd107d1e3 -Dashboard+mention: frame=6091ee9a8ba6bb8e hits=2178ca57f0b3cfd3 +Dashboard+slash: frame=1972225550a37fa3 hits=7bc21f0311a1f171 +Dashboard+mention: frame=6091ee9a8ba6bb8e hits=3f150d5f4decbee7 Dashboard+model: frame=94b31acf2a644906 hits=de7bc67135fb88ec Dashboard+thinking: frame=2e4f1d6cde8c3b6d hits=f64c038377072b2b -Dashboard+theme: frame=186de30e37569285 hits=0fea45d2fc373428 +Dashboard+theme: frame=186de30e37569285 hits=6ae67c6c9fb14fcd Dashboard+auth: frame=c30b575f2402e1d9 hits=de7bc67135fb88ec Dashboard+permission: frame=c30b575f2402e1d9 hits=de7bc67135fb88ec Dashboard+question: frame=c30b575f2402e1d9 hits=de7bc67135fb88ec @@ -218,11 +218,11 @@ ChatWideProse scrolled: frame=763f6da386997546 hits=3836f0941803048a ChatWideProse searching: frame=1878156c08a54641 hits=00e988aa75182c51 ChatWideProse selecting: frame=8c1edde42c1f3700 hits=bddfef30519a2a3a ChatWideProse copied: frame=7757bb42f647c93e hits=bddfef30519a2a3a -ChangesWide@180x44: frame=2f39ea02da654a31 hits=e9b01340cccc666e +ChangesWide@180x44: frame=9bbe81ca767acba8 hits=c9c1021bb64d2d75 ChangesNarrow unwrapped: frame=13da9745cf50215c hits=c84985bf30e3251e -ChangesWide file: frame=4292536a789062da hits=da530d7bf2c94fdf -ChangesWide file cursor: frame=aacfd7dfe8f072f0 hits=6293b97445fe71a6 -ChangesWide file unwrapped: frame=cbf79ee6830376c5 hits=316acbdf05625e0b +ChangesWide file: frame=1194fa59f8ea5db3 hits=36477f2310641d0c +ChangesWide file cursor: frame=833f03816b3313b1 hits=897bb2fabe0e82c5 +ChangesWide file unwrapped: frame=3617d8bccfa68b3c hits=f64a48041a46cec2 review help@140x44: frame=ce6ecfdcf523a173 hits=363734d0f1e4973a review help@100x30: frame=f556ce437bd29e48 hits=e4ef9f77a3045de7 review details@140x44: frame=74d4463801d34480 hits=5c309ee031fdabbc @@ -246,9 +246,9 @@ GuidedReviewSplit wrapped: frame=744f32f79e0e2cdb hits=0f089258f4d432e1 GuidedReviewFindings wrapped: frame=b633d879925abb7d hits=6dbae16ee902d2ad GuidedReviewFindings split: frame=0ca567ccbed0b3c4 hits=ed78edfc97c588fe GuidedReviewFindings split wrapped: frame=198214cf1a5d51f4 hits=a1ef3e921a2f268b -login@100x30: frame=b38ac40b582acab9 hits=fe653c5a7d02c41e -login-subscription@100x30: frame=d0d2a22124d02530 hits=57ef1e7d5ac5daaf -login-local@100x30: frame=2e2797e9080feb20 hits=9d3e38903152bd40 +login@100x30: frame=b38ac40b582acab9 hits=95ec927979b30d8d +login-subscription@100x30: frame=e124818a2e734350 hits=5676dba97e0ea37f +login-local@100x30: frame=2e2797e9080feb20 hits=ee2b62ff5ee571b4 login-method@100x30: frame=25f0337c7e66d84b hits=d7190c558c1be1a3 login-secret@100x30: frame=8e5caa0414d23337 hits=b05996f46f500728 login-device@100x30: frame=9678dcaabe255bf8 hits=4f495f0ab9ddfec4 @@ -261,16 +261,16 @@ github-draft@100x30: frame=4422c33d0017af09 hits=6ce218f729777fd8 github-issue@100x30: frame=e3d564c4eef215f3 hits=6ce218f729777fd8 github-pulls@100x30: frame=cac8411b28b1f011 hits=6ce218f729777fd8 github-merged@100x30: frame=e82ed89a22ea11e1 hits=6ce218f729777fd8 -mention-files-query@100x30: frame=2eb05c671dab8ebc hits=94f686e59ecfd850 -mention-files-status@100x30: frame=a7d9e3d29bb40d91 hits=93e4a8d7ebc91b2b -mention-skills@100x30: frame=6e6877b6dd409095 hits=47910cf92223c731 -mention-mcp@100x30: frame=038a9d5361f2bc2f hits=0cef6f71d501ed1c -mention-jira@100x30: frame=f640a573307765d3 hits=47910cf92223c731 -mention-github@100x30: frame=026d8b9a16953d45 hits=c3ebc406964da748 -mention-github-signed-out@100x30: frame=d1d8c82792308662 hits=b05996f46f500728 -login@64x20: frame=3b1d75fe18a971a0 hits=2b4df26313e3f401 -login-subscription@64x20: frame=36f5e865860fbdc2 hits=2d2883380c90c475 -login-local@64x20: frame=1e111e16e697b7d2 hits=7aff247fdf8c800d +mention-files-query@100x30: frame=2eb05c671dab8ebc hits=e6c3e66b46987af2 +mention-files-status@100x30: frame=91f8455b4baf0148 hits=7757c43a2fec458b +mention-skills@100x30: frame=6e6877b6dd409095 hits=27fb10f91fed61ab +mention-mcp@100x30: frame=038a9d5361f2bc2f hits=0c089633a27c8ae2 +mention-jira@100x30: frame=f640a573307765d3 hits=27fb10f91fed61ab +mention-github@100x30: frame=026d8b9a16953d45 hits=e23658383d089fb6 +mention-github-signed-out@100x30: frame=d1d8c82792308662 hits=21234e7842378b16 +login@64x20: frame=3b1d75fe18a971a0 hits=c63cd0e65b0b73cd +login-subscription@64x20: frame=9f51f8338dd333a2 hits=faeb76f2da50194c +login-local@64x20: frame=1e111e16e697b7d2 hits=cf1a97c489a227e5 login-method@64x20: frame=c0818a1d2ffab01b hits=d068b54bba55b395 login-secret@64x20: frame=f7cb80562502782e hits=a16a29ea4502d9fb login-device@64x20: frame=d61ec0dc1534f2a5 hits=44ef8648f0a8302d @@ -283,10 +283,10 @@ github-draft@64x20: frame=9d8959251dd7d83d hits=7c38e58fb5f36453 github-issue@64x20: frame=8add8ff54baf5a03 hits=7c38e58fb5f36453 github-pulls@64x20: frame=b3b0eb63f8cd945a hits=7c38e58fb5f36453 github-merged@64x20: frame=a84ad5ca4b5dee92 hits=7c38e58fb5f36453 -mention-files-query@64x20: frame=da23adbd6c69989c hits=a584b39e65ff3032 -mention-files-status@64x20: frame=a0e536dce3f224a9 hits=65b02333eb73a649 -mention-skills@64x20: frame=1de91f817235caaa hits=8c5d9faebecd685a -mention-mcp@64x20: frame=c7116499ec2e6de7 hits=d672d83176bdf2cf -mention-jira@64x20: frame=7c4e7cbbf9dfbfe4 hits=8c5d9faebecd685a -mention-github@64x20: frame=38344f549d6e1c2f hits=d672d83176bdf2cf -mention-github-signed-out@64x20: frame=cfdc0449ca9d0350 hits=a16a29ea4502d9fb +mention-files-query@64x20: frame=da23adbd6c69989c hits=b7e5cd3a9d5b2844 +mention-files-status@64x20: frame=b8032fcc39098b20 hits=93543fda718d1960 +mention-skills@64x20: frame=1de91f817235caaa hits=907bb533764c9348 +mention-mcp@64x20: frame=c7116499ec2e6de7 hits=b0a66af049a2990d +mention-jira@64x20: frame=7c4e7cbbf9dfbfe4 hits=907bb533764c9348 +mention-github@64x20: frame=38344f549d6e1c2f hits=b0a66af049a2990d +mention-github-signed-out@64x20: frame=cfdc0449ca9d0350 hits=9a375098c9c3f3e9 diff --git a/crates/luxe-tui/src/view/guided_review.rs b/crates/luxe-tui/src/view/guided_review.rs index 46c09ef..ed41463 100644 --- a/crates/luxe-tui/src/view/guided_review.rs +++ b/crates/luxe-tui/src/view/guided_review.rs @@ -78,7 +78,7 @@ fn render_rail_divider(frame: &mut Frame, area: Rect, guide: Rect, app: &App) { /// Renders the dedicated full-screen Guided Review source state. pub(super) fn render(frame: &mut Frame, inner: Rect, app: &App) { // Borderless surface: a dock-style left rail carries the review metadata and Guide, divided - // from the content pane by a single rule — no outer frame, matching the rest of Luxe. The + // from the content pane by a single rule — no outer frame, matching the rest of luxe. The // metadata lives in the rail (wide) or the context header (medium/narrow). if !app.guided_review_workspace.settle_surface(inner.width >= 40 && inner.height >= 5) { render_minimum_size(frame, inner, app); diff --git a/crates/luxe-tui/src/view/guided_review/brief/notices.rs b/crates/luxe-tui/src/view/guided_review/brief/notices.rs index 57b1efc..46b0910 100644 --- a/crates/luxe-tui/src/view/guided_review/brief/notices.rs +++ b/crates/luxe-tui/src/view/guided_review/brief/notices.rs @@ -97,7 +97,7 @@ fn work_done_outside(app: &App) -> Option { } /// Whether the review has no record of the work that produced it (a base/commit review, or a -/// working tree Luxe did not write). +/// working tree luxe did not write). fn no_provenance(review: &GuidedReview) -> bool { review.provenance.as_ref().is_none_or(|provenance| { provenance.commands.is_empty() && provenance.written_paths.is_empty() diff --git a/crates/luxe-tui/src/view/guided_review/context/summary.rs b/crates/luxe-tui/src/view/guided_review/context/summary.rs index 033ff93..41aadec 100644 --- a/crates/luxe-tui/src/view/guided_review/context/summary.rs +++ b/crates/luxe-tui/src/view/guided_review/context/summary.rs @@ -301,7 +301,7 @@ pub(super) fn feedback_tally( .partition(|finding| with_the_agent(session, &finding.id)); let to_verify = back.iter().filter(|finding| finding.state == FindingState::NeedsVerification).count(); - // Open and back from the agent: it answered, said it could not, or Luxe said it said nothing + // Open and back from the agent: it answered, said it could not, or luxe said it said nothing let to_read = back .iter() .filter(|finding| finding.state == FindingState::Open) diff --git a/crates/luxe-tui/src/view/guided_review/diff_render/annotations.rs b/crates/luxe-tui/src/view/guided_review/diff_render/annotations.rs index 0d83278..426006e 100644 --- a/crates/luxe-tui/src/view/guided_review/diff_render/annotations.rs +++ b/crates/luxe-tui/src/view/guided_review/diff_render/annotations.rs @@ -180,7 +180,7 @@ fn comment_reply_rows( let styles = &app.theme_styles; let mut rows = Vec::new(); // The last word that was not the reader's: the answer to a question belongs beside the - // question, not behind two overlays, and so does Luxe saying the agent left none + // question, not behind two overlays, and so does luxe saying the agent left none if let Some(reply) = finding.thread.iter().rev().find(|message| { message.author != luxe_core::guided_review::FindingMessageAuthor::Reviewer diff --git a/crates/luxe-tui/src/view/guided_review/feedback_window.rs b/crates/luxe-tui/src/view/guided_review/feedback_window.rs index b67a6d3..beed210 100644 --- a/crates/luxe-tui/src/view/guided_review/feedback_window.rs +++ b/crates/luxe-tui/src/view/guided_review/feedback_window.rs @@ -279,7 +279,7 @@ fn preview_lines(app: &App, finding: &ReviewFinding) -> Vec> { let who = match message.author { FindingMessageAuthor::Reviewer => "You", FindingMessageAuthor::Agent => "The agent", - FindingMessageAuthor::System => "Luxe", + FindingMessageAuthor::System => "luxe", }; lines.push(Line::from(Span::styled(who, styles.muted))); lines.extend(crate::markdown::render_markdown(&message.body, styles)); diff --git a/crates/luxe-tui/src/view/guided_review/tests/feedback.rs b/crates/luxe-tui/src/view/guided_review/tests/feedback.rs index 31b4c9f..cb36c6e 100644 --- a/crates/luxe-tui/src/view/guided_review/tests/feedback.rs +++ b/crates/luxe-tui/src/view/guided_review/tests/feedback.rs @@ -321,7 +321,7 @@ fn a_comment_the_agent_replied_to_says_so_on_its_card() { assert!(text.contains("agent: Agent reported: not fixed."), "{text}"); } -/// A comment a fix turn ended with no word on says so on its card, with Luxe's reason under +/// A comment a fix turn ended with no word on says so on its card, with luxe's reason under /// it, rather than still claiming the agent is on it. #[test] fn a_comment_with_no_word_from_the_agent_says_so_on_its_card() { diff --git a/crates/luxe-tui/src/widgets.rs b/crates/luxe-tui/src/widgets.rs index 39d4181..28d0548 100644 --- a/crates/luxe-tui/src/widgets.rs +++ b/crates/luxe-tui/src/widgets.rs @@ -8,6 +8,7 @@ mod fit; mod gauge; mod language_glyph; mod panel; +mod provider_glyph; mod scrollbar; mod slab; pub(crate) mod text_field; @@ -28,7 +29,8 @@ pub use panel::{ code_spans, footed_body, key_hint, key_hint_row, panel_block, panel_title, panel_title_width, render_footed, render_footer, split_footer, titled_panel, FOOTER_ROWS, PANEL_BORDER_TYPE, }; -pub use scrollbar::{drag_offset, scrollbar, steered_scrollbar}; +pub(crate) use provider_glyph::provider_icon; +pub use scrollbar::{drag_offset, list_rows_width, list_scrollbar, scrollbar, steered_scrollbar}; pub use slab::{ badge, fade, idle_badge, ramp, selection_block, selection_row, selection_row_on, slab, Cap, Fade, FADE_CELLS, SELECTION_FRAME, SELECTION_INSET, SLAB_FRAME, diff --git a/crates/luxe-tui/src/widgets/language_glyph.rs b/crates/luxe-tui/src/widgets/language_glyph.rs index 86111fa..c0ee6a0 100644 --- a/crates/luxe-tui/src/widgets/language_glyph.rs +++ b/crates/luxe-tui/src/widgets/language_glyph.rs @@ -14,12 +14,12 @@ //! //! # Which languages are here //! -//! The ones Luxe is first-class in, which is not a taste judgment: every language with a default +//! The ones luxe is first-class in, which is not a taste judgment: every language with a default //! entry in `luxe-lsp`'s server registry or `luxe-dap`'s adapter registry earns a mark, and //! `every_first_class_language_has_a_mark` fails if one is added to either registry without one. //! On top of those sit the languages that show up in *answers* rather than in a project — //! `json`, `yaml`, `toml`, `markdown`, `html`, `css`, `sql`, `diff` — and a handful of common -//! others. Anything unrecognized keeps the generic [`GENERIC_LANGUAGE`] mark, because a fence Luxe +//! others. Anything unrecognized keeps the generic [`GENERIC_LANGUAGE`] mark, because a fence luxe //! has never heard of is still a fence. //! //! Spellings are folded rather than multiplied: `rs` is `rust`, `sh`/`zsh`/`shell` are `bash`, @@ -143,7 +143,7 @@ mod tests { use super::*; use crate::glyphs::GlyphTier; - /// The languages Luxe ships a language server or a debug adapter for. Read off + /// The languages luxe ships a language server or a debug adapter for. Read off /// `luxe-lsp/src/default-lsp-servers.json` and `luxe-dap/src/default-debug-adapters.json` /// rather than invented, so this list is a claim about the product and not about this file. const FIRST_CLASS: &[&str] = &[ @@ -163,7 +163,7 @@ mod tests { "c", ]; - /// A language Luxe can run a server or a debugger for is one it claims to know, so a fence in + /// A language luxe can run a server or a debugger for is one it claims to know, so a fence in /// it must not fall back to the generic mark. Add an entry to either registry without one here /// and this is what says so. #[test] diff --git a/crates/luxe-tui/src/widgets/provider_glyph.rs b/crates/luxe-tui/src/widgets/provider_glyph.rs new file mode 100644 index 0000000..224d021 --- /dev/null +++ b/crates/luxe-tui/src/widgets/provider_glyph.rs @@ -0,0 +1,90 @@ +//! provider_glyph — which mark the provider serving a model wears. +//! +//! The provider's id is written beside the mark, so the mark is shine, the same job +//! [`super::language_glyph`] does for a code fence. Only the providers with a mark in the Nerd Font +//! set get one; the rest share [`Icon::Provider`], because a made-up shape for a brand is worse +//! than a plain one. +//! +//! A gateway wears the gateway's mark, not the model maker's: `foundry-anthropic` is served by +//! Microsoft, and the dock row is about who serves the model. The model's own name says who made it. + +use crate::glyphs::{brands, Icon}; + +/// The mark for `provider`, as the dock draws it now. +/// +/// OpenAI, Anthropic and Copilot have marks only the newest Nerd Fonts carry, so where no font on +/// the machine has them they fall back to a mark every v3 font does. +pub(crate) fn provider_icon(provider: &str) -> Icon { + let icon = provider_brand(&provider.to_ascii_lowercase()); + match brands() { + true => icon, + false => older_font_mark(icon), + } +} + +/// The brand mark for a lowercased provider id, whatever the font has. +fn provider_brand(provider: &str) -> Icon { + match provider { + "openai" => Icon::ProviderOpenAi, + "anthropic" => Icon::ProviderAnthropic, + "github-copilot" | "copilot" => Icon::ProviderCopilot, + "google" | "gemini" | "google-gemini" | "google-vertex" | "vertex" => Icon::ProviderGoogle, + "bedrock" | "amazon-bedrock" | "aws" => Icon::ProviderAws, + id if id == "azure" || id.starts_with("azure-") || id.starts_with("foundry") => { + Icon::ProviderAzure + } + _ => Icon::Provider, + } +} + +/// What a recent brand mark becomes in a font from before it: Copilot keeps GitHub's mark, the +/// rest the generic one. +fn older_font_mark(icon: Icon) -> Icon { + match icon { + Icon::ProviderCopilot => Icon::GitHub, + Icon::ProviderOpenAi | Icon::ProviderAnthropic => Icon::Provider, + other => other, + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::glyphs::RECENT_BRANDS; + + #[test] + fn known_providers_wear_their_own_brand() { + assert_eq!(provider_brand("openai"), Icon::ProviderOpenAi); + assert_eq!(provider_brand("anthropic"), Icon::ProviderAnthropic); + assert_eq!(provider_brand("github-copilot"), Icon::ProviderCopilot); + assert_eq!(provider_brand("google"), Icon::ProviderGoogle); + assert_eq!(provider_brand("bedrock"), Icon::ProviderAws); + } + + /// A gateway is who serves the model, so `foundry-anthropic` is Azure's, not Anthropic's. + #[test] + fn a_gateway_wears_the_gateways_mark() { + for id in ["foundry-anthropic", "foundry-openai", "foundry", "azure", "azure-foundry"] { + assert_eq!(provider_brand(id), Icon::ProviderAzure, "{id}"); + } + assert_eq!(provider_brand("azurely"), Icon::Provider, "a prefix, not a substring"); + } + + #[test] + fn a_provider_with_no_mark_gets_the_generic_one() { + for id in ["deepseek", "zai", "openrouter", "ollama", "mistral", ""] { + assert_eq!(provider_brand(id), Icon::Provider, "{id}"); + } + } + + /// Every recent brand has a fallback that is not itself a recent brand, so an older font never + /// draws a box for one. + #[test] + fn an_older_font_never_meets_a_recent_brand() { + for icon in RECENT_BRANDS { + assert!(!RECENT_BRANDS.contains(&older_font_mark(*icon)), "{icon:?}"); + } + assert_eq!(older_font_mark(Icon::ProviderCopilot), Icon::GitHub); + assert_eq!(older_font_mark(Icon::ProviderGoogle), Icon::ProviderGoogle); + } +} diff --git a/crates/luxe-tui/src/widgets/scrollbar.rs b/crates/luxe-tui/src/widgets/scrollbar.rs index da5d469..61f3551 100644 --- a/crates/luxe-tui/src/widgets/scrollbar.rs +++ b/crates/luxe-tui/src/widgets/scrollbar.rs @@ -71,6 +71,31 @@ pub fn steered_scrollbar( scrollbar(frame, area, offset, total, viewport, styles); } +/// Publishes `rows` as `list`'s wheel region and, when the list runs past them, draws its steered +/// bar down their last column. +/// +/// The region covers the rows even when everything fits, so a notch over a short list moves its +/// cursor rather than scrolling the transcript behind the modal. `top` is the first line drawn and +/// `total` the lines there are, a rule included. +pub fn list_scrollbar( + frame: &mut Frame, + hit: &mut crate::mouse::HitRegions, + rows: Rect, + list: crate::mouse::OverlayList, + (top, total): (usize, usize), + styles: &ThemeStyles, +) { + let region = crate::mouse::ScrollRegionId::OverlayList(list); + hit.push_scroll(rows, region); + steered_scrollbar(frame, hit, rows, region, top, total, usize::from(rows.height), styles); +} + +/// The columns a list's rows keep beside its bar: one less when it scrolls, so no row sits half +/// under the bar and a press on the track never lands on a row. +pub fn list_rows_width(width: u16, total: usize, viewport: u16) -> u16 { + width.saturating_sub(u16::from(total > usize::from(viewport))) +} + /// What [`ScrollbarState`] has to be told the content is, to park the thumb at the end of the /// track on the last offset. /// diff --git a/crates/luxe-tui/src/workspace_dock/sections/tests.rs b/crates/luxe-tui/src/workspace_dock/sections/tests.rs index 8cc1093..1606c04 100644 --- a/crates/luxe-tui/src/workspace_dock/sections/tests.rs +++ b/crates/luxe-tui/src/workspace_dock/sections/tests.rs @@ -385,7 +385,7 @@ fn staying_inside_the_project_shows_no_elsewhere_section() { } /// The two kinds of place are not interchangeable: one is backed by Git and one by the record -/// of what Luxe itself touched, and the branch is what tells them apart on screen. +/// of what luxe itself touched, and the branch is what tells them apart on screen. #[test] fn external_groups_keep_the_witness_that_backs_them() { let mut snapshot = snapshot(); diff --git a/crates/luxe-tui/src/workspace_layout.rs b/crates/luxe-tui/src/workspace_layout.rs index 0b3daca..8d54a38 100644 --- a/crates/luxe-tui/src/workspace_layout.rs +++ b/crates/luxe-tui/src/workspace_layout.rs @@ -21,16 +21,16 @@ pub const CONTEXT_DOCK_WIDTH: u16 = LEFT_RAIL_WIDTH; /// The divider between side-by-side conversation and dock surfaces. pub const CONTEXT_DOCK_SEPARATOR_WIDTH: u16 = 1; -/// Cells a surface keeps between itself and a rule Luxe drew beside it. +/// Cells a surface keeps between itself and a rule luxe drew beside it. const INNER_GUTTER: u16 = 1; -/// `rect`, inset by a column on each side that faces something Luxe drew, and flush on each side +/// `rect`, inset by a column on each side that faces something luxe drew, and flush on each side /// that sits on an edge of `frame`. /// -/// The two edges are different questions. A rule Luxe owns needs a column of air or text runs +/// The two edges are different questions. A rule luxe owns needs a column of air or text runs /// into it. The terminal's edge does not: air there is a column the reader doesn't get, and a /// host with chrome of its own (herdr draws its tab row flush to the pane's left edge) would -/// disagree with Luxe about where the content starts. Every surface that touches an edge insets +/// disagree with luxe about where the content starts. Every surface that touches an edge insets /// through here, so the answer lives in one place. /// /// Degenerate widths collapse the rect rather than wrapping, matching @@ -319,7 +319,7 @@ mod tests { assert_eq!(compact.conversation_width, 78); } - /// The terminal's edge is drawn flush; a side facing something Luxe drew keeps its air. + /// The terminal's edge is drawn flush; a side facing something luxe drew keeps its air. #[test] fn a_gutter_tells_the_terminal_edge_from_one_luxe_drew() { let frame = Rect::new(0, 0, 100, 40); diff --git a/crates/luxe-tui/tests/clipboard_live.rs b/crates/luxe-tui/tests/clipboard_live.rs index 433a902..bb955b6 100644 --- a/crates/luxe-tui/tests/clipboard_live.rs +++ b/crates/luxe-tui/tests/clipboard_live.rs @@ -40,5 +40,5 @@ async fn a_copy_is_readable_by_the_wayland_clipboard() { .await .expect("wl-paste runs"); let pasted = String::from_utf8_lossy(&pasted.stdout).to_string(); - assert_eq!(pasted, payload, "the Wayland clipboard must hold what Luxe just copied"); + assert_eq!(pasted, payload, "the Wayland clipboard must hold what luxe just copied"); } diff --git a/crates/luxe-tui/tests/frame_gutter.rs b/crates/luxe-tui/tests/frame_gutter.rs index 33af445..06c0911 100644 --- a/crates/luxe-tui/tests/frame_gutter.rs +++ b/crates/luxe-tui/tests/frame_gutter.rs @@ -1,8 +1,8 @@ -//! Frame gutter — where Luxe draws relative to the edges it meets. +//! Frame gutter — where luxe draws relative to the edges it meets. //! -//! The terminal's edge gets no air: Luxe draws flush to it and uses every column it was given, +//! The terminal's edge gets no air: luxe draws flush to it and uses every column it was given, //! which also lines it up with a host that frames the pane (herdr's tab row starts flush at the -//! pane's left edge). A rule Luxe drew itself keeps a column of air on the side facing the text. +//! pane's left edge). A rule luxe drew itself keeps a column of air on the side facing the text. //! These tests pin both halves. use luxe_tui::app::{App, Msg}; @@ -51,7 +51,7 @@ fn luxe_draws_flush_to_both_terminal_edges() { assert!(inked(&buffer, buffer.area.width - 1), "the right edge is drawn on"); } -/// The inner gutter answers a different question — it keeps text off a rule Luxe owns — so it +/// The inner gutter answers a different question — it keeps text off a rule luxe owns — so it /// stays. Measured off the dock separator, the one edge both columns meet. #[test] fn the_column_beside_the_dock_keeps_its_air() { diff --git a/crates/luxe-tui/tests/glyph_tiers.rs b/crates/luxe-tui/tests/glyph_tiers.rs index 693515a..0c5bd48 100644 --- a/crates/luxe-tui/tests/glyph_tiers.rs +++ b/crates/luxe-tui/tests/glyph_tiers.rs @@ -302,7 +302,7 @@ fn no_surface_reaches_for_a_powerline_triangle_at_any_tier() { set_tier(GlyphTier::Nerd); } -/// The default has to be the look Luxe ships with, so a surface rendered without any resolution step +/// The default has to be the look luxe ships with, so a surface rendered without any resolution step /// is unchanged from before the tiers existed. #[test] fn the_untouched_default_is_the_nerd_vocabulary() { diff --git a/crates/luxe-tui/tests/render/dock.rs b/crates/luxe-tui/tests/render/dock.rs index 9a9251e..9a0c2b0 100644 --- a/crates/luxe-tui/tests/render/dock.rs +++ b/crates/luxe-tui/tests/render/dock.rs @@ -503,9 +503,9 @@ fn dock_footer_bottom_anchors_model_telemetry() { .expect("MODEL heading row"); // Identity stays at the top; telemetry sinks to the bottom near the composer. assert!(model_row > project_row, "telemetry should sit below identity: {content}"); - // Heading, model, thinking and mode, then SESSION's heading, context and cost + // Heading, provider, model, thinking and mode, then SESSION's heading, context and cost assert!( - model_row >= height - 7, + model_row >= height - 8, "telemetry should be bottom-anchored (row {model_row} of {height}): {content}" ); } diff --git a/crates/luxe-tui/tests/render/files.rs b/crates/luxe-tui/tests/render/files.rs index c263ed4..efad2d3 100644 --- a/crates/luxe-tui/tests/render/files.rs +++ b/crates/luxe-tui/tests/render/files.rs @@ -83,6 +83,64 @@ fn the_tree_lists_the_project_beside_its_changes() { assert!(content.contains("file00.rs"), "and the change, revealed: {content}"); } +/// Every listing request waiting in the queue, as (request, folder). +fn listing_requests( + rx: &mut tokio::sync::mpsc::Receiver, +) -> Vec<(luxe_core::project_files::ListingRequestId, String)> { + let mut asked = Vec::new(); + while let Ok(action) = rx.try_recv() { + if let luxe_core::engine::Action::ListDirectory { request_id, path, .. } = action { + asked.push((request_id, path)); + } + } + asked +} + +/// Lands `folders` as the listing of `path`, every entry a folder. +fn land_folders( + app: &mut App, + request_id: luxe_core::project_files::ListingRequestId, + path: &str, + folders: &[String], +) { + use luxe_core::project_files::{DirectoryEntry, DirectoryListing, EntryKind}; + let entries = folders + .iter() + .map(|name| DirectoryEntry { + name: name.clone(), + kind: EntryKind::Directory, + ignored: false, + }) + .collect(); + let listing = DirectoryListing { path: path.into(), entries, omitted: 0 }; + app.update(Msg::Engine(luxe_core::event::Event::DirectoryListed { request_id, listing })); +} + +/// A change in many folders asks for their listings a few at a time, and the rest follow as +/// answers land. +/// +/// The break this catches: every open folder asked for in one go, filling the engine's queue ahead +/// of the reader's own steer and flashing "the engine is busy" for work they never asked for. +#[test] +fn a_change_across_many_folders_asks_for_their_listings_a_few_at_a_time() { + let (mut app, mut rx) = create_app_with_engine(); + app.update(Msg::Engine(luxe_core::event::Event::WorkspaceUpdated(Box::new( + changed_workspace("tree-burst", 20), + )))); + let (root, _) = listing_requests(&mut rx).pop().expect("the root is asked for"); + // src and its twenty modules are all open on the way to a change + land_folders(&mut app, root, "", &["src".to_string()]); + + let first = listing_requests(&mut rx); + assert_eq!(first.len(), 8, "no more than eight in flight: {first:?}"); + let (answered, folder) = first[0].clone(); + land_folders(&mut app, answered, &folder, &[]); + let next = listing_requests(&mut rx); + assert_eq!(next.len(), 1, "one landed, so one more is asked for: {next:?}"); + assert!(!first.iter().any(|(_, asked)| *asked == next[0].1), "and it's a new folder"); + assert_eq!(app.status.toast(), None, "and nothing told the reader to try again"); +} + /// A file that did not change opens whole, numbered and highlighted, with no Diff to switch to. #[test] fn an_unchanged_file_opens_whole_in_the_file_view() { diff --git a/crates/luxe-tui/tests/render/reveal.rs b/crates/luxe-tui/tests/render/reveal.rs index a7bc640..d471993 100644 --- a/crates/luxe-tui/tests/render/reveal.rs +++ b/crates/luxe-tui/tests/render/reveal.rs @@ -470,7 +470,7 @@ fn an_image_scrolls_through_the_viewport_without_leaving_anything_behind() { } /// The tool the reader never asked to watch. `activate_tools` loads a deferred tool's schema — a -/// fact about Luxe's request budget, not a step in anyone's task — and it lands directly in front +/// fact about luxe's request budget, not a step in anyone's task — and it lands directly in front /// of the tool that actually did something. A successful one leaves no card; a failed one does, /// because a call nobody can see cannot explain the stall it caused. #[test] diff --git a/crates/luxe-tui/tests/render/routing.rs b/crates/luxe-tui/tests/render/routing.rs index 03e4cf6..7bc0e41 100644 --- a/crates/luxe-tui/tests/render/routing.rs +++ b/crates/luxe-tui/tests/render/routing.rs @@ -133,7 +133,7 @@ fn test_route_key_dashboard_esc_stays_and_ctrl_c_quits() { /// /// Opening it does not change the view mode — the dashboard stays behind it on purpose — and the /// routing asked for the view mode. So the arrows walked the column *underneath* the overlay, a -/// click reached the menu through it, and Esc quit Luxe instead of closing the list. +/// click reached the menu through it, and Esc quit luxe instead of closing the list. #[test] fn the_project_context_list_takes_the_keys_from_the_dashboard_behind_it() { let mut app = seeded_app("nord", FixtureScenario::DashboardContextFiles).expect("the fixture"); @@ -154,7 +154,7 @@ fn the_project_context_list_takes_the_keys_from_the_dashboard_behind_it() { assert_eq!(selected(&app), 2, "j and ↓ walk the list; Tab is not its key"); assert!(app.editor.current_input().is_empty(), "and the prompt underneath typed nothing"); - // Esc puts the list away rather than quitting Luxe. + // Esc puts the list away rather than quitting luxe. let action = route_key(&mut app, &key(KeyCode::Esc)); match action { RouteAction::Msg(message) => app.update(*message), @@ -259,11 +259,10 @@ fn a_finished_login_walks_into_the_model_picker_inside_the_surface() { let screen: String = buffer.content.iter().map(|cell| cell.symbol()).collect(); assert!(screen.contains("Select model"), "{screen}"); assert!(screen.contains("GPT-5.6"), "{screen}"); - // What the login had to say rides along as the picker's opening line rather than being lost - // with the screen that used to report it — including which model it left the session on, so - // the preselected row does not read as a choice nobody made. + // What the login had to say rides along as the picker's opening line, and with no model + // chosen for the reader, the line asks them to choose one. assert!(screen.contains("Signed in to OpenAI"), "{screen}"); - assert!(screen.contains("Now on GPT-5.6"), "{screen}"); + assert!(screen.contains("Choose a model to finish setting up."), "{screen}"); // The count of models is not on it: they are the rows underneath. assert!(!screen.contains("47 models available"), "{screen}"); } diff --git a/dist-workspace.toml b/dist-workspace.toml index 3bc9444..a1e5af8 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -1,4 +1,4 @@ -# How Luxe is released. dist reads this and writes .github/workflows/release.yml from it, so the +# How luxe is released. dist reads this and writes .github/workflows/release.yml from it, so the # workflow is never edited by hand: change this, then run `dist generate`. Run `dist init` only to # move to a new dist version; with `--yes` it answers its own questions and drops settings here. # @@ -28,7 +28,7 @@ install-updater = true # The installers' last word. A new terminal, because one already open has the old PATH, which the # installer's own note then explains. Pasted into a double-quoted string in both scripts, so no # backticks (sh would run what they hold), no `$` and no double quotes -install-success-msg = "Luxe is installed. To start, open a new terminal in your project's folder and run: luxe" +install-success-msg = "luxe is installed. To start, open a new terminal in your project's folder and run: luxe" tap = "evanwhittaker/homebrew-tap" # `brew install evanwhittaker/tap/luxe`, not `luxe-cli`: the command is `luxe` formula = "luxe" diff --git a/docs/brand/voice.md b/docs/brand/voice.md index 426d55f..f3c2262 100644 --- a/docs/brand/voice.md +++ b/docs/brand/voice.md @@ -1,9 +1,9 @@ -# Luxe's voice +# luxe's voice -How Luxe sounds anywhere a person reads it: the TUI, the phone app, the site, the guide, `--help`, +How luxe sounds anywhere a person reads it: the TUI, the phone app, the site, the guide, `--help`, errors and release notes. How the agent talks is set in `luxe-core::context`, not here. -**In one line:** plain, direct and warm. Luxe sounds confident because it's good, not because it +**In one line:** plain, direct and warm. luxe sounds confident because it's good, not because it says so. ## Principles @@ -16,7 +16,7 @@ says so. with all the best models". CI fails on the marketing words listed in `scripts/voice-check.py`. - **Use the real name.** Feature names, git terms and key names are what people search for. Explain one if you have to; don't swap it for a cuter word. -- **Don't oversell the model.** Luxe drives models; it isn't one. Talk about what Luxe does: what +- **Don't oversell the model.** luxe drives models; it isn't one. Talk about what luxe does: what the model sees, what it can touch, how you review what it did. - **Have some fun, in the right places.** Wordplay belongs in headlines and empty states: "As good as it gits.", "Get excited." Never in errors, buttons, permission prompts or anything read when @@ -30,7 +30,7 @@ The TUI and the phone app use labels, not sentences. People glance at UI; they d | --- | --- | --- | | Button | `Review changes` | `Click here to review your changes` | | Key hint | `ctrl+g to review` | `Press ctrl+g to open a review of what changed.` | -| Status | `Compacting` | `Luxe is now compacting your conversation…` | +| Status | `Compacting` | `luxe is now compacting your conversation…` | | Empty state | `No sessions yet. Run luxe in a project to start one.` | `Nothing to see here!` | | Error | `No shell found. Install Git for Windows and try again.` | `Oops! Something went wrong.` | @@ -67,7 +67,7 @@ People read `docs/guide/` mid-task, and so do the agents they point at it. ## Words -- **Luxe** in prose, `luxe` for the command. Never all caps. +- **luxe** in prose, `luxe` for the command. Never all caps. - **Model,** not "AI". **Coding agent,** not "platform" or "solution". - **American spelling.** `scripts/voice-check.py` checks it, comments included. diff --git a/docs/guide/agent.md b/docs/guide/agent.md index 3dfbb55..e687bef 100644 --- a/docs/guide/agent.md +++ b/docs/guide/agent.md @@ -2,7 +2,7 @@ title: "How the agent works" summary: "How the agent writes to you, asks you questions, plans, and gets a second opinion." order: 11 -group: "Using Luxe" +group: "Using luxe" --- ## How it writes @@ -60,7 +60,7 @@ nor the tools, so it does not re-read the conversation at full price. In plan mode the agent asks its open questions one at a time, then writes the plan as one `## Phase N` section per phase, numbered from 0, which is the shape [`luxe loop`](loop.md) works -through. When a turn writes the plan, Luxe asks what next: +through. When a turn writes the plan, luxe asks what next: - **Build it here**, with the planning conversation still in context - **Build it in a fresh session**, starting from `PLAN.md` alone @@ -113,10 +113,12 @@ In order, the first that is set: 1. `--model` and `--thinking` on the command line 2. `LUXE_MODEL` and `LUXE_PROVIDER` in the environment -3. The model you last chose -4. `default_model` in `models.json` +3. The model you last chose in this project +4. The model you last chose anywhere +5. `default_model` in `models.json` -Luxe never picks a model for you. With none of these set, sending a message opens the model picker, +luxe never picks a model for you, and signing in doesn't either: the model picker opens at the top +of the list for you to choose. With none of these set, sending a message opens the model picker, and `--headless` and the loop refuse to start. To always start from your configured default rather than your last choice: diff --git a/docs/guide/appearance.md b/docs/guide/appearance.md index dedeb9c..daf35bd 100644 --- a/docs/guide/appearance.md +++ b/docs/guide/appearance.md @@ -13,13 +13,13 @@ Every setting on this page goes in `~/.config/luxe/config.json`, or a project's `/theme` previews each theme as you move through the list. `enter` keeps one and saves it to your config; `esc` puts back the theme you had. -Luxe's own theme is `luxe`, a warm graphite with a brass accent. Every accent clears a 4.5:1 +luxe's own theme is `luxe`, a warm graphite with a brass accent. Every accent clears a 4.5:1 contrast ratio against the background, and body text 7:1. The others are dark versions of community favorites and of Omarchy's themes: | | | | --- | --- | -| Luxe | `luxe` | +| luxe | `luxe` | | Editors | `jetbrains` (Darcula), `vscode` (Visual Studio 2017 Dark), `xcode` (Default Dark) | | Community | `aura`, `ayu`, `catppuccin`, `dracula`, `everforest`, `github` (Dark Dimmed), `gruvbox`, `kanagawa`, `monokai`, `noctis-bordo`, `nord`, `one-dark`, `panda`, `rose-pine`, `tokyo-night`, `vesper`, `zenburn` | | Omarchy | `ethereal`, `hackerman`, `last-horizon`, `lumon`, `matte-black`, `miasma`, `osaka-jade`, `retro-82`, `ristretto`, `solitude`, `vantablack` | @@ -28,7 +28,7 @@ community favorites and of Omarchy's themes: { "theme": "nord" } ``` -An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all on +An unknown name falls back to `luxe`, and luxe says so when the session opens. See them all on [luxe.dev](https://luxe.dev/#craft). Code is colored by the theme too: in answers, tool cards, diffs and the preview, keywords take the @@ -56,7 +56,7 @@ The names are the ones a theme file uses; [`luxe.json`](https://github.com/evanw lists every one. One more name is optional: `modePlan`, the color [plan mode](agent.md#plan-then-build) wears on the -composer and the menus and questions around it. Without it, Luxe picks the first of the theme's +composer and the menus and questions around it. Without it, luxe picks the first of the theme's other colors that reads as different from its accent. ### Make a theme @@ -78,12 +78,12 @@ for a complete one. ### On Omarchy -Leave `theme` unset, or set it to `omarchy`, and Luxe wears your desktop's theme and changes with +Leave `theme` unset, or set it to `omarchy`, and luxe wears your desktop's theme and changes with it, within a couple of seconds, in a running session. It uses, in order: 1. A `luxe.json` in the current Omarchy theme. To give every theme one, write a template at `~/.config/omarchy/themed/luxe.json.tpl` and Omarchy renders it from each theme's colors. -2. Luxe's built-in theme of the same name, when both are dark. +2. luxe's built-in theme of the same name, when both are dark. 3. A theme made on the spot from the Omarchy theme's `colors.toml`, with text lifted until it is readable. This is how a light Omarchy theme comes out. @@ -139,12 +139,12 @@ When the bar runs out of room, it drops modules in this order: `cwd`, `tokens`, ## Icons and fonts -`glyphs` sets which icons Luxe draws. Every icon has a word beside it, so nothing is lost at any +`glyphs` sets which icons luxe draws. Every icon has a word beside it, so nothing is lost at any setting. | `glyphs` | Draws | Needs | | --- | --- | --- | -| `auto` | `nerd` when Luxe can confirm your font has every icon, otherwise `unicode` | | +| `auto` | `nerd` when luxe can confirm your font has every icon, otherwise `unicode` | | | `nerd` | Nerd Font icons | A Nerd Font | | `nerd_wide` | The same icons, each given two cells | A Nerd Font whose icons are drawn wide | | `unicode` | Plain shapes: `■ ► ▪ ○ ●` | UTF-8 | @@ -159,7 +159,7 @@ which brings its own. On macOS and Windows without fontconfig, it picks `unicode have a Nerd Font. If icons sit flush against the word beside them, you have the wide build of your Nerd Font: switch to its `Mono` build (see [Fonts](install.md#fonts)), or set `nerd_wide`. -Fonts that draw every character Luxe uses, measured against the font files: +Fonts that draw every character luxe uses, measured against the font files: | Font | Missing | Width | | --- | --- | --- | @@ -235,7 +235,7 @@ Screenshots and images the agent reads are drawn in the conversation where the t ``` Double-click an image, or select its message (`alt+k`) and press `alt+i`, to view it full-window. -`/images` says which setting is in effect and why. A change to `images` applies the next time Luxe +`/images` says which setting is in effect and why. A change to `images` applies the next time luxe starts. ## The start screen diff --git a/docs/guide/cli.md b/docs/guide/cli.md index 11e3f8f..3536cc4 100644 --- a/docs/guide/cli.md +++ b/docs/guide/cli.md @@ -68,7 +68,7 @@ luxe --headless -p "list the TODO comments in src/" --format text ``` A headless run needs `-p` and a model: `--model`, `LUXE_MODEL`, your last choice or `default_model` -in `models.json`. It refuses to start without either. It exits with status 1 when the turn fails or Luxe stops before the turn ends, so a +in `models.json`. It refuses to start without either. It exits with status 1 when the turn fails or luxe stops before the turn ends, so a script can tell a failure from an answer without reading the output. ## Commands @@ -80,15 +80,15 @@ script can tell a failure from an answer without reading the output. | `luxe auth status [provider]` | A credential's type, where it came from, and when it expires | | `luxe auth logout ` | Remove a stored credential | | `luxe models list` | Models you can use. `--provider ` filters, `--configured` lists only the models `models.json` or `auth.json` names. | -| `luxe models show ` | What Luxe knows about a model, and where each value came from. A bare ID uses the active provider. | +| `luxe models show ` | What luxe knows about a model, and where each value came from. A bare ID uses the active provider. | | `luxe models refresh` | Refresh the model catalog. `--force` even if it is fresh. | | `luxe sessions list` | Sessions in this project, newest first | -| `luxe join [id]` | Join a session another Luxe is running, speaking the [RPC protocol](rpc.md#join-a-running-session) on stdin and stdout. The id can be its start, or the Luxe's process id; without one, it joins the session running in this folder. | +| `luxe join [id]` | Join a session another luxe is running, speaking the [RPC protocol](rpc.md#join-a-running-session) on stdin and stdout. The id can be its start, or the luxe's process id; without one, it joins the session running in this folder. | | `luxe join --list` | Sessions running on this machine that can be joined | | `luxe remote` | Serve this machine's sessions to your own phone or tablet. Listens on this machine only, for Tailscale Serve to carry to your devices, and lets in this machine's tailnet owner from a paired device. | | `luxe remote --port ` | The port it listens on (default 4519) | | `luxe remote --allow ` | Also let this tailnet login in, as Tailscale names it (`alex@github`). Repeatable. | -| `luxe remote setup` | Check Tailscale, offer to publish the bridge on your tailnet with Tailscale Serve, offer to run it at login as a user service, then show a QR code to pair a device. Each step that changes something outside Luxe asks first. | +| `luxe remote setup` | Check Tailscale, offer to publish the bridge on your tailnet with Tailscale Serve, offer to run it at login as a user service, then show a QR code to pair a device. Each step that changes something outside luxe asks first. | | `luxe remote pair` | Show a QR code and link that pair one phone or tablet. They work once, within ten minutes. | | `luxe remote devices` | The paired devices | | `luxe remote devices revoke ` | Unpair a device. Its open sessions close within a few seconds. | @@ -105,7 +105,7 @@ script can tell a failure from an answer without reading the output. | `luxe loop fresh` | Reset the run's turn count; see [Autonomous runs](loop.md#start-a-run) | | `luxe docs [page]` | Read this guide, offline and for the installed version. `--search ` finds lines across every page. | | `luxe doctor` | Check which tools, language servers and debug adapters work | -| `luxe update` | Update Luxe with the command for however it was installed; see [Updates](configuration.md#updates). `--check` only reports. | +| `luxe update` | Update luxe with the command for however it was installed; see [Updates](configuration.md#updates). `--check` only reports. | | `luxe init` | Set up a theme, a provider, the tools and the start screen, and write them to `~/.config/luxe/config.json`. `--defaults` skips the questions, `--force` starts from an empty file; see [Editing](configuration.md#editing). | | `luxe wire ` | Summarize a `LUXE_WIRE_LOG` capture; see [Troubleshooting](troubleshooting.md#see-what-is-sent-to-the-model). `--tools` breaks the tool schemas' size down per tool. | diff --git a/docs/guide/commands.md b/docs/guide/commands.md index d71c82f..dfa4d02 100644 --- a/docs/guide/commands.md +++ b/docs/guide/commands.md @@ -2,7 +2,7 @@ title: "Commands and keys" summary: "The Command Palette, slash commands, Help, every default key, and how to rebind them." order: 4 -group: "Using Luxe" +group: "Using luxe" --- ## Command Palette and slash commands @@ -26,7 +26,7 @@ list says what the command does and the arguments it takes. Past the command, the list shows the arguments it takes, such as `/diff turn` or `/diff pr `, and narrows as you type. `tab` fills in the one under the cursor. `enter` runs it when nothing is missing, and fills it in when it still needs a value. `esc` puts the -list away for that command. In the composer, a command Luxe knows is highlighted, and so are the +list away for that command. In the composer, a command luxe knows is highlighted, and so are the words of it you have typed, like `pr` in `/diff pr 142`. A command that stays plain is misspelled. ## Slash commands @@ -66,8 +66,8 @@ words of it you have typed, like `pr` in `/diff pr 142`. A command that stays pl | `/login`, `/logout` | Add or remove a provider's credential | | `/auth` | Which providers you are signed in to, and how | | `/reload` | Re-read your config and keys without restarting | -| `/quit` | Leave Luxe. The session is already saved. | -| `/update` | Leave Luxe and update it, as `luxe update` does | +| `/quit` | Leave luxe. The session is already saved. | +| `/update` | Leave luxe and update it, as `luxe update` does | The Command Palette also lists commands with no slash form, such as **Copy message**, **Swap the sidebar's side** and, in a review, **Send comments**. @@ -200,7 +200,7 @@ Put your bindings in `~/.config/luxe/keybindings.json`, or open it from **Config ## Alt keys on a Mac A Mac has no Alt key. Its Option key types characters instead: `option+o` is `ø`, `option+p` is -`π`. Most of Luxe's `alt` keys need your terminal to send Option as Alt: +`π`. Most of luxe's `alt` keys need your terminal to send Option as Alt: | Terminal | Setting | | --- | --- | @@ -212,6 +212,6 @@ A Mac has no Alt key. Its Option key types characters instead: `option+o` is `ø | Alacritty | `option_as_alt = "Both"` under `[window]` | Ghostty already does this on the "U.S." keyboard layouts. On the others it sends the character and -marks it as an Alt key. On "ABC", the Mac's default English layout, Luxe reads that back as the key +marks it as an Alt key. On "ABC", the Mac's default English layout, luxe reads that back as the key you pressed, so `option+o` opens a file from the preview without any setting. On other layouts, set the option above. diff --git a/docs/guide/configuration.md b/docs/guide/configuration.md index 5dbe6dc..15c8731 100644 --- a/docs/guide/configuration.md +++ b/docs/guide/configuration.md @@ -1,12 +1,12 @@ --- title: "Configuration" -summary: "Where Luxe's files live, what a project can set, and every key in config.json." +summary: "Where luxe's files live, what a project can set, and every key in config.json." order: 1 group: "Customize" --- -Luxe works with no configuration. Everything here is optional, and most of it can be set from inside -Luxe: **Configuration** (on the start screen, or `/config`) signs you in and opens these files in +luxe works with no configuration. Everything here is optional, and most of it can be set from inside +luxe: **Configuration** (on the start screen, or `/config`) signs you in and opens these files in your editor, [`/settings`](#settings) changes the settings you use most, `/theme` sets the theme, and `/model` the model. @@ -35,7 +35,7 @@ in `.luxe/` at its root. ### What a project cannot change A project's `.luxe/config.json` overrides yours key by key, with a few exceptions. These run -programs, reach the network, or decide what a repository is trusted with, so Luxe reads them from +programs, reach the network, or decide what a repository is trusted with, so luxe reads them from your own config only: - `launchers` and `mentions`, which run programs @@ -44,7 +44,7 @@ your own config only: - `agent.on_ask`, which a project can set to `deny` but not to `allow` - `agent.cache_warming`, which a project can turn down but not up, since it spends your money -Project `gate.commands` also run programs. Luxe ignores them and warns unless you start with +Project `gate.commands` also run programs. luxe ignores them and warns unless you start with `--trust-project`. With trust, a nonempty project list replaces your global list. Otherwise, the loop uses your global commands. Move the list to your own config if you don't want to trust the project. @@ -55,8 +55,8 @@ project. screen) and writes the answers to `config.json`, changing only those keys. It also writes a `config.schema.json` beside it so your editor can complete and check every key. `--defaults` writes a file that chooses nothing, without asking, and so does a run with no terminal; with a -`config.json` already there, either one needs `--force`, which removes the old file first. Luxe ignores a key it does -not know, so an old config always loads on a newer Luxe; check the spelling if a setting seems to +`config.json` already there, either one needs `--force`, which removes the old file first. luxe ignores a key it does +not know, so an old config always loads on a newer luxe; check the spelling if a setting seems to do nothing. `/reload` (`ctrl+shift+r`) applies changes to `config.json` and `keybindings.json` without @@ -82,7 +82,7 @@ change writes one key to your `config.json` and leaves the rest of the file as i Each value says where it comes from: `default`, `global` (your `config.json`), or `project` (this project's `.luxe/config.json`, which wins over yours, so it is changed there). Most settings take -effect at once; the rest say they take effect the next time Luxe starts. That includes the Tools +effect at once; the rest say they take effect the next time luxe starts. That includes the Tools page, because the tools the agent is offered are fixed for a run. In a window too small for the panel, it says so instead, and only `esc` works until the window fits. @@ -115,22 +115,22 @@ are doing. The notification goes through your terminal, as an escape sequence it turns into a desktop notification, so it works over ssh and needs nothing installed. Ghostty, iTerm2, kitty, WezTerm, -Warp and foot show them; Luxe recognizes those and sends nothing to a terminal it does not know. If -yours shows them and Luxe does not recognize it, name the sequence: `"notification_method": "osc9"` +Warp and foot show them; luxe recognizes those and sends nothing to a terminal it does not know. If +yours shows them and luxe does not recognize it, name the sequence: `"notification_method": "osc9"` (the common one) or `"osc777"`. Inside tmux, add `set -g allow-passthrough on` to your tmux configuration. Your terminal may also have to be allowed to send notifications in your system's settings. ### herdr -Inside a [herdr](https://herdr.dev) pane, Luxe tells herdr whether it is working, idle, or waiting +Inside a [herdr](https://herdr.dev) pane, luxe tells herdr whether it is working, idle, or waiting on you, and why: `Approve bash`, or the question it asked. herdr shows that in its sidebar, raises -its own notification when Luxe finishes or needs you (set in herdr's `[ui.toast]`), and reports it +its own notification when luxe finishes or needs you (set in herdr's `[ui.toast]`), and reports it to `herdr agent wait`. After a herdr restart, the pane reopens the same session with -`luxe --resume`. Luxe sends no escape-sequence notifications inside herdr, because herdr keeps +`luxe --resume`. luxe sends no escape-sequence notifications inside herdr, because herdr keeps them for itself. -[Recipes](recipes.md#luxe-colors-in-herdr) has a Luxe palette for herdr's theme. +[Recipes](recipes.md#luxe-colors-in-herdr) has a luxe palette for herdr's theme. This is local to your machine and on by default. Outside herdr nothing is sent. `LUXE_HERDR=0` in the environment stops the reports, and so does the config: @@ -141,7 +141,7 @@ This is local to your machine and on by default. Outside herdr nothing is sent. ### Joining a session -A running Luxe lets another program on this machine join its session: `luxe join`, a script, or +A running luxe lets another program on this machine join its session: `luxe join`, a script, or whatever you build on [the RPC protocol](rpc.md#join-a-running-session). Only your user account can connect, and nothing listens on the network. To turn it off: @@ -154,11 +154,11 @@ it back on once yours has. ### Updates -Once a day, Luxe checks whether a newer release exists, and when one does the start screen says +Once a day, luxe checks whether a newer release exists, and when one does the start screen says *Update available · /update*. The check sends nothing about you or your machine; the comparison happens locally. -`/update`, or `luxe update` in a shell, updates Luxe with the command for however you installed +`/update`, or `luxe update` in a shell, updates luxe with the command for however you installed it, showing each one before it runs: | Installed with | `luxe update` runs | @@ -167,9 +167,10 @@ it, showing each one before it runs: | Homebrew | `brew update`, then `brew upgrade luxe` | | Cargo | `cargo install --locked --force luxe-cli` | -Luxe never downloads or replaces its own program; whatever installed it does. A copy your system's +luxe never downloads or replaces its own program; whatever installed it does. A copy your system's package manager owns is left to it, and a downloaded archive points you at the releases page. On -Windows, Luxe can't be replaced while it runs, so it prints the command to run once it has exited. +Windows, a running program can't be overwritten, so luxe first renames itself to `luxe.exe.old`, +and the next launch deletes it. Afterwards it checks that the `luxe` your shell finds is the new version, and says so if another copy earlier on your `PATH` is in the way. `luxe update --check` only reports. @@ -195,9 +196,9 @@ or lazygit: } ``` -Luxe keeps running underneath and redraws when the program exits. Text the program writes to the +luxe keeps running underneath and redraws when the program exits. Text the program writes to the file named by `$LUXE_HANDOFF` is put in the composer, so a gh-dash command can send -`#123 look at this` to Luxe. A launcher's key wins over any other binding. +`#123 look at this` to luxe. A launcher's key wins over any other binding. ## Reference diff --git a/docs/guide/custom-providers.md b/docs/guide/custom-providers.md index 203fdb3..3b668e7 100644 --- a/docs/guide/custom-providers.md +++ b/docs/guide/custom-providers.md @@ -5,13 +5,13 @@ order: 6 group: "Extend" --- -Luxe knows how to reach every provider in [Models and providers](providers.md), and the +luxe knows how to reach every provider in [Models and providers](providers.md), and the [models.dev](https://models.dev) catalog tells it each model's context window, output limit, thinking levels and price. This page is for what neither covers: your own endpoint, a model the catalog does not know, or a local server that needs its requests shaped a particular way. Everything here goes in `~/.config/luxe/models.json`. `luxe models show /` shows what -Luxe resolved for a model, and where each value came from. +luxe resolved for a model, and where each value came from. ## Add an endpoint @@ -38,7 +38,7 @@ Then `luxe --model gateway/qwen3-coder-480b`, or choose it in `/model`. | Provider key | Does | | --- | --- | | `base_url` | The endpoint, including its version, such as `/v1` | -| `api_key` | The key: the value, `$VAR`, `${VAR}` or `$env:VAR`, or `!command`, which runs each time a request needs the key. An unset `${VAR}` is empty, as in `mcp.json`, and Luxe logs which one. | +| `api_key` | The key: the value, `$VAR`, `${VAR}` or `$env:VAR`, or `!command`, which runs each time a request needs the key. An unset `${VAR}` is empty, as in `mcp.json`, and luxe logs which one. | | `api` | The API it speaks: `openai-completions` (the default), `openai-responses`, `anthropic-messages` | | `auth` | How the key is sent: `bearer`, `x-api-key`, `api-key`, or `foundry` for both of the last two | | `models_dev` | The models.dev provider to take model details from, when the names differ | @@ -46,12 +46,12 @@ Then `luxe --model gateway/qwen3-coder-480b`, or choose it in `/model`. | `sampling_params` | Samplers for every model it serves; see [Samplers](#samplers) | A provider in `models.json` replaces the same provider's block in `auth.json` whole, so keep a -provider's key and endpoint in one file. A provider Luxe already knows keeps everything you do not -write. A key in a provider Luxe knows is used when its own variable, such as `OPENAI_API_KEY`, is +provider's key and endpoint in one file. A provider luxe already knows keeps everything you do not +write. A key in a provider luxe knows is used when its own variable, such as `OPENAI_API_KEY`, is unset; for one it does not know, the key you write comes first and `OPENAI_API_KEY` is the fallback. A key you signed in with comes before either. -A file Luxe cannot parse is skipped with a warning in the log, and a misspelled key is ignored, so +A file luxe cannot parse is skipped with a warning in the log, and a misspelled key is ignored, so check the result with `luxe models show /` after editing. ## Model settings @@ -64,7 +64,7 @@ each replace the catalog's whole: a `cost` you write drops the catalog's long-pr | Key | Does | | --- | --- | | `context_window` | The model's context window, in tokens | -| `max_tokens` | The most it may write in one reply. Defaults to the model's own limit from the catalog. Luxe lowers it per request to what the window has left, so setting the real limit is safe; setting a lower one is how replies get cut off. | +| `max_tokens` | The most it may write in one reply. Defaults to the model's own limit from the catalog. luxe lowers it per request to what the window has left, so setting the real limit is safe; setting a lower one is how replies get cut off. | | `name` | The name shown in the picker and statusline | | `reasoning` | Whether it can think | | `thinking` | The level a session starts at for this model | @@ -74,14 +74,14 @@ each replace the catalog's whole: a `cost` you write drops the catalog's long-pr | `compat`, `sampling_params` | Override the provider's, key by key | A model the catalog does not know gets a 128k context window and no output limit until you set -them. Anthropic endpoints require a limit, so there Luxe asks for 128k. If the model allows less, -Anthropic's refusal names its real limit, and Luxe retries with that and uses it for the rest of the +them. Anthropic endpoints require a limit, so there luxe asks for 128k. If the model allows less, +Anthropic's refusal names its real limit, and luxe retries with that and uses it for the rest of the session. ## Thinking levels -`thinking_level_map` says what each of Luxe's levels sends to the model. `null` marks a level the -model cannot do, removing it from `/thinking`; a level Luxe needs falls back to the nearest one that +`thinking_level_map` says what each of luxe's levels sends to the model. `null` marks a level the +model cannot do, removing it from `/thinking`; a level luxe needs falls back to the nearest one that is left. `ultra` is the name for a provider's `max`. ```json title="~/.config/luxe/models.json" @@ -107,12 +107,12 @@ is left. `ultra` is the name for a provider's `max`. A level you do not map sends its own name, and `off` sends `none`; `xhigh` and `ultra` are offered only once mapped. Setting a map also marks the model as one that reasons. -An endpoint Luxe does not know sends no thinking setting at all until its `compat` says how: for +An endpoint luxe does not know sends no thinking setting at all until its `compat` says how: for most OpenAI-compatible servers, `"thinking_format": "openai"`, which sends `reasoning_effort` on every request, `off` included. See [Request format](#request-format). -For Anthropic models, Luxe uses adaptive thinking with an effort level where the model supports -it, and a token budget for older ones. If a model refuses how thinking was requested, Luxe tries +For Anthropic models, luxe uses adaptive thinking with an effort level where the model supports +it, and a token budget for older ones. If a model refuses how thinking was requested, luxe tries the other way once and remembers it for the session. `compat.force_adaptive_thinking` forces adaptive thinking for an endpoint the catalog does not know. @@ -150,7 +150,7 @@ to every model the provider serves; on a model, only the keys you write override | `force_adaptive_thinking` | Use Anthropic's adaptive thinking | | `supports_long_cache_retention` | Ask Anthropic to keep cached prompts for an hour rather than five minutes. Each cache write costs 2x input instead of 1.25x. Off by default, since not every Anthropic-compatible endpoint accepts it. | | `stream_tool_arguments` | Stream a `write` call's file from Anthropic as it is written, so its card fills in live. On by default; turn off for an endpoint that rejects a tool's `eager_input_streaming` field. | -| `defer_tool_loading` | Load a tool the agent asks for with `activate_tools` where it asked, so the cached prompt stays cached. On by default. Luxe stops on its own for an endpoint that refuses it; turn it off for one that accepts it and then misbehaves. Anthropic and Responses endpoints only. | +| `defer_tool_loading` | Load a tool the agent asks for with `activate_tools` where it asked, so the cached prompt stays cached. On by default. luxe stops on its own for an endpoint that refuses it; turn it off for one that accepts it and then misbehaves. Anthropic and Responses endpoints only. | | `copilot_headers`, `openrouter_headers` | Send those services' identifying headers. With `copilot_headers`, each model also goes to the Copilot endpoint it takes. | | `use_responses_api` | Use OpenAI's Responses API. Provider only; prefer `"api": "openai-responses"`. | @@ -164,7 +164,7 @@ provider's. A local model's card often gives a sampling recipe with settings the OpenAI format has no field for, such as `top_k`, `min_p` and `repeat_penalty`. `sampling_params` is added to the request as written, -after Luxe's own fields, so its values win: +after luxe's own fields, so its values win: ```json title="~/.config/luxe/models.json" { @@ -212,9 +212,9 @@ sent as written. LM Studio ignores `chat_template_kwargs`; use `"thinking_format ## Model details -Luxe takes a model's details from three places, each overriding the one before, value by value: +luxe takes a model's details from three places, each overriding the one before, value by value: -1. The models.dev catalog built into Luxe, which works offline +1. The models.dev catalog built into luxe, which works offline 2. A fresher copy, refreshed in the background into `~/.cache/luxe/models-dev.json` 3. Your `models.json` @@ -231,7 +231,7 @@ anthropic/claude-opus-5 cost /Mtok $5.00/$25.00 [models.dev] ``` -Each value names where it came from: `snapshot` for the catalog built into Luxe, `models.dev` for +Each value names where it came from: `snapshot` for the catalog built into luxe, `models.dev` for the refreshed copy, `config` for your `models.json`, and `default` where none of them said. | Variable | Does | @@ -245,7 +245,7 @@ the refreshed copy, `config` for your `models.json`, and `default` where none of ### Keyless sign-in with Microsoft Entra ID -If your Foundry resource has key sign-in turned off, give Luxe a command that prints a token: +If your Foundry resource has key sign-in turned off, give luxe a command that prints a token: ```json title="~/.config/luxe/models.json" { @@ -265,9 +265,9 @@ Run `az login` first. Only the Claude provider needs `auth`; the others already token. The command runs for each request and nothing is kept, so a token from `az`, which lasts about an hour, is replaced as it expires and a long session carries on. -### Choose which deployments Luxe offers +### Choose which deployments luxe offers -Luxe records what a resource has deployed in each provider's `served_models`, and the model behind +luxe records what a resource has deployed in each provider's `served_models`, and the model behind any deployment named something else in `deployments`, which is where it looks up the context window and price. If your key cannot list deployments, or you want to choose the list yourself, turn discovery off and write both: @@ -284,7 +284,7 @@ discovery off and write both: } ``` -`discover_deployments: false` on any of the three providers stops Luxe asking the resource at all. +`discover_deployments: false` on any of the three providers stops luxe asking the resource at all. ### Thinking on partner models @@ -306,14 +306,14 @@ Use `reasoning_effort` only: Foundry refuses DeepSeek's own `thinking` format. F report these models' thinking tokens, so `/cost` counts them as output. A Foundry deployment can have a different context window and price from the vendor's own API. -Luxe uses Azure's figures for Foundry models. +luxe uses Azure's figures for Foundry models. ## OpenRouter -- Luxe asks OpenRouter to cache prompts for Claude models, which it otherwise does not, and which +- luxe asks OpenRouter to cache prompts for Claude models, which it otherwise does not, and which makes later turns of a session far cheaper. `"cache_control_format": null` in the provider's `compat` stops it. -- Some models on OpenRouter cannot turn thinking off. For those, Luxe leaves the setting out and +- Some models on OpenRouter cannot turn thinking off. For those, luxe leaves the setting out and the model thinks at its own default. `luxe models show openrouter/` says `never off`. -- Luxe identifies itself to OpenRouter with its `HTTP-Referer` and `X-Title` headers, which carry +- luxe identifies itself to OpenRouter with its `HTTP-Referer` and `X-Title` headers, which carry nothing about you. `"openrouter_headers": false` in `compat` drops them. diff --git a/docs/guide/environment.md b/docs/guide/environment.md index 2074618..232ba36 100644 --- a/docs/guide/environment.md +++ b/docs/guide/environment.md @@ -1,6 +1,6 @@ --- title: "Environment variables" -summary: "The environment variables you can set, and the ones Luxe sets." +summary: "The environment variables you can set, and the ones luxe sets." order: 3 group: "Reference" --- @@ -28,10 +28,10 @@ config file turned off. | Variable | Does | | --- | --- | | `LUXE_CONFIG_DIR` | Where configuration and credentials live, instead of `~/.config/luxe` | -| `LUXE_STATE_DIR` | Where Luxe keeps its state, such as the model you last chose, MCP sign-ins and the logs of commands that only report, instead of `~/.local/state/luxe` | +| `LUXE_STATE_DIR` | Where luxe keeps its state, such as the model you last chose, MCP sign-ins and the logs of commands that only report, instead of `~/.local/state/luxe` | | `XDG_CONFIG_HOME`, `XDG_STATE_HOME`, `XDG_CACHE_HOME` | Honored on every platform; see [Install](install.md#where-luxe-keeps-files) | -When Luxe works out where its files go, a path in one of these, or in `HOME`, that is not valid +When luxe works out where its files go, a path in one of these, or in `HOME`, that is not valid UTF-8 is ignored, as if the variable were unset. ## Model catalog @@ -58,7 +58,7 @@ UTF-8 is ignored, as if the variable were unset. | `LUXE_LAZY_TOOLS` | `1` | `0` sends every tool's description with every request | | `LUXE_CORE_TOOLS` | | The tools sent with every request, comma-separated; the rest load when needed | | `LUXE_DAP_STOP_TIMEOUT_SECS` | `30` | How long the debugger waits for a program to stop | -| `LUXE_MAX_DEPTH` | `2` | How deeply Luxe may run inside itself, as with [subagents](recipes.md#subagents) | +| `LUXE_MAX_DEPTH` | `2` | How deeply luxe may run inside itself, as with [subagents](recipes.md#subagents) | | `LUXE_WEB_ALLOW_PRIVATE` | | `1` lets `web_fetch` and `screenshot` reach your local network and files | | `LUXE_WEB_TIMEOUT_SECS` | `30` | How long one fetch may take. Past 60, raise `LUXE_TOOL_TIMEOUT_SECS` too. | | `BRAVE_API_KEY`, `TAVILY_API_KEY`, `EXA_API_KEY`, `FIRECRAWL_API_KEY` | | Search providers, and Firecrawl for pages built with JavaScript; see [Tools](tools.md#web) | @@ -67,12 +67,12 @@ UTF-8 is ignored, as if the variable were unset. | Variable | Does | | --- | --- | -| `LUXE_EDITOR`, then `VISUAL`, then `EDITOR` | The editor Luxe opens files in | +| `LUXE_EDITOR`, then `VISUAL`, then `EDITOR` | The editor luxe opens files in | | `LUXE_FILE_MANAGER`, then `FILE_MANAGER` | The file manager `O` in the dock's file tree opens a folder in. Without either, the first of yazi, lf, ranger and nnn that is installed, then your desktop's own. | | `LUXE_HERDR` | `0` stops reporting state to [Herdr](recipes.md#run-luxe-in-herdr) | | `LUXE_UPDATE_CHECK` | `0` turns off the update check | | `LUXE_JOINABLE` | `0` stops other programs [joining](configuration.md#joining-a-session) this run's session | -| `LUXE_RUNTIME_DIR` | Where a running Luxe keeps the socket and record that let a program join it, instead of `luxe` in `$XDG_RUNTIME_DIR` on Linux or `$TMPDIR` on macOS, or `run` in the state folder | +| `LUXE_RUNTIME_DIR` | Where a running luxe keeps the socket and record that let a program join it, instead of `luxe` in `$XDG_RUNTIME_DIR` on Linux or `$TMPDIR` on macOS, or `run` in the state folder | ## Diagnostics @@ -81,10 +81,10 @@ UTF-8 is ignored, as if the variable were unset. | `LUXE_LOG` | What goes in the log, such as `debug` or `luxe_core=debug`. `RUST_LOG` works too. See [Logs](troubleshooting.md#logs). | | `LUXE_WIRE_LOG` | A file to record every request sent to the model; see [Troubleshooting](troubleshooting.md#see-what-is-sent-to-the-model) | -## Set by Luxe +## Set by luxe | Variable | Is | | --- | --- | -| `LUXE_DEPTH` | How deeply this run is nested inside another Luxe | -| `LUXE_REVIEW_GATE_ACTIVE` | Set for a loop's [gate commands](loop.md#check-each-phase), so a Luxe they start does not run a gate of its own | +| `LUXE_DEPTH` | How deeply this run is nested inside another luxe | +| `LUXE_REVIEW_GATE_ACTIVE` | Set for a loop's [gate commands](loop.md#check-each-phase), so a luxe they start does not run a gate of its own | | `LUXE_HANDOFF` | For a [launcher](configuration.md#launchers): a file whose contents go in the composer when the program exits | diff --git a/docs/guide/extending.md b/docs/guide/extending.md index 0439644..b52fd61 100644 --- a/docs/guide/extending.md +++ b/docs/guide/extending.md @@ -1,11 +1,11 @@ --- -title: "Extending Luxe" +title: "Extending luxe" summary: "Which kind of extension you need, how to install one, and what stays stable across updates." order: 1 group: "Extend" --- -Luxe extends through files and programs, never through code loaded into Luxe itself. A file carries +luxe extends through files and programs, never through code loaded into luxe itself. A file carries instructions or settings; a program carries behavior, and runs with the same access you have. Installing an extension is copying a file. @@ -13,13 +13,13 @@ Installing an extension is copying a file. | To | Use | Runs | | --- | --- | --- | -| Change how Luxe looks, or which tools exist | [Configuration](configuration.md) and [themes](appearance.md#make-a-theme) | Nothing | +| Change how luxe looks, or which tools exist | [Configuration](configuration.md) and [themes](appearance.md#make-a-theme) | Nothing | | Teach the agent a procedure or house style | [Skills](skills.md) and [`AGENTS.md`](project-context.md) | Nothing | | Point the agent at your tracker or runbooks with `@` | [Mention sources](mention-sources.md) | Your program, when its tab opens | | Give the agent new tools | [An MCP server](mcp.md) | Your program, when the agent calls it | | Block, rewrite, audit or react to what the agent does | [Hooks](hooks.md) | Your program, at points in a turn | -| Use an endpoint or model Luxe does not know | [Custom providers](custom-providers.md) | Nothing, or your `!command` for a key | -| Drive Luxe from your own program, or build a new front end: conversation, Guided Review and GitHub | [The RPC protocol](rpc.md) | Your program, driving Luxe | +| Use an endpoint or model luxe does not know | [Custom providers](custom-providers.md) | Nothing, or your `!command` for a key | +| Drive luxe from your own program, or build a new front end: conversation, Guided Review and GitHub | [The RPC protocol](rpc.md) | Your program, driving luxe | | Open another terminal tool with a key | [Launchers](configuration.md#launchers) | Your program, on a key | The rows are in order of effort; the first that fits is usually right. [Recipes](recipes.md) puts @@ -64,7 +64,7 @@ releases. `.luxe/` writes its own `.gitignore`, which keeps everything in it out of Git except `permissions.json`, `mcp.json`, `hooks.json` and `skills/`. To share more with your team, such as the -project's `config.json`, write that `.gitignore` yourself: Luxe rewrites its own copy, but leaves +project's `config.json`, write that `.gitignore` yourself: luxe rewrites its own copy, but leaves alone one it did not write. ## Trust @@ -73,11 +73,11 @@ alone one it did not write. `gate.commands` run only with `--trust-project`, and its permission rules can only make yours stricter. MCP servers, language servers and formatters it brings start, by default, only in an interactive session or with `--trust-project`; `lsp.project_servers` in your own config changes -that, see [Tools](tools.md#a-server-the-project-installed). This is about which programs Luxe starts. A +that, see [Tools](tools.md#a-server-the-project-installed). This is about which programs luxe starts. A language server itself may run project code, as rust-analyzer does with `build.rs`, so open an -unfamiliar repository in Luxe the way you would build it. +unfamiliar repository in luxe the way you would build it. -**A repository can still write instructions.** Its `AGENTS.md` and skills reach the model. Luxe +**A repository can still write instructions.** Its `AGENTS.md` and skills reach the model. luxe removes text a reviewer cannot see, but plain text is still instructions, so read an unfamiliar repository's `AGENTS.md` as you would its `Makefile`. @@ -86,7 +86,7 @@ repository's `AGENTS.md` as you would its `Makefile`. | | Across updates | | --- | --- | | `config.json`, `models.json`, `keybindings.json`, `lsp-servers.json`, `debug-adapters.json` | **Only added to.** An old file always loads. An unknown key is ignored, and no key changes meaning. | -| Sessions in `.luxe/sessions/` | A newer Luxe reads every older session. An older Luxe skips what it does not know in a newer one. | +| Sessions in `.luxe/sessions/` | A newer luxe reads every older session. An older luxe skips what it does not know in a newer one. | | The RPC protocol | Adding to it changes nothing. Removing or renaming anything changes `protocol_version`. | | Hook points | Added, never renamed. An unknown point skips that hook alone, with a warning in the log. | | Tool arguments | A renamed argument still accepts its old name. | @@ -97,8 +97,8 @@ Before 1.0, a minor release may change the RPC protocol and the hook points, and will say so. Config files and sessions keep the stronger promise regardless, since they are the two you cannot regenerate. -## What Luxe will not add +## What luxe will not add -- **Plugins loaded into Luxe.** A plugin would have all of Luxe's access, however it was sandboxed. +- **Plugins loaded into luxe.** A plugin would have all of luxe's access, however it was sandboxed. - **A network listener for RPC.** It would turn a local program into a service that needs authentication. diff --git a/docs/guide/github.md b/docs/guide/github.md index 79f861e..a53dd22 100644 --- a/docs/guide/github.md +++ b/docs/guide/github.md @@ -2,11 +2,11 @@ title: "Git and GitHub" summary: "Worktrees, issues, opening and merging pull requests, review threads, and stacks." order: 7 -group: "Using Luxe" +group: "Using luxe" --- Everything that talks to GitHub goes through the GitHub CLI, `gh`, signed in with your own account -(`gh auth login`). Without it, the rest of Luxe works and these features say why they cannot. +(`gh auth login`). Without it, the rest of luxe works and these features say why they cannot. ## Work in a worktree @@ -35,7 +35,7 @@ worktree stays out of `git status`. luxe --issue 123 ``` -Luxe reads issue #123, makes a worktree on a branch named for it (`123-short-title`), and starts a +luxe reads issue #123, makes a worktree on a branch named for it (`123-short-title`), and starts a session there. The issue and its latest comments go to the agent with your first message, so "fix it" is enough. They are treated as the reporter's words to weigh, not as instructions. @@ -52,13 +52,13 @@ luxe --from-pr 142 # resume the session already working on it A plain `git push` from the worktree updates the pull request, including one from a fork. A fork's branch that has to be renamed here, such as its `main` checked out as `mara/main`, gets a remote of its own (`mara-push-main`) for that push, so pushes from the fork's other branches are not -redirected. Luxe refuses a pull request that is merged or closed, that your account cannot push to, +redirected. luxe refuses a pull request that is merged or closed, that your account cannot push to, or whose author turned off edits by maintainers. ## Open a pull request Review the work with [Guided Review](guided-review.md), finish (`alt+enter`), and choose **Open pull -request**. Luxe drafts the title and description from the review, with `Closes #123` when the +request**. luxe drafts the title and description from the review, with `Closes #123` when the session started from an issue. ![The pull request, drafted from the review](images/quickstart-pull-request.svg) @@ -116,7 +116,7 @@ you can see a match before you search for it. ![Editing a search in /github](images/github-search.svg) -A changed tab is marked with `*` and keeps your search until you close Luxe. `x` puts back the +A changed tab is marked with `*` and keeps your search until you close luxe. `x` puts back the tab's own search, and so does running an empty search. The tabs always stay in this repository. A `repo:`, `org:` or `user:` you type is ignored. @@ -208,9 +208,9 @@ After the bottom pull request is squash-merged, keep its branch until `/stack` h one. Deleting it through the API, with `gh pr merge --delete-branch`, makes GitHub close the pull requests based on it. -## How often Luxe checks GitHub +## How often luxe checks GitHub -Luxe reads the pull request after anything that could change it, such as a push or `/pr`, and on +luxe reads the pull request after anything that could change it, such as a push or `/pr`, and on an interval otherwise: every 15 seconds while checks run, every minute once things settle, and every five minutes when the terminal has been in the background for a while. Each read costs one point of the 5,000 an hour your `gh` sign-in allows. diff --git a/docs/guide/guided-review.md b/docs/guide/guided-review.md index 062b5aa..dbe3f7f 100644 --- a/docs/guide/guided-review.md +++ b/docs/guide/guided-review.md @@ -2,7 +2,7 @@ title: "Guided Review" summary: "Read a change chapter by chapter, comment for the agent, and finish with a commit, fixes or a pull request." order: 6 -group: "Using Luxe" +group: "Using luxe" --- Guided Review reads a change back to you in the order it makes sense, split into chapters. Each @@ -13,9 +13,9 @@ the agent as work to do. ## Open a review -Press `ctrl+g`, or run `/diff`. Luxe writes the guide first; when `review ready` shows above the +Press `ctrl+g`, or run `/diff`. luxe writes the guide first; when `review ready` shows above the composer, press `ctrl+g` again to open it. Asked for while a turn is running, the review waits for -the turn to end. A review you already have opens at once, and one you had open when Luxe stopped +the turn to end. A review you already have opens at once, and one you had open when luxe stopped comes back with your comments. | Review | Command | @@ -28,7 +28,7 @@ comes back with your comments. Inside a review, `s` changes what it covers: uncommitted changes, the last turn, a base or a commit. A pull request takes `/diff pr`. If the agent committed its work, so nothing is uncommitted, -`ctrl+g` and `/diff` review the last turn instead. Luxe remembers what you have already reviewed in +`ctrl+g` and `/diff` review the last turn instead. luxe remembers what you have already reviewed in each project, so the next review leads with what is new since then. ## Read it @@ -75,7 +75,7 @@ To leave project bookkeeping out of every review: ``` The patterns take `*`, `**`, `?` and a trailing `/`, and a project's list replaces your own. -Excluded files are counted in the guide. Luxe's own `.luxe/` is never reviewed. +Excluded files are counted in the guide. luxe's own `.luxe/` is never reviewed. A review leaves out a file it cannot hold, so the rest is still reviewable: in the last turn, any file over 1 MiB, unreadable, or not a regular file; in uncommitted changes or a base, a new file @@ -102,7 +102,7 @@ so you can verify it, at any time. The agent ends a fix by reporting on each comment: fixed, not fixed, or needs clarification, with a note. The note shows under the comment, and a comment it calls fixed waits for you to verify it, -since a claim is not proof. If the agent leaves its report out, Luxe asks for it once. A comment +since a claim is not proof. If the agent leaves its report out, luxe asks for it once. A comment the agent still says nothing about reads `no word from the agent`, with the reason in Feedback, and stays where you left it. @@ -156,8 +156,8 @@ agent opened. It needs the GitHub CLI, `gh`, signed in. | `enter` | Post it | Line comments are listed under their files with the diff they sit on, the way GitHub shows them. -Questions you asked the agent stay in Luxe and are never posted. On your own pull request, GitHub -only takes a comment, so that is all Luxe offers. +Questions you asked the agent stay in luxe and are never posted. On your own pull request, GitHub +only takes a comment, so that is all luxe offers. A drafted summary opens in the preview for you to read and edit. Anything the agent says beside it, such as a part of the change it did not read, appears under it as a note. Once the review is @@ -166,6 +166,6 @@ posted, the guide's foot says **Posted to GitHub** with the verdict, and `o` ope ### Fix it yourself To change someone else's pull request rather than comment on it, press `alt+u` (or `w` in the post -preview). Luxe asks GitHub whether you can push to it, then checks it out in a worktree of its own +preview). luxe asks GitHub whether you can push to it, then checks it out in a worktree of its own and starts a session there, with your comments as the agent's first task. A plain `git push` then updates the pull request. diff --git a/docs/guide/hooks.md b/docs/guide/hooks.md index a6ff2f5..846c6c5 100644 --- a/docs/guide/hooks.md +++ b/docs/guide/hooks.md @@ -35,7 +35,7 @@ case "$cmd" in esac ``` -A project's `.luxe/hooks.json` runs only when you start Luxe with `--trust-project`, since opening a +A project's `.luxe/hooks.json` runs only when you start luxe with `--trust-project`, since opening a repository should never run its commands. When both are loaded, a project's hooks run after yours. ### Hook settings @@ -49,7 +49,7 @@ repository should never run its commands. When both are loaded, a project's hook `on_timeout: "deny"` makes a guard fail closed. `"ask"` puts the question to you instead, at `BeforeToolUse`; at other points it acts as `allow`. A -`decision` Luxe does not recognize, a typo or different casing included, gets the same treatment, +`decision` luxe does not recognize, a typo or different casing included, gets the same treatment, with a warning in the log, and its `args` and `context` are dropped. ## Matchers @@ -74,10 +74,10 @@ points without a tool call ignore the matcher. | Point | Runs | stdin | Can | | --- | --- | --- | --- | | `SessionStart` | A session starts or resumes, including a switch to it from another session | `{"Other": null}` | | -| `SessionEnd` | A session ends, including a switch to another session; Luxe waits for the hook | `{"Other": null}` | | +| `SessionEnd` | A session ends, including a switch to another session; luxe waits for the hook | `{"Other": null}` | | | `UserPromptSubmit` | You send a message, including one sent while the agent works | `{"Other": {"content": "…"}}` | block it, add context | | `BeforeAgentStart` | A turn is about to start | `{"Other": null}` | | -| `AgentStart` | Luxe is about to call the model | `{"Other": null}` | | +| `AgentStart` | luxe is about to call the model | `{"Other": null}` | | | `BeforeToolUse` | Before each tool call | `{"ToolUse": {"tool_name": "bash", "args": {…}}}` | block it, ask you, rewrite it | | `AfterToolUse` | After each tool call | `{"ToolResult": {"tool_name": "bash", "result": "…", "is_error": false}}` | add context to the result | | `FileChanged` | `write`, `edit`, an applied rename or code action, or an `ast_grep` rewrite changed a file | `{"FileChanged": {"path": "/abs/file", "operation": "edit"}}` | | @@ -99,7 +99,7 @@ that hook alone, with a warning naming the nearest real point. | Field | Where | Does | | --- | --- | --- | -| `decision` | Required in any answer | `deny` blocks the call or message. `ask` raises a permission prompt, at `BeforeToolUse`. `allow`, or no output at all, means no opinion. An answer without `decision` counts as one Luxe cannot read. | +| `decision` | Required in any answer | `deny` blocks the call or message. `ask` raises a permission prompt, at `BeforeToolUse`. `allow`, or no output at all, means no opinion. An answer without `decision` counts as one luxe cannot read. | | `reason` | with `deny` or `ask` | Shown to the model when a call is blocked, to you when a message is blocked, and on the prompt | | `args` | `BeforeToolUse` | New values for the call's arguments. Keys you leave out keep their values. | | `context` | `AfterToolUse`, `UserPromptSubmit` | Text added to the tool result, or saved with your message, for the model to see | @@ -152,7 +152,7 @@ saved. Read a hook script before installing it, as you would anything on your `P } ``` -Luxe already adds language server errors after every edit; a hook like this is for a different +luxe already adds language server errors after every edit; a hook like this is for a different check. **Refuse messages that contain an internal token:** @@ -176,7 +176,7 @@ command is destructive. ## Coming from Claude Code -| Claude Code | Luxe | +| Claude Code | luxe | | --- | --- | | `PreToolUse`, `PostToolUse` | `BeforeToolUse`, `AfterToolUse` | | `UserPromptSubmit` with `additionalContext` | `UserPromptSubmit` with `context` | diff --git a/docs/guide/images/commands-palette.svg b/docs/guide/images/commands-palette.svg index 2efc0eb..1c82e88 100644 --- a/docs/guide/images/commands-palette.svg +++ b/docs/guide/images/commands-palette.svg @@ -10,7 +10,7 @@ - + @@ -232,15 +232,18 @@ - + + + + @@ -290,71 +293,87 @@ - + + + + + + + + + + + + + + + + + @@ -661,26 +680,26 @@ 󰍉 Command palette Search: - ❯ Session cost /cost Session cost - Review changes /diff ctrl+g /cost - Change model /model - What this session has cost, by model and by - Ask again alt+t kind of token. - Auto-approve tool asks /permissions - Browse files by keyboard ctrl+t On a subscription it shows the allowance - Change theme /theme left rather than dollars. - Compact the conversation /compact - Configuration /config - Context Dock /dock alt+d - Context window /context - Copy message alt+y - Credentials /auth - Debug adapters /debug - Edit and resend alt+e - Full tool output ctrl+o - GitHub /github - Help /help - Inline images /images + ❯ Session cost /cost Session cost + Review changes /diff ctrl+g /cost + Change model /model + What this session has cost, by model and by + Ask again alt+t kind of token. + Auto-approve tool asks /permissions + Browse files by keyboard ctrl+t On a subscription it shows the allowance + Change theme /theme left rather than dollars. + Compact the conversation /compact + Configuration /config + Context Dock /dock alt+d + Context window /context + Copy message alt+y + Credentials /auth + Debug adapters /debug + Edit and resend alt+e + Full tool output ctrl+o + GitHub /github + Help /help + Inline images /images enter run · ↑/↓ choose · esc close 1/41 diff --git a/docs/guide/images/configuration-settings.svg b/docs/guide/images/configuration-settings.svg index d520b15..95fa704 100644 --- a/docs/guide/images/configuration-settings.svg +++ b/docs/guide/images/configuration-settings.svg @@ -10,7 +10,7 @@ - + @@ -133,73 +133,95 @@ + + + - + + + + + + + + + + + + + + + + + + + + @@ -548,30 +570,30 @@ 󰒓 Settings TOOLS ~/.config/luxe/config.json 󰌵 Appearance 1 - 󰆁 Conversation 2 read · write · edit · bash always on - Dock & statusline 3 - 󰖷 Tools 4 CODE - 󱌣 Agent 5 ❯ ast_grep Search and replace by code structure ● on default - debug Step through code with a debugger ○ off project - glob Find files by name ● on default - grep Search file contents ● on default - impact What else a change affects ● on default - lsp_diagnostics Errors and warnings from a language … ● on default - lsp_navigation Definitions, references and types ● on default - module_report Outline a file's symbols ● on default - read_symbol Read one function or type ● on default - symbol_search Find symbols by name ● on default - test Run the tests and read the failures ● on default - - WEB - web_fetch Read a page or a repository ● on default - web_search Search the web ● on default - - WORKFLOW - git Status, diffs, commits and pull requ… ● on default - mcp Call tools on your MCP servers ● on default + 󰆁 Conversation 2 read · write · edit · bash always on + Dock & statusline 3 + 󰖷 Tools 4 CODE + 󱌣 Agent 5 ❯ ast_grep Search and replace by code structure ● on default + debug Step through code with a debugger ○ off project + glob Find files by name ● on default + grep Search file contents ● on default + impact What else a change affects ● on default + lsp_diagnostics Errors and warnings from a language… ● on default + lsp_navigation Definitions, references and types ● on default + module_report Outline a file's symbols ● on default + read_symbol Read one function or type ● on default + symbol_search Find symbols by name ● on default + test Run the tests and read the failures ● on default + + WEB + web_fetch Read a page or a repository ● on default + web_search Search the web ● on default + + WORKFLOW + git Status, diffs, commits and pull req… ● on default + mcp Call tools on your MCP servers ● on default - ast_grep tools.disabled · Takes effect the next time Luxe starts · the default + ast_grep tools.disabled · Takes effect the next time luxe starts · the default Matches syntax rather than text, so a rename or a pattern change touches the code and not the comments or strings that look like it. Registers only where there is the ast-grep program. diff --git a/docs/guide/images/interface-peek.svg b/docs/guide/images/interface-peek.svg index 06fac3e..543bd3f 100644 --- a/docs/guide/images/interface-peek.svg +++ b/docs/guide/images/interface-peek.svg @@ -39,10 +39,10 @@ - - - - + + + + @@ -644,16 +644,16 @@ ctrl+p preview · ctrl+g review ELSEWHERE - 5 files outside this project - - MODEL - lmstudio 󰚩 qwen3.8-27b - thinking 󰌵 med - mode 󱌣 build alt+n next file · ctrl+b side-by-side diff · ctrl+g review this file · esc close + + MODEL + provider 󰅣 lmstudio + model 󰚩 qwen3.8-27b + thinking 󰌵 med + mode 󱌣 build alt+n next file · ctrl+b side-by-side diff · ctrl+g review this file · esc close SESSION - context  12% of 200k 38s · ctrl+esc to interrupt - tokens ↑21k ↓5.2k ↺21k 󱌣 build - cost $0.45 - review $0.03 + context  12% of 200k 38s · ctrl+esc to interrupt + tokens ↑21k ↓5.2k ↺21k 󱌣 build + cost $0.45 + review $0.03 diff --git a/docs/guide/images/mentions-picker.svg b/docs/guide/images/mentions-picker.svg index f78abf0..f343954 100644 --- a/docs/guide/images/mentions-picker.svg +++ b/docs/guide/images/mentions-picker.svg @@ -2,7 +2,7 @@ - + @@ -210,23 +210,32 @@ - + + + + + + + + + + @@ -630,15 +639,15 @@ 󰁥 Mention 󰈔 Files 󱐋 Skills 󰊤 GitHub 󰌃 Jira - ❯ crates/luxe-tui/src/picker.rs M - crates/luxe-tui/src/ref_provider.rs M - crates/luxe-tui/tests/mention_flyout_render.rs ? - CONTRIBUTING.md - Cargo.toml - README.md - crates/luxe-core/src/mcp_client.rs - crates/luxe-core/src/output_limit.rs - crates/luxe-mcp/src/oauth.rs + ❯ crates/luxe-tui/src/picker.rs M + crates/luxe-tui/src/ref_provider.rs M + crates/luxe-tui/tests/mention_flyout_render.rs ? + CONTRIBUTING.md + Cargo.toml + README.md + crates/luxe-core/src/mcp_client.rs + crates/luxe-core/src/output_limit.rs + crates/luxe-mcp/src/oauth.rs tab switch · enter insert · ctrl+r refresh diff --git a/docs/guide/images/quickstart-setup.svg b/docs/guide/images/quickstart-setup.svg index 549662c..1863305 100644 --- a/docs/guide/images/quickstart-setup.svg +++ b/docs/guide/images/quickstart-setup.svg @@ -5,7 +5,7 @@ - + @@ -247,44 +247,63 @@ - + + + + + + + + + + + + + + + + + + + + @@ -514,28 +533,28 @@ - 󰒓 Welcome to Luxe + 󰒓 Welcome to luxe 1 Theme 2 Provider 3 Tools 4 Start - ❯ luxe Rename the dock's headings to match the rail - nord - dracula Two headings drift from the rail's names; renaming both. - gruvbox - tokyo-night ± edit src/view/dock.rs 6ms - kanagawa 734 fn heading(section: Section) { - rose-pine -735 let label = "FILES"; - catppuccin +735 let label = "CHANGES"; - everforest 736 } - github - one-dark PLAN CHANGES MODEL - ayu - monokai info warning error success - aura - zenburn - jetbrains - noctis-bordo - panda - vesper + ❯ luxe Rename the dock's headings to match the rail + nord + dracula Two headings drift from the rail's names; renaming both. + gruvbox + tokyo-night ± edit src/view/dock.rs 6ms + kanagawa 734 fn heading(section: Section) { + rose-pine -735 let label = "FILES"; + catppuccin +735 let label = "CHANGES"; + everforest 736 } + github + one-dark PLAN CHANGES MODEL + ayu + monokai info warning error success + aura + zenburn + jetbrains + noctis-bordo + panda + vesper ↑/↓ preview · enter use this one · s skip setup ~/.config/luxe/config.json diff --git a/docs/guide/index.md b/docs/guide/index.md index 299d7c1..bb4a0dd 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -1,15 +1,15 @@ --- title: "Overview" -summary: "What Luxe is, and where to find what you need." +summary: "What luxe is, and where to find what you need." order: 0 group: "Get started" --- -Luxe is a coding agent for your terminal. It works in your project with the model you choose, +luxe is a coding agent for your terminal. It works in your project with the model you choose, then walks you through what it changed so you can review it and open a pull request without leaving the terminal. -New to Luxe? [Install](install.md) it, then follow the [Quickstart](quickstart.md). The rest of the +New to luxe? [Install](install.md) it, then follow the [Quickstart](quickstart.md). The rest of the guide is reference, for when you need it. ## Find what you need @@ -25,10 +25,10 @@ guide is reference, for when you need it. | Resume a session, or see what fills the context | [Sessions and context](sessions.md) | | See what the agent can use | [Tools](tools.md) | | Let the agent work through a plan on its own | [Autonomous runs](loop.md) | -| Reach your sessions from your phone or tablet | [Luxe on your phone](remote.md) | +| Reach your sessions from your phone or tablet | [luxe on your phone](remote.md) | | Change the theme, keys or statusline | [Configuration](configuration.md) | | Give the agent your project's conventions | [Project context](project-context.md) | -| Add tools, skills or your own commands | [Extending Luxe](extending.md), [Recipes](recipes.md) | +| Add tools, skills or your own commands | [Extending luxe](extending.md), [Recipes](recipes.md) | | Control what the agent may do | [Security and permissions](security.md) | | Look up a command, flag or environment variable | [Command line](cli.md), [Environment variables](environment.md) | | Fix something that is not working | [Troubleshooting](troubleshooting.md) | @@ -36,14 +36,14 @@ guide is reference, for when you need it. ## Help - **Help** (`/help`) lists every key for the screen you are on, with any you have rebound. -- `luxe doctor` checks which language servers, debuggers and tools Luxe can use on your machine. +- `luxe doctor` checks which language servers, debuggers and tools luxe can use on your machine. - [Troubleshooting](troubleshooting.md) covers common problems and how to report a bug. - Problems and questions: [GitHub issues](https://github.com/evanwhittaker/luxe/issues). -## Ask Luxe +## Ask luxe -This guide is built into Luxe, for the version you have installed. Ask the agent how to do -something in Luxe, such as *how do I add an MCP server?*, and it reads the answer from the guide +This guide is built into luxe, for the version you have installed. Ask the agent how to do +something in luxe, such as *how do I add an MCP server?*, and it reads the answer from the guide rather than guessing. You can read it yourself too: ```bash @@ -57,4 +57,4 @@ luxe docs --search "on_ask" Every page is also plain markdown, at the same address with `.md` on the end: `https://luxe.dev/docs/install.md`. [`llms.txt`](https://luxe.dev/llms.txt) lists every page with a one-line summary, and [`llms-full.txt`](https://luxe.dev/llms-full.txt) is the whole guide in one -file. Inside Luxe, `luxe docs` serves the same pages offline. +file. Inside luxe, `luxe docs` serves the same pages offline. diff --git a/docs/guide/install.md b/docs/guide/install.md index 7eab47e..47d7088 100644 --- a/docs/guide/install.md +++ b/docs/guide/install.md @@ -1,6 +1,6 @@ --- title: "Install" -summary: "Install Luxe, check your setup, and pick a font." +summary: "Install luxe, check your setup, and pick a font." order: 1 group: "Get started" --- @@ -24,6 +24,11 @@ With Homebrew, on macOS or Linux: brew install evanwhittaker/tap/luxe ``` +Homebrew finishes with a line that names the installed version; run `luxe --version` +to check. Since Homebrew 6, a tap has to be trusted before its code runs. The full name above +trusts luxe's formula for you, but Homebrew can still stop on *another* tap you already have. If it +names one, trust it with `brew trust /`, or remove it with `brew untap`. + With Cargo, which builds it, so you need Rust 1.89 or newer ([rustup](https://rustup.rs) installs one): @@ -43,7 +48,7 @@ about your policy is saved. Any of them installs the `luxe` command; `luxe --version` checks it worked. -To update, run `luxe update`, or `/update` inside Luxe. Luxe checks once a day for a newer release +To update, run `luxe update`, or `/update` inside luxe. luxe checks once a day for a newer release and says so on the start screen; see [Updates](configuration.md#updates) for how it updates and how to turn the check off. @@ -67,17 +72,17 @@ cargo build --release ## Requirements -Luxe runs natively on Linux, macOS and Windows. Only a terminal and a model are required. +luxe runs natively on Linux, macOS and Windows. Only a terminal and a model are required. | | | | --- | --- | | **Terminal** | Any current terminal with UTF-8. On Windows, use Windows Terminal. | | **Model** | An API key, a ChatGPT, Copilot or OpenRouter subscription, or a local server such as LM Studio or Ollama. See [Providers](providers.md). | -| **Git** | For reviewing changes and working in worktrees. Without a repository, Luxe runs with nothing to review. | +| **Git** | For reviewing changes and working in worktrees. Without a repository, luxe runs with nothing to review. | | **GitHub CLI** | Optional. `gh`, signed in, for issues and pull requests. | | **A Nerd Font** | Optional, for icons. See [Fonts](#fonts). | -Luxe also uses these when they are installed: +luxe also uses these when they are installed: - `ast-grep`, for structural search. - A language server per language, for code intelligence. See [Code @@ -90,7 +95,7 @@ Luxe also uses these when they are installed: luxe doctor ``` -`luxe doctor` lists the tools, language servers and debug adapters Luxe found, which ones work, and +`luxe doctor` lists the tools, language servers and debug adapters luxe found, which ones work, and how to install what is missing: ``` @@ -106,7 +111,7 @@ Language servers ## Fonts -Luxe draws its icons from a [Nerd Font](https://www.nerdfonts.com/) when your terminal has one. +luxe draws its icons from a [Nerd Font](https://www.nerdfonts.com/) when your terminal has one. Without one, it falls back to plain characters on its own, and every icon has a word beside it, so nothing becomes unreadable. @@ -134,7 +139,7 @@ desktop's font instead. To check what a name resolves to: fc-match -f '%{file}\n' "JetBrainsMono NFM" ``` -JetBrains Mono lacks six symbols Luxe draws (`ℹ︎ ↳︎ ↺︎ ⏸︎ ✔︎ ✖︎`), and your system fills them in +JetBrains Mono lacks six symbols luxe draws (`ℹ︎ ↳︎ ↺︎ ⏸︎ ✔︎ ✖︎`), and your system fills them in from another font. For every character from one face, use **IosevkaTerm** or **Adwaita Mono**: ```bash @@ -145,26 +150,26 @@ scoop install nerd-fonts/IosevkaTerm-NF-Mono nerd-fonts/AdwaitaMono-NF-Mono ``` To use the wider icons anyway, set `"glyphs": "nerd_wide"` in -[`config.json`](configuration.md), and Luxe gives each icon two cells. +[`config.json`](configuration.md), and luxe gives each icon two cells. ## On Windows -Install [Git for Windows](https://gitforwindows.org/). Luxe finds its `bash` even though it is not +Install [Git for Windows](https://gitforwindows.org/). luxe finds its `bash` even though it is not on `PATH`, and the agent needs a POSIX shell for most commands. Without one, commands run through `cmd.exe`, which handles `cargo test` or `npm run build` but not much else. -If WSL is installed, Luxe skips the `bash.exe` in `System32`, which would run commands inside Linux +If WSL is installed, luxe skips the `bash.exe` in `System32`, which would run commands inside Linux against a different filesystem. Python on Windows is `py` or `python`. `python3` is usually the Microsoft Store's placeholder, so -Luxe tries `py -3` first. For the Python debugger, run `py -m pip install debugpy`. The agent's +luxe tries `py -3` first. For the Python debugger, run `py -m pip install debugpy`. The agent's commands run Python in UTF-8 mode (`PYTHONUTF8=1`) unless you have set it yourself, so output with characters outside your code page doesn't crash them. -Windows Terminal keeps a column at the right edge for its scrollbar. To give it to Luxe, set +Windows Terminal keeps a column at the right edge for its scrollbar. To give it to luxe, set **Scrollbar visibility** to **Hidden** in your profile's **Appearance** settings. -## Where Luxe keeps files +## Where luxe keeps files | | Linux and macOS | Windows | | --- | --- | --- | @@ -174,9 +179,9 @@ Windows Terminal keeps a column at the right edge for its scrollbar. To give it An `XDG_CONFIG_HOME`, `XDG_STATE_HOME` or `XDG_CACHE_HOME` you have set wins on every platform. `LUXE_CONFIG_DIR` moves every configuration file, API key and provider sign-in. `LUXE_STATE_DIR` -moves the state Luxe keeps for you: the model you last chose, MCP sign-ins, and the logs of +moves the state luxe keeps for you: the model you last chose, MCP sign-ins, and the logs of commands that only report, such as `luxe auth`. -Inside a project, Luxe keeps its sessions, logs and caches in `.luxe/`, with a `.gitignore` that +Inside a project, luxe keeps its sessions, logs and caches in `.luxe/`, with a `.gitignore` that keeps all of it out of Git except the files a team may want to share: `permissions.json`, `mcp.json`, `hooks.json` and `skills/`. diff --git a/docs/guide/interface.md b/docs/guide/interface.md index 1a668f2..892eddd 100644 --- a/docs/guide/interface.md +++ b/docs/guide/interface.md @@ -2,7 +2,7 @@ title: "The interface" summary: "The start screen, the conversation, the composer, the dock, the statusline and the preview." order: 3 -group: "Using Luxe" +group: "Using luxe" --- ![The dock beside the preview, showing one file's diff](images/interface-peek.svg) @@ -14,7 +14,7 @@ This page names the keys for each part of the screen. All of them, and how to re ## The start screen -Luxe opens on a prompt. Type and press `enter` to ask in a new session, or choose a row from the +luxe opens on a prompt. Type and press `enter` to ask in a new session, or choose a row from the list under it with `↑`/`↓` and `enter`. | Row | Opens | @@ -25,7 +25,7 @@ list under it with `↑`/`↓` and `enter`. | **Sessions…** | Every session in this project, searchable. `/sessions` opens it too, here or in a session. | | **Review changes** | A [Guided Review](guided-review.md) of your uncommitted changes, when there are any | | **Configuration** | Providers, credentials, [settings](configuration.md#settings) and config files, once a provider is set up | -| **Quit** | Leaves Luxe. `ctrl+c` does too, here and in a session, even mid-turn, unless a prompt or menu is open, which it answers instead. | +| **Quit** | Leaves luxe. `ctrl+c` does too, here and in a session, even mid-turn, unless a prompt or menu is open, which it answers instead. | | **RECENT** | Your other recent sessions | Typing narrows the list. The first row becomes **Ask in a new session**, and under it come the @@ -59,7 +59,7 @@ screen and opens a new session. **Start screen** in `/settings` sets the same ke ![The minimal start screen](images/interface-launcher-minimal.svg) -Luxe works on the project it was started in. To switch projects, `cd` there and run `luxe`. +luxe works on the project it was started in. To switch projects, `cd` there and run `luxe`. ## The conversation @@ -158,7 +158,7 @@ conversation, or in its place below 80 columns. `mode` is `auto` (beside the conversation when there is room), `shown` or `hidden`. Drag the line between the dock and the conversation to make the dock wider or narrower. It stays -that width the next time Luxe starts; double-click the line to put it back. +that width the next time luxe starts; double-click the line to put it back. ### Files @@ -264,12 +264,12 @@ scrollbar to scroll, or press anywhere on it to jump. The lines between panes move: the dock's, the preview's, and the one beside a review's guide. A line lights under the pointer; drag it to resize the pane beside it, or double-click it to put the pane -back to its own width. Luxe remembers the widths for next time. +back to its own width. luxe remembers the widths for next time. Drag across the conversation or the composer to select, and the selection is copied when you let go. Click a message to copy all of it. `ctrl+insert` or `ctrl+shift+c` copies a selection too. -Your terminal's own copy key reaches Luxe only if the terminal passes it through. Either hold +Your terminal's own copy key reaches luxe only if the terminal passes it through. Either hold `shift` (`option` on macOS) while dragging, to make a selection the terminal copies itself, or let the copy key fall through when the terminal has nothing selected. In Ghostty: @@ -277,7 +277,7 @@ the copy key fall through when the terminal has nothing selected. In Ghostty: keybind = performable:control+insert=copy_to_clipboard ``` -Luxe copies to the desktop clipboard, and over SSH through the terminal (OSC 52). Inside tmux, +luxe copies to the desktop clipboard, and over SSH through the terminal (OSC 52). Inside tmux, that needs `set -g set-clipboard on`. `/mouse off` hands the mouse back to the terminal for the session, and `"mouse": false` in diff --git a/docs/guide/loop.md b/docs/guide/loop.md index 72947a5..59167b1 100644 --- a/docs/guide/loop.md +++ b/docs/guide/loop.md @@ -2,7 +2,7 @@ title: "Autonomous runs" summary: "Let the agent work through a phased plan on its own, with tests and a reviewer at each phase." order: 12 -group: "Using Luxe" +group: "Using luxe" --- `luxe loop` runs the agent on its own, phase by phase through your plan. A phase only counts as done @@ -55,7 +55,7 @@ A run uses your session's model, or `--model`. Only one run at a time works in a ## Check each phase -When the agent says a phase is done, Luxe checks it before moving on: +When the agent says a phase is done, luxe checks it before moving on: 1. **Your commands.** Each must pass. 2. **A reviewer**, if `gate.review` is on and the commands passed. It runs in a fresh session, so @@ -98,13 +98,22 @@ phase with `luxe loop phase --set `. A run prints one line per step, timed from its start: ```text - 19s write logstats.py - 49s test python3 -m unittest -q - 1m09s phase 0 claimed complete — running the gate - 1m31s the acceptance commands passed — asking the reviewer - 2m34s phase 0 accepted — now on phase 1 + 0s ┃ phase 0 + 0s ┃ ┌ start + 19s ┃ │ ✓ write logstats.py + 49s ┃ │ ✗ test python3 -m unittest -q · failed + 1m09s ┃ │ phase 0 claimed complete — running the gate + 1m31s ┃ │ the acceptance commands passed — asking the reviewer + 2m34s ┃ │ phase 0 accepted — now on phase 1 + 2m40s ┃ └ turn ended · 6 tools · 2m40s + 2m41s ┃ phase 1 + 2m41s ┃ ┌ iteration 1 ``` +The heavy rail on the left marks the phase, in a color of its own, and the bracket inside it marks +each iteration. In a terminal, a tool's line shows `○` while it runs, then turns green with `✓` or +red with `✗` when it ends. Piped to a file there's no color, and a failure gets a line of its own. + `luxe loop status` shows what it has cost, by model: ```text diff --git a/docs/guide/mcp.md b/docs/guide/mcp.md index 9194f0e..4471bba 100644 --- a/docs/guide/mcp.md +++ b/docs/guide/mcp.md @@ -6,7 +6,7 @@ group: "Extend" --- An [MCP](https://modelcontextprotocol.io) server gives the agent new tools: a browser, a database, -your issue tracker. Luxe reaches every server through one `mcp` tool, so a server's tools cost +your issue tracker. luxe reaches every server through one `mcp` tool, so a server's tools cost nothing in a request until the agent looks for them: ```text @@ -44,14 +44,14 @@ removed by editing that file. `luxe mcp list` starts nothing: it shows every con disabled ones included, and marks a project's entries `not started (project)`, with or without `--trust-project`. In a session, `/mcp` shows each server, how it connects and its tools. -Luxe also reads `~/.config/mcp/mcp.json`, and a project's `.mcp.json` and `.luxe/mcp.json`. Where +luxe also reads `~/.config/mcp/mcp.json`, and a project's `.mcp.json` and `.luxe/mcp.json`. Where two files name the same server, the project's wins. ### Server settings | Key | Does | | --- | --- | -| `command`, `args`, `env` | Start a local server. An `env` value can use `${VAR}` or `$env:VAR`; an unset one is empty, and Luxe logs which. | +| `command`, `args`, `env` | Start a local server. An `env` value can use `${VAR}` or `$env:VAR`; an unset one is empty, and luxe logs which. | | `url`, `headers` | Connect to a remote server. `headers` take `${VAR}` the same way. | | `auth` | Sign in: see [below](#sign-in) | | `lifecycle` | `lazy` (the default) connects on first use and disconnects when idle. `eager` connects at start; `keep_alive` stays connected. | @@ -75,7 +75,7 @@ A remote server signs in with a token or with OAuth. } ``` -For OAuth, sign in once in a browser, and Luxe refreshes the token from then on: +For OAuth, sign in once in a browser, and luxe refreshes the token from then on: ```bash luxe mcp login --id linear @@ -83,7 +83,7 @@ luxe mcp login --id linear The agent never starts a sign-in. Tokens are kept in `~/.local/state/luxe/mcp-auth.json`, readable only by you. With `LUXE_STATE_DIR` set they are kept there instead, so a moved state directory does -not share the default one's sign-ins. If that file stops being valid JSON, Luxe moves it to +not share the default one's sign-ins. If that file stops being valid JSON, luxe moves it to `mcp-auth.json.bad` (or a dated name, if one is already there) rather than write over it, and you sign in again. @@ -156,7 +156,7 @@ A server's descriptions and results are treated as information, never as instruc ### Servers a project brings -A project's `.mcp.json` names programs that would run on your machine. Luxe starts a project's +A project's `.mcp.json` names programs that would run on your machine. luxe starts a project's servers in an interactive session, or with `--trust-project`, but not in a headless or loop run. To decide for every run, set `lsp.project_servers` in your own config; see [Tools](tools.md#a-server-the-project-installed). diff --git a/docs/guide/mention-sources.md b/docs/guide/mention-sources.md index f85868f..be65d4e 100644 --- a/docs/guide/mention-sources.md +++ b/docs/guide/mention-sources.md @@ -27,14 +27,14 @@ row, and the agent receives the text your program gave for it. | `icon` | One Nerd Font glyph for the tab, as the character or a JSON escape. Without one, the tab shows a tag; without a Nerd Font, a plain mark. | Sources are read from your own config only, since each one runs a program. Their tabs come after -Luxe's own: Files, Skills, GitHub and MCP, whose kinds `file`, `skill`, `github` and `mcp` are +luxe's own: Files, Skills, GitHub and MCP, whose kinds `file`, `skill`, `github` and `mcp` are taken. Two sources with the same kind get one tab, the first's. ## What the program prints -Luxe runs the program, in the project, the first time its tab opens, and lists what it prints: one -JSON object per line. The rows are kept until Luxe exits, so a new ticket, or a change to your -script, shows up the next time you start Luxe. The program has no terminal and no stdin, so it +luxe runs the program, in the project, the first time its tab opens, and lists what it prints: one +JSON object per line. The rows are kept until luxe exits, so a new ticket, or a change to your +script, shows up the next time you start luxe. The program has no terminal and no stdin, so it cannot prompt for a sign-in. ```json @@ -54,7 +54,7 @@ wrong. If the program fails, the tab shows the last line it wrote to stderr, or and it runs again the next time the tab opens. Make `text` enough for the agent to find the rest: a title and a link, or an ID it can look up with -a CLI or an MCP server. A mention you type by hand, or one not picked since Luxe started, reaches +a CLI or an MCP server. A mention you type by hand, or one not picked since luxe started, reaches the agent as `Jira PROJ-12` alone. What a tracker says is other people's words, and it reaches your model provider once you mention it. @@ -75,4 +75,4 @@ jq -c --arg site "$site" '.issues[] | { ``` Make it executable (`chmod +x`), put it on your `PATH`, and add the Jira entry above. For Asana, -see [Recipes](recipes.md#asana). Or ask Luxe to write one for the tracker you use. +see [Recipes](recipes.md#asana). Or ask luxe to write one for the tracker you use. diff --git a/docs/guide/mentions.md b/docs/guide/mentions.md index f0b12ee..80a77ac 100644 --- a/docs/guide/mentions.md +++ b/docs/guide/mentions.md @@ -2,7 +2,7 @@ title: "Mentions" summary: "Point the agent at a file, skill, issue, MCP server or your own tracker with `@`." order: 5 -group: "Using Luxe" +group: "Using luxe" --- Type `@` at the start of a word in the composer to mention something. The picker opens on your diff --git a/docs/guide/phone/remote-permission.png b/docs/guide/phone/remote-permission.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3d1118fe5ca40c22134e135aeda7940f84e6c2 GIT binary patch literal 77027 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 z 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.json`, with the `address` to connect to: a Unix socket, or a named pipe on Windows. Connect there yourself to skip `luxe join`. To stop sessions being joined, set [`joinable`](configuration.md#joining-a-session) to `false`. @@ -140,12 +140,12 @@ To stop sessions being joined, set [`joinable`](configuration.md#joining-a-sessi | `load_file_diff` | `{"request_id": "…", "path": "src/main.rs"}` | One file's change, outside any review; answered by `file_diff_loaded` | | `list_directory` | `{"request_id": "…", "path": "src"}` | One project folder's entries, without what `.gitignore` ignores unless `"include_ignored": true`, which marks each such entry `"ignored": true`; answered by `directory_listed` | | `read_project_file` | `{"request_id": "…", "path": "src/main.rs"}` | One project file's text, up to 2 MB; answered by `project_file_read` | -| `introduce` | `{"name": "iPhone"}` | A joined client's name, which the interface uses when it says who joined or answered. Add `"watch_only": true` as your first line to read without being announced; Luxe then drops everything else you send. `"yours": true` says the person at the terminal paired it, so it's listed without a line in the conversation. Refused from the client that started the session. | +| `introduce` | `{"name": "iPhone"}` | A joined client's name, which the interface uses when it says who joined or answered. Add `"watch_only": true` as your first line to read without being announced; luxe then drops everything else you send. `"yours": true` says the person at the terminal paired it, so it's listed without a line in the conversation. Refused from the client that started the session. | | `close` | | Shut down, stopping a turn in flight the way `cancel` does. The stream ends after it. | ### Guided Review -A review is loaded with `load_guided_review`. Luxe answers with `guided_review_loaded`, which +A review is loaded with `load_guided_review`. luxe answers with `guided_review_loaded`, which carries the whole review (its `id`, `revision_id`, files, hunks and chapters), and then always `review_session_restored`, which carries its comments. Everything below names the review by its `id`. An action for a review that is no longer the open one is refused. @@ -182,7 +182,7 @@ goes in `edit`, beside `request_id` and `review_id`: as `review_session_saved` while it runs: the agent's answer to a question, and its report on a fix, are recorded on the comments. You can keep editing while it works. -Each comment's `thread` says who said what, by `author`: `reviewer`, `agent`, or `system` for Luxe's +Each comment's `thread` says who said what, by `author`: `reviewer`, `agent`, or `system` for luxe's own word. A fix turn that ends with no report on a comment leaves a `system` entry saying why, and the comment stays `open`. @@ -203,7 +203,7 @@ the comment stays `open`. | `prepare_thread_answers` | `{"request_id", "review_id"}` | Whether your fixes are pushed yet, on your own pull request; answered by `thread_answers_prepared` | | `answer_threads` | `{"request_id", "review_id", "answers": [{"finding_id", "reply", "resolve"}]}` | Reply to and resolve its threads, each named by the comment it became. **A GitHub write.** | -The `open_*` and `post_*` actions confirm a preview by its `request_id`. Luxe keeps what it +The `open_*` and `post_*` actions confirm a preview by its `request_id`. luxe keeps what it prepared, so you send back only what a person can change: a title, a description, a verdict. `post_pull_request_review` is refused if the comments changed after the `session_revision` you drew the preview from, so what posts is what you showed. A failed open or post can be confirmed again; @@ -222,16 +222,16 @@ These go through your own `gh`, as the interface's `/github` and `/pr` do. `repo | `read_github_conversation` | `{"number": 142, "pull_request": true}` | Everything said on it; answered by `github_conversation_read` | | `draft_github_reply` | `{"request_id": "…", "number": 142, "pull_request": true, "target": {…}, "conversation": […]}` | The agent drafts a reply in a turn that changes nothing; answered by `github_reply_drafted`. `target` and `conversation` are what `github_conversation_read` gave you. | | `check_pull_request_fix` | `{"number": 142}` | Whether it can be checked out here to fix; answered by `pull_request_fix_checked` | -| `plan_restack` | `{"request_id": "restack:…"}` | What restacking this branch's stack would do; answered by `restack_planned`. Luxe keeps the plan. | +| `plan_restack` | `{"request_id": "restack:…"}` | What restacking this branch's stack would do; answered by `restack_planned`. luxe keeps the plan. | | `check_worktree_removal` | | What the session's worktree has not committed; answered by `worktree_removal_checked` | -| `set_focus` | `{"focused": false}` | Whether your window has focus. Luxe checks GitHub less often while it does not. | +| `set_focus` | `{"focused": false}` | Whether your window has focus. luxe checks GitHub less often while it does not. | | `link_pull_request` | `{"number": 142, "url": "…"}` | Record that this session worked on that pull request | | `post_github_comment` | `{"number": 142, "thread": "PRRT_…", "body": "Fixed."}` | Post a reply in a thread, or a comment without `thread`; answered by `github_comment_posted`. **A GitHub write.** | | `change_pull_request` | `{"number": 142, "write": {"change": "mark_ready"}}` | `update_branch`, `mark_ready`, `merge`, `enable_auto_merge` or `disable_auto_merge`; answered by `pull_request_changed`. **A GitHub write.** | | `restack` | `{"request_id": "restack:…"}` | Push the plan `plan_restack` made under that id, exactly as planned; answered by `restacked` or `restack_failed`. **A GitHub write.** | -You confirm a restack by its id, not by sending the plan back: Luxe pushes the plan it showed you. A -newer `plan_restack` replaces the older plan, and a plan is pushed once. Before pushing, Luxe checks +You confirm a restack by its id, not by sending the plan back: luxe pushes the plan it showed you. A +newer `plan_restack` replaces the older plan, and a plan is pushed once. Before pushing, luxe checks that every moving branch here is where the plan saw it, checked out where it was, and clean, and refuses with `restack_failed` otherwise. A push that did not finish is also `restack_failed`, and its message says to check the branches on GitHub, since some may have moved. If the push succeeds @@ -256,7 +256,7 @@ There are around sixty. These are the ones a front end is built on: | `kind` | Is | | --- | --- | -| `ready` | The handshake: protocol version, Luxe version, session ID, directory | +| `ready` | The handshake: protocol version, luxe version, session ID, directory | | `token_delta`, `thinking_delta` | The reply and reasoning as they stream. `block` orders them. | | `tool_call_composing` | The model has started writing a tool call. Optional; useful for showing a `write` filling in. | | `tool_started`, `tool_progress`, `tool_completed`, `tool_ended` | A tool call's progress, by `call_id`. `tool_completed` carries its output. | @@ -266,7 +266,7 @@ There are around sixty. These are the ones a front end is built on: | `question_asked` | **Answer it** with `answer_question` | | `turn_started` | A turn began, from any client. It comes before the turn's message is saved, and `turn_ended` always follows. A client joining mid-turn gets it as part of catching up. | | `turn_ended` | The turn finished; `reason` says why | -| `provider_retrying` | The provider failed before answering, and Luxe is trying again | +| `provider_retrying` | The provider failed before answering, and luxe is trying again | | `state_changed` | Model, thinking level, mode, and whether a turn is running | | `plan_written` | Plan mode wrote `path`. The interface offers the plan's next step when the turn ends. | | `review_started`, `review_finished` | A requested review began on `model`, and came back with a `verdict` (`continue`, `fix` or `unavailable`) and `findings`. On `fix` the findings also become the agent's next turn. | @@ -288,7 +288,7 @@ Guided Review, as the interface sees it: | `guided_review_guide_updated` | Better chapters and a summary replaced the first ones, for the same pinned revision | | `review_session_restored` | The comments and progress that go with the review just loaded. It always follows `guided_review_loaded`, after a restart too. | | `open_review_shown` | The answer to `show_open_review`, under its `request_id`: the open `review` and its `session`, or neither when no review is open. `reading` says what each chapter asks of the reader: `needs_review` items, and the `reason` when one thing accounts for all of them. | -| `review_session_saved`, `review_session_save_failed` | A change to them was stored, or refused. Luxe reports its own changes this way too: a turn starting, the agent's report, a review posted. | +| `review_session_saved`, `review_session_save_failed` | A change to them was stored, or refused. luxe reports its own changes this way too: a turn starting, the agent's report, a review posted. | | `review_feedback_turn_dispatched`, `review_feedback_turn_completed`, `review_feedback_turn_failed` | Feedback you sent reaching the agent, and how its turn went | | `review_questions_answered`, `remediation_reported` | The agent's answer to a question, and its report on a fix | | `review_committed`, `review_commit_failed` | Committing a review's chapters | @@ -330,7 +330,7 @@ list is closed. - Nothing listens on the network. A [joined](#join-a-running-session) session takes connections on a local socket or pipe that only your user account can open, and turns away any program the agent itself started, so the agent can't answer its own prompts. -- Permission rules are enforced inside Luxe. A client cannot weaken a `deny`: reading `.env` is +- Permission rules are enforced inside luxe. A client cannot weaken a `deny`: reading `.env` is refused here as everywhere. - Prompts go to your client to answer. To approve everything, send `set_permission_auto_approve` or start with `--auto-approve`. `--on-ask` is refused, since your client can answer. @@ -339,15 +339,15 @@ list is closed. ### GitHub writes Your client can read GitHub without asking. To let it publish there (post a comment or a review, -answer threads, open, change, merge or restack a pull request), start Luxe with `--github-writes`. +answer threads, open, change, merge or restack a pull request), start luxe with `--github-writes`. Without it, those actions are refused with `action_rejected`, and `ready` says `"github_writes": false` so you can hide them. - **Read-only wins.** With `--read-only`, or a read-only mode in your permissions file, the writes are refused even with the flag, and so is `commit_review_chapters`. -- **It is a flag, not a setting.** Whoever starts Luxe decides, for that session. No config file +- **It is a flag, not a setting.** Whoever starts luxe decides, for that session. No config file turns it on, and a project cannot. - **It covers your client, not the agent.** The agent's own GitHub writes are permission rules: they ask first, and the prompt comes to your client. See [Security](security.md#when-you-step-away). -Luxe is not a sandbox. To isolate it, run it in a [container](security.md#isolation). +luxe is not a sandbox. To isolate it, run it in a [container](security.md#isolation). diff --git a/docs/guide/security.md b/docs/guide/security.md index 4f42822..ec738ec 100644 --- a/docs/guide/security.md +++ b/docs/guide/security.md @@ -1,11 +1,11 @@ --- title: "Security and permissions" -summary: "What the agent may do, the rules and prompts that decide it, secrets, and what Luxe sends over the network." +summary: "What the agent may do, the rules and prompts that decide it, secrets, and what luxe sends over the network." order: 1 group: "Reference" --- -The agent reads and writes files and runs commands on your machine. Luxe lets ordinary work through +The agent reads and writes files and runs commands on your machine. luxe lets ordinary work through without asking, keeps a few guardrails on at all times, and gives you rules to tighten the rest. For real isolation, run it in a [container](#isolation). @@ -105,7 +105,7 @@ open. They don't sandbox a language server, which can index other files and runs code. A project's `.luxe/permissions.json` can only make your rules stricter, never looser, unless you -start Luxe with `--trust-project`. +start luxe with `--trust-project`. ## The permission prompt @@ -151,11 +151,11 @@ which then sees the conversation and can answer its prompts. That makes who may question: - **Only your user account.** The socket sits in a folder only you can open, only you can use it, - and Luxe checks the account of whatever connects. On Windows the named pipe admits your account + and luxe checks the account of whatever connects. On Windows the named pipe admits your account alone, and refuses remote clients. Nothing listens on the network. - **Not the agent.** A program the agent started, at any depth, is turned away, so it can't - approve its own prompts. Luxe checks the joining process's ancestry. It can't see past a program + approve its own prompts. luxe checks the joining process's ancestry. It can't see past a program that detaches from its parent, such as one started with `setsid` and left running after its parent exits, so treat this as a tripwire, not a wall. A command that would do that should be something your rules ask about. @@ -166,19 +166,19 @@ Anything running as you can already read your sessions on disk and your credenti adds a way to steer, not a way to read. To turn it off, set [`joinable`](configuration.md#joining-a-session) to `false`. -## Luxe remote +## luxe remote -[`luxe remote`](remote.md) is the one part of Luxe that answers network requests, and it is off +[`luxe remote`](remote.md) is the one part of luxe that answers network requests, and it is off until you run it. It puts your sessions in reach of your phone, so it takes two things to get in: - **Your Tailscale login.** The bridge listens on this machine only (`127.0.0.1`) and refuses to listen anywhere else. Tailscale Serve carries it to your tailnet over HTTPS and adds the login of whoever is asking, replacing any the request brought. A request without one didn't come through - Serve and is refused, and so is a login other than yours or one you `--allow`. Luxe never uses + Serve and is refused, and so is a login other than yours or one you `--allow`. luxe never uses Tailscale Funnel, which would publish it to the internet. - **A paired device.** Any program on this machine can reach a local port and claim a login, so every session also needs the credential a device gets when it pairs. An invitation works once, - within ten minutes. Luxe keeps only a hash of each invitation and credential, in + within ten minutes. luxe keeps only a hash of each invitation and credential, in `~/.config/luxe/remote.json`. The device keeps its credential in a cookie scripts can't read, sent only over HTTPS and never with a request from another site; a request a page on another site makes is refused too. @@ -192,28 +192,28 @@ Notifications are off until you turn them on in the app, one device at a time, a answer anything: a notification says what is waiting and where, such as "Approve bash" over the folder's name, never the command, and answering takes the app. While any device has them on, the bridge joins each running session to watch for prompts. It joins watch-only: the terminal doesn't -announce it, and Luxe drops anything it sends, so a client nobody sees can't act. Each +announce it, and luxe drops anything it sends, so a client nobody sees can't act. Each notification is sealed so only that device can read it (RFC 8291) and posted to the push service the device's browser picked; the push service sees when, not what. The bridge posts only to Apple's, Google's, Mozilla's and Microsoft's push services, so a paired device can't aim it at anything else on your network. It signs with a key of its own, kept in `remote.json`, and revoking a device ends its notifications. -The bridge starts Luxe only in a folder a device asks for, as you, in a herdr pane when herdr is -already running and as its own `luxe --rpc` otherwise. A packager can build Luxe without the +The bridge starts luxe only in a folder a device asks for, as you, in a herdr pane when herdr is +already running and as its own `luxe --rpc` otherwise. A packager can build luxe without the `remote` feature, which leaves out the bridge entirely. -A session is open in one Luxe at a time. A second `luxe --resume` of a session the interface +A session is open in one luxe at a time. A second `luxe --resume` of a session the interface already has, or a resume from the session list, is refused and says which process has it. The lock is the operating system's, so a crash never leaves a session stuck. ## Secrets -- Credentials are stored in `~/.config/luxe/auth.json`, readable only by you. Luxe warns if +- Credentials are stored in `~/.config/luxe/auth.json`, readable only by you. luxe warns if `auth.json` or `models.json` can be read by others. - A key is found in this order: `--api-key` or `LUXE_API_KEY`, then what you signed in with, then the provider's own variable, then a provider block in `auth.json` or `models.json`. For a provider - Luxe does not know, the block comes before `OPENAI_API_KEY`. The order is the same for the + luxe does not know, the block comes before `OPENAI_API_KEY`. The order is the same for the provider a session starts on and for one you switch to in `/model`. - A key can be `$VAR` or `!command` rather than the value, so it never sits in a file. A command runs when a key is needed, so treat these files like your shell's startup file. It runs from your @@ -221,7 +221,7 @@ is the operating system's, so a crash never leaves a session stuck. needs a graphical prompt. - Anything that looks like a secret (API keys, tokens, private keys, passwords in URLs) is removed from tool output before the model, the transcript, hooks or the log see it. So is every key and - token Luxe itself has used or loaded, whatever it looks like, including `$VAR` and `!command` + token luxe itself has used or loaded, whatever it looks like, including `$VAR` and `!command` keys and MCP tokens, as long as it is at least 8 characters. - MCP sign-in tokens are kept in `~/.local/state/luxe/mcp-auth.json`, outside your config folder, so a dotfiles repository never carries them. @@ -275,23 +275,23 @@ Opening a repository should not run its code. So, without `--trust-project`: [Tools](tools.md#a-server-the-project-installed). Its `AGENTS.md` and skills, including the ones it commits in `.agents/skills/`, still reach the -model, because your own project's are the point of the feature. Luxe removes text a reviewer +model, because your own project's are the point of the feature. luxe removes text a reviewer cannot see, comments and invisible Unicode, and leaves out a file it cannot finish checking; see -[What Luxe removes](project-context.md#what-luxe-removes). Plain text is still instructions, so read +[What luxe removes](project-context.md#what-luxe-removes). Plain text is still instructions, so read an unfamiliar repository's `AGENTS.md` as you would its `Makefile`. Text from GitHub, such as issues and comments, is filtered the same way and given to the agent as someone else's words, not as instructions. So are MCP servers' descriptions and results. A language server can run project code itself: rust-analyzer runs `build.rs`. Treat opening a -repository in Luxe like building it. +repository in luxe like building it. -A repository the agent fetches with `web_fetch` is different: you never chose to open it. Luxe +A repository the agent fetches with `web_fetch` is different: you never chose to open it. luxe clones it into `.luxe/gh-cache/` with symbolic links flattened to plain files, and starts no language server or formatter there; see [Tools](tools.md#github-repositories). ### Isolation -Rules are a policy, not a sandbox. For hard isolation, run Luxe in a container that mounts only the +Rules are a policy, not a sandbox. For hard isolation, run luxe in a container that mounts only the project: ```bash @@ -302,9 +302,9 @@ docker run --rm -it -v "$PWD":/work -w /work -e ANTHROPIC_API_KEY ` | @@ -40,7 +40,7 @@ threshold. A price you set in `models.json` replaces the catalog's, tiers and al Anthropic keeps a cached prompt for five minutes after it was last read. A turn that waits longer than that, on a slow command, a permission prompt or a question, loses the cache, and the next request pays to write the whole conversation again: about $2 on a 400k-token Opus session. So while -a turn runs, Luxe re-sends its last request with a one-token reply just before the five minutes are +a turn runs, luxe re-sends its last request with a one-token reply just before the five minutes are up. That costs a cache read, a tenth of the write it saves. `agent.cache_warming` decides when: @@ -52,7 +52,7 @@ up. That costs a cache read, a tenth of the write it saves. | `off` | Never | A refresh goes out only when it is expected to save at least $0.05, so a short conversation is -never refreshed. Between turns Luxe cannot know you will reply, so `idle` refreshes only a large +never refreshed. Between turns luxe cannot know you will reply, so `idle` refreshes only a large conversation. On real sessions it lost money overall, which is why it is not the default. Refreshes are never sent on a subscription plan, or for an Anthropic model using a fixed thinking budget, whose cache would change on replay. Their cost shows under **cache warming** in `/cost`. @@ -82,7 +82,7 @@ more on every turn instead of on each pause. | tool schemas | The tools the agent can call | `tools.disabled`; see [Tools](tools.md) | | instructions | Your `AGENTS.md` files | A shorter file; see [Project context](project-context.md) | | skills | The list of skills the agent can load | Fewer, or shorter descriptions | -| harness | Luxe's own instructions | Nothing; this is fixed | +| harness | luxe's own instructions | Nothing; this is fixed | | appended | One-time context added to a resumed session, such as what changed while you were away | `/new` | The largest single items are named under a row, which is usually how you find a `read` or `bash` @@ -90,7 +90,7 @@ call that should have been narrower. The total is what the provider reported for ## Compaction -When a conversation fills 90% of the usable window, Luxe summarizes it and carries on, keeping the +When a conversation fills 90% of the usable window, luxe summarizes it and carries on, keeping the most recent part word for word. The summary records the goal, constraints, progress, decisions, next steps and the files the session touched. You see a line like `Compacted the conversation — 82k → 21k of context.` @@ -99,7 +99,7 @@ next steps and the files the session touched. You see a line like conversation that already fits in what `keep_recent` keeps has nothing to summarize, and `/compact` says so. -Before summarizing, from 80% full, Luxe first replaces old tool output in the request with a short +Before summarizing, from 80% full, luxe first replaces old tool output in the request with a short placeholder. The session file keeps everything; only what is sent changes. To change when and how it happens: @@ -127,7 +127,7 @@ To change when and how it happens: | `summarizer` | the session's model | The model that writes the summary, as `provider/id`, on a provider you have set up. A smaller, cheaper model is usually enough, and `/cost` prices its spend as it does any other model's. | This works in a project's `.luxe/config.json` too, and so does `agent.cache_warming`, which a project -can turn down but not up. The compaction settings in `/settings` apply the next time Luxe starts. +can turn down but not up. The compaction settings in `/settings` apply the next time luxe starts. ## Long command output diff --git a/docs/guide/skills.md b/docs/guide/skills.md index 4a50449..6eadda6 100644 --- a/docs/guide/skills.md +++ b/docs/guide/skills.md @@ -21,7 +21,7 @@ One folder per skill, with a `SKILL.md` in it: | `.luxe/skills//` | This project. Git sees it too, since `.luxe/` keeps `skills/` out of what it ignores. | `.agents/skills/` is where Codex, OpenCode, Pi, GitHub Copilot and the `npx skills` installer put -skills, so one installed for any of them works here too. Luxe reads a repository's `.agents/skills/` +skills, so one installed for any of them works here too. luxe reads a repository's `.agents/skills/` from the top of the repository down to the project. When two skills share a name, whatever its case, the one lower in the table wins, so a project's skill replaces your own, and between nested `.agents/skills/` folders the deeper one wins. A skill reached twice through a symbolic link counts @@ -54,8 +54,8 @@ with a note telling the agent to read the rest of the file. The agent loads a skill when its description fits the task. To ask for one yourself, mention it: `@`, `tab` to **Skills**, and `enter`, as in *split this into a stack with @[skill:gh-stack]*. -**Project context** lists the skills Luxe found: type `skills` on the start screen and open it. A -`SKILL.md` placed directly in `skills/`, without its own folder, is skipped, and Luxe names it at +**Project context** lists the skills luxe found: type `skills` on the start screen and open it. A +`SKILL.md` placed directly in `skills/`, without its own folder, is skipped, and luxe names it at startup. The list in the agent's instructions is read with a session's first message, and again when you resume one. The `@` picker and the `skill` tool look again every time, so a skill added mid-session can be mentioned or loaded at once. @@ -76,6 +76,6 @@ itself, one level too high. A skill's text reaches the model as instructions, so read a skill before installing it, as you would a script. The same goes for a repository you clone: its `.agents/skills/` and -`.luxe/skills/` reach the model without `--trust-project`. Luxe removes comments and invisible +`.luxe/skills/` reach the model without `--trust-project`. luxe removes comments and invisible characters from skill files, as it does from [`AGENTS.md`](project-context.md#what-luxe-removes), but without a notice. diff --git a/docs/guide/tools.md b/docs/guide/tools.md index 5b0137c..c8ed7ba 100644 --- a/docs/guide/tools.md +++ b/docs/guide/tools.md @@ -2,7 +2,7 @@ title: "Tools" summary: "What the agent can use: files, the shell, tests, Git, code intelligence, a debugger and the web." order: 10 -group: "Using Luxe" +group: "Using luxe" --- ## What the agent can use @@ -50,7 +50,7 @@ the file: { "tools": { "disabled": ["web_search", "screenshot"] } } ``` -A change applies the next time Luxe starts, since the tools the agent is offered are fixed for a +A change applies the next time luxe starts, since the tools the agent is offered are fixed for a run. For one session, `luxe --no-tool web_search` turns a tool off and `luxe --with-tool web_search` @@ -71,7 +71,7 @@ their config, in the file's directory or one above it: | TypeScript, JavaScript | biome | `biome.json` or `biome.jsonc` | | TOML | taplo | `taplo.toml` or `.taplo.toml` | -A formatter that is not installed is skipped. When Luxe pipes a file through one (taplo), an empty +A formatter that is not installed is skipped. When luxe pipes a file through one (taplo), an empty answer, or a file that changed again while it ran, leaves the file as it was. To turn formatting off: @@ -92,12 +92,12 @@ reported as having had no effect; one stopped partway says so, since it may have A command that starts something and leaves it running, such as a dev server, returns when the command itself ends. The server keeps running. -Tools work from the directory Luxe was started in. A `cd` inside one `bash` call does not carry over -to the next, so start Luxe in the project you want to work on. +Tools work from the directory luxe was started in. A `cd` inside one `bash` call does not carry over +to the next, so start luxe in the project you want to work on. ## Code intelligence -After every edit, Luxe asks the file's language server for errors and warnings and adds the ones +After every edit, luxe asks the file's language server for errors and warnings and adds the ones the edit introduced to the result the agent sees, so it can fix what it broke before moving on. Problems that were already in the file are counted, not listed. The result also names changed code that no test covers. Set `LUXE_LSP_ON_EDIT=0` to turn both off. @@ -108,7 +108,7 @@ while the change is fresh. A file that was already long says nothing more. Funct in Rust, Python, Go, TypeScript and JavaScript; files in any language. Set `LUXE_SIZE_CHECK=0` to turn this off, for a project whose own conventions differ. -Luxe launches these language servers when they are installed: +luxe launches these language servers when they are installed: | Language | Server | Install | | --- | --- | --- | @@ -129,13 +129,13 @@ anywhere else, or inside a [fetched repository](#github-repositories), is refuse every file is written or none is, and the result says which edits didn't fit their file and which file operations, such as creating or renaming one, it left undone. -`/lsp` shows which servers are running, and `luxe doctor` starts each one to check it works. Luxe +`/lsp` shows which servers are running, and `luxe doctor` starts each one to check it works. luxe never installs a server itself. When one is missing, the result tells the agent the command that installs it, which runs through `bash` under your rules like any other. ### A server the project installed -Luxe prefers the copy a project installed for itself, in its `node_modules/.bin` or virtual +luxe prefers the copy a project installed for itself, in its `node_modules/.bin` or virtual environment, since that version matches the project. The same goes for formatters such as `ruff` and `biome`, and for MCP servers a project declares. Runs with nobody watching, such as `--headless` and the loop, use only what you installed yourself unless you pass `--trust-project`. @@ -165,14 +165,14 @@ use a container rather than relying on this setting. } ``` -An entry for a language Luxe already knows changes only what it names, so +An entry for a language luxe already knows changes only what it names, so `{ "rust": { "command": "rust-analyzer-nightly" } }` swaps the binary and keeps the rest. `alternatives` lists other servers to try, in order, when the first will not start. ## Debugger The `debug` tool drives a real debugger, so the agent can set breakpoints, step through code and -inspect variables rather than add print statements. After three failing test runs in a row, Luxe +inspect variables rather than add print statements. After three failing test runs in a row, luxe suggests it. `LUXE_DEBUG_NUDGE=0` turns that suggestion off. | Language | Adapter | @@ -196,9 +196,9 @@ with `lldb-dap`: ] ``` -`transport` is `stdio` (the default) or `tcp_dial_in`, for an adapter that connects back to Luxe: +`transport` is `stdio` (the default) or `tcp_dial_in`, for an adapter that connects back to luxe: put `${DAP_ADDR}` in its `command` where it takes the address, as Delve's -`dlv dap --client-addr ${DAP_ADDR}` does, and Luxe replaces it with `host:port`. +`dlv dap --client-addr ${DAP_ADDR}` does, and luxe replaces it with `host:port`. `addr_placeholder` names a different placeholder. A breakpoint the adapter could not set is listed under the launch, with the adapter's reason. An @@ -225,7 +225,7 @@ server works. Other machines on your network, cloud metadata addresses and `file including through an IPv6 address that carries one of them. A page elsewhere can't redirect a fetch to your machine, and a fetch reads at most 10 MB. `screenshot` loads only the host you asked for, so a redirect, frame or image from any other host fails to load, and it runs the browser on a fresh -profile, sandboxed unless Luxe runs as root or in a container. `LUXE_WEB_ALLOW_PRIVATE=1` lifts the +profile, sandboxed unless luxe runs as root or in a container. `LUXE_WEB_ALLOW_PRIVATE=1` lifts the address checks, allows `file://` in `screenshot`, and lets it load other hosts. A fetch gives up after 30 seconds, or `LUXE_WEB_TIMEOUT_SECS`, within the call's 60-second limit. @@ -239,7 +239,7 @@ of reading the page, so the agent can search the real files. The clone is shallo only, and goes into `.luxe/gh-cache/owner/repo` in your project, which git ignores. Reading it never asks permission, because it is inside the project. -A repository you did not write sits inside one you did, so Luxe keeps it inert: +A repository you did not write sits inside one you did, so luxe keeps it inert: - Symbolic links are checked out as plain files holding the link's target. A link cannot point the agent at your `.env`, or anywhere else outside the clone. diff --git a/docs/guide/troubleshooting.md b/docs/guide/troubleshooting.md index fbcef76..c626615 100644 --- a/docs/guide/troubleshooting.md +++ b/docs/guide/troubleshooting.md @@ -1,6 +1,6 @@ --- title: "Troubleshooting" -summary: "Common problems, where Luxe logs, and what to include in a bug report." +summary: "Common problems, where luxe logs, and what to include in a bug report." order: 4 group: "Reference" --- @@ -11,23 +11,23 @@ group: "Reference" luxe doctor ``` -It lists the tools, language servers and debug adapters Luxe found, starts each language server to +It lists the tools, language servers and debug adapters luxe found, starts each language server to check that it works, and shows how to install or fix what does not. ## Common problems | Problem | Fix | | --- | --- | -| **No model selected**, or `--headless` refuses to start | Choose one with `/model`, or pass `--model provider/id`. Luxe never picks one for you. | +| **No model selected**, or `--headless` refuses to start | Choose one with `/model`, or pass `--model provider/id`. luxe never picks one for you. | | The model picker is empty | No provider is set up. Open **Configuration** (`c`), or set a provider's key in the environment. | | A provider keeps failing with `retrying (3/3)` | It is overloaded or unreachable. See [When a provider stalls](providers.md#when-a-provider-stalls) for the time limits. | -| A setting does nothing | Luxe ignores keys it does not know, so check the spelling. `luxe init` and `/settings` write a `config.schema.json` your editor can check against. A project's file cannot change some settings; see [Configuration](configuration.md#what-a-project-cannot-change). | +| A setting does nothing | luxe ignores keys it does not know, so check the spelling. `luxe init` and `/settings` write a `config.schema.json` your editor can check against. A project's file cannot change some settings; see [Configuration](configuration.md#what-a-project-cannot-change). | | Icons show as boxes, or sit flush against their words | See [Fonts](install.md#fonts), and the `glyphs` setting in [Appearance](appearance.md#icons-and-fonts). | | Your terminal's copy key does nothing | The terminal keeps it. Hold `shift` while dragging, or let the key pass through; see [Mouse and clipboard](interface.md#mouse-and-clipboard). | | Images do not appear | Your terminal may not draw them. `/images` says why; see [Images](appearance.md#images). | | A language server is not used | `luxe doctor` says whether it starts. A server a project installed is used only when you are watching; see [Tools](tools.md#a-server-the-project-installed). | | A project's hooks or MCP servers do not run | They need `--trust-project`, or an interactive session for MCP servers. See [Security](security.md#untrusted-repositories). | -| Luxe opened the wrong folder as the project | Inside a repository, a `.luxe/` between you and its top scopes the project there. Remove it, or start Luxe somewhere else. See [Where the project begins](project-context.md#where-the-project-begins). | +| luxe opened the wrong folder as the project | Inside a repository, a `.luxe/` between you and its top scopes the project there. Remove it, or start luxe somewhere else. See [Where the project begins](project-context.md#where-the-project-begins). | | `/pr` or `/github` says GitHub is unavailable | Install the GitHub CLI and sign in: `gh auth login`. A private repository also needs `gh auth setup-git`. | | A key binding does not work | Your terminal may not send that key. Rebind it; see [Commands and keys](commands.md#rebind-keys). | | On a Mac, some `alt` keys type a character such as `ø` or `π` | Your terminal treats Option as a key that types characters. Set it to act as Alt; see [Alt keys on a Mac](commands.md#alt-keys-on-a-mac). | @@ -38,9 +38,9 @@ A session logs to `.luxe/logs/luxe.log` in the project. Commands that only repor `luxe auth`, `luxe doctor` and `luxe models`, log to `logs/luxe.log` in the state directory: `~/.local/state/luxe/` (`%LOCALAPPDATA%\luxe\` on Windows), or wherever `LUXE_STATE_DIR` or `XDG_STATE_HOME` puts it. On macOS and Linux, a log is readable only by you. One past 5 MB is moved -to `luxe.log.1` the next time Luxe starts, replacing the one before. +to `luxe.log.1` the next time luxe starts, replacing the one before. -The log shows Luxe's own activity at `info` and everything else at `warn`. For more: +The log shows luxe's own activity at `info` and everything else at `warn`. For more: ```bash LUXE_LOG=debug luxe # everything @@ -49,7 +49,7 @@ LUXE_LOG=luxe_core::hooks=debug luxe # one part, in detail ## See what is sent to the model -`LUXE_WIRE_LOG` records every request Luxe sends and every reply, with credentials removed. +`LUXE_WIRE_LOG` records every request luxe sends and every reply, with credentials removed. `luxe wire` summarizes it: what fills each request, whether the cached part stays the same between turns, and whether anything is sent twice. @@ -70,7 +70,7 @@ Open an issue at [github.com/evanwhittaker/luxe](https://github.com/evanwhittake - The relevant part of `.luxe/logs/luxe.log` If the interface itself draws wrongly, such as stray characters or a half-drawn screen, record the -raw output, which shows what Luxe actually wrote: +raw output, which shows what luxe actually wrote: ```bash script -f /tmp/luxe.tty -c luxe # replay with `cat` or `scriptreplay` diff --git a/scripts/cast-still.py b/scripts/cast-still.py index ec95957..40b82f8 100755 --- a/scripts/cast-still.py +++ b/scripts/cast-still.py @@ -4,7 +4,7 @@ Some surfaces do not survive being watched. Guided Review puts a chapter's argument beside the code it argues about, and a reader meeting it for the first time needs to *stop* on it — played at demo speed it registers as motion rather than as information. So the same capture that makes a demo also -makes the stills, and there is still exactly one source of truth for what Luxe looks like. +makes the stills, and there is still exactly one source of truth for what luxe looks like. **The drawing is not done here.** This replays the recording with `pyte` to work out what is on the screen, then hands that grid to `fixture_svg --grid`, which is the exporter the generated diff --git a/scripts/docs-check.py b/scripts/docs-check.py index 18a3996..005caab 100755 --- a/scripts/docs-check.py +++ b/scripts/docs-check.py @@ -25,7 +25,7 @@ ROOT = pathlib.Path(__file__).resolve().parent.parent GUIDE = ROOT / "docs" / "guide" # Sidebar groups, in order. `web/src/content.config.ts` holds the same list. -GROUPS = ["Get started", "Using Luxe", "Customize", "Extend", "Reference"] +GROUPS = ["Get started", "Using luxe", "Customize", "Extend", "Reference"] # Pages exempt from the voice rules while a rewrite is in progress. Empty: every page follows them. # Links and frontmatter apply to every page regardless. diff --git a/scripts/fn-length-allowlist.txt b/scripts/fn-length-allowlist.txt index 9dfd05f..75a56a8 100644 --- a/scripts/fn-length-allowlist.txt +++ b/scripts/fn-length-allowlist.txt @@ -1,7 +1,7 @@ # Functions allowed over clippy's too_many_lines threshold. See scripts/fn-length-check.py. # # reason 406 crates/luxe-tui/src/commands/built_in.rs built_in # the command catalog: one `Command` literal per entry, no logic to pull out, so a new command raises this by its own entry - 369 crates/luxe-tui/src/app/messages.rs reduce_inner # the `Msg` reducer, one arm per message and nearly all of them one call; the fat arms already live in `app::messages::*` + 366 crates/luxe-tui/src/app/messages.rs reduce_inner # the `Msg` reducer, one arm per message and nearly all of them one call; the fat arms already live in `app::messages::*` 351 crates/luxe-tui/src/app/commands.rs dispatch_action # maps each `UiAction` to the one call that handles it; arms are a line or two and a handler that grows moves out 237 crates/luxe-tui/src/app/events.rs reduce # the `Event` reducer, one arm per engine event; the long arms delegate to `app::events::*` 218 crates/luxe-core/src/engine/run.rs run # the engine action loop, a dispatch over `Action` where each arm is one handler call; the arms that did real work are methods diff --git a/scripts/glyph-survey.py b/scripts/glyph-survey.py index eee4ed9..277cf35 100755 --- a/scripts/glyph-survey.py +++ b/scripts/glyph-survey.py @@ -15,13 +15,13 @@ that is wrong in the one direction that matters. scripts/glyph-survey.py # report coverage for the current vocabulary scripts/glyph-survey.py --candidates # which of a wider palette every face has scripts/glyph-survey.py --check # portable.txt still holds (CI) - scripts/glyph-survey.py --face FILE... # does a face draw everything Luxe does, cleanly + scripts/glyph-survey.py --face FILE... # does a face draw everything luxe does, cleanly U+2500-U+259F is not surveyed: terminals synthesize that range against the cell box, so the font is not in the path. Everything else has to be in every face on the panel. `--face` asks the opposite question, of a font you might *recommend* rather than one a reader -already has: does it carry every character Luxe can put on screen at the nerd tier, and does each +already has: does it carry every character luxe can put on screen at the nerd tier, and does each one stay inside its cell? The second half is the one a coverage count misses. The non-`Mono` cut of any Nerd Font has every icon and draws most of them twice the cell wide, and plain Iosevka has every character while `→ … —` print over their neighbor. The character set is read out of the TUI's @@ -45,7 +45,7 @@ import unicodedata ROOT = pathlib.Path(__file__).resolve().parent.parent PORTABLE = ROOT / "crates" / "luxe-tui" / "src" / "glyphs" / "portable.txt" -# Where `--face` reads what Luxe draws from. +# Where `--face` reads what luxe draws from. DRAWING_SOURCES = (ROOT / "crates" / "luxe-tui" / "src", ROOT / "crates" / "luxe-cli" / "src") DRAWING_ASSETS = ( ROOT / "web" / "src" / "assets" / "generated", @@ -151,7 +151,7 @@ def parse_portable() -> list[int]: return listed -# === What Luxe draws, for --face === +# === What luxe draws, for --face === def rust_literals(src: str) -> tuple[list[tuple[int, int]], str]: @@ -307,7 +307,7 @@ def braille(cp: int) -> bool: def survey_faces(paths: list[str]) -> int: - """Report each face against everything Luxe draws. Non-zero if any misses or spills anything.""" + """Report each face against everything luxe draws. Non-zero if any misses or spills anything.""" try: from fontTools.pens.boundsPen import BoundsPen from fontTools.ttLib import TTFont @@ -322,7 +322,7 @@ def survey_faces(paths: list[str]) -> int: } classes["marks"] = [cp for cp in drawn if not any(cp in group for group in classes.values())] print( - f"Luxe draws {len(drawn)} non-ASCII characters: " + f"luxe draws {len(drawn)} non-ASCII characters: " + ", ".join(f"{len(group)} {name}" for name, group in classes.items()) + "\n", file=sys.stderr, @@ -375,7 +375,7 @@ def survey_faces(paths: list[str]) -> int: if absent - len(missing["braille"]) or spilled: failed = True else: - print(" draws everything Luxe does, each inside its cell") + print(" draws everything luxe does, each inside its cell") font.close() return 1 if failed else 0 @@ -394,7 +394,7 @@ def main() -> int: parser.add_argument("--check", action="store_true", help="verify portable.txt against the panel") parser.add_argument("--candidates", action="store_true", help="survey the wider palette") parser.add_argument( - "--face", nargs="+", metavar="FILE", help="measure font files against everything Luxe draws" + "--face", nargs="+", metavar="FILE", help="measure font files against everything luxe draws" ) args = parser.parse_args() diff --git a/scripts/publish-clean.sh b/scripts/publish-clean.sh index fa74207..6416972 100755 --- a/scripts/publish-clean.sh +++ b/scripts/publish-clean.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# Materialize a clean, publishable copy of Luxe — without this repo's development +# Materialize a clean, publishable copy of luxe — without this repo's development # artifacts (PROJECT.md, PROGRESS.md, docs/plan/, .pi/, …) or its git history. # # The exclusions are declared as `export-ignore` in .gitattributes, so `git archive` # does the filtering for us. The result is a fresh tree suitable for `git init` in a -# new public repository. Luxe never requires the excluded files at runtime. +# new public repository. luxe never requires the excluded files at runtime. # # Usage: # scripts/publish-clean.sh [ref] diff --git a/scripts/remediation-eval.py b/scripts/remediation-eval.py index ab33603..58bc1a8 100755 --- a/scripts/remediation-eval.py +++ b/scripts/remediation-eval.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -"""Ask real models to fix review comments and see whether Luxe can read what they report. +"""Ask real models to fix review comments and see whether luxe can read what they report. A fix request ends with a remediation report, and the review learns what the agent did only from -it. Whether a model writes one Luxe can read is a property of the model and of the prompt, so it is +it. Whether a model writes one luxe can read is a property of the model and of the prompt, so it is measured against live models rather than asserted in a unit test. Each run is a scratch repository with two bugs, a working-tree review, a comment on each, and a fix request over `luxe --rpc`; the turn's assistant text is then read back from the session log and sorted by how it wrapped its diff --git a/scripts/remote-fonts.sh b/scripts/remote-fonts.sh index 0e6eb23..95c7dc0 100755 --- a/scripts/remote-fonts.sh +++ b/scripts/remote-fonts.sh @@ -5,7 +5,7 @@ # too): JetBrains Mono Nerd Font Mono, and Adwaita Mono for the marks it lacks. The subset differs. # The site draws a known set of characters; the app draws whatever a model writes. So it keeps the # ranges text is written in (Latin, Greek, Cyrillic, punctuation, arrows, maths, box drawing) plus -# every glyph Luxe draws: the TUI's glyph table at every tier (the glyph_codepoints example), and, +# every glyph luxe draws: the TUI's glyph table at every tier (the glyph_codepoints example), and, # when the website has been built, its coverage.txt, which catches what captures show outside the # table. Anything else falls through the CSS stack to the phone's own font, one glyph at a time. # @@ -69,7 +69,7 @@ for style in Regular Bold Italic; do "${out_dir}/jetbrains-mono-${style,,}.woff2" "${unicodes}" done -# Only Luxe's own marks come from Adwaita: filling every gap in the text ranges would add its +# Only luxe's own marks come from Adwaita: filling every gap in the text ranges would add its # drawing of characters JetBrains Mono chose to leave out, for little a phone can't draw itself gaps="$(comm -23 <(printf '%s' "${luxe}" | tr ',' '\n' | sort -u) \ <(cmap "${out_dir}/jetbrains-mono-regular.woff2" | sort -u) | paste -sd, -)" diff --git a/scripts/site-assets.sh b/scripts/site-assets.sh index 1983d8a..9f8e869 100755 --- a/scripts/site-assets.sh +++ b/scripts/site-assets.sh @@ -6,7 +6,7 @@ # fixture runner. That is the point — a screenshot taken by hand is a claim about a build nobody can # reproduce, and it starts lying the first time a border changes. # -# Run it after anything that changes how Luxe looks, and commit the result. CI runs it with +# Run it after anything that changes how luxe looks, and commit the result. CI runs it with # `--check`, which regenerates into a scratch directory and fails if the committed assets differ. # # The *demos* are not here and cannot be. They are recordings of real sessions against a real @@ -116,7 +116,7 @@ guide_dir="${repo_root}/docs/guide/images" # The phone app's wordmark, from the same art. The app has no build step, so it ships the file app_dir="${repo_root}/crates/luxe-remote/app/generated" -# Luxe's own theme, the one the site is set in. The colors are baked into each file rather than left +# luxe's own theme, the one the site is set in. The colors are baked into each file rather than left # as custom properties, so a capture stays correct wherever it is embedded — a README, someone's # blog. The theme preview is the one picture drawn in every theme, below. THEMES=("luxe") diff --git a/scripts/site-drive.py b/scripts/site-drive.py index 304c678..810c9ab 100755 --- a/scripts/site-drive.py +++ b/scripts/site-drive.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -"""Drive a real Luxe session from a script, and record what the terminal saw. +"""Drive a real luxe session from a script, and record what the terminal saw. Run *inside* a terminal, with the app under a pseudo-terminal this process owns: @@ -12,7 +12,7 @@ desktop is to synthesize key events with `wtype`, and it works until focus moves every remaining keystroke, `Ctrl+C` included, is typed into whatever window took it. Writing to the pty cannot reach another window at all, and it does not need the recording to hold focus. -**The relay is transparent both ways.** Luxe asks the terminal what it can do — cursor position, +**The relay is transparent both ways.** luxe asks the terminal what it can do — cursor position, device attributes, the glyph probe — and a driver that answers none of those hangs on the first question. So the app's output goes to our stdout (the real terminal, which answers) and the real terminal's replies go back into the pty. Only the outbound half is recorded; the terminal's answers @@ -121,7 +121,7 @@ LEGACY = { **dict(zip(("f1", "f2", "f3", "f4"), ("\x1bOP", "\x1bOQ", "\x1bOR", "\x1bOS"))), } -# The same keys as Unicode codepoints, for the CSI-u form. Luxe negotiates the Kitty keyboard +# The same keys as Unicode codepoints, for the CSI-u form. luxe negotiates the Kitty keyboard # protocol, so a chord the legacy encoding cannot spell — `Ctrl+Esc`, which is how a turn is # interrupted — has a representation here rather than being unreachable. CSI_U_CODE = { @@ -267,7 +267,7 @@ class Session: self._screen = pyte.Screen(cols, rows) self._stream = pyte.Stream(self._screen) # Incremental, and that matters. A read returns whatever bytes happened to be available, so - # a multi-byte character — every box-drawing rule and every Nerd Font glyph Luxe draws — can + # a multi-byte character — every box-drawing rule and every Nerd Font glyph luxe draws — can # be split across two of them. Decoding each read on its own turns both halves into U+FFFD, # which is how stray `�` diamonds ended up scattered through otherwise good takes. This # holds the incomplete tail until the rest of it arrives. diff --git a/scripts/site-fonts.sh b/scripts/site-fonts.sh index df0cf5c..7bb2bb0 100755 --- a/scripts/site-fonts.sh +++ b/scripts/site-fonts.sh @@ -29,7 +29,7 @@ # on the web through the CSS stack and in a terminal through fontconfig. # # **Why two mono faces.** JetBrains Mono is the one people already run, so it is what the site and -# every capture are set in. It lacks six marks Luxe draws (`ℹ ↳ ↺ ⏸ ✔ ✖`), and a missing glyph on +# every capture are set in. It lacks six marks luxe draws (`ℹ ↳ ↺ ⏸ ✔ ✖`), and a missing glyph on # the web is whatever the reader's system substitutes, at whatever width. Adwaita Mono has all six # on the same 0.6em cell, so those codepoints, and only those, come from it; the CSS stack names it # second and the browser falls through per glyph. @@ -50,7 +50,7 @@ assets_dir="${repo_root}/web/src/assets/generated" # face installed. Both directories feed the subset. captures_dir="${repo_root}/web/src/assets/captures" # The guide's screenshots are drawn on the site too, and so is the guide's own text, which names -# the symbols Luxe draws: set in a face that lacks them, a browser reaches for color emoji. +# the symbols luxe draws: set in a face that lacks them, a browser reaches for color emoji. guide_images_dir="${repo_root}/docs/guide/images" guide_dir="${repo_root}/docs/guide" coverage_file="${out_dir}/coverage.txt" @@ -191,7 +191,7 @@ subset() { printf ' %-34s %6s\n' "$(basename "${dst}")" "$(stat -c%s "${dst}")" } -# The terminal face. Regular and Bold are what Luxe's cells ask for; Italic is there because reasoning +# The terminal face. Regular and Bold are what luxe's cells ask for; Italic is there because reasoning # and a few labels are set in it, and a synthesized slant of an upright mono reads as a rendering bug. pyftsubset_python="$(head -1 "$(command -v pyftsubset)" | sed 's/^#!//')" cmap() { diff --git a/scripts/site-record.sh b/scripts/site-record.sh index 4bdb83f..bfb249d 100755 --- a/scripts/site-record.sh +++ b/scripts/site-record.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Record a demo for the website by driving the real Luxe in a real terminal. +# Record a demo for the website by driving the real luxe in a real terminal. # # These used to be scripted through the reducer with no terminal involved, which made them exactly # reproducible and exactly as much work as writing the app twice. This runs the shipped binary @@ -19,8 +19,8 @@ # --cols N terminal columns (default 92 — see below) # --rows N terminal rows (default 28) # --font-size N Ghostty font size (default 13) -# --theme NAME Luxe theme (default luxe) -# --project DIR where to run Luxe (default: a scratch copy of web/demo) +# --theme NAME luxe theme (default luxe) +# --project DIR where to run luxe (default: a scratch copy of web/demo) # --project-src DIR the project template to copy # --project-name N what the scratch copy is called, which is the name every surface shows # --max-idle SECS cap on a gap between frames after editing (default 1.2) @@ -36,7 +36,7 @@ # --model P/ID which model answers (default: LUXE_RECORD_MODEL, else whatever is remembered) # --thinking LEVEL reasoning level for the take # --glyphs STYLE glyph fidelity: auto, nerd, nerd_wide, unicode, ascii -# --bin DIR put DIR first on Luxe's PATH (relative to web/demo-scripts), for stand-ins +# --bin DIR put DIR first on luxe's PATH (relative to web/demo-scripts), for stand-ins # # Both are how a demo gets a starting state without spending a turn on it: a changes-and-commit # demo needs a dirty tree, and paying a provider to manufacture one so the demo can then talk about @@ -52,7 +52,7 @@ # character on a phone, which is the same as not being there. 92 carries a two-pane review and # still reads at 390px wide. # -# The keystrokes go into Luxe's pty, never to the compositor. `wtype` was the obvious way to drive +# The keystrokes go into luxe's pty, never to the compositor. `wtype` was the obvious way to drive # a TUI and it works right up until focus moves, after which every remaining key — `Ctrl+C` # included — is typed into whatever window took it. `scripts/site-drive.py` writes to the pty # instead, which cannot reach another window and does not need the recording to hold focus. @@ -190,7 +190,7 @@ drive_log="${work}/drive.log" # === The terminal === -# Ghostty wears the Luxe palette. The app paints nearly every cell itself, but not the ones it has +# Ghostty wears the luxe palette. The app paints nearly every cell itself, but not the ones it has # not reached yet — and a demo whose first frame is somebody else's background color announces that # it was staged. theme_json="${repo_root}/crates/luxe-core/src/themes/${theme}.json" @@ -242,7 +242,7 @@ if [[ -z "$project" ]]; then # cannot proceed, so an agent asked to commit correctly stops and asks who it is — which is good # behavior and a poor demo, and it is the recorder's doing rather than something to talk the # model out of in the prompt. - git -C "$project" config user.name "Luxe" + git -C "$project" config user.name "luxe" git -C "$project" config user.email "demo@luxe.dev" git -C "$project" add -A git -C "$project" commit --quiet -m "Initial commit" @@ -256,7 +256,7 @@ if [[ -n "$setup_cmd" ]]; then (cd "$project" && DEMO_SCRIPTS="${repo_root}/web/demo-scripts" eval "$setup_cmd") fi -# === Luxe's own config === +# === luxe's own config === # Copied from the real one so the credentials and the model are the ones being demonstrated, then # overridden where a demo needs a fixed answer. Never the real directory: a take must not be able @@ -270,7 +270,7 @@ if [[ -d "$real_config" ]]; then find "$real_config" -maxdepth 1 -name '*.json' ! -name 'auth.json' ! -name 'mcp.json' \ -exec cp {} "${config_home}/luxe/" \; # Linked, not copied. An OAuth credential rotates: the provider hands back a new refresh token - # and invalidates the one just used, and Luxe writes it to whichever auth file it was given. A + # and invalidates the one just used, and luxe writes it to whichever auth file it was given. A # copy in a scratch directory therefore takes the rotation with it when the directory is # deleted, and every later take authenticates with a token the provider has already retired — # which is a signed-out account after one recording, not a recording problem you notice at the @@ -325,7 +325,7 @@ luxe_args=() [[ -n "$thinking" ]] && luxe_args+=(--thinking "$thinking") # A stand-in for a program the demo project has no real counterpart for, like `gh` for a repository -# that doesn't exist. First on PATH, so Luxe and every command the model runs find it. +# that doesn't exist. First on PATH, so luxe and every command the model runs find it. record_path="$PATH" if [[ -n "$bin_dir" ]]; then [[ "$bin_dir" == /* ]] || bin_dir="${repo_root}/web/demo-scripts/${bin_dir}" @@ -357,7 +357,7 @@ trap cleanup EXIT # rather than a convenience. # # A take does not need to be seen: the recording comes from the pty the driver owns, and a hidden -# GTK window still answers the device queries Luxe asks. What an on-screen window *does* do is sit +# GTK window still answers the device queries luxe asks. What an on-screen window *does* do is sit # in the way — it takes focus, it lands on whichever monitor the pointer last touched, and the # operator cannot use their machine without wondering whether they just spoiled a minute of # recording. `silent` keeps the workspace from being switched to. diff --git a/scripts/site-smoke.mjs b/scripts/site-smoke.mjs index 7c9ada3..0cb13d7 100644 --- a/scripts/site-smoke.mjs +++ b/scripts/site-smoke.mjs @@ -51,7 +51,7 @@ const PAGES = [ * Pages only applies `_headers` and a wrong charset turns every em dash into mojibake for a model. */ const TEXTS = [ - { path: "/llms.txt", type: "text/plain", expect: ["# Luxe", "/docs/install.md"] }, + { path: "/llms.txt", type: "text/plain", expect: ["# luxe", "/docs/install.md"] }, { path: "/llms-full.txt", type: "text/plain", expect: ["# Install"] }, { path: "/docs/install.md", type: "text/markdown", expect: ["# Install"] }, ]; @@ -398,7 +398,7 @@ const CAPTURE_ADVANCE = 0.6; * An SVG loaded through `` is a document of its own in secure static mode: it cannot see * this page's `@font-face`, so the subset webfont never reached a single screenshot and every Nerd * Font icon in them drew as tofu. None of that is visible to anyone with the face installed - * locally, which is anyone who works on Luxe — so the check has to be a measurement taken in the + * locally, which is anyone who works on luxe — so the check has to be a measurement taken in the * page. * * `foreign` is the structural half: a capture that is not an `` holding real `` in *this* diff --git a/scripts/tool-bench.sh b/scripts/tool-bench.sh index 323e18b..76b4b4d 100755 --- a/scripts/tool-bench.sh +++ b/scripts/tool-bench.sh @@ -4,7 +4,7 @@ # scripts/tool-bench.sh NAME=REPO:CASES ... # # Each argument is a checkout to measure in and the cases to run there (scripts/tool-bench/); -# Luxe's own checkout is always measured last, with the cases built into the example. The first +# luxe's own checkout is always measured last, with the cases built into the example. The first # repository is the one the page draws its bars from. # # A recording, not a generated asset: the numbers depend on the trees they run in, build output @@ -25,8 +25,8 @@ for spec in "$@"; do (cd "$repo" && TOOL_BENCH_CASES="$root/$cases" "$bench" "$out/$name.json") names+=("$name") done -"$bench" "$out/Luxe.json" -names+=("Luxe") +"$bench" "$out/luxe.json" +names+=("luxe") python3 - "$out" "${names[@]}" <<'PY' > web/src/data/tool-bench.json import json, sys out, names = sys.argv[1], sys.argv[2:] diff --git a/scripts/tui-drive.sh b/scripts/tui-drive.sh index 24d5511..f3aa37b 100755 --- a/scripts/tui-drive.sh +++ b/scripts/tui-drive.sh @@ -151,7 +151,7 @@ cleanup() { } trap cleanup EXIT -# The throwaway XDG_CONFIG_HOME is for Luxe alone. gh finds its hosts.yml under the same variable, +# The throwaway XDG_CONFIG_HOME is for luxe alone. gh finds its hosts.yml under the same variable, # so without this every GitHub surface in the drive reads "not signed in" while gh is fine export GH_CONFIG_DIR="${GH_CONFIG_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/gh}" diff --git a/scripts/update-models-snapshot.sh b/scripts/update-models-snapshot.sh index bc3a74c..f36ce0f 100755 --- a/scripts/update-models-snapshot.sh +++ b/scripts/update-models-snapshot.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Regenerate the embedded models.dev snapshot. # -# Luxe resolves model metadata from four layers (defaults -> snapshot -> cache -> config). The +# luxe resolves model metadata from four layers (defaults -> snapshot -> cache -> config). The # snapshot is the offline/first-run floor: it's what a fresh install with no network knows. The # runtime refresh keeps a live install current, so this only needs to run at release cadence — # CI does it weekly and opens a PR when the bytes change. diff --git a/web/README.md b/web/README.md index a8b3bf9..345212b 100644 --- a/web/README.md +++ b/web/README.md @@ -77,7 +77,7 @@ is read-only and refuses anything it wasn't written to answer. The trade is stated plainly: **no two runs produce the same bytes, so nothing checks that a capture still matches the build.** `manifest.json` records the commit, size and theme each take was shot -against. When Luxe's appearance changes, re-record. +against. When luxe's appearance changes, re-record. The webfonts in `public/fonts/` come from `scripts/site-fonts.sh`, which subsets them to exactly the characters **both** directories use — a capture that catches an icon no fixture ever drew would diff --git a/web/astro.config.mjs b/web/astro.config.mjs index 493ce66..bfa25ee 100644 --- a/web/astro.config.mjs +++ b/web/astro.config.mjs @@ -133,7 +133,7 @@ export default defineConfig({ remarkPlugins: [guideShots], rehypePlugins: [guideLinks], shikiConfig: { - // Luxe's own palette, generated from the same JSON the terminal loads. The docs describe a + // luxe's own palette, generated from the same JSON the terminal loads. The docs describe a // terminal program; coloring their code in someone else's palette would be a small lie about // what it looks like. Every color in it clears 4.5:1 on the code background — asserted where // it is generated, because syntax highlighting is the one surface that puts all six accents diff --git a/web/demo-scripts/flagship.rec b/web/demo-scripts/flagship.rec index b9a0b87..9734f13 100644 --- a/web/demo-scripts/flagship.rec +++ b/web/demo-scripts/flagship.rec @@ -1,6 +1,6 @@ # flagship — the hero: one small feature, written, reviewed and ready to ship. # -# What using Luxe looks like, at the speed it happens: a request, the agent reading its way in, an +# What using luxe looks like, at the speed it happens: a request, the agent reading its way in, an # edit with its diff, the tests really run, and a reply that says what changed. Then the part no # other agent has: the change read back as a Guided Review, a chapter at a time, and finished into a # pull request drafted from it. Nothing is staged and nothing is sped up; only the dead air between @@ -14,7 +14,7 @@ # being drafted, are marked `squeeze`…`resume`: `cast-edit.py` plays each in two seconds, every # frame kept, and the clock on screen still says how long it took. # -# The recorder starts Luxe with the dashboard off, so a take opens on the session itself rather +# The recorder starts luxe with the dashboard off, so a take opens on the session itself rather # than on three seconds of a splash screen it is not about. #: cols 120 diff --git a/web/demo-scripts/gh/gh b/web/demo-scripts/gh/gh index f865042..6daae81 100755 --- a/web/demo-scripts/gh/gh +++ b/web/demo-scripts/gh/gh @@ -4,7 +4,7 @@ The toy project under `web/demo` is fictional, and so is its repository: `acme/todo`. A take that shows the `@` picker's GitHub tab needs issues and pull requests to list, and pointing a recording at a real repository would put strangers' names and titles on the website. So the recorder puts this -directory first on `PATH` (`#: bin gh` in a script) and Luxe lists what's here instead. +directory first on `PATH` (`#: bin gh` in a script) and luxe lists what's here instead. Everything else about the take is real: the picker, the chips, the model, the tools it calls. The answers are the shapes `gh` actually prints (see `crates/luxe-core/src/github/fixtures/`), and it diff --git a/web/package.json b/web/package.json index 236ee49..75dda14 100644 --- a/web/package.json +++ b/web/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "type": "module", - "description": "luxe.dev, the website for Luxe: a beautiful coding agent for your terminal", + "description": "luxe.dev, the website for luxe: a coding agent for your terminal", "engines": { "node": ">=24" }, diff --git a/web/public/fonts/LICENSES.md b/web/public/fonts/LICENSES.md index 344d329..cf3ad65 100644 --- a/web/public/fonts/LICENSES.md +++ b/web/public/fonts/LICENSES.md @@ -31,7 +31,7 @@ Subset to exactly the characters the generated assets and captures draw, plus pr a couple of hundred codepoints out of several thousand. Regular (400), Bold (700) and Italic. **Why this font.** It's the monospace face most people already have in their terminal, so a -capture on this site looks like Luxe will look for them. +capture on this site looks like luxe will look for them. ## Adwaita Mono Nerd Font Mono — the six marks JetBrains Mono lacks diff --git a/web/public/fonts/coverage.txt b/web/public/fonts/coverage.txt index 4e9cae9..eb947cd 100644 --- a/web/public/fonts/coverage.txt +++ b/web/public/fonts/coverage.txt @@ -122,6 +122,7 @@ U+23F8 U+2500 U+2502 U+2503 +U+250C U+2514 U+251C U+256D @@ -170,6 +171,7 @@ U+F0054 U+F0065 U+F012C U+F0135 +U+F0163 U+F0174 U+F0181 U+F0193 diff --git a/web/public/fonts/fallback-ok.txt b/web/public/fonts/fallback-ok.txt index af64b76..148f21c 100644 --- a/web/public/fonts/fallback-ok.txt +++ b/web/public/fonts/fallback-ok.txt @@ -1,4 +1,4 @@ -# Characters Luxe draws that the terminal face does not contain. +# Characters luxe draws that the terminal face does not contain. # # The reader's own font draws these — on the web through the CSS fallback chain, in a terminal # through fontconfig. Listing one here is a decision, not a shrug: it says the glyph is polish, its @@ -10,5 +10,5 @@ # # The list is currently empty. JetBrains Mono lacks six marks, and the Adwaita Mono subset beside it # carries exactly those, so between them the two faces cover everything. Under Lilex this file held -# sixteen entries, every one of them a glyph Luxe drew and the font it recommended could not. Keep +# sixteen entries, every one of them a glyph luxe drew and the font it recommended could not. Keep # it empty if you can. If you cannot, say which glyph, and why losing it costs nothing. diff --git a/web/public/fonts/jetbrains-mono-nfm-bold.woff2 b/web/public/fonts/jetbrains-mono-nfm-bold.woff2 index bad7b700d3c175e58e0048d2688aaa60cb1fe835..52a83f32b80768e8e965d4dccd4262409f15bd15 100644 GIT binary patch literal 11484 zcmV<2EF;r*Pew8T0RR9104&@94gdfE09a4}04#?90!`8Y00000000000000000000 z0000QC>tOgDh6NxjVuue3W1O`>?Z*>0we>2EDM7y00bZfhcpKu8>T}A?ARl)aR4yN zK7S;_4yjdL+5d+FZVUw*T7Lt40yaYyoym;`ibda~;1)ysacntok*(oHK63rVy`sG* zaQ}Q2O$C!2qG(M2e-;bo6U+)Gf-F(GBP5yq0o>LT69?#r1gt26hl&epcEmzdSfy8nM=|Ge8J55c|q?y@x;4o%=`@zC;c1VRA};b;p| zDz+lUf0xVHZjz(yCX}ks48~zZa=E|zS{1EjZKA17IR;yratwd&r%m1~xb`(8%H=8t z84##{UkykSs$GSeW>izC2=rKw6~W@r?W8AZl6LPL4?<$Z9M&>~!C0htjN7vR%b8Ub z57xJD0z<-WHw{pLSXI?yg&RC?dKsj*H|a`-gc~e72!w!62BSr%J0J33i z(9KaluhU%r_XSjT3N+!-++hNmmJa*-|4Wzu^=(IzbE#w<$Uc&DY0gdxKXhOp#3=x5 zz!Q+-l6_QPN(ftr6>yn4cAkNTsmqvBm#_+MQbkJ%6f5pec(g3@J3D0X1jKrqlnJ&h0l@My-V!y%59ok=8uoHF z>Va4y@SJ6;^Asz9yd5_HiP5`=11=&0AOWh-$*uQ^1Sg%DF4)QIKX0)TIFM2^fF5sxg`4J_l&zoA(KD^d`r9S*=z_|xJXg+TG3P$_;C zsrQKYIMs<7N1dR)_qjs@ngtC_BhbjSTH1QrDD4~CPTDcr3ECOjb=pnZUD_jmyuYh| z4c&%rPsh>S=>Bv*T|y7}nf^NLb;s-NZ|vXxz4+q?$`WbGYl*cKu@t}b;5X9pG5`wO z5uQSxC-Gk2L@riM8*1z0H>3EY^|ySfc2>o|+g_<&rMyaf757T`;=32~KcJcy!3(bz z2A=PpZ<%kNubZ!&*US^lf0=(X|JVGz`LX$t`M&w8`HK0X`RrWBT>BjT*@kDs&jz1$ zK3nyy;#ui4t$VYZ*3F0bkvQ$N2X_hAk6wo!Lbs!<(OUZjdrU_mJXC07%R34|fo;13 ztq*KhS=*zKqUN8aSc@l6T2b(Y0F+e}a`6BvrBH!tDSk)LLnM)wnxpr6C?kMD?{T0( zsuQqEY8+saIsr6FeGfG0a|dXa20%+iLlz65RT>&-mqq|SlSV$mYDjfz(~+U9PtRr) zfB|XW0E5zY0z=Y{0c)k50EVTV0oF;o4y>1U6WAc_F7UauN5F{wcwnRcu16S!=u=b1 zE_53JCZyW~lhSd(lytWvOhf$QpD)4>KVL;0Nxt5M0IA<(X4g+R<-2rU&^>$#3 zZ|s4szWp26=HidQc0W*n9WIf8oi2F+yIf)cyIqO^_P7)e>~-k@u+QH}$$|ZF@C7&k zCv(8T)j|Pg;euI!LvSG&a9D{FM;I9$)uF?&9f1NIhf6{MPQaz-fRkioPDzyLv~Jzb z7&7FnZ++{W%{Du~W+=b~z_lz2a1n4V!GKE}4+XdkxOP_ot^lq*GT`c7fC5~DNj6^} z^djsJ6nd$he9$Yn*KkI!Jv_Ye^z?SWq0l?s*AL47{sRh4N%un2mPUm-mcw&H>ib{G zk+~~CG(h;XJP`j!W((*57@iDcFcUMF!hr@@dOf;{l$Ja;GyFuMoZoDJ1^%poGWPTW zOex&`pRqf~#!Speiej@>Uh5@WQQXSkgYacG{3n^kD9^G1#(E>+8nJO?r47GhSd27F zm`$P}p9gKj$T|%$t8;;r77So&7L`M@!|f_#m$||KRj7c7tmslb77_bQl8>(*XcAj4 zstQ&$;>s7LSC8bu3p7JXyI8%6<(5`Nhh^2W=d8;G8c>?Rq@AjSq`+l>D5(xZ zDfZ(CF^YXaGh4Eis}Wkp952z0uLFv zw7n$`^D{8D!3cOpOh@B`L>2SUC`JoQ8@M!)4Z@KiYyo}?AdN(!il_VQ8W3gY*@22od-PZ#`1uKU}05;R1X%f)dQr%D^bBRkMyCYK`P7LT`8? z2?dNsv+V7Ek7jva?dn8BP@7WnkmLrkBvKBZlDg;ojoiKdFWI%>_(sh`b2MCf$oJ1d zKquAIaRK2@R}*Au=2%p@qChFLPiD# zf}ld9Vh0mr8cPSt6!Ja&Gu%FEgdx_V6({*VGdq}_Ci%T~rnqVOJ&Esdc(~eQIm|FH zt|D9@RX2ik_9&IRA?7>KIUSrkj4;O0f#>@xO`ydU%n=}~LWgMwHW-l!1hW6PDl}r{ z6=5b+5Mc@B?fb|8b_56=tc!V@@z^UgU2&D_5H0uXN{3*h2m%YY9OEM z7L2!X=XX%v9Q^e_Wx>_f-dCad`7u00N5-xT_KoaO{faU1m{*;=B|A5B$M6JkCLs+{ zD91@`K()5?JxCF!n*AmP9Py|kU}(+uWuoOOeVZ_X0jX=YTAvNmMSmuI*se>TzA+Vc zk(P4OoJvvZC_7V>;C6DLlPRyC8gy* zOJ)##pMxzlk0rMJH7m^FK}E&^?H>e7Dn<6J&4m=0(o9X$MC8A>f>(72y%RyI63tPe ze-m-SE=M%n*CH7I)o1+aQ<|9%u_;Wp+ zj?ks_aY_?L3tB+Qo441Nf%0w+_&)6$m&{|BO~vJJC7s-E+w4_lRvz&p)Kw%4DWO*- zTTTVcO<++x?-SzUbIDU$*-l0Q-(8{m%3Mr0VupZoo56(6q$V(wjq}^i!Z)){y~9AY z4s@i*l9eSU9F*5iik79>l-G-xPm!wr1#u+rq`>pajP&4)6tXi}+}`pI%UuU#7Vux( zC6?>-vUM;?)H8+wt}YYM@O;fGW+zr3wbGew&Smz0O0!E_R%Fd7cNYbPavXF8U+Y*; zD5H6tpKA4f^V_poXvu1gS@ev*;Yl!8Ij;Gh@G&0=xkox1ZGIXqC@q3c`XH$EeG;`4 zyl7tVR*sRGH1o1`(KZ*Pkzew97_Q8RUia4Z;2(HZNZz)F>l&I9WBC|)wxo>rN<>rk z$xe*`X3v&E__3pAf&8f^ZACTnB;Y3P@`Zk%c;J;&Sg!VgcLjMmsf;ScQ$QI&usL+Y>(o^RzA><_YCva!MXz1?xJQ4TQ!1h!(6Yyp%bA z*o=n63$7Y^q3Yn6K+-!nQa~`MiKv{tik+!E^m#R}_h-1X^e9&vD=aXxHDNDc+ZlLZZ?oca;;S~Q;!PQ9>S%zKEeS_?qSjzf_vhrt!mMoCp-v*chcvirFKq(sJbkum1L0SG-qiMn|{S^mS5=ETf( zD_C@l1W73797$SI%HCN#$t&q{Ymp;44uRHW*A?wlBLqmIYTtE@C9AVe^xAiFMJx$c zZlZ6=2i046WAUy3oA9`^ZIhdUB0kZGFeE@Iib*6YK1tn4%Z4&8u+YMZ^i(d_)`Tlf z90%cu8YZ^}ECgtESu;4DmLrVi09quUgOZhVq=hcB4QcmHdQMrS6Rw!Z)A~dTjPGK>H{AsQuv}A~91ZO_Su@Xb@P!w* zuK}6#>=qIvEKG5Z%O3L#!79P60ZTx5yrha`s^h(0ve;u;q@of5Y#TnO?1_&HJLB>M z7+19CMN@UnqyYfQBsOZ8gY__j(Jt zHDu=TM%P%*m7z+ea@a^Jx1cPvIJme8Xq}T^yMZf4TegiQX+q(RWP5*g@`uO%CzCXe)x8On#!UkBHntK_R) zMqe$BoBUQOE4tnU>@=XR~|(TL{zf~L8_8m!?+{D24z@)*_H;4me_dQ;6H$3(ev_Ir<)6*C@zqc^5hZf9^K5e|$ zrc^UP_@3ld4FU|L_xXY!8ve&Xld^)}53$`}4E}jsJG8lhUX3WOw6Uh?iYs^3(4g)! zt#^RmevC99$TzR4HQ4awe|G)#m~gFkkGkk^kh9fPVT`X*s7*MEbFD~CdOiBBleb7j z9JEz6x$1y@b7wZyU)-G1-XCV3UEwg2wv0Zts!f?4!TE6Ph-cnjH@i)8I34OyXVCm| zpN+D(Va*|-M}*j0QCfs<(eF-5vWqokVXT@g_AKIsm`o6x zEtHrjlbk3EsRS;>q^9b8Z}CJHSyf~ej(&zBOYmSuB;bI55ZtP{pyDRe3z801*9sDBGliuT7=E8g3u82!X zO}KzuQQhDnwB2j^_4@5vVzOJqh2W zNM7)Bb}5`Eu!Sn@a_}%r-@{>3^PY-WJIpc;jw2$xWS%rGueptop zQLnPHXYYRJD@mS>50ICT?+3|l2KS*V%QbH{8>$#mCcc3wgWtZ#{NCrIqF#GtdU#}d zc~YXb8X7N9dY?{G<$BI$skD}>Q4WvcjPiEPR_Q2w9k{_x!{eKA7|?^=MK-mSkljYR zx8@N+<(zLwQ?_i--Q4-a|n{*ELky>Oq|k>Ax&7*{qSMJ&vUR1U}; zNVtKDdIv91EA?gS!mnY*J~N#Gd`)=>HQ}u3kGk zaI7n##Q$nuP;jZ|e*+F0r?CEa10n-(@L`WFqt}K3Kbpp=TW*cdj%~R)?$fF!=!SK( zI^D3E0ClFebKY73;f~FY^ByQ1DN2_{7eDl6M-A5oP*>E_+jnKPyEo~Y+}m|0+XXon z1Pn*9eIGVJ6N*_!)tcVwhwwJ<(5!LxQ0u;NIQ=!Bvo4VXgE(V^5g4dIYCwQbV4%;B z0aTDxJO8k|QvQVne3k z%;K5Bp>2&D%O?$xV6aAqM@Dmo*qpumwkVmlTpSZ!Di9aS#r&F^N00Cf;ESqit1W70 zjq$i+ED@)dm#^9OjfZ|~g)PXo*HmST%5UykXy2eXj2RiE9P+!lrF}E_qbl2Li`rOQ zdAwc@o3o1d(DaQV5XOtE8ftXxl2!vSP>Fh3NL4(;SO4dip2H{QoFB)jp}9g%NmN`& zg^_ILKHFLK?{+M3t!n){$gtT>8;+j@@B*FHNw!s2t`uKb7Vqe)q3w9an+_xE%Yz|(gx}e)z2=U_CZC`90!v3imKG z=n!wTVO>HcU$!zbl$)Q!-=7-YPO%rteBz>Jb30>VI&w2|6&-ES>eRZB(5g6WYJPr7 za&E4&GBH{e8j!XY85^HYOqrfnwlbrjSeK(;Ne%U8(klZP-iK&96MT-&Z8|o$+JFBA zuY|d5WL*3Pms|#Vq4t5&{HnZFn-vnJDnoWJ`XsT!B?aZ&xZ2$s&PG;HH&FL}I|f>kgvtJ`5=5mPFVv}9D)epato(s=1tSAH2!%IoKH`?s29pfvv+Um=hc zM#jfhT^TNgpLyp|*PlL6$9cS){0d;967;-~LPZNFQX&?-Ge)`IEJxo+PKiu6(KJ->!aN_Zi zRAlV#Y24YJ^2({uxC~4y(~3-k4WXUSE{c z&|Iof$;evKZ$a|a0Uv#7OejD}m69Jc&E~c#i?&~rC6crvL(ynqv7x<^tq=|i6>N6A zpj!|Rd{k_iLs|ooPuO3X*wWStWL`_)UKVeRH^>|31%DOTg3N2JfWJ_w#fHMsq9Q|@ zBw6ySMcY)HxmojrQesz0B*7*b1x!>-sX$z;=u`+0nV4u@m;8cjGX2C80{@EmR&-2L z=9MD+Jm4j50#Q3$s~9(o7sahqrEJoFMZDp<@}c2j1&q&@O*22yy%8!*0#}$>EDI_N ziw&8=w+Uj^&7RqHniBhPb{wye7sqA`Ic1!h`NnKJgw&2GWg%&Wm3ifDxxAR5;8?yI z(#>r{>dvQw-=emYhI@Wc{|G(l#YL${4;#2NFJI411_<^mOSSNK^rMBX5wZNa^5n1? z{S;}~HAp(8330s(`+9=Xueo$Y8B%d1!?vPjm3FnRrJ7Q z1d?XW&DtN7QmG)7$6OIUy0WM~O`0tG$)aOQ<7|g(Svxyr(Te!L(o)G(3m*ENvxejR z&-wrN6!|q*jwXkNXBJcz@!MEjKAS5Or2)aV*q}~op?nv}3_?&m$-aG#a@&{;MRI9+ zF)P0&0}}+eFfrXeJ#U!D5cd*i48TB@ zn~d75HWgpO4vy!m+Oo7wMp!sT>nc}%`9GTA)=*h;_fZ zsMRugI)0k7k;bc!mSzP8Dl_q4pwhB?>wB|N>G*L~V2X+%1Ky{U(3AvuK%W1x6V85& z_==R!L=>C!v6x& zX2;?XRWQNTFS(avz|LmRA74R|;Z)Ri1MTn*1EkIxHn1Bx!=DT-NR6pp2btaVg98g9dgsx1Cl_Iz|FL(c7JHX34Aj&6zVm+NH86Skiq=^p~p~5%RpU8P; zfWRaQP(BAnZCTlx!CC{-NtF;LSEa?pbaM&7z^jK+Q-{to9#%WvCrK5lk*R0mSU+chXQ9}+~eZ<#D9`frn*n53%I7M>`iv~e`h--gU znm#d>q4m-D#Fk4XmGQ5D$M0U5G!9(dXvQa}^cCTZPh8p5yQR6s9yFSvgSc?**o(WuX=xWPUb>u-L168)^ccIOf=6#fuYP-P)shC82RK3xGTNalha9$9aOpaMC&lPW zSKLO=EUlTP8JEKpZ85e3v_CfrH+PlI(TSDuW4GT_UjMBKNeZbDkwqWo@t;ilP={c$1E7JRA6o`ufoC_P(?t>qy7KY-j ztlh1q#2Z2dhmLLhT5!_rPB1_HBQQ-Qa17@d>gq@FTs+B{G&?)HWElHv)c6&@dC}?V zesvmm!`#CsPbK_6pBhHpk9(c?ZnDI%Pz!woLADen*o>kxZZAs#-;VX`JSGJb()Yo0 zC7Da=J*DDwRvf(w^E#N|%rX%9IYqJ4Oo!$Rz+cp^oNHpJLaE$941YsWB5sa>x z5~l$e0|8#)k#2z&;fj%zp!Ra4lbIaPA4o~B)a&fbnTHJ~vv z*?7hRV#dCp1c_`kZFq`zcJ=rP!9l=(B_7f%C&*D{(2gQ7NJIzPg5+ftFY=DIwH!Z6 z)5ibf{9V!eg~Mrzg_HFiv9a;7cBoiExSThGu<{;pnR&f%RX%{A8FKLPvG#5yjPSUa zl0bSu#zi{^fx*{DODB<#juc#89s+6VM_ByelV&ZTg$ux{XU&H5Kg~Xs3*s{}8Wad; zB%5w)D4%Sp7gTQIP%1Z|y|*tk>@1+CP% zYg0vLV02*gnnb0Qv(14`zXo{-`9Hnxso%Dv%Tcb#CcWH4(q%Cah#P}U^-vv!qsZgI z^0delsLWIihKj4zrkOQOK6xtt`t@Jiw!u>+pWgN5+U!zj_9XE9x9#>1JiWBp!GQt@ z1OOBibgKj7x~r=p%@J20dWVfmrvv?W`)wo6t+tZ?+a;2S>qqQ=L%V-g5pctXKJz5_6DaiTlJ7*T* zBr+J02JRFucS`YnMi5v~z&*m_J|99$YgV>?%Kp4^lH{!3 z70(FVyz$$a_?+DcO9!u$VOgp$RTiLJC&@evcJk`A$z^zT@*cJ?i<;QCKXoeu%R^)P zB?K{n5tE<@W_c|WT^GqAE_)G88JiXU(f%p@n_bYKlAez2DRfa8Nm5kFQyil45H?-gmce5l#~D&ld={?%)Mj8-EAeoCpj2 zHd<^#aW-S_&-}!nkOmhnOLFYW@7{11i;h8Pv~#fP4|`l1O=v&6@uyd6i&otJUBf1@ zQzY6h(QdyfJd>jGbnp{WIp9u!(NnAPilRifv}h?)o+s6OIWdXe_I5-&`}6j8QT+ z-s!oKU8}BT8y6BC<&L6Qew#-$4MV?1$JlW^3Se!*mD~3OjFAgE6&M)ms@SZ!EK%F1 zr}@DC7AA9nDI}k2&dF(#s4+5>=``&(?ZhluyY`YtmxJQ5kg+D~z;AYwA=_hm`s7Kk z{=v#hz_;IfkfcZ=uOdGneD9577ggi=Vstby=@ZEV=I%$)Ph=dYJDrFZv-}qzuh>VFs-pNg!dCt>AGsghKRVi<9!1?iq;ljjU|JaL*Y@#Q>0AzYicPK?7&7!r zbh_SU+1bhElS?b{_>(5;OEeR9_TOe?r1v_tI#mkAv98O+gQA15?q*U?Qpx?m$&9JY zsf@`s!g>MguZNVUckbSPXhk{csrEccIR`Z^ynG2K73}50)ATfhANYx4=FKB=XtDewBgE5{1XN% zrqmgk$82oV92Uo%!Q+8Lwshf%`H+(JAs0((>O-5!71GIC2!=|`2D3M`oVj7~OjWJna#H2I|`Z;>vaJsjoR6froF;Qr*6CDio zz=U3QFVWz1k&xb(lDZ}{LD6wl<79F|;!B-0SEnE$J+=SxNx|?~ga)TQ_y$5C5?+o- zOQkYhX!?o?_gy=AJ9d&M9;JtA&%DXP78x29k(1Mrt?tZGcbGQ^FiPLpmwh&qM+$gz z=5=X2qvu+#a(lligOK6eze>3+?;0@v33{9NF85vD+ha*Uf)6}*T4;sEp~xi9ktw?r z>owM`1Yk{WJVmE(wg{`Bx$z@7K!Rsoo}F`8xy9!6B#)6vyHx957V33VcXeQ6=`)t0 zBJSKFrJ*&EfPgAQJ0DUJ$nnv(D@KiGt2LMpdt!3#y~svq+9y zsX-EWiXeICAHTB*T4i#LlS@NGTB^xtz*jfvG=v}i_@mFcabesQ@FOjws3)rD-h+E9 zYbmV76eu<=!j`Q|@JW>wDMtWiHY7B}I))QMbmDU9r9Q0=tvmY%EyU$P%aPUx?wr^dNFk;FB{;Ak zqOzA)$mJ~GNs`!O+?Op6U$M;gZTja*Q+{OI?1qJGDl1%`+lb#u(X{JdvJnR!RX}N= z*5m9Q0x@8wD@}CBpr|5wV5t!2vj>tYt0(+;NdxSB=QS>)tkFQVIQA%EGBA2DZm&-b zodSl*W!VKc_n1oNXY)B(d@}kIIt^?xxwNE}_|k=ZK|aA}&>N>dd4_X&SrkZa6q&>( zQRA~yqrf;$U5@z}^)cq9Pm^ZG;FIH%H&b)XLk}-?lcE2ncXUU}1OkTMijK4iP#|MV zv1Re-dHrDeHhsN7U-$$KPNso$QVwpj(re}| z*sO&YjvRRw2j%PnU>17_e88u%3FlxL9>sFBR$D%4x10g<^Iz1jP#8ExQ4^fC81OU} z;4PSeN#YFP$S&0kzXX~Zk006vvqiX^H_<7GE?{7p?n;)SNf;A)n z00j8Aw1wPPw8|s8#EK*O7fCLFXHd@vBmm$DzrZ&2C?JC~hTMe^h>{^3WFUhu5P*UJ z1Ui3Ql5{Gr=M6rfJc<*krHV6NF3;3$BGe2-6nPS0VSOLKB7-ZWI4%U%h#K?56jL0lh@4N|^92V2y|!f0-a-yOguz|#C_P;xYC1Ux$Ofup+Jy&0 zn788v1S7no$6x+O^uMgX;Tke9(#AwVOcVwH#*prTse4&&K*-KCA_UTive|EEl3Es` zQgN+~4T$Ua*e*%87S?u@7U>L1-J{(`34BUVCL>Vc)MO-EFD6?M!_Si~F%h1Vt*nZK z$<_i9=O$x87z-!K(}1FO2Gi)1%fPnaOZ;JrU3%(aw`z6Ov1*@lBU5NLb`*MXE{Rv>EP6A*=w^ C6TJ8U literal 11344 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 CGBwQr literal 11928 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 eMM9b%tg5E=~f| diff --git a/web/public/fonts/jetbrains-mono-nfm-regular.woff2 b/web/public/fonts/jetbrains-mono-nfm-regular.woff2 index 9e4d168c0d9a67819d6b5c2c30715dbbb9003363..f8f2d5edf9542e112de42545126cabedae473a9e 100644 GIT binary patch literal 11476 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 diff --git a/web/public/install.ps1 b/web/public/install.ps1 index ff5d0ca..3cb2b8a 100644 --- a/web/public/install.ps1 +++ b/web/public/install.ps1 @@ -1,4 +1,4 @@ -# Luxe's installer for Windows: +# luxe's installer for Windows: # # powershell -c "irm https://luxe.dev/install.ps1 | iex" # diff --git a/web/src/assets/generated/changes-wide.luxe.svg b/web/src/assets/generated/changes-wide.luxe.svg index 313ef46..41d997d 100644 --- a/web/src/assets/generated/changes-wide.luxe.svg +++ b/web/src/assets/generated/changes-wide.luxe.svg @@ -46,10 +46,10 @@ - - - - + + + + @@ -303,7 +303,7 @@ - + @@ -311,9 +311,6 @@ - - - @@ -764,16 +761,16 @@ ▾ 󰉋 ~/work/luxe-sdk 󰘬 main I put the names back under their directory ▾ 󰉋 src headings, middle-eliding the long ones so the client.ts +18 −3 M basename always survives. - events.ts +64 −0 A - Now the dock's tests, to check nothing else leaned - MODEL on the old grouping. - lmstudio 󰚩 qwen3.8-27b - thinking 󰌵 med - mode 󱌣 build ⠋ test cargo nextest run -p luxe-tui dock 6s + + MODEL Now the dock's tests, to check nothing else leaned + provider 󰅣 lmstudio on the old grouping. + model 󰚩 qwen3.8-27b + thinking 󰌵 med + mode 󱌣 build ⠋ test cargo nextest run -p luxe-tui dock 6s SESSION - context  12% of 200k 38s · ctrl+esc to interrupt - tokens ↑21k ↓5.2k ↺21k 󱌣 build - cost $0.45 alt+n next file · ctrl+b unified diff · alt+w stop wrapping · ctrl+g review this file · alt+o open in editor · esc close - review $0.03 + context  12% of 200k 38s · ctrl+esc to interrupt + tokens ↑21k ↓5.2k ↺21k 󱌣 build + cost $0.45 alt+n next file · ctrl+b unified diff · alt+w stop wrapping · ctrl+g review this file · alt+o open in editor · esc close + review $0.03 diff --git a/web/src/assets/generated/chat-question.luxe.svg b/web/src/assets/generated/chat-question.luxe.svg index efa9174..15d45ce 100644 --- a/web/src/assets/generated/chat-question.luxe.svg +++ b/web/src/assets/generated/chat-question.luxe.svg @@ -11,10 +11,10 @@ - - - - + + + + @@ -614,9 +614,9 @@ [ ] 3. tracing [ ] 4. Type your own answer - enter submit · space toggle · ↑/↓ choose · esc cancel - MODEL - lmstudio 󰚩 qwen3.8-27b 󱌣 build - thinking 󰌵 off - mode 󱌣 build + MODEL enter submit · space toggle · ↑/↓ choose · esc cancel + provider 󰅣 lmstudio + model 󰚩 qwen3.8-27b 󱌣 build + thinking 󰌵 off + mode 󱌣 build diff --git a/web/src/assets/generated/chat-streaming.luxe.svg b/web/src/assets/generated/chat-streaming.luxe.svg index 67c176a..b434b0c 100644 --- a/web/src/assets/generated/chat-streaming.luxe.svg +++ b/web/src/assets/generated/chat-streaming.luxe.svg @@ -5,10 +5,10 @@ - - - - + + + + @@ -306,9 +306,9 @@ - - MODEL 0s · ctrl+esc to interrupt - lmstudio 󰚩 qwen3.8-27b 󱌣 build - thinking 󰌵 off - mode 󱌣 build + MODEL + provider 󰅣 lmstudio 0s · ctrl+esc to interrupt + model 󰚩 qwen3.8-27b 󱌣 build + thinking 󰌵 off + mode 󱌣 build diff --git a/web/src/assets/generated/chat-thinking.luxe.svg b/web/src/assets/generated/chat-thinking.luxe.svg index c43fc8e..580abba 100644 --- a/web/src/assets/generated/chat-thinking.luxe.svg +++ b/web/src/assets/generated/chat-thinking.luxe.svg @@ -11,10 +11,10 @@ - - - - + + + + @@ -284,9 +284,9 @@ Planning the test · +1 more line Added a byte-at-a-time table test covering split-token boundaries. - - MODEL - lmstudio 󰚩 qwen3.8-27b 󱌣 build - thinking 󰌵 off - mode 󱌣 build + MODEL + provider 󰅣 lmstudio + model 󰚩 qwen3.8-27b 󱌣 build + thinking 󰌵 off + mode 󱌣 build diff --git a/web/src/assets/generated/chat-tools.luxe.svg b/web/src/assets/generated/chat-tools.luxe.svg index 0a9f312..f0a7f29 100644 --- a/web/src/assets/generated/chat-tools.luxe.svg +++ b/web/src/assets/generated/chat-tools.luxe.svg @@ -44,10 +44,10 @@ - - - - + + + + @@ -329,9 +329,9 @@ ⠋ read crates/luxe-tui/src/view.rs - - MODEL - lmstudio 󰚩 qwen3.8-27b 󱌣 build - thinking 󰌵 off - mode 󱌣 build + MODEL + provider 󰅣 lmstudio + model 󰚩 qwen3.8-27b 󱌣 build + thinking 󰌵 off + mode 󱌣 build diff --git a/web/src/assets/generated/dock-wide.luxe.svg b/web/src/assets/generated/dock-wide.luxe.svg index e93d445..7e75fd0 100644 --- a/web/src/assets/generated/dock-wide.luxe.svg +++ b/web/src/assets/generated/dock-wide.luxe.svg @@ -17,10 +17,10 @@ - - - - + + + + @@ -92,12 +92,10 @@ - + - - @@ -386,16 +384,16 @@ client.ts +18 −3 M events.ts +64 −0 A ▾ 󰉋 ~/work/luxe-docs 󰘬 guide - README.md +2 −2 M - - MODEL - lmstudio 󰚩 qwen3.8-27b - thinking 󰌵 med - mode 󱌣 build + + MODEL + provider 󰅣 lmstudio + model 󰚩 qwen3.8-27b + thinking 󰌵 med + mode 󱌣 build Context stays available without displacing the active conversation. SESSION - context  12% of 200k - tokens ↑21k ↓5.2k ↺21k 󱌣 build - cost $0.45 - review $0.03 + context  12% of 200k + tokens ↑21k ↓5.2k ↺21k 󱌣 build + cost $0.45 + review $0.03 diff --git a/web/src/assets/generated/mark.svg b/web/src/assets/generated/mark.svg index 2725166..7ee3cb0 100644 --- a/web/src/assets/generated/mark.svg +++ b/web/src/assets/generated/mark.svg @@ -1,4 +1,4 @@ - - Luxe + + luxe diff --git a/web/src/assets/generated/peek-beside.luxe.svg b/web/src/assets/generated/peek-beside.luxe.svg index f47ec49..ca3ee6d 100644 --- a/web/src/assets/generated/peek-beside.luxe.svg +++ b/web/src/assets/generated/peek-beside.luxe.svg @@ -42,14 +42,14 @@ - - - - - - - - + + + + + + + + @@ -183,44 +183,46 @@ - + + - + - + + - + + - @@ -229,9 +231,6 @@ - - - @@ -240,12 +239,15 @@ + + + @@ -254,16 +256,13 @@ - - - + + - - @@ -568,38 +567,38 @@ ○ Document the sections @@ -212,5 +214,6 @@ fn change_file_line 212 214 let styles = &app.theme_styles; FILES 12 changed all ▾ 213 - let ink = if reviewed { styles.dim } else { styles.text - ▾ 󰉋 .luxe/agent-loop ↳}; - state.json ? 215 + let open = app.changes.as_ref().is_some_and(|view| view. - ▾ 󰉋 assets ↳path == path); - 󰅴 context-preview.png A 216 + let ink = if open { styles.selected_bg } else { styles.t - ▾ 󰉋 crates ↳ext }; - ▾ 󰉋 luxe-core/src 214 217 Line::from(spans) -  workspace.rs +13 −0 M 215 218 } - ▾ 󰉋 luxe-tui/src - ▾ 󰉋 view - dock.rs +48 −9 M -  dashboard.rs +6 −2 M Why does the dock's change list show directories - fixture.rs +31 −0 A instead of files? - ctrl+p preview · ctrl+g review - - ELSEWHERE The data was always there — DockChanges.files - 5 files outside this project carries a path, a status and both counts per file. - ▾ 󰉋 ~/work/luxe-sdk 󰘬 main Only the renderer withheld them, reducing every - ▾ 󰉋 src file to its directory before drawing. - client.ts +18 −3 M - events.ts +64 −0 A I put the names back under their directory - ▾ 󰉋 ~/work/luxe-docs 󰘬 guide headings, middle-eliding the long ones so the - README.md +2 −2 M basename always survives. + state.json ? ↳}; + ▾ 󰉋 assets 215 + let open = app.changes.as_ref().is_some_and(|view| view. + 󰅴 context-preview.png A ↳path == path); + ▾ 󰉋 crates 216 + let ink = if open { styles.selected_bg } else { styles.t + ▾ 󰉋 luxe-core/src ↳ext }; +  workspace.rs +13 −0 M 214 217 Line::from(spans) + ▾ 󰉋 luxe-tui/src 215 218 } + ▾ 󰉋 view + dock.rs +48 −9 M +  dashboard.rs +6 −2 M + fixture.rs +31 −0 A Why does the dock's change list show directories + ctrl+p preview · ctrl+g review instead of files? + + ELSEWHERE + 5 files outside this project The data was always there — DockChanges.files + ▾ 󰉋 ~/work/luxe-sdk 󰘬 main carries a path, a status and both counts per file. + ▾ 󰉋 src Only the renderer withheld them, reducing every + client.ts +18 −3 M file to its directory before drawing. + events.ts +64 −0 A + ▾ 󰉋 ~/work/luxe-docs 󰘬 guide I put the names back under their directory + README.md +2 −2 M headings, middle-eliding the long ones so the + basename always survives. - Now the dock's tests, to check nothing else leaned - MODEL on the old grouping. - lmstudio 󰚩 qwen3.8-27b - thinking 󰌵 med - mode 󱌣 build ⠋ test cargo nextest run -p luxe-tui dock 6s + MODEL Now the dock's tests, to check nothing else leaned + provider 󰅣 lmstudio on the old grouping. + model 󰚩 qwen3.8-27b + thinking 󰌵 med + mode 󱌣 build ⠋ test cargo nextest run -p luxe-tui dock 6s SESSION - context  12% of 200k 38s · ctrl+esc to interrupt - tokens ↑21k ↓5.2k ↺21k 󱌣 build - cost $0.45 alt+n next file · ctrl+g review this file · esc close - review $0.03 + context  12% of 200k 38s · ctrl+esc to interrupt + tokens ↑21k ↓5.2k ↺21k 󱌣 build + cost $0.45 alt+n next file · ctrl+g review this file · esc close + review $0.03 diff --git a/web/src/assets/generated/tile.svg b/web/src/assets/generated/tile.svg index 8d7b84c..359bc1c 100644 --- a/web/src/assets/generated/tile.svg +++ b/web/src/assets/generated/tile.svg @@ -1,5 +1,5 @@ - - Luxe + + luxe diff --git a/web/src/assets/generated/wordmark.svg b/web/src/assets/generated/wordmark.svg index eac2eb5..e42562d 100644 --- a/web/src/assets/generated/wordmark.svg +++ b/web/src/assets/generated/wordmark.svg @@ -1,5 +1,5 @@ - - Luxe + + luxe diff --git a/web/src/components/Demo.svelte b/web/src/components/Demo.svelte index 364f9e2..7745d4e 100644 --- a/web/src/components/Demo.svelte +++ b/web/src/components/Demo.svelte @@ -232,7 +232,7 @@ /* The terminal's own background, not the site's raised surface. - Luxe paints a background into most of its cells rather than leaving them default, so a plate + luxe paints a background into most of its cells rather than leaving them default, so a plate in any other color splits the picture in two: painted cells become dark rectangles and unpainted ones show the plate through. It reads as a corrupted capture, and it is the reason these looked broken in a browser while the recording itself was clean. `--luxe-capture-bg` is diff --git a/web/src/components/Shot.astro b/web/src/components/Shot.astro index 7bf04e2..11cf8e9 100644 --- a/web/src/components/Shot.astro +++ b/web/src/components/Shot.astro @@ -2,13 +2,13 @@ /** * A terminal capture, in a plate. * - * Luxe's own theme, generated from the production view path. SVG: crisp at any zoom, and the text + * luxe's own theme, generated from the production view path. SVG: crisp at any zoom, and the text * inside is real text. * * **The markup is inlined, and it has to be.** An SVG loaded through `` is a document of * its own in secure static mode: it cannot see the embedding page's `@font-face`, so the subset * webfont this site ships never reached a single screenshot. That is invisible to anyone who has - * the face installed, which is anyone who works on Luxe. For everyone else the stack fell through + * the face installed, which is anyone who works on luxe. For everyone else the stack fell through * to a system mono advancing some other width than the one the exporter pins `textLength` to, so * every row was squeezed or stretched by the difference, and every Nerd Font icon in the picture * drew as tofu. `` also makes the text unselectable, which is half the reason these are diff --git a/web/src/components/Still.astro b/web/src/components/Still.astro index 7aa9976..6d15a9a 100644 --- a/web/src/components/Still.astro +++ b/web/src/components/Still.astro @@ -6,7 +6,7 @@ * code it argues about, and a reader meeting that for the first time needs to stop on it — played * at demo speed it registers as motion rather than as information. So these come from the same * captures the demos do, cut with `scripts/cast-still.py`, and there is still one source of truth - * for what Luxe looks like. + * for what luxe looks like. * * A recording bakes its colors in, and the site is drawn in the same theme it was recorded in. * @@ -21,7 +21,7 @@ interface Props { * Where the picture comes from: a frame cut out of a recording (the default), or a fixture * `scripts/site-assets.sh` generates from the production view path. * - * Either way it is Luxe's own theme, so a fixture and a recording beside it are one product. + * Either way it is luxe's own theme, so a fixture and a recording beside it are one product. */ from?: "captures" | "generated"; /** @@ -134,7 +134,7 @@ const capture = (basename: string, variant: string) => { position: relative; } - /* The terminal's own background, for the reason `Demo` documents at length: Luxe paints a + /* The terminal's own background, for the reason `Demo` documents at length: luxe paints a background into most cells, so a plate in any other color turns the painted ones into rectangles. Generated from the dark theme, and it does not follow the page's mode because the capture does not either. */ diff --git a/web/src/components/ThemeGallery.svelte b/web/src/components/ThemeGallery.svelte index d53d4cc..a7674d0 100644 --- a/web/src/components/ThemeGallery.svelte +++ b/web/src/components/ThemeGallery.svelte @@ -10,7 +10,7 @@ * The picture arrives as the slot, drawn once at build time by `fixture_svg --palette`: every * color in it is `var(--pN, …)`, and `palette` says what each `N` is in each theme. So this sets * a dozen custom properties on the frame and the browser repaints the rest. It used to be an HTML - * mock of the app, which showed the colors and nothing of how Luxe actually uses them. + * mock of the app, which showed the colors and nothing of how luxe actually uses them. * * With `cycle`, the gallery takes turns on its own every few seconds, so a reader who never * touches it still sees what the themes are. Pointing at a chip holds that theme, pointing at the @@ -141,7 +141,7 @@ onmouseenter={() => (reading = true)} onmouseleave={() => (reading = false)} > -