@zhongqian97-code/ecode 0.5.60 → 0.5.61

package/dist/altScreen-I6W4LBRE.js

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+const _ew=process.emitWarning.bind(process);process.emitWarning=function(w,...a){if((w?.message??w)?.includes?.('punycode'))return;_ew(w,...a);};
+
+// src/ui/altScreen.ts
+import { writeSync as fsWriteSync } from "fs";
+var ENTER_ALT_SCREEN_SEQ = "\x1B[?1049h\x1B[H";
+var EXIT_ALT_SCREEN_SEQ = "\x1B[?1049l";
+var DISABLE_TERMINAL_MODES_SEQ = "\x1B[?1004l\x1B[?1002l\x1B[?1006l";
+function installCrashCleanup(opts = {}) {
+  const writeSync = opts.writeSync ?? ((s) => {
+    try {
+      fsWriteSync(1, s);
+    } catch {
+    }
+  });
+  const signals = opts.signals ?? ["SIGINT", "SIGTERM", "SIGHUP"];
+  let cleaned = false;
+  const cleanup = () => {
+    if (cleaned) return;
+    cleaned = true;
+    writeSync(DISABLE_TERMINAL_MODES_SEQ);
+    writeSync(EXIT_ALT_SCREEN_SEQ);
+  };
+  const onExit = () => {
+    cleanup();
+  };
+  process.on("exit", onExit);
+  const sigHandlers = signals.map((sig) => {
+    const h = () => {
+      cleanup();
+      process.exit(0);
+    };
+    process.on(sig, h);
+    return [sig, h];
+  });
+  return () => {
+    process.off("exit", onExit);
+    for (const [sig, h] of sigHandlers) process.off(sig, h);
+  };
+}
+export {
+  DISABLE_TERMINAL_MODES_SEQ,
+  ENTER_ALT_SCREEN_SEQ,
+  EXIT_ALT_SCREEN_SEQ,
+  installCrashCleanup
+};

package/dist/index.js

@@ -903,21 +903,9 @@ Press Ctrl+C to stop.
     process.exit(0);
   }
   if (process.stdout.isTTY) {
-    process.stdout.write("\x1B[?1049h\x1B[H");
-    const exitAltScreen = () => process.stdout.write("\x1B[?1049l");
-    process.on("exit", exitAltScreen);
-    process.on("SIGINT", () => {
-      exitAltScreen();
-      process.exit(0);
-    });
-    process.on("SIGTERM", () => {
-      exitAltScreen();
-      process.exit(0);
-    });
-    process.on("SIGHUP", () => {
-      exitAltScreen();
-      process.exit(0);
-    });
+    const { ENTER_ALT_SCREEN_SEQ, installCrashCleanup } = await import("./altScreen-I6W4LBRE.js");
+    process.stdout.write(ENTER_ALT_SCREEN_SEQ);
+    installCrashCleanup();
   }
   const [nodeMaj] = process.versions.node.split(".").map(Number);
   if (nodeMaj < 20) {
@@ -928,7 +916,7 @@ Node.js 16/18 \u8BF7\u4F7F\u7528 --web \u6216 --pipe \u6A21\u5F0F\u3002
     );
     process.exit(1);
   }
-  const { App, React, render, createStdinFilter } = await import("./ui-3HB6NDEE.js");
+  const { App, React, render, createStdinFilter } = await import("./ui-DFEOOA36.js");
   const stdinFilter = process.stdin.isTTY ? createStdinFilter(process.stdin) : process.stdin;
   render(
     React.createElement(App, { config: finalConfig, version: VERSION, autoMode, registry, trustedSkillDirs, initialMessages, stdinFilter }),

package/dist/{ui-3HB6NDEE.js → ui-DFEOOA36.js}

@@ -47,7 +47,7 @@ import { render } from "ink";
 
 // src/ui/App.tsx
 import { useState as useState3, useCallback, useRef as useRef2, useEffect as useEffect3, useMemo } from "react";
-import { Box as Box6, Text as Text6, useInput as useInput2, useStdout } from "ink";
+import { Box as Box6, Text as Text6, useInput as useInput2, useStdout, measureElement } from "ink";
 
 // src/skills/executor.ts
 import { exec } from "child_process";
@@ -296,6 +296,7 @@ function messageToLines(msg, expandTools, terminalWidth) {
 }
 
 // src/ui/mouseSelection.ts
+import stringWidth2 from "string-width";
 function initialSelectionState() {
   return { anchor: null, focus: null, dragging: false };
 }
@@ -328,6 +329,21 @@ function isCellSelected(row, col, state) {
   if (row === end.row) return col <= end.col;
   return true;
 }
+function colToStringIndex(line, col, roundUp) {
+  if (col <= 0) return 0;
+  let w = 0;
+  let idx = 0;
+  for (const ch of line) {
+    const cw = stringWidth2(ch);
+    if (w >= col) return idx;
+    if (w + cw > col) {
+      return roundUp ? idx + ch.length : idx;
+    }
+    w += cw;
+    idx += ch.length;
+  }
+  return idx;
+}
 function extractSelectedText(lines, state) {
   const norm = normalizeSelection(state);
   if (!norm) return "";
@@ -335,9 +351,11 @@ function extractSelectedText(lines, state) {
   const parts = [];
   for (let r = start.row; r <= end.row; r++) {
     const line = lines[r] ?? "";
-    const colStart = r === start.row ? start.col : 0;
-    const colEnd = r === end.row ? Math.min(end.col + 1, line.length) : line.length;
-    parts.push(line.slice(colStart, colEnd));
+    const colStartVis = r === start.row ? start.col : 0;
+    const colEndVis = r === end.row ? end.col + 1 : Number.POSITIVE_INFINITY;
+    const idxStart = colToStringIndex(line, colStartVis, false);
+    const idxEnd = colToStringIndex(line, colEndVis, true);
+    parts.push(line.slice(idxStart, idxEnd));
   }
   return parts.join("\n");
 }
@@ -405,7 +423,20 @@ import { useState as useState2, useEffect as useEffect2, useRef, forwardRef, use
 import { Box as Box3, Text as Text3, useInput } from "ink";
 
 // src/ui/inputClick.ts
+import stringWidth3 from "string-width";
 var INPUT_PREFIX_WIDTH = 2;
+function colToStringIndex2(line, col) {
+  if (col <= 0) return 0;
+  let w = 0;
+  let idx = 0;
+  for (const ch of line) {
+    const cw = stringWidth3(ch);
+    if (w + cw > col) break;
+    w += cw;
+    idx += ch.length;
+  }
+  return idx;
+}
 function clickToCursor(value, localRow, localCol) {
   if (value.length === 0) return 0;
   const lines = value.split("\n");
@@ -416,7 +447,7 @@ function clickToCursor(value, localRow, localCol) {
     pos += lines[i].length + 1;
   }
   const lineCol = Math.max(0, localCol - INPUT_PREFIX_WIDTH);
-  pos += Math.min(lineCol, lines[localRow].length);
+  pos += colToStringIndex2(lines[localRow], lineCol);
   return pos;
 }
 
@@ -962,7 +993,7 @@ function computeVisibleWindow(totalLines, scrollOffset, historyMaxHeight) {
 }
 function mouseRowToLineIndex(opts) {
   if (opts.visibleCount <= 0) return null;
-  const bottomRows = STATUS_BAR_ROWS + opts.skillAcRows + opts.fileAcRows + opts.selectedItemsRows + opts.inputRows;
+  const bottomRows = opts.bottomChromeRows ?? STATUS_BAR_ROWS + (opts.skillAcRows ?? 0) + (opts.fileAcRows ?? 0) + (opts.selectedItemsRows ?? 0) + (opts.inputRows ?? 1);
   const innerBoxHeight = opts.terminalRows - bottomRows;
   const chTopRow = innerBoxHeight - opts.visibleCount;
   const chBottomRow = innerBoxHeight - 1;
@@ -2542,6 +2573,7 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
   const inputHistoryRef = useRef2([]);
   inputHistoryRef.current = inputHistory;
   const historyIndexRef = useRef2(-1);
+  const historyDraftRef = useRef2("");
   const isNavigatingHistoryRef = useRef2(false);
   const totalLines = useMemo(() => {
     const visible = messages.filter((m) => m.role !== "system");
@@ -2558,10 +2590,8 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
   historyMaxHeightRef.current = historyMaxHeight;
   const selectionStateRef = useRef2(selectionState);
   selectionStateRef.current = selectionState;
+  const bottomChromeRef = useRef2(null);
   const inputRowsRef = useRef2(1);
-  const skillAcRowsRef = useRef2(0);
-  const fileAcRowsRef = useRef2(0);
-  const selectedItemsRowsRef = useRef2(0);
   const terminalRowsRef = useRef2((stdout == null ? void 0 : stdout.rows) ?? 24);
   terminalRowsRef.current = (stdout == null ? void 0 : stdout.rows) ?? 24;
   const pendingConfirmRef = useRef2(null);
@@ -2626,13 +2656,24 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
       automationManagerRef.current.stop();
     };
   }, []);
+  const enableModesSeq = "\x1B[?1002h\x1B[?1006h\x1B[?1004h";
   useEffect3(() => {
     if (!stdout) return;
-    stdout.write("\x1B[?1002h\x1B[?1006h");
+    stdout.write(enableModesSeq);
     return () => {
-      stdout.write("\x1B[?1002l\x1B[?1006l");
+      stdout.write("\x1B[?1004l\x1B[?1002l\x1B[?1006l");
     };
   }, [stdout]);
+  useEffect3(() => {
+    if (!stdinFilter || !stdout) return;
+    const onResumed = () => {
+      stdout.write(enableModesSeq);
+    };
+    stdinFilter.on("resumed", onResumed);
+    return () => {
+      stdinFilter.off("resumed", onResumed);
+    };
+  }, [stdinFilter, stdout]);
   useEffect3(() => {
     if (!stdinFilter) return;
     const onMouse = (e) => {
@@ -2672,13 +2713,16 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
         scrollOffsetRef.current,
         historyMaxHeightRef.current
       );
+      let bottomRows;
+      if (bottomChromeRef.current) {
+        const m = measureElement(bottomChromeRef.current);
+        if (m && m.height > 0) bottomRows = m.height;
+      }
       const lineIdx = mouseRowToLineIndex({
         mouseRow: e.row,
         terminalRows: tRows,
+        bottomChromeRows: bottomRows,
         inputRows: inRows,
-        skillAcRows: skillAcRowsRef.current,
-        fileAcRows: fileAcRowsRef.current,
-        selectedItemsRows: selectedItemsRowsRef.current,
         visibleCount: window.visibleCount,
         hasScrollIndicator: window.hasScrollIndicator
       });
@@ -2721,7 +2765,7 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
     };
   }, [fileAcState.query]);
   useInput2((input, key) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c;
     if (key.escape && status === "thinking" && abortControllerRef.current) {
       abortControllerRef.current.abort();
       return;
@@ -2796,52 +2840,47 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
       return;
     }
     const currentInput = ((_c = inputRef.current) == null ? void 0 : _c.getValue()) ?? "";
-    if (currentInput === "" && key.upArrow) {
+    const inHistory = historyIndexRef.current >= 0;
+    const canEnterHistory = currentInput === "" || inHistory;
+    const navUp = () => {
+      var _a2;
       const history = inputHistoryRef.current;
       const newIndex = Math.min(historyIndexRef.current + 1, history.length - 1);
-      if (newIndex >= 0 && newIndex < history.length) {
-        historyIndexRef.current = newIndex;
-        isNavigatingHistoryRef.current = true;
-        (_d = inputRef.current) == null ? void 0 : _d.fill(history[newIndex]);
-      }
-      return;
-    }
-    if (currentInput === "" && key.downArrow) {
+      if (newIndex < 0 || newIndex >= history.length) return;
+      if (historyIndexRef.current === -1) historyDraftRef.current = currentInput;
+      historyIndexRef.current = newIndex;
+      isNavigatingHistoryRef.current = true;
+      (_a2 = inputRef.current) == null ? void 0 : _a2.fill(history[newIndex]);
+    };
+    const navDown = () => {
+      var _a2, _b2;
       const history = inputHistoryRef.current;
       if (historyIndexRef.current > 0) {
         const newIndex = historyIndexRef.current - 1;
         historyIndexRef.current = newIndex;
         isNavigatingHistoryRef.current = true;
-        (_e = inputRef.current) == null ? void 0 : _e.fill(history[newIndex]);
+        (_a2 = inputRef.current) == null ? void 0 : _a2.fill(history[newIndex]);
       } else if (historyIndexRef.current === 0) {
         historyIndexRef.current = -1;
         isNavigatingHistoryRef.current = true;
-        (_f = inputRef.current) == null ? void 0 : _f.fill("");
+        (_b2 = inputRef.current) == null ? void 0 : _b2.fill(historyDraftRef.current);
+        historyDraftRef.current = "";
       }
+    };
+    if (canEnterHistory && key.upArrow) {
+      navUp();
+      return;
+    }
+    if (canEnterHistory && key.downArrow) {
+      navDown();
       return;
     }
     if (key.ctrl && input === "p") {
-      const history = inputHistoryRef.current;
-      const newIndex = Math.min(historyIndexRef.current + 1, history.length - 1);
-      if (newIndex >= 0 && newIndex < history.length) {
-        historyIndexRef.current = newIndex;
-        isNavigatingHistoryRef.current = true;
-        (_g = inputRef.current) == null ? void 0 : _g.fill(history[newIndex]);
-      }
+      navUp();
       return;
     }
     if (key.ctrl && input === "n") {
-      const history = inputHistoryRef.current;
-      if (historyIndexRef.current > 0) {
-        const newIndex = historyIndexRef.current - 1;
-        historyIndexRef.current = newIndex;
-        isNavigatingHistoryRef.current = true;
-        (_h = inputRef.current) == null ? void 0 : _h.fill(history[newIndex]);
-      } else if (historyIndexRef.current === 0) {
-        historyIndexRef.current = -1;
-        isNavigatingHistoryRef.current = true;
-        (_i = inputRef.current) == null ? void 0 : _i.fill("");
-      }
+      navDown();
       return;
     }
   });
@@ -3186,9 +3225,6 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
   const skillSuggestions = registry ? computeSuggestions(registry.list(), acState) : [];
   const acOpen = isOpen(acState, skillSuggestions);
   const facOpen = isOpen2(fileAcState, fileSuggestions);
-  skillAcRowsRef.current = acOpen ? skillSuggestions.length + 2 : 0;
-  fileAcRowsRef.current = facOpen ? fileSuggestions.length + 2 : 0;
-  selectedItemsRowsRef.current = selectedItems.length > 0 ? 1 : 0;
   return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", height: "100%", children: [
     /* @__PURE__ */ jsx6(Box6, { flexGrow: 1, flexDirection: "column", justifyContent: "flex-end", children: /* @__PURE__ */ jsx6(
       ConversationHistory,
@@ -3201,46 +3237,48 @@ function App({ config, version, autoMode = false, registry, trustedSkillDirs = [
         selection: selectionState
       }
     ) }),
-    /* @__PURE__ */ jsx6(
-      StatusBar,
-      {
-        status,
-        toolName,
-        confirmPrompt,
-        version,
-        tokenUsage
-      }
-    ),
-    /* @__PURE__ */ jsx6(
-      SkillAutocomplete,
-      {
-        suggestions: skillSuggestions,
-        selectedIndex: acState.selectedIndex,
-        isOpen: acOpen
-      }
-    ),
-    /* @__PURE__ */ jsx6(
-      FileAutocomplete,
-      {
-        suggestions: fileSuggestions,
-        selectedIndex: fileAcState.selectedIndex,
-        isOpen: facOpen
-      }
-    ),
-    selectedItems.length > 0 && /* @__PURE__ */ jsx6(Box6, { paddingLeft: 1, children: /* @__PURE__ */ jsxs6(Text6, { color: "cyan", dimColor: true, children: [
-      "Selected: ",
-      selectedItems.map((i) => i.label).join(", ")
-    ] }) }),
-    /* @__PURE__ */ jsx6(
-      Input_default,
-      {
-        ref: inputRef,
-        isActive: isInputActive,
-        onSubmit: handleSubmit,
-        onChange: handleInputTextChange,
-        placeholder: status === "awaiting_confirm" ? "y / n" : void 0
-      }
-    )
+    /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", ref: bottomChromeRef, children: [
+      /* @__PURE__ */ jsx6(
+        StatusBar,
+        {
+          status,
+          toolName,
+          confirmPrompt,
+          version,
+          tokenUsage
+        }
+      ),
+      /* @__PURE__ */ jsx6(
+        SkillAutocomplete,
+        {
+          suggestions: skillSuggestions,
+          selectedIndex: acState.selectedIndex,
+          isOpen: acOpen
+        }
+      ),
+      /* @__PURE__ */ jsx6(
+        FileAutocomplete,
+        {
+          suggestions: fileSuggestions,
+          selectedIndex: fileAcState.selectedIndex,
+          isOpen: facOpen
+        }
+      ),
+      selectedItems.length > 0 && /* @__PURE__ */ jsx6(Box6, { paddingLeft: 1, children: /* @__PURE__ */ jsxs6(Text6, { color: "cyan", dimColor: true, children: [
+        "Selected: ",
+        selectedItems.map((i) => i.label).join(", ")
+      ] }) }),
+      /* @__PURE__ */ jsx6(
+        Input_default,
+        {
+          ref: inputRef,
+          isActive: isInputActive,
+          onSubmit: handleSubmit,
+          onChange: handleInputTextChange,
+          placeholder: status === "awaiting_confirm" ? "y / n" : void 0
+        }
+      )
+    ] })
   ] });
 }
 
@@ -3306,6 +3344,7 @@ function tokenizeStdin(input, pendingIn) {
   let i = 0;
   let keyboardOut = "";
   const events = [];
+  const focusEvents = [];
   while (i < data.length) {
     const ch = data[i];
     if (ch !== "\x1B") {
@@ -3327,13 +3366,18 @@ function tokenizeStdin(input, pendingIn) {
       i += mLen;
       continue;
     }
+    if (tail.length >= 3 && tail[1] === "[" && (tail[2] === "I" || tail[2] === "O")) {
+      focusEvents.push({ kind: "focus", focused: tail[2] === "I" });
+      i += 3;
+      continue;
+    }
     if (isMousePartial(tail) && tail.length < MAX_MOUSE_SEQ) {
-      return { keyboard: keyboardOut, pending: tail, events };
+      return { keyboard: keyboardOut, pending: tail, events, focusEvents };
     }
     keyboardOut += ch;
     i++;
   }
-  return { keyboard: keyboardOut, pending: "", events };
+  return { keyboard: keyboardOut, pending: "", events, focusEvents };
 }
 
 // src/ui/stdinFilter.ts
@@ -3341,12 +3385,22 @@ var StdinFilterImpl = class extends Transform {
   isTTY;
   source;
   pending = "";
-  constructor(source) {
+  // 焦点状态——cc-haha 把 focus 作 signal 而非 mode switch（§5.4）。
+  // CSI I/O 切换；任何字节到达时若为 false 由 failsafe 强制回 true。
+  focused = true;
+  // resume 检测：最近一次活动时间戳；间隔 > resumeIdleMs 算 SSH 重连 / tmux detach 回来。
+  lastByteAt = 0;
+  resumeIdleMs;
+  constructor(source, opts = {}) {
     super();
     this.source = source;
     this.isTTY = source.isTTY ?? false;
+    this.resumeIdleMs = opts.resumeIdleMs ?? 5e3;
     source.pipe(this);
   }
+  isFocused() {
+    return this.focused;
+  }
   setRawMode(mode) {
     var _a, _b;
     (_b = (_a = this.source).setRawMode) == null ? void 0 : _b.call(_a, mode);
@@ -3361,9 +3415,23 @@ var StdinFilterImpl = class extends Transform {
   }
   _transform(chunk, _encoding, callback) {
     const s = typeof chunk === "string" ? chunk : chunk.toString("binary");
-    const { keyboard, pending, events } = tokenizeStdin(s, this.pending);
+    const now = Date.now();
+    if (this.lastByteAt > 0 && now - this.lastByteAt >= this.resumeIdleMs) {
+      this.emit("resumed");
+    }
+    this.lastByteAt = now;
+    const { keyboard, pending, events, focusEvents } = tokenizeStdin(s, this.pending);
     this.pending = pending;
+    for (const ev of focusEvents) {
+      this.focused = ev.focused;
+      this.emit("focus", ev);
+    }
     for (const ev of events) this.emit("mouse", ev);
+    const hadNonFocusActivity = events.length > 0 || keyboard.length > 0;
+    if (hadNonFocusActivity && !this.focused) {
+      this.focused = true;
+      this.emit("focus", { kind: "focus", focused: true });
+    }
     if (keyboard.length > 0) {
       callback(null, Buffer.from(keyboard, "binary"));
     } else {
@@ -3371,8 +3439,8 @@ var StdinFilterImpl = class extends Transform {
     }
   }
 };
-function createStdinFilter(source) {
-  return new StdinFilterImpl(source);
+function createStdinFilter(source, opts) {
+  return new StdinFilterImpl(source, opts);
 }
 export {
   App,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhongqian97-code/ecode",
-  "version": "0.5.60",
+  "version": "0.5.61",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",