git-sync-tui 0.1.7 → 0.1.9

package/dist/cli.js

@@ -1,17 +1,11 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/cli.tsx
 import { render } from "ink";
 import meow from "meow";
 
 // src/app.tsx
-import { useState as useState9, useEffect as useEffect7, useRef as useRef5, useCallback as useCallback3 } from "react";
+import { useState as useState9, useEffect as useEffect7, useRef as useRef5, useCallback as useCallback4 } from "react";
 import { Box as Box11, useApp } from "ink";
 import { Spinner as Spinner7 } from "@inkjs/ui";
 
@@ -92,10 +86,14 @@ function StatusPanel({ type, title, children }) {
     children
   ] });
 }
-function AppHeader({ step, stashed, noCommit }) {
+function AppHeader({ step, stashed, noCommit, version }) {
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
       /* @__PURE__ */ jsx(Text, { backgroundColor: "cyan", color: "white", bold: true, children: " git-sync-tui " }),
+      version && /* @__PURE__ */ jsxs(Text, { color: "gray", dimColor: true, children: [
+        "v",
+        version
+      ] }),
       /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
         "cherry-pick",
         noCommit ? " --no-commit" : ""
@@ -140,11 +138,13 @@ import { Spinner } from "@inkjs/ui";
 // src/utils/git.ts
 import simpleGit from "simple-git";
 import { existsSync, writeFileSync, unlinkSync, readFileSync } from "fs";
+import { execSync } from "child_process";
 import { join } from "path";
 var gitInstance = null;
 function getGit(cwd) {
-  if (!gitInstance || cwd) {
-    gitInstance = simpleGit(cwd);
+  if (cwd) return simpleGit(cwd);
+  if (!gitInstance) {
+    gitInstance = simpleGit();
   }
   return gitInstance;
 }
@@ -227,13 +227,14 @@ async function getMultiCommitStat(hashes) {
   if (hashes.length === 0) return "";
   const git = getGit();
   try {
-    const stats = [];
-    for (const hash of hashes) {
-      const result = await git.raw(["diff-tree", "--stat", "--no-commit-id", "-r", hash]);
-      if (result.trim()) stats.push(`${hash.substring(0, 7)}:
-${result.trim()}`);
-    }
-    return stats.join("\n\n");
+    const results = await Promise.all(
+      hashes.map(async (hash) => {
+        const result = await git.raw(["diff-tree", "--stat", "--no-commit-id", "-r", hash]);
+        return result.trim() ? `${hash.substring(0, 7)}:
+${result.trim()}` : "";
+      })
+    );
+    return results.filter(Boolean).join("\n\n");
   } catch {
     return "(\u65E0\u6CD5\u83B7\u53D6 stat \u4FE1\u606F)";
   }
@@ -454,8 +455,7 @@ async function removeStashGuard() {
 }
 function removeStashGuardSync() {
   try {
-    const { execSync: execSync2 } = __require("child_process");
-    const gitDir = String(execSync2("git rev-parse --git-dir", { encoding: "utf-8" })).trim();
+    const gitDir = String(execSync("git rev-parse --git-dir", { encoding: "utf-8" })).trim();
     const guardPath = join(gitDir, STASH_GUARD_FILE);
     if (existsSync(guardPath)) {
       unlinkSync(guardPath);
@@ -542,10 +542,12 @@ function useAsync(fn, deps = []) {
     loading: true,
     error: null
   });
+  const fnRef = useRef(fn);
+  fnRef.current = fn;
   const load = useCallback(async () => {
     setState({ data: null, loading: true, error: null });
     try {
-      const data = await fn();
+      const data = await fnRef.current();
       setState({ data, loading: false, error: null });
     } catch (err) {
       setState({ data: null, loading: false, error: err.message });
@@ -612,20 +614,23 @@ function useCommits(remote2, branch2, pageSize = 100) {
 function useCommitStat(hashes) {
   const [stat, setStat] = useState2("");
   const [loading, setLoading] = useState2(false);
+  const hashKey = hashes.join(",");
+  const stableHashes = useRef(hashes);
+  stableHashes.current = hashes;
   useEffect2(() => {
-    if (hashes.length === 0) {
+    if (stableHashes.current.length === 0) {
       setStat("");
       return;
     }
     setLoading(true);
-    getMultiCommitStat(hashes).then((s) => {
+    getMultiCommitStat(stableHashes.current).then((s) => {
       setStat(s);
       setLoading(false);
     }).catch(() => {
       setStat("(\u83B7\u53D6\u5931\u8D25)");
       setLoading(false);
     });
-  }, [hashes.join(",")]);
+  }, [hashKey]);
   return { stat, loading };
 }
 
@@ -1180,6 +1185,8 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
   const [error2, setError] = useState6(null);
   const [matched, setMatched] = useState6(false);
   const autoCreated = useRef3(false);
+  const onContinueRef = useRef3(onContinue);
+  onContinueRef.current = onContinue;
   useEffect4(() => {
     getCurrentBranch().then((branch2) => {
       setCurrentBranch(branch2);
@@ -1189,7 +1196,7 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
     });
   }, [targetBranch]);
   useEffect4(() => {
-    if (matched) onContinue();
+    if (matched) onContinueRef.current();
   }, [matched]);
   useEffect4(() => {
     if (currentBranch === null || matched || autoCreated.current) return;
@@ -1197,7 +1204,7 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
     autoCreated.current = true;
     setCreating(true);
     createBranchFrom(targetBranch, currentBranch).then(() => {
-      onContinue();
+      onContinueRef.current();
     }).catch((err) => {
       setCreating(false);
       setError(err.message);
@@ -1333,7 +1340,7 @@ function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline
 }
 
 // src/components/result-panel.tsx
-import { useState as useState7, useEffect as useEffect5, useCallback as useCallback2, useRef as useRef4 } from "react";
+import { useState as useState7, useEffect as useEffect5, useCallback as useCallback3, useRef as useRef4 } from "react";
 import { Box as Box9, Text as Text9, useInput as useInput8 } from "ink";
 import { Spinner as Spinner6 } from "@inkjs/ui";
 import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
@@ -1349,7 +1356,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
   const remainingRef = useRef4([]);
   const backupBranchRef = useRef4("");
   const orderedHashes = useRef4([...selectedHashes].reverse());
-  const tryRestoreStash = useCallback2(async () => {
+  const tryRestoreStash = useCallback3(async () => {
     if (!stashed) return true;
     setPhase("restoring");
     const ok = await stashPop();
@@ -1357,7 +1364,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     if (ok) onStashRestored();
     return ok;
   }, [stashed, onStashRestored]);
-  const finishAll = useCallback2(async () => {
+  const finishAll = useCallback3(async () => {
     if (noCommit) {
       const stat = await getStagedStat();
       setStagedStat(stat);
@@ -1368,7 +1375,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     await tryRestoreStash();
     setPhase("done");
   }, [noCommit, tryRestoreStash]);
-  const executeFrom = useCallback2(async (startIndex) => {
+  const executeFrom = useCallback3(async (startIndex) => {
     const hashes = orderedHashes.current;
     for (let i = startIndex; i < hashes.length; i++) {
       setCurrentIndex(i);
@@ -1389,7 +1396,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
       executeFrom(0);
     });
   }, []);
-  const continueRemaining = useCallback2(async () => {
+  const continueRemaining = useCallback3(async () => {
     const remaining = remainingRef.current;
     if (remaining.length === 0) {
       await finishAll();
@@ -1409,7 +1416,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     }
     await finishAll();
   }, [useMainline, noCommit, finishAll]);
-  const handleContinue = useCallback2(async () => {
+  const handleContinue = useCallback3(async () => {
     const conflicts = await getConflictFiles();
     if (conflicts.length > 0) {
       setConflictFiles(conflicts);
@@ -1442,14 +1449,14 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
       await continueRemaining();
     }
   }, [noCommit, continueRemaining]);
-  const handleSkip = useCallback2(async () => {
+  const handleSkip = useCallback3(async () => {
     setPhase("continuing");
     setErrorMsg("");
     await skipCherryPick();
     setSkippedCount((c) => c + 1);
     await continueRemaining();
   }, [continueRemaining]);
-  const handleAbort = useCallback2(async () => {
+  const handleAbort = useCallback3(async () => {
     setPhase("aborting");
     await abortCherryPick();
     if (backupBranchRef.current) {
@@ -1741,11 +1748,9 @@ function UpdateBanner({ currentVersion }) {
 }
 
 // src/app.tsx
-import { execSync } from "child_process";
-import { createRequire } from "module";
+import { execSync as execSync2 } from "child_process";
 import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
-var require2 = createRequire(import.meta.url);
-var { version: APP_VERSION } = require2("../package.json");
+var APP_VERSION = "0.1.9";
 var STEP_NUMBER = {
   checking: 0,
   "stash-recovery": 0,
@@ -1776,7 +1781,7 @@ function App({ initialRemote, initialBranch }) {
   const stashRestoredRef = useRef5(false);
   const mountedRef = useRef5(true);
   const debounceTimer = useRef5(null);
-  const setStep = useCallback3((newStep) => {
+  const setStep = useCallback4((newStep) => {
     setInputReady(false);
     setStepRaw(newStep);
     if (debounceTimer.current) clearTimeout(debounceTimer.current);
@@ -1784,10 +1789,10 @@ function App({ initialRemote, initialBranch }) {
       if (mountedRef.current) setInputReady(true);
     }, STEP_DEBOUNCE);
   }, []);
-  const restoreStashSync = useCallback3(() => {
+  const restoreStashSync = useCallback4(() => {
     if (stashedRef.current && !stashRestoredRef.current) {
       try {
-        execSync("git stash pop", { stdio: "ignore" });
+        execSync2("git stash pop", { stdio: "ignore" });
         stashRestoredRef.current = true;
         removeStashGuardSync();
       } catch {
@@ -1798,7 +1803,7 @@ function App({ initialRemote, initialBranch }) {
       }
     }
   }, []);
-  const markStashRestored = useCallback3(() => {
+  const markStashRestored = useCallback4(() => {
     stashRestoredRef.current = true;
     removeStashGuard();
   }, []);
@@ -1857,7 +1862,7 @@ function App({ initialRemote, initialBranch }) {
     const clean = await isWorkingDirClean();
     if (mountedRef.current) setStep(clean ? entryStep : "stash-prompt");
   };
-  const goBack = useCallback3((fromStep) => {
+  const goBack = useCallback4((fromStep) => {
     const backMap = {
       branch: "remote",
       "branch-check": "branch",
@@ -1873,7 +1878,7 @@ function App({ initialRemote, initialBranch }) {
     }
   }, [setStep, restoreStashSync, exit]);
   return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx11(AppHeader, { step: STEP_NUMBER[step], stashed, noCommit }),
+    /* @__PURE__ */ jsx11(AppHeader, { step: STEP_NUMBER[step], stashed, noCommit, version: APP_VERSION }),
     step === "checking" && /* @__PURE__ */ jsx11(Spinner7, { label: "\u68C0\u67E5\u5DE5\u4F5C\u533A\u72B6\u6001..." }),
     step === "stash-recovery" && inputReady && /* @__PURE__ */ jsx11(
       StashRecovery,
@@ -1924,9 +1929,11 @@ function App({ initialRemote, initialBranch }) {
       {
         remote: remote2,
         branch: branch2,
-        onSelect: (hashes, loadedCommits) => {
+        onSelect: async (hashes, loadedCommits) => {
           setSelectedHashes(hashes);
           setCommits(loadedCommits);
+          const merge = await hasMergeCommits(hashes);
+          setHasMerge(merge);
           setStep("confirm");
         },
         onBack: () => goBack("commits")
@@ -1966,18 +1973,13 @@ function App({ initialRemote, initialBranch }) {
 
 // src/cli-runner.ts
 import { createInterface } from "readline";
-import { createRequire as createRequire2 } from "module";
-var require3 = createRequire2(import.meta.url);
-var { version: APP_VERSION2 } = require3("../package.json");
+var APP_VERSION2 = "0.1.9";
 function log(msg) {
   process.stdout.write(msg + "\n");
 }
 function error(msg) {
   process.stderr.write(msg + "\n");
 }
-function padEnd(str, len) {
-  return str.length >= len ? str : str + " ".repeat(len - str.length);
-}
 async function confirm(message) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
@@ -2039,7 +2041,7 @@ async function validateBranch(remote2, branch2) {
   log(`\u2714 \u5206\u652F '${remote2}/${branch2}'`);
 }
 function formatCommitLine(c) {
-  return `  ${c.shortHash}  ${padEnd(c.message.slice(0, 60), 62)} ${padEnd(c.author, 16)} ${c.date}`;
+  return `  ${c.shortHash}  ${c.message.slice(0, 60).padEnd(62)} ${c.author.padEnd(16)} ${c.date}`;
 }
 async function runList(opts) {
   await validateRemote(opts.remote);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "git-sync-tui",
   "type": "module",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "packageManager": "pnpm@10.32.1",
   "description": "Interactive TUI tool for cross-repo git commit synchronization (cherry-pick --no-commit)",
   "author": "KiWi233333",