mirror of
https://github.com/backnotprop/plannotator.git
synced 2026-09-14 14:17:26 +08:00
feat/opencode2-native-commands
3 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 mararn1618
|
5d1544fa32 |
fix(hook): route annotate-last to the live Copilot CLI session (#1150)
* fix(hook): add Copilot session lock detection Copilot CLI exports no identifying environment variable, so nothing distinguishes a Copilot session from a plain shell. Match ancestor pids against session-state inuse locks to find the live session, and only accept a match when the lock owner still names a copilot process, since locks can outlive their session and pids get reused. * fix(hook): route annotate-last to the live Copilot session Under Copilot CLI, annotate-last silently fell back to the default transcript reader and annotated a message from a different tool. Take the Copilot branch when an ancestor process holds a session lock, or when PLANNOTATOR_ORIGIN=copilot-cli is set with the cwd heuristic as fallback, and report origin copilot-cli to the annotate server. * fix(hook): prefer ancestor lock match in copilot-last The cwd heuristic can pick a stale session when several exist for one repo. Resolve the session locked by an ancestor copilot process first and keep the heuristic as fallback. * docs(cli): document copilot-last in help The subcommand worked but was missing from the top-level usage and the per-subcommand help map. |
||
|
Graham Lipsman
|
be2c81fa3b |
annotate-last: pick which message to annotate (fixes #800) (#809)
* feat: message picker for annotate-last (#800) When running /plannotator-last after /rewind, the newest transcript entry is no longer the message the user intended to annotate, and there was no affordance to pick a different one. Adds a picker UI that surfaces the recent assistant messages so the user can choose which one to annotate: - A "Message N of M" button in the Viewer's sticky-top action bar (alongside Copy / Global comment / Attachments), so it stays accessible while scrolling. - A "Messages" tab in the left sidebar with the full list (newest-first, preview + timestamp, default ★), mirroring the existing Files / Versions / Archive tab pattern. Wired for Claude Code, Codex, and Droid (all share apps/hook/server). OpenCode, Pi, and Copilot still get the original single-message behavior — they don't emit recentMessages, so the picker affordances hide cleanly. Default selection (index 0) matches today's "last message" behavior, so users who don't interact with the picker see no change. * feat: extend annotate-last picker to Copilot and OpenCode The picker UI from #800 was wired for Claude / Codex / Droid only. Pull Copilot and OpenCode onto the same shape so users on those harnesses also get the recent-messages picker when annotating the last assistant message. - Copilot: replace getLastCopilotMessage with getRecentCopilotMessages, walking events.jsonl newest-first up to 25 assistant.message events. - OpenCode: rewrite the session walk to collect up to 25 messages (newest first) instead of bailing on the first hit; normalize the SDK time.created (ms epoch) to ISO to match the shared picker contract. - Both pass recentMessages to startAnnotateServer only when length > 1, matching the existing Claude/Codex/Droid behavior. Also trims a leftover narrating comment in MessagesBrowser and refreshes the stale Copilot session-parser header. Pi parity follows in the next commit (needs round-trip of the picker selection through /api/feedback so its post-submit anchoring quotes the right message). * feat(pi): wire annotate-last picker with feedback round-trip Extends the picker UI (#800) to Pi and fixes a Pi-specific anchoring bug the picker would otherwise introduce. Picker plumbing - assistant-message: getRecentAssistantMessages walks the active branch newest-first, returning { messageId, text, timestamp? } in the same shape the other harnesses produce. - Plumbed through plannotator-browser / plannotator-events so the Bun server's recentMessages option is populated when the branch has more than one assistant message. Anchoring fix - Pi quotes the targeted assistant message back to the agent because its UX is async — the conversation may have moved on by feedback time. With the picker, that target is no longer guaranteed to be the snapshot taken when the UI opened. The editor now sends the user's selectedMessageId with /api/feedback; Pi looks it up in the current branch via findAssistantMessageByEntryId and quotes that message instead. Falls back to the original snapshot if the entry is gone. - The round-trip field is optional and only meaningful in annotate-last mode; other harnesses (and other modes) ignore it. Timestamp safety - Pi's SDK currently types SessionEntryBase.timestamp as string, but the picker contract everywhere else is ISO. Treat the value as unknown and normalize string/number(ms)/Date to ISO; drop anything else, rather than blind-casting and risking silent drift if the SDK changes. * chore: strip issue-number references from comments Comments shouldn't rely on external references — issue numbers age out of context, link rot is a thing, and a reader shouldn't need to open GitHub to understand why a line exists. Strip the `(#800)` and `(#570)` parentheticals from comments and doc strings across the picker and review-gate code; the surrounding "why" content is preserved. * fix: prevent removeChild crash when switching annotate-last messages Switching the picked message remounted nothing, so React reconciled new content against DOM that web-highlighter had mutated with <mark> nodes, throwing removeChild. Drive the Viewer key (and StickyHeaderLane's remount token) off a shared viewerContentKey so a message switch fully remounts the Viewer and re-anchors the sticky-header observer. Also cap MessagesBrowser row previews via previewText() and drop the redundant 'block' class that was overriding line-clamp-2. * feat: persist annotate-last feedback across messages --------- Co-authored-by: Michael Ramos <mdramos8@gmail.com> |
||
|
Stacey Haffner
|
15af1c40eb |
Add GitHub Copilot CLI integration (#409)
* feat: add GitHub Copilot CLI integration Add full Copilot CLI support via a new plugin (apps/copilot/) with: - preToolUse hook intercepting exit_plan_mode for plan review - copilot-plan subcommand with correct permissionDecision output format - copilot-last subcommand parsing events.jsonl for last message annotation - Copilot CLI session parser (copilot-session.ts) - Plugin manifest, hooks.json, and slash commands - UI origin branding (blue badge for Copilot CLI) - Marketplace entry for plugin discovery - README install section Key design decisions: - Intercepts exit_plan_mode (not create) to avoid double-review - Uses sessionId (with fallback) to locate plan.md from session state - Follows Codex integration pattern: same CLI binary, new plugin dir Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: handle actual Copilot CLI preToolUse input format (toolCalls array) The Copilot CLI hook input uses { toolCalls: [{ name, args }] } format instead of the documented { toolName, toolArgs } format. The filter was checking event.toolName (always undefined), causing exit_plan_mode to pass through unintercepted. Now extracts tool name from either format. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Revert "fix: handle actual Copilot CLI preToolUse input format (toolCalls array)" This reverts commit b214bc02c58fc5d8f305b128457099afb2ea6ecc. * fix: use absolute path in hooks.json for reliable binary discovery The hook subprocess inherits the PATH from when Copilot CLI was started, which may not include the plannotator binary directory. Using the full absolute path via env vars ensures the hook always finds the binary. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Finishing the feature * fix: remove Copilot CLI plugin from Claude Code marketplace.json .claude-plugin/marketplace.json is for Claude Code's plugin marketplace. The Copilot CLI plugin has its own install path and doesn't belong here. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: align Copilot CLI plugin with official spec - Add .github/plugin/marketplace.json for Copilot CLI plugin discovery - Change allowed-tools from Bash() to shell() syntax in commands - Respect COPILOT_HOME env var in session path discovery - Update plugin.json version to 0.14.5 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Yecats <Yecats@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: stahaff <222254525+stahaff@users.noreply.github.com> |