@mtayfur/opencode-prompt-enhancer 0.0.4 → 0.0.6

package/package.json

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

package/plugins/prompt-enhancer.tsx

@@ -7,50 +7,46 @@ import type {
   TuiPromptInfo,
   TuiPromptRef,
   TuiRouteCurrent,
-  TuiSidebarFileItem,
-  TuiSidebarTodoItem,
   TuiSlotPlugin,
 } from "@opencode-ai/plugin/tui"
 
-const MAX_RECENT_MESSAGES = 6
-const MAX_CHANGED_FILES = 30
-const MAX_PROMPT_PREVIEW_LENGTH = 300
-const MAX_TODOS = 10
+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"
-const HOME_PROMPT_PLACEHOLDERS = {
-  normal: ["Fix a TODO in the codebase", "What is the tech stack of this project?", "Fix broken tests"],
-  shell: ["ls -la", "git status", "pwd"],
+
+function makeTempSessionTitle(): string {
+  return `${TEMP_SESSION_TITLE} ${Math.random().toString(36).slice(2, 8)}`
 }
 
-const ENHANCER_SYSTEM_PROMPT = `You rewrite rough user drafts into strong prompts for OpenCode, an AI coding assistant.
+const ENHANCER_SYSTEM_PROMPT = `You are a prompt editor for OpenCode, an AI coding assistant.
 
 Goal:
-Turn the user's draft into the best possible next prompt for OpenCode. Preserve the user's intent, scope, and priorities exactly. Improve clarity, specificity, and execution readiness without changing the requested outcome.
-
-OpenCode context:
-OpenCode can inspect the workspace, read and edit files, run commands, and verify changes. Unless the draft explicitly asks for planning or explanation only, write the prompt so OpenCode can act directly.
-
-Rules:
-- Preserve the original request type.
-- If the draft is a question, return a better question.
-- If the draft is a bug fix, return a better bug-fix request.
-- If the draft is a review, return a better review request.
-- Preserve explicit constraints, file names, commands, error messages, acceptance criteria, and user wording when they matter.
-- Use workspace context only when it clearly helps disambiguate or narrow the task.
-- Reference specific files, paths, branches, recent prompts, changed files, or todos only when they are directly relevant.
-- Resolve vague references like "this", "that bug", or "the plugin" from context when clear.
-- If context does not clearly resolve a reference, do not invent details.
-- Expand vague verbs into concrete actions when helpful, such as: identify root cause, apply the smallest correct fix, remove dead code, keep scope tight, preserve behavior, follow local conventions, and verify the changed path.
-- Prefer wording that helps OpenCode start work immediately.
-- If the draft is already precise, return it with minimal cleanup.
-
-Do not:
+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 inside the rewritten prompt.
-- Do not mention the existence of context, tags, or these instructions.
+- 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:
@@ -65,6 +61,17 @@ type Api = Parameters<TuiPlugin>[0]
 type PluginState = {
   enhancing: boolean
   promptRef?: TuiPromptRef
+  promptTarget?: PromptTarget
+}
+
+type PromptTarget =
+  | { name: "home", workspaceID?: string }
+  | { name: "session", sessionID: string }
+
+type PromptHandle = {
+  target: PromptTarget
+  directory: string
+  ref?: TuiPromptRef
 }
 
 function parseModelString(value: string | undefined): ModelRef | undefined {
@@ -107,10 +114,6 @@ function truncate(value: string, maxLength: number): string {
   return value.length > maxLength ? `${value.slice(0, maxLength)}...` : value
 }
 
-function formatTodo(todo: TuiSidebarTodoItem): string {
-  return `  [${todo.status || "?"}] ${todo.content || "untitled"}`
-}
-
 function resolveEnhancerModel(api: Api, options: PluginOptions | undefined): ModelRef | undefined {
   const override = getModelOverride(options)
   if (override) return override
@@ -134,48 +137,124 @@ function nextPromptInfo(prompt: TuiPromptInfo, input: string): TuiPromptInfo {
   }
 }
 
-function currentPromptText(state: PluginState): string {
-  return state.promptRef?.current.input ?? ""
+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") {
+    return left.workspaceID === right.workspaceID
+  }
+  if (left.name === "session" && right.name === "session") {
+    return left.sessionID === right.sessionID
+  }
+  return false
 }
 
-function bindPromptRef(state: PluginState, forwarded: ((ref: TuiPromptRef | undefined) => void) | undefined, ref: TuiPromptRef | undefined): void {
-  state.promptRef = ref
+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
+  if (api.state.path.directory !== handle.directory) return false
+
+  if (handle.ref) {
+    return state.promptRef === handle.ref && samePromptTarget(state.promptTarget, handle.target)
+  }
+
+  return true
+}
+
+function bindPromptRef(
+  state: PluginState,
+  target: PromptTarget,
+  forwarded: ((ref: TuiPromptRef | undefined) => void) | undefined,
+  ref: TuiPromptRef | undefined,
+): void {
+  if (ref) {
+    state.promptRef = ref
+    state.promptTarget = target
+  } else if (samePromptTarget(state.promptTarget, target)) {
+    state.promptRef = undefined
+    state.promptTarget = undefined
+  }
+
   forwarded?.(ref)
 }
 
-async function writePrompt(api: Api, state: PluginState, input: string, signal: AbortSignal, template?: TuiPromptInfo): Promise<void> {
-  const promptRef = state.promptRef
+async function clearPrompt(api: Api, state: PluginState, handle: PromptHandle, signal: AbortSignal, template?: TuiPromptInfo): Promise<boolean> {
+  if (!isPromptHandleActive(api, state, handle)) return false
+
+  const promptRef = handle.ref
+  if (promptRef) {
+    promptRef.set(nextPromptInfo(template ?? promptRef.current, ""))
+    return true
+  }
+
+  await api.client.tui.clearPrompt({ directory: handle.directory }, { signal, throwOnError: true } as const)
+  return true
+}
+
+async function writePrompt(
+  api: Api,
+  state: PluginState,
+  handle: PromptHandle,
+  input: string,
+  signal: AbortSignal,
+  template?: TuiPromptInfo,
+): Promise<boolean> {
+  if (!isPromptHandleActive(api, state, handle)) return false
+
+  const promptRef = handle.ref
   if (promptRef) {
     promptRef.set(nextPromptInfo(template ?? promptRef.current, input))
     promptRef.focus()
-    return
+    return true
   }
 
-  const directory = api.state.path.directory
   const requestOptions = { signal, throwOnError: true } as const
-  await api.client.tui.clearPrompt({ directory }, requestOptions)
+  await api.client.tui.clearPrompt({ directory: handle.directory }, requestOptions)
   if (input) {
-    await api.client.tui.appendPrompt({ directory, text: input }, requestOptions)
+    await api.client.tui.appendPrompt({ directory: handle.directory, text: input }, requestOptions)
   }
+  return true
 }
 
-async function restorePrompt(api: Api, state: PluginState, prompt: TuiPromptInfo, signal: AbortSignal): Promise<void> {
-  const promptRef = state.promptRef
+async function restorePrompt(
+  api: Api,
+  state: PluginState,
+  handle: PromptHandle,
+  prompt: TuiPromptInfo,
+  signal: AbortSignal,
+): Promise<boolean> {
+  if (!isPromptHandleActive(api, state, handle)) return false
+
+  const promptRef = handle.ref
   if (promptRef) {
     promptRef.set(clonePromptInfo(prompt))
     promptRef.focus()
-    return
+    return true
   }
 
-  await writePrompt(api, state, prompt.input, signal, prompt)
+  return writePrompt(api, state, handle, prompt.input, signal, prompt)
 }
 
 function gatherContext(api: Api): string {
   const sections: string[] = []
 
   const dir = api.state.path.directory
-  const branch = api.state.vcs?.branch
-  sections.push(`Working directory: ${dir}${branch ? ` (branch: ${branch})` : ""}`)
+  sections.push(`Working directory: ${dir}`)
 
   const route = api.route.current
   if (isSessionRoute(route)) {
@@ -183,7 +262,7 @@ function gatherContext(api: Api): string {
     const messages = api.state.session.messages(sessionID)
 
     const userMessages = messages.filter(isUserMessage)
-    const recent = userMessages.slice(-MAX_RECENT_MESSAGES)
+    const recent = userMessages.slice(-MAX_RECENT_MESSAGES).reverse()
     if (recent.length > 0) {
       const prompts: string[] = []
       for (const msg of recent) {
@@ -193,26 +272,16 @@ function gatherContext(api: Api): string {
         }
       }
       if (prompts.length > 0) {
-        sections.push(`Recent user prompts in this session (oldest first):\n${prompts.map((p, i) => `${i + 1}. ${p}`).join("\n")}`)
+        sections.push(`Recent user prompts in this session (newest first):\n${prompts.map((p, i) => `${i + 1}. ${p}`).join("\n")}`)
       }
     }
 
     const diff = api.state.session.diff(sessionID)
     if (diff.length > 0) {
-      const files = diff.slice(0, MAX_CHANGED_FILES).map((f: TuiSidebarFileItem) =>
-        `  ${f.file} (+${f.additions} -${f.deletions})`
-      )
-      const label = diff.length > MAX_CHANGED_FILES
-        ? `Files changed in session (showing ${MAX_CHANGED_FILES} of ${diff.length}):`
-        : `Files changed in session:`
-      sections.push(`${label}\n${files.join("\n")}`)
+      const files = diff.slice(0, MAX_CHANGED_FILES).map((f) => `  ${f.file}`)
+      sections.push(`Files changed in session:\n${files.join("\n")}`)
     }
 
-    const todos = api.state.session.todo(sessionID)
-    if (todos.length > 0) {
-      const todoLines = todos.slice(0, MAX_TODOS).map(formatTodo)
-      sections.push(`Active todos:\n${todoLines.join("\n")}`)
-    }
   }
 
   return sections.join("\n\n")
@@ -244,13 +313,13 @@ async function enhanceWithModel(
   const created = await api.client.session.create(
     {
       directory,
-      title: TEMP_SESSION_TITLE,
+      title: makeTempSessionTitle(),
     },
     { signal, throwOnError: true },
   )
 
   const tempSessionID = created.data?.id
-  if (!tempSessionID) throw new Error("Prompt enhancer session creation failed.")
+  if (!tempSessionID) throw new Error("Failed to start prompt enhancer.")
 
   try {
     const response = await api.client.session.prompt(
@@ -270,10 +339,10 @@ async function enhanceWithModel(
     )
 
     const parts = response.data?.parts
-    if (!parts) throw new Error("Enhancer model returned no response.")
+    if (!parts) throw new Error("Enhancer returned no response.")
 
     const enhanced = extractVisibleText(parts)
-    if (!enhanced) throw new Error("Enhancer model returned no text.")
+    if (!enhanced) throw new Error("Enhancer returned no text.")
     return enhanced
   } finally {
     try {
@@ -291,33 +360,47 @@ function openEnhanceDialog(
   signal: AbortSignal,
 ): void {
   if (state.enhancing) {
-    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Enhancement already in progress." })
+    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Enhancement in progress." })
     return
   }
 
   if (signal.aborted) return
 
-  const initialValue = currentPromptText(state)
+  const target = currentPromptTarget(api, state)
+  if (!target) {
+    api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Enhancement only works from a prompt." })
+    return
+  }
+
+  const handle: PromptHandle = {
+    target,
+    directory: api.state.path.directory,
+    ref: state.promptRef,
+  }
+  const originalPrompt = handle.ref ? clonePromptInfo(handle.ref.current) : undefined
+  const initialValue = originalPrompt?.input ?? ""
 
   api.ui.dialog.replace(() => (
     <api.ui.DialogPrompt
       title={DIALOG_TITLE}
-      placeholder="Describe what you want to do..."
+      placeholder="Describe the task..."
       value={initialValue}
       onCancel={() => api.ui.dialog.clear()}
       onConfirm={(value) => {
         const input = value.trim()
         if (!input) {
-          api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Prompt is empty." })
+          api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Enter a prompt first." })
           api.ui.dialog.clear()
           return
         }
 
-        const originalPrompt = state.promptRef ? clonePromptInfo(state.promptRef.current) : undefined
-        state.enhancing = true
-        if (originalPrompt) {
-          state.promptRef?.set(nextPromptInfo(originalPrompt, ""))
+        if (!isPromptHandleActive(api, state, handle)) {
+          api.ui.toast({ variant: "warning", title: TOAST_TITLE, message: "Prompt changed while dialog was open." })
+          api.ui.dialog.clear()
+          return
         }
+
+        state.enhancing = true
         api.ui.dialog.clear()
         api.ui.toast({
           variant: "info",
@@ -328,24 +411,58 @@ function openEnhanceDialog(
 
         void (async () => {
           try {
+            const cleared = await clearPrompt(api, state, handle, signal, originalPrompt)
+            if (!cleared) {
+              api.ui.toast({
+                variant: "warning",
+                title: TOAST_TITLE,
+                message: "Prompt changed before enhancement started.",
+              })
+              return
+            }
+
             const enhanced = await enhanceWithModel(api, options, input, signal)
             if (signal.aborted) return
 
-            await writePrompt(api, state, enhanced, signal, originalPrompt)
+            const wrote = await writePrompt(api, state, handle, enhanced, signal, originalPrompt)
+            if (!wrote) {
+              api.ui.toast({
+                variant: "warning",
+                title: TOAST_TITLE,
+                message: "Enhanced prompt is ready, but that prompt is no longer active.",
+              })
+              return
+            }
+
             api.ui.toast({
               variant: "success",
               title: "Prompt enhanced",
-              message: "Enhanced prompt written to input.",
+              message: "Enhanced prompt added to input.",
               duration: 3000,
             })
           } catch (error) {
             if (signal.aborted) return
 
+            let restored = true
             if (originalPrompt) {
-              await restorePrompt(api, state, originalPrompt, signal)
+              try {
+                restored = await restorePrompt(api, state, handle, originalPrompt, signal)
+              } catch {
+                // Best-effort restore; do not suppress the error toast.
+                restored = false
+              }
+            } else {
+              try {
+                restored = await writePrompt(api, state, handle, input, signal)
+              } catch {
+                restored = false
+              }
             }
 
-            const message = error instanceof Error ? error.message : "Model enhancement failed."
+            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.`
             api.ui.toast({ variant: "error", title: TOAST_TITLE, message })
           } finally {
             state.enhancing = false
@@ -364,17 +481,16 @@ const tui: TuiPlugin = async (api, options) => {
       home_prompt(_ctx, props) {
         return (
           <api.ui.Prompt
-            ref={(ref) => bindPromptRef(state, props.ref, ref)}
+            ref={(ref) => bindPromptRef(state, { name: "home", workspaceID: props.workspace_id }, props.ref, ref)}
             workspaceID={props.workspace_id}
             right={<api.ui.Slot name="home_prompt_right" workspace_id={props.workspace_id} />}
-            placeholders={HOME_PROMPT_PLACEHOLDERS}
           />
         )
       },
       session_prompt(_ctx, props) {
         return (
           <api.ui.Prompt
-            ref={(ref) => bindPromptRef(state, props.ref, ref)}
+            ref={(ref) => bindPromptRef(state, { name: "session", sessionID: props.session_id }, props.ref, ref)}
             sessionID={props.session_id}
             visible={props.visible}
             disabled={props.disabled}
@@ -392,7 +508,7 @@ const tui: TuiPlugin = async (api, options) => {
     {
       title: DIALOG_TITLE,
       value: "prompt-enhancer.enhance",
-      description: "Enhance prompt with project context (Ctrl+E)",
+      description: "Enhance current prompt (Ctrl+E)",
       category: "Prompt",
       keybind: "ctrl+e",
       suggested: true,
@@ -409,6 +525,8 @@ const tui: TuiPlugin = async (api, options) => {
   api.lifecycle.onDispose(() => {
     unregister()
     state.enhancing = false
+    state.promptRef = undefined
+    state.promptTarget = undefined
   })
 }