feat: Make plan approval options contextual

[charlesvien]

Problem

Plan approval shows N mode options every time, regardless of the user's current mode. This PR makes it contextual to their pre-plan mode similar to claude code.

The issue:

Changes

1. Track the pre-plan permission mode on the session (prePlanMode)
2. Show "continue with <current mode>" as the default exit option instead of listing all modes
3. Offer a "manually approve edits" downgrade only when not already in manual mode
4. Remove the static bypass/auto/acceptEdits menu in favor of contextual options
5. Document the upstream divergence in upstream.md file

How did you test this?

Manually

[charlesvien]

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

• feat: Make plan approval options contextual #1794 👈 (View in Graphite)
• feat: Add fullscreen expand to plan preview #1793
• fix: Misc bug and nit fixes #1792
• feat: Add usage limit detection and upgrade prompt #1791
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[greptile-apps]

Prompt To Fix All With AI

This is a comment left during a code review.
Path: packages/agent/src/adapters/claude/permissions/permission-handlers.ts
Line: 213

Comment:
**`prePlanMode` can be set to `"plan"` causing silent approval failure**

If `EnterPlanMode` is called while the session is already in plan mode, `prePlanMode` gets set to `"plan"`. `EnterPlanMode` is not in `BASE_ALLOWED_TOOLS` so `isToolAllowedForMode` returns `false` for plan mode, and `handleEnterPlanModeTool` is invoked. When the user later exits plan mode, `buildExitPlanModePermissionOptions("plan")` produces a first option with `optionId: "plan"`. Since `"plan"` is not in the `applyPlanApproval` allow-list (`"auto" | "default" | "acceptEdits" | "bypassPermissions"`), selecting "Yes, continue with plan" falls through to the rejection path — the user's approval is silently treated as a rejection.

Guard against overwriting `prePlanMode` when already in plan mode:

```suggestion
  if (session.permissionMode !== "plan") {
    session.prePlanMode = session.permissionMode;
  }
  session.permissionMode = "plan";
```

How can I resolve this? If you propose a fix, please make it concise.

---

This is a comment left during a code review.
Path: packages/agent/src/adapters/claude/permissions/permission-options.ts
Line: 95-100

Comment:
**`MODE_LABELS` missing `"plan"` entry**

`CodeExecutionMode` includes `"plan"`, so if `prePlanMode` is ever `"plan"` the label falls back to the raw string `"plan"`. Adding an entry makes the display name explicit and removes reliance on the fallback:

```suggestion
const MODE_LABELS: Record<CodeExecutionMode, string> = {
  default: "manual approval",
  acceptEdits: "auto-accept edits",
  bypassPermissions: "bypass permissions",
  auto: "auto mode",
  plan: "plan mode",
};
```

How can I resolve this? If you propose a fix, please make it concise.

_{Reviews (1): Last reviewed commit: "Make plan approval options contextual" | Re-trigger Greptile}

[greptile-apps]

prePlanMode can be set to "plan" causing silent approval failure

If EnterPlanMode is called while the session is already in plan mode, prePlanMode gets set to "plan". EnterPlanMode is not in BASE_ALLOWED_TOOLS so isToolAllowedForMode returns false for plan mode, and handleEnterPlanModeTool is invoked. When the user later exits plan mode, buildExitPlanModePermissionOptions("plan") produces a first option with optionId: "plan". Since "plan" is not in the applyPlanApproval allow-list ("auto" | "default" | "acceptEdits" | "bypassPermissions"), selecting "Yes, continue with plan" falls through to the rejection path — the user's approval is silently treated as a rejection.

Guard against overwriting prePlanMode when already in plan mode:

Suggested change

	session.prePlanMode = session.permissionMode;
	if (session.permissionMode !== "plan") {
	session.prePlanMode = session.permissionMode;
	}
	session.permissionMode = "plan";

Prompt To Fix With AI

This is a comment left during a code review.
Path: packages/agent/src/adapters/claude/permissions/permission-handlers.ts
Line: 213

Comment:
**`prePlanMode` can be set to `"plan"` causing silent approval failure**

If `EnterPlanMode` is called while the session is already in plan mode, `prePlanMode` gets set to `"plan"`. `EnterPlanMode` is not in `BASE_ALLOWED_TOOLS` so `isToolAllowedForMode` returns `false` for plan mode, and `handleEnterPlanModeTool` is invoked. When the user later exits plan mode, `buildExitPlanModePermissionOptions("plan")` produces a first option with `optionId: "plan"`. Since `"plan"` is not in the `applyPlanApproval` allow-list (`"auto" | "default" | "acceptEdits" | "bypassPermissions"`), selecting "Yes, continue with plan" falls through to the rejection path — the user's approval is silently treated as a rejection.

Guard against overwriting `prePlanMode` when already in plan mode:

```suggestion
  if (session.permissionMode !== "plan") {
    session.prePlanMode = session.permissionMode;
  }
  session.permissionMode = "plan";
```

How can I resolve this? If you propose a fix, please make it concise.

[greptile-apps]

MODE_LABELS missing "plan" entry

CodeExecutionMode includes "plan", so if prePlanMode is ever "plan" the label falls back to the raw string "plan". Adding an entry makes the display name explicit and removes reliance on the fallback:

Suggested change

	const MODE_LABELS: Record<string, string> = {
	default: "manual approval",
	acceptEdits: "auto-accept edits",
	bypassPermissions: "bypass permissions",
	auto: "auto mode",
	};
	const MODE_LABELS: Record<CodeExecutionMode, string> = {
	default: "manual approval",
	acceptEdits: "auto-accept edits",
	bypassPermissions: "bypass permissions",
	auto: "auto mode",
	plan: "plan mode",
	};

Prompt To Fix With AI

This is a comment left during a code review.
Path: packages/agent/src/adapters/claude/permissions/permission-options.ts
Line: 95-100

Comment:
**`MODE_LABELS` missing `"plan"` entry**

`CodeExecutionMode` includes `"plan"`, so if `prePlanMode` is ever `"plan"` the label falls back to the raw string `"plan"`. Adding an entry makes the display name explicit and removes reliance on the fallback:

```suggestion
const MODE_LABELS: Record<CodeExecutionMode, string> = {
  default: "manual approval",
  acceptEdits: "auto-accept edits",
  bypassPermissions: "bypass permissions",
  auto: "auto mode",
  plan: "plan mode",
};
```

How can I resolve this? If you propose a fix, please make it concise.