@dotobokuri/fleet-console 1.27.0 → 1.29.0

package/dist/fleet-plugins/{diff → repository}/routes.mjs

@@ -21,7 +21,7 @@ function withHidden(options) {
   return { ...options ?? {}, windowsHide: true };
 }
 
-// ../fleet-plugins/diff/server/git-executor.ts
+// ../fleet-plugins/repository/server/git-executor.ts
 var GitExecutorError = class extends Error {
   code;
   exitCode;
@@ -154,26 +154,10 @@ function isNoHeadError(error) {
   if (error.code !== "non_zero_exit") return false;
   return error.stderr.includes("unknown revision") || error.stderr.includes("bad revision");
 }
-async function resolveGitCwd(theaterPath, rawSubPath) {
-  if (rawSubPath === "") return { gitCwd: theaterPath };
-  const resolvedSub = path2.resolve(theaterPath, rawSubPath);
-  if (!resolvedSub.startsWith(theaterPath + path2.sep) && resolvedSub !== theaterPath) return null;
-  if (path2.normalize(rawSubPath).startsWith("..")) return null;
-  let realTheater;
-  let realSub;
-  try {
-    [realTheater, realSub] = await Promise.all([
-      fs.realpath(theaterPath),
-      fs.realpath(resolvedSub)
-    ]);
-  } catch {
-    return null;
-  }
-  const norm = realTheater.endsWith(path2.sep) ? realTheater : realTheater + path2.sep;
-  if (realSub !== realTheater && !realSub.startsWith(norm)) return null;
-  return { gitCwd: resolvedSub };
+function resolveGitCwd(theaterPath) {
+  return { gitCwd: theaterPath };
 }
-async function handleDiffChanged(req, res, ctx) {
+async function handleRepositoryChanged(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
     return;
@@ -183,7 +167,7 @@ async function handleDiffChanged(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject(body)) {
+  if (!isPlainObject(body) || "subPath" in body) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -197,12 +181,7 @@ async function handleDiffChanged(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const rawSubPath = typeof body.subPath === "string" ? body.subPath : "";
-  const cwdResult = await resolveGitCwd(theaterPath, rawSubPath);
-  if (!cwdResult) {
-    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
-    return;
-  }
+  const cwdResult = resolveGitCwd(theaterPath);
   const { gitCwd } = cwdResult;
   try {
     await ensureGitRepository(gitCwd);
@@ -242,7 +221,7 @@ async function handleDiffChanged(req, res, ctx) {
     throw error;
   }
 }
-async function handleDiffFile(req, res, ctx) {
+async function handleRepositoryFile(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
     return;
@@ -252,7 +231,7 @@ async function handleDiffFile(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject(body) || typeof body.filePath !== "string") {
+  if (!isPlainObject(body) || "subPath" in body || typeof body.filePath !== "string") {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -271,12 +250,7 @@ async function handleDiffFile(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const rawSubPath = typeof body.subPath === "string" ? body.subPath : "";
-  const cwdResult = await resolveGitCwd(theaterPath, rawSubPath);
-  if (!cwdResult) {
-    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
-    return;
-  }
+  const cwdResult = resolveGitCwd(theaterPath);
   const { gitCwd } = cwdResult;
   const rawFilePath = body.filePath;
   const resolvedFilePath = path2.resolve(gitCwd, rawFilePath);
@@ -345,7 +319,7 @@ async function handleDiffFile(req, res, ctx) {
   }
 }
 
-// ../fleet-plugins/diff/server/commit.ts
+// ../fleet-plugins/repository/server/commit.ts
 var REF_RE = /^[0-9a-f]{7,40}$/i;
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -366,7 +340,7 @@ function parseCommitMeta(output) {
     parents: rawParents.split(" ").filter(Boolean).map((full) => ({ full, short: full.slice(0, 9) }))
   };
 }
-async function handleDiffCommit(req, res, ctx) {
+async function handleRepositoryCommit(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
     return;
@@ -376,7 +350,7 @@ async function handleDiffCommit(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject2(body)) {
+  if (!isPlainObject2(body) || "subPath" in body) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -395,12 +369,7 @@ async function handleDiffCommit(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const rawSubPath = typeof body.subPath === "string" ? body.subPath : "";
-  const cwdResult = await resolveGitCwd(theaterPath, rawSubPath);
-  if (!cwdResult) {
-    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
-    return;
-  }
+  const cwdResult = resolveGitCwd(theaterPath);
   const { gitCwd } = cwdResult;
   try {
     const [metaResult, nameStatusResult, numstatResult] = await Promise.all([
@@ -442,7 +411,7 @@ function resolveLiteralFilePath(gitCwd, rawPath) {
 function literalPathspec2(relativePath) {
   return `:(literal)${relativePath}`;
 }
-async function handleDiffCommitFile(req, res, ctx) {
+async function handleRepositoryCommitFile(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
     return;
@@ -452,7 +421,7 @@ async function handleDiffCommitFile(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject3(body) || typeof body.theaterId !== "string" || typeof body.ref !== "string" || typeof body.filePath !== "string") {
+  if (!isPlainObject3(body) || "subPath" in body || typeof body.theaterId !== "string" || typeof body.ref !== "string" || typeof body.filePath !== "string") {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -473,11 +442,7 @@ async function handleDiffCommitFile(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const cwdResult = await resolveGitCwd(theaterPath, typeof body.subPath === "string" ? body.subPath : "");
-  if (!cwdResult) {
-    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
-    return;
-  }
+  const cwdResult = resolveGitCwd(theaterPath);
   const relativePath = resolveLiteralFilePath(cwdResult.gitCwd, body.filePath);
   const oldPath = typeof body.oldPath === "string" ? resolveLiteralFilePath(cwdResult.gitCwd, body.oldPath) : void 0;
   if (!relativePath || body.oldPath !== void 0 && !oldPath) {
@@ -500,17 +465,22 @@ async function handleDiffCommitFile(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]/;
 function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isCanonicalRepositoryRef(ref) {
+  return CANONICAL_REF_RE.test(ref) && !ref.startsWith("-") && !ref.includes("..") && !ref.includes("//") && !REF_METACHAR_RE.test(ref) && !ref.includes("@{") && !ref.endsWith("/") && !ref.endsWith(".") && !ref.split("/").some((part) => part.startsWith(".") || part.endsWith(".lock"));
+}
 function parseLogOutput(stdout) {
   if (!stdout.trim()) return [];
   const commits = [];
   for (const chunk of stdout.split("")) {
     const trimmed = chunk.trimStart();
     if (!trimmed) continue;
-    const lines = trimmed.split("\n");
-    const firstLine = lines[0] ?? "";
+    const lines2 = trimmed.split("\n");
+    const firstLine = lines2[0] ?? "";
     const fields = firstLine.split("\0");
     const fullHash = fields[0] ?? "";
     const shortHash = fields[1] ?? "";
@@ -608,7 +578,7 @@ async function readCurrentWorktreePath(gitCwd) {
     throw error;
   }
 }
-async function handleDiffLog(req, res, ctx) {
+async function handleRepositoryLog(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
     return;
@@ -618,7 +588,7 @@ async function handleDiffLog(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject4(body)) {
+  if (!isPlainObject4(body) || "subPath" in body) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -632,14 +602,15 @@ async function handleDiffLog(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const rawSubPath = typeof body.subPath === "string" ? body.subPath : "";
-  const cwdResult = await resolveGitCwd(theaterPath, rawSubPath);
-  if (!cwdResult) {
-    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
+  const cwdResult = resolveGitCwd(theaterPath);
+  const { gitCwd } = cwdResult;
+  const requestedRef = body.ref;
+  if (requestedRef !== void 0 && (typeof requestedRef !== "string" || !isCanonicalRepositoryRef(requestedRef))) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_ref" });
     return;
   }
-  const { gitCwd } = cwdResult;
   try {
+    const resolvedRef = typeof requestedRef === "string" ? (await runGit(["rev-parse", "--verify", "--end-of-options", `${requestedRef}^{commit}`], { cwd: gitCwd })).stdout.trim() : null;
     const [worktrees, currentWorktreePath, headRevList] = await Promise.all([
       runGit(["worktree", "list", "--porcelain"], { cwd: gitCwd }),
       readCurrentWorktreePath(gitCwd),
@@ -648,7 +619,7 @@ async function handleDiffLog(req, res, ctx) {
     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 = await runGit(
+    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(
       // --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, "--", "."],
       { cwd: gitCwd }
@@ -657,6 +628,10 @@ async function handleDiffLog(req, res, ctx) {
     ctx.host.http.writeJson(res, 200, { commits, checkouts, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
     if (error instanceof GitExecutorError) {
+      if (requestedRef !== void 0 && error.code === "non_zero_exit") {
+        ctx.host.http.writeJson(res, 400, { error: "invalid_ref" });
+        return;
+      }
       if (error.code === "no_git_repo") {
         ctx.host.http.writeJson(res, 200, { commits: [], checkouts: [] });
         return;
@@ -676,28 +651,104 @@ async function handleDiffLog(req, res, ctx) {
   }
 }
 
-// ../fleet-plugins/diff/routes.ts
+// ../fleet-plugins/repository/server/refs.ts
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function lines(stdout) {
+  return stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+}
+function parseRefItems(stdout, current) {
+  return lines(stdout).flatMap((line) => {
+    const [ref, label] = line.split("\0");
+    return ref && label ? [{ ref, label, current: ref === current }] : [];
+  });
+}
+async function readStashes(gitCwd) {
+  try {
+    return (await runGit(["stash", "list", "--format=%gd%x00%s"], { cwd: gitCwd })).stdout;
+  } catch (error) {
+    if (error instanceof GitExecutorError) return "";
+    throw error;
+  }
+}
+async function handleRepositoryRefs(req, res, ctx) {
+  if (req.method !== "POST") {
+    ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
+    return;
+  }
+  if (!ctx.host.security.isTerminalAuthorized(req)) {
+    ctx.host.http.writeJson(res, 401, { error: "unauthorized" });
+    return;
+  }
+  const body = await ctx.host.http.readJsonBody(req);
+  if (!isObject(body) || "subPath" in body || typeof body.theaterId !== "string") {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  const theaterPath = ctx.host.paths.resolveTheaterPath(body.theaterId);
+  if (!theaterPath) {
+    ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
+    return;
+  }
+  const resolved = resolveGitCwd(theaterPath);
+  try {
+    const [head, local, remote, tags, stashes] = await Promise.all([
+      runGit(["symbolic-ref", "--quiet", "HEAD"], { cwd: resolved.gitCwd, allowExitCodes: [1] }),
+      runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/heads"], { cwd: resolved.gitCwd }),
+      runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/remotes"], { cwd: resolved.gitCwd }),
+      runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/tags"], { cwd: resolved.gitCwd }),
+      readStashes(resolved.gitCwd)
+    ]);
+    const current = head.stdout.trim();
+    ctx.host.http.writeJson(res, 200, {
+      branches: parseRefItems(local.stdout, current),
+      remotes: parseRefItems(remote.stdout, current),
+      tags: parseRefItems(tags.stdout, current),
+      stashes: lines(stashes).map((line) => {
+        const [name, subject = ""] = line.split("\0");
+        return { name, subject };
+      })
+    });
+  } catch (error) {
+    if (error instanceof GitExecutorError && error.code === "no_git_repo") {
+      ctx.host.http.writeJson(res, 200, { branches: [], remotes: [], tags: [], stashes: [] });
+      return;
+    }
+    if (error instanceof GitExecutorError && error.code === "git_unavailable") {
+      ctx.host.http.writeJson(res, 422, { error: error.code });
+      return;
+    }
+    ctx.host.http.writeJson(res, 500, { error: "git_failed" });
+  }
+}
+
+// ../fleet-plugins/repository/routes.ts
 var routes_default = definePlugin({
-  id: "diff",
+  id: "repository",
   register(ctx) {
     registerRouter(ctx, "changed", async ({ req, res }) => {
-      await handleDiffChanged(req, res, ctx);
+      await handleRepositoryChanged(req, res, ctx);
       return true;
     });
     registerRouter(ctx, "file", async ({ req, res }) => {
-      await handleDiffFile(req, res, ctx);
+      await handleRepositoryFile(req, res, ctx);
       return true;
     });
     registerRouter(ctx, "log", async ({ req, res }) => {
-      await handleDiffLog(req, res, ctx);
+      await handleRepositoryLog(req, res, ctx);
+      return true;
+    });
+    registerRouter(ctx, "refs", async ({ req, res }) => {
+      await handleRepositoryRefs(req, res, ctx);
       return true;
     });
     registerRouter(ctx, "commit", async ({ req, res }) => {
-      await handleDiffCommit(req, res, ctx);
+      await handleRepositoryCommit(req, res, ctx);
       return true;
     });
     registerRouter(ctx, "commit-file", async ({ req, res }) => {
-      await handleDiffCommitFile(req, res, ctx);
+      await handleRepositoryCommitFile(req, res, ctx);
       return true;
     });
   }