updates

.kilo/plans/1784851829193-codecompanion-revamp.md

@@ -0,0 +1,85 @@
+# CodeCompanion Revamp Plan
+
+## Context
+
+- Current: CodeCompanion **19.18.0** via nixpkgs `vimPlugins.codecompanion-nvim` (nixpkgs input lastModified ~2026-05-15).
+- Latest: **19.20.0**. Key changes since 19.18.0:
+  - v19.19.0: `claude-sonnet-5` support, async/dynamic model fetching, copilot `top_p` fixes, inline orphaned-keymap fix, background command deregistration.
+  - v19.20.0: `gemini_interactions` adapter, PDF support for http adapters (`/file` on Anthropic/Copilot/OpenAI/OpenRouter), env vars from files, prompt-library items auto-receive default rule groups, copilot schema options removed.
+- **Bug in current setup:** config sets `model = "claude-sonnet-5"` but 19.18.0 predates its support; the model name may not resolve. The nixpkgs bump fixes this.
+- Files involved:
+  - `plugin/24_completion.lua` — `get_codecompanion_config()`, setup, blink integration.
+  - `plugin/10_keymap.lua` — `<leader>a*` keymaps (lines 69–84, contains duplicates/commented cruft).
+  - `overlays/plugins.nix` — codecompanion overlay (nvimSkipModules); likely unchanged.
+  - `modules/module/specs/plugins.nix` — plugin spec; unchanged.
+
+## Decisions (confirmed with user)
+
+1. **Version bump:** `nix flake update nixpkgs` (accepts wider plugin bump; do NOT override src).
+2. **Adopt:** agent-mode keymaps, one workflow prompt, minor slash-command config (`/share` token). **No MCP.**
+3. **Models:** `claude-sonnet-5` (copilot) for **chat only**; cheaper copilot model for **inline** and **background** (title generation) — use `gpt-5-mini` as placeholder; verify exact model id via `ga` model picker in a chat buffer after the bump and adjust.
+4. **Codex (ChatGPT Edu) = heavy agent lane.** Copilot stays the default chat adapter; Codex ACP is launched explicitly for heavy autonomous tasks. Auth via ChatGPT login only (no API key) — user's existing `auth_method = "chatgpt"` is correct per the v19.20.0 adapter source (`"openai-api-key"|"codex-api-key"|"chatgpt"`; the docs page comment `"chat-gpt"` is stale).
+
+## Tasks
+
+1. **Bump nixpkgs**
+   - Run `nix flake update nixpkgs`.
+   - Verify: `nix eval --raw nixpkgs#vimPlugins.codecompanion-nvim.version` reports ≥ 19.20.0.
+   - Rebuild the wrapped Neovim per this repo's normal build (`nix build` / the repo's usual package target) and smoke-test that the editor starts.
+
+2. **`plugin/24_completion.lua` — `get_codecompanion_config()`**
+   - Keep `interactions.chat.adapter = { name = "copilot", model = "claude-sonnet-5" }`.
+   - Change `interactions.inline.adapter` to `{ name = "copilot", model = "gpt-5-mini" }` (cheap/fast).
+   - Add a background adapter so title generation doesn't use Sonnet: set the background chat adapter to copilot/`gpt-5-mini` (config lives under `interactions.background.chat`; confirm exact key against `:h codecompanion` / `:checkhealth codecompanion` after the bump — the docs page "Generating Titles" says an adapter must be configured for background interactions).
+   - Keep existing context_management, rules, display, shared keymaps unchanged.
+   - Add `interactions.chat.slash_commands["share"].opts.token = os.getenv("GITHUB_GIST_TOKEN")`.
+   - **Prompt library additions** (keep `expert`, `fixer`, `suggest`):
+     - `["agent"]`: interaction "chat", alias `agent`, first user prompt starts with `@{agent}` plus selected code block, so Copilot/Claude gets the file-editing tool group (read_file, insert_edit_into_file, grep_search, run_command, etc., with approvals).
+     - `["tdd"]` (name flexible): interaction "chat", `opts = { is_workflow = true, alias = "tdd" }` — 3-stage workflow: (1) plan/understand `#buffer`, (2) `@{agent}` implement, (3) `@{run_command}` run the test suite (leverages run_command's test-flag for agentic workflows).
+
+3. **`plugin/10_keymap.lua` — clean up + add**
+   - Remove duplicated/commented lines (70–71, 77, 81).
+   - Add:
+     - `nmap_leader("aa", "<cmd>CodeCompanionChat<CR>", "Agent chat (use @{agent})")` or directly `<cmd>CodeCompanion /agent<CR>`.
+     - `xmap_leader("aa", "<cmd>CodeCompanion /agent<CR>", "Agent on selection")`.
+     - `nmap_leader("aw", "<cmd>CodeCompanion /tdd<CR>", "Workflow: plan→implement→test")`.
+     - `nmap_leader("aC", "<cmd>CodeCompanion /compact<CR>", "Compact chat")` (verify `<leader>aC` doesn't clash).
+   - Keep existing mappings unchanged.
+
+4. **No changes** to `overlays/plugins.nix` or `modules/module/specs/plugins.nix` unless the new version introduces new lazy-module load failures (re-run the build's check phase; `doCheck = false` is already set on the spec entry).
+
+5. **Codex ACP lane (ChatGPT Edu)**
+   - **Resolved prerequisite:** user has installed `codex-acp` at `~/.nix-profile/bin/codex-acp` (verified on PATH 2026-07-24). The preset adapter's default command (`codex-acp`) now works as-is — **no `commands` override in the Lua config**. Fallback only if the binary misbehaves: override with `commands = { default = { "codex", "acp" } }` (requires the codex CLI's built-in `acp` subcommand; verify with `codex acp --help`).
+   - **Config change (small):** none strictly required — the existing `extend("codex", { defaults = { auth_method = "chatgpt" } })` block in `plugin/24_completion.lua` is correct. Keep it.
+   - Auth: prereq is an active `codex login` session with the ChatGPT Edu account (`~/.codex/auth.json` exists — user confirms validity; if expired, re-run `codex login`, browser/ChatGPT-app flow, no API key).
+   - Keep codex on-demand (do NOT make it the default chat adapter):
+     - Keep `<leader>ak` (`:CodeCompanionChat adapter=codex`).
+     - Add comment documenting ACP-only slash commands for this lane: `/resume` (restore past codex session, fresh chat only), `/mode` (switch agent mode), `/command`, `/acp_session_options`, plus `\`-triggered ACP command completion in the chat buffer.
+   - Do not set a default codex model in config; pick per-session via `ga` / `/acp_session_options` (avoids hardcoding model ids that change with the Edu plan).
+   - PATH note: Neovim must inherit a PATH containing `~/.nix-profile/bin` so the spawned `codex-acp` resolves — true when nvim is launched from the user's normal shell; call it out if validation fails with "command not found".
+
+6. **Docs/habit notes** (add as comment block above the codecompanion setup, no separate docs file): `/compact`, `/fork`, `/symbols`, `/share`, `/resume`+`/mode` (codex ACP), `gm` (btw), `gty` (YOLO), `gba`/`gbd` (buffer sync), `gd` (debug window).
+
+## Validation
+
+- `nix flake update nixpkgs` then repo build succeeds.
+- In Neovim: `:checkhealth codecompanion` clean.
+- `:CodeCompanionChat`, press `ga` → copilot adapter lists `claude-sonnet-5`; send a trivial message and confirm response + auto title generation.
+- In chat: type `@` → completion shows `agent`, `files`, `memory`, etc.; run `@{agent}` task on a scratch repo and confirm the approval prompt flow works.
+- `:CodeCompanion /tdd` starts the workflow stages in order.
+- Inline: visual-select code, `:CodeCompanion` prompt → confirm diff shows and `ga`/`gr` accept/reject still work on the cheap model.
+- `:CodeCompanion /share` prompts/errors sensibly if `GITHUB_GIST_TOKEN` unset.
+- **Codex lane:** `<leader>ak` opens a chat with the codex ACP adapter; the spawned `codex-acp` process initializes without auth errors (ChatGPT method), a trivial prompt gets a response, and `/mode` lists codex session modes. If it fails with command-not-found, check that Neovim inherited `~/.nix-profile/bin` in PATH (`:echo $PATH` inside nvim).
+
+## Risks
+
+- `nix flake update nixpkgs` bumps **all** vimPlugins and Neovim itself; other plugins may break. If the blast radius is too large, fall back to overriding codecompanion `src` to tag `v19.20.0` in `overlays/plugins.nix` (fetchFromGitHub, `doCheck = false`).
+- Model ids (`claude-sonnet-5`, `gpt-5-mini`) must match the copilot adapter's choices post-bump; verify via `ga` picker and adjust literals.
+- `gpt-5-mini` may not support tool use on copilot — fine, since inline/background don't use tools.
+- `codex-acp` lives in the user's nix profile (outside this flake). If the profile is rebuilt/removed, the codex lane breaks — long-term consider adding `codex-acp` to this flake's runtime deps so it's pinned with the rest of the setup (optional follow-up, not required now).
+- ChatGPT Edu accounts authenticate codex via browser/ChatGPT-app login; token expiry will surface as ACP auth errors → re-run `codex login`.
+
+## Out of scope
+
+- MCP server integration.
+- Custom rules parsers, custom tools, extensions (mcphub/history/vectorcode).

.kilo/plans/1784858731550-nix-neovim-review.md

@@ -0,0 +1,191 @@
+# Neovim + Nix setup review
+
+Scope: `flake.nix`, `overlays/`, `modules/`, `plugin/*.lua`, `lua/*`, `ftplugin/*`, CI/workflows, and cross-check against the pinned versions in `flake.lock` (nixpkgs weekly `241313f4`).
+
+## Pinned package versions (from current lock)
+- neovim `0.12.2`
+- blink-cmp `1.10.2`
+- codecompanion-nvim `19.13.0`
+- nvim-treesitter `0.10.0-unstable-2026-04-03` (main-branch rewrite)
+- nvim-treesitter-textobjects `0-unstable-2026-04-07` (main-branch rewrite)
+- copilot-lua `2.0.3`
+- render-markdown-nvim `8.12.0-unstable-2026-05-07`
+- zk-nvim `0.4.7-unstable-2026-03-13`
+- mini.nvim `0.17.0-unstable-2026-05-12`
+- quarto-nvim `2.1.0`
+- otter-nvim `2.14.5`
+- lspconfig `2.9.0`
+
+---
+
+## CRITICAL: Treesitter is currently non-functional
+
+### Finding
+The nixpkgs `nvim-treesitter` package is the **main-branch rewrite** — there is no `lua/nvim-treesitter/configs.lua`. The whole module in `plugin/20_startup.lua` lines 212-294 is dead code:
+
+```lua
+local ok_configs, configs = pcall(require, "nvim-treesitter.configs")  -- fails
+```
+
+The working tree already removed the fallback `vim.treesitter.start()` FileType autocmd (the "fixed treesitter" commit deleted it). Net result: **no treesitter highlighting, indentexpr, foldexpr, or textobjects are configured**.
+
+### Impact
+- Syntax highlighting falls back to Neovim's regex-only engine.
+- All textobject keymaps (`]a`, `[a`, `]f`, `[f`, `]e`/`[e`, `<leader>x`/`X`, lsp_interop `<leader>lm`) are inert.
+- `foldexpr`/`indentexpr` based folding does nothing.
+
+### Fix direction
+Rewrite `plugin/20_startup.lua` for main-branch API:
+1. FileType autocmd → `vim.treesitter.start()` (and optionally `indentexpr`/`foldexpr`).
+2. `require("nvim-treesitter-textobjects").setup({ move = { set_jumps = true } })` + explicit keymaps using `move.goto_next_start(query, "textobjects")` and `swap.swap_next(...)`.
+3. The non-Nix `ensure_installed` block should set `opts.ensure_installed` BEFORE the filter (line 278 reads it before line 286 defines it).
+
+Also remove duplicate `vim.treesitter.language.register("markdown", ...)` between `plugin/20_startup.lua` and `plugin/21_datascience.lua`.
+
+---
+
+## CodeCompanion version mismatch
+
+### Finding
+Config targets features absent in `19.13.0` (present only in `≥19.19.0`/main):
+
+| Config usage | Present in 19.13? | Present in main (`v19.20.0`) |
+|---|---|---|
+| `interactions.chat.opts.context_management.editing` | No (flat `trigger`/`enabled` only) | Yes |
+| `interactions.chat.opts.context_management.compaction` | No | Yes |
+| `<leader>aC` requiring `codecompanion.interactions.chat.context_management.compaction` | **RUNTIME ERROR** | Works |
+| `slash_commands.share` (`opts.token = ...`) | No (absent from defaults) | Yes |
+| `adapters.acp.codex.defaults.auth_method = "chatgpt"` | Yes | Yes |
+| `interactions.chat.adapter = { name = ..., model = ... }` table form | Yes | Yes |
+
+### Risk
+On today's lock (`19.13.0`): `/share` is inert, compaction-only keymap throws module-not-found, and `editing`/`compaction` tuning is silently ignored. On `≥19.19.0`/main: everything works.
+
+### Decision needed (BLOCKING)
+Choose **exactly one**:
+
+- **A — Upgrade the plugin pin** (`overlays/plugins.nix` fetch to `v19.20.0` or `main`, bump the lock, and keep the current config). Riskiest change but matches what the config is written for.
+- **B — Downgrade config call sites** to match `19.13.0`: remove `slash_commands.share`, remove `editing`/`compaction` keys (or collapse to flat `trigger: 0.75`), remove or gate `<leader>aC` on "newer" version.
+- **C — Version-gate the config**: keep current code, read the installed version at startup and skip the new features when < 19.19.
+
+I recommend A (the config clearly intends to track upstream main-ish behavior; `nix flake update` already bumped it to `19.18.0` in a prior session and you only reverted because the nightly was still too old — `v19.20.0` is now available).
+
+---
+
+## DEAD / DUPLICATE code
+
+- `plugin/20_startup.lua` — the entire `configs.setup(opts)` block is dead (see Treesitter finding above).
+- `plugin/10_keymap.lua`:
+  - `nmap_leader('od', '<Cmd>Neogen<CR>', ...)` — `neogen` plugin is **not shipped** in `specs/plugins.nix`. Mapping errors on press.
+  - `nmap_leader('fp', '<Cmd>Pick projects<CR>', ...)` — `MiniExtra.pickers.projects` doesn't exist in mini.extra; would error.
+  - `nmap_leader('oS', '<Cmd>lua Config.insert_section()<CR>', ...)` — `Config.insert_section` is never defined.
+  - `vim.lsp.buf.definition()` is bound to `grd`; Neovim 0.11+ defaults include `gr` aliases. Cosmetic, but `]d`/`[d` exist on modern LSP config and would be more idiomatic.
+- `plugin/23_editor.lua`:
+  - `my_styler` formatter (calls `R -s -e styler::...`) is defined but never referenced — dead.
+- `plugin/24_completion.lua`:
+  - `providers.cmp_r` is defined in the blink source list but never enabled in `default` or `per_filetype`; inert.
+  - `BLINK_VERSION = "v1.4.1"` — only consulted in the non-Nix install path; nixpkgs is `1.10.2`. Pin it to current or drop.
+  - `get_blink_fuzzy_setting().prebuilt_binary = { force_version = BLINK_VERSION }` — singular key is wrong; blink option is `fuzzy.prebuilt_binaries` (plural). Being skipped in-Nix anyway, but still wrong key.
+- `modules/module/specs/plugins.nix` — `specs.utils-lazy` ships `nvim-dap*` and `nvim-lint` but there is zero config/tooling that references them in this repo.
+- `ftplugin/quarto.lua`:
+  - Second top-level `require('quarto').setup()` with **no args** runs _after_ `21_datascience.lua`'s setup and **resets** it to defaults (no `lspFeatures`, no `codeRunner`).
+  - Top-level `require('quarto')` at FileType load also crashes if the quarto plugin isn't installed (e.g. cats off and a `.qmd`/`.quarto` file is opened): Neovim detects `quarto` ft natively in 0.10+.
+- `plugin/00_options.lua`:
+  - Lines 146-163: two back-to-back FileType autocmds that both remove `r`/`o` from `formatoptions`. The second references an undefined `augroup` variable (nil → autocmd is global, happens to still work).
+
+---
+
+## STALE / WRONG options
+
+- `plugin/10_keymap.lua` line 174:
+  ```lua
+  require("conform").format({ lsp_fallback = true })
+  ```
+  `lsp_fallback` is the **deprecated** boolean form of `conform.nvim`; should be `lsp_format = "fallback"` (the form already used in `plugin/23_editor.lua` and `ftplugin/python.lua`). In newer conform this may warn or error.
+- `ftplugin/quarto.lua`:
+  - Sets `<Plug>RDSendLine` and R-style keymaps on _all_ quarto buffers, including Python/Julia chunks. This collides with quarto-runner mappings set in `21_datascience.lua`. Should gate on `vim.bo.filetype == "r"` (the ftplugin already imports quarto.runner for python, but the R keys leak).
+- `.github/dependapot.yml` — filename typo. GitHub expects `dependabot.yml`; Dependabot won't run.
+- `.github/workflows/check.yml`:
+  - `nix develop` without a `-c` command just launches an interactive shell. In CI it does nothing useful (or hangs). Replace with `nix develop -c echo ok` or drop.
+  - Path filter `'modules'` only matches the root directory itself; should be `modules/**` (or `'modules/**'`).
+  - Changing `plugin/`, `lua/`, `overlays/`, `ftplugin/`, etc. does **not** trigger CI.
+- `flake.nix` / `.envrc` shellHook:
+  ```sh
+  export R_LIBS_SITE=$(strings "$(command -v R)" | grep -oP '/nix/store/[^:]+/library' ...)
+  ```
+  `grep -oP` (PCRE) is **not available in macOS BSD grep**. On `aarch64-darwin` this silently fails → `R_LIBS_SITE` is empty. Either depend on `ripgrep` regex (`strings ... | rg -o '...'`) or use `gsed` (GNU sed).
+- `overlays/plugins.nix` — `zk-nvim` skip list contains `zk.pickers.fzf_lua`; current zk-nvim package likely doesn't load that regardless, but harmless.
+- `modules/module/settings/core.nix` — `config.settings.nvim_lua_env` references `lp.tiktoken_core` but `tiktoken_core` is **not in `catPkgs.general` or anywhere else** in these files. If there's an extra Lua/tiktoken module, fine; otherwise this option is placeholder dead code.
+- `modules/module/settings/hosts.nix` — host `m` (marimo) is defined with `enable = false` but also configured with `package`, `argv0`, `addFlag`. Dead block.
+
+---
+
+## PORTABILITY / DARWIN issues
+
+- Shell hook `grep -oP` (above) fails on macOS.
+- `mkdir -p "$R_LIBS_USER"` fine; but `command -v R` on macOS returns the wrapper; the wrapper path injection still works.
+
+---
+
+## DEAD WEIGHT (shipped but unused)
+
+- `catPkgs.r` includes `pkgs.rnvimserver` — `rnvimserver` is needed by R.nvim only when using the _socket_ transport; `21_datascience.lua` only uses vim-slime. Acceptable, but `rnvimserver` adds to build time. Include if you actually use it? Currently not used.
+- `specs.utils-lazy` ships `nvim-dap`, `nvim-dap-ui`, `nvim-dap-virtual-text`, `nvim-lint` — none of these are referenced anywhere in `plugin/` or `lua/`. Consider moving them to a devShell-only cat, or drop them.
+- `.gitignore` `*.R` — prevents tracking any new `.R` files. `tests/test.R` is already committed so it isn't actively harmful, but it's surprising for a repo whose default cats include R.
+- `.commandcode/` dir is listed in `.gitignore` but is in the worktree; fine, but worth cleaning up if it's an artifact.
+
+---
+
+## IMPROVEMENTS given updated packages
+
+- `catPkgs.markdown` — add `marksman` (it's the LSP used by `render-markdown.nvim` wiki links and configured in LSP). Same binary is needed by `render-markdown` for wiki link ISP.
+- `vim.lsp.enable` servers configured but binaries missing in PATH:
+  - `marksman` (LSP + render-markdown wiki integration).
+  - `r_ls` (new R language server — package name in nixpkgs is likely `r-languageserver` or `r_ls`; current `catPkgs.r` doesn't ship either).
+  - `clangd` — not required for this data-science setup; either drop or add to `external`.
+  - `julials` — require `LanguageServer.jl` in `settings.lang_packages.julia` for it to be useful.
+- `blink.cmp` is `1.10.2` but config pins `BLINK_VERSION = "v1.4.1"` for the non-Nix path. Either drop the `BLINK_VERSION` constant (let MiniDeps track HEAD or the tag pinned in flake) or update it to `v1.10.2`.
+- `conform.nvim` already uses `lsp_format = "fallback"` in `23_editor.lua` and `ftplugin/python.lua`, but `10_keymap.lua` still calls the deprecated `lsp_fallback = true`. Align to `lsp_format = "fallback"`.
+- `.github/workflows/check.yml` — add path filters for `plugin/**`, `lua/**`, `overlays/**`, `ftplugin/**`, `modules/**`.
+- `tests/init.lua` smoke-test and `tests/test.R` are present but **not wired into `nix flake check`**. Add a trivial check that runs `lua tests/init.lua` via `nix-shell -A ...`.
+
+---
+
+## CONFLICTS
+
+- `<leader>up` (terminal bracketed paste toggle in `10_keymap.lua`) conflicts with `mini.basics.mappings.option_toggle_prefix = "<leader>u"` (paste toggle), which is set up later in `20_startup.lua` via `now()`. Result: the user's `<leader>up` mapping gets overwritten. Portable workaround: remap to `<leader>tp` (terminal namespace) and keep `<leader>tb` as alternative — both already mapped in 10_keymap.
+- `ftplugin/quarto.lua` resets quarto-nvim config (kills `lspFeatures`/`codeRunner` set in `21_datascience.lua`) and injects R plug mappings into non-R quarto chunks.
+
+---
+
+## CLEAN summary for implementer
+
+### Immediate (not version-dependent)
+1. Restore treesitter highlighting + textobjects in `plugin/20_startup.lua` using main-branch API.
+2. Remove duplicate `vim.treesitter.language.register` in `21_datascience.lua`.
+3. Fix `plugin/10_keymap.lua`: remove/resolve `Neogen`, `Pick projects`, `Config.insert_section` dangling mappings.
+4. Replace deprecated `lsp_fallback = true` with `lsp_format = "fallback"` in `plugin/10_keymap.lua`.
+5. Gate `ftplugin/quarto.lua` to not reset config and to not leak R keys into non-R chunks; guard against missing `quarto` plugin.
+6. Remove duplicate `formatoptions` autocmds (or at least dedupe).
+7. Dedupe `RNVIM_COMPLDIR` / `TMPDIR` setup (do it in one place).
+8. Rename `.github/dependapot.yml` to `.github/dependabot.yml`.
+9. Remove or gate dead host `m` in `hosts.nix`.
+10. Remove unused `rsplit`? no, irrelevant.
+11. Add `marksman` to `catPkgs.markdown` and remove orphan LSP entries or ship the binaries.
+12. Remove dead `conform` formatter `my_styler` and dead blink `cmp_r` provider, or wire them up.
+
+### Version-dependent (BLOCKED)
+- **Reset the CodeCompanion version decision**: either pin to `v19.20.0` (keep config, fix `slash_commands.share`, drop the `<leader>aC` compatibility shim, keep `editing`/`compaction`) OR downgrade config to match `19.13.0` (remove `share`, collapse `context_management`).
+
+### CI / packaging
+- Fix `nix develop` usage and path filters in `.github/workflows/check.yml`.
+- Replace `grep -oP` in `flake.nix` shellHook with portable `rg -o` or add `gnused` to `catPkgs.always` and use `gsed`.
+- Wire `tests/init.lua` into `flake check`.
+
+### Verification
+- `nix flake check` on both `aarch64-darwin` and `x86_64-linux`.
+- `nix build .#packages.<system>.default` succeeds (already does).
+- Start nvim, verify :TSContext works, treesitter highlighting is on, and `]f`/`[f` textobjects move.
+- Open a `.qmd` file with cats off → no ftplugin crash.
+- Confirm `<leader>up` still toggles bracketed paste.
+- Confirm `:Pick projects` and `:Neogen` and `Config.insert_section` no longer error (or are mapped to valid handlers).