@nalvietnam/avatar-cli 1.6.0 → 1.6.2

package/dist/index.js

@@ -1852,17 +1852,41 @@ import { join as join14 } from "path";
 import { confirm as confirm2 } from "@inquirer/prompts";
 var WIKI_TIMEOUT_MS = 15 * 60 * 1e3;
 var DEFAULT_LLMLITE_MODEL = "nal-claude";
+var DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-4-5";
+function normalizeAnthropicBaseUrl(rawBaseUrl) {
+  const cleaned = rawBaseUrl.replace(/\/+$/, "");
+  if (cleaned.endsWith("/v1")) return `${cleaned}/`;
+  if (cleaned.endsWith("/v1/")) return cleaned;
+  return `${cleaned}/v1/`;
+}
 async function readSettingsForWikiCredentials(workspacePath) {
   const settingsPath = join14(workspacePath, ".claude", "settings.json");
   if (!await pathExists(settingsPath)) return null;
   try {
     const settings = await readJson(settingsPath);
     const env = settings.env || {};
-    const apiKey = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : null;
     const baseUrl = typeof env.ANTHROPIC_BASE_URL === "string" ? env.ANTHROPIC_BASE_URL : null;
-    if (!apiKey || !baseUrl) return null;
-    const model = typeof env.ANTHROPIC_MODEL === "string" && env.ANTHROPIC_MODEL.length > 0 ? env.ANTHROPIC_MODEL : DEFAULT_LLMLITE_MODEL;
-    return { apiKey, baseUrl, model };
+    if (!baseUrl) return null;
+    const userModel = typeof env.ANTHROPIC_MODEL === "string" ? env.ANTHROPIC_MODEL : "";
+    const anthropicKey = typeof env.ANTHROPIC_API_KEY === "string" ? env.ANTHROPIC_API_KEY : null;
+    if (anthropicKey) {
+      return {
+        provider: "anthropic",
+        apiKey: anthropicKey,
+        baseUrl: normalizeAnthropicBaseUrl(baseUrl),
+        model: userModel.length > 0 ? userModel : DEFAULT_ANTHROPIC_MODEL
+      };
+    }
+    const llmliteToken = typeof env.ANTHROPIC_AUTH_TOKEN === "string" ? env.ANTHROPIC_AUTH_TOKEN : null;
+    if (llmliteToken) {
+      return {
+        provider: "llmlite",
+        apiKey: llmliteToken,
+        baseUrl,
+        model: userModel.length > 0 ? userModel : DEFAULT_LLMLITE_MODEL
+      };
+    }
+    return null;
   } catch {
     return null;
   }
@@ -1880,8 +1904,10 @@ function tailLines2(text, n) {
 async function runGitnexusWikiConditional(workspacePath) {
   const creds = await readSettingsForWikiCredentials(workspacePath);
   if (!creds) {
-    log.warn("Subscription mode (ho\u1EB7c settings.json kh\xF4ng c\xF3 LLMLite key) \u2192 skip wiki gen.");
-    log.dim("\u0110\u1EC3 gen wiki sau, ch\u1EA1y manual: gitnexus wiki . --api-key <openai-key>");
+    log.warn("Subscription mode (OAuth, kh\xF4ng c\xF3 API key trong settings.json) \u2192 skip wiki gen.");
+    log.dim(
+      "\u0110\u1EC3 gen wiki sau, ch\u1EA1y manual:\n  gitnexus wiki . --api-key <key> --base-url <url> --model <model>"
+    );
     return { ran: false, skipped: true, reason: "subscription-mode" };
   }
   const proceed = await confirmWikiGeneration(creds.baseUrl, creds.model);
@@ -1891,7 +1917,9 @@ async function runGitnexusWikiConditional(workspacePath) {
     );
     return { ran: false, skipped: true, reason: "user-declined" };
   }
-  const sp = spinnerWithElapsed(`Generating wiki via ${creds.baseUrl} model=${creds.model}`);
+  const sp = spinnerWithElapsed(
+    `Generating wiki via ${creds.baseUrl} (${creds.provider}) model=${creds.model}`
+  );
   const result = spawnSync10(
     "gitnexus",
     ["wiki", ".", "--api-key", creds.apiKey, "--base-url", creds.baseUrl, "--model", creds.model],
@@ -2169,7 +2197,7 @@ function registerGitnexusCommand(program2) {
 }
 
 // src/commands/init.ts
-import { basename, join as join22, relative as relative2, resolve } from "path";
+import { basename, join as join24, relative as relative3, resolve } from "path";
 import { confirm as confirm5, input as input5, select as select9 } from "@inquirer/prompts";
 import boxen5 from "boxen";
 
@@ -3032,6 +3060,131 @@ function linkExistingRemoteToWorkspace(args) {
   return { sshUrl, httpsUrl };
 }
 
+// src/lib/merge-pack-settings-into-project-settings.ts
+import { promises as fs9 } from "fs";
+import { join as join17 } from "path";
+function backupFilename(originalPath) {
+  const d = /* @__PURE__ */ new Date();
+  const stamp = `${d.getFullYear().toString().slice(-2) + String(d.getMonth() + 1).padStart(2, "0") + String(d.getDate()).padStart(2, "0")}-${String(d.getHours()).padStart(2, "0")}${String(d.getMinutes()).padStart(2, "0")}`;
+  return `${originalPath}.backup-${stamp}`;
+}
+function unionDedupe(a, b) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const item of [...a, ...b]) {
+    const key = typeof item === "string" ? item : JSON.stringify(item);
+    if (!seen.has(key)) {
+      seen.add(key);
+      out.push(item);
+    }
+  }
+  return out;
+}
+function mergeHooksPerEvent(packHooks, userHooks) {
+  const touched = [];
+  const merged = { ...userHooks };
+  for (const [event, packEntries] of Object.entries(packHooks)) {
+    const userEntries = userHooks[event] || [];
+    const union = unionDedupe(userEntries, packEntries);
+    if (union.length !== userEntries.length) {
+      touched.push(event);
+    }
+    merged[event] = union;
+  }
+  return { merged, touchedEvents: touched };
+}
+async function mergePackSettingsIntoProjectSettings(workspacePath) {
+  const packTemplatePath = join17(workspacePath, ".claude", "pack", "templates", "settings.json.tpl");
+  const projectSettingsPath = join17(workspacePath, ".claude", "settings.json");
+  if (!await pathExists(packTemplatePath)) {
+    return { action: "no-pack-template", changes: [] };
+  }
+  let packTemplate;
+  try {
+    const raw = await readText(packTemplatePath);
+    packTemplate = JSON.parse(raw);
+  } catch (err) {
+    throw new Error(
+      `Pack settings template kh\xF4ng parse \u0111\u01B0\u1EE3c JSON: ${err.message}. Path: ${packTemplatePath}`
+    );
+  }
+  let userSettings = {};
+  let projectHasSettings = false;
+  if (await pathExists(projectSettingsPath)) {
+    projectHasSettings = true;
+    try {
+      userSettings = await readJson(projectSettingsPath);
+    } catch (err) {
+      throw new Error(
+        `Project settings.json kh\xF4ng parse \u0111\u01B0\u1EE3c: ${err.message}. Manual fix tr\u01B0\u1EDBc khi sync.`
+      );
+    }
+  }
+  const changes = [];
+  const merged = { ...userSettings };
+  if (packTemplate.statusLine && !userSettings.statusLine) {
+    merged.statusLine = packTemplate.statusLine;
+    changes.push("statusLine added");
+  }
+  if (typeof packTemplate.includeCoAuthoredBy === "boolean" && typeof userSettings.includeCoAuthoredBy !== "boolean") {
+    merged.includeCoAuthoredBy = packTemplate.includeCoAuthoredBy;
+    changes.push("includeCoAuthoredBy added");
+  }
+  if (packTemplate.model && !userSettings.model) {
+    merged.model = packTemplate.model;
+    changes.push("model added");
+  }
+  if (packTemplate.env) {
+    const mergedEnv = { ...userSettings.env || {} };
+    let envChanged = false;
+    for (const [k, v] of Object.entries(packTemplate.env)) {
+      if (!(k in mergedEnv)) {
+        mergedEnv[k] = v;
+        envChanged = true;
+      }
+    }
+    if (envChanged) {
+      merged.env = mergedEnv;
+      changes.push("env vars added from pack");
+    }
+  }
+  if (packTemplate.permissions) {
+    const userAllow = userSettings.permissions?.allow || [];
+    const userDeny = userSettings.permissions?.deny || [];
+    const packAllow = packTemplate.permissions.allow || [];
+    const packDeny = packTemplate.permissions.deny || [];
+    const mergedAllow = unionDedupe(userAllow, packAllow);
+    const mergedDeny = unionDedupe(userDeny, packDeny);
+    if (mergedAllow.length !== userAllow.length || mergedDeny.length !== userDeny.length) {
+      merged.permissions = { allow: mergedAllow, deny: mergedDeny };
+      changes.push(
+        `permissions union (+${mergedAllow.length - userAllow.length} allow, +${mergedDeny.length - userDeny.length} deny)`
+      );
+    }
+  }
+  if (packTemplate.hooks) {
+    const userHooks = userSettings.hooks || {};
+    const { merged: mergedHooks, touchedEvents } = mergeHooksPerEvent(
+      packTemplate.hooks,
+      userHooks
+    );
+    if (touchedEvents.length > 0) {
+      merged.hooks = mergedHooks;
+      changes.push(`hooks added for events: ${touchedEvents.join(", ")}`);
+    }
+  }
+  if (changes.length === 0) {
+    return { action: "no-change", changes: [] };
+  }
+  let backupPath;
+  if (projectHasSettings) {
+    backupPath = backupFilename(projectSettingsPath);
+    await fs9.copyFile(projectSettingsPath, backupPath);
+  }
+  await writeJsonAtomic(projectSettingsPath, merged);
+  return { action: "merged", backupPath, changes };
+}
+
 // src/lib/safe-bootstrap-for-dirty-folder.ts
 import { readdirSync } from "fs";
 import { select as select8 } from "@inquirer/prompts";
@@ -3039,9 +3192,9 @@ import { simpleGit as simpleGit3 } from "simple-git";
 
 // src/lib/check-folder-has-git.ts
 import { existsSync as existsSync6, statSync } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 function checkFolderHasGit(folderPath) {
-  const gitPath = join17(folderPath, ".git");
+  const gitPath = join18(folderPath, ".git");
   if (!existsSync6(gitPath)) return false;
   const stat = statSync(gitPath);
   return stat.isDirectory() || stat.isFile();
@@ -3073,7 +3226,7 @@ async function createInitialGitCommit(folderPath) {
 
 // src/lib/detect-folder-tech-stack.ts
 import { existsSync as existsSync7 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 var SIGNATURES = {
   node: ["package.json"],
   python: ["pyproject.toml", "requirements.txt", "setup.py", "Pipfile"],
@@ -3085,7 +3238,7 @@ var SIGNATURES = {
 function detectFolderTechStack(folderPath) {
   const matched = [];
   for (const [stack, files] of Object.entries(SIGNATURES)) {
-    if (files.some((f) => existsSync7(join18(folderPath, f)))) {
+    if (files.some((f) => existsSync7(join19(folderPath, f)))) {
       matched.push(stack);
     }
   }
@@ -3094,25 +3247,25 @@ function detectFolderTechStack(folderPath) {
 
 // src/lib/gitignore-template-loader.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname4, join as join19 } from "path";
+import { dirname as dirname4, join as join20 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var __dirname = dirname4(fileURLToPath2(import.meta.url));
 var CANDIDATE_DIRS = [
   // Bundled production: dist/index.js → __dirname = .../dist/, sibling dist/templates
-  join19(__dirname, "templates", "gitignore"),
+  join20(__dirname, "templates", "gitignore"),
   // Legacy bundled: nếu file là dist/lib/*.js (sub-bundle), templates ở dist/templates
-  join19(__dirname, "..", "templates", "gitignore"),
+  join20(__dirname, "..", "templates", "gitignore"),
   // Dev mode (vitest/tsx run src/ trực tiếp): __dirname = src/lib/
-  join19(__dirname, "..", "..", "src", "templates", "gitignore"),
+  join20(__dirname, "..", "..", "src", "templates", "gitignore"),
   // npm-installed alt: __dirname = .../dist/ → package_root/src/templates
-  join19(__dirname, "..", "src", "templates", "gitignore")
+  join20(__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 readFileSync3(join19(dir, `${stack}.txt`), "utf8");
+      return readFileSync3(join20(dir, `${stack}.txt`), "utf8");
     } catch {
     }
   }
@@ -3127,9 +3280,9 @@ ${readTemplate(s).trim()}`);
 
 // src/lib/write-or-merge-gitignore.ts
 import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync } from "fs";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 function writeOrMergeGitignore(folderPath, avatarBlock) {
-  const path = join20(folderPath, ".gitignore");
+  const path = join21(folderPath, ".gitignore");
   if (!existsSync8(path)) {
     writeFileSync(path, avatarBlock, "utf8");
     return;
@@ -3304,9 +3457,75 @@ async function safeBootstrapGitInFolder(folderPath, opts = {}) {
   await appendAuditEntry("bootstrap", `state=${state},strategy=${strategy}`);
 }
 
+// src/lib/symlink-farm-for-team-pack-mount-dirs.ts
+import { promises as fs11 } from "fs";
+import { dirname as dirname5, join as join22, relative as relative2 } from "path";
+
+// src/lib/backup-existing-dir-before-symlink-override.ts
+import { promises as fs10 } from "fs";
+function timestamp() {
+  const d = /* @__PURE__ */ new Date();
+  const pad = (n) => n.toString().padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}`;
+}
+async function backupDirBeforeReplace(targetPath) {
+  const backupPath = `${targetPath}.backup-${timestamp()}`;
+  await fs10.rename(targetPath, backupPath);
+  return backupPath;
+}
+
+// src/lib/symlink-farm-for-team-pack-mount-dirs.ts
+var TEAM_PACK_MOUNT_DIRS = [
+  "skills",
+  "agents",
+  "commands",
+  "hooks",
+  "workflows",
+  "scripts",
+  "knowledge"
+];
+async function isSymbolicLink(path) {
+  try {
+    const st = await fs11.lstat(path);
+    return st.isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+async function syncMountedDir(source, dest, force) {
+  const dir = relative2(dirname5(dest), dest) || dest;
+  if (!await pathExists(source)) {
+    return { dir, action: "source-missing" };
+  }
+  if (await pathExists(dest)) {
+    if (await isSymbolicLink(dest)) {
+      await fs11.unlink(dest);
+    } else if (force) {
+      const backupPath = await backupDirBeforeReplace(dest);
+      const relativeSource2 = relative2(dirname5(dest), source);
+      await fs11.symlink(relativeSource2, dest);
+      return { dir, action: "backed-up-and-linked", backupPath };
+    } else {
+      return { dir, action: "skipped-conflict" };
+    }
+  }
+  const relativeSource = relative2(dirname5(dest), source);
+  await fs11.symlink(relativeSource, dest);
+  return { dir, action: "created" };
+}
+async function syncAllMountDirs(packDir, claudeDir, force) {
+  const results = [];
+  for (const dir of TEAM_PACK_MOUNT_DIRS) {
+    const source = join22(packDir, dir);
+    const dest = join22(claudeDir, dir);
+    results.push(await syncMountedDir(source, dest, force));
+  }
+  return results;
+}
+
 // src/commands/init-conflict-detection-helpers.ts
 import { readdir } from "fs/promises";
-import { join as join21 } from "path";
+import { join as join23 } from "path";
 async function isEmptyOrMissing(path) {
   if (!await pathExists(path)) return true;
   try {
@@ -3319,7 +3538,7 @@ async function isEmptyOrMissing(path) {
 }
 async function findAlternativeWorkspaceName(parent, desiredName, maxAttempts = 10) {
   for (let i = 2; i < maxAttempts; i++) {
-    const candidate = join21(parent, `${desiredName}-${i}`);
+    const candidate = join23(parent, `${desiredName}-${i}`);
     if (await isEmptyOrMissing(candidate)) return candidate;
   }
   return null;
@@ -3749,7 +3968,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 = join22(workspacePath, "src");
+  const srcPath = join24(workspacePath, "src");
   await ensureDir(workspacePath);
   await ensureDir(srcPath);
   await safeBootstrapGitInFolder(srcPath, { autoYes: true });
@@ -3887,11 +4106,12 @@ async function finalizeWorkspaceScaffold(args) {
   await writeRootClaudeMd(args.workspacePath, vars);
   await writeProjectSettings(args.workspacePath, vars);
   await appendGitignoreEntries(args.workspacePath);
-  await ensureDir(join22(args.workspacePath, "notes"));
-  await ensureDir(join22(args.workspacePath, "scripts"));
-  await installGitHook(join22(args.workspacePath, ".git"), "post-merge");
-  await installGitHook(join22(args.workspacePath, ".git", "modules", "src"), "pre-push");
+  await ensureDir(join24(args.workspacePath, "notes"));
+  await ensureDir(join24(args.workspacePath, "scripts"));
+  await installGitHook(join24(args.workspacePath, ".git"), "post-merge");
+  await installGitHook(join24(args.workspacePath, ".git", "modules", "src"), "pre-push");
   log.success("C\xE0i post-merge (workspace) + pre-push (src/)");
+  await autoSyncPackOnInit(args.workspacePath);
   await appendAuditEntry("init", `flow=${args.flow},workspace=${args.workspaceName}`);
   await maybeCommitWorkspace(args.workspacePath, args.skipCommit);
   await maybeCreateWorkspaceRemote(args);
@@ -3926,6 +4146,39 @@ async function finalizeWorkspaceScaffold(args) {
   }
   printInitSuccessBox(args.workspacePath, args.flow, aiResult, gitnexusResult);
 }
+async function autoSyncPackOnInit(workspacePath) {
+  const packDir = join24(workspacePath, TEAM_PACK_RELATIVE_PATH);
+  if (!await pathExists(packDir)) {
+    log.dim("Pack submodule kh\xF4ng t\u1ED3n t\u1EA1i (skip auto-sync). C\xF3 th\u1EC3 ch\u1EA1y `avatar sync` sau.");
+    return;
+  }
+  const claudeDir = join24(workspacePath, ".claude");
+  log.info("Auto-sync pack content v\xE0o .claude/ (symlinks + settings merge)...");
+  try {
+    const results = await syncAllMountDirs(packDir, claudeDir, false);
+    const created = results.filter((r) => r.action === "created" || r.action === "updated").length;
+    const missing = results.filter((r) => r.action === "source-missing").length;
+    log.success(
+      `  \u2713 Symlinks: ${created} created${missing > 0 ? `, ${missing} source-missing (pack thi\u1EBFu dir)` : ""}`
+    );
+    const mergeResult = await mergePackSettingsIntoProjectSettings(workspacePath);
+    switch (mergeResult.action) {
+      case "merged":
+        log.success(`  \u2713 settings.json merged (${mergeResult.changes.join("; ")})`);
+        break;
+      case "no-change":
+        log.dim("  - settings.json \u0111\xE3 sync, kh\xF4ng c\u1EA7n thay \u0111\u1ED5i.");
+        break;
+      case "no-pack-template":
+        log.dim("  - Pack kh\xF4ng c\xF3 templates/settings.json.tpl, skip merge.");
+        break;
+    }
+  } catch (err) {
+    log.warn(
+      `Auto-sync pack fail: ${err instanceof Error ? err.message : err}. Ch\u1EA1y \`avatar sync\` th\u1EE7 c\xF4ng \u0111\u1EC3 retry.`
+    );
+  }
+}
 async function maybeCreateWorkspaceRemote(args) {
   if (args.skipCommit) {
     log.dim("Skip workspace remote (ch\u01B0a commit). Setup sau qua: gh repo create ...");
@@ -4013,7 +4266,7 @@ async function maybeCreateWorkspaceRemote(args) {
   }
 }
 async function resolveWorkspacePath(parent, desiredName, force) {
-  const desired = join22(parent, desiredName);
+  const desired = join24(parent, desiredName);
   if (await isEmptyOrMissing(desired)) return desired;
   log.warn(`Workspace path "${desired}" \u0111\xE3 c\xF3 n\u1ED9i dung.`);
   while (true) {
@@ -4044,7 +4297,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 = join22(parent, newName.trim());
+    const newPath = join24(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.`);
   }
@@ -4087,7 +4340,7 @@ function formatGitnexusStatusLine(result) {
 }
 function printInitSuccessBox(rootPath, flow, aiResult = null, gitnexusResult = null) {
   const lines = [
-    `${chalk.green("\u2713")} Workspace s\u1EB5n s\xE0ng: ${relative2(process.cwd(), rootPath) || rootPath}`,
+    `${chalk.green("\u2713")} Workspace s\u1EB5n s\xE0ng: ${relative3(process.cwd(), rootPath) || rootPath}`,
     `  ${chalk.dim(`(flow: ${flow})`)}`,
     formatAiStatusLine(aiResult),
     formatGitnexusStatusLine(gitnexusResult),
@@ -4150,18 +4403,18 @@ function registerSecretsCommand(program2) {
 }
 
 // src/commands/status.ts
-import { promises as fs10 } from "fs";
-import { join as join24 } from "path";
+import { promises as fs13 } from "fs";
+import { join as join26 } from "path";
 import boxen6 from "boxen";
 
 // src/lib/pack-backup-manager.ts
-import { promises as fs9 } from "fs";
-import { join as join23 } from "path";
+import { promises as fs12 } from "fs";
+import { join as join25 } from "path";
 var BACKUP_DIR_NAME = "_backup";
 async function listBackups(projectRoot) {
-  const dir = join23(projectRoot, ".claude", BACKUP_DIR_NAME);
+  const dir = join25(projectRoot, ".claude", BACKUP_DIR_NAME);
   if (!await pathExists(dir)) return [];
-  const entries = await fs9.readdir(dir, { withFileTypes: true });
+  const entries = await fs12.readdir(dir, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort().reverse();
 }
 
@@ -4185,7 +4438,7 @@ function registerStatusCommand(program2) {
 }
 async function gatherStatus(cwd) {
   const projectName = cwd.split("/").filter(Boolean).pop() ?? "unknown";
-  const claudeRoot = join24(cwd, ".claude");
+  const claudeRoot = join26(cwd, ".claude");
   const hasAvatar = await pathExists(claudeRoot);
   if (!hasAvatar) {
     return {
@@ -4198,9 +4451,9 @@ async function gatherStatus(cwd) {
       hasAvatar: false
     };
   }
-  const packVersion = await isGitRepo(join24(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
-  const pendingDir = join24(claudeRoot, "_pending");
-  const pendingCount = await pathExists(pendingDir) ? (await fs10.readdir(pendingDir)).filter((n) => n.endsWith(".diff.md")).length : 0;
+  const packVersion = await isGitRepo(join26(claudeRoot, "pack")) ? await readPinnedPackVersion(cwd).catch(() => null) : null;
+  const pendingDir = join26(claudeRoot, "_pending");
+  const pendingCount = await pathExists(pendingDir) ? (await fs13.readdir(pendingDir)).filter((n) => n.endsWith(".diff.md")).length : 0;
   const backupCount = (await listBackups(cwd)).length;
   const techStackSummary = await readTechStackFirstLine(claudeRoot);
   return {
@@ -4214,7 +4467,7 @@ async function gatherStatus(cwd) {
   };
 }
 async function readTechStackFirstLine(claudeRoot) {
-  const techStackPath = join24(claudeRoot, "project", "tech-stack.md");
+  const techStackPath = join26(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(">"));
@@ -4237,201 +4490,8 @@ function renderStatusBox(s) {
 // src/commands/sync.ts
 import { join as join28 } from "path";
 
-// src/lib/merge-pack-settings-into-project-settings.ts
-import { promises as fs11 } from "fs";
-import { join as join25 } from "path";
-function backupFilename(originalPath) {
-  const d = /* @__PURE__ */ new Date();
-  const stamp = `${d.getFullYear().toString().slice(-2) + String(d.getMonth() + 1).padStart(2, "0") + String(d.getDate()).padStart(2, "0")}-${String(d.getHours()).padStart(2, "0")}${String(d.getMinutes()).padStart(2, "0")}`;
-  return `${originalPath}.backup-${stamp}`;
-}
-function unionDedupe(a, b) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const item of [...a, ...b]) {
-    const key = typeof item === "string" ? item : JSON.stringify(item);
-    if (!seen.has(key)) {
-      seen.add(key);
-      out.push(item);
-    }
-  }
-  return out;
-}
-function mergeHooksPerEvent(packHooks, userHooks) {
-  const touched = [];
-  const merged = { ...userHooks };
-  for (const [event, packEntries] of Object.entries(packHooks)) {
-    const userEntries = userHooks[event] || [];
-    const union = unionDedupe(userEntries, packEntries);
-    if (union.length !== userEntries.length) {
-      touched.push(event);
-    }
-    merged[event] = union;
-  }
-  return { merged, touchedEvents: touched };
-}
-async function mergePackSettingsIntoProjectSettings(workspacePath) {
-  const packTemplatePath = join25(workspacePath, ".claude", "pack", "templates", "settings.json.tpl");
-  const projectSettingsPath = join25(workspacePath, ".claude", "settings.json");
-  if (!await pathExists(packTemplatePath)) {
-    return { action: "no-pack-template", changes: [] };
-  }
-  let packTemplate;
-  try {
-    const raw = await readText(packTemplatePath);
-    packTemplate = JSON.parse(raw);
-  } catch (err) {
-    throw new Error(
-      `Pack settings template kh\xF4ng parse \u0111\u01B0\u1EE3c JSON: ${err.message}. Path: ${packTemplatePath}`
-    );
-  }
-  let userSettings = {};
-  let projectHasSettings = false;
-  if (await pathExists(projectSettingsPath)) {
-    projectHasSettings = true;
-    try {
-      userSettings = await readJson(projectSettingsPath);
-    } catch (err) {
-      throw new Error(
-        `Project settings.json kh\xF4ng parse \u0111\u01B0\u1EE3c: ${err.message}. Manual fix tr\u01B0\u1EDBc khi sync.`
-      );
-    }
-  }
-  const changes = [];
-  const merged = { ...userSettings };
-  if (packTemplate.statusLine && !userSettings.statusLine) {
-    merged.statusLine = packTemplate.statusLine;
-    changes.push("statusLine added");
-  }
-  if (typeof packTemplate.includeCoAuthoredBy === "boolean" && typeof userSettings.includeCoAuthoredBy !== "boolean") {
-    merged.includeCoAuthoredBy = packTemplate.includeCoAuthoredBy;
-    changes.push("includeCoAuthoredBy added");
-  }
-  if (packTemplate.model && !userSettings.model) {
-    merged.model = packTemplate.model;
-    changes.push("model added");
-  }
-  if (packTemplate.env) {
-    const mergedEnv = { ...userSettings.env || {} };
-    let envChanged = false;
-    for (const [k, v] of Object.entries(packTemplate.env)) {
-      if (!(k in mergedEnv)) {
-        mergedEnv[k] = v;
-        envChanged = true;
-      }
-    }
-    if (envChanged) {
-      merged.env = mergedEnv;
-      changes.push("env vars added from pack");
-    }
-  }
-  if (packTemplate.permissions) {
-    const userAllow = userSettings.permissions?.allow || [];
-    const userDeny = userSettings.permissions?.deny || [];
-    const packAllow = packTemplate.permissions.allow || [];
-    const packDeny = packTemplate.permissions.deny || [];
-    const mergedAllow = unionDedupe(userAllow, packAllow);
-    const mergedDeny = unionDedupe(userDeny, packDeny);
-    if (mergedAllow.length !== userAllow.length || mergedDeny.length !== userDeny.length) {
-      merged.permissions = { allow: mergedAllow, deny: mergedDeny };
-      changes.push(
-        `permissions union (+${mergedAllow.length - userAllow.length} allow, +${mergedDeny.length - userDeny.length} deny)`
-      );
-    }
-  }
-  if (packTemplate.hooks) {
-    const userHooks = userSettings.hooks || {};
-    const { merged: mergedHooks, touchedEvents } = mergeHooksPerEvent(
-      packTemplate.hooks,
-      userHooks
-    );
-    if (touchedEvents.length > 0) {
-      merged.hooks = mergedHooks;
-      changes.push(`hooks added for events: ${touchedEvents.join(", ")}`);
-    }
-  }
-  if (changes.length === 0) {
-    return { action: "no-change", changes: [] };
-  }
-  let backupPath;
-  if (projectHasSettings) {
-    backupPath = backupFilename(projectSettingsPath);
-    await fs11.copyFile(projectSettingsPath, backupPath);
-  }
-  await writeJsonAtomic(projectSettingsPath, merged);
-  return { action: "merged", backupPath, changes };
-}
-
 // src/lib/preview-team-pack-sync-changes-for-dry-run.ts
 import { join as join27 } from "path";
-
-// src/lib/symlink-farm-for-team-pack-mount-dirs.ts
-import { promises as fs13 } from "fs";
-import { dirname as dirname5, join as join26, relative as relative3 } from "path";
-
-// src/lib/backup-existing-dir-before-symlink-override.ts
-import { promises as fs12 } from "fs";
-function timestamp() {
-  const d = /* @__PURE__ */ new Date();
-  const pad = (n) => n.toString().padStart(2, "0");
-  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}`;
-}
-async function backupDirBeforeReplace(targetPath) {
-  const backupPath = `${targetPath}.backup-${timestamp()}`;
-  await fs12.rename(targetPath, backupPath);
-  return backupPath;
-}
-
-// src/lib/symlink-farm-for-team-pack-mount-dirs.ts
-var TEAM_PACK_MOUNT_DIRS = [
-  "skills",
-  "agents",
-  "commands",
-  "hooks",
-  "workflows",
-  "scripts",
-  "knowledge"
-];
-async function isSymbolicLink(path) {
-  try {
-    const st = await fs13.lstat(path);
-    return st.isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
-async function syncMountedDir(source, dest, force) {
-  const dir = relative3(dirname5(dest), dest) || dest;
-  if (!await pathExists(source)) {
-    return { dir, action: "source-missing" };
-  }
-  if (await pathExists(dest)) {
-    if (await isSymbolicLink(dest)) {
-      await fs13.unlink(dest);
-    } else if (force) {
-      const backupPath = await backupDirBeforeReplace(dest);
-      const relativeSource2 = relative3(dirname5(dest), source);
-      await fs13.symlink(relativeSource2, dest);
-      return { dir, action: "backed-up-and-linked", backupPath };
-    } else {
-      return { dir, action: "skipped-conflict" };
-    }
-  }
-  const relativeSource = relative3(dirname5(dest), source);
-  await fs13.symlink(relativeSource, dest);
-  return { dir, action: "created" };
-}
-async function syncAllMountDirs(packDir, claudeDir, force) {
-  const results = [];
-  for (const dir of TEAM_PACK_MOUNT_DIRS) {
-    const source = join26(packDir, dir);
-    const dest = join26(claudeDir, dir);
-    results.push(await syncMountedDir(source, dest, force));
-  }
-  return results;
-}
-
-// src/lib/preview-team-pack-sync-changes-for-dry-run.ts
 async function inspectMountDir(packDir, claudeDir, dir) {
   const source = join27(packDir, dir);
   const dest = join27(claudeDir, dir);
@@ -4746,7 +4806,7 @@ async function removeSubmoduleEntry(gitmodulesPath, submodulePath) {
 }
 
 // src/commands/uninstall.ts
-var CLI_VERSION = "1.6.0";
+var CLI_VERSION = "1.6.2";
 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 {
@@ -4828,7 +4888,7 @@ function printUninstallSuccessBox(backupPath) {
 }
 
 // src/index.ts
-var CLI_VERSION2 = "1.6.0";
+var CLI_VERSION2 = "1.6.2";
 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",