fix: address issues with nested binary calls in tests

This change also fixes an issue where the MCP client is initialized
twice.

Signed-off-by: Donnie Adams <donnie@acorn.io>

Author: thedadams

.gitignore

@@ -1,4 +1,5 @@
 /bin
+/pkg/tests/bin
 /.idea
 /static/ui
 **/node_modules/

go.mod

@@ -2,6 +2,10 @@ module github.com/gptscript-ai/gptscript
 
 go 1.24.2
 
+toolchain go1.24.4
+
+replace github.com/nanobot-ai/nanobot => github.com/thedadams/nanobot v0.0.0-20250612152714-166ea7e8fb71
+
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
@@ -17,7 +21,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86
 	github.com/gptscript-ai/chat-completion-client v0.0.0-20250224164718-139cb4507b1d
-	github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb
+	github.com/gptscript-ai/cmd v0.0.0-20250530150401-bc71fddf8070
 	github.com/gptscript-ai/go-gptscript v0.9.6-0.20250520154649-f1616a06f1b0
 	github.com/gptscript-ai/tui v0.0.0-20250419050840-5e79e16786c9
 	github.com/hexops/autogold/v2 v2.2.1

go.sum

@@ -213,8 +213,8 @@ github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86 h1:m9yLtI
 github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86/go.mod h1:lK3K5EZx4dyT24UG3yCt0wmspkYqrj4D/8kxdN3relk=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20250224164718-139cb4507b1d h1:p5uqZufDIMQzAALblZFkr8fwbnZbFXbBCR1ZMAFylXk=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20250224164718-139cb4507b1d/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=
-github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb h1:ky2J2CzBOskC7Jgm2VJAQi2x3p7FVGa+2/PcywkFJuc=
-github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb/go.mod h1:DJAo1xTht1LDkNYFNydVjTHd576TC7MlpsVRl3oloVw=
+github.com/gptscript-ai/cmd v0.0.0-20250530150401-bc71fddf8070 h1:xm5ZZFraWFwxyE7TBEncCXArubCDZTwG6s5bpMzqhSY=
+github.com/gptscript-ai/cmd v0.0.0-20250530150401-bc71fddf8070/go.mod h1:DJAo1xTht1LDkNYFNydVjTHd576TC7MlpsVRl3oloVw=
 github.com/gptscript-ai/go-gptscript v0.9.6-0.20250520154649-f1616a06f1b0 h1:UXZRFAUPDWOgeTyjZd4M8YrEEgPc7XOfjgbm81w7x0w=
 github.com/gptscript-ai/go-gptscript v0.9.6-0.20250520154649-f1616a06f1b0/go.mod h1:t2TyiEa6rhd4reOcorAMUmd5MledmZuTmYrO7rV3Iy8=
 github.com/gptscript-ai/tui v0.0.0-20250419050840-5e79e16786c9 h1:wQC8sKyeGA50WnCEG+Jo5FNRIkuX3HX8d3ubyWCCoI8=
@@ -311,8 +311,6 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/nanobot-ai/nanobot v0.0.6-0.20250612011942-bda908a3e3ab h1:ZYLDoc5w3iqb7ykbslG+Fr0uCA8wMTWWblT27cerwzg=
-github.com/nanobot-ai/nanobot v0.0.6-0.20250612011942-bda908a3e3ab/go.mod h1:XAvQcMgztKKR8Ul7/i28MfepoyC72ZGwG3uzAIH9F6c=
 github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA=
 github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI=
 github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 h1:MYzLheyVx1tJVDqfu3YnN4jtnyALNzLvwl+f58TcvQY=
@@ -398,6 +396,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/thedadams/nanobot v0.0.0-20250612152714-166ea7e8fb71 h1:Y4ysr+aVjLQEcpWRkwZ+NioEtO5oaiNuT6QcnvydmVY=
+github.com/thedadams/nanobot v0.0.0-20250612152714-166ea7e8fb71/go.mod h1:XAvQcMgztKKR8Ul7/i28MfepoyC72ZGwG3uzAIH9F6c=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
 github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=

pkg/mcp/client.go

@@ -11,16 +11,14 @@ func (l *Local) Client(server ServerConfig) (*Client, error) {
 	}
 
 	return &Client{
-		Client:     session.Client,
-		InitResult: session.InitResult,
+		Client: session.Client,
 	}, nil
 }
 
 type Client struct {
 	*nmcp.Client
-	InitResult nmcp.InitializeResult
 }
 
 func (c *Client) Capabilities() nmcp.ServerCapabilities {
-	return c.InitResult.Capabilities
+	return c.Session.InitializeResult.Capabilities
 }

pkg/mcp/loader.go

@@ -14,7 +14,6 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/hash"
 	"github.com/gptscript-ai/gptscript/pkg/mvl"
 	"github.com/gptscript-ai/gptscript/pkg/types"
-	"github.com/gptscript-ai/gptscript/pkg/version"
 	nmcp "github.com/nanobot-ai/nanobot/pkg/mcp"
 )
 
@@ -33,10 +32,9 @@ type Local struct {
 }
 
 type Session struct {
-	ID         string
-	InitResult nmcp.InitializeResult
-	Client     *nmcp.Client
-	Config     ServerConfig
+	ID     string
+	Client *nmcp.Client
+	Config ServerConfig
 }
 
 type Config struct {
@@ -145,6 +143,7 @@ func (l *Local) ShutdownServer(server ServerConfig) error {
 
 	if session != nil && session.Client != nil {
 		session.Client.Session.Close()
+		session.Client.Session.Wait()
 	}
 
 	return nil
@@ -224,7 +223,7 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 			},
 		}
 
-		if string(annotations) != "{}" {
+		if string(annotations) != "{}" && string(annotations) != "null" {
 			toolDef.MetaData = map[string]string{
 				"mcp-tool-annotations": string(annotations),
 			}
@@ -243,7 +242,7 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 		ToolDef: types.ToolDef{
 			Parameters: types.Parameters{
 				Name:        toolName,
-				Description: session.InitResult.ServerInfo.Name,
+				Description: session.Client.Session.InitializeResult.ServerInfo.Name,
 				Export:      toolNames,
 			},
 			MetaData: map[string]string{
@@ -252,18 +251,18 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 		},
 	}
 
-	if session.InitResult.Instructions != "" {
+	if session.Client.Session.InitializeResult.Instructions != "" {
 		data, _ := json.Marshal(map[string]any{
 			"tools":        toolNames,
-			"instructions": session.InitResult.Instructions,
+			"instructions": session.Client.Session.InitializeResult.Instructions,
 		})
 		toolDefs = append(toolDefs, types.Tool{
 			ToolDef: types.ToolDef{
 				Parameters: types.Parameters{
 					Name: session.ID,
 					Type: "context",
 				},
-				Instructions: types.EchoPrefix + "\n" + `# START MCP SERVER INFO: ` + session.InitResult.ServerInfo.Name + "\n" +
+				Instructions: types.EchoPrefix + "\n" + `# START MCP SERVER INFO: ` + session.Client.Session.InitializeResult.ServerInfo.Name + "\n" +
 					`You have available the following tools from an MCP Server that has provided the following additional instructions` + "\n" +
 					string(data) + "\n" +
 					`# END MCP SERVER INFO` + "\n",
@@ -284,7 +283,6 @@ func (l *Local) loadSession(server ServerConfig, serverName string) (*Session, e
 	if l.sessionCtx == nil {
 		l.sessionCtx, l.cancel = context.WithCancel(context.Background())
 	}
-	ctx := l.sessionCtx
 	l.lock.Unlock()
 
 	if ok {
@@ -303,22 +301,10 @@ func (l *Local) loadSession(server ServerConfig, serverName string) (*Session, e
 		return nil, fmt.Errorf("failed to create MCP stdio client: %w", err)
 	}
 
-	initResult, err := c.Initialize(ctx, nmcp.InitializeRequest{
-		ProtocolVersion: "2025-03-26",
-		ClientInfo: nmcp.ClientInfo{
-			Name:    version.ProgramName,
-			Version: version.Get().String(),
-		},
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize MCP client: %w", err)
-	}
-
 	result := &Session{
-		ID:         id,
-		InitResult: initResult,
-		Client:     c,
-		Config:     server,
+		ID:     id,
+		Client: c,
+		Config: server,
 	}
 
 	l.lock.Lock()
@@ -330,7 +316,7 @@ func (l *Local) loadSession(server ServerConfig, serverName string) (*Session, e
 	}
 
 	if l.sessions == nil {
-		l.sessions = make(map[string]*Session)
+		l.sessions = make(map[string]*Session, 1)
 	}
 	l.sessions[id] = result
 	return result, nil

pkg/tests/runner2_test.go

@@ -212,7 +212,7 @@ func TestMCPLoad(t *testing.T) {
 	}
 
 	r := tester.NewRunner(t)
-	prg, err := loader.ProgramFromSource(context.Background(), `
+	prg, err := loader.ProgramFromSource(t.Context(), `
 name: mcp
 
 #!mcp

pkg/tests/runner_test.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"io"
 	"os"
+	"os/exec"
 	"runtime"
 	"testing"
 
@@ -27,6 +28,17 @@ func toJSONString(t *testing.T, v interface{}) string {
 	return string(x)
 }
 
+func TestMain(m *testing.M) {
+	cmd := exec.CommandContext(context.Background(), "go", "build", "-o", "bin/gptscript", "../../main.go")
+	if err := cmd.Run(); err != nil {
+		panic(err)
+	}
+
+	os.Setenv("NANOBOT_BIN", "bin/gptscript")
+	defer os.Unsetenv("NANOBOT_BIN")
+	m.Run()
+}
+
 func TestAsterick(t *testing.T) {
 	r := tester.NewRunner(t)
 	p, err := r.Load("")

pkg/tests/testdata/TestMCPLoad/step1.golden

@@ -1,6 +1,6 @@
 `{
   "done": true,
-  "content": "{\"content\":[{\"type\":\"text\",\"text\":\"[{'1': 1}]\"}]}",
+  "content": "{\"isError\":false,\"content\":[{\"type\":\"text\",\"text\":\"[{'1': 1}]\"}]}",
   "toolID": "",
   "state": null
 }`