Merge pull request #2156 from dgageot/decline-elicitations

Decline elicitations in run --exec --json mode

Author: gtardif

pkg/cli/runner.go

@@ -110,6 +110,8 @@ func Run(ctx context.Context, out *Printer, cfg Config, rt runtime.Runtime, sess
 					if !cfg.AutoApprove {
 						rt.Resume(ctx, runtime.ResumeReject(""))
 					}
+				case *runtime.ElicitationRequestEvent:
+					_ = rt.ResumeElicitation(ctx, "decline", nil)
 				case *runtime.MaxIterationsReachedEvent:
 					switch handleMaxIterationsAutoApprove(cfg.AutoApprove, &autoExtensions, e.MaxIterations) {
 					case maxIterContinue:

pkg/cli/runner_test.go

@@ -21,8 +21,10 @@ import (
 type mockRuntime struct {
 	events []runtime.Event
 
-	mu      sync.Mutex
-	resumes []runtime.ResumeRequest
+	mu                    sync.Mutex
+	resumes               []runtime.ResumeRequest
+	elicitationDeclines   int
+	elicitationLastAction tools.ElicitationAction
 }
 
 func (m *mockRuntime) CurrentAgentName() string { return "test" }
@@ -37,7 +39,11 @@ func (m *mockRuntime) Run(context.Context, *session.Session) ([]session.Message,
 	return nil, nil
 }
 
-func (m *mockRuntime) ResumeElicitation(context.Context, tools.ElicitationAction, map[string]any) error {
+func (m *mockRuntime) ResumeElicitation(_ context.Context, action tools.ElicitationAction, _ map[string]any) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	m.elicitationDeclines++
+	m.elicitationLastAction = action
 	return nil
 }
 func (m *mockRuntime) SessionStore() session.Store                                             { return nil }
@@ -178,6 +184,33 @@ func TestMaxIterationsRejectInJSONModeWithoutYolo(t *testing.T) {
 	assert.Equal(t, resumes[0].Type, runtime.ResumeTypeReject)
 }
 
+func TestElicitationAutoDeclineInJSONMode(t *testing.T) {
+	t.Parallel()
+
+	rt := &mockRuntime{
+		events: []runtime.Event{
+			&runtime.ElicitationRequestEvent{
+				Type:    "elicitation_request",
+				Message: "Please authorize",
+				Meta:    map[string]any{"cagent/server_url": "https://example.com"},
+			},
+		},
+	}
+
+	var buf bytes.Buffer
+	out := NewPrinter(&buf)
+	sess := session.New()
+	cfg := Config{OutputJSON: true}
+
+	err := Run(t.Context(), out, cfg, rt, sess, []string{"hello"})
+	assert.NilError(t, err)
+
+	rt.mu.Lock()
+	defer rt.mu.Unlock()
+	assert.Equal(t, rt.elicitationDeclines, 1)
+	assert.Equal(t, rt.elicitationLastAction, tools.ElicitationAction("decline"))
+}
+
 func TestMaxIterationsSafetyCapJSONMode(t *testing.T) {
 	t.Parallel()