@zhongqian97-code/ecode 0.2.4 → 0.2.5

package/dist/index.js

@@ -597,19 +597,45 @@ import { Box as Box3, Text as Text3, useInput } from "ink";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var CURSOR_CHAR = "\u258C";
 var BLINK_INTERVAL_MS = 530;
+function wordBackward(s, pos) {
+  let i = pos;
+  while (i > 0 && s[i - 1] === " ") {
+    i--;
+  }
+  while (i > 0 && s[i - 1] !== " ") {
+    i--;
+  }
+  return i;
+}
+function wordForward(s, pos) {
+  let i = pos;
+  const len = s.length;
+  while (i < len && s[i] !== " ") {
+    i++;
+  }
+  while (i < len && s[i] === " ") {
+    i++;
+  }
+  return i;
+}
 var Input = forwardRef(function Input2({ isActive, onSubmit, onChange, placeholder }, ref) {
-  const [lines, setLines] = useState2([""]);
+  const [value, setValue] = useState2("");
+  const [cursorPos, setCursorPos] = useState2(0);
   const [cursorVisible, setCursorVisible] = useState2(true);
-  const linesRef = useRef(lines);
-  linesRef.current = lines;
+  const valueRef = useRef(value);
+  valueRef.current = value;
+  const cursorPosRef = useRef(cursorPos);
+  cursorPosRef.current = cursorPos;
   const onChangeRef = useRef(onChange);
   onChangeRef.current = onChange;
   const onSubmitRef = useRef(onSubmit);
   onSubmitRef.current = onSubmit;
   useImperativeHandle(ref, () => ({
     fill(text) {
-      const newLines = text ? text.split("\n") : [""];
-      setLines(newLines);
+      valueRef.current = text;
+      cursorPosRef.current = text.length;
+      setValue(text);
+      setCursorPos(text.length);
       onChangeRef.current?.(text);
     }
   }));
@@ -625,49 +651,124 @@ var Input = forwardRef(function Input2({ isActive, onSubmit, onChange, placehold
       clearInterval(timer);
     };
   }, [isActive]);
+  function setValueSync(newValue) {
+    valueRef.current = newValue;
+    setValue(newValue);
+  }
+  function setCursorPosSync(newPos) {
+    cursorPosRef.current = newPos;
+    setCursorPos(newPos);
+  }
   useInput(
     (input, key) => {
-      const currentLines = linesRef.current;
+      const v = valueRef.current;
+      const pos = cursorPosRef.current;
       if (key.return && key.shift) {
-        const newLines = [...currentLines, ""];
-        setLines(newLines);
-        onChangeRef.current?.(newLines.join("\n"));
+        const newValue = v.slice(0, pos) + "\n" + v.slice(pos);
+        setValueSync(newValue);
+        setCursorPosSync(pos + 1);
+        onChangeRef.current?.(newValue);
         return;
       }
       if (key.return) {
-        const text = currentLines.join("\n");
-        onSubmitRef.current(text);
-        setLines([""]);
+        onSubmitRef.current(v);
+        setValueSync("");
+        setCursorPosSync(0);
         onChangeRef.current?.("");
         return;
       }
       if (key.backspace || key.delete) {
-        const lastIdx = currentLines.length - 1;
-        const lastLine = currentLines[lastIdx];
-        let newLines;
-        if (lastLine.length > 0) {
-          newLines = [...currentLines.slice(0, lastIdx), lastLine.slice(0, -1)];
-        } else if (currentLines.length > 1) {
-          newLines = currentLines.slice(0, -1);
-        } else {
+        if (pos === 0) return;
+        const newValue = v.slice(0, pos - 1) + v.slice(pos);
+        setValueSync(newValue);
+        setCursorPosSync(pos - 1);
+        onChangeRef.current?.(newValue);
+        return;
+      }
+      if (key.ctrl) {
+        switch (input) {
+          case "a": {
+            setCursorPosSync(0);
+            return;
+          }
+          case "e": {
+            setCursorPosSync(v.length);
+            return;
+          }
+          case "b": {
+            setCursorPosSync(Math.max(0, pos - 1));
+            return;
+          }
+          case "f": {
+            setCursorPosSync(Math.min(v.length, pos + 1));
+            return;
+          }
+          case "k": {
+            const nextNl = v.indexOf("\n", pos);
+            const lineEnd = nextNl === -1 ? v.length : nextNl;
+            const newValue = v.slice(0, pos) + v.slice(lineEnd);
+            setValueSync(newValue);
+            onChangeRef.current?.(newValue);
+            return;
+          }
+          case "u": {
+            const newValue = v.slice(pos);
+            setValueSync(newValue);
+            setCursorPosSync(0);
+            onChangeRef.current?.(newValue);
+            return;
+          }
+          case "w": {
+            const newPos = wordBackward(v, pos);
+            const newValue = v.slice(0, newPos) + v.slice(pos);
+            setValueSync(newValue);
+            setCursorPosSync(newPos);
+            onChangeRef.current?.(newValue);
+            return;
+          }
+          case "d": {
+            if (pos >= v.length) return;
+            const newValue = v.slice(0, pos) + v.slice(pos + 1);
+            setValueSync(newValue);
+            onChangeRef.current?.(newValue);
+            return;
+          }
+          default:
+            return;
+        }
+      }
+      if (key.meta) {
+        if (input === "b") {
+          setCursorPosSync(wordBackward(v, pos));
           return;
         }
-        setLines(newLines);
-        onChangeRef.current?.(newLines.join("\n"));
+        if (input === "f") {
+          setCursorPosSync(wordForward(v, pos));
+          return;
+        }
+        return;
+      }
+      if (key.leftArrow) {
+        setCursorPosSync(Math.max(0, pos - 1));
         return;
       }
-      if (key.ctrl || key.escape || key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.tab || key.pageUp || key.pageDown) {
+      if (key.rightArrow) {
+        setCursorPosSync(Math.min(v.length, pos + 1));
+        return;
+      }
+      if (key.escape || key.upArrow || key.downArrow || key.tab || key.pageUp || key.pageDown) {
         return;
       }
       if (input.length > 0) {
-        const newLines = [...currentLines.slice(0, -1), currentLines[currentLines.length - 1] + input];
-        setLines(newLines);
-        onChangeRef.current?.(newLines.join("\n"));
+        const newValue = v.slice(0, pos) + input + v.slice(pos);
+        setValueSync(newValue);
+        setCursorPosSync(pos + input.length);
+        onChangeRef.current?.(newValue);
       }
     },
     { isActive }
   );
-  const isEmpty = lines.every((line) => line === "");
+  const isEmpty = value === "";
   const renderLines = () => {
     if (isEmpty && placeholder) {
       return /* @__PURE__ */ jsxs3(Box3, { children: [
@@ -676,19 +777,41 @@ var Input = forwardRef(function Input2({ isActive, onSubmit, onChange, placehold
         isActive && cursorVisible && /* @__PURE__ */ jsx3(Text3, { color: "cyan", children: CURSOR_CHAR })
       ] });
     }
+    const lines = value.split("\n");
+    let remaining = cursorPos;
+    let cursorLine = 0;
+    let cursorCol = 0;
+    for (let i = 0; i < lines.length; i++) {
+      const lineLen = lines[i].length;
+      if (remaining <= lineLen) {
+        cursorLine = i;
+        cursorCol = remaining;
+        break;
+      }
+      remaining -= lineLen + 1;
+    }
     return /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: lines.map((line, idx) => {
-      const isLastLine = idx === lines.length - 1;
       const prefix = idx === 0 ? "> " : "  ";
+      const showCursor = isActive && cursorVisible && idx === cursorLine;
+      if (!showCursor) {
+        return /* @__PURE__ */ jsxs3(Box3, { children: [
+          /* @__PURE__ */ jsx3(Text3, { color: "cyan", children: prefix }),
+          /* @__PURE__ */ jsx3(Text3, { children: line })
+        ] }, idx);
+      }
+      const before = line.slice(0, cursorCol);
+      const after = line.slice(cursorCol);
       return /* @__PURE__ */ jsxs3(Box3, { children: [
         /* @__PURE__ */ jsx3(Text3, { color: "cyan", children: prefix }),
-        /* @__PURE__ */ jsx3(Text3, { children: line }),
-        isActive && isLastLine && cursorVisible && /* @__PURE__ */ jsx3(Text3, { color: "cyan", children: CURSOR_CHAR })
+        /* @__PURE__ */ jsx3(Text3, { children: before }),
+        /* @__PURE__ */ jsx3(Text3, { color: "cyan", children: CURSOR_CHAR }),
+        /* @__PURE__ */ jsx3(Text3, { children: after })
       ] }, idx);
     }) });
   };
   return /* @__PURE__ */ jsx3(Box3, { children: isActive ? renderLines() : /* @__PURE__ */ jsxs3(Box3, { children: [
     /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "> " }),
-    /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: isEmpty ? placeholder ?? "" : lines.join(" ") })
+    /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: isEmpty ? placeholder ?? "" : value })
   ] }) });
 });
 var Input_default = Input;
@@ -764,6 +887,11 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
   const [confirmPrompt, setConfirmPrompt] = useState3(void 0);
   const [expandTools, setExpandTools] = useState3(false);
   const [scrollOffset, setScrollOffset] = useState3(0);
+  const [inputHistory, setInputHistory] = useState3([]);
+  const inputHistoryRef = useRef2([]);
+  inputHistoryRef.current = inputHistory;
+  const historyIndexRef = useRef2(-1);
+  const isNavigatingHistoryRef = useRef2(false);
   const totalLines = useMemo(() => {
     const visible = messages.filter((m) => m.role !== "system");
     return visible.reduce(
@@ -799,7 +927,7 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
     }
     loggedCountRef.current = messages.length;
   }, [messages]);
-  useInput2((_input, key) => {
+  useInput2((input, key) => {
     const skillList = registry2?.list() ?? [];
     const suggestions = computeSuggestions(skillList, acState);
     const open = isOpen(acState, suggestions);
@@ -837,6 +965,38 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
       setScrollOffset((prev) => Math.max(0, prev - scrollStep));
       return;
     }
+    if (key.ctrl && input === "v") {
+      setScrollOffset((prev) => Math.max(0, prev - scrollStep));
+      return;
+    }
+    if (key.meta && input === "v") {
+      setScrollOffset((prev) => Math.min(prev + scrollStep, Math.max(0, totalLines - 1)));
+      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;
+        inputRef.current?.fill(history[newIndex]);
+      }
+      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;
+        inputRef.current?.fill(history[newIndex]);
+      } else if (historyIndexRef.current === 0) {
+        historyIndexRef.current = -1;
+        isNavigatingHistoryRef.current = true;
+        inputRef.current?.fill("");
+      }
+      return;
+    }
   });
   const confirm = useCallback((prompt) => {
     return new Promise((resolve2) => {
@@ -980,6 +1140,8 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
         return;
       }
       if (!trimmed) return;
+      setInputHistory((prev) => [trimmed, ...prev.slice(0, 99)]);
+      historyIndexRef.current = -1;
       setScrollOffset(0);
       if (registry2) {
         const skillResult = handleSkillInput(trimmed, registry2);
@@ -1021,6 +1183,11 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
   );
   const isInputActive = status === "idle" || status === "awaiting_confirm";
   const handleInputTextChange = useCallback((text) => {
+    if (isNavigatingHistoryRef.current) {
+      isNavigatingHistoryRef.current = false;
+    } else {
+      historyIndexRef.current = -1;
+    }
     if (status !== "awaiting_confirm") {
       setAcState((prev) => handleInputChange(prev, text));
     }

package/package.json

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