@mtayfur/opencode-prompt-enhancer 0.0.10 → 0.0.12

package/package.json

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

package/plugins/prompt-enhancer.tsx

@@ -14,6 +14,16 @@ 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 ENHANCEMENT_TIMEOUT_MS = 60_000
+const ENHANCEMENT_ANIMATION_INTERVAL_MS = 250
+const TOAST_DURATION_MS = 3_000
+const ENHANCEMENT_CANCELED_MESSAGE = "Prompt enhancement canceled."
+const ENHANCEMENT_ANIMATION_FRAMES = [
+  "Enhancing prompt",
+  "Enhancing prompt.",
+  "Enhancing prompt..",
+  "Enhancing prompt...",
+] as const
 const DIALOG_TITLE = "Enhance Prompt"
 const TOAST_TITLE = "Prompt enhancer"
 
@@ -23,8 +33,18 @@ type ModelRef = {
 }
 
 type Api = Parameters<TuiPlugin>[0]
+type ActiveEnhancement = {
+  controller: AbortController
+  stopAnimation?: () => void
+  handle: PromptHandle
+  originalPrompt?: TuiPromptInfo
+  input: string
+  canceled?: boolean
+}
+
 type PluginState = {
   enhancing: boolean
+  activeEnhancement?: ActiveEnhancement
   promptRef?: TuiPromptRef
   promptTarget?: PromptTarget
   lastOriginal?: TuiPromptInfo
@@ -87,6 +107,39 @@ function nextPromptInfo(prompt: TuiPromptInfo, input: string): TuiPromptInfo {
   }
 }
 
+function errorFromReason(reason: unknown, fallbackMessage: string): Error {
+  return reason instanceof Error ? reason : new Error(fallbackMessage)
+}
+
+async function withRequestTimeout<T>(
+  signal: AbortSignal,
+  timeoutMs: number,
+  run: (signal: AbortSignal) => Promise<T>,
+): Promise<T> {
+  const controller = new AbortController()
+  const timeoutMessage = `Prompt enhancement timed out after ${Math.floor(timeoutMs / 1000)} seconds.`
+  const onAbort = () => controller.abort(signal.reason)
+  const timeout = setTimeout(() => controller.abort(new Error(timeoutMessage)), timeoutMs)
+
+  if (signal.aborted) {
+    controller.abort(signal.reason)
+  } else {
+    signal.addEventListener("abort", onAbort, { once: true })
+  }
+
+  try {
+    return await run(controller.signal)
+  } catch (error) {
+    if (controller.signal.aborted && !signal.aborted) {
+      throw errorFromReason(controller.signal.reason, timeoutMessage)
+    }
+    throw error
+  } finally {
+    clearTimeout(timeout)
+    signal.removeEventListener("abort", onAbort)
+  }
+}
+
 function samePromptTarget(left: PromptTarget | undefined, right: PromptTarget | undefined): boolean {
   if (!left || !right || left.name !== right.name) return false
   if (left.name === "home" && right.name === "home") {
@@ -138,6 +191,7 @@ async function clearPrompt(api: Api, state: PluginState, handle: PromptHandle, s
   const promptRef = handle.ref
   if (promptRef) {
     promptRef.set(nextPromptInfo(template ?? promptRef.current, ""))
+    promptRef.blur()
     return true
   }
 
@@ -186,7 +240,62 @@ async function restorePrompt(
     return true
   }
 
-  return false
+  const requestOptions = { signal, throwOnError: true } as const
+  await api.client.tui.clearPrompt({ directory: handle.directory }, requestOptions)
+  if (prompt.input) {
+    await api.client.tui.appendPrompt({ directory: handle.directory, text: prompt.input }, requestOptions)
+  }
+  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,
+  handle: PromptHandle,
+  template?: TuiPromptInfo,
+): () => void {
+  const promptRef = handle.ref
+  if (!promptRef) return () => {}
+
+  let frame = 0
+  let stopped = false
+
+  const render = () => {
+    if (stopped) return
+    if (!isPromptHandleActive(api, state, handle)) {
+      stopped = true
+      return
+    }
+
+    promptRef.set(nextPromptInfo(template ?? promptRef.current, ENHANCEMENT_ANIMATION_FRAMES[frame]))
+    frame = (frame + 1) % ENHANCEMENT_ANIMATION_FRAMES.length
+  }
+
+  render()
+  const interval = setInterval(render, ENHANCEMENT_ANIMATION_INTERVAL_MS)
+  return () => {
+    stopped = true
+    clearInterval(interval)
+  }
 }
 
 function gatherContext(api: Api): string {
@@ -225,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")
@@ -259,20 +366,24 @@ async function enhanceWithModel(
   if (!tempSessionID) throw new Error("Failed to start prompt enhancer.")
 
   try {
-    const response = await api.client.session.prompt(
-      {
-        sessionID: tempSessionID,
-        directory,
-        model,
-        system: ENHANCER_SYSTEM_PROMPT,
-        parts: [
-          {
-            type: "text",
-            text: userMessage,
-          },
-        ],
-      },
-      { signal, throwOnError: true },
+    const response = await withRequestTimeout(
+      signal,
+      ENHANCEMENT_TIMEOUT_MS,
+      (requestSignal) => api.client.session.prompt(
+        {
+          sessionID: tempSessionID,
+          directory,
+          model,
+          system: ENHANCER_SYSTEM_PROMPT,
+          parts: [
+            {
+              type: "text",
+              text: userMessage,
+            },
+          ],
+        },
+        { signal: requestSignal, throwOnError: true },
+      ),
     )
 
     const parts = response.data?.parts
@@ -282,11 +393,9 @@ async function enhanceWithModel(
     if (!enhanced) throw new Error("Enhancer returned no text.")
     return enhanced
   } finally {
-    try {
-      await api.client.session.delete({ sessionID: tempSessionID, directory })
-    } catch {
+    void api.client.session.delete({ sessionID: tempSessionID, directory }).catch(() => {
       // Best-effort cleanup for the temporary enhancement session.
-    }
+    })
   }
 }
 
@@ -347,10 +456,25 @@ function openEnhanceDialog(
           variant: "info",
           title: TOAST_TITLE,
           message: "Enhancing prompt...",
-          duration: 8_000,
+          duration: TOAST_DURATION_MS,
         })
 
+        const enhancementController = new AbortController()
+        const onLifecycleAbort = () => enhancementController.abort(signal.reason)
+        state.activeEnhancement = {
+          controller: enhancementController,
+          handle,
+          originalPrompt,
+          input,
+        }
+        if (signal.aborted) {
+          enhancementController.abort(signal.reason)
+        } else {
+          signal.addEventListener("abort", onLifecycleAbort, { once: true })
+        }
+
         void (async () => {
+          let stopAnimation = () => {}
           try {
             const cleared = await clearPrompt(api, state, handle, signal, originalPrompt)
             if (!cleared) {
@@ -362,8 +486,18 @@ function openEnhanceDialog(
               return
             }
 
-            const enhanced = await enhanceWithModel(api, options, input, signal)
+            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
+            if (enhancementController.signal.aborted) {
+              throw errorFromReason(enhancementController.signal.reason, ENHANCEMENT_CANCELED_MESSAGE)
+            }
+
+            stopAnimation()
 
             const wrote = await writePrompt(api, state, handle, enhanced, signal, originalPrompt)
             if (!wrote) {
@@ -374,6 +508,9 @@ function openEnhanceDialog(
               })
               return
             }
+            if (enhancementController.signal.aborted) {
+              throw errorFromReason(enhancementController.signal.reason, ENHANCEMENT_CANCELED_MESSAGE)
+            }
 
             state.lastOriginal = originalPrompt
             state.lastEnhancedInput = enhanced
@@ -382,11 +519,19 @@ function openEnhanceDialog(
               variant: "success",
               title: "Prompt enhanced",
               message: "Enhanced prompt added to input.",
-              duration: 3000,
+              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 {
@@ -402,13 +547,23 @@ function openEnhanceDialog(
                 restored = false
               }
             }
-
-            const baseMessage = error instanceof Error ? error.message : "Prompt enhancement failed."
+            const baseMessage = canceled
+              ? ENHANCEMENT_CANCELED_MESSAGE
+              : error instanceof Error
+                ? error.message
+                : "Prompt enhancement failed."
             const message = restored
-              ? baseMessage
+              ? canceled
+                ? "Enhancement canceled. Original prompt restored."
+                : baseMessage
               : `${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 })
+            api.ui.toast({ variant: canceled && restored ? "info" : "error", title: TOAST_TITLE, message })
           } finally {
+            stopAnimation()
+            signal.removeEventListener("abort", onLifecycleAbort)
+            if (state.activeEnhancement?.controller === enhancementController) {
+              state.activeEnhancement = undefined
+            }
             state.enhancing = false
           }
         })()
@@ -422,6 +577,30 @@ function revertEnhancement(
   state: PluginState,
   signal: AbortSignal,
 ): void {
+  if (state.enhancing && state.activeEnhancement) {
+    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
+  }
+
   if (!state.lastOriginal) {
     api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "No enhancement to revert." })
     return
@@ -473,7 +652,7 @@ function revertEnhancement(
         variant: "success",
         title: TOAST_TITLE,
         message: "Reverted to original prompt.",
-        duration: 3000,
+        duration: TOAST_DURATION_MS,
       })
     } catch (error) {
       if (signal.aborted) return
@@ -541,6 +720,8 @@ const tui: TuiPlugin = async (api, options) => {
   api.lifecycle.onDispose(() => {
     unregister()
     api.ui.dialog.clear()
+    state.activeEnhancement?.controller.abort(api.lifecycle.signal.reason)
+    state.activeEnhancement = undefined
     state.enhancing = false
     state.promptRef = undefined
     state.promptTarget = undefined