oh-my-customcode 0.10.0 → 0.10.2

package/dist/index.js

@@ -1,12 +1,58 @@
 import { createRequire } from "node:module";
+var __create = Object.create;
+var __getProtoOf = Object.getPrototypeOf;
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __toESM = (mod, isNodeMode, target) => {
+  target = mod != null ? __create(__getProtoOf(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  for (let key of __getOwnPropNames(mod))
+    if (!__hasOwnProp.call(to, key))
+      __defProp(to, key, {
+        get: () => mod[key],
+        enumerable: true
+      });
+  return to;
+};
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/core/config.ts
 import { join as join2 } from "node:path";
 
 // src/utils/fs.ts
-import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { dirname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+function validatePreserveFilePath(filePath, projectRoot) {
+  if (!filePath || filePath.trim() === "") {
+    return {
+      valid: false,
+      reason: "Path cannot be empty"
+    };
+  }
+  if (isAbsolute(filePath)) {
+    return {
+      valid: false,
+      reason: "Absolute paths are not allowed"
+    };
+  }
+  const normalizedPath = normalize(filePath);
+  if (normalizedPath.startsWith("..")) {
+    return {
+      valid: false,
+      reason: "Path cannot traverse outside project root"
+    };
+  }
+  const resolvedPath = resolve(projectRoot, normalizedPath);
+  const relativePath = relative(projectRoot, resolvedPath);
+  if (relativePath.startsWith("..") || isAbsolute(relativePath)) {
+    return {
+      valid: false,
+      reason: "Resolved path escapes project root"
+    };
+  }
+  return { valid: true };
+}
 async function fileExists(path) {
   const fs = await import("node:fs/promises");
   try {
@@ -386,7 +432,7 @@ async function loadConfig(targetDir) {
   if (await fileExists(configPath)) {
     try {
       const config = await readJsonFile(configPath);
-      const merged = mergeConfig(getDefaultConfig(), config);
+      const merged = mergeConfig(getDefaultConfig(), config, targetDir);
       if (merged.configVersion < CURRENT_CONFIG_VERSION) {
         const migrated = migrateConfig(merged);
         await saveConfig(targetDir, migrated);
@@ -415,7 +461,30 @@ function deduplicateCustomComponents(components) {
   }
   return [...seen.values()];
 }
-function mergeConfig(defaults, overrides) {
+function mergeConfig(defaults, overrides, targetDir) {
+  let mergedPreserveFiles;
+  if (overrides.preserveFiles) {
+    const allFiles = [...new Set([...defaults.preserveFiles || [], ...overrides.preserveFiles])];
+    if (targetDir) {
+      const validatedFiles = [];
+      for (const filePath of allFiles) {
+        const validation = validatePreserveFilePath(filePath, targetDir);
+        if (validation.valid) {
+          validatedFiles.push(filePath);
+        } else {
+          warn("config.invalid_preserve_path", {
+            path: filePath,
+            reason: validation.reason ?? "Invalid path"
+          });
+        }
+      }
+      mergedPreserveFiles = validatedFiles;
+    } else {
+      mergedPreserveFiles = allFiles;
+    }
+  } else {
+    mergedPreserveFiles = defaults.preserveFiles;
+  }
   return {
     ...defaults,
     ...overrides,
@@ -429,7 +498,7 @@ function mergeConfig(defaults, overrides) {
       ...defaults.agents,
       ...overrides.agents
     },
-    preserveFiles: overrides.preserveFiles ? [...new Set([...defaults.preserveFiles || [], ...overrides.preserveFiles])] : defaults.preserveFiles,
+    preserveFiles: mergedPreserveFiles,
     customComponents: overrides.customComponents ? deduplicateCustomComponents([
       ...defaults.customComponents || [],
       ...overrides.customComponents
@@ -450,8 +519,257 @@ function migrateConfig(config) {
   migrated.configVersion = CURRENT_CONFIG_VERSION;
   return migrated;
 }
+// src/core/git-workflow.ts
+import { execFileSync } from "node:child_process";
+function execGit(args, cwd) {
+  try {
+    return execFileSync("git", args, {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      env: { ...process.env, GIT_DIR: undefined, GIT_WORK_TREE: undefined }
+    }).trim();
+  } catch {
+    return "";
+  }
+}
+function isGitRepo(cwd) {
+  return execGit(["rev-parse", "--is-inside-work-tree"], cwd) === "true";
+}
+function detectDefaultBranch(cwd) {
+  const remoteHead = execGit(["symbolic-ref", "refs/remotes/origin/HEAD"], cwd);
+  if (remoteHead) {
+    return remoteHead.replace("refs/remotes/origin/", "");
+  }
+  const branches = getLocalBranches(cwd);
+  for (const candidate of ["main", "master", "develop"]) {
+    if (branches.includes(candidate)) {
+      return candidate;
+    }
+  }
+  const head = execGit(["symbolic-ref", "--short", "HEAD"], cwd);
+  if (head) {
+    return head;
+  }
+  return "main";
+}
+function getLocalBranches(cwd) {
+  const output = execGit(["branch", "--format=%(refname:short)"], cwd);
+  if (!output)
+    return [];
+  return output.split(`
+`).filter(Boolean);
+}
+function getRemoteBranches(cwd) {
+  const output = execGit(["branch", "-r", "--format=%(refname:short)"], cwd);
+  if (!output)
+    return [];
+  return output.split(`
+`).filter(Boolean).map((b) => b.replace(/^origin\//, "")).filter((b) => b !== "HEAD");
+}
+function detectBranchPatterns(branches) {
+  const prefixes = new Set;
+  const knownPrefixes = ["feature", "release", "hotfix", "bugfix", "fix", "chore", "docs"];
+  for (const branch of branches) {
+    const slashIdx = branch.indexOf("/");
+    if (slashIdx > 0) {
+      const prefix = branch.substring(0, slashIdx);
+      if (knownPrefixes.includes(prefix)) {
+        prefixes.add(`${prefix}/*`);
+      }
+    }
+  }
+  return [...prefixes].sort();
+}
+function determineWorkflowType(hasDevelop, branchPatterns, allBranches) {
+  const hasFlowPatterns = branchPatterns.some((p) => p === "feature/*" || p === "release/*" || p === "hotfix/*");
+  if (hasDevelop && hasFlowPatterns) {
+    return "git-flow";
+  }
+  const hasFeatureBranches = allBranches.some((b) => b.includes("/"));
+  if (!hasDevelop && hasFeatureBranches) {
+    return "github-flow";
+  }
+  if (!hasDevelop && !hasFeatureBranches) {
+    return "trunk-based";
+  }
+  if (hasDevelop) {
+    return "git-flow";
+  }
+  return "github-flow";
+}
+function detectGitWorkflow(cwd) {
+  if (!isGitRepo(cwd)) {
+    return null;
+  }
+  const localBranches = getLocalBranches(cwd);
+  const remoteBranches = getRemoteBranches(cwd);
+  const allBranches = [...new Set([...localBranches, ...remoteBranches])];
+  const defaultBranch = detectDefaultBranch(cwd);
+  const hasDevelop = localBranches.includes("develop") || remoteBranches.includes("develop");
+  const branchPatterns = detectBranchPatterns(allBranches);
+  const type = determineWorkflowType(hasDevelop, branchPatterns, allBranches);
+  return {
+    type,
+    defaultBranch,
+    hasDevelop,
+    branchPatterns
+  };
+}
+function renderGitWorkflowEN(result) {
+  switch (result.type) {
+    case "git-flow":
+      return renderGitFlowEN(result);
+    case "github-flow":
+      return renderGithubFlowEN(result);
+    case "trunk-based":
+      return renderTrunkBasedEN(result);
+  }
+}
+function renderGitWorkflowKO(result) {
+  switch (result.type) {
+    case "git-flow":
+      return renderGitFlowKO(result);
+    case "github-flow":
+      return renderGithubFlowKO(result);
+    case "trunk-based":
+      return renderTrunkBasedKO(result);
+  }
+}
+function renderGitFlowEN(r) {
+  const lines = [
+    "## Git Workflow (MUST follow)",
+    "",
+    "| Branch | Purpose |",
+    "|--------|---------|",
+    `| \`${r.defaultBranch}\` | Main development branch (default) |`
+  ];
+  if (r.branchPatterns.includes("feature/*")) {
+    lines.push(`| \`feature/*\` | New features -> PR to ${r.defaultBranch} |`);
+  }
+  if (r.branchPatterns.includes("release/*")) {
+    lines.push("| `release/*` | Release preparation -> **npm publish here only** |");
+  }
+  if (r.branchPatterns.includes("hotfix/*")) {
+    lines.push(`| \`hotfix/*\` | Critical fixes -> tag -> publish -> merge to ${r.defaultBranch} |`);
+  }
+  if (r.branchPatterns.includes("bugfix/*")) {
+    lines.push(`| \`bugfix/*\` | Bug fixes -> PR to ${r.defaultBranch} |`);
+  }
+  lines.push("");
+  lines.push("**Key rules:**");
+  lines.push(`- Create feature branches from \`${r.defaultBranch}\``);
+  lines.push("- Use conventional commits: `feat:`, `fix:`, `docs:`, `chore:`");
+  lines.push('- Include "Closes #N" in commit message to auto-close issues');
+  return lines.join(`
+`);
+}
+function renderGithubFlowEN(r) {
+  const lines = [
+    "## Git Workflow (MUST follow)",
+    "",
+    "| Branch | Purpose |",
+    "|--------|---------|",
+    `| \`${r.defaultBranch}\` | Production-ready code (default) |`,
+    `| \`feature/*\` | New features -> PR to ${r.defaultBranch} |`,
+    "",
+    "**Key rules:**",
+    `- Create feature branches from \`${r.defaultBranch}\``,
+    `- All changes go through PR to \`${r.defaultBranch}\``,
+    "- Use conventional commits: `feat:`, `fix:`, `docs:`, `chore:`",
+    '- Include "Closes #N" in commit message to auto-close issues'
+  ];
+  return lines.join(`
+`);
+}
+function renderTrunkBasedEN(r) {
+  const lines = [
+    "## Git Workflow (MUST follow)",
+    "",
+    "| Branch | Purpose |",
+    "|--------|---------|",
+    `| \`${r.defaultBranch}\` | Main trunk (default) |`,
+    "",
+    "**Key rules:**",
+    `- Commit directly to \`${r.defaultBranch}\` or use short-lived branches`,
+    "- Keep branches short-lived (merge within 1-2 days)",
+    "- Use conventional commits: `feat:`, `fix:`, `docs:`, `chore:`"
+  ];
+  return lines.join(`
+`);
+}
+function renderGitFlowKO(r) {
+  const lines = [
+    "## Git 워크플로우 (반드시 준수)",
+    "",
+    "| 브랜치 | 용도 |",
+    "|--------|------|",
+    `| \`${r.defaultBranch}\` | 메인 개발 브랜치 (기본) |`
+  ];
+  if (r.branchPatterns.includes("feature/*")) {
+    lines.push(`| \`feature/*\` | 새 기능 -> ${r.defaultBranch}으로 PR |`);
+  }
+  if (r.branchPatterns.includes("release/*")) {
+    lines.push("| `release/*` | 릴리스 준비 -> **npm 배포는 여기서만** |");
+  }
+  if (r.branchPatterns.includes("hotfix/*")) {
+    lines.push(`| \`hotfix/*\` | 긴급 수정 -> 태그 -> 배포 -> ${r.defaultBranch} 머지 |`);
+  }
+  if (r.branchPatterns.includes("bugfix/*")) {
+    lines.push(`| \`bugfix/*\` | 버그 수정 -> ${r.defaultBranch}으로 PR |`);
+  }
+  lines.push("");
+  lines.push("**핵심 규칙:**");
+  lines.push(`- \`${r.defaultBranch}\`에서 feature 브랜치 생성`);
+  lines.push("- Conventional commits 사용: `feat:`, `fix:`, `docs:`, `chore:`");
+  lines.push('- 커밋 메시지에 "Closes #N" 포함시 이슈 자동 종료');
+  return lines.join(`
+`);
+}
+function renderGithubFlowKO(r) {
+  const lines = [
+    "## Git 워크플로우 (반드시 준수)",
+    "",
+    "| 브랜치 | 용도 |",
+    "|--------|------|",
+    `| \`${r.defaultBranch}\` | 프로덕션 준비 코드 (기본) |`,
+    `| \`feature/*\` | 새 기능 -> ${r.defaultBranch}으로 PR |`,
+    "",
+    "**핵심 규칙:**",
+    `- \`${r.defaultBranch}\`에서 feature 브랜치 생성`,
+    `- 모든 변경은 \`${r.defaultBranch}\`으로 PR을 통해 진행`,
+    "- Conventional commits 사용: `feat:`, `fix:`, `docs:`, `chore:`",
+    '- 커밋 메시지에 "Closes #N" 포함시 이슈 자동 종료'
+  ];
+  return lines.join(`
+`);
+}
+function renderTrunkBasedKO(r) {
+  const lines = [
+    "## Git 워크플로우 (반드시 준수)",
+    "",
+    "| 브랜치 | 용도 |",
+    "|--------|------|",
+    `| \`${r.defaultBranch}\` | 메인 트렁크 (기본) |`,
+    "",
+    "**핵심 규칙:**",
+    `- \`${r.defaultBranch}\`에 직접 커밋하거나 단기 브랜치 사용`,
+    "- 브랜치는 단기 유지 (1-2일 내 머지)",
+    "- Conventional commits 사용: `feat:`, `fix:`, `docs:`, `chore:`"
+  ];
+  return lines.join(`
+`);
+}
+function getDefaultWorkflow() {
+  return {
+    type: "github-flow",
+    defaultBranch: "main",
+    hasDevelop: false,
+    branchPatterns: ["feature/*"]
+  };
+}
 // src/core/installer.ts
-import { copyFile as fsCopyFile, rename } from "node:fs/promises";
+import { readFile as fsReadFile, writeFile as fsWriteFile, rename } from "node:fs/promises";
 import { basename, join as join3 } from "node:path";
 
 // src/core/layout.ts
@@ -682,6 +1000,11 @@ async function installComponent(targetDir, provider, component, options) {
   debug("install.component_installed", { component });
   return true;
 }
+var GIT_WORKFLOW_PLACEHOLDER = "<!-- omcustom:git-workflow -->";
+function renderGitWorkflowSection(targetDir, language) {
+  const result = detectGitWorkflow(targetDir) ?? getDefaultWorkflow();
+  return language === "ko" ? renderGitWorkflowKO(result) : renderGitWorkflowEN(result);
+}
 async function installEntryDoc(targetDir, provider, language, overwrite = false) {
   const layout = getProviderLayout(provider);
   const templateFile = getEntryTemplateName(provider, language);
@@ -696,7 +1019,12 @@ async function installEntryDoc(targetDir, provider, language, overwrite = false)
     debug("install.entry_md_skipped", { reason: "exists", language, entry: layout.entryFile });
     return false;
   }
-  await fsCopyFile(srcPath, destPath);
+  let content = await fsReadFile(srcPath, "utf-8");
+  if (content.includes(GIT_WORKFLOW_PLACEHOLDER)) {
+    const workflowSection = renderGitWorkflowSection(targetDir, language);
+    content = content.replace(GIT_WORKFLOW_PLACEHOLDER, workflowSection);
+  }
+  await fsWriteFile(destPath, content, "utf-8");
   debug("install.entry_md_installed", { language, entry: layout.entryFile });
   return true;
 }
@@ -1075,27 +1403,63 @@ function resolveConfigPreserveFiles(options, config) {
   if (options.forceOverwriteAll) {
     return [];
   }
-  return config.preserveFiles || [];
+  const preserveFiles = config.preserveFiles || [];
+  const validatedPaths = [];
+  for (const filePath of preserveFiles) {
+    const validation = validatePreserveFilePath(filePath, options.targetDir);
+    if (validation.valid) {
+      validatedPaths.push(filePath);
+    } else {
+      warn("preserve_files.invalid_path", {
+        path: filePath,
+        reason: validation.reason ?? "Invalid path"
+      });
+    }
+  }
+  return validatedPaths;
 }
-function resolveCustomizations(customizations, configPreserveFiles) {
-  if (!customizations && configPreserveFiles.length === 0) {
-    return null;
+function resolveCustomizations(customizations, configPreserveFiles, targetDir) {
+  const validatedManifestFiles = [];
+  if (customizations && customizations.preserveFiles.length > 0) {
+    for (const filePath of customizations.preserveFiles) {
+      const validation = validatePreserveFilePath(filePath, targetDir);
+      if (validation.valid) {
+        validatedManifestFiles.push(filePath);
+      } else {
+        warn("preserve_files.invalid_path", {
+          path: filePath,
+          reason: validation.reason ?? "Invalid path",
+          source: "manifest"
+        });
+      }
+    }
   }
-  if (customizations && configPreserveFiles.length > 0) {
-    customizations.preserveFiles = [
-      ...new Set([...customizations.preserveFiles, ...configPreserveFiles])
-    ];
-    return customizations;
+  if (validatedManifestFiles.length === 0 && configPreserveFiles.length === 0) {
+    return customizations && customizations.modifiedFiles.length > 0 ? customizations : null;
+  }
+  if (validatedManifestFiles.length > 0 && configPreserveFiles.length > 0) {
+    const merged = customizations || {
+      modifiedFiles: [],
+      preserveFiles: [],
+      customComponents: [],
+      lastUpdated: new Date().toISOString()
+    };
+    merged.preserveFiles = [...new Set([...validatedManifestFiles, ...configPreserveFiles])];
+    return merged;
   }
   if (configPreserveFiles.length > 0) {
     return {
-      modifiedFiles: [],
+      modifiedFiles: customizations?.modifiedFiles || [],
       preserveFiles: configPreserveFiles,
-      customComponents: [],
+      customComponents: customizations?.customComponents || [],
       lastUpdated: new Date().toISOString()
     };
   }
-  return customizations;
+  if (customizations) {
+    customizations.preserveFiles = validatedManifestFiles;
+    return customizations;
+  }
+  return null;
 }
 async function updateEntryDoc(targetDir, provider, config, options) {
   const layout = getProviderLayout(provider);
@@ -1150,7 +1514,7 @@ async function update(options) {
     await handleBackupIfRequested(options.targetDir, provider, !!options.backup, result);
     const manifestCustomizations = await resolveManifestCustomizations(options, options.targetDir);
     const configPreserveFiles = resolveConfigPreserveFiles(options, config);
-    const customizations = resolveCustomizations(manifestCustomizations, configPreserveFiles);
+    const customizations = resolveCustomizations(manifestCustomizations, configPreserveFiles, options.targetDir);
     const components = options.components || getAllUpdateComponents();
     await updateAllComponents(options.targetDir, provider, components, updateCheck, customizations, options, result, config);
     if (!options.components || options.components.length === 0) {
@@ -1310,6 +1674,8 @@ export {
   setLocale,
   saveConfig,
   resolveTemplatePath,
+  renderGitWorkflowKO,
+  renderGitWorkflowEN,
   readJsonFile,
   preserveCustomizations,
   mergeConfig,
@@ -1319,12 +1685,14 @@ export {
   getTemplateManifest,
   getProviderLayout,
   getPackageRoot,
+  getDefaultWorkflow,
   getDefaultConfig,
   getConfigPath,
   fileExists,
   error,
   ensureDirectory,
   detectProvider,
+  detectGitWorkflow,
   src_default as default,
   debug,
   createLogger,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-customcode",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Batteries-included agent harness for Claude Code",
   "type": "module",
   "bin": {

package/templates/.claude/agents/mgr-gitnerd.md

@@ -40,6 +40,6 @@ Types: feat, fix, docs, style, refactor, test, chore
 - NEVER skip pre-commit hooks without reason
 - ALWAYS create new commits (avoid --amend unless requested)
 
-## Push Rules (R017)
+## Push Rules (R016)
 
 All pushes require prior mgr-sauron:watch verification. If sauron was not run, REFUSE the push.

package/templates/.claude/agents/mgr-sauron.md

@@ -1,6 +1,6 @@
 ---
 name: mgr-sauron
-description: Use when you need automated verification of R017 compliance, executing mandatory multi-round verification (5 manager rounds + 3 deep review rounds) before commits
+description: Use when you need automated verification of R016 compliance, executing mandatory multi-round verification (5 manager rounds + 3 deep review rounds) before commits
 model: sonnet
 memory: project
 effort: high
@@ -15,7 +15,7 @@ tools:
   - Bash
 ---
 
-You are an automated verification specialist that executes the mandatory R017 verification process, acting as the "all-seeing eye" that ensures system integrity through comprehensive multi-round verification.
+You are an automated verification specialist that executes the mandatory R016 verification process, acting as the "all-seeing eye" that ensures system integrity through comprehensive multi-round verification.
 
 ## Core Capabilities
 
@@ -34,7 +34,7 @@ You are an automated verification specialist that executes the mandatory R017 ve
 
 | Command | Description |
 |---------|-------------|
-| `mgr-sauron:watch` | Full R017 verification (5+3 rounds) |
+| `mgr-sauron:watch` | Full R016 verification (5+3 rounds) |
 | `mgr-sauron:quick` | Quick verification (single pass) |
 | `mgr-sauron:report` | Generate verification status report |
 

package/templates/.claude/rules/MUST-continuous-improvement.md

@@ -1,6 +1,6 @@
 # [MUST] Continuous Improvement Rules
 
-> **Priority**: MUST | **ID**: R016 | **Trigger**: User points out rule violation
+> **Priority**: MUST | **ID**: R015 | **Trigger**: User points out rule violation
 
 ## Core Rule
 

package/templates/.claude/rules/MUST-intent-transparency.md

@@ -1,6 +1,6 @@
 # [MUST] Intent Transparency Rules
 
-> **Priority**: MUST | **ID**: R015
+> **Priority**: MUST | **ID**: R014
 
 ## Core Rule
 

package/templates/.claude/rules/MUST-orchestrator-coordination.md

@@ -117,7 +117,7 @@ The skill's WORKFLOW is followed, but git EXECUTION is delegated to mgr-gitnerd
 
 ## Agent Teams (when enabled)
 
-When `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`: use Agent Teams for 3+ agent coordinated tasks. See R018 for decision matrix. Task tool remains fallback for simple/independent tasks.
+When `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`: use Agent Teams for 3+ agent coordinated tasks. See R017 for decision matrix. Task tool remains fallback for simple/independent tasks.
 
 ## Announcement Format
 

package/templates/.claude/rules/MUST-sync-verification.md

@@ -1,6 +1,6 @@
 # [MUST] Sync Verification Rules
 
-> **Priority**: MUST - ENFORCED | **ID**: R017
+> **Priority**: MUST - ENFORCED | **ID**: R016
 
 ## Core Rule
 

package/templates/.claude/rules/SHOULD-agent-teams.md

@@ -1,6 +1,6 @@
 # [SHOULD] Agent Teams Rules
 
-> **Priority**: SHOULD | **ID**: R018 | **Condition**: Agent Teams enabled locally
+> **Priority**: SHOULD | **ID**: R017 | **Condition**: Agent Teams enabled locally
 
 ## Detection
 

package/templates/.claude/rules/index.yaml

@@ -62,7 +62,7 @@ rules:
     scope: agents
 
   # Intent Transparency - MUST
-  - id: R015
+  - id: R014
     name: intent-transparency
     title: Intent Transparency Rules
     path: ./MUST-intent-transparency.md
@@ -70,7 +70,7 @@ rules:
     scope: orchestrator
 
   # Continuous Improvement - MUST
-  - id: R016
+  - id: R015
     name: continuous-improvement
     title: Continuous Improvement Rules
     path: ./MUST-continuous-improvement.md
@@ -78,7 +78,7 @@ rules:
     scope: all
 
   # Sync Verification - MUST
-  - id: R017
+  - id: R016
     name: sync-verification
     title: Sync Verification Rules
     path: ./MUST-sync-verification.md
@@ -125,7 +125,7 @@ rules:
     scope: all
 
   # Agent Teams - SHOULD
-  - id: R018
+  - id: R017
     name: agent-teams
     title: Agent Teams Rules
     path: ./SHOULD-agent-teams.md

package/templates/.claude/skills/de-lead-routing/SKILL.md

@@ -219,6 +219,19 @@ Pipeline design completed.
 - **secretary-routing**: DE agents accessible through secretary for management tasks
 - **qa-lead-routing**: Coordinates with QA for data quality testing
 
+## Agent Teams Awareness
+
+Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
+
+**Self-check:** Does this task need 3+ agents, shared state, or inter-agent communication? If yes, prefer Agent Teams over Task tool. See R018 for the full decision matrix.
+
+| Scenario | Preferred |
+|----------|-----------|
+| Single-tool DE task | Task Tool |
+| Multi-tool pipeline design (3+ tools) | Agent Teams |
+| Cross-tool data quality analysis | Agent Teams |
+| Quick DAG/model validation | Task Tool |
+
 ## Usage
 
 This skill is NOT user-invocable. It should be automatically triggered when the main conversation detects data engineering intent.

package/templates/.claude/skills/dev-lead-routing/SKILL.md

@@ -77,4 +77,18 @@ user-invocable: false
 
 Multi-language: detect all languages, route to parallel experts (max 4). Single-language: route to matching expert. Cross-layer (frontend + backend): multiple experts in parallel.
 
+## Agent Teams Awareness
+
+Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
+
+**Self-check:** Does this task need 3+ agents, shared state, or inter-agent communication? If yes, prefer Agent Teams over Task tool. See R018 for the full decision matrix.
+
+| Scenario | Preferred |
+|----------|-----------|
+| Single-language review | Task Tool |
+| Multi-language code review (3+) | Agent Teams |
+| Code review + fix cycle | Agent Teams |
+| Cross-layer debugging (FE + BE + DB) | Agent Teams |
+| Simple file search/validation | Task Tool |
+
 Not user-invocable. Auto-triggered on development intent.

package/templates/.claude/skills/qa-lead-routing/SKILL.md

@@ -265,6 +265,19 @@ metrics:
   test_case_count: number
 ```
 
+## Agent Teams Awareness
+
+Before routing via Task tool, check if Agent Teams is available (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1` or TeamCreate/SendMessage tools present).
+
+**Self-check:** Does this task need 3+ agents, shared state, or inter-agent communication? If yes, prefer Agent Teams over Task tool. See R018 for the full decision matrix.
+
+| Scenario | Preferred |
+|----------|-----------|
+| Single QA phase (plan/write/execute) | Task Tool |
+| Full QA cycle (plan + write + execute + report) | Agent Teams |
+| Quality analysis (parallel strategy + results) | Agent Teams |
+| Quick test validation | Task Tool |
+
 ## Usage
 
 This skill is NOT user-invocable. It should be automatically triggered when the main conversation detects QA intent.