Add orch wait command

2026-03-19 14:02:33 +08:00
parent 1b0cd723d7
commit f1785b314f
7 changed files with 535 additions and 22 deletions
@@ -4,6 +4,7 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+	"time"
 )

 func TestOrchRunDispatchReconcileLifecycle(t *testing.T) {
@@ -726,3 +727,155 @@ func TestOrchStrictWorktreeAllowsExplicitBaseRefOnDirtyRepo(t *testing.T) {
 		t.Fatalf("expected base_commit %q, got %q", baseCommit, got)
 	}
 }
+
+func TestOrchWaitWakesOnBlockedEvent(t *testing.T) {
+	t.Parallel()
+
+	dbPath := filepath.Join(t.TempDir(), "coord.db")
+
+	runOrchCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"run", "init",
+		"--run", "run_blog_wait_001",
+		"--goal", "Validate wait wake behavior",
+	)
+	runOrchCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"task", "add",
+		"--run", "run_blog_wait_001",
+		"--task", "T1",
+		"--title", "Implement backend",
+		"--default-to", "worker-a",
+	)
+
+	dispatchOut := runOrchCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"dispatch",
+		"--run", "run_blog_wait_001",
+		"--task", "T1",
+	)
+
+	var dispatchResp map[string]any
+	mustDecodeJSON(t, dispatchOut, &dispatchResp)
+	threadID := nestedString(t, dispatchResp, "data", "attempt", "thread_id")
+
+	type waitResult struct {
+		stdout   string
+		stderr   string
+		exitCode int
+	}
+	resultCh := make(chan waitResult, 1)
+	go func() {
+		stdout, stderr, exitCode := executeOrchCommand(
+			"--db", dbPath,
+			"--json",
+			"wait",
+			"--run", "run_blog_wait_001",
+			"--for", "task_blocked",
+			"--after-event", "0",
+			"--timeout-seconds", "2",
+		)
+		resultCh <- waitResult{stdout: stdout, stderr: stderr, exitCode: exitCode}
+	}()
+
+	time.Sleep(200 * time.Millisecond)
+
+	runInboxCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"claim",
+		"--agent", "worker-a",
+		"--thread", threadID,
+	)
+	runInboxCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"update",
+		"--agent", "worker-a",
+		"--thread", threadID,
+		"--status", "blocked",
+		"--summary", "Need logging decision",
+		"--payload-json", `{"question":"stdout or stderr?"}`,
+	)
+
+	select {
+	case result := <-resultCh:
+		if result.exitCode != 0 {
+			t.Fatalf("wait exited with %d\nstderr:\n%s\nstdout:\n%s", result.exitCode, result.stderr, result.stdout)
+		}
+
+		var waitResp map[string]any
+		mustDecodeJSON(t, result.stdout, &waitResp)
+		if woke, _ := nestedValue(t, waitResp, "data", "woke").(bool); !woke {
+			t.Fatalf("expected wait to wake, got %#v", waitResp)
+		}
+		events := nestedArray(t, waitResp, "data", "events")
+		if len(events) != 1 {
+			t.Fatalf("expected one wait event, got %#v", events)
+		}
+		event, ok := events[0].(map[string]any)
+		if !ok {
+			t.Fatalf("expected wait event object, got %#v", events[0])
+		}
+		if got, _ := event["type"].(string); got != "task_blocked" {
+			t.Fatalf("expected task_blocked event, got %#v", event["type"])
+		}
+		if got, _ := event["summary"].(string); got != "Need logging decision" {
+			t.Fatalf("expected blocked summary to surface question summary, got %#v", event["summary"])
+		}
+		payload, ok := event["payload"].(map[string]any)
+		if !ok {
+			t.Fatalf("expected event payload object, got %#v", event["payload"])
+		}
+		if got, _ := payload["question"].(string); got != "stdout or stderr?" {
+			t.Fatalf("expected question payload, got %#v", payload["question"])
+		}
+	case <-time.After(3 * time.Second):
+		t.Fatal("timed out waiting for orch wait result")
+	}
+}
+
+func TestOrchWaitTimesOutWithoutMatchingEvent(t *testing.T) {
+	t.Parallel()
+
+	dbPath := filepath.Join(t.TempDir(), "coord.db")
+
+	runOrchCommand(
+		t,
+		"--db", dbPath,
+		"--json",
+		"run", "init",
+		"--run", "run_blog_wait_002",
+		"--goal", "Validate wait timeout behavior",
+	)
+
+	stdout, stderr, exitCode := executeOrchCommand(
+		"--db", dbPath,
+		"--json",
+		"wait",
+		"--run", "run_blog_wait_002",
+		"--for", "task_done",
+		"--after-event", "0",
+		"--timeout-seconds", "1",
+	)
+	if exitCode != 0 {
+		t.Fatalf("wait exited with %d\nstderr:\n%s\nstdout:\n%s", exitCode, stderr, stdout)
+	}
+
+	var waitResp map[string]any
+	mustDecodeJSON(t, stdout, &waitResp)
+	if woke, _ := nestedValue(t, waitResp, "data", "woke").(bool); woke {
+		t.Fatalf("expected wait timeout, got %#v", waitResp)
+	}
+	if nextEventID, _ := nestedValue(t, waitResp, "data", "next_event_id").(float64); nextEventID != 0 {
+		t.Fatalf("expected next_event_id 0 on timeout, got %#v", nextEventID)
+	}
+}