@phenx-inc/ctlsurf 0.16.0 → 0.16.1

package/out/renderer/assets/{cssMode-Xx1-SozN.js → cssMode-DwHD6JSn.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages } from "./index-D65QIRev.js";
-import { C as CompletionAdapter, H as HoverAdapter, D as DocumentHighlightAdapter, a as DefinitionAdapter, R as ReferenceAdapter, b as DocumentSymbolAdapter, c as RenameAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, e as DiagnosticsAdapter, S as SelectionRangeAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider } from "./lspLanguageFeatures-IDD0-KWa.js";
-import { h, i, j, t, k } from "./lspLanguageFeatures-IDD0-KWa.js";
+import { c as createWebWorker, l as languages } from "./index-HoDaBul3.js";
+import { C as CompletionAdapter, H as HoverAdapter, D as DocumentHighlightAdapter, a as DefinitionAdapter, R as ReferenceAdapter, b as DocumentSymbolAdapter, c as RenameAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, e as DiagnosticsAdapter, S as SelectionRangeAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider } from "./lspLanguageFeatures-Bb27EY8c.js";
+import { h, i, j, t, k } from "./lspLanguageFeatures-Bb27EY8c.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {

package/out/renderer/assets/{freemarker2-DM49yPw1.js → freemarker2-Na9-bXYw.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const EMPTY_ELEMENTS = [
   "assign",
   "flush",

package/out/renderer/assets/{handlebars-DJJBblpV.js → handlebars-D7gzKLS8.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{html-DnMnJOxw.js → html-DDK7xN27.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{htmlMode-BG5u2CSH.js → htmlMode-BfbLv-NB.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages } from "./index-D65QIRev.js";
-import { H as HoverAdapter, D as DocumentHighlightAdapter, h as DocumentLinkAdapter, F as FoldingRangeAdapter, b as DocumentSymbolAdapter, S as SelectionRangeAdapter, c as RenameAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter } from "./lspLanguageFeatures-IDD0-KWa.js";
-import { a, e, d, R, i, j, t, k } from "./lspLanguageFeatures-IDD0-KWa.js";
+import { c as createWebWorker, l as languages } from "./index-HoDaBul3.js";
+import { H as HoverAdapter, D as DocumentHighlightAdapter, h as DocumentLinkAdapter, F as FoldingRangeAdapter, b as DocumentSymbolAdapter, S as SelectionRangeAdapter, c as RenameAdapter, f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter } from "./lspLanguageFeatures-Bb27EY8c.js";
+import { a, e, d, R, i, j, t, k } from "./lspLanguageFeatures-Bb27EY8c.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {

package/out/renderer/assets/{index-D65QIRev.js → index-HoDaBul3.js}

@@ -1,4 +1,4 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./cssMode-Xx1-SozN.js","./lspLanguageFeatures-IDD0-KWa.js","./htmlMode-BG5u2CSH.js","./jsonMode-Dmp3JJSm.js","./javascript-Dci_phmN.js","./typescript-DhTtFBLt.js"])))=>i.map(i=>d[i]);
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./cssMode-DwHD6JSn.js","./lspLanguageFeatures-Bb27EY8c.js","./htmlMode-BfbLv-NB.js","./jsonMode-BileWbig.js","./javascript-DJjWOxID.js","./typescript-r5QB4yRW.js"])))=>i.map(i=>d[i]);
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -19525,6 +19525,20 @@ function markGesture(tabId) {
   const s = _terminals.get(tabId);
   if (s) s.userScrollPending = true;
 }
+function followLatest(state) {
+  state.userScrollPending = false;
+  setPinned(state, true);
+  reassert(state);
+}
+function rememberScrollPosition(state) {
+  state.userScrollPending = false;
+  if (isAtBottom(state.terminal)) {
+    setPinned(state, true);
+  } else {
+    state.anchorLine = state.terminal.buffer.active.viewportY;
+    setPinned(state, false);
+  }
+}
 function getOrCreateTerminal(tabId, onExit) {
   const existing = _terminals.get(tabId);
   if (existing) {
@@ -19550,7 +19564,9 @@ function getOrCreateTerminal(tabId, onExit) {
     fontFamily: "'JetBrains Mono', 'Fira Code', 'Cascadia Code', 'SF Mono', monospace",
     theme: currentTheme().terminal,
     scrollback: 1e4,
-    scrollOnUserInput: true,
+    // Follow explicit keyboard/paste input below. xterm also counts mouse
+    // reports as user input, which must not pull someone out of scrollback.
+    scrollOnUserInput: false,
     allowTransparency: false
   });
   const fitAddon = new addonFitExports.FitAddon();
@@ -19612,17 +19628,10 @@ function getOrCreateTerminal(tabId, onExit) {
       reassert(state);
       return;
     }
-    state.userScrollPending = false;
-    if (isAtBottom(terminal)) {
-      setPinned(state, true);
-    } else {
-      state.anchorLine = terminal.buffer.active.viewportY;
-      setPinned(state, false);
-    }
+    rememberScrollPosition(state);
   });
+  terminal.onKey(() => followLatest(state));
   terminal.onData((data) => {
-    setPinned(state, true);
-    terminal.scrollToBottom();
     window.worker.writePty(tabId, data);
   });
   state.unsubData = window.worker.onPtyData((eventTabId, data) => {
@@ -19680,8 +19689,7 @@ function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, isActive
   const jumpToLatest = () => {
     const s = _terminals.get(tabId);
     if (!s) return;
-    setPinned(s, true);
-    s.terminal.scrollToBottom();
+    followLatest(s);
     s.terminal.focus();
   };
   const handleContextMenu = (e) => {
@@ -19761,6 +19769,22 @@ function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, isActive
     if (attached) reassert(attached);
     const onWheel = () => markGesture(tabId);
     terminal.element?.addEventListener("wheel", onWheel, { capture: true, passive: true });
+    const viewport = terminal.element?.querySelector(".xterm-viewport");
+    const onViewportScroll = () => {
+      const state = _terminals.get(tabId);
+      if (state && !state.holding && state.userScrollPending) rememberScrollPosition(state);
+    };
+    viewport?.addEventListener("scroll", onViewportScroll);
+    const onTextInput = () => {
+      const state = _terminals.get(tabId);
+      if (state) followLatest(state);
+    };
+    const onPaste = (event) => {
+      if (event.clipboardData?.getData("text/plain")) onTextInput();
+    };
+    terminal.textarea?.addEventListener("paste", onPaste, true);
+    terminal.textarea?.addEventListener("input", onTextInput, true);
+    terminal.textarea?.addEventListener("compositionend", onTextInput, true);
     let resizeTimeout;
     const handleResize = () => {
       clearTimeout(resizeTimeout);
@@ -19784,6 +19808,10 @@ function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, isActive
       window.removeEventListener("resize", handleResize);
       observer.disconnect();
       terminal.element?.removeEventListener("wheel", onWheel, true);
+      viewport?.removeEventListener("scroll", onViewportScroll);
+      terminal.textarea?.removeEventListener("paste", onPaste, true);
+      terminal.textarea?.removeEventListener("input", onTextInput, true);
+      terminal.textarea?.removeEventListener("compositionend", onTextInput, true);
     };
   }, [tabId, onExit]);
   reactExports.useEffect(() => {
@@ -208443,7 +208471,7 @@ const lessDefaults = new LanguageServiceDefaultsImpl$3(
   modeConfigurationDefault$2
 );
 function getMode$3() {
-  return __vitePreload(() => import("./cssMode-Xx1-SozN.js"), true ? __vite__mapDeps([0,1]) : void 0, import.meta.url);
+  return __vitePreload(() => import("./cssMode-DwHD6JSn.js"), true ? __vite__mapDeps([0,1]) : void 0, import.meta.url);
 }
 languages.onLanguage("less", () => {
   getMode$3().then((mode2) => mode2.setupMode(lessDefaults));
@@ -208548,7 +208576,7 @@ const razorLanguageService = registerHTMLLanguageService(
 );
 const razorDefaults = razorLanguageService.defaults;
 function getMode$2() {
-  return __vitePreload(() => import("./htmlMode-BG5u2CSH.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url);
+  return __vitePreload(() => import("./htmlMode-BfbLv-NB.js"), true ? __vite__mapDeps([2,1]) : void 0, import.meta.url);
 }
 function registerHTMLLanguageService(languageId, options = optionsDefault, modeConfiguration = getConfigurationDefault(languageId)) {
   const defaults = new LanguageServiceDefaultsImpl$2(languageId, options, modeConfiguration);
@@ -208632,7 +208660,7 @@ const jsonDefaults = new LanguageServiceDefaultsImpl$1(
 );
 const getWorker$1 = () => getMode$1().then((mode2) => mode2.getWorker());
 function getMode$1() {
-  return __vitePreload(() => import("./jsonMode-Dmp3JJSm.js"), true ? __vite__mapDeps([3,1]) : void 0, import.meta.url);
+  return __vitePreload(() => import("./jsonMode-BileWbig.js"), true ? __vite__mapDeps([3,1]) : void 0, import.meta.url);
 }
 languages.register({
   id: "json",
@@ -208878,7 +208906,7 @@ const getJavaScriptWorker = () => {
   return getMode().then((mode) => mode.getJavaScriptWorker());
 };
 function getMode() {
-  return __vitePreload(() => import("./tsMode-EXbzul3n.js"), true ? [] : void 0, import.meta.url);
+  return __vitePreload(() => import("./tsMode-sbsAvk21.js"), true ? [] : void 0, import.meta.url);
 }
 languages.onLanguage("typescript", () => {
   return getMode().then((mode) => mode.setupTypeScript(typescriptDefaults));
@@ -209073,49 +209101,49 @@ registerLanguage({
   extensions: [".ftl", ".ftlh", ".ftlx"],
   aliases: ["FreeMarker2", "Apache FreeMarker2"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationDollar);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationDollar);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-angle.interpolation-dollar",
   aliases: ["FreeMarker2 (Angle/Dollar)", "Apache FreeMarker2 (Angle/Dollar)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAngleInterpolationDollar);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAngleInterpolationDollar);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-bracket.interpolation-dollar",
   aliases: ["FreeMarker2 (Bracket/Dollar)", "Apache FreeMarker2 (Bracket/Dollar)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagBracketInterpolationDollar);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagBracketInterpolationDollar);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-angle.interpolation-bracket",
   aliases: ["FreeMarker2 (Angle/Bracket)", "Apache FreeMarker2 (Angle/Bracket)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAngleInterpolationBracket);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAngleInterpolationBracket);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-bracket.interpolation-bracket",
   aliases: ["FreeMarker2 (Bracket/Bracket)", "Apache FreeMarker2 (Bracket/Bracket)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagBracketInterpolationBracket);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagBracketInterpolationBracket);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-auto.interpolation-dollar",
   aliases: ["FreeMarker2 (Auto/Dollar)", "Apache FreeMarker2 (Auto/Dollar)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationDollar);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationDollar);
   }
 });
 registerLanguage({
   id: "freemarker2.tag-auto.interpolation-bracket",
   aliases: ["FreeMarker2 (Auto/Bracket)", "Apache FreeMarker2 (Auto/Bracket)"],
   loader: () => {
-    return __vitePreload(() => import("./freemarker2-DM49yPw1.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationBracket);
+    return __vitePreload(() => import("./freemarker2-Na9-bXYw.js"), true ? [] : void 0, import.meta.url).then((m) => m.TagAutoInterpolationBracket);
   }
 });
 registerLanguage({
@@ -209136,7 +209164,7 @@ registerLanguage({
   extensions: [".handlebars", ".hbs"],
   aliases: ["Handlebars", "handlebars", "hbs"],
   mimetypes: ["text/x-handlebars-template"],
-  loader: () => __vitePreload(() => import("./handlebars-DJJBblpV.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./handlebars-D7gzKLS8.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "hcl",
@@ -209149,7 +209177,7 @@ registerLanguage({
   extensions: [".html", ".htm", ".shtml", ".xhtml", ".mdoc", ".jsp", ".asp", ".aspx", ".jshtm"],
   aliases: ["HTML", "htm", "html", "xhtml"],
   mimetypes: ["text/html", "text/x-jshtm", "text/template", "text/ng-template"],
-  loader: () => __vitePreload(() => import("./html-DnMnJOxw.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./html-DDK7xN27.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "ini",
@@ -209172,7 +209200,7 @@ registerLanguage({
   filenames: ["jakefile"],
   aliases: ["JavaScript", "javascript", "js"],
   mimetypes: ["text/javascript"],
-  loader: () => __vitePreload(() => import("./javascript-Dci_phmN.js"), true ? __vite__mapDeps([4,5]) : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./javascript-DJjWOxID.js"), true ? __vite__mapDeps([4,5]) : void 0, import.meta.url)
 });
 registerLanguage({
   id: "julia",
@@ -209211,7 +209239,7 @@ registerLanguage({
   extensions: [".liquid", ".html.liquid"],
   aliases: ["Liquid", "liquid"],
   mimetypes: ["application/liquid"],
-  loader: () => __vitePreload(() => import("./liquid-C9KVysk1.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./liquid-DvNU_dI9.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "m3",
@@ -209229,7 +209257,7 @@ registerLanguage({
   id: "mdx",
   extensions: [".mdx"],
   aliases: ["MDX", "mdx"],
-  loader: () => __vitePreload(() => import("./mdx-ascmBFXX.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./mdx-CLkNPVgD.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "mips",
@@ -209328,7 +209356,7 @@ registerLanguage({
   extensions: [".py", ".rpy", ".pyw", ".cpy", ".gyp", ".gypi"],
   aliases: ["Python", "py"],
   firstLine: "^#!/.*\\bpython[0-9.-]*\\b",
-  loader: () => __vitePreload(() => import("./python-DcbM4Hy5.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./python-DOJdL4kC.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "qsharp",
@@ -209347,7 +209375,7 @@ registerLanguage({
   extensions: [".cshtml"],
   aliases: ["Razor", "razor"],
   mimetypes: ["text/x-cshtml"],
-  loader: () => __vitePreload(() => import("./razor-XJROxpYK.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./razor-CSr8UlJc.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "redis",
@@ -209480,7 +209508,7 @@ registerLanguage({
   aliases: ["TypeScript", "ts", "typescript"],
   mimetypes: ["text/typescript"],
   loader: () => {
-    return __vitePreload(() => import("./typescript-DhTtFBLt.js"), true ? [] : void 0, import.meta.url);
+    return __vitePreload(() => import("./typescript-r5QB4yRW.js"), true ? [] : void 0, import.meta.url);
   }
 });
 registerLanguage({
@@ -209525,14 +209553,14 @@ registerLanguage({
   firstLine: "(\\<\\?xml.*)|(\\<svg)|(\\<\\!doctype\\s+svg)",
   aliases: ["XML", "xml"],
   mimetypes: ["text/xml", "application/xml", "application/xaml+xml", "application/xml-dtd"],
-  loader: () => __vitePreload(() => import("./xml-BLfEkVl1.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./xml-CYhKh3Pi.js"), true ? [] : void 0, import.meta.url)
 });
 registerLanguage({
   id: "yaml",
   extensions: [".yaml", ".yml"],
   aliases: ["YAML", "yaml", "YML", "yml"],
   mimetypes: ["application/x-yaml", "text/x-yaml"],
-  loader: () => __vitePreload(() => import("./yaml-DpzsqvWa.js"), true ? [] : void 0, import.meta.url)
+  loader: () => __vitePreload(() => import("./yaml-B8DsoaYW.js"), true ? [] : void 0, import.meta.url)
 });
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;

package/out/renderer/assets/{javascript-Dci_phmN.js → javascript-DJjWOxID.js}

@@ -1,5 +1,5 @@
-import { conf as conf$1, language as language$1 } from "./typescript-DhTtFBLt.js";
-import "./index-D65QIRev.js";
+import { conf as conf$1, language as language$1 } from "./typescript-r5QB4yRW.js";
+import "./index-HoDaBul3.js";
 const conf = conf$1;
 const language = {
   // Set defaultToken to invalid to see what you do not tokenize yet

package/out/renderer/assets/{jsonMode-Dmp3JJSm.js → jsonMode-BileWbig.js}

@@ -1,6 +1,6 @@
-import { c as createWebWorker, l as languages, e as editor } from "./index-D65QIRev.js";
-import { f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter, H as HoverAdapter, b as DocumentSymbolAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, S as SelectionRangeAdapter, e as DiagnosticsAdapter } from "./lspLanguageFeatures-IDD0-KWa.js";
-import { a, D, h, R, c, i, j, t, k } from "./lspLanguageFeatures-IDD0-KWa.js";
+import { c as createWebWorker, l as languages, e as editor } from "./index-HoDaBul3.js";
+import { f as DocumentFormattingEditProvider, g as DocumentRangeFormattingEditProvider, C as CompletionAdapter, H as HoverAdapter, b as DocumentSymbolAdapter, d as DocumentColorAdapter, F as FoldingRangeAdapter, S as SelectionRangeAdapter, e as DiagnosticsAdapter } from "./lspLanguageFeatures-Bb27EY8c.js";
+import { a, D, h, R, c, i, j, t, k } from "./lspLanguageFeatures-Bb27EY8c.js";
 const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
 class WorkerManager {
   constructor(defaults) {

package/out/renderer/assets/{liquid-C9KVysk1.js → liquid-DvNU_dI9.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{lspLanguageFeatures-IDD0-KWa.js → lspLanguageFeatures-Bb27EY8c.js}

@@ -1,4 +1,4 @@
-import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-D65QIRev.js";
+import { R as Range$1, l as languages, e as editor, U as Uri, M as MarkerSeverity } from "./index-HoDaBul3.js";
 var DocumentUri;
 (function(DocumentUri2) {
   function is(value) {

package/out/renderer/assets/{mdx-ascmBFXX.js → mdx-CLkNPVgD.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const conf = {
   comments: {
     blockComment: ["{/*", "*/}"]

package/out/renderer/assets/{python-DcbM4Hy5.js → python-DOJdL4kC.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const conf = {
   comments: {
     lineComment: "#",

package/out/renderer/assets/{razor-XJROxpYK.js → razor-CSr8UlJc.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const EMPTY_ELEMENTS = [
   "area",
   "base",

package/out/renderer/assets/{tsMode-EXbzul3n.js → tsMode-sbsAvk21.js}

@@ -1,4 +1,4 @@
-import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-D65QIRev.js";
+import { c as createWebWorker, e as editor, U as Uri, a as MarkerTag, M as MarkerSeverity, l as languages, t as typescriptDefaults, R as Range } from "./index-HoDaBul3.js";
 class WorkerManager {
   constructor(_modeId, _defaults) {
     this._modeId = _modeId;

package/out/renderer/assets/{typescript-DhTtFBLt.js → typescript-r5QB4yRW.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const conf = {
   wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
   comments: {

package/out/renderer/assets/{xml-BLfEkVl1.js → xml-CYhKh3Pi.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const conf = {
   comments: {
     blockComment: ["<!--", "-->"]

package/out/renderer/assets/{yaml-DpzsqvWa.js → yaml-B8DsoaYW.js}

@@ -1,4 +1,4 @@
-import { l as languages } from "./index-D65QIRev.js";
+import { l as languages } from "./index-HoDaBul3.js";
 const conf = {
   comments: {
     lineComment: "#"

package/out/renderer/index.html

@@ -106,7 +106,7 @@
     :root[data-theme='catppuccin-latte'] .boot-splash-title { color: #2f3145; }
     :root[data-theme='catppuccin-latte'] .boot-splash-label { color: #7c7f93; }
   </style>
-  <script type="module" crossorigin src="./assets/index-D65QIRev.js"></script>
+  <script type="module" crossorigin src="./assets/index-HoDaBul3.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-DID1LlMU.css">
 </head>
 <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {

package/scripts/test-terminal-scroll.cjs

@@ -0,0 +1,64 @@
+// Exercise the actual React terminal panel and xterm parser in Electron.
+// Run: node_modules/.bin/electron scripts/test-terminal-scroll.cjs
+const { app, BrowserWindow } = require('electron')
+const { build } = require('esbuild')
+const fs = require('node:fs/promises')
+const os = require('node:os')
+const path = require('node:path')
+app.on('window-all-closed', () => {})
+app.on('child-process-gone', (_event, details) => console.error('Child process exited:', details))
+
+async function main() {
+  console.log('Starting terminal scroll regression checks...')
+  const temp = await fs.mkdtemp(path.join(os.tmpdir(), 'ctlsurf-scroll-'))
+  app.setPath('userData', path.join(temp, 'profile'))
+  let win
+  try {
+    await build({
+      entryPoints: [path.join(__dirname, '../repro-terminal-scroll.tsx')],
+      outfile: path.join(temp, 'test.js'),
+      bundle: true,
+      platform: 'browser',
+      jsx: 'automatic',
+      external: ['@huggingface/transformers'],
+    })
+    await fs.writeFile(path.join(temp, 'index.html'), `<!doctype html><meta charset="UTF-8">
+      <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'">
+      <link rel="stylesheet" href="test.css">
+      <style>
+        html, body, #root { margin: 0; width: 100%; height: 100%; }
+        .terminal-wrap, .terminal-container, .xterm { width: 100%; height: 100%; }
+        .terminal-wrap { position: relative; }
+        .term-jump-latest { position: absolute; bottom: 0; right: 0; }
+      </style>
+      <div id="root"></div><script src="test.js"></script>`)
+    await app.whenReady()
+    win = new BrowserWindow({
+      show: false, width: 900, height: 500,
+      webPreferences: { backgroundThrottling: false },
+    })
+    win.webContents.on('console-message', (event) => {
+      if (event.level === 'error') console.error(event.message)
+    })
+    win.webContents.on('render-process-gone', (_event, details) => console.error('Renderer exited:', details))
+    await win.loadFile(path.join(temp, 'index.html'))
+    let timeout
+    const result = await Promise.race([
+      win.webContents.executeJavaScript('window.scrollTest'),
+      new Promise((_, reject) => {
+        timeout = setTimeout(() => reject(new Error('Scroll test timed out')), 15_000)
+      }),
+    ]).finally(() => clearTimeout(timeout))
+    for (const line of result.checks) console.log(line)
+    if (result.error) throw new Error(result.error)
+    console.log('Terminal scroll regression checks passed.')
+  } finally {
+    win?.destroy()
+    await fs.rm(temp, { recursive: true, force: true, maxRetries: 5 })
+  }
+}
+
+main().then(() => app.exit(0), (err) => {
+  console.error(err)
+  app.exit(1)
+})

package/src/renderer/components/TerminalPanel.tsx

@@ -127,7 +127,7 @@ type TermState = {
   // (neither down to the bottom, nor up to the top — the old bug).
   anchorLine: number | null
   // One-shot flag set by a real user scroll gesture (wheel / scroll keys) and
-  // consumed by the very next onScroll, so a redraw firing onScroll right after
+  // consumed by the next terminal/viewport scroll, so a redraw right after
   // a gesture isn't mistaken for one. Spinner redraws (~10x/s while "thinking")
   // would otherwise be misread as user intent and re-pin to the bottom.
   userScrollPending: boolean
@@ -190,6 +190,22 @@ function markGesture(tabId: string): void {
   if (s) s.userScrollPending = true
 }
 
+function followLatest(state: TermState): void {
+  state.userScrollPending = false
+  setPinned(state, true)
+  reassert(state)
+}
+
+function rememberScrollPosition(state: TermState): void {
+  state.userScrollPending = false
+  if (isAtBottom(state.terminal)) {
+    setPinned(state, true)
+  } else {
+    state.anchorLine = state.terminal.buffer.active.viewportY
+    setPinned(state, false)
+  }
+}
+
 function getOrCreateTerminal(tabId: string, onExit: (tabId: string) => void): { terminal: Terminal; fitAddon: FitAddon } {
   const existing = _terminals.get(tabId)
   if (existing) {
@@ -216,7 +232,9 @@ function getOrCreateTerminal(tabId: string, onExit: (tabId: string) => void): {
     fontFamily: "'JetBrains Mono', 'Fira Code', 'Cascadia Code', 'SF Mono', monospace",
     theme: currentTheme().terminal,
     scrollback: 10000,
-    scrollOnUserInput: true,
+    // Follow explicit keyboard/paste input below. xterm also counts mouse
+    // reports as user input, which must not pull someone out of scrollback.
+    scrollOnUserInput: false,
     allowTransparency: false
   })
 
@@ -302,19 +320,14 @@ function getOrCreateTerminal(tabId: string, onExit: (tabId: string) => void): {
       reassert(state)
       return
     }
-    state.userScrollPending = false
-    if (isAtBottom(terminal)) {
-      setPinned(state, true)
-    } else {
-      state.anchorLine = terminal.buffer.active.viewportY
-      setPinned(state, false)
-    }
+    rememberScrollPosition(state)
   })
 
-  // Send keystrokes to pty — typing always returns to (and follows) the bottom.
+  // onData includes automatic cursor/device/color replies and focus/mouse
+  // reports, not just keystrokes. Codex's terminal queries used to re-enable
+  // follow mode here, snapping the viewport down while reading old output.
+  terminal.onKey(() => followLatest(state))
   terminal.onData((data) => {
-    setPinned(state, true)
-    terminal.scrollToBottom()
     window.worker.writePty(tabId, data)
   })
 
@@ -394,8 +407,7 @@ export function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, i
   const jumpToLatest = () => {
     const s = _terminals.get(tabId)
     if (!s) return
-    setPinned(s, true)
-    s.terminal.scrollToBottom()
+    followLatest(s)
     s.terminal.focus()
   }
 
@@ -496,15 +508,33 @@ export function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, i
     const attached = _terminals.get(tabId)
     if (attached) reassert(attached)
 
-    // Wheel over the terminal is an explicit user scroll — stamp it so onScroll
-    // treats the resulting move as intentional (not an involuntary redraw jump).
-    // Capture is important: xterm handles wheel events on a descendant and
-    // emits onScroll synchronously. A bubbling listener runs too late, causing
-    // streamed Codex output to mistake the wheel scroll for a redraw and snap
-    // the viewport straight back to the bottom.
+    // Wheel handling starts inside xterm, so record intent in capture phase.
     const onWheel = () => markGesture(tabId)
     terminal.element?.addEventListener('wheel', onWheel, { capture: true, passive: true })
 
+    // xterm 5.5 suppresses its public onScroll event for native viewport
+    // scrolling. Observe the DOM event after xterm updates buffer.viewportY,
+    // otherwise a wheel gesture never pauses follow mode before the next write.
+    const viewport = terminal.element?.querySelector('.xterm-viewport')
+    const onViewportScroll = () => {
+      const state = _terminals.get(tabId)
+      if (state && !state.holding && state.userScrollPending) rememberScrollPosition(state)
+    }
+    viewport?.addEventListener('scroll', onViewportScroll)
+
+    // Paste and IME/emoji input can bypass onKey. Capture them before xterm
+    // handles the event (paste stops propagation inside xterm).
+    const onTextInput = () => {
+      const state = _terminals.get(tabId)
+      if (state) followLatest(state)
+    }
+    const onPaste = (event: ClipboardEvent) => {
+      if (event.clipboardData?.getData('text/plain')) onTextInput()
+    }
+    terminal.textarea?.addEventListener('paste', onPaste, true)
+    terminal.textarea?.addEventListener('input', onTextInput, true)
+    terminal.textarea?.addEventListener('compositionend', onTextInput, true)
+
     // Resize handling — skip when the container is hidden (display:none → 0x0),
     // otherwise fit() reports a tiny size and the PTY gets stuck at ~4 cols
     // until the user switches back.
@@ -533,6 +563,10 @@ export function TerminalPanel({ tabId, agent, sessionVersion, onSpawn, onExit, i
       window.removeEventListener('resize', handleResize)
       observer.disconnect()
       terminal.element?.removeEventListener('wheel', onWheel, true)
+      viewport?.removeEventListener('scroll', onViewportScroll)
+      terminal.textarea?.removeEventListener('paste', onPaste, true)
+      terminal.textarea?.removeEventListener('input', onTextInput, true)
+      terminal.textarea?.removeEventListener('compositionend', onTextInput, true)
       // Do NOT dispose terminal or unsub PTY listeners — they persist across remounts
     }
   }, [tabId, onExit])