Skip to content

fix(opencode): intercept annotate/review/archive commands before LLM #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
backnotprop merged 1 commit into from
May 13, 2026
+43 −60
Merged

fix(opencode): intercept annotate/review/archive commands before LLM #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions apps/opencode-plugin/commands/plannotator-annotate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
---
description: Open interactive annotation UI for a markdown file, HTML file, or URL
---

The Plannotator Annotate UI has been triggered. Opening the annotation UI...
Acknowledge "Opening annotation UI..." and wait for the user's feedback.
3 changes: 0 additions & 3 deletions apps/opencode-plugin/commands/plannotator-archive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
---
description: Browse saved plan decisions in the archive
---

The Plannotator Archive has been triggered. Opening the archive browser...
Acknowledge "Opening plan archive..." and wait for the user to finish browsing.
3 changes: 0 additions & 3 deletions apps/opencode-plugin/commands/plannotator-review.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
---
description: Open interactive code review for current changes or a PR URL; pass --git to force Git in JJ workspaces
---

The Plannotator Code Review has been triggered. Opening the review UI...
Acknowledge "Opening code review..." and wait for the user's feedback.
94 changes: 43 additions & 51 deletions apps/opencode-plugin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,26 @@ The user will review your plan in a visual UI where they can annotate, approve,
Do NOT proceed with implementation until your plan is approved.`);
},

// Intercept plannotator-last before the agent sees the command
// Intercept plannotator commands before the agent sees them.
// Clearing output.parts in place suppresses the .md body + appended
// args so the agent never receives the command — without this, OpenCode
// calls resolvePromptParts() on "<body> <arguments>", which auto-attaches
// any file path it finds as a FilePart. On a large file that blows the
// context before the annotation UI even opens (#713).
//
// Must mutate in place (length = 0), not reassign (= []). The caller
// holds a reference to the parts array directly and ignores any new
// array assigned to output.parts.
"command.execute.before": async (input, output) => {
if (input.command !== "plannotator-last") return;
const cmd = input.command;
if (
cmd !== "plannotator-last" &&
cmd !== "plannotator-annotate" &&
cmd !== "plannotator-review" &&
cmd !== "plannotator-archive"
) return;

output.parts = [];
output.parts.length = 0;

const deps: CommandDeps = {
client: ctx.client,
Expand All @@ -398,58 +413,35 @@ Do NOT proceed with implementation until your plan is approved.`);
getPasteApiUrl,
directory: ctx.directory,
};
// input.arguments is the raw tail string from OpenCode's command dispatcher —
// needed so --gate / --json reach the handlers' parseAnnotateArgs (#570).
const event = {
properties: { sessionID: input.sessionID, arguments: input.arguments },
};

const feedback = await handleAnnotateLastCommand(
// input.arguments is the raw tail string from OpenCode's command dispatcher —
// needed so --gate / --json reach handleAnnotateLastCommand's parseAnnotateArgs (#570).
{ properties: { sessionID: input.sessionID, arguments: input.arguments } },
deps
);

if (feedback) {
try {
await ctx.client.session.prompt({
path: { id: input.sessionID },
body: {
parts: [{
type: "text",
text: getAnnotateMessageFeedbackPrompt("opencode", undefined, { feedback }),
}],
},
});
} catch {
// Session may not be available
if (cmd === "plannotator-last") {
const feedback = await handleAnnotateLastCommand(event, deps);
if (feedback) {
try {
await ctx.client.session.prompt({
path: { id: input.sessionID },
body: {
parts: [{
type: "text",
text: getAnnotateMessageFeedbackPrompt("opencode", undefined, { feedback }),
}],
},
});
} catch {
// Session may not be available
}
}
return;
}
},

// Listen for slash commands (review + annotate)
event: async ({ event }) => {
const isCommandEvent =
event.type === "command.executed" ||
event.type === "tui.command.execute";

if (!isCommandEvent) return;

// @ts-ignore - Event structure varies
const commandName = event.properties?.name || event.command || event.payload?.name;

const deps: CommandDeps = {
client: ctx.client,
htmlContent: getPlanHtml(),
reviewHtmlContent: getReviewHtml(),
getSharingEnabled,
getShareBaseUrl,
getPasteApiUrl,
directory: ctx.directory,
};

if (commandName === "plannotator-review")
return handleReviewCommand(event, deps);
if (commandName === "plannotator-annotate")
return handleAnnotateCommand(event, deps);
if (commandName === "plannotator-archive")
return handleArchiveCommand(event, deps);
if (cmd === "plannotator-annotate") return handleAnnotateCommand(event, deps);
if (cmd === "plannotator-review") return handleReviewCommand(event, deps);
if (cmd === "plannotator-archive") return handleArchiveCommand(event, deps);
},
};

Expand Down
Loading