@mtayfur/opencode-prompt-enhancer 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtayfur/opencode-prompt-enhancer",
-  "version": "0.0.7",
+  "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

@@ -1,27 +1,26 @@
 export 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.
+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. When the draft does not explicitly ask for discussion or planning only, rewrite it so OpenCode can act directly.
+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 when they matter.
+- 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 or narrows the task.
-- Resolve vague references like "this", "that bug", or "the plugin" only when context makes them clear.
+- 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.
-- 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.
+- 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.
-- 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 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.

package/plugins/prompt-enhancer.tsx

@@ -27,6 +27,8 @@ type PluginState = {
   enhancing: boolean
   promptRef?: TuiPromptRef
   promptTarget?: PromptTarget
+  lastOriginal?: TuiPromptInfo
+  lastEnhancedInput?: string
 }
 
 type PromptTarget =
@@ -193,6 +195,11 @@ 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
@@ -341,7 +348,7 @@ function openEnhanceDialog(
           variant: "info",
           title: TOAST_TITLE,
           message: "Enhancing prompt...",
-          duration: 15_000,
+          duration: 8_000,
         })
 
         void (async () => {
@@ -369,6 +376,9 @@ function openEnhanceDialog(
               return
             }
 
+            state.lastOriginal = originalPrompt
+            state.lastEnhancedInput = enhanced
+
             api.ui.toast({
               variant: "success",
               title: "Prompt enhanced",
@@ -397,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
@@ -408,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 }
 
@@ -455,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