Skip to content

feat: agent config modal for start/restart#237

Merged
marcus merged 16 commits intomarcus:mainfrom
EugeneOsipenko:new-agent-config-modal
Mar 24, 2026
Merged

feat: agent config modal for start/restart#237
marcus merged 16 commits intomarcus:mainfrom
EugeneOsipenko:new-agent-config-modal

Conversation

@EugeneOsipenko
Copy link
Contributor

@EugeneOsipenko EugeneOsipenko commented Mar 15, 2026 •
edited
Loading

Summary

  • New modal when pressing 's' to start/restart an agent on a worktree — lets you choose agent type, toggle skip-permissions, and select a prompt template
  • When agent is running, the existing attach/restart choice modal now routes "Restart" through the new config modal
  • Prompt picker correctly returns to whichever modal opened it (agent config or create workspace)
Снимок экрана 2026-03-15 в 14 15 23

Test plan

  • Press 's' on a worktree with no agent → agent config modal opens with pre-selected agent type
  • Select different agent, toggle skip permissions, pick a prompt → start agent with those options
  • Press 's' on a worktree with running agent → attach/restart modal → choose restart → agent config modal opens
  • Open prompt picker from agent config modal → select prompt → returns to agent config modal
  • Cancel prompt picker from agent config modal → returns to agent config modal
  • Open prompt picker from create workspace modal → still works as before
  • Press Esc in agent config modal → returns to list view
  • Enter on prompt field opens picker, Enter on agent list absorbs, Enter on Start submits

🤖 Generated with Claude Code

EugeneOsipenko and others added 16 commits March 15, 2026 12:51
@EugeneOsipenko @claude
docs: add agent config modal design spec
c5af5c3 
Design for a new modal that appears when starting or restarting an
agent on a worktree, allowing users to choose agent type, toggle
skip-permissions, and select a prompt template.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
docs: add agent config modal implementation plan
5885feb 
13 tasks across 6 chunks covering types, messages, state fields,
modal builder, key/mouse/command handlers, entry point rewiring,
and prompt picker return routing.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: add ViewModeAgentConfig constant
41ad7ef 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: add restartAgentWithOptionsMsg message type
6d91979 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: add agent config modal state fields to Plugin
66a8ea8 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: handle restartAgentWithOptionsMsg in update loop
a8523ed 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@EugeneOsipenko
feat: add agent config modal constants, helpers, and tests
17eecab
@EugeneOsipenko @claude
feat: add handleAgentConfigKeys and executeAgentConfig
705716d 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: wire agent config modal into view, commands, mouse, and keymap
76629bf 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko
feat: 's' key opens agent config modal instead of starting directly
ca77c2f
@EugeneOsipenko @claude
feat: set promptPickerReturnMode in existing create modal flow
7226505 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
feat: route prompt picker return to agent config or create modal
f9fe96f 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
fix: use correct background when prompt picker opens from agent config
f059681 
renderPromptPickerModal always used renderCreateModal as its background.
When opened from the agent config modal, the create modal's text inputs
were uninitialized (nil cursor), causing a nil pointer panic.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
fix: handle Enter per-element in agent config modal
7972695 
The modal's HandleKey falls through to primaryAction (submit) when
the focused section doesn't consume Enter. This caused Enter on the
prompt selector or agent list to immediately submit instead of
activating the focused element. Now Enter is handled manually by
checking FocusedID, matching the pattern used by handleCreateKeys.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
chore: remove design spec and implementation plan docs
e5c757a 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@EugeneOsipenko @claude
refactor: extract helpers, remove redundant state, fix test leak
409b605 
- Extract openAgentConfigModal(wt, isRestart) eliminating duplicate
  12-line init blocks in two places
- Extract openPromptPicker(prompts, returnMode) eliminating duplicate
  4-line blocks in 6 places across keys.go and mouse.go
- Remove agentConfigFocusSet field — move initial SetFocus into
  ensureAgentConfigModal when modal is first built, avoiding the
  bug where focus flag wasn't reset on re-open
- Revert p.ctx nil guard in StartAgentWithOptions (test-only concern);
  fix tests to provide &plugin.Context{} instead
- Remove os/filepath imports from keys.go (no longer needed)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@marcus
Copy link
Owner

marcus commented Mar 15, 2026

Hey @EugeneOsipenko! Starling here (AI assistant on the project). 👋

This is a really nice UX improvement — pressing 's' on a worktree today drops you straight into starting the agent with whatever defaults, so having a config modal to pick agent type, toggle skip-permissions, and select a prompt template before committing is a meaningful quality-of-life upgrade.

A few things I like:

  • The "restart" path routing through the new config modal is the right call — muscle memory says 'restart' and you still get to adjust options before kicking it off
  • Prompt picker correctly returning to whichever modal opened it is good modal hygiene
  • 228-line new modal with 169 lines of tests is a healthy ratio

The test plan is thorough — 8 manual scenarios covering the full interaction tree. That's the right level of detail for UI state machine work.

This is your second contribution after #231 (the .gitignore cleanup) — thank you for keeping at it. Flagging for Marcus/Kestrel review. ✦

@marcus marcus merged commit cf20dde into marcus:main Mar 24, 2026
2 checks passed
@marcus
Copy link
Owner

marcus commented Mar 24, 2026

Thanks @EugeneOsipenko! The agent config modal is a great UX improvement — choosing agent type, skip-permissions, and prompts all in one place before starting. Tests look solid. Merged. 🪡

This was referenced Mar 24, 2026
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@EugeneOsipenko @marcus