@dotobokuri/fleet-console 1.17.1 → 1.19.0

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

@@ -1,19 +1,27 @@
 #!/usr/bin/env node
-import fs from 'fs/promises';
-import path from 'path';
 import { spawn } from 'child_process';
+import 'fs';
+import path3 from 'path';
+import fs from 'fs/promises';
 
 // sdk/plugin/node.ts
 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
+function withHidden(options) {
+  return { ...options ?? {}, windowsHide: true };
+}
+
+// ../fleet-plugins/diff/server/git-executor.ts
 var GitExecutorError = class extends Error {
   code;
   exitCode;
@@ -34,7 +42,7 @@ function runGit(args, opts) {
   return new Promise((resolve, reject) => {
     let child;
     try {
-      child = spawn("git", args, { cwd: opts.cwd, shell: false, windowsHide: true });
+      child = spawn("git", args, withHidden({ cwd: opts.cwd, shell: false }));
     } catch (error) {
       const code = error.code === "ENOENT" ? "git_unavailable" : "spawn_failed";
       reject(new GitExecutorError(code, String(error)));
@@ -89,8 +97,6 @@ function runGit(args, opts) {
     });
   });
 }
-
-// ../fleet-plugins/diff/server/diff.ts
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -141,9 +147,9 @@ function isNoHeadError(error) {
 }
 async function resolveGitCwd(theaterPath, rawSubPath) {
   if (rawSubPath === "") return { gitCwd: theaterPath };
-  const resolvedSub = path.resolve(theaterPath, rawSubPath);
-  if (!resolvedSub.startsWith(theaterPath + path.sep) && resolvedSub !== theaterPath) return null;
-  if (path.normalize(rawSubPath).startsWith("..")) return null;
+  const resolvedSub = path3.resolve(theaterPath, rawSubPath);
+  if (!resolvedSub.startsWith(theaterPath + path3.sep) && resolvedSub !== theaterPath) return null;
+  if (path3.normalize(rawSubPath).startsWith("..")) return null;
   let realTheater;
   let realSub;
   try {
@@ -154,7 +160,7 @@ async function resolveGitCwd(theaterPath, rawSubPath) {
   } catch {
     return null;
   }
-  const norm = realTheater.endsWith(path.sep) ? realTheater : realTheater + path.sep;
+  const norm = realTheater.endsWith(path3.sep) ? realTheater : realTheater + path3.sep;
   if (realSub !== realTheater && !realSub.startsWith(norm)) return null;
   return { gitCwd: resolvedSub };
 }
@@ -263,12 +269,12 @@ async function handleDiffFile(req, res, ctx) {
   }
   const { gitCwd } = cwdResult;
   const rawFilePath = body.filePath;
-  const resolvedFilePath = path.resolve(gitCwd, rawFilePath);
-  if (!resolvedFilePath.startsWith(gitCwd + path.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 = path.normalize(rawFilePath);
+  const relativePath = path3.normalize(rawFilePath);
   if (relativePath.startsWith("..")) {
     ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
     return;
@@ -286,7 +292,7 @@ async function handleDiffFile(req, res, ctx) {
         ctx.host.http.writeJson(res, 404, { error: "file_not_found" });
         return;
       }
-      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path.sep)) {
+      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path3.sep)) {
         ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
         return;
       }
@@ -302,7 +308,7 @@ async function handleDiffFile(req, res, ctx) {
         fs.realpath(gitCwd),
         fs.realpath(resolvedFilePath)
       ]);
-      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path.sep)) {
+      if (realFile !== realGitCwd && !realFile.startsWith(realGitCwd + path3.sep)) {
         ctx.host.http.writeJson(res, 403, { error: "path_outside_theater" });
         return;
       }
@@ -328,10 +334,169 @@ async function handleDiffFile(req, res, ctx) {
     throw error;
   }
 }
+
+// ../fleet-plugins/diff/server/commit.ts
+var REF_RE = /^[0-9a-f]{7,40}$/i;
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+async function handleDiffCommit(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 (!isPlainObject2(body)) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  const theaterId = body.theaterId;
+  if (typeof theaterId !== "string") {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  const ref = body.ref;
+  if (typeof ref !== "string" || !REF_RE.test(ref)) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_ref" });
+    return;
+  }
+  const theaterPath = ctx.host.paths.resolveTheaterPath(theaterId);
+  if (!theaterPath) {
+    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 { gitCwd } = cwdResult;
+  try {
+    const result = await runGit(["show", ref, "--unified=3", "--format="], { cwd: gitCwd });
+    ctx.host.http.writeJson(res, 200, { content: result.stdout, ...result.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;
+  }
+}
+
+// ../fleet-plugins/diff/server/log.ts
+function isPlainObject3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+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 fields = firstLine.split("\0");
+    const fullHash = fields[0] ?? "";
+    const shortHash = fields[1] ?? "";
+    const subject = fields[2] ?? "";
+    const authorName = fields[3] ?? "";
+    const relTime = fields[4] ?? "";
+    const refsRaw = fields[5] ?? "";
+    const parentsRaw = fields[6] ?? "";
+    if (!fullHash) continue;
+    const refs = refsRaw.split(",").map((r) => r.trim()).filter(Boolean);
+    const parents = parentsRaw.split(" ").map((p) => p.trim()).filter(Boolean);
+    let additions = 0;
+    let deletions = 0;
+    for (const line of lines.slice(1)) {
+      if (!line.trim()) continue;
+      const parts = line.split("	");
+      if (parts.length < 2) continue;
+      const a = parseInt(parts[0] ?? "0", 10);
+      const d = parseInt(parts[1] ?? "0", 10);
+      if (!isNaN(a)) additions += a;
+      if (!isNaN(d)) deletions += d;
+    }
+    commits.push({ shortHash, fullHash, subject, authorName, relTime, refs, parents, additions, deletions });
+  }
+  return commits;
+}
+function isNoHeadError2(error) {
+  if (!(error instanceof GitExecutorError)) return false;
+  if (error.code !== "non_zero_exit") return false;
+  return error.stderr.includes("unknown revision") || error.stderr.includes("bad revision");
+}
+async function handleDiffLog(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)) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
+  const theaterId = body.theaterId;
+  if (typeof theaterId !== "string") {
+    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" });
+    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 { gitCwd } = cwdResult;
+  try {
+    const result = await runGit(
+      ["log", "-n", "50", "--numstat", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%D%x00%P"],
+      { cwd: gitCwd }
+    );
+    const commits = parseLogOutput(result.stdout);
+    ctx.host.http.writeJson(res, 200, { commits, ...result.truncated ? { truncated: true } : {} });
+  } catch (error) {
+    if (error instanceof GitExecutorError) {
+      if (error.code === "no_git_repo") {
+        ctx.host.http.writeJson(res, 200, { commits: [] });
+        return;
+      }
+      if (error.code === "git_unavailable") {
+        ctx.host.http.writeJson(res, 422, { error: error.code });
+        return;
+      }
+      if (isNoHeadError2(error)) {
+        ctx.host.http.writeJson(res, 200, { commits: [] });
+        return;
+      }
+      ctx.host.http.writeJson(res, 500, { error: "git_failed" });
+      return;
+    }
+    throw error;
+  }
+}
 var REPOS_CAP = 200;
 var HARD_CAP_DEPTH = 8;
 var DEFAULT_DEPTH = 3;
-function isPlainObject2(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function resolveRepoBranch(repoDir) {
@@ -347,15 +512,49 @@ async function resolveRepoBranch(repoDir) {
     return "unknown";
   }
 }
+async function detectWorktreeParent(dir, gitFileContent) {
+  const match = gitFileContent.trim().match(/^gitdir:\s*(.+)$/m);
+  if (!match) return null;
+  const rawPointer = match[1].trim();
+  const resolvedGitdir = path3.normalize(
+    path3.isAbsolute(rawPointer) ? rawPointer : path3.resolve(dir, rawPointer)
+  );
+  if (resolvedGitdir.includes(`${path3.sep}modules${path3.sep}`)) {
+    return null;
+  }
+  const worktreesSegment = `${path3.sep}.git${path3.sep}worktrees${path3.sep}`;
+  const wtIdx = resolvedGitdir.indexOf(worktreesSegment);
+  if (wtIdx === -1) {
+    return null;
+  }
+  const parentAbsRaw = resolvedGitdir.slice(0, wtIdx);
+  let parentAbs;
+  try {
+    parentAbs = await fs.realpath(parentAbsRaw);
+  } catch {
+    parentAbs = path3.normalize(parentAbsRaw);
+  }
+  return { isWorktree: true, parentAbs };
+}
 async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDepth, repos, cap = REPOS_CAP) {
   if (repos.length >= cap) return true;
-  const gitPath = path.join(dir, ".git");
+  const gitPath = path3.join(dir, ".git");
   try {
-    await fs.stat(gitPath);
-    const relPath = path.relative(theaterPath, dir);
-    const name = relPath === "" ? path.basename(theaterPath) : path.basename(dir);
+    const gitStat = await fs.stat(gitPath);
+    const relPath = path3.relative(theaterPath, dir);
+    const name = relPath === "" ? path3.basename(theaterPath) : path3.basename(dir);
     const branch = await resolveRepoBranch(dir);
-    repos.push({ relPath, name, branch });
+    if (gitStat.isFile()) {
+      const content = await fs.readFile(gitPath, "utf8");
+      const worktreeResult = await detectWorktreeParent(dir, content);
+      if (worktreeResult) {
+        repos.push({ relPath, name, branch, isWorktree: true, _wtParentAbs: worktreeResult.parentAbs });
+      } else {
+        repos.push({ relPath, name, branch });
+      }
+    } else {
+      repos.push({ relPath, name, branch });
+    }
     if (repos.length >= cap) return true;
   } catch {
   }
@@ -373,7 +572,7 @@ async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDep
             dirent = await dirHandle.read();
             continue;
           }
-          const childPath = path.join(dir, childName);
+          const childPath = path3.join(dir, childName);
           let realChildPath;
           try {
             realChildPath = await fs.realpath(childPath);
@@ -381,7 +580,7 @@ async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDep
             dirent = await dirHandle.read();
             continue;
           }
-          const normalizedReal = realTheaterPath.endsWith(path.sep) ? realTheaterPath : realTheaterPath + path.sep;
+          const normalizedReal = realTheaterPath.endsWith(path3.sep) ? realTheaterPath : realTheaterPath + path3.sep;
           if (realChildPath !== realTheaterPath && !realChildPath.startsWith(normalizedReal)) {
             dirent = await dirHandle.read();
             continue;
@@ -405,6 +604,26 @@ async function scanRepos(theaterPath, realTheaterPath, dir, currentDepth, maxDep
     return false;
   }
 }
+function resolveWorktreeParents(raw, realTheaterPath) {
+  const absToRelPath = /* @__PURE__ */ new Map();
+  for (const entry of raw) {
+    const absDir = path3.normalize(
+      entry.relPath === "" ? realTheaterPath : path3.join(realTheaterPath, entry.relPath)
+    );
+    absToRelPath.set(absDir, entry.relPath);
+  }
+  return raw.map((entry) => {
+    const { _wtParentAbs, ...rest } = entry;
+    if (_wtParentAbs && entry.isWorktree) {
+      const normalizedParent = path3.normalize(_wtParentAbs);
+      const parentRelPath = absToRelPath.get(normalizedParent);
+      if (parentRelPath !== void 0) {
+        return { ...rest, worktreeOf: parentRelPath };
+      }
+    }
+    return rest;
+  });
+}
 async function handleDiffRepos(req, res, ctx) {
   if (req.method !== "POST") {
     ctx.host.http.writeJson(res, 405, { error: "Method not allowed" });
@@ -415,7 +634,7 @@ async function handleDiffRepos(req, res, ctx) {
     return;
   }
   const body = await ctx.host.http.readJsonBody(req);
-  if (!isPlainObject2(body)) {
+  if (!isPlainObject4(body)) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
@@ -438,14 +657,15 @@ async function handleDiffRepos(req, res, ctx) {
     ctx.host.http.writeJson(res, 404, { error: "theater_not_found" });
     return;
   }
-  const repos = [];
-  const truncated = await scanRepos(theaterPath, realTheaterPath, theaterPath, 0, maxDepth, repos);
-  repos.sort((a, b) => {
+  const raw = [];
+  const truncated = await scanRepos(theaterPath, realTheaterPath, theaterPath, 0, maxDepth, raw);
+  const resolved = resolveWorktreeParents(raw, realTheaterPath);
+  resolved.sort((a, b) => {
     if (a.relPath === "") return -1;
     if (b.relPath === "") return 1;
     return a.relPath.localeCompare(b.relPath);
   });
-  const result = { repos, ...truncated ? { truncated: true } : {} };
+  const result = { repos: resolved, ...truncated ? { truncated: true } : {} };
   ctx.host.http.writeJson(res, 200, result);
 }
 
@@ -465,6 +685,14 @@ var routes_default = definePlugin({
       await handleDiffFile(req, res, ctx);
       return true;
     });
+    registerRouter(ctx, "log", async ({ req, res }) => {
+      await handleDiffLog(req, res, ctx);
+      return true;
+    });
+    registerRouter(ctx, "commit", async ({ req, res }) => {
+      await handleDiffCommit(req, res, ctx);
+      return true;
+    });
   }
 });
 

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

@@ -243,7 +243,7 @@ var ImageServeError = class extends Error {
     this.code = code;
   }
 };
-var IMAGE_SIZE_CAP = 4 * 1024 * 1024;
+var IMAGE_SIZE_CAP = 16 * 1024 * 1024;
 var MIME_ALLOWLIST = {
   ".png": "image/png",
   ".jpg": "image/jpeg",