@mtayfur/opencode-prompt-enhancer 0.0.6 → 0.0.8

package/README.md

@@ -1,11 +1,20 @@
 # opencode-prompt-enhancer
 
-OpenCode TUI plugin that rewrites rough prompt drafts into stronger prompts with workspace context.
+OpenCode TUI plugin that rewrites rough prompt drafts into clearer, stronger prompts.
 
-## Package
+## What it does
 
-- npm: `opencode-prompt-enhancer`
-- GitHub: `mtayfur/opencode-prompt-enhancer`
+- Rewrites rough prompt drafts into clearer, stronger prompts.
+- Uses lightweight workspace context.
+- Keeps the original intent and language, and does not read file contents.
+
+## Context used
+
+The enhancer uses:
+
+- the current working directory
+- recent user prompts in the current session
+- files changed in the current session
 
 ## Install
 
@@ -14,20 +23,20 @@ Add the package to OpenCode's `tui.json` plugin list:
 ```jsonc
 {
   "plugin": [
-    "opencode-prompt-enhancer@latest"
+    "@mtayfur/opencode-prompt-enhancer@latest"
   ]
 }
 ```
 
-## Use
+OpenCode `>=1.3.14` is required.
 
-After restarting OpenCode, press `Ctrl+E` or run `/enhance`.
-
-The plugin opens a dialog, rewrites your draft with workspace context, and writes the enhanced prompt back into the current input.
-
-## Context
+## Use
 
-The enhancer uses the current working directory, branch, recent user prompts, changed files, and active todos. It passes lightweight context only and does not read file contents.
+1. Open OpenCode in a workspace.
+2. Enter a rough prompt in the TUI prompt.
+3. Press `Ctrl+E` or run `/enhance`.
+4. Review the prefilled dialog, edit it if needed, and confirm.
+5. The enhanced prompt replaces the current input.
 
 ## Development
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtayfur/opencode-prompt-enhancer",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "OpenCode plugin that rewrites rough drafts into stronger prompts.",
   "publishConfig": {
     "access": "public"
@@ -27,6 +27,7 @@
   "peerDependencies": {
     "@opencode-ai/plugin": "*",
     "@opencode-ai/sdk": "*",
+    "@opentui/core": "*",
     "@opentui/solid": "*",
     "solid-js": "*"
   },

package/plugins/enhancer-system-prompt.ts

@@ -0,0 +1,29 @@
+export const ENHANCER_SYSTEM_PROMPT = `You are a prompt editor for OpenCode, an AI coding assistant.
+
+Goal:
+Clean up the user's draft only when it improves clarity. Preserve intent, scope, priorities, language, and tone. Always fix typos and awkward phrasing; otherwise return the draft unchanged when it is already clear.
+
+Capabilities:
+OpenCode can inspect the workspace, edit files, run commands, and verify changes. Respect the user's requested mode: if the draft asks for discussion, planning, or review, keep it that way.
+
+Rewrite rules:
+- Preserve the request form. Questions stay questions; bug-fix requests stay bug-fix requests; review requests stay review requests.
+- Preserve the language of the draft. Do not translate.
+- Preserve inline code, file paths, command strings, error messages, identifiers, and quoted phrases verbatim.
+- Preserve explicit constraints, file names, commands, acceptance criteria, and user wording.
+- Use workspace context only when it directly clarifies an ambiguous reference.
+- Resolve vague references like "this" or "that bug" only when context makes them unambiguous.
+- Do not invent details when context is ambiguous.
+- Do not add background, motivation, implementation steps, acceptance criteria, or structure the draft did not imply.
+- Match the draft's structure and tone. Keep prose as prose and lists as lists.
+
+Hard constraints:
+- Do not invent requirements, files, APIs, dependencies, bugs, or acceptance criteria.
+- Do not broaden scope with extra features, refactors, tests, or docs.
+- Do not inject assistant-style directives (e.g., "identify root cause", "verify the changed path", "follow local conventions").
+- Do not ask follow-up questions.
+- Do not mention context, tags, instructions, or the rewriting process.
+- Do not output explanations, markdown fences, or commentary.
+
+Output:
+Return exactly one enhanced user prompt as plain text.`

package/plugins/prompt-enhancer.tsx

@@ -9,48 +9,13 @@ import type {
   TuiRouteCurrent,
   TuiSlotPlugin,
 } from "@opencode-ai/plugin/tui"
+import { ENHANCER_SYSTEM_PROMPT } from "./enhancer-system-prompt"
 
 const MAX_RECENT_MESSAGES = 3
 const MAX_CHANGED_FILES = 25
 const MAX_PROMPT_PREVIEW_LENGTH = 250
 const DIALOG_TITLE = "Enhance Prompt"
 const TOAST_TITLE = "Prompt enhancer"
-const TEMP_SESSION_TITLE = "Prompt Enhancer"
-
-function makeTempSessionTitle(): string {
-  return `${TEMP_SESSION_TITLE} ${Math.random().toString(36).slice(2, 8)}`
-}
-
-const ENHANCER_SYSTEM_PROMPT = `You are a prompt editor for OpenCode, an AI coding assistant.
-
-Goal:
-Rewrite the user's draft into the strongest possible next prompt for OpenCode. Preserve the user's intent, scope, priorities, and language. Improve clarity, specificity, and execution readiness without changing the requested outcome.
-
-Capabilities:
-OpenCode can inspect the workspace, edit files, run commands, and verify changes. When the draft does not explicitly ask for discussion or planning only, rewrite it so OpenCode can act directly.
-
-Rewrite rules:
-- Preserve the request form. Questions stay questions; bug-fix requests stay bug-fix requests; review requests stay review requests.
-- Preserve the language of the draft. Do not translate.
-- Preserve inline code, file paths, command strings, error messages, identifiers, and quoted phrases verbatim when they matter.
-- Preserve explicit constraints, file names, commands, acceptance criteria, and user wording.
-- Use workspace context only when it directly clarifies or narrows the task.
-- Resolve vague references like "this", "that bug", or "the plugin" only when context makes them clear.
-- Do not invent details when context is ambiguous.
-- Expand vague verbs into concrete actions when it helps OpenCode act immediately, such as identify the root cause, apply the smallest correct fix, remove dead code, keep scope tight, preserve behavior, follow local conventions, and verify the changed path.
-- Keep the rewrite proportional to the draft. Do not add background, motivation, or steps the draft did not imply.
-- Match the draft's structure and tone. Keep prose as prose and lists as lists.
-- If the draft is already precise, make only minimal cleanup.
-
-Hard constraints:
-- Do not invent requirements, files, APIs, dependencies, bugs, or acceptance criteria.
-- Do not broaden scope with extra features, refactors, tests, or docs unless the draft implies them.
-- Do not ask follow-up questions.
-- Do not mention context, tags, instructions, or the rewriting process.
-- Do not output explanations, markdown fences, or commentary.
-
-Output:
-Return exactly one enhanced user prompt as plain text.`
 
 type ModelRef = {
   providerID: string
@@ -62,6 +27,8 @@ type PluginState = {
   enhancing: boolean
   promptRef?: TuiPromptRef
   promptTarget?: PromptTarget
+  lastOriginal?: TuiPromptInfo
+  lastEnhancedInput?: string
 }
 
 type PromptTarget =
@@ -85,37 +52,20 @@ function parseModelString(value: string | undefined): ModelRef | undefined {
   }
 }
 
-function getModelOverride(options: PluginOptions | undefined): ModelRef | undefined {
-  const value = typeof options?.model === "string" ? options.model : undefined
-  return parseModelString(value)
-}
-
 function isSessionRoute(route: TuiRouteCurrent): route is Extract<TuiRouteCurrent, { name: "session" }> {
   return route.name === "session"
 }
 
-function isUserMessage(message: Message): message is Extract<Message, { role: "user" }> {
-  return message.role === "user"
-}
-
-function isVisibleTextPart(part: Part): part is TextPart {
-  return part.type === "text" && !part.ignored
-}
-
 function extractVisibleText(parts: ReadonlyArray<Part>): string {
   return parts
-    .filter(isVisibleTextPart)
+    .filter((part): part is TextPart => part.type === "text" && !part.ignored)
     .map((part) => part.text)
     .join("")
     .trim()
 }
 
-function truncate(value: string, maxLength: number): string {
-  return value.length > maxLength ? `${value.slice(0, maxLength)}...` : value
-}
-
 function resolveEnhancerModel(api: Api, options: PluginOptions | undefined): ModelRef | undefined {
-  const override = getModelOverride(options)
+  const override = typeof options?.model === "string" ? parseModelString(options.model) : undefined
   if (override) return override
 
   return parseModelString(api.state.config.small_model || api.state.config.model)
@@ -148,25 +98,14 @@ function samePromptTarget(left: PromptTarget | undefined, right: PromptTarget |
   return false
 }
 
-function resolvePromptTarget(route: TuiRouteCurrent, workspaceID?: string): PromptTarget | undefined {
-  if (route.name === "home") return { name: "home", workspaceID }
-  if (isSessionRoute(route)) {
-    return { name: "session", sessionID: route.params.sessionID }
-  }
-  return undefined
-}
-
-function isPromptTargetActive(route: TuiRouteCurrent, target: PromptTarget): boolean {
-  if (target.name === "home") return route.name === "home"
-  return isSessionRoute(route) && route.params.sessionID === target.sessionID
-}
-
-function currentPromptTarget(api: Api, state: PluginState): PromptTarget | undefined {
-  return state.promptTarget ?? resolvePromptTarget(api.route.current)
-}
-
 function isPromptHandleActive(api: Api, state: PluginState, handle: PromptHandle): boolean {
-  if (!isPromptTargetActive(api.route.current, handle.target)) return false
+  const route = api.route.current
+  const target = handle.target
+  if (target.name === "home") {
+    if (route.name !== "home") return false
+  } else if (!isSessionRoute(route) || route.params.sessionID !== target.sessionID) {
+    return false
+  }
   if (api.state.path.directory !== handle.directory) return false
 
   if (handle.ref) {
@@ -247,7 +186,7 @@ async function restorePrompt(
     return true
   }
 
-  return writePrompt(api, state, handle, prompt.input, signal, prompt)
+  return false
 }
 
 function gatherContext(api: Api): string {
@@ -256,19 +195,24 @@ function gatherContext(api: Api): string {
   const dir = api.state.path.directory
   sections.push(`Working directory: ${dir}`)
 
+  const branch = api.state.vcs?.branch
+  if (branch) {
+    sections.push(`Current branch: ${branch}`)
+  }
+
   const route = api.route.current
   if (isSessionRoute(route)) {
     const sessionID = route.params.sessionID
     const messages = api.state.session.messages(sessionID)
 
-    const userMessages = messages.filter(isUserMessage)
+    const userMessages = messages.filter((message): message is Extract<Message, { role: "user" }> => message.role === "user")
     const recent = userMessages.slice(-MAX_RECENT_MESSAGES).reverse()
     if (recent.length > 0) {
       const prompts: string[] = []
       for (const msg of recent) {
         const text = extractVisibleText(api.state.part(msg.id))
         if (text) {
-          prompts.push(truncate(text, MAX_PROMPT_PREVIEW_LENGTH))
+          prompts.push(text.length > MAX_PROMPT_PREVIEW_LENGTH ? `${text.slice(0, MAX_PROMPT_PREVIEW_LENGTH)}...` : text)
         }
       }
       if (prompts.length > 0) {
@@ -287,19 +231,6 @@ function gatherContext(api: Api): string {
   return sections.join("\n\n")
 }
 
-function buildUserMessage(input: string, context: string): string {
-  const sections = [
-    "Rewrite the following user draft into a stronger prompt.",
-    `User draft:\n${input}`,
-  ]
-
-  if (context) {
-    sections.splice(1, 0, `Workspace context (use only if directly relevant):\n${context}`)
-  }
-
-  return sections.join("\n\n")
-}
-
 async function enhanceWithModel(
   api: Api,
   options: PluginOptions | undefined,
@@ -309,11 +240,18 @@ async function enhanceWithModel(
   const directory = api.state.path.directory
   const model = resolveEnhancerModel(api, options)
   const context = gatherContext(api)
+  const userMessage = context
+    ? [
+        "Rewrite the following user draft into a stronger prompt.",
+        `Workspace context (use only if directly relevant):\n${context}`,
+        `User draft:\n${input}`,
+      ].join("\n\n")
+    : ["Rewrite the following user draft into a stronger prompt.", `User draft:\n${input}`].join("\n\n")
 
   const created = await api.client.session.create(
     {
       directory,
-      title: makeTempSessionTitle(),
+      title: `Prompt Enhancer ${Math.random().toString(36).slice(2, 8)}`,
     },
     { signal, throwOnError: true },
   )
@@ -331,7 +269,7 @@ async function enhanceWithModel(
         parts: [
           {
             type: "text",
-            text: buildUserMessage(input, context),
+            text: userMessage,
           },
         ],
       },
@@ -366,7 +304,11 @@ function openEnhanceDialog(
 
   if (signal.aborted) return
 
-  const target = currentPromptTarget(api, state)
+  const target = state.promptTarget ?? (api.route.current.name === "home"
+    ? { name: "home" as const }
+    : isSessionRoute(api.route.current)
+      ? { name: "session" as const, sessionID: api.route.current.params.sessionID }
+      : undefined)
   if (!target) {
     api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Enhancement only works from a prompt." })
     return
@@ -406,7 +348,7 @@ function openEnhanceDialog(
           variant: "info",
           title: TOAST_TITLE,
           message: "Enhancing prompt...",
-          duration: 15_000,
+          duration: 8_000,
         })
 
         void (async () => {
@@ -434,6 +376,9 @@ function openEnhanceDialog(
               return
             }
 
+            state.lastOriginal = originalPrompt
+            state.lastEnhancedInput = enhanced
+
             api.ui.toast({
               variant: "success",
               title: "Prompt enhanced",
@@ -462,7 +407,7 @@ function openEnhanceDialog(
             const baseMessage = error instanceof Error ? error.message : "Prompt enhancement failed."
             const message = restored
               ? baseMessage
-              : `${baseMessage} Original prompt could not be restored because the prompt changed.`
+              : `${baseMessage} Original prompt could not be restored because the prompt changed. Please re-enter your prompt manually.`
             api.ui.toast({ variant: "error", title: TOAST_TITLE, message })
           } finally {
             state.enhancing = false
@@ -473,6 +418,72 @@ function openEnhanceDialog(
   ))
 }
 
+function revertEnhancement(
+  api: Api,
+  state: PluginState,
+  signal: AbortSignal,
+): void {
+  if (!state.lastOriginal) {
+    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "No enhancement to revert." })
+    return
+  }
+
+  const target = state.promptTarget
+  if (!target) {
+    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Revert only works from a prompt." })
+    return
+  }
+
+  const handle: PromptHandle = {
+    target,
+    directory: api.state.path.directory,
+    ref: state.promptRef,
+  }
+
+  if (!isPromptHandleActive(api, state, handle)) {
+    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Prompt changed since enhancement." })
+    return
+  }
+
+  const currentInput = handle.ref?.current.input ?? ""
+  if (currentInput !== state.lastEnhancedInput) {
+    api.ui.toast({
+      variant: "warning",
+      title: TOAST_TITLE,
+      message: "Prompt was manually changed after enhancement. Revert skipped.",
+    })
+    return
+  }
+
+  void (async () => {
+    try {
+      const wrote = await restorePrompt(api, state, handle, state.lastOriginal!, signal)
+      if (!wrote) {
+        api.ui.toast({
+          variant: "warning",
+          title: TOAST_TITLE,
+          message: "Prompt changed while reverting.",
+        })
+        return
+      }
+
+      state.lastOriginal = undefined
+      state.lastEnhancedInput = undefined
+
+      api.ui.toast({
+        variant: "success",
+        title: TOAST_TITLE,
+        message: "Reverted to original prompt.",
+        duration: 3000,
+      })
+    } catch (error) {
+      if (signal.aborted) return
+      const message = error instanceof Error ? error.message : "Revert failed."
+      api.ui.toast({ variant: "error", title: TOAST_TITLE, message })
+    }
+  })()
+}
+
 const tui: TuiPlugin = async (api, options) => {
   const state: PluginState = { enhancing: false }
 
@@ -520,19 +531,36 @@ const tui: TuiPlugin = async (api, options) => {
         openEnhanceDialog(api, options, state, api.lifecycle.signal)
       },
     },
+    {
+      title: "Revert Enhanced Prompt",
+      value: "prompt-enhancer.revert",
+      description: "Revert last prompt enhancement (Ctrl+Shift+E)",
+      category: "Prompt",
+      keybind: "ctrl+shift+e",
+      slash: {
+        name: "revert-enhance",
+        aliases: ["revert-enhancement"],
+      },
+      onSelect: () => {
+        revertEnhancement(api, state, api.lifecycle.signal)
+      },
+    },
   ])
 
   api.lifecycle.onDispose(() => {
     unregister()
+    api.ui.dialog.clear()
     state.enhancing = false
     state.promptRef = undefined
     state.promptTarget = undefined
+    state.lastOriginal = undefined
+    state.lastEnhancedInput = undefined
   })
 }
 
-const plugin: TuiPluginModule & { id: string } = {
+const plugin = {
   id: "prompt-enhancer",
   tui,
-}
+} satisfies TuiPluginModule & { id: string }
 
 export default plugin