Merge pull request #19 from thedadams/fix-stdout-deadlock

fix: simplify event processing

Author: thedadams

README.md

@@ -27,7 +27,6 @@ None of the options is required, and the defaults will reduce the number of call
 
 - `cache`: Enable or disable caching. Default (true).
 - `cacheDir`: Specify the cache directory.
-- `quiet`: No output logging
 - `subTool`: Use tool of this name, not the first tool
 - `input`: Input arguments for the tool run
 - `workspace`: Directory to use for the workspace, if specified it will not be deleted on exit
@@ -261,7 +260,6 @@ func streamExecTool(ctx context.Context) error {
 		// Process event...
 	}
 
-	// Wait for the output to ensure the script completes successfully.
 	_, err = run.Text()
 	return err
 }

client.go

@@ -165,32 +165,10 @@ func (c *client) ParseTool(ctx context.Context, toolDef string) ([]Node, error)
 
 // Fmt will format the given nodes into a string.
 func (c *client) Fmt(ctx context.Context, nodes []Node) (string, error) {
-	b, err := json.Marshal(Document{Nodes: nodes})
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal nodes: %w", err)
-	}
-
-	run := &runSubCommand{
-		Run: Run{
-			url:         c.gptscriptURL,
-			requestPath: "fmt",
-			state:       Creating,
-			toolPath:    "",
-			content:     string(b),
-		},
-	}
-
-	if err = run.request(ctx, Document{Nodes: nodes}); err != nil {
-		return "", err
-	}
-
-	out, err := run.Text()
+	out, err := c.runBasicCommand(ctx, "fmt", Document{Nodes: nodes})
 	if err != nil {
 		return "", err
 	}
-	if run.err != nil {
-		return run.ErrorOutput(), run.err
-	}
 
 	return out, nil
 }
@@ -231,12 +209,11 @@ func (c *client) Confirm(ctx context.Context, resp AuthResponse) error {
 }
 
 func (c *client) runBasicCommand(ctx context.Context, requestPath string, body any) (string, error) {
-	run := &runSubCommand{
-		Run: Run{
-			url:         c.gptscriptURL,
-			requestPath: requestPath,
-			state:       Creating,
-		},
+	run := &Run{
+		url:          c.gptscriptURL,
+		requestPath:  requestPath,
+		state:        Creating,
+		basicCommand: true,
 	}
 
 	if err := run.request(ctx, body); err != nil {

client_test.go

@@ -3,7 +3,6 @@ package gptscript
 import (
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -309,11 +308,6 @@ func TestStreamRun(t *testing.T) {
 		}
 	}
 
-	stdErr, err := io.ReadAll(run.stderr)
-	if err != nil {
-		t.Errorf("Error reading stderr: %v", err)
-	}
-
 	out, err := run.Text()
 	if err != nil {
 		t.Errorf("Error reading output: %v", err)
@@ -327,7 +321,7 @@ func TestStreamRun(t *testing.T) {
 		t.Errorf("Unexpected output: %s", out)
 	}
 
-	if len(stdErr) != 0 {
+	if len(run.ErrorOutput()) != 0 {
 		t.Error("Should have no stderr output")
 	}
 }

opts.go

@@ -6,7 +6,6 @@ type Options struct {
 	Input         string `json:"input"`
 	DisableCache  bool   `json:"disableCache"`
 	CacheDir      string `json:"cacheDir"`
-	Quiet         bool   `json:"quiet"`
 	SubTool       string `json:"subTool"`
 	Workspace     string `json:"workspace"`
 	ChatState     string `json:"chatState"`