@nalvietnam/avatar-cli 1.3.0 → 1.3.1

package/dist/index.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 
 // src/commands/ai.ts
 import { promises as fs4 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { confirm } from "@inquirer/prompts";
 
 // src/lib/filesystem-helpers.ts
@@ -42,12 +42,44 @@ async function writeJsonAtomic(path, data, mode) {
 `, mode);
 }
 
+// src/lib/resolve-avatar-workspace-root-from-cwd.ts
+import { existsSync, readFileSync } from "fs";
+import { dirname as dirname2, join as join2 } from "path";
+var MAX_WALKUP_LEVELS = 5;
+function isAvatarWorkspace(dir) {
+  const hasClaudeDir = existsSync(join2(dir, ".claude"));
+  const hasClaudeMd = existsSync(join2(dir, "CLAUDE.md"));
+  if (!hasClaudeDir || !hasClaudeMd) return false;
+  const hasSrcDir = existsSync(join2(dir, "src"));
+  const gitmodulesPath = join2(dir, ".gitmodules");
+  if (hasSrcDir) return true;
+  if (existsSync(gitmodulesPath)) {
+    try {
+      const content = readFileSync(gitmodulesPath, "utf8");
+      return content.includes("path = src") || content.includes("path = ./src");
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+function resolveAvatarWorkspaceRootFromCwd(startDir) {
+  let current = startDir;
+  for (let i = 0; i < MAX_WALKUP_LEVELS; i++) {
+    if (isAvatarWorkspace(current)) return current;
+    const parent = dirname2(current);
+    if (parent === current) return null;
+    current = parent;
+  }
+  return null;
+}
+
 // src/lib/audit-log-appender.ts
 import { promises as fs2 } from "fs";
 
 // src/lib/user-config-store.ts
 import { homedir } from "os";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 
 // src/types/config-schema.ts
 import { z } from "zod";
@@ -80,11 +112,11 @@ var projectSettingsSchema = z.object({
 var initModeSchema = z.enum(["internal", "client", "library"]);
 
 // src/lib/user-config-store.ts
-var AVATAR_HOME = join2(homedir(), ".avatar");
-var USER_CONFIG_PATH = join2(AVATAR_HOME, "config.json");
-var USER_STATE_PATH = join2(AVATAR_HOME, "state.json");
-var AUDIT_LOG_PATH = join2(AVATAR_HOME, "audit.log");
-var BACKUPS_DIR = join2(AVATAR_HOME, "backups");
+var AVATAR_HOME = join3(homedir(), ".avatar");
+var USER_CONFIG_PATH = join3(AVATAR_HOME, "config.json");
+var USER_STATE_PATH = join3(AVATAR_HOME, "state.json");
+var AUDIT_LOG_PATH = join3(AVATAR_HOME, "audit.log");
+var BACKUPS_DIR = join3(AVATAR_HOME, "backups");
 var SECRET_FILE_MODE = 384;
 async function ensureAvatarHome() {
   await ensureDir(AVATAR_HOME);
@@ -348,18 +380,18 @@ function installClaudeCodeViaNpm() {
 }
 
 // src/lib/prompt-ai-provider-choice.ts
-import { readFileSync } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { select } from "@inquirer/prompts";
 function getGlobalSettingsPath() {
-  return join3(homedir2(), ".claude", "settings.json");
+  return join4(homedir2(), ".claude", "settings.json");
 }
 function detectGlobalClaudeSettings() {
   const path = getGlobalSettingsPath();
   let raw;
   try {
-    raw = readFileSync(path, "utf8");
+    raw = readFileSync2(path, "utf8");
   } catch {
     return { exists: false, hasBaseUrl: false, hasToken: false };
   }
@@ -497,10 +529,10 @@ async function setupLLMLiteApiKeyAndModel() {
 
 // src/lib/write-claude-settings-json-per-project.ts
 import { promises as fs3 } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var SECRET_FILE_MODE2 = 384;
 function getClaudeSettingsPath(workspacePath) {
-  return join4(workspacePath, ".claude", "settings.json");
+  return join5(workspacePath, ".claude", "settings.json");
 }
 async function readExistingSettings(path) {
   if (!await pathExists(path)) return {};
@@ -752,15 +784,23 @@ async function testAiProviderByDetectedMode(settings) {
 // src/commands/ai.ts
 async function ensureWorkspaceCwd() {
   const cwd = process.cwd();
-  const claudeDir = join5(cwd, ".claude");
-  if (!await pathExists(claudeDir)) {
-    log.error("Kh\xF4ng th\u1EA5y .claude/ trong th\u01B0 m\u1EE5c hi\u1EC7n t\u1EA1i. Ch\u1EA1y l\u1EC7nh n\xE0y trong workspace Avatar.");
+  const workspaceRoot = resolveAvatarWorkspaceRootFromCwd(cwd);
+  if (!workspaceRoot) {
+    log.error(
+      `Kh\xF4ng t\xECm th\u1EA5y Avatar workspace t\u1EEB th\u01B0 m\u1EE5c hi\u1EC7n t\u1EA1i.
+  Avatar workspace c\u1EA7n c\xF3: .claude/ + CLAUDE.md + src/ (ho\u1EB7c .gitmodules).
+  B\u1EA1n \u0111ang \u1EDF: ${cwd}
+  Cd v\xE0o workspace dir (vd /path/to/<project>-workspace) r\u1ED3i ch\u1EA1y l\u1EA1i.`
+    );
     process.exit(1);
   }
-  return cwd;
+  if (workspaceRoot !== cwd) {
+    log.dim(`Detected workspace root: ${workspaceRoot}`);
+  }
+  return workspaceRoot;
 }
 async function readWorkspaceSettings(workspacePath) {
-  const settingsPath = join5(workspacePath, ".claude", "settings.json");
+  const settingsPath = join6(workspacePath, ".claude", "settings.json");
   if (!await pathExists(settingsPath)) return {};
   try {
     return await readJson(settingsPath);
@@ -798,7 +838,7 @@ async function runAiTest() {
 }
 async function runAiReset(opts) {
   const workspacePath = await ensureWorkspaceCwd();
-  const settingsPath = join5(workspacePath, ".claude", "settings.json");
+  const settingsPath = join6(workspacePath, ".claude", "settings.json");
   const settings = await readWorkspaceSettings(workspacePath);
   if (!opts.yes) {
     const ok = await confirm({
@@ -848,25 +888,25 @@ import { input as input2 } from "@inquirer/prompts";
 
 // src/lib/execute-commit-with-target-selection.ts
 import { spawnSync as spawnSync5 } from "child_process";
-import { existsSync } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { join as join7 } from "path";
 function assertAvatarWorkspaceRoot(cwd) {
-  const srcGit = join6(cwd, "src", ".git");
-  const workspaceGit = join6(cwd, ".git");
-  const claudeDir = join6(cwd, ".claude");
-  if (!existsSync(workspaceGit)) {
+  const srcGit = join7(cwd, "src", ".git");
+  const workspaceGit = join7(cwd, ".git");
+  const claudeDir = join7(cwd, ".claude");
+  if (!existsSync2(workspaceGit)) {
     throw new Error(
       `Kh\xF4ng ph\u1EA3i workspace root: ${cwd}
   Ch\u1EA1y 'avatar commit' trong workspace dir (c\xF3 .git v\xE0 .claude/).`
     );
   }
-  if (!existsSync(claudeDir)) {
+  if (!existsSync2(claudeDir)) {
     throw new Error(
       `Kh\xF4ng th\u1EA5y .claude/ trong ${cwd}.
   Ch\u1EA1y 'avatar commit' trong Avatar workspace, kh\xF4ng ph\u1EA3i project b\xECnh th\u01B0\u1EDDng.`
     );
   }
-  if (!existsSync(srcGit)) {
+  if (!existsSync2(srcGit)) {
     throw new Error(
       `Kh\xF4ng th\u1EA5y src/.git trong ${cwd}.
   Workspace thi\u1EBFu submodule src/. Ch\u1EA1y 'avatar init' l\u1EA1i?`
@@ -890,7 +930,7 @@ function isDirty(cwd) {
   return status.length > 0;
 }
 async function commitSrc(workspaceRoot, opts) {
-  const srcPath = join6(workspaceRoot, "src");
+  const srcPath = join7(workspaceRoot, "src");
   if (!isDirty(srcPath)) {
     log.dim("src/: nothing to commit (clean)");
     return {};
@@ -930,7 +970,7 @@ async function commitWorkspace(workspaceRoot, opts) {
 }
 function warnIfOtherTargetDirty(workspaceRoot, requestedTarget) {
   if (requestedTarget === "all") return;
-  const srcDirty = isDirty(join6(workspaceRoot, "src"));
+  const srcDirty = isDirty(join7(workspaceRoot, "src"));
   const workspaceDirty = isDirty(workspaceRoot);
   if (requestedTarget === "src" && workspaceDirty) {
     log.warn(
@@ -1006,23 +1046,23 @@ async function runCommit(target, opts) {
 // src/commands/doctor.ts
 import { spawnSync as spawnSync6 } from "child_process";
 import { promises as fs6 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import boxen from "boxen";
 
 // src/lib/git-operations.ts
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { simpleGit } from "simple-git";
 function git(cwd = process.cwd()) {
   return simpleGit({ baseDir: cwd, binary: "git" });
 }
 async function isGitRepo(cwd = process.cwd()) {
-  return await pathExists(join7(cwd, ".git"));
+  return await pathExists(join8(cwd, ".git"));
 }
 async function addSubmodule(repoUrl, destPath, cwd = process.cwd()) {
   await git(cwd).subModule(["add", repoUrl, destPath]);
 }
 async function checkoutTagInSubmodule(submodulePath, tag, cwd = process.cwd()) {
-  const submoduleCwd = join7(cwd, submodulePath);
+  const submoduleCwd = join8(cwd, submodulePath);
   await git(submoduleCwd).fetch(["--tags"]);
   await git(submoduleCwd).checkout(tag);
 }
@@ -1041,11 +1081,11 @@ async function currentCommitSha(cwd = process.cwd()) {
 
 // src/lib/project-tree-scaffolder.ts
 import { promises as fs5 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/lib/template-bundle-loader.ts
-import { existsSync as existsSync2 } from "fs";
-import { dirname as dirname2, join as join8 } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { dirname as dirname3, join as join9 } from "path";
 import { fileURLToPath } from "url";
 
 // src/lib/mustache-template-engine.ts
@@ -1059,15 +1099,15 @@ function renderTemplate(source, variables) {
 }
 
 // src/lib/template-bundle-loader.ts
-var HERE = dirname2(fileURLToPath(import.meta.url));
+var HERE = dirname3(fileURLToPath(import.meta.url));
 var PACKAGE_ROOT = findPackageRoot(HERE);
-var TEMPLATES_ROOT = join8(PACKAGE_ROOT, "src", "templates");
-var HOOKS_ROOT = join8(PACKAGE_ROOT, "src", "hooks");
+var TEMPLATES_ROOT = join9(PACKAGE_ROOT, "src", "templates");
+var HOOKS_ROOT = join9(PACKAGE_ROOT, "src", "hooks");
 function findPackageRoot(startDir) {
   let dir = startDir;
   while (true) {
-    if (existsSync2(join8(dir, "package.json"))) return dir;
-    const parent = dirname2(dir);
+    if (existsSync3(join9(dir, "package.json"))) return dir;
+    const parent = dirname3(dir);
     if (parent === dir) {
       throw new Error(`Cannot locate package root from ${startDir}`);
     }
@@ -1075,14 +1115,14 @@ function findPackageRoot(startDir) {
   }
 }
 async function loadTemplate(name) {
-  return await readText(join8(TEMPLATES_ROOT, `${name}.tpl`));
+  return await readText(join9(TEMPLATES_ROOT, `${name}.tpl`));
 }
 async function renderTemplateByName(name, variables) {
   const source = await loadTemplate(name);
   return renderTemplate(source, variables);
 }
 async function loadHook(name) {
-  return await readText(join8(HOOKS_ROOT, `${name}.sh.tpl`));
+  return await readText(join9(HOOKS_ROOT, `${name}.sh.tpl`));
 }
 
 // src/lib/project-tree-scaffolder.ts
@@ -1116,12 +1156,12 @@ var PROJECT_KNOWLEDGE_TEMPLATES = [
   "project/gotchas.md"
 ];
 async function createClaudeDirTree(projectRoot) {
-  const claudeRoot = join9(projectRoot, ".claude");
+  const claudeRoot = join10(projectRoot, ".claude");
   await ensureDir(claudeRoot);
   for (const sub of CLAUDE_SUBDIRS) {
-    const dir = join9(claudeRoot, sub);
+    const dir = join10(claudeRoot, sub);
     await ensureDir(dir);
-    await writeTextAtomic(join9(dir, ".gitkeep"), "");
+    await writeTextAtomic(join10(dir, ".gitkeep"), "");
   }
 }
 async function writeProjectKnowledgeFiles(projectRoot, vars) {
@@ -1152,7 +1192,7 @@ async function writeProjectKnowledgeFiles(projectRoot, vars) {
   for (const tpl of PROJECT_KNOWLEDGE_TEMPLATES) {
     const content = await renderTemplateByName(tpl, baseVars);
     const relative4 = tpl.replace(/^project\//, "");
-    const outPath = join9(projectRoot, ".claude", "project", relative4);
+    const outPath = join10(projectRoot, ".claude", "project", relative4);
     const backup = await writeWithBackup(outPath, content);
     if (backup) backups.push(backup);
   }
@@ -1160,14 +1200,14 @@ async function writeProjectKnowledgeFiles(projectRoot, vars) {
 }
 async function writeRootClaudeMd(projectRoot, vars) {
   const content = await renderTemplateByName("CLAUDE.md", vars);
-  return await writeWithBackup(join9(projectRoot, "CLAUDE.md"), content);
+  return await writeWithBackup(join10(projectRoot, "CLAUDE.md"), content);
 }
 async function writeProjectSettings(projectRoot, vars) {
   const content = await renderTemplateByName("settings.json", vars);
-  return await writeWithBackup(join9(projectRoot, ".claude", "settings.json"), content);
+  return await writeWithBackup(join10(projectRoot, ".claude", "settings.json"), content);
 }
 async function appendGitignoreEntries(projectRoot) {
-  const path = join9(projectRoot, ".gitignore");
+  const path = join10(projectRoot, ".gitignore");
   const tpl = await renderTemplateByName("gitignore", {});
   const marker = "# Avatar \u2014 git-ignored entries injected on `avatar init`";
   let existing = "";
@@ -1181,9 +1221,9 @@ ${tpl}`);
 }
 async function installGitHook(gitDir, hookName) {
   const content = await loadHook(hookName);
-  const hooksDir = join9(gitDir, "hooks");
+  const hooksDir = join10(gitDir, "hooks");
   await ensureDir(hooksDir);
-  const dest = join9(hooksDir, hookName);
+  const dest = join10(hooksDir, hookName);
   await writeTextAtomic(dest, content, 493);
 }
 
@@ -1241,7 +1281,7 @@ async function runChecks(cwd) {
     detail: gitRepo ? cwd : "Kh\xF4ng ph\u1EA3i git repo (c\u1EA7n cho 'avatar init')",
     fixable: false
   });
-  const packPath = join10(cwd, ".claude", "pack");
+  const packPath = join11(cwd, ".claude", "pack");
   const hasPack = await pathExists(packPath);
   checks.push({
     name: "team-ai-pack submodule",
@@ -1249,7 +1289,7 @@ async function runChecks(cwd) {
     detail: hasPack ? packPath : "Avatar ch\u01B0a init \u2014 ch\u1EA1y 'avatar init'",
     fixable: false
   });
-  const claudeMdPath = join10(cwd, "CLAUDE.md");
+  const claudeMdPath = join11(cwd, "CLAUDE.md");
   const hasClaudeMd = await pathExists(claudeMdPath);
   checks.push({
     name: "CLAUDE.md",
@@ -1257,7 +1297,7 @@ async function runChecks(cwd) {
     detail: hasClaudeMd ? "t\u1ED3n t\u1EA1i \u1EDF project root" : "thi\u1EBFu \u2014 ch\u1EA1y 'avatar init'",
     fixable: false
   });
-  const hookPath = join10(cwd, ".git", "hooks", "post-merge");
+  const hookPath = join11(cwd, ".git", "hooks", "post-merge");
   const hasHook = await pathExists(hookPath);
   if (gitRepo && hasPack) {
     checks.push({
@@ -1266,11 +1306,11 @@ async function runChecks(cwd) {
       detail: hasHook ? "installed" : "missing \u2014 fixable",
       fixable: !hasHook,
       fix: hasHook ? void 0 : async () => {
-        await installGitHook(join10(cwd, ".git"), "post-merge");
+        await installGitHook(join11(cwd, ".git"), "post-merge");
       }
     });
   }
-  const gitignorePath = join10(cwd, ".gitignore");
+  const gitignorePath = join11(cwd, ".gitignore");
   if (gitRepo) {
     let gitignoreOk = false;
     if (await pathExists(gitignorePath)) {
@@ -1332,7 +1372,7 @@ async function applyFixes(checks) {
 }
 
 // src/commands/init.ts
-import { basename, join as join17, relative as relative2, resolve } from "path";
+import { basename, join as join18, relative as relative2, resolve } from "path";
 import { confirm as confirm3, input as input5, select as select8 } from "@inquirer/prompts";
 import boxen4 from "boxen";
 
@@ -1365,7 +1405,7 @@ async function promptRetryOrSkip(args) {
 }
 
 // src/lib/team-pack-submodule-manager.ts
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 
 // src/lib/check-team-pack-access-with-retry-loop.ts
 import { spawnSync as spawnSync7 } from "child_process";
@@ -1530,7 +1570,7 @@ async function addTeamPackSubmodule(projectRoot, tag, ssoEmail) {
   }
   let target = tag ?? null;
   if (!target) {
-    target = await latestTag(join11(projectRoot, TEAM_PACK_RELATIVE_PATH));
+    target = await latestTag(join12(projectRoot, TEAM_PACK_RELATIVE_PATH));
   }
   if (target) {
     await checkoutTagInSubmodule(TEAM_PACK_RELATIVE_PATH, target, projectRoot);
@@ -1538,7 +1578,7 @@ async function addTeamPackSubmodule(projectRoot, tag, ssoEmail) {
   return { pinnedTag: target };
 }
 async function readPinnedPackVersion(projectRoot) {
-  const submoduleRoot = join11(projectRoot, TEAM_PACK_RELATIVE_PATH);
+  const submoduleRoot = join12(projectRoot, TEAM_PACK_RELATIVE_PATH);
   const tag = await latestTag(submoduleRoot);
   if (tag) return tag;
   const sha = await currentCommitSha(submoduleRoot);
@@ -2225,11 +2265,11 @@ import { select as select7 } from "@inquirer/prompts";
 import { simpleGit as simpleGit3 } from "simple-git";
 
 // src/lib/check-folder-has-git.ts
-import { existsSync as existsSync3, statSync } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync4, statSync } from "fs";
+import { join as join13 } from "path";
 function checkFolderHasGit(folderPath) {
-  const gitPath = join12(folderPath, ".git");
-  if (!existsSync3(gitPath)) return false;
+  const gitPath = join13(folderPath, ".git");
+  if (!existsSync4(gitPath)) return false;
   const stat = statSync(gitPath);
   return stat.isDirectory() || stat.isFile();
 }
@@ -2259,8 +2299,8 @@ async function createInitialGitCommit(folderPath) {
 }
 
 // src/lib/detect-folder-tech-stack.ts
-import { existsSync as existsSync4 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync5 } from "fs";
+import { join as join14 } from "path";
 var SIGNATURES = {
   node: ["package.json"],
   python: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"],
@@ -2272,7 +2312,7 @@ var SIGNATURES = {
 function detectFolderTechStack(folderPath) {
   const matched = [];
   for (const [stack, files] of Object.entries(SIGNATURES)) {
-    if (files.some((f) => existsSync4(join13(folderPath, f)))) {
+    if (files.some((f) => existsSync5(join14(folderPath, f)))) {
       matched.push(stack);
     }
   }
@@ -2280,26 +2320,26 @@ function detectFolderTechStack(folderPath) {
 }
 
 // src/lib/gitignore-template-loader.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname3, join as join14 } from "path";
+import { readFileSync as readFileSync3 } from "fs";
+import { dirname as dirname4, join as join15 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-var __dirname = dirname3(fileURLToPath2(import.meta.url));
+var __dirname = dirname4(fileURLToPath2(import.meta.url));
 var CANDIDATE_DIRS = [
   // Bundled production: dist/index.js → __dirname = .../dist/, sibling dist/templates
-  join14(__dirname, "templates", "gitignore"),
+  join15(__dirname, "templates", "gitignore"),
   // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
-  join14(__dirname, "..", "templates", "gitignore"),
+  join15(__dirname, "..", "templates", "gitignore"),
   // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
-  join14(__dirname, "..", "..", "src", "templates", "gitignore"),
+  join15(__dirname, "..", "..", "src", "templates", "gitignore"),
   // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
-  join14(__dirname, "..", "src", "templates", "gitignore")
+  join15(__dirname, "..", "src", "templates", "gitignore")
 ];
 var AVATAR_MARKER_START = "# === avatar ===";
 var AVATAR_MARKER_END = "# === /avatar ===";
 function readTemplate(stack) {
   for (const dir of CANDIDATE_DIRS) {
     try {
-      return readFileSync2(join14(dir, `${stack}.txt`), "utf8");
+      return readFileSync3(join15(dir, `${stack}.txt`), "utf8");
     } catch {
     }
   }
@@ -2313,15 +2353,15 @@ ${readTemplate(s).trim()}`);
 }
 
 // src/lib/write-or-merge-gitignore.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync } from "fs";
+import { join as join16 } from "path";
 function writeOrMergeGitignore(folderPath, avatarBlock) {
-  const path = join15(folderPath, ".gitignore");
-  if (!existsSync5(path)) {
+  const path = join16(folderPath, ".gitignore");
+  if (!existsSync6(path)) {
     writeFileSync(path, avatarBlock, "utf8");
     return;
   }
-  const existing = readFileSync3(path, "utf8");
+  const existing = readFileSync4(path, "utf8");
   const startIdx = existing.indexOf(AVATAR_MARKER_START);
   const endIdx = existing.indexOf(AVATAR_MARKER_END);
   if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
@@ -2493,7 +2533,7 @@ async function safeBootstrapGitInFolder(folderPath, opts = {}) {
 
 // src/commands/init-conflict-detection-helpers.ts
 import { readdir } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 async function isEmptyOrMissing(path) {
   if (!await pathExists(path)) return true;
   try {
@@ -2506,7 +2546,7 @@ async function isEmptyOrMissing(path) {
 }
 async function findAlternativeWorkspaceName(parent, desiredName, maxAttempts = 10) {
   for (let i = 2; i < maxAttempts; i++) {
-    const candidate = join16(parent, `${desiredName}-${i}`);
+    const candidate = join17(parent, `${desiredName}-${i}`);
     if (await isEmptyOrMissing(candidate)) return candidate;
   }
   return null;
@@ -2898,7 +2938,7 @@ async function runInitFromScratch(opts, ownerEmail) {
   const teamOwner = opts.teamOwner ?? await promptTeamOwner(ownerEmail);
   const workspaceParent = resolve(opts.workspaceParent ?? ".");
   const workspacePath = await resolveWorkspacePath(workspaceParent, projectName, opts.force);
-  const srcPath = join17(workspacePath, "src");
+  const srcPath = join18(workspacePath, "src");
   await ensureDir(workspacePath);
   await ensureDir(srcPath);
   await safeBootstrapGitInFolder(srcPath, { autoYes: true });
@@ -3034,10 +3074,10 @@ async function finalizeWorkspaceScaffold(args) {
   await writeRootClaudeMd(args.workspacePath, vars);
   await writeProjectSettings(args.workspacePath, vars);
   await appendGitignoreEntries(args.workspacePath);
-  await ensureDir(join17(args.workspacePath, "notes"));
-  await ensureDir(join17(args.workspacePath, "scripts"));
-  await installGitHook(join17(args.workspacePath, ".git"), "post-merge");
-  await installGitHook(join17(args.workspacePath, ".git", "modules", "src"), "pre-push");
+  await ensureDir(join18(args.workspacePath, "notes"));
+  await ensureDir(join18(args.workspacePath, "scripts"));
+  await installGitHook(join18(args.workspacePath, ".git"), "post-merge");
+  await installGitHook(join18(args.workspacePath, ".git", "modules", "src"), "pre-push");
   log.success("C\xE0i post-merge (workspace) + pre-push (src/)");
   await appendAuditEntry("init", `flow=${args.flow},workspace=${args.workspaceName}`);
   await maybeCommitWorkspace(args.workspacePath, args.skipCommit);
@@ -3137,7 +3177,7 @@ async function maybeCreateWorkspaceRemote(args) {
   }
 }
 async function resolveWorkspacePath(parent, desiredName, force) {
-  const desired = join17(parent, desiredName);
+  const desired = join18(parent, desiredName);
   if (await isEmptyOrMissing(desired)) return desired;
   log.warn(`Workspace path "${desired}" \u0111\xE3 c\xF3 n\u1ED9i dung.`);
   while (true) {
@@ -3168,7 +3208,7 @@ async function resolveWorkspacePath(parent, desiredName, force) {
       message: "T\xEAn workspace m\u1EDBi:",
       validate: (v) => v.trim().length > 0 ? true : "T\xEAn kh\xF4ng \u0111\u01B0\u1EE3c r\u1ED7ng"
     });
-    const newPath = join17(parent, newName.trim());
+    const newPath = join18(parent, newName.trim());
     if (await isEmptyOrMissing(newPath)) return newPath;
     log.warn(`"${newPath}" c\u0169ng \u0111\xE3 c\xF3 n\u1ED9i dung. Th\u1EED t\xEAn kh\xE1c.`);
   }
@@ -3262,15 +3302,15 @@ function registerSecretsCommand(program2) {
 
 // src/commands/status.ts
 import { promises as fs8 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 import boxen5 from "boxen";
 
 // src/lib/pack-backup-manager.ts
 import { promises as fs7 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 var BACKUP_DIR_NAME = "_backup";
 async function listBackups(projectRoot) {
-  const dir = join18(projectRoot, ".claude", BACKUP_DIR_NAME);
+  const dir = join19(projectRoot, ".claude", BACKUP_DIR_NAME);
   if (!await pathExists(dir)) return [];
   const entries = await fs7.readdir(dir, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort().reverse();
@@ -3296,7 +3336,7 @@ function registerStatusCommand(program2) {
 }
 async function gatherStatus(cwd) {
   const projectName = cwd.split("/").filter(Boolean).pop() ?? "unknown";
-  const claudeRoot = join19(cwd, ".claude");
+  const claudeRoot = join20(cwd, ".claude");
   const hasAvatar = await pathExists(claudeRoot);
   if (!hasAvatar) {
     return {
@@ -3309,8 +3349,8 @@ async function gatherStatus(cwd) {
       hasAvatar: false
     };
   }
-  const packVersion = await isGitRepo(join19(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
-  const pendingDir = join19(claudeRoot, "_pending");
+  const packVersion = await isGitRepo(join20(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
+  const pendingDir = join20(claudeRoot, "_pending");
   const pendingCount = await pathExists(pendingDir) ? (await fs8.readdir(pendingDir)).filter((n) => n.endsWith(".diff.md")).length : 0;
   const backupCount = (await listBackups(cwd)).length;
   const techStackSummary = await readTechStackFirstLine(claudeRoot);
@@ -3325,7 +3365,7 @@ async function gatherStatus(cwd) {
   };
 }
 async function readTechStackFirstLine(claudeRoot) {
-  const techStackPath = join19(claudeRoot, "project", "tech-stack.md");
+  const techStackPath = join20(claudeRoot, "project", "tech-stack.md");
   if (!await pathExists(techStackPath)) return "(no tech-stack.md)";
   const content = await readText(techStackPath);
   const firstNonHeaderLine = content.split("\n").find((l) => l.trim() && !l.startsWith("#") && !l.startsWith(">"));
@@ -3366,27 +3406,27 @@ import boxen6 from "boxen";
 // src/lib/create-uninstall-backup-snapshot.ts
 import { cp, mkdir, writeFile } from "fs/promises";
 import { homedir as homedir3 } from "os";
-import { basename as basename2, join as join20 } from "path";
-var UNINSTALL_BACKUPS_DIR = join20(homedir3(), ".avatar", "uninstall-backups");
+import { basename as basename2, join as join21 } from "path";
+var UNINSTALL_BACKUPS_DIR = join21(homedir3(), ".avatar", "uninstall-backups");
 async function createUninstallBackupSnapshot(projectRoot, artifacts, avatarVersion) {
   const projectName = basename2(projectRoot);
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const backupDir = join20(UNINSTALL_BACKUPS_DIR, `${projectName}-${timestamp}`);
+  const backupDir = join21(UNINSTALL_BACKUPS_DIR, `${projectName}-${timestamp}`);
   await mkdir(backupDir, { recursive: true, mode: 448 });
   if (artifacts.claudeDir) {
-    await cp(artifacts.claudeDir, join20(backupDir, ".claude"), { recursive: true });
+    await cp(artifacts.claudeDir, join21(backupDir, ".claude"), { recursive: true });
   }
   if (artifacts.claudeMd) {
-    await cp(artifacts.claudeMd, join20(backupDir, "CLAUDE.md"));
+    await cp(artifacts.claudeMd, join21(backupDir, "CLAUDE.md"));
   }
   if (artifacts.postMergeHook || artifacts.prePushHook) {
-    const hooksBackupDir = join20(backupDir, "hooks");
+    const hooksBackupDir = join21(backupDir, "hooks");
     await mkdir(hooksBackupDir, { recursive: true });
     if (artifacts.postMergeHook) {
-      await cp(artifacts.postMergeHook, join20(hooksBackupDir, "post-merge"));
+      await cp(artifacts.postMergeHook, join21(hooksBackupDir, "post-merge"));
     }
     if (artifacts.prePushHook) {
-      await cp(artifacts.prePushHook, join20(hooksBackupDir, "pre-push"));
+      await cp(artifacts.prePushHook, join21(hooksBackupDir, "pre-push"));
     }
   }
   const manifest = {
@@ -3401,27 +3441,27 @@ async function createUninstallBackupSnapshot(projectRoot, artifacts, avatarVersi
       prePushHook: !!artifacts.prePushHook
     }
   };
-  await writeFile(join20(backupDir, "manifest.json"), JSON.stringify(manifest, null, 2), "utf8");
+  await writeFile(join21(backupDir, "manifest.json"), JSON.stringify(manifest, null, 2), "utf8");
   return backupDir;
 }
 
 // src/lib/detect-avatar-project-artifacts.ts
-import { existsSync as existsSync6 } from "fs";
-import { join as join21 } from "path";
+import { existsSync as existsSync7 } from "fs";
+import { join as join22 } from "path";
 function existsOrNull(path) {
-  return existsSync6(path) ? path : null;
+  return existsSync7(path) ? path : null;
 }
 function detectAvatarProjectArtifacts(projectRoot) {
-  const claudeDir = existsOrNull(join21(projectRoot, ".claude"));
-  const claudeMd = existsOrNull(join21(projectRoot, "CLAUDE.md"));
-  const postMergeHook = existsOrNull(join21(projectRoot, ".git", "hooks", "post-merge"));
+  const claudeDir = existsOrNull(join22(projectRoot, ".claude"));
+  const claudeMd = existsOrNull(join22(projectRoot, "CLAUDE.md"));
+  const postMergeHook = existsOrNull(join22(projectRoot, ".git", "hooks", "post-merge"));
   const prePushHook = existsOrNull(
-    join21(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
+    join22(projectRoot, ".git", "modules", "src", "hooks", "pre-push")
   );
-  const gitignorePath = existsOrNull(join21(projectRoot, ".gitignore"));
-  const gitmodulesPath = existsOrNull(join21(projectRoot, ".gitmodules"));
-  const notesDir = existsOrNull(join21(projectRoot, "notes"));
-  const scriptsDir = existsOrNull(join21(projectRoot, "scripts"));
+  const gitignorePath = existsOrNull(join22(projectRoot, ".gitignore"));
+  const gitmodulesPath = existsOrNull(join22(projectRoot, ".gitmodules"));
+  const notesDir = existsOrNull(join22(projectRoot, "notes"));
+  const scriptsDir = existsOrNull(join22(projectRoot, "scripts"));
   const hasAnyArtifact = !!(claudeDir || claudeMd || postMergeHook || prePushHook);
   return {
     hasAnyArtifact,
@@ -3442,11 +3482,11 @@ async function executeUninstallDeletion(artifacts, flags) {
   if (artifacts.claudeDir) {
     if (flags.keepSubmodule) {
       const { readdir: readdir2 } = await import("fs/promises");
-      const { join: join22 } = await import("path");
+      const { join: join23 } = await import("path");
       const entries = await readdir2(artifacts.claudeDir);
       for (const entry of entries) {
         if (entry === "pack") continue;
-        await rm(join22(artifacts.claudeDir, entry), { recursive: true, force: true });
+        await rm(join23(artifacts.claudeDir, entry), { recursive: true, force: true });
       }
     } else {
       await rm(artifacts.claudeDir, { recursive: true, force: true });
@@ -3515,7 +3555,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.3.0";
+var CLI_VERSION = "1.3.1";
 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 {
@@ -3597,7 +3637,7 @@ function printUninstallSuccessBox(backupPath) {
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.3.0";
+var CLI_VERSION2 = "1.3.1";
 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",