Merge remote-tracking branch 'upstream/main' into inercia/aws-bedrock-provider

Author: inercia

README.md

@@ -258,7 +258,7 @@ cagent new --model dmr/ai/gemma3n:2B-F16 --max-iterations 15
 $ cagent new
 
 ------- Welcome to cagent! -------
-(Ctrl+C to stop the agent or exit)
+(Ctrl+C to stop the agent and exit)
 
 What should your agent/agent team do? (describe its purpose):
 

cmd/root/api.go

@@ -80,7 +80,7 @@ func runHTTP(cmd *cobra.Command, args []string) error {
 	}
 	defer func() {
 		for _, team := range teams {
-			if err := team.StopToolSets(); err != nil {
+			if err := team.StopToolSets(ctx); err != nil {
 				slog.Error("Failed to stop tool sets", "error", err)
 			}
 		}

cmd/root/debug.go

@@ -50,7 +50,7 @@ func debugToolsetsCommand(cmd *cobra.Command, args []string) error {
 	}
 
 	slog.Info("Stopping toolsets", "agent", agentFilename)
-	if err := team.StopToolSets(); err != nil {
+	if err := team.StopToolSets(ctx); err != nil {
 		slog.Error("Failed to stop tool sets", "error", err)
 	}
 

cmd/root/new.go

@@ -83,7 +83,7 @@ func NewNewCmd() *cobra.Command {
 				fmt.Print(blue("> "))
 
 				var err error
-				prompt, err = readLine(ctx)
+				prompt, err = readLine(ctx, os.Stdin)
 				if err != nil {
 					return fmt.Errorf("failed to read purpose: %w", err)
 				}

cmd/root/run.go

@@ -1,15 +1,13 @@
 package root
 
 import (
-	"bufio"
 	"bytes"
 	"context"
 	"encoding/base64"
 	"fmt"
 	"io"
 	"log/slog"
 	"os"
-	"os/signal"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -189,7 +187,7 @@ func doRunCommand(ctx context.Context, args []string, exec bool) error {
 			return err
 		}
 		defer func() {
-			if err := agents.StopToolSets(); err != nil {
+			if err := agents.StopToolSets(ctx); err != nil {
 				slog.Error("Failed to stop tool sets", "error", err)
 			}
 		}()
@@ -363,12 +361,21 @@ func doRunCommand(ctx context.Context, args []string, exec bool) error {
 }
 
 func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime, sess *session.Session, args []string) error {
+	// Create a cancellable context for this agentic loop and wire Ctrl+C to cancel it
+	ctx, cancel := context.WithCancel(ctx)
+
+	// Ensure telemetry is initialized and add to context so runtime can access it
+	telemetry.EnsureGlobalTelemetryInitialized()
+	if telemetryClient := telemetry.GetGlobalTelemetryClient(); telemetryClient != nil {
+		ctx = telemetry.WithClient(ctx, telemetryClient)
+	}
+
 	sess.Title = "Running agent"
 	// If the last received event was an error, return it. That way the exit code
 	// will be non-zero if the agent failed.
 	var lastErr error
 
-	oneLoop := func(text string, scannerConfirmations *bufio.Scanner) error {
+	oneLoop := func(text string, rd io.Reader) error {
 		userInput := strings.TrimSpace(text)
 		if userInput == "" {
 			return nil
@@ -383,25 +390,6 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 			return nil
 		}
 
-		// Create a cancellable context for this agentic loop and wire Ctrl+C to cancel it
-		loopCtx, loopCancel := context.WithCancel(ctx)
-
-		// Ensure telemetry is initialized and add to context so runtime can access it
-		telemetry.EnsureGlobalTelemetryInitialized()
-		if telemetryClient := telemetry.GetGlobalTelemetryClient(); telemetryClient != nil {
-			loopCtx = telemetry.WithClient(loopCtx, telemetryClient)
-		}
-
-		sigCh := make(chan os.Signal, 1)
-		signal.Notify(sigCh, os.Interrupt)
-		go func() {
-			<-sigCh
-			// Ensure we break any inline typing output nicely
-			fmt.Println()
-			loopCancel()
-		}()
-		defer signal.Stop(sigCh)
-
 		// Parse for /attach commands in the message
 		messageText, attachPath := parseAttachCommand(userInput)
 
@@ -417,7 +405,7 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 		lastAgent := rt.CurrentAgent().Name()
 		llmIsTyping := false
 		var lastConfirmedToolCallID string
-		for event := range rt.RunStream(loopCtx, sess) {
+		for event := range rt.RunStream(ctx, sess) {
 			agentName := event.GetAgentName()
 			if agentName != "" && (firstLoop || lastAgent != agentName) {
 				if !firstLoop {
@@ -449,9 +437,9 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 					fmt.Println()
 					llmIsTyping = false
 				}
-				result := printToolCallWithConfirmation(e.ToolCall, scannerConfirmations)
+				result := printToolCallWithConfirmation(ctx, e.ToolCall, rd)
 				// If interrupted, skip resuming; the runtime will notice context cancellation and stop
-				if loopCtx.Err() != nil {
+				if ctx.Err() != nil {
 					continue
 				}
 				lastConfirmedToolCallID = e.ToolCall.ID // Store the ID to avoid duplicate printing
@@ -466,7 +454,7 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 					lastConfirmedToolCallID = "" // Clear on reject since tool won't execute
 				case ConfirmationAbort:
 					// Stop the agent loop immediately
-					loopCancel()
+					cancel()
 					continue
 				}
 			case *runtime.ToolCallEvent:
@@ -494,7 +482,7 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 					llmIsTyping = false
 				}
 				lowerErr := strings.ToLower(e.Error)
-				if strings.Contains(lowerErr, "context cancel") && loopCtx.Err() != nil { // treat Ctrl+C cancellations as non-errors
+				if strings.Contains(lowerErr, "context cancel") && ctx.Err() != nil { // treat Ctrl+C cancellations as non-errors
 					lastErr = nil
 				} else {
 					lastErr = fmt.Errorf("%s", e.Error)
@@ -538,7 +526,7 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 		}
 
 		// If the loop ended due to Ctrl+C, inform the user succinctly
-		if loopCtx.Err() != nil {
+		if ctx.Err() != nil {
 			fmt.Println(yellow("\n⚠️  agent stopped  ⚠️"))
 		}
 
@@ -556,17 +544,16 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 				return fmt.Errorf("failed to read from stdin: %w", err)
 			}
 
-			if err := oneLoop(string(buf), bufio.NewScanner(os.Stdin)); err != nil {
+			if err := oneLoop(string(buf), os.Stdin); err != nil {
 				return err
 			}
 		} else {
-			if err := oneLoop(args[1], bufio.NewScanner(os.Stdin)); err != nil {
+			if err := oneLoop(args[1], os.Stdin); err != nil {
 				return err
 			}
 		}
 	} else {
 		printWelcomeMessage()
-		scanner := bufio.NewScanner(os.Stdin)
 		firstQuestion := true
 		for {
 			if !firstQuestion {
@@ -575,18 +562,15 @@ func runWithoutTUI(ctx context.Context, agentFilename string, rt runtime.Runtime
 			fmt.Print(blue("> "))
 			firstQuestion = false
 
-			if !scanner.Scan() {
-				break
+			line, err := readLine(ctx, os.Stdin)
+			if err != nil {
+				return err
 			}
 
-			if err := oneLoop(scanner.Text(), scanner); err != nil {
+			if err := oneLoop(line, os.Stdin); err != nil {
 				return err
 			}
 		}
-
-		if err := scanner.Err(); err != nil {
-			return err
-		}
 	}
 
 	// Wrap runtime errors to prevent duplicate error messages and usage display

cmd/root/run_text_utils.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"os"
 	"strings"
 
@@ -39,7 +40,7 @@ const (
 // text utility functions
 
 func printWelcomeMessage() {
-	fmt.Printf("\n%s\n%s\n\n", blue("------- Welcome to %s! -------", bold(AppName)), white("(Ctrl+C to stop the agent or exit)"))
+	fmt.Printf("\n%s\n%s\n\n", blue("------- Welcome to %s! -------", bold(AppName)), white("(Ctrl+C to stop the agent and exit)"))
 }
 
 func printError(err error) {
@@ -58,7 +59,7 @@ func printToolCall(toolCall tools.ToolCall, colorFunc ...func(format string, a .
 	fmt.Printf("\nCalling %s\n", c("%s%s", bold(toolCall.Function.Name), formatToolCallArguments(toolCall.Function.Arguments)))
 }
 
-func printToolCallWithConfirmation(toolCall tools.ToolCall, scanner *bufio.Scanner) ConfirmationResult {
+func printToolCallWithConfirmation(ctx context.Context, toolCall tools.ToolCall, rd io.Reader) ConfirmationResult {
 	fmt.Printf("\n%s\n", bold(yellow("🛠️ Tool call requires confirmation 🛠️")))
 	printToolCall(toolCall, color.New(color.FgWhite).SprintfFunc())
 	fmt.Printf("\n%s", bold(yellow("Can I run this tool? ([y]es/[a]ll/[n]o): ")))
@@ -97,10 +98,11 @@ func printToolCallWithConfirmation(toolCall tools.ToolCall, scanner *bufio.Scann
 	}
 
 	// Fallback: line-based scanner (requires Enter)
-	if !scanner.Scan() {
+	text, err := readLine(ctx, rd)
+	if err != nil {
 		return ConfirmationReject
 	}
-	text := scanner.Text()
+
 	switch text {
 	case "y":
 		return ConfirmationApprove
@@ -123,7 +125,7 @@ func promptMaxIterationsContinue(ctx context.Context, maxIterations int) Confirm
 	fmt.Printf("%s\n", white("This can happen with smaller or less capable models."))
 	fmt.Printf("\n%s (y/n): ", blue("Do you want to continue for 10 more iterations?"))
 
-	response, err := readLine(ctx)
+	response, err := readLine(ctx, os.Stdin)
 	if err != nil {
 		fmt.Printf("\n%s\n", red("Failed to read input, exiting..."))
 		return ConfirmationAbort
@@ -146,7 +148,7 @@ func promptOAuthAuthorization(ctx context.Context, serverURL string) Confirmatio
 	fmt.Printf("%s\n", white("Your browser will open automatically to complete the authorization."))
 	fmt.Printf("\n%s (y/n): ", blue("Do you want to authorize access?"))
 
-	response, err := readLine(ctx)
+	response, err := readLine(ctx, os.Stdin)
 	if err != nil {
 		fmt.Printf("\n%s\n", red("Failed to read input, aborting authorization..."))
 		return ConfirmationAbort
@@ -290,15 +292,15 @@ func formatJSONValue(key string, value any) string {
 	}
 }
 
-func readLine(ctx context.Context) (string, error) {
+func readLine(ctx context.Context, rd io.Reader) (string, error) {
 	lines := make(chan string)
 	errs := make(chan error)
 
 	go func() {
 		defer close(lines)
 		defer close(errs)
 
-		reader := bufio.NewReader(os.Stdin)
+		reader := bufio.NewReader(rd)
 		line, err := reader.ReadString('\n')
 		if err != nil {
 			errs <- err

pkg/agent/agent.go

@@ -100,7 +100,7 @@ func (a *Agent) Model() provider.Provider {
 
 // Tools returns the tools available to this agent
 func (a *Agent) Tools(ctx context.Context) ([]tools.Tool, error) {
-	if err := a.ensureToolSetsAreStarted(); err != nil {
+	if err := a.ensureToolSetsAreStarted(ctx); err != nil {
 		return nil, err
 	}
 
@@ -149,20 +149,14 @@ func (a *Agent) Commands() map[string]string {
 	return a.commands
 }
 
-func (a *Agent) ensureToolSetsAreStarted() error {
+func (a *Agent) ensureToolSetsAreStarted(ctx context.Context) error {
 	for _, toolSet := range a.toolsets {
 		// Skip if toolset is already started
 		if toolSet.started.Load() {
 			continue
 		}
 
-		// The MCP toolset connection needs to persist beyond the initial HTTP request that triggered its creation.
-		// When OAuth succeeds, subsequent agent requests should reuse the already-authenticated MCP connection.
-		// But if the connection's underlying context is tied to the first HTTP request, it gets cancelled when that request
-		// completes, killing the connection even though OAuth succeeded.
-		// Use background context for starting toolsets to ensure they persist beyond request lifecycle
-		// This is critical for OAuth flows where the toolset connection needs to remain alive after the initial HTTP request completes.
-		if err := toolSet.Start(context.Background()); err != nil {
+		if err := toolSet.Start(ctx); err != nil {
 			return err
 		}
 
@@ -173,14 +167,14 @@ func (a *Agent) ensureToolSetsAreStarted() error {
 	return nil
 }
 
-func (a *Agent) StopToolSets() error {
+func (a *Agent) StopToolSets(ctx context.Context) error {
 	for _, toolSet := range a.toolsets {
 		// Only stop toolsets that are marked as started
 		if !toolSet.started.Load() {
 			continue
 		}
 
-		if err := toolSet.Stop(); err != nil {
+		if err := toolSet.Stop(ctx); err != nil {
 			return fmt.Errorf("failed to stop toolset: %w", err)
 		}
 

pkg/codemode/codemode.go

@@ -117,11 +117,11 @@ func (c *codeModeTool) Start(ctx context.Context) error {
 	return nil
 }
 
-func (c *codeModeTool) Stop() error {
+func (c *codeModeTool) Stop(ctx context.Context) error {
 	var errs []error
 
 	for _, t := range c.toolsets {
-		if err := t.Stop(); err != nil {
+		if err := t.Stop(ctx); err != nil {
 			errs = append(errs, err)
 		}
 	}

pkg/codemode/codemode_test.go

@@ -79,6 +79,6 @@ func TestCodeModeTool_StartStop(t *testing.T) {
 	err := tool.Start(t.Context())
 	require.NoError(t, err)
 
-	err = tool.Stop()
+	err = tool.Stop(t.Context())
 	require.NoError(t, err)
 }

pkg/creator/agent.go

@@ -40,8 +40,8 @@ func (f *fsToolset) Start(ctx context.Context) error {
 	return f.inner.Start(ctx)
 }
 
-func (f *fsToolset) Stop() error {
-	return f.inner.Stop()
+func (f *fsToolset) Stop(ctx context.Context) error {
+	return f.inner.Stop(ctx)
 }
 
 func (f *fsToolset) SetElicitationHandler(tools.ElicitationHandler) {