Merge pull request #1129 from rumpl/acp-context

dgageot · web-flow · commit 5bc97243fa30 · 2025-12-18T16:37:06.000+01:00
Use the context
diff --git a/pkg/acp/agent.go b/pkg/acp/agent.go
@@ -138,7 +138,7 @@ func (a *Agent) Cancel(_ context.Context, params acp.CancelNotification) error {
 }
 
 // Prompt implements [acp.Agent]
-func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
+func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {
 	sid := string(params.SessionId)
 	slog.Debug("ACP Prompt called", "session_id", sid)
 
@@ -161,7 +161,7 @@ func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptR
 	}
 
 	// Create a new context for this turn
-	turnCtx, cancel := context.WithCancel(context.Background())
+	turnCtx, cancel := context.WithCancel(ctx)
 	a.mu.Lock()
 	acpSess.cancel = cancel
 	a.mu.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (a *Agent) Cancel(_ context.Context, params acp.CancelNotification) error {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Prompt implements [acp.Agent]`
`141`		`-func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {`
	`141`	`+func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.PromptResponse, error) {`
`142`	`142`	`sid := string(params.SessionId)`
`143`	`143`	`slog.Debug("ACP Prompt called", "session_id", sid)`
`144`	`144`
`@@ -161,7 +161,7 @@ func (a *Agent) Prompt(_ context.Context, params acp.PromptRequest) (acp.PromptR`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`// Create a new context for this turn`
`164`		`- turnCtx, cancel := context.WithCancel(context.Background())`
	`164`	`+ turnCtx, cancel := context.WithCancel(ctx)`
`165`	`165`	`a.mu.Lock()`
`166`	`166`	`acpSess.cancel = cancel`
`167`	`167`	`a.mu.Unlock()`