fix(ai): multiple suggestions

CyanSalt · CyanSalt · commit 6304aa5d8d58 · 2025-04-14T14:33:59.000+08:00
diff --git a/addons/ai/src/main/index.ts b/addons/ai/src/main/index.ts
@@ -1,7 +1,7 @@
 import * as commas from 'commas:api/main'
 import { useAIStatus } from './chat'
 import type { RuntimeInformation } from './prompt'
-import { AnswerSyntaxError, completeCommand, fixCommand, translateCommand } from './prompt'
+import { completeCommand, fixCommand, translateCommand } from './prompt'
 
 declare module '@commas/types/settings' {
   export interface Settings {
@@ -40,25 +40,18 @@ export default () => {
       }
       if (query) {
         status = true
-        try {
-          const generator = translateCommand(query, {
-            cwd,
-            extra: { columns },
-          })
-          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          while (true) {
-            const { done, value } = await generator.next()
-            if (done) {
-              return commas.ipcMain.invoke(sender, 'ai-chat-fix', value)
-            } else {
-              yield value
-            }
+        const generator = translateCommand(query, {
+          cwd,
+          extra: { columns },
+        })
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+          const { done, value } = await generator.next()
+          if (done) {
+            return commas.ipcMain.invoke(sender, 'ai-chat-fix', value)
+          } else {
+            yield value
           }
-        } catch (err) {
-          if (err instanceof AnswerSyntaxError) {
-            return `# ${err.message}`
-          }
-          throw err
         }
       }
     },
@@ -85,7 +78,7 @@ export default () => {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       while (true) {
         const { done, value } = await generator.next()
-        if (done) return value.value
+        if (done && value[0]) return value[0].value
       }
     } catch {
       return ''
@@ -99,7 +92,7 @@ export default () => {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       while (true) {
         const { done, value } = await generator.next()
-        if (done) return value.value
+        if (done && value[0]) return value[0].value
       }
     } catch {
       return ''
diff --git a/addons/ai/src/main/prompt.ts b/addons/ai/src/main/prompt.ts
@@ -108,17 +108,15 @@ Preferred Language: ${
 `
 }
 
-class AnswerSyntaxError extends Error {}
-
-async function* getAnswer(input: string, runtime: RuntimeInformation) {
+async function* getAnswers(input: string, runtime: RuntimeInformation) {
   const parser = new XMLParser()
   const prompt = getSystemPrompt(runtime)
-  let answer: CommandSuggestion | undefined
+  const answers: CommandSuggestion[] = []
   for await (const { tag, content } of paraphraseXML(chat(prompt, input))) {
     if (tag === 'command_suggestion') {
       const doc = parser.parse(content)
       const suggestion: CommandSuggestion = doc.command_suggestion
-      answer ??= suggestion
+      answers.push(suggestion)
       yield boxen(`${suggestion.label ?? suggestion.value}${suggestion.description ? '\n' + picocolors.dim(suggestion.description) : ''}`, {
         title: picocolors.inverse(picocolors.magenta(` ${startCase(tag)} `)),
         borderColor: 'magenta',
@@ -132,19 +130,18 @@ async function* getAnswer(input: string, runtime: RuntimeInformation) {
       yield content
     }
   }
-  if (!answer) throw new AnswerSyntaxError(answer)
-  return answer
+  return answers
 }
 
 function translateCommand(query: string, runtime: RuntimeInformation) {
-  return getAnswer(`
+  return getAnswers(`
 Translate the following task into a command:
 ${query}
 `, runtime)
 }
 
 function fixCommand(command: string, output: string, runtime: RuntimeInformation) {
-  return getAnswer(`
+  return getAnswers(`
 An error occurred when executing the command:
 ${command}
 The error message is:
@@ -154,14 +151,13 @@ Provide a command that can be executed correctly.
 }
 
 function completeCommand(query: string, runtime: RuntimeInformation) {
-  return getAnswer(`
+  return getAnswers(`
 Try to complete the following command:
 ${query}
 `, runtime)
 }
 
 export {
-  AnswerSyntaxError,
   translateCommand,
   fixCommand,
   completeCommand,
diff --git a/addons/ai/src/main/stream.ts b/addons/ai/src/main/stream.ts
@@ -25,8 +25,8 @@ function parseXMLSlices(source: string, offset = 0): XMLSlice[] {
       {
         type: 'text',
         tag: '',
-        start: 0,
-        end: source.length,
+        start: offset,
+        end: source.length + offset,
         isClosed: true,
       },
     ]
@@ -41,7 +41,7 @@ function parseXMLSlices(source: string, offset = 0): XMLSlice[] {
       {
         type: 'text',
         tag: '',
-        start: 0,
+        start: offset,
         end: tagIndex + offset,
         isClosed: true,
       } satisfies XMLSlice,
diff --git a/addons/ai/src/renderer/index.ts b/addons/ai/src/renderer/index.ts
@@ -6,7 +6,7 @@ import { useAIStatus } from './compositions'
 
 declare module '@commas/electron-ipc' {
   export interface RendererCommands {
-    'ai-chat-fix': (suggestion: CommandSuggestion) => void,
+    'ai-chat-fix': (suggestions: CommandSuggestion[]) => void,
   }
 }
 
@@ -16,14 +16,16 @@ export default () => {
 
   const terminal = $(commas.workspace.useCurrentTerminal())
 
-  commas.ipcRenderer.handle('ai-chat-fix', (event, suggestion) => {
+  commas.ipcRenderer.handle('ai-chat-fix', (event, suggestions) => {
     if (!terminal) return
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    terminal.addons?.shellIntegration?.addQuickFixAction(undefined, {
-      value: suggestion.value,
-      label: suggestion.label,
-      description: suggestion.description,
-    })
+    for (const suggestion of suggestions) {
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      terminal.addons?.shellIntegration?.addQuickFixAction(undefined, {
+        value: suggestion.value,
+        label: suggestion.label,
+        description: suggestion.description,
+      })
+    }
   })
 
   const status = $(useAIStatus())

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ function parseXMLSlices(source: string, offset = 0): XMLSlice[] {`
`25`	`25`	`{`
`26`	`26`	`type: 'text',`
`27`	`27`	`tag: '',`
`28`		`- start: 0,`
`29`		`- end: source.length,`
	`28`	`+ start: offset,`
	`29`	`+ end: source.length + offset,`
`30`	`30`	`isClosed: true,`
`31`	`31`	`},`
`32`	`32`	`]`
`@@ -41,7 +41,7 @@ function parseXMLSlices(source: string, offset = 0): XMLSlice[] {`
`41`	`41`	`{`
`42`	`42`	`type: 'text',`
`43`	`43`	`tag: '',`
`44`		`- start: 0,`
	`44`	`+ start: offset,`
`45`	`45`	`end: tagIndex + offset,`
`46`	`46`	`isClosed: true,`
`47`	`47`	`} satisfies XMLSlice,`