diff --git a/app/lib/features/chat/ui/sessions/chat_prompt_chooser.dart b/app/lib/features/chat/ui/sessions/chat_prompt_chooser.dart new file mode 100644 index 00000000..c5b86634 --- /dev/null +++ b/app/lib/features/chat/ui/sessions/chat_prompt_chooser.dart @@ -0,0 +1,81 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'chat_create_fields.dart'; + +/// Native platform controls for choosing what editable prompt to start with. +class ChatPromptChooser extends StatelessWidget { + const ChatPromptChooser({ + super.key, + required this.cupertino, + required this.enabled, + required this.choice, + required this.hasLastUsed, + required this.onEnabled, + required this.onChoice, + }); + + static const custom = 'custom'; + static const careful = 'careful'; + static const lastUsed = 'last-used'; + + final bool cupertino; + final bool enabled; + final String choice; + final bool hasLastUsed; + final ValueChanged onEnabled; + final ValueChanged onChoice; + + @override + Widget build(BuildContext context) { + final choices = [custom, careful, if (hasLastUsed) lastUsed]; + String label(String value) => switch (value) { + custom => 'Custom', + careful => 'Careful coding', + lastUsed => 'Last used prompt', + _ => value, + }; + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Row( + children: [ + const Expanded(child: Text('Start with a prompt')), + if (cupertino) + CupertinoSwitch( + key: const Key('chat-create-send-prompt'), + value: enabled, + onChanged: onEnabled, + ) + else + Switch( + key: const Key('chat-create-send-prompt'), + value: enabled, + onChanged: onEnabled, + ), + ], + ), + if (enabled) + if (cupertino) + CupertinoPickerField( + fieldKey: const Key('chat-create-prompt-choice'), + label: 'Prompt', + value: choices.contains(choice) ? choice : custom, + values: choices, + labelOf: label, + onSelected: onChoice, + ) + else + MaterialPickerField( + fieldKey: const Key('chat-create-prompt-choice'), + label: 'Prompt', + value: choices.contains(choice) ? choice : custom, + values: choices, + labelOf: label, + onSelected: onChoice, + ), + ], + ); + } +} diff --git a/app/lib/features/chat/ui/sessions/create_chat_dialog.dart b/app/lib/features/chat/ui/sessions/create_chat_dialog.dart index 1d430948..5904d518 100644 --- a/app/lib/features/chat/ui/sessions/create_chat_dialog.dart +++ b/app/lib/features/chat/ui/sessions/create_chat_dialog.dart @@ -11,6 +11,7 @@ import '../../domain/chat_commands.dart'; import 'chat_adaptive.dart'; import 'chat_create_dialog_frame.dart'; import 'chat_create_fields.dart'; +import 'chat_prompt_chooser.dart'; /// The instructions field's helper and the model note, verbatim from the web. const String chatCreateInstructionsHelper = @@ -91,10 +92,12 @@ class _CreateChatDialogState extends State { bool _nameEdited = false; /// Whether the new chat starts with the prompt below. - bool _sendPrompt = true; + bool _sendPrompt = false; - /// The remembered prompt fills in only until the operator types one. - bool _promptEdited = false; + /// A user's choice or edit wins over any pending saved-prompt read. + bool _promptTouched = false; + String _promptChoice = ChatPromptChooser.custom; + ChatCreatePrompt? _savedPrompt; int _recall = 0; List _directories = const []; List _backends = const []; @@ -168,10 +171,30 @@ class _CreateChatDialogState extends State { final recall = ++_recall; final saved = await _prompts.read(backend, directory); if (!mounted || recall != _recall) return; - if (_promptEdited) return; + if (_promptTouched) return; setState(() { - _sendPrompt = saved?.send ?? true; + // Prompt text can be recalled, but sending it always requires an + // explicit choice in this new-chat dialog. + _sendPrompt = false; _instructions.text = saved?.text ?? chatDefaultSessionInstructions; + _savedPrompt = saved; + _promptChoice = ChatPromptChooser.custom; + }); + } + + void _selectPrompt(String choice) { + setState(() { + _promptTouched = true; + _promptChoice = choice; + if (choice == ChatPromptChooser.careful) { + _instructions.text = chatDefaultSessionInstructions; + _sendPrompt = true; + } else if (choice == ChatPromptChooser.lastUsed) { + _instructions.text = _savedPrompt!.text; + _sendPrompt = true; + } else { + _sendPrompt = true; + } }); } @@ -256,22 +279,16 @@ class _CreateChatDialogState extends State { onChanged: (_) => _nameEdited = true, ), const SizedBox(height: 12), - Row( - children: [ - const Expanded(child: Text('Start with a prompt')), - if (cupertino) - CupertinoSwitch( - key: const Key('chat-create-send-prompt'), - value: _sendPrompt, - onChanged: (value) => setState(() => _sendPrompt = value), - ) - else - Switch( - key: const Key('chat-create-send-prompt'), - value: _sendPrompt, - onChanged: (value) => setState(() => _sendPrompt = value), - ), - ], + ChatPromptChooser( + cupertino: cupertino, + enabled: _sendPrompt, + choice: _promptChoice, + hasLastUsed: _savedPrompt?.text.trim().isNotEmpty == true, + onEnabled: (value) => setState(() { + _promptTouched = true; + _sendPrompt = value; + }), + onChoice: _selectPrompt, ), if (_sendPrompt) ...[ const SizedBox(height: 4), @@ -281,7 +298,12 @@ class _CreateChatDialogState extends State { controller: _instructions, minLines: 2, maxLines: 4, - onChanged: (_) => _promptEdited = true, + onChanged: (_) { + setState(() { + _promptTouched = true; + _promptChoice = ChatPromptChooser.custom; + }); + }, ) else TextField( @@ -289,7 +311,12 @@ class _CreateChatDialogState extends State { controller: _instructions, minLines: 2, maxLines: 4, - onChanged: (_) => _promptEdited = true, + onChanged: (_) { + setState(() { + _promptTouched = true; + _promptChoice = ChatPromptChooser.custom; + }); + }, ), const SizedBox(height: 4), const Text(chatCreateInstructionsHelper), diff --git a/app/notes/chat-prompt-create-material.png b/app/notes/chat-prompt-create-material.png new file mode 100644 index 00000000..a6bae819 Binary files /dev/null and b/app/notes/chat-prompt-create-material.png differ diff --git a/app/notes/chat-prompt-options.md b/app/notes/chat-prompt-options.md new file mode 100644 index 00000000..b4b73b03 --- /dev/null +++ b/app/notes/chat-prompt-options.md @@ -0,0 +1,13 @@ +# Chat creation prompt option + +- Prompt sending now starts off, regardless of the previous choice stored for + the current backend and directory. When enabled, the existing default careful + coding instructions remain editable. +- Material browser fixture evidence: `chat-prompt-create-material.png` shows + the create dialog with the prompt switch off by default at 320 CSS px / 2x. +- Focused widget tests cover the Material and Cupertino controls, editing a + custom prompt, and omission of `instructions` from the off-state create + payload. +- The broader pre-existing `chat_sessions_probe.mjs` completed through the + create-dialog capture but exited later at its unrelated “New” row-marker + assertion; that probe was not treated as a full pass. diff --git a/app/test/features/chat/ui/sessions/chat_create_dialog_test.dart b/app/test/features/chat/ui/sessions/chat_create_dialog_test.dart index b59f7953..b6bd76b3 100644 --- a/app/test/features/chat/ui/sessions/chat_create_dialog_test.dart +++ b/app/test/features/chat/ui/sessions/chat_create_dialog_test.dart @@ -26,6 +26,9 @@ void main() { await tester.pump(const Duration(milliseconds: 400)); expect(find.text('Loading directories…'), findsOneWidget); + expect(find.byKey(const Key('chat-create-instructions')), findsNothing); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); await tester.enterText( find.byKey(const Key('chat-create-instructions')), 'Keep me', @@ -88,6 +91,9 @@ void main() { await tester.pumpAndSettle(); expect(find.textContaining('Unable to load chat options'), findsOneWidget); + expect(find.byKey(const Key('chat-create-instructions')), findsNothing); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); await tester.enterText( find.byKey(const Key('chat-create-instructions')), 'Keep me too', @@ -118,6 +124,7 @@ void main() { final fields = gateway.lastFields('chat_create')!['chat_create']! as JsonMap; expect(fields['directory'], '~'); + expect(fields.containsKey('instructions'), isFalse); }); testWidgets('Cupertino create dialog uses native selectors and fields', ( @@ -135,6 +142,9 @@ void main() { await tester.pumpAndSettle(); expect(find.byType(CupertinoAlertDialog), findsOneWidget); expect(find.text('Start a chat'), findsOneWidget); + expect(find.byKey(const Key('chat-create-instructions')), findsNothing); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); expect( find.text('Where should this chat live?: Home (~) — /work'), findsOneWidget, diff --git a/app/test/features/chat/ui/sessions/chat_create_prompt_test.dart b/app/test/features/chat/ui/sessions/chat_create_prompt_test.dart index 74a4822d..64573584 100644 --- a/app/test/features/chat/ui/sessions/chat_create_prompt_test.dart +++ b/app/test/features/chat/ui/sessions/chat_create_prompt_test.dart @@ -1,8 +1,12 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/chat/data/chat_create_prompt_store.dart'; import 'package:pipelines_app/features/chat/data/chat_repository.dart'; import 'package:pipelines_app/features/chat/ui/sessions/create_chat_dialog.dart'; +import 'package:pipelines_app/features/chat/domain/chat_commands.dart'; import 'fake_chat_gateway.dart'; @@ -21,10 +25,17 @@ class _MemoryPrompts implements ChatCreatePromptStore { ) async => saved['$backend|$directory'] = value; } +class _DelayedPrompts extends _MemoryPrompts { + final Completer result = Completer(); + + @override + Future read(String backend, String directory) => + result.future; +} + Future _create( WidgetTester tester, _MemoryPrompts prompts, { - bool turnOff = false, String? prompt, }) async { ChatDraft? sent; @@ -48,16 +59,16 @@ Future _create( ), ); await tester.pumpAndSettle(); + if (prompt != null) { + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); + } if (prompt != null) { await tester.enterText( find.byKey(const Key('chat-create-instructions')), prompt, ); } - if (turnOff) { - await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); - await tester.pumpAndSettle(); - } await tester.ensureVisible(find.byKey(const Key('chat-create-confirm'))); await tester.tap(find.byKey(const Key('chat-create-confirm'))); await tester.pumpAndSettle(); @@ -73,25 +84,24 @@ void main() { expect(defaultChatName('~', 'OpenCode'), 'Home OpenCode'); }); - testWidgets( - 'a custom prompt is sent and comes back for that harness and folder', - (tester) async { - final prompts = _MemoryPrompts(); - final first = await _create(tester, prompts, prompt: 'Review only.'); - expect(first!.instructions, 'Review only.'); - expect(prompts.saved.values.single, (send: true, text: 'Review only.')); - - await tester.pumpWidget(const SizedBox()); - final second = await _create(tester, prompts); - expect(second!.instructions, 'Review only.'); - }, - ); - - testWidgets('a chat can start without a prompt, and that is remembered', ( + testWidgets('a custom prompt is sent, but the next chat defaults to off', ( tester, ) async { final prompts = _MemoryPrompts(); - final draft = await _create(tester, prompts, turnOff: true); + final first = await _create(tester, prompts, prompt: 'Review only.'); + expect(first!.instructions, 'Review only.'); + expect(prompts.saved.values.single, (send: true, text: 'Review only.')); + + await tester.pumpWidget(const SizedBox()); + final second = await _create(tester, prompts); + expect(second!.instructions, isEmpty); + }); + + testWidgets('a chat starts without a prompt even after a prior choice', ( + tester, + ) async { + final prompts = _MemoryPrompts(); + final draft = await _create(tester, prompts); expect(draft!.instructions, isEmpty); expect(prompts.saved.values.single.send, isFalse); @@ -99,4 +109,130 @@ void main() { await _create(tester, prompts); expect(prompts.saved.values.single.send, isFalse); }); + + testWidgets('the prompt menu selects a preset and permits custom edits', ( + tester, + ) async { + final prompts = _MemoryPrompts(); + await _open(tester, prompts); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('chat-create-prompt-choice'))); + await tester.pumpAndSettle(); + await tester.tap(find.text('Careful coding').last); + await tester.pumpAndSettle(); + expect( + tester + .widget(find.byKey(const Key('chat-create-instructions'))) + .controller! + .text, + chatDefaultSessionInstructions, + ); + await tester.enterText( + find.byKey(const Key('chat-create-instructions')), + 'My own instructions', + ); + await tester.pumpAndSettle(); + expect(find.text('Custom'), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('a recalled prompt is offered as an editable preset', ( + tester, + ) async { + final prompts = _MemoryPrompts() + ..saved['opencode|~'] = (send: true, text: 'Previously used'); + await _open(tester, prompts); + expect(find.byKey(const Key('chat-create-instructions')), findsNothing); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('chat-create-prompt-choice'))); + await tester.pumpAndSettle(); + await tester.tap(find.text('Last used prompt').last); + await tester.pumpAndSettle(); + expect( + tester + .widget(find.byKey(const Key('chat-create-instructions'))) + .controller! + .text, + 'Previously used', + ); + }); + + testWidgets('a delayed saved prompt cannot override a user edit', ( + tester, + ) async { + final prompts = _DelayedPrompts(); + await _open(tester, prompts, settle: false); + await tester.pump(const Duration(milliseconds: 1)); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pump(); + await tester.enterText( + find.byKey(const Key('chat-create-instructions')), + 'User choice wins', + ); + prompts.result.complete((send: true, text: 'Stale saved prompt')); + await tester.pumpAndSettle(); + expect( + tester + .widget(find.byKey(const Key('chat-create-instructions'))) + .controller! + .text, + 'User choice wins', + ); + }); + + testWidgets('Cupertino prompt chooser has native preset and custom choices', ( + tester, + ) async { + final prompts = _MemoryPrompts(); + await tester.pumpWidget( + CupertinoApp( + home: CupertinoPageScaffold( + child: CreateChatDialog( + repository: ChatRepository(FakeChatGateway()), + operationId: 'op', + prompts: prompts, + onSubmit: (_, _) async => {'id': 'new'}, + ), + ), + ), + ); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('chat-create-send-prompt')), findsOneWidget); + expect(find.byKey(const Key('chat-create-instructions')), findsNothing); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('chat-create-prompt-choice'))); + await tester.pumpAndSettle(); + expect(find.byType(CupertinoActionSheet), findsOneWidget); + expect(find.text('Careful coding'), findsOneWidget); + await tester.tap(find.text('Cancel').last); + await tester.pumpAndSettle(); + expect(tester.takeException(), isNull); + }); +} + +Future _open( + WidgetTester tester, + ChatCreatePromptStore prompts, { + bool settle = true, +}) async { + final gateway = FakeChatGateway() + ..directoriesHandler = () async => { + 'chat_directories': ['/work/pipelines'], + }; + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: CreateChatDialog( + repository: ChatRepository(gateway), + operationId: 'op', + prompts: prompts, + onSubmit: (_, _) async => {'id': 'new'}, + ), + ), + ), + ); + if (settle) await tester.pumpAndSettle(); } diff --git a/app/test/features/chat/ui/sessions/chat_session_dialog_layout_test.dart b/app/test/features/chat/ui/sessions/chat_session_dialog_layout_test.dart index 26556078..6ac17f96 100644 --- a/app/test/features/chat/ui/sessions/chat_session_dialog_layout_test.dart +++ b/app/test/features/chat/ui/sessions/chat_session_dialog_layout_test.dart @@ -68,6 +68,10 @@ void main() { await tester.tap(find.byKey(const Key('chat-new-chat-fab'))); await tester.pumpAndSettle(); expect(tester.takeException(), isNull); + await tester.ensureVisible(find.byKey(const Key('chat-create-send-prompt'))); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); + await tester.ensureVisible(find.byKey(const Key('chat-create-server-directory'))); await tester.tap(find.byKey(const Key('chat-create-server-directory'))); await tester.pumpAndSettle(); diff --git a/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart b/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart index d42f2dd5..5f40c1db 100644 --- a/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart +++ b/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart @@ -32,6 +32,8 @@ void main() { await tester.tap(find.byKey(const Key('chat-new-chat-fab'))); await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); await tester.tap(find.byKey(const Key('chat-create-confirm'))); await tester.pumpAndSettle(); @@ -192,6 +194,8 @@ void main() { await tester.tap(find.byKey(const Key('chat-new-chat-fab'))); await tester.pumpAndSettle(); + await tester.tap(find.byKey(const Key('chat-create-send-prompt'))); + await tester.pumpAndSettle(); await tester.tap(find.byKey(const Key('chat-create-confirm'))); await tester.pumpAndSettle();