engineering-memory 1.11.13 → 1.11.15

package/dispatcher/sections.mjs

@@ -20,7 +20,7 @@ Never answer a question about a bound repository from the working tree alone. Wh
 
 After compaction, a new chat, interruption, or handoff, call \`session.resume\` before continuing.
 
-Before a new write/scaffold task, call \`task.branch\` directly: do not ask the user where, from which branch or under which name first, and do not call \`worktree.list\` for it. Its one native form asks where the task works, which branch it starts from and the branch name, and nothing is created until the user answers. The pool reuses a safely available worktree slot before creating another; never pass or invent a worktree path. Reconcile protected legacy entries through the native recovery flow; clean files alone do not establish that the old agent and delivery have finished. Run all commands from its returned \`repoRoot\`. Renew \`task.heartbeat\` during actual work, use \`task.pause\` on handoff, and resume before writing again. Inactivity never permits force checkout or cleanup. Keep closed worktrees until authorized delivery completes. When \`session.entry\` says the user can manage them, unanswered shared branch preferences are asked together in one native form via \`project.set_git_preferences\`; other members choose only their own task base in \`task.branch\`. Answering "Not now" returns \`deferred\` with nothing allocated and a \`reconsider\` call; say so in one line, keep working on anything that does not depend on it, and make that \`reconsider\` call only when the user actually asks to start that task.
+Before a new write/scaffold task, call \`task.branch\` directly: do not ask the user where, from which branch or under which name first, and do not call \`worktree.list\` for it. Its short native form asks only the starting branch and where to work. It generates the new branch name automatically; do not ask the user to name it unless they request a specific name. Nothing is created until the user answers. The pool reuses a safely available worktree slot before creating another; never pass or invent a worktree path. Reconcile protected legacy entries through the native recovery flow; clean files alone do not establish that the old agent and delivery have finished. Run all commands from its returned \`repoRoot\`. Renew \`task.heartbeat\` during actual work, use \`task.pause\` on handoff, and resume before writing again. Inactivity never permits force checkout or cleanup. Keep closed worktrees until authorized delivery completes. When \`session.entry\` says the user can manage them, unanswered shared branch preferences are asked together in one native form via \`project.set_git_preferences\`; other members choose only their own task base in \`task.branch\`. Answering "Not now" returns \`deferred\` with nothing allocated and a \`reconsider\` call; say so in one line, keep working on anything that does not depend on it, and make that \`reconsider\` call only when the user actually asks to start that task.
 
 Do not edit until the skill lifecycle has completed discovery, its checkpoint, and \`context.prepare_change\`. Do not claim completion until \`task.verify\` succeeds.
 
@@ -28,7 +28,7 @@ Do not block independent task work on \`memory.propose_revision\` drafting, subm
 
 A check whose answer decides the next action — delivery preconditions such as the commit hook, the remote and the branch; whether verification or close can pass; what a waiver allows — is run by the agent that takes that action, in its own turn. Hand work to another agent only when you have other real work to do while it runs, and never take the action a delegated check gates before its answer is back. Work another agent checked is neither the user's approval nor task verification. Size delegation to the task — a one- or two-file change needs no multi-agent workflow — and once work is delegated, wait for its real completion signal, never a sleep loop polling its output.
 
-Use the host's native questionnaire for every question to the user, including implementation choices, names, clarification, branch/worktree decisions and delivery. For a required decision, use \`questionnaire.ask\` to open a durable native MCP form and \`questionnaire.resume\` to return to the same unanswered question. Read the skill's questionnaires reference first. Write every question in the user's language, say in \`context\` why it is asked, give in \`example\` one concrete thing the decision changes, and give every option a \`description\` of what happens next. Show a record by its title, never by an id or a hash. When the user says they did not understand, that is not an answer: explain in chat and show the same question again. Never use request_user_input_async for a required decision: it does not wait for an answer. When the durable form is unavailable, use a blocking native control only where the host permits it: request_user_input in Codex or AskUserQuestion in Claude. Never replace the questionnaire with a chat instruction such as 'type this', 'reply yes', or 'write X if you want Y'. Do not open a survey web page. If the required native control is unavailable or prohibited for that kind of question, follow the host's tool restrictions, explain the limitation, and continue only work already authorized; do not fabricate a survey or silently choose an answer. A timeout, dismissed form, empty response or ended turn is not an answer. Keep the decision pending and resume it; do not start dependent work or report it as resolved. Existing answers remain valid through retries and handoffs.
+Choose question detail to suit the decision: task start is short, while complex decisions retain context and examples. Put a deliberate recommended choice first and preserve the host's free-input path without requiring an option or adding a duplicate Other choice; feedback is not consent. Use the host's native questionnaire for every question to the user, including implementation choices, names, clarification, branch/worktree decisions and delivery. For a required decision, use \`questionnaire.ask\` to open a durable native MCP form and \`questionnaire.resume\` to return to the same unanswered question. Read the skill's questionnaires reference first. Write every question in the user's language, say in \`context\` why it is asked, give in \`example\` one concrete thing the decision changes, and give every option a \`description\` of what happens next. Show a record by its title, never by an id or a hash. When the user says they did not understand, that is not an answer: explain in chat and show the same question again. Never use request_user_input_async for a required decision: it does not wait for an answer. When the durable form is unavailable, use a blocking native control only where the host permits it: request_user_input in Codex or AskUserQuestion in Claude. Never replace the questionnaire with a chat instruction such as 'type this', 'reply yes', or 'write X if you want Y'. Do not open a survey web page. If the required native control is unavailable or prohibited for that kind of question, follow the host's tool restrictions, explain the limitation, and continue only work already authorized; do not fabricate a survey or silently choose an answer. A timeout, dismissed form, empty response or ended turn is not an answer. Keep the decision pending and resume it; do not start dependent work or report it as resolved. Existing answers remain valid through retries and handoffs.
 
 When a durable MCP form cannot be displayed, read its \`hostFallback\` or call \`questionnaire.resume\` with \`presentation: host_native\` to get the original question without reopening the MCP form. Display the same question, all choices and notices through a blocking native control only if the host permits that control for this decision. After an actual native answer, call \`questionnaire.answer_from_host\` with the unchanged questionnaireId, requestKey and contentHash, the hostTool name and the returned choice/text. This is an agent-reported relay, not MCP transport attestation. Then retry the owning operation; its authority, content and version checks still apply. Never relay prose consent, a default, an asynchronous response or a cancelled/declined/missing answer. Decline alone is not proof that the host cannot display forms. Keep the decision pending if no permitted native control can represent it.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engineering-memory",
-  "version": "1.11.13",
+  "version": "1.11.15",
   "description": "Installs the Engineering Memory skill and its local MCP bridge. Sign in after installing; your organization and project are resolved from your account.",
   "license": "UNLICENSED",
   "type": "module",
@@ -11,7 +11,7 @@
     "engineering-memory": "bin/engineering-memory.mjs"
   },
   "files": [
-    "bin",
+    "bin/engineering-memory.mjs",
     "dispatcher",
     "lib",
     "install",

package/runtime/build.json

@@ -1,3 +1,3 @@
 {
-  "gitHead": "b6171df2dae6cc2a967101902fbedc155d8d301d"
+  "gitHead": "52f278262fad1afde8d11aa6e2343b3de5e8fe78"
 }

package/runtime/dist/src/mcp/onboarding-tools.js

@@ -2,7 +2,7 @@ import * as z from 'zod/v4';
 import { sha256, stableStringify } from '../utilities/hash.js';
 import { restrictedValueKind } from '../runtime/privacy-detector.js';
 import { languageTag } from '../runtime/questionnaire-store.js';
-import { answerChoice, answerData, askQuestionnaire, resumeQuestionnaire, } from './questionnaire-tools.js';
+import { answerChoice, answerData, askFailed, askQuestionnaire, resumeQuestionnaire, } from './questionnaire-tools.js';
 const uuid = z.string().uuid();
 const hash = z.string().regex(/^[a-f0-9]{64}$/);
 const project = { projectId: uuid };
@@ -411,18 +411,30 @@ export function registerOnboardingTools(server, service) {
                 ],
             };
         });
-        const form = await askQuestionnaire(server, service, {
-            ...definitions.find((entry) => entry.language === language),
+        const binding = { decision: questionnaireId };
+        const bound = definitions.map((entry) => ({ ...entry, binding }));
+        const asked = {
             repoRoot: input.repoRoot,
+            questionnaireId,
             presentation: input.presentation,
-        }, context, [...definitions, ...previousWording], {
-            tool: 'project.move_repository',
-            ...(input.decisionAttempt ? { decisionAttempt: input.decisionAttempt } : {}),
-            retryArguments: {
-                projectId: input.projectId,
-                ...(input.language ? { language: input.language } : {}),
-            },
-        });
+        };
+        const stored = await service.questionnaireResume(asked).catch(() => undefined);
+        const form = stored?.binding && stableStringify(stored.binding) === stableStringify(binding)
+            ? await resumeQuestionnaire(server, service, asked, context)
+            : await askQuestionnaire(server, service, {
+                ...bound.find((entry) => entry.language === language),
+                repoRoot: input.repoRoot,
+                presentation: input.presentation,
+            }, context, [...bound, ...definitions, ...previousWording], {
+                tool: 'project.move_repository',
+                ...(input.decisionAttempt ? { decisionAttempt: input.decisionAttempt } : {}),
+                retryArguments: {
+                    projectId: input.projectId,
+                    ...(input.language ? { language: input.language } : {}),
+                },
+            });
+        if (askFailed(form))
+            return form;
         const record = await service.questionnaireResume({
             repoRoot: input.repoRoot,
             questionnaireId,

package/runtime/dist/src/mcp/questionnaire-tools.js

@@ -8,18 +8,29 @@ export async function askQuestionnaire(server, service, input, context, previous
         return failure(error);
     }
 }
+export function askFailed(result) {
+    return payload(result)?.ok === false;
+}
 export function answerChoice(result) {
     return answerData(result)?.choice;
 }
 export function answerData(result) {
+    const value = payload(result);
+    return value?.ok && value.data?.status === 'answered' && value.data.answerAvailable
+        ? value.data.answer
+        : undefined;
+}
+function payload(result) {
     const response = result;
     const text = response.content?.find((item) => item.type === 'text')?.text;
     if (!text)
         return undefined;
-    const value = JSON.parse(text);
-    return value.ok && value.data?.status === 'answered' && value.data.answerAvailable
-        ? value.data.answer
-        : undefined;
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
 }
 export async function resumeQuestionnaire(server, service, input, context) {
     try {
@@ -31,12 +42,21 @@ export async function resumeQuestionnaire(server, service, input, context) {
 }
 export async function answerQuestionnaireFromHost(service, input) {
     try {
-        if (input.answer?.choice === explain) {
+        if (input.answer?.choice === explain ||
+            input.answer?.choice === '__other__' ||
+            Object.values(input.answers ?? {}).some((answer) => answer.choice === '__other__')) {
             const record = await service.questionnaireResume(input);
             if (record.status === 'pending' &&
                 record.requestKey === input.requestKey &&
-                record.contentHash === input.contentHash)
-                return pending(record, 'needs_explanation');
+                record.contentHash === input.contentHash) {
+                if (input.answer?.choice === explain)
+                    return pending(record, 'needs_explanation');
+                if (record.questions || !record.allowFreeText) {
+                    const feedback = input.answer ??
+                        Object.values(input.answers ?? {}).find((answer) => answer.choice === '__other__');
+                    return feedbackResult(record, feedback?.text);
+                }
+            }
         }
         const resolved = await service.questionnaireAnswerFromHost(input);
         return answered(resolved.record, resolved.answer, resolved.replayed, resolved.retry);
@@ -66,11 +86,33 @@ async function present(server, service, record, repoRoot, context, preparation,
     const response = inputResponse(responses, record.requestKey);
     if (response.kind === 'elicit' && response.action === 'accept') {
         const content = acceptedContent(responses, record.requestKey);
-        if (content?.choice === explain || content?.[explain] === true) {
+        if (content?.choice === explain ||
+            content?.[explain] === true ||
+            record.questions?.some((question) => content?.[question.id] === explain)) {
             consumedResponses(context).add(record.requestKey);
             return pending(record, 'needs_explanation');
         }
-        const parsed = questionnaireAnswerSchema(record).safeParse(record.questions && content ? formAnswers(record, content) : content);
+        if (content?.__feedback__ !== undefined &&
+            !(typeof content.__feedback__ === 'string' && !content.__feedback__.trim())) {
+            consumedResponses(context).add(record.requestKey);
+            return feedbackResult(record, content.__feedback__);
+        }
+        if (!record.questions &&
+            !record.allowFreeText &&
+            !content?.choice &&
+            typeof content?.text === 'string' &&
+            content.text.trim()) {
+            consumedResponses(context).add(record.requestKey);
+            return feedbackResult(record, content.text);
+        }
+        const { __feedback__: _feedback, ...answerContent } = content ?? {};
+        if (!record.questions &&
+            record.allowFreeText &&
+            !answerContent.choice &&
+            typeof answerContent.text === 'string' &&
+            answerContent.text.trim())
+            answerContent.choice = '__other__';
+        const parsed = questionnaireAnswerSchema(record).safeParse(record.questions ? formAnswers(record, answerContent) : answerContent);
         const answer = parsed.success ? parsed.data : undefined;
         if (!answer)
             return pending(record, 'invalid_response');
@@ -98,15 +140,22 @@ async function present(server, service, record, repoRoot, context, preparation,
         return pending(record, 'native_form_unavailable');
     const copy = copyFor(record);
     if (record.questions) {
+        const compact = record.questionnaireId.startsWith('task-start-') && !!record.binding;
         const properties = {};
         for (const sub of record.questions) {
+            const options = compact && sub.otherAsText
+                ? sub.options.filter((option) => option.id !== 'other')
+                : sub.options;
             properties[sub.id] = {
                 type: 'string',
                 title: sub.message,
-                enum: sub.options.map((option) => option.id),
-                enumNames: sub.options.map((option) => option.label),
+                description: [sub.context, sub.example && `${copy.example}: ${sub.example}`]
+                    .filter(Boolean)
+                    .join('\n'),
+                enum: options.map((option) => option.id),
+                enumNames: optionLabels(options, copy),
             };
-            if (sub.textField)
+            if (sub.textField && !(compact && sub.otherAsText))
                 properties[`${sub.id}_text`] = {
                     type: 'string',
                     title: sub.textField.title,
@@ -114,12 +163,12 @@ async function present(server, service, record, repoRoot, context, preparation,
                     maxLength: sub.textField.maxLength,
                 };
         }
-        properties[explain] = { type: 'boolean', title: copy.explain };
+        properties.__feedback__ = { type: 'string', title: copy.feedback, maxLength: 2000 };
         return inputRequired({
             inputRequests: {
                 [record.requestKey]: inputRequired.elicit({
                     mode: 'form',
-                    message: presentationMessage(record),
+                    message: presentationMessage(record, compact),
                     requestedSchema: { type: 'object', properties },
                 }),
             },
@@ -136,23 +185,14 @@ async function present(server, service, record, repoRoot, context, preparation,
                         choice: {
                             type: 'string',
                             title: copy.answer,
-                            enum: [
-                                ...record.options.map((option) => option.id),
-                                ...(record.allowFreeText ? ['__other__'] : []),
-                                explain,
-                            ],
-                            enumNames: [
-                                ...record.options.map((option) => option.label),
-                                ...(record.allowFreeText ? [copy.other] : []),
-                                copy.explain,
-                            ],
+                            enum: record.options.map((option) => option.id),
+                            enumNames: optionLabels(record.options, copy),
                         },
                         ...(record.allowFreeText
                             ? {
                                 text: {
                                     type: 'string',
-                                    title: copy.otherAnswer,
-                                    minLength: 1,
+                                    title: copy.freeAnswer,
                                     maxLength: 2000,
                                 },
                             }
@@ -167,8 +207,10 @@ async function present(server, service, record, repoRoot, context, preparation,
                                 },
                             }
                             : {}),
+                        ...(!record.allowFreeText
+                            ? { __feedback__: { type: 'string', title: copy.feedback, maxLength: 2000 } }
+                            : {}),
                     },
-                    required: ['choice'],
                 },
             }),
         },
@@ -184,25 +226,25 @@ function consumedResponses(context) {
 const questionnaireCopy = {
     en: {
         pending: 'Choose an answer to resolve this decision. Closing or cancelling the form leaves it pending.',
-        freeText: ' For another answer choose Other and fill in text. Free text is not stored and cannot be replayed.',
+        freeText: ' You can type a different answer without choosing an option. Free text is not stored and cannot be replayed.',
         storedText: ' The bounded text field is stored as part of this exact decision and is replayed after restart.',
-        everyQuestion: ' Answer every question before submitting, unless you pick an option that ends the form.',
+        everyQuestion: ' To record a decision, answer each question or choose an option that ends the form. You can send a comment without selecting any option.',
         example: 'Example',
-        explain: 'I did not understand; explain in more detail first',
         answer: 'Answer',
-        other: 'Other',
-        otherAnswer: 'Other answer',
+        freeAnswer: 'Write another answer (optional)',
+        recommended: 'Recommended',
+        feedback: 'Write an answer or comment (optional)',
     },
     tr: {
         pending: 'Kararını kaydetmek için bir seçenek seç. Formu kapatmak veya iptal etmek onay sayılmaz; soru beklemede kalır.',
-        freeText: ' Farklı bir yanıt için Diğer seçeneğini seçip metin alanını doldur. Serbest yanıt saklanmaz ve daha sonra geri getirilemez.',
+        freeText: ' Bir seçenek seçmeden farklı yanıtını yazabilirsin. Serbest yanıt saklanmaz ve daha sonra geri getirilemez.',
         storedText: ' Bu metin alanındaki yanıt kararınla birlikte saklanır; yeniden başlattığında korunur.',
-        everyQuestion: ' Göndermeden önce her soruyu cevapla; formu bitiren bir seçenek seçtiysen gerekmez.',
+        everyQuestion: ' Karar vermek için soruları cevapla veya formu bitiren bir seçenek seç. Hiçbir seçenek seçmeden yorum da gönderebilirsin.',
         example: 'Örnek',
-        explain: 'Anlamadım; önce daha ayrıntılı anlat',
         answer: 'Yanıt',
-        other: 'Diğer',
-        otherAnswer: 'Diğer yanıt',
+        freeAnswer: 'Farklı yanıtını yaz (isteğe bağlı)',
+        recommended: 'Önerilen',
+        feedback: 'Yanıtını veya yorumunu yaz (isteğe bağlı)',
     },
 };
 function formAnswers(record, content) {
@@ -220,23 +262,26 @@ function formAnswers(record, content) {
     }
     return answers;
 }
-function presentationMessage(record) {
+function presentationMessage(record, compact = false) {
     const copy = copyFor(record);
+    if (compact)
+        return [
+            record.message,
+            record.context,
+            record.example,
+            record.language?.startsWith('tr')
+                ? 'İptal edersen başlamaz.'
+                : 'Cancelling does not start the task.',
+        ]
+            .filter(Boolean)
+            .join('\n');
     const explained = (item) => [
         item.context,
         item.example && `${copy.example}: ${item.example}`,
-        (item.options ?? [])
-            .filter((option) => option.description)
-            .map((option) => `${option.label}: ${option.description}`)
-            .join('\n'),
     ];
     return [
         record.message,
         ...explained(record),
-        ...(record.questions ?? []).flatMap((sub) => {
-            const details = explained(sub).filter(Boolean);
-            return details.length ? [sub.message, ...details] : [];
-        }),
         `${copy.pending}${record.questions ? copy.everyQuestion : ''}${record.allowFreeText ? copy.freeText : ''}${record.textField ? copy.storedText : ''}`,
     ]
         .filter(Boolean)
@@ -245,19 +290,38 @@ function presentationMessage(record) {
 function copyFor(record) {
     return questionnaireCopy[record.language?.startsWith('tr') ? 'tr' : 'en'];
 }
-function pending(record, reason) {
+function optionLabels(options, copy) {
+    const recommended = options.find((option) => option.label.includes(`(${copy.recommended})`))?.id ?? options[0].id;
+    return options.map((option) => {
+        const label = option.id === recommended && !option.label.includes(`(${copy.recommended})`)
+            ? `${option.label} (${copy.recommended})`
+            : option.label;
+        return option.description ? `${label} — ${option.description}` : label;
+    });
+}
+function feedbackResult(record, text) {
+    if (typeof text !== 'string' || !text.trim() || text.length > 2000)
+        return pending(record, 'invalid_response');
+    return pending(record, 'feedback', { text: text.trim() });
+}
+function pending(record, reason, feedback) {
     return result({
         questionnaireId: record.questionnaireId,
         status: 'pending',
         reason,
+        ...(feedback ? { feedback } : {}),
         answerAvailable: false,
         hostFallback: {
             operation: 'questionnaire.answer_from_host',
             questionnaireId: record.questionnaireId,
             requestKey: record.requestKey,
             contentHash: record.contentHash,
-            message: presentationMessage(record),
+            message: presentationMessage(record, record.questionnaireId.startsWith('task-start-') && !!record.binding),
             language: record.language ?? 'en',
+            freeTextFeedback: {
+                relayChoice: '__other__',
+                recordsDecision: !record.questions && record.allowFreeText,
+            },
             ...(record.questions
                 ? {
                     questions: record.questions,
@@ -270,15 +334,17 @@ function pending(record, reason) {
                 }),
             instructions: `${record.questions
                 ? 'Only if the host permits a blocking native control for this decision, display every question, its options and notices in AskUserQuestion or request_user_input, one call at a time if needed. Relay every answer together in one questionnaire.answer_from_host call as `answers`, keyed by question id. Closing, declining, timeout, prose consent and missing answers are not native answers for any question. Do not reopen a dismissed question in a loop or label decline as proof of host incompatibility. The relay records agent-reported provenance, not MCP transport attestation. Retry the owning operation after acceptance; its authority and version checks still apply.'
-                : 'Only if the host permits a blocking native control for this decision, display this exact question, all options and notices in AskUserQuestion or request_user_input. Relay only the actual returned answer with these unchanged bindings. Closing, declining, timeout, prose consent and missing answers are not native answers. Do not reopen a dismissed question in a loop or label decline as proof of host incompatibility. The relay records agent-reported provenance, not MCP transport attestation. Retry the owning operation after acceptance; its authority and version checks still apply.'} Show each option's description under its label. If the person says they did not understand, including through the control's free-text answer, that is not an answer: call questionnaire.answer_from_host with answer {choice: "${explain}"} and the same bindings, and the decision stays pending.${(record.options?.length ?? 0) > 4
+                : 'Only if the host permits a blocking native control for this decision, display this exact question, all options and notices in AskUserQuestion or request_user_input. Relay only the actual returned answer with these unchanged bindings. Closing, declining, timeout, prose consent and missing answers are not native answers. Do not reopen a dismissed question in a loop or label decline as proof of host incompatibility. The relay records agent-reported provenance, not MCP transport attestation. Retry the owning operation after acceptance; its authority and version checks still apply.'} Keep the question proportional to the decision: short for task start, detailed when needed; do not omit context, examples or consequences. Mark the explicitly recommended option, otherwise the first option, as recommended without treating it as an answer. Use the host control's existing free-text input so the person can write without picking an option. Do not add a duplicate Other choice or a second feedback question. Relay that actual native text through the internal __other__ choice with text and preserve all bindings. This internal relay identifier is not a visible option. Show each option's description under its label. If the person says they did not understand, including through the control's free-text answer, that is not an answer: call questionnaire.answer_from_host with answer {choice: "${explain}"} and the same bindings, and the decision stays pending.${(record.options?.length ?? 0) > 4
                 ? ' The host control shows fewer options than this question has: show them three at a time with one more option that reveals the rest, and relay only the final pick.'
                 : ''}`,
         },
-        nextAction: reason === 'needs_explanation'
-            ? 'The person asked for more detail and the decision is still pending. Explain in chat, in their language, why this is asked, what each option does next and one concrete example. Then show the same question once more with questionnaire.resume. Do not infer an answer.'
-            : reason === 'native_form_unavailable'
-                ? 'This host does not advertise native MCP forms. The decision remains pending. Explain the limitation and continue only independently authorized work. Use hostFallback only with a permitted blocking native control; otherwise keep pending. Never substitute an asynchronous question.'
-                : 'The decision remains pending without expiry. Call questionnaire.resume with this questionnaireId to show the same question again. Do not infer an answer or continue dependent work.',
+        nextAction: reason === 'feedback'
+            ? 'The person provided feedback, not consent. Address it in their language. The original decision is still pending and no choice has been saved. Resume it after explaining, or compose a new bound question if the requested choices change. Do not persist arbitrary feedback text.'
+            : reason === 'needs_explanation'
+                ? 'The person asked for more detail and the decision is still pending. Explain in chat, in their language, why this is asked, what each option does next and one concrete example. Then show the same question once more with questionnaire.resume. Do not infer an answer.'
+                : reason === 'native_form_unavailable'
+                    ? 'This host does not advertise native MCP forms. The decision remains pending. Explain the limitation and continue only independently authorized work. Use hostFallback only with a permitted blocking native control; otherwise keep pending. Never substitute an asynchronous question.'
+                    : 'The decision remains pending without expiry. Call questionnaire.resume with this questionnaireId to show the same question again. Do not infer an answer or continue dependent work.',
     });
 }
 function answered(record, answer, replayed, retry) {

package/runtime/dist/src/mcp/tool-definitions.js

@@ -2,7 +2,7 @@ import * as z from 'zod/v4';
 import { validationIds } from '../runtime/bridge-service.js';
 import { stableStringify } from '../utilities/hash.js';
 import { hostAnswerSchema, languageTag, questionnaireDefinitionSchema, } from '../runtime/questionnaire-store.js';
-import { answerChoice, answerQuestionnaireFromHost, askQuestionnaire, resumeQuestionnaire, } from './questionnaire-tools.js';
+import { answerChoice, answerQuestionnaireFromHost, askFailed, askQuestionnaire, resumeQuestionnaire, } from './questionnaire-tools.js';
 const optionalRepoRoot = z.string().min(1).optional();
 const stringList = z.array(z.string().min(1));
 const jsonValue = z.lazy(() => z.union([
@@ -726,6 +726,8 @@ export function registerEngineeringMemoryTools(server, service) {
                 ...definitions.find((definition) => definition.language === language),
                 repoRoot: request.repoRoot,
             }, context, [...definitions, ...earlier]);
+            if (askFailed(form))
+                return form;
             const record = await service.questionnaireResume({
                 repoRoot: request.repoRoot,
                 questionnaireId,

package/runtime/dist/src/mcp/worktree-tools.js

@@ -1,10 +1,10 @@
 import { basename } from 'node:path';
 import * as z from 'zod/v4';
-import { cancelledDeliveryQuestionId, forgetUnreadableQuestionId, } from '../runtime/bridge-service.js';
+import { cancelledDeliveryQuestionId, forgetUnreadableQuestionId, retireQuestionId, } from '../runtime/bridge-service.js';
 import { configuredBase, sourceLabel, taskStartChoice, taskStartDefinition, } from '../runtime/task-start.js';
 import { sha256, stableStringify } from '../utilities/hash.js';
 import { unreadableWorktree } from '../runtime/worktree-pool.js';
-import { askQuestionnaire } from './questionnaire-tools.js';
+import { askFailed, askQuestionnaire } from './questionnaire-tools.js';
 import { languageTag } from '../runtime/questionnaire-store.js';
 const repo = z.string().min(1);
 const branch = z.string().min(1).max(255);
@@ -333,6 +333,8 @@ export function registerWorktreeTools(server, service) {
             repoRoot: input.repoRoot,
             presentation: input.presentation,
         }, context, [definition(language !== 'tr'), previous(true), previous(false)], owner);
+        if (askFailed(form))
+            return form;
         const record = await service.questionnaireResume({
             repoRoot: input.repoRoot,
             questionnaireId,
@@ -356,7 +358,7 @@ export function registerWorktreeTools(server, service) {
         inputSchema: z.strictObject(policy),
     }, async (input) => output(await service.worktreePolicy(json(input))));
     server.registerTool('task.branch', {
-        description: 'Start a write task with ONE durable native form: where the branch starts (unless base is given), the new branch name with a suggested default (unless name is given), and the folder: a separate managed worktree, this folder as a new branch when it is clean (moving out an unfinished task that holds it, named in the option), this folder on its current branch, or not now. Nothing is created until the user answers; the next call with the same arguments allocates. A remote base is fetched and its exact commit pinned. Retry/resume preserves the allocation. Not now returns status deferred with the exact reconsider call; retries keep the same decisionAttempt. Use the returned repoRoot for ALL commands. A read-only task allocates only when transitioning to write.',
+        description: 'Start a write task with ONE durable native form: two short questions for the starting branch (unless base is given) and the folder. A unique branch name is generated automatically unless name is supplied. Folder options: a separate managed worktree, this folder as a new branch when it is clean (moving out an unfinished task that holds it, named in the option), this folder on its current branch, or not now. Nothing is created until the user answers; the next call with the same arguments allocates. A remote base is fetched and its exact commit pinned. Retry/resume preserves the allocation. Not now returns status deferred with the exact reconsider call; retries keep the same decisionAttempt. Use the returned repoRoot for ALL commands. A read-only task allocates only when transitioning to write.',
         inputSchema: z.strictObject({
             repoRoot: repo,
             externalTaskId: z.string().min(2).max(160),
@@ -399,12 +401,17 @@ export function registerWorktreeTools(server, service) {
                 keepCurrent: input.keepCurrent,
             }),
         };
-        const form = await askQuestionnaire(server, service, { ...definition, repoRoot: input.repoRoot, presentation: input.presentation }, context, [previous], owner);
-        const record = await service.questionnaireResume({
+        const form = await askQuestionnaire(server, service, { ...definition, repoRoot: input.repoRoot, presentation: input.presentation }, context, previous, owner);
+        const record = await service
+            .questionnaireResume({
             repoRoot: input.repoRoot,
             questionnaireId: definition.questionnaireId,
-        });
-        const choice = taskStartChoice(record);
+        })
+            .catch(() => undefined);
+        const choice = record?.binding &&
+            [definition, ...previous].some((offered) => stableStringify(record.binding) === stableStringify(offered.binding))
+            ? taskStartChoice(record)
+            : null;
         if (!choice)
             return form;
         if (choice.status === 'deferred')
@@ -490,6 +497,8 @@ export function registerWorktreeTools(server, service) {
                 repoRoot: input.repoRoot,
                 presentation: input.presentation,
             }, context, [definition(language !== 'tr'), previousFallback(true), previousFallback(false)], owner);
+            if (askFailed(fallbackForm))
+                return fallbackForm;
             const answer = await service.questionnaireResume({
                 repoRoot: input.repoRoot,
                 questionnaireId: fallbackId,
@@ -531,7 +540,7 @@ export function registerWorktreeTools(server, service) {
         inputSchema: locationSchema,
     }, async (input) => output(await service.worktreeOperation('list', input)));
     server.registerTool('worktree.reconcile', {
-        description: 'Reconcile Git with the local registry, including unregistered legacy checkouts. Use releaseUnowned only on a selected unreserved recovered checkout after prior work has finished; a native source-bound confirmation and fresh safety checks precede reuse. Use retireLegacy only when the user wants old-location slots gone: each retired folder is removed with git worktree remove after its own native approval, and the branch stays. Use forgetUnreadable with the externalTaskId of a checkout that is gone or can no longer be read as a Git worktree, called from a working checkout of the same project: after its own native approval Engineering Memory stops tracking that entry, so it no longer counts toward the limit, and no file in the folder is read, moved or deleted. Otherwise never delete files or reset branches.',
+        description: 'Reconcile Git with the local registry, including unregistered legacy checkouts. Use releaseUnowned only on a selected unreserved recovered checkout after prior work has finished; a native source-bound confirmation and fresh safety checks precede reuse. Use retireLegacy only when the user wants old-location slots gone: each retired folder is removed with git worktree remove after its own native approval, once every retired folder has an answer, and the branch stays. Reconsider a retired folder with a new decisionAttempt; retries keep the same attempt. Use forgetUnreadable with the externalTaskId of a checkout that is gone or can no longer be read as a Git worktree, called from a working checkout of the same project: after its own native approval Engineering Memory stops tracking that entry, so it no longer counts toward the limit, and no file in the folder is read, moved or deleted. Otherwise never delete files or reset branches.',
         inputSchema: z.strictObject({
             repoRoot: repo,
             releaseUnowned: z.boolean().optional(),
@@ -613,6 +622,8 @@ export function registerWorktreeTools(server, service) {
                     language: input.language,
                 }),
             });
+            if (askFailed(form))
+                return form;
             const decision = await service.questionnaireResume({
                 repoRoot: input.repoRoot,
                 questionnaireId,
@@ -634,9 +645,10 @@ export function registerWorktreeTools(server, service) {
             const retired = [];
             const kept = [];
             const refused = [];
+            const approved = [];
             for (const item of items) {
-                const questionnaireId = 'worktree-retire-' + sha256(item.repoRoot + item.generation);
                 const missing = item.reasons.includes('worktree directory missing');
+                const questionnaireId = retireQuestionId(item, !missing, input.decisionAttempt);
                 const folder = basename(item.repoRoot);
                 const definition = (turkish) => {
                     const copy = retireCopy[turkish ? 'tr' : 'en'];
@@ -677,20 +689,30 @@ export function registerWorktreeTools(server, service) {
                     ],
                 });
                 const form = await askQuestionnaire(server, service, { ...definition(language === 'tr'), repoRoot: input.repoRoot }, context, [definition(language !== 'tr'), previous(true), previous(false)]);
+                if (askFailed(form)) {
+                    refused.push({
+                        repoRoot: item.repoRoot,
+                        message: 'This folder was not asked about and nothing was removed: the decision stored under its question could not be opened.',
+                    });
+                    continue;
+                }
                 const decision = await service.questionnaireResume({
                     repoRoot: input.repoRoot,
                     questionnaireId,
                 });
                 if (decision.status !== 'answered')
                     return form;
-                if (decision.answer?.choice !== 'retire') {
+                if (decision.answer?.choice === 'retire')
+                    approved.push({ item, questionnaireId });
+                else
                     kept.push(item.repoRoot);
-                    continue;
-                }
+            }
+            for (const { item, questionnaireId } of approved) {
                 const result = await service.worktreeOperation('retire', {
                     repoRoot: input.repoRoot,
                     worktreePath: item.repoRoot,
                     generation: item.generation,
+                    decisionAttempt: input.decisionAttempt,
                     decisionId: questionnaireId,
                 });
                 if (result.ok)
@@ -753,6 +775,8 @@ export function registerWorktreeTools(server, service) {
             ],
         });
         const form = await askQuestionnaire(server, service, { ...definition(language === 'tr'), repoRoot: input.repoRoot }, context, [definition(language !== 'tr'), previous(true), previous(false)]);
+        if (askFailed(form))
+            return form;
         const decision = await service.questionnaireResume({
             repoRoot: input.repoRoot,
             questionnaireId,
@@ -857,6 +881,8 @@ export function registerWorktreeTools(server, service) {
                 ],
         });
         const form = await askQuestionnaire(server, service, { ...definition(language === 'tr'), repoRoot: input.repoRoot }, context, [definition(language !== 'tr'), previous(true), previous(false)]);
+        if (askFailed(form))
+            return form;
         const decision = await service.questionnaireResume({
             repoRoot: input.repoRoot,
             questionnaireId,

package/runtime/dist/src/runtime/bridge-service.js

@@ -6,7 +6,7 @@ import { lstat, readFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { SourceSnapshot } from '../git/source-snapshot.js';
 import { ProjectIntake } from '../project/project-intake.js';
-import { canonicalPath } from '../utilities/files.js';
+import { canonicalPath, pathExists } from '../utilities/files.js';
 import { minimatch } from 'minimatch';
 import { endpoints } from '../config.js';
 import { startPhaseTimer } from './phase-timer.js';
@@ -2276,7 +2276,13 @@ export class BridgeService {
         for (const candidate of candidates)
             if (!(await this.unusableBranchName(repoRoot, candidate)))
                 return candidate;
-        return candidates[0];
+        const git = this.dependencies.repositories.git;
+        let suffix = candidates.length + 1;
+        while (await git.branchExists(repoRoot, candidates[0] + '-' + suffix))
+            suffix++;
+        const name = candidates[0] + '-' + suffix;
+        await git.validateBranch(repoRoot, name);
+        return name;
     }
     async unusableBranchName(repoRoot, name) {
         const git = this.dependencies.repositories.git;
@@ -2444,9 +2450,10 @@ export class BridgeService {
             }
             if (operation === 'retire') {
                 const entry = input.worktreePath ? await pool.forPath(projectId, input.worktreePath) : null;
+                const folderPresent = entry ? await pathExists(entry.repoRoot) : false;
                 if (!entry ||
                     entry.generation !== input.generation ||
-                    input.decisionId !== 'worktree-retire-' + sha256(entry.repoRoot + entry.generation))
+                    input.decisionId !== retireQuestionId(entry, folderPresent, input.decisionAttempt ?? 0))
                     throw refuse('The retired folder changed after its removal was asked about. List the worktrees again.', 'worktree.list');
                 const decision = await this.questionnaireResume({
                     repoRoot: repository.repoRoot,
@@ -2454,7 +2461,7 @@ export class BridgeService {
                 });
                 if (decision.status !== 'answered' || decision.answer?.choice !== 'retire')
                     throw refuse('A retired folder is removed only after the user approves it in the native worktree.reconcile form.', 'worktree.reconcile');
-                await pool.retire(projectId, repository.repoRoot, entry.repoRoot, entry.generation);
+                await pool.retire(projectId, repository.repoRoot, entry.repoRoot, entry.generation, folderPresent);
                 return asJsonValue({ operation, complete: true, removed: entry.repoRoot });
             }
             const entry = await pool.forPath(projectId, repository.repoRoot);
@@ -5066,6 +5073,13 @@ export function cancelledDeliveryQuestionId(entry, clean) {
     return ('worktree-delivery-cancel-' +
         sha256(entry.generation + ':' + (clean ? 'clean' : entry.managed ? 'modified' : 'own-folder')));
 }
+export function retireQuestionId(entry, folderPresent, decisionAttempt) {
+    return ('worktree-retire-' +
+        sha256(entry.repoRoot +
+            entry.generation +
+            (folderPresent ? '' : ':record') +
+            (decisionAttempt ? ':' + decisionAttempt : '')));
+}
 function refuse(message, recovery, details) {
     return new BridgeRecoveryError(message, recovery, details);
 }

package/runtime/dist/src/runtime/task-start.js

@@ -73,6 +73,130 @@ export function configuredBase(preferences, role) {
         : null;
 }
 export function taskStartDefinition(facts) {
+    const { previous, ...legacy } = legacyTaskStartDefinition(facts);
+    const tr = facts.language === 'tr';
+    const binding = { ...legacy.binding };
+    const keepOnly = facts.keepCurrent === true || !facts.currentCommit;
+    if (!keepOnly) {
+        binding.name = facts.name ?? facts.suggestedName;
+        delete binding.suggestedName;
+    }
+    const seen = new Set();
+    const questions = legacy
+        .questions.filter((question) => question.id !== 'name')
+        .map((question) => {
+        if (question.id === 'base')
+            return {
+                ...question,
+                message: tr ? 'Hangi daldan başlayalım?' : 'Which starting branch?',
+                options: question.options
+                    .filter((option) => {
+                    const base = binding.bases?.[option.id];
+                    const identity = base ? stableStringify(base) : option.id;
+                    if (seen.has(identity))
+                        return false;
+                    seen.add(identity);
+                    return true;
+                })
+                    .map((option) => {
+                    const base = binding.bases?.[option.id];
+                    return {
+                        ...option,
+                        label: base?.kind === 'remote'
+                            ? sourceLabel(base, facts.currentBranch)
+                            : option.id === 'current'
+                                ? (tr ? 'Yerel: ' : 'Local: ') + (facts.currentBranch ?? 'HEAD')
+                                : tr
+                                    ? 'origin üzerinde başka dal'
+                                    : 'Another branch on origin',
+                        description: option.id === 'current'
+                            ? tr
+                                ? 'Çekmeden, mevcut commit’ten.'
+                                : 'Current commit; no fetch.'
+                            : option.id === 'other'
+                                ? tr
+                                    ? 'Alttaki alana yaz.'
+                                    : 'Enter it below.'
+                                : tr
+                                    ? 'Güncel hali çekilir.'
+                                    : 'Fetch the latest commit.',
+                    };
+                }),
+                textField: {
+                    ...question.textField,
+                    title: tr
+                        ? 'origin dalı (yalnızca başka dal için)'
+                        : 'Branch on origin (only for another branch)',
+                },
+            };
+        const holder = binding.holder?.externalTaskId;
+        return {
+            ...question,
+            message: tr ? 'Nerede çalışalım?' : 'Where should we work?',
+            ...(holder
+                ? {
+                    context: tr
+                        ? `Bu klasördeki ${holder} görevi burada başlarsan ayrı worktree’ye geçer; işi korunur.`
+                        : `Starting here moves ${holder} to a separate worktree; its work is kept.`,
+                }
+                : {}),
+            options: question.options.map((option) => ({
+                ...option,
+                label: option.id === 'worktree'
+                    ? tr
+                        ? 'Ayrı worktree'
+                        : 'Separate worktree'
+                    : option.id === 'here'
+                        ? tr
+                            ? 'Bu klasörde yeni dal'
+                            : 'New branch in this folder'
+                        : option.id === 'keep_current'
+                            ? tr
+                                ? 'Mevcut dalda kal'
+                                : 'Stay on the current branch'
+                            : tr
+                                ? 'Şimdilik başlatma'
+                                : 'Not now',
+                description: option.id === 'worktree'
+                    ? tr
+                        ? 'Bu klasör değişmez.'
+                        : 'Leave this folder unchanged.'
+                    : option.id === 'here'
+                        ? tr
+                            ? 'Klasör yeni dala geçer.'
+                            : 'Switch this folder to the new branch.'
+                        : option.id === 'keep_current'
+                            ? tr
+                                ? `${facts.currentBranch ?? 'HEAD'} üzerinde devam et.`
+                                : `Continue on ${facts.currentBranch ?? 'HEAD'}.`
+                            : tr
+                                ? 'Hiçbir şey oluşturulmaz.'
+                                : 'Create nothing.',
+            })),
+        };
+    });
+    questions.sort((left, right) => Number(right.id === 'base') - Number(left.id === 'base'));
+    return {
+        ...legacy,
+        message: tr ? 'Göreve başla' : 'Start task',
+        context: keepOnly
+            ? tr
+                ? 'Mevcut dalda devam edilecek.'
+                : 'Continue on the current branch.'
+            : (tr ? 'Yeni dal: ' : 'New branch: ') +
+                binding.name +
+                (binding.base ? ' · ' + sourceLabel(binding.base, facts.currentBranch) : ''),
+        example: keepOnly
+            ? legacy.example
+            : tr
+                ? 'Ayrı worktree, işi ayrı klasörde tutar.'
+                : 'A worktree keeps this task in its own folder.',
+        questions,
+        binding: JSON.parse(JSON.stringify(binding)),
+        previous: [previous, legacy],
+    };
+}
+function legacyTaskStartDefinition(facts) {
     const tr = facts.language === 'tr';
     const copy = startCopy[tr ? 'tr' : 'en'];
     const folder = facts.folder;

package/runtime/dist/src/runtime/worktree-pool.js

@@ -429,7 +429,7 @@ export class WorktreePool {
             await this.save(registry);
         });
     }
-    async retire(projectId, repoRoot, path, generation) {
+    async retire(projectId, repoRoot, path, generation, folderPresent) {
         const commonDir = await this.commonDirectory(repoRoot);
         const activeRoot = key(await this.documentsDirectory());
         const legacyRoot = await this.legacyDocumentsDirectory();
@@ -443,7 +443,10 @@ export class WorktreePool {
                 entry.commonDir !== commonDir ||
                 !this.outsideActiveRoot(entry, activeRoot, legacyRoot))
                 throw refuse('This folder is no longer the same retired slot. List the worktrees again before removing it.');
-            if (await pathExists(entry.repoRoot)) {
+            const present = await pathExists(entry.repoRoot);
+            if (present !== folderPresent)
+                throw refuse('The retired folder changed after its removal was asked about. List the worktrees again.');
+            if (present) {
                 const reasons = await this.fileProtection(entry);
                 if (reasons.length)
                     throw refuse('The retired folder is protected: ' +

package/skill/references/lifecycle.md

@@ -20,7 +20,7 @@ For a bound repository, call `session.bootstrap` before producing a plan or chan
 
 Before a new write or scaffold task, read `session.entry` and the project Git preferences. If `canManage` is true, and any of development/production/test is still unanswered, ask them through one native form and save them with `project.set_git_preferences` — the tool asks every supplied role as its own question in that single form, then saves the approved roles together in one PUT. Development needs a branch; production/test may explicitly be absent. Their answered flags prevent repeated questions. Other members choose only a task-specific base and continue without changing shared preferences. A later request to change a base updates future tasks only. Branch preferences never label memory sources or change commit/tree applicability.
 
-Start new write or scaffold work with `task.branch`, before `session.bootstrap`, passing the stable `externalTaskId` and `repoRoot`. It opens one native form: where the branch starts (the configured project branches, this folder's branch and commit, or another remote branch), the new branch's name with a suggested default, and the folder: a separate managed worktree, this folder as a new branch when it is clean (moving out an unfinished task that holds it, which that option names), this folder on its current branch, or not now. Pass `base` or `name` only when the user has already said them; those questions then drop out of the form. Show the whole form in as few native control calls as the host allows, relay every answer together, then call `task.branch` again with the same arguments, which is the `retry` the relay returns. That call allocates exactly what was answered, fetches a remote base and pins its commit, and returns the `repoRoot` to bootstrap in. When the fetch fails it asks once whether to continue from the local commit; never select a cached branch silently. "Not now" returns `status: 'deferred'` with nothing created, reserved or saved: say so in one line, continue only read-only work, and call the returned `reconsider` exactly as given once the user asks to start it. A refusal that names a new `decisionAttempt`, such as a branch name that already exists, asks the form again under that attempt. Existing task decisions survive retries and restarts; resume a recorded branch rather than recreating or resetting it.
+Start new write or scaffold work with `task.branch`, before `session.bootstrap`, passing the stable `externalTaskId` and `repoRoot`. It opens one short native form with only two questions: the starting branch and the folder. The branch name is generated automatically; a user-requested name may be supplied through `name`. Identical configured remote branches appear once. Folder choices: a separate managed worktree, this folder as a new branch when it is clean (moving out an unfinished task that holds it, which that option names), this folder on its current branch, or not now. Pass `base` or `name` when the user has already specified them; a supplied base removes that question. Do not ask a separate naming question. Keep the form concise and do not repeat its choices in a long chat introduction. Show the whole form in as few native control calls as the host allows, relay every answer together, then call `task.branch` again with the same arguments, which is the `retry` the relay returns. That call allocates exactly what was answered, fetches a remote base and pins its commit, and returns the `repoRoot` to bootstrap in. When the fetch fails it asks once whether to continue from the local commit; never select a cached branch silently. "Not now" returns `status: 'deferred'` with nothing created, reserved or saved: say so in one line, continue only read-only work, and call the returned `reconsider` exactly as given once the user asks to start it. A refusal that names a new `decisionAttempt`, such as a branch name that already exists, asks the form again under that attempt. Existing task decisions survive retries and restarts; resume a recorded branch rather than recreating or resetting it.
 
 Use the returned `repoRoot` for **every** file read/write, terminal, context, validation and Git/delivery operation. The user-local pool is shared by Codex and Claude. Managed directories live under `engineering_memory/worktrees/<stable-project-folder>/<folder>_worktreeN`, at the root of the system drive on Windows (`C:\engineering_memory\worktrees\...`) and in the home directory elsewhere, or under the absolute directory named by `worktree-root.json` in the user-level API state directory when that file exists; `worktree.list` reports the effective root, and worktrees created by earlier clients under the Documents folder keep working where they are. Do not supply arbitrary `worktreePath` values or create ad-hoc siblings. Independent clones cannot reuse each other's worktrees. `worktree.list` explains which slots are active, inactive but protected, or safely reusable. The versioned backend policy defaults to 50 directories per project/computer, 30-second heartbeats and 10-minute inactivity. Protected inactive directories still count toward the limit. Only a global admin changes `worktree.set_policy`; it is not an environment setting.
 

package/skill/references/questionnaires.md

@@ -8,9 +8,11 @@ Use `questionnaire.ask` for a required decision. It records the question before
 
 Pass `repoRoot`, `questionnaireId`, `message` and two to twelve `options`, each with an `id` and `label`. Identifiers use letters, digits, underscores or hyphens.
 
+Order choices with the recommendation first, or label the recommended choice explicitly in the user’s language. The renderer marks the recommendation without preselecting an answer. Keep task-start questions short; for a complex decision preserve the context, a concrete example and each option’s consequences. Do not repeat option explanations in the question body.
+
 A question has to be answerable by someone who has not followed the work. Say in `context` why it is being asked, give in `example` one concrete thing the decision changes, and give every option a `description` of what happens next if it is chosen. Show a record, a branch or a project by its title or name; an identifier or a hash in the visible text is refused, and one that really has to be shown goes inside backticks. Write all of it in the language the user is writing in and pass that language as `language`, a BCP-47 tag such as `tr`, `en` or `pt-BR`. The tag is remembered for the account and the computer, so it is asked for once: `session.entry` and every tool that opens a form take the same argument, and `questionnaire.ask` is refused while no language is known.
 
-Every form carries one more choice, "I did not understand; explain in more detail first". It is never recorded as an answer. When a call returns `needs_explanation`, explain in chat why the question is asked, what each option leads to and one example, then show the same question again with `questionnaire.resume`. A free-text reply that says the question was not understood is handled the same way and is not passed on as the decision. Set `allowFreeText` only when the user needs to give an answer outside those options. `questionnaire.resume` takes the same `repoRoot` and `questionnaireId`. These tools collect decisions; they do not commit, publish, bind a project or perform the selected action. Apply the accepted answer through the relevant lifecycle tool, checking the current target and version first.
+Every form lets the person write an answer or comment without selecting an option. Use the host control's own free-input area; do not add a duplicate Other choice or a second question for feedback. Standard MCP forms expose one optional free-input field. On fixed decisions, text returns `status: pending` and `reason: feedback`, including when a selection is present: a comment may qualify that selection. It is not persisted as a decision. Address the feedback, then resume the original question or use a new bound question if its choices change. A host-native free response is relayed with the internal `__other__` choice and `text`; that identifier is not a visible choice. Explicit `allowFreeText` forms retain their free-answer contract and accept a typed answer without a selection. Earlier explanation choices and checkbox replies still return `needs_explanation` without recording consent. When the person asks for more detail, explain why the question is asked, what the options lead to and one example, then resume the original question. Set `allowFreeText` only when the user needs to give an answer outside those options. `questionnaire.resume` takes the same `repoRoot` and `questionnaireId`. These tools collect decisions; they do not commit, publish, bind a project or perform the selected action. Apply the accepted answer through the relevant lifecycle tool, checking the current target and version first.
 
 Fixed-choice answers can be replayed from the local receipt. Free text is returned only in the accepting call and is never stored. If a later receipt says the answer is unavailable, recover it from the user's actual answer in the conversation; never reconstruct it from the options. If it cannot be recovered, explain that it must be requested again using a new question identifier.
 
@@ -26,7 +28,7 @@ never enough to answer here. Resume it only in the chat working on that task.
 
 Only an explicit, valid accepted response answers a question. A timeout, dismissed form, empty response, invalid response, connection loss or ended turn is not an answer. These events leave the decision pending. Never substitute the recommended choice or treat silence as consent. The form's cancel or decline button dismisses the form; if abandoning the work is a meaningful decision, offer it as an explicit answer in the question. A question left pending this way stays pending; show it again once, on the user's next message, and then wait rather than re-asking on every following turn.
 
-State the decision and one concrete example directly in the question's `message`, in the language the user is writing in. Never put a resource key, hash, task ID or other internal identifier in a question's text — it explains nothing to the person answering and only makes the question harder to read.
+State the decision in `message` and one useful example in `example`, in the language the user is writing in. Never put a resource key, hash, task ID or other internal identifier in a question's text — it explains nothing to the person answering and only makes the question harder to read.
 
 Never use request_user_input_async for a required decision: it does not wait for an answer. Do not end a turn while a required native form is still awaiting the user. Work that does not depend on the answer may continue. If the host removes the form or interrupts the tool call, retain the pending decision and resume that same question when the user returns. Do not automatically reopen dismissed forms in a loop, or use repeated sleeps to claim that a host timer has been disabled.
 
@@ -65,12 +67,12 @@ host: offer the MCP form again in a fresh session, since decline alone is not pr
 cannot display one.
 
 Some forms carry several related questions in one durable record. The `task.branch` start form
-asks where the task works, which branch it starts from and the branch name; the
+asks only the starting branch and where to work; it names the new branch automatically. The
 `project.set_git_preferences` form asks one question per role. Their `hostFallback` carries a
 `questions` array instead of a single `options` array. AskUserQuestion takes at most 4
 questions per call, so show them in as few calls as needed and relay every answer together in
 one `questionnaire.answer_from_host` call, as `answers` keyed by each question's id. A choice
-that needs text, such as a custom branch name, carries it as that answer's `text`. A record can
+that needs text, such as another starting branch, carries it as that answer's `text`. A record can
 also declare `terminalChoices`: picking one of those answers (for example "Not now") makes
 every other question in that form optional.
 
@@ -180,7 +182,7 @@ Ask for the registered email and intended role. Show owner, maintainer, member,
 
 ## Branch
 
-Call `task.branch` once for every new write or scaffold task, on any branch, and before a read-only task transitions to writing. Do not ask these questions yourself first: its one form asks where the task works (a separate managed worktree, this folder when it is clean, this folder after the task holding it moves out, or the branch already checked out), which branch it starts from, and the branch name, with a suggestion that follows the returned naming convention. Pass the exact `externalTaskId`. Pass `name`, `base` or `keepCurrent` only when the user already stated them, so the form skips that question; never pass a `worktreePath`. A task whose branch already exists resumes its recorded task instead of starting a new one. Continue in the returned `repoRoot`. Retries and handoffs reuse the stored answer. Read-only analysis does not create a branch or consume another task's answer.
+Call `task.branch` once for every new write or scaffold task, on any branch, and before a read-only task transitions to writing. Do not ask these questions yourself first: its one form asks where the task works (a separate managed worktree, this folder when it is clean, this folder after the task holding it moves out, or the branch already checked out), and which branch it starts from. The new branch name is generated automatically; never add a naming question unless the user requests it. Keep the two questions short; do not repeat all choices in the introduction. Pass the exact `externalTaskId`. Pass `name`, `base` or `keepCurrent` only when the user already stated them, so the form skips that question; never pass a `worktreePath`. A task whose branch already exists resumes its recorded task instead of starting a new one. Continue in the returned `repoRoot`. Retries and handoffs reuse the stored answer. Read-only analysis does not create a branch or consume another task's answer.
 
 ## Flow Entry and Exit
 
@@ -375,3 +377,5 @@ freed with `worktree.release` instead.
 
 If the user later reconsiders a preserved legacy checkout, repeat `worktree.reconcile` with a new
 `decisionAttempt`; never reinterpret the previous preserve answer as approval.
+
+Codex exposes native user-input tools and MCP elicitation as separate host capabilities. Use only tools permitted in the current mode. Standard MCP fields support labels, descriptions and optional text. Codex's native question UI already supports free responses; do not mistake a restriction in our form schema for a host limitation. Do not guess an undocumented `openai/form` schema. Keep fallback questions structured rather than flattening options into one long prompt.

package/bin/entry-point.test.mjs

@@ -1,29 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFile } from 'node:fs/promises';
-import test from 'node:test';
-
-const entryPoint = new URL('./engineering-memory.mjs', import.meta.url);
-const manifest = new URL('../package.json', import.meta.url);
-
-test('the published entry point tells the installer which version it is', async () => {
-  const source = await readFile(entryPoint, 'utf8');
-
-  assert.match(
-    source,
-    /'--client-version',\s*await publishedVersion\(\)/,
-    'The installer is never told the version, so every install reports itself as unknown and no update is ever offered',
-  );
-});
-
-test('the published entry point tells the installer which backend it was built for', async () => {
-  const source = await readFile(entryPoint, 'utf8');
-
-  assert.match(source, /'--api-url',\s*await publishedApiUrl\(\)/);
-});
-
-test('the manifest carries a version the entry point can stamp', async () => {
-  const declared = JSON.parse(await readFile(manifest, 'utf8'));
-
-  assert.match(String(declared.version), /^\d+\.\d+\.\d+$/);
-  assert.equal(declared.name, 'engineering-memory');
-});