Fix tests

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

pkg/mcp/loader.go

@@ -142,7 +142,7 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 					Description: tool.Description,
 					Arguments:   &schema,
 				},
-				Instructions: types.MCPInvokePrefix + "." + tool.Name + " " + session.ID + " " + tool.Name,
+				Instructions: types.MCPInvokePrefix + tool.Name + " " + session.ID,
 			},
 		}
 

pkg/mcp/runner.go

@@ -12,12 +12,16 @@ import (
 
 func (l *Local) Run(ctx context.Context, _ chan<- types.CompletionStatus, tool types.Tool, input string) (string, error) {
 	fields := strings.Fields(tool.Instructions)
-	if len(fields) < 3 {
+	if len(fields) < 2 {
 		return "", fmt.Errorf("invalid mcp call, invalid number of fields in %s", tool.Instructions)
 	}
 
 	id := fields[1]
-	toolName := fields[2]
+	toolName, ok := strings.CutPrefix(fields[0], types.MCPInvokePrefix)
+	if !ok {
+		return "", fmt.Errorf("invalid mcp call, invalid tool name in %s", tool.Instructions)
+	}
+
 	arguments := map[string]any{}
 
 	if input != "" {

pkg/tests/runner2_test.go

@@ -308,7 +308,7 @@ name: mcp
       ],
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f append_insight",
+    "instructions": "#!sys.mcp.invoke.append_insight e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:append_insight",
     "localTools": {
       "append_insight": "inline:append_insight",
@@ -341,7 +341,7 @@ name: mcp
       ],
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f create_table",
+    "instructions": "#!sys.mcp.invoke.create_table e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:create_table",
     "localTools": {
       "append_insight": "inline:append_insight",
@@ -374,7 +374,7 @@ name: mcp
       ],
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f describe_table",
+    "instructions": "#!sys.mcp.invoke.describe_table e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:describe_table",
     "localTools": {
       "append_insight": "inline:append_insight",
@@ -398,7 +398,7 @@ name: mcp
     "arguments": {
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f list_tables",
+    "instructions": "#!sys.mcp.invoke.list_tables e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:list_tables",
     "localTools": {
       "append_insight": "inline:append_insight",
@@ -500,7 +500,7 @@ name: mcp
       ],
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f read_query",
+    "instructions": "#!sys.mcp.invoke.read_query e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:read_query",
     "localTools": {
       "append_insight": "inline:append_insight",
@@ -533,7 +533,7 @@ name: mcp
       ],
       "type": "object"
     },
-    "instructions": "#!sys.mcp.invoke 441826308787ad271e84a381e90d8eccc3fce0fe94503636e679bd0984c79f2f write_query",
+    "instructions": "#!sys.mcp.invoke.write_query e057d98f5d43e56fda04eb3e7ea6120c93b5bcaf832090fca76e8d744e2de494",
     "id": "inline:write_query",
     "localTools": {
       "append_insight": "inline:append_insight",

pkg/types/tool.go

@@ -21,7 +21,7 @@ const (
 	EchoPrefix      = "#!sys.echo"
 	CallPrefix      = "#!sys.call"
 	MCPPrefix       = "#!mcp"
-	MCPInvokePrefix = "#!sys.mcp.invoke"
+	MCPInvokePrefix = "#!sys.mcp.invoke."
 	CommandPrefix   = "#!"
 	PromptPrefix    = "!!"
 )

pkg/types/toolstring.go

@@ -44,7 +44,7 @@ func ToDisplayText(tool Tool, input string) string {
 }
 
 func ToSysDisplayString(id string, args map[string]string) (string, error) {
-	if suffix, ok := strings.CutPrefix(id, "sys.mcp.invoke."); ok {
+	if suffix, ok := strings.CutPrefix(id, MCPInvokePrefix); ok {
 		return fmt.Sprintf("Invoking MCP `%s`", suffix), nil
 	}