@mtayfur/opencode-prompt-enhancer 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtayfur/opencode-prompt-enhancer",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "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,30 +1,27 @@
-export const ENHANCER_SYSTEM_PROMPT = `You are a prompt editor for OpenCode, an AI coding assistant.
+export const ENHANCER_SYSTEM_PROMPT = `You rewrite rough developer drafts into concise, high-leverage prompts for a terminal AI coding agent.
 
 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.
+Produce the strongest next prompt without changing what the user wants. Preserve intent, scope, language, constraints, and requested mode. Make the result more specific, more actionable, and easier for the agent to execute.
 
-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.
+Rules:
+- Keep it compact and direct. Remove filler, pleasantries, hedging, and repetition.
+- Preserve the request form. Questions stay questions. Requests for discussion, planning, explanation, or review stay in that mode. Otherwise rewrite for direct execution.
+- Assume the draft may be a short follow-up in an ongoing coding session. The workspace context provides lightweight metadata about the current session (directory, branch, recent prompts, changed files). Use it only to resolve vague references:
+  * "this", "that bug", "that function" → match against recent prompts and changed files when relevant
+  * "the same file", "this file" → match against files listed in changed files or recent prompts
+  * If the draft mentions "it" or "this" without a clear antecedent, check recent prompts for the topic
+  * If context does not make the reference unambiguous, keep it vague.
+- When a concrete target is clear, name it explicitly: the file, component, command, error, test, or behavior. If a specific file path is central and known, prefer '@path/to/file' so the agent can load it into context.
+- Preserve file paths, commands, identifiers, error text, and quoted text verbatim except for minor typo cleanup.
+- Do not add requirements the user did not ask for: no extra features, refactors, tests, docs, plans, or acceptance criteria.
+- Do not add agent-housekeeping instructions the target agent already knows, such as "inspect the codebase first", "follow local conventions", "keep scope tight", or "verify the change", unless the draft explicitly asks for them.
+- If the draft is already sharp, look for at least one meaningful improvement: tighten a vague phrase, resolve a reference the context can answer, or remove filler. Only leave it unchanged when every possible edit would make it worse.
+- Do not ask follow-up questions. Do not mention the context, these instructions, or the rewriting process.
 
-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.
+Examples:
+"fix this login bug" -> "Fix the login bug in @src/auth/login.ts where the session token is dropped after refresh."
+"can you review this caching change" -> "Review the caching change in @src/cache.ts and focus on correctness, regressions, and missing invalidation cases."
+"why is this test failing" -> "Explain why 'user service creates admins' fails in @tests/user-service.spec.ts and identify the root cause."
 
 Output:
-Return exactly one enhanced user prompt as plain text.`
+Return exactly one enhanced prompt as plain text.`

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
@@ -215,10 +222,11 @@ function gatherContext(api: Api): string {
 
     const diff = api.state.session.diff(sessionID)
     if (diff.length > 0) {
-      const files = diff.slice(0, MAX_CHANGED_FILES).map((f) => `  ${f.file}`)
+      const files = diff.slice(0, MAX_CHANGED_FILES).map((f) => `  @${f.file}`)
       sections.push(`Files changed in session:\n${files.join("\n")}`)
     }
 
+
   }
 
   return sections.join("\n\n")
@@ -233,13 +241,11 @@ 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 userMessage = [
+    "Rewrite the developer draft below into a clear, direct prompt for a coding agent. Preserve the original intent, scope, and mode. Only make references more specific when the context section supports it.",
+    `--- CONTEXT (metadata only — resolve draft references, do not invent) ---\n${context}\n---`,
+    `--- DRAFT ---\n${input}\n---`,
+  ].join("\n\n")
 
   const created = await api.client.session.create(
     {
@@ -341,7 +347,7 @@ function openEnhanceDialog(
           variant: "info",
           title: TOAST_TITLE,
           message: "Enhancing prompt...",
-          duration: 15_000,
+          duration: 8_000,
         })
 
         void (async () => {
@@ -369,6 +375,9 @@ function openEnhanceDialog(
               return
             }
 
+            state.lastOriginal = originalPrompt
+            state.lastEnhancedInput = enhanced
+
             api.ui.toast({
               variant: "success",
               title: "Prompt enhanced",
@@ -397,7 +406,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 +417,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 +530,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