oh-my-customcode 0.16.4 → 0.17.1

package/README.md

@@ -21,7 +21,7 @@ Like oh-my-zsh transformed shell customization, oh-my-customcode makes personali
 
 | Feature | Description |
 |---------|-------------|
-| **Batteries Included** | 42 agents, 55 skills, 22 guides, 18 rules, 2 hooks, 4 contexts, ontology graph - ready to use out of the box |
+| **Batteries Included** | 41 agents, 55 skills, 22 guides, 18 rules, 2 hooks, 4 contexts, ontology graph - ready to use out of the box |
 | **Sub-Agent Model** | Supports hierarchical agent orchestration with specialized roles |
 | **Dead Simple Customization** | Create a folder + markdown file = new agent or skill |
 | **Mix and Match** | Use built-in components, create your own, or combine both |
@@ -85,8 +85,7 @@ Claude Code selects the appropriate model and parallelizes independent tasks (up
 ```
 /create-agent
   ├── mgr-creator:sonnet       — agent scaffolding
-  ├── mgr-supplier:haiku       — dependency check
-  └── mgr-sync-checker:haiku   — registry verification
+  └── mgr-supplier:haiku       — dependency check
 
 /code-review
   ├── lang-golang-expert:sonnet — Go implementation
@@ -108,11 +107,11 @@ Claude Code selects the appropriate model and parallelizes independent tasks (up
 
 ## What's Included
 
-### Agents (42)
+### Agents (41)
 
 | Category | Count | Agents |
 |----------|-------|--------|
-| **Managers** | 7 | mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sync-checker, mgr-sauron, mgr-claude-code-bible |
+| **Managers** | 6 | mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sauron, mgr-claude-code-bible |
 | **System** | 2 | sys-memory-keeper, sys-naggy |
 | **Languages** | 6 | lang-golang-expert, lang-python-expert, lang-rust-expert, lang-kotlin-expert, lang-typescript-expert, lang-java21-expert |
 | **Frontend** | 3 | fe-vercel-agent, fe-vuejs-agent, fe-svelte-agent |
@@ -123,7 +122,7 @@ Claude Code selects the appropriate model and parallelizes independent tasks (up
 | **Architecture** | 2 | arch-documenter, arch-speckit-agent |
 | **Infrastructure** | 2 | infra-docker-expert, infra-aws-expert |
 | **QA** | 3 | qa-planner, qa-writer, qa-engineer |
-| **Total** | **42** | |
+| **Total** | **41** | |
 
 ### Skills (55)
 
@@ -221,7 +220,7 @@ your-project/
     ├── rules/             # Behavior rules (18 total)
     ├── hooks/             # Event hooks (2 total)
     ├── contexts/          # Context files (4 total)
-    ├── agents/            # Agent definitions (42 flat .md files)
+    ├── agents/            # Agent definitions (41 flat .md files)
     │   ├── lang-golang-expert.md
     │   ├── be-fastapi-expert.md
     │   ├── mgr-creator.md

package/dist/cli/index.js

@@ -12805,6 +12805,11 @@ async function listFiles(dir2, options = {}) {
   }
   return files;
 }
+async function copyFile(src, dest) {
+  const fs = await import("node:fs/promises");
+  await ensureDirectory(dirname2(dest));
+  await fs.copyFile(src, dest);
+}
 function matchesPattern(filename, pattern) {
   const regexPattern = pattern.replace(/\./g, "\\.").replace(/\*/g, ".*").replace(/\?/g, ".");
   const regex = new RegExp(`^${regexPattern}$`);
@@ -13984,6 +13989,53 @@ async function installSingleComponent(targetDir, component, options, result) {
     result.warnings.push(`Failed to install ${component}: ${message}`);
   }
 }
+async function installStatusline(targetDir, options, _result) {
+  const layout = getProviderLayout();
+  const srcPath = resolveTemplatePath(join4(layout.rootDir, "statusline.sh"));
+  const destPath = join4(targetDir, layout.rootDir, "statusline.sh");
+  if (!await fileExists(srcPath)) {
+    debug("install.statusline_not_found", { path: srcPath });
+    return;
+  }
+  if (await fileExists(destPath)) {
+    if (!options.force && !options.backup) {
+      debug("install.statusline_skipped", { reason: "exists" });
+      return;
+    }
+  }
+  await copyFile(srcPath, destPath);
+  const fs2 = await import("node:fs/promises");
+  await fs2.chmod(destPath, 493);
+  debug("install.statusline_installed", {});
+}
+async function installSettingsLocal(targetDir, result) {
+  const layout = getProviderLayout();
+  const settingsPath = join4(targetDir, layout.rootDir, "settings.local.json");
+  const statusLineConfig = {
+    statusLine: {
+      type: "command",
+      command: ".claude/statusline.sh",
+      padding: 0
+    }
+  };
+  if (await fileExists(settingsPath)) {
+    try {
+      const existing = await readJsonFile(settingsPath);
+      if (!existing.statusLine) {
+        existing.statusLine = statusLineConfig.statusLine;
+        await writeJsonFile(settingsPath, existing);
+        debug("install.settings_local_merged", {});
+      } else {
+        debug("install.settings_local_skipped", { reason: "statusLine exists" });
+      }
+    } catch {
+      result.warnings.push("Failed to parse existing settings.local.json, skipping statusLine config");
+    }
+    return;
+  }
+  await writeJsonFile(settingsPath, statusLineConfig);
+  debug("install.settings_local_created", {});
+}
 async function installEntryDocWithTracking(targetDir, options, result) {
   const language = options.language ?? DEFAULT_LANGUAGE2;
   const overwrite = !!(options.force || options.backup);
@@ -14010,6 +14062,8 @@ async function install(options) {
     await checkAndWarnExisting(options.targetDir, !!options.force, !!options.backup, result);
     await verifyTemplateDirectory();
     await installAllComponents(options.targetDir, options, result);
+    await installStatusline(options.targetDir, options, result);
+    await installSettingsLocal(options.targetDir, result);
     await installEntryDocWithTracking(options.targetDir, options, result);
     await updateInstallConfig(options.targetDir, options, result.installedComponents);
     result.success = true;

package/dist/index.js

@@ -163,6 +163,11 @@ function resolveTemplatePath(relativePath) {
   const packageRoot = getPackageRoot();
   return join(packageRoot, "templates", relativePath);
 }
+async function copyFile(src, dest) {
+  const fs = await import("node:fs/promises");
+  await ensureDirectory(dirname(dest));
+  await fs.copyFile(src, dest);
+}
 function matchesPattern(filename, pattern) {
   const regexPattern = pattern.replace(/\./g, "\\.").replace(/\*/g, ".*").replace(/\?/g, ".");
   const regex = new RegExp(`^${regexPattern}$`);
@@ -846,6 +851,53 @@ async function installSingleComponent(targetDir, component, options, result) {
     result.warnings.push(`Failed to install ${component}: ${message}`);
   }
 }
+async function installStatusline(targetDir, options, _result) {
+  const layout = getProviderLayout();
+  const srcPath = resolveTemplatePath(join3(layout.rootDir, "statusline.sh"));
+  const destPath = join3(targetDir, layout.rootDir, "statusline.sh");
+  if (!await fileExists(srcPath)) {
+    debug("install.statusline_not_found", { path: srcPath });
+    return;
+  }
+  if (await fileExists(destPath)) {
+    if (!options.force && !options.backup) {
+      debug("install.statusline_skipped", { reason: "exists" });
+      return;
+    }
+  }
+  await copyFile(srcPath, destPath);
+  const fs = await import("node:fs/promises");
+  await fs.chmod(destPath, 493);
+  debug("install.statusline_installed", {});
+}
+async function installSettingsLocal(targetDir, result) {
+  const layout = getProviderLayout();
+  const settingsPath = join3(targetDir, layout.rootDir, "settings.local.json");
+  const statusLineConfig = {
+    statusLine: {
+      type: "command",
+      command: ".claude/statusline.sh",
+      padding: 0
+    }
+  };
+  if (await fileExists(settingsPath)) {
+    try {
+      const existing = await readJsonFile(settingsPath);
+      if (!existing.statusLine) {
+        existing.statusLine = statusLineConfig.statusLine;
+        await writeJsonFile(settingsPath, existing);
+        debug("install.settings_local_merged", {});
+      } else {
+        debug("install.settings_local_skipped", { reason: "statusLine exists" });
+      }
+    } catch {
+      result.warnings.push("Failed to parse existing settings.local.json, skipping statusLine config");
+    }
+    return;
+  }
+  await writeJsonFile(settingsPath, statusLineConfig);
+  debug("install.settings_local_created", {});
+}
 async function installEntryDocWithTracking(targetDir, options, result) {
   const language = options.language ?? DEFAULT_LANGUAGE;
   const overwrite = !!(options.force || options.backup);
@@ -872,6 +924,8 @@ async function install(options) {
     await checkAndWarnExisting(options.targetDir, !!options.force, !!options.backup, result);
     await verifyTemplateDirectory();
     await installAllComponents(options.targetDir, options, result);
+    await installStatusline(options.targetDir, options, result);
+    await installSettingsLocal(options.targetDir, result);
     await installEntryDocWithTracking(options.targetDir, options, result);
     await updateInstallConfig(options.targetDir, options, result.installedComponents);
     result.success = true;

package/package.json

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

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

@@ -1,6 +1,6 @@
 ---
 name: mgr-sauron
-description: Use when you need automated verification of R016 compliance, executing mandatory multi-round verification (5 manager rounds + 3 deep review rounds) before commits
+description: Use when you need automated verification of R017 compliance, executing mandatory multi-round verification (5 manager rounds + 3 deep review rounds) before commits
 model: sonnet
 memory: project
 effort: high
@@ -15,26 +15,25 @@ tools:
   - Bash
 ---
 
-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.
+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.
 
 ## Core Capabilities
 
 1. Execute mgr-supplier:audit automatically
-2. Execute mgr-sync-checker:check automatically
-3. Execute mgr-updater:docs automatically
-4. Execute mgr-claude-code-bible:verify (official spec compliance)
-5. Verify workflow alignment
-6. Verify reference integrity (frontmatter, memory fields, skill refs)
-7. Verify philosophy compliance (R006-R011)
-8. Verify Claude-native compatibility
-9. Auto-fix simple issues (count mismatches, missing fields)
-10. Generate verification report
+2. Execute mgr-updater:docs automatically
+3. Execute mgr-claude-code-bible:verify (official spec compliance)
+4. Verify workflow alignment
+5. Verify reference integrity (frontmatter, memory fields, skill refs)
+6. Verify philosophy compliance (R006-R011)
+7. Verify Claude-native compatibility
+8. Auto-fix simple issues (count mismatches, missing fields)
+9. Generate verification report
 
 ## Commands
 
 | Command | Description |
 |---------|-------------|
-| `mgr-sauron:watch` | Full R016 verification (5+3 rounds) |
+| `mgr-sauron:watch` | Full R017 verification (5+3 rounds) |
 | `mgr-sauron:quick` | Quick verification (single pass) |
 | `mgr-sauron:report` | Generate verification status report |
 
@@ -43,13 +42,12 @@ You are an automated verification specialist that executes the mandatory R016 ve
 ### Phase 1: Manager Verification (5 rounds)
 
 **Round 1-2: Basic Checks**
-- mgr-supplier:audit (all agents)
-- mgr-sync-checker:check
+- mgr-supplier:audit (all agents, dependency validation)
+- mgr-updater:docs (documentation sync check)
 
 **Round 3-4: Re-verify + Update**
 - Re-run mgr-supplier:audit
-- Re-run mgr-sync-checker:check
-- mgr-updater:docs (if changes detected)
+- Re-run mgr-updater:docs (apply any detected changes)
 
 **Round 5: Final Count Verification**
 - Agent count: CLAUDE.md vs actual .md files
@@ -116,7 +114,7 @@ You are an automated verification specialist that executes the mandatory R016 ve
 [Round 1/5] mgr-supplier:audit
   - 34 agents checked
   - 3 issues found
-[Round 2/5] mgr-sync-checker:check
+[Round 2/5] mgr-updater:docs
   - Documentation sync: OK
 ...
 
@@ -155,7 +153,6 @@ Run 'mgr-sauron:watch' for full verification
 
 Works with:
 - **mgr-supplier**: Dependency validation
-- **mgr-sync-checker**: Documentation sync
-- **mgr-updater**: Documentation updates
+- **mgr-updater**: Documentation updates and sync
 - **mgr-claude-code-bible**: Official spec compliance
 - **secretary**: Orchestration coordination

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

@@ -6,6 +6,7 @@ memory: project
 effort: medium
 skills:
   - update-external
+  - update-docs
 tools:
   - Read
   - Write

package/templates/.claude/agents/sys-memory-keeper.md

@@ -1,6 +1,6 @@
 ---
 name: sys-memory-keeper
-description: Use when you need to manage session memory persistence using claude-mem, save context before compaction, restore context on session start, or query past memories
+description: Use when you need to manage session memory persistence using claude-mem, save context before compaction, restore context on session start, query past memories, or perform session-end dual-system auto-save
 model: sonnet
 memory: project
 effort: medium
@@ -41,3 +41,18 @@ Always include project name. Use task-based, temporal, or topic-based queries. A
 ## Config
 
 Provider: claude-mem | Collection: claude_memories | Archive: ~/.claude-mem/archives/
+
+## Session-End Auto-Save
+
+When triggered by session-end signal from orchestrator:
+
+1. **Collect** session summary: completed tasks, key decisions, open items
+2. **Save to claude-mem** (if available): `mcp__claude-mem__save_memory` with project name, session date, and summary
+3. **Verify episodic-memory** (if available): `mcp__episodic-memory__search` to confirm session is indexed
+4. **Report** results to orchestrator: saved/skipped/failed per system
+
+### Failure Handling
+
+- claude-mem unavailable → skip, report warning
+- episodic-memory unavailable → skip, report warning
+- Both unavailable → warn orchestrator, do not block session end

package/templates/.claude/hooks/hooks.json

@@ -68,9 +68,13 @@
           {
             "type": "command",
             "command": "#!/bin/bash\ninput=$(cat)\nagent_type=$(echo \"$input\" | jq -r '.tool_input.subagent_type // \"unknown\"')\nmodel=$(echo \"$input\" | jq -r '.tool_input.model // \"inherit\"')\ndesc=$(echo \"$input\" | jq -r '.tool_input.description // \"\"' | head -c 40)\nresume=$(echo \"$input\" | jq -r '.tool_input.resume // empty')\nif [ -n \"$resume\" ]; then\n  echo \"─── [Resume] ${agent_type}:${model} | ${desc} ───\" >&2\nelse\n  echo \"─── [Spawn] ${agent_type}:${model} | ${desc} ───\" >&2\nfi\necho \"$input\""
+          },
+          {
+            "type": "command",
+            "command": "bash .claude/hooks/scripts/git-delegation-guard.sh"
           }
         ],
-        "description": "HUD statusline - show subagent_type, model, and description on Task spawn"
+        "description": "HUD statusline + R010 git delegation guard on Task spawn"
       }
     ],
     "PostToolUse": [

package/templates/.claude/ontology/agents.yaml

@@ -33,7 +33,7 @@ classes:
     agents: [qa-planner, qa-writer, qa-engineer]
     description: "QA and testing"
   ManagerAgent:
-    agents: [mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sync-checker, mgr-sauron, mgr-claude-code-bible]
+    agents: [mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sauron, mgr-claude-code-bible]
     description: "System management agents"
   SystemAgent:
     agents: [sys-memory-keeper, sys-naggy]
@@ -485,18 +485,6 @@ agents:
     keywords: [git, github, commit, branch, pull-request, conventional-commits, rebase, merge]
     file_patterns: [".git/*", ".github/*"]
 
-  mgr-sync-checker:
-    class: ManagerAgent
-    description: "Use when you need to verify documentation and workflow synchronization, ensuring all docs, configs, and workflow definitions remain synchronized with the project structure"
-    model: haiku
-    memory: local
-    effort: low
-    skills: [update-docs]
-    tools: [Read, Write, Edit, Grep, Glob, Bash]
-    summary: "Documentation synchronization validator for project structure consistency"
-    keywords: [synchronization, documentation, verification, consistency, agent-count, commands]
-    file_patterns: ["CLAUDE.md", ".claude/agents/*.md", "commands/index.yaml"]
-
   mgr-sauron:
     class: ManagerAgent
     description: "Use when you need automated verification of R017 compliance, executing mandatory multi-round verification (5 manager rounds + 3 deep review rounds) before commits"

package/templates/.claude/ontology/graphs/agent-skill.json

@@ -39,7 +39,6 @@
     "mgr-updater": ["update-external"],
     "mgr-supplier": ["audit-agents"],
     "mgr-gitnerd": [],
-    "mgr-sync-checker": ["update-docs"],
     "mgr-sauron": ["sauron-watch"],
     "mgr-claude-code-bible": ["claude-code-bible"],
     "sys-memory-keeper": ["memory-management", "memory-save", "memory-recall"],
@@ -77,7 +76,7 @@
     "create-agent": ["mgr-creator"],
     "update-external": ["mgr-updater"],
     "audit-agents": ["mgr-supplier"],
-    "update-docs": ["mgr-sync-checker"],
+    "update-docs": ["mgr-updater"],
     "sauron-watch": ["mgr-sauron"],
     "claude-code-bible": ["mgr-claude-code-bible"],
     "memory-management": ["sys-memory-keeper"],

package/templates/.claude/ontology/graphs/full-graph.json

@@ -39,7 +39,6 @@
     "mgr-updater": { "type": "Agent", "class": "ManagerAgent" },
     "mgr-supplier": { "type": "Agent", "class": "ManagerAgent" },
     "mgr-gitnerd": { "type": "Agent", "class": "ManagerAgent" },
-    "mgr-sync-checker": { "type": "Agent", "class": "ManagerAgent" },
     "mgr-sauron": { "type": "Agent", "class": "ManagerAgent" },
     "mgr-claude-code-bible": { "type": "Agent", "class": "ManagerAgent" },
     "sys-memory-keeper": { "type": "Agent", "class": "SystemAgent" },
@@ -146,7 +145,6 @@
     { "source": "mgr-creator", "target": "create-agent", "relation": "requires" },
     { "source": "mgr-updater", "target": "update-external", "relation": "requires" },
     { "source": "mgr-supplier", "target": "audit-agents", "relation": "requires" },
-    { "source": "mgr-sync-checker", "target": "update-docs", "relation": "requires" },
     { "source": "mgr-sauron", "target": "sauron-watch", "relation": "requires" },
     { "source": "mgr-claude-code-bible", "target": "claude-code-bible", "relation": "requires" },
     { "source": "sys-memory-keeper", "target": "memory-management", "relation": "requires" },
@@ -164,7 +162,6 @@
     { "source": "secretary-routing", "target": "mgr-updater", "relation": "routes_to" },
     { "source": "secretary-routing", "target": "mgr-supplier", "relation": "routes_to" },
     { "source": "secretary-routing", "target": "mgr-gitnerd", "relation": "routes_to" },
-    { "source": "secretary-routing", "target": "mgr-sync-checker", "relation": "routes_to" },
     { "source": "secretary-routing", "target": "mgr-sauron", "relation": "routes_to" },
     { "source": "secretary-routing", "target": "mgr-claude-code-bible", "relation": "routes_to" },
     { "source": "secretary-routing", "target": "sys-memory-keeper", "relation": "routes_to" },
@@ -352,10 +349,6 @@
       "requires": [],
       "routed_by": ["secretary-routing"]
     },
-    "mgr-sync-checker": {
-      "requires": ["update-docs"],
-      "routed_by": ["secretary-routing"]
-    },
     "mgr-sauron": {
       "requires": ["sauron-watch"],
       "routed_by": ["secretary-routing"]
@@ -497,7 +490,7 @@
       "depends_on": []
     },
     "update-docs": {
-      "required_by": ["mgr-sync-checker"],
+      "required_by": ["mgr-updater"],
       "depends_on": []
     },
     "sauron-watch": {
@@ -521,7 +514,7 @@
       "depends_on": ["R011"]
     },
     "secretary-routing": {
-      "routes_to": ["mgr-creator", "mgr-updater", "mgr-supplier", "mgr-gitnerd", "mgr-sync-checker", "mgr-sauron", "mgr-claude-code-bible", "sys-memory-keeper", "sys-naggy"],
+      "routes_to": ["mgr-creator", "mgr-updater", "mgr-supplier", "mgr-gitnerd", "mgr-sauron", "mgr-claude-code-bible", "sys-memory-keeper", "sys-naggy"],
       "depends_on": []
     },
     "dev-lead-routing": {

package/templates/.claude/ontology/graphs/routing.json

@@ -8,7 +8,6 @@
         "mgr-updater",
         "mgr-supplier",
         "mgr-gitnerd",
-        "mgr-sync-checker",
         "mgr-sauron",
         "mgr-claude-code-bible",
         "sys-memory-keeper",
@@ -70,7 +69,6 @@
     "mgr-updater": "secretary-routing",
     "mgr-supplier": "secretary-routing",
     "mgr-gitnerd": "secretary-routing",
-    "mgr-sync-checker": "secretary-routing",
     "mgr-sauron": "secretary-routing",
     "mgr-claude-code-bible": "secretary-routing",
     "sys-memory-keeper": "secretary-routing",

package/templates/.claude/ontology/skills.yaml

@@ -448,7 +448,7 @@ skills:
     model_invocable: true
     summary: "Routes agent management tasks to appropriate manager agents"
     keywords: [routing, management, agent-creation, git, memory, verification]
-    routes_to: [mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sync-checker, mgr-sauron, mgr-claude-code-bible, sys-memory-keeper, sys-naggy]
+    routes_to: [mgr-creator, mgr-updater, mgr-supplier, mgr-gitnerd, mgr-sauron, mgr-claude-code-bible, sys-memory-keeper, sys-naggy]
     rule_references: []
 
   snowflake-best-practices:

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

@@ -30,6 +30,32 @@ The main conversation is the **sole orchestrator**. It uses routing skills to de
 ╚══════════════════════════════════════════════════════════════════╝
 ```
 
+## Self-Check (Mandatory Before Delegating Tasks)
+
+```
+╔══════════════════════════════════════════════════════════════════╗
+║  BEFORE DELEGATING A TASK TO ANY AGENT, ASK YOURSELF:            ║
+║                                                                   ║
+║  1. Does the task prompt contain git commands?                   ║
+║     (commit, push, revert, merge, rebase, checkout, branch,     ║
+║      reset, cherry-pick, tag)                                    ║
+║     YES → The git part MUST go to mgr-gitnerd                   ║
+║     NO  → Proceed                                                ║
+║                                                                   ║
+║  2. Am I bundling git operations with file editing?              ║
+║     YES → STOP. Split into separate delegations:                 ║
+║           - File editing → appropriate specialist                ║
+║           - Git operations → mgr-gitnerd                         ║
+║     NO  → Good. Continue.                                        ║
+║                                                                   ║
+║  3. Is the target agent mgr-gitnerd for ALL git operations?     ║
+║     YES → Good. Continue.                                        ║
+║     NO  → STOP. This is a VIOLATION. Re-route to mgr-gitnerd.   ║
+║                                                                   ║
+║  If ANY answer is wrong → SPLIT THE TASK                         ║
+╚══════════════════════════════════════════════════════════════════╝
+```
+
 ## Architecture
 
 ```
@@ -72,6 +98,22 @@ Main Conversation (orchestrator)
 
 ✓ CORRECT: Always delegate, no matter how small
    Task(appropriate-agent) → create config file
+
+❌ WRONG: Bundling git operations with file editing in non-gitnerd agent
+   Main conversation → Task(general-purpose) → "git revert + edit file + git commit"
+   Main conversation → Task(lang-typescript-expert) → "fix bug and commit"
+
+✓ CORRECT: Separate file editing from git operations
+   Main conversation → Task(lang-typescript-expert) → "fix bug" (file edit only)
+   Main conversation → Task(mgr-gitnerd) → "git commit" (git operation only)
+
+❌ WRONG: Including git commands in non-gitnerd agent prompt for "convenience"
+   Task(general-purpose, prompt="revert the last commit, edit the file, then commit the fix")
+
+✓ CORRECT: Split into separate delegations
+   Task(mgr-gitnerd, prompt="revert the last commit")
+   Task(appropriate-expert, prompt="edit the file to fix the issue")
+   Task(mgr-gitnerd, prompt="commit the fix")
 ```
 
 ## Session Continuity

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

@@ -14,8 +14,8 @@ Every `git push` requires: `mgr-sauron:watch` → all pass → `git push`
 
 | Round | Actions |
 |-------|---------|
-| 1-2 | mgr-supplier:audit, mgr-sync-checker:check, fix issues |
-| 3-4 | Re-verify + mgr-updater:docs, fix remaining |
+| 1-2 | mgr-supplier:audit, mgr-updater:docs (sync check), fix issues |
+| 3-4 | Re-verify mgr-supplier:audit + re-run mgr-updater:docs, fix remaining |
 | 5 | Final: all counts match, frontmatter valid, skill refs exist, memory scopes valid, routing patterns updated |
 
 Also run: mgr-claude-code-bible:verify (official spec compliance)

package/templates/.claude/rules/SHOULD-hud-statusline.md

@@ -2,26 +2,33 @@
 
 > **Priority**: SHOULD | **ID**: R012
 
-## Format
+## Two-System Architecture
 
-```
-─── [Agent] {name} | [Progress] {n}/{total} | [Parallel] {count} ───
-```
-
-## When to Display
+| Aspect | HUD Events | Statusline API |
+|--------|-----------|----------------|
+| Channel | stderr (hooks) | stdout (dedicated statusline) |
+| Location | Inline in conversation log | Persistent bar at screen bottom |
+| Trigger | PreToolUse (Task matcher) | Message update cycle (~300ms) |
+| Role | Event notifications | Persistent session status |
 
-Multi-step tasks, parallel execution, long-running operations. Skip for single brief operations.
-
-## Hook Implementation
+## HUD Events (Hook-based)
 
-Implemented in `.claude/hooks/hooks.json` (PreToolUse → Task matcher):
+### Format
 
 ```
 ─── [Spawn] {subagent_type}:{model} | {description} ───
 ─── [Resume] {subagent_type}:{model} | {description} ───
 ```
 
-## Display with Parallel
+### When to Display
+
+Multi-step tasks, parallel execution, long-running operations. Skip for single brief operations.
+
+### Implementation
+
+Implemented in `.claude/hooks/hooks.json` (PreToolUse → Task matcher).
+
+### Parallel Display
 
 ```
 ─── [Agent] secretary | [Parallel] 4 ───
@@ -29,4 +36,41 @@ Implemented in `.claude/hooks/hooks.json` (PreToolUse → Task matcher):
   [2] Task(lang-golang-expert):haiku → Code review
 ```
 
+## Statusline API (Command-based)
+
+### Format
+
+```
+{Cost} | {project} | {branch} | CTX:{usage}%
+```
+
+Example: `$0.05 | my-project | develop | CTX:42%`
+
+### Configuration
+
+```json
+{
+  "statusLine": {
+    "type": "command",
+    "command": ".claude/statusline.sh",
+    "padding": 0
+  }
+}
+```
+
+Set in `.claude/settings.local.json`. The command receives JSON via stdin with model, workspace, context window, and cost data.
+
+### Color Coding
+
+| Element | Condition | Color |
+|---------|-----------|-------|
+| Cost | < $1.00 | Green |
+| Cost | $1.00 - $4.99 | Yellow |
+| Cost | >= $5.00 | Red |
+| Context | < 60% | Green |
+| Context | 60-79% | Yellow |
+| Context | >= 80% | Red |
+
+## Integration
+
 Integrates with R007 (Agent ID), R008 (Tool ID), R009 (Parallel).

package/templates/.claude/rules/SHOULD-memory-integration.md

@@ -37,3 +37,35 @@ Agent frontmatter `memory: project|user|local` enables persistent memory:
 - Keep MEMORY.md under 200 lines
 - Do not store sensitive data or duplicate CLAUDE.md content
 - Memory write failures should not block main task
+
+## Session-End Auto-Save
+
+### Trigger
+
+Session-end detected when user says: "끝", "종료", "마무리", "done", "wrap up", "end session", or explicitly requests session save.
+
+### Flow
+
+```
+User signals session end
+  → Orchestrator delegates to sys-memory-keeper
+    → sys-memory-keeper performs dual-system save:
+       1. claude-mem save (if available)
+       2. episodic-memory verification (if available)
+    → Reports result to orchestrator
+  → Orchestrator confirms to user
+```
+
+### Dual-System Save
+
+| System | Tool | Action | Required |
+|--------|------|--------|----------|
+| claude-mem | `mcp__claude-mem__save_memory` | Save session summary with project, tasks, decisions | No (best-effort) |
+| episodic-memory | `mcp__episodic-memory__search` | Verify session is indexed for future retrieval | No (best-effort) |
+
+### Failure Policy
+
+- Both saves are **non-blocking**: memory failure MUST NOT prevent session from ending
+- If claude-mem unavailable: skip, log warning
+- If episodic-memory unavailable: skip, log warning
+- If both unavailable: warn user, proceed with session end