@nalvietnam/avatar-cli 1.2.8 → 1.2.10

package/dist/index.js

@@ -1865,6 +1865,40 @@ async function ensureGitHubReady(remoteUrl) {
 }
 
 // src/lib/create-workspace-remote-via-gh.ts
+var CreateWorkspaceRemoteError = class extends Error {
+  reason;
+  fullName;
+  stderr;
+  constructor(reason, fullName, message, stderr) {
+    super(message);
+    this.name = "CreateWorkspaceRemoteError";
+    this.reason = reason;
+    this.fullName = fullName;
+    this.stderr = stderr;
+  }
+};
+function classifyGhCreateError(stderr) {
+  const text = stderr.toLowerCase();
+  if (text.includes("name already exists") || text.includes("already exists on this account") || text.includes("repository already exists")) {
+    return "repo-exists";
+  }
+  if (text.includes("403") || text.includes("permission") || text.includes("not authorized") || text.includes("forbidden")) {
+    return "no-permission";
+  }
+  if (text.includes("invalid") && text.includes("name")) {
+    return "name-invalid";
+  }
+  if (text.includes("could not resolve") || text.includes("network") || text.includes("connection refused")) {
+    return "network";
+  }
+  return "unknown";
+}
+function repoExistsOnGitHub(fullName) {
+  const r = spawnSync16("gh", ["repo", "view", fullName, "--json", "name"], {
+    stdio: "ignore"
+  });
+  return r.status === 0;
+}
 function canCreateInNamespace(org, ghUser) {
   if (org.toLowerCase() === ghUser.toLowerCase()) return { ok: true };
   const r = spawnSync16("gh", ["api", `orgs/${org}/members/${ghUser}`, "--silent"], {
@@ -1901,6 +1935,13 @@ async function createWorkspaceRemoteViaGh(input5) {
     throw new Error(`Kh\xF4ng th\u1EC3 t\u1EA1o repo d\u01B0\u1EDBi '${org}/': ${namespaceCheck.reason}`);
   }
   const fullName = `${org}/${input5.workspaceName}`;
+  if (repoExistsOnGitHub(fullName)) {
+    throw new CreateWorkspaceRemoteError(
+      "repo-exists",
+      fullName,
+      `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xF3 th\u1EC3 b\u1EA1n \u0111\xE3 init workspace n\xE0y tr\u01B0\u1EDBc \u0111\xF3.`
+    );
+  }
   log.info(`T\u1EA1o GitHub repo cho workspace: ${fullName} (${input5.visibility})...`);
   const r = spawnSync16(
     "gh",
@@ -1915,14 +1956,24 @@ async function createWorkspaceRemoteViaGh(input5) {
       "origin",
       "--push"
     ],
-    { stdio: ["inherit", "inherit", "pipe"], encoding: "utf8" }
+    { stdio: ["ignore", "pipe", "pipe"], encoding: "utf8" }
   );
   if (r.status !== 0) {
     const stderr = (r.stderr || "").trim();
-    if (stderr) process.stderr.write(`${stderr}
+    const stdout = (r.stdout || "").trim();
+    const combined = [stderr, stdout].filter(Boolean).join("\n");
+    const reason = classifyGhCreateError(combined);
+    if (combined) {
+      process.stderr.write(`
+${combined}
+
 `);
-    throw new Error(
-      `T\u1EA1o workspace remote th\u1EA5t b\u1EA1i (exit ${r.status}). Workspace v\u1EABn d\xF9ng \u0111\u01B0\u1EE3c local. Setup remote sau qua: gh repo create ${fullName} --${input5.visibility} --source=. --remote=origin --push`
+    }
+    throw new CreateWorkspaceRemoteError(
+      reason,
+      fullName,
+      `T\u1EA1o workspace remote th\u1EA5t b\u1EA1i (exit ${r.status}): ${reason}.`,
+      combined
     );
   }
   const sshUrl = `git@github.com:${fullName}.git`;
@@ -1930,6 +1981,25 @@ async function createWorkspaceRemoteViaGh(input5) {
   log.success(`Workspace remote: ${sshUrl}`);
   return { sshUrl, httpsUrl };
 }
+function linkExistingRemoteToWorkspace(args) {
+  const sshUrl = `git@github.com:${args.fullName}.git`;
+  const httpsUrl = `https://github.com/${args.fullName}.git`;
+  const addResult = spawnSync16(
+    "git",
+    ["-C", args.workspacePath, "remote", "add", "origin", sshUrl],
+    {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    }
+  );
+  if (addResult.status !== 0) {
+    spawnSync16("git", ["-C", args.workspacePath, "remote", "set-url", "origin", sshUrl], {
+      stdio: "ignore"
+    });
+  }
+  log.success(`Linked existing remote: ${sshUrl}`);
+  return { sshUrl, httpsUrl };
+}
 
 // src/lib/safe-bootstrap-for-dirty-folder.ts
 import { readdirSync } from "fs";
@@ -1997,8 +2067,14 @@ import { dirname as dirname3, join as join13 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __dirname = dirname3(fileURLToPath2(import.meta.url));
 var CANDIDATE_DIRS = [
+  // Bundled production: dist/index.js → __dirname = .../dist/, sibling dist/templates
+  join13(__dirname, "templates", "gitignore"),
+  // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
   join13(__dirname, "..", "templates", "gitignore"),
-  join13(__dirname, "..", "..", "src", "templates", "gitignore")
+  // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
+  join13(__dirname, "..", "..", "src", "templates", "gitignore"),
+  // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
+  join13(__dirname, "..", "src", "templates", "gitignore")
 ];
 var AVATAR_MARKER_START = "# === avatar ===";
 var AVATAR_MARKER_END = "# === /avatar ===";
@@ -2787,6 +2863,44 @@ async function maybeCreateWorkspaceRemote(args) {
       });
       return;
     } catch (err) {
+      if (err instanceof CreateWorkspaceRemoteError && err.reason === "repo-exists") {
+        const fullName = err.fullName;
+        const reuseAction = await select7({
+          message: `Repo '${fullName}' \u0111\xE3 t\u1ED3n t\u1EA1i tr\xEAn GitHub. C\xE1ch x\u1EED l\xFD?`,
+          choices: [
+            {
+              name: "D\xF9ng remote \u0111\xE3 c\xF3 (link workspace local v\xE0o repo n\xE0y)",
+              value: "reuse"
+            },
+            {
+              name: "Nh\u1EADp t\xEAn workspace kh\xE1c (t\u1EA1o repo m\u1EDBi)",
+              value: "rename"
+            },
+            { name: "B\u1ECF qua (workspace local-only)", value: "skip" },
+            { name: "T\u1EA1m ng\u01B0ng init", value: "abort" }
+          ]
+        });
+        if (reuseAction === "abort") {
+          throw new UserAbortedRecoveryError("User abort t\u1EA1i b\u01B0\u1EDBc t\u1EA1o workspace remote.");
+        }
+        if (reuseAction === "skip") {
+          log.warn("Workspace v\u1EABn s\u1EB5n s\xE0ng local-only. Setup remote sau khi c\u1EA7n.");
+          return;
+        }
+        if (reuseAction === "reuse") {
+          linkExistingRemoteToWorkspace({
+            workspacePath: args.workspacePath,
+            fullName
+          });
+          return;
+        }
+        const newName = await input4({
+          message: "T\xEAn workspace m\u1EDBi (s\u1EBD t\u1EA1o repo new):",
+          validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
+        });
+        args.workspaceName = newName.trim();
+        continue;
+      }
       const action = await promptRetryOrSkip({
         taskName: "T\u1EA1o workspace remote tr\xEAn GitHub",
         reason: err instanceof Error ? err.message : String(err),
@@ -3167,7 +3281,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.2.8";
+var CLI_VERSION = "1.2.10";
 function registerUninstallCommand(program2) {
   program2.command("uninstall").description("G\u1EE1 Avatar kh\u1ECFi project \u2014 backup t\u1EF1 \u0111\u1ED9ng (M11)").option("--yes", "Skip confirm prompt").option("--no-backup", "Kh\xF4ng t\u1EA1o backup tr\u01B0\u1EDBc khi x\xF3a (nguy hi\u1EC3m)").option("--keep-submodule", "Gi\u1EEF submodule .claude/pack/").option("--keep-hooks", "Gi\u1EEF git hooks post-merge, pre-push").option("--dry-run", "Hi\u1EC3n th\u1ECB danh s\xE1ch s\u1EBD x\xF3a, kh\xF4ng th\u1EF1c thi").action(async (opts) => {
     try {
@@ -3249,7 +3363,7 @@ function printUninstallSuccessBox(backupPath) {
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.2.8";
+var CLI_VERSION2 = "1.2.10";
 var program = new Command();
 program.name("avatar").description("AI harness CLI for NAL Vietnam engineering").version(CLI_VERSION2, "-v, --version", "Hi\u1EC3n th\u1ECB phi\xEAn b\u1EA3n Avatar CLI").addHelpText(
   "beforeAll",