Merge pull request #47 from thedadams/run-restart-on-error

fix: allow retry of failed runs

Author: thedadams

README.md

@@ -50,6 +50,7 @@ None of the options is required, and the defaults will reduce the number of call
 - `chatState`: The chat state to continue, or null to start a new chat and return the state
 - `confirm`: Prompt before running potentially dangerous commands
 - `prompt`: Allow scripts to prompt the user for input
+- `env`: Extra environment variables to pass to the script in the form `KEY=VAL`
 
 ## Functions
 
@@ -240,7 +241,7 @@ const gptscript = require('@gptscript-ai/gptscript');
 const opts = {
     disableCache: true,
     input: "--testin how high is that there mouse?",
-    confirm: true
+    prompt: true
 };
 
 async function streamExecFileWithEvents() {

src/gptscript.ts

@@ -13,6 +13,7 @@ export interface RunOpts {
 	chatState?: string
 	confirm?: boolean
 	prompt?: boolean
+	env?: string[]
 }
 
 export enum RunEventType {
@@ -242,25 +243,25 @@ export class Run {
 	}
 
 	nextChat(input: string = ""): Run {
-		if (this.state === RunState.Finished || this.state === RunState.Error) {
-			throw (new Error("Run already finished"))
+		if (this.state !== RunState.Continue && this.state !== RunState.Creating && this.state !== RunState.Error) {
+			throw (new Error(`Run must in creating, continue or error state, not ${this.state}`))
 		}
 
 		let run = this
 		if (run.state !== RunState.Creating) {
 			run = new (this.constructor as any)(this.requestPath, this.filePath, this.content, this.opts, this.gptscriptURL)
 		}
 
-		if (this.chatState) {
-			run.chatState = this.chatState
-		} else if (this.opts.chatState) {
-			run.chatState = this.opts.chatState
+		if (this.chatState && this.state === RunState.Continue) {
+			// Only update the chat state if the previous run didn't error.
+			// The chat state on opts will be the chat state for the last successful run.
+			this.opts.chatState = this.chatState
 		}
 		run.opts.input = input
 		if (run.content !== "") {
-			run.request({content: this.content, chatState: run.chatState})
+			run.request({content: this.content, ...this.opts})
 		} else {
-			run.request({file: this.filePath, chatState: run.chatState})
+			run.request({file: this.filePath, ...this.opts})
 		}
 
 		return run

tests/gptscript.test.ts

@@ -470,4 +470,34 @@ describe("gptscript module", () => {
 		expect(run.err).toContain("prompt occurred")
 		expect(promptFound).toBeFalsy()
 	})
+
+	test("retry failed run", async () => {
+		let shebang = `#!/bin/bash\nexit \${EXIT_CODE}`
+		if (process.platform == "win32") {
+			shebang = "#!/usr/bin/env powershell.exe\n$e = $env:EXIT_CODE;\nif ($e) { Exit 1; }"
+		}
+		const t = {
+			instructions: "say hello",
+			context: ["my-context"]
+		} as gptscript.ToolDef
+		const contextTool = {
+			name: "my-context",
+			instructions: `${shebang}\nexit \${EXIT_CODE}`
+		} as gptscript.ToolDef
+
+		let run = await client.evaluate([t, contextTool], {disableCache: true, env: ["EXIT_CODE=1"]})
+		try {
+			await run.text()
+		} catch {
+		}
+
+		expect(run.err).not.toEqual("")
+
+		run.opts.env = []
+		run = run.nextChat()
+
+		await run.text()
+
+		expect(run.err).toEqual("")
+	})
 })