claudeos-core 1.0.7 → 1.2.0

package/plan-validator/index.js

@@ -3,13 +3,13 @@
 /**
  * ClaudeOS-Core — Plan Validator
  *
- * 역할: 마스터 플랜(plan/) <file> 블록 ↔ 디스크 파일 정합성 검증 및 동기화
- * 모드:
- *   --check    : drift/missing 감지만 (기본값, CI/CD용)
- *   --refresh  : 디스크 → Plan 갱신 (파일 직접 수정 후)
- *   --execute  : Plan → 디스크 복원 (파일이 깨졌을 때)
+ * Role: Validate and sync Master Plan (plan/) <file> blocks ↔ disk files
+ * Modes:
+ *   --check    : detect drift/missing only (default, for CI/CD)
+ *   --refresh  : sync disk → Plan (after manual file edits)
+ *   --execute  : restore Plan → disk (when files are corrupted)
  *
- * 실행: npx claudeos-core <cmd> 또는 node claudeos-core-tools/plan-validator/index.js [--check|--refresh|--execute]
+ * Usage: npx claudeos-core <cmd> or node claudeos-core-tools/plan-validator/index.js [--check|--refresh|--execute]
  */
 
 const fs = require("fs");
@@ -20,14 +20,14 @@ const ROOT = process.env.CLAUDEOS_ROOT || path.resolve(__dirname, "../..");
 const PLAN = path.join(ROOT, "claudeos-core/plan");
 const GEN  = path.join(ROOT, "claudeos-core/generated");
 
-// 코드블록 방식을 사용하는 플랜 파일 목록 (나머지는 <file> 블록 방식)
+// Plan files using code block format (the rest use <file> block format)
 const CODE_BLOCK_PLANS = ["21.sync-rules-master.md"];
 
 function rel(p) {
   return path.relative(ROOT, p).replace(/\\/g, "/");
 }
 
-// <file path="..."> ... </file> 블록 추출
+// Extract <file path="..."> ... </file> blocks
 function extractFileBlocks(content) {
   const result = [];
   let m;
@@ -38,7 +38,7 @@ function extractFileBlocks(content) {
   return result;
 }
 
-// ## N. `path` \n```markdown ... ``` 블록 추출
+// Extract ## N. `path` \n```markdown ... ``` blocks
 function extractCodeBlocks(content) {
   const result = [];
   let m;
@@ -49,7 +49,7 @@ function extractCodeBlocks(content) {
   return result;
 }
 
-// <file> 블록 내용을 새 내용으로 교체
+// Replace <file> block content with new content
 function replaceFileBlock(content, filePath, newContent) {
   const escaped = filePath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   return content.replace(
@@ -58,13 +58,41 @@ function replaceFileBlock(content, filePath, newContent) {
   );
 }
 
-// 코드블록 내용을 새 내용으로 교체
+// Replace code block content with new content
+// Uses indexOf-based approach to avoid regex issues with nested code fences
 function replaceCodeBlock(content, filePath, newContent) {
-  const escaped = filePath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/`/g, "");
-  return content.replace(
-    new RegExp(`(##\\s+\\d+\\.\\s+\`?${escaped}\`?\\s*\\n+\`\`\`markdown\\n)[\\s\\S]*?(\`\`\`)`, "g"),
-    `$1${newContent}\n$2`
-  );
+  const cleanPath = filePath.replace(/`/g, "");
+  // Find the heading line containing the file path
+  const headingPattern = new RegExp(`^##\\s+\\d+\\.\\s+\`?${cleanPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\`?`, "m");
+  const headingMatch = headingPattern.exec(content);
+  if (!headingMatch) return content;
+  // Find the opening ```markdown after the heading
+  const afterHeading = content.indexOf("```markdown\n", headingMatch.index);
+  if (afterHeading < 0) return content;
+  const contentStart = afterHeading + "```markdown\n".length;
+  // Find the closing ``` that is on its own line (not nested)
+  // Track nesting depth to skip inner fenced blocks
+  let searchPos = contentStart;
+  let closingPos = -1;
+  let nestDepth = 0;
+  while (searchPos < content.length) {
+    const nextFence = content.indexOf("\n```", searchPos);
+    if (nextFence < 0) break;
+    const lineAfterFence = content.substring(nextFence + 4, content.indexOf("\n", nextFence + 4));
+    const isOpening = lineAfterFence.trim().length > 0 && !lineAfterFence.startsWith("\n");
+    if (isOpening) {
+      nestDepth++;
+      searchPos = nextFence + 4;
+    } else if (nestDepth > 0) {
+      nestDepth--;
+      searchPos = nextFence + 4;
+    } else {
+      closingPos = nextFence + 1; // position of the closing ```
+      break;
+    }
+  }
+  if (closingPos < 0) return content;
+  return content.substring(0, contentStart) + newContent + "\n" + content.substring(closingPos);
 }
 
 async function main() {
@@ -98,13 +126,13 @@ async function main() {
       total++;
       const abs = path.join(ROOT, b.path);
 
-      // 파일이 없는 경우
+      // File does not exist
       if (!fs.existsSync(abs)) {
         if (mode === "--execute") {
           const dir = path.dirname(abs);
           if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
           fs.writeFileSync(abs, b.content + "\n");
-          console.log(`     ✅ RESTORED: ${b.path}`);
+          console.log(`     ✅ CREATED:  ${b.path}`);
           synced++;
         } else {
           console.log(`     ❌ MISSING:  ${b.path}`);
@@ -114,7 +142,7 @@ async function main() {
         continue;
       }
 
-      // 파일이 있는 경우 — 내용 비교
+      // File exists — compare content
       const diskContent = fs.readFileSync(abs, "utf-8").trimEnd();
       const planContent = b.content.trimEnd();
 
@@ -129,8 +157,11 @@ async function main() {
           console.log(`     🔄 REFRESHED: ${b.path}`);
           synced++;
         } else if (mode === "--execute") {
+          // Backup existing file before overwrite
+          const backupPath = abs + ".bak";
+          fs.copyFileSync(abs, backupPath);
           fs.writeFileSync(abs, b.content + "\n");
-          console.log(`     ✅ RESTORED: ${b.path}`);
+          console.log(`     ✅ RESTORED: ${b.path} (backup: ${b.path}.bak)`);
           synced++;
         } else {
           console.log(`     ⚠️  DRIFT:    ${b.path}`);
@@ -146,14 +177,14 @@ async function main() {
     }
   }
 
-  // ─── 결과 요약 ──────────────────────────────────────────
+  // ─── Results summary ──────────────────────────────────────────
   console.log(`\n  Total: ${total} | Synced: ${synced} | Drift: ${drift} | Missing: ${missing}`);
   console.log(drift + missing === 0 ? "  ✅ All plans in sync\n" : `  ⚠️  ${drift + missing} issues\n`);
 
-  // ─── plan-manifest.json 갱신 ───────────────────────────
+  // ─── Update plan-sync-status.json (separate from manifest-generator's plan-manifest.json) ──
   if (fs.existsSync(GEN)) {
     fs.writeFileSync(
-      path.join(GEN, "plan-manifest.json"),
+      path.join(GEN, "plan-sync-status.json"),
       JSON.stringify({ generatedAt: new Date().toISOString(), lastMode: mode, total, synced, drift, missing, issues: results }, null, 2)
     );
   }

package/sync-checker/index.js

@@ -3,13 +3,13 @@
 /**
  * ClaudeOS-Core — Sync Checker
  *
- * 역할: sync-map.json 기준으로 디스크 ↔ 마스터 플랜 동기화 상태 확인
- * 감지 항목:
- *   - Unregistered: 디스크에 존재하지만 플랜에 등록되지 않은 파일
- *   - Orphaned:     플랜에 등록됐지만 디스크에 없는 파일
+ * Role: Check disk ↔ Master Plan sync status based on sync-map.json
+ * Detection items:
+ *   - Unregistered: file exists on disk but not registered in any plan
+ *   - Orphaned:     registered in plan but missing from disk
  *
- * 실행: npx claudeos-core <cmd> 또는 node claudeos-core-tools/sync-checker/index.js
- * 의존: manifest-generator 선행 실행 필요 (sync-map.json)
+ * Usage: npx claudeos-core <cmd> or node claudeos-core-tools/sync-checker/index.js
+ * Depends: manifest-generator must run first (sync-map.json)
  */
 
 const fs = require("fs");
@@ -43,11 +43,17 @@ async function main() {
     process.exit(1);
   }
 
-  const sm = JSON.parse(fs.readFileSync(SMP, "utf-8"));
+  let sm;
+  try {
+    sm = JSON.parse(fs.readFileSync(SMP, "utf-8"));
+  } catch (e) {
+    console.log(`  ❌ sync-map.json is malformed: ${e.message}\n`);
+    process.exit(1);
+  }
   const reg = new Set(sm.mappings.map((m) => m.sourcePath));
   const issues = { unreg: [], orphan: [] };
 
-  // ─── [1/2] Disk → Plan: 등록되지 않은 파일 탐지 ───────
+  // ─── [1/2] Disk → Plan: detect unregistered files ───────
   console.log("  [1/2] Disk → Plan...");
   for (const t of TRACKED) {
     const abs = path.join(ROOT, t.dir);
@@ -62,12 +68,12 @@ async function main() {
     }
   }
 
-  // CLAUDE.md 별도 확인
+  // Check CLAUDE.md separately
   if (fs.existsSync(path.join(ROOT, "CLAUDE.md")) && !reg.has("CLAUDE.md")) {
     issues.unreg.push({ path: "CLAUDE.md", domain: "root" });
   }
 
-  // ─── [2/2] Plan → Disk: 고아 파일 탐지 ───────────────
+  // ─── [2/2] Plan → Disk: detect orphaned files ───────────────
   console.log("  [2/2] Plan → Disk...");
   for (const m of sm.mappings) {
     if (!fs.existsSync(path.join(ROOT, m.sourcePath))) {
@@ -75,7 +81,7 @@ async function main() {
     }
   }
 
-  // ─── 결과 출력 ─────────────────────────────────────────
+  // ─── Output results ─────────────────────────────────────────
   if (issues.unreg.length) {
     console.log(`\n  ⚠️  Unregistered (${issues.unreg.length}):`);
     issues.unreg.forEach((i) => console.log(`     + ${i.path}`));
@@ -89,10 +95,13 @@ async function main() {
   console.log(`\n  Registered: ${reg.size} | Unregistered: ${issues.unreg.length} | Orphaned: ${issues.orphan.length}`);
   console.log(total === 0 ? "  ✅ All in sync\n" : `  ⚠️  ${total} issues\n`);
 
-  // ─── stale-report.json 갱신 ────────────────────────────
+  // ─── Update stale-report.json ────────────────────────────
   if (fs.existsSync(GEN)) {
     const rp = path.join(GEN, "stale-report.json");
-    const ex = fs.existsSync(rp) ? JSON.parse(fs.readFileSync(rp, "utf-8")) : {};
+    let ex = {};
+    if (fs.existsSync(rp)) {
+      try { ex = JSON.parse(fs.readFileSync(rp, "utf-8")); } catch { ex = {}; }
+    }
     ex.syncMisses = {
       checkedAt: new Date().toISOString(),
       unregistered: issues.unreg,
@@ -106,7 +115,9 @@ async function main() {
     fs.writeFileSync(rp, JSON.stringify(ex, null, 2));
   }
 
-  process.exit(total > 0 ? 1 : 0);
+  // Exit 1 only for orphaned files (actual breakage), not for unregistered (informational)
+  const orphanCount = issues.orphan.length;
+  process.exit(orphanCount > 0 ? 1 : 0);
 }
 
 main().catch(console.error);