dsh-code 1.0.1 → 1.0.3

package/lib/index.mjs

@@ -4,7 +4,7 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import { readFileSync, realpathSync } from "node:fs";
 import os, { homedir } from "node:os";
-import { mkdir, open, readFile, rm, stat, writeFile } from "node:fs/promises";
+import { mkdir, open, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
@@ -14,12 +14,12 @@ import { PassThrough, Stream } from "node:stream";
 import process$1, { cwd, env } from "node:process";
 import { EventEmitter } from "node:events";
 import { Buffer as Buffer$1 } from "node:buffer";
+import { DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES, DEFAULT_FILE_SEARCH_MAX_ENTRIES, DEFAULT_FILE_SEARCH_MAX_RESULTS, WorkspaceFileSearch } from "@deepseek-ai/dsh-file-reference-local";
+import { formatSessionReferenceMention, parseSessionReferenceText } from "@deepseek-ai/dsh-session-reference";
 import { execFile, spawn } from "node:child_process";
 import { credentialKeyId, credentialKeyScope } from "@deepseek-ai/dsh-credentials";
 import { AuthorizationDeclinedError } from "@deepseek-ai/dsh-authorization";
 import { fileURLToPath } from "node:url";
-import { DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES, DEFAULT_FILE_SEARCH_MAX_ENTRIES, DEFAULT_FILE_SEARCH_MAX_RESULTS, WorkspaceFileSearch } from "@deepseek-ai/dsh-file-reference-local";
-import { formatSessionReferenceMention, parseSessionReferenceText } from "@deepseek-ai/dsh-session-reference";
 import { UserQuestionError } from "@deepseek-ai/dsh-user-questions";
 import { isUserInvocable } from "@deepseek-ai/dsh-skill";
 //#region node_modules/.pnpm/react@18.3.1/node_modules/react/cjs/react.production.min.js
@@ -21657,16 +21657,16 @@ var import_emoji_regex = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(
 		return /[#*0-9]\uFE0F?\u20E3|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26AA\u26B0\u26B1\u26BD\u26BE\u26C4\u26C8\u26CF\u26D1\u26E9\u26F0-\u26F5\u26F7\u26F8\u26FA\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B55\u3030\u303D\u3297\u3299]\uFE0F?|[\u261D\u270C\u270D](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?|[\u270A\u270B](?:\uD83C[\uDFFB-\uDFFF])?|[\u23E9-\u23EC\u23F0\u23F3\u25FD\u2693\u26A1\u26AB\u26C5\u26CE\u26D4\u26EA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2795-\u2797\u27B0\u27BF\u2B50]|\u26D3\uFE0F?(?:\u200D\uD83D\uDCA5)?|\u26F9(?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|\u2764\uFE0F?(?:\u200D(?:\uD83D\uDD25|\uD83E\uDE79))?|\uD83C(?:[\uDC04\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]\uFE0F?|[\uDF85\uDFC2\uDFC7](?:\uD83C[\uDFFB-\uDFFF])?|[\uDFC4\uDFCA](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDFCB\uDFCC](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF43\uDF45-\uDF4A\uDF4C-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uDDE6\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF]|\uDDE7\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF]|\uDDE8\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF7\uDDFA-\uDDFF]|\uDDE9\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF]|\uDDEA\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA]|\uDDEB\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7]|\uDDEC\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE]|\uDDED\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA]|\uDDEE\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9]|\uDDEF\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5]|\uDDF0\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF]|\uDDF1\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE]|\uDDF2\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF]|\uDDF3\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF]|\uDDF4\uD83C\uDDF2|\uDDF5\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE]|\uDDF6\uD83C\uDDE6|\uDDF7\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC]|\uDDF8\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF]|\uDDF9\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF]|\uDDFA\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF]|\uDDFB\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA]|\uDDFC\uD83C[\uDDEB\uDDF8]|\uDDFD\uD83C\uDDF0|\uDDFE\uD83C[\uDDEA\uDDF9]|\uDDFF\uD83C[\uDDE6\uDDF2\uDDFC]|\uDF44(?:\u200D\uD83D\uDFEB)?|\uDF4B(?:\u200D\uD83D\uDFE9)?|\uDFC3(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDFF3\uFE0F?(?:\u200D(?:\u26A7\uFE0F?|\uD83C\uDF08))?|\uDFF4(?:\u200D\u2620\uFE0F?|\uDB40\uDC67\uDB40\uDC62\uDB40(?:\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDC73\uDB40\uDC63\uDB40\uDC74|\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F)?)|\uD83D(?:[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3]\uFE0F?|[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC](?:\uD83C[\uDFFB-\uDFFF])?|[\uDC6E-\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4\uDEB5](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD74\uDD90](?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?|[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC25\uDC27-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE41\uDE43\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED8\uDEDC-\uDEDF\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB\uDFF0]|\uDC08(?:\u200D\u2B1B)?|\uDC15(?:\u200D\uD83E\uDDBA)?|\uDC26(?:\u200D(?:\u2B1B|\uD83D\uDD25))?|\uDC3B(?:\u200D\u2744\uFE0F?)?|\uDC41\uFE0F?(?:\u200D\uD83D\uDDE8\uFE0F?)?|\uDC68(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDC68\uDC69]\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFC-\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFD-\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFD\uDFFF]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDD1D\uDEEF]\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFE]|[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3])))?))?|\uDC69(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?[\uDC68\uDC69]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?|\uDC69\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?))|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFC-\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFD-\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFD\uDFFF]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFE]|\uDEEF\u200D\uD83D\uDC69\uD83C[\uDFFB-\uDFFE])))?))?|\uDD75(?:\uD83C[\uDFFB-\uDFFF]|\uFE0F)?(?:\u200D[\u2640\u2642]\uFE0F?)?|\uDE2E(?:\u200D\uD83D\uDCA8)?|\uDE35(?:\u200D\uD83D\uDCAB)?|\uDE36(?:\u200D\uD83C\uDF2B\uFE0F?)?|\uDE42(?:\u200D[\u2194\u2195]\uFE0F?)?|\uDEB6(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?)|\uD83E(?:[\uDD0C\uDD0F\uDD18-\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5\uDEC3-\uDEC5\uDEF0\uDEF2-\uDEF8](?:\uD83C[\uDFFB-\uDFFF])?|[\uDD26\uDD35\uDD37-\uDD39\uDD3C-\uDD3E\uDDB8\uDDB9\uDDCD\uDDCF\uDDD4\uDDD6-\uDDDD](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDDDE\uDDDF](?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD0D\uDD0E\uDD10-\uDD17\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCC\uDDD0\uDDE0-\uDDFF\uDE70-\uDE7C\uDE80-\uDE8A\uDE8E-\uDEC2\uDEC6\uDEC8\uDECD-\uDEDC\uDEDF-\uDEEA\uDEEF]|\uDDCE(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDDD1(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1|\uDDD1\u200D\uD83E\uDDD2(?:\u200D\uD83E\uDDD2)?|\uDDD2(?:\u200D\uD83E\uDDD2)?))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC30\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE])|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3\uDE70]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF]|\uDEEF\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE])))?))?|\uDEF1(?:\uD83C(?:\uDFFB(?:\u200D\uD83E\uDEF2\uD83C[\uDFFC-\uDFFF])?|\uDFFC(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFD-\uDFFF])?|\uDFFD(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])?|\uDFFE(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFD\uDFFF])?|\uDFFF(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFE])?))?)/g;
 	};
 })))(), 1);
-const segmenter$1 = new Intl.Segmenter();
+const segmenter$2 = new Intl.Segmenter();
 const defaultIgnorableCodePointRegex = /^\p{Default_Ignorable_Code_Point}$/u;
-function stringWidth(string, options = {}) {
+function stringWidth$1(string, options = {}) {
 	if (typeof string !== "string" || string.length === 0) return 0;
 	const { ambiguousIsNarrow = true, countAnsiEscapeCodes = false } = options;
 	if (!countAnsiEscapeCodes) string = stripAnsi(string);
 	if (string.length === 0) return 0;
 	let width = 0;
 	const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
-	for (const { segment: character } of segmenter$1.segment(string)) {
+	for (const { segment: character } of segmenter$2.segment(string)) {
 		const codePoint = character.codePointAt(0);
 		if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) continue;
 		if (codePoint >= 8203 && codePoint <= 8207 || codePoint === 65279) continue;
@@ -21686,7 +21686,7 @@ function stringWidth(string, options = {}) {
 //#region node_modules/.pnpm/widest-line@5.0.0/node_modules/widest-line/index.js
 function widestLine(string) {
 	let lineWidth = 0;
-	for (const line of string.split("\n")) lineWidth = Math.max(lineWidth, stringWidth(line));
+	for (const line of string.split("\n")) lineWidth = Math.max(lineWidth, stringWidth$1(line));
 	return lineWidth;
 }
 //#endregion
@@ -21885,14 +21885,14 @@ const ANSI_SGR_TERMINATOR = "m";
 const ANSI_ESCAPE_LINK = `${ANSI_OSC}8;;`;
 const wrapAnsiCode = (code) => `${ESCAPES$3.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`;
 const wrapAnsiHyperlink = (url) => `${ESCAPES$3.values().next().value}${ANSI_ESCAPE_LINK}${url}${ANSI_ESCAPE_BELL}`;
-const wordLengths = (string) => string.split(" ").map((character) => stringWidth(character));
+const wordLengths = (string) => string.split(" ").map((character) => stringWidth$1(character));
 const wrapWord = (rows, word, columns) => {
 	const characters = [...word];
 	let isInsideEscape = false;
 	let isInsideLinkEscape = false;
-	let visible = stringWidth(stripAnsi(rows.at(-1)));
+	let visible = stringWidth$1(stripAnsi(rows.at(-1)));
 	for (const [index, character] of characters.entries()) {
-		const characterLength = stringWidth(character);
+		const characterLength = stringWidth$1(character);
 		if (visible + characterLength <= columns) rows[rows.length - 1] += character;
 		else {
 			rows.push(character);
@@ -21923,7 +21923,7 @@ const stringVisibleTrimSpacesRight = (string) => {
 	const words = string.split(" ");
 	let last = words.length;
 	while (last > 0) {
-		if (stringWidth(words[last - 1]) > 0) break;
+		if (stringWidth$1(words[last - 1]) > 0) break;
 		last--;
 	}
 	if (last === words.length) return string;
@@ -21938,7 +21938,7 @@ const exec = (string, columns, options = {}) => {
 	let rows = [""];
 	for (const [index, word] of string.split(" ").entries()) {
 		if (options.trim !== false) rows[rows.length - 1] = rows.at(-1).trimStart();
-		let rowLength = stringWidth(rows.at(-1));
+		let rowLength = stringWidth$1(rows.at(-1));
 		if (index !== 0) {
 			if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
 				rows.push("");
@@ -22086,7 +22086,7 @@ function cliTruncate(text, columns, options = {}) {
 	if (typeof columns !== "number") throw new TypeError(`Expected \`columns\` to be a number, got ${typeof columns}`);
 	if (columns < 1) return "";
 	if (columns === 1) return truncationCharacter;
-	const length = stringWidth(text);
+	const length = stringWidth$1(text);
 	if (length <= columns) return text;
 	if (position === "start") {
 		if (preferTruncationOnSpace) {
@@ -22094,7 +22094,7 @@ function cliTruncate(text, columns, options = {}) {
 			return truncationCharacter + sliceAnsi$1(text, nearestSpace, length).trim();
 		}
 		if (space === true) truncationCharacter += " ";
-		return truncationCharacter + sliceAnsi$1(text, length - columns + stringWidth(truncationCharacter), length);
+		return truncationCharacter + sliceAnsi$1(text, length - columns + stringWidth$1(truncationCharacter), length);
 	}
 	if (position === "middle") {
 		if (space === true) truncationCharacter = ` ${truncationCharacter} `;
@@ -22104,12 +22104,12 @@ function cliTruncate(text, columns, options = {}) {
 			const spaceNearSecondBreakPoint = getIndexOfNearestSpace(text, length - (columns - half) + 1, true);
 			return sliceAnsi$1(text, 0, spaceNearFirstBreakPoint) + truncationCharacter + sliceAnsi$1(text, spaceNearSecondBreakPoint, length).trim();
 		}
-		return sliceAnsi$1(text, 0, half) + truncationCharacter + sliceAnsi$1(text, length - (columns - half) + stringWidth(truncationCharacter), length);
+		return sliceAnsi$1(text, 0, half) + truncationCharacter + sliceAnsi$1(text, length - (columns - half) + stringWidth$1(truncationCharacter), length);
 	}
 	if (position === "end") {
 		if (preferTruncationOnSpace) return sliceAnsi$1(text, 0, getIndexOfNearestSpace(text, columns - 1)) + truncationCharacter;
 		if (space === true) truncationCharacter = ` ${truncationCharacter}`;
-		return sliceAnsi$1(text, 0, columns - stringWidth(truncationCharacter)) + truncationCharacter;
+		return sliceAnsi$1(text, 0, columns - stringWidth$1(truncationCharacter)) + truncationCharacter;
 	}
 	throw new Error(`Expected \`options.position\` to be either \`start\`, \`middle\` or \`end\`, got ${position}`);
 }
@@ -23064,7 +23064,7 @@ var Output = class {
 					if (clipHorizontally) {
 						lines = lines.map((line) => {
 							const from = x < clip.x1 ? clip.x1 - x : 0;
-							const width = stringWidth(line);
+							const width = stringWidth$1(line);
 							return sliceAnsi(line, from, x + width > clip.x2 ? clip.x2 - x : width);
 						});
 						if (x < clip.x1) x = clip.x1;
@@ -24355,6 +24355,180 @@ function followInspectorCursor(cursor, previousLength, nextLength) {
 	return Math.min(cursor, nextLast);
 }
 //#endregion
+//#region src/render/width.ts
+/**
+* Precise terminal-cell width measurement — the single authority every
+* budget, wrap, and truncation path shares. The previous heuristic
+* (`codePoint > 0x2e7f ? 2 : 1)) mis-sized Hangul Jamo (narrow), high
+* non-CJK code points (wide), and emoji: text-default glyphs like ✳ ⚠ ❤
+* counted 2 while terminals draw 1, and VS16 sequences counted 1 while
+* terminals draw 2 — the exact drift class the community dsh-TUI string
+* engine documents (a spinner glyph drifting one column per frame). This
+* module adapts that engine's rules without its Ink-fork renderer: an ASCII
+* fast path, grapheme-cluster iteration via Intl.Segmenter (code-point
+* fallback), a merged East-Asian-Wide/Fullwidth + Emoji_Presentation range
+* table, text-default emoji = 1, VS16 = 2, marks/selectors/ZWJ = 0.
+* @module @deepseek-ai/dsh-code/render/width
+*/
+/**
+* Code-point ranges rendered two cells wide: East Asian Wide/Fullwidth
+* blocks merged with the Emoji_Presentation set (default-wide emoji) and
+* regional indicators (flags). Sorted, inclusive, binary-searched.
+*/
+const WIDE_RANGES = [
+	[4352, 4447],
+	[8986, 8987],
+	[9001, 9002],
+	[9193, 9196],
+	[9200, 9200],
+	[9203, 9203],
+	[9208, 9210],
+	[9725, 9726],
+	[9748, 9749],
+	[9800, 9811],
+	[9855, 9855],
+	[9875, 9875],
+	[9889, 9889],
+	[9898, 9899],
+	[9917, 9918],
+	[9924, 9925],
+	[9934, 9934],
+	[9940, 9940],
+	[9962, 9962],
+	[9970, 9971],
+	[9973, 9973],
+	[9978, 9978],
+	[9981, 9981],
+	[9989, 9989],
+	[9994, 9995],
+	[10024, 10024],
+	[10060, 10060],
+	[10062, 10062],
+	[10067, 10069],
+	[10071, 10071],
+	[10133, 10135],
+	[10160, 10160],
+	[10175, 10175],
+	[11035, 11036],
+	[11088, 11088],
+	[11093, 11093],
+	[11904, 12350],
+	[12353, 13311],
+	[13312, 19903],
+	[19968, 42191],
+	[43360, 43391],
+	[44032, 55203],
+	[63744, 64255],
+	[65040, 65049],
+	[65072, 65103],
+	[65280, 65376],
+	[65504, 65510],
+	[94176, 94180],
+	[94208, 101119],
+	[110592, 111359],
+	[126980, 126980],
+	[127183, 127183],
+	[127374, 127374],
+	[127377, 127386],
+	[127462, 127487],
+	[127488, 127776],
+	[127789, 127797],
+	[127799, 127868],
+	[127870, 127891],
+	[127904, 127946],
+	[127951, 127955],
+	[127968, 127984],
+	[127988, 127988],
+	[127992, 128062],
+	[128064, 128064],
+	[128066, 128252],
+	[128255, 128317],
+	[128331, 128334],
+	[128336, 128359],
+	[128378, 128378],
+	[128405, 128406],
+	[128420, 128420],
+	[128507, 128591],
+	[128640, 128709],
+	[128716, 128716],
+	[128720, 128722],
+	[128725, 128727],
+	[128747, 128748],
+	[128756, 128764],
+	[128992, 129003],
+	[129292, 129338],
+	[129340, 129349],
+	[129351, 129535],
+	[129648, 129660],
+	[129664, 129673],
+	[129679, 129734],
+	[129742, 129756],
+	[129759, 129769],
+	[129776, 129784],
+	[131072, 196605],
+	[196608, 262141]
+];
+/** Whether one code point falls inside a wide range (binary search). */
+function isWideCodePoint(code) {
+	let low = 0;
+	let high = WIDE_RANGES.length - 1;
+	while (low <= high) {
+		const mid = low + high >> 1;
+		const [start, end] = WIDE_RANGES[mid];
+		if (code < start) high = mid - 1;
+		else if (code > end) low = mid + 1;
+		else return true;
+	}
+	return false;
+}
+/** Zero-width code points: combining marks, enclosing marks, format controls. */
+const ZERO_WIDTH = /^[\p{Mn}\p{Me}\p{Cf}]$/u;
+/** Module-cached grapheme segmenter; undefined when the runtime lacks it. */
+let segmenter$1;
+try {
+	segmenter$1 = new Intl.Segmenter("en", { granularity: "grapheme" });
+} catch {
+	segmenter$1 = void 0;
+}
+/** Split text into grapheme clusters (code points when Segmenter is absent). */
+function splitGraphemes$1(text) {
+	if (segmenter$1 === void 0) return Array.from(text);
+	return Array.from(segmenter$1.segment(text), (part) => part.segment);
+}
+/** Terminal-cell width of one grapheme cluster. */
+function graphemeWidth(cluster) {
+	if (cluster.includes("️", 0)) return 2;
+	const first = cluster.codePointAt(0) ?? 0;
+	if (ZERO_WIDTH.test(String.fromCodePoint(first))) return 0;
+	return isWideCodePoint(first) ? 2 : 1;
+}
+/**
+* Terminal-cell width of a string: an ASCII fast path avoids the segmenter
+* for the overwhelmingly common case; everything else sums grapheme clusters.
+* Control characters occupy no cells (display sanitization makes them
+* visible escapes before they ever reach a budget).
+* @param text - display-safe or raw text to measure.
+* @returns the column count the terminal will draw.
+*/
+function stringWidth(text) {
+	let asciiOnly = true;
+	for (let index = 0; index < text.length; index += 1) if (text.charCodeAt(index) > 127) {
+		asciiOnly = false;
+		break;
+	}
+	if (asciiOnly) {
+		let columns = 0;
+		for (let index = 0; index < text.length; index += 1) {
+			const code = text.charCodeAt(index);
+			if (code >= 32 && code !== 127) columns += 1;
+		}
+		return columns;
+	}
+	let columns = 0;
+	for (const cluster of splitGraphemes$1(text)) columns += graphemeWidth(cluster);
+	return columns;
+}
+//#endregion
 //#region src/render/text.ts
 /**
 * Display-boundary sanitization for externally sourced text (model output,
@@ -24395,56 +24569,45 @@ function displayText(text) {
 function singleLineText(text) {
 	return displayText(text).replace(/\r?\n/gu, " ↵ ").replace(/\t/gu, "  ");
 }
-/** Terminal-cell width matching the TUI's existing CJK-aware wrapping rule. */
-function cellWidth(text) {
-	let columns = 0;
-	for (const char of text) columns += (char.codePointAt(0) ?? 0) > 11903 ? 2 : 1;
-	return columns;
-}
 /**
 * Truncate one display-safe row without ever exceeding its physical-column
 * budget. The ellipsis is included inside the budget, matching Codex's popup
-* truncation contract; the previous app-local helper appended it after the
-* row was already full and could force an extra terminal wrap.
+* truncation contract; the cut walks grapheme clusters so emoji and
+* combining sequences never split mid-cluster.
 */
 function truncateColumns(text, columns) {
 	const limit = Math.max(0, Math.floor(columns));
 	if (limit === 0) return "";
-	if (cellWidth(text) <= limit) return text;
+	if (stringWidth(text) <= limit) return text;
 	const contentLimit = limit - 1;
 	let used = 0;
 	let result = "";
-	for (const char of text) {
-		const width = cellWidth(char);
+	for (const cluster of splitGraphemes$1(text)) {
+		const width = graphemeWidth(cluster);
 		if (used + width > contentLimit) break;
-		result += char;
+		result += cluster;
 		used += width;
 	}
 	return `${result}…`;
 }
-/** Read one Unicode character immediately before `end`. */
-function previousCharacter(text, end) {
-	const last = text.charCodeAt(end - 1);
-	if (last >= 56320 && last <= 57343 && end >= 2) {
-		const first = text.charCodeAt(end - 2);
-		if (first >= 55296 && first <= 56319) return {
-			char: text.slice(end - 2, end),
-			start: end - 2
-		};
-	}
-	return {
-		char: text.slice(end - 1, end),
-		start: end - 1
-	};
-}
+/** Punctuation that must never START a physical row (CJK kinsoku tail set). */
+const ROW_START_FORBIDDEN = "，。、；：！？）】」』〉》…‥";
+/** Punctuation that must never END a physical row (CJK kinsoku head set). */
+const ROW_END_FORBIDDEN = "（【「『〈《";
 /**
-* Keep only the newest display-safe text that fits a terminal rectangle.
-* The scan walks backward and stops as soon as the suffix is full, so a long
-* reasoning stream does not rescan its entire accumulated prefix per chunk.
-* Explicit newlines and terminal wrapping both consume rows; tabs expand to
-* two spaces so terminal tab stops (which render at contextual column 8
-* boundaries, not at the budgeted cell count) cannot inflate the physical
-* row count of the live region.
+* Keep the newest display-safe text that fits a terminal rectangle, wrapping
+* FORWARD from the start of the text and slicing the tail rows.
+*
+* Forward wrapping is what keeps a streaming tail calm: rows already produced
+* never re-wrap as tokens append (a backward scan recomputes every wrap point
+* per chunk and the whole visible block jumps), and the wrap rules match the
+* settled text's renderer so the flush at turn end does not reflow the block
+* a second time. CJK kinsoku applies at both edges: closing punctuation
+* overhangs up to two cells onto the filled row instead of starting the next
+* one (within the caret column the caller reserves), and opening punctuation
+* moves down instead of dangling at a row end. Tabs expand to two spaces so
+* terminal tab stops cannot inflate the physical row count; clusters carry
+* emoji presentation and combining marks whole.
 * @param text - raw externally sourced text.
 * @param columns - available terminal columns.
 * @param rows - available terminal rows.
@@ -24453,38 +24616,43 @@ function previousCharacter(text, end) {
 function displayTail(text, columns, rows) {
 	const columnLimit = Math.max(1, Math.floor(columns));
 	const rowLimit = Math.max(1, Math.floor(rows));
-	const reversed = [];
-	let row = 1;
+	const wrapped = [];
+	let current = "";
 	let used = 0;
-	let end = text.length;
-	while (end > 0) {
-		const previous = previousCharacter(text, end);
-		if (previous.char === "\n") {
-			if (row >= rowLimit) break;
-			reversed.push("\n");
-			row += 1;
-			used = 0;
-			end = previous.start;
+	let lastCluster = "";
+	const flush = () => {
+		wrapped.push(current);
+		current = "";
+		used = 0;
+		lastCluster = "";
+	};
+	for (const cluster of splitGraphemes$1(text)) {
+		if (cluster === "\n") {
+			flush();
 			continue;
 		}
-		const safe = previous.char === "	" ? "  " : displayText(previous.char);
-		const width = cellWidth(safe);
+		const safe = cluster === "	" ? "  " : displayText(cluster);
+		const width = stringWidth(safe);
 		if (used > 0 && used + width > columnLimit) {
-			if (row >= rowLimit) break;
-			reversed.push("\n");
-			row += 1;
-			used = 0;
-		}
-		const extraRows = Math.floor(Math.max(0, width - 1) / columnLimit);
-		if (row + extraRows > rowLimit) break;
-		row += extraRows;
-		reversed.push(safe);
-		used = extraRows === 0 ? used + width : width - extraRows * columnLimit;
-		end = previous.start;
+			if (!(width <= 2 && ROW_START_FORBIDDEN.includes(cluster))) {
+				if (lastCluster !== "" && ROW_END_FORBIDDEN.includes(lastCluster)) {
+					const carried = lastCluster;
+					current = current.slice(0, current.length - carried.length);
+					flush();
+					current = carried;
+					used = stringWidth(carried);
+				} else flush();
+			}
+		}
+		current += safe;
+		used += width;
+		lastCluster = cluster;
 	}
+	if (current !== "" || wrapped.length > 0 && text.endsWith("\n")) flush();
+	const truncated = wrapped.length > rowLimit;
 	return {
-		text: reversed.reverse().join(""),
-		truncated: end > 0
+		text: (truncated ? wrapped.slice(-rowLimit) : wrapped).join("\n"),
+		truncated
 	};
 }
 //#endregion
@@ -24947,535 +25115,14 @@ function reasoningOf(content) {
 function estimateTokens(text) {
 	let wide = 0;
 	let narrow = 0;
-	for (const char of text) if ((char.codePointAt(0) ?? 0) > 11903) wide += 1;
+	for (const cluster of splitGraphemes$1(text)) if (graphemeWidth(cluster) > 1) wide += 1;
 	else narrow += 1;
 	return wide + Math.ceil(narrow / 4);
 }
-/** A fresh, empty transcript view. */
-function createTranscriptView() {
-	return {
-		entries: [],
-		streaming: "",
-		streamingReasoning: "",
-		todos: [],
-		toolCallOrdinal: 0,
-		busy: false,
-		busySince: 0,
-		model: "",
-		plan: false,
-		permission: "",
-		title: "",
-		sandbox: "",
-		goal: void 0,
-		pending: {
-			"next-turn": [],
-			"next-step": []
-		},
-		stats: {
-			turns: 0,
-			steps: 0,
-			llmMs: 0,
-			toolMs: 0,
-			usage: {
-				inputTokens: 0,
-				outputTokens: 0,
-				cacheReadTokens: 0
-			},
-			lastPromptTokens: 0,
-			contextWindow: 0,
-			contextSegments: {
-				system: 0,
-				prompt: 0,
-				assistant: 0,
-				thinking: 0,
-				tools: 0
-			},
-			ttftMs: 0,
-			ttftSteps: 0,
-			decodeMs: 0,
-			decodeTokens: 0,
-			reasoningEffort: ""
-		},
-		anchors: {
-			stepStart: /* @__PURE__ */ new Map(),
-			toolStart: /* @__PURE__ */ new Map(),
-			firstChunkAt: /* @__PURE__ */ new Map(),
-			compactionTokens: /* @__PURE__ */ new Map(),
-			lastPruneTokens: 0,
-			turnFiles: /* @__PURE__ */ new Map(),
-			turnSteps: /* @__PURE__ */ new Map(),
-			turnTools: /* @__PURE__ */ new Map()
-		}
-	};
-}
 /** Full prompt text of a queued message (identical to the durable user row it retires into). */
 function pendingText(content) {
 	return textOf(content);
 }
-/**
-* Fold one session event into an updated view (copy-on-write).
-* @param view - the view before the event.
-* @param event - one durable session event from `session/event` or the log.
-* @returns the view after the event; the input view is never mutated.
-*/
-function projectEvent(view, event) {
-	switch (event.type) {
-		case "user/message": {
-			const message = event.data;
-			let entries = view.entries;
-			let pending = view.pending;
-			for (const target of ["next-turn", "next-step"]) {
-				const index = pending[target].indexOf(message.id);
-				if (index < 0) continue;
-				pending = {
-					...pending,
-					[target]: pending[target].filter((_, i) => i !== index)
-				};
-				entries = entries.filter((entry) => !(entry.kind === "pending" && entry.messageId === message.id));
-			}
-			const text = textOf(message.content);
-			const images = imagesOf(message.content);
-			if (message.source.kind === "user") return {
-				...view,
-				pending,
-				entries: [...entries, {
-					kind: "user",
-					text,
-					notice: false,
-					...images.length === 0 ? {} : { images }
-				}],
-				stats: {
-					...view.stats,
-					contextSegments: {
-						...view.stats.contextSegments,
-						prompt: view.stats.contextSegments.prompt + estimateTokens(text)
-					}
-				}
-			};
-			const notice = message.source.kind === "plugin" && message.source.form === "notice" ? message.source.summary : message.source.kind;
-			const summary = boundContextSummary(notice);
-			return {
-				...view,
-				pending,
-				entries: [...entries, {
-					kind: "user",
-					text: summary,
-					notice: true
-				}],
-				stats: {
-					...view.stats,
-					contextSegments: {
-						...view.stats.contextSegments,
-						system: view.stats.contextSegments.system + estimateTokens(summary)
-					}
-				}
-			};
-		}
-		case "agent/inbox/spliced": {
-			const { target, start, removedCount = 0, inserted } = event.data;
-			const ids = view.pending[target];
-			const removed = ids.slice(start, start + removedCount);
-			const nextIds = [
-				...ids.slice(0, start),
-				...ids.slice(start + removedCount),
-				...inserted.map((message) => message.id)
-			];
-			let entries = view.entries;
-			if (removed.length > 0) {
-				const removedSet = new Set(removed);
-				entries = entries.filter((entry) => !(entry.kind === "pending" && entry.target === target && removedSet.has(entry.messageId)));
-			}
-			for (const message of inserted) entries = [...entries, {
-				kind: "pending",
-				messageId: message.id,
-				target,
-				text: pendingText(message.content),
-				...imagesOf(message.content).length === 0 ? {} : { images: imagesOf(message.content) }
-			}];
-			return {
-				...view,
-				entries,
-				pending: {
-					...view.pending,
-					[target]: nextIds
-				}
-			};
-		}
-		case "assistant/chunk": {
-			const chunk = event.data.chunk;
-			const key = `${event.data.turn}:${event.data.step}`;
-			const delta = chunk.type === "text-delta" || chunk.type === "reasoning-delta" ? chunk.text : "";
-			let stats = view.stats;
-			if (delta !== "" && !view.anchors.firstChunkAt.has(key)) {
-				view.anchors.firstChunkAt.set(key, event.time);
-				const started = view.anchors.stepStart.get(key);
-				if (started !== void 0) stats = {
-					...stats,
-					ttftMs: stats.ttftMs + Math.max(0, event.time - started),
-					ttftSteps: stats.ttftSteps + 1
-				};
-			}
-			if (chunk.type === "text-delta") return {
-				...view,
-				streaming: appendStreamingTail(view.streaming, chunk.text),
-				stats
-			};
-			if (chunk.type === "reasoning-delta") return {
-				...view,
-				streamingReasoning: appendStreamingTail(view.streamingReasoning, chunk.text),
-				stats
-			};
-			return view;
-		}
-		case "assistant/message": {
-			const key = `${event.data.turn}:${event.data.step}`;
-			const started = view.anchors.stepStart.get(key);
-			view.anchors.stepStart.delete(key);
-			const firstChunk = view.anchors.firstChunkAt.get(key);
-			view.anchors.firstChunkAt.delete(key);
-			if (view.anchors.turnSteps.get(event.data.turn) === key) view.anchors.turnSteps.delete(event.data.turn);
-			const usage = event.data.usage;
-			const totals = view.stats.usage;
-			const text = textOf(event.data.message.content);
-			const reasoning = reasoningOf(event.data.message.content);
-			return {
-				...view,
-				streaming: "",
-				streamingReasoning: "",
-				entries: [...view.entries, {
-					kind: "assistant",
-					text,
-					reasoning,
-					interrupted: event.data.interrupted === true ? true : void 0
-				}],
-				stats: {
-					...view.stats,
-					llmMs: view.stats.llmMs + (started === void 0 ? 0 : Math.max(0, event.time - started)),
-					usage: usage === void 0 ? totals : {
-						inputTokens: totals.inputTokens + usage.inputTokens + (usage.cacheReadTokens ?? 0) + (usage.cacheWriteTokens ?? 0),
-						outputTokens: totals.outputTokens + usage.outputTokens,
-						cacheReadTokens: totals.cacheReadTokens + (usage.cacheReadTokens ?? 0)
-					},
-					lastPromptTokens: usage === void 0 ? view.stats.lastPromptTokens : usage.inputTokens + (usage.cacheReadTokens ?? 0) + (usage.cacheWriteTokens ?? 0),
-					decodeMs: view.stats.decodeMs + (firstChunk === void 0 ? 0 : Math.max(0, event.time - firstChunk)),
-					decodeTokens: view.stats.decodeTokens + (firstChunk === void 0 || usage === void 0 ? 0 : usage.outputTokens),
-					contextSegments: {
-						...view.stats.contextSegments,
-						thinking: view.stats.contextSegments.thinking + estimateTokens(reasoning),
-						assistant: view.stats.contextSegments.assistant + estimateTokens(text)
-					}
-				}
-			};
-		}
-		case "tool/call": {
-			const data = event.data;
-			view.anchors.toolStart.set(data.callId, event.time);
-			const turnTools = view.anchors.turnTools.get(data.turn) ?? /* @__PURE__ */ new Set();
-			turnTools.add(data.callId);
-			view.anchors.turnTools.set(data.turn, turnTools);
-			const ordinal = view.toolCallOrdinal + 1;
-			return {
-				...view,
-				toolCallOrdinal: ordinal,
-				entries: [...view.entries, {
-					kind: "tool",
-					callId: data.callId,
-					ordinal,
-					name: data.name,
-					arguments: data.arguments,
-					preview: toolArgumentsPreview(data.arguments, data.name),
-					prompt: toolPromptPreview(data.name, data.arguments),
-					state: "running",
-					summary: "",
-					detail: void 0
-				}],
-				stats: {
-					...view.stats,
-					contextSegments: {
-						...view.stats.contextSegments,
-						tools: view.stats.contextSegments.tools + (typeof data.arguments === "string" ? estimateTokens(data.arguments) : 0)
-					}
-				}
-			};
-		}
-		case "tool/result": {
-			const block = event.data.message.content[0];
-			const started = view.anchors.toolStart.get(block.toolCallId);
-			view.anchors.toolStart.delete(block.toolCallId);
-			const turnTools = view.anchors.turnTools.get(event.data.turn);
-			if (turnTools !== void 0) {
-				turnTools.delete(block.toolCallId);
-				if (turnTools.size === 0) view.anchors.turnTools.delete(event.data.turn);
-			}
-			const rawText = textOf(block.content);
-			const summary = boundContextSummary(rawText);
-			const detail = toolResultDetail(event.data.meta, rawText);
-			if (detail?.kind === "diff") {
-				const set = view.anchors.turnFiles.get(event.data.turn) ?? /* @__PURE__ */ new Set();
-				for (const diff of detail.diffs) set.add(diff.path);
-				view.anchors.turnFiles.set(event.data.turn, set);
-			}
-			const entries = view.entries.map((entry) => {
-				if (entry.kind !== "tool" || entry.callId !== block.toolCallId) return entry;
-				return {
-					...entry,
-					state: block.isError === true ? "error" : "done",
-					summary,
-					detail
-				};
-			});
-			return {
-				...view,
-				entries,
-				stats: {
-					...view.stats,
-					toolMs: view.stats.toolMs + (started === void 0 ? 0 : Math.max(0, event.time - started)),
-					contextSegments: {
-						...view.stats.contextSegments,
-						tools: view.stats.contextSegments.tools + estimateTokens(rawText)
-					}
-				}
-			};
-		}
-		case "todo/write": return {
-			...view,
-			todos: event.data.todos
-		};
-		case "turn/start": return {
-			...view,
-			busy: true,
-			busySince: view.busy ? view.busySince : event.time,
-			todos: [],
-			stats: {
-				...view.stats,
-				turns: view.stats.turns + 1
-			}
-		};
-		case "step/start": {
-			const key = `${event.data.turn}:${event.data.step}`;
-			const previous = view.anchors.turnSteps.get(event.data.turn);
-			if (previous !== void 0 && previous !== key) {
-				view.anchors.stepStart.delete(previous);
-				view.anchors.firstChunkAt.delete(previous);
-			}
-			view.anchors.turnSteps.set(event.data.turn, key);
-			view.anchors.stepStart.set(key, event.time);
-			return {
-				...view,
-				streaming: "",
-				streamingReasoning: "",
-				stats: {
-					...view.stats,
-					steps: view.stats.steps + 1
-				}
-			};
-		}
-		case "turn/end": {
-			const reason = event.data.reason;
-			const appended = [];
-			if (reason.kind === "error") {
-				const recovery = reason.error.code === "MISSING_CREDENTIAL" ? " · open /model to add an API key" : "";
-				appended.push({
-					kind: "error",
-					text: `${reason.error.code}: ${reason.error.message}${recovery}`
-				});
-			} else {
-				const marker = reason.kind === "aborted" ? reason.reason.kind === "user" ? "turn cancelled by the user" : `turn cancelled (${reason.reason.kind})` : reason.kind === "max-tokens" ? "turn hit the output-token ceiling (max-tokens)" : reason.kind === "blocked" ? "turn ended blocked" : reason.kind === "interrupted" ? "turn was interrupted by a restart" : void 0;
-				if (marker !== void 0) appended.push({
-					kind: "turn-marker",
-					text: marker
-				});
-			}
-			const files = view.anchors.turnFiles.get(event.data.turn);
-			view.anchors.turnFiles.delete(event.data.turn);
-			if (files !== void 0 && files.size > 0) appended.push({
-				kind: "files",
-				paths: [...files].slice(0, 12)
-			});
-			const stepKey = view.anchors.turnSteps.get(event.data.turn);
-			if (stepKey !== void 0) {
-				view.anchors.stepStart.delete(stepKey);
-				view.anchors.firstChunkAt.delete(stepKey);
-				view.anchors.turnSteps.delete(event.data.turn);
-			}
-			const turnToolSet = view.anchors.turnTools.get(event.data.turn);
-			if (turnToolSet !== void 0) {
-				for (const callId of turnToolSet) view.anchors.toolStart.delete(callId);
-				view.anchors.turnTools.delete(event.data.turn);
-			}
-			if (appended.length === 0) return {
-				...view,
-				busy: false,
-				busySince: 0,
-				streaming: "",
-				streamingReasoning: ""
-			};
-			return {
-				...view,
-				busy: false,
-				busySince: 0,
-				streaming: "",
-				streamingReasoning: "",
-				entries: [...view.entries, ...appended]
-			};
-		}
-		case "llm/retry": {
-			const data = event.data;
-			return {
-				...view,
-				streaming: "",
-				streamingReasoning: "",
-				entries: [...view.entries, {
-					kind: "retry",
-					retryId: data.retryId,
-					attempt: data.retry,
-					max: "maxRetries" in data ? data.maxRetries : data.retry,
-					code: data.failure.code,
-					delayMs: data.delayMs,
-					state: "running"
-				}]
-			};
-		}
-		case "llm/retry-started": {
-			const data = event.data;
-			const entries = view.entries.map((entry) => {
-				if (entry.kind !== "retry" || entry.retryId !== data.retryId) return entry;
-				return {
-					...entry,
-					state: "done"
-				};
-			});
-			return {
-				...view,
-				entries
-			};
-		}
-		case "sandbox/mode": return {
-			...view,
-			sandbox: event.data.mode
-		};
-		case "goal/change": {
-			const data = event.data;
-			const clip = (text) => text.length > 60 ? `${text.slice(0, 59)}…` : text;
-			if (data.operation === "clear") return {
-				...view,
-				goal: void 0,
-				entries: [...view.entries, {
-					kind: "turn-marker",
-					text: "◎ goal cleared"
-				}]
-			};
-			const goal = {
-				objective: data.goal.objective,
-				phase: data.goal.phase,
-				rounds: data.roundsStarted,
-				max: data.goal.maxGoalRounds,
-				blocked: data.goal.blockedReason?.message ?? ""
-			};
-			const line = data.operation === "create" ? `◎ goal: ${clip(data.goal.objective)}` : data.operation === "complete" ? "◎ goal complete" : data.operation === "pause" ? "◎ goal paused" : data.operation === "resume" ? "◎ goal resumed" : data.operation === "block" ? `◎ goal blocked: ${clip(goal.blocked)}` : void 0;
-			return {
-				...view,
-				goal,
-				entries: line === void 0 ? view.entries : [...view.entries, {
-					kind: "turn-marker",
-					text: line
-				}]
-			};
-		}
-		case "session/title": return {
-			...view,
-			title: event.data.title
-		};
-		case "compaction/summary":
-			if (view.anchors.compactionTokens.size >= MAX_COMPACTION_SUMMARY_RESIDUE) {
-				const oldest = view.anchors.compactionTokens.keys().next().value;
-				if (oldest !== void 0) view.anchors.compactionTokens.delete(oldest);
-			}
-			view.anchors.compactionTokens.set(event.data.compactionId, event.data.shadowedTokenCount);
-			return view;
-		case "compaction/prune": return {
-			...view,
-			anchors: {
-				...view.anchors,
-				lastPruneTokens: event.data.shadowedTokenCount
-			}
-		};
-		case "compaction/end": {
-			const ok = event.data.error === void 0;
-			const tokens = view.anchors.compactionTokens.get(event.data.compactionId) ?? view.anchors.lastPruneTokens;
-			view.anchors.compactionTokens.delete(event.data.compactionId);
-			return {
-				...view,
-				entries: [...view.entries, {
-					kind: "compaction",
-					ok,
-					tokens,
-					error: event.data.error ?? ""
-				}]
-			};
-		}
-		case "request/context": return {
-			...view,
-			stats: {
-				...view.stats,
-				contextWindow: event.data.contextWindow ?? view.stats.contextWindow
-			}
-		};
-		case "request/header": {
-			const config = event.data.header.config;
-			return {
-				...view,
-				model: `${config.provider}/${config.model}`,
-				stats: {
-					...view.stats,
-					reasoningEffort: config.reasoningEffort === void 0 ? "" : String(config.reasoningEffort),
-					contextSegments: {
-						...view.stats.contextSegments,
-						system: estimateTokens(event.data.header.system ?? "")
-					}
-				}
-			};
-		}
-		case "plan/mode": return {
-			...view,
-			plan: event.data.active
-		};
-		case "permission/preset": return {
-			...view,
-			permission: event.data.preset
-		};
-		case "command/run": {
-			const data = event.data;
-			return {
-				...view,
-				entries: [...view.entries, {
-					kind: "command",
-					commandId: data.commandId,
-					name: data.name,
-					args: data.args ?? "",
-					state: "running",
-					summary: ""
-				}]
-			};
-		}
-		case "command/done": {
-			const data = event.data;
-			const entries = view.entries.map((entry) => {
-				if (entry.kind !== "command" || entry.commandId !== data.commandId) return entry;
-				return {
-					...entry,
-					state: data.kind === "success" ? "done" : "error",
-					summary: boundContextSummary(data.text ?? "")
-				};
-			});
-			return {
-				...view,
-				entries
-			};
-		}
-		default: return view;
-	}
-}
 /** @internal A fresh replay accumulator whose state mirrors `createTranscriptView()`. */
 function createReplayAccumulator() {
 	return {
@@ -25586,6 +25233,9 @@ function retireReplayEntry(acc, index) {
 * to a sequential fold; only the `entries` container operations are mutable.
 *
 * @internal Test-instrumentation path; `projectEvents` is the public entry.
+* @returns whether the event changed the accumulated state — the live store
+* stays silent and keeps its snapshot identity for ignored events, exactly
+* like the copy-on-write reducer returning its input view unchanged.
 */
 function replayProjectEvent(acc, event) {
 	switch (event.type) {
@@ -25620,7 +25270,7 @@ function replayProjectEvent(acc, event) {
 						prompt: acc.stats.contextSegments.prompt + estimateTokens(text)
 					}
 				};
-				return;
+				return true;
 			}
 			const notice = message.source.kind === "plugin" && message.source.form === "notice" ? message.source.summary : message.source.kind;
 			const summary = boundContextSummary(notice);
@@ -25636,7 +25286,7 @@ function replayProjectEvent(acc, event) {
 					system: acc.stats.contextSegments.system + estimateTokens(summary)
 				}
 			};
-			return;
+			return true;
 		}
 		case "agent/inbox/spliced": {
 			const { target, start, removedCount = 0, inserted } = event.data;
@@ -25666,7 +25316,7 @@ function replayProjectEvent(acc, event) {
 				ids.push(message.id);
 				acc.ops += 1;
 			}
-			return;
+			return true;
 		}
 		case "assistant/chunk": {
 			const chunk = event.data.chunk;
@@ -25682,13 +25332,13 @@ function replayProjectEvent(acc, event) {
 			}
 			if (chunk.type === "text-delta") {
 				acc.streaming = appendStreamingTail(acc.streaming, chunk.text);
-				return;
+				return true;
 			}
 			if (chunk.type === "reasoning-delta") {
 				acc.streamingReasoning = appendStreamingTail(acc.streamingReasoning, chunk.text);
-				return;
+				return true;
 			}
-			return;
+			return false;
 		}
 		case "assistant/message": {
 			const key = `${event.data.turn}:${event.data.step}`;
@@ -25726,7 +25376,7 @@ function replayProjectEvent(acc, event) {
 					assistant: acc.stats.contextSegments.assistant + estimateTokens(text)
 				}
 			};
-			return;
+			return true;
 		}
 		case "tool/call": {
 			const data = event.data;
@@ -25755,7 +25405,7 @@ function replayProjectEvent(acc, event) {
 					tools: acc.stats.contextSegments.tools + (typeof data.arguments === "string" ? estimateTokens(data.arguments) : 0)
 				}
 			};
-			return;
+			return true;
 		}
 		case "tool/result": {
 			const block = event.data.message.content[0];
@@ -25789,11 +25439,11 @@ function replayProjectEvent(acc, event) {
 					tools: acc.stats.contextSegments.tools + estimateTokens(rawText)
 				}
 			};
-			return;
+			return true;
 		}
 		case "todo/write":
 			acc.todos = event.data.todos;
-			return;
+			return true;
 		case "turn/start": {
 			const wasBusy = acc.busy;
 			acc.busy = true;
@@ -25803,7 +25453,7 @@ function replayProjectEvent(acc, event) {
 				...acc.stats,
 				turns: acc.stats.turns + 1
 			};
-			return;
+			return true;
 		}
 		case "step/start": {
 			const key = `${event.data.turn}:${event.data.step}`;
@@ -25820,7 +25470,7 @@ function replayProjectEvent(acc, event) {
 				...acc.stats,
 				steps: acc.stats.steps + 1
 			};
-			return;
+			return true;
 		}
 		case "turn/end": {
 			const reason = event.data.reason;
@@ -25860,7 +25510,7 @@ function replayProjectEvent(acc, event) {
 			acc.busy = false;
 			acc.busySince = 0;
 			for (const entry of appended) appendReplayEntry(acc, entry);
-			return;
+			return true;
 		}
 		case "llm/retry": {
 			const data = event.data;
@@ -25876,7 +25526,7 @@ function replayProjectEvent(acc, event) {
 				state: "running"
 			});
 			indexList(acc.retryIndex, data.retryId).push(acc.entries.length - 1);
-			return;
+			return true;
 		}
 		case "llm/retry-started": {
 			const data = event.data;
@@ -25884,11 +25534,11 @@ function replayProjectEvent(acc, event) {
 				...entry,
 				state: "done"
 			}));
-			return;
+			return true;
 		}
 		case "sandbox/mode":
 			acc.sandbox = event.data.mode;
-			return;
+			return true;
 		case "goal/change": {
 			const data = event.data;
 			const clip = (text) => text.length > 60 ? `${text.slice(0, 59)}…` : text;
@@ -25898,7 +25548,7 @@ function replayProjectEvent(acc, event) {
 					kind: "turn-marker",
 					text: "◎ goal cleared"
 				});
-				return;
+				return true;
 			}
 			const goal = {
 				objective: data.goal.objective,
@@ -25913,21 +25563,21 @@ function replayProjectEvent(acc, event) {
 				kind: "turn-marker",
 				text: line
 			});
-			return;
+			return true;
 		}
 		case "session/title":
 			acc.title = event.data.title;
-			return;
+			return true;
 		case "compaction/summary":
 			if (acc.compactionTokens.size >= MAX_COMPACTION_SUMMARY_RESIDUE) {
 				const oldest = acc.compactionTokens.keys().next().value;
 				if (oldest !== void 0) acc.compactionTokens.delete(oldest);
 			}
 			acc.compactionTokens.set(event.data.compactionId, event.data.shadowedTokenCount);
-			return;
+			return true;
 		case "compaction/prune":
 			acc.lastPruneTokens = event.data.shadowedTokenCount;
-			return;
+			return true;
 		case "compaction/end": {
 			const ok = event.data.error === void 0;
 			const tokens = acc.compactionTokens.get(event.data.compactionId) ?? acc.lastPruneTokens;
@@ -25938,14 +25588,14 @@ function replayProjectEvent(acc, event) {
 				tokens,
 				error: event.data.error ?? ""
 			});
-			return;
+			return true;
 		}
 		case "request/context":
 			acc.stats = {
 				...acc.stats,
 				contextWindow: event.data.contextWindow ?? acc.stats.contextWindow
 			};
-			return;
+			return true;
 		case "request/header": {
 			const config = event.data.header.config;
 			acc.model = `${config.provider}/${config.model}`;
@@ -25957,14 +25607,14 @@ function replayProjectEvent(acc, event) {
 					system: estimateTokens(event.data.header.system ?? "")
 				}
 			};
-			return;
+			return true;
 		}
 		case "plan/mode":
 			acc.plan = event.data.active;
-			return;
+			return true;
 		case "permission/preset":
 			acc.permission = event.data.preset;
-			return;
+			return true;
 		case "command/run": {
 			const data = event.data;
 			appendReplayEntry(acc, {
@@ -25976,7 +25626,7 @@ function replayProjectEvent(acc, event) {
 				summary: ""
 			});
 			indexList(acc.commandIndex, data.commandId).push(acc.entries.length - 1);
-			return;
+			return true;
 		}
 		case "command/done": {
 			const data = event.data;
@@ -25986,20 +25636,27 @@ function replayProjectEvent(acc, event) {
 				summary: boundContextSummary(data.text ?? "")
 			});
 			updateReplayById(acc, acc.commandIndex, data.commandId, (entry) => entry.commandId === data.commandId, update);
-			return;
+			return true;
 		}
-		default: return;
+		default: return false;
 	}
 }
 /**
-* Materialize the accumulated fold as a `TranscriptView`, compacting any
-* retired tombstones. The anchors maps are handed through as-is (their
-* content is identical to a sequential fold's).
+* Materialize the accumulated fold as a fresh immutable snapshot for the
+* live store. Unlike {@link finishReplay} — the one-shot replay entry, which
+* hands the accumulator's own arrays through because the accumulator is
+* discarded — every array a renderer can hold is copied here, so later
+* folds never mutate a snapshot already handed out. Same fields, same
+* tombstone compaction.
 *
-* @internal Test-instrumentation path; `projectEvents` is the public entry.
+* @internal Live-store path; `projectEvents` is the public entry.
 */
-function finishReplay(acc) {
-	const entries = acc.removedCount === 0 ? acc.entries : acc.entries.filter((entry) => entry !== void 0);
+function snapshotReplayView(acc) {
+	return materializeReplayView(acc, true);
+}
+/** Field-for-field materialization; `copy` selects snapshot array isolation. */
+function materializeReplayView(acc, copy) {
+	const entries = acc.removedCount === 0 ? copy ? [...acc.entries] : acc.entries : acc.entries.filter((entry) => entry !== void 0);
 	if (acc.removedCount > 0) acc.ops += acc.entries.length;
 	return {
 		entries,
@@ -26033,22 +25690,6 @@ function finishReplay(acc) {
 	};
 }
 /**
-* Fold a replayed event history into one view.
-*
-* Folding is near-linear in the log size: the mutable replay accumulator
-* appends in place and resolves id-keyed updates through index maps, so a
-* long persisted session replays without the O(N²) copy-on-write rebuilds a
-* naive sequential fold would incur. The result is identical to folding
-* {@link projectEvent} per event in order.
-* @param events - events in `seq` order.
-* @returns the folded view.
-*/
-function projectEvents(events) {
-	const acc = createReplayAccumulator();
-	for (const event of events) replayProjectEvent(acc, event);
-	return finishReplay(acc);
-}
-/**
 * The append-only flush boundary for a transcript view: the count of entries
 * no later event can remove. Entries at or beyond this index are mutable and
 * must stay in the live tree.
@@ -26077,6 +25718,16 @@ function settledEntryCount(entries) {
 }
 //#endregion
 //#region src/render/markdown.ts
+/**
+* Terminal markdown renderer for assistant replies: a pure GFM-subset
+* block/inline parser producing styled line segments the Ink renderer maps
+* to colored text. No ANSI here — the app owns color mapping, tests own the
+* structure. The subset mirrors what agent replies actually emit: headings,
+* emphasis, inline/fenced code, flat lists, blockquotes, links, rules, GFM
+* tables, and wrapped paragraphs. Unknown syntax degrades to plain text.
+*
+* @module @deepseek-ai/dsh-code/render/markdown
+*/
 /** Plain segment helper. */
 function seg(text, style = "plain") {
 	return {
@@ -26084,14 +25735,9 @@ function seg(text, style = "plain") {
 		style
 	};
 }
-/** Visible width of a run in columns (CJK counts double). */
+/** Visible width of a run in columns (grapheme-cluster and emoji aware). */
 function visibleColumns(text) {
-	let columns = 0;
-	for (const char of text) {
-		const code = char.codePointAt(0) ?? 0;
-		columns += code > 11903 ? 2 : 1;
-	}
-	return columns;
+	return stringWidth(text);
 }
 /** Punctuation that should not become the first visible glyph of a row. */
 function isClosingPunctuation(text) {
@@ -26633,11 +26279,7 @@ function renderMarkdown(text, width, options = {}) {
 }
 //#endregion
 //#region src/render/animations.ts
-/**
-* The web StateDot "ongoing" chase in terminal form: three cells of the 3×3
-* ring trail clockwise around the eight outer positions, one braille glyph
-* per step — 8 frames × 125ms = the web's 1s cycle.
-*/
+/** Original terminal StateDot chase frames. */
 const BUSY_CHASE_FRAMES = [
 	"⣾",
 	"⣽",
@@ -26648,10 +26290,40 @@ const BUSY_CHASE_FRAMES = [
 	"⣯",
 	"⣷"
 ];
-/** Chase frame for a monotonic tick (the busy composer/Deep-diving marker). */
+/** Chase frame for a monotonic tick. */
 function busyChaseFrame(tick) {
 	return BUSY_CHASE_FRAMES[tick % BUSY_CHASE_FRAMES.length] ?? BUSY_CHASE_FRAMES[0];
 }
+/** Codex shimmer timing and geometry. */
+const DEEP_DIVING_SHIMMER_DURATION_MS = 2e3;
+const DEEP_DIVING_SPARK_BREATH_DURATION_MS = 2e3;
+/**
+* Codex's 2-second shimmer sweep, expressed in terminal ticks. The sweep has
+* ten virtual columns of padding on either side and a five-column cosine
+* highlight band, so the text changes gently rather than cycling rapidly.
+*/
+function deepDivingShimmerIntensity(index, tick, graphemeCount) {
+	if (graphemeCount <= 0) return 0;
+	const period = graphemeCount + 20;
+	const position = (tick * 33 % DEEP_DIVING_SHIMMER_DURATION_MS + DEEP_DIVING_SHIMMER_DURATION_MS) % DEEP_DIVING_SHIMMER_DURATION_MS / DEEP_DIVING_SHIMMER_DURATION_MS * period;
+	const distance = Math.abs(index + 10 - position);
+	if (distance > 5) return 0;
+	const angle = Math.PI * distance / 5;
+	return .5 * (1 + Math.cos(angle));
+}
+/** Blue RGB color for one grapheme in the Codex-style shimmer. */
+function deepDivingGradientColor(index, tick, graphemeCount, base, highlight) {
+	return blendRgb(highlight, base, deepDivingShimmerIntensity(index, tick, graphemeCount));
+}
+/** Smooth breathing intensity for the always-visible Deep diving sparkle. */
+function deepDivingSparkIntensity(tick) {
+	const phase = (tick * 33 % DEEP_DIVING_SPARK_BREATH_DURATION_MS + DEEP_DIVING_SPARK_BREATH_DURATION_MS) % DEEP_DIVING_SPARK_BREATH_DURATION_MS / DEEP_DIVING_SPARK_BREATH_DURATION_MS;
+	return .2 + .8 * (.5 + .5 * Math.cos(Math.PI * 2 * phase));
+}
+/** Blue RGB color for the breathing Deep diving sparkle. */
+function deepDivingSparkColor(tick, base, highlight) {
+	return blendRgb(highlight, base, deepDivingSparkIntensity(tick));
+}
 /** Caret visibility: half the ticks on, half off (530ms blink). */
 function caretVisible(tick) {
 	return tick % 2 === 0;
@@ -27041,6 +26713,87 @@ function effortAboveHigh(effort) {
 	return rank !== void 0 && rank > 3;
 }
 //#endregion
+//#region src/mentions.ts
+/** Menu cap on file rows; the service owns ranking and default rows. */
+const MAX_FILE_ROWS = 20;
+/** Whether a mention token is already navigating a filesystem path. */
+function isPathLikeMentionQuery(query) {
+	return /[\\/]/u.test(query);
+}
+/**
+* Create the mention API for one agent's workspace. A missing
+* `fileReferences` service (with an agent present) or `sessionReferenceResolver`
+* degrades that half to empty rows; `prepare` passes text through untouched
+* without references. An undefined agent (a bare launch before any session
+* exists) runs the official WorkspaceFileSearch over the launch cwd — the
+* same class the mounted service uses per agent — so `@` file completion
+* works from the first keystroke; session references wait for the session.
+*
+* `candidates` never reaches for `this` — the runner hands it to the input
+* editor as a detached callback, and a `this`-bound method would throw on
+* every `@` key.
+* @param ctx - context carrying the optional `fileReferences` and
+* `sessionReferenceResolver` services.
+* @param agent - the session owner; excluded from its own session candidates.
+* @param cwd - launch working directory; bounds the pre-session search.
+*/
+function createMentions(ctx, agent, cwd) {
+	const resolver = ctx.get("sessionReferenceResolver");
+	const fileReferences = ctx.get("fileReferences");
+	const sessionCapable = agent !== void 0 && resolver !== void 0;
+	let preSessionSearch;
+	const preSessionFiles = (query, signal) => {
+		preSessionSearch ??= new WorkspaceFileSearch(cwd, {
+			maxResults: DEFAULT_FILE_SEARCH_MAX_RESULTS,
+			maxEntries: DEFAULT_FILE_SEARCH_MAX_ENTRIES,
+			excludedDirectories: [...DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES]
+		});
+		return preSessionSearch.list(query, signal ?? new AbortController().signal);
+	};
+	return {
+		async candidates(query, signal) {
+			const needle = query.trim();
+			const [files, sessions] = await Promise.all([agent !== void 0 && fileReferences !== void 0 ? fileReferences.list(agent, needle, signal ?? new AbortController().signal).catch(() => []) : agent === void 0 ? preSessionFiles(needle, signal).catch(() => []) : Promise.resolve([]), sessionCapable && needle !== "" && !isPathLikeMentionQuery(needle) && agent !== void 0 ? resolver.listCandidates(agent, needle, 10, signal).catch(() => []) : Promise.resolve([])]);
+			const fileRows = files.slice(0, MAX_FILE_ROWS).map((candidate) => ({
+				label: candidate.path,
+				description: candidate.kind === "directory" ? "Folder" : "File",
+				kind: candidate.kind,
+				...candidate.kind === "file" ? { path: isAbsolute(candidate.path) ? candidate.path : resolve(cwd, candidate.path) } : {}
+			}));
+			const sessionRows = sessions.map((candidate) => ({
+				label: formatSessionReferenceMention(candidate),
+				description: `Session · ${candidate.cwd ?? "(no cwd)"}`,
+				kind: "session"
+			}));
+			return [...fileRows, ...sessionRows];
+		},
+		parse(text) {
+			return parseSessionReferenceText(text);
+		},
+		async prepare(parsed, signal) {
+			if (parsed.references.length === 0 || resolver === void 0 || agent === void 0) return {
+				text: parsed.text,
+				references: parsed.references
+			};
+			const prepared = await resolver.prepare(agent, [{
+				type: "text",
+				text: parsed.text
+			}], parsed.references, signal);
+			return {
+				text: prepared.content.filter((block) => block.type === "text").map((block) => block.text).join(""),
+				references: parsed.references,
+				additionalContext: prepared.additionalContext
+			};
+		},
+		sessionMention(candidate) {
+			return formatSessionReferenceMention({
+				sessionId: candidate.sessionId,
+				label: candidate.label
+			});
+		}
+	};
+}
+//#endregion
 //#region src/session-directory.ts
 /** Lightweight session-directory projection for the /resume picker. */
 /** Case-insensitive filesystems (Windows, macOS) compare paths by lowercased form. */
@@ -27188,6 +26941,59 @@ function collectDeletionSubtree(records, id) {
 	return [...doomed];
 }
 /**
+* Plan one session-subtree deletion with NO filesystem side effects: collect
+* the doomed lineage, refuse when the root or ANY member is live (a live
+* child would outlive its deleted parent) or missing from the listing, and
+* order the result children-first so the executor can never leave a deleted
+* parent behind surviving children. Artifact-location guards stay at the
+* call site; this is the pure preflight they complete.
+* @param records - the full directory listing.
+* @param id - the root session id to delete.
+* @returns the ordered plan, or a user-facing refusal reason.
+*/
+function planSessionDeletion(records, id) {
+	const target = records.find((record) => record.header.id === id);
+	if (target === void 0) return {
+		ok: false,
+		reason: `no persisted session matches "${id}"`
+	};
+	if (target.live) return {
+		ok: false,
+		reason: "cannot delete a live session — it is open in this or another process"
+	};
+	const doomed = collectDeletionSubtree(records, id);
+	const byId = new Map(records.map((record) => [record.header.id, record]));
+	const parentOf = /* @__PURE__ */ new Map();
+	for (const record of records) parentOf.set(record.header.id, record.header.parentSession);
+	const nodes = [];
+	for (const candidate of doomed) {
+		const record = byId.get(candidate);
+		if (record === void 0) return {
+			ok: false,
+			reason: `no persisted session matches "${candidate}"`
+		};
+		if (record.live) return {
+			ok: false,
+			reason: `cannot delete: child session ${candidate.slice(-12)} is live — close it (and any process using it) first`
+		};
+		let depth = 0;
+		let ancestor = parentOf.get(candidate);
+		while (ancestor !== void 0 && depth < 64) {
+			depth += 1;
+			ancestor = parentOf.get(ancestor);
+		}
+		nodes.push({
+			id: candidate,
+			depth
+		});
+	}
+	nodes.sort((left, right) => right.depth - left.depth);
+	return {
+		ok: true,
+		nodes
+	};
+}
+/**
 * Codex-style relative time for session rows ("now", "5m ago", "3h ago",
 * "2d ago"; older than a week falls back to the local date).
 * @param timestamp - epoch milliseconds of the last activity.
@@ -27970,19 +27776,26 @@ function toolDetailLines(detail, columns) {
 		default: return detail;
 	}
 }
+/** Default compact tool-card window used while the Ctrl+R fold is closed. */
+const DEFAULT_TOOL_ROWS = 3;
+/** Keep the invocation visible while making hidden tool output discoverable. */
+function compactToolLines(lines, columns) {
+	if (lines.length <= DEFAULT_TOOL_ROWS) return lines;
+	return [...lines.slice(0, 2), ...textLines("    … output hidden · Ctrl/Alt+R", columns, "dim").slice(0, 1)];
+}
 /**
 * Convert one durable transcript entry to its complete scrollable row model.
 * The source entry stays intact; only the caller's visible slice is rendered.
 * Wrapped continuations keep a hanging indent aligned under each row's
 * content (Codex history-cell alignment) instead of resetting to column 0.
 */
-function transcriptEntryLines(entry, columns, showReasoning = true, reasoningToggleHint = true) {
+function transcriptEntryLines(entry, columns, showReasoning = true, reasoningToggleHint = true, showToolDetails = showReasoning) {
 	const width = Math.max(1, Math.floor(columns));
 	switch (entry.kind) {
 		case "user": return entry.notice ? hangingStyledLines([lineSegment(promptDisplayText(entry), "dim")], width, "⤷ ", "dim", "  ", "dim") : hangingStyledLines([lineSegment(promptDisplayText(entry), "plain")], width, "❯ ", "brand", "  ", "plain");
 		case "pending": return hangingStyledLines([lineSegment(promptDisplayText(entry), "plain")], width, "❯ ", "brand", "  ", "plain");
 		case "assistant": {
-			const reasoning = entry.reasoning === "" ? [] : showReasoning ? reasoningLines(entry.reasoning, width) : textLines(`✻ Thinking (${entry.reasoning.length} chars${reasoningToggleHint ? ", Ctrl+R to expand" : ""})`, width, "dim");
+			const reasoning = entry.reasoning === "" ? [] : showReasoning ? reasoningLines(entry.reasoning, width) : textLines(`✻ Thinking (${entry.reasoning.length} chars${reasoningToggleHint ? ", Ctrl/Alt+R to expand" : ""})`, width, "dim");
 			const body = markdownLines(entry.text, Math.max(10, width - 2)).map((line) => ({ segments: [{
 				text: "  ",
 				style: "plain"
@@ -27998,7 +27811,7 @@ function transcriptEntryLines(entry, columns, showReasoning = true, reasoningTog
 			const mark = entry.state === "running" ? "●" : entry.state === "error" ? "⨯" : "⏺";
 			const markStyle = entry.state === "running" ? "brand" : entry.state === "error" ? "error" : "success";
 			const summaryStyle = entry.state === "error" ? "error" : "dim";
-			return [
+			const lines = [
 				...hangingStyledLines([
 					lineSegment(`[${entry.ordinal}] `, "dim"),
 					lineSegment(entry.name, "brand"),
@@ -28008,6 +27821,7 @@ function transcriptEntryLines(entry, columns, showReasoning = true, reasoningTog
 				...entry.summary === "" ? [] : hangingTextLines(entry.state === "error" ? `call ${entry.ordinal}: ${entry.summary}` : entry.summary, width, "  ⎿ ", summaryStyle, "    ", summaryStyle),
 				...entry.detail === void 0 ? [] : toolDetailLines(entry.detail, width)
 			];
+			return showToolDetails ? lines : compactToolLines(lines, width);
 		}
 		case "command": {
 			const mark = entry.state === "running" ? "●" : entry.state === "error" ? "⨯" : "⏺";
@@ -28025,7 +27839,45 @@ function transcriptEntryLines(entry, columns, showReasoning = true, reasoningTog
 }
 /** Settled-history variant carrying the Ctrl+R reasoning fold. */
 function settledEntryLines(entry, columns, showReasoning) {
-	return transcriptEntryLines(entry, columns, showReasoning, false);
+	return transcriptEntryLines(entry, columns, showReasoning, false, showReasoning);
+}
+/**
+* Clamp the live-region allocation so the flexible dynamic rows never exceed
+* the post-chrome budget. By construction the caller derives these rows from
+* the same budget; this is the runtime tripwire for a future edit that breaks
+* that derivation. Reduction order: answer first (the freshest content is the
+* live tail), then reasoning, then settled live rows; nothing goes negative.
+* @param allocation - the intended row allocation.
+* @param dynamicRows - the post-chrome row budget.
+* @returns the clamped allocation and a warning string when clamping fired.
+*/
+function clampLiveAllocation(allocation, dynamicRows) {
+	const live = Math.max(0, Math.floor(allocation.live));
+	const reasoning = Math.max(0, Math.floor(allocation.reasoning));
+	const answer = Math.max(0, Math.floor(allocation.answer));
+	const budget = Math.max(0, Math.floor(dynamicRows));
+	let excess = live + reasoning + answer - budget;
+	if (excess <= 0) return { allocation: {
+		live,
+		reasoning,
+		answer
+	} };
+	const take = (from) => {
+		const cut = Math.min(from, excess);
+		excess -= cut;
+		return from - cut;
+	};
+	const clampedAnswer = take(answer);
+	const clampedReasoning = excess > 0 ? take(reasoning) : reasoning;
+	const clampedLive = excess > 0 ? take(live) : live;
+	return {
+		allocation: {
+			live: clampedLive,
+			reasoning: clampedReasoning,
+			answer: clampedAnswer
+		},
+		warning: `live rows ${live} + ${reasoning} + ${answer} exceed the dynamic budget ${budget}; clamped to ${clampedLive}/${clampedReasoning}/${clampedAnswer}`
+	};
 }
 //#endregion
 //#region src/render/editor.ts
@@ -28039,9 +27891,8 @@ function settledEntryLines(entry, columns, showReasoning) {
 * grapheme boundaries) so the React state stays two primitives
 * (value, cursor) and every operation here stays pure and testable.
 *
-* Word motion deviates from Codex's UAX#29 segmentation in one deliberate
-* way: a run of same-class characters is ONE piece, so a CJK run moves as a
-* single word (two hanzi are one Alt+B step, not two).
+* Word motion follows Codex's piece semantics: whitespace separates runs,
+* punctuation runs stay atomic, and each Han grapheme is its own boundary.
 *
 * @module @deepseek-ai/dsh-code/render/editor
 */
@@ -28194,6 +28045,28 @@ function editorModel(value, columns) {
 		length: value.length
 	};
 }
+/** Split one row around the authoritative caret; every other row stays whole. */
+function editorRowParts(row, rowIndex, caretRow, cursor, caretEnabled = true) {
+	if (!caretEnabled || rowIndex !== caretRow) return {
+		before: "",
+		caret: "",
+		after: row.text,
+		hasCaret: false
+	};
+	const at = row.offsets.indexOf(cursor);
+	if (at < 0) return {
+		before: "",
+		caret: "",
+		after: row.text,
+		hasCaret: false
+	};
+	return {
+		before: at > 0 ? row.text.slice(0, row.cuts[at]) : "",
+		caret: at < row.cuts.length - 1 ? row.text.slice(row.cuts[at], row.cuts[at + 1]) : " ",
+		after: at < row.cuts.length - 1 ? row.text.slice(row.cuts[at + 1]) : "",
+		hasCaret: true
+	};
+}
 /** Map a cursor offset to its caret site on the wrapped rows. */
 function caretSite(model, offset) {
 	const target = Math.max(0, Math.min(model.length, offset));
@@ -28218,7 +28091,9 @@ function caretSite(model, offset) {
 */
 function moveCursorVertically(model, offset, preferredColumn, delta) {
 	const target = caretSite(model, offset).row + delta;
-	if (target < 0 || target >= model.rows.length || delta === 0) return offset;
+	if (delta === 0) return offset;
+	if (target < 0) return 0;
+	if (target >= model.rows.length) return model.length;
 	const row = model.rows[target];
 	const wanted = Math.max(0, Math.min(preferredColumn, row.columns[row.columns.length - 1]));
 	let best = 0;
@@ -28238,24 +28113,28 @@ function lineBounds(value, offset) {
 }
 /** Codex WORD_SEPARATORS: punctuation runs are their own word pieces. */
 const WORD_SEPARATORS = /* @__PURE__ */ new Set("`~!@#$%^&*()-=+[{]}\\|;:'\",.<>/?");
+const HAN_GRAPHEME = /^\p{Script=Han}(?:\p{Mark}|\uFE0F)*$/u;
+const UNICODE_PUNCTUATION = /^\p{P}+$/u;
 function classifyGrapheme(text) {
 	if (/^\s$/u.test(text)) return "space";
-	return WORD_SEPARATORS.has(text) ? "punct" : "word";
+	return WORD_SEPARATORS.has(text) || UNICODE_PUNCTUATION.test(text) ? "punct" : "word";
 }
-/** Maximal same-class runs of graphemes as [start, end) spans. */
+/** Maximal same-class runs; Han graphemes deliberately stay one run each. */
 function pieceRuns(value) {
 	const runs = [];
 	let current;
 	for (const span of splitGraphemes(value)) {
 		const klass = span.text === "\n" ? "space" : classifyGrapheme(span.text);
-		if (current !== void 0 && current.class === klass) {
+		const atomic = klass === "word" && HAN_GRAPHEME.test(span.text);
+		if (current !== void 0 && current.class === klass && !current.atomic && !atomic) {
 			current.end = span.end;
 			continue;
 		}
 		current = {
 			start: span.start,
 			end: span.end,
-			class: klass
+			class: klass,
+			atomic
 		};
 		runs.push(current);
 	}
@@ -28266,10 +28145,9 @@ function pieceRuns(value) {
 * START of the trailing non-space piece (extending over separator pieces).
 */
 function moveWordLeft(value, offset) {
-	const cursor = Math.max(0, Math.min(value.length, offset));
+	const cursor = clampCursor(value, offset);
 	const runs = pieceRuns(value);
-	let index = runs.length - 1;
-	while (index >= 0 && runs[index].end > cursor) index -= 1;
+	let index = runs.findLastIndex((run) => run.start < cursor);
 	if (index < 0) return 0;
 	if (runs[index].class === "space") {
 		index -= 1;
@@ -28284,10 +28162,9 @@ function moveWordLeft(value, offset) {
 * the leading non-space piece (extending over separator pieces).
 */
 function moveWordRight(value, offset) {
-	const cursor = Math.max(0, Math.min(value.length, offset));
+	const cursor = clampCursor(value, offset);
 	const runs = pieceRuns(value);
-	let index = 0;
-	while (index < runs.length && runs[index].start < cursor) index += 1;
+	let index = runs.findIndex((run) => run.end > cursor);
 	if (index >= runs.length) return value.length;
 	if (runs[index].class === "space") {
 		index += 1;
@@ -28376,6 +28253,62 @@ function insertText(value, cursor, text) {
 		killed: void 0
 	};
 }
+/** Ctrl+A: current logical line start, then the previous line start on repeat. */
+function moveToLineStart(value, cursor, crossOnRepeat) {
+	const site = clampCursor(value, cursor);
+	const bounds = lineBounds(value, site);
+	if (!crossOnRepeat || site !== bounds.start || bounds.start === 0) return bounds.start;
+	return lineBounds(value, bounds.start - 1).start;
+}
+/** Ctrl+E: current logical line end, then the next line end on repeat. */
+function moveToLineEnd(value, cursor, crossOnRepeat) {
+	const site = clampCursor(value, cursor);
+	const bounds = lineBounds(value, site);
+	if (!crossOnRepeat || site !== bounds.end || bounds.end >= value.length) return bounds.end;
+	return lineBounds(value, bounds.end + 1).end;
+}
+/**
+* Remap a captured range when all intervening edits are wholly before or
+* wholly after it. An edit overlapping either boundary invalidates the
+* anchor instead of guessing and inserting content at a surprising place.
+*/
+function remapStableRange(original, current, range) {
+	const start = Math.max(0, Math.min(original.length, range.start));
+	const end = Math.max(start, Math.min(original.length, range.end));
+	if (original === current) return {
+		start,
+		end
+	};
+	let prefix = 0;
+	const shared = Math.min(original.length, current.length);
+	while (prefix < shared && original[prefix] === current[prefix]) prefix += 1;
+	let suffix = 0;
+	while (suffix < original.length - prefix && suffix < current.length - prefix && original[original.length - 1 - suffix] === current[current.length - 1 - suffix]) suffix += 1;
+	const oldChangedEnd = original.length - suffix;
+	if (prefix >= end) return {
+		start,
+		end
+	};
+	if (oldChangedEnd <= start) {
+		const delta = current.length - original.length;
+		return {
+			start: start + delta,
+			end: end + delta
+		};
+	}
+}
+/** Replace a current range while preserving a cursor moved after capture. */
+function replaceRangePreservingCursor(value, cursor, range, replacement) {
+	const start = Math.max(0, Math.min(value.length, range.start));
+	const end = Math.max(start, Math.min(value.length, range.end));
+	const site = clampCursor(value, cursor);
+	const nextCursor = site <= start ? site : site >= end ? site + replacement.length - (end - start) : start + replacement.length;
+	return {
+		value: value.slice(0, start) + replacement + value.slice(end),
+		cursor: nextCursor,
+		killed: void 0
+	};
+}
 /**
 * Composer editor row budget: the editor itself never grows past this many
 * physical rows; deeper drafts scroll internally to keep the caret visible.
@@ -28385,14 +28318,73 @@ function composerMaxRows(terminalRows) {
 	return Math.max(1, Math.min(6, Math.floor((Math.max(1, terminalRows) - 10) / 3)));
 }
 /**
-* Codex `should_handle_navigation`: Up/Down walk history only from an empty
-* draft, or from a boundary of a draft that still exactly matches the last
-* recalled entry. Any interior cursor position keeps vertical caret movement.
+* History navigation starts with Up on an empty draft, or after visual
+* movement has reached the directional text edge of an unchanged recalled
+* entry. Every other position remains under textarea movement.
+*/
+function shouldRecallNavigate(value, cursor, lastRecalled, direction) {
+	if (value === "") return direction < 0;
+	if (lastRecalled !== value) return false;
+	return direction < 0 ? cursor === 0 : cursor === value.length;
+}
+//#endregion
+//#region src/keyboard.ts
+/**
+* Keyboard enhancement protocol (Codex `keyboard_modes` parity) and the
+* kitty CSI-u normalization layer.
+*
+* The TUI pushes the kitty keyboard protocol with DISAMBIGUATE_ESCAPE_CODES
+* and REPORT_ALTERNATE_KEYS (flags 1|4 = `\x1b[>5u`). Event types are
+* deliberately NOT requested: Ink 5's parser cannot decode the
+* `:event-type` suffix, and repeat/release reporting buys this surface
+* nothing.
+*
+* Ink 5 also cannot parse most CSI-u forms at all — they fall through its
+* regex as unnamed sequences and get INSERTED AS DRAFT TEXT. The composer's
+* stdin read patch therefore rewrites every CSI-u form it can decode back
+* to the legacy byte or canonical sequence the existing key handling
+* already understands, before Ink ever parses the chunk.
+* @module @deepseek-ai/dsh-code/keyboard
+*/
+/** Push keyboard enhancement (modifyOtherKeys off, kitty flags 1|4). */
+const KEYBOARD_ENHANCE_ENABLE = "\x1B[>4;0m\x1B[>5u";
+/** Pop the enhancement stack and reset modifyOtherKeys (exit path). */
+const KEYBOARD_ENHANCE_DISABLE = "\x1B[<u\x1B[>4;0m";
+const DSH_ENABLE_KEYBOARD_ENHANCEMENT = "DSH_ENABLE_KEYBOARD_ENHANCEMENT";
+function parseBooleanEnv(value) {
+	if (value === void 0) return void 0;
+	const normalized = value.trim().toLowerCase();
+	if (normalized === "1" || normalized === "true" || normalized === "yes") return true;
+	if (normalized === "0" || normalized === "false" || normalized === "no") return false;
+}
+/** True when the process is running inside the VS Code integrated terminal. */
+function isVsCodeTerminalEnv(env = process.env) {
+	return env.TERM_PROGRAM?.trim().toLowerCase() === "vscode" || env.VSCODE_INJECTION === "1";
+}
+/** Whether to push Kitty keyboard enhancement for the current terminal. */
+function shouldEnableKeyboardEnhancement(env = process.env) {
+	if (parseBooleanEnv(env["DSH_DISABLE_KEYBOARD_ENHANCEMENT"]) === true) return false;
+	const explicitEnable = parseBooleanEnv(env[DSH_ENABLE_KEYBOARD_ENHANCEMENT]);
+	if (explicitEnable !== void 0) return explicitEnable;
+	return !isVsCodeTerminalEnv(env);
+}
+/** Enable bracketed paste reporting. */
+const BRACKETED_PASTE_ENABLE = "\x1B[?2004h";
+/** Disable bracketed paste reporting. */
+const BRACKETED_PASTE_DISABLE = "\x1B[?2004l";
+/** Enable terminal focus-in/focus-out reporting (xterm focus protocol). */
+const TERMINAL_FOCUS_REPORT_ENABLE = "\x1B[?1004h";
+/** Disable terminal focus-in/focus-out reporting. */
+const TERMINAL_FOCUS_REPORT_DISABLE = "\x1B[?1004l";
+/**
+* Remove xterm focus reports from one input chunk and update the caller's
+* focus state. Focus reports are terminal protocol, not composer text.
 */
-function shouldRecallNavigate(value, cursor, lastRecalled) {
-	if (value === "") return true;
-	if (cursor !== 0 && cursor !== value.length) return false;
-	return lastRecalled === value;
+function stripTerminalFocusEvents(chunk, onFocus) {
+	return chunk.replace(/\x1b\[(I|O)/gu, (_whole, event) => {
+		onFocus(event === "I");
+		return "";
+	});
 }
 /** Bracketed paste markers as Ink delivers them (it strips the leading ESC). */
 const PASTE_START_MARKER = "[200~";
@@ -28464,6 +28456,98 @@ function normalizeKeyboardChunk(chunk) {
 		}) ?? whole;
 	});
 }
+const HOME_SEQUENCES = [
+	"\x1B[H",
+	"\x1B[1~",
+	"\x1B[7~",
+	"\x1BOH"
+];
+const END_SEQUENCES = [
+	"\x1B[F",
+	"\x1B[4~",
+	"\x1B[8~",
+	"\x1BOF"
+];
+/** Parse one CSI functional-key sequence at `offset`. */
+function functionalToken(chunk, offset) {
+	const tail = chunk.slice(offset);
+	for (const sequence of HOME_SEQUENCES) if (tail.startsWith(sequence)) return {
+		token: { kind: "home" },
+		length: sequence.length
+	};
+	for (const sequence of END_SEQUENCES) if (tail.startsWith(sequence)) return {
+		token: { kind: "end" },
+		length: sequence.length
+	};
+	const modifiedHome = /^\x1b\[1;(\d+)H/u.exec(tail);
+	if (modifiedHome !== null) return {
+		token: { kind: "home" },
+		length: modifiedHome[0].length
+	};
+	const modifiedEnd = /^\x1b\[1;(\d+)F/u.exec(tail);
+	if (modifiedEnd !== null) return {
+		token: { kind: "end" },
+		length: modifiedEnd[0].length
+	};
+	const modifiedDelete = /^\x1b\[3(?:;(\d+))?~/u.exec(tail);
+	if (modifiedDelete !== null) {
+		const modifiers = Number.parseInt(modifiedDelete[1] ?? "1", 10) - 1;
+		return {
+			token: { kind: (modifiers & 2) !== 0 || (modifiers & 4) !== 0 ? "delete-word-forward" : "delete-forward" },
+			length: modifiedDelete[0].length
+		};
+	}
+}
+/**
+* Tokenize a stdin chunk containing at least one editor-only key. Ink calls
+* `useInput` once for a pasted/batched chunk, so preserving each action here
+* prevents repeated Backspace/Home/End/Delete presses from collapsing into
+* one blurred key event. Unknown escape sequences return undefined and stay
+* under Ink's ownership.
+*/
+function tokenizeRawEditorChunk(chunk) {
+	const tokens = [];
+	let text = "";
+	let special = false;
+	const flushText = () => {
+		if (text === "") return;
+		tokens.push({
+			kind: "text",
+			text
+		});
+		text = "";
+	};
+	for (let offset = 0; offset < chunk.length;) {
+		if (chunk.startsWith("\x1B", offset) || chunk.startsWith("\x1B\b", offset)) {
+			flushText();
+			tokens.push({ kind: "delete-word-backward" });
+			special = true;
+			offset += 2;
+			continue;
+		}
+		const functional = functionalToken(chunk, offset);
+		if (functional !== void 0) {
+			flushText();
+			tokens.push(functional.token);
+			special = true;
+			offset += functional.length;
+			continue;
+		}
+		const char = chunk[offset];
+		if (char === "" || char === "\b") {
+			flushText();
+			tokens.push({ kind: "delete-backward" });
+			special = true;
+			offset += 1;
+			continue;
+		}
+		if (char === "\x1B") return void 0;
+		text += char;
+		offset += 1;
+	}
+	flushText();
+	return special ? tokens : void 0;
+}
 //#endregion
 //#region src/kernel-panels.ts
 /** Bounded, composer-safe panels for preset, session, and plugin kernel views. */
@@ -29923,11 +30007,15 @@ async function inspectImagePaths(paths, attachments, cwd = process.cwd()) {
 	return inspected;
 }
 /** Read, validate, and persist an ordered image path list as model content blocks. */
-async function saveImagePaths(paths, attachments) {
+async function saveImagePaths(paths, attachments, signal) {
 	if (paths.length === 0) return [];
 	if (attachments === void 0) throw new Error("image attachments are unavailable in this profile");
+	const checkCancelled = () => {
+		if (signal?.aborted === true) throw new Error("image submission cancelled");
+	};
 	const inputs = [];
 	for (const path of paths) {
+		checkCancelled();
 		let data;
 		try {
 			data = await readFile(path);
@@ -29942,7 +30030,10 @@ async function saveImagePaths(paths, attachments) {
 			name: basename(path)
 		});
 	}
-	return (await attachments.saveImages(inputs)).map((attachment) => ({
+	checkCancelled();
+	const refs = await attachments.saveImages(inputs);
+	checkCancelled();
+	return refs.map((attachment) => ({
 		type: "image",
 		attachment
 	}));
@@ -30058,6 +30149,10 @@ const LOCAL_COMMANDS = [
 		label: "/subagent",
 		description: "choose the model delegated subagents run on"
 	},
+	{
+		label: "/vscode-keys",
+		description: "pass ctrl+r through the vs code terminal"
+	},
 	{
 		label: "/delete",
 		description: "delete a session and its subagent threads"
@@ -30098,14 +30193,15 @@ function padColumns(text, width) {
 	return clipped + " ".repeat(Math.max(0, width - visibleColumns(clipped)));
 }
 /** Interval-driven frame counter for one self-contained animated leaf. */
-function useFrames(intervalMs) {
+function useFrames(intervalMs, active = true) {
 	const [tick, setTick] = (0, import_react.useState)(0);
 	(0, import_react.useEffect)(() => {
+		if (!active) return;
 		const id = setInterval(() => setTick((current) => current + 1), intervalMs);
 		return () => {
 			clearInterval(id);
 		};
-	}, [intervalMs]);
+	}, [active, intervalMs]);
 	return tick;
 }
 /**
@@ -30122,12 +30218,7 @@ function useStableInput(handler, active) {
 	}, []);
 	useInput(stableHandler, { isActive: active });
 }
-/**
-* The web StateDot "ongoing" chase in terminal form: three cells of the 3×3
-* ring trail clockwise around the eight outer positions (8 frames × 125ms =
-* the web's 1s cycle). Replaces the plain busy ellipsis as the composer's
-* prompt marker and leads the Deep-diving line.
-*/
+/** The original web StateDot chase used by the busy composer marker. */
 function BusyChase() {
 	const tick = useFrames(125);
 	return (0, import_react.createElement)(Text, { color: inkColor(getPalette().brandBright) }, busyChaseFrame(tick) + " ");
@@ -30137,21 +30228,55 @@ function Caret() {
 	const tick = useFrames(530);
 	return (0, import_react.createElement)(Text, null, caretVisible(tick) ? "▍" : " ");
 }
-/** Blinking input cursor: inverse block while the caret phase is on. */
-function CursorBlock({ char }) {
-	const tick = useFrames(530);
-	return (0, import_react.createElement)(Text, { inverse: caretVisible(tick) || void 0 }, char);
+/** One resettable input-caret phase shared by the entire composer. */
+function useCursorBlink(active) {
+	const [epoch, setEpoch] = (0, import_react.useState)(0);
+	const [visible, setVisible] = (0, import_react.useState)(true);
+	(0, import_react.useEffect)(() => {
+		setVisible(true);
+		if (!active) return;
+		const id = setInterval(() => setVisible((current) => !current), 530);
+		return () => {
+			clearInterval(id);
+		};
+	}, [active, epoch]);
+	return {
+		visible,
+		reset: (0, import_react.useCallback)(() => {
+			setVisible(true);
+			setEpoch((current) => current + 1);
+		}, [])
+	};
+}
+/**
+* One bounded line painted with the deep-diving shimmer: a continuously
+* moving blue gradient across graphemes, the `✻` glyph in the breathing
+* spark color. Shared by the busy line and the collapsed thinking marker;
+* always exactly one row (truncate-end) so the live budget stays exact.
+*/
+function ShimmerLine({ text }) {
+	const tick = useFrames(33);
+	const palette = getPalette();
+	const graphemes = splitGraphemes(text);
+	return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, ...graphemes.map((grapheme, index) => {
+		const sparkle = grapheme.text === "✻";
+		return (0, import_react.createElement)(Text, {
+			key: `${grapheme.start}-${grapheme.end}`,
+			color: inkColor(sparkle ? deepDivingSparkColor(tick, palette.brandDeep, palette.brandBright) : deepDivingGradientColor(index, tick, graphemes.length, palette.brandDeep, palette.brandBright)),
+			bold: sparkle || void 0
+		}, grapheme.text);
+	}));
 }
 /**
-* The busy line, web TurnStatus contract: the StateDot chase leads the plain
-* `Deep diving...` label, with the elapsed clock appended only once the turn
-* has clearly been running (15s) — anchored to `turn/start` so a resumed
-* mid-turn keeps the real time.
+* The busy line, web TurnStatus contract: a continuously moving blue gradient
+* paints the complete `Deep diving...` label, with the elapsed clock appended
+* only once the turn has clearly been running (15s) — anchored to `turn/start`
+* so a resumed mid-turn keeps the real time.
 */
 function DeepDivingLine({ since }) {
-	useFrames(1e3);
 	const elapsed = since === 0 ? 0 : Date.now() - since;
-	return (0, import_react.createElement)(Box, { flexDirection: "row" }, (0, import_react.createElement)(BusyChase), (0, import_react.createElement)(Text, { dimColor: true }, elapsed >= 15e3 ? `Deep diving... ${runClock(elapsed)}` : "Deep diving..."));
+	const text = elapsed >= 15e3 ? `✻ Deep diving... ${runClock(elapsed)}` : "✻ Deep diving...";
+	return (0, import_react.createElement)(ShimmerLine, { text });
 }
 /**
 * The streaming buffer rendered with a hard size cap: the live region must
@@ -30409,11 +30534,12 @@ function todoMark(status) {
 }
 /**
 * One-row live subagent summary (the Codex agent status feed, compressed to
-* the transcript's budget): running count, total, and the most recently
-* active child's current activity. One line, never more — the full view is
-* the /agents panel.
+* the transcript's budget): running count, the observed total (the row cap
+* is a display budget, not the fan-out size), and the most recently active
+* child's current activity. One line, never more — the full view is the
+* /agents panel.
 */
-function AgentsLine({ rows }) {
+function AgentsLine({ rows, total }) {
 	if (rows.length === 0) return void 0;
 	const running = rows.filter((row) => row.state !== "done").length;
 	const newest = [...rows].sort((left, right) => right.updatedAt - left.updatedAt)[0];
@@ -30422,7 +30548,7 @@ function AgentsLine({ rows }) {
 		color: inkColor(getPalette().brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, `agents ${running} live`, (0, import_react.createElement)(Text, { color: inkColor(getPalette().dim) }, ` · ${rows.length} total · /agents`), (0, import_react.createElement)(Text, { color: inkColor(getPalette().text) }, ` · ${mark} ${newest.label} ${newest.activity}`)));
+	}, `agents ${running} live`, (0, import_react.createElement)(Text, { color: inkColor(getPalette().dim) }, ` · ${total} total · /agents`), (0, import_react.createElement)(Text, { color: inkColor(getPalette().text) }, ` · ${mark} ${newest.label} ${newest.activity}`)));
 }
 /** One-row todo summary: task count cannot grow the live Ink tree. */
 function TodoPanel({ todos }) {
@@ -31641,7 +31767,7 @@ function HelpPanel({ descriptors, skills, commandError, skillError, onClose }) {
 			key: "key-inspector",
 			dimColor: true,
 			wrap: "truncate-end"
-		}, "  ctrl+o history details · ctrl+r thinking · shift+tab permission preset"),
+		}, "  ctrl+o history details · ctrl/alt+r thinking · shift+tab permission preset"),
 		(0, import_react.createElement)(Text, {
 			key: "key-cancel",
 			dimColor: true,
@@ -31730,49 +31856,6 @@ function HelpPanel({ descriptors, skills, commandError, skillError, onClose }) {
 function verboseLine(text, columns) {
 	return truncateColumns(displayText(text).replace(/\n/gu, " ↵ ").replace(/\t/gu, "  "), Math.max(1, columns));
 }
-/** Identify one whole-chunk key sequence Ink drops or blurs. */
-function annotateRawKey(chunk) {
-	switch (chunk) {
-		case "": return "delete-backward";
-		case "\x1B":
-		case "\x1B\b": return "delete-word-backward";
-		case "\x1B[3~":
-		case "\x1B[3;2~": return "delete-forward";
-		case "\x1B[3;3~":
-		case "\x1B[3;5~": return "delete-word-forward";
-		case "\x1B[H":
-		case "\x1B[1~":
-		case "\x1B[7~":
-		case "\x1BOH": return "home";
-		case "\x1B[F":
-		case "\x1B[4~":
-		case "\x1B[8~":
-		case "\x1BOF": return "end";
-		default: return;
-	}
-}
-/**
-* One-row editor window keeping the logical cursor visible in long drafts.
-* The caret and its surroundings slice at grapheme boundaries: splitting a
-* star-plane surrogate pair would render an isolated half under the block
-* caret with a width the terminal never draws.
-*/
-function editorWindow(value, cursor, columns) {
-	const width = Math.max(1, columns);
-	const normalize = (text) => displayText(text).replace(/\n/gu, "↵").replace(/\t/gu, "  ");
-	const site = clampCursor(value, cursor);
-	const caretSpan = splitGraphemes(value).find((span) => span.start === site);
-	const caret = caretSpan === void 0 ? " " : normalize(caretSpan.text);
-	const rest = value.slice(caretSpan === void 0 ? site : caretSpan.end);
-	const remaining = Math.max(0, width - visibleColumns(caret));
-	const afterBudget = Math.min(Math.floor(remaining / 3), visibleColumns(normalize(rest)));
-	const beforeBudget = Math.max(0, remaining - afterBudget);
-	return {
-		before: beforeBudget === 0 ? "" : displayTail(normalize(value.slice(0, site)), beforeBudget, 1).text,
-		caret,
-		after: afterBudget === 0 ? "" : truncateColumns(normalize(rest), afterBudget)
-	};
-}
 /** The empty-composer placeholder text (shared by the static and wave paths). */
 const COMPOSER_PLACEHOLDER = "type a message · / commands · @ mentions";
 /** Adjacent cells with identical styling merge into one styled Text span. */
@@ -32021,9 +32104,11 @@ function CompletionMenu({ active, mention, index, rows }) {
 * While a modal (approval / question / model panel) owns the keys, the
 * box passes every key through untouched.
 */
-function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, interrupt, quit, openModel, openEffort, openHelp, openMode, openPermission, openResume, openPlugin, openJobs, openStatusline, openTheme, openHistory, openAgents, openSubagent, openTodos, openDelete, openDiff, reviewChanges, deleteConfirm, confirmDelete, cancelDelete, createSession, forkSession, cancelSessionSwitch, notify, hasNotice, dismissNotice, toggleReasoning, openVerbose, clearView, refresh, loadMentions, inspectImages, prepareImages, cyclePermission, exportTranscript, renameTitle, copyLastResponse, recallSpace, recordLocal, recordHistory, queued, cancelQueued, historyFill, historyConsumed, waveTier, waveStyle, maxRows, onEditorRows }) {
+function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, interrupt, quit, openModel, openEffort, openHelp, openMode, openPermission, openResume, openPlugin, openJobs, openStatusline, openTheme, openHistory, openAgents, openSubagent, openTodos, openDelete, openDiff, reviewChanges, deleteConfirm, confirmDelete, cancelDelete, createSession, forkSession, cancelSessionSwitch, notify, applyEditorKeys, hasNotice, dismissNotice, toggleReasoning, openVerbose, clearView, refresh, loadMentions, inspectImages, prepareImages, cyclePermission, exportTranscript, renameTitle, copyLastResponse, recallSpace, recordLocal, recordHistory, queued, cancelQueued, historyFill, historyConsumed, waveTier, waveStyle, maxRows, onEditorRows }) {
 	const columns = useStdout().stdout?.columns ?? 80;
+	const editorColumns = Math.max(1, columns - 6);
 	const stdin = useStdin().stdin;
+	const focusReporting = isVsCodeTerminalEnv();
 	const [value, setValue] = (0, import_react.useState)("");
 	const [cursor, setCursor] = (0, import_react.useState)(0);
 	const valueRef = (0, import_react.useRef)(value);
@@ -32034,22 +32119,37 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	const draftImagesRef = (0, import_react.useRef)(draftImages);
 	draftImagesRef.current = draftImages;
 	const [preparingImages, setPreparingImages] = (0, import_react.useState)(false);
+	const prepareAbortRef = (0, import_react.useRef)(void 0);
+	const prepareEpochRef = (0, import_react.useRef)(0);
+	const { visible: cursorVisible, reset: resetCursorBlink } = useCursorBlink(active && !frozen && !preparingImages);
+	(0, import_react.useEffect)(() => () => {
+		prepareEpochRef.current += 1;
+		prepareAbortRef.current?.abort();
+	}, []);
 	const killRef = (0, import_react.useRef)("");
 	const preferredColumnRef = (0, import_react.useRef)(null);
 	const editorScrollRef = (0, import_react.useRef)(0);
 	const pasteBracketRef = (0, import_react.useRef)(false);
 	/** Cancels the pending lost-paste safety timer (undefined when disarmed). */
 	const pasteBracketCancelRef = (0, import_react.useRef)(void 0);
-	/** Annotation of the stdin chunk Ink is about to deliver to useInput. */
-	const rawAnnotation = (0, import_react.useRef)(void 0);
+	/** Ordered editor tokens from the stdin chunk Ink is about to deliver. */
+	const rawEditorTokens = (0, import_react.useRef)(void 0);
+	/** VS Code focus state from xterm focus-report events; starts focused. */
+	const terminalFocusedRef = (0, import_react.useRef)(true);
 	const recall = (0, import_react.useRef)(beginRecall([], ""));
+	(0, import_react.useEffect)(() => {
+		preferredColumnRef.current = null;
+	}, [editorColumns]);
 	(0, import_react.useEffect)(() => {
 		if (historyFill === void 0) return;
 		const safe = sanitizeDraftText(historyFill.text);
 		draftImagesRef.current = [];
 		setDraftImages([]);
+		valueRef.current = safe;
+		cursorRef.current = safe.length;
 		setValue(safe);
 		setCursor(safe.length);
+		resetCursorBlink();
 		preferredColumnRef.current = null;
 		setDismissedMenuValue(void 0);
 		recall.current = {
@@ -32062,7 +32162,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	}, [
 		historyFill,
 		recallSpace,
-		historyConsumed
+		historyConsumed,
+		resetCursorBlink
 	]);
 	(0, import_react.useEffect)(() => {
 		setDraftImages((current) => {
@@ -32078,13 +32179,16 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			const chunk = originalRead(...args);
 			if (chunk === null) return chunk;
 			const normalized = normalizeKeyboardChunk(typeof chunk === "string" ? chunk : String(chunk));
-			rawAnnotation.current = annotateRawKey(normalized);
-			return normalized;
+			const input = focusReporting ? stripTerminalFocusEvents(normalized, (focused) => {
+				terminalFocusedRef.current = focused;
+			}) : normalized;
+			rawEditorTokens.current = tokenizeRawEditorChunk(input);
+			return input;
 		};
 		return () => {
 			stdin.read = originalRead;
 		};
-	}, [stdin]);
+	}, [focusReporting, stdin]);
 	if (recall.current.entries !== recallSpace) {
 		const index = recall.current.index === null || recall.current.index < recallSpace.length ? recall.current.index : null;
 		recall.current = {
@@ -32106,6 +32210,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	};
 	const mentionActive = mentionToken !== void 0;
 	const [mentionRows, setMentionRows] = (0, import_react.useState)([]);
+	const mentionRequestRef = (0, import_react.useRef)(0);
 	const sameImagePath = (left, right) => process.platform === "win32" ? left.toLowerCase() === right.toLowerCase() : left === right;
 	const uniqueImageMarker = (name, source, reserved = []) => {
 		const safeName = singleLineText(sanitizeDraftText(name));
@@ -32131,6 +32236,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		return true;
 	};
 	const insertDroppedImages = (paths) => {
+		const originalValue = valueRef.current;
+		const originalCursor = cursorRef.current;
 		notify(`checking ${paths.length} image${paths.length === 1 ? "" : "s"}…`);
 		inspectImages(paths).then((inspected) => {
 			const additions = [];
@@ -32148,14 +32255,24 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				notify("those images are already attached", "warning");
 				return;
 			}
-			const at = cursorRef.current;
 			const current = valueRef.current;
+			const anchor = remapStableRange(originalValue, current, {
+				start: originalCursor,
+				end: originalCursor
+			});
+			if (anchor === void 0) {
+				notify("draft changed at the image drop point; drop the images again", "warning");
+				return;
+			}
+			const at = anchor.start;
 			const insertion = `${at > 0 && !/\s$/u.test(current.slice(0, at)) ? " " : ""}${markers.join(" ")}${current.slice(at) === "" ? "" : " "}`;
-			const next = current.slice(0, at) + insertion + current.slice(at);
-			valueRef.current = next;
-			cursorRef.current = at + insertion.length;
-			setValue(next);
-			setCursor(cursorRef.current);
+			const edit = replaceRangePreservingCursor(current, cursorRef.current, anchor, insertion);
+			const nextCursor = current === originalValue && cursorRef.current === originalCursor ? at + insertion.length : edit.cursor;
+			valueRef.current = edit.value;
+			cursorRef.current = nextCursor;
+			setValue(edit.value);
+			setCursor(nextCursor);
+			resetCursorBlink();
 			const nextImages = [...draftImagesRef.current, ...additions];
 			draftImagesRef.current = nextImages;
 			setDraftImages(nextImages);
@@ -32165,14 +32282,21 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		});
 	};
 	(0, import_react.useEffect)(() => {
+		const requestId = mentionRequestRef.current + 1;
+		mentionRequestRef.current = requestId;
 		if (!active || !mentionActive) {
 			setMentionRows([]);
 			return;
 		}
 		const controller = new AbortController();
-		setMentionRows([]);
-		loadMentions(mentionToken.query, controller.signal).then((rows) => setMentionRows(rows), () => {});
+		const query = mentionToken.query;
+		const timer = setTimeout(() => {
+			loadMentions(query, controller.signal).then((rows) => {
+				if (!controller.signal.aborted && mentionRequestRef.current === requestId) setMentionRows(rows);
+			}, () => {});
+		}, 50);
 		return () => {
+			clearTimeout(timer);
 			controller.abort();
 		};
 	}, [
@@ -32180,8 +32304,9 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		mentionActive,
 		mentionToken?.query
 	]);
-	const menuActive = (slashActive || mentionActive) && dismissedMenuValue !== value;
-	const menuRows = mentionActive ? mentionRows.map((row) => ({
+	const menuActive = !preparingImages && (slashActive || mentionActive) && dismissedMenuValue !== value;
+	const visibleMentionRows = mentionToken !== void 0 && isPathLikeMentionQuery(mentionToken.query) ? mentionRows.filter((row) => row.kind !== "session") : mentionRows;
+	const menuRows = mentionActive ? visibleMentionRows.map((row) => ({
 		label: row.label.startsWith("@") ? row.label : `@${row.label}${row.kind === "directory" ? "/" : ""}`,
 		description: row.description,
 		origin: "mention"
@@ -32189,34 +32314,45 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	/** Accept the highlighted completion-menu candidate into the draft. */
 	const acceptMenuCandidate = () => {
 		if (mentionActive && mentionToken !== void 0) {
-			const row = mentionRows[completionIndex % mentionRows.length];
+			if (visibleMentionRows.length === 0) return;
+			const row = visibleMentionRows[completionIndex % visibleMentionRows.length];
 			if (row !== void 0) {
 				if (row.kind === "file" && row.path !== void 0 && looksLikeImagePath(row.path)) {
 					const tokenText = value.slice(mentionToken.start, cursor);
 					const start = mentionToken.start;
+					const originalValue = value;
 					notify(`checking image ${basename(row.path)}…`);
 					inspectImages([row.path]).then((inspected) => {
 						const inspection = inspected[0];
 						if (inspection === void 0) return;
 						const current = valueRef.current;
-						if (current.slice(start, start + tokenText.length) !== tokenText) return;
+						const anchor = remapStableRange(originalValue, current, {
+							start,
+							end: start + tokenText.length
+						});
+						if (anchor === void 0 || current.slice(anchor.start, anchor.end) !== tokenText) {
+							notify("draft changed around the image mention; select it again", "warning");
+							return;
+						}
 						if (draftImagesRef.current.some((image) => sameImagePath(image.path, inspection.path))) {
-							const next = current.slice(0, start) + current.slice(start + tokenText.length);
-							valueRef.current = next;
-							cursorRef.current = start;
-							setValue(next);
-							setCursor(start);
-							setDismissedMenuValue(next);
+							const edit = replaceRangePreservingCursor(current, cursorRef.current, anchor, "");
+							valueRef.current = edit.value;
+							cursorRef.current = edit.cursor;
+							setValue(edit.value);
+							setCursor(edit.cursor);
+							resetCursorBlink();
+							setDismissedMenuValue(edit.value);
 							notify(`${inspection.name} is already attached`, "warning");
 							return;
 						}
 						const marker = uniqueImageMarker(inspection.name, "mention");
-						const next = current.slice(0, start) + marker + current.slice(start + tokenText.length);
-						valueRef.current = next;
-						cursorRef.current = start + marker.length;
-						setValue(next);
-						setCursor(cursorRef.current);
-						setDismissedMenuValue(next);
+						const edit = replaceRangePreservingCursor(current, cursorRef.current, anchor, marker);
+						valueRef.current = edit.value;
+						cursorRef.current = edit.cursor;
+						setValue(edit.value);
+						setCursor(edit.cursor);
+						resetCursorBlink();
+						setDismissedMenuValue(edit.value);
 						registerDraftImage(inspection, marker);
 						notify(`${inspection.name} ready for the next message`);
 					}, (reason) => {
@@ -32227,14 +32363,25 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 					return;
 				}
 				const insertion = row.label.startsWith("@") ? row.label : `@${row.label}${row.kind === "directory" ? "/" : ""}`;
-				setValue(value.slice(0, mentionToken.start) + insertion + value.slice(cursor));
-				setCursor(mentionToken.start + insertion.length);
+				const nextValue = value.slice(0, mentionToken.start) + insertion + value.slice(cursor);
+				const nextCursor = mentionToken.start + insertion.length;
+				valueRef.current = nextValue;
+				cursorRef.current = nextCursor;
+				setValue(nextValue);
+				setCursor(nextCursor);
+				resetCursorBlink();
 			}
 		} else {
+			if (candidates.length === 0) return;
 			const candidate = candidates[completionIndex % candidates.length];
 			if (candidate !== void 0) {
-				setValue(`${candidate.label} `);
-				setCursor(candidate.label.length + 1);
+				const nextValue = `${candidate.label} `;
+				const nextCursor = candidate.label.length + 1;
+				valueRef.current = nextValue;
+				cursorRef.current = nextCursor;
+				setValue(nextValue);
+				setCursor(nextCursor);
+				resetCursorBlink();
 			}
 		}
 		setCompletionIndex(0);
@@ -32243,21 +32390,101 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	/** Apply one editor edit: draft, cursor, kill buffer, menu reset. */
 	const applyEdit = (edit) => {
 		if (edit.killed !== void 0 && edit.killed !== "") killRef.current = edit.killed;
+		valueRef.current = edit.value;
+		cursorRef.current = edit.cursor;
 		setValue(edit.value);
 		setCursor(edit.cursor);
+		resetCursorBlink();
 		preferredColumnRef.current = null;
 		setCompletionIndex(0);
 		setDismissedMenuValue(void 0);
 	};
 	/** Move the cursor without editing; horizontal moves clear the column preference. */
 	const moveCursorTo = (next) => {
-		if (next === cursor) return;
+		resetCursorBlink();
+		if (next === cursorRef.current) return;
+		cursorRef.current = next;
 		setCursor(next);
 		preferredColumnRef.current = null;
 	};
-	useInput((input, key) => {
+	/** Apply an ordered raw-key batch against one current draft snapshot. */
+	const applyRawEditorTokens = (tokens) => {
+		let nextValue = valueRef.current;
+		let nextCursor = cursorRef.current;
+		for (const token of tokens) {
+			if (token.kind === "text") {
+				const edit = insertText(nextValue, nextCursor, token.text);
+				nextValue = edit.value;
+				nextCursor = edit.cursor;
+				continue;
+			}
+			if (token.kind === "home") {
+				nextCursor = moveToLineStart(nextValue, nextCursor, false);
+				continue;
+			}
+			if (token.kind === "end") {
+				nextCursor = moveToLineEnd(nextValue, nextCursor, false);
+				continue;
+			}
+			const edit = token.kind === "delete-backward" ? deleteBackward(nextValue, nextCursor) : token.kind === "delete-word-backward" ? deleteWordBackward(nextValue, nextCursor) : token.kind === "delete-forward" ? deleteForward(nextValue, nextCursor) : deleteWordForward(nextValue, nextCursor);
+			if (edit.killed !== void 0 && edit.killed !== "") killRef.current = edit.killed;
+			nextValue = edit.value;
+			nextCursor = edit.cursor;
+		}
+		valueRef.current = nextValue;
+		cursorRef.current = nextCursor;
+		setValue(nextValue);
+		setCursor(nextCursor);
+		resetCursorBlink();
+		preferredColumnRef.current = null;
+		setCompletionIndex(0);
+		setDismissedMenuValue(void 0);
+	};
+	const cancelImageSubmission = () => {
+		prepareEpochRef.current += 1;
+		prepareAbortRef.current?.abort();
+		prepareAbortRef.current = void 0;
+		setPreparingImages(false);
+		dismissNotice();
+		notify("image submission cancelled", "warning");
+	};
+	/** Move through visual rows first, then cross history at the true edge. */
+	const navigateVertical = (direction) => {
+		const currentValue = valueRef.current;
+		const currentCursor = cursorRef.current;
+		const model = editorModel(currentValue, editorColumns);
+		const preferred = preferredColumnRef.current ?? caretSite(model, currentCursor).column;
+		const next = moveCursorVertically(model, currentCursor, preferred, direction);
+		if (next !== currentCursor) {
+			cursorRef.current = next;
+			setCursor(next);
+			resetCursorBlink();
+			preferredColumnRef.current = preferred;
+			return;
+		}
+		if (recall.current.entries.length > 0 && shouldRecallNavigate(currentValue, currentCursor, recall.current.lastRecalled, direction)) {
+			const step = direction < 0 ? recallOlder(recall.current, currentValue) : recallNewer(recall.current);
+			recall.current = step.state;
+			if (step.entry !== void 0) {
+				const safe = sanitizeDraftText(step.entry);
+				valueRef.current = safe;
+				cursorRef.current = safe.length;
+				setValue(safe);
+				setCursor(safe.length);
+				preferredColumnRef.current = null;
+				setDismissedMenuValue(void 0);
+			}
+		}
+		resetCursorBlink();
+	};
+	useStableInput((input, key) => {
 		if (!active) return;
-		if (preparingImages) return;
+		const liveValue = valueRef.current;
+		const liveCursor = cursorRef.current;
+		if (preparingImages) {
+			if (key.escape || key.ctrl && input === "c") cancelImageSubmission();
+			return;
+		}
 		if (deleteConfirm !== void 0) {
 			if (input === "y" || input === "Y") confirmDelete();
 			else cancelDelete();
@@ -32272,7 +32499,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			}
 			return;
 		}
-		if (key.ctrl && input === "r") {
+		if ((key.ctrl || key.meta) && input === "r") {
+			if (focusReporting && !terminalFocusedRef.current) return;
 			toggleReasoning();
 			return;
 		}
@@ -32282,9 +32510,12 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		}
 		if (key.ctrl && input === "c") {
 			if (busy) interrupt();
-			else if (value !== "") {
+			else if (liveValue !== "") {
+				valueRef.current = "";
+				cursorRef.current = 0;
 				setValue("");
 				setCursor(0);
+				resetCursorBlink();
 				draftImagesRef.current = [];
 				setDraftImages([]);
 				setCompletionIndex(0);
@@ -32293,8 +32524,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			return;
 		}
 		if (key.ctrl && input === "d") {
-			if (value !== "") {
-				applyEdit(deleteForward(value, cursor));
+			if (liveValue !== "") {
+				applyEdit(deleteForward(liveValue, liveCursor));
 				return;
 			}
 			if (busy) notify("cancel the running turn before exiting (Esc or Ctrl+C)", "warning");
@@ -32303,7 +32534,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		}
 		if (key.escape) {
 			if (menuActive) {
-				setDismissedMenuValue(value);
+				setDismissedMenuValue(liveValue);
 				return;
 			}
 			if (hasNotice) {
@@ -32313,27 +32544,33 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			if (busy) interrupt();
 			return;
 		}
-		if (key.delete && value === "" && queued.length > 0) {
+		if (key.delete && liveValue === "" && queued.length > 0) {
 			cancelQueued(queued[queued.length - 1].messageId);
 			return;
 		}
 		if (key.return) {
 			if (pasteBracketRef.current) {
-				applyEdit(insertText(value, cursor, "\n"));
+				applyEdit(insertText(liveValue, liveCursor, "\n"));
 				return;
 			}
 			if (menuActive) {
-				if (!(!mentionActive && candidates.some((candidate) => candidate.label === value))) {
+				if (!(!mentionActive && candidates.some((candidate) => candidate.label === liveValue))) {
 					acceptMenuCandidate();
 					return;
 				}
 			}
-			const text = value.trim();
+			const text = liveValue.trim();
 			if (draftImagesRef.current.length > 0) {
+				const controller = new AbortController();
+				const epoch = prepareEpochRef.current + 1;
+				prepareEpochRef.current = epoch;
+				prepareAbortRef.current = controller;
 				setPreparingImages(true);
 				notify(`processing ${draftImagesRef.current.length} image${draftImagesRef.current.length === 1 ? "" : "s"}…`);
 				const snapshot = draftImagesRef.current;
-				prepareImages(snapshot.map((image) => image.path)).then((images) => {
+				prepareImages(snapshot.map((image) => image.path), controller.signal).then((images) => {
+					if (controller.signal.aborted || prepareEpochRef.current !== epoch) return;
+					prepareAbortRef.current = void 0;
 					setPreparingImages(false);
 					valueRef.current = "";
 					cursorRef.current = 0;
@@ -32352,13 +32589,18 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 					if (busy) steer(text, images);
 					else dispatch(text, images);
 				}, (reason) => {
+					if (controller.signal.aborted || prepareEpochRef.current !== epoch) return;
+					prepareAbortRef.current = void 0;
 					setPreparingImages(false);
 					notify(`image submission failed: ${reason instanceof Error ? reason.message : String(reason)}`, "error");
 				});
 				return;
 			}
+			valueRef.current = "";
+			cursorRef.current = 0;
 			setValue("");
 			setCursor(0);
+			resetCursorBlink();
 			setCompletionIndex(0);
 			setDismissedMenuValue(void 0);
 			if (text === "") return;
@@ -32469,6 +32711,10 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				openTodos();
 				return;
 			}
+			if (text === "/vscode-keys" || text.startsWith("/vscode-keys ")) {
+				applyEditorKeys().then((summary) => notify(summary), (error) => notify(`vscode-keys failed: ${error instanceof Error ? error.message : String(error)}`, "error"));
+				return;
+			}
 			if (text === "/subagent") {
 				openSubagent();
 				return;
@@ -32485,6 +32731,12 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			return;
 		}
 		if (input === "\n" || input === "\r") return;
+		if (menuActive && (key.tab || input.startsWith("	"))) {
+			const remainder = key.tab ? "" : input.slice(1);
+			acceptMenuCandidate();
+			if (remainder !== "") applyEdit(insertText(valueRef.current, cursorRef.current, remainder));
+			return;
+		}
 		if (menuActive && key.upArrow) {
 			setCompletionIndex((index) => (index + menuRows.length - 1) % menuRows.length);
 			return;
@@ -32493,119 +32745,74 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			setCompletionIndex((index) => (index + 1) % menuRows.length);
 			return;
 		}
-		const rawKey = rawAnnotation.current;
-		if (rawKey !== void 0) {
-			if (rawKey === "home") moveCursorTo(lineBounds(value, cursor).start);
-			else if (rawKey === "end") moveCursorTo(lineBounds(value, cursor).end);
-			else if (rawKey === "delete-backward") applyEdit(deleteBackward(value, cursor));
-			else if (rawKey === "delete-word-backward") applyEdit(deleteWordBackward(value, cursor));
-			else if (rawKey === "delete-forward") applyEdit(deleteForward(value, cursor));
-			else applyEdit(deleteWordForward(value, cursor));
+		const rawTokens = rawEditorTokens.current;
+		rawEditorTokens.current = void 0;
+		if (rawTokens !== void 0) {
+			applyRawEditorTokens(rawTokens);
 			return;
 		}
 		if (key.upArrow || key.downArrow) {
-			if (recall.current.entries.length > 0 && shouldRecallNavigate(value, cursor, recall.current.lastRecalled)) {
-				const step = key.upArrow ? recallOlder(recall.current, value) : recallNewer(recall.current);
-				recall.current = step.state;
-				if (step.entry !== void 0) {
-					const safe = sanitizeDraftText(step.entry);
-					setValue(safe);
-					setCursor(safe.length);
-					preferredColumnRef.current = null;
-					setDismissedMenuValue(void 0);
-				}
-				return;
-			}
-			const model = editorModel(value, Math.max(1, columns - 6));
-			const preferred = preferredColumnRef.current ?? caretSite(model, cursor).column;
-			const next = moveCursorVertically(model, cursor, preferred, key.upArrow ? -1 : 1);
-			if (next !== cursor) {
-				setCursor(next);
-				preferredColumnRef.current = preferred;
-			}
+			navigateVertical(key.upArrow ? -1 : 1);
 			return;
 		}
 		if (key.ctrl && (input === "p" || input === "n")) {
-			const up = input === "p";
-			if (recall.current.entries.length > 0 && shouldRecallNavigate(value, cursor, recall.current.lastRecalled)) {
-				const step = up ? recallOlder(recall.current, value) : recallNewer(recall.current);
-				recall.current = step.state;
-				if (step.entry !== void 0) {
-					const safe = sanitizeDraftText(step.entry);
-					setValue(safe);
-					setCursor(safe.length);
-					preferredColumnRef.current = null;
-					setDismissedMenuValue(void 0);
-				}
-				return;
-			}
-			const model = editorModel(value, Math.max(1, columns - 6));
-			const preferred = preferredColumnRef.current ?? caretSite(model, cursor).column;
-			const next = moveCursorVertically(model, cursor, preferred, up ? -1 : 1);
-			if (next !== cursor) {
-				setCursor(next);
-				preferredColumnRef.current = preferred;
-			}
-			return;
-		}
-		if (key.tab && menuActive) {
-			acceptMenuCandidate();
+			navigateVertical(input === "p" ? -1 : 1);
 			return;
 		}
 		if (key.leftArrow) {
-			moveCursorTo(key.meta || key.ctrl ? moveWordLeft(value, cursor) : moveCursorBy(value, cursor, -1));
+			moveCursorTo(key.meta || key.ctrl ? moveWordLeft(liveValue, liveCursor) : moveCursorBy(liveValue, liveCursor, -1));
 			return;
 		}
 		if (key.rightArrow) {
-			moveCursorTo(key.meta || key.ctrl ? moveWordRight(value, cursor) : moveCursorBy(value, cursor, 1));
+			moveCursorTo(key.meta || key.ctrl ? moveWordRight(liveValue, liveCursor) : moveCursorBy(liveValue, liveCursor, 1));
 			return;
 		}
 		if (key.meta && input === "b") {
-			moveCursorTo(moveWordLeft(value, cursor));
+			moveCursorTo(moveWordLeft(liveValue, liveCursor));
 			return;
 		}
 		if (key.meta && input === "f") {
-			moveCursorTo(moveWordRight(value, cursor));
+			moveCursorTo(moveWordRight(liveValue, liveCursor));
 			return;
 		}
 		if (key.ctrl && input === "b") {
-			moveCursorTo(moveCursorBy(value, cursor, -1));
+			moveCursorTo(moveCursorBy(liveValue, liveCursor, -1));
 			return;
 		}
 		if (key.ctrl && input === "f") {
-			moveCursorTo(moveCursorBy(value, cursor, 1));
+			moveCursorTo(moveCursorBy(liveValue, liveCursor, 1));
 			return;
 		}
 		if (key.ctrl && input === "w") {
-			applyEdit(deleteWordBackward(value, cursor));
+			applyEdit(deleteWordBackward(liveValue, liveCursor));
 			return;
 		}
 		if (key.meta && input === "d") {
-			applyEdit(deleteWordForward(value, cursor));
+			applyEdit(deleteWordForward(liveValue, liveCursor));
 			return;
 		}
 		if (key.backspace || key.delete) {
-			applyEdit(deleteBackward(value, cursor));
+			applyEdit(deleteBackward(liveValue, liveCursor));
 			return;
 		}
 		if (key.ctrl && input === "a") {
-			moveCursorTo(lineBounds(value, cursor).start);
+			moveCursorTo(moveToLineStart(liveValue, liveCursor, true));
 			return;
 		}
 		if (key.ctrl && input === "e") {
-			moveCursorTo(lineBounds(value, cursor).end);
+			moveCursorTo(moveToLineEnd(liveValue, liveCursor, true));
 			return;
 		}
 		if (key.ctrl && input === "u") {
-			applyEdit(killToLineStart(value, cursor));
+			applyEdit(killToLineStart(liveValue, liveCursor));
 			return;
 		}
 		if (key.ctrl && input === "k") {
-			applyEdit(killToLineEnd(value, cursor));
+			applyEdit(killToLineEnd(liveValue, liveCursor));
 			return;
 		}
 		if (key.ctrl && input === "y") {
-			if (killRef.current !== "") applyEdit(insertText(value, cursor, killRef.current));
+			if (killRef.current !== "") applyEdit(insertText(liveValue, liveCursor, killRef.current));
 			return;
 		}
 		if (key.ctrl && input === "l") {
@@ -32638,9 +32845,9 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				insertDroppedImages(droppedPaths);
 				return;
 			}
-			applyEdit(insertText(value, cursor, text));
+			applyEdit(insertText(valueRef.current, cursorRef.current, text));
 		}
-	});
+	}, active);
 	const [waveTick, setWaveTick] = (0, import_react.useState)(null);
 	const wavePrevious = (0, import_react.useRef)({
 		tier: null,
@@ -32658,7 +32865,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		}
 		if (previous.tier !== waveTier || previous.style !== waveStyle) setWaveTick(0);
 	}, [waveTier, waveStyle]);
-	const waveActive = waveTick !== null && waveTier !== null && waveStyle !== null && waveTick * 33 < deepseekWaveDuration(waveTier, waveStyle);
+	const waveActive = !preparingImages && waveTick !== null && waveTier !== null && waveStyle !== null && waveTick * 33 < deepseekWaveDuration(waveTier, waveStyle);
 	(0, import_react.useEffect)(() => {
 		if (!waveActive) return;
 		const id = setInterval(() => {
@@ -32679,7 +32886,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	const tierHues = waveTier === null ? null : deepseekWaveHues(waveTier);
 	const promptColor = tierHues === null ? inkColor(getPalette().brand) : inkColor(tierHues[0]);
 	const promptGlyph = waveTier === "flash" ? "›" : waveTier === "deepseek" ? "»" : "❯";
-	const editorViewModel = editorModel(value, Math.max(1, columns - 6));
+	const editorViewModel = editorModel(value, editorColumns);
 	const clampedCursor = clampCursor(value, cursor);
 	const caret = caretSite(editorViewModel, clampedCursor);
 	const editorWindowRows = Math.min(editorViewModel.rows.length, Math.max(1, maxRows));
@@ -32730,123 +32937,120 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	const editorRows = [];
 	for (let index = editorWindowStart; index < Math.min(editorViewModel.rows.length, editorWindowStart + editorWindowRows); index += 1) {
 		const row = editorViewModel.rows[index];
-		const caretAt = index === caret.row ? row.offsets.indexOf(clampedCursor) : -1;
-		const before = caretAt > 0 ? row.text.slice(0, row.cuts[caretAt]) : "";
-		const caretChar = caretAt >= 0 && caretAt < row.cuts.length - 1 ? row.text.slice(row.cuts[caretAt], row.cuts[caretAt + 1]) : " ";
-		const after = caretAt < 0 ? row.text : caretAt < row.cuts.length - 1 ? row.text.slice(row.cuts[caretAt + 1]) : "";
-		const placeholder = index === 0 && value === "" && !busy;
-		const tail = placeholder ? COMPOSER_PLACEHOLDER : after;
-		const consumed = 2 + visibleColumns(before) + visibleColumns(caretChar) + visibleColumns(tail);
+		const parts = editorRowParts(row, index, caret.row, clampedCursor, !preparingImages);
+		const placeholder = index === 0 && value === "" && !busy && !preparingImages;
+		const tail = placeholder ? COMPOSER_PLACEHOLDER : parts.after;
+		const consumed = 2 + visibleColumns(parts.before) + visibleColumns(parts.caret) + visibleColumns(tail);
 		editorRows.push((0, import_react.createElement)(Text, {
 			key: index,
 			backgroundColor: bandBg,
 			wrap: "truncate-end"
-		}, index === 0 ? busy ? (0, import_react.createElement)(BusyChase) : (0, import_react.createElement)(Text, {
+		}, index === 0 ? preparingImages ? (0, import_react.createElement)(Text, {
+			color: inkColor(getPalette().warn),
+			bold: true
+		}, "… ") : busy ? (0, import_react.createElement)(BusyChase) : (0, import_react.createElement)(Text, {
 			color: promptColor,
 			bold: tierActive ? true : void 0
-		}, `${promptGlyph} `) : "  ", before, (0, import_react.createElement)(CursorBlock, {
+		}, `${promptGlyph} `) : "  ", parts.before, parts.hasCaret ? (0, import_react.createElement)(Text, {
 			key: "caret",
-			char: caretChar
-		}), placeholder ? (0, import_react.createElement)(Text, { dimColor: true }, COMPOSER_PLACEHOLDER) : after, bandFill(consumed)));
+			inverse: cursorVisible || void 0
+		}, parts.caret) : null, placeholder ? (0, import_react.createElement)(Text, { dimColor: true }, COMPOSER_PLACEHOLDER) : parts.after, bandFill(consumed)));
 	}
 	const staticEditor = (0, import_react.createElement)(Box, { flexDirection: "column" }, ...editorRows);
 	const waveRow = () => {
 		const hues = deepseekWaveHues(waveTier);
 		const style = waveStyle;
 		const bandRgb = getPalette().composerBand;
+		const visibleRows = editorViewModel.rows.slice(editorWindowStart, editorWindowStart + editorWindowRows);
+		const totalBandRows = visibleRows.length + 2;
 		const waveBg = (row, column) => {
-			const rgb = deepseekWaveColumnBg(waveTick, column, bandWidth, waveTier, style, hues, bandRgb, row, 3);
+			const rgb = deepseekWaveColumnBg(waveTick, column, bandWidth, waveTier, style, hues, bandRgb, row, totalBandRows);
 			return rgb === null ? bandBg : inkColor(rgb);
 		};
 		const blankBandRow = (row) => {
 			const blanks = [];
-			while (blanks.length < bandWidth) blanks.push({
+			for (let column = 0; column < bandWidth; column += 1) blanks.push({
 				char: " ",
-				backgroundColor: waveBg(row, blanks.length)
+				width: 1,
+				backgroundColor: waveBg(row, column)
 			});
-			return (0, import_react.createElement)(Text, { key: row }, ...waveRowSpans(blanks));
+			return (0, import_react.createElement)(Text, { key: `blank-${row}` }, ...waveRowSpans(blanks));
 		};
-		const waveEditor = editorWindow(value, cursor, Math.max(1, columns - 7));
-		const cells = [
-			{
-				char: " ",
-				backgroundColor: waveBg(1, 0)
-			},
-			{
-				char: " ",
-				backgroundColor: waveBg(1, 1)
-			},
-			{
-				char: promptGlyph,
-				color: promptColor,
-				bold: true,
-				backgroundColor: waveBg(1, 2)
-			},
-			{
-				char: " ",
-				color: promptColor,
-				backgroundColor: waveBg(1, 3)
+		const cellIndexAtColumn = (cells, target) => {
+			let column = 0;
+			for (let index = 0; index < cells.length; index += 1) {
+				if (column === target) return index;
+				column += cells[index].width ?? visibleColumns(cells[index].char);
+				if (column > target) return void 0;
 			}
-		];
-		for (const char of waveEditor.before) cells.push({
-			char,
-			backgroundColor: waveBg(1, cells.length)
-		});
-		cells.push({
-			char: waveEditor.caret,
-			inverse: true,
-			backgroundColor: waveBg(1, cells.length)
-		});
-		if (value === "" && !busy) for (let at = 0; at < 40; at += 1) cells.push({
-			char: COMPOSER_PLACEHOLDER[at],
-			dim: true,
-			backgroundColor: waveBg(1, cells.length)
-		});
-		else for (const char of waveEditor.after) cells.push({
-			char,
-			backgroundColor: waveBg(1, cells.length)
-		});
-		while (cells.length < bandWidth) cells.push({
-			char: " ",
-			backgroundColor: waveBg(1, cells.length)
+		};
+		const editorWaveRows = visibleRows.map((row, visibleIndex) => {
+			const sourceIndex = editorWindowStart + visibleIndex;
+			const bandRow = visibleIndex + 1;
+			const parts = editorRowParts(row, sourceIndex, caret.row, clampedCursor);
+			const placeholder = sourceIndex === 0 && value === "" && !busy;
+			const cells = [];
+			let usedColumns = 0;
+			const push = (char, extra = {}) => {
+				const width = visibleColumns(char);
+				cells.push({
+					char,
+					width,
+					backgroundColor: waveBg(bandRow, usedColumns),
+					...extra
+				});
+				usedColumns += width;
+			};
+			if (sourceIndex === 0) {
+				push(promptGlyph, {
+					color: promptColor,
+					bold: true
+				});
+				push(" ", { color: promptColor });
+			} else {
+				push(" ");
+				push(" ");
+			}
+			for (const span of splitGraphemes(parts.before)) push(span.text);
+			if (parts.hasCaret) push(parts.caret, { inverse: cursorVisible });
+			const tail = placeholder ? COMPOSER_PLACEHOLDER : parts.after;
+			for (const span of splitGraphemes(tail)) push(span.text, placeholder ? { dim: true } : {});
+			while (usedColumns < bandWidth) push(" ");
+			const middleBandRow = Math.floor(totalBandRows / 2);
+			if (bandRow === middleBandRow && deepseekWaveWordVisible(waveTick, waveTier, style)) {
+				const word = waveTier === "unknown" ? "Into the Unknown" : "deepseek";
+				const start = Math.max(2, Math.floor((bandWidth - word.length) / 2));
+				const indices = Array.from({ length: word.length }, (_, at) => cellIndexAtColumn(cells, start + at));
+				if (indices.every((index) => index !== void 0 && (cells[index].char === " " || cells[index].dim === true))) for (let at = 0; at < word.length; at += 1) {
+					const cell = cells[indices[at]];
+					cell.char = word[at];
+					cell.width = 1;
+					cell.color = inkColor(deepseekWaveWordHue(at, hues));
+					cell.bold = true;
+					cell.dim = false;
+				}
+			}
+			if (bandRow === middleBandRow && (waveTier === "deepseek" || waveTier === "unknown") && style === "wave") {
+				const spark = deepseekWaveSpark(waveTick);
+				const lastIndex = cellIndexAtColumn(cells, bandWidth - 1);
+				if (spark !== null && lastIndex !== void 0 && cells[lastIndex].char === " ") {
+					cells[lastIndex].char = spark;
+					cells[lastIndex].color = promptColor;
+					cells[lastIndex].bold = true;
+					cells[lastIndex].dim = false;
+				}
+			}
+			return (0, import_react.createElement)(Text, {
+				key: `editor-${sourceIndex}`,
+				wrap: "truncate-end"
+			}, ...waveRowSpans(cells));
 		});
-		if (deepseekWaveWordVisible(waveTick, waveTier, style)) {
-			const word = waveTier === "unknown" ? "Into the Unknown" : "deepseek";
-			const start = Math.max(2, Math.floor((bandWidth - word.length) / 2));
-			let clear = true;
-			for (let at = 0; at < word.length; at += 1) {
-				const cell = cells[start + at];
-				if (cell === void 0 || cell.char !== " " && cell.dim !== true) {
-					clear = false;
-					break;
-				}
-			}
-			if (clear) for (let at = 0; at < word.length; at += 1) {
-				const cell = cells[start + at];
-				cell.char = word[at];
-				cell.color = inkColor(deepseekWaveWordHue(at, hues));
-				cell.bold = true;
-				cell.dim = false;
-			}
-		}
-		if ((waveTier === "deepseek" || waveTier === "unknown") && style === "wave") {
-			const spark = deepseekWaveSpark(waveTick);
-			if (spark !== null) {
-				const last = cells[cells.length - 1];
-				if (last !== void 0 && last.char === " ") {
-					last.char = spark;
-					last.color = promptColor;
-					last.bold = true;
-					last.dim = false;
-				}
-			}
-		}
 		return (0, import_react.createElement)(Box, {
 			flexDirection: "column",
 			width: bandWidth
-		}, blankBandRow(0), (0, import_react.createElement)(Text, { wrap: "truncate-end" }, ...waveRowSpans(cells)), blankBandRow(2));
+		}, blankBandRow(0), ...editorWaveRows, blankBandRow(totalBandRows - 1));
 	};
-	return (0, import_react.createElement)(Box, { flexDirection: "column" }, menu, waveTick !== null && waveTier !== null && !busy ? waveRow() : band(staticEditor));
+	return (0, import_react.createElement)(Box, { flexDirection: "column" }, menu, waveTick !== null && waveTier !== null && waveStyle !== null && !busy && !preparingImages ? waveRow() : band(staticEditor));
 }
 /** Build one settled row (row Box plus its roomy-prompt spacers and row count). */
 function buildSettledRow(entry, index, showReasoning, columns) {
@@ -33143,6 +33347,7 @@ function App(props) {
 	}, [modelOpen, props.subscribeProviderAuthorizations]);
 	const busy = view.busy;
 	const [showReasoning, setShowReasoning] = (0, import_react.useState)(false);
+	const budgetWarnRef = (0, import_react.useRef)(void 0);
 	const [verboseOpen, setVerboseOpen] = (0, import_react.useState)(false);
 	const [diffView, setDiffView] = (0, import_react.useState)(void 0);
 	const [helpOpen, setHelpOpen] = (0, import_react.useState)(false);
@@ -33311,6 +33516,18 @@ function App(props) {
 	const streamRows = Math.max(1, dynamicRows - visibleLiveLines.length);
 	const reasoningRows = view.streamingReasoning === "" ? 0 : view.streaming === "" ? streamRows : streamRows <= 1 ? 0 : showReasoning ? Math.max(1, Math.floor(streamRows / 3)) : 1;
 	const answerRows = view.streaming === "" ? 0 : Math.max(1, streamRows - reasoningRows);
+	const liveAudit = clampLiveAllocation({
+		live: visibleLiveLines.length,
+		reasoning: reasoningRows,
+		answer: answerRows
+	}, dynamicRows);
+	if (liveAudit.warning !== void 0 && budgetWarnRef.current !== liveAudit.warning) {
+		budgetWarnRef.current = liveAudit.warning;
+		console.warn(`[dsh-code] ${liveAudit.warning}`);
+	}
+	const auditedLiveLines = liveAudit.allocation.live === visibleLiveLines.length ? visibleLiveLines : visibleLiveLines.slice(-liveAudit.allocation.live);
+	const auditedReasoningRows = liveAudit.allocation.reasoning;
+	const auditedAnswerRows = liveAudit.allocation.answer;
 	const transcriptVisible = !modelOpen && !helpOpen && !modeOpen && !permissionOpen && !resumeOpen && !pluginOpen && !jobsOpen && !statuslineOpen && !themeOpen && !historyOpen && !agentsOpen && !subagentOpen && !todosOpen && !verboseOpen && diffView === void 0 && !approvalPending && !questionPending;
 	const modalVisible = modelOpen || helpOpen || modeOpen || permissionOpen || resumeOpen || pluginOpen || jobsOpen || statuslineOpen || themeOpen || historyOpen || agentsOpen || subagentOpen || todosOpen || verboseOpen && !approvalPending && !questionPending || diffView !== void 0 || approvalPending || questionPending;
 	const closeInspector = (0, import_react.useCallback)(() => {
@@ -33548,18 +33765,27 @@ function App(props) {
 	return (0, import_react.createElement)(Box, { flexDirection: "column" }, (0, import_react.createElement)(MemoStaticTranscript, {
 		key: refreshEpoch,
 		items: settledRows
-	}), transcriptVisible ? (0, import_react.createElement)(Box, { flexDirection: "column" }, visibleLiveLines.length === 0 ? void 0 : (0, import_react.createElement)(StyledRows, { lines: visibleLiveLines }), view.streamingReasoning !== "" && reasoningRows > 0 ? (0, import_react.createElement)(StreamTail, {
-		text: showReasoning ? view.streamingReasoning : "Thinking… (Ctrl+R to expand)",
+	}), transcriptVisible ? (0, import_react.createElement)(Box, { flexDirection: "column" }, auditedLiveLines.length === 0 ? void 0 : (0, import_react.createElement)(StyledRows, { lines: auditedLiveLines }), view.streamingReasoning !== "" && auditedReasoningRows > 0 ? showReasoning ? (0, import_react.createElement)(StreamTail, {
+		text: view.streamingReasoning,
+		prefix: "✻ ",
+		continuationPrefix: "  ",
+		dim: true,
+		maxRows: auditedReasoningRows
+	}) : view.streaming === "" ? (0, import_react.createElement)(ShimmerLine, { text: "✻ Thinking… (Ctrl/Alt+R to expand)" }) : (0, import_react.createElement)(StreamTail, {
+		text: "Thinking… (Ctrl/Alt+R to expand)",
 		prefix: "✻ ",
 		continuationPrefix: "  ",
 		dim: true,
-		maxRows: reasoningRows
-	}) : void 0, view.streaming !== "" && answerRows > 0 ? (0, import_react.createElement)(StreamTail, {
+		maxRows: auditedReasoningRows
+	}) : void 0, view.streaming !== "" && auditedAnswerRows > 0 ? (0, import_react.createElement)(StreamTail, {
 		text: view.streaming,
 		dim: false,
-		maxRows: answerRows,
+		maxRows: auditedAnswerRows,
 		prefix: "  "
-	}, busy ? (0, import_react.createElement)(Caret) : void 0) : void 0, deepDivingVisible ? (0, import_react.createElement)(DeepDivingLine, { since: view.busySince }) : void 0) : void 0, transcriptVisible ? (0, import_react.createElement)(TodoPanel, { todos: view.todos }) : void 0, transcriptVisible ? (0, import_react.createElement)(AgentsLine, { rows: agentRows }) : void 0, todosOpen && !approvalPending && !questionPending ? (0, import_react.createElement)(MemoTodoListPanel, {
+	}, busy ? (0, import_react.createElement)(Caret) : void 0) : void 0, deepDivingVisible ? (0, import_react.createElement)(DeepDivingLine, { since: view.busySince }) : void 0) : void 0, transcriptVisible ? (0, import_react.createElement)(TodoPanel, { todos: view.todos }) : void 0, transcriptVisible ? (0, import_react.createElement)(AgentsLine, {
+		rows: agentRows,
+		total: props.subagents.getTotalSeen()
+	}) : void 0, todosOpen && !approvalPending && !questionPending ? (0, import_react.createElement)(MemoTodoListPanel, {
 		todos: view.todos,
 		onClose: () => {
 			setTodosOpen(false);
@@ -33692,6 +33918,7 @@ function App(props) {
 		descriptors,
 		skills,
 		dispatch: props.dispatch,
+		applyEditorKeys: props.applyEditorKeys,
 		steer: props.steer,
 		interrupt: props.interrupt,
 		quit: props.quit,
@@ -33786,7 +34013,7 @@ function App(props) {
 		refresh: refreshScreen,
 		toggleReasoning: () => {
 			setShowReasoning((current) => !current);
-			if (!busy && !streamingActive) refreshScreen();
+			refreshScreen();
 		},
 		loadMentions: props.loadMentions,
 		inspectImages: props.inspectImages,
@@ -33992,7 +34219,9 @@ function isSlashLine(line) {
 /** Substitutable runner effects; production values write to the real terminal. */
 const internals = {
 	mount: (element) => {
-		process.stdout.write("\x1B[>4;0m\x1B[>5u\x1B[?2004h");
+		const keyboardEnhanced = shouldEnableKeyboardEnhancement();
+		const focusReporting = isVsCodeTerminalEnv();
+		process.stdout.write((keyboardEnhanced ? KEYBOARD_ENHANCE_ENABLE : "") + BRACKETED_PASTE_ENABLE + (focusReporting ? TERMINAL_FOCUS_REPORT_ENABLE : ""));
 		const instance = render(element, { exitOnCtrlC: false });
 		return {
 			rerender(element) {
@@ -34000,7 +34229,7 @@ const internals = {
 			},
 			unmount() {
 				instance.unmount();
-				process.stdout.write("\x1B[<u\x1B[>4;0m\x1B[?2004l");
+				process.stdout.write((keyboardEnhanced ? KEYBOARD_ENHANCE_DISABLE : "") + BRACKETED_PASTE_DISABLE + (focusReporting ? TERMINAL_FOCUS_REPORT_DISABLE : ""));
 			}
 		};
 	},
@@ -34153,6 +34382,202 @@ async function loadModelDirectory(ctx) {
 	};
 }
 //#endregion
+//#region src/model-capabilities.ts
+/** The settings namespace the llm-pi-ai plugin owns (identity via `settingsNamespace`). */
+const PI_AI_SETTINGS_NS = "llm-pi-ai";
+/** The effort level that means "send no reasoning parameter"; its wire value is always null. */
+const OFF_LEVEL = "off";
+/** Single-line a misbehaving error for the notice channel. */
+function singleLine$1(message) {
+	return [...message].map((ch) => {
+		const code = ch.charCodeAt(0);
+		return code < 32 || code === 127 ? " " : ch;
+	}).join("").split(" ").filter((part) => part !== "").join(" ");
+}
+/** Human text for a rejection value. */
+function messageOf$1(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/** Read the value at a path through plain objects; undefined when any segment misses. */
+function getPath$1(value, path) {
+	let current = value;
+	for (const segment of path) {
+		if (typeof current !== "object" || current === null) return void 0;
+		current = current[segment];
+	}
+	return current;
+}
+/** Whether a raw settings value is a usable `reasoningEfforts` dict (non-empty, non-false). */
+function isDeclaredEfforts(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length > 0;
+}
+/**
+* The identity level map for an advertised effort list: `off` sends no
+* parameter, every other level keeps its own name — the wire spelling
+* OpenAI-compatible relays accept as-is.
+*/
+function identityEfforts(levels) {
+	const dict = {};
+	for (const level of levels) dict[level] = level === OFF_LEVEL ? null : level;
+	return dict;
+}
+/**
+* Plan the reasoning declarations to materialize. A model entry inherits
+* when it declares nothing (`reasoningEfforts` absent — a dict or `false` is
+* an explicit choice and is never touched) and its live row advertises no
+* efforts; the donor is the first sibling settings declaration for the same
+* id, copied verbatim so dialect wire spellings survive, otherwise the first
+* other-route row advertising efforts for that id, mapped by identity.
+* Entries never lose fields and keep their key order; a provider appears in
+* the result only when at least one entry changes.
+* @param input - the live model rows and the raw pi-ai profiles from settings.
+* @returns one plan per provider with at least one inheritance.
+*/
+function planCapabilitySync(input) {
+	const declared = /* @__PURE__ */ new Map();
+	for (const [provider, profile] of input.profiles) for (const entry of profile.models) {
+		const efforts = entry.reasoningEfforts;
+		if (!isDeclaredEfforts(efforts)) continue;
+		if (!declared.has(String(entry.id))) declared.set(String(entry.id), {
+			dict: efforts,
+			provider
+		});
+	}
+	const advertised = /* @__PURE__ */ new Map();
+	for (const row of input.rows) {
+		const levels = row.reasoning?.efforts.map((effort) => effort.id) ?? [];
+		if (levels.filter((level) => level !== OFF_LEVEL).length === 0) continue;
+		if (!advertised.has(row.model)) advertised.set(row.model, {
+			levels,
+			provider: row.provider
+		});
+	}
+	const plans = [];
+	for (const [provider, profile] of input.profiles) {
+		const inherited = [];
+		const sources = [];
+		const models = profile.models.map((entry) => {
+			if (entry.reasoningEfforts !== void 0) return entry;
+			const id = String(entry.id);
+			const sibling = declared.get(id);
+			if (sibling !== void 0 && sibling.provider !== provider) {
+				inherited.push(id);
+				if (!sources.includes(`${sibling.provider}/${id}`)) sources.push(`${sibling.provider}/${id}`);
+				return {
+					...entry,
+					reasoningEfforts: sibling.dict
+				};
+			}
+			const donor = advertised.get(id);
+			if (donor !== void 0 && donor.provider !== provider) {
+				inherited.push(id);
+				if (!sources.includes(`${donor.provider}/${id}`)) sources.push(`${donor.provider}/${id}`);
+				return {
+					...entry,
+					reasoningEfforts: identityEfforts(donor.levels)
+				};
+			}
+			return entry;
+		});
+		if (inherited.length > 0) plans.push({
+			provider,
+			settingsNs: profile.settingsNs,
+			settingsPath: profile.settingsPath,
+			models,
+			sourceFingerprint: JSON.stringify(profile.models),
+			sourceRevision: profile.revision,
+			inherited,
+			sources
+		});
+	}
+	return plans;
+}
+/** Provider -> the source snapshot and document revision its last write landed against. */
+const lastApplied = /* @__PURE__ */ new Map();
+/** Fresh revision of one namespace, or undefined when it does not resolve. */
+function revisionOf(settings, ns) {
+	try {
+		for (const descriptor of settings.describe({ redactSecrets: true })) if (descriptor.ns === ns) return descriptor.revision;
+	} catch {
+		return;
+	}
+}
+/**
+* Materialize same-id reasoning declarations once per provider. Reads the
+* configurable directory, the redacted settings document, and the live model
+* rows; plans; then writes each provider's merged models array through
+* `settings.mutate` under a fresh revision (writes bump the section
+* revision, so per-plan revisions are re-read). Every failure converges to a
+* single-line notice — the caller's promise never rejects and the session
+* keeps running on the previous configuration.
+* @param ctx - context carrying the `llm` and `settings` services (optional).
+* @param notify - the app bridge's notice sink, when one is live.
+*/
+async function syncModelCapabilities(ctx, notify) {
+	try {
+		const llm = ctx.get("llm");
+		if (llm?.listConfigurableProviders === void 0) return;
+		const settings = ctx.get("settings");
+		if (settings === void 0) return;
+		let entries;
+		try {
+			entries = llm.listConfigurableProviders();
+		} catch {
+			return;
+		}
+		const routed = entries.filter((entry) => entry.settingsNs === PI_AI_SETTINGS_NS);
+		if (routed.length === 0) return;
+		let descriptors;
+		try {
+			descriptors = settings.describe({ redactSecrets: true });
+		} catch {
+			return;
+		}
+		const namespaces = new Map(descriptors.map((descriptor) => [descriptor.ns, descriptor]));
+		const profiles = /* @__PURE__ */ new Map();
+		for (const entry of routed) {
+			const namespace = namespaces.get(entry.settingsNs);
+			if (namespace === void 0) continue;
+			const profile = entry.settingsPath.length === 0 ? namespace.value : getPath$1(namespace.value, entry.settingsPath);
+			const models = Array.isArray(profile?.models) ? profile.models : void 0;
+			if (models === void 0) continue;
+			profiles.set(entry.provider, {
+				settingsNs: entry.settingsNs,
+				settingsPath: entry.settingsPath,
+				revision: namespace.revision,
+				models
+			});
+		}
+		if (profiles.size === 0) return;
+		const directory = await loadModelDirectory(ctx);
+		for (const plan of planCapabilitySync({
+			rows: directory.rows,
+			profiles
+		})) {
+			const applied = lastApplied.get(plan.provider);
+			if (applied !== void 0 && applied.fingerprint === plan.sourceFingerprint && applied.revision === plan.sourceRevision) continue;
+			const revision = revisionOf(settings, plan.settingsNs);
+			if (revision === void 0) continue;
+			try {
+				await settings.mutate(plan.settingsNs, [{
+					op: "set",
+					path: [...plan.settingsPath, "models"],
+					value: plan.models
+				}], revision);
+				lastApplied.set(plan.provider, {
+					fingerprint: plan.sourceFingerprint,
+					revision: plan.sourceRevision
+				});
+				const shown = plan.sources.slice(0, 3).join(", ");
+				const more = plan.sources.length > 3 ? `, +${plan.sources.length - 3}` : "";
+				notify?.(`inherited reasoning levels for ${plan.inherited.length} model${plan.inherited.length === 1 ? "" : "s"} on ${plan.provider} (from ${shown}${more})`, "info");
+			} catch (error) {
+				notify?.(`capability inheritance failed on ${plan.provider}: ${singleLine$1(messageOf$1(error))}`, "warning");
+			}
+		}
+	} catch {}
+}
+//#endregion
 //#region src/provider-settings.ts
 /** Human text for a rejection value (mirrors the web page's `messageOf`). */
 function messageOf(error) {
@@ -34201,11 +34626,13 @@ function configurationOf(profile) {
 		if (typeof value !== "object" || value === null) return [];
 		const entry = value;
 		if (typeof entry.id !== "string" || entry.id.trim() === "") return [];
+		const { id: _id, name: _name, contextWindow: _contextWindow, maxTokens: _maxTokens, ...extras } = entry;
 		return [{
 			id: entry.id,
 			...typeof entry.name === "string" && entry.name.trim() !== "" ? { name: entry.name } : {},
 			...typeof entry.contextWindow === "number" && Number.isFinite(entry.contextWindow) ? { contextWindow: entry.contextWindow } : {},
-			...typeof entry.maxTokens === "number" && Number.isFinite(entry.maxTokens) ? { maxTokens: entry.maxTokens } : {}
+			...typeof entry.maxTokens === "number" && Number.isFinite(entry.maxTokens) ? { maxTokens: entry.maxTokens } : {},
+			...Object.keys(extras).length > 0 ? { extras } : {}
 		}];
 	});
 	return {
@@ -34421,6 +34848,7 @@ async function saveProviderConfiguration(ctx, target, configuration) {
 		for (const [label, value] of [["context window", model.contextWindow], ["output window", model.maxTokens]]) if (value !== void 0 && (!Number.isSafeInteger(value) || value <= 0)) throw new ProviderSettingsError(`${label} must be a positive integer`);
 		return {
 			id,
+			...model.extras,
 			...model.name === void 0 || model.name.trim() === "" ? {} : { name: model.name.trim() },
 			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
 			...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
@@ -34504,83 +34932,6 @@ async function removeProviderSettings(ctx, target) {
 	}
 }
 //#endregion
-//#region src/mentions.ts
-/** Menu cap on file rows; the service owns ranking and default rows. */
-const MAX_FILE_ROWS = 20;
-/**
-* Create the mention API for one agent's workspace. A missing
-* `fileReferences` service (with an agent present) or `sessionReferenceResolver`
-* degrades that half to empty rows; `prepare` passes text through untouched
-* without references. An undefined agent (a bare launch before any session
-* exists) runs the official WorkspaceFileSearch over the launch cwd — the
-* same class the mounted service uses per agent — so `@` file completion
-* works from the first keystroke; session references wait for the session.
-*
-* `candidates` never reaches for `this` — the runner hands it to the input
-* editor as a detached callback, and a `this`-bound method would throw on
-* every `@` key.
-* @param ctx - context carrying the optional `fileReferences` and
-* `sessionReferenceResolver` services.
-* @param agent - the session owner; excluded from its own session candidates.
-* @param cwd - launch working directory; bounds the pre-session search.
-*/
-function createMentions(ctx, agent, cwd) {
-	const resolver = ctx.get("sessionReferenceResolver");
-	const fileReferences = ctx.get("fileReferences");
-	const sessionCapable = agent !== void 0 && resolver !== void 0;
-	let preSessionSearch;
-	const preSessionFiles = (query, signal) => {
-		preSessionSearch ??= new WorkspaceFileSearch(cwd, {
-			maxResults: DEFAULT_FILE_SEARCH_MAX_RESULTS,
-			maxEntries: DEFAULT_FILE_SEARCH_MAX_ENTRIES,
-			excludedDirectories: [...DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES]
-		});
-		return preSessionSearch.list(query, signal ?? new AbortController().signal);
-	};
-	return {
-		async candidates(query, signal) {
-			const needle = query.trim();
-			const [files, sessions] = await Promise.all([agent !== void 0 && fileReferences !== void 0 ? fileReferences.list(agent, needle, signal ?? new AbortController().signal).catch(() => []) : agent === void 0 ? preSessionFiles(needle, signal).catch(() => []) : Promise.resolve([]), sessionCapable && needle !== "" && agent !== void 0 ? resolver.listCandidates(agent, needle, 10, signal).catch(() => []) : Promise.resolve([])]);
-			const fileRows = files.slice(0, MAX_FILE_ROWS).map((candidate) => ({
-				label: candidate.path,
-				description: candidate.kind === "directory" ? "Folder" : "File",
-				kind: candidate.kind,
-				...candidate.kind === "file" ? { path: isAbsolute(candidate.path) ? candidate.path : resolve(cwd, candidate.path) } : {}
-			}));
-			const sessionRows = sessions.map((candidate) => ({
-				label: formatSessionReferenceMention(candidate),
-				description: `Session · ${candidate.cwd ?? "(no cwd)"}`,
-				kind: "session"
-			}));
-			return [...fileRows, ...sessionRows];
-		},
-		parse(text) {
-			return parseSessionReferenceText(text);
-		},
-		async prepare(parsed, signal) {
-			if (parsed.references.length === 0 || resolver === void 0 || agent === void 0) return {
-				text: parsed.text,
-				references: parsed.references
-			};
-			const prepared = await resolver.prepare(agent, [{
-				type: "text",
-				text: parsed.text
-			}], parsed.references, signal);
-			return {
-				text: prepared.content.filter((block) => block.type === "text").map((block) => block.text).join(""),
-				references: parsed.references,
-				additionalContext: prepared.additionalContext
-			};
-		},
-		sessionMention(candidate) {
-			return formatSessionReferenceMention({
-				sessionId: candidate.sessionId,
-				label: candidate.label
-			});
-		}
-	};
-}
-//#endregion
 //#region src/questions.ts
 const ABORT_ERROR = new UserQuestionError("ask_user_question was interrupted before the user answered", "ASK_ABORTED");
 /**
@@ -34681,7 +35032,10 @@ const NOTIFY_FRAME_MS$1 = 16;
 * @returns the store the runner feeds and the renderer subscribes to.
 */
 function createTranscriptStore(replay) {
-	let view = replay === void 0 ? createTranscriptView() : projectEvents(replay);
+	let acc = createReplayAccumulator();
+	for (const event of replay ?? []) replayProjectEvent(acc, event);
+	let view = snapshotReplayView(acc);
+	let dirty = false;
 	const listeners = /* @__PURE__ */ new Set();
 	let scheduled = false;
 	let lastNotifyAt = 0;
@@ -34698,7 +35052,13 @@ function createTranscriptStore(replay) {
 		else setTimeout(dispatch, wait);
 	};
 	return {
-		getView: () => view,
+		getView: () => {
+			if (dirty) {
+				view = snapshotReplayView(acc);
+				dirty = false;
+			}
+			return view;
+		},
 		subscribe(listener) {
 			listeners.add(listener);
 			return () => {
@@ -34706,13 +35066,13 @@ function createTranscriptStore(replay) {
 			};
 		},
 		apply(event) {
-			const next = projectEvent(view, event);
-			if (next === view) return;
-			view = next;
+			if (!replayProjectEvent(acc, event)) return;
+			dirty = true;
 			notify();
 		},
 		reset() {
-			view = createTranscriptView();
+			acc = createReplayAccumulator();
+			dirty = true;
 			notify();
 		}
 	};
@@ -34830,6 +35190,7 @@ function foldSubagentRow(previous, sessionId, event) {
 */
 function createSubagentFeed() {
 	let rows = Object.freeze([]);
+	const seen = /* @__PURE__ */ new Set();
 	const listeners = /* @__PURE__ */ new Set();
 	let scheduled = false;
 	let lastNotifyAt = 0;
@@ -34850,12 +35211,30 @@ function createSubagentFeed() {
 			const index = rows.findIndex((row) => row.id === sessionId);
 			const previous = index === -1 ? void 0 : rows[index];
 			const next = foldSubagentRow(previous, sessionId, event);
-			if (next === previous) return;
-			if (index === -1 && rows.length >= 8) return;
-			rows = Object.freeze(index === -1 ? [...rows, next] : rows.map((row, at) => at === index ? next : row));
+			if (index !== -1) {
+				if (next === previous) return;
+				rows = Object.freeze(rows.map((row, at) => at === index ? next : row));
+				notify();
+				return;
+			}
+			const counted = !seen.has(sessionId);
+			if (counted) seen.add(sessionId);
+			if (rows.length >= 8) {
+				const evict = rows.findIndex((row) => row.state === "done");
+				if (evict === -1) {
+					if (counted) notify();
+					return;
+				}
+				rows = Object.freeze([
+					...rows.slice(0, evict),
+					next,
+					...rows.slice(evict + 1)
+				]);
+			} else rows = Object.freeze([...rows, next]);
 			notify();
 		},
 		reset() {
+			seen.clear();
 			if (rows.length === 0) return;
 			rows = Object.freeze([]);
 			notify();
@@ -34868,6 +35247,9 @@ function createSubagentFeed() {
 		},
 		getSnapshot() {
 			return rows;
+		},
+		getTotalSeen() {
+			return seen.size;
 		}
 	};
 }
@@ -35057,6 +35439,312 @@ function latestAssistantText(view) {
 	}
 }
 //#endregion
+//#region src/editor-keys.ts
+/**
+* VS Code-family terminal keybinding repair. VS Code hands Ctrl+R to the
+* workbench (Open Recent) even while an integrated terminal owns focus, so
+* the reasoning-fold key never reaches the TUI. Workspace-scoped keybindings
+* do not exist, so the fix is one user-level keybindings.json rule that
+* forwards the raw Ctrl byte via sendSequence under terminalFocus. This
+* module detects the hosting editor variant, resolves its user
+* keybindings.json, and merges the rule idempotently; pure merge/detect
+* helpers are separated from the fs orchestration so both stay testable.
+* @module @deepseek-ai/dsh-code/editor-keys
+*/
+/** Install directory names per family ('vscode' covers stable and Insiders). */
+const FAMILY_DIRS = {
+	vscode: ["Code", "Code - Insiders"],
+	cursor: ["Cursor"],
+	vscodium: ["VSCodium"],
+	windsurf: ["Windsurf"]
+};
+/**
+* Detect the editor hosting this integrated terminal.
+* @param env - process environment (TERM_PROGRAM decides; case/whitespace tolerant).
+* @returns the family, or undefined outside VS Code-family terminals.
+*/
+function detectEditorTerminalFamily(env = process.env) {
+	const program = env.TERM_PROGRAM?.trim().toLowerCase();
+	if (program === "vscode" || program === "cursor" || program === "vscodium" || program === "windsurf") return program;
+}
+/**
+* Whether the pty is hosted away from the editor UI (ssh/container/tunnel).
+* Keybindings live on the client machine, so a remote session must never
+* write them server-side.
+*/
+function isRemoteTerminalEnv(env = process.env) {
+	return (env.VSCODE_IPC_HOOK_CLI ?? "").trim() !== "";
+}
+/**
+* Resolve the user keybindings.json candidates for one family, most likely
+* install first. Only paths that exist on disk are repaired.
+*/
+function editorKeybindingCandidates(family, context) {
+	return FAMILY_DIRS[family].map((dir) => {
+		if (context.platform === "win32") return join(context.appdata ?? join(context.homedir, "AppData", "Roaming"), dir, "User", "keybindings.json");
+		if (context.platform === "darwin") return join(context.homedir, "Library", "Application Support", dir, "User", "keybindings.json");
+		return join(context.homedir, ".config", dir, "User", "keybindings.json");
+	});
+}
+/** The one workbench rule that hands Ctrl+R to the focused terminal. */
+const CTRL_R_PASSTHROUGH_RULE = {
+	key: "ctrl+r",
+	command: "workbench.action.terminal.sendSequence",
+	args: { text: "" },
+	when: "terminalFocus"
+};
+/** Serialized rule block (4-space indent, the editors' default style). */
+const RULE_BLOCK = [
+	"    {",
+	"        \"key\": \"ctrl+r\",",
+	"        \"command\": \"workbench.action.terminal.sendSequence\",",
+	"        \"args\": { \"text\": \"\\u0012\" },",
+	"        \"when\": \"terminalFocus\"",
+	"    }"
+].join("\n");
+/** Fresh-file template carrying the editors' standard header comment. */
+const KEYBINDINGS_TEMPLATE = "// Place your key bindings in this file to override the defaults\n[\n" + RULE_BLOCK + "\n]\n";
+/** Whether one parsed keybindings entry already forwards Ctrl+R to the terminal. */
+function isCtrlRPassthroughEntry(entry) {
+	if (typeof entry !== "object" || entry === null) return false;
+	const record = entry;
+	if (record.command !== CTRL_R_PASSTHROUGH_RULE.command) return false;
+	if (typeof record.key !== "string" || record.key.trim().toLowerCase() !== CTRL_R_PASSTHROUGH_RULE.key) return false;
+	const args = record.args;
+	if (typeof args !== "object" || args === null) return false;
+	const text = args.text;
+	if (typeof text !== "string" || !text.includes("")) return false;
+	return typeof record.when === "string" && /\bterminalFocus\b/u.test(record.when);
+}
+/**
+* Remove // and block comments from one JSONC document. Double-quoted strings
+* survive untouched, so comment markers inside string values are preserved.
+*/
+function stripJsoncComments(text) {
+	let out = "";
+	let index = 0;
+	let inString = false;
+	while (index < text.length) {
+		const char = text[index];
+		if (inString) {
+			out += char;
+			if (char === "\\" && index + 1 < text.length) {
+				out += text[index + 1];
+				index += 2;
+				continue;
+			}
+			if (char === "\"") inString = false;
+			index += 1;
+			continue;
+		}
+		if (char === "\"") {
+			inString = true;
+			out += char;
+			index += 1;
+			continue;
+		}
+		if (char === "/" && text[index + 1] === "/") {
+			while (index < text.length && text[index] !== "\n") index += 1;
+			continue;
+		}
+		if (char === "/" && text[index + 1] === "*") {
+			index += 2;
+			while (index < text.length && !(text[index] === "*" && text[index + 1] === "/")) {
+				if (text[index] === "\n") out += "\n";
+				index += 1;
+			}
+			index += 2;
+			continue;
+		}
+		out += char;
+		index += 1;
+	}
+	return out;
+}
+/** Drop commas directly before a closing bracket (string-aware). */
+function removeTrailingCommas(text) {
+	let out = "";
+	let index = 0;
+	let inString = false;
+	while (index < text.length) {
+		const char = text[index];
+		if (inString) {
+			out += char;
+			if (char === "\\" && index + 1 < text.length) {
+				out += text[index + 1];
+				index += 2;
+				continue;
+			}
+			if (char === "\"") inString = false;
+			index += 1;
+			continue;
+		}
+		if (char === "\"") {
+			inString = true;
+			out += char;
+			index += 1;
+			continue;
+		}
+		if (char === ",") {
+			let peek = index + 1;
+			while (peek < text.length && (text[peek] === " " || text[peek] === "	" || text[peek] === "\n" || text[peek] === "\r")) peek += 1;
+			const next = text[peek];
+			if (next === "}" || next === "]") {
+				index += 1;
+				continue;
+			}
+		}
+		out += char;
+		index += 1;
+	}
+	return out;
+}
+/** Parse one JSONC document; trailing commas are tolerated. */
+function parseJsonc(text) {
+	return JSON.parse(removeTrailingCommas(stripJsoncComments(text)));
+}
+/** Raw index of the top-level rule array's opening bracket, or -1 when absent. */
+function rawOpenBracketIndex(text) {
+	let index = 0;
+	let inString = false;
+	while (index < text.length) {
+		const char = text[index];
+		if (inString) {
+			if (char === "\\") {
+				index += 2;
+				continue;
+			}
+			if (char === "\"") inString = false;
+			index += 1;
+			continue;
+		}
+		if (char === "\"") {
+			inString = true;
+			index += 1;
+			continue;
+		}
+		if (char === "/" && text[index + 1] === "/") {
+			while (index < text.length && text[index] !== "\n") index += 1;
+			continue;
+		}
+		if (char === "/" && text[index + 1] === "*") {
+			index += 2;
+			while (index < text.length && !(text[index] === "*" && text[index + 1] === "/")) index += 1;
+			index += 2;
+			continue;
+		}
+		if (char === "[") return index;
+		index += 1;
+	}
+	return -1;
+}
+/**
+* Merge the Ctrl+R passthrough into one keybindings.json document. The raw
+* text is preserved verbatim (comments included); the rule is inserted right
+* after the array opener so it cannot be shadowed by later conflicting user
+* rules. Missing files resolve to a fresh template.
+* @throws when the document does not carry a rule array.
+*/
+function mergeCtrlRPassthrough(raw) {
+	if (raw === void 0) return {
+		status: "created",
+		text: KEYBINDINGS_TEMPLATE
+	};
+	const parsed = parseJsonc(raw);
+	if (!Array.isArray(parsed)) throw new Error("keybindings.json does not contain a rule array");
+	if (parsed.some(isCtrlRPassthroughEntry)) return { status: "present" };
+	const open = rawOpenBracketIndex(raw);
+	if (open === -1) throw new Error("keybindings.json does not contain a rule array");
+	const insert = parsed.length > 0 ? "\n" + RULE_BLOCK + "," : "\n" + RULE_BLOCK;
+	return {
+		status: "updated",
+		text: raw.slice(0, open + 1) + insert + raw.slice(open + 1)
+	};
+}
+/** Parse one flag file snapshot; missing or corrupt content degrades to unshown. */
+function parseEditorKeysFlag(raw) {
+	if (raw === void 0) return {};
+	try {
+		const parsed = JSON.parse(raw);
+		if (typeof parsed !== "object" || parsed === null) return {};
+		const shown = parsed.hintShownAt;
+		return typeof shown === "string" ? { hintShownAt: shown } : {};
+	} catch {
+		return {};
+	}
+}
+/** Persist the shown marker; best-effort, the hint is cosmetic and never a gate. */
+async function markEditorKeysHintShown(path) {
+	await mkdir(dirname(path), { recursive: true });
+	await writeFile(path, JSON.stringify({ hintShownAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2) + "\n", "utf8");
+}
+/** Read one file if it exists; undefined otherwise (ENOENT and unreadable both). */
+async function readIfPresent(path) {
+	try {
+		return await readFile(path, "utf8");
+	} catch {
+		return;
+	}
+}
+/**
+* Apply the Ctrl+R passthrough to every local keybindings.json of the hosting
+* editor and mark the startup hint shown. Existing files get a .dsh-bak
+* backup before the first write.
+* @returns a one-line user-facing summary.
+* @throws with an actionable message when the environment cannot be repaired.
+*/
+async function applyCtrlRPassthrough({ env, paths, flagPath }) {
+	const family = detectEditorTerminalFamily(env);
+	if (family === void 0) throw new Error("not a VS Code-family terminal (TERM_PROGRAM=" + (env.TERM_PROGRAM?.trim() || "unset") + "); add the ctrl+r rule to keybindings.json manually");
+	if (isRemoteTerminalEnv(env)) throw new Error("remote terminal detected; apply the keybindings rule on the local machine instead");
+	const candidates = editorKeybindingCandidates(family, paths);
+	const targets = [];
+	for (const candidate of candidates) if (await readIfPresent(candidate) !== void 0) targets.push(candidate);
+	if (targets.length === 0) targets.push(candidates[0]);
+	const updated = [];
+	const present = [];
+	for (const target of targets) {
+		const raw = await readIfPresent(target);
+		const merge = mergeCtrlRPassthrough(raw);
+		if (merge.status === "present") {
+			present.push(target);
+			continue;
+		}
+		await mkdir(dirname(target), { recursive: true });
+		if (raw !== void 0) await writeFile(target + ".dsh-bak", raw, "utf8");
+		await writeFile(target, merge.text, "utf8");
+		updated.push(target);
+	}
+	await markEditorKeysHintShown(flagPath).catch(() => {});
+	const label = (target) => basename(dirname(dirname(target)));
+	if (updated.length === 0) return "ctrl+r passthrough already configured in " + present.map(label).join(", ");
+	return "ctrl+r passthrough written to " + updated.map(label).join(", ") + " — effective immediately";
+}
+/**
+* Resolve the one-shot startup hint for VS Code-family terminals. Fires at
+* most once per install (flag file), never when the passthrough rule is
+* already present, and never in remote ptys where the repair cannot run.
+* @returns the hint line, or undefined to stay silent.
+*/
+async function resolveEditorKeysStartupHint({ env, paths, flagPath }) {
+	if (parseEditorKeysFlag(await readIfPresent(flagPath)).hintShownAt !== void 0) return void 0;
+	const family = detectEditorTerminalFamily(env);
+	if (family === void 0 || isRemoteTerminalEnv(env)) return void 0;
+	for (const candidate of editorKeybindingCandidates(family, paths)) {
+		const raw = await readIfPresent(candidate);
+		if (raw === void 0) continue;
+		try {
+			const parsed = parseJsonc(raw);
+			if (Array.isArray(parsed) && parsed.some(isCtrlRPassthroughEntry)) {
+				await markEditorKeysHintShown(flagPath).catch(() => {});
+				return;
+			}
+		} catch {}
+	}
+	await markEditorKeysHintShown(flagPath).catch(() => {});
+	return "run /vscode-keys to pass ctrl+r through this editor (alt+r works meanwhile)";
+}
+//#endregion
 //#region src/fork.ts
 /** Select a completed turn and trailing between-turn metadata. */
 function selectForkSeed(events, atSeq) {
@@ -35123,13 +35811,14 @@ function parseGitDiffSpec(argument) {
 		]
 	};
 }
-function executeGit(cwd, args) {
+function executeGit(cwd, args, signal) {
 	return new Promise((resolve, reject) => {
 		execFile("git", [...args], {
 			cwd,
 			encoding: "utf8",
 			maxBuffer: 16777216,
-			windowsHide: true
+			windowsHide: true,
+			signal
 		}, (error, stdout, stderr) => {
 			if (error !== null) {
 				reject(new Error(stderr.trim() || error.message));
@@ -35139,11 +35828,15 @@ function executeGit(cwd, args) {
 		});
 	});
 }
-/** Load one complete textual diff without invoking external diff drivers. */
-async function loadGitDiff(cwd, argument) {
+/**
+* Load one complete textual diff without invoking external diff drivers.
+* @param signal - aborted by the caller on session switches/quit, killing the
+* git subprocess instead of letting a stale repository's diff land later.
+*/
+async function loadGitDiff(cwd, argument, signal) {
 	const spec = parseGitDiffSpec(argument);
 	try {
-		const text = await executeGit(cwd, spec.args);
+		const text = await executeGit(cwd, spec.args, signal);
 		return {
 			title: `git diff - ${spec.label}`,
 			files: parseGitDiffFiles(text)
@@ -35157,7 +35850,7 @@ async function loadGitDiff(cwd, argument) {
 				"--no-ext-diff",
 				"--unified=3",
 				"--"
-			]))
+			], signal))
 		};
 	}
 }
@@ -35325,6 +36018,48 @@ function listPluginRows(ctx) {
 	return rows;
 }
 //#endregion
+//#region src/settings-file.ts
+/**
+* Serialized, crash-atomic persistence for the small user-level JSON files
+* under the DSH home (statusline.json, theme.json). Two guarantees the bare
+* floating `writeFile` path could not give:
+*
+* 1. Every save is appended to ONE chain, so rapid consecutive edits land
+*    in submission order and the last snapshot is the one on disk (parallel
+*    floating writes let an older snapshot finish last and win).
+* 2. Each write goes to a sibling temp file first and is renamed into
+*    place, so a crash mid-write can never leave a half-written JSON
+*    document behind.
+*
+* The chain itself never rejects: a failed write is reported to that
+* save's caller while later saves keep their turn.
+*
+* @module @deepseek-ai/dsh-code/settings-file
+*/
+/**
+* Create the shared settings-write chain. One instance per process keeps
+* every user-level JSON file mutually serialized.
+* @returns the persistence handle.
+*/
+function createUserSettingsPersistence() {
+	let chain = Promise.resolve();
+	return {
+		save(path, text) {
+			const write = chain.then(async () => {
+				await mkdir(dirname(path), { recursive: true });
+				const temp = `${path}.tmp`;
+				await writeFile(temp, text, "utf8");
+				await rename(temp, path);
+			});
+			chain = write.catch(() => {});
+			return write;
+		},
+		flush() {
+			return chain;
+		}
+	};
+}
+//#endregion
 //#region src/index.ts
 /**
 * @deepseek-ai/dsh-code — the interactive terminal driver. The bundle patch
@@ -35648,6 +36383,20 @@ async function run(ctx, startup, io) {
 	});
 	const questions = mountQuestionProvider(ctx);
 	const bridge = { notify: () => {} };
+	const capabilitySyncDebounceMs = 400;
+	const runCapabilitySync = () => {
+		syncModelCapabilities(ctx, bridge.notify);
+	};
+	let capabilitySyncTimer;
+	const scheduleCapabilitySync = () => {
+		if (capabilitySyncTimer !== void 0) clearTimeout(capabilitySyncTimer);
+		capabilitySyncTimer = setTimeout(() => {
+			capabilitySyncTimer = void 0;
+			runCapabilitySync();
+		}, capabilitySyncDebounceMs);
+	};
+	const offCapabilitySync = [ctx.on("settings/document-updated", scheduleCapabilitySync), ctx.on("llm/adapters-updated", scheduleCapabilitySync)];
+	scheduleCapabilitySync();
 	const statuslinePath = join(homedir(), ".dsh", "dsh-code", "statusline.json");
 	let statuslineWarning;
 	let statuslineItems = [];
@@ -35657,12 +36406,23 @@ async function run(ctx, startup, io) {
 		statuslineItems = parseStatuslineItems(void 0);
 		if (error.code !== "ENOENT") statuslineWarning = error instanceof Error ? error.message : String(error);
 	}
+	const settingsPersistence = createUserSettingsPersistence();
 	const saveStatusline = (items) => {
 		statuslineItems = [...items];
-		mkdir(dirname(statuslinePath), { recursive: true }).then(() => writeFile(statuslinePath, JSON.stringify({ items }, null, 2) + "\n", "utf8")).catch((writeError) => {
+		settingsPersistence.save(statuslinePath, JSON.stringify({ items }, null, 2) + "\n").catch((writeError) => {
 			bridge.notify("statusline save failed: " + (writeError instanceof Error ? writeError.message : String(writeError)), "error");
 		});
 	};
+	const editorKeysEnv = {
+		env: process.env,
+		paths: {
+			homedir: homedir(),
+			appdata: process.env.APPDATA,
+			platform: process.platform
+		},
+		flagPath: join(homedir(), ".dsh", "dsh-code", "editor-keys.json")
+	};
+	const applyEditorKeys = () => applyCtrlRPassthrough(editorKeysEnv);
 	const themePath = join(homedir(), ".dsh", "dsh-code", "theme.json");
 	let themeWarning;
 	if (startup.theme === void 0) try {
@@ -35673,7 +36433,7 @@ async function run(ctx, startup, io) {
 	else setTheme(startup.theme);
 	const saveTheme = (name) => {
 		setTheme(name);
-		mkdir(dirname(themePath), { recursive: true }).then(() => writeFile(themePath, JSON.stringify({ theme: name }, null, 2) + "\n", "utf8")).catch((writeError) => {
+		settingsPersistence.save(themePath, JSON.stringify({ theme: name }, null, 2) + "\n").catch((writeError) => {
 			bridge.notify("theme save failed: " + (writeError instanceof Error ? writeError.message : String(writeError)), "error");
 		});
 	};
@@ -35712,6 +36472,8 @@ async function run(ctx, startup, io) {
 		quitAbort.abort();
 		epoch += 1;
 		off();
+		for (const dispose of offCapabilitySync) dispose();
+		if (capabilitySyncTimer !== void 0) clearTimeout(capabilitySyncTimer);
 		mountRef.current?.unmount();
 		const currentSession = session;
 		const currentActive = active;
@@ -35735,6 +36497,10 @@ async function run(ctx, startup, io) {
 			{
 				name: "history",
 				run: () => historyWriteChain
+			},
+			{
+				name: "settings",
+				run: () => settingsPersistence.flush()
 			}
 		], io.exit, report);
 	};
@@ -36054,10 +36820,21 @@ async function run(ctx, startup, io) {
 	* Delete one session subtree (/delete, codex semantics: subagent threads go
 	* with their root). The kernel persistence seam has NO deletion API by
 	* design — logs accumulate "until removed externally" — so this is the
-	* controlled external removal: guards (live/current refusal, subtree
-	* collection, and the JSONL layout check `encodeSegment(id)/session.jsonl`)
-	* run before any filesystem touch, and only the backend-located artifacts
-	* are removed. Backends without a locatable artifact (SQLite) are refused.
+	* controlled external removal, in three phases with a hard boundary
+	* between planning and touching the filesystem:
+	*
+	* 1. `planSessionDeletion` collects the subtree and refuses when the root
+	*    or ANY member is live (a live child would outlive its deleted
+	*    parent), ordering the plan children-first.
+	* 2. Every plan node must locate to a guarded artifact directory
+	*    (`encodeSegment(id)`/`session.jsonl` layout). Backends without a
+	*    locatable artifact (SQLite) refuse the WHOLE deletion here — no
+	*    file has been touched yet, so a backend or layout surprise can
+	*    never strand a half-deleted subtree.
+	* 3. Artifacts are removed children-first: only an I/O error mid-delete
+	*    can stop it short (reported with removed/total counts), leaving the
+	*    shallowest lineage intact.
+	*
 	* @param id - the root session id to delete.
 	* @returns the outcome line for the panel/notice.
 	*/
@@ -36065,19 +36842,22 @@ async function run(ctx, startup, io) {
 		if (sessionQuery === void 0) return "session query is unavailable in this profile";
 		if (session !== void 0 && session.id === id) return "cannot delete the session you are using — switch or /new first";
 		const records = await sessionQuery.listSessions();
-		const target = records.find((record) => record.header.id === id);
-		if (target === void 0) return `no persisted session matches "${id}"`;
-		if (target.live) return "cannot delete a live session — it is open in this or another process";
-		const doomed = collectDeletionSubtree(records, id);
+		const plan = planSessionDeletion(records, id);
+		if (!plan.ok) return plan.reason;
 		const byId = new Map(records.map((record) => [record.header.id, record]));
-		let removed = 0;
-		for (const candidate of doomed) {
-			const record = byId.get(candidate);
-			if (record === void 0 || record.live) continue;
+		const dirs = /* @__PURE__ */ new Map();
+		for (const node of plan.nodes) {
+			const record = byId.get(node.id);
+			if (record === void 0) return `no persisted session matches "${node.id}"`;
 			const location = persistence?.locate(record.header);
-			if (location === void 0) return `session backend exposes no deletable artifact for ${candidate.slice(-12)} (deletion is unsupported on this backend)`;
-			const dir = sessionArtifactDirectory(location.path, candidate);
+			if (location === void 0) return `session backend exposes no deletable artifact for ${node.id.slice(-12)} (deletion is unsupported on this backend)`;
+			const dir = sessionArtifactDirectory(location.path, node.id);
 			if (dir === void 0) return `refusing to delete: unexpected artifact layout at ${location.path}`;
+			dirs.set(node.id, dir);
+		}
+		let removed = 0;
+		for (const node of plan.nodes) {
+			const dir = dirs.get(node.id);
 			try {
 				for (const name of SESSION_ARTIFACT_NAMES) await rm(join(dir, name), { force: true });
 				await rm(dir, {
@@ -36086,7 +36866,7 @@ async function run(ctx, startup, io) {
 				}).catch(() => {});
 				removed += 1;
 			} catch (error) {
-				return `delete failed for ${candidate.slice(-12)}: ${error instanceof Error ? error.message : String(error)}`;
+				return `delete failed for ${node.id.slice(-12)} after ${removed} of ${plan.nodes.length}: ${error instanceof Error ? error.message : String(error)}`;
 			}
 		}
 		return `deleted ${removed} session${removed === 1 ? "" : "s"}`;
@@ -36111,13 +36891,20 @@ async function run(ctx, startup, io) {
 			pendingModeWork = choice.then(() => {}, () => {});
 			return choice;
 		}
-		const preset = await selectPreset(presets, currentAgent, id);
-		if (active === void 0) throw new Error("active Agent has no session state");
-		active.mode = preset.id;
-		commands.setAgent(currentAgent);
-		skills.setAgent(currentAgent);
-		renderCurrent();
-		return preset.id;
+		const currentActive = active;
+		const atEpoch = epoch;
+		let selected;
+		await compose(async () => {
+			const preset = await selectPreset(presets, currentAgent, id);
+			if (epoch !== atEpoch || agent !== currentAgent || active !== currentActive) throw new Error("session changed while switching mode — nothing applied; retry in the active session");
+			if (active === void 0) throw new Error("active Agent has no session state");
+			active.mode = preset.id;
+			commands.setAgent(currentAgent);
+			skills.setAgent(currentAgent);
+			selected = preset.id;
+			renderCurrent();
+		});
+		return selected;
 	};
 	const activate = (nextTarget) => {
 		if (quitting) return Promise.resolve();
@@ -36231,7 +37018,21 @@ async function run(ctx, startup, io) {
 		});
 	};
 	const reviewChanges = (argument) => {
-		loadGitDiff(session?.header.cwd ?? cwd, argument).then(({ title, files }) => {
+		const currentAgent = agent;
+		if (currentAgent === void 0) {
+			bridge.notify("no session yet - submit a message to start", "warning");
+			return;
+		}
+		const atEpoch = epoch;
+		const reviewCwd = session?.header.cwd ?? cwd;
+		const controller = new AbortController();
+		pendingControllers.add(controller);
+		const finish = () => {
+			pendingControllers.delete(controller);
+		};
+		loadGitDiff(reviewCwd, argument, controller.signal).then(({ title, files }) => {
+			finish();
+			if (controller.signal.aborted || epoch !== atEpoch || agent !== currentAgent) return;
 			try {
 				setPermissionAction("read-only");
 			} catch (error) {
@@ -36241,6 +37042,8 @@ async function run(ctx, startup, io) {
 			send(buildReviewPrompt(files.flatMap((file) => file.lines).join("\n"), title), "followup");
 			bridge.notify("review started under read-only permissions");
 		}, (error) => {
+			finish();
+			if (controller.signal.aborted || epoch !== atEpoch) return;
 			bridge.notify(`review failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 		});
 	};
@@ -36331,7 +37134,7 @@ async function run(ctx, startup, io) {
 			copyTextValue: copyText,
 			loadMentions: (query, signal) => mentions.candidates(query, signal),
 			inspectImages: (paths) => inspectImagePaths(paths, ctx.get("attachments"), session?.header.cwd ?? cwd),
-			prepareImages: (paths) => saveImagePaths(paths, ctx.get("attachments")),
+			prepareImages: (paths, signal) => saveImagePaths(paths, ctx.get("attachments"), signal),
 			cyclePermission: cyclePermission$1,
 			setPermission: setPermissionAction,
 			selectModel,
@@ -36368,6 +37171,7 @@ async function run(ctx, startup, io) {
 			loadJobs: () => listJobs(ctx, active?.agent),
 			statusline: statuslineItems,
 			saveStatusline,
+			applyEditorKeys,
 			saveTheme,
 			history: inputHistory,
 			recordHistory,
@@ -36400,6 +37204,12 @@ async function run(ctx, startup, io) {
 	if (themeWarning !== void 0) setTimeout(() => {
 		bridge.notify("theme config unreadable, using dark: " + themeWarning, "warning");
 	}, 50);
+	resolveEditorKeysStartupHint(editorKeysEnv).then((hint) => {
+		if (hint === void 0) return;
+		setTimeout(() => {
+			bridge.notify(hint);
+		}, 50);
+	}, () => {});
 }
 /**
 * Mount the interactive terminal driver.