fix: show error always after logUpdate.clear

offline-ai · Jun 27, 2024 · 26494c9 · 26494c9
1 parent 008a7a5
commit 26494c9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ $ npm install -g @offline-ai/cli
 $ ai COMMAND
 running command...
 $ ai (--version)
-@offline-ai/cli/0.0.12 linux-x64 node-v20.14.0
+@offline-ai/cli/0.0.13 linux-x64 node-v20.14.0
 $ ai --help [COMMAND]
 USAGE
   $ ai COMMAND
@@ -303,7 +303,7 @@ EXAMPLES
   $ ai agent publish <agent-name>
 ```
 
-_See code: [src/commands/agent/index.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/agent/index.ts)_
+_See code: [src/commands/agent/index.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/agent/index.ts)_
 
 ## `ai autocomplete [SHELL]`
 
@@ -376,7 +376,7 @@ EXAMPLES
   $ ai brain download <brain-name>
 ```
 
-_See code: [src/commands/brain/index.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/brain/index.ts)_
+_See code: [src/commands/brain/index.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/brain/index.ts)_
 
 ## `ai brain dn [NAME]`
 
@@ -504,7 +504,7 @@ EXAMPLES
   $ ai brain download <brain-name> [-q <QUANT>]
 ```
 
-_See code: [src/commands/brain/download.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/brain/download.ts)_
+_See code: [src/commands/brain/download.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/brain/download.ts)_
 
 ## `ai brain list [NAME]`
 
@@ -536,7 +536,7 @@ ALIASES
   $ ai brain search
 ```
 
-_See code: [src/commands/brain/list.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/brain/list.ts)_
+_See code: [src/commands/brain/list.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/brain/list.ts)_
 
 ## `ai brain search [NAME]`
 
@@ -603,7 +603,7 @@ EXAMPLES
   }
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/config/index.ts)_
 
 ## `ai config save [DATA]`
 
@@ -643,7 +643,7 @@ GLOBAL FLAGS
   --json  Format output as json.
 ```
 
-_See code: [src/commands/config/save.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/config/save.ts)_
+_See code: [src/commands/config/save.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/config/save.ts)_
 
 ## `ai help [COMMAND]`
 
@@ -1004,7 +1004,7 @@ EXAMPLES
   │[info]:Start Script: ...
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/offline-ai/cli/blob/v0.0.12/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/offline-ai/cli/blob/v0.0.13/src/commands/run/index.ts)_
 
 ## `ai version`
 

diff --git a/src/lib/run-script.ts b/src/lib/run-script.ts
@@ -163,12 +163,18 @@ export async function runScript(filename: string, options: IRunScriptOptions) {
     })
   }
 
+  let lastError: any
   try {
     await runtime.run(options.data)
   } catch(error: any) {
     if (error.name !== 'AbortError') {throw error}
-  } finally {
+    lastError = error.name + (error.data?.what ? ':'+error.data.what : '')
+} finally {
     if (!isSilence) {logUpdate.clear(options.consoleClear)}
+    if (lastError) {
+      console.log(colors.magentaBright(`<${lastError}>`))
+      lastError = undefined
+    }
   }
 
   let result = runtime.result
@@ -244,10 +250,13 @@ export async function runScript(filename: string, options: IRunScriptOptions) {
           result = await runtime.$interact(llmOptions)
         } catch(error: any) {
           if (error.name !== 'AbortError') {throw error}
-          const what = error.data?.what ? ':'+error.data.what : ''
-          input.write(colors.magentaBright(`<${error.name+what}>`))
+          lastError = error.name + (error.data?.what ? ':'+error.data.what : '')
         } finally {
           if (!isSilence) {logUpdate.clear(options.consoleClear)}
+          if (lastError) {
+            input.write(colors.magentaBright(`<${lastError}>\n`))
+            lastError = undefined
+          }
         }
         if (result) {
           if (typeof result !== 'string') { result = ux.colorizeJson(result, {pretty: true, theme: options.theme?.json})}

diff --git a/src/oclif/commands/run/index.ts b/src/oclif/commands/run/index.ts
@@ -37,7 +37,7 @@ export default class RunScript extends AICommand {
     ...AICommand.flags,
     ...AICommonFlags,
     'consoleClear': Flags.boolean({
-      aliases: ['console-clear'],
+      aliases: ['console-clear', 'ConsoleClear', 'Console-clear', 'Console-Clear'],
       description: 'Whether console clear after stream output, default to true in interactive, false to non-interactive',
       allowNo: true,
     }),