pan-stack-cli 0.1.5 → 0.2.1

package/lib/git/git-clone.js

@@ -1,66 +1,201 @@
 #!/usr/bin/env node
 /*
  * Clone PAN Stack project repositories from a small clone manifest.
- *
- * The parser intentionally supports only the manifest shape documented in
- * PAN_STACK.md. It avoids external dependencies so the script can run anywhere
- * Node.js and Git are available.
+ * Compact summary table (giống pull/push/fetch): repo · result · note — KHÔNG in
+ * [warn]/lỗi rời rạc theo từng repo, chỉ tổng hợp cuối (cloned · đã có sẵn · không
+ * có quyền · không tìm thấy · lỗi khác).
  */
 
 const fs = require("fs");
 const path = require("path");
 const { spawnSync } = require("child_process");
 const { spawnOptions } = require("../platform");
-const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
+const { parseCommonArgs, loadManifestRepos, resolveProjectWorkspace, printCommonOptions } = require("./helpers/cli");
+const { looksLikeGitUrl, repoNameFromUrl, appendRepository } = require("./helpers/manifest");
+const { printSummary, statusBadge, bulkColumns } = require("./helpers/bulk-report");
+const colors = require("./helpers/colors");
+const { t } = require("../i18n");
+
+// Dòng lỗi ngắn gọn cho cột "note" — bỏ qua dòng tiến trình "Cloning into '<path dài>'..." (luôn
+// là dòng đầu của git clone, không có ý nghĩa), ưu tiên dòng thật (fatal:/remote:).
+function shortCloneError(stderr) {
+  const lines = stderr.split("\n").map((l) => l.trim()).filter(Boolean);
+  const meaningful = lines.find((l) => /^(fatal:|remote:|error:)/i.test(l)) || lines[lines.length - 1] || lines[0] || "";
+  return meaningful.slice(0, 100);
+}
+
+// Phân loại lỗi clone từ stderr — KHÔNG in message thô cho user, chỉ dùng để chọn nhãn tổng hợp.
+function classifyCloneError(stderr) {
+  if (/permission denied|authentication failed|access denied|403|could not read username|invalid username or password/i.test(stderr)) {
+    return "no-access";
+  }
+  if (/repository .* not found|not found|does not exist|404/i.test(stderr)) {
+    return "not-found";
+  }
+  return "failed";
+}
 
 function cloneRepo({ name, url, destination, dryRun }) {
   if (fs.existsSync(destination)) {
-    console.log(`[skip] ${name}: ${destination} already exists`);
-    return;
+    return { name, exists: true };
   }
 
-  fs.mkdirSync(path.dirname(destination), { recursive: true });
-  const command = ["git", "clone", url, destination];
   if (dryRun) {
-    console.log(`[dry-run] ${command.join(" ")}`);
-    return;
+    console.log(colors.dim(`[dry-run] git clone ${url} ${destination}`));
+    return { name, dryRun: true };
   }
 
-  console.log(`[clone] ${name}: ${url} -> ${destination}`);
-  const result = spawnSync(command[0], command.slice(1), spawnOptions({ stdio: "inherit" }));
-  if (result.status !== 0) {
-    console.log(`[warn] ${name}: clone failed, check repo access or url`);
-  }
+  fs.mkdirSync(path.dirname(destination), { recursive: true });
+  process.stdout.write(colors.dim(`  ⇩ ${name} ... `));
+  const result = spawnSync("git", ["clone", url, destination], spawnOptions({ encoding: "utf8" }));
+  const ok = result.status === 0;
+  const stderr = (result.stderr || "").trim();
+  const category = ok ? "ok" : classifyCloneError(stderr);
+  const shortMsg = ok ? t("CLONE_STATUS_CLONED")
+    : category === "no-access" ? t("CLONE_STATUS_NO_ACCESS")
+    : category === "not-found" ? t("CLONE_STATUS_NOT_FOUND")
+    : t("BULK_STATUS_FAILED");
+  console.log((ok ? colors.green : category === "no-access" ? colors.yellow : colors.red)(shortMsg));
+
+  return {
+    name,
+    status: result.status,
+    category,
+    error: !ok ? shortCloneError(stderr) : "",
+  };
+}
+
+function row(r) {
+  if (r.dryRun) return { repo: r.name, result: colors.dim(t("BULK_STATUS_DRY_RUN")), note: "" };
+  if (r.exists) return { repo: r.name, result: statusBadge("skip", t("CLONE_STATUS_EXISTS")), note: "" };
+  if (!r.error) return { repo: r.name, result: statusBadge("ok", t("CLONE_STATUS_CLONED")), note: "" };
+  const label =
+    r.category === "no-access" ? t("CLONE_STATUS_NO_ACCESS")
+    : r.category === "not-found" ? t("CLONE_STATUS_NOT_FOUND")
+    : t("BULK_STATUS_FAILED");
+  const kind = r.category === "no-access" ? "warn" : "fail";
+  return { repo: r.name, result: statusBadge(kind, label), note: colors.dim(r.error) };
 }
 
 function printHelp() {
   console.log(`usage: git-clone.js [--base-dir BASE_DIR] [--dry-run] [manifest]
+       git-clone.js <git-url> [--dry-run]
+
+Không tham số (hoặc [manifest]) → clone TẤT CẢ repo trong manifest (clone all).
+Có <git-url> (https://…, git@host:…, hoặc kết thúc .git) → tự tách tên dự án từ
+URL, THÊM 1 entry mới vào cuối 'repositories:' trong .project.yaml (path mặc
+định 'apps/<tên>'), rồi clone NGAY repo đó — tương tự 'git clone <url>' nhưng
+tiện hơn: repo được ghi lại vào manifest luôn, lần sau 'pan clone'/'pan pull'... tự
+thấy nó. Đã có tên đó trong manifest rồi → KHÔNG thêm trùng, dùng lại entry cũ.
 
-Clone repositories from a PAN Stack clone manifest.
+Prints a compact summary table (repo · result · note) — KHÔNG dừng ở lỗi đầu
+tiên, clone hết các repo rồi tổng hợp (đã có sẵn / không có quyền / không tìm
+thấy / lỗi khác) ở cuối.
 
 ${printCommonOptions()}`);
 }
 
+function printCloneSummary(results, dryRun) {
+  const cloned = results.filter((r) => !r.dryRun && !r.exists && !r.error);
+  const exists = results.filter((r) => r.exists);
+  const noAccess = results.filter((r) => r.category === "no-access");
+  const notFound = results.filter((r) => r.category === "not-found");
+  const failed = results.filter((r) => r.error && r.category === "failed");
+  const rows = results.map(row);
+
+  const footer = [];
+  footer.push(colors.dim(t("CLONE_FOOTER_COUNTS__TOTAL_CLONED_EXISTS_NOACCESS_NOTFOUND_FAILED", {
+    total: results.length, cloned: cloned.length, exists: exists.length,
+    noAccess: noAccess.length, notFound: notFound.length, failed: failed.length,
+  })));
+  if (noAccess.length) {
+    footer.push("");
+    footer.push(colors.yellow(t("CLONE_NO_ACCESS_HEADER")));
+    for (const r of noAccess) footer.push(`  ${colors.cyan(r.name)}`);
+  }
+
+  if (!dryRun && results.every((r) => r.exists)) {
+    console.log("");
+    console.log(colors.bold(`─── ${t("CLONE_TITLE")} ───`));
+    console.log(colors.green(t("CLONE_ALL_EXIST__N", { n: results.length })));
+    for (const line of footer) console.log(line);
+  } else {
+    printSummary({
+      title: t("CLONE_TITLE"),
+      rows,
+      columns: bulkColumns([
+        { key: "repo", labelKey: "BULK_COL_REPO" },
+        { key: "result", labelKey: "BULK_COL_RESULT" },
+        { key: "note", labelKey: "BULK_COL_NOTE" },
+      ]),
+      footerLines: footer,
+    });
+  }
+
+  if (noAccess.length || notFound.length || failed.length) process.exitCode = 1;
+}
+
+// `pan clone <url>` — thêm 1 repo mới vào .project.yaml (KHÔNG phải .project.local.yaml — repo
+// thêm qua đường này coi như chính thức, muốn giữ riêng thì tự thêm tay vào .project.local.yaml)
+// rồi clone ngay repo đó. Đã có tên trùng trong manifest (kể cả từ .project.local.yaml) → dùng
+// lại entry cũ, không thêm trùng.
+function runAddAndCloneOne(urlArg, { baseDirArg, dryRun }) {
+  const name = repoNameFromUrl(urlArg);
+  if (!name) {
+    throw new Error(`Không tách được tên dự án từ URL: ${urlArg}`);
+  }
+
+  const { manifestPath, baseDir } = resolveProjectWorkspace({ baseDir: baseDirArg || "." });
+  const { repos: existingRepos } = loadManifestRepos({ baseDir: baseDirArg, allowFallback: false });
+  const already = existingRepos.find((r) => r.name === name);
+
+  let url = urlArg;
+  let destination = path.resolve(baseDir, "apps", name);
+  if (already) {
+    console.log(colors.dim(`ℹ️  '${name}' đã có trong manifest — dùng entry hiện có (${already.url}).`));
+    url = already.url;
+    destination = already.destination;
+  } else {
+    const repoPath = `apps/${name}`;
+    if (dryRun) {
+      console.log(colors.dim(`[dry-run] + thêm '${name}' vào ${manifestPath} (url: ${urlArg}, path: ${repoPath})`));
+    } else {
+      appendRepository(manifestPath, { name, url: urlArg, path: repoPath });
+      console.log(colors.green(`✓ Đã thêm '${name}' vào ${manifestPath} (path: ${repoPath})`));
+    }
+  }
+
+  const result = cloneRepo({ name, url, destination, dryRun });
+  printCloneSummary([result], dryRun);
+}
+
 function main() {
-  const args = parseCommonArgs(process.argv.slice(2));
-  if (args.help) {
+  const rawArgs = process.argv.slice(2);
+  if (rawArgs.includes("-h") || rawArgs.includes("--help")) {
     printHelp();
     return;
   }
 
+  const dryRun = rawArgs.includes("--dry-run");
+  const baseDirIdx = rawArgs.indexOf("--base-dir");
+  const baseDirArg = baseDirIdx >= 0 ? rawArgs[baseDirIdx + 1] : "";
+  const urlArg = rawArgs.find((a, i) => !a.startsWith("--") && rawArgs[i - 1] !== "--base-dir" && looksLikeGitUrl(a));
+
+  if (urlArg) {
+    runAddAndCloneOne(urlArg, { baseDirArg, dryRun });
+    return;
+  }
+
+  const args = parseCommonArgs(rawArgs);
+
   const { repos } = loadManifestRepos({
     manifestPath: args.manifest,
     baseDir: args.baseDir,
+    allowFallback: false,
   });
 
-  for (const repo of repos) {
-    cloneRepo({
-      name: repo.name,
-      url: repo.url,
-      destination: repo.destination,
-      dryRun: args.dryRun,
-    });
-  }
+  const results = repos.map((r) => cloneRepo({ name: r.name, url: r.url, destination: r.destination, dryRun: args.dryRun }));
+  printCloneSummary(results, args.dryRun);
 }
 
 try {

package/lib/git/git-fetch-all.js

@@ -1,62 +1,129 @@
 #!/usr/bin/env node
 /*
- * Fetch all remotes for PAN Stack project repositories from a clone manifest.
- *
- * Skips repositories that do not exist or are not git checkouts. Failures warn
- * and continue so one broken repo does not block the rest.
+ * Fetch all remotes for PAN Stack project repositories.
+ * Compact summary table: repo · branch · fetched · behind/ahead · new refs.
  */
 
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
-const { ensureRepoExists, runGit } = require("./helpers/git");
+const { ensureRepoExists } = require("./helpers/git");
+const {
+  runGitSilent, parseFetchOutput, printSummary, statusBadge, bulkColumns,
+  aheadBehind, getCurrentBranch, ICON,
+} = require("./helpers/bulk-report");
+const colors = require("./helpers/colors");
+const { t } = require("../i18n");
 
 function fetchRepo({ name, destination, dryRun }) {
   if (!ensureRepoExists({ name, destination })) {
-    return;
+    return { name, skipped: true };
   }
+  const branch = getCurrentBranch(destination) || t("GST_DETACHED");
 
-  const status = runGit(["fetch", "--all"], {
-    cwd: destination,
-    dryRun,
-    action: "fetch",
-    name,
-  });
-  if (status !== 0) {
-    console.log(`[warn] ${name}: fetch failed, check remote access`);
+  if (dryRun) {
+    console.log(colors.dim(`[dry-run] (in ${destination}) git fetch --all`));
+    return { name, branch, dryRun: true };
   }
+
+  process.stdout.write(colors.dim(`  ⇣ ${name} (${branch}) ... `));
+  const res = runGitSilent(["fetch", "--all", "--prune"], destination);
+  const parsed = parseFetchOutput(res.stdout, res.stderr);
+  const ab = aheadBehind(destination);
+  const ok = res.status === 0;
+  const shortMsg = !ok ? t("BULK_STATUS_FAILED")
+    : (parsed.newBranches || parsed.updatedBranches || parsed.newTags) ? t("BULK_STATUS_UPDATED")
+    : t("BULK_STATUS_OK");
+  console.log((ok ? colors.green : colors.red)(shortMsg));
+
+  return {
+    name, branch,
+    status: res.status,
+    ...parsed,
+    ahead: ab ? ab.ahead : 0,
+    behind: ab ? ab.behind : 0,
+    hasUpstream: Boolean(ab),
+    error: !ok ? (res.stderr.split("\n")[0] || "").slice(0, 80) : "",
+  };
+}
+
+function row(r) {
+  if (r.skipped) return { repo: colors.dim(r.name), branch: "", result: colors.dim(t("BULK_STATUS_SKIPPED")), sync: "", refs: "" };
+  if (r.dryRun) return { repo: r.name, branch: r.branch, result: colors.dim(t("BULK_STATUS_DRY_RUN")), sync: "", refs: "" };
+  const result = r.error ? statusBadge("fail", t("BULK_STATUS_FAILED")) : statusBadge("ok", t("BULK_STATUS_FETCHED"));
+  let sync;
+  if (!r.hasUpstream) sync = colors.dim(t("BULK_STATUS_NO_UPSTREAM"));
+  else if (r.behind === 0 && r.ahead === 0) sync = colors.green(t("BULK_STATUS_IN_SYNC"));
+  else {
+    const parts = [];
+    if (r.behind) parts.push(colors.yellow(`${ICON.down} ${r.behind}`));
+    if (r.ahead) parts.push(colors.cyan(`${ICON.up} ${r.ahead}`));
+    sync = parts.join(" ");
+  }
+  const refBits = [];
+  if (r.newBranches) refBits.push(t("BULK_REFS_NEW__N", { n: r.newBranches }));
+  if (r.updatedBranches) refBits.push(t("BULK_REFS_UPD__N", { n: r.updatedBranches }));
+  if (r.newTags) refBits.push(t("BULK_REFS_TAGS__N", { n: r.newTags }));
+  if (r.prunedRefs) refBits.push(t("BULK_REFS_PRUNED__N", { n: r.prunedRefs }));
+  const refs = refBits.length ? refBits.join(" · ") : colors.dim("—");
+  return { repo: r.name, branch: r.branch, result, sync, refs };
 }
 
 function printHelp() {
   console.log(`usage: git-fetch-all.js [--base-dir BASE_DIR] [--dry-run] [manifest]
 
 Fetch all remotes for repositories listed in a PAN Stack clone manifest.
+Prints a compact summary table (repo · branch · result · behind/ahead · new refs).
 
 ${printCommonOptions()}`);
 }
 
 function main() {
   const args = parseCommonArgs(process.argv.slice(2));
-  if (args.help) {
-    printHelp();
-    return;
-  }
+  if (args.help) { printHelp(); return; }
 
-  const { repos } = loadManifestRepos({
-    manifestPath: args.manifest,
-    baseDir: args.baseDir,
-  });
+  const { repos } = loadManifestRepos({ manifestPath: args.manifest, baseDir: args.baseDir });
+  const results = repos.map((r) => fetchRepo({ name: r.name, destination: r.destination, dryRun: args.dryRun }));
 
-  for (const repo of repos) {
-    fetchRepo({
-      name: repo.name,
-      destination: repo.destination,
-      dryRun: args.dryRun,
+  const behind = results.filter((r) => r.behind > 0);
+  const failed = results.filter((r) => r.error);
+  const hasNewRefs = (r) => (r.newBranches || r.updatedBranches || r.newTags || r.prunedRefs) > 0;
+  const changed = results.filter((r) => !r.skipped && (hasNewRefs(r) || r.behind > 0 || r.ahead > 0 || r.error));
+  const inSyncCount = results.length - changed.length - results.filter((r) => r.skipped).length;
+  // Chỉ đưa vào bảng: có ref mới / behind-ahead / lỗi / dry-run.
+  const shown = results.filter((r) => r.dryRun || (!r.skipped && (hasNewRefs(r) || r.behind > 0 || r.ahead > 0 || r.error)));
+  const rows = shown.map(row);
+
+  const footer = [];
+  footer.push(colors.dim(t("FETCH_FOOTER_COUNTS__TOTAL_CHANGED_INSYNC_BEHIND_FAILED", {
+    total: results.length, changed: changed.length, inSync: inSyncCount,
+    behind: behind.length, failed: failed.length,
+  })));
+  if (behind.length) {
+    footer.push("");
+    footer.push(colors.yellow(t("FETCH_BEHIND_HEADER")));
+    for (const r of behind) footer.push(`  ${colors.cyan(r.name)} (${r.branch}): ${ICON.down} ${r.behind}`);
+  }
+
+  if (rows.length === 0) {
+    console.log("");
+    console.log(colors.bold(`─── ${t("FETCH_TITLE")} ───`));
+    console.log(colors.green(t("FETCH_ALL_IN_SYNC__N", { n: results.length })));
+    for (const line of footer) console.log(line);
+  } else {
+    printSummary({
+      title: t("FETCH_TITLE"),
+      rows,
+      columns: bulkColumns([
+        { key: "repo", labelKey: "BULK_COL_REPO" },
+        { key: "branch", labelKey: "BULK_COL_BRANCH" },
+        { key: "result", labelKey: "BULK_COL_RESULT" },
+        { key: "sync", labelKey: "BULK_COL_SYNC" },
+        { key: "refs", labelKey: "BULK_COL_NEW_REFS" },
+      ]),
+      footerLines: footer,
     });
   }
-}
 
-try {
-  main();
-} catch (error) {
-  console.error(error.message);
-  process.exit(1);
+  if (failed.length) process.exitCode = 1;
 }
+
+try { main(); } catch (error) { console.error(error.message); process.exit(1); }

package/lib/git/git-grv.js

@@ -1,48 +1,58 @@
 #!/usr/bin/env node
 /*
  * List git remotes (git remote -v) for PAN Stack project repositories.
- *
- * oh-my-zsh-style alias for grv — full remote URLs (fetch/push).
+ * Compact summary table (giống pull/push/fetch): repo · branch · remote · fetch · push.
  */
 
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
-const { ensureRepoExists, isGitRepo, listRemotesVerbose } = require("./helpers/git");
+const { ensureRepoExists, isGitRepo, listRemotesVerbose, getCurrentBranch } = require("./helpers/git");
+const { printSummary, bulkColumns } = require("./helpers/bulk-report");
+const colors = require("./helpers/colors");
+const { t } = require("../i18n");
 
-function printRepoRemotes({ label, destination, dryRun }) {
-  if (dryRun) {
-    console.log(`[dry-run] (in ${destination}) git remote -v`);
-    return;
+// `git remote -v` in 2 dòng/remote ("origin\tURL (fetch)" / "origin\tURL (push)") — gộp lại
+// thành { name: { fetch, push } } theo tên remote.
+function parseRemotes(lines) {
+  const byName = new Map();
+  for (const line of lines) {
+    const m = line.match(/^(\S+)\s+(\S+)\s+\((fetch|push)\)$/);
+    if (!m) continue;
+    const [, name, url, kind] = m;
+    if (!byName.has(name)) byName.set(name, { name, fetch: "", push: "" });
+    byName.get(name)[kind] = url;
   }
+  return [...byName.values()];
+}
 
-  console.log(`== ${label} ==`);
-  console.log(destination);
-  const lines = listRemotesVerbose(destination);
-  if (lines.length === 0) {
-    console.log("(no remotes)");
-  } else {
-    for (const line of lines) {
-      console.log(line);
-    }
+function repoRow({ label, destination, dryRun }) {
+  if (dryRun) {
+    console.log(colors.dim(`[dry-run] (in ${destination}) git remote -v`));
+    return null;
   }
-  console.log("");
+  const branch = getCurrentBranch(destination) || t("GST_DETACHED");
+  const remotes = parseRemotes(listRemotesVerbose(destination));
+  return { name: label, branch, remotes };
 }
 
-function showWorkspaceRootRemotes({ workspaceRoot, dryRun }) {
-  if (!isGitRepo(workspaceRoot)) {
-    return;
+function row(r) {
+  if (r.skipped) {
+    return { repo: colors.dim(r.name), branch: "", remote: colors.dim(t("BULK_STATUS_SKIPPED")), fetch: "", push: "" };
   }
-
-  printRepoRemotes({
-    label: "workspace",
-    destination: workspaceRoot,
-    dryRun,
-  });
+  if (r.remotes.length === 0) {
+    return { repo: r.name, branch: r.branch, remote: colors.dim(t("GRV_NO_REMOTES")), fetch: "", push: "" };
+  }
+  // Ưu tiên hiện 'origin' trên dòng đầu; nếu có remote khác, gộp tên (vd "origin (+1)").
+  const primary = r.remotes.find((rm) => rm.name === "origin") || r.remotes[0];
+  const remoteLabel = r.remotes.length > 1 ? `${primary.name} (+${r.remotes.length - 1})` : primary.name;
+  const push = primary.push === primary.fetch ? colors.dim(t("GRV_PUSH_SAME_AS_FETCH")) : primary.push;
+  return { repo: r.name, branch: r.branch, remote: remoteLabel, fetch: primary.fetch, push };
 }
 
 function printHelp() {
   console.log(`usage: git-grv.js [--base-dir BASE_DIR] [--dry-run] [--no-workspace] [manifest]
 
-List git remotes with full URLs (git remote -v) for each repository.
+List git remotes (git remote -v) for each repository — compact summary table
+(repo · branch · remote · fetch · push; push = '=' khi giống fetch).
 
 ${printCommonOptions()}
   --no-workspace       Skip workspace root (manifest repos only)`);
@@ -67,23 +77,44 @@ function main() {
     baseDir: args.baseDir,
   });
 
-  if (!args.noWorkspace) {
-    showWorkspaceRootRemotes({
-      workspaceRoot,
-      dryRun: args.dryRun,
-    });
+  const results = [];
+  if (!args.noWorkspace && isGitRepo(workspaceRoot)) {
+    const r = repoRow({ label: "workspace", destination: workspaceRoot, dryRun: args.dryRun });
+    if (r) results.push(r);
   }
 
   for (const repo of repos) {
     if (!ensureRepoExists({ name: repo.name, destination: repo.destination })) {
+      results.push({ name: repo.name, skipped: true });
       continue;
     }
-    printRepoRemotes({
-      label: repo.name,
-      destination: repo.destination,
-      dryRun: args.dryRun,
-    });
+    const r = repoRow({ label: repo.name, destination: repo.destination, dryRun: args.dryRun });
+    if (r) results.push(r);
   }
+
+  if (args.dryRun) return;
+
+  const noRemotes = results.filter((r) => !r.skipped && r.remotes.length === 0);
+  const skipped = results.filter((r) => r.skipped);
+  const rows = results.map(row);
+
+  const footer = [];
+  footer.push(colors.dim(
+    `Total ${results.length} repos · ${results.length - noRemotes.length - skipped.length} with remotes · ${noRemotes.length} no remote · ${skipped.length} skipped`
+  ));
+
+  printSummary({
+    title: t("GRV_TITLE"),
+    rows,
+    columns: bulkColumns([
+      { key: "repo", labelKey: "BULK_COL_REPO" },
+      { key: "branch", labelKey: "BULK_COL_BRANCH" },
+      { key: "remote", labelKey: "GRV_COL_REMOTE" },
+      { key: "fetch", labelKey: "GRV_COL_FETCH" },
+      { key: "push", labelKey: "GRV_COL_PUSH" },
+    ]),
+    footerLines: footer,
+  });
 }
 
 try {