@dotobokuri/fleet-console 1.24.0 → 1.26.0

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

@@ -8,12 +8,12 @@ import fs from 'fs/promises';
 function definePlugin(definition) {
   return definition;
 }
-function registerRouter(ctx, path3, handler) {
-  ctx.registerRouter(normalizePath(path3), handler);
+function registerRouter(ctx, path4, handler) {
+  ctx.registerRouter(normalizePath(path4), handler);
 }
-function normalizePath(path3) {
-  if (path3.length === 0 || path3 === "/") return "/";
-  return path3;
+function normalizePath(path4) {
+  if (path4.length === 0 || path4 === "/") return "/";
+  return path4;
 }
 
 // ../../packages/core-process/src/hidden.ts
@@ -100,17 +100,22 @@ function runGit(args, opts) {
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function literalPathspec(relativePath) {
+  return `:(literal)${relativePath}`;
+}
 function normalizeNumstatPath(p) {
   const match = /^(.*?)\{[^}]* => ([^}]*)\}(.*)$/.exec(p);
-  if (!match) return p;
-  return (match[1] ?? "") + (match[2] ?? "") + (match[3] ?? "");
+  if (match) return (match[1] ?? "") + (match[2] ?? "") + (match[3] ?? "");
+  const plainRename = /^.+ => (.+)$/.exec(p);
+  return plainRename?.[1] ?? p;
 }
 function parseDiffFileList(nameStatusOutput, numstatOutput) {
   const numstatMap = /* @__PURE__ */ new Map();
   for (const line of numstatOutput.split("\n")) {
     const parts = line.split("	");
     if (parts.length < 3) continue;
-    const [adds, dels, filePath] = parts;
+    const [adds, dels] = parts;
+    const filePath = parts.length > 3 ? parts[parts.length - 1] : parts[2];
     if (!filePath) continue;
     numstatMap.set(normalizeNumstatPath(filePath), {
       additions: parseInt(adds ?? "0", 10) || 0,
@@ -123,11 +128,12 @@ function parseDiffFileList(nameStatusOutput, numstatOutput) {
     const [rawStatus, ...pathParts] = line.split("	");
     if (!rawStatus || pathParts.length === 0) continue;
     const statusChar = rawStatus.charAt(0).toUpperCase();
-    if (statusChar !== "M" && statusChar !== "A" && statusChar !== "D" && statusChar !== "R") continue;
+    if (statusChar !== "M" && statusChar !== "A" && statusChar !== "D" && statusChar !== "R" && statusChar !== "T") continue;
+    const oldPath = statusChar === "R" ? pathParts[0] : void 0;
     const filePath = statusChar === "R" ? pathParts[1] ?? pathParts[0] ?? "" : pathParts[0] ?? "";
     if (!filePath) continue;
     const nums = numstatMap.get(filePath) ?? { additions: 0, deletions: 0 };
-    files.push({ path: filePath, status: statusChar, ...nums });
+    files.push({ path: filePath, ...oldPath ? { oldPath } : {}, status: statusChar, ...nums });
   }
   return files;
 }
@@ -204,16 +210,16 @@ async function handleDiffChanged(req, res, ctx) {
     let truncated = false;
     try {
       const [nameStatusResult, numstatResult] = await Promise.all([
-        runGit(["diff", "HEAD", "--relative", "--name-status", "--diff-filter=MADR", "--", "."], { cwd: gitCwd }),
-        runGit(["diff", "HEAD", "--relative", "--numstat", "--diff-filter=MADR", "--", "."], { cwd: gitCwd })
+        runGit(["diff", "HEAD", "--relative", "--name-status", "--diff-filter=MADRT", "--", "."], { cwd: gitCwd }),
+        runGit(["diff", "HEAD", "--relative", "--numstat", "--diff-filter=MADRT", "--", "."], { cwd: gitCwd })
       ]);
       files = parseDiffFileList(nameStatusResult.stdout, numstatResult.stdout);
       truncated = nameStatusResult.truncated || numstatResult.truncated;
     } catch (err) {
       if (!isNoHeadError(err)) throw err;
       const [nsResult, nsNumstat] = await Promise.all([
-        runGit(["diff", "--cached", "--relative", "--name-status", "--diff-filter=MADR", "--", "."], { cwd: gitCwd }),
-        runGit(["diff", "--cached", "--relative", "--numstat", "--diff-filter=MADR", "--", "."], { cwd: gitCwd })
+        runGit(["diff", "--cached", "--relative", "--name-status", "--diff-filter=MADRT", "--", "."], { cwd: gitCwd }),
+        runGit(["diff", "--cached", "--relative", "--numstat", "--diff-filter=MADRT", "--", "."], { cwd: gitCwd })
       ]);
       files = parseDiffFileList(nsResult.stdout, nsNumstat.stdout);
       truncated = nsResult.truncated || nsNumstat.truncated;
@@ -320,10 +326,10 @@ async function handleDiffFile(req, res, ctx) {
     }
     let result;
     try {
-      result = await runGit(["diff", "HEAD", "--relative", "--unified=3", "--", relativePath], { cwd: gitCwd });
+      result = await runGit(["diff", "HEAD", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
     } catch (err) {
       if (!isNoHeadError(err)) throw err;
-      result = await runGit(["diff", "--cached", "--relative", "--unified=3", "--", relativePath], { cwd: gitCwd });
+      result = await runGit(["diff", "--cached", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
     }
     ctx.host.http.writeJson(res, 200, { content: result.stdout, truncated: result.truncated });
   } catch (error) {
@@ -344,6 +350,22 @@ var REF_RE = /^[0-9a-f]{7,40}$/i;
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function parseCommitMeta(output) {
+  const fields = output.split("\0");
+  if (fields.length < 6) return null;
+  const [authorName, authorEmail, rawAuthorAt, subject, rawParents, ...bodyParts] = fields;
+  if (authorName === void 0 || authorEmail === void 0 || rawAuthorAt === void 0 || subject === void 0 || rawParents === void 0) return null;
+  const authorAt = Number.parseInt(rawAuthorAt, 10);
+  if (!Number.isFinite(authorAt)) return null;
+  return {
+    authorName,
+    authorEmail,
+    authorAt,
+    subject,
+    body: bodyParts.join("\0").trimEnd(),
+    parents: rawParents.split(" ").filter(Boolean).map((full) => ({ full, short: full.slice(0, 9) }))
+  };
+}
 async function handleDiffCommit(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
@@ -381,7 +403,89 @@ async function handleDiffCommit(req, res, ctx) {
   }
   const { gitCwd } = cwdResult;
   try {
-    const result = await runGit(["show", ref, "--relative", "--unified=3", "--format=", "--", "."], { cwd: gitCwd });
+    const [metaResult, nameStatusResult, numstatResult] = await Promise.all([
+      runGit(["show", "-s", "--format=%an%x00%ae%x00%at%x00%s%x00%P%x00%b", ref], { cwd: gitCwd }),
+      runGit(["show", "--first-parent", "--format=", "--relative", "--name-status", "--diff-filter=MADRT", ref, "--", "."], { cwd: gitCwd }),
+      runGit(["show", "--first-parent", "--format=", "--relative", "--numstat", "--diff-filter=MADRT", ref, "--", "."], { cwd: gitCwd })
+    ]);
+    const meta = parseCommitMeta(metaResult.stdout);
+    if (!meta) {
+      ctx.host.http.writeJson(res, 500, { error: "git_failed" });
+      return;
+    }
+    ctx.host.http.writeJson(res, 200, {
+      meta,
+      files: parseDiffFileList(nameStatusResult.stdout, numstatResult.stdout),
+      ...metaResult.truncated || nameStatusResult.truncated || numstatResult.truncated ? { truncated: true } : {}
+    });
+  } catch (error) {
+    if (error instanceof GitExecutorError) {
+      if (error.code === "no_git_repo" || error.code === "git_unavailable") {
+        ctx.host.http.writeJson(res, 422, { error: error.code });
+        return;
+      }
+      ctx.host.http.writeJson(res, 500, { error: "git_failed" });
+      return;
+    }
+    throw error;
+  }
+}
+function isPlainObject3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resolveLiteralFilePath(gitCwd, rawPath) {
+  const relativePath = path2.normalize(rawPath);
+  const resolved = path2.resolve(gitCwd, relativePath);
+  if (relativePath === ".." || relativePath.startsWith(".." + path2.sep) || !resolved.startsWith(gitCwd + path2.sep)) return null;
+  return relativePath;
+}
+function literalPathspec2(relativePath) {
+  return `:(literal)${relativePath}`;
+}
+async function handleDiffCommitFile(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 (!isPlainObject3(body) || typeof body.theaterId !== "string" || typeof body.ref !== "string" || typeof body.filePath !== "string") {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  if (!REF_RE.test(body.ref)) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_ref" });
+    return;
+  }
+  if (!body.filePath) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_file_path" });
+    return;
+  }
+  if (body.oldPath !== void 0 && (typeof body.oldPath !== "string" || !body.oldPath)) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_file_path" });
+    return;
+  }
+  const theaterPath = ctx.host.paths.resolveTheaterPath(body.theaterId);
+  if (!theaterPath) {
+    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 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) {
+    ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
+    return;
+  }
+  try {
+    const result = await runGit(oldPath ? ["show", "--first-parent", body.ref, "-M", "--format=", "--unified=3", "--", literalPathspec2(oldPath), literalPathspec2(relativePath)] : ["show", "--first-parent", body.ref, "--format=", "--unified=3", "--", literalPathspec2(relativePath)], { cwd: cwdResult.gitCwd });
     ctx.host.http.writeJson(res, 200, { content: result.stdout, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
     if (error instanceof GitExecutorError) {
@@ -396,7 +500,7 @@ async function handleDiffCommit(req, res, ctx) {
   }
 }
 var WORKTREE_SHA_RE = /^[0-9a-f]{40}$/;
-function isPlainObject3(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseLogOutput(stdout) {
@@ -514,7 +618,7 @@ async function handleDiffLog(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject3(body)) {
+  if (!isPlainObject4(body)) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -592,6 +696,10 @@ var routes_default = definePlugin({
       await handleDiffCommit(req, res, ctx);
       return true;
     });
+    registerRouter(ctx, "commit-file", async ({ req, res }) => {
+      await handleDiffCommitFile(req, res, ctx);
+      return true;
+    });
   }
 });
 

package/dist/fleet-plugins/file-explorer/routes.mjs

@@ -205,7 +205,7 @@ async function collectContentsEntries(targetPath, theaterPath, opendir, stat, en
 }
 async function openDirectory(targetPath, opendir) {
   try {
-    return await opendir(targetPath);
+    return await opendir(targetPath, { bufferSize: DIRECTORY_ENTRY_CAP + 1 });
   } catch (error) {
     throw mapFsError(error);
   }