@mtayfur/opencode-prompt-enhancer 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtayfur/opencode-prompt-enhancer",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "OpenCode plugin that rewrites rough drafts into stronger prompts.",
   "publishConfig": {
     "access": "public"

package/plugins/enhancer-system-prompt.ts

@@ -4,24 +4,64 @@ Goal:
 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.
 
 Rules:
+- Preserve intent first. Do not change scope, language, constraints, requested mode, or the user's level of certainty.
 - 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.
+- Use workspace context only when it directly clarifies the current draft:
+  * "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 context makes the current target unambiguous, name it explicitly: the file, component, command, error, test, or behavior
+  * If a specific file path is central and known, prefer '@path/to/file'
+  * If context does not make the reference unambiguous, keep it vague
+- Do not import unrelated prior-session scope. Context can identify what the draft refers to, but it must not add new tasks, constraints, tests, docs, or implementation details unless the draft explicitly asks to carry them over.
 - Preserve file paths, commands, identifiers, error text, and quoted text verbatim except for minor typo cleanup.
+- Format by complexity:
+  * Single-action requests stay as one direct sentence
+  * Multi-point requests become a numbered sequence; each item must be a distinct, meaningful task
+  * Do not force a list when a compact sentence is clearer
 - 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.
+- If the draft is already sharp, make only a meaningful improvement: tighten a vague phrase, resolve a reference the context can answer, or remove filler. 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.
 
 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."
+
+Context resolves a vague reference:
+  Context: changed files include @src/auth/login.ts; recent prompt mentioned "session token dropped after refresh".
+  "fix this bug"
+  -> Fix the session token bug in @src/auth/login.ts where the token is dropped after refresh.
+
+Question stays a question:
+  Context: changed files include @src/cache/store.ts.
+  "why does the cache get invalidated on every request"
+  -> Why is the cache invalidated on every request in @src/cache/store.ts?
+
+Compact cleanup, no context needed:
+  "investigate and then fix the null dereference in @src/parser.ts around line 42"
+  -> Fix the null dereference in @src/parser.ts:42.
+
+Multi-point request:
+  Context: changed files include @src/services/user.ts.
+  "the user service needs validation split out from persistence and logging added"
+  -> Update @src/services/user.ts:
+    1. Isolate validation logic from persistence
+    2. Add logging for create, update, and delete operations
+
+Counter-examples (do NOT produce):
+
+  Adding unrequested requirements:
+    Context: changed files include @src/services/user.ts.
+    "add logging to the user service"
+    Bad: Add logging to @src/services/user.ts and add unit tests for the new log calls.
+
+  Changing a question into an action:
+    "why does the token refresh fail silently"
+    Bad: Fix the silent failure in the token refresh flow.
+
+  Importing prior-session scope as a new constraint:
+    Context: previous prompt was "add tests to @src/auth/login.ts".
+    "refactor the login helper"
+    Bad: Refactor the login helper in @src/auth/login.ts and update the tests accordingly.
 
 Output:
 Return exactly one enhanced prompt as plain text.`

package/plugins/prompt-enhancer.tsx

@@ -16,8 +16,7 @@ const MAX_CHANGED_FILES = 25
 const MAX_PROMPT_PREVIEW_LENGTH = 250
 const ENHANCEMENT_TIMEOUT_MS = 60_000
 const ENHANCEMENT_ANIMATION_INTERVAL_MS = 250
-const PROGRESS_TOAST_DURATION_MS = 2_000
-const RESULT_TOAST_DURATION_MS = 2_000
+const TOAST_DURATION_MS = 3_000
 const ENHANCEMENT_CANCELED_MESSAGE = "Prompt enhancement canceled."
 const ENHANCEMENT_ANIMATION_FRAMES = [
   "Enhancing prompt",
@@ -36,6 +35,11 @@ type ModelRef = {
 type Api = Parameters<TuiPlugin>[0]
 type ActiveEnhancement = {
   controller: AbortController
+  stopAnimation?: () => void
+  handle: PromptHandle
+  originalPrompt?: TuiPromptInfo
+  input: string
+  canceled?: boolean
 }
 
 type PluginState = {
@@ -244,6 +248,25 @@ async function restorePrompt(
   return true
 }
 
+async function cancelActiveEnhancement(
+  api: Api,
+  state: PluginState,
+  signal: AbortSignal,
+): Promise<boolean> {
+  const active = state.activeEnhancement
+  if (!state.enhancing || !active) return false
+
+  active.canceled = true
+  active.stopAnimation?.()
+  active.controller.abort(new Error(ENHANCEMENT_CANCELED_MESSAGE))
+
+  if (active.originalPrompt) {
+    return restorePrompt(api, state, active.handle, active.originalPrompt, signal)
+  }
+
+  return writePrompt(api, state, active.handle, active.input, signal)
+}
+
 function startEnhancementAnimation(
   api: Api,
   state: PluginState,
@@ -311,8 +334,6 @@ function gatherContext(api: Api): string {
       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")
@@ -435,12 +456,17 @@ function openEnhanceDialog(
           variant: "info",
           title: TOAST_TITLE,
           message: "Enhancing prompt...",
-          duration: PROGRESS_TOAST_DURATION_MS,
+          duration: TOAST_DURATION_MS,
         })
 
         const enhancementController = new AbortController()
         const onLifecycleAbort = () => enhancementController.abort(signal.reason)
-        state.activeEnhancement = { controller: enhancementController }
+        state.activeEnhancement = {
+          controller: enhancementController,
+          handle,
+          originalPrompt,
+          input,
+        }
         if (signal.aborted) {
           enhancementController.abort(signal.reason)
         } else {
@@ -461,6 +487,9 @@ function openEnhanceDialog(
             }
 
             stopAnimation = startEnhancementAnimation(api, state, handle, originalPrompt)
+            if (state.activeEnhancement) {
+              state.activeEnhancement.stopAnimation = stopAnimation
+            }
 
             const enhanced = await enhanceWithModel(api, options, input, enhancementController.signal)
             if (signal.aborted) return
@@ -490,13 +519,19 @@ function openEnhanceDialog(
               variant: "success",
               title: "Prompt enhanced",
               message: "Enhanced prompt added to input.",
-              duration: RESULT_TOAST_DURATION_MS,
+              duration: TOAST_DURATION_MS,
             })
           } catch (error) {
             if (signal.aborted) return
 
             stopAnimation()
 
+            const canceled = enhancementController.signal.aborted && !signal.aborted
+            if (canceled && state.activeEnhancement?.canceled) {
+              // cancelActiveEnhancement already stopped the animation and restored the prompt.
+              return
+            }
+
             let restored = true
             if (originalPrompt) {
               try {
@@ -512,8 +547,6 @@ function openEnhanceDialog(
                 restored = false
               }
             }
-
-            const canceled = enhancementController.signal.aborted && !signal.aborted
             const baseMessage = canceled
               ? ENHANCEMENT_CANCELED_MESSAGE
               : error instanceof Error
@@ -545,7 +578,26 @@ function revertEnhancement(
   signal: AbortSignal,
 ): void {
   if (state.enhancing && state.activeEnhancement) {
-    state.activeEnhancement.controller.abort(new Error(ENHANCEMENT_CANCELED_MESSAGE))
+    void (async () => {
+      try {
+        const restored = await cancelActiveEnhancement(api, state, signal)
+        if (!restored) {
+          api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Prompt changed while canceling." })
+          return
+        }
+
+        api.ui.toast({
+          variant: "info",
+          title: TOAST_TITLE,
+          message: "Enhancement canceled. Original prompt restored.",
+          duration: TOAST_DURATION_MS,
+        })
+      } catch (error) {
+        if (signal.aborted) return
+        const message = error instanceof Error ? error.message : "Cancel failed."
+        api.ui.toast({ variant: "error", title: TOAST_TITLE, message })
+      }
+    })()
     return
   }
 
@@ -600,7 +652,7 @@ function revertEnhancement(
         variant: "success",
         title: TOAST_TITLE,
         message: "Reverted to original prompt.",
-        duration: RESULT_TOAST_DURATION_MS,
+        duration: TOAST_DURATION_MS,
       })
     } catch (error) {
       if (signal.aborted) return