logging and metrics

Author: rogeralsing

internal/core/runtime/command_executor_failure_test.go

@@ -42,7 +42,7 @@ func TestCommandFailureLogging(t *testing.T) {
 		},
 	}
 
-	exec := NewCommandExecutor()
+	exec := NewCommandExecutor(nil, nil)
 
 	// Execute and expect an error.
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

internal/core/runtime/command_executor_test.go

@@ -104,7 +104,7 @@ func TestEnforceObservationLimit(t *testing.T) {
 func TestCommandExecutorExecuteInternal(t *testing.T) {
 	t.Parallel()
 
-	executor := NewCommandExecutor()
+	executor := NewCommandExecutor(nil, nil)
 	if err := executor.RegisterInternalCommand("beep", func(_ context.Context, req InternalCommandRequest) (PlanObservationPayload, error) {
 		if req.Name != "beep" {
 			return PlanObservationPayload{}, fmt.Errorf("unexpected name %q", req.Name)
@@ -148,7 +148,7 @@ func TestCommandExecutorExecuteBuiltinApplyPatch(t *testing.T) {
 		t.Fatalf("failed to seed file: %v", err)
 	}
 
-	executor := NewCommandExecutor()
+	executor := NewCommandExecutor(nil, nil)
 	if err := registerBuiltinInternalCommands(nil, executor); err != nil {
 		t.Fatalf("failed to register builtins: %v", err)
 	}
@@ -184,7 +184,7 @@ func TestCommandExecutorExecuteBuiltinApplyPatch(t *testing.T) {
 func TestCommandExecutorExecuteInternalUnknown(t *testing.T) {
 	t.Parallel()
 
-	executor := NewCommandExecutor()
+	executor := NewCommandExecutor(nil, nil)
 	step := PlanStep{ID: "step-1", Command: CommandDraft{Shell: agentShell, Run: "noop"}}
 	_, err := executor.Execute(context.Background(), step)
 	if err == nil || !strings.Contains(err.Error(), "unknown internal command") {

internal/core/runtime/loop.go

@@ -168,110 +168,7 @@ func (r *Runtime) handlePrompt(ctx context.Context, evt InputEvent) error {
 	return nil
 }
 
-func (r *Runtime) planExecutionLoop(ctx context.Context) {
-	for {
-		if ctx.Err() != nil {
-			return
-		}
-
-		pass := r.incrementPassCount()
-		r.options.Metrics.RecordPass(pass)
-		r.options.Logger.Info(ctx, "Starting plan execution pass",
-			Field("pass", pass),
-		)
-
-		if r.options.MaxPasses > 0 && pass > r.options.MaxPasses {
-			message := fmt.Sprintf("Maximum pass limit (%d) reached. Stopping execution.", r.options.MaxPasses)
-			r.emit(RuntimeEvent{
-				Type:     EventTypeError,
-				Message:  message,
-				Level:    StatusLevelError,
-				Metadata: map[string]any{"max_passes": r.options.MaxPasses, "pass": pass},
-			})
-			r.emitRequestInput("Pass limit reached. Provide additional guidance to continue.")
-			if r.options.HandsFree {
-				r.close()
-			}
-			return
-		}
-
-		r.emit(RuntimeEvent{
-			Type:    EventTypeStatus,
-			Message: fmt.Sprintf("Starting plan execution pass #%d.", pass),
-			Level:   StatusLevelInfo,
-		})
-
-		plan, toolCall, err := r.requestPlan(ctx)
-		if err != nil {
-			r.options.Logger.Error(ctx, "Failed to request plan from OpenAI", err,
-				Field("pass", pass),
-			)
-			r.emit(RuntimeEvent{
-				Type:    EventTypeError,
-				Message: fmt.Sprintf("Failed to contact OpenAI: %v", err),
-				Level:   StatusLevelError,
-			})
-			r.emitRequestInput("You can provide another prompt.")
-			return
-		}
-
-		if plan == nil {
-			r.options.Logger.Error(ctx, "Received nil plan response", nil,
-				Field("pass", pass),
-			)
-			r.emit(RuntimeEvent{
-				Type:    EventTypeError,
-				Message: "Received nil plan response.",
-				Level:   StatusLevelError,
-			})
-			r.emitRequestInput("Unable to continue plan execution. Provide the next instruction.")
-			return
-		}
-
-		execCount := r.recordPlanResponse(plan, toolCall)
-
-		if plan.RequireHumanInput {
-			// The assistant explicitly requested help from the human, so surface the
-			// request and pause automated execution until the user responds.
-			r.appendToolObservation(toolCall, PlanObservationPayload{
-				Summary: "Assistant requested additional input before continuing the plan.",
-			})
-			r.emitRequestInput("Assistant requested additional input before continuing.")
-			return
-		}
-
-		if execCount == 0 {
-			r.appendToolObservation(toolCall, PlanObservationPayload{
-				Summary: "Assistant returned a plan without executable steps.",
-			})
-			r.emit(RuntimeEvent{
-				Type:    EventTypeStatus,
-				Message: "Plan has no executable steps.",
-				Level:   StatusLevelInfo,
-			})
-			if r.options.HandsFree {
-				summary := fmt.Sprintf("Hands-free session complete after %d pass(es); assistant reported no further work.", pass)
-				if trimmed := strings.TrimSpace(plan.Message); trimmed != "" {
-					summary = fmt.Sprintf("%s Summary: %s", summary, trimmed)
-				}
-				r.emit(RuntimeEvent{
-					Type:    EventTypeStatus,
-					Message: summary,
-					Level:   StatusLevelInfo,
-				})
-				r.close()
-				return
-			}
-			r.emitRequestInput("Plan has no executable steps. Provide the next instruction.")
-			return
-		}
-
-		r.executePendingCommands(ctx, toolCall)
-		if ctx.Err() != nil {
-			return
-		}
-	}
-}
+// planExecutionLoop is now implemented in plan_execution.go
 
 // requestPlan centralizes the logic for requesting a new plan from the assistant.
 // It snapshots the history to guarantee a consistent view, forwards the request

internal/core/runtime/loop_test.go

@@ -140,7 +140,7 @@ func TestPlanExecutionLoopPausesForHumanInput(t *testing.T) {
 		"data: [DONE]\n\n"
 	transport := &stubTransport{body: []byte(sse), statusCode: http.StatusOK}
 
-	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "")
+	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "", nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create client: %v", err)
 	}
@@ -158,7 +158,7 @@ func TestPlanExecutionLoopPausesForHumanInput(t *testing.T) {
 		closed:    make(chan struct{}),
 		plan:      NewPlanManager(),
 		client:    client,
-		executor:  NewCommandExecutor(),
+		executor:  NewCommandExecutor(nil, nil),
 		history:   []ChatMessage{{Role: RoleSystem, Content: "system"}},
 		agentName: "main",
 	}
@@ -226,7 +226,7 @@ func TestPlanExecutionLoopHandsFreeCompletes(t *testing.T) {
 		"data: [DONE]\n\n"
 	transport := &stubTransport{body: []byte(sse), statusCode: http.StatusOK}
 
-	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "")
+	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "", nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create client: %v", err)
 	}
@@ -245,7 +245,7 @@ func TestPlanExecutionLoopHandsFreeCompletes(t *testing.T) {
 		closed:    make(chan struct{}),
 		plan:      NewPlanManager(),
 		client:    client,
-		executor:  NewCommandExecutor(),
+		executor:  NewCommandExecutor(nil, nil),
 		history:   []ChatMessage{{Role: RoleSystem, Content: "system"}},
 		agentName: "main",
 	}
@@ -323,13 +323,13 @@ func TestPlanExecutionLoopHandsFreeStopsAtPassLimit(t *testing.T) {
 		"data: [DONE]\n\n"
 	transport := &stubTransport{body: []byte(sse), statusCode: http.StatusOK}
 
-	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "")
+	client, err := NewOpenAIClient("test-key", "gpt-4o", "", "", nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create client: %v", err)
 	}
 	client.httpClient = &http.Client{Transport: transport}
 
-	executor := NewCommandExecutor()
+	executor := NewCommandExecutor(nil, nil)
 	if err := executor.RegisterInternalCommand("noop", func(_ context.Context, _ InternalCommandRequest) (PlanObservationPayload, error) {
 		return PlanObservationPayload{Summary: "noop", ExitCode: &zero}, nil
 	}); err != nil {