fix(mode): stabilize plan-mode model experience

packages/ui/acp/src/index.ts

@@ -145,11 +145,14 @@ function elicitationForQuestion(
   options: AskUserQuestionOption[],
 ): CreateElicitationRequest {
   const title = question.header ?? 'Question'
+  const message = question.detail === undefined
+    ? question.question
+    : `${question.question}\n\n${question.detail}`
   if (options.length === 0) {
     return {
       sessionId,
       mode: 'form',
-      message: question.question,
+      message,
       requestedSchema: {
         type: 'object',
         title,
@@ -183,7 +186,7 @@ function elicitationForQuestion(
   return {
     sessionId,
     mode: 'form',
-    message: question.question,
+    message,
     requestedSchema: {
       type: 'object',
       title,
@@ -504,7 +507,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
   // --- Stream the harness event taxonomy to ACP session/update --------------
 
   // --- Session modes (dsh-mode, opportunistic) ------------------------------
-  // The mode PICKER is dsh-mode's ACP surface (the plan-mode RFC): advertised
+  // The mode PICKER is dsh-mode's ACP surface (the plan-mode Agent Note): advertised
   // as `modes` on session/new + session/load, switched via session/set_mode —
   // optimistic `current_mode_update` (the pending mode IS the user's
   // selection; the logged `mode/set` follows at the turn boundary) — and

packages/ui/acp/tests/bridge.spec.ts

@@ -143,15 +143,18 @@ describe('acp bridge', () => {
       questions: [{
         id: 'language',
         question: 'Which language?',
+        detail: 'Choose the implementation language for this project.',
         options: [{ label: 'TypeScript' }],
       }],
     })
 
     expect(result).toEqual({ answers: [{ id: 'language', selected: [], custom: 'Use Zig' }] })
     expect(harness.elicitationRequests[0]).toMatchObject({
+      message: 'Which language?\n\nChoose the implementation language for this project.',
       requestedSchema: {
         properties: {
           choice: {
+            title: 'Which language?',
             description: 'Choose one option, or fill a custom answer below.',
             oneOf: [{ const: 'TypeScript', title: 'TypeScript' }],
           },

packages/ui/acp/tests/harness.ts

@@ -227,7 +227,7 @@ export async function makeBridgeHarness(options: {
     await ctx.plugin(ToolTodo)
   }
   if (options.withModes) {
-    await ctx.plugin(ModesService)
+    await ctx.plugin(ModesService, { modes: { plan: { section: 'Test plan mode instructions.' } } })
   }
   if (options.withFs) {
     await ctx.plugin(LocalFileSystem, { cwd: options.fsCwd ?? options.storageDir })