@dotobokuri/fleet-console 1.34.0 → 1.36.0

package/dist/fleet-plugins/repository/routes.mjs

@@ -898,9 +898,9 @@ async function normalizeWorktreePath(worktreePath) {
     return worktreePath;
   }
 }
-async function readHeadRevList(gitCwd) {
+async function readHeadRevList(gitCwd, skip, limit) {
   try {
-    return (await runGit(["rev-list", "-n", "1000", "HEAD"], { cwd: gitCwd })).stdout;
+    return (await runGit(["rev-list", "-n", String(Math.max(1e3, skip + limit + 800)), "HEAD"], { cwd: gitCwd })).stdout;
   } catch (error) {
     if (error instanceof GitExecutorError) return "";
     throw error;
@@ -933,6 +933,12 @@ async function handleRepositoryLog(req, res, ctx) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
+  const limit = body.limit === void 0 ? 200 : body.limit;
+  const skip = body.skip === void 0 ? 0 : body.skip;
+  if (!Number.isInteger(limit) || typeof limit !== "number" || limit < 1 || limit > 500 || !Number.isInteger(skip) || typeof skip !== "number" || skip < 0) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
   const theaterPath = ctx.host.paths.resolveTheaterPath(theaterId);
   if (!theaterPath) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
@@ -959,18 +965,23 @@ async function handleRepositoryLog(req, res, ctx) {
     const [worktrees, currentWorktreePath, headRevList] = await Promise.all([
       runGit(["worktree", "list", "--porcelain"], { cwd: gitCwd }),
       readCurrentWorktreePath(gitCwd),
-      readHeadRevList(gitCwd)
+      readHeadRevList(gitCwd, skip, limit)
     ]);
     const checkouts = await parseWorktreePorcelain(worktrees.stdout, currentWorktreePath);
     const worktreeRevs = [...new Set(checkouts.map((checkout) => checkout.sha))].filter((sha) => WORKTREE_SHA_RE.test(sha) && !/^0+$/.test(sha));
     const headRevs = headRevList ? ["HEAD"] : [];
-    const result = resolvedRef ? await runGit(["log", resolvedRef, "--date-order", "-n", "200", "--relative", "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", "--", "."], { cwd: gitCwd }) : await runGit(
+    const [realGitCwd, realToplevel] = await Promise.all([normalizeWorktreePath(gitCwd), normalizeWorktreePath(currentWorktreePath)]);
+    const scopePathspec = realToplevel !== "" && realGitCwd === realToplevel ? [] : ["."];
+    const skipArg = skip > 0 ? [`--skip=${skip}`] : [];
+    const result = resolvedRef ? await runGit(["log", resolvedRef, "--date-order", "-n", String(limit + 1), ...skipArg, "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", "--", ...scopePathspec], { cwd: gitCwd }) : await runGit(
       // --all은 refs/stash·refs/notes까지 그래프에 유입시키므로 브랜치/태그/원격 + 현재 HEAD + 워크트리 HEAD로 한정한다
-      ["log", "--branches", "--tags", "--remotes", "--date-order", "-n", "200", "--relative", "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", ...headRevs, ...worktreeRevs, "--", "."],
+      ["log", "--branches", "--tags", "--remotes", "--date-order", "-n", String(limit + 1), ...skipArg, "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", ...headRevs, ...worktreeRevs, "--", ...scopePathspec],
       { cwd: gitCwd }
     );
-    const commits = annotateHeadReachability(parseLogOutput(result.stdout), headRevList);
-    ctx.host.http.writeJson(res, 200, { commits, checkouts, ...result.truncated ? { truncated: true } : {} });
+    const parsedCommits = parseLogOutput(result.stdout);
+    const hasMore = parsedCommits.length > limit;
+    const commits = annotateHeadReachability(parsedCommits.slice(0, limit), headRevList);
+    ctx.host.http.writeJson(res, 200, { commits, checkouts, hasMore, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
     if (error instanceof GitExecutorError) {
       if (requestedRef !== void 0 && error.code === "non_zero_exit") {
@@ -978,7 +989,7 @@ async function handleRepositoryLog(req, res, ctx) {
         return;
       }
       if (error.code === "no_git_repo") {
-        ctx.host.http.writeJson(res, 200, { commits: [], checkouts: [] });
+        ctx.host.http.writeJson(res, 200, { commits: [], checkouts: [], hasMore: false });
         return;
       }
       if (error.code === "git_unavailable") {
@@ -986,7 +997,7 @@ async function handleRepositoryLog(req, res, ctx) {
         return;
       }
       if (isNoHeadError2(error)) {
-        ctx.host.http.writeJson(res, 200, { commits: [], checkouts: [] });
+        ctx.host.http.writeJson(res, 200, { commits: [], checkouts: [], hasMore: false });
         return;
       }
       ctx.host.http.writeJson(res, 500, { error: "git_failed" });