dw-kit 1.1.0 → 1.2.1

package/src/lib/config.mjs

@@ -7,6 +7,35 @@ export function loadConfig(configPath) {
   return yaml.load(content);
 }
 
+/**
+ * Load config với local override (v1.2+).
+ * dw.config.yml  — shared, committed
+ * dw.config.local.yml — machine-specific, gitignored
+ * Local values win over base values (shallow merge per top-level key).
+ */
+export function loadConfigWithLocal(configDir) {
+  const basePath = `${configDir}/dw.config.yml`;
+  const localPath = `${configDir}/dw.config.local.yml`;
+
+  const base = loadConfig(basePath);
+  if (!base) return null;
+
+  if (!existsSync(localPath)) return base;
+
+  const local = loadConfig(localPath);
+  if (!local) return base;
+
+  const merged = { ...base };
+  for (const key of Object.keys(local)) {
+    if (typeof local[key] === 'object' && !Array.isArray(local[key]) && local[key] !== null) {
+      merged[key] = { ...(merged[key] || {}), ...local[key] };
+    } else {
+      merged[key] = local[key];
+    }
+  }
+  return merged;
+}
+
 export function writeConfig(configPath, data) {
   const content = yaml.dump(data, {
     indent: 2,
@@ -57,9 +86,9 @@ export function buildConfig({ projectName, language, depth, roles }) {
       mcp: [],
     },
     _toolkit: {
-      core_version: '1.0',
+      core_version: '1.2',
       platform_version: '1.0',
-      capability_version: '1.0',
+      capability_version: '1.2',
       installed: today,
       last_upgrade: today,
     },

package/src/lib/copy.mjs

@@ -1,110 +1,118 @@
-import {
-  existsSync, mkdirSync, copyFileSync, readdirSync, readFileSync,
-} from 'node:fs';
-import { join, dirname } from 'node:path';
-
-export function ensureDir(dir) {
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-}
-
-export function copyFile(src, dst, { dryRun = false } = {}) {
-  if (dryRun) return { action: 'copy', src, dst, applied: false };
-  ensureDir(dirname(dst));
-  copyFileSync(src, dst);
-  return { action: 'copy', src, dst, applied: true };
-}
-
-export function copyDir(srcDir, dstDir, { dryRun = false, overwrite = false } = {}) {
-  const results = [];
-  if (!existsSync(srcDir)) return results;
-
-  const entries = readdirSync(srcDir, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = join(srcDir, entry.name);
-    const dstPath = join(dstDir, entry.name);
-
-    if (entry.isDirectory()) {
-      results.push(...copyDir(srcPath, dstPath, { dryRun, overwrite }));
-    } else if (entry.isFile()) {
-      if (!overwrite && existsSync(dstPath)) {
-        results.push({ action: 'skip', src: srcPath, dst: dstPath, reason: 'exists' });
-        continue;
-      }
-      results.push(copyFile(srcPath, dstPath, { dryRun }));
-    }
-  }
-  return results;
-}
-
-/**
- * Copy files from srcDir to dstDir, respecting an overrides directory.
- * Files present in overridesDir take precedence over srcDir.
- */
-export function copyWithOverrides(srcDir, dstDir, overridesDir, { dryRun = false } = {}) {
-  const results = [];
-  if (!existsSync(srcDir)) return results;
-
-  const entries = readdirSync(srcDir, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = join(srcDir, entry.name);
-    const dstPath = join(dstDir, entry.name);
-    const overridePath = overridesDir ? join(overridesDir, entry.name) : null;
-
-    if (entry.isDirectory()) {
-      const subOverride = overridePath && existsSync(overridePath) ? overridePath : null;
-      results.push(...copyWithOverrides(srcPath, dstPath, subOverride, { dryRun }));
-    } else if (entry.isFile()) {
-      if (overridePath && existsSync(overridePath)) {
-        results.push({
-          action: 'override',
-          src: overridePath,
-          dst: dstPath,
-          ...(dryRun ? { applied: false } : (() => { ensureDir(dirname(dstPath)); copyFileSync(overridePath, dstPath); return { applied: true }; })()),
-        });
-      } else {
-        results.push(copyFile(srcPath, dstPath, { dryRun }));
-      }
-    }
-  }
-  return results;
-}
-
-/**
- * Compute file differences between two directories.
- * Returns { added, modified, unchanged } arrays of relative paths.
- */
-export function diffDirs(sourceDir, targetDir) {
-  const added = [];
-  const modified = [];
-  const unchanged = [];
-
-  if (!existsSync(sourceDir)) return { added, modified, unchanged };
-
-  function walk(dir, base) {
-    const entries = readdirSync(dir, { withFileTypes: true });
-    for (const entry of entries) {
-      const srcPath = join(dir, entry.name);
-      const relPath = base ? join(base, entry.name) : entry.name;
-
-      if (entry.isDirectory()) {
-        walk(srcPath, relPath);
-      } else if (entry.isFile()) {
-        const targetPath = join(targetDir, relPath);
-        if (!existsSync(targetPath)) {
-          added.push(relPath);
-        } else {
-          const srcContent = readFileSync(srcPath);
-          const tgtContent = readFileSync(targetPath);
-          if (srcContent.equals(tgtContent)) {
-            unchanged.push(relPath);
-          } else {
-            modified.push(relPath);
-          }
-        }
-      }
-    }
-  }
-
-  walk(sourceDir, '');
-  return { added, modified, unchanged };
-}
+import {
+  existsSync, mkdirSync, copyFileSync, readdirSync, readFileSync, writeFileSync,
+} from 'node:fs';
+import { join, dirname } from 'node:path';
+
+export function ensureDir(dir) {
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+}
+
+export function copyFile(src, dst, { dryRun = false } = {}) {
+  if (dryRun) return { action: 'copy', src, dst, applied: false };
+  ensureDir(dirname(dst));
+  if (src.endsWith('.sh')) {
+    // Always write shell scripts with LF endings.
+    // Prevents CRLF contamination when git later checks out these files on Windows
+    // (core.autocrlf=true overrides .gitattributes in the *user's* repo, which dw-kit cannot control).
+    const content = readFileSync(src, 'utf-8').replace(/\r\n/g, '\n');
+    writeFileSync(dst, content, 'utf-8');
+  } else {
+    copyFileSync(src, dst);
+  }
+  return { action: 'copy', src, dst, applied: true };
+}
+
+export function copyDir(srcDir, dstDir, { dryRun = false, overwrite = false } = {}) {
+  const results = [];
+  if (!existsSync(srcDir)) return results;
+
+  const entries = readdirSync(srcDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = join(srcDir, entry.name);
+    const dstPath = join(dstDir, entry.name);
+
+    if (entry.isDirectory()) {
+      results.push(...copyDir(srcPath, dstPath, { dryRun, overwrite }));
+    } else if (entry.isFile()) {
+      if (!overwrite && existsSync(dstPath)) {
+        results.push({ action: 'skip', src: srcPath, dst: dstPath, reason: 'exists' });
+        continue;
+      }
+      results.push(copyFile(srcPath, dstPath, { dryRun }));
+    }
+  }
+  return results;
+}
+
+/**
+ * Copy files from srcDir to dstDir, respecting an overrides directory.
+ * Files present in overridesDir take precedence over srcDir.
+ */
+export function copyWithOverrides(srcDir, dstDir, overridesDir, { dryRun = false } = {}) {
+  const results = [];
+  if (!existsSync(srcDir)) return results;
+
+  const entries = readdirSync(srcDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = join(srcDir, entry.name);
+    const dstPath = join(dstDir, entry.name);
+    const overridePath = overridesDir ? join(overridesDir, entry.name) : null;
+
+    if (entry.isDirectory()) {
+      const subOverride = overridePath && existsSync(overridePath) ? overridePath : null;
+      results.push(...copyWithOverrides(srcPath, dstPath, subOverride, { dryRun }));
+    } else if (entry.isFile()) {
+      if (overridePath && existsSync(overridePath)) {
+        results.push({
+          action: 'override',
+          src: overridePath,
+          dst: dstPath,
+          ...(dryRun ? { applied: false } : (() => { ensureDir(dirname(dstPath)); copyFileSync(overridePath, dstPath); return { applied: true }; })()),
+        });
+      } else {
+        results.push(copyFile(srcPath, dstPath, { dryRun }));
+      }
+    }
+  }
+  return results;
+}
+
+/**
+ * Compute file differences between two directories.
+ * Returns { added, modified, unchanged } arrays of relative paths.
+ */
+export function diffDirs(sourceDir, targetDir) {
+  const added = [];
+  const modified = [];
+  const unchanged = [];
+
+  if (!existsSync(sourceDir)) return { added, modified, unchanged };
+
+  function walk(dir, base) {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const srcPath = join(dir, entry.name);
+      const relPath = base ? join(base, entry.name) : entry.name;
+
+      if (entry.isDirectory()) {
+        walk(srcPath, relPath);
+      } else if (entry.isFile()) {
+        const targetPath = join(targetDir, relPath);
+        if (!existsSync(targetPath)) {
+          added.push(relPath);
+        } else {
+          const srcContent = readFileSync(srcPath);
+          const tgtContent = readFileSync(targetPath);
+          if (srcContent.equals(tgtContent)) {
+            unchanged.push(relPath);
+          } else {
+            modified.push(relPath);
+          }
+        }
+      }
+    }
+  }
+
+  walk(sourceDir, '');
+  return { added, modified, unchanged };
+}

package/scripts/e2e-local-check.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-# scripts/e2e-local-check.sh
-# End-to-end local publish check (pack -> install -> run CLI)
-
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-cd "$ROOT_DIR"
-
-log()  { echo "  $*"; }
-info() { echo ""; echo "▶ $*"; }
-ok()   { echo "  ✓  $*"; }
-warn() { echo "  ⚠  $*"; }
-
-cleanup() {
-  if [ -n "${TMP_DIR:-}" ] && [ -d "${TMP_DIR:-}" ]; then
-    rm -rf "$TMP_DIR"
-  fi
-  if [ -n "${PACK_FILE:-}" ] && [ -f "${PACK_FILE:-}" ]; then
-    rm -f "$PACK_FILE"
-  fi
-}
-trap cleanup EXIT
-
-info "Step 1: Run smoke tests"
-npm test
-ok "Smoke tests passed"
-
-info "Step 2: Build npm package tarball"
-PACK_OUTPUT="$(npm pack)"
-PACK_FILE="$(echo "$PACK_OUTPUT" | tail -n 1 | tr -d '\r')"
-if [ ! -f "$PACK_FILE" ]; then
-  echo "  ✗  Failed to produce package tarball"
-  exit 1
-fi
-ok "Tarball: $PACK_FILE"
-
-info "Step 3: Create isolated test project"
-TMP_DIR="$(mktemp -d 2>/dev/null || true)"
-if [ -z "${TMP_DIR}" ]; then
-  TMP_DIR=".tmp-e2e-local-check"
-  rm -rf "$TMP_DIR"
-  mkdir -p "$TMP_DIR"
-fi
-TEST_DIR="$TMP_DIR/e2e-project"
-mkdir -p "$TEST_DIR"
-cd "$TEST_DIR"
-npm init -y >/dev/null 2>&1
-git init >/dev/null 2>&1 || true
-ok "Created isolated project at $TEST_DIR"
-
-info "Step 4: Install from local tarball"
-npm install "$ROOT_DIR/$PACK_FILE" >/dev/null
-ok "Installed package from tarball"
-
-info "Step 5: Run CLI checks in isolated project"
-VERSION_OUT="$(npx dw --version | tr -d '\r')"
-log "dw --version: $VERSION_OUT"
-npx dw init --preset small-team
-npx dw validate
-npx dw doctor
-npx dw upgrade --check
-
-info "Step 6: Verify task-depth override guidance artifacts"
-grep -q "Task-Level Depth Override" ".dw/core/WORKFLOW.md"
-grep -q "Depth Source: default (from config) | override (task-specific)" ".dw/core/templates/vi/task-context.md"
-ok "Depth override guidance exists in generated artifacts"
-
-ok "CLI flow passed in isolated project"
-
-echo ""
-echo "══════════════════════════════════════════"
-echo "  E2E local check passed"
-echo "══════════════════════════════════════════"
-echo ""

package/src/__fixtures__/claude-cli-bug-snippet.js

@@ -1,15 +0,0 @@
-// Minimal fixture that contains the known Vietnamese IME bug pattern.
-// This is NOT the real Claude CLI; only used for testing the patcher logic.
-//
-// IMPORTANT: The comment below must contain both '@anthropic-ai' and 'claude-code'
-// to pass the bundle signature guard in patchCliJs(). Do not remove it.
-// @anthropic-ai/claude-code bundle stub
-
-function demo(INPUT) {
-  if(INPUT.includes("\x7f")){
-    let COUNT=(INPUT.match(/\x7f/g)||[]).length,STATE=CURSTATE;
-    UPDATETEXT(STATE.text);UPDATEOFFSET(STATE.offset)
-    return;
-  }
-}
-