@supatest/cli 0.0.49 → 0.0.50

package/dist/index.js

@@ -24,9 +24,13 @@ You are Supatest AI, an E2E testing assistant. You explore applications, create
 If .supatest/SUPATEST.md does NOT exist, you MUST run discovery before doing anything else:
 1. Read package.json to detect the framework (Playwright, WebDriverIO, Cypress, etc.)
 2. Read 2-3 existing test files to learn patterns (naming, selectors, page objects, assertions)
-3. Write findings to .supatest/SUPATEST.md (framework, test command, file patterns, conventions, selector strategies)
+3. Write findings to .supatest/SUPATEST.md including:
+   - Framework and test command
+   - File patterns and naming conventions
+   - **Selector strategy** \u2014 Document exactly what selectors the project uses (e.g., \`[data-test]\` attributes, \`getByRole\`, CSS classes). Your new tests MUST use the same selector strategy as existing tests.
+   - Page object patterns if present
 
-This file persists across sessions \u2014 future runs skip discovery. Do NOT skip this step.
+NEVER edit existing test files or write new tests until discovery is complete and SUPATEST.md exists. This file persists across sessions \u2014 future runs skip discovery.
 </context>
 
 <bias_to_action>
@@ -40,9 +44,14 @@ Determine what the user needs:
 
 **Build** \u2014 The user wants test scripts created:
 1. If you have enough context (source code, page objects, existing tests), write the test directly. If not, open the app with Agent Browser to see the actual page structure first.
-2. Write tests using semantic locators (button "Submit" \u2192 getByRole('button', { name: 'Submit' })). When creating multiple tests for the same page or flow, write them all before running.
-3. Run tests in headless mode. Run single test first for faster feedback. If a process hangs, kill it and check for interactive flags.
-4. Fix failures and re-run. Max 5 attempts per test.
+2. Write tests using the project's established selector strategy (from SUPATEST.md). If no strategy exists, prefer semantic locators. When creating multiple tests for the same page or flow, write them all before running.
+3. Run tests in headless mode. **For newly written tests, run a single test file first** for faster feedback \u2014 don't run multiple test files in the first command. If a process hangs, kill it and check for interactive flags.
+4. Fix failures and re-run. Max 5 attempts per test. **If the requested feature does not exist in the app, report this to the user rather than testing a substitute feature.**
+
+**Testing with special users** (problem_user, error_user, etc.): These users have known bugs that only manifest with certain products or flows. You MUST:
+1. Test ALL available products/items (not just 2-3) to find user-specific bugs
+2. If a test fails due to unexpected app behavior (e.g., button doesn't respond, wrong data displayed), report it as a potential app bug \u2014 don't just pick a different product that works
+3. Use Agent Browser to visually verify if something seems broken
 
 **When to use Agent Browser during build:** If a test fails and the error is about a selector, missing element, or unexpected page state \u2014 open Agent Browser and snapshot the page before your next attempt. A snapshot takes seconds; re-running a full test to validate a guess takes much longer. The rule: if you've failed once on a selector/UI issue and haven't looked at the live page yet, look first.
 </modes>
@@ -156,21 +165,143 @@ var init_fixer = __esm({
   "src/prompts/fixer.ts"() {
     "use strict";
     fixerPrompt = `<role>
-You are a Test Fixer Agent that debugs failing tests and fixes issues. You work with any test framework.
+You are a Test Fixer Agent that debugs failing E2E tests and fixes issues. You work with any test framework.
+You operate in one of two modes depending on the task you receive.
 </role>
 
-<workflow>
-The failing test output is provided with your task. Start there.
+<modes>
+**UNDERSTAND & FIX MODE** \u2014 When the task starts with "Analyze and fix":
+Follow the 3-phase workflow: Understand \u2192 Plan \u2192 Fix. Never skip phases.
+
+**QUICK FIX MODE** \u2014 When the task starts with "Fix the following":
+Skip analysis. Go directly to investigating and fixing the provided tests.
+</modes>
+
+<understand_and_fix_workflow>
+
+## Phase 1: Understand
+
+Read each failing test's **source code** to understand what it verifies. Then analyze the provided error data.
+
+Present your findings as a markdown table:
+
+| # | Spec File | Test | What It Verifies | Failure Reason | Root Cause | Details |
+|---|-----------|------|------------------|----------------|------------|---------|
+
+Column guidelines:
+- **Spec File**: Short filename with line (e.g., \`login.spec:25\`)
+- **Test**: Short test name
+- **What It Verifies**: Plain English \u2014 the user journey this test protects. Read the test code to determine this. Example: "User can log in with valid credentials" \u2014 not "clicks login button and asserts URL"
+- **Failure Reason**: Plain English \u2014 what went wrong. Example: "Login button not found on page" \u2014 not the raw Playwright error message
+- **Root Cause**: One of: \`Selector\`, \`Timing\`, \`State\`, \`Data\`, \`Logic\`, \`App Bug\`
+- **Details**: Link to run details if URL was provided: \`[View](url)\`
+
+After the table, add a **Patterns** section:
+- Group tests that share the same root cause or would be fixed by the same change
+- Note which fixes will cascade (e.g., "Fixing the login selector in tests #1 and #2 requires one change")
+- Flag flaky tests (pass rate below 80% in history)
+- Note tests that are already claimed/assigned to someone else
+
+Example output:
+\`\`\`
+## Failure Analysis \u2014 6 failures across 3 spec files
+
+| # | Spec File | Test | What It Verifies | Failure Reason | Root Cause | Details |
+|---|-----------|------|------------------|----------------|------------|---------|
+| 1 | login.spec:25 | User login | User can log in with valid credentials | Login button not found \u2014 selector changed | Selector | [View](url) |
+| 2 | login.spec:48 | Wrong password | Error shown for invalid password | Same login button not found | Selector | [View](url) |
+| 3 | cart.spec:102 | Add to cart | User can add item and see updated total | Expected $20.00 but got $25.00 | Data | [View](url) |
+
+**Patterns:**
+- **Login selector (2 tests)**: Tests #1 and #2 share the same broken selector \u2014 one fix resolves both
+- **Cart pricing (1 test)**: Test #3 has a data mismatch \u2014 product price may have changed
+- Test #2 is flaky (65% pass rate) \u2014 may also have an intermittent timing issue
+\`\`\`
+
+## Phase 2: Plan
+
+After presenting your analysis, use the \`AskUserQuestion\` tool to let the user choose how to proceed.
+
+Build the options dynamically based on your analysis:
+
+\`\`\`json
+{
+  "questions": [{
+    "question": "I found N failures grouped into M patterns. How would you like to proceed?",
+    "header": "Fix plan",
+    "options": [
+      {
+        "label": "Fix Group A: [short description] (N tests)",
+        "description": "[Which tests and what the fix involves]"
+      },
+      {
+        "label": "Fix all N failures",
+        "description": "Fix everything sequentially, starting with highest-confidence fixes"
+      },
+      {
+        "label": "Let me choose",
+        "description": "I will tell you which tests to focus on"
+      }
+    ],
+    "multiSelect": false
+  }]
+}
+\`\`\`
+
+Guidelines for building options:
+- Create one option per failure group/pattern you identified
+- Order by confidence \u2014 highest-confidence fix first
+- Always include "Fix all" and "Let me choose" as the last two options
+- Keep labels short (under 60 characters)
+- Descriptions should explain what the fix involves
+
+Wait for the user's response before proceeding.
+
+## Phase 3: Fix
+
+Fix only the tests the user selected. For each test:
+1. Read the test file and relevant source/application code
+2. Identify the minimal change needed
+3. Make the fix
+4. Run the test to verify: \`npx playwright test <file>:<line>\`
+
+After completing each group of related fixes, output a progress table:
+
+| # | Test | Status | Fix Applied |
+|---|------|--------|-------------|
+| 1 | login.spec:25 | \u2705 Fixed | Updated selector to \`data-testid="login-btn"\` |
+| 2 | login.spec:48 | \u2705 Fixed | Same selector change |
+| 3 | cart.spec:102 | \u{1F504} Fixing | Investigating price data source... |
+
+If you completed a group and more groups remain, use \`AskUserQuestion\` to check in:
+\`\`\`json
+{
+  "questions": [{
+    "question": "Group A is fixed (2/2 passing). Continue with the next group?",
+    "header": "Continue",
+    "options": [
+      { "label": "Yes, continue", "description": "Proceed to fix the next group" },
+      { "label": "Stop here", "description": "I'll handle the rest later" }
+    ],
+    "multiSelect": false
+  }]
+}
+\`\`\`
+
+</understand_and_fix_workflow>
+
+<quick_fix_workflow>
+When in Quick Fix mode, follow this workflow:
 
 1. **Analyze** \u2014 Read the error message and stack trace from the provided output
 2. **Categorize** \u2014 Identify root cause: selector, timing, state, data, or logic
 3. **Investigate** \u2014 Read the failing test and relevant source code
 4. **Fix** \u2014 Make minimal, targeted changes. Don't weaken assertions or skip tests.
 5. **Verify** \u2014 Run the single failing test in headless mode to confirm the fix. If a process hangs, kill it and check for interactive flags.
-6. **Iterate** \u2014 If still failing after a fix attempt, and the error involves selectors, missing elements, or unexpected page state: open Agent Browser and snapshot the page before your next attempt. A snapshot takes seconds; re-running the test to validate a guess takes much longer. Max 3 attempts per test.
+6. **Iterate** \u2014 If still failing after a fix attempt, and the error involves selectors, missing elements, or unexpected page state: open Agent Browser and snapshot the page before your next attempt. Max 3 attempts per test.
 
 Continue until all tests pass. After all individual fixes, run the full suite once to check for regressions.
-</workflow>
+</quick_fix_workflow>
 
 <root_causes>
 **Selector** \u2014 Element changed or locator fragile \u2192 update to roles/labels/test IDs (survive refactors unlike CSS classes)
@@ -178,6 +309,7 @@ Continue until all tests pass. After all individual fixes, run the full suite on
 **State** \u2014 Test pollution or setup issue \u2192 ensure cleanup, add preconditions, refresh data
 **Data** \u2014 Hardcoded or missing data \u2192 use dynamic data, create via API
 **Logic** \u2014 Assertion wrong or outdated \u2192 update expectation to match actual behavior
+**App Bug** \u2014 The application itself has a bug, not the test \u2192 report the bug, don't mask it in the test
 </root_causes>
 
 <agent_browser>
@@ -193,12 +325,15 @@ Re-snapshot after each interaction. Walk through the test flow manually to compa
 </agent_browser>
 
 <test_tagging>
-If tests are missing metadata tags, add them \u2014 this is a Supatest platform feature used for filtering, assignment, and reporting.
+**IMPORTANT**: Before completing any fix, check if the test you touched has metadata tags. If tags are missing, add them.
+
+Required tags: @feature:name, @priority:critical|high|medium|low, @test_type:smoke|e2e|regression|integration|unit
+Optional: @owner:email, @ticket:PROJ-123, @slow, @flaky, @key:value
 
-**Tags**: @feature:name, @priority:critical|high|medium|low, @test_type:smoke|e2e|regression|integration|unit, @owner:email, @ticket:PROJ-123, @slow, @flaky, @key:value
+**Playwright**: test("...", { tags: ['@feature:auth', '@priority:high', '@test_type:e2e'] }, async ({ page }) => { });
+**WebdriverIO/Other**: it("... (@feature:auth @priority:high @test_type:e2e)", async () => { });
 
-**Playwright**: test("...", { tags: ['@feature:auth', '@priority:high'] }, async ({ page }) => { });
-**WebdriverIO/Other**: it("... (@feature:auth @priority:high)", async () => { });
+A fix is not complete until the test has proper tags.
 </test_tagging>
 
 <decisions>
@@ -206,6 +341,15 @@ If tests are missing metadata tags, add them \u2014 this is a Supatest platform
 **Escalate:** 3 attempts with no progress, actual app bug found, requirements unclear \u2014 report what you tried and why it didn't work
 </decisions>
 
+<headless_mode>
+When the task includes "[HEADLESS]":
+- Do NOT use the AskUserQuestion tool
+- Proceed automatically through all phases without pausing for input
+- Still output the analysis table and progress updates for CI log visibility
+- Fix all failures sequentially, starting with highest-confidence fixes
+- Generate the final report at the end
+</headless_mode>
+
 <report>
 Generate this once after all tests are addressed, not after each individual test.
 
@@ -854,7 +998,8 @@ var init_config = __esm({
       anthropicModelName: getEnvVar("ANTHROPIC_MODEL_NAME", "claude-opus-4-5"),
       headlessSystemPrompt: fixerPrompt,
       interactiveSystemPrompt: builderPrompt,
-      planSystemPrompt: plannerPrompt
+      planSystemPrompt: plannerPrompt,
+      fixSystemPrompt: fixerPrompt
     };
   }
 });
@@ -868,7 +1013,7 @@ function getModelById(id) {
   return AVAILABLE_MODELS.find((m) => m.id === baseId);
 }
 function getTierFromProviderModel(providerModel) {
-  if (providerModel === "glm-4.7" || providerModel.startsWith("glm-4.7")) {
+  if (providerModel === "glm-5" || providerModel.startsWith("glm-5")) {
     return "premium";
   }
   return null;
@@ -1176,7 +1321,7 @@ function getToolGroupCounts(tools) {
   );
   return Object.entries(groups).map(([name, count]) => ({ name, count })).sort((a, b) => b.count - a.count);
 }
-var AVAILABLE_MODELS, DATE_SUFFIX_REGEX, SMALL_COST_MULTIPLIER, MEDIUM_COST_MULTIPLIER, PREMIUM_COST_MULTIPLIER, SMALL_COST_LABEL, MEDIUM_COST_LABEL, PREMIUM_COST_LABEL, MODEL_TIERS, CONTEXT_WINDOWS, util, objectUtil, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, ParseInputLazyPath, handleResult, ZodType, cuidRegex, cuid2Regex, ulidRegex, uuidRegex, nanoidRegex, jwtRegex, durationRegex, emailRegex, _emojiRegex, emojiRegex, ipv4Regex, ipv4CidrRegex, ipv6Regex, ipv6CidrRegex, base64Regex, base64urlRegex, dateRegexSource, dateRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, ZodBranded, ZodPipeline, ZodReadonly, ZodFirstPartyTypeKind, stringType, numberType, booleanType, dateType, unknownType, arrayType, objectType, unionType, discriminatedUnionType, recordType, functionType, lazyType, literalType, enumType, promiseType, coerce, MAX_API_KEY_NAME_LENGTH, apiKeySchema, apiKeyUsageSchema, createApiKeyRequestSchema, apiKeyResponseSchema, apiKeyUsageSummarySchema, genericErrorSchema, validationErrorSchema, feedbackCategorySchema, FEEDBACK_CATEGORIES, createFeedbackSchema, feedbackResponseSchema, listFeedbackQuerySchema, feedbackListResponseSchema, healthMetricSchema, healthMetricDailyItemSchema, healthMetricsWithDailySchema, healthAnalyticsPeriodSchema, healthAnalyticsDailyItemSchema, healthAnalyticsResponseSchema, MAX_TIMEZONE_CHAR_LENGTH, organizationSchema, organizationSettingsSchema, textBlockSchema, toolUseBlockSchema, toolResultBlockSchema, thinkingBlockSchema, imageBlockSchema, contentBlockSchema, sessionSchema, createSessionRequestSchema, updateSessionRequestSchema, messageSchema, createMessageRequestSchema, cliEventSchema, createCLISessionRequestSchema, queryResultSchema, queryTurnSchema, queryContentSchema, queryUsageSchema, querySchema, runStatusSchema, testResultStatusSchema, testOutcomeSchema, attachmentKindSchema, stepCategorySchema, runSummarySchema, ciMetadataSchema, gitMetadataSchema, playwrightConfigSchema, errorInfoSchema, locationSchema, sourceSnippetSchema, runSchema, annotationSchema, testSchema, testResultSchema, baseStepSchema, stepSchema, attachmentSchema, listRunsQuerySchema, listTestsQuerySchema, runsListResponseSchema, runDetailResponseSchema, coverageTestItemSchema, secondaryTagMetricSchema, tagCoverageSchema, coverageStatsSchema, coverageAlertSchema, coverageDashboardResponseSchema, coverageDashboardQuerySchema, testsListResponseSchema, testDetailResponseSchema, testHistoryItemSchema, testHistoryResponseSchema, topOffenderSchema, topOffendersResponseSchema, trendPointSchema, trendsResponseSchema, errorCategorySchema, failureClusterSchema, newFailureSchema, runInsightsResponseSchema, FailureCategoryEnum, SelectorTypeEnum, FailureCategoryStatsSchema, FailureCategoriesResponseSchema, FailingSelectorStatsSchema, FailingSelectorsResponseSchema, newFailureItemSchema, newFailuresResponseSchema, flakyTestItemSchema, flakyTestsResponseSchema, slowestTestItemSchema, slowestTestsResponseSchema, runSummaryEmailFailureSchema, runSummaryEmailReportSchema, sendRunReportRequestSchema, metricWithTrendSchema, weekOverWeekMetricsSchema, ciComputeTimeSchema, investigationCandidateSchema, failureCategoryBreakdownSchema, stabilityTrendSchema, folderStabilitySchema, managerReportSchema, managerReportQuerySchema, sendManagerReportRequestSchema, reportAttachmentLinkSchema, developerReportRegressionSchema, developerReportFlakyTestSchema, developerReportSlowTestSchema, developerRunSummaryReportSchema, executiveReportStatusSchema, executiveMetricSchema, executiveKeyMetricsSchema, executiveTrendPointSchema, executiveTrendsSchema, executiveFlakyOffenderSchema, executiveSlowestOffenderSchema, executiveTopOffendersSchema, executiveReportSchema, executiveReportQuerySchema, sendExecutiveReportRequestSchema, fixAssignmentStatusSchema, fixAssignmentSchema, testWithAssignmentSchema, listAssignmentsQuerySchema, listTestsWithAssignmentsQuerySchema, assignmentsListResponseSchema, assigneeInfoSchema, assigneesListResponseSchema, assignTestsRequestSchema, assignTestRequestSchema, reassignTestRequestSchema, completeAssignmentsRequestSchema, completeAssignmentRequestSchema, bulkReassignRequestSchema, assignmentResponseSchema, assignTestsResponseSchema, testsWithAssignmentsResponseSchema, bulkReassignResponseSchema, userAssignmentStatsSchema, testCatalogPrioritySchema, testCatalogTypeSchema, testCatalogAssignmentStatusSchema, testCatalogAssignmentSchema, testCatalogDefinitionSchema, testCatalogListItemSchema, testCatalogHistoryEntrySchema, testCatalogListQuerySchema, testCatalogListResponseSchema, testCatalogDetailResponseSchema, testCatalogFilterOptionsSchema, testCatalogAssigneeInfoSchema, testCatalogAssignRequestSchema, testCatalogUpdateAssignmentRequestSchema, testCatalogAssignmentResponseSchema, testCatalogFolderNodeSchema, testCatalogFolderTreeResponseSchema, testCatalogFolderTestsQuerySchema, SECONDS_PER_MINUTE, SECONDS_PER_HOUR, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH, SECONDS_PER_YEAR;
+var AVAILABLE_MODELS, DATE_SUFFIX_REGEX, SMALL_COST_MULTIPLIER, MEDIUM_COST_MULTIPLIER, PREMIUM_COST_MULTIPLIER, SMALL_COST_LABEL, MEDIUM_COST_LABEL, PREMIUM_COST_LABEL, MODEL_TIERS, CONTEXT_WINDOWS, util, objectUtil, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, ParseInputLazyPath, handleResult, ZodType, cuidRegex, cuid2Regex, ulidRegex, uuidRegex, nanoidRegex, jwtRegex, durationRegex, emailRegex, _emojiRegex, emojiRegex, ipv4Regex, ipv4CidrRegex, ipv6Regex, ipv6CidrRegex, base64Regex, base64urlRegex, dateRegexSource, dateRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, ZodBranded, ZodPipeline, ZodReadonly, ZodFirstPartyTypeKind, stringType, numberType, booleanType, dateType, unknownType, arrayType, objectType, unionType, discriminatedUnionType, recordType, functionType, lazyType, literalType, enumType, promiseType, coerce, MAX_API_KEY_NAME_LENGTH, apiKeySchema, apiKeyUsageSchema, createApiKeyRequestSchema, apiKeyResponseSchema, apiKeyUsageSummarySchema, genericErrorSchema, validationErrorSchema, feedbackCategorySchema, FEEDBACK_CATEGORIES, createFeedbackSchema, feedbackResponseSchema, listFeedbackQuerySchema, feedbackListResponseSchema, healthMetricSchema, healthMetricDailyItemSchema, healthMetricsWithDailySchema, healthAnalyticsPeriodSchema, healthAnalyticsDailyItemSchema, healthAnalyticsResponseSchema, MAX_TIMEZONE_CHAR_LENGTH, organizationSchema, organizationSettingsSchema, textBlockSchema, toolUseBlockSchema, toolResultBlockSchema, thinkingBlockSchema, imageBlockSchema, contentBlockSchema, sessionSchema, createSessionRequestSchema, updateSessionRequestSchema, messageSchema, createMessageRequestSchema, cliEventSchema, createCLISessionRequestSchema, queryResultSchema, queryTurnSchema, queryContentSchema, queryUsageSchema, querySchema, runStatusSchema, testResultStatusSchema, testOutcomeSchema, attachmentKindSchema, stepCategorySchema, runSummarySchema, ciMetadataSchema, gitMetadataSchema, playwrightConfigSchema, errorInfoSchema, locationSchema, sourceSnippetSchema, runSchema, annotationSchema, testSchema, testResultSchema, baseStepSchema, stepSchema, attachmentSchema, listRunsQuerySchema, listTestsQuerySchema, runsListResponseSchema, runDetailResponseSchema, coverageTestItemSchema, secondaryTagMetricSchema, tagCoverageSchema, coverageStatsSchema, coverageAlertSchema, coverageDashboardResponseSchema, coverageDashboardQuerySchema, testsListResponseSchema, testDetailResponseSchema, testHistoryItemSchema, testHistoryResponseSchema, topOffenderSchema, topOffendersResponseSchema, trendPointSchema, trendsResponseSchema, errorCategorySchema, failureClusterSchema, newFailureSchema, runInsightsResponseSchema, FailureCategoryEnum, SelectorTypeEnum, FailureCategoryStatsSchema, FailureCategoriesResponseSchema, FailingSelectorStatsSchema, FailingSelectorsResponseSchema, newFailureItemSchema, newFailuresResponseSchema, flakyTestItemSchema, flakyTestsResponseSchema, slowestTestItemSchema, slowestTestsResponseSchema, runSummaryEmailFailureSchema, runSummaryEmailReportSchema, sendRunReportRequestSchema, metricWithTrendSchema, weekOverWeekMetricsSchema, ciComputeTimeSchema, investigationCandidateSchema, failureCategoryBreakdownSchema, stabilityTrendSchema, folderStabilitySchema, managerReportSchema, managerReportQuerySchema, sendManagerReportRequestSchema, reportAttachmentLinkSchema, developerReportRegressionSchema, developerReportFlakyTestSchema, developerReportSlowTestSchema, developerRunSummaryReportSchema, executiveReportStatusSchema, executiveMetricSchema, executiveKeyMetricsSchema, executiveTrendPointSchema, executiveTrendsSchema, executiveFlakyOffenderSchema, executiveSlowestOffenderSchema, executiveTopOffendersSchema, executiveReportSchema, executiveReportQuerySchema, sendExecutiveReportRequestSchema, assigneeInfoSchema, assigneesListResponseSchema, testCatalogPrioritySchema, testCatalogTypeSchema, testCatalogAssignmentStatusSchema, testCatalogAssignmentSchema, testCatalogDefinitionSchema, testCatalogListItemSchema, testCatalogHistoryEntrySchema, testCatalogListQuerySchema, testCatalogListResponseSchema, testCatalogDetailResponseSchema, testCatalogFilterOptionsSchema, testCatalogAssigneeInfoSchema, testCatalogAssignRequestSchema, testCatalogUpdateAssignmentRequestSchema, testCatalogAssignmentResponseSchema, testCatalogFolderNodeSchema, testCatalogFolderTreeResponseSchema, testCatalogFolderTestsQuerySchema, SECONDS_PER_MINUTE, SECONDS_PER_HOUR, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH, SECONDS_PER_YEAR;
 var init_shared_es = __esm({
   "../shared/dist/shared.es.mjs"() {
     "use strict";
@@ -5993,84 +6138,6 @@ var init_shared_es = __esm({
       month: stringType().regex(/^\d{4}-\d{2}$/, "month must be in format YYYY-MM"),
       emails: arrayType(stringType().email())
     });
-    fixAssignmentStatusSchema = enumType([
-      "assigned",
-      // Currently being worked on
-      "completed",
-      // Successfully fixed
-      "failed"
-      // Fix attempt failed
-    ]);
-    fixAssignmentSchema = objectType({
-      id: stringType(),
-      testRunId: stringType(),
-      // Reference to test_run table
-      assignedTo: stringType().optional(),
-      // User ID (Clerk user ID)
-      assignedAt: stringType().optional(),
-      // ISO timestamp
-      status: fixAssignmentStatusSchema.optional(),
-      completedAt: stringType().optional(),
-      reason: stringType().optional(),
-      createdAt: stringType(),
-      updatedAt: stringType()
-    });
-    testWithAssignmentSchema = objectType({
-      // Core test fields from Test schema
-      id: stringType(),
-      readableId: stringType().optional(),
-      runId: stringType(),
-      file: stringType(),
-      title: stringType(),
-      location: objectType({
-        file: stringType(),
-        line: numberType(),
-        column: numberType().optional()
-      }).optional(),
-      status: enumType(["passed", "failed", "timedOut", "skipped", "interrupted"]),
-      durationMs: numberType(),
-      retryCount: numberType(),
-      isFlaky: booleanType().optional(),
-      // Assignment fields
-      assignmentId: stringType().optional(),
-      assignedTo: stringType().optional(),
-      assignedAt: stringType().optional(),
-      assignmentStatus: fixAssignmentStatusSchema.optional(),
-      assignmentCompletedAt: stringType().optional(),
-      assignmentReason: stringType().optional()
-    });
-    listAssignmentsQuerySchema = objectType({
-      runId: stringType().optional(),
-      assignedTo: stringType().optional(),
-      status: fixAssignmentStatusSchema.optional(),
-      file: stringType().optional(),
-      search: stringType().optional(),
-      page: coerce.number().min(1).default(1),
-      limit: coerce.number().min(1).max(100).default(50)
-    });
-    listTestsWithAssignmentsQuerySchema = objectType({
-      assignedTo: stringType().optional(),
-      status: fixAssignmentStatusSchema.optional(),
-      testStatus: enumType(["passed", "failed", "timedOut", "skipped", "interrupted"]).optional(),
-      file: stringType().optional(),
-      search: stringType().optional(),
-      page: coerce.number().min(1).default(1),
-      limit: coerce.number().min(1).max(100).default(50)
-    });
-    assignmentsListResponseSchema = objectType({
-      assignments: arrayType(testWithAssignmentSchema),
-      total: numberType(),
-      page: numberType(),
-      limit: numberType(),
-      // Summary stats
-      stats: objectType({
-        total: numberType(),
-        assigned: numberType(),
-        completed: numberType(),
-        failed: numberType(),
-        unassigned: numberType()
-      })
-    });
     assigneeInfoSchema = objectType({
       id: stringType(),
       name: stringType(),
@@ -6081,84 +6148,6 @@ var init_shared_es = __esm({
     assigneesListResponseSchema = objectType({
       assignees: arrayType(assigneeInfoSchema)
     });
-    assignTestsRequestSchema = objectType({
-      testRunIds: arrayType(stringType()).min(1),
-      assignedTo: stringType().min(1),
-      notes: stringType().optional()
-    });
-    assignTestRequestSchema = objectType({
-      testRunId: stringType(),
-      assignedTo: stringType(),
-      reason: stringType().optional()
-    });
-    reassignTestRequestSchema = objectType({
-      assignedTo: stringType().min(1),
-      notes: stringType().optional()
-    });
-    completeAssignmentsRequestSchema = objectType({
-      assignmentIds: arrayType(stringType()).min(1),
-      status: fixAssignmentStatusSchema,
-      notes: stringType().optional(),
-      fixSessionId: stringType().optional()
-    });
-    completeAssignmentRequestSchema = objectType({
-      assignmentId: stringType(),
-      success: booleanType()
-    });
-    bulkReassignRequestSchema = objectType({
-      fromUser: stringType().min(1),
-      toUser: stringType().min(1),
-      status: fixAssignmentStatusSchema.optional(),
-      notes: stringType().optional()
-    });
-    assignmentResponseSchema = objectType({
-      assignment: fixAssignmentSchema
-    });
-    assignTestsResponseSchema = objectType({
-      assigned: arrayType(
-        objectType({
-          id: stringType(),
-          testRunId: stringType()
-        })
-      ),
-      conflicts: arrayType(
-        objectType({
-          testRunId: stringType(),
-          file: stringType(),
-          title: stringType(),
-          currentAssignee: stringType()
-        })
-      )
-    });
-    testsWithAssignmentsResponseSchema = objectType({
-      tests: arrayType(testWithAssignmentSchema),
-      total: numberType(),
-      page: numberType(),
-      limit: numberType(),
-      stats: objectType({
-        total: numberType(),
-        assigned: numberType(),
-        completed: numberType(),
-        failed: numberType(),
-        unassigned: numberType()
-      })
-    });
-    bulkReassignResponseSchema = objectType({
-      reassigned: numberType(),
-      conflicts: arrayType(
-        objectType({
-          testRunId: stringType(),
-          file: stringType(),
-          title: stringType(),
-          reason: stringType()
-        })
-      )
-    });
-    userAssignmentStatsSchema = objectType({
-      assigned: numberType(),
-      completed: numberType(),
-      failed: numberType()
-    });
     testCatalogPrioritySchema = enumType([
       "critical",
       "high",
@@ -6564,7 +6553,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.49";
+    CLI_VERSION = "0.0.50";
   }
 });
 
@@ -7907,8 +7896,20 @@ ${projectInstructions}`,
           stderr: (msg) => {
             this.presenter.onLog(`[Agent Failure] ${msg}`);
           },
-          // Intercept AskUserQuestion tool to wait for user response
+          // Intercept AskUserQuestion and ExitPlanMode tools to wait for user response
           canUseTool: async (toolName, input) => {
+            if (toolName === "ExitPlanMode") {
+              const questionId2 = `plan-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+              this.presenter.onToolUse?.(toolName, input, questionId2);
+              const answers2 = await this.createQuestionPromise(questionId2);
+              if (answers2 && answers2.approved === "true") {
+                this.presenter.onToolResult?.(questionId2, JSON.stringify({ approved: true }));
+                return { behavior: "allow", updatedInput: input };
+              }
+              const feedbackMsg = answers2?.feedback || "User did not approve the plan.";
+              this.presenter.onToolResult?.(questionId2, JSON.stringify({ approved: false, feedback: feedbackMsg }));
+              return { behavior: "deny", message: feedbackMsg };
+            }
             if (toolName !== "AskUserQuestion") {
               return { behavior: "allow", updatedInput: input };
             }
@@ -8313,17 +8314,21 @@ var init_react = __esm({
         });
       }
       onToolUse(tool, input, toolId) {
-        const message = {
-          type: "tool",
-          content: getToolDescription(tool, input),
-          toolName: getToolDisplayName(tool),
-          toolInput: input,
-          toolResult: void 0,
-          isExpanded: false,
-          isPending: true,
-          toolUseId: toolId
-        };
-        this.callbacks.addMessage(message);
+        const interactiveTools = ["ExitPlanMode", "AskUserQuestion", "EnterPlanMode"];
+        const isInteractiveTool = interactiveTools.includes(tool);
+        if (!isInteractiveTool) {
+          const message = {
+            type: "tool",
+            content: getToolDescription(tool, input),
+            toolName: getToolDisplayName(tool),
+            toolInput: input,
+            toolResult: void 0,
+            isExpanded: false,
+            isPending: true,
+            toolUseId: toolId
+          };
+          this.callbacks.addMessage(message);
+        }
         this.hasAssistantMessage = false;
         this.hasThinkingMessage = false;
         this.currentAssistantText = "";
@@ -8353,7 +8358,7 @@ var init_react = __esm({
             });
           }
         } else if (tool === "ExitPlanMode") {
-          this.callbacks.onExitPlanMode?.();
+          this.callbacks.onPlanApproval?.(toolId, input?.allowedPrompts);
         } else if (tool === "EnterPlanMode") {
           this.callbacks.onEnterPlanMode?.();
         } else if (tool === "AskUserQuestion") {
@@ -8523,6 +8528,7 @@ var init_SessionContext = __esm({
       const [toolGroupsExpanded, setToolGroupsExpanded] = useState(false);
       const [staticRemountKey, setStaticRemountKey] = useState(0);
       const [pendingQuestion, setPendingQuestion] = useState(null);
+      const [pendingPlanApproval, setPendingPlanApproval] = useState(null);
       const addMessage = useCallback(
         (message) => {
           const expandableTools = ["Bash", "BashOutput", "Command Output"];
@@ -8655,7 +8661,9 @@ var init_SessionContext = __esm({
         staticRemountKey,
         refreshStatic,
         pendingQuestion,
-        setPendingQuestion
+        setPendingQuestion,
+        pendingPlanApproval,
+        setPendingPlanApproval
       }), [
         messages,
         addMessage,
@@ -8681,7 +8689,8 @@ var init_SessionContext = __esm({
         llmProvider,
         staticRemountKey,
         refreshStatic,
-        pendingQuestion
+        pendingQuestion,
+        pendingPlanApproval
       ]);
       const usageStatsValue = useMemo(() => ({
         usageStats,
@@ -9622,7 +9631,7 @@ var init_MessageList = __esm({
     });
     StaticHeader.displayName = "StaticHeader";
     MessageList = memo2(({ terminalWidth, currentFolder, gitBranch, headless = false, queuedTasks = [] }) => {
-      const { messages, updateMessageById, isAgentRunning, staticRemountKey, toolGroupsExpanded, toggleToolGroups } = useSession();
+      const { messages, updateMessageById, isAgentRunning, staticRemountKey, toolGroupsExpanded, toggleToolGroups, pendingQuestion, pendingPlanApproval } = useSession();
       const handleToggle = useCallback2((id, currentExpanded) => {
         updateMessageById(id, { isExpanded: !currentExpanded });
       }, [updateMessageById]);
@@ -9765,15 +9774,6 @@ var init_MessageList = __esm({
           }
           flushToolGroup();
         };
-        const completeMessages = [];
-        const inProgressMessages = [];
-        for (const msg of messages) {
-          if (isMessageComplete(msg)) {
-            completeMessages.push(msg);
-          } else {
-            inProgressMessages.push(msg);
-          }
-        }
         let splitIndex = messages.length;
         for (let i = messages.length - 1; i >= 0; i--) {
           if (isMessageComplete(messages[i])) {
@@ -9781,10 +9781,10 @@ var init_MessageList = __esm({
             break;
           }
         }
-        const finalCompleteMessages = messages.slice(0, splitIndex);
-        const finalInProgressMessages = messages.slice(splitIndex);
-        processTurn(finalCompleteMessages, completed);
-        processTurn(finalInProgressMessages, currentTurn);
+        const completeMessages = messages.slice(0, splitIndex);
+        const inProgressMessages = messages.slice(splitIndex);
+        processTurn(completeMessages, completed);
+        processTurn(inProgressMessages, currentTurn);
         return { completedGroups: completed, currentTurnGroups: currentTurn };
       }, [messages]);
       const staticItems = useMemo3(
@@ -9804,7 +9804,7 @@ var init_MessageList = __esm({
           headless,
           staticRemountKey
         }
-      ), staticItems.length > 0 && /* @__PURE__ */ React13.createElement(Static, { items: staticItems, key: `messages-${staticRemountKey}-${toolGroupsExpanded}` }, (item) => {
+      ), staticItems.length > 0 && /* @__PURE__ */ React13.createElement(Static, { items: staticItems, key: `messages-${staticRemountKey}` }, (item) => {
         if (item._isGroup) {
           const content2 = renderGroupedMessage(item);
           if (!content2) {
@@ -9823,7 +9823,7 @@ var init_MessageList = __esm({
           return null;
         }
         return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", key: group.type === "group" ? `current-group-${idx}` : group.messages[0].id, width: "100%" }, content);
-      }), /* @__PURE__ */ React13.createElement(QueuedMessageDisplay, { messageQueue: queuedTasks }), isAgentRunning && !hasPendingAssistant && /* @__PURE__ */ React13.createElement(LoadingMessage, { headless, key: "loading" }), /* @__PURE__ */ React13.createElement(Box12, { height: 1 }));
+      }), /* @__PURE__ */ React13.createElement(QueuedMessageDisplay, { messageQueue: queuedTasks }), isAgentRunning && !hasPendingAssistant && !pendingQuestion && !pendingPlanApproval && /* @__PURE__ */ React13.createElement(LoadingMessage, { headless, key: "loading" }), /* @__PURE__ */ React13.createElement(Box12, { height: 1 }));
     });
     MessageList.displayName = "MessageList";
   }
@@ -12394,6 +12394,9 @@ var init_FeedbackDialog = __esm({
 });
 
 // src/fix/context-builder.ts
+function getFrontendUrl() {
+  return process.env.SUPATEST_FRONTEND_URL || "https://app.supatest.dev";
+}
 function buildTestContext(ctx) {
   const { test, history } = ctx;
   const lines = [];
@@ -12447,6 +12450,20 @@ function buildTestContext(ctx) {
       lines.push("```");
       lines.push("");
     }
+    const attachments = lastResult.attachments;
+    if (attachments && attachments.length > 0) {
+      const screenshots = attachments.filter((a) => a.kind === "screenshot");
+      const traces = attachments.filter((a) => a.kind === "trace");
+      const videos = attachments.filter((a) => a.kind === "video");
+      const parts = [];
+      if (screenshots.length > 0) parts.push(`${screenshots.length} screenshot(s)`);
+      if (traces.length > 0) parts.push(`${traces.length} trace(s)`);
+      if (videos.length > 0) parts.push(`${videos.length} video(s)`);
+      if (parts.length > 0) {
+        lines.push(`## Attachments: ${parts.join(", ")}`);
+        lines.push("");
+      }
+    }
   }
   if (history && history.history.length > 0) {
     const passCount = history.history.filter((h) => h.status === "passed").length;
@@ -12470,7 +12487,7 @@ ${buildTestContext(ctx)}`;
   });
   return sections.join("\n\n");
 }
-function buildFixPrompt(tests) {
+function buildQuickFixPrompt(tests) {
   const intro = tests.length === 1 ? "Fix the following failing test:" : `Fix the following ${tests.length} failing tests:`;
   const context = buildMultipleTestsContext(tests);
   const instructions = `
@@ -12489,6 +12506,130 @@ Focus on fixing the actual issue, not just suppressing the error. If the test is
 ${context}
 ${instructions}`;
 }
+function formatTestForAnalysis(ctx, index, runId, frontendUrl, assignment) {
+  const { test, history } = ctx;
+  const lines = [];
+  const testRunDetailUrl = `${frontendUrl}/runs/${runId}/tests/${test.id}`;
+  lines.push(`### Test ${index + 1}: ${test.title}`);
+  lines.push(`- **File**: ${test.file}${test.location ? `:${test.location.line}` : ""}`);
+  lines.push(`- **Status**: ${test.status} | **Duration**: ${test.durationMs}ms | **Retries**: ${test.retryCount}`);
+  if (test.projectName) {
+    lines.push(`- **Browser/Project**: ${test.projectName}`);
+  }
+  if (test.tags && test.tags.length > 0) {
+    lines.push(`- **Tags**: ${test.tags.join(", ")}`);
+  }
+  lines.push(`- **Details**: [View run details](${testRunDetailUrl})`);
+  if (assignment) {
+    lines.push(`- **Assignment**: Claimed by ${assignment.assignedTo} (${assignment.status})`);
+  }
+  lines.push("");
+  const lastResult = test.results[test.results.length - 1];
+  if (lastResult) {
+    if (lastResult.errors && lastResult.errors.length > 0) {
+      lines.push("**Error:**");
+      for (const error of lastResult.errors) {
+        lines.push(error.message);
+        if (error.stack) {
+          lines.push("```");
+          lines.push(error.stack);
+          lines.push("```");
+        }
+      }
+      lines.push("");
+    }
+    if (lastResult.steps && lastResult.steps.length > 0) {
+      lines.push("**Execution Steps:**");
+      for (const step of lastResult.steps) {
+        const failed = step.error ? " \u2190 FAILED" : "";
+        const duration = `[${step.durationMs}ms]`;
+        lines.push(`- ${duration} ${step.category}: ${step.title}${failed}`);
+        if (step.error) {
+          lines.push(`  Error: ${step.error.message}`);
+        }
+      }
+      lines.push("");
+    }
+    if (lastResult.stdout && lastResult.stdout.length > 0) {
+      const stdout = lastResult.stdout.join("\n");
+      const truncated = stdout.length > 500 ? stdout.slice(0, 500) + "\n... (truncated)" : stdout;
+      lines.push("**Console Output (stdout):**");
+      lines.push("```");
+      lines.push(truncated);
+      lines.push("```");
+      lines.push("");
+    }
+    if (lastResult.stderr && lastResult.stderr.length > 0) {
+      const stderr = lastResult.stderr.join("\n");
+      const truncated = stderr.length > 500 ? stderr.slice(0, 500) + "\n... (truncated)" : stderr;
+      lines.push("**Console Output (stderr):**");
+      lines.push("```");
+      lines.push(truncated);
+      lines.push("```");
+      lines.push("");
+    }
+    const attachments = lastResult.attachments;
+    if (attachments && attachments.length > 0) {
+      const screenshots = attachments.filter((a) => a.kind === "screenshot");
+      const traces = attachments.filter((a) => a.kind === "trace");
+      const videos = attachments.filter((a) => a.kind === "video");
+      const parts = [];
+      if (screenshots.length > 0) parts.push(`${screenshots.length} screenshot(s)`);
+      if (traces.length > 0) parts.push(`${traces.length} trace(s)`);
+      if (videos.length > 0) parts.push(`${videos.length} video(s)`);
+      if (parts.length > 0) {
+        lines.push(`**Attachments**: ${parts.join(", ")} \u2014 [view in dashboard](${testRunDetailUrl})`);
+        lines.push("");
+      }
+    }
+  }
+  if (history && history.history.length > 0) {
+    const passCount = history.history.filter((h) => h.status === "passed").length;
+    const totalCount = history.history.length;
+    const passRate = Math.round(passCount / totalCount * 100);
+    const sparkline = history.history.map((h) => h.status === "passed" ? "\u2713" : "\u2717").join("");
+    lines.push(`**History**: ${sparkline}  (${passRate}% pass rate over last ${totalCount} runs)`);
+    if (passRate > 0 && passRate < 80) {
+      lines.push(`\u26A0 This test appears flaky \u2014 passes ${passRate}% of the time`);
+    }
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+function buildUnderstandAndFixPrompt(tests, run, assignments, options) {
+  const frontendUrl = getFrontendUrl();
+  const runDetailUrl = `${frontendUrl}/runs/${run.id}`;
+  const lines = [];
+  lines.push("Analyze and fix the following test failures.\n");
+  lines.push("## Run Information");
+  lines.push(`- **Run**: ${run.readableId || run.id}`);
+  lines.push(`- **Branch**: ${run.git?.branch || "unknown"}${run.git?.commit ? ` @ ${run.git.commit.slice(0, 7)}` : ""}`);
+  if (run.git?.commitMessage) {
+    lines.push(`- **Commit**: ${run.git.commitMessage}`);
+  }
+  if (run.ci?.provider) {
+    lines.push(`- **CI**: ${run.ci.provider}${run.ci.workflow ? ` / ${run.ci.workflow}` : ""}`);
+  }
+  lines.push(`- **Results**: ${run.summary.failed} failed / ${run.summary.total} total (${run.summary.passed} passed, ${run.summary.flaky} flaky, ${run.summary.skipped} skipped)`);
+  lines.push(`- **Duration**: ${Math.round(run.durationMs / 1e3)}s`);
+  lines.push(`- **Dashboard**: [View full run](${runDetailUrl})`);
+  lines.push("");
+  if (options?.headless) {
+    lines.push("[HEADLESS]\n");
+  }
+  const specFiles = new Set(tests.map((t) => t.test.file));
+  lines.push(`## Failing Tests \u2014 ${tests.length} failure${tests.length !== 1 ? "s" : ""} across ${specFiles.size} spec file${specFiles.size !== 1 ? "s" : ""}`);
+  lines.push("");
+  for (let i = 0; i < tests.length; i++) {
+    const testId = tests[i].test.id;
+    const assignment = assignments?.get(testId) || null;
+    lines.push(formatTestForAnalysis(tests[i], i, run.id, frontendUrl, assignment));
+    if (i < tests.length - 1) {
+      lines.push("---\n");
+    }
+  }
+  return lines.join("\n");
+}
 var init_context_builder = __esm({
   "src/fix/context-builder.ts"() {
     "use strict";
@@ -12924,7 +13065,7 @@ var init_FixFlow = __esm({
       onStartFix,
       initialRunId
     }) => {
-      const [step, setStep] = useState8(initialRunId ? "select-run" : "select-run");
+      const [step, setStep] = useState8("select-run");
       const [selectedRun, setSelectedRun] = useState8(null);
       const [selectedTests, setSelectedTests] = useState8([]);
       const [assignments, setAssignments] = useState8(/* @__PURE__ */ new Map());
@@ -12932,22 +13073,38 @@ var init_FixFlow = __esm({
       const [assignmentIds, setAssignmentIds] = useState8(/* @__PURE__ */ new Map());
       const [loadingProgress, setLoadingProgress] = useState8({ current: 0, total: 0 });
       const [loadError, setLoadError] = useState8(null);
+      const [workflowMode, setWorkflowMode] = useState8(null);
+      const [modeSelectionIndex, setModeSelectionIndex] = useState8(0);
       useInput4((input, key) => {
         if (key.escape || input === "q") {
-          if (step === "select-tests" && selectedRun) {
+          if (step === "choosing-mode" && selectedRun) {
             setSelectedRun(null);
             setStep("select-run");
+          } else if (step === "select-tests" && selectedRun) {
+            setStep("choosing-mode");
           } else if (step === "select-run") {
             onCancel();
-          } else if ((step === "loading-details" || step === "claiming-tests" || step === "error") && loadError) {
+          } else if ((step === "loading-details" || step === "loading-analysis" || step === "claiming-tests" || step === "error") && loadError) {
             setLoadError(null);
-            setStep("select-tests");
+            if (workflowMode === "quick-fix") {
+              setStep("select-tests");
+            } else {
+              setStep("choosing-mode");
+            }
+          }
+        }
+        if (step === "choosing-mode") {
+          if (key.upArrow || key.downArrow) {
+            setModeSelectionIndex((prev) => prev === 0 ? 1 : 0);
+          } else if (key.return) {
+            const mode = modeSelectionIndex === 0 ? "understand-and-fix" : "quick-fix";
+            handleModeSelect(mode);
           }
         }
       });
       const handleRunSelect = (run) => {
         setSelectedRun(run);
-        setStep("select-tests");
+        setStep("choosing-mode");
         fetchAssignments(run.id);
       };
       const fetchAssignments = async (runId) => {
@@ -12990,12 +13147,88 @@ var init_FixFlow = __esm({
           console.error("Failed to load assignments:", err);
         }
       };
+      const handleModeSelect = (mode) => {
+        setWorkflowMode(mode);
+        if (mode === "understand-and-fix") {
+          setStep("loading-analysis");
+          loadAndStartAnalysis();
+        } else {
+          setStep("select-tests");
+        }
+      };
+      const loadAndStartAnalysis = async () => {
+        if (!selectedRun) return;
+        setLoadError(null);
+        try {
+          const result = await apiClient.getRunTestsCatalog(selectedRun.id, {
+            status: "failed",
+            limit: 1e3
+          });
+          if (result.tests.length === 0) {
+            setLoadError("No failed tests found in this run.");
+            setStep("error");
+            return;
+          }
+          setLoadingProgress({ current: 0, total: result.tests.length });
+          const testIds = result.tests.map((t) => t.id);
+          const testDetailsArray = await apiClient.getTestDetailsBulk(testIds);
+          const testDetails = testDetailsArray.filter(
+            (detail) => detail !== null
+          );
+          const histories = await Promise.allSettled(
+            result.tests.map(
+              (t) => apiClient.getTestHistory(t.testId, 10).catch(() => null)
+            )
+          );
+          const testContexts = testDetails.map((test, index) => {
+            const historyResult = histories[index];
+            const history = historyResult?.status === "fulfilled" && historyResult.value ? historyResult.value : void 0;
+            return { test, history };
+          });
+          const assignmentInfoMap = /* @__PURE__ */ new Map();
+          for (const test of result.tests) {
+            if (test.assignment) {
+              assignmentInfoMap.set(test.id, {
+                assignedTo: test.assignment.assignedTo,
+                status: test.assignment.status
+              });
+            }
+          }
+          const prompt = buildUnderstandAndFixPrompt(
+            testContexts,
+            selectedRun,
+            assignmentInfoMap
+          );
+          setSelectedTests(result.tests);
+          setStep("fixing");
+          onStartFix(prompt, result.tests);
+        } catch (err) {
+          const errorMessage = err instanceof Error ? err.message : String(err);
+          if (errorMessage.includes("network") || errorMessage.includes("fetch")) {
+            setLoadError(`Network error: Unable to connect to the server.
+
+Please check your internet connection and try again.
+
+Error: ${errorMessage}`);
+          } else if (errorMessage.includes("auth") || errorMessage.includes("unauthorized")) {
+            setLoadError(`Authentication error: Please run 'supatest auth' to log in.
+
+Error: ${errorMessage}`);
+          } else {
+            setLoadError(`Failed to load test details:
+
+${errorMessage}
+
+Press ESC to go back and try again.`);
+          }
+          setStep("error");
+        }
+      };
       const handleTestsSelect = async (tests) => {
         setSelectedTests(tests);
         setStep("claiming-tests");
         setLoadError(null);
         try {
-          const assignmentMap = /* @__PURE__ */ new Map();
           const testCatalogUuids = [];
           const testRunToCatalogMap = /* @__PURE__ */ new Map();
           for (const test of tests) {
@@ -13009,6 +13242,7 @@ var init_FixFlow = __esm({
           const result = await apiClient.assignTestsBulk({
             testIds: testCatalogUuids
           });
+          const assignmentMap = /* @__PURE__ */ new Map();
           for (const assignment of result.successful) {
             const testRunId = testRunToCatalogMap.get(assignment.testId);
             if (testRunId) {
@@ -13021,10 +13255,7 @@ var init_FixFlow = __esm({
             if (testRunId) {
               const test = tests.find((t) => t.id === testRunId);
               if (test) {
-                conflicts.push({
-                  test,
-                  assignee: conflict.assignedTo
-                });
+                conflicts.push({ test, assignee: conflict.assignedTo });
               }
             }
           }
@@ -13056,7 +13287,7 @@ Please select different tests.`
             (detail) => detail !== null
           );
           const testContexts = testDetails.map((test) => ({ test }));
-          const prompt = buildFixPrompt(testContexts);
+          const prompt = buildQuickFixPrompt(testContexts);
           setStep("fixing");
           onStartFix(prompt, testsToLoad);
         } catch (err) {
@@ -13085,14 +13316,10 @@ Press ESC to go back and try again.`);
         onCancel();
       };
       const handleTestCancel = () => {
-        setSelectedRun(null);
-        setAssignments(/* @__PURE__ */ new Map());
-        setStep("select-run");
+        setStep("choosing-mode");
       };
-      const markAssignmentsComplete = async (fixSessionId) => {
-        if (assignmentIds.size === 0) {
-          return;
-        }
+      const markAssignmentsComplete = async () => {
+        if (assignmentIds.size === 0) return;
         try {
           await Promise.all(
             Array.from(assignmentIds.values()).map(
@@ -13106,21 +13333,6 @@ Press ESC to go back and try again.`);
           console.error("Failed to mark assignments as complete:", err);
         }
       };
-      const releaseAssignments = async () => {
-        if (assignmentIds.size === 0) {
-          return;
-        }
-        try {
-          await Promise.all(
-            Array.from(assignmentIds.values()).map(
-              (assignmentId) => apiClient.releaseAssignment(assignmentId)
-            )
-          );
-          setAssignmentIds(/* @__PURE__ */ new Map());
-        } catch (err) {
-          console.error("Failed to release assignments:", err);
-        }
-      };
       useEffect8(() => {
         if (step === "complete") {
           markAssignmentsComplete();
@@ -13137,10 +13349,47 @@ Press ESC to go back and try again.`);
               onSelect: handleRunSelect
             }
           );
-        case "select-tests":
-          if (!selectedRun) {
-            return null;
+        case "choosing-mode": {
+          const failed = selectedRun?.summary?.failed ?? 0;
+          const branch = selectedRun?.git?.branch || "unknown";
+          const commit = selectedRun?.git?.commit?.slice(0, 7) || "";
+          if (failed === 0) {
+            return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "green", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "green" }, "No Failed Tests"), /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "All tests passed in this run. Nothing to fix!"), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React22.createElement(Text17, { bold: true }, "ESC"), " to go back")));
           }
+          const modes = [
+            {
+              label: "Understand & Fix",
+              description: `Agent analyzes all ${failed} failure${failed !== 1 ? "s" : ""}, shows a summary table with root causes and patterns, then guides you through fixing`
+            },
+            {
+              label: "Quick Fix",
+              description: "Select specific tests to fix immediately \u2014 skip analysis and go straight to fixing"
+            }
+          ];
+          return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Box19, { marginBottom: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, branch, commit && /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, " @ ", commit), /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, " \u2022 "), /* @__PURE__ */ React22.createElement(Text17, { color: "red" }, failed, " failed"))), /* @__PURE__ */ React22.createElement(Box19, { marginBottom: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: theme.text.primary }, "How would you like to proceed?")), /* @__PURE__ */ React22.createElement(Box19, { flexDirection: "column", marginBottom: 1 }, modes.map((mode, index) => {
+            const isSelected = index === modeSelectionIndex;
+            const indicator = isSelected ? "\u25B6 " : "  ";
+            return /* @__PURE__ */ React22.createElement(Box19, { flexDirection: "column", gap: 0, key: mode.label }, /* @__PURE__ */ React22.createElement(Box19, null, /* @__PURE__ */ React22.createElement(
+              Text17,
+              {
+                backgroundColor: isSelected ? theme.text.accent : void 0,
+                bold: isSelected,
+                color: isSelected ? "black" : theme.text.primary
+              },
+              indicator,
+              mode.label
+            )), /* @__PURE__ */ React22.createElement(Box19, { marginLeft: 4 }, /* @__PURE__ */ React22.createElement(
+              Text17,
+              {
+                color: isSelected ? theme.text.primary : theme.text.dim,
+                dimColor: !isSelected
+              },
+              mode.description
+            )));
+          })), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, /* @__PURE__ */ React22.createElement(Text17, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", /* @__PURE__ */ React22.createElement(Text17, { bold: true }, "Enter"), " select \u2022 ", /* @__PURE__ */ React22.createElement(Text17, { bold: true }, "ESC"), " back")));
+        }
+        case "select-tests":
+          if (!selectedRun) return null;
           return /* @__PURE__ */ React22.createElement(
             TestSelector,
             {
@@ -13151,6 +13400,8 @@ Press ESC to go back and try again.`);
               run: selectedRun
             }
           );
+        case "loading-analysis":
+          return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, "Analyzing Failures..."), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Loading test details, error data, and execution history for all failed tests...")), loadingProgress.total > 0 && /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: "yellow" }, loadingProgress.current, " / ", loadingProgress.total, " tests loaded")));
         case "claiming-tests":
           return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, "Claiming Tests..."), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Assigning ", selectedTests.length, " test", selectedTests.length !== 1 ? "s" : "", " to you...")));
         case "loading-details":
@@ -13160,8 +13411,10 @@ Press ESC to go back and try again.`);
           return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, "Loading Test Details..."), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Fetching error messages, stack traces, and execution steps...")), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: "yellow" }, loadingProgress.current, " / ", loadingProgress.total, " tests loaded")));
         case "error":
           return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "red", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "red" }, "Error"), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, loadError)), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React22.createElement(Text17, { bold: true }, "ESC"), " to go back")));
-        case "fixing":
-          return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, "Fixing ", selectedTests.length, " Test", selectedTests.length !== 1 ? "s" : "", "..."), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, selectedTests.map((test, index) => /* @__PURE__ */ React22.createElement(Box19, { key: test.id }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, index + 1, ". ", test.file.split("/").pop(), ":", test.location?.line || "", " - ", test.title)))), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "The agent will now analyze and fix each test...")));
+        case "fixing": {
+          const modeLabel = workflowMode === "understand-and-fix" ? "Analyzing & Fixing" : "Fixing";
+          return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "cyan" }, modeLabel, " ", selectedTests.length, " Test", selectedTests.length !== 1 ? "s" : "", "..."), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, selectedTests.slice(0, 10).map((test, index) => /* @__PURE__ */ React22.createElement(Box19, { key: test.id }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, index + 1, ". ", test.file.split("/").pop(), ":", test.location?.line || "", " - ", test.title))), selectedTests.length > 10 && /* @__PURE__ */ React22.createElement(Box19, null, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "... and ", selectedTests.length - 10, " more"))), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, workflowMode === "understand-and-fix" ? "The agent will analyze all failures, present findings, and guide you through fixing..." : "The agent will now analyze and fix each test...")));
+        }
         case "complete":
           return /* @__PURE__ */ React22.createElement(Box19, { borderColor: "green", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React22.createElement(Text17, { bold: true, color: "green" }, "Tests Marked as Complete"), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "\u2713 ", selectedTests.length, " test", selectedTests.length !== 1 ? "s have" : " has", " been marked as fixed")), /* @__PURE__ */ React22.createElement(Box19, { marginTop: 1 }, /* @__PURE__ */ React22.createElement(Text17, { color: theme.text.dim }, "Press any key to continue...")));
         default:
@@ -14125,9 +14378,87 @@ var init_ProviderSelector = __esm({
   }
 });
 
-// src/ui/components/QuestionSelector.tsx
+// src/ui/components/PlanApprovalSelector.tsx
 import { Box as Box26, Text as Text24, useInput as useInput10 } from "ink";
 import React29, { useState as useState16 } from "react";
+var OPTIONS, PlanApprovalSelector;
+var init_PlanApprovalSelector = __esm({
+  "src/ui/components/PlanApprovalSelector.tsx"() {
+    "use strict";
+    init_theme();
+    OPTIONS = [
+      { label: "Build it", description: "Approve the plan and start building" },
+      { label: "Give feedback", description: "Send feedback to revise the plan" }
+    ];
+    PlanApprovalSelector = ({
+      allowedPrompts,
+      onApprove,
+      onFeedback
+    }) => {
+      const [selectedIndex, setSelectedIndex] = useState16(0);
+      const [feedbackMode, setFeedbackMode] = useState16(false);
+      const [feedbackText, setFeedbackText] = useState16("");
+      useInput10((input, key) => {
+        if (feedbackMode) {
+          if (key.return) {
+            if (feedbackText.trim()) {
+              onFeedback(feedbackText.trim());
+            }
+          } else if (key.escape) {
+            setFeedbackMode(false);
+            setFeedbackText("");
+          } else if (key.backspace || key.delete) {
+            setFeedbackText((prev) => prev.slice(0, -1));
+          } else if (input && !key.ctrl && !key.meta) {
+            setFeedbackText((prev) => prev + input);
+          }
+          return;
+        }
+        if (key.upArrow) {
+          setSelectedIndex((prev) => prev > 0 ? prev - 1 : OPTIONS.length - 1);
+        } else if (key.downArrow) {
+          setSelectedIndex((prev) => prev < OPTIONS.length - 1 ? prev + 1 : 0);
+        } else if (key.return) {
+          if (selectedIndex === 0) {
+            onApprove();
+          } else {
+            setFeedbackMode(true);
+          }
+        } else if (key.escape) {
+          onFeedback("Plan not approved by user.");
+        }
+      });
+      if (feedbackMode) {
+        return /* @__PURE__ */ React29.createElement(Box26, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { bold: true, color: theme.text.accent }, "What changes would you like to the plan?")), /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.primary }, ">", " ", feedbackText, /* @__PURE__ */ React29.createElement(Text24, { backgroundColor: theme.text.accent }, " "))), /* @__PURE__ */ React29.createElement(Box26, { marginTop: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Enter"), " submit feedback \u2022 ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "ESC"), " back to options")));
+      }
+      return /* @__PURE__ */ React29.createElement(Box26, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { bold: true, color: theme.text.accent }, "Plan ready for review")), allowedPrompts && allowedPrompts.length > 0 && /* @__PURE__ */ React29.createElement(Box26, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, "The agent wants to:"), allowedPrompts.map((p, i) => /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim, key: `${p.prompt}-${i}` }, "\u2022 ", p.prompt))), /* @__PURE__ */ React29.createElement(Box26, { flexDirection: "column", marginBottom: 1 }, OPTIONS.map((option, index) => {
+        const isSelected = index === selectedIndex;
+        const indicator = isSelected ? "\u25B6 " : "  ";
+        return /* @__PURE__ */ React29.createElement(Box26, { flexDirection: "column", gap: 0, key: option.label }, /* @__PURE__ */ React29.createElement(Box26, null, /* @__PURE__ */ React29.createElement(
+          Text24,
+          {
+            backgroundColor: isSelected ? theme.text.accent : void 0,
+            bold: isSelected,
+            color: isSelected ? "black" : theme.text.primary
+          },
+          indicator,
+          option.label
+        )), /* @__PURE__ */ React29.createElement(Box26, { marginLeft: 4 }, /* @__PURE__ */ React29.createElement(
+          Text24,
+          {
+            color: isSelected ? theme.text.primary : theme.text.dim,
+            dimColor: !isSelected
+          },
+          option.description
+        )));
+      })), /* @__PURE__ */ React29.createElement(Box26, { marginTop: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Enter"), " select \u2022 ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "ESC"), " cancel")));
+    };
+  }
+});
+
+// src/ui/components/QuestionSelector.tsx
+import { Box as Box27, Text as Text25, useInput as useInput11 } from "ink";
+import React30, { useState as useState17 } from "react";
 var QuestionSelector;
 var init_QuestionSelector = __esm({
   "src/ui/components/QuestionSelector.tsx"() {
@@ -14144,11 +14475,11 @@ var init_QuestionSelector = __esm({
     }) => {
       const hasOptions = options && options.length > 0;
       const allOptions = hasOptions && allowCustomAnswer ? [...options, { label: "Other", description: "Provide a custom response" }] : options;
-      const [selectedIndex, setSelectedIndex] = useState16(0);
-      const [selectedItems, setSelectedItems] = useState16(/* @__PURE__ */ new Set());
-      const [customInputMode, setCustomInputMode] = useState16(!hasOptions);
-      const [customAnswer, setCustomAnswer] = useState16("");
-      useInput10((input, key) => {
+      const [selectedIndex, setSelectedIndex] = useState17(0);
+      const [selectedItems, setSelectedItems] = useState17(/* @__PURE__ */ new Set());
+      const [customInputMode, setCustomInputMode] = useState17(!hasOptions);
+      const [customAnswer, setCustomAnswer] = useState17("");
+      useInput11((input, key) => {
         if (customInputMode) {
           if (key.return) {
             if (customAnswer.trim()) {
@@ -14211,15 +14542,15 @@ var init_QuestionSelector = __esm({
         }
       });
       if (customInputMode) {
-        return /* @__PURE__ */ React29.createElement(Box26, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { bold: true, color: theme.text.accent }, question)), /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, hasOptions ? "Enter your custom answer:" : "Type your answer:")), /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.primary }, ">", " ", customAnswer, /* @__PURE__ */ React29.createElement(Text24, { backgroundColor: theme.text.accent }, " "))), /* @__PURE__ */ React29.createElement(Box26, { marginTop: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Enter"), " submit \u2022 ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "ESC"), " ", hasOptions ? "back to options" : "cancel")));
+        return /* @__PURE__ */ React30.createElement(Box27, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: theme.text.accent }, question)), /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, hasOptions ? "Enter your custom answer:" : "Type your answer:")), /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.primary }, ">", " ", customAnswer, /* @__PURE__ */ React30.createElement(Text25, { backgroundColor: theme.text.accent }, " "))), /* @__PURE__ */ React30.createElement(Box27, { marginTop: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "Enter"), " submit \u2022 ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "ESC"), " ", hasOptions ? "back to options" : "cancel")));
       }
-      return /* @__PURE__ */ React29.createElement(Box26, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { bold: true, color: theme.text.accent }, question)), multiSelect && /* @__PURE__ */ React29.createElement(Box26, { marginBottom: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, "(Select multiple options with ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Space"), ", submit with ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "S"), ")")), /* @__PURE__ */ React29.createElement(Box26, { flexDirection: "column", marginBottom: 1 }, allOptions.map((option, index) => {
+      return /* @__PURE__ */ React30.createElement(Box27, { borderColor: theme.border.accent, borderStyle: "round", flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: theme.text.accent }, question)), multiSelect && /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "(Select multiple options with ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "Space"), ", submit with ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "S"), ")")), /* @__PURE__ */ React30.createElement(Box27, { flexDirection: "column", marginBottom: 1 }, allOptions.map((option, index) => {
         const isSelected = index === selectedIndex;
         const isChosen = selectedItems.has(index);
         const indicator = isSelected ? "\u25B6 " : "  ";
         const checkbox = multiSelect ? isChosen ? "[\u2713] " : "[ ] " : "";
-        return /* @__PURE__ */ React29.createElement(Box26, { flexDirection: "column", gap: 0, key: `${option.label}-${index}` }, /* @__PURE__ */ React29.createElement(Box26, null, /* @__PURE__ */ React29.createElement(
-          Text24,
+        return /* @__PURE__ */ React30.createElement(Box27, { flexDirection: "column", gap: 0, key: `${option.label}-${index}` }, /* @__PURE__ */ React30.createElement(Box27, null, /* @__PURE__ */ React30.createElement(
+          Text25,
           {
             backgroundColor: isSelected ? theme.text.accent : void 0,
             bold: isSelected,
@@ -14228,22 +14559,22 @@ var init_QuestionSelector = __esm({
           indicator,
           checkbox,
           option.label
-        )), /* @__PURE__ */ React29.createElement(Box26, { marginLeft: multiSelect ? 6 : 4 }, /* @__PURE__ */ React29.createElement(
-          Text24,
+        )), /* @__PURE__ */ React30.createElement(Box27, { marginLeft: multiSelect ? 6 : 4 }, /* @__PURE__ */ React30.createElement(
+          Text25,
           {
             color: isSelected ? theme.text.primary : theme.text.dim,
             dimColor: !isSelected
           },
           option.description
         )));
-      })), /* @__PURE__ */ React29.createElement(Box26, { marginTop: 1 }, /* @__PURE__ */ React29.createElement(Text24, { color: theme.text.dim }, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", multiSelect ? /* @__PURE__ */ React29.createElement(React29.Fragment, null, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Space"), " toggle \u2022 ", /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "S"), " submit \u2022", " ") : /* @__PURE__ */ React29.createElement(React29.Fragment, null, /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "Enter"), " select \u2022", " "), /* @__PURE__ */ React29.createElement(Text24, { bold: true }, "ESC"), " cancel")));
+      })), /* @__PURE__ */ React30.createElement(Box27, { marginTop: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "\u2191\u2193"), " navigate \u2022 ", multiSelect ? /* @__PURE__ */ React30.createElement(React30.Fragment, null, /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "Space"), " toggle \u2022 ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "S"), " submit \u2022", " ") : /* @__PURE__ */ React30.createElement(React30.Fragment, null, /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "Enter"), " select \u2022", " "), /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "ESC"), " cancel")));
     };
   }
 });
 
 // src/ui/components/SessionSelector.tsx
-import { Box as Box27, Text as Text25, useInput as useInput11 } from "ink";
-import React30, { useEffect as useEffect12, useState as useState17 } from "react";
+import { Box as Box28, Text as Text26, useInput as useInput12 } from "ink";
+import React31, { useEffect as useEffect12, useState as useState18 } from "react";
 function getSessionPrefix(authMethod) {
   return authMethod === "api-key" ? "[Team]" : "[Me]";
 }
@@ -14258,12 +14589,12 @@ var init_SessionSelector = __esm({
       onSelect,
       onCancel
     }) => {
-      const [allSessions, setAllSessions] = useState17([]);
-      const [selectedIndex, setSelectedIndex] = useState17(0);
-      const [isLoading, setIsLoading] = useState17(false);
-      const [hasMore, setHasMore] = useState17(true);
-      const [totalSessions, setTotalSessions] = useState17(0);
-      const [error, setError] = useState17(null);
+      const [allSessions, setAllSessions] = useState18([]);
+      const [selectedIndex, setSelectedIndex] = useState18(0);
+      const [isLoading, setIsLoading] = useState18(false);
+      const [hasMore, setHasMore] = useState18(true);
+      const [totalSessions, setTotalSessions] = useState18(0);
+      const [error, setError] = useState18(null);
       useEffect12(() => {
         loadMoreSessions();
       }, []);
@@ -14290,7 +14621,7 @@ var init_SessionSelector = __esm({
           setIsLoading(false);
         }
       };
-      useInput11((input, key) => {
+      useInput12((input, key) => {
         if (allSessions.length === 0) {
           if (key.escape || input === "q") {
             onCancel();
@@ -14314,13 +14645,13 @@ var init_SessionSelector = __esm({
         }
       });
       if (error) {
-        return /* @__PURE__ */ React30.createElement(Box27, { borderColor: "red", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: "red" }, "Error Loading Sessions"), /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, error), /* @__PURE__ */ React30.createElement(Box27, { marginTop: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "ESC"), " to cancel")));
+        return /* @__PURE__ */ React31.createElement(Box28, { borderColor: "red", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React31.createElement(Text26, { bold: true, color: "red" }, "Error Loading Sessions"), /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, error), /* @__PURE__ */ React31.createElement(Box28, { marginTop: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "ESC"), " to cancel")));
       }
       if (allSessions.length === 0 && isLoading) {
-        return /* @__PURE__ */ React30.createElement(Box27, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: "cyan" }, "Loading Sessions..."), /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "Fetching your sessions from the server"));
+        return /* @__PURE__ */ React31.createElement(Box28, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React31.createElement(Text26, { bold: true, color: "cyan" }, "Loading Sessions..."), /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "Fetching your sessions from the server"));
       }
       if (allSessions.length === 0 && !isLoading) {
-        return /* @__PURE__ */ React30.createElement(Box27, { borderColor: "yellow", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: "yellow" }, "No Sessions Found"), /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "No previous sessions available. Start a new session!"), /* @__PURE__ */ React30.createElement(Box27, { marginTop: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "ESC"), " to cancel")));
+        return /* @__PURE__ */ React31.createElement(Box28, { borderColor: "yellow", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React31.createElement(Text26, { bold: true, color: "yellow" }, "No Sessions Found"), /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "No previous sessions available. Start a new session!"), /* @__PURE__ */ React31.createElement(Box28, { marginTop: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "ESC"), " to cancel")));
       }
       const VISIBLE_ITEMS3 = 10;
       let startIndex;
@@ -14340,7 +14671,7 @@ var init_SessionSelector = __esm({
       const visibleSessions = allSessions.slice(startIndex, endIndex);
       const MAX_TITLE_WIDTH = 50;
       const PREFIX_WIDTH = 6;
-      return /* @__PURE__ */ React30.createElement(Box27, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { bold: true, color: "cyan" }, "Select a Session to Resume")), /* @__PURE__ */ React30.createElement(Box27, { flexDirection: "column" }, visibleSessions.map((item, index) => {
+      return /* @__PURE__ */ React31.createElement(Box28, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React31.createElement(Box28, { marginBottom: 1 }, /* @__PURE__ */ React31.createElement(Text26, { bold: true, color: "cyan" }, "Select a Session to Resume")), /* @__PURE__ */ React31.createElement(Box28, { flexDirection: "column" }, visibleSessions.map((item, index) => {
         const actualIndex = startIndex + index;
         const isSelected = actualIndex === selectedIndex;
         const title = item.session.title || "Untitled session";
@@ -14364,8 +14695,8 @@ var init_SessionSelector = __esm({
         const prefixColor = item.prefix === "[Me]" ? "cyan" : "yellow";
         const indicator = isSelected ? "\u25B6 " : "  ";
         const bgColor = isSelected ? theme.text.accent : void 0;
-        return /* @__PURE__ */ React30.createElement(Box27, { key: item.session.id, width: "100%" }, /* @__PURE__ */ React30.createElement(Text25, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, indicator), /* @__PURE__ */ React30.createElement(Text25, { backgroundColor: bgColor, bold: isSelected, color: prefixColor }, prefix), /* @__PURE__ */ React30.createElement(Text25, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, displayTitle), /* @__PURE__ */ React30.createElement(Text25, { backgroundColor: bgColor, color: theme.text.dim }, "(", dateStr, ")"));
-      })), /* @__PURE__ */ React30.createElement(Box27, { flexDirection: "column", marginTop: 1 }, (allSessions.length > VISIBLE_ITEMS3 || totalSessions > allSessions.length) && /* @__PURE__ */ React30.createElement(Box27, { marginBottom: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: "yellow" }, "Showing ", startIndex + 1, "-", endIndex, " of ", totalSessions || allSessions.length, " sessions", hasMore && !isLoading && /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, " \u2022 Scroll for more"))), /* @__PURE__ */ React30.createElement(Box27, null, /* @__PURE__ */ React30.createElement(Text25, { color: theme.text.dim }, "Use ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "\u2191\u2193"), " to navigate \u2022 ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "Enter"), " to select \u2022 ", /* @__PURE__ */ React30.createElement(Text25, { bold: true }, "ESC"), " to cancel")), isLoading && /* @__PURE__ */ React30.createElement(Box27, { marginTop: 1 }, /* @__PURE__ */ React30.createElement(Text25, { color: "cyan" }, "Loading more sessions..."))));
+        return /* @__PURE__ */ React31.createElement(Box28, { key: item.session.id, width: "100%" }, /* @__PURE__ */ React31.createElement(Text26, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, indicator), /* @__PURE__ */ React31.createElement(Text26, { backgroundColor: bgColor, bold: isSelected, color: prefixColor }, prefix), /* @__PURE__ */ React31.createElement(Text26, { backgroundColor: bgColor, bold: isSelected, color: isSelected ? "black" : theme.text.primary }, displayTitle), /* @__PURE__ */ React31.createElement(Text26, { backgroundColor: bgColor, color: theme.text.dim }, "(", dateStr, ")"));
+      })), /* @__PURE__ */ React31.createElement(Box28, { flexDirection: "column", marginTop: 1 }, (allSessions.length > VISIBLE_ITEMS3 || totalSessions > allSessions.length) && /* @__PURE__ */ React31.createElement(Box28, { marginBottom: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: "yellow" }, "Showing ", startIndex + 1, "-", endIndex, " of ", totalSessions || allSessions.length, " sessions", hasMore && !isLoading && /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, " \u2022 Scroll for more"))), /* @__PURE__ */ React31.createElement(Box28, null, /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "Use ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "\u2191\u2193"), " to navigate \u2022 ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "Enter"), " to select \u2022 ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "ESC"), " to cancel")), isLoading && /* @__PURE__ */ React31.createElement(Box28, { marginTop: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: "cyan" }, "Loading more sessions..."))));
     };
   }
 });
@@ -14416,9 +14747,9 @@ var init_useOverlayEscapeGuard = __esm({
 // src/ui/App.tsx
 import { execSync as execSync5 } from "child_process";
 import { homedir as homedir9 } from "os";
-import { Box as Box28, Text as Text26, useApp as useApp2, useStdout as useStdout2 } from "ink";
+import { Box as Box29, Text as Text27, useApp as useApp2, useStdout as useStdout2 } from "ink";
 import Spinner4 from "ink-spinner";
-import React31, { useCallback as useCallback5, useEffect as useEffect14, useRef as useRef8, useState as useState18 } from "react";
+import React32, { useCallback as useCallback5, useEffect as useEffect14, useRef as useRef8, useState as useState19 } from "react";
 var getGitBranch2, getCurrentFolder2, AppContent, App;
 var init_App = __esm({
   "src/ui/App.tsx"() {
@@ -14445,6 +14776,7 @@ var init_App = __esm({
     init_MessageList();
     init_ModelSelector();
     init_ProviderSelector();
+    init_PlanApprovalSelector();
     init_QuestionSelector();
     init_SessionSelector();
     init_SessionContext();
@@ -14468,37 +14800,37 @@ var init_App = __esm({
       }
       return cwd;
     };
-    AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession, onClearSession, onQuestionAnswer }) => {
+    AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession, onClearSession, onQuestionAnswer, onPlanAnswer }) => {
       const { exit } = useApp2();
       const { stdout } = useStdout2();
-      const { addMessage, clearMessages, isAgentRunning, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded, selectedModel, setSelectedModel, refreshStatic, toggleToolGroups, llmProvider, setLlmProvider, pendingQuestion, setPendingQuestion } = useSession();
+      const { addMessage, clearMessages, isAgentRunning, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded, selectedModel, setSelectedModel, refreshStatic, toggleToolGroups, llmProvider, setLlmProvider, pendingQuestion, setPendingQuestion, pendingPlanApproval, setPendingPlanApproval, agentMode, setAgentMode } = useSession();
       useModeToggle();
-      const [terminalWidth, setTerminalWidth] = useState18(process.stdout.columns || 80);
-      const [showInput, setShowInput] = useState18(true);
-      const [gitBranch] = useState18(() => getGitBranch2());
-      const [currentFolder] = useState18(() => getCurrentFolder2(config2.cwd));
+      const [terminalWidth, setTerminalWidth] = useState19(process.stdout.columns || 80);
+      const [showInput, setShowInput] = useState19(true);
+      const [gitBranch] = useState19(() => getGitBranch2());
+      const [currentFolder] = useState19(() => getCurrentFolder2(config2.cwd));
       const hasInputContentRef = useRef8(false);
-      const [exitWarning, setExitWarning] = useState18(null);
+      const [exitWarning, setExitWarning] = useState19(null);
       const inputPromptRef = useRef8(null);
-      const [showSessionSelector, setShowSessionSelector] = useState18(false);
-      const [showModelSelector, setShowModelSelector] = useState18(false);
-      const [showProviderSelector, setShowProviderSelector] = useState18(false);
-      const [claudeMaxAvailable, setClaudeMaxAvailable] = useState18(false);
-      const [showFeedbackDialog, setShowFeedbackDialog] = useState18(false);
-      const [isLoadingSession, setIsLoadingSession] = useState18(false);
-      const [showFixFlow, setShowFixFlow] = useState18(false);
-      const [fixRunId, setFixRunId] = useState18(void 0);
-      const [showMcpServers, setShowMcpServers] = useState18(false);
-      const [showMcpAdd, setShowMcpAdd] = useState18(false);
-      const [showMcpSelector, setShowMcpSelector] = useState18(false);
-      const [mcpSelectorAction, setMcpSelectorAction] = useState18(
+      const [showSessionSelector, setShowSessionSelector] = useState19(false);
+      const [showModelSelector, setShowModelSelector] = useState19(false);
+      const [showProviderSelector, setShowProviderSelector] = useState19(false);
+      const [claudeMaxAvailable, setClaudeMaxAvailable] = useState19(false);
+      const [showFeedbackDialog, setShowFeedbackDialog] = useState19(false);
+      const [isLoadingSession, setIsLoadingSession] = useState19(false);
+      const [showFixFlow, setShowFixFlow] = useState19(false);
+      const [fixRunId, setFixRunId] = useState19(void 0);
+      const [showMcpServers, setShowMcpServers] = useState19(false);
+      const [showMcpAdd, setShowMcpAdd] = useState19(false);
+      const [showMcpSelector, setShowMcpSelector] = useState19(false);
+      const [mcpSelectorAction, setMcpSelectorAction] = useState19(
         "remove"
       );
-      const [mcpServers, setMcpServers] = useState18([]);
-      const [authState, setAuthState] = useState18(
+      const [mcpServers, setMcpServers] = useState19([]);
+      const [authState, setAuthState] = useState19(
         () => config2.supatestApiKey ? "authenticated" /* Authenticated */ : "unauthenticated" /* Unauthenticated */
       );
-      const [showAuthDialog, setShowAuthDialog] = useState18(false);
+      const [showAuthDialog, setShowAuthDialog] = useState19(false);
       const { isOverlayOpen, isCancelSuppressed, markOverlayClosed } = useOverlayEscapeGuard({
         overlays: [
           showSessionSelector,
@@ -14510,7 +14842,8 @@ var init_App = __esm({
           showMcpServers,
           showMcpAdd,
           showMcpSelector,
-          !!pendingQuestion
+          !!pendingQuestion,
+          !!pendingPlanApproval
         ]
       });
       useEffect14(() => {
@@ -14526,6 +14859,11 @@ var init_App = __esm({
           setWebUrl(webUrl);
         }
       }, [sessionId, webUrl, setSessionId, setWebUrl]);
+      useEffect14(() => {
+        if (!isAgentRunning && agentMode === "fix") {
+          setAgentMode("build");
+        }
+      }, [isAgentRunning, agentMode, setAgentMode]);
       const handleLogin = async () => {
         setShowAuthDialog(false);
         setAuthState("authenticating" /* Authenticating */);
@@ -14895,6 +15233,31 @@ var init_App = __esm({
         setPendingQuestion(null);
         markOverlayClosed();
       };
+      const handlePlanApprove = () => {
+        if (!pendingPlanApproval) return;
+        addMessage({
+          type: "user",
+          content: "Plan approved \u2014 build it."
+        });
+        setAgentMode("build");
+        if (onPlanAnswer) {
+          onPlanAnswer(pendingPlanApproval.toolUseId, true);
+        }
+        setPendingPlanApproval(null);
+        markOverlayClosed();
+      };
+      const handlePlanFeedback = (feedback) => {
+        if (!pendingPlanApproval) return;
+        addMessage({
+          type: "user",
+          content: feedback
+        });
+        if (onPlanAnswer) {
+          onPlanAnswer(pendingPlanApproval.toolUseId, false, feedback);
+        }
+        setPendingPlanApproval(null);
+        markOverlayClosed();
+      };
       const handleFixFlowCancel = () => {
         markOverlayClosed();
         setShowFixFlow(false);
@@ -14920,6 +15283,7 @@ var init_App = __esm({
           });
           return;
         }
+        setAgentMode("fix");
         addMessage({
           type: "user",
           content: prompt
@@ -15114,14 +15478,14 @@ var init_App = __esm({
           });
         }
       }, []);
-      return /* @__PURE__ */ React31.createElement(
-        Box28,
+      return /* @__PURE__ */ React32.createElement(
+        Box29,
         {
           flexDirection: "column",
           paddingX: 1
         },
-        /* @__PURE__ */ React31.createElement(MessageList, { currentFolder, gitBranch, queuedTasks, terminalWidth }),
-        showSessionSelector && apiClient && /* @__PURE__ */ React31.createElement(
+        /* @__PURE__ */ React32.createElement(MessageList, { currentFolder, gitBranch, queuedTasks, terminalWidth }),
+        showSessionSelector && apiClient && /* @__PURE__ */ React32.createElement(
           SessionSelector,
           {
             apiClient,
@@ -15129,8 +15493,8 @@ var init_App = __esm({
             onSelect: handleSessionSelect
           }
         ),
-        isLoadingSession && /* @__PURE__ */ React31.createElement(Box28, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React31.createElement(Box28, { flexDirection: "row" }, /* @__PURE__ */ React31.createElement(Box28, { width: 2 }, /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.accent }, /* @__PURE__ */ React31.createElement(Spinner4, { type: "dots" }))), /* @__PURE__ */ React31.createElement(Text26, { bold: true, color: "cyan" }, "Loading session...")), /* @__PURE__ */ React31.createElement(Text26, { color: theme.text.dim }, "Fetching queries and context")),
-        showModelSelector && /* @__PURE__ */ React31.createElement(
+        isLoadingSession && /* @__PURE__ */ React32.createElement(Box29, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React32.createElement(Box29, { flexDirection: "row" }, /* @__PURE__ */ React32.createElement(Box29, { width: 2 }, /* @__PURE__ */ React32.createElement(Text27, { color: theme.text.accent }, /* @__PURE__ */ React32.createElement(Spinner4, { type: "dots" }))), /* @__PURE__ */ React32.createElement(Text27, { bold: true, color: "cyan" }, "Loading session...")), /* @__PURE__ */ React32.createElement(Text27, { color: theme.text.dim }, "Fetching queries and context")),
+        showModelSelector && /* @__PURE__ */ React32.createElement(
           ModelSelector,
           {
             currentModel: selectedModel,
@@ -15139,7 +15503,7 @@ var init_App = __esm({
             onSelect: handleModelSelect
           }
         ),
-        showProviderSelector && /* @__PURE__ */ React31.createElement(
+        showProviderSelector && /* @__PURE__ */ React32.createElement(
           ProviderSelector,
           {
             currentProvider: llmProvider,
@@ -15147,20 +15511,20 @@ var init_App = __esm({
             onSelect: handleProviderSelect
           }
         ),
-        showAuthDialog && /* @__PURE__ */ React31.createElement(
+        showAuthDialog && /* @__PURE__ */ React32.createElement(
           AuthDialog,
           {
             onLogin: handleLogin
           }
         ),
-        showFeedbackDialog && /* @__PURE__ */ React31.createElement(
+        showFeedbackDialog && /* @__PURE__ */ React32.createElement(
           FeedbackDialog,
           {
             onCancel: handleFeedbackCancel,
             onSubmit: handleFeedbackSubmit
           }
         ),
-        showFixFlow && apiClient && /* @__PURE__ */ React31.createElement(
+        showFixFlow && apiClient && /* @__PURE__ */ React32.createElement(
           FixFlow,
           {
             apiClient,
@@ -15170,7 +15534,7 @@ var init_App = __esm({
             onStartFix: handleFixStart
           }
         ),
-        showMcpServers && /* @__PURE__ */ React31.createElement(
+        showMcpServers && /* @__PURE__ */ React32.createElement(
           McpServersDisplay,
           {
             cwd: config2.cwd,
@@ -15180,8 +15544,8 @@ var init_App = __esm({
             onTest: handleMcpTest
           }
         ),
-        showMcpAdd && /* @__PURE__ */ React31.createElement(McpAddDialog, { onCancel: handleMcpAddCancel, onConfirm: handleMcpAddConfirm }),
-        showMcpSelector && /* @__PURE__ */ React31.createElement(
+        showMcpAdd && /* @__PURE__ */ React32.createElement(McpAddDialog, { onCancel: handleMcpAddCancel, onConfirm: handleMcpAddConfirm }),
+        showMcpSelector && /* @__PURE__ */ React32.createElement(
           McpServerSelector,
           {
             action: mcpSelectorAction,
@@ -15190,7 +15554,7 @@ var init_App = __esm({
             servers: mcpServers
           }
         ),
-        pendingQuestion && /* @__PURE__ */ React31.createElement(
+        /* @__PURE__ */ React32.createElement(Box29, { flexDirection: "column" }, !showAuthDialog && /* @__PURE__ */ React32.createElement(AuthBanner, { authState }), pendingQuestion && /* @__PURE__ */ React32.createElement(
           QuestionSelector,
           {
             multiSelect: pendingQuestion.multiSelect,
@@ -15199,8 +15563,14 @@ var init_App = __esm({
             options: pendingQuestion.options || [],
             question: pendingQuestion.question
           }
-        ),
-        /* @__PURE__ */ React31.createElement(Box28, { flexDirection: "column" }, !showAuthDialog && /* @__PURE__ */ React31.createElement(AuthBanner, { authState }), showInput && !showSessionSelector && !showAuthDialog && !showModelSelector && !showProviderSelector && !showFeedbackDialog && !showFixFlow && !showMcpServers && !showMcpAdd && !showMcpSelector && !pendingQuestion && !isLoadingSession && /* @__PURE__ */ React31.createElement(Box28, { flexDirection: "column", marginTop: 0, width: "100%" }, exitWarning && /* @__PURE__ */ React31.createElement(Box28, { marginBottom: 0, paddingX: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: "yellow" }, exitWarning)), /* @__PURE__ */ React31.createElement(
+        ), pendingPlanApproval && /* @__PURE__ */ React32.createElement(
+          PlanApprovalSelector,
+          {
+            allowedPrompts: pendingPlanApproval.allowedPrompts,
+            onApprove: handlePlanApprove,
+            onFeedback: handlePlanFeedback
+          }
+        ), showInput && !showSessionSelector && !showAuthDialog && !showModelSelector && !showProviderSelector && !showFeedbackDialog && !showFixFlow && !showMcpServers && !showMcpAdd && !showMcpSelector && !pendingQuestion && !pendingPlanApproval && !isLoadingSession && /* @__PURE__ */ React32.createElement(Box29, { flexDirection: "column", marginTop: 0, width: "100%" }, exitWarning && /* @__PURE__ */ React32.createElement(Box29, { marginBottom: 0, paddingX: 1 }, /* @__PURE__ */ React32.createElement(Text27, { color: "yellow" }, exitWarning)), /* @__PURE__ */ React32.createElement(
           InputPrompt,
           {
             currentFolder,
@@ -15216,7 +15586,7 @@ var init_App = __esm({
       );
     };
     App = (props) => {
-      return /* @__PURE__ */ React31.createElement(AppContent, { ...props });
+      return /* @__PURE__ */ React32.createElement(AppContent, { ...props });
     };
   }
 });
@@ -15246,13 +15616,32 @@ var init_useBracketedPaste = __esm({
   }
 });
 
+// src/utils/prompt-routing.ts
+function getSystemPromptForMode(mode) {
+  switch (mode) {
+    case "plan":
+      return config.planSystemPrompt;
+    case "fix":
+      return config.fixSystemPrompt;
+    case "build":
+    default:
+      return config.interactiveSystemPrompt;
+  }
+}
+var init_prompt_routing = __esm({
+  async "src/utils/prompt-routing.ts"() {
+    "use strict";
+    await init_config();
+  }
+});
+
 // src/modes/interactive.tsx
 var interactive_exports = {};
 __export(interactive_exports, {
   runInteractive: () => runInteractive
 });
 import { render as render2 } from "ink";
-import React32, { useEffect as useEffect16, useRef as useRef9 } from "react";
+import React33, { useEffect as useEffect16, useRef as useRef9 } from "react";
 function getToolDescription2(toolName, input) {
   switch (toolName) {
     case "Read":
@@ -15385,7 +15774,7 @@ async function runInteractive(config2) {
       webUrl = session.webUrl;
     }
     const { unmount, waitUntilExit } = render2(
-      /* @__PURE__ */ React32.createElement(
+      /* @__PURE__ */ React33.createElement(
         InteractiveApp,
         {
           apiClient,
@@ -15435,7 +15824,6 @@ var AgentRunner, InteractiveAppContent, InteractiveApp;
 var init_interactive = __esm({
   async "src/modes/interactive.tsx"() {
     "use strict";
-    await init_config();
     await init_agent();
     init_message_bridge();
     init_react();
@@ -15447,6 +15835,7 @@ var init_interactive = __esm({
     init_mouse();
     init_claude_max();
     init_logger();
+    await init_prompt_routing();
     init_settings_loader();
     init_stdio();
     init_version();
@@ -15465,7 +15854,8 @@ var init_interactive = __esm({
         planFilePath,
         selectedModel,
         llmProvider,
-        setPendingQuestion
+        setPendingQuestion,
+        setPendingPlanApproval
       } = useSession();
       const { setUsageStats } = useUsageStats();
       const agentRef = useRef9(null);
@@ -15515,6 +15905,14 @@ var init_interactive = __esm({
                 onEnterPlanMode: () => {
                   if (isMounted) setAgentMode("plan");
                 },
+                onPlanApproval: (toolId, allowedPrompts) => {
+                  if (isMounted) {
+                    setPendingPlanApproval({
+                      toolUseId: toolId,
+                      allowedPrompts
+                    });
+                  }
+                },
                 onTurnComplete: () => {
                   if (isMounted) onTurnComplete?.();
                 },
@@ -15558,7 +15956,7 @@ var init_interactive = __esm({
               planFilePath,
               selectedModel,
               oauthToken,
-              systemPromptAppend: agentMode === "plan" ? config.planSystemPrompt : config2.systemPromptAppend
+              systemPromptAppend: getSystemPromptForMode(agentMode)
             };
             const agent2 = new CoreAgent(presenter, messageBridge);
             agentRef.current = agent2;
@@ -15605,18 +16003,18 @@ var init_interactive = __esm({
         setIsAgentRunning
       } = useSession();
       const { setUsageStats } = useUsageStats();
-      const [sessionId, setSessionId] = React32.useState(initialSessionId);
-      const [currentTask, setCurrentTask] = React32.useState(config2.task);
-      const [taskId, setTaskId] = React32.useState(0);
-      const [shouldRunAgent, setShouldRunAgent] = React32.useState(!!config2.task);
-      const [taskQueue, setTaskQueue] = React32.useState([]);
-      const [providerSessionId, setProviderSessionId] = React32.useState();
-      const messageBridgeRef = React32.useRef(null);
-      const agentRef = React32.useRef(null);
-      const lastSubmitRef = React32.useRef(null);
-      const [pendingInjected, setPendingInjected] = React32.useState([]);
-      const pendingInjectedRef = React32.useRef([]);
-      React32.useEffect(() => {
+      const [sessionId, setSessionId] = React33.useState(initialSessionId);
+      const [currentTask, setCurrentTask] = React33.useState(config2.task);
+      const [taskId, setTaskId] = React33.useState(0);
+      const [shouldRunAgent, setShouldRunAgent] = React33.useState(!!config2.task);
+      const [taskQueue, setTaskQueue] = React33.useState([]);
+      const [providerSessionId, setProviderSessionId] = React33.useState();
+      const messageBridgeRef = React33.useRef(null);
+      const agentRef = React33.useRef(null);
+      const lastSubmitRef = React33.useRef(null);
+      const [pendingInjected, setPendingInjected] = React33.useState([]);
+      const pendingInjectedRef = React33.useRef([]);
+      React33.useEffect(() => {
         pendingInjectedRef.current = pendingInjected;
       }, [pendingInjected]);
       const handleSubmitTask = async (task) => {
@@ -15680,7 +16078,7 @@ var init_interactive = __esm({
       if (shouldRunAgent && !messageBridgeRef.current) {
         messageBridgeRef.current = new MessageBridge(providerSessionId || "");
       }
-      React32.useEffect(() => {
+      React33.useEffect(() => {
         if (!shouldRunAgent && taskQueue.length > 0) {
           const [nextTask, ...remaining] = taskQueue;
           setTaskQueue(remaining);
@@ -15694,26 +16092,35 @@ var init_interactive = __esm({
           setShouldRunAgent(true);
         }
       }, [shouldRunAgent, taskQueue, addMessage, providerSessionId]);
-      const handleClearSession = React32.useCallback(() => {
+      const handleClearSession = React33.useCallback(() => {
         setSessionId(void 0);
         setContextSessionId(void 0);
         setProviderSessionId(void 0);
         setTaskQueue([]);
         setPendingInjected([]);
       }, [setContextSessionId]);
-      const handleQuestionAnswer = React32.useCallback((questionId, answers) => {
+      const handleQuestionAnswer = React33.useCallback((questionId, answers) => {
         if (agentRef.current) {
           return agentRef.current.submitAnswer(questionId, answers);
         }
         return false;
       }, []);
-      return /* @__PURE__ */ React32.createElement(React32.Fragment, null, /* @__PURE__ */ React32.createElement(
+      const handlePlanAnswer = React33.useCallback((toolUseId, approved, feedback) => {
+        if (!agentRef.current) return false;
+        if (approved) {
+          return agentRef.current.submitAnswer(toolUseId, { approved: "true" });
+        }
+        const result = agentRef.current.submitAnswer(toolUseId, { feedback: feedback || "User did not approve the plan." });
+        return result;
+      }, []);
+      return /* @__PURE__ */ React33.createElement(React33.Fragment, null, /* @__PURE__ */ React33.createElement(
         App,
         {
           apiClient,
           config: { ...config2, task: currentTask },
           onClearSession: handleClearSession,
           onExit,
+          onPlanAnswer: handlePlanAnswer,
           onQuestionAnswer: handleQuestionAnswer,
           onResumeSession: async (session) => {
             try {
@@ -15773,7 +16180,7 @@ var init_interactive = __esm({
           sessionId,
           webUrl
         }
-      ), shouldRunAgent && currentTask && sessionId && messageBridgeRef.current && /* @__PURE__ */ React32.createElement(
+      ), shouldRunAgent && currentTask && sessionId && messageBridgeRef.current && /* @__PURE__ */ React33.createElement(
         AgentRunner,
         {
           apiClient,
@@ -15801,7 +16208,7 @@ var init_interactive = __esm({
       useBracketedPaste();
       const settings = loadSupatestSettings(props.config.cwd || process.cwd());
       const initialProvider = settings.llmProvider || "supatest-managed";
-      return /* @__PURE__ */ React32.createElement(KeypressProvider, null, /* @__PURE__ */ React32.createElement(SessionProvider, { initialLlmProvider: initialProvider, initialModel: props.config.selectedModel }, /* @__PURE__ */ React32.createElement(InteractiveAppContent, { ...props })));
+      return /* @__PURE__ */ React33.createElement(KeypressProvider, null, /* @__PURE__ */ React33.createElement(SessionProvider, { initialLlmProvider: initialProvider, initialModel: props.config.selectedModel }, /* @__PURE__ */ React33.createElement(InteractiveAppContent, { ...props })));
     };
   }
 });
@@ -16392,8 +16799,9 @@ program.name("supatest").description(
         plan: config.planSystemPrompt
       };
       logger.raw(getBanner());
+      const headlessTask = headlessMode === "fix" ? `[HEADLESS] ${prompt}` : prompt;
       const result = await runAgent({
-        task: prompt,
+        task: headlessTask,
         logs,
         supatestApiKey,
         supatestApiUrl,