Keyboard navigation: Emacs-style bindings + kill ring - #1
Merged
Conversation
added 2 commits
May 18, 2026 21:53
…tion+arrows, kill ring with yank-pop 56 tests covering: - Ctrl+A/E start/end of line - Ctrl+B/F char navigation - Option/Meta+Left/Right word skipping (Unicode-aware) - Meta+B/F Emacs-style word skip - Ctrl+K/U/W kill operations with kill ring - Ctrl+Y yank, Meta+Y yank-pop - Meta+Backspace/D word delete - Ctrl+N/P history navigation - Consecutive kill accumulation - Kill ring cap at 10 entries - Yank state reset on non-yank actions
yogthos
added a commit
that referenced
this pull request
May 21, 2026
) Track F-CRITICAL #1 from ROADMAP.md. ## Problem `extras/acp/mod.rs::build_acp_permission` constructed `(ask_tx, _ask_rx)` and immediately dropped `ask_rx`. When a tool needed `Ask` confirmation in ACP mode (Zed / editor client), the permission check called `ask_tx.send()`, awaited the oneshot reply, and waited 30 seconds before timing out. The user saw a generic tool failure with no context. Tools requiring permission were effectively unrunnable from ACP clients unless the user configured `--yolo` or explicit allow rules in `permission` config. ## Fix New `spawn_acp_ask_drain` task takes ownership of the receiver and responds to every `AskRequest` with `UserDecision::Deny` immediately. Fail-fast with a clear deny beats a 30s timeout: - The LLM sees the denial in the tool result and can re-plan. - The error message is "Permission denied by user", not a generic timeout. - Explicit allow rules (set via config or `/allow add` in interactive mode beforehand) still work — they short-circuit before the ask channel. Routing the ask through the ACP protocol as a real `requestPermission` notification (so the editor surfaces a dialog) is a larger Phase C5-ish feature; F1 is the minimum-viable non-hang fix. ## Tests Two new tests in `extras::acp::tests`: - `acp_ask_drain_responds_with_deny`: send one `AskRequest`, assert the reply arrives within 200ms with `Deny`. - `acp_ask_drain_handles_multiple_concurrent_asks`: send 5 asks in a loop, assert all 5 replies arrive promptly with Deny — guards against a single-shot drain bug. ## Test plan - [x] `cargo test --features acp` — 2 new tests pass. - [x] `cargo test --features plugin` — 649 pass (full suite). - [x] `cargo build --all-features` — compiles, no warnings. Co-authored-by: Yogthos <yogthos@gmail.com>
yogthos
added a commit
that referenced
this pull request
May 21, 2026
…aths (#111) 23 audit findings verified REAL via parallel agent verification + cross-check against opencode/pi reference patterns. Shipping the 10 most concrete fixes here; the rest go in a follow-up docs/test batch. ## Security - **#9 bash quote_aware_split missed bare `|`** — `safe_cmd | rm -rf /` was treated as one segment; only the LHS got permission-checked. Pipe RHS rode in unchecked under the fallback (non-semantic-bash) path. Added single-byte `|` split after `||` is matched. The tree-sitter path was already correct. - **#4 read.rs no binary detection** — feeding a PDF/ELF/.pyc into the LLM as lossy UTF-8 wasted tokens and confused the model. Ported opencode `read.ts:153-198`: reject by extension list (zip/exe/.o/.pdf/.png/etc.), then sniff the first 4 KiB — null byte = binary, >30% non-printable = binary. Clear error message tells the agent to use bash + xxd instead. ## Correctness - **#2 skill override inverted** — README contract: "Project skills override global skills by name". Code used `map.entry(name).or_insert(skill)` which KEEPS the first (global) value and silently drops project overrides. Switch to `map.insert` (last-write-wins) since globals iterate first and project iterates second. - **#37 skill empty name** — frontmatter `name:` with empty value parsed to "", which then matched any `skill ""` call silently. Fall back to directory name when frontmatter name is empty/whitespace-only. - **#1 session_tree.janet hook never fired** — plugin defined `(defn on-message ...)` but `(def hooks [])` was empty AND the hook name doesn't exist (dirge uses `on-message-update`). `/label` was permanently broken ("no entry yet"). Fix: rename to `on-message-update` + register in hooks vector. - **#7 workflow.janet hooks vector missing entries** — plugin defined `workflow-on-tool-end`, `-on-error`, `-on-complete` but only registered the first four hook names. Three hooks were dead. Added them. - **#26 MCP malformed JSON silently empty args** — `serde_json::from_str(&args).unwrap_or_default()` turned bad JSON into None, sending the server an empty argument set. Server then errored with confusing "missing required field" instead of dirge surfacing the actual parse error. Now returns ToolError with the parse error message + first 200 chars of the offending JSON. - **#22 /prompt default unreachable** — README documents `default` as a built-in prompt (prompts/default.md exists), but `/prompt default` was intercepted as a magic "clear" keyword. If `default` is registered in `context.prompts`, the new branch falls through to the normal name-lookup. Only acts as clear-keyword when no `default` prompt is present (legacy fallback). - **#23 /allow add accepted invalid tools** — typo `/allow add bsah ...` silently created an inert rule the user couldn't debug. Added a known-tools whitelist matching PermissionConfig fields; unknown tools error with the valid list. ## Performance + correctness - **#11 grep loaded whole files into memory** — no size cap meant a 9MB file got fully buffered. Added 10 MiB per-file cap via metadata pre-check. - **#15 Python dunder methods marked non-exported** — `!name.starts_with('_')` treats `__init__`/`__call__`/etc. as private, even though they're Python's standard public protocol. Recognize `__x__` dunder pattern as exported. ## UI - **#36 panel char-count truncation vs Unicode width** — panel truncation used `chars().count()` while wide emoji and CJK take 2 cells. A status line with an emoji overflowed the right border by one cell. Switched to `UnicodeWidthStr::width` for both truncation and padding. ## Tests 4 new regression tests: - `test_is_binary_extension_known` — pdf/tgz/.so/.jpg/.pyc - `test_is_binary_content_null_byte` — null byte trigger, UTF-8 Japanese stays clean, all-non-printable triggers - `quote_aware_split_splits_on_bare_pipe` — pipe security - `quote_aware_split_or_and_pipe_distinct` — `a || b | c` produces 3 segments, not 2 725 plugin / 599 default pass. All build profiles clean. ## Verified false positives (not fixed, audit was wrong) - #3 cache.rs clear() race — generation counter gating in `get` makes stale entries invisible, no correctness impact. - #17 DeepSeek auto-detect priority — auto-detect only fires when env vars present; default-default is still OpenRouter. - #19 semantic tools in collision filter — semantic tools added separately, can't be shadowed by MCP. - #20 glob global gitignore — intentionally disabled to match grep behavior. - #28 nearest_root blocking std::fs — function doesn't exist in current code. - #32 ReadArgs.path vs GrepArgs.path — semantically different by design (file vs dir), documented in schema. - #33 install_plugin_providers dead-without-feature — gated with explicit `#[cfg_attr(not(feature), allow(dead_code))]`. - #34 websearch double-gated — config + API key serve distinct purposes (enable + auth). ## Deferred to follow-up batches Docs-only fixes (#6 CONFIG.md tools, #12 temperature, #13 --api-key, #14 acp_host/port), MCP/LSP architecture (#8, #25, #27), test gaps (#38-40), and lower-priority polish — all in a follow-up PR. Co-authored-by: Yogthos <yogthos@gmail.com>
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…nd hygiene Self-review of the chamber + collapse work found 8 actionable issues. Addressing all in one round. - **#1 CRITICAL — ContextOverflow infinite loop on compress no-op** (`ui/slash.rs`, `ui/mod.rs`): `handle_compress` had three `Ok` paths that returned without compacting (within-limits, nothing-to-cut, summary-too-large). The auto-recovery branch treated any `Ok` as success and respawned the run against the SAME history, which immediately re-emitted `ContextOverflow` → loop. Added `CompressOutcome::{Compacted, NoOp{reason}}`; auto-recovery now respawns only on `Compacted` and surfaces a "made no progress" error otherwise. The interactive `/compress` and auto-Done paths ignore the discriminant — only the success/error path matters there. - **#2 HIGH — ContextOverflow re-runs side-effecting tools**: the interactive retry loop already refuses to retry once `had_tool_calls=true`; the new auto path bypassed that safety. Now gates respawn on `tool_calls_this_run == 0`; if any tool ran in the failed turn, compact happens but auto-retry is refused and the user must re-issue. - **#3 HIGH — char-truncated body wasn't stashed for Ctrl+O**: `render_tool_output` returned `None` when only `chars_truncated > 0` (no line truncation) — Ctrl+O reported "nothing to expand" despite the visible `+N chars truncated` footer. Now stashes whenever EITHER signal indicates hidden content. Regression test: `render_tool_output_stashes_on_char_truncation_alone`. - **#4 HIGH — `last_collapsed` persisted across turns**: a Ctrl+O press would expand a collapsed result from any prior unrelated turn. Cleared on prompt-send (every user submission starts a new turn) and on ContextOverflow respawn. - **#5 MEDIUM — Ctrl+O was one-shot via `.take()`**: switched to `.as_ref().cloned()` so a second Ctrl+O re-emits the same expand; stash overwrites on the next collapse or clears on next turn. - **#6 MEDIUM — empty `resolved_name` painted unnamed chamber**: added an early-out: when name resolution drops to empty (no `last_tool_name`, no buffered call by id), emit a dim `(unresolved tool)` trailer + chamber bottom and skip the body paint. - **#7 MEDIUM — edit colorized diff lost when `last_tool_name` drained**: `is_edit` was gated on `last_tool_name`, falling through to plain `render_tool_output` when the slot drained (same shape as the chamber-orphan bug). Now gates on `resolved_name`. - **#8 DESIGN/SEC — `banner_value` unsanitized at expand time**: the initial chamber TOP sanitizes the banner; the Ctrl+O reprint did not. ANSI-bearing tool args (MCP, plugin, attacker-shaped filename) could paint raw at expand. Sanitize once at stash time in `render_tool_output`. Also (review #9, reviewer recommendation): swapped `apply_patch` out of `tool_skips_collapse` and `read` in. `read` is what the user/LLM explicitly asked for — defaulting to 4 lines defeated the request. `apply_patch` output is usually a short "N ops" summary; the rare per-op-failure spew is the right place for Ctrl+O to engage. Tests: 625 pass (3 added — char-truncation stash, apply_patch collapses, exempt-set without apply_patch). Updated 2 existing tests for the exempt-set change. Fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…view Adversarial review of the per-prompt deny-list architecture flagged two real bypasses + several defense-in-depth gaps. Addressing. - **#1 CRITICAL — MCP tools bypassed the deny-list entirely**: `McpTool::call` passes the umbrella name `"mcp_tool"` to `check_perm`. The deny-list match is literal `==` (now case- insensitive), so a prompt declaring `deny_tools: [edit]` would NOT match an MCP server's `edit` tool — the LLM could route filesystem writes through any MCP server unscathed. Added `PermissionChecker::any_prompt_denied(&[name1, name2, ...])` public probe; `McpTool::call` now checks (concrete tool name, `mcp_tool:<server>:<name>` qualified form, umbrella `mcp_tool`) before invoking `check_perm`. Any hit returns a hard denial. - **#2 CRITICAL — ACP never installed the prompt deny-list**: the ACP bridge built a fresh `PermissionChecker` per session and never wired in `context.current_prompt_deny_tools`. Plan mode was a no-op for editor clients. Mirror the `apply_prompt_deny` call from `main.rs::build_channels` into the ACP `run_prompt` path right after `build_acp_permission`. - **#5 MEDIUM — `glob` / `repo_overview` added to PermissionConfig**: both were filesystem walkers reachable via the perm checker but not declared as user-configurable in `PermissionConfig`. User- level `permission.glob = "deny"` would silently fall through to the `*` default. Added the fields + the per-tool rule loop entry. - **#6 MEDIUM — `plan_enter` / `plan_exit` now consult deny-list**: both intentionally skip `check_perm` (the confirmation dialog IS the user-prompt). But the prompt deny-list should still apply — a strict-mode prompt that says `deny_tools: [plan_exit]` should refuse the call WITHOUT opening the dialog. Added a thin `check_prompt_deny` helper that queries `any_prompt_denied` before opening the channel. - **#7 MEDIUM — case-insensitive tool-name matching**: `deny_tools: [Edit]` (typo capitalization) used to silently no-op. `is_prompt_denied` now uses `eq_ignore_ascii_case`; the frontmatter parser also lowercases at load so the stored list is canonical in every consumer (status line, UI, etc.). - **#9 LOW — warn on unknown tool names in `deny_tools`**: at prompt load time, cross-check every `deny_tools` entry against a `KNOWN_TOOLS` list. Warns once per unknown entry, with the full known set printed for guidance. MCP-server-exported tool names will trigger this benignly; documented inline. - **#3 HIGH — pin order with tests**: three new checker tests pin the contract: - `prompt_deny_any_matches_concrete_and_qualified_mcp_names` (locks the MCP bypass fix) - `prompt_deny_is_case_insensitive` - existing tests continue passing - **#4 plugin trust boundary documented**: per the review's recommendation, added a "Plugin trust boundary" section to CONFIG.md acknowledging that plugins are inside the trust boundary and not sandboxed. Not addressed (intentional): - #8 doom-loop UI nudge on repeated deny-list hits — UX polish. - #10 `/prompt default` clear confirmation — user-typed; would have to confirm every clear, including the legitimate ones. 634 tests pass; fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…ry, repo_overview walk Self-review of the last 5 commits surfaced 9 findings. Addressing all. - **#1 MEDIUM — `repo_overview` permission patterns got command-glob semantics**: `is_path_tool_name` was updated for `glob` but not `repo_overview`, so a config rule like `"repo_overview": { "/etc/**": "deny" }` parsed `**` as command-glob (no path-spanning match). Added `repo_overview` to the path-tool arm. - **#2 MEDIUM — `providers.<name>` override silently missed on capitalised provider names**: `parse_provider` is case-insensitive but `HashMap::get(provider)` is not, so `--provider Anthropic` built the client fine but the `providers.anthropic` chunk-timeout override was a no-op. Lowercased the lookup key in `resolve_stream_chunk_timeout` and `resolve_provider_info` (with the original key as a fallback so existing exact-case configs keep working). - **#3 MEDIUM — `Prompt.description` parsed but never displayed**: the frontmatter `description: "..."` was being captured into a `#[allow(dead_code)]` field. A user writing a description expected it to appear somewhere. Wired into the `/prompt` list output — each prompt now renders as `name description` (padded for alignment) when a description is set, falling back to the bare name otherwise. - **#4 MEDIUM — `stream_chunk_timeout_secs` undocumented**: the knob landed in 6c395d0 with the error message pointing users at it, but neither CONFIG.md nor README explained the resolution ladder. Added a "Streaming timeouts" section to CONFIG.md covering the precedence order (custom_providers > providers > top-level > 300s default) and noting the case-insensitive matching. - **#5 LOW — Unicode lowercase mismatch with ASCII-only matcher**: the frontmatter parser called `to_lowercase()` (Unicode-aware) while `is_prompt_denied` used `eq_ignore_ascii_case`. Swapped the parser to `make_ascii_lowercase` so both ends share the same contract — non-ASCII bytes pass through unchanged on both sides. - **#6 LOW — MCP bare-name deny semantics undocumented**: the 3-name probe `any_prompt_denied(&[concrete, qualified, "mcp_tool"])` matches an MCP server's `edit` tool when the prompt denies `edit` (intended for the built-in). README now spells this out and recommends the qualified `mcp_tool:<server>:<name>` form for surgical denies. - **#7 LOW — `KNOWN_TOOLS` duplicated `BUILTIN_TOOL_NAMES`**: two hand-maintained lists of every built-in tool, used for the MCP collision filter and the frontmatter `deny_tools` warn respectively. Drift would produce either spurious warnings or (worse) an unsafely shadowable name. Extracted a single `pub const BUILTIN_TOOL_NAMES` in `agent/tools/mod.rs`; both sites now import it. - **#8 DESIGN — ACP can't switch prompts mid-session**: the 30604a3 fix installed the deny-list correctly per-request but ACP has no protocol message for `/prompt <name>`, so the deny- list is effectively locked at boot. Documented in the README ACP bullet — recommends `--prompt <name>` at launch for restricted modes. - **#9 LOW — `repo_overview` ancestor walk went above crawl root**: `compute_dir_file_counts` bumped every parent up to `/`, including dirs that would never be printed. Now stops at the first ancestor not in the printed-dir set. 634 tests pass; fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…rf cache Self-review of the last 4 commits flagged 11 findings. Addressing all in one batch. - **#1 HIGH — leading whitespace dropped on first row of soft_wrap**: `current.is_empty()` at row start unconditionally dropped `token.leading_ws`, including on the first row of a logical line. Option lines `" ▶ label …"` lost their ` ` margin; the green ` allowed …` confirmation lost its indent too. First-row branch now preserves leading_ws (with a ws-overflow fallback to keep the token). - **#2 HIGH — drain_events early-broke before reader quiesced**: the Ok(false) shortcut fired on the first quiet poll, which was often "the background reader currently holds crossterm's internal mutex" rather than "terminal is quiet". A delayed OSC 11 / DA1 response could still escape past our drain. Now requires at least one observed event before the Ok(false) shortcut; honors the full budget otherwise. - **#3 HIGH — MODIFIED section clipped its own bottom border at `available == 4`**: row_budget=1, footer + 1 file = 2 items, +3 frame rows = 5 total in a 4-row budget. draw_panel clipped the `╰────╯`. Bumped MIN_MOD_SECTION_ROWS from 4 → 5 so the bottom border is always painted. - **#4 MEDIUM — `\r` not stripped from CRLF input**: Windows / some-MCP tool output left `\r` in tokens, producing terminal redraw artifacts. `soft_wrap` now strips a trailing `\r` per logical line. - **#5 MEDIUM — Show cursor on alt screen was a no-op**: `Show` was issued while still on the alt screen; `LeaveAlternateScreen` restores the main screen's saved DECTCEM state, discarding the Show. Moved Show to AFTER LeaveAlternateScreen + disable_raw_mode. - **#6 MEDIUM — recent(256) clones + locks on every redraw**: panel redraws on every streamed token. Added `modified::version()` monotonic counter (bumped on mark / clear); panel-side cache in `panel_modified_cached` keyed by (version, cwd) skips the lock + 256-PathBuf clone + path-strip when nothing changed. - **#7 MEDIUM — break_long_token could emit wide-glyph row > budget at max_width<2**: floored max_width at 2 inside soft_wrap. A 1-cell terminal is unusable anyway; this just removes a sharp edge. - **#8 MEDIUM — all-whitespace first row collapsed to empty**: same root cause as #1, fixed by the same change. Indented blank separators now preserve their indentation. - **#9 LOW — `allowed …` confirmation flush against alert `╰─╯`**: added a blank-line breathing row before the green confirmation so the alert's bottom border and the confirmation don't read as one block. - **#10 LOW — head_w used chars().count() not display width**: switched to `UnicodeWidthStr::width(head)` so future wide-glyph markers won't under-pad the continuation indent. - **#11 LOW — single-select marker width inconsistent**: cursor marker was `▶` (w=1), non-cursor was ` ` (w=2), so wrapped tails of adjacent options drifted by one column. Cursor marker padded to `▶ ` so all markers in a question share display width. 5 new tests: - preserves_leading_whitespace_on_first_row - strips_carriage_returns_from_crlf_input - wide_glyph_respects_max_width_at_floor - preserves_leading_whitespace_only_line - version_bumps_on_mark_and_clear 651 tests pass; fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…e migration, model-shrink, unicode tokens Self-review of the last 6 substantive commits flagged 7 findings. Addressing all in one batch. - **#1 HIGH — Accept mode silently bypassed mcp_tool's default-Ask**: `SecurityMode::Accept` coerced `Ask → Allow` for every non-path tool, so the new default-Ask rule for `mcp_tool` (27bd70a) was effective only in Standard mode. `dirge --accept` + an MCP server still allowed every call silently. Added `is_high_risk_non_path_tool(tool)` (matches `mcp_tool` and `bash`) which forces the Ask to survive the coercion. The general non-path coercion still applies to `question`, etc. Regression test pins both directions. - **#2 MEDIUM — Pre-9a044ce sessions resumed with under-counted `estimated_tokens`**: stored values were computed under the old text-only logic. Bumped `SCHEMA_VERSION` to 2 and added a v1 → v2 migration step that calls a new `Session::recompute_all_estimates` (also exposed `estimate_message_tokens` as the per-message helper). Tested via `v1_to_v2_recomputes_under_counted_estimates`. - **#3 MEDIUM — `/model` switch to a smaller window didn't warn about over-capacity**: switching from a 1M to a 200k model with the session already exceeding the new budget would have errored mid-stream on the next prompt. The /model handler now surfaces a warning recommending `/compress` when `total_estimated_tokens > new_ctx - reserve`. - **#4 LOW — Highlight tokenizer mis-split non-ASCII identifiers**: `bytes[i] as char` for a UTF-8 lead byte produced a Latin-1 char that failed `is_ascii_alphanumeric`, terminating the identifier mid-word (`naïve` → `na` + punctuation + `ve`). Walk via `line[i..].chars().next()` and broadened `is_ident_cont` to accept any non-ASCII non-control letter. ASCII path unchanged. - **#5 LOW — `looks_like_type` colored short capitalized words as types**: `Ok`/`No`/`Hi`/`Id` all hit. Tightened the floor to ≥3 chars. Added `Ok`/`Err`/`Some`/`None` to the Rust types table so idiomatic 2-char Rust constructors still get type color via the explicit table. - **#6 INFO — Yolo bypass documented**: README permission section now says explicitly that `--yolo` skips rule eval, the per-tool default-Ask, and the doom-loop detector — but that `deny_tools` frontmatter STILL applies (that gate runs BEFORE the yolo short-circuit by design). Accept-mode bullet also updated to note `bash` and `mcp_tool` keep their Ask. - **#7 + #8 CLEARED**: doom-loop Allow + `"*": "allow"` default config both verified NOT to bypass mcp_tool's Ask. 684 tests pass; fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…nds, error masking Adversarial review of `1c341e9`/`8e60553`/`69318b7` flagged 14 findings. Addressing all. - **#1 HIGH — C1 controls bypassed MCP stderr sanitizer**: the original filter was `b == 0x09 || (0x20..0x7f).contains(&b) || b >= 0x80`. That second clause let through every non-ASCII byte including the C1 control range (U+0080..=U+009F). In particular U+009B is single-byte CSI, behaves identically to `\x1b[` on iTerm2/xterm in 8-bit mode. A misbehaving MCP child could write `\u{9b}2J` and repaint the screen — exactly the smuggling vector the commit message claimed to close. Filter now blocks C0 controls (except `\t`), DEL, and the full C1 range. - **#2 HIGH — MCP stderr was silently dropped at default verbosity**: emit was `tracing::info!`, but dirge's default EnvFilter is `warn,rig=off`. Users diagnosing MCP server panics or init errors saw nothing — real regression vs the old `Stdio::inherit()`. Raised to `tracing::warn!` so it surfaces on the default config. - **#3 HIGH — `parse_ddg_html` panicked on truncated input**: `&html[tag_start..abs_start + 32]` blew up when `abs_start + 32 > html.len()` or landed mid-codepoint. Rewrote the scanner to anchor on `<a ` tags and walk only within bounded slices via `tag_end.min(html.len())`. Added regression test for the truncated case. - **#5 MEDIUM — MCP stderr forwarder had no per-line cap**: `BufReader::lines()` buffers until `\n`. A buggy child writing a GB without newline would OOM dirge. Replaced with a manual read loop, 16 KiB per-line cap, emit `…[truncated]` past the cap and skip until next `\n`. - **#6 MEDIUM — provider rotation race on first call**: two concurrent first-callers both saw `AtomicU8 = 0`, both rolled a fresh entropy pick, both stored. Last writer won — inconsistent contract. Switched to `compare_exchange` from 0 to candidate; loser re-reads the winner's value. - **#7 MEDIUM — both-providers-fail error masked secondary + DDG errors**: only `primary_err` was returned. Now concatenates all three failures so the user can diagnose without chasing the wrong cause. - **#8 MEDIUM — `parse_ddg_html` false-positives on substring match**: previously matched `class="result__a"` anywhere in the HTML, including inside `<script>` blocks or quoted text. Walked backward via `rfind("<a ")` could grab an unrelated anchor. Now anchors on `<a ` first and inspects the tag's attributes — proper containment check. - **#9 MEDIUM — DDG snippet control bytes flowed into LLM prompt**: `strip_tags_and_decode` decoded entities but didn't filter ESC / C1 controls. A malicious or mojibake search result could ship ANSI styling into the agent's context. Added control-byte filter to the decoder's output pass. - **#10 LOW — `PARALLEL_API_KEY` read per-call**: was `std::env::var` inside `call`, inconsistent with how `EXA_API_KEY` was captured at construction. Moved to `WebSearchTool::new`. - **#11 LOW — whitespace-only key passed empty-filter**: `EXA_API_KEY=" "` produced a malformed `?exaApiKey=%20%20` URL. Now trims keys at construction. - **#12 LOW — tool description out of date**: still mentioned Exa-only + DDG fallback, missed Parallel.ai rotation and the keyless default. Rewritten to reflect the actual contract. - **#13 LOW — `urlencode_query` renamed to `percent_encode`**: the function is a generic percent-encoder (RFC 3986 unreserved set), not a form-encoder. Misleading name. - **#14 DESIGN — no tests for new code paths**: added 11 regression tests covering ddg parser bounds + happy path + anti-script-block, control-byte filter, key trim, MCP response parser (plain JSON + SSE + malformed), DDG redirect unwrap, percent encoding, provider env override. - **#15 LOW — bot-identifying DDG User-Agent**: swapped `compatible; dirge-agent/1.0` for a real Firefox 133 UA. DDG aggressively rate-limits identifiable scrapers. 695 tests pass (684 + 11 new); fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
Audit response covering the user's 6-item duplication list. Three substantive modules + thin wrappers; two items deferred as non-issues; one already complete from earlier commits. **#4 — ANSI / control-byte filter (new `src/ui/ansi.rs`)**: Previously three independent filters: MCP forwarder (`emit_mcp_line`), websearch (`strip_tags_and_decode`), chat (`sanitize_output`). Each drifted in coverage — one blocked C0 but not C1, another stripped `\r` only, etc. New `ansi::strip_controls(s, policy)` with a `StripPolicy { keep_newline, keep_tab }` knob is the single source of truth. MCP forwarder + websearch routed through it. Chat `sanitize_output` left as-is — it does ANSI-escape PARSING (consumes `\x1b[…m` as a unit so the payload disappears) which is more specific than what `strip_controls` does (drops just ESC, leaving `[31m` as visible text). The two coexist intentionally. **#1 — Reusable box component (new `src/ui/box_render.rs`)**: Three implementations of chamber/box math previously: tool chambers (`chamber_row` / `chamber_row_with_bg` / `chamber_bottom`), permission alert (inline `row` closure), panel sections (`push_section` closure). Inconsistent — `chamber_row` was display-width-aware, `chamber_row_with_bg` was char-count-based; each treated tabs and width math differently. New module: - `BoxStyle` enum (currently only `Rounded`) - `top(style, title, total_w)`, `bottom(style, total_w)`, `divider(style, total_w)` — frame primitives - `row(style, content, total_w)` — display-width-aware content row with tab expansion + truncate-with-`…` - `row_with_bg(style, content, total_w, bg_idx)` — for diff backgrounds - `expand_tabs(s, tab_stop)` — moved here from `mod.rs` - `BoxBuilder` — fluent API for callers that build a box all-at-once (notifications, alerts, panel sections). Long rows soft-wrap via `wrap::soft_wrap` instead of truncating. `chamber_row`, `chamber_row_with_bg`, `chamber_bottom` in `mod.rs` are now thin wrappers around `box_render`'s primitives — existing call sites unchanged, but the underlying math is shared. 7 new unit tests covering frame width invariants, tab handling, CJK, builder construction, and soft-wrap. **#2 — Single output chokepoint** — already done in commit `dc21de7` (the `ui::notifications` module + channel). The remaining stray `eprintln!` sites all run during STARTUP (config parsing, skill discovery, MCP connect_all) BEFORE `TerminalGuard` is installed, so they don't paint over the UI. Audited and confirmed clean. **#3 — Permission check chokepoint** — already centralized. `check_perm` / `check_perm_path` / `check_perm_path_resolve` in `agent/tools/mod.rs` cover every tool's input-checked path; `any_prompt_denied` covers MCP-style multi-name lookup; `check_prompt_deny` covers plan tools. No duplication worth extracting. **#5 — Layout module** — deferred. `chamber_widths`, `Renderer::content_width`, `Renderer::line_width`, `Renderer::max_line_width` are already in their proper homes; forcing them into a new module would be churn, not clarification. **#6 — Soft-wrap inside chambers** — deferred. The current chamber rows truncate with `…` (matches user expectation for single-row tool result lines); the `BoxBuilder` path soft-wraps when the caller wants that explicitly. Forcing all chamber rows to soft-wrap would change the visual feel of tool output and needs a separate UX call. 709 tests pass (702 + 7 box_render); fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…h_bg width, sanitization Correctness + security review of `dc21de7`/`cd701a8` flagged 15 findings. Addressing all 15. - **#1 HIGH — startup race: MCP forwarders fired before `install()`**. `connect_all` spawns stderr forwarders in `main` BEFORE `run_interactive` reached the old `install()` call. Lines emitted during MCP-server handshake hit `sender() == None` and were silently dropped. Moved `install()` to the very top of `main()` so the channel is live by the time any forwarder starts. Split the API: `install()` (creates channel) + `take_receiver()` (UI loop claims the rx). - **#2 HIGH — orphaned-sender footgun on UI restart**. `OnceLock` meant a re-entry could never replace the sender; producers holding clones would send into a dead channel forever. Switched to `RwLock<Option<Sender>>`. Producers also self-heal: when `try_send` returns Err because the receiver was dropped, `notify_send` clears the slot so subsequent producers see `None` and skip. - **#3 HIGH — `row_with_bg` was still char-count-based**. The refactor claim was "unifies display-width vs char-count" but the bg-tinted variant still used `chars().count()`. A diff row with CJK / emoji drifted the right border. Now uses the same display-width budget as the plain `row`. Regression test `row_with_bg_width_invariant` pins it. - **#4 HIGH — unbounded channel + no backpressure → OOM**. A buggy / hostile MCP child spamming stderr would grow the queue unboundedly. Switched to `mpsc::channel(1024)` (bounded) with `try_send` so the producer drops on overflow rather than unboundedly queuing. Test `bounded_channel_drops_on_full` pins the contract. - **#5 MEDIUM — multi-colon MCP tool names**. `splitn(3, ':')` on `mcp_tool:server:do:thing` parsed correctly but the comment explanation was off. Clarified; behavior unchanged (the wildcarded server pattern is the desired semantics). - **#6 MEDIUM — mcp_tool umbrella check case-sensitive**. `umbrella == "mcp_tool"` would miss `MCP_TOOL:…` if a future caller surfaces uppercase. Switched to `eq_ignore_ascii_case`. - **#7 MEDIUM — receiver-side sanitization for ALL Notification variants**. MCP variant was pre-sanitized at the producer, but Info/Warn/Error had no producer-side contract. Adding receiver-side `ansi::strip_controls(KEEP_NEWLINE)` makes the rule un-bypassable: nothing reaches `write_line` carrying escape bytes regardless of how careful a future producer is. - **#8 MEDIUM — websearch `KEEP_BOTH` + `\n` broke chamber border**. Tabs survived into chamber rows where they interacted poorly with the wrap math. Switched to `KEEP_NEWLINE` and replace `\t` with single space. - **#9 MEDIUM — whitespace-only MCP lines dropped**. The blank-line collapse used `trim().is_empty()` which also ate legitimate indented continuation lines. Now uses `is_empty()` post-sanitize. - **#10 LOW — `top()` with empty title rendered `╭─ ─…─╮`** (two spaces with no glyph between). Empty title now matches the bottom-border shape `╭{horizontals}╮`. Test pins it. - **#11 LOW — `expand_tabs` precondition undocumented**. Added comment that input should be control-byte free; callers must sanitize first. - **#12 LOW — `BoxBuilder::row("a\nb")` produced one row containing a literal `\n`**. Now splits on `\n` and emits one row per logical line. Test `builder_splits_embedded_newlines` pins it. - **#13 LOW — `BoxBuilder` had no labelled-row variant**. Added `row_labelled(label, sep, value)` that indents wrapped tails under the value column. Mirrors the alert chamber's `labelled_rows` shape so a future alert migration to BoxBuilder is unblocked. Test pins continuation indent. - **#14 LOW — `strip_controls` allocated on no-op path**. Fast path returns the input unchanged when no chars would be filtered. - **#15 DESIGN — sender caching deferred**. Per-call `sender()` is the right semantics for the orphan-detection case (#2); caching would skip the slot-clear behavior. Kept as is. 8 new tests; 715 total. Two-test serialisation via TEST_GATE for the notification tests since they mutate global TX/RX_HOLDER state. fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
…ser_rx writes Code review of `b508658`/`8b48bfd`/`f9285ad` flagged 15 findings, including one **active regression** I shipped: `write_outside_chamber` reused `close_tool_chamber_if_open` which always painted "⚠ tool denied · aborted · no result". So every notification arriving while a tool was in-flight would falsely brand that tool as denied. Fixed. Headline: of 9 tokio::select! arms, only 2 were using the new chokepoint. 3 others (question_rx, dialog_rx, plan_rx) carried the SAME X-inside-chamber bug the helper was built to eliminate. Migrated them. - **#4 HIGH (regression I shipped)**: split chamber-close into two variants: - `close_tool_chamber_abort` — paints the "⚠ tool denied" row + bottom border. Used by permission-deny / agent error / interjection / context-overflow paths (the tool is being actively rejected). - `close_tool_chamber_passive` — emits ONLY the bottom border. Used by `write_outside_chamber` (the tool isn't being denied; we just need to terminate the visual frame so notification text doesn't land inside). - `close_tool_chamber_if_open` kept as back-compat alias for the abort variant — existing call sites (4 of them, all in abort-shaped contexts) keep their previous behavior. - **#1 / #2 / #3 CRITICAL — three arms migrated**: - `question_rx` (3537): a `question` tool's chamber was open when the prompt header was painted; header + stem + option grid landed inside. - `dialog_rx` (3811): plugin `harness/confirm` / `harness/select` fires from inside on-tool-start hooks while a tool chamber is open; the dialog rendered inside. - `plan_rx` (3955): plan-switch prompt could be delivered while a tool chamber was open; prompt landed inside. - **#5 HIGH — user_rx interactive writes migrated**: - Ctrl+C interrupt msg (1135) - "copied selection" (1150) - Ctrl+X dropped-interjection trailer (1168) - "agent is busy" × 2 (1533, 1598) - **#7 MEDIUM — defense-in-depth sanitization**: `write_outside_chamber` now runs `strip_controls(KEEP_NEWLINE)` on `text` before writing. A future caller that forgets producer-side sanitization can't smuggle ANSI escapes. - **#12 LOW — notification amplification cap**: the bounded channel limits NOTIFICATIONS but not ROWS per notification. A single `Notification::McpLog` carrying 10k `\n`s would expand to 10k chamber rows. After 200 lines we truncate and emit a `[N more lines suppressed]` marker. - **#6 audit** revealed the 4 remaining manual sites (1984/2602/2713/2884) all ARE abort-shaped and correctly use the abort variant via the back-compat alias. No migration needed. - **#8 / #9 / #10 / #13 / #14 / #15** noted as design trade-offs or already verified clean. 3 new regression tests: - `close_passive_does_not_paint_abort_row` pins the new no-abort-label contract - `close_abort_paints_warning_and_bottom` pins the abort variant still emits 2 rows - existing `write_outside_chamber_closes_chamber_first` still passes; helper now uses passive close 718 tests pass (716 + 2 new); fmt clean.
yogthos
pushed a commit
that referenced
this pull request
May 22, 2026
Three issues from the post-cutover code review against pi: **Bug #1**: stream.rs:186-194 — defensive fallback (stream closed without Done/Error) skipped emitting message_start / message_end. Pi at agent-loop.ts:359-366 emits both. Fix: route the fallback through `finalize()` so it follows the same emit path as Done/Error. Updated the existing test that documented the wrong behavior as "intentional Rust deviation" — it's now pi-faithful. **Bug #4**: integration.rs:411 — orphaned inner loop task. `spawn_loop_runner` spawned `run_agent_loop` as a NESTED `tokio::spawn`. A `task.abort()` on the outer task would kill it but leave the nested task running silently — tools could keep executing after the user thought they'd cancelled. Fix: collapse to `tokio::join!(loop_future, pump_future)` in the same outer task. Shared fate; outer abort drops both futures at their next .await. Tools that poll the AbortSignal still observe cancellation cooperatively. **Gap #3**: run.rs prepareNextTurn — pi at agent-loop.ts:229-238 rebuilds config with the new model / reasoning. We accepted the fields but silently ignored them. Surfacing a tracing warning per ignored swap so users wiring the hook know their change didn't take effect. Full fix requires the StreamFn to be a factory `Fn(Context) -> StreamFn` (so the loop can rebuild it on swap) — flagged for follow-up when a real consumer demands it. Items NOT addressed (documented in review): - #2 get_api_key receives empty string (no production caller) - #5/#6 timing / ordering changes (observable but not bugs) - #7-9 efficiency micro-optimizations - #10/#11 UI-side wiring + Agent.preamble defensiveness Gates: - cargo build (default) clean - cargo build --all-features clean - cargo test (default) 841 green (unchanged) - cargo fmt clean
yogthos
pushed a commit
that referenced
this pull request
May 25, 2026
Three follow-ups to PR #126 (experimental tab completion) flagged in the code review: #1 — mid-word cursor produced corrupt buffer `try_complete` replaced `[word_start..cursor]` with the candidate command and appended `buffer[cursor..]` as a tail. With the cursor inside the first word (e.g. Tab pressed after Home, or after moving Left into `/mod`), the unreplaced suffix leaked into the result: `/mod` cursor=2 → `/mcpod` (replacement `/mcp` + residual `od`). Cursor=0 → `/allow/mod` (replacement + the entire word as tail). Fix: anchor replacement to the WHOLE-WORD boundary (`word_start..word_end`) so cursor position inside the command name no longer matters. New buffer is exactly one of the matching commands followed by the args tail (if any). Also: `cursor > word_end` now returns None — the user is past the command name typing args, completion shouldn't fire. #3 — Tab raced the file picker The `@`-file-picker has its own keystroke handling (Enter / Ctrl+J guard it explicitly). Tab in the new completion path didn't. In practice the picker's buffer doesn't start with `/`, but guarding explicitly closes the race for future changes — mirrors the existing Enter/Ctrl+J gates. #2 — single source of truth for slash command names Previously `builtin_commands()` (feature-gated, used by tab completion) and `handle_slash`'s match arms (always compiled, the actual dispatch) were two independent lists. Adding a command required updating both — or the command worked but wasn't tab-completable, or appeared in completion but errored on use. Restructure: * `slash_command_names()` — always-compiled canonical list. The one place to add a command name when wiring it up. * `is_known_slash_command(name)` — wrapper over the canonical list. Single implementation, no second match to drift from. * `builtin_commands()` — now just `slash_command_names()`, kept as a feature-gated alias so the public API doesn't break. * `handle_slash`'s `_` default arm — now consults `is_known_slash_command(parts[0])`. A name listed in the canonical list but with no matching dispatch arm surfaces as `internal error: X is listed in slash_command_names() but has no dispatch arm in handle_slash` instead of silently falling through to "unknown command" or a plugin lookup. Loud failure in dev/test. The remaining drift direction (dispatch arm but missing from the list) only costs tab completion — accepted as the lesser failure mode. Tests (9 new, 22 slash tests pass total) * complete_with_cursor_mid_word_produces_clean_buffer — #1 * complete_with_cursor_at_start_produces_clean_buffer — #1 * complete_preserves_trailing_args — #1 edge * no_completion_when_cursor_in_args — #1 edge * is_known_slash_command_agrees_with_canonical_list — #2 * slash_command_names_is_sorted — #2 (preview ordering) * always_on_commands_appear_in_canonical_list — #2 drift guard: pins the 22 always-on dispatch arms against the canonical list Verified * cargo test --bin dirge → 1011 passed * cargo test --bin dirge --features experimental-ui-tab-slash → 1025 passed * cargo test --bin dirge --features "experimental-ui-tab-slash plugin" → 1239 passed * cargo fmt --all --check → clean
yogthos
pushed a commit
that referenced
this pull request
May 27, 2026
…tests SESS-2 follow-up #1 — UI session-mutation on ContextCompacted: ContextCompacted event now carries summary + first_kept_index. The UI consumer mutates session.id in-place, calls Session::compress_reporting() to push a Compaction entry, and runs save_session() so the rotated id and summary are persisted on disk. Mirrors hermes-agent/conversation_compression.py lines 380-397. Without this the on-disk session kept the OLD id and the compaction was lost on next resume. SESS-2 follow-up #4 — /compress <focus> argument wire-through: - build_summary_prompt now honors focus_topic: when supplied, the Hermes-style "FOCUS TOPIC: …" framing is appended to the prompt, asking the model to allocate ~60-70% of its summary budget to the topic (verbatim port of hermes context_compressor.py:1050-1054). - compress_messages (existing slash-command path) gets the same treatment: any free-form text after /compress is wrapped in the FOCUS TOPIC framing instead of the generic "Additional instructions" placeholder. - run_compaction_pass exposes the focus parameter via a new with_focus wrapper (auto-trigger path still uses None). - Slash help text updated: "/compress [focus] compress; focus text guides what to preserve". SESS-2 follow-ups #2 (background spawn) and #3 (multi-generation chaining) closed as "matches reference impl": hermes is also inline (no background spawn) and only chains the most-recent prior summary via _find_latest_context_summary. Our implementation already matches. H7_SMOKE: remove the 6 #[ignore] markers from the real-API integration tests. Each test already has a runtime `detect_provider()` check that bails with `[skipped]` + Ok when no provider key is set; #[ignore] was blocking that check from ever running. Removing the markers means: in CI without keys, the tests run, hit the skip path, pass (1713 pass / 0 fail / 0 ignored). With keys present, they exercise the real provider as designed. Header doc updated. Tests: 1713 pass / 0 fail / 0 ignored (was 1707 / 0 / 6).
yogthos
pushed a commit
that referenced
this pull request
May 28, 2026
Independent verification turned up 6 gaps in the Phase 2.5 parity work. This commit closes all of them. #1 HIGH — `truncations_fixed` now bumps on hard-fallback too. Reasonix counts both success (`repair/index.ts:105`) and unrecoverable (`repair/index.ts:99`) under the same counter; dirge was dropping the latter, under-reporting exactly the cases operators need most. `apply_truncation_repair` now records the kind whenever the closer ran, not just on successful repair. #2 MEDIUM — closer notes are now surfaced to the model. Reasonix pushes `r.notes` into `report.notes` with `[<tool>]` prefix on success and `[<tool>]⚠️ TRUNCATION UNRECOVERABLE: ...` on fallback (`repair/index.ts:100-101, :106`), then carries them into the next-turn assistant input. Dirge now stashes them per-call-id on a new `LoopConfig.truncation_notes` shared map; `prepare_tool_call` drains them and appends to `repair_notes`, which `prepend_notes_to_result` (already in place for relational-default notes) prepends to the tool result content so the model sees the repair in the same turn. #3 MEDIUM — added end-to-end wiring tests through `run_agent_loop`. The prior 7 tests proved the helpers worked in isolation; they did not prove the loop calls them in the right order. Two new tests drive the full canned-stream loop: - `dirge_7bwx_end_to_end_storm_dedupes_after_truncation_repair`: three tool calls with different truncated raw strings that heal identically. Storm threshold=3 → the third must be suppressed (only possible if truncation runs before storm). - `dirge_ngic_end_to_end_orphan_dsml_in_text_dispatches`: DSML invoke in `ContentBlock::Text` ONLY (no Thinking, no declared ToolCall) must dispatch (only possible if `build_scavenge_source` includes Text). #4 MEDIUM — removed dead `try_truncation_repair`. It was kept as "defense in depth" but marked `#[allow(dead_code)]`, so the safety claim was illusory. Now actually gone; direct callers can use `repair_truncated_json` for the brace-closer if needed. The `validate_and_repair` block-comment was updated to reflect the new contract. #5 LOW — `truncation_repair_canonicalizes_divergent_streams_before_storm` tested canonicalization in isolation; the new end-to-end #3 tests exercise the actual storm dedupe path that depends on the String→Object promotion. The promotion itself is now also covered with an explicit note in `apply_truncation_repair`'s doc — it has no Reasonix analog (their args are always strings) and is dirge-specific compensation for mixed arg representations. #6 LOW — added a comment near `storm.rs::inspect` documenting the implicit dependency on `serde_json` being built without the `preserve_order` feature. If feature unification ever enables it, storm dedupe regresses silently; the comment points at the workaround (`run::canonical_json`) and notes Reasonix has the same fragility at `repair/index.ts:127`. `LoopConfig` gained the new `truncation_notes` field; all constructors (production + tests) were updated. `Clone` impl threaded through. 1632 tests pass with `-D warnings` (was 1630; +3 new, -1 removed).
yogthos
pushed a commit
that referenced
this pull request
May 29, 2026
Four issues found in self-review of the 5 compaction improvements: 1. Counter double-increment (#1 circuit breaker): a turn-start fold and a post-usage summary in the same loop iteration both bumped compaction_failures, opening the breaker early. Now first-record-wins per iteration via compaction_recorded_this_iter. 2. Unbounded file read (#2 restoration): read_to_string loaded a whole (possibly multi-GB) working-set file before truncation -> OOM. Now a per-file metadata size check (POST_COMPACT_MAX_READ_BYTES = 2MiB) skips oversized files before reading. 3. Fold<->restore oscillation (#2 restoration): re-injecting up to ~25k tokens of snapshots into a near-full window could re-cross the fold threshold. Added a post-fold headroom guard (POST_COMPACT_RESTORE_CEILING = 0.50) that skips restoration when the freshly-folded context lacks headroom. Corrected the overstated 'can't trigger another fold' comments to point at this guard. 4. Breaker-open mislabeled PruneOnly (#5 report enrichment): once the breaker latched, telemetry hid the ongoing summarizer failure. Added CompactionKind::PruneSummarizerDisabled, tracked via breaker_open, so the failure signal stays visible after the breaker opens.
yogthos
added a commit
that referenced
this pull request
May 29, 2026
…cuit-breaker feat(agent-loop): compaction circuit breaker (IMPROVEMENTS_PLAN #1)
allen-munsch
referenced
this pull request
in allen-munsch/dirge
May 29, 2026
When the summarizer keeps failing (network errors, invalid summaries, model garbage), every fold trigger re-called the LLM and silently fell back to pruned-only context — wasting API calls every turn. Add a per-run consecutive-failure counter. `run_compaction_pass[_with_focus]` now takes the current count and returns a `SummaryOutcome` (Succeeded / Failed / Skipped); `run_loop` folds that into `compaction_failures` via `record_compaction_outcome`. Once the count reaches MAX_CONSECUTIVE_COMPACTION_FAILURES (3), the pass skips the LLM summarizer entirely (logs "circuit breaker open") — the cheap `prune_tool_outputs` pass still runs, so context can't grow unbounded. Counter resets on the next successful summary; it's per-run, so a fresh run_loop starts clean. Tests: pure `record_compaction_outcome` counter logic, and an end-to-end test asserting the summarizer is invoked once per sub-threshold attempt then NOT called once the breaker opens, with the prune-only fallback still firing. 2135 pass at -D warnings.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
May 30, 2026
From the review of PR dirge-code#231: - #1 (run.rs): the cap notice's new_messages.push is a legitimate part of run_agent_loop's returned message list, but the comment overclaimed that headless/subagent collectors and resumed models read it — they drive display from the LoopEvent stream and discard the return value. Comment corrected to describe it as a return-value contract nicety, not the display mechanism. - #2 (provider/mod.rs): headless run_print dropped SystemNotice into its catch-all, so a --print run hitting the turn cap reported a clean success with no truncation signal. It now prints the notice to stderr. - #3 (text_output.rs): documented the deliberate divergence between the live <system>/warning-color notice and persisted <sys>/system-color session history, cross-referencing render_session. - #4 + altitude (text_output.rs): extracted write_prefixed_lines() shared by write_user_lines and write_system_lines, removing the copy-paste and making blank/empty-line handling identical by construction.
This was referenced May 30, 2026
yogthos
pushed a commit
that referenced
this pull request
May 31, 2026
…erpreter defaults The recurring "I allow npx but keep getting re-prompted" bug had several compounding root causes, none of which the prior suggest_pattern tweaks addressed. All are now deterministically tested with a corpus of the commands models actually emit (no LLM involved). Root causes fixed: 1. DOTALL. Command-style permission patterns compiled their regex WITHOUT dot_matches_new_line, so .* could not span newlines. A grant like "npx *" silently failed to match any multi-line command, e.g. npx tsx -e "import x\nimport y". Models emit these constantly (multi-line -e / -c scripts), so allow-always never stuck. Fix: build command regexes DOTALL; path patterns stay line-sensitive (a newline in a path must not widen a deny scope). 2. Bare commands. "cmd **" compiled to ^cmd .*$, REQUIRING trailing space+args, so bare "cargo test" / "ls" never matched their own default allow rules and prompted. Fix: the trailing-arg rewrite now also makes " **" optional (for commands * and ** are both .*). 3. Benign-prefix mismatch. significant_bash_head skips benign prefixes when suggesting a pattern (so "cd /x && npx ..." suggests "npx *"), but only cd/env were actually auto-allowed, so "export X=1 && cmd" kept prompting on the export segment. Fix: default-allow the genuinely benign builtins (export/set/unset/pushd/popd/:/true) and keep the skip-list in sync; remove source/. (they run code, so the suggestion targets them). Security tightening (per review): npx / node / python / python3 are general interpreters that run ARBITRARY, possibly remote code and are NOT guaranteed to operate in the working folder, so they are no longer default-allowed -- each prompts once, and "allow always" then sticks (including for multi-line scripts, via fix #1). Project-scoped dev tools (cargo / go / make / npm run / pytest / ruff / black / mypy) remain auto-allowed under the existing "trust to edit project == trust to run the project's own code" model. Adds a deterministic gating corpus over compound &&/|/;/|| commands, cd into another project, and multi-line -e/-c scripts, pinning the core invariant: picking "allow always" (the suggested pattern) MUST make that exact command stop prompting; and denied/dangerous segments are NOT unlocked by a sibling grant. dirge-9zbd
yogthos
added a commit
that referenced
this pull request
May 31, 2026
…erpreter defaults (#271) The recurring "I allow npx but keep getting re-prompted" bug had several compounding root causes, none of which the prior suggest_pattern tweaks addressed. All are now deterministically tested with a corpus of the commands models actually emit (no LLM involved). Root causes fixed: 1. DOTALL. Command-style permission patterns compiled their regex WITHOUT dot_matches_new_line, so .* could not span newlines. A grant like "npx *" silently failed to match any multi-line command, e.g. npx tsx -e "import x\nimport y". Models emit these constantly (multi-line -e / -c scripts), so allow-always never stuck. Fix: build command regexes DOTALL; path patterns stay line-sensitive (a newline in a path must not widen a deny scope). 2. Bare commands. "cmd **" compiled to ^cmd .*$, REQUIRING trailing space+args, so bare "cargo test" / "ls" never matched their own default allow rules and prompted. Fix: the trailing-arg rewrite now also makes " **" optional (for commands * and ** are both .*). 3. Benign-prefix mismatch. significant_bash_head skips benign prefixes when suggesting a pattern (so "cd /x && npx ..." suggests "npx *"), but only cd/env were actually auto-allowed, so "export X=1 && cmd" kept prompting on the export segment. Fix: default-allow the genuinely benign builtins (export/set/unset/pushd/popd/:/true) and keep the skip-list in sync; remove source/. (they run code, so the suggestion targets them). Security tightening (per review): npx / node / python / python3 are general interpreters that run ARBITRARY, possibly remote code and are NOT guaranteed to operate in the working folder, so they are no longer default-allowed -- each prompts once, and "allow always" then sticks (including for multi-line scripts, via fix #1). Project-scoped dev tools (cargo / go / make / npm run / pytest / ruff / black / mypy) remain auto-allowed under the existing "trust to edit project == trust to run the project's own code" model. Adds a deterministic gating corpus over compound &&/|/;/|| commands, cd into another project, and multi-line -e/-c scripts, pinning the core invariant: picking "allow always" (the suggested pattern) MUST make that exact command stop prompting; and denied/dangerous segments are NOT unlocked by a sibling grant. dirge-9zbd Co-authored-by: Yogthos <yogthos@gmail.com>
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…nd hygiene Self-review of the chamber + collapse work found 8 actionable issues. Addressing all in one round. - **#1 CRITICAL — ContextOverflow infinite loop on compress no-op** (`ui/slash.rs`, `ui/mod.rs`): `handle_compress` had three `Ok` paths that returned without compacting (within-limits, nothing-to-cut, summary-too-large). The auto-recovery branch treated any `Ok` as success and respawned the run against the SAME history, which immediately re-emitted `ContextOverflow` → loop. Added `CompressOutcome::{Compacted, NoOp{reason}}`; auto-recovery now respawns only on `Compacted` and surfaces a "made no progress" error otherwise. The interactive `/compress` and auto-Done paths ignore the discriminant — only the success/error path matters there. - **#2 HIGH — ContextOverflow re-runs side-effecting tools**: the interactive retry loop already refuses to retry once `had_tool_calls=true`; the new auto path bypassed that safety. Now gates respawn on `tool_calls_this_run == 0`; if any tool ran in the failed turn, compact happens but auto-retry is refused and the user must re-issue. - **#3 HIGH — char-truncated body wasn't stashed for Ctrl+O**: `render_tool_output` returned `None` when only `chars_truncated > 0` (no line truncation) — Ctrl+O reported "nothing to expand" despite the visible `+N chars truncated` footer. Now stashes whenever EITHER signal indicates hidden content. Regression test: `render_tool_output_stashes_on_char_truncation_alone`. - **#4 HIGH — `last_collapsed` persisted across turns**: a Ctrl+O press would expand a collapsed result from any prior unrelated turn. Cleared on prompt-send (every user submission starts a new turn) and on ContextOverflow respawn. - **dirge-code#5 MEDIUM — Ctrl+O was one-shot via `.take()`**: switched to `.as_ref().cloned()` so a second Ctrl+O re-emits the same expand; stash overwrites on the next collapse or clears on next turn. - **dirge-code#6 MEDIUM — empty `resolved_name` painted unnamed chamber**: added an early-out: when name resolution drops to empty (no `last_tool_name`, no buffered call by id), emit a dim `(unresolved tool)` trailer + chamber bottom and skip the body paint. - **dirge-code#7 MEDIUM — edit colorized diff lost when `last_tool_name` drained**: `is_edit` was gated on `last_tool_name`, falling through to plain `render_tool_output` when the slot drained (same shape as the chamber-orphan bug). Now gates on `resolved_name`. - **dirge-code#8 DESIGN/SEC — `banner_value` unsanitized at expand time**: the initial chamber TOP sanitizes the banner; the Ctrl+O reprint did not. ANSI-bearing tool args (MCP, plugin, attacker-shaped filename) could paint raw at expand. Sanitize once at stash time in `render_tool_output`. Also (review dirge-code#9, reviewer recommendation): swapped `apply_patch` out of `tool_skips_collapse` and `read` in. `read` is what the user/LLM explicitly asked for — defaulting to 4 lines defeated the request. `apply_patch` output is usually a short "N ops" summary; the rare per-op-failure spew is the right place for Ctrl+O to engage. Tests: 625 pass (3 added — char-truncation stash, apply_patch collapses, exempt-set without apply_patch). Updated 2 existing tests for the exempt-set change. Fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…view Adversarial review of the per-prompt deny-list architecture flagged two real bypasses + several defense-in-depth gaps. Addressing. - **#1 CRITICAL — MCP tools bypassed the deny-list entirely**: `McpTool::call` passes the umbrella name `"mcp_tool"` to `check_perm`. The deny-list match is literal `==` (now case- insensitive), so a prompt declaring `deny_tools: [edit]` would NOT match an MCP server's `edit` tool — the LLM could route filesystem writes through any MCP server unscathed. Added `PermissionChecker::any_prompt_denied(&[name1, name2, ...])` public probe; `McpTool::call` now checks (concrete tool name, `mcp_tool:<server>:<name>` qualified form, umbrella `mcp_tool`) before invoking `check_perm`. Any hit returns a hard denial. - **#2 CRITICAL — ACP never installed the prompt deny-list**: the ACP bridge built a fresh `PermissionChecker` per session and never wired in `context.current_prompt_deny_tools`. Plan mode was a no-op for editor clients. Mirror the `apply_prompt_deny` call from `main.rs::build_channels` into the ACP `run_prompt` path right after `build_acp_permission`. - **dirge-code#5 MEDIUM — `glob` / `repo_overview` added to PermissionConfig**: both were filesystem walkers reachable via the perm checker but not declared as user-configurable in `PermissionConfig`. User- level `permission.glob = "deny"` would silently fall through to the `*` default. Added the fields + the per-tool rule loop entry. - **dirge-code#6 MEDIUM — `plan_enter` / `plan_exit` now consult deny-list**: both intentionally skip `check_perm` (the confirmation dialog IS the user-prompt). But the prompt deny-list should still apply — a strict-mode prompt that says `deny_tools: [plan_exit]` should refuse the call WITHOUT opening the dialog. Added a thin `check_prompt_deny` helper that queries `any_prompt_denied` before opening the channel. - **dirge-code#7 MEDIUM — case-insensitive tool-name matching**: `deny_tools: [Edit]` (typo capitalization) used to silently no-op. `is_prompt_denied` now uses `eq_ignore_ascii_case`; the frontmatter parser also lowercases at load so the stored list is canonical in every consumer (status line, UI, etc.). - **dirge-code#9 LOW — warn on unknown tool names in `deny_tools`**: at prompt load time, cross-check every `deny_tools` entry against a `KNOWN_TOOLS` list. Warns once per unknown entry, with the full known set printed for guidance. MCP-server-exported tool names will trigger this benignly; documented inline. - **#3 HIGH — pin order with tests**: three new checker tests pin the contract: - `prompt_deny_any_matches_concrete_and_qualified_mcp_names` (locks the MCP bypass fix) - `prompt_deny_is_case_insensitive` - existing tests continue passing - **#4 plugin trust boundary documented**: per the review's recommendation, added a "Plugin trust boundary" section to CONFIG.md acknowledging that plugins are inside the trust boundary and not sandboxed. Not addressed (intentional): - dirge-code#8 doom-loop UI nudge on repeated deny-list hits — UX polish. - dirge-code#10 `/prompt default` clear confirmation — user-typed; would have to confirm every clear, including the legitimate ones. 634 tests pass; fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…ry, repo_overview walk Self-review of the last 5 commits surfaced 9 findings. Addressing all. - **#1 MEDIUM — `repo_overview` permission patterns got command-glob semantics**: `is_path_tool_name` was updated for `glob` but not `repo_overview`, so a config rule like `"repo_overview": { "/etc/**": "deny" }` parsed `**` as command-glob (no path-spanning match). Added `repo_overview` to the path-tool arm. - **#2 MEDIUM — `providers.<name>` override silently missed on capitalised provider names**: `parse_provider` is case-insensitive but `HashMap::get(provider)` is not, so `--provider Anthropic` built the client fine but the `providers.anthropic` chunk-timeout override was a no-op. Lowercased the lookup key in `resolve_stream_chunk_timeout` and `resolve_provider_info` (with the original key as a fallback so existing exact-case configs keep working). - **#3 MEDIUM — `Prompt.description` parsed but never displayed**: the frontmatter `description: "..."` was being captured into a `#[allow(dead_code)]` field. A user writing a description expected it to appear somewhere. Wired into the `/prompt` list output — each prompt now renders as `name description` (padded for alignment) when a description is set, falling back to the bare name otherwise. - **#4 MEDIUM — `stream_chunk_timeout_secs` undocumented**: the knob landed in 186628b with the error message pointing users at it, but neither CONFIG.md nor README explained the resolution ladder. Added a "Streaming timeouts" section to CONFIG.md covering the precedence order (custom_providers > providers > top-level > 300s default) and noting the case-insensitive matching. - **dirge-code#5 LOW — Unicode lowercase mismatch with ASCII-only matcher**: the frontmatter parser called `to_lowercase()` (Unicode-aware) while `is_prompt_denied` used `eq_ignore_ascii_case`. Swapped the parser to `make_ascii_lowercase` so both ends share the same contract — non-ASCII bytes pass through unchanged on both sides. - **dirge-code#6 LOW — MCP bare-name deny semantics undocumented**: the 3-name probe `any_prompt_denied(&[concrete, qualified, "mcp_tool"])` matches an MCP server's `edit` tool when the prompt denies `edit` (intended for the built-in). README now spells this out and recommends the qualified `mcp_tool:<server>:<name>` form for surgical denies. - **dirge-code#7 LOW — `KNOWN_TOOLS` duplicated `BUILTIN_TOOL_NAMES`**: two hand-maintained lists of every built-in tool, used for the MCP collision filter and the frontmatter `deny_tools` warn respectively. Drift would produce either spurious warnings or (worse) an unsafely shadowable name. Extracted a single `pub const BUILTIN_TOOL_NAMES` in `agent/tools/mod.rs`; both sites now import it. - **dirge-code#8 DESIGN — ACP can't switch prompts mid-session**: the 4dd17d7 fix installed the deny-list correctly per-request but ACP has no protocol message for `/prompt <name>`, so the deny- list is effectively locked at boot. Documented in the README ACP bullet — recommends `--prompt <name>` at launch for restricted modes. - **dirge-code#9 LOW — `repo_overview` ancestor walk went above crawl root**: `compute_dir_file_counts` bumped every parent up to `/`, including dirs that would never be printed. Now stops at the first ancestor not in the printed-dir set. 634 tests pass; fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…rf cache Self-review of the last 4 commits flagged 11 findings. Addressing all in one batch. - **#1 HIGH — leading whitespace dropped on first row of soft_wrap**: `current.is_empty()` at row start unconditionally dropped `token.leading_ws`, including on the first row of a logical line. Option lines `" ▶ label …"` lost their ` ` margin; the green ` allowed …` confirmation lost its indent too. First-row branch now preserves leading_ws (with a ws-overflow fallback to keep the token). - **#2 HIGH — drain_events early-broke before reader quiesced**: the Ok(false) shortcut fired on the first quiet poll, which was often "the background reader currently holds crossterm's internal mutex" rather than "terminal is quiet". A delayed OSC 11 / DA1 response could still escape past our drain. Now requires at least one observed event before the Ok(false) shortcut; honors the full budget otherwise. - **#3 HIGH — MODIFIED section clipped its own bottom border at `available == 4`**: row_budget=1, footer + 1 file = 2 items, +3 frame rows = 5 total in a 4-row budget. draw_panel clipped the `╰────╯`. Bumped MIN_MOD_SECTION_ROWS from 4 → 5 so the bottom border is always painted. - **#4 MEDIUM — `\r` not stripped from CRLF input**: Windows / some-MCP tool output left `\r` in tokens, producing terminal redraw artifacts. `soft_wrap` now strips a trailing `\r` per logical line. - **dirge-code#5 MEDIUM — Show cursor on alt screen was a no-op**: `Show` was issued while still on the alt screen; `LeaveAlternateScreen` restores the main screen's saved DECTCEM state, discarding the Show. Moved Show to AFTER LeaveAlternateScreen + disable_raw_mode. - **dirge-code#6 MEDIUM — recent(256) clones + locks on every redraw**: panel redraws on every streamed token. Added `modified::version()` monotonic counter (bumped on mark / clear); panel-side cache in `panel_modified_cached` keyed by (version, cwd) skips the lock + 256-PathBuf clone + path-strip when nothing changed. - **dirge-code#7 MEDIUM — break_long_token could emit wide-glyph row > budget at max_width<2**: floored max_width at 2 inside soft_wrap. A 1-cell terminal is unusable anyway; this just removes a sharp edge. - **dirge-code#8 MEDIUM — all-whitespace first row collapsed to empty**: same root cause as #1, fixed by the same change. Indented blank separators now preserve their indentation. - **dirge-code#9 LOW — `allowed …` confirmation flush against alert `╰─╯`**: added a blank-line breathing row before the green confirmation so the alert's bottom border and the confirmation don't read as one block. - **dirge-code#10 LOW — head_w used chars().count() not display width**: switched to `UnicodeWidthStr::width(head)` so future wide-glyph markers won't under-pad the continuation indent. - **dirge-code#11 LOW — single-select marker width inconsistent**: cursor marker was `▶` (w=1), non-cursor was ` ` (w=2), so wrapped tails of adjacent options drifted by one column. Cursor marker padded to `▶ ` so all markers in a question share display width. 5 new tests: - preserves_leading_whitespace_on_first_row - strips_carriage_returns_from_crlf_input - wide_glyph_respects_max_width_at_floor - preserves_leading_whitespace_only_line - version_bumps_on_mark_and_clear 651 tests pass; fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…e migration, model-shrink, unicode tokens Self-review of the last 6 substantive commits flagged 7 findings. Addressing all in one batch. - **#1 HIGH — Accept mode silently bypassed mcp_tool's default-Ask**: `SecurityMode::Accept` coerced `Ask → Allow` for every non-path tool, so the new default-Ask rule for `mcp_tool` (f62a89b) was effective only in Standard mode. `dirge --accept` + an MCP server still allowed every call silently. Added `is_high_risk_non_path_tool(tool)` (matches `mcp_tool` and `bash`) which forces the Ask to survive the coercion. The general non-path coercion still applies to `question`, etc. Regression test pins both directions. - **#2 MEDIUM — Pre-5dc036d sessions resumed with under-counted `estimated_tokens`**: stored values were computed under the old text-only logic. Bumped `SCHEMA_VERSION` to 2 and added a v1 → v2 migration step that calls a new `Session::recompute_all_estimates` (also exposed `estimate_message_tokens` as the per-message helper). Tested via `v1_to_v2_recomputes_under_counted_estimates`. - **#3 MEDIUM — `/model` switch to a smaller window didn't warn about over-capacity**: switching from a 1M to a 200k model with the session already exceeding the new budget would have errored mid-stream on the next prompt. The /model handler now surfaces a warning recommending `/compress` when `total_estimated_tokens > new_ctx - reserve`. - **#4 LOW — Highlight tokenizer mis-split non-ASCII identifiers**: `bytes[i] as char` for a UTF-8 lead byte produced a Latin-1 char that failed `is_ascii_alphanumeric`, terminating the identifier mid-word (`naïve` → `na` + punctuation + `ve`). Walk via `line[i..].chars().next()` and broadened `is_ident_cont` to accept any non-ASCII non-control letter. ASCII path unchanged. - **dirge-code#5 LOW — `looks_like_type` colored short capitalized words as types**: `Ok`/`No`/`Hi`/`Id` all hit. Tightened the floor to ≥3 chars. Added `Ok`/`Err`/`Some`/`None` to the Rust types table so idiomatic 2-char Rust constructors still get type color via the explicit table. - **dirge-code#6 INFO — Yolo bypass documented**: README permission section now says explicitly that `--yolo` skips rule eval, the per-tool default-Ask, and the doom-loop detector — but that `deny_tools` frontmatter STILL applies (that gate runs BEFORE the yolo short-circuit by design). Accept-mode bullet also updated to note `bash` and `mcp_tool` keep their Ask. - **dirge-code#7 + dirge-code#8 CLEARED**: doom-loop Allow + `"*": "allow"` default config both verified NOT to bypass mcp_tool's Ask. 684 tests pass; fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…nds, error masking Adversarial review of `349afb6`/`b9de3d5`/`2fac609` flagged 14 findings. Addressing all. - **#1 HIGH — C1 controls bypassed MCP stderr sanitizer**: the original filter was `b == 0x09 || (0x20..0x7f).contains(&b) || b >= 0x80`. That second clause let through every non-ASCII byte including the C1 control range (U+0080..=U+009F). In particular U+009B is single-byte CSI, behaves identically to `\x1b[` on iTerm2/xterm in 8-bit mode. A misbehaving MCP child could write `\u{9b}2J` and repaint the screen — exactly the smuggling vector the commit message claimed to close. Filter now blocks C0 controls (except `\t`), DEL, and the full C1 range. - **#2 HIGH — MCP stderr was silently dropped at default verbosity**: emit was `tracing::info!`, but dirge's default EnvFilter is `warn,rig=off`. Users diagnosing MCP server panics or init errors saw nothing — real regression vs the old `Stdio::inherit()`. Raised to `tracing::warn!` so it surfaces on the default config. - **#3 HIGH — `parse_ddg_html` panicked on truncated input**: `&html[tag_start..abs_start + 32]` blew up when `abs_start + 32 > html.len()` or landed mid-codepoint. Rewrote the scanner to anchor on `<a ` tags and walk only within bounded slices via `tag_end.min(html.len())`. Added regression test for the truncated case. - **dirge-code#5 MEDIUM — MCP stderr forwarder had no per-line cap**: `BufReader::lines()` buffers until `\n`. A buggy child writing a GB without newline would OOM dirge. Replaced with a manual read loop, 16 KiB per-line cap, emit `…[truncated]` past the cap and skip until next `\n`. - **dirge-code#6 MEDIUM — provider rotation race on first call**: two concurrent first-callers both saw `AtomicU8 = 0`, both rolled a fresh entropy pick, both stored. Last writer won — inconsistent contract. Switched to `compare_exchange` from 0 to candidate; loser re-reads the winner's value. - **dirge-code#7 MEDIUM — both-providers-fail error masked secondary + DDG errors**: only `primary_err` was returned. Now concatenates all three failures so the user can diagnose without chasing the wrong cause. - **dirge-code#8 MEDIUM — `parse_ddg_html` false-positives on substring match**: previously matched `class="result__a"` anywhere in the HTML, including inside `<script>` blocks or quoted text. Walked backward via `rfind("<a ")` could grab an unrelated anchor. Now anchors on `<a ` first and inspects the tag's attributes — proper containment check. - **dirge-code#9 MEDIUM — DDG snippet control bytes flowed into LLM prompt**: `strip_tags_and_decode` decoded entities but didn't filter ESC / C1 controls. A malicious or mojibake search result could ship ANSI styling into the agent's context. Added control-byte filter to the decoder's output pass. - **dirge-code#10 LOW — `PARALLEL_API_KEY` read per-call**: was `std::env::var` inside `call`, inconsistent with how `EXA_API_KEY` was captured at construction. Moved to `WebSearchTool::new`. - **dirge-code#11 LOW — whitespace-only key passed empty-filter**: `EXA_API_KEY=" "` produced a malformed `?exaApiKey=%20%20` URL. Now trims keys at construction. - **dirge-code#12 LOW — tool description out of date**: still mentioned Exa-only + DDG fallback, missed Parallel.ai rotation and the keyless default. Rewritten to reflect the actual contract. - **dirge-code#13 LOW — `urlencode_query` renamed to `percent_encode`**: the function is a generic percent-encoder (RFC 3986 unreserved set), not a form-encoder. Misleading name. - **dirge-code#14 DESIGN — no tests for new code paths**: added 11 regression tests covering ddg parser bounds + happy path + anti-script-block, control-byte filter, key trim, MCP response parser (plain JSON + SSE + malformed), DDG redirect unwrap, percent encoding, provider env override. - **dirge-code#15 LOW — bot-identifying DDG User-Agent**: swapped `compatible; dirge-agent/1.0` for a real Firefox 133 UA. DDG aggressively rate-limits identifiable scrapers. 695 tests pass (684 + 11 new); fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
Audit response covering the user's 6-item duplication list. Three substantive modules + thin wrappers; two items deferred as non-issues; one already complete from earlier commits. **#4 — ANSI / control-byte filter (new `src/ui/ansi.rs`)**: Previously three independent filters: MCP forwarder (`emit_mcp_line`), websearch (`strip_tags_and_decode`), chat (`sanitize_output`). Each drifted in coverage — one blocked C0 but not C1, another stripped `\r` only, etc. New `ansi::strip_controls(s, policy)` with a `StripPolicy { keep_newline, keep_tab }` knob is the single source of truth. MCP forwarder + websearch routed through it. Chat `sanitize_output` left as-is — it does ANSI-escape PARSING (consumes `\x1b[…m` as a unit so the payload disappears) which is more specific than what `strip_controls` does (drops just ESC, leaving `[31m` as visible text). The two coexist intentionally. **#1 — Reusable box component (new `src/ui/box_render.rs`)**: Three implementations of chamber/box math previously: tool chambers (`chamber_row` / `chamber_row_with_bg` / `chamber_bottom`), permission alert (inline `row` closure), panel sections (`push_section` closure). Inconsistent — `chamber_row` was display-width-aware, `chamber_row_with_bg` was char-count-based; each treated tabs and width math differently. New module: - `BoxStyle` enum (currently only `Rounded`) - `top(style, title, total_w)`, `bottom(style, total_w)`, `divider(style, total_w)` — frame primitives - `row(style, content, total_w)` — display-width-aware content row with tab expansion + truncate-with-`…` - `row_with_bg(style, content, total_w, bg_idx)` — for diff backgrounds - `expand_tabs(s, tab_stop)` — moved here from `mod.rs` - `BoxBuilder` — fluent API for callers that build a box all-at-once (notifications, alerts, panel sections). Long rows soft-wrap via `wrap::soft_wrap` instead of truncating. `chamber_row`, `chamber_row_with_bg`, `chamber_bottom` in `mod.rs` are now thin wrappers around `box_render`'s primitives — existing call sites unchanged, but the underlying math is shared. 7 new unit tests covering frame width invariants, tab handling, CJK, builder construction, and soft-wrap. **#2 — Single output chokepoint** — already done in commit `ea042b1` (the `ui::notifications` module + channel). The remaining stray `eprintln!` sites all run during STARTUP (config parsing, skill discovery, MCP connect_all) BEFORE `TerminalGuard` is installed, so they don't paint over the UI. Audited and confirmed clean. **#3 — Permission check chokepoint** — already centralized. `check_perm` / `check_perm_path` / `check_perm_path_resolve` in `agent/tools/mod.rs` cover every tool's input-checked path; `any_prompt_denied` covers MCP-style multi-name lookup; `check_prompt_deny` covers plan tools. No duplication worth extracting. **dirge-code#5 — Layout module** — deferred. `chamber_widths`, `Renderer::content_width`, `Renderer::line_width`, `Renderer::max_line_width` are already in their proper homes; forcing them into a new module would be churn, not clarification. **dirge-code#6 — Soft-wrap inside chambers** — deferred. The current chamber rows truncate with `…` (matches user expectation for single-row tool result lines); the `BoxBuilder` path soft-wraps when the caller wants that explicitly. Forcing all chamber rows to soft-wrap would change the visual feel of tool output and needs a separate UX call. 709 tests pass (702 + 7 box_render); fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…h_bg width, sanitization Correctness + security review of `ea042b1`/`524c90c` flagged 15 findings. Addressing all 15. - **#1 HIGH — startup race: MCP forwarders fired before `install()`**. `connect_all` spawns stderr forwarders in `main` BEFORE `run_interactive` reached the old `install()` call. Lines emitted during MCP-server handshake hit `sender() == None` and were silently dropped. Moved `install()` to the very top of `main()` so the channel is live by the time any forwarder starts. Split the API: `install()` (creates channel) + `take_receiver()` (UI loop claims the rx). - **#2 HIGH — orphaned-sender footgun on UI restart**. `OnceLock` meant a re-entry could never replace the sender; producers holding clones would send into a dead channel forever. Switched to `RwLock<Option<Sender>>`. Producers also self-heal: when `try_send` returns Err because the receiver was dropped, `notify_send` clears the slot so subsequent producers see `None` and skip. - **#3 HIGH — `row_with_bg` was still char-count-based**. The refactor claim was "unifies display-width vs char-count" but the bg-tinted variant still used `chars().count()`. A diff row with CJK / emoji drifted the right border. Now uses the same display-width budget as the plain `row`. Regression test `row_with_bg_width_invariant` pins it. - **#4 HIGH — unbounded channel + no backpressure → OOM**. A buggy / hostile MCP child spamming stderr would grow the queue unboundedly. Switched to `mpsc::channel(1024)` (bounded) with `try_send` so the producer drops on overflow rather than unboundedly queuing. Test `bounded_channel_drops_on_full` pins the contract. - **dirge-code#5 MEDIUM — multi-colon MCP tool names**. `splitn(3, ':')` on `mcp_tool:server:do:thing` parsed correctly but the comment explanation was off. Clarified; behavior unchanged (the wildcarded server pattern is the desired semantics). - **dirge-code#6 MEDIUM — mcp_tool umbrella check case-sensitive**. `umbrella == "mcp_tool"` would miss `MCP_TOOL:…` if a future caller surfaces uppercase. Switched to `eq_ignore_ascii_case`. - **dirge-code#7 MEDIUM — receiver-side sanitization for ALL Notification variants**. MCP variant was pre-sanitized at the producer, but Info/Warn/Error had no producer-side contract. Adding receiver-side `ansi::strip_controls(KEEP_NEWLINE)` makes the rule un-bypassable: nothing reaches `write_line` carrying escape bytes regardless of how careful a future producer is. - **dirge-code#8 MEDIUM — websearch `KEEP_BOTH` + `\n` broke chamber border**. Tabs survived into chamber rows where they interacted poorly with the wrap math. Switched to `KEEP_NEWLINE` and replace `\t` with single space. - **dirge-code#9 MEDIUM — whitespace-only MCP lines dropped**. The blank-line collapse used `trim().is_empty()` which also ate legitimate indented continuation lines. Now uses `is_empty()` post-sanitize. - **dirge-code#10 LOW — `top()` with empty title rendered `╭─ ─…─╮`** (two spaces with no glyph between). Empty title now matches the bottom-border shape `╭{horizontals}╮`. Test pins it. - **dirge-code#11 LOW — `expand_tabs` precondition undocumented**. Added comment that input should be control-byte free; callers must sanitize first. - **dirge-code#12 LOW — `BoxBuilder::row("a\nb")` produced one row containing a literal `\n`**. Now splits on `\n` and emits one row per logical line. Test `builder_splits_embedded_newlines` pins it. - **dirge-code#13 LOW — `BoxBuilder` had no labelled-row variant**. Added `row_labelled(label, sep, value)` that indents wrapped tails under the value column. Mirrors the alert chamber's `labelled_rows` shape so a future alert migration to BoxBuilder is unblocked. Test pins continuation indent. - **dirge-code#14 LOW — `strip_controls` allocated on no-op path**. Fast path returns the input unchanged when no chars would be filtered. - **dirge-code#15 DESIGN — sender caching deferred**. Per-call `sender()` is the right semantics for the orphan-detection case (#2); caching would skip the slot-clear behavior. Kept as is. 8 new tests; 715 total. Two-test serialisation via TEST_GATE for the notification tests since they mutate global TX/RX_HOLDER state. fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…ser_rx writes Code review of `a70fb03`/`8b0688c`/`afc76eb` flagged 15 findings, including one **active regression** I shipped: `write_outside_chamber` reused `close_tool_chamber_if_open` which always painted "⚠ tool denied · aborted · no result". So every notification arriving while a tool was in-flight would falsely brand that tool as denied. Fixed. Headline: of 9 tokio::select! arms, only 2 were using the new chokepoint. 3 others (question_rx, dialog_rx, plan_rx) carried the SAME X-inside-chamber bug the helper was built to eliminate. Migrated them. - **#4 HIGH (regression I shipped)**: split chamber-close into two variants: - `close_tool_chamber_abort` — paints the "⚠ tool denied" row + bottom border. Used by permission-deny / agent error / interjection / context-overflow paths (the tool is being actively rejected). - `close_tool_chamber_passive` — emits ONLY the bottom border. Used by `write_outside_chamber` (the tool isn't being denied; we just need to terminate the visual frame so notification text doesn't land inside). - `close_tool_chamber_if_open` kept as back-compat alias for the abort variant — existing call sites (4 of them, all in abort-shaped contexts) keep their previous behavior. - **#1 / #2 / #3 CRITICAL — three arms migrated**: - `question_rx` (3537): a `question` tool's chamber was open when the prompt header was painted; header + stem + option grid landed inside. - `dialog_rx` (3811): plugin `harness/confirm` / `harness/select` fires from inside on-tool-start hooks while a tool chamber is open; the dialog rendered inside. - `plan_rx` (3955): plan-switch prompt could be delivered while a tool chamber was open; prompt landed inside. - **dirge-code#5 HIGH — user_rx interactive writes migrated**: - Ctrl+C interrupt msg (1135) - "copied selection" (1150) - Ctrl+X dropped-interjection trailer (1168) - "agent is busy" × 2 (1533, 1598) - **dirge-code#7 MEDIUM — defense-in-depth sanitization**: `write_outside_chamber` now runs `strip_controls(KEEP_NEWLINE)` on `text` before writing. A future caller that forgets producer-side sanitization can't smuggle ANSI escapes. - **dirge-code#12 LOW — notification amplification cap**: the bounded channel limits NOTIFICATIONS but not ROWS per notification. A single `Notification::McpLog` carrying 10k `\n`s would expand to 10k chamber rows. After 200 lines we truncate and emit a `[N more lines suppressed]` marker. - **dirge-code#6 audit** revealed the 4 remaining manual sites (1984/2602/2713/2884) all ARE abort-shaped and correctly use the abort variant via the back-compat alias. No migration needed. - **dirge-code#8 / dirge-code#9 / dirge-code#10 / dirge-code#13 / dirge-code#14 / dirge-code#15** noted as design trade-offs or already verified clean. 3 new regression tests: - `close_passive_does_not_paint_abort_row` pins the new no-abort-label contract - `close_abort_paints_warning_and_bottom` pins the abort variant still emits 2 rows - existing `write_outside_chamber_closes_chamber_first` still passes; helper now uses passive close 718 tests pass (716 + 2 new); fmt clean.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
Three issues from the post-cutover code review against pi: **Bug #1**: stream.rs:186-194 — defensive fallback (stream closed without Done/Error) skipped emitting message_start / message_end. Pi at agent-loop.ts:359-366 emits both. Fix: route the fallback through `finalize()` so it follows the same emit path as Done/Error. Updated the existing test that documented the wrong behavior as "intentional Rust deviation" — it's now pi-faithful. **Bug #4**: integration.rs:411 — orphaned inner loop task. `spawn_loop_runner` spawned `run_agent_loop` as a NESTED `tokio::spawn`. A `task.abort()` on the outer task would kill it but leave the nested task running silently — tools could keep executing after the user thought they'd cancelled. Fix: collapse to `tokio::join!(loop_future, pump_future)` in the same outer task. Shared fate; outer abort drops both futures at their next .await. Tools that poll the AbortSignal still observe cancellation cooperatively. **Gap #3**: run.rs prepareNextTurn — pi at agent-loop.ts:229-238 rebuilds config with the new model / reasoning. We accepted the fields but silently ignored them. Surfacing a tracing warning per ignored swap so users wiring the hook know their change didn't take effect. Full fix requires the StreamFn to be a factory `Fn(Context) -> StreamFn` (so the loop can rebuild it on swap) — flagged for follow-up when a real consumer demands it. Items NOT addressed (documented in review): - #2 get_api_key receives empty string (no production caller) - dirge-code#5/dirge-code#6 timing / ordering changes (observable but not bugs) - dirge-code#7-9 efficiency micro-optimizations - dirge-code#10/dirge-code#11 UI-side wiring + Agent.preamble defensiveness Gates: - cargo build (default) clean - cargo build --all-features clean - cargo test (default) 841 green (unchanged) - cargo fmt clean
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
Three follow-ups to PR dirge-code#126 (experimental tab completion) flagged in the code review: #1 — mid-word cursor produced corrupt buffer `try_complete` replaced `[word_start..cursor]` with the candidate command and appended `buffer[cursor..]` as a tail. With the cursor inside the first word (e.g. Tab pressed after Home, or after moving Left into `/mod`), the unreplaced suffix leaked into the result: `/mod` cursor=2 → `/mcpod` (replacement `/mcp` + residual `od`). Cursor=0 → `/allow/mod` (replacement + the entire word as tail). Fix: anchor replacement to the WHOLE-WORD boundary (`word_start..word_end`) so cursor position inside the command name no longer matters. New buffer is exactly one of the matching commands followed by the args tail (if any). Also: `cursor > word_end` now returns None — the user is past the command name typing args, completion shouldn't fire. #3 — Tab raced the file picker The `@`-file-picker has its own keystroke handling (Enter / Ctrl+J guard it explicitly). Tab in the new completion path didn't. In practice the picker's buffer doesn't start with `/`, but guarding explicitly closes the race for future changes — mirrors the existing Enter/Ctrl+J gates. #2 — single source of truth for slash command names Previously `builtin_commands()` (feature-gated, used by tab completion) and `handle_slash`'s match arms (always compiled, the actual dispatch) were two independent lists. Adding a command required updating both — or the command worked but wasn't tab-completable, or appeared in completion but errored on use. Restructure: * `slash_command_names()` — always-compiled canonical list. The one place to add a command name when wiring it up. * `is_known_slash_command(name)` — wrapper over the canonical list. Single implementation, no second match to drift from. * `builtin_commands()` — now just `slash_command_names()`, kept as a feature-gated alias so the public API doesn't break. * `handle_slash`'s `_` default arm — now consults `is_known_slash_command(parts[0])`. A name listed in the canonical list but with no matching dispatch arm surfaces as `internal error: X is listed in slash_command_names() but has no dispatch arm in handle_slash` instead of silently falling through to "unknown command" or a plugin lookup. Loud failure in dev/test. The remaining drift direction (dispatch arm but missing from the list) only costs tab completion — accepted as the lesser failure mode. Tests (9 new, 22 slash tests pass total) * complete_with_cursor_mid_word_produces_clean_buffer — #1 * complete_with_cursor_at_start_produces_clean_buffer — #1 * complete_preserves_trailing_args — #1 edge * no_completion_when_cursor_in_args — #1 edge * is_known_slash_command_agrees_with_canonical_list — #2 * slash_command_names_is_sorted — #2 (preview ordering) * always_on_commands_appear_in_canonical_list — #2 drift guard: pins the 22 always-on dispatch arms against the canonical list Verified * cargo test --bin dirge → 1011 passed * cargo test --bin dirge --features experimental-ui-tab-slash → 1025 passed * cargo test --bin dirge --features "experimental-ui-tab-slash plugin" → 1239 passed * cargo fmt --all --check → clean
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…tests SESS-2 follow-up #1 — UI session-mutation on ContextCompacted: ContextCompacted event now carries summary + first_kept_index. The UI consumer mutates session.id in-place, calls Session::compress_reporting() to push a Compaction entry, and runs save_session() so the rotated id and summary are persisted on disk. Mirrors hermes-agent/conversation_compression.py lines 380-397. Without this the on-disk session kept the OLD id and the compaction was lost on next resume. SESS-2 follow-up #4 — /compress <focus> argument wire-through: - build_summary_prompt now honors focus_topic: when supplied, the Hermes-style "FOCUS TOPIC: …" framing is appended to the prompt, asking the model to allocate ~60-70% of its summary budget to the topic (verbatim port of hermes context_compressor.py:1050-1054). - compress_messages (existing slash-command path) gets the same treatment: any free-form text after /compress is wrapped in the FOCUS TOPIC framing instead of the generic "Additional instructions" placeholder. - run_compaction_pass exposes the focus parameter via a new with_focus wrapper (auto-trigger path still uses None). - Slash help text updated: "/compress [focus] compress; focus text guides what to preserve". SESS-2 follow-ups #2 (background spawn) and #3 (multi-generation chaining) closed as "matches reference impl": hermes is also inline (no background spawn) and only chains the most-recent prior summary via _find_latest_context_summary. Our implementation already matches. H7_SMOKE: remove the 6 #[ignore] markers from the real-API integration tests. Each test already has a runtime `detect_provider()` check that bails with `[skipped]` + Ok when no provider key is set; #[ignore] was blocking that check from ever running. Removing the markers means: in CI without keys, the tests run, hit the skip path, pass (1713 pass / 0 fail / 0 ignored). With keys present, they exercise the real provider as designed. Header doc updated. Tests: 1713 pass / 0 fail / 0 ignored (was 1707 / 0 / 6).
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…asonix parity Independent verification turned up 6 gaps in the Phase 2.5 parity work. This commit closes all of them. #1 HIGH — `truncations_fixed` now bumps on hard-fallback too. Reasonix counts both success (`repair/index.ts:105`) and unrecoverable (`repair/index.ts:99`) under the same counter; dirge was dropping the latter, under-reporting exactly the cases operators need most. `apply_truncation_repair` now records the kind whenever the closer ran, not just on successful repair. #2 MEDIUM — closer notes are now surfaced to the model. Reasonix pushes `r.notes` into `report.notes` with `[<tool>]` prefix on success and `[<tool>]⚠️ TRUNCATION UNRECOVERABLE: ...` on fallback (`repair/index.ts:100-101, :106`), then carries them into the next-turn assistant input. Dirge now stashes them per-call-id on a new `LoopConfig.truncation_notes` shared map; `prepare_tool_call` drains them and appends to `repair_notes`, which `prepend_notes_to_result` (already in place for relational-default notes) prepends to the tool result content so the model sees the repair in the same turn. #3 MEDIUM — added end-to-end wiring tests through `run_agent_loop`. The prior 7 tests proved the helpers worked in isolation; they did not prove the loop calls them in the right order. Two new tests drive the full canned-stream loop: - `dirge_7bwx_end_to_end_storm_dedupes_after_truncation_repair`: three tool calls with different truncated raw strings that heal identically. Storm threshold=3 → the third must be suppressed (only possible if truncation runs before storm). - `dirge_ngic_end_to_end_orphan_dsml_in_text_dispatches`: DSML invoke in `ContentBlock::Text` ONLY (no Thinking, no declared ToolCall) must dispatch (only possible if `build_scavenge_source` includes Text). #4 MEDIUM — removed dead `try_truncation_repair`. It was kept as "defense in depth" but marked `#[allow(dead_code)]`, so the safety claim was illusory. Now actually gone; direct callers can use `repair_truncated_json` for the brace-closer if needed. The `validate_and_repair` block-comment was updated to reflect the new contract. dirge-code#5 LOW — `truncation_repair_canonicalizes_divergent_streams_before_storm` tested canonicalization in isolation; the new end-to-end #3 tests exercise the actual storm dedupe path that depends on the String→Object promotion. The promotion itself is now also covered with an explicit note in `apply_truncation_repair`'s doc — it has no Reasonix analog (their args are always strings) and is dirge-specific compensation for mixed arg representations. dirge-code#6 LOW — added a comment near `storm.rs::inspect` documenting the implicit dependency on `serde_json` being built without the `preserve_order` feature. If feature unification ever enables it, storm dedupe regresses silently; the comment points at the workaround (`run::canonical_json`) and notes Reasonix has the same fragility at `repair/index.ts:127`. `LoopConfig` gained the new `truncation_notes` field; all constructors (production + tests) were updated. `Clone` impl threaded through. 1632 tests pass with `-D warnings` (was 1630; +3 new, -1 removed).
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
When the summarizer keeps failing (network errors, invalid summaries, model garbage), every fold trigger re-called the LLM and silently fell back to pruned-only context — wasting API calls every turn. Add a per-run consecutive-failure counter. `run_compaction_pass[_with_focus]` now takes the current count and returns a `SummaryOutcome` (Succeeded / Failed / Skipped); `run_loop` folds that into `compaction_failures` via `record_compaction_outcome`. Once the count reaches MAX_CONSECUTIVE_COMPACTION_FAILURES (3), the pass skips the LLM summarizer entirely (logs "circuit breaker open") — the cheap `prune_tool_outputs` pass still runs, so context can't grow unbounded. Counter resets on the next successful summary; it's per-run, so a fresh run_loop starts clean. Tests: pure `record_compaction_outcome` counter logic, and an end-to-end test asserting the summarizer is invoked once per sub-threshold attempt then NOT called once the breaker opens, with the prune-only fallback still firing. 2135 pass at -D warnings.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…action-circuit-breaker feat(agent-loop): compaction circuit breaker (IMPROVEMENTS_PLAN #1)
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
Four issues found in self-review of the 5 compaction improvements: 1. Counter double-increment (#1 circuit breaker): a turn-start fold and a post-usage summary in the same loop iteration both bumped compaction_failures, opening the breaker early. Now first-record-wins per iteration via compaction_recorded_this_iter. 2. Unbounded file read (#2 restoration): read_to_string loaded a whole (possibly multi-GB) working-set file before truncation -> OOM. Now a per-file metadata size check (POST_COMPACT_MAX_READ_BYTES = 2MiB) skips oversized files before reading. 3. Fold<->restore oscillation (#2 restoration): re-injecting up to ~25k tokens of snapshots into a near-full window could re-cross the fold threshold. Added a post-fold headroom guard (POST_COMPACT_RESTORE_CEILING = 0.50) that skips restoration when the freshly-folded context lacks headroom. Corrected the overstated 'can't trigger another fold' comments to point at this guard. 4. Breaker-open mislabeled PruneOnly (dirge-code#5 report enrichment): once the breaker latched, telemetry hid the ongoing summarizer failure. Added CompactionKind::PruneSummarizerDisabled, tracked via breaker_open, so the failure signal stays visible after the breaker opens.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
From the review of PR dirge-code#231: - #1 (run.rs): the cap notice's new_messages.push is a legitimate part of run_agent_loop's returned message list, but the comment overclaimed that headless/subagent collectors and resumed models read it — they drive display from the LoopEvent stream and discard the return value. Comment corrected to describe it as a return-value contract nicety, not the display mechanism. - #2 (provider/mod.rs): headless run_print dropped SystemNotice into its catch-all, so a --print run hitting the turn cap reported a clean success with no truncation signal. It now prints the notice to stderr. - #3 (text_output.rs): documented the deliberate divergence between the live <system>/warning-color notice and persisted <sys>/system-color session history, cross-referencing render_session. - #4 + altitude (text_output.rs): extracted write_prefixed_lines() shared by write_user_lines and write_system_lines, removing the copy-paste and making blank/empty-line handling identical by construction.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
Addresses the six findings from the post-merge review of the harness/lsp API (PR dirge-code#245). #1 (dirge-5qqo) Load-time deadlock. The LSP responder used to spawn after the plugin-load loop, so a plugin querying LSP at load time blocked the worker forever on a reply with no drainer. Build the LspManager standalone (`build_lsp_manager`) and wire the responder BEFORE plugins load. On the current_thread runtime a load-time call still can't be serviced while the loader blocks, but it now falls back (see dirge-code#6) instead of hanging forever, and the disabled case returns nil instantly. Documented the load-time caveat alongside dialogs. #2 (dirge-m0zm) Honest availability. `(harness/lsp?)` checked only compile-time symbol existence, so with LSP disabled at runtime it reported available and queries silently returned nil (crashing plugins that then json/decode). New `harness/__lsp-live` C-fn reports liveness via the request channel's `is_closed()`, so the predicate reflects a real, wired bridge. #3 (dirge-38q7) Coordinate validation. `harness/lsp` now asserts line/char are positive 1-based integers (surfacing a plugin bug) rather than `read_uint_arg` silently clamping negatives/NaN to line 0. #4 (dirge-d098) Shared dispatch. Extracted `lsp::query` (Operation + parse + run) so the `lsp` tool and the harness share one op→method match and one coordinate-conversion point. Removes ~140 lines of duplication and the drift that left the harness without the tool's goToDefinition/findReferences aliases. dirge-code#5 (dirge-lfxd) Cheap diagnostics. Added `LspManager::diagnostics_for` (O(one file)); the harness no longer clones the whole project diagnostic map per single-file query. dirge-code#6 (dirge-eehk) Query timeout. `send_lsp` is now bounded by a 30s `LSP_QUERY_TIMEOUT` (via the testable `lsp_should_abort` helper) so a wedged language server returns nil instead of freezing the worker thread. Tests: liveness predicate false on dropped receiver; query nil on dropped receiver; nonpositive-coordinate rejection; abort-decision helper; operation-alias acceptance; Operation parse/needs_position. Full feature matrix green at -D warnings; default 2193, all-features 2214 tests pass.
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…erpreter defaults (dirge-code#271) The recurring "I allow npx but keep getting re-prompted" bug had several compounding root causes, none of which the prior suggest_pattern tweaks addressed. All are now deterministically tested with a corpus of the commands models actually emit (no LLM involved). Root causes fixed: 1. DOTALL. Command-style permission patterns compiled their regex WITHOUT dot_matches_new_line, so .* could not span newlines. A grant like "npx *" silently failed to match any multi-line command, e.g. npx tsx -e "import x\nimport y". Models emit these constantly (multi-line -e / -c scripts), so allow-always never stuck. Fix: build command regexes DOTALL; path patterns stay line-sensitive (a newline in a path must not widen a deny scope). 2. Bare commands. "cmd **" compiled to ^cmd .*$, REQUIRING trailing space+args, so bare "cargo test" / "ls" never matched their own default allow rules and prompted. Fix: the trailing-arg rewrite now also makes " **" optional (for commands * and ** are both .*). 3. Benign-prefix mismatch. significant_bash_head skips benign prefixes when suggesting a pattern (so "cd /x && npx ..." suggests "npx *"), but only cd/env were actually auto-allowed, so "export X=1 && cmd" kept prompting on the export segment. Fix: default-allow the genuinely benign builtins (export/set/unset/pushd/popd/:/true) and keep the skip-list in sync; remove source/. (they run code, so the suggestion targets them). Security tightening (per review): npx / node / python / python3 are general interpreters that run ARBITRARY, possibly remote code and are NOT guaranteed to operate in the working folder, so they are no longer default-allowed -- each prompts once, and "allow always" then sticks (including for multi-line scripts, via fix #1). Project-scoped dev tools (cargo / go / make / npm run / pytest / ruff / black / mypy) remain auto-allowed under the existing "trust to edit project == trust to run the project's own code" model. Adds a deterministic gating corpus over compound &&/|/;/|| commands, cd into another project, and multi-line -e/-c scripts, pinning the core invariant: picking "allow always" (the suggested pattern) MUST make that exact command stop prompting; and denied/dangerous segments are NOT unlocked by a sibling grant. dirge-9zbd Co-authored-by: Yogthos <yogthos@gmail.com>
allen-munsch
referenced
this pull request
in allen-munsch/dirge
Jun 3, 2026
…_and_resolve preamble [dirge-ac9k] (dirge-code#355) #1 (ANSI): sanitize_output (ui/events.rs) and strip_escapes (ui/ansi.rs) were two byte-identical DoS-capped ESC state machines guarding untrusted LLM/bash output to the terminal — a security-relevant duplication the codebase itself flagged as intended-but-unfinished. Verified keep_char(c, KEEP_BOTH) is char-for-char equivalent to sanitize_output's inline control check, then collapsed sanitize_output to: strip_escapes(strip_orphan_mouse_reports(s), KEEP_BOTH). Removed the ~70-line duplicate machine + the now-genuinely-dead strip_controls_compact (its 'future migration' took a different path). One escape stripper => the two guards can't drift. #3 (perm): the require_absolute_path + check_perm_path_resolve preamble (the Audit-H12 symlink-swap canonicalize→check invariant) was hand-rolled in 6 path tools. Hoisted to tools::require_and_resolve; read/write/edit/ read_minified/edit_minified/lsp now call it. apply_patch left as-is (its require + check are intentionally separated across validation vs apply). 2455 default / 2549 all-features tests pass (the existing ansi + sanitize + perm suites lock behavior); clean under -D warnings --all-features. Co-authored-by: Yogthos <yogthos@gmail.com>
This was referenced Jun 5, 2026
yogthos
added a commit
that referenced
this pull request
Jun 11, 2026
…#406) Two bugs found testing the dirge MCP delegation loop: 1. dirge -p --session <id> persisted the session but never RESUMED it — run_print passed Vec::new() as history regardless of --session, so the model ran cold every call. A follow-up delegation ('fix the thing you just did') had no memory of the prior turn. The print path now threads convert_history(&session) into run_print; --loop still passes empty. 2. The MCP server's files_changed used a git-status porcelain-LINE diff, which misses content edits to a file that was already dirty before the delegation (common across delegations in one session: created in #1, edited in #2). Switch to a (size, mtime) signature per dirty path so further edits are attributed, without falsely claiming the caller's pre-existing untouched changes. Resume verified live through the MCP server (a second delegate now knows the file the first created). The files_changed change is in the long-lived server process, so it needs a Claude Code restart to take effect live; covered by unit tests. Co-authored-by: Yogthos <yogthos@gmail.com>
This was referenced Jun 18, 2026
yogthos
added a commit
that referenced
this pull request
Jun 18, 2026
Idea #1 from the Elastic agent-memory writeup, and the validation target for the Phase 3 retrieval eval. HybridMemoryProvider wraps the builtin store + an Embedder, delegating everything except search, which runs dense cosine ranking over all active entries and fuses it with the BM25 ranking via Reciprocal Rank Fusion. BM25 keeps exact-match precision; dense recall recovers the paraphrases keyword search structurally misses. Opt-in via config memory.hybrid_retrieval + an OpenAI-compatible embeddings endpoint; default and any failure (unset/unreachable/timed-out endpoint, embedder spawn failure) degrade silently to BM25. The real embedder runs HTTP on a dedicated worker thread (search is sync but called from async, and only async reqwest is available), with a 10s request timeout and a bounded recv so a hung endpoint can't stall the turn. The memory tool's search dispatch moved to spawn_blocking so the round-trip never parks an async worker. Fusion over-fetches the BM25 leg (50) so a lexical hit ranked past the 8-result cap still contributes its rank. Embeddings are cached by content hash for the session. Config keys documented in docs/config.md. bd: dirge-4hld Co-authored-by: Yogthos <yogthos@gmail.com>
yogthos
added a commit
that referenced
this pull request
Jul 6, 2026
review and review-security carried deny_tools:[…, bash, …], and a whole-tool bash deny is terminal at PromptDenyPolicy (precedence #1) — so it pre-empted the default_bash_rules that already auto-allow git status/log/diff/show and read-only inspection. The reviewer couldn't even see the diff it was asked to review. Drop bash from both review prompts' deny_tools. Read-only git and the other pre-trusted commands now flow through the normal engine (default rules → allow; effectful commands → Ask/approval_provider); plan mode keeps its full read-only lock. No engine change — an initial BuiltinAllow read-only-git carve-out was redundant with default_bash_rules and dropped; only a clarifying comment remains. Regression test pins that both review prompts deny the file-mutating tools + webfetch but keep bash. Co-authored-by: Yogthos <yogthos@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan