Merge pull request #1839 from entireio/fix/droid-trust-dialog-e2e

fix(e2e): dismiss Droid trust-folder dialog on interactive start

Author: gtrrz-victor

e2e/agents/droid.go

@@ -191,10 +191,33 @@ func (d *Droid) StartSession(ctx context.Context, dir string) (Session, error) {
 		return nil, err
 	}
 
-	// Wait for the interactive prompt indicator.
-	if _, err := s.WaitFor(`>`, 30*time.Second); err != nil {
+	// Dismiss startup dialogs (folder trust, etc.) then wait for the input
+	// prompt. Droid v0.178.0 added a "Trust this folder?" dialog in interactive
+	// mode for untrusted directories. Its "1. Trust this folder" option is
+	// pre-selected, so Enter confirms it. The dialog renders its selected option
+	// as "> 1. Trust this folder", so a bare ">" match cannot distinguish the
+	// dialog from the real input box — we must key off the dialog chrome (see
+	// isDroidStartupDialog) before treating ">" as ready.
+	foundPrompt := false
+	for range 5 {
+		content, err := s.WaitFor(`>`, 30*time.Second)
+		if err != nil {
+			_ = s.Close()
+			return nil, fmt.Errorf("waiting for startup prompt: %w", err)
+		}
+		if !isDroidStartupDialog(content) {
+			foundPrompt = true
+			break
+		}
+		if err := s.SendKeys("Enter"); err != nil {
+			_ = s.Close()
+			return nil, fmt.Errorf("dismissing startup dialog: %w", err)
+		}
+		time.Sleep(500 * time.Millisecond)
+	}
+	if !foundPrompt {
 		_ = s.Close()
-		return nil, fmt.Errorf("waiting for startup prompt: %w", err)
+		return nil, errors.New("droid did not reach interactive prompt after dismissing startup dialogs")
 	}
 
 	// Droid auto-generates a greeting on startup which fires a Stop hook.
@@ -209,3 +232,16 @@ func (d *Droid) StartSession(ctx context.Context, dir string) (Session, error) {
 
 	return s, nil
 }
+
+// isDroidStartupDialog reports whether the captured pane is showing a Droid
+// startup dialog (currently the "Trust this folder?" prompt) rather than the
+// interactive input box. The dialog renders its pre-selected option as
+// "> 1. Trust this folder", so the presence of ">" alone cannot distinguish it
+// from the real prompt — we key off the dialog title ("trust this folder") and
+// its "exit without trusting" option label instead.
+// Matching is case-insensitive to stay resilient to Droid re-casing its copy.
+func isDroidStartupDialog(content string) bool {
+	lower := strings.ToLower(content)
+	return strings.Contains(lower, "trust this folder") ||
+		strings.Contains(lower, "exit without trusting")
+}

e2e/agents/droid_trust_test.go

@@ -0,0 +1,64 @@
+package agents
+
+import "testing"
+
+// droidTrustDialogPane is a trimmed capture of Droid v0.178.0's interactive
+// "Trust this folder?" startup dialog. The pre-selected option renders as
+// "> 1. Trust this folder", i.e. it uses the same ">" as the real input box —
+// the exact shape that made the old bare-">" WaitFor mistake the dialog for the
+// prompt and swallow the first real prompt.
+const droidTrustDialogPane = `│ Trust this folder?                                                           │
+│                                                                              │
+│ /tmp/e2e-repo-4116086897                                                     │
+│                                                                              │
+│ Droid will read, edit, and run files in this folder, and load any project    │
+│ configuration it defines, including hooks and MCP servers that can execute   │
+│ commands on your machine.                                                    │
+╰──────────────────────────────────────────────────────────────────────────────╯
+
+> 1. Trust this folder
+  2. Exit without trusting
+
+Enter to confirm · Esc to exit`
+
+// droidInteractivePromptPane is the real idle REPL after trust is granted: the
+// input box with a bare ">" and no dialog chrome. This must NOT be classified
+// as a startup dialog.
+const droidInteractivePromptPane = ` Auto (High) · allow all commands           claude-haiku-custom (High) [custom]
+╭──────────────────────────────────────────────────────────────────────────────╮
+│ >                                                                            │
+╰──────────────────────────────────────────────────────────────────────────────╯
+? for help                                                                TMUX ⧉`
+
+// TestIsDroidStartupDialog_DetectsTrustDialog is the regression guard for the
+// Droid v0.178.0 break: the trust dialog must be recognized so StartSession
+// keeps sending Enter to confirm it instead of mistaking "> 1. Trust this
+// folder" for the interactive prompt and sending the first real prompt into a
+// dialog that swallows it.
+func TestIsDroidStartupDialog_DetectsTrustDialog(t *testing.T) {
+	t.Parallel()
+	if !isDroidStartupDialog(droidTrustDialogPane) {
+		t.Fatal("trust dialog should be detected as a startup dialog")
+	}
+}
+
+// TestIsDroidStartupDialog_DetectsByOptionLabel confirms detection keys off the
+// "exit without trusting" option too, so a title-text change in a future Droid
+// release does not silently re-break the handshake.
+func TestIsDroidStartupDialog_DetectsByOptionLabel(t *testing.T) {
+	t.Parallel()
+	const optionOnly = "> 1. Trust folder\n  2. Exit without trusting"
+	if !isDroidStartupDialog(optionOnly) {
+		t.Fatal("the trust dialog's option labels alone should be enough to detect it")
+	}
+}
+
+// TestIsDroidStartupDialog_IgnoresInteractivePrompt ensures the real prompt is
+// not classified as a dialog — otherwise StartSession would loop dismissing a
+// dialog that isn't there and never hand back a usable session.
+func TestIsDroidStartupDialog_IgnoresInteractivePrompt(t *testing.T) {
+	t.Parallel()
+	if isDroidStartupDialog(droidInteractivePromptPane) {
+		t.Fatal("bare interactive prompt should not be classified as a startup dialog")
+	}
+}