@byh3071/vhk 1.5.1 → 1.6.1

package/README.md

@@ -1,12 +1,12 @@
 ---
 id: vhk-readme
 date: 2026-05-28
-tags: [vhk, cli, readme, v1.5.1, ga]
+tags: [vhk, cli, readme, v1.6.1, ga]
 ---
 
 # 🔧 VHK — Vibe Harness Kit
 
-> 🎉 **v1.5.1** — **규칙은 한 벌로 Cursor·Claude·Windsurf·Copilot·Antigravity에, 맥락은 클라우드로.**
+> 🎉 **v1.6.1** — **규칙은 한 벌로 Cursor·Claude·Windsurf·Copilot·Antigravity에, 맥락은 클라우드로.**
 > 도구·기기를 옮겨도 `vhk` 명령으로 그대로 불러옵니다. (포터빌리티)
 >
 > AI 코딩 에이전트를 부리는 사람을 위한 **한국어 풀사이클 CLI**.
@@ -55,7 +55,7 @@ vhk start
 vhk gate          # 퀵 5문항 — GO / 다듬기 / 다른 아이디어
 ```
 
-### 3. 그 외 기능 한눈에 (v1.5)
+### 3. 그 외 기능 한눈에 (v1.6)
 
 | 기능 | 한 줄 요약 | 진입 명령 |
 |------|-----------|-----------|
@@ -64,6 +64,7 @@ vhk gate          # 퀵 5문항 — GO / 다듬기 / 다른 아이디어
 | 🚧 **HARD_STOP 안전장치** | 블로커 3건 누적 → `.vhk/HARD_STOP` 트립와이어. `vhk resume --confirm` 만 해제 | `vhk blocker "<증상>"` |
 | 🔌 **MCP 24 tool** | Cursor·Claude Desktop 등에서 vhk를 채팅으로 호출 | `vhk mcp-init` |
 | 📋 **컨텍스트 영속화** | `.vhk/context.md` + `memory.json` + `brief.md` 로 세션 간 맥락 유지 | `vhk context` |
+| 🔀 **드리프트 감지** | 규칙 파일이 RULES.md와 어긋나거나 context가 코드보다 낡으면 자동 경고 (읽기전용) | `vhk doctor` |
 
 ### 4. 권장 일일 사이클
 
@@ -315,7 +316,7 @@ vhk ref open 1          # 1번 레퍼런스를 브라우저로 열기
 
 | 기능 | 설명 |
 |------|------|
-| **MCP 서버** | `vhk mcp` — stdio MCP 서버 첫 도입 (v0.6.0 당시 8개 도구 — save/undo/status/diff/ship/doctor/check/recap). 현재 v1.5 기준 **24개** 로 확장 — 위 "Cursor와 MCP로 연동하기" 섹션 참조 |
+| **MCP 서버** | `vhk mcp` — stdio MCP 서버 첫 도입 (v0.6.0 당시 8개 도구 — save/undo/status/diff/ship/doctor/check/recap). 현재 v1.6 기준 **24개** 로 확장 — 위 "Cursor와 MCP로 연동하기" 섹션 참조 |
 | **mcp-init** | `vhk mcp-init` — Cursor `.cursor/mcp.json` 자동 생성. 재시작 한 번으로 연동 완료 |
 | **자연어 라우팅 확장** | `vhk mcp설정` → `vhk mcp-init` 별칭 |
 | **보안** | MCP save 도구의 shell injection 차단 — 모든 git 호출에 shell 미경유 `safeExecFile` 사용 |

package/dist/{chunk-4KWZANQG.js → chunk-O3A6SO7G.js}

@@ -503,33 +503,54 @@ function resolveCmd(cmd, args) {
   }
   return { bin: platformCmd(cmd), argv: args };
 }
+var DEFAULT_EXEC_TIMEOUT_MS = 6e5;
+var NETWORK_EXEC_TIMEOUT_MS = 3e4;
+function resolveTimeout(timeoutMs, fallback) {
+  const v = timeoutMs === void 0 ? fallback : timeoutMs;
+  return v > 0 ? v : void 0;
+}
+function isTimeoutError(e, timeout) {
+  if (!timeout) return false;
+  return e.code === "ETIMEDOUT";
+}
 function safeExecFile(cmd, args, opts = {}) {
   const { bin, argv } = resolveCmd(cmd, args);
   const env2 = opts.env ? { ...process.env, ...opts.env } : void 0;
+  const timeout = resolveTimeout(opts.timeoutMs, DEFAULT_EXEC_TIMEOUT_MS);
   try {
     const out = execFileSync(bin, argv, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
-      env: env2
+      env: env2,
+      ...timeout ? { timeout, killSignal: "SIGTERM" } : {}
     }).toString();
     return { ok: true, out: out.trim() };
   } catch (err) {
     const e = err;
     const stdout = e.stdout ? e.stdout.toString() : "";
-    const msg = e.message ?? String(err);
+    let msg = e.message ?? String(err);
+    if (isTimeoutError(e, timeout)) {
+      msg = `\uBA85\uB839 \uC2DC\uAC04 \uCD08\uACFC (timeout ${timeout}ms): ${cmd} ${args.join(" ")}`.trim();
+    }
     return { ok: false, err: msg, out: stdout.trim() };
   }
 }
-function safeExecFileStream(cmd, args) {
+function safeExecFileStream(cmd, args, opts = {}) {
   const { bin, argv } = resolveCmd(cmd, args);
+  const timeout = opts.timeoutMs && opts.timeoutMs > 0 ? opts.timeoutMs : void 0;
   try {
     execFileSync(bin, argv, {
       encoding: "utf-8",
-      stdio: "inherit"
+      stdio: "inherit",
+      ...timeout ? { timeout, killSignal: "SIGTERM" } : {}
     });
     return { ok: true };
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
+    const e = err;
+    let msg = err instanceof Error ? err.message : String(err);
+    if (isTimeoutError(e, timeout)) {
+      msg = `\uBA85\uB839 \uC2DC\uAC04 \uCD08\uACFC (timeout ${timeout}ms): ${cmd} ${args.join(" ")}`.trim();
+    }
     return { ok: false, err: msg };
   }
 }
@@ -734,7 +755,12 @@ var ko = {
     nextOkMessage: "\uD658\uACBD \uC810\uAC80 \uD1B5\uACFC! \uC774\uC81C \uD504\uB85C\uC81D\uD2B8\uB97C \uC2DC\uC791\uD558\uC138\uC694.",
     nextRetryMessage: "\uC704 \uB3C4\uAD6C\uB97C \uC124\uCE58\uD55C \uD6C4 \uB2E4\uC2DC \uC810\uAC80\uD558\uC138\uC694.",
     updateAvailable: (latest) => `\u{1F195} v${latest} \uC0AC\uC6A9 \uAC00\uB2A5 \u2014 npm i -g @byh3071/vhk`,
-    updateCurrent: "\uCD5C\uC2E0 \uBC84\uC804\uC744 \uC4F0\uACE0 \uC788\uC5B4\uC694"
+    updateCurrent: "\uCD5C\uC2E0 \uBC84\uC804\uC744 \uC4F0\uACE0 \uC788\uC5B4\uC694",
+    driftTitle: "\u{1F500} \uB4DC\uB9AC\uD504\uD2B8 \uC810\uAC80 (\uADDC\uCE59\xB7\uB9E5\uB77D \uC5B4\uAE0B\uB0A8):",
+    driftNoRules: "\u2B1A RULES.md \uC5C6\uC74C \u2014 \uADDC\uCE59 \uB4DC\uB9AC\uD504\uD2B8 \uC810\uAC80 \uC0DD\uB7B5",
+    driftRuleClean: "\u2705 \uADDC\uCE59 \uD30C\uC77C\uC774 RULES.md\uC640 \uC77C\uCE58",
+    driftRuleWarn: (files) => `\u26A0\uFE0F RULES.md\uC640 \uC5B4\uAE0B\uB09C \uADDC\uCE59 \uD30C\uC77C: ${files} \u2014 vhk sync \uB97C \uB2E4\uC2DC \uC2E4\uD589\uD558\uC138\uC694`,
+    driftContextWarn: "\u26A0\uFE0F .vhk/context.md \uAC00 \uD604\uC7AC \uCF54\uB4DC\uBCF4\uB2E4 \uB0A1\uC558\uC5B4\uC694 \u2014 vhk context \uB85C \uAC31\uC2E0\uD558\uC138\uC694"
   },
   nlp: {
     matched: "\uC774\uAC8C \uB9DE\uB098\uC694?",
@@ -1138,6 +1164,48 @@ function bumpVersion(current, type) {
       return `${major}.${minor}.${patch + 1}`;
   }
 }
+function gitPostRelease(newVersion) {
+  const add = safeExecFile("git", ["add", "package.json"]);
+  if (!add.ok) {
+    return {
+      added: false,
+      committed: false,
+      tagged: false,
+      pushed: false,
+      warning: `git add \uC2E4\uD328 \u2014 \uCEE4\uBC0B/\uD0DC\uADF8/\uD478\uC2DC\uB97C \uAC74\uB108\uB701\uB2C8\uB2E4. \uC218\uB3D9\uC73C\uB85C \uCC98\uB9AC\uD558\uC138\uC694.`
+    };
+  }
+  const commit = safeExecFile("git", ["commit", "-m", `chore: release v${newVersion}`]);
+  if (!commit.ok) {
+    return {
+      added: true,
+      committed: false,
+      tagged: false,
+      pushed: false,
+      warning: `git commit \uC2E4\uD328 \u2014 git tag \uB97C \uAC74\uB108\uB701\uB2C8\uB2E4 (\uC798\uBABB\uB41C HEAD \uC5D0 \uD0DC\uADF8 \uBC29\uC9C0).
+    ${commit.err.slice(0, 300)}
+    \uC218\uB3D9 \uCC98\uB9AC: git commit && git tag v${newVersion} && git push --tags`
+    };
+  }
+  const tag = safeExecFile("git", ["tag", `v${newVersion}`]);
+  if (!tag.ok) {
+    return {
+      added: true,
+      committed: true,
+      tagged: false,
+      pushed: false,
+      warning: `git tag \uC0DD\uC131 \uC2E4\uD328 (\uC218\uB3D9: git tag v${newVersion}). ${tag.err.slice(0, 200)}`
+    };
+  }
+  const push = safeExecFile("git", ["push"]);
+  const pushTags = safeExecFile("git", ["push", "--tags"]);
+  return {
+    added: true,
+    committed: true,
+    tagged: true,
+    pushed: push.ok && pushTags.ok
+  };
+}
 async function publish() {
   console.log(chalk4.bold("\n\u{1F4E6} " + t("publish.title")));
   console.log(chalk4.gray("\u2500".repeat(40)));
@@ -1222,21 +1290,17 @@ async function publish() {
   }
   console.log(chalk4.green(`
 \u2714 ${t("publish.publishSuccess")}`));
-  const addResult = safeExecFile("git", ["add", "package.json"]);
-  if (addResult.ok) {
-    safeExecFile("git", ["commit", "-m", `chore: release v${newVersion}`]);
-    const tagResult = safeExecFile("git", ["tag", `v${newVersion}`]);
-    if (tagResult.ok) {
-      const pushResult = safeExecFile("git", ["push"]);
-      const pushTagsResult = safeExecFile("git", ["push", "--tags"]);
-      if (pushResult.ok && pushTagsResult.ok) {
-        console.log(chalk4.green(`
+  const git = gitPostRelease(newVersion);
+  if (git.warning) {
+    console.log(chalk4.yellow(`
+\u26A0\uFE0F  ${git.warning}`));
+    console.log(chalk4.dim(`    npm \uBC30\uD3EC\uB294 \uC774\uBBF8 \uC131\uACF5\uD588\uC2B5\uB2C8\uB2E4 (v${newVersion}).`));
+  } else if (git.tagged && git.pushed) {
+    console.log(chalk4.green(`
 \u{1F3F7}\uFE0F  git tag v${newVersion} \uC0DD\uC131 + push \uC644\uB8CC`));
-      } else {
-        console.log(chalk4.yellow(`
+  } else if (git.tagged) {
+    console.log(chalk4.yellow(`
 \u{1F3F7}\uFE0F  git tag v${newVersion} \uC0DD\uC131\uB428 (push\uB294 \uC218\uB3D9\uC73C\uB85C)`));
-      }
-    }
   }
   console.log(chalk4.green.bold(`
 \u{1F389} v${newVersion} \uBC30\uD3EC \uC644\uB8CC!`));
@@ -2112,7 +2176,9 @@ ${cliStatus}
     },
     async () => {
       const cur = safeExecFile("vhk", ["--version"]);
-      const latest = safeExecFile("npm", ["view", "@byh3071/vhk", "version"]);
+      const latest = safeExecFile("npm", ["view", "@byh3071/vhk", "version"], {
+        timeoutMs: NETWORK_EXEC_TIMEOUT_MS
+      });
       const lines = [
         `\uD604\uC7AC: ${cur.ok ? `v${cur.out.replace(/^v/, "")}` : "\uD655\uC778 \uC2E4\uD328"}`,
         `\uCD5C\uC2E0: ${latest.ok ? `v${latest.out.replace(/^v/, "")}` : "\uD655\uC778 \uC2E4\uD328 (\uB124\uD2B8\uC6CC\uD06C \uB610\uB294 npm registry)"}`
@@ -2163,6 +2229,7 @@ export {
   printSecurityWarnings,
   filterTrackedPaths,
   readJsonFile,
+  NETWORK_EXEC_TIMEOUT_MS,
   safeExecFile,
   MAX_SCAN_FILE_BYTES,
   MAX_SECRET_FINDINGS,

package/dist/index.js

@@ -2,6 +2,7 @@
 import {
   MAX_SCAN_FILE_BYTES,
   MAX_SECRET_FINDINGS,
+  NETWORK_EXEC_TIMEOUT_MS,
   __toESM,
   audit,
   deploy,
@@ -20,7 +21,7 @@ import {
   scanProjectForSecrets,
   startMcpServer,
   t
-} from "./chunk-4KWZANQG.js";
+} from "./chunk-O3A6SO7G.js";
 
 // src/index.ts
 import { Command, Help } from "commander";
@@ -1752,6 +1753,16 @@ function toClaudeMd(sections, existing) {
   }
   return lines.join("\n");
 }
+function deriveProjectName(rulesContent) {
+  const firstLine = rulesContent.split("\n")[0];
+  return firstLine.replace(/^#\s*/, "").replace(/\s*—.*/, "").trim() || "Project";
+}
+var SYNC_TARGETS = [
+  { path: ".cursorrules", generate: toCursorrules, doneMessage: ko.sync.cursorrulesDone },
+  { path: ".windsurfrules", generate: toWindsurfrules, doneMessage: ko.sync.windsurfDone },
+  { path: ".github/copilot-instructions.md", generate: toCopilotInstructions, doneMessage: ko.sync.copilotDone },
+  { path: ".agents/rules/vhk-rules.md", generate: toAntigravityRules, doneMessage: ko.sync.antigravityDone }
+];
 async function sync() {
   console.log(chalk5.bold(`
 ${ko.sync.title}
@@ -1774,11 +1785,17 @@ ${ko.sync.title}
   const rulesContent = fs5.readFileSync(rulesPath, "utf-8");
   const sections = parseRulesMd(rulesContent);
   console.log(chalk5.dim(`  \u{1F4C4} RULES.md \uD30C\uC2F1 \uC644\uB8CC \u2014 ${sections.length}\uAC1C \uC139\uC158`));
-  const firstLine = rulesContent.split("\n")[0];
-  const projectName = firstLine.replace(/^#\s*/, "").replace(/\s*—.*/, "").trim() || "Project";
-  const cursorrulesPath = path6.join(cwd, ".cursorrules");
-  fs5.writeFileSync(cursorrulesPath, toCursorrules(sections, projectName), "utf-8");
-  console.log(chalk5.green(`  ${ko.sync.cursorrulesDone}`));
+  const projectName = deriveProjectName(rulesContent);
+  for (const target of SYNC_TARGETS) {
+    const fullPath = path6.join(cwd, target.path);
+    fs5.mkdirSync(path6.dirname(fullPath), { recursive: true });
+    const content = target.generate(sections, projectName);
+    fs5.writeFileSync(fullPath, content, "utf-8");
+    console.log(chalk5.green(`  ${target.doneMessage}`));
+    if (content.includes("Antigravity 12,000\uC790 \uC81C\uD55C\uC73C\uB85C \uC808\uC0AD\uB428")) {
+      console.log(chalk5.yellow(`    \u26A0\uFE0F  ${ko.sync.antigravityTruncated}`));
+    }
+  }
   const claudePath = path6.join(cwd, "CLAUDE.md");
   const existingClaude = fs5.existsSync(claudePath) ? fs5.readFileSync(claudePath, "utf-8") : `# \uAE30\uB85D \uADDC\uCE59 (${projectName})
 
@@ -1789,21 +1806,6 @@ ${ko.sync.title}
 - **\uB9C8\uC9C0\uB9C9 \uC5C5\uB370\uC774\uD2B8:** ${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}`;
   fs5.writeFileSync(claudePath, toClaudeMd(sections, existingClaude), "utf-8");
   console.log(chalk5.green(`  ${ko.sync.claudeDone}`));
-  const windsurfPath = path6.join(cwd, ".windsurfrules");
-  fs5.writeFileSync(windsurfPath, toWindsurfrules(sections, projectName), "utf-8");
-  console.log(chalk5.green(`  ${ko.sync.windsurfDone}`));
-  const copilotPath = path6.join(cwd, ".github", "copilot-instructions.md");
-  fs5.mkdirSync(path6.dirname(copilotPath), { recursive: true });
-  fs5.writeFileSync(copilotPath, toCopilotInstructions(sections, projectName), "utf-8");
-  console.log(chalk5.green(`  ${ko.sync.copilotDone}`));
-  const antigravityPath = path6.join(cwd, ".agents", "rules", "vhk-rules.md");
-  fs5.mkdirSync(path6.dirname(antigravityPath), { recursive: true });
-  const antigravityDoc = toAntigravityRules(sections, projectName);
-  fs5.writeFileSync(antigravityPath, antigravityDoc, "utf-8");
-  console.log(chalk5.green(`  ${ko.sync.antigravityDone}`));
-  if (antigravityDoc.includes("\uC808\uC0AD\uB428")) {
-    console.log(chalk5.yellow(`    \u26A0\uFE0F  ${ko.sync.antigravityTruncated}`));
-  }
   console.log(chalk5.bold.green(`
 ${ko.sync.done}`));
   console.log(chalk5.dim("  RULES.md (\uC6D0\uBCF8) \u2192 .cursorrules + CLAUDE.md + .windsurfrules"));
@@ -2495,9 +2497,124 @@ ${ko.secure.title}
 
 // src/commands/doctor.ts
 import chalk9 from "chalk";
+import fs10 from "fs";
+import path11 from "path";
+import { fileURLToPath } from "url";
+
+// src/lib/drift.ts
 import fs9 from "fs";
 import path10 from "path";
-import { fileURLToPath } from "url";
+
+// src/lib/git-repo.ts
+import { execFileSync } from "child_process";
+function getGitRoot(cwd = process.cwd()) {
+  return execFileSync("git", ["rev-parse", "--show-toplevel"], {
+    encoding: "utf-8",
+    cwd,
+    stdio: ["pipe", "pipe", "pipe"]
+  }).trim();
+}
+function gitOut(args, cwd) {
+  return execFileSync("git", args, {
+    encoding: "utf-8",
+    cwd,
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+}
+function gitRun(args, cwd) {
+  execFileSync("git", args, { stdio: "pipe", cwd });
+}
+function getExecErrorMessage(err) {
+  if (err && typeof err === "object" && "stderr" in err) {
+    const stderr = err.stderr;
+    if (Buffer.isBuffer(stderr)) return stderr.toString("utf-8").trim();
+    if (typeof stderr === "string") return stderr.trim();
+  }
+  return err instanceof Error ? err.message : String(err);
+}
+function hasGitRemote(cwd) {
+  try {
+    return gitOut(["remote"], cwd).trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function countLocalCommits(cwd) {
+  try {
+    const out = gitOut(["rev-list", "--count", "HEAD"], cwd).trim();
+    return parseInt(out, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+
+// src/lib/drift.ts
+function normalizeForCompare(s) {
+  return s.replace(/\r\n/g, "\n").replace(/[ \t]+$/gm, "").replace(/\n+$/, "\n");
+}
+function checkRuleDrift(rootDir) {
+  const rulesPath = path10.join(rootDir, "RULES.md");
+  if (!fs9.existsSync(rulesPath)) return { checked: false, results: [] };
+  const rulesContent = fs9.readFileSync(rulesPath, "utf-8");
+  const sections = parseRulesMd(rulesContent);
+  const projectName = deriveProjectName(rulesContent);
+  const results = [];
+  for (const target of SYNC_TARGETS) {
+    const fullPath = path10.join(rootDir, target.path);
+    if (!fs9.existsSync(fullPath)) {
+      results.push({ path: target.path, status: "missing" });
+      continue;
+    }
+    const expected = normalizeForCompare(target.generate(sections, projectName));
+    const actual = normalizeForCompare(fs9.readFileSync(fullPath, "utf-8"));
+    results.push({ path: target.path, status: expected === actual ? "ok" : "drifted" });
+  }
+  return { checked: true, results };
+}
+var CONTEXT_GIT_MARKER = "vhk-context-git";
+var CONTEXT_PATH = ".vhk/context.md";
+function extractContextSha(content) {
+  const m = content.match(new RegExp(`${CONTEXT_GIT_MARKER}:\\s*([0-9a-f]{7,40})`));
+  return m ? m[1] : null;
+}
+var CONTEXT_SOURCE_PATHS = ["package.json", "goals", "docs/state/learnings.md"];
+function contextSourcesChanged(generatedSha, rootDir) {
+  const content = gitOut(
+    ["diff", "--name-only", generatedSha, "HEAD", "--", ...CONTEXT_SOURCE_PATHS],
+    rootDir
+  ).trim();
+  if (content) return true;
+  const structural = gitOut(
+    ["diff", "--name-only", "--diff-filter=ADR", generatedSha, "HEAD"],
+    rootDir
+  ).trim();
+  return structural.length > 0;
+}
+function checkContextDrift(rootDir) {
+  const ctxPath = path10.join(rootDir, CONTEXT_PATH);
+  if (!fs9.existsSync(ctxPath)) return { checked: false, stale: false };
+  const generatedSha = extractContextSha(fs9.readFileSync(ctxPath, "utf-8"));
+  if (!generatedSha) return { checked: false, stale: false };
+  let currentSha;
+  try {
+    currentSha = gitOut(["rev-parse", "HEAD"], rootDir).trim();
+  } catch {
+    return { checked: false, stale: false };
+  }
+  if (!currentSha) return { checked: false, stale: false };
+  if (currentSha.startsWith(generatedSha) || generatedSha.startsWith(currentSha)) {
+    return { checked: true, stale: false, generatedSha, currentSha };
+  }
+  let stale;
+  try {
+    stale = contextSourcesChanged(generatedSha, rootDir);
+  } catch {
+    return { checked: false, stale: false };
+  }
+  return { checked: true, stale, generatedSha, currentSha };
+}
+
+// src/commands/doctor.ts
 function checkCommand(name, command, hint) {
   const result = safeExecFile(command, ["--version"]);
   if (!result.ok) return { name, command, ok: false, hint };
@@ -2505,14 +2622,14 @@ function checkCommand(name, command, hint) {
   return { name, command, version, ok: true, hint };
 }
 function getVhkVersion2() {
-  const dir = path10.dirname(fileURLToPath(import.meta.url));
+  const dir = path11.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path10.join(dir, "../package.json"),
-    path10.join(dir, "../../package.json")
+    path11.join(dir, "../package.json"),
+    path11.join(dir, "../../package.json")
   ];
   for (const pkgPath of candidates) {
     try {
-      if (fs9.existsSync(pkgPath)) {
+      if (fs10.existsSync(pkgPath)) {
         const pkg = readJsonFile(pkgPath);
         return pkg.version;
       }
@@ -2523,7 +2640,9 @@ function getVhkVersion2() {
   return void 0;
 }
 function fetchLatestNpmVersion(packageName) {
-  const result = safeExecFile("npm", ["view", packageName, "version"]);
+  const result = safeExecFile("npm", ["view", packageName, "version"], {
+    timeoutMs: NETWORK_EXEC_TIMEOUT_MS
+  });
   if (!result.ok) return void 0;
   const out = result.out;
   if (/^\d+\.\d+\.\d+/.test(out)) return out;
@@ -2583,13 +2702,13 @@ ${ko.doctor.title}
     { name: ".env", hint: ".gitignore\uC5D0 \uD3EC\uD568\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778" }
   ];
   for (const file of projectFiles) {
-    const exists = fs9.existsSync(path10.join(cwd, file.name));
+    const exists = fs10.existsSync(path11.join(cwd, file.name));
     if (exists) {
       console.log(chalk9.green(`    \u2705 ${file.name}`));
       if (file.name === ".env") {
-        const gitignorePath = path10.join(cwd, ".gitignore");
-        if (fs9.existsSync(gitignorePath)) {
-          const gitignore = fs9.readFileSync(gitignorePath, "utf-8");
+        const gitignorePath = path11.join(cwd, ".gitignore");
+        if (fs10.existsSync(gitignorePath)) {
+          const gitignore = fs10.readFileSync(gitignorePath, "utf-8");
           if (!gitignore.includes(".env")) {
             console.log(chalk9.yellow(`    ${ko.doctor.envNotIgnored}`));
           }
@@ -2600,6 +2719,23 @@ ${ko.doctor.title}
     }
   }
   console.log("");
+  console.log(chalk9.bold(`  ${ko.doctor.driftTitle}`));
+  const ruleDrift = checkRuleDrift(cwd);
+  if (!ruleDrift.checked) {
+    console.log(chalk9.dim(`    ${ko.doctor.driftNoRules}`));
+  } else {
+    const drifted = ruleDrift.results.filter((r) => r.status === "drifted");
+    if (drifted.length === 0) {
+      console.log(chalk9.green(`    ${ko.doctor.driftRuleClean}`));
+    } else {
+      console.log(chalk9.yellow(`    ${ko.doctor.driftRuleWarn(drifted.map((d) => d.path).join(", "))}`));
+    }
+  }
+  const ctxDrift = checkContextDrift(cwd);
+  if (ctxDrift.checked && ctxDrift.stale) {
+    console.log(chalk9.yellow(`    ${ko.doctor.driftContextWarn}`));
+  }
+  console.log("");
   if (allOk) {
     console.log(chalk9.green.bold(`  ${ko.doctor.allOk}`));
     printNextStep({
@@ -2621,8 +2757,8 @@ ${ko.doctor.title}
 // src/commands/ship.ts
 import chalk10 from "chalk";
 import inquirer4 from "inquirer";
-import fs10 from "fs";
-import path11 from "path";
+import fs11 from "fs";
+import path12 from "path";
 var CHECKLIST = [
   { id: "build", questionKey: "checkBuild", hintKey: "hintBuild" },
   { id: "test", questionKey: "checkTest", hintKey: "hintTest" },
@@ -2635,9 +2771,9 @@ function sanitizeVersion(version) {
   return version.trim().replace(/^v/i, "").replace(/[^a-zA-Z0-9._-]/g, "-") || "0.0.0";
 }
 function updateChangelogUnreleased(cwd, version, date) {
-  const changelogPath = path11.join(cwd, "CHANGELOG.md");
-  if (!fs10.existsSync(changelogPath)) return { status: "missing" };
-  const content = fs10.readFileSync(changelogPath, "utf-8");
+  const changelogPath = path12.join(cwd, "CHANGELOG.md");
+  if (!fs11.existsSync(changelogPath)) return { status: "missing" };
+  const content = fs11.readFileSync(changelogPath, "utf-8");
   const unreleasedHeading = /^## \[Unreleased\][^\n]*$/m;
   if (!unreleasedHeading.test(content)) return { status: "no-unreleased" };
   const blankUnreleased = [
@@ -2654,7 +2790,7 @@ function updateChangelogUnreleased(cwd, version, date) {
     `## [${version}] \u2014 ${date}`
   ].join("\n");
   const updated = content.replace(unreleasedHeading, blankUnreleased);
-  fs10.writeFileSync(changelogPath, updated, "utf-8");
+  fs11.writeFileSync(changelogPath, updated, "utf-8");
   return { status: "updated", version };
 }
 async function ship() {
@@ -2711,12 +2847,12 @@ ${ko.ship.title}
     { type: "input", name: "learned", message: ko.ship.questionLearned },
     { type: "input", name: "nextVersion", message: ko.ship.questionNext }
   ]);
-  const buildLogDir = path11.join(cwd, "docs", "build-log");
-  if (!fs10.existsSync(buildLogDir)) fs10.mkdirSync(buildLogDir, { recursive: true });
+  const buildLogDir = path12.join(cwd, "docs", "build-log");
+  if (!fs11.existsSync(buildLogDir)) fs11.mkdirSync(buildLogDir, { recursive: true });
   const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   const versionSlug = sanitizeVersion(retro.version);
   const fileName = `${today}-v${versionSlug}.md`;
-  const filePath = path11.join(buildLogDir, fileName);
+  const filePath = path12.join(buildLogDir, fileName);
   const content = [
     `# \uBE4C\uB4DC \uB85C\uADF8: v${versionSlug}`,
     "",
@@ -2745,9 +2881,9 @@ ${ko.ship.title}
     "---",
     `*Generated by \`vhk ship\` at ${(/* @__PURE__ */ new Date()).toISOString()}*`
   ].join("\n");
-  fs10.writeFileSync(filePath, content, "utf-8");
+  fs11.writeFileSync(filePath, content, "utf-8");
   console.log(chalk10.green(`
-  ${ko.ship.buildLogDone(path11.relative(cwd, filePath))}`));
+  ${ko.ship.buildLogDone(path12.relative(cwd, filePath))}`));
   const changelogResult = updateChangelogUnreleased(cwd, versionSlug, today);
   if (changelogResult.status === "updated") {
     log.success(ko.ship.changelogUpdated(changelogResult.version));
@@ -2778,49 +2914,6 @@ function parsePorcelainLines(raw) {
   return normalizePorcelain(raw).split("\n").filter(Boolean);
 }
 
-// src/lib/git-repo.ts
-import { execFileSync } from "child_process";
-function getGitRoot(cwd = process.cwd()) {
-  return execFileSync("git", ["rev-parse", "--show-toplevel"], {
-    encoding: "utf-8",
-    cwd,
-    stdio: ["pipe", "pipe", "pipe"]
-  }).trim();
-}
-function gitOut(args, cwd) {
-  return execFileSync("git", args, {
-    encoding: "utf-8",
-    cwd,
-    stdio: ["pipe", "pipe", "pipe"]
-  });
-}
-function gitRun(args, cwd) {
-  execFileSync("git", args, { stdio: "pipe", cwd });
-}
-function getExecErrorMessage(err) {
-  if (err && typeof err === "object" && "stderr" in err) {
-    const stderr = err.stderr;
-    if (Buffer.isBuffer(stderr)) return stderr.toString("utf-8").trim();
-    if (typeof stderr === "string") return stderr.trim();
-  }
-  return err instanceof Error ? err.message : String(err);
-}
-function hasGitRemote(cwd) {
-  try {
-    return gitOut(["remote"], cwd).trim().length > 0;
-  } catch {
-    return false;
-  }
-}
-function countLocalCommits(cwd) {
-  try {
-    const out = gitOut(["rev-list", "--count", "HEAD"], cwd).trim();
-    return parseInt(out, 10) || 0;
-  } catch {
-    return 0;
-  }
-}
-
 // src/commands/save.ts
 function formatDefaultCommitMessage(date = /* @__PURE__ */ new Date()) {
   const y = date.getFullYear();
@@ -3062,8 +3155,8 @@ ${t("undo.recentHeader")}`));
 
 // src/commands/status.ts
 import { execFileSync as execFileSync4 } from "child_process";
-import fs11 from "fs";
-import path12 from "path";
+import fs12 from "fs";
+import path13 from "path";
 import chalk13 from "chalk";
 function countFileChanges(porcelain) {
   const lines = porcelain.split("\n").filter(Boolean);
@@ -3102,8 +3195,8 @@ function parseRecentCommitLines(logOutput) {
   return logOutput.split("\n").map((l) => l.trim()).filter(Boolean);
 }
 function readProjectPackage(cwd = process.cwd()) {
-  const pkgPath = path12.join(cwd, "package.json");
-  if (!fs11.existsSync(pkgPath)) return null;
+  const pkgPath = path13.join(cwd, "package.json");
+  if (!fs12.existsSync(pkgPath)) return null;
   try {
     const pkg = readJsonFile(pkgPath);
     if (!pkg.name && !pkg.version) return null;
@@ -3893,7 +3986,7 @@ function getCurrentVersion() {
   return "0.0.0";
 }
 function getLatestVersion() {
-  const r = safeExecFile("npm", ["view", PACKAGE, "version"]);
+  const r = safeExecFile("npm", ["view", PACKAGE, "version"], { timeoutMs: NETWORK_EXEC_TIMEOUT_MS });
   return r.ok ? r.out : null;
 }
 function isUpToDate(current, latest) {
@@ -4066,7 +4159,7 @@ function clearHardStop() {
 }
 
 // src/commands/context.ts
-var CONTEXT_PATH = ".vhk/context.md";
+var CONTEXT_PATH2 = ".vhk/context.md";
 var IGNORE_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -4243,11 +4336,16 @@ async function context() {
   lines.push("---");
   lines.push("");
   lines.push(`_\uC0DD\uC131: ${(/* @__PURE__ */ new Date()).toLocaleString("ko-KR")}_`);
+  try {
+    const sha = gitOut(["rev-parse", "HEAD"], process.cwd()).trim();
+    if (sha) lines.push(`_${CONTEXT_GIT_MARKER}: ${sha}_`);
+  } catch {
+  }
   lines.push("");
   mkdirSync7(".vhk", { recursive: true });
-  writeFileSync7(CONTEXT_PATH, lines.join("\n"), "utf-8");
+  writeFileSync7(CONTEXT_PATH2, lines.join("\n"), "utf-8");
   console.log(chalk22.green(`
-\u2705 ${CONTEXT_PATH} \uC0DD\uC131 \uC644\uB8CC!`));
+\u2705 ${CONTEXT_PATH2} \uC0DD\uC131 \uC644\uB8CC!`));
   console.log(chalk22.gray(`   \uAE30\uC220 \uC2A4\uD0DD ${Object.keys(stack).length}\uAC1C \uAC10\uC9C0`));
   console.log(chalk22.gray("   AI \uC5B4\uC2DC\uC2A4\uD134\uD2B8\uC5D0\uAC8C \uC774 \uD30C\uC77C\uC744 \uCC38\uC870\uD558\uAC8C \uD558\uC138\uC694."));
   printNextStep({
@@ -4259,12 +4357,12 @@ async function context() {
 async function contextShow() {
   console.log(chalk22.bold("\n\u{1F4C4} " + t("context.showTitle")));
   console.log(chalk22.gray("\u2500".repeat(40)));
-  if (!existsSync11(CONTEXT_PATH)) {
+  if (!existsSync11(CONTEXT_PATH2)) {
     console.log(chalk22.yellow("\n\u26A0\uFE0F  \uCEE8\uD14D\uC2A4\uD2B8 \uD30C\uC77C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."));
     console.log(chalk22.gray("   vhk context\uB97C \uBA3C\uC800 \uC2E4\uD589\uD558\uC138\uC694."));
     return;
   }
-  const content = readFileSync4(CONTEXT_PATH, "utf-8");
+  const content = readFileSync4(CONTEXT_PATH2, "utf-8");
   console.log("\n" + content);
 }
 
@@ -4552,14 +4650,15 @@ ${ko.start.allDone}
 }
 
 // src/commands/cloud.ts
-import fs13 from "fs";
-import path14 from "path";
+import fs14 from "fs";
+import os from "os";
+import path15 from "path";
 import chalk26 from "chalk";
 
 // src/lib/vhk-cloud.ts
 var import_ignore = __toESM(require_ignore(), 1);
-import fs12 from "fs";
-import path13 from "path";
+import fs13 from "fs";
+import path14 from "path";
 var DEFAULT_CLOUD_EXCLUDES = [
   "memory.json",
   // 개인 의사결정 메모
@@ -4577,27 +4676,36 @@ var CLOUD_CONFIG_FILE = "cloud.json";
 function loadVhkignore(rootDir) {
   const ig = (0, import_ignore.default)();
   ig.add(DEFAULT_CLOUD_EXCLUDES);
-  const ignorePath = path13.join(rootDir, ".vhkignore");
-  if (fs12.existsSync(ignorePath)) {
-    ig.add(fs12.readFileSync(ignorePath, "utf-8"));
+  const ignorePath = path14.join(rootDir, ".vhkignore");
+  if (fs13.existsSync(ignorePath)) {
+    ig.add(fs13.readFileSync(ignorePath, "utf-8"));
   }
   return ig;
 }
 function collectVhkFiles(rootDir, ig = loadVhkignore(rootDir)) {
-  const vhkDir = path13.join(rootDir, VHK_DIR2);
+  const vhkDir = path14.join(rootDir, VHK_DIR2);
   let entries;
   try {
-    entries = fs12.readdirSync(vhkDir, { withFileTypes: true });
+    entries = fs13.readdirSync(vhkDir, { withFileTypes: true });
   } catch {
     return [];
   }
   return entries.filter((e) => e.isFile()).map((e) => e.name).filter((name) => !ig.ignores(name)).sort();
 }
+function partitionGistFiles(gistFiles, ig) {
+  const keep = [];
+  const excluded = [];
+  for (const name of gistFiles) {
+    if (name && ig.ignores(name)) excluded.push(name);
+    else if (name) keep.push(name);
+  }
+  return { keep, excluded };
+}
 function readCloudConfig(rootDir) {
-  const p = path13.join(rootDir, VHK_DIR2, CLOUD_CONFIG_FILE);
-  if (!fs12.existsSync(p)) return null;
+  const p = path14.join(rootDir, VHK_DIR2, CLOUD_CONFIG_FILE);
+  if (!fs13.existsSync(p)) return null;
   try {
-    const parsed = JSON.parse(fs12.readFileSync(p, "utf-8"));
+    const parsed = JSON.parse(fs13.readFileSync(p, "utf-8"));
     if (parsed && typeof parsed.gistId === "string" && parsed.gistId) {
       return { gistId: parsed.gistId };
     }
@@ -4607,10 +4715,10 @@ function readCloudConfig(rootDir) {
   }
 }
 function writeCloudConfig(rootDir, config) {
-  const vhkDir = path13.join(rootDir, VHK_DIR2);
-  fs12.mkdirSync(vhkDir, { recursive: true });
-  const p = path13.join(vhkDir, CLOUD_CONFIG_FILE);
-  fs12.writeFileSync(p, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  const vhkDir = path14.join(rootDir, VHK_DIR2);
+  fs13.mkdirSync(vhkDir, { recursive: true });
+  const p = path14.join(vhkDir, CLOUD_CONFIG_FILE);
+  fs13.writeFileSync(p, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
 
 // src/commands/cloud.ts
@@ -4641,11 +4749,12 @@ async function cloudPush() {
 ${ko.cloud.pushTitle}
 `));
   const cwd = process.cwd();
-  if (!fs13.existsSync(path14.join(cwd, VHK_DIR2))) {
+  if (!fs14.existsSync(path15.join(cwd, VHK_DIR2))) {
     console.log(chalk26.yellow(`  ${ko.cloud.noVhkDir}`));
     return;
   }
-  const files = collectVhkFiles(cwd);
+  const ig = loadVhkignore(cwd);
+  const files = collectVhkFiles(cwd, ig);
   if (files.length === 0) {
     console.log(chalk26.yellow(`  ${ko.cloud.nothingToSync}`));
     return;
@@ -4654,11 +4763,11 @@ ${ko.cloud.pushTitle}
     process.exitCode = 1;
     return;
   }
-  const filePaths = files.map((f) => path14.join(cwd, VHK_DIR2, f));
+  const filePaths = files.map((f) => path15.join(cwd, VHK_DIR2, f));
   console.log(chalk26.dim(`  \u{1F4E6} \uBC31\uC5C5 \uB300\uC0C1 ${files.length}\uAC1C: ${files.join(", ")}
 `));
   const existing = readCloudConfig(cwd);
-  const desc = `vhk .vhk backup \u2014 ${path14.basename(cwd)}`;
+  const desc = `vhk .vhk backup \u2014 ${path15.basename(cwd)}`;
   if (existing) {
     const gistFiles = listGistFiles(existing.gistId);
     for (let i = 0; i < files.length; i++) {
@@ -4673,8 +4782,27 @@ ${ko.cloud.pushTitle}
         return;
       }
     }
+    const { excluded } = partitionGistFiles(gistFiles, ig);
+    const purgeFailed = [];
+    if (excluded.length > 0) {
+      const purgeOk = purgeExcludedFromGist(existing.gistId, excluded);
+      if (!purgeOk) purgeFailed.push(...excluded);
+      const stillThere = partitionGistFiles(listGistFiles(existing.gistId), ig).excluded;
+      for (const name of stillThere) {
+        if (!purgeFailed.includes(name)) purgeFailed.push(name);
+      }
+    }
     console.log(chalk26.green.bold(`  ${ko.cloud.pushDone}`));
     console.log(chalk26.dim(`  gist: ${existing.gistId} (\uAC31\uC2E0)`));
+    if (excluded.length > 0) {
+      const purged = excluded.filter((n) => !purgeFailed.includes(n));
+      if (purged.length > 0) {
+        console.log(chalk26.dim(`  \u{1F512} \uC81C\uC678 \uB300\uC0C1 ${purged.length}\uAC1C gist \uC5D0\uC11C \uC81C\uAC70: ${purged.join(", ")}`));
+      }
+      if (purgeFailed.length > 0) {
+        console.log(chalk26.yellow(`  \u26A0\uFE0F  \uC81C\uC678 \uB300\uC0C1 \uC81C\uAC70 \uC2E4\uD328: ${purgeFailed.join(", ")} (\uC218\uB3D9 \uC81C\uAC70 \uAD8C\uC7A5 \u2014 pull \uC2DC\uC5D4 \uBCF5\uC6D0 \uC548 \uB428)`));
+      }
+    }
     printPushNext();
     return;
   }
@@ -4712,14 +4840,22 @@ ${ko.cloud.pullTitle}
     process.exitCode = 1;
     return;
   }
-  const names = listGistFiles(gistId);
-  if (names.length === 0) {
+  const allNames = listGistFiles(gistId);
+  if (allNames.length === 0) {
     console.log(chalk26.red(`  ${ko.cloud.pullFail} \u2014 gist \uBE44\uC5C8\uAC70\uB098 \uC811\uADFC \uBD88\uAC00: ${gistId}`));
     process.exitCode = 1;
     return;
   }
-  const vhkDir = path14.join(cwd, VHK_DIR2);
-  fs13.mkdirSync(vhkDir, { recursive: true });
+  const { keep: names, excluded: skipped } = partitionGistFiles(allNames, loadVhkignore(cwd));
+  if (skipped.length > 0) {
+    console.log(chalk26.dim(`  \u{1F512} \uC81C\uC678 \uB300\uC0C1 ${skipped.length}\uAC1C \uBCF5\uC6D0 \uC2A4\uD0B5: ${skipped.join(", ")}`));
+  }
+  if (names.length === 0) {
+    console.log(chalk26.yellow(`  \uBCF5\uC6D0 \uB300\uC0C1\uC774 \uC5C6\uC2B5\uB2C8\uB2E4 (gist \uD30C\uC77C\uC774 \uBAA8\uB450 \uC81C\uC678 \uADDC\uCE59\uC5D0 \uD574\uB2F9).`));
+    return;
+  }
+  const vhkDir = path15.join(cwd, VHK_DIR2);
+  fs14.mkdirSync(vhkDir, { recursive: true });
   let restored = 0;
   for (const name of names) {
     const res = safeExecFile("gh", ["gist", "view", gistId, "-f", name, "--raw"]);
@@ -4728,7 +4864,7 @@ ${ko.cloud.pullTitle}
       console.log(chalk26.dim(`    ${res.err}`));
       continue;
     }
-    fs13.writeFileSync(path14.join(vhkDir, name), ensureTrailingNewline(res.out), "utf-8");
+    fs14.writeFileSync(path15.join(vhkDir, name), ensureTrailingNewline(res.out), "utf-8");
     restored++;
   }
   writeCloudConfig(cwd, { gistId });
@@ -4740,6 +4876,30 @@ ${ko.cloud.pullTitle}
     cursorHint: "\uD504\uB85C\uC81D\uD2B8 \uB9E5\uB77D \uBCF4\uC5EC\uC918"
   });
 }
+function purgeExcludedFromGist(gistId, names) {
+  if (names.length === 0) return true;
+  const body = JSON.stringify({
+    files: Object.fromEntries(names.map((n) => [n, null]))
+  });
+  const tmp = path15.join(os.tmpdir(), `vhk-gist-purge-${process.pid}.json`);
+  try {
+    fs14.writeFileSync(tmp, body, "utf-8");
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const res = safeExecFile(
+        "gh",
+        ["api", "--method", "PATCH", `/gists/${gistId}`, "--input", tmp],
+        { timeoutMs: NETWORK_EXEC_TIMEOUT_MS }
+      );
+      if (res.ok) return true;
+    }
+    return false;
+  } finally {
+    try {
+      fs14.unlinkSync(tmp);
+    } catch {
+    }
+  }
+}
 function listGistFiles(gistId) {
   const res = safeExecFile("gh", ["gist", "view", gistId, "--files"]);
   if (!res.ok) return [];

package/dist/mcp/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startMcpServer
-} from "../chunk-4KWZANQG.js";
+} from "../chunk-O3A6SO7G.js";
 
 // src/mcp/index.ts
 startMcpServer().catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byh3071/vhk",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "description": "Vibe Harness Kit — AI 코딩 도구·기기를 바꿔도 규칙·맥락이 따라가는 포터빌리티 CLI (sync: Cursor·Claude·Windsurf·Copilot·Antigravity / cloud 백업)",
   "bin": {
     "vhk": "dist/index.js",