Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,17 @@ Full install. Works with Claude Code, Codex, pi, Copilot CLI, Droid, Oh My Pi, H
| `Ctrl+B Ctrl+O` | the agent's newest reply, with no picker |
| Ctrl-click a `file://…md` link | that file |

`annotate.terminal` opens the focused pane's recent terminal output (the last 200 lines) for
review in the same way. It has no default key; to use it, bind one yourself, for example:

```toml
[[keys.command]]
key = "prefix+t"
type = "plugin_action"
command = "annotate.terminal"
description = "review this pane's recent output"
```

**Send** (or `E`) makes the review the agent's next message. `q` closes. On an agent reply, `S`
sends and closes in one key; `E` and `q` are unchanged.

Expand Down
6 changes: 4 additions & 2 deletions docs/windows-full-acceptance.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ requirements, not completed verification. Every box starts unchecked.
| `open-link` | Annotate this file | `pane` |
| `last` | Annotate: agent's last message | `pane` |
| `last-newest` | Annotate: agent's newest message | `pane` |
| `terminal` | Annotate: terminal output | `pane` |

- [ ] Require exactly three panes: `editor` (Annotate, popup, 88×24), `manager`
(Annotations, popup, 100×30), and one `doc` (Annotate, overlay). The `doc`
command must be exactly `["./bin/plannotator-tui.exe", "herdr", "pane"]`.
No shell, PowerShell, command-string interpolation, or fallback launcher may sit
between Herdr's pane process and the TUI.
- [ ] Keep `open` and `open-link` as direct argv ending in `herdr open`,
`last` as direct argv ending in `herdr last`, and `last-newest` as direct argv
ending in `herdr last --newest`, all using
`last` as direct argv ending in `herdr last`, `last-newest` as direct argv
ending in `herdr last --newest`, and `terminal` as direct argv ending in
`herdr terminal`, all using
`./bin/plannotator-tui.exe`. Preserve the `markdown-file` link handler's title,
pattern, and `open-link` action. All actions, panes, the handler, and the build
must be effective on Windows; no inherited Unix gate may disable them.
Expand Down
11 changes: 10 additions & 1 deletion herdr-plugin.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id = "annotate"
name = "Annotate"
version = "0.5.0"
version = "0.6.0"
min_herdr_version = "0.8.0"
description = "Comment on terminal selections and copy annotations as agent context."
platforms = ["linux", "macos", "windows"]
Expand Down Expand Up @@ -117,6 +117,15 @@ contexts = ["pane"]
platforms = ["macos", "linux"]
command = ["./bin/plannotator-tui.exe", "herdr", "last", "--newest"]

# No default key; bind one in Herdr's config (see the README).
[[actions]]
id = "terminal"
title = "Annotate: terminal output"
description = "Review the focused pane's recent terminal output in plannotator-tui and send feedback back."
contexts = ["pane"]
platforms = ["macos", "linux"]
command = ["./bin/plannotator-tui.exe", "herdr", "terminal"]

# Ctrl-click on a file:// Markdown link. Anchored on the scheme so web links never match.
[[link_handlers]]
id = "markdown-file"
Expand Down
2 changes: 1 addition & 1 deletion lite/herdr-plugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

id = "annotate"
name = "Annotate"
version = "0.5.0"
version = "0.6.0"
min_herdr_version = "0.8.0"
description = "Comment on terminal selections and copy annotations as agent context."
platforms = ["linux", "macos", "windows"]
Expand Down
2 changes: 1 addition & 1 deletion plannotator-tui.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.3
0.9.4
4 changes: 2 additions & 2 deletions scripts/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ trap restore EXIT

echo "== fresh install: full"
install "$spec"
check "actions" "$(actions)" "capture,copy-archive,copy-context,last,last-newest,manage,open,open-link"
check "actions" "$(actions)" "capture,copy-archive,copy-context,last,last-newest,manage,open,open-link,terminal"
check "action programs" "$(programs)" "./bin/herdr-annotate.exe,./bin/plannotator-tui.exe"
check "review binary matches pin" "$(tui_version)" "$(tui_pin)"
check "native binary matches pin" "$(native_version)" "$(native_pin)"
Expand Down Expand Up @@ -134,7 +134,7 @@ check "manager pane" "$(manager_renders)" "ok"

echo "== swap: lite -> full"
install "$spec"
check "actions" "$(actions)" "capture,copy-archive,copy-context,last,last-newest,manage,open,open-link"
check "actions" "$(actions)" "capture,copy-archive,copy-context,last,last-newest,manage,open,open-link,terminal"
check "review binary" "$(tui_version)" "$(tui_pin)"
check "native binary" "$(native_version)" "$(native_pin)"

Expand Down
4 changes: 2 additions & 2 deletions scripts/test-fetch-plannotator-tui.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ try {
$result = Invoke-Fetcher
Assert-True ($result.ExitCode -eq 0) "local override failed: $($result.Output)"
Assert-BytesEqual $source $destination "local override bytes differ"
Assert-True ((Get-Content -LiteralPath $stamp -Raw) -ceq "0.9.3") "local stamp differs"
Assert-True ((Get-Content -LiteralPath $stamp -Raw) -ceq "0.9.4") "local stamp differs"

$env:PLANNOTATOR_TUI_BIN = $null
$env:PLANNOTATOR_TUI_RELEASE_BASE = "http://127.0.0.1:1/must-not-be-requested"
Expand Down Expand Up @@ -120,7 +120,7 @@ try {
Assert-True ($result.ExitCode -eq 0) "download fixture failed: $($result.Output)"
Assert-True ($result.Output -match "x86_64-pc-windows-msvc") "x64 target was not selected"
Assert-BytesEqual $source $destination "downloaded destination bytes differ"
Assert-True ((Get-Content -LiteralPath $stamp -Raw) -ceq "0.9.3") "download stamp differs"
Assert-True ((Get-Content -LiteralPath $stamp -Raw) -ceq "0.9.4") "download stamp differs"

Set-Content -LiteralPath $stamp -NoNewline -Value "preserve-this-stamp"
$beforeHash = (Get-FileHash -Algorithm SHA256 -LiteralPath $destination).Hash
Expand Down
8 changes: 4 additions & 4 deletions scripts/test-fetch-plannotator-tui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cp "$repository_root/plannotator-tui.version" "$plugin_root/"
source_binary="$source_root/plannotator-tui local"
cat > "$source_binary" <<'EOF'
#!/usr/bin/env sh
printf 'plannotator-tui 0.9.3\n'
printf 'plannotator-tui 0.9.4\n'
EOF
chmod +x "$source_binary"
printf 'old destination' > "$plugin_root/bin/plannotator-tui.exe"
Expand All @@ -23,10 +23,10 @@ printf 'old-version' > "$plugin_root/bin/plannotator-tui.version"

PLANNOTATOR_TUI_BIN="$source_binary" bash "$plugin_root/scripts/fetch-plannotator-tui.sh"
cmp "$source_binary" "$plugin_root/bin/plannotator-tui.exe"
test "$(cat "$plugin_root/bin/plannotator-tui.version")" = 0.9.3
test "$(cat "$plugin_root/bin/plannotator-tui.version")" = 0.9.4
test ! -e "$plugin_root/bin/plannotator-tui"
test "$("$plugin_root/bin/plannotator-tui.exe" --version)" = "plannotator-tui 0.9.3"
test "$(bash "$plugin_root/scripts/plannotator-tui.sh" --version)" = "plannotator-tui 0.9.3"
test "$("$plugin_root/bin/plannotator-tui.exe" --version)" = "plannotator-tui 0.9.4"
test "$(bash "$plugin_root/scripts/plannotator-tui.sh" --version)" = "plannotator-tui 0.9.4"

output="$(bash "$plugin_root/scripts/fetch-plannotator-tui.sh")"
case "$output" in
Expand Down
6 changes: 3 additions & 3 deletions scripts/test-herdr-windows-full-plugin.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ try {
# variant installed and the review half silently unreachable, which is the state this
# whole variant exists to end.
$actionIds = @($plugin.actions | ForEach-Object { $_.id })
foreach ($id in @("capture", "copy-context", "copy-archive", "manage", "open", "open-link", "last")) {
foreach ($id in @("capture", "copy-context", "copy-archive", "manage", "open", "open-link", "last", "last-newest", "terminal")) {
Assert-True ($actionIds -contains $id) "Herdr $version omitted action $id"
$action = @($plugin.actions | Where-Object { $_.id -ceq $id })
# @() at the call site: an empty array returned from a function unrolls to $null.
$platforms = @(Get-Platforms -Item $action[0])
Assert-True ($platforms.Count -eq 0 -or $platforms -contains "windows") `
"action $id is not effective on Windows: $($platforms -join ',')"
}
Assert-True ($actionIds.Count -eq 8) "Herdr $version listed $($actionIds.Count) actions, expected 7"
Assert-True ($actionIds.Count -eq 9) "Herdr $version listed $($actionIds.Count) actions, expected 9"

$paneIds = @($plugin.panes | ForEach-Object { $_.id })
foreach ($id in @("editor", "manager", "doc")) {
Expand All @@ -155,7 +155,7 @@ try {
$handler = @($plugin.link_handlers | Where-Object { $_.id -ceq "markdown-file" })
Assert-True ($handler.Count -eq 1) "Herdr $version omitted the markdown-file link handler"

Write-Output "herdr $version accepts windows-full: 8 actions, 3 panes, direct-argv doc pane"
Write-Output "herdr $version accepts windows-full: 9 actions, 3 panes, direct-argv doc pane"
}
} finally {
foreach ($name in $isolatedNames) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-windows-full-manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ def check_distributed(path: Path, version_path: Path, native_version_path: Path)
manifest = load(path)
check_top_level_windows(path, manifest)
check_native_lite(path, manifest)
if version_path.read_text(encoding="utf-8").strip() != "0.9.3":
fail(version_path, "plannotator-tui.version is not 0.9.3")
if version_path.read_text(encoding="utf-8").strip() != "0.9.4":
fail(version_path, "plannotator-tui.version is not 0.9.4")
if native_version_path.read_text(encoding="utf-8").strip() != "0.1.0":
fail(native_version_path, "herdr-annotate.version is not 0.1.0")

Expand Down
10 changes: 9 additions & 1 deletion windows-full/herdr-plugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

id = "annotate"
name = "Annotate"
version = "0.5.0"
version = "0.6.0"
min_herdr_version = "0.9.0"
description = "Comment on terminal selections and copy annotations as agent context."
platforms = ["windows"]
Expand Down Expand Up @@ -119,6 +119,14 @@ description = "Review the focused agent's newest message in plannotator-tui, wit
contexts = ["pane"]
command = ["./bin/plannotator-tui.exe", "herdr", "last", "--newest"]

# No default key; bind one in Herdr's config (see the README).
[[actions]]
id = "terminal"
title = "Annotate: terminal output"
description = "Review the focused pane's recent terminal output in plannotator-tui and send feedback back."
contexts = ["pane"]
command = ["./bin/plannotator-tui.exe", "herdr", "terminal"]

# Ctrl-click on a file:// Markdown link. Anchored on the scheme so web links never match.
[[link_handlers]]
id = "markdown-file"
Expand Down
Loading