xgen-dex-cli 1.7.0 → 1.7.2

package/dist/chunks/{tui-QF5OJEFW.js → tui-VLPJMWUK.js}

@@ -288,7 +288,7 @@ import { Box as Box2, Text as Text2 } from "ink";
 
 // src/tui/ime-text-input.tsx
 import { useEffect as useEffect2, useRef as useRef2, useState as useState2 } from "react";
-import { Box, Text, useCursor, useInput, useStdin } from "ink";
+import { Box, Text, useCursor, useInput } from "ink";
 import stringWidth2 from "string-width";
 
 // src/tui/terminal-input.ts
@@ -504,58 +504,6 @@ function backspace(session) {
   };
 }
 
-// src/tui/kitty.ts
-var ESC = "\x1B";
-var QUERY = `${ESC}[?u`;
-var KEY_CODES = {
-  57358: "capslock",
-  57449: "rightalt"
-};
-var CAPS_LOCK_BIT = 64;
-function parseKeyEvents(chunk) {
-  const events = [];
-  const pattern = /\u001B\[(\d+)(?::\d+)*(?:;(\d+)(?::(\d+))?)?(?:;[\d:]*)?u/g;
-  for (const match of chunk.matchAll(pattern)) {
-    const code = Number(match[1]);
-    const modifiers = match[2] ? Number(match[2]) - 1 : 0;
-    events.push({
-      name: KEY_CODES[code],
-      // eslint-disable-next-line no-bitwise
-      capsLock: (modifiers & CAPS_LOCK_BIT) !== 0,
-      eventType: match[3] ? Number(match[3]) : 1
-    });
-  }
-  return events;
-}
-async function supportsKittyKeyboard(streams, timeoutMs = 200) {
-  if (process.env.DEX_NO_KITTY === "1") return false;
-  if (!streams.stdout.isTTY || !streams.isTTY) return false;
-  const wasRaw = streams.stdin.isRaw === true;
-  const wasPaused = !wasRaw;
-  streams.stdin.setRawMode?.(true);
-  streams.stdin.resume?.();
-  return new Promise((resolve) => {
-    let settled = false;
-    let seen = "";
-    const finish = (supported) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      streams.stdin.removeListener("data", onData);
-      if (!wasRaw) streams.stdin.setRawMode?.(false);
-      if (wasPaused) streams.stdin.pause?.();
-      resolve(supported);
-    };
-    const onData = (data) => {
-      seen += typeof data === "string" ? data : data.toString("utf8");
-      if (/\u001B\[\?\d*u/.test(seen)) finish(true);
-    };
-    const timer = setTimeout(() => finish(false), timeoutMs);
-    streams.stdin.on("data", onData);
-    streams.stdout.write(QUERY);
-  });
-}
-
 // src/tui/ime-text-input.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
 var segmenter = new Intl.Segmenter("ko", { granularity: "grapheme" });
@@ -589,6 +537,12 @@ function visibleInput(segments, cursor, maximumWidth) {
     cursorWidth: widthBeforeCursor
   };
 }
+function isHangulToggle(input, key) {
+  if (key.ctrl && (input === "`" || input === " " || input === "l")) return true;
+  if (key.meta && input === " ") return true;
+  if (key.shift && input === " ") return true;
+  return false;
+}
 function TerminalCursor({ x, y }) {
   const { setCursorPosition } = useCursor();
   setCursorPosition({ x, y });
@@ -613,22 +567,6 @@ function ImeTextInput(props) {
     moveCursor(nextCursor, segments.length);
     props.onChange(nextValue);
   };
-  const { stdin: stdin2, isRawModeSupported } = useStdin();
-  const onModeKeyRef = useRef2(void 0);
-  onModeKeyRef.current = () => props.onHangulModeChange?.(!props.hangulMode);
-  useEffect2(() => {
-    if (!props.focus || !isRawModeSupported) return void 0;
-    const onData = (data) => {
-      const chunk = typeof data === "string" ? data : data.toString("utf8");
-      for (const event of parseKeyEvents(chunk)) {
-        typingRef.current = { ...typingRef.current, capsLock: event.capsLock };
-        if (event.eventType !== 1) continue;
-        if (event.name === "rightalt" || event.name === "capslock") onModeKeyRef.current?.();
-      }
-    };
-    stdin2?.on("data", onData);
-    return () => void stdin2?.off("data", onData);
-  }, [props.focus, isRawModeSupported, stdin2]);
   useEffect2(() => {
     if (!props.focus || !props.hangulMode) {
       typingRef.current = { ...IDLE, capsLock: typingRef.current.capsLock };
@@ -674,7 +612,7 @@ function ImeTextInput(props) {
         }
         return;
       }
-      if (key.ctrl && (input === "`" || input === "l") || key.meta && input === " ") {
+      if (isHangulToggle(input, key)) {
         settle();
         props.onHangulModeChange?.(!props.hangulMode);
         return;
@@ -1100,6 +1038,15 @@ function Dashboard(props) {
     setHangulMode(enabled);
     props.preferences?.onHangulModeChange?.(enabled);
   };
+  useEffect6(
+    () => props.preferences?.onModeKey?.(
+      () => setHangulMode((current) => {
+        props.preferences?.onHangulModeChange?.(!current);
+        return !current;
+      })
+    ),
+    [props.preferences]
+  );
   const viewport = useRef3({ lineCount: 0, height: 0 });
   const [starting, setStarting] = useState7(false);
   const controller = useRef3(null);
@@ -1755,25 +1702,25 @@ function RetryInput({ onRetry }) {
 }
 
 // src/tui/screen.ts
-var ESC2 = "\x1B";
-var ENTER_ALT_SCREEN = `${ESC2}[?1049h`;
-var LEAVE_ALT_SCREEN = `${ESC2}[?1049l`;
-var SHOW_CURSOR = `${ESC2}[?25h`;
+var ESC = "\x1B";
+var ENTER_ALT_SCREEN = `${ESC}[?1049h`;
+var LEAVE_ALT_SCREEN = `${ESC}[?1049l`;
+var SHOW_CURSOR = `${ESC}[?25h`;
 var DISABLE_REPORTS = [
-  `${ESC2}[?1004l`,
+  `${ESC}[?1004l`,
   // 포커스 들어옴/나감
-  `${ESC2}[?1000l`,
+  `${ESC}[?1000l`,
   // 마우스 클릭
-  `${ESC2}[?1002l`,
+  `${ESC}[?1002l`,
   // 마우스 드래그
-  `${ESC2}[?1003l`,
+  `${ESC}[?1003l`,
   // 마우스 이동 전부
-  `${ESC2}[?1006l`
+  `${ESC}[?1006l`
   // SGR 확장 좌표
 ].join("");
-var ENABLE_BRACKETED_PASTE = `${ESC2}[?2004h`;
-var DISABLE_BRACKETED_PASTE = `${ESC2}[?2004l`;
-var POP_KITTY_KEYBOARD = `${ESC2}[<u`;
+var ENABLE_BRACKETED_PASTE = `${ESC}[?2004h`;
+var DISABLE_BRACKETED_PASTE = `${ESC}[?2004l`;
+var POP_KITTY_KEYBOARD = `${ESC}[<u`;
 function createScreenGuard(stream, options = {}) {
   const alt = Boolean(stream.isTTY);
   let entered = false;
@@ -1826,6 +1773,131 @@ async function writePreferences(preferences, env = process.env) {
   }
 }
 
+// src/tui/kitty.ts
+var ESC2 = "\x1B";
+var QUERY = `${ESC2}[?u`;
+var KEY_CODES = {
+  57358: "capslock",
+  57449: "rightalt"
+};
+var CAPS_LOCK_BIT = 64;
+function parseKeyEvents(chunk) {
+  const events = [];
+  const pattern = /\u001B\[(\d+)(?::\d+)*(?:;(\d+)(?::(\d+))?)?(?:;[\d:]*)?u/g;
+  for (const match of chunk.matchAll(pattern)) {
+    const code = Number(match[1]);
+    const modifiers = match[2] ? Number(match[2]) - 1 : 0;
+    events.push({
+      name: KEY_CODES[code],
+      // eslint-disable-next-line no-bitwise
+      capsLock: (modifiers & CAPS_LOCK_BIT) !== 0,
+      eventType: match[3] ? Number(match[3]) : 1
+    });
+  }
+  return events;
+}
+function knownKittyTerminal(env = process.env) {
+  if (env.KITTY_WINDOW_ID) return true;
+  if (env.GHOSTTY_RESOURCES_DIR) return true;
+  const term = (env.TERM ?? "").toLowerCase();
+  if (term === "xterm-kitty" || term === "xterm-ghostty" || term.includes("foot")) return true;
+  const program = (env.TERM_PROGRAM ?? "").toLowerCase();
+  return program === "wezterm" || program === "ghostty" || program === "kitty";
+}
+async function supportsKittyKeyboard(streams, timeoutMs = 200, env = process.env) {
+  if (env.DEX_NO_KITTY === "1") return false;
+  if (!streams.stdout.isTTY || !streams.isTTY) return false;
+  if (knownKittyTerminal(env)) return true;
+  const wasRaw = streams.stdin.isRaw === true;
+  const wasPaused = !wasRaw;
+  streams.stdin.setRawMode?.(true);
+  streams.stdin.resume?.();
+  return new Promise((resolve) => {
+    let settled = false;
+    let seen = "";
+    const finish = (supported) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      streams.stdin.removeListener("data", onData);
+      if (!wasRaw) streams.stdin.setRawMode?.(false);
+      if (wasPaused) streams.stdin.pause?.();
+      resolve(supported);
+    };
+    const onData = (data) => {
+      seen += typeof data === "string" ? data : data.toString("utf8");
+      if (/\u001B\[\?\d*u/.test(seen)) finish(true);
+    };
+    const timer = setTimeout(() => finish(false), timeoutMs);
+    streams.stdin.on("data", onData);
+    streams.stdout.write(QUERY);
+  });
+}
+var KEY_EVENT = /\u001B\[([0-9]+)(?::[0-9:]*)?(?:;([0-9]*(?::[0-9]+)?))?(?:;([0-9:]+))?u/g;
+function normalizeKeyEvents(chunk) {
+  return chunk.replace(
+    KEY_EVENT,
+    (all, code, modifiers, text) => {
+      const hasAlternate = all.slice(0, all.indexOf(";") === -1 ? all.length : all.indexOf(";")).includes(":");
+      const needsModifier = modifiers !== void 0 && modifiers.length === 0;
+      if (!hasAlternate && !needsModifier) return all;
+      const mods = modifiers === void 0 ? void 0 : modifiers.length > 0 ? modifiers : "1";
+      const fields = [code, mods, text].filter((field) => field !== void 0).join(";");
+      return `\x1B[${fields}u`;
+    }
+  );
+}
+var PARTIAL_TAIL = /\u001B\[[0-9:;]*$/;
+var MAX_PARTIAL = 64;
+function createNormalizer() {
+  let pending = "";
+  return (chunk) => {
+    const combined = pending + chunk;
+    const match = PARTIAL_TAIL.exec(combined);
+    if (match && combined.length - match.index <= MAX_PARTIAL) {
+      pending = combined.slice(match.index);
+      return normalizeKeyEvents(combined.slice(0, match.index));
+    }
+    pending = "";
+    return normalizeKeyEvents(combined);
+  };
+}
+function normalizedStdin(stdin2, onSpecialKey) {
+  const normalize = createNormalizer();
+  return new Proxy(stdin2, {
+    get(target, property, receiver) {
+      if (property === "read") {
+        return (...args) => {
+          const chunk = target.read(...args);
+          if (chunk === null || chunk === void 0) return null;
+          const text = typeof chunk === "string" ? chunk : String(chunk);
+          if (onSpecialKey) {
+            for (const event of parseKeyEvents(text)) {
+              if (event.name && event.eventType === 1) onSpecialKey(event.name);
+            }
+          }
+          return normalize(text);
+        };
+      }
+      void receiver;
+      const value = Reflect.get(target, property, target);
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
+function createKeySignal() {
+  const listeners = /* @__PURE__ */ new Set();
+  return {
+    notify(name) {
+      for (const listener of listeners) listener(name);
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => void listeners.delete(listener);
+    }
+  };
+}
+
 // src/tui/index.tsx
 import { jsx as jsx11 } from "react/jsx-runtime";
 async function runTui(engine) {
@@ -1841,6 +1913,7 @@ async function runTui(engine) {
   const preferences = await readPreferences();
   const kitty = await supportsKittyKeyboard({ stdin, stdout, isTTY: stdin.isTTY });
   screen = createScreenGuard(stdout, { kittyKeyboard: kitty });
+  const modeKeys = createKeySignal();
   screen.enter();
   try {
     const instance = render(
@@ -1850,18 +1923,33 @@ async function runTui(engine) {
           engine,
           preferences: {
             hangulMode: preferences.hangulMode,
-            onHangulModeChange: (enabled) => void writePreferences({ hangulMode: enabled })
+            onHangulModeChange: (enabled) => void writePreferences({ hangulMode: enabled }),
+            onModeKey: modeKeys.subscribe
           }
         }
       ),
       {
         exitOnCtrlC: true,
         patchConsole: true,
-        // 모든 키를 이스케이프로 받아야 수식 키 자체가 사건으로 온다.
+        // 프로토콜을 켜면 kitty 가 ink 이 못 읽는 모양으로 키를 보낸다 — 사이에서
+        // 고쳐 넘기지 않으면 글자가 하나도 입력되지 않는다.
+        ...kitty ? {
+          stdin: normalizedStdin(stdin, (name) => {
+            if (name === "rightalt" || name === "capslock") modeKeys.notify(name);
+          })
+        } : {},
+        // 모든 키를 이스케이프로 받아야 한/영 키(오른쪽 Alt)와 Caps Lock 이 사건으로
+        // 온다. 그런데 그렇게만 켜면 터미널이 **글쇠 코드만** 보내서 Shift+r 이
+        // 소문자 `r` 로 도착한다 — 된소리도 영문 대문자도 사라진다. 그래서 글자까지
+        // 함께 보내 달라고(reportAssociatedText) 요청한다.
         ...kitty ? {
           kittyKeyboard: {
             mode: "enabled",
-            flags: ["disambiguateEscapeCodes", "reportAllKeysAsEscapeCodes"]
+            flags: [
+              "disambiguateEscapeCodes",
+              "reportAllKeysAsEscapeCodes",
+              "reportAssociatedText"
+            ]
           }
         } : {}
       }
@@ -1877,4 +1965,4 @@ async function runTui(engine) {
 export {
   runTui
 };
-//# sourceMappingURL=tui-QF5OJEFW.js.map
+//# sourceMappingURL=tui-VLPJMWUK.js.map