@dotobokuri/fleet-console 1.50.1 → 1.52.0

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

@@ -1,20 +1,21 @@
 #!/usr/bin/env node
-import { spawn } from 'child_process';
-import 'fs';
-import path4 from 'path';
-import fs2 from 'fs/promises';
+import { spawn } from 'node:child_process';
+import fs2 from 'node:fs/promises';
+import path3 from 'node:path';
 
 // sdk/plugin/node.ts
 function definePlugin(definition) {
   return definition;
 }
-function registerRouter(ctx, path10, handler) {
-  ctx.registerRouter(normalizePath(path10), handler);
+function registerRouter(ctx, path9, handler) {
+  ctx.registerRouter(normalizePath(path9), handler);
 }
-function normalizePath(path10) {
-  if (path10.length === 0 || path10 === "/") return "/";
-  return path10;
+function normalizePath(path9) {
+  if (path9.length === 0 || path9 === "/") return "/";
+  return path9;
 }
+
+// ../../packages/core-process/src/bin-resolver.ts
 function withHidden(options) {
   return { ...options ?? {}, windowsHide: true };
 }
@@ -35,6 +36,7 @@ var GitExecutorError = class extends Error {
 var DEFAULT_TIMEOUT_MS = 3e4;
 var DEFAULT_MAX_BUFFER = 8 * 1024 * 1024;
 var STDERR_MAX_BUFFER = 1024 * 1024;
+var PROBE_TIMEOUT_MS = 5e3;
 var GIT_HARDENING_PREFIX = ["-c", "core.fsmonitor=false", "--no-optional-locks"];
 function sanitizeGitEnvironment(environment) {
   const sanitized = {};
@@ -129,8 +131,13 @@ function runGit(args, opts) {
           resolve({ stdout: stdout2, stderr, truncated, stderrTruncated });
           return;
         }
-        const isNoRepo = stderr.toLowerCase().includes("not a git repository");
-        reject(new GitExecutorError(isNoRepo ? "no_git_repo" : "non_zero_exit", stderr, code ?? void 0));
+        if (stderr.toLowerCase().includes("not a git repository")) {
+          reject(new GitExecutorError("no_git_repo", stderr, code ?? void 0));
+          return;
+        }
+        isInsideRepository(opts.cwd).then((inside) => {
+          reject(new GitExecutorError(inside ? "non_zero_exit" : "no_git_repo", stderr, code ?? void 0));
+        });
         return;
       }
       const stdout = Buffer.concat(stdoutChunks).toString("utf8");
@@ -138,21 +145,55 @@ function runGit(args, opts) {
     });
   });
 }
+function isInsideRepository(cwd) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (inside) => {
+      if (settled) return;
+      settled = true;
+      resolve(inside);
+    };
+    try {
+      const probeOptions = {
+        cwd,
+        env: sanitizeGitEnvironment(process.env),
+        stdio: "ignore",
+        shell: false
+      };
+      const probe = spawn("git", [...GIT_HARDENING_PREFIX, "rev-parse", "--git-dir"], withHidden(probeOptions));
+      const timer = setTimeout(() => {
+        probe.kill("SIGKILL");
+        done(true);
+      }, PROBE_TIMEOUT_MS);
+      timer.unref?.();
+      probe.on("error", () => {
+        clearTimeout(timer);
+        done(true);
+      });
+      probe.on("close", (code) => {
+        clearTimeout(timer);
+        done(code === 0);
+      });
+    } catch {
+      done(true);
+    }
+  });
+}
 function isPathContained(root, candidate) {
-  const relative = path4.relative(root, candidate);
-  return relative === "" || !path4.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path4.sep}`);
+  const relative = path3.relative(root, candidate);
+  return relative === "" || !path3.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path3.sep}`);
 }
 function isSelectableRepoRel(repoRel) {
   if (repoRel === "") return true;
-  if (path4.isAbsolute(repoRel)) return false;
-  const normalized = path4.normalize(repoRel);
-  return !normalized.startsWith("-") && normalized !== ".." && !normalized.startsWith(`..${path4.sep}`);
+  if (path3.isAbsolute(repoRel)) return false;
+  const normalized = path3.normalize(repoRel);
+  return !normalized.startsWith("-") && normalized !== ".." && !normalized.startsWith(`..${path3.sep}`);
 }
 
 // ../fleet-plugins/repository/server/git-marker.ts
 var GITDIR_PREFIX = "gitdir:";
 async function resolveContainedGitDir(repoDir, realTheaterPath) {
-  const markerPath = path4.join(repoDir, ".git");
+  const markerPath = path3.join(repoDir, ".git");
   let marker;
   try {
     marker = await fs2.stat(markerPath);
@@ -171,7 +212,7 @@ async function resolveContainedGitDir(repoDir, realTheaterPath) {
     if (!line) return null;
     const target = line.trim().slice(GITDIR_PREFIX.length).trim();
     if (!target) return null;
-    gitDir = path4.resolve(repoDir, target);
+    gitDir = path3.resolve(repoDir, target);
   } else if (marker.isDirectory()) {
     gitDir = markerPath;
   } else {
@@ -186,7 +227,7 @@ async function resolveContainedGitDir(repoDir, realTheaterPath) {
   if (!isPathContained(realTheaterPath, realGitDir)) return null;
   let commonRaw = null;
   try {
-    commonRaw = await fs2.readFile(path4.join(realGitDir, "commondir"), "utf8");
+    commonRaw = await fs2.readFile(path3.join(realGitDir, "commondir"), "utf8");
   } catch {
   }
   if (commonRaw !== null) {
@@ -194,7 +235,7 @@ async function resolveContainedGitDir(repoDir, realTheaterPath) {
     if (!commonTarget) return null;
     let realCommonDir;
     try {
-      realCommonDir = await fs2.realpath(path4.resolve(realGitDir, commonTarget));
+      realCommonDir = await fs2.realpath(path3.resolve(realGitDir, commonTarget));
     } catch {
       return null;
     }
@@ -266,9 +307,9 @@ var InvalidRepoError = class extends Error {
 };
 async function resolveGitCwd(theaterPath, repoRel = "") {
   if (repoRel === void 0 || repoRel === "") return { gitCwd: theaterPath };
-  if (typeof repoRel !== "string" || path4.isAbsolute(repoRel)) throw new InvalidRepoError("Repository path must be relative");
+  if (typeof repoRel !== "string" || path3.isAbsolute(repoRel)) throw new InvalidRepoError("Repository path must be relative");
   if (!isSelectableRepoRel(repoRel)) throw new InvalidRepoError("Repository path is invalid");
-  const resolved = path4.resolve(theaterPath, path4.normalize(repoRel));
+  const resolved = path3.resolve(theaterPath, path3.normalize(repoRel));
   if (!isPathContained(theaterPath, resolved)) throw new InvalidRepoError("Repository path escapes Theater");
   let realTheater;
   let realRepo;
@@ -399,12 +440,12 @@ async function handleRepositoryFile(req, res, ctx) {
   }
   const { gitCwd } = cwdResult;
   const rawFilePath = body.filePath;
-  const resolvedFilePath = path4.resolve(gitCwd, rawFilePath);
-  if (!resolvedFilePath.startsWith(gitCwd + path4.sep) && resolvedFilePath !== gitCwd) {
+  const resolvedFilePath = path3.resolve(gitCwd, rawFilePath);
+  if (!resolvedFilePath.startsWith(gitCwd + path3.sep) && resolvedFilePath !== gitCwd) {
     ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
     return;
   }
-  const relativePath = path4.normalize(rawFilePath);
+  const relativePath = path3.normalize(rawFilePath);
   if (relativePath.startsWith("..")) {
     ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
     return;
@@ -422,7 +463,7 @@ async function handleRepositoryFile(req, res, ctx) {
         ctx.host.http.writeJson(res, 404, { error: "file_not_found" });
         return;
       }
-      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path4.sep)) {
+      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path3.sep)) {
         ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
         return;
       }
@@ -438,7 +479,7 @@ async function handleRepositoryFile(req, res, ctx) {
         fs2.realpath(gitCwd),
         fs2.realpath(resolvedFilePath)
       ]);
-      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path4.sep)) {
+      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path3.sep)) {
         ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
         return;
       }
@@ -558,9 +599,9 @@ function isPlainObject3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function resolveLiteralFilePath(gitCwd, rawPath) {
-  const relativePath = path4.normalize(rawPath);
-  const resolved = path4.resolve(gitCwd, relativePath);
-  if (relativePath === ".." || relativePath.startsWith(".." + path4.sep) || !resolved.startsWith(gitCwd + path4.sep)) return null;
+  const relativePath = path3.normalize(rawPath);
+  const resolved = path3.resolve(gitCwd, relativePath);
+  if (relativePath === ".." || relativePath.startsWith(".." + path3.sep) || !resolved.startsWith(gitCwd + path3.sep)) return null;
   return relativePath;
 }
 function literalPathspec2(relativePath) {
@@ -746,9 +787,9 @@ function isPlainObject5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function resolveLiteralFilePath2(gitCwd, rawPath) {
-  const relativePath = path4.normalize(rawPath);
-  const resolved = path4.resolve(gitCwd, relativePath);
-  if (relativePath === ".." || relativePath.startsWith(".." + path4.sep) || !resolved.startsWith(gitCwd + path4.sep)) return null;
+  const relativePath = path3.normalize(rawPath);
+  const resolved = path3.resolve(gitCwd, relativePath);
+  if (relativePath === ".." || relativePath.startsWith(".." + path3.sep) || !resolved.startsWith(gitCwd + path3.sep)) return null;
   return relativePath;
 }
 function literalPathspec3(relativePath) {
@@ -849,8 +890,8 @@ async function resolveGitIdentity(gitCwd) {
     runGit(["rev-parse", "--git-common-dir"], { cwd: gitCwd })
   ]);
   const [gitDir, commonDir] = await Promise.all([
-    fs2.realpath(path4.resolve(gitCwd, gitDirResult.stdout.trim())),
-    fs2.realpath(path4.resolve(gitCwd, commonDirResult.stdout.trim()))
+    fs2.realpath(path3.resolve(gitCwd, gitDirResult.stdout.trim())),
+    fs2.realpath(path3.resolve(gitCwd, commonDirResult.stdout.trim()))
   ]);
   return { gitDir, commonDir };
 }
@@ -858,7 +899,7 @@ async function readLastFetchAt(gitDirs) {
   let newest = null;
   for (const gitDir of gitDirs) {
     try {
-      const stats = await fs2.stat(path4.join(gitDir, "FETCH_HEAD"));
+      const stats = await fs2.stat(path3.join(gitDir, "FETCH_HEAD"));
       if (stats.size === 0) continue;
       if (!newest || stats.mtime.getTime() > newest.getTime()) newest = stats.mtime;
     } catch (error) {
@@ -959,9 +1000,9 @@ async function fetchRepository(gitCwd) {
 async function fetchHeadCandidates(identity) {
   const candidates = /* @__PURE__ */ new Set([identity.gitDir, identity.commonDir]);
   try {
-    const worktreesDir = path4.join(identity.commonDir, "worktrees");
+    const worktreesDir = path3.join(identity.commonDir, "worktrees");
     for (const entry of await fs2.readdir(worktreesDir, { withFileTypes: true })) {
-      if (entry.isDirectory()) candidates.add(path4.join(worktreesDir, entry.name));
+      if (entry.isDirectory()) candidates.add(path3.join(worktreesDir, entry.name));
     }
   } catch (error) {
     if (error.code !== "ENOENT") throw error;
@@ -1050,6 +1091,14 @@ async function handleRepositoryFetch(req, res, ctx) {
 var WORKTREE_SHA_RE = /^[0-9a-f]{40}$/;
 var CANONICAL_REF_RE = /^refs\/(?:heads|remotes|tags)\//;
 var REF_METACHAR_RE = /[~^:?*\[\\\s\x00-\x1f\x7f]/;
+var LOG_PRETTY_FORMAT = "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P%x00%<(8,trunc)%b";
+var LOG_FIELD_COUNT = 9;
+var FULL_HASH_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+var LOG_ORDER_ARGS = { topo: "--topo-order", date: "--date-order" };
+function resolveLogOrder(requested) {
+  if (requested === void 0) return "topo";
+  return requested === "topo" || requested === "date" ? requested : null;
+}
 function isPlainObject7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1073,9 +1122,10 @@ function parseLogOutput(stdout) {
     const authorAt = Number.parseInt(fields[5] ?? "0", 10);
     const refsRaw = fields[6] ?? "";
     const parentsRaw = fields[7] ?? "";
-    if (!fullHash) continue;
+    if (fields.length < LOG_FIELD_COUNT || !FULL_HASH_RE.test(fullHash)) continue;
     const refs = refsRaw.split(",").map((r) => r.trim()).filter(Boolean);
     const parents = parentsRaw.split(" ").map((p) => p.trim()).filter(Boolean);
+    const hasBody = (fields[8] ?? "").trim() !== "";
     commits.push({
       shortHash,
       fullHash,
@@ -1085,7 +1135,8 @@ function parseLogOutput(stdout) {
       authorAt: Number.isFinite(authorAt) ? authorAt : 0,
       refs,
       parents,
-      onHead: true
+      onHead: true,
+      hasBody
     });
   }
   return commits;
@@ -1184,6 +1235,11 @@ async function handleRepositoryLog(req, res, ctx) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
+  const order = resolveLogOrder(body.order);
+  if (order === null) {
+    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) {
@@ -1224,13 +1280,14 @@ async function handleRepositoryLog(req, res, ctx) {
     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(
+    const orderArg = LOG_ORDER_ARGS[order];
+    const result = resolvedRef ? await runGit(["log", resolvedRef, orderArg, "-n", String(limit + 1), ...skipArg, "--decorate=full", LOG_PRETTY_FORMAT, "--", ...scopePathspec], { cwd: gitCwd }) : await runGit(
       // --all은 refs/stash·refs/notes까지 그래프에 유입시키므로 브랜치/태그/원격 + 현재 HEAD + 워크트리 HEAD로 한정한다
-      ["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],
+      ["log", "--branches", "--tags", "--remotes", orderArg, "-n", String(limit + 1), ...skipArg, "--decorate=full", LOG_PRETTY_FORMAT, ...headRevs, ...worktreeRevs, "--", ...scopePathspec],
       { cwd: gitCwd }
     );
     const parsedCommits = parseLogOutput(result.stdout);
-    const hasMore = parsedCommits.length > limit;
+    const hasMore = parsedCommits.length > limit || result.truncated && parsedCommits.length > 0;
     const commits = annotateHeadReachability(parsedCommits.slice(0, limit), headRevList);
     ctx.host.http.writeJson(res, 200, { commits, checkouts, hasMore, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
@@ -1377,18 +1434,18 @@ async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDep
   if (repos.length >= cap) return true;
   if (visits.remaining <= 0) return true;
   visits.remaining -= 1;
-  const relPath = path4.relative(realTheaterPath, dir);
+  const relPath = path3.relative(realTheaterPath, dir);
   const gitDir = isSelectableRepoRel(relPath) ? await resolveContainedGitDir(dir, realTheaterPath) : null;
   let linkedWorktree = false;
   if (gitDir !== null) {
     try {
-      await fs2.access(path4.join(gitDir, "commondir"));
+      await fs2.access(path3.join(gitDir, "commondir"));
       linkedWorktree = true;
     } catch {
     }
   }
   if (gitDir !== null && !linkedWorktree) {
-    repos.push({ relPath, name: relPath === "" ? path4.basename(realTheaterPath) : path4.basename(dir), repoDir: dir });
+    repos.push({ relPath, name: relPath === "" ? path3.basename(realTheaterPath) : path3.basename(dir), repoDir: dir });
     if (repos.length >= cap) return true;
   }
   if (currentDepth >= maxDepth) return false;
@@ -1399,7 +1456,7 @@ async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDep
     while (dirent !== null) {
       if (repos.length >= cap || visits.remaining <= 0) return true;
       if (dirent.isDirectory() && dirent.name !== "node_modules" && dirent.name !== ".git") {
-        const childPath = path4.join(dir, dirent.name);
+        const childPath = path3.join(dir, dirent.name);
         let realChildPath;
         try {
           realChildPath = await fs2.realpath(childPath);
@@ -1478,7 +1535,7 @@ async function handleRepositoryRepos(req, res, ctx) {
     }
   }
   if (rootIsRepo) {
-    repos.push({ relPath: "", name: path4.basename(theaterPath), branch: await resolveRepoBranch(theaterPath), kind: "root" });
+    repos.push({ relPath: "", name: path3.basename(theaterPath), branch: await resolveRepoBranch(theaterPath), kind: "root" });
     seen.add("");
   }
   const scanned = [];
@@ -1637,12 +1694,12 @@ async function handleRepositoryWorktrees(req, res, ctx) {
         continue;
       }
       if (!isPathContained(realTheaterPath, realWorktree)) continue;
-      const relPath = path4.relative(realTheaterPath, realWorktree);
+      const relPath = path3.relative(realTheaterPath, realWorktree);
       if (!isSelectableRepoRel(relPath) || seen.has(relPath)) continue;
       if (await resolveContainedGitDir(realWorktree, realTheaterPath) === null) continue;
       worktrees.push({
         relPath,
-        name: path4.basename(realWorktree),
+        name: path3.basename(realWorktree),
         branch: worktree.branch ?? worktree.sha.slice(0, 7),
         current: realWorktree === realGitCwd
       });