azcodr 1.0.0 → 1.0.1

package/AGENTS.md

@@ -100,7 +100,7 @@ To prevent context bloat and keep prompt overhead minimal, detailed engineering
 | **Relentless Questioning** | [docs/rules/relentless_questioning.md](./docs/rules/relentless_questioning.md) | Dynamic context-aware interrogation loops, adaptive decision trees. |
 | **Workspace Isolation** | [docs/rules/workspace_isolation.md](./docs/rules/workspace_isolation.md) | Strict workspace sovereignty, zero global contamination, local ground truth. |
 | **Continuous Learning** | [docs/rules/continuous_learning.md](./docs/rules/continuous_learning.md) | Automated defect post-mortems, DO's/DONT's logging, dynamic rule updates. |
-| **Upstream Sync** | [docs/rules/upstream_synchronization.md](./docs/rules/upstream_synchronization.md) | Syncing generic AI knowledge to upstream baselines; zero domain contamination. |
+| **Upstream Sync** | [docs/rules/upstream_synchronization.md](./docs/rules/upstream_synchronization.md) | Logging generic architecture improvements to changes.md; zero baseline pollution. |
 ---
 
 ## 4. Agent Configuration & Workspace Architecture
@@ -113,7 +113,6 @@ To prevent context bloat and keep prompt overhead minimal, detailed engineering
   - [`clean-code-refactor`](.agents/skills/clean-code-refactor/SKILL.md): Refactoring code smells with Clean Code, SOLID, and design patterns.
   - [`lets-build`](.agents/skills/lets-build/SKILL.md): Conducting architecture interviews to finalize stack, frameworks, package managers, and bootstrapping projects.
   - [`relentless-questioner`](.agents/skills/relentless-questioner/SKILL.md): Dynamic context-aware interrogation loops before planning and coding.
-  - [`merge-ai`](.agents/skills/merge-ai/SKILL.md): Auditing, filtering, and merging generic rules and skills to upstream baseline.
 - **Relentless Skill Architecture Inquiry:** Never author or update skills on assumptions. Interrogate all 7 inquiry branches (placement, trigger intent, domain truth, gotchas/anti-patterns, determinism, progressive bloat, verification loop) defined in [docs/rules/agentic_configuration.md](./docs/rules/agentic_configuration.md) before writing `SKILL.md`.
 - **Workspace Memory & Knowledge Hub:** Consult [`memory.md`](./memory.md) for ADRs, and [`docs/knowledge/`](./docs/knowledge/knowledge_graph.md) for system topologies, issue logs, and DO's/DONT's.
 - **Harness Parity & Symlinks:** `AGENTS.md`, `CLAUDE.md`, and `agents.md` must remain identical via filesystem symbolic links to eliminate configuration divergence across different agent harnesses.

package/README.md

@@ -31,7 +31,6 @@
 │       ├── clean-code-refactor/      # Refactoring code smells with GoF & Clean Code
 │       ├── compliance-audit/         # SOC 2, ISO 27001 & OWASP open-source audits
 │       ├── lets-build/               # Architecture interview & project bootstrapper
-│       ├── merge-ai/                 # Auditing & merging generic AI knowledge to upstream
 │       ├── product-analyst/          # INVEST user stories & Gherkin criteria
 │       └── relentless-questioner/    # Context-aware dynamic interrogation loop
 ├── docs/
@@ -45,6 +44,7 @@
 ├── AGENTS.md                         # Lean root agentic configuration (< 120 lines)
 ├── CLAUDE.md -> AGENTS.md            # Filesystem symlink for harness parity
 ├── agents.md -> AGENTS.md            # Filesystem symlink for harness parity
+├── changes.md                        # Upstream changes ledger
 ├── memory.md                         # Master memory hub & Lightweight ADR ledger
 └── README.md                         # Project documentation
 ```
@@ -103,7 +103,7 @@ The architecture enforces 47 atomic, single-responsibility domain rules. Read on
 | **Relentless Questioning** | [`relentless_questioning.md`](./docs/rules/relentless_questioning.md) | Dynamic context-aware interrogation loops, adaptive decision trees. |
 | **Workspace Isolation** | [`workspace_isolation.md`](./docs/rules/workspace_isolation.md) | Strict workspace sovereignty, zero global contamination, local ground truth. |
 | **Continuous Learning** | [`continuous_learning.md`](./docs/rules/continuous_learning.md) | Automated defect post-mortems, DO's/DONT's logging, dynamic rule updates. |
-| **Upstream Sync** | [`upstream_synchronization.md`](./docs/rules/upstream_synchronization.md) | Syncing generic AI knowledge to upstream baselines; zero domain contamination. |
+| **Upstream Sync** | [`upstream_synchronization.md`](./docs/rules/upstream_synchronization.md) | Logging generic architecture improvements to changes.md; zero baseline pollution. |
 
 ---
 
@@ -113,7 +113,6 @@ The architecture enforces 47 atomic, single-responsibility domain rules. Read on
 - [`clean-code-refactor`](.agents/skills/clean-code-refactor/SKILL.md): Refactoring code smells with Clean Code, SOLID, and modern design patterns.
 - [`compliance-audit`](.agents/skills/compliance-audit/SKILL.md): Conducting SOC 2, ISO 27001, and OWASP audits using open-source scanners.
 - [`lets-build`](.agents/skills/lets-build/SKILL.md): Conducting architecture interviews to finalize stack, frameworks, package managers, and bootstrapping projects.
-- [`merge-ai`](.agents/skills/merge-ai/SKILL.md): Auditing, filtering, and merging generic rules and skills to upstream baseline.
 - [`product-analyst`](.agents/skills/product-analyst/SKILL.md): Aligning OKRs, backlog ordering (Kano/MoSCoW/RICE), INVEST stories, and Gherkin criteria.
 - [`relentless-questioner`](.agents/skills/relentless-questioner/SKILL.md): Dynamic context-aware interrogation loops before planning and coding.
 
@@ -182,3 +181,4 @@ Once confirmed, the agent automatically executes:
 - 🐛 **[Coding Issue Log](./docs/knowledge/issue_log.md)**: Defect post-mortems and preventative rules.
 - 💡 **[Institutional Lessons Learned](./docs/knowledge/lessons_learned.md)**: Strategic engineering insights.
 - 📜 **[Lightweight ADR Ledger](./memory.md)**: Formal Architectural Decision Records.
+- 📝 **[Upstream Changes Ledger](./changes.md)**: Record candidate improvements and generic patterns for the upstream azcodr template.

package/bin/azcodr.js

@@ -3,7 +3,7 @@
 
 const path = require('node:path');
 const readline = require('node:readline');
-const { scaffold, getTemplateDir } = require('../lib/scaffold.js');
+const { scaffold, logChange, getTemplateDir } = require('../lib/scaffold.js');
 const pkg = require('../package.json');
 
 const args = process.argv.slice(2);
@@ -15,19 +15,28 @@ Enterprise Multi-Tenant Architecture & Agentic Engineering Starter Template
 
 Usage:
   npx azcodr [directory] [options]
+  npx azcodr change <title> [options]
 
-Arguments:
-  directory       Target directory to scaffold (default: current directory)
+Commands:
+  [directory]     Scaffold azcodr template into directory (default: current directory)
+  change <title>  Log a generic architectural change to changes.md
 
-Options:
+Scaffold Options:
   -f, --force     Overwrite existing files in target directory without confirmation
   --no-git        Do not initialize a git repository
   -v, --version   Display version number
   -h, --help      Display this help message
 
+Change Options:
+  -c, --category  Category (Rule | Skill | Infrastructure | CLI | Knowledge Hub)
+  -f, --files     Target file(s) affected (e.g. "docs/rules/caching.md")
+  -r, --rationale Rationale for upstream template incorporation
+  -d, --desc      Detailed description of the change
+
 Examples:
   npx azcodr my-project
   npx azcodr . --force
+  npx azcodr change "Add Wasm plugin interface" -c Architecture
 `);
 }
 
@@ -49,7 +58,75 @@ function askQuestion(query) {
   });
 }
 
+async function handleLogChange() {
+  let title = null;
+  let category = 'Architecture';
+  let targetFiles = 'docs/rules/';
+  let rationale = 'Generic architectural enhancement';
+  let description = '';
+
+  for (let i = 1; i < args.length; i++) {
+    const a = args[i];
+    if (a === '-c' || a === '--category') {
+      category = args[++i] || category;
+    } else if (a === '-f' || a === '--files') {
+      targetFiles = args[++i] || targetFiles;
+    } else if (a === '-r' || a === '--rationale') {
+      rationale = args[++i] || rationale;
+    } else if (a === '-d' || a === '--desc' || a === '--description') {
+      description = args[++i] || description;
+    } else if (!a.startsWith('-')) {
+      if (!title) {
+        title = a;
+      }
+    }
+  }
+
+  if (!title) {
+    if (process.stdin.isTTY) {
+      title = await askQuestion('? Change title: ');
+    }
+  }
+
+  if (!title) {
+    console.error('❌ Error: A title is required to log an upstream change.');
+    console.error('Usage: npx azcodr change "<title>" [-c Category] [-f Files] [-r Rationale] [-d Description]');
+    process.exit(1);
+  }
+
+  try {
+    const res = logChange({
+      title,
+      category,
+      targetFiles,
+      rationale,
+      description,
+      targetDir: process.cwd()
+    });
+    console.log(`\n✅ Upstream change logged to ${res.filePath}\n`);
+    process.exit(0);
+  } catch (err) {
+    console.error(`\n❌ Failed to log change: ${err.message}\n`);
+    process.exit(1);
+  }
+}
+
 async function main() {
+  if (args.length > 0 && (args[0] === '-h' || args[0] === '--help')) {
+    printHelp();
+    process.exit(0);
+  }
+
+  if (args.length > 0 && (args[0] === '-v' || args[0] === '--version')) {
+    printVersion();
+    process.exit(0);
+  }
+
+  if (args.length > 0 && (args[0] === 'change' || args[0] === 'log-change')) {
+    await handleLogChange();
+    return;
+  }
+
   let targetDir = null;
   let force = false;
   let noGit = false;
@@ -127,6 +204,7 @@ async function main() {
     console.log('  ✅ Progressive disclosure rules copied (docs/rules/)');
     console.log('  ✅ Workspace knowledge hub and ADR ledger copied (docs/knowledge/, memory.md)');
     console.log('  ✅ Specialized agentic skills copied (.agents/skills/)');
+    console.log('  ✅ Upstream changes ledger initialized (changes.md)');
     console.log('  ✅ Agent directives and harness symlinks established (AGENTS.md, CLAUDE.md, agents.md)');
     if (result.gitInitialized) {
       console.log('  ✅ Git repository initialized');

package/changes.md

@@ -0,0 +1,36 @@
+# Upstream Changes Ledger (`changes.md`)
+
+> **Core Purpose:** Record candidate improvements, generic architectural updates, defect post-mortems, and rule enhancements discovered in this workspace that should be incorporated into the upstream `azcodr` baseline template. No automated git merging or external repo mutation is performed.
+
+---
+
+## 1. Specification & Protocol
+
+When an AI agent or engineer discovers a generic architectural improvement, bug fix, or rule refinement during project development, append an entry below using this atomic format:
+
+```markdown
+### [YYYY-MM-DD] <Title of Change>
+- **Category:** Rule | Skill | Infrastructure | CLI | Knowledge Hub
+- **Target File(s):** `docs/rules/...`, `.agents/skills/...`, etc.
+- **Rationale:** Why this improvement is necessary or valuable across all enterprise projects.
+- **Description:** Concise summary of the mutation or invariant added.
+- **Domain Filter Verification:** Verified 100% generic; purged of all project-specific business entities and models.
+```
+
+---
+
+## 2. Upstream Changes Log
+
+### [2026-09-25] Initialized npx Scaffolder CLI and npm Package
+- **Category:** CLI & Infrastructure
+- **Target File(s):** `bin/azcodr.js`, `lib/scaffold.js`, `package.json`, `tests/`
+- **Rationale:** Eliminate manual `cp -r` copying; enable anyone to pull and scaffold the azcodr architecture template via `npx azcodr`.
+- **Description:** Implemented zero-dependency Node.js CLI executable with Outside-In TDD, harness parity symlink generation, script execution bit setting, and full test suite passing with 100% agentic config validation.
+- **Domain Filter Verification:** Verified 100% generic; no project-specific business models.
+
+### [2026-09-25] Streamlined Upstream Sync Protocol to changes.md Ledger
+- **Category:** Rule & Process
+- **Target File(s):** `docs/rules/upstream_synchronization.md`, `changes.md`, `AGENTS.md`
+- **Rationale:** Remove fragile git repo resolution and merge scripts; replace with atomic change logging in `changes.md`.
+- **Description:** Retired `merge-ai` skill and removed machine-specific hardcoded paths. All upstream improvements are now recorded atomically in `changes.md`.
+- **Domain Filter Verification:** Verified 100% generic.

package/docs/rules/upstream_synchronization.md

@@ -1,40 +1,37 @@
-# Upstream Baseline Synchronization & AI Knowledge Merging
+# Upstream Baseline Synchronization & changes.md Ledger
 
-> **Core Mandate:** Upstream template/baseline workspaces (`azcodr`) must remain strictly untouched until the user explicitly requests merging. When merging via `/merge-ai`, strictly filter out all domain-specific entities, stacks, and models, keeping the baseline 100% generic.
+> **Core Mandate:** Upstream template/baseline workspaces (`azcodr`) must remain strictly untouched during project development. When generic architectural improvements, rule refinements, or post-mortems are identified, record them solely into the `changes.md` ledger with zero automated repo merging or baseline contamination.
 
 ---
 
 ## 1. The Baseline-Project Decoupling Principle
 
-Workspaces operate under a strict unidirectional and on-demand bidirectional flow:
+Workspaces operate under a clean, decoupled flow:
 
 ```
 [Upstream Generic Baseline: azcodr]
                │
-               ▼  (One-time fork / clone at project inception)
+               ▼  (Scaffolded via npx azcodr)
 [Derived Project Workspace: my-app / others]
                │
                │  (Accumulates project code, specificities, and institutional lessons)
                │
-               ▼  (ONLY when user explicitly triggers /merge-ai)
-[Distillation & Filter: Purge Domain Specificities, Colocate DOs/DONTs]
-               │
-               ▼
-[Clean Merge into Upstream Baseline: azcodr]
+               ▼  (Record reusable improvements)
+[Upstream Changes Ledger: changes.md]
 ```
 
-- **Pristine Upstream Mandate:** Never edit, commit, or push changes to an upstream baseline repository (`azcodr`) during routine project development, feature implementation, or bug fixes.
-- **Explicit Trigger Requirement:** Synchronization into the baseline template may occur **only and exclusively** when the user explicitly issues the `/merge-ai` slash command or direct merge directive.
+- **Pristine Upstream Mandate:** Never edit, commit, or attempt automated git merges to an upstream baseline repository during routine project development, feature implementation, or bug fixes.
+- **Ledger-Only Synchronization:** When generic architectural discoveries or defect post-mortems occur, document them cleanly in `changes.md` at the workspace root. No automated merge AI or remote repo synchronization is executed.
 
 ---
 
 ## 2. Zero-Contamination Invariant (Generic vs. Specific)
 
-When merging knowledge, rules, or skills back to the baseline, enforce strict domain filtering:
+When logging proposed changes into `changes.md`, enforce strict domain filtering:
 
-| Element Category | Keep in Specific Project Workspace | Allow in Generic Baseline (`azcodr`) |
+| Element Category | Keep in Specific Project Workspace | Allow in changes.md for Upstream (`azcodr`) |
 |---|---|---|
-| **Domain Entities** | Concrete business models (`Order`, `Customer`, `Invoice`, `Account`, etc.) | Abstract archetypes (`Entity`, `Aggregate`, `ValueObject`, `Resource`) |
+| **Domain Entities** | Concrete business models (`Order`, `Customer`, `Invoice`, etc.) | Abstract archetypes (`Entity`, `Aggregate`, `ValueObject`, `Resource`) |
 | **Tech Stack / Adapters** | Concrete choices (Prisma, SQLite dev, PostgreSQL prod, Vite React) | Hexagonal Ports, abstract repository contracts, polyglot adapter guidance |
 | **Architectural Rules** | Specific entity validation, specific route paths | Universal invariants (5-Phase Agile Lifecycle, SemVer trigger matrix, FK dropdowns) |
 | **ADRs** | Stack decisions (`ADR-006: Target Tech Stack for Project`) | Generic architecture patterns (`ADR-007` to `ADR-010`) |
@@ -42,25 +39,30 @@ When merging knowledge, rules, or skills back to the baseline, enforce strict do
 
 ---
 
-## 3. Direct Rule Colocation Protocol
+## 3. Atomic changes.md Entry Protocol
+
+Every upstream-bound proposal logged to `changes.md` must follow the standardized format:
 
-To prevent token bloat and documentation rot:
-1. **Never Duplicate in a Consolidated List:** Never dump merged rules into a monolithic `dos_and_donts.md`.
-2. **Colocate at Source:** Embed DO's and DONT's directly into the relevant atomic rule (`docs/rules/<domain>.md`) and skill (`.agents/skills/<skill>/SKILL.md`).
-3. **Index-Only Directory:** Maintain `docs/knowledge/dos_and_donts.md` strictly as a clean reference table pointing to atomic rules.
+```markdown
+### [YYYY-MM-DD] <Title of Change>
+- **Category:** Rule | Skill | Infrastructure | CLI | Knowledge Hub
+- **Target File(s):** `docs/rules/...`, `.agents/skills/...`, etc.
+- **Rationale:** Why this improvement is necessary or valuable across all enterprise projects.
+- **Description:** Concise summary of the mutation or invariant added.
+- **Domain Filter Verification:** Verified 100% generic; purged of all project-specific business entities and models.
+```
 
 ---
 
 ## 4. Invariants, DO's & DONT's
 
 ### DO's:
-- **DO:** Leave the upstream baseline repository (`azcodr`) completely alone during regular development.
-- **DO:** Require an explicit `/merge-ai` command before proposing or executing any upstream synchronization.
-- **DO:** Distill all lessons and post-mortems into generic, domain-agnostic language before merging.
+- **DO:** Record candidate generic architectural improvements in `changes.md`.
+- **DO:** Distill all lessons and post-mortems into generic, domain-agnostic language before logging.
 - **DO:** Colocate DOs and DONTs directly inside the relevant atomic rules and skills.
-- **DO:** Run `validate_agentic_configs.sh` on the upstream baseline before and after any merge.
+- **DO:** Verify that all entries in `changes.md` are 100% stack- and domain-agnostic.
 
 ### DONT's:
-- **DONT:** Never touch or edit the upstream baseline template automatically without explicit user command.
-- **DONT:** Never contaminate the baseline template with project-specific domain models, entity names, or framework setups.
-- **DONT:** Never overwrite upstream baseline files with raw project copies; merge generic concepts surgically.
+- **DONT:** Never execute automated upstream git cloning or merge AI workflows during project work.
+- **DONT:** Never contaminate `changes.md` with project-specific business logic, schemas, or customer requirements.
+- **DONT:** Never leave machine-specific or absolute user paths in scripts or documentation.

package/lib/scaffold.js

@@ -7,6 +7,7 @@ const { execSync } = require('node:child_process');
 const TEMPLATE_ITEMS = [
   'AGENTS.md',
   'memory.md',
+  'changes.md',
   'README.md',
   'docs',
   '.agents',
@@ -165,8 +166,53 @@ function scaffold(options = {}) {
   };
 }
 
+/**
+ * Appends a standardized upstream change entry to changes.md.
+ */
+function logChange(options = {}) {
+  const {
+    title,
+    category = 'Architecture',
+    targetFiles = 'docs/rules/',
+    rationale = 'Generic architectural enhancement',
+    description = '',
+    targetDir = process.cwd()
+  } = options;
+
+  if (!title || typeof title !== 'string' || !title.trim()) {
+    throw new Error('A change title is required to log an upstream change.');
+  }
+
+  const cleanTitle = title.trim();
+  const changesFilePath = path.join(path.resolve(targetDir), 'changes.md');
+  const today = new Date().toISOString().slice(0, 10);
+
+  const entry = `\n### [${today}] ${cleanTitle}\n` +
+    `- **Category:** ${category}\n` +
+    `- **Target File(s):** ${targetFiles}\n` +
+    `- **Rationale:** ${rationale}\n` +
+    `- **Description:** ${description || cleanTitle}\n` +
+    `- **Domain Filter Verification:** Verified 100% generic; purged of all project-specific business entities and models.\n`;
+
+  if (fs.existsSync(changesFilePath)) {
+    fs.appendFileSync(changesFilePath, entry, 'utf-8');
+  } else {
+    const initialHeader = `# Upstream Changes Ledger (\`changes.md\`)\n\n` +
+      `> **Core Purpose:** Record candidate improvements, generic architectural updates, defect post-mortems, and rule enhancements discovered in this workspace that should be incorporated into the upstream \`azcodr\` baseline template.\n\n` +
+      `---\n\n## Upstream Changes Log\n`;
+    fs.writeFileSync(changesFilePath, initialHeader + entry, 'utf-8');
+  }
+
+  return {
+    success: true,
+    filePath: changesFilePath,
+    entry
+  };
+}
+
 module.exports = {
   scaffold,
+  logChange,
   validateTarget,
   copyTemplate,
   ensureSymlink,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azcodr",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Enterprise Multi-Tenant Architecture & Agentic Engineering Starter Template",
   "bin": {
     "azcodr": "bin/azcodr.js"
@@ -11,6 +11,7 @@
     "lib",
     "AGENTS.md",
     "memory.md",
+    "changes.md",
     "README.md",
     "docs",
     ".agents",

package/.agents/skills/merge-ai/SKILL.md

@@ -1,90 +0,0 @@
----
-name: merge-ai
-description: Use when the user invokes /merge-ai or asks to merge generic AI rules, skills, lessons learned, and post-mortems from the current workspace back into the generic azcodr baseline repository. Do not use for merging application business logic or routine Git branches.
----
-
-# Merge AI Knowledge, Rules & Skills Skill (`/merge-ai`)
-
-> **Core Philosophy:** Upstream baseline repositories (e.g. `https://github.com/org/azcodr`) must remain pristine, generic, and untouched until the user explicitly triggers `/merge-ai`. When triggered from any project workspace (e.g. `https://github.com/org/my-project`), detect if the baseline repo is already cloned locally (apply directly) or clone it first, purge all project-specific domain models, colocate DOs and DONTs into atomic rules, and synchronize the generic baseline.
-
----
-
-## 1. When to Use This Skill
-- The user issues `/merge-ai` or requests syncing AI rules, skills, issue logs, and lessons learned back into the generic baseline repository.
-- User references repository URLs (e.g. Source: `https://github.com/org/my-project`, Target: `https://github.com/org/azcodr`).
-- Auditing divergences between the current project workspace and the generic baseline repository.
-- Exporting newly discovered architectural patterns, defect post-mortems, or reusable skills to the generic starter.
-- **DO NOT USE** during routine project feature development or bug fixes.
-- **DO NOT USE** to merge application domain entities, business logic, or project-specific data models.
-- **DO NOT USE** without explicit user invocation.
-
----
-
-## 2. Step-by-Step Execution Workflow
-
-### Phase 1: Target Baseline Repository Resolution (URL or Local)
-When `/merge-ai` is triggered with repository URLs (e.g. `/merge-ai https://github.com/org/my-project https://github.com/org/azcodr`):
-1. **Execute Repo Resolver Script:**
-   ```bash
-   # Discovers existing local clone or automatically clones fresh
-   eval $(bash .agents/skills/merge-ai/scripts/resolve_repo.sh "$TARGET_REPO_URL")
-   ```
-   - **If already cloned locally:** Discovers its directory, verifies clean working tree, and exports `STATUS=ALREADY_CLONED` and `LOCAL_PATH` (e.g. `/path/to/azcodr`).
-   - **If not cloned locally:** Automatically executes `git clone "$TARGET_REPO_URL"` to `$HOME/projects/<name>` and exports `STATUS=CLONED_FRESH` and `LOCAL_PATH`.
-2. Set `$BASELINE_DIR="$LOCAL_PATH"`.
-3. If `STATUS=ALREADY_CLONED`, ensure the repository is on branch `main` (`git -C "$BASELINE_DIR" pull --ff-only`).
-
----
-
-### Phase 2: Divergence Audit & Domain Purging
-1. Run the divergence audit script:
-   ```bash
-   bash .agents/skills/merge-ai/scripts/audit_divergence.sh "$BASELINE_DIR"
-   ```
-2. Systematically filter out all project-specific elements before proposing changes:
-   - **Purge Business Domain Entities:** Replace project-specific nouns with universal architectural archetypes (`Entity`, `Aggregate`, `ValueObject`, `Resource`, `Transaction`).
-   - **Purge Concrete Stack Specifics:** Keep core rules stack-agnostic (Hexagonal Ports, abstract repositories). Keep project-specific setups (e.g. SQLite dev / Postgres prod, React Vite client) in the project workspace.
-   - **Colocate DOs & DONTs into Atomic Rules:** Embed DOs and DONTs directly inside their governing atomic rule files in `docs/rules/` (`## Invariants, DO's & DONT's`). Keep `docs/knowledge/dos_and_donts.md` strictly as a clean cross-reference index directory.
-   - **Transform ADRs & Post-Mortems:** Port universal decisions (ADR-007 CRUD & Selectors, ADR-008 Bootstrapping Decoupling, ADR-009 Agile Domain TDD, ADR-010 M:N Skill Composability) as generic ADRs in `memory.md`. Port universal post-mortems (`ISSUE-004`, `ISSUE-005`) into `issue_log.md` and `lessons_learned.md`.
-
----
-
-### Phase 3: Dry-Run Review & Explicit User Confirmation
-1. Present a concise, structured dry-run report to the user summarizing:
-   - Target baseline repo URL and resolved local directory (`$BASELINE_DIR`).
-   - Generic rules, skills, post-mortems, and ADRs to be merged.
-   - Domain-specific elements purged.
-2. **STOP AND ASK FOR EXPLICIT CONFIRMATION** before modifying `$BASELINE_DIR`.
-
----
-
-### Phase 4: Apply Merge, Validate & Sync
-Upon user confirmation:
-1. Apply the generic updates to `$BASELINE_DIR`:
-   - `AGENTS.md` (Unified Agent Cognitive & Agile Domain Lifecycle).
-   - `docs/rules/` (Updated atomic rules with colocated DOs/DONTs).
-   - `.agents/skills/` (Updated generic skills, e.g. decoupled `lets-build`).
-   - `docs/knowledge/` (Index-only `dos_and_donts.md`, generic post-mortems in `issue_log.md`, `lessons_learned.md`, `knowledge_graph.md`).
-   - `memory.md` (Generic ADRs).
-2. Validate agentic configuration integrity in the baseline:
-   ```bash
-   bash "$BASELINE_DIR/.agents/skills/agentic-architect/scripts/validate_agentic_configs.sh"
-   ```
-   *Requirement: 0 warnings, AGENTS.md <= 120 lines, valid symlinks.*
-3. Commit and push the baseline repository to remote:
-   ```bash
-   git -C "$BASELINE_DIR" add -A
-   git -C "$BASELINE_DIR" commit -m "feat(ai-sync): merge generic rules, skills, and lifecycle improvements from workspace"
-   git -C "$BASELINE_DIR" push origin main
-   ```
-4. Confirm successful synchronization with the remote generic baseline URL.
-
----
-
-## 3. Gotchas & What NOT to Do
-
-- **MAJOR DONT: Never touch, edit, or commit to the baseline repository (`azcodr`) during routine feature development.** The baseline must be left completely alone until `/merge-ai` is explicitly invoked.
-- **DO NOT** copy application domain models, database tables, or framework-specific configs to the baseline.
-- **DO NOT** create monolithic DO/DONT lists. Always colocate directives in atomic rules.
-- **DO NOT** execute the merge without presenting a dry-run summary and receiving explicit approval.
-- **DO NOT** push to the baseline repository if `validate_agentic_configs.sh` fails or reports warnings.

package/.agents/skills/merge-ai/scripts/audit_divergence.sh

@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-BASELINE_DIR="${1:-/home/prosubodh/projects/azcodr}"
-CURRENT_DIR="$(pwd)"
-
-echo "=================================================================="
-echo "🔍 Auditing AI Knowledge & Rule Divergence"
-echo "Current Workspace: $CURRENT_DIR"
-echo "Baseline Template: $BASELINE_DIR"
-echo "=================================================================="
-
-if [ ! -d "$BASELINE_DIR" ]; then
-  echo "❌ Error: Baseline directory '$BASELINE_DIR' does not exist."
-  exit 1
-fi
-
-echo ""
-echo "--- 1. Checking Core Directives (AGENTS.md) ---"
-if diff -q "$CURRENT_DIR/AGENTS.md" "$BASELINE_DIR/AGENTS.md" > /dev/null 2>&1; then
-  echo "✅ AGENTS.md is identical."
-else
-  echo "⚠️ AGENTS.md differs between workspaces."
-fi
-
-echo ""
-echo "--- 2. Checking Atomic Rules (docs/rules/) ---"
-DIFF_RULES=$(diff -qr "$CURRENT_DIR/docs/rules" "$BASELINE_DIR/docs/rules" 2>/dev/null || true)
-if [ -z "$DIFF_RULES" ]; then
-  echo "✅ All atomic rules in docs/rules/ are identical."
-else
-  echo "$DIFF_RULES"
-fi
-
-echo ""
-echo "--- 3. Checking Specialized Skills (.agents/skills/) ---"
-DIFF_SKILLS=$(diff -qr "$CURRENT_DIR/.agents/skills" "$BASELINE_DIR/.agents/skills" 2>/dev/null || true)
-if [ -z "$DIFF_SKILLS" ]; then
-  echo "✅ All skills in .agents/skills/ are identical."
-else
-  echo "$DIFF_SKILLS"
-fi
-
-echo ""
-echo "--- 4. Checking Knowledge Hub (docs/knowledge/) ---"
-DIFF_KNOW=$(diff -qr "$CURRENT_DIR/docs/knowledge" "$BASELINE_DIR/docs/knowledge" 2>/dev/null || true)
-if [ -z "$DIFF_KNOW" ]; then
-  echo "✅ All knowledge files in docs/knowledge/ are identical."
-else
-  echo "$DIFF_KNOW"
-fi
-
-echo ""
-echo "--- 5. Checking Architecture Decision Records (memory.md) ---"
-if [ -f "$CURRENT_DIR/memory.md" ] && [ -f "$BASELINE_DIR/memory.md" ]; then
-  mapfile -t BASELINE_ADRS < <(grep -E '^### ADR-[0-9]+:' "$BASELINE_DIR/memory.md" 2>/dev/null | sed -E 's/^### ADR-[0-9]+:[[:space:]]*//' || true)
-  mapfile -t CURRENT_ADRS < <(grep -E '^### ADR-[0-9]+:' "$CURRENT_DIR/memory.md" 2>/dev/null | sed -E 's/^### ADR-[0-9]+:[[:space:]]*//' || true)
-
-  MISSING_IN_CURRENT=()
-  for b_adr in "${BASELINE_ADRS[@]}"; do
-    [ -z "$b_adr" ] && continue
-    found=false
-    for c_adr in "${CURRENT_ADRS[@]}"; do
-      if [ "$b_adr" = "$c_adr" ]; then
-        found=true
-        break
-      fi
-    done
-    if [ "$found" = false ]; then
-      MISSING_IN_CURRENT+=("$b_adr")
-    fi
-  done
-
-  EXTRA_IN_CURRENT=()
-  for c_adr in "${CURRENT_ADRS[@]}"; do
-    [ -z "$c_adr" ] && continue
-    found=false
-    for b_adr in "${BASELINE_ADRS[@]}"; do
-      if [ "$c_adr" = "$b_adr" ]; then
-        found=true
-        break
-      fi
-    done
-    if [ "$found" = false ]; then
-      EXTRA_IN_CURRENT+=("$c_adr")
-    fi
-  done
-
-  if [ ${#MISSING_IN_CURRENT[@]} -gt 0 ]; then
-    echo "⚠️ Workspace is missing ${#MISSING_IN_CURRENT[@]} baseline ADR(s):"
-    for m in "${MISSING_IN_CURRENT[@]}"; do
-      echo "   - $m"
-    done
-  elif [ ${#EXTRA_IN_CURRENT[@]} -eq 0 ]; then
-    echo "✅ memory.md ADRs are 100% identical."
-  else
-    echo "✅ All generic baseline ADRs are synchronized."
-    for e in "${EXTRA_IN_CURRENT[@]}"; do
-      echo "   ℹ️ Project-specific ADR retained in workspace: $e"
-    done
-  fi
-else
-  echo "⚠️ memory.md not found in one or both workspaces."
-fi
-
-echo "=================================================================="
-echo "Audit complete. Run /merge-ai to filter and merge generic changes."
-echo "=================================================================="

package/.agents/skills/merge-ai/scripts/resolve_repo.sh

@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# ==============================================================================
-# resolve_repo.sh
-# Deterministically resolves whether a remote Git URL is cloned locally,
-# EVEN IF CLONED UNDER A COMPLETELY DIFFERENT FOLDER NAME.
-#
-# Usage: ./resolve_repo.sh <REPO_URL> [--check-only] [--dest-dir <DIR>]
-# ==============================================================================
-
-REPO_URL="${1:-}"
-CHECK_ONLY=false
-DEST_DIR=""
-
-if [ -z "$REPO_URL" ]; then
-  echo "Usage: $0 <REPO_URL> [--check-only] [--dest-dir <DIR>]" >&2
-  exit 1
-fi
-
-shift || true
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --check-only)
-      CHECK_ONLY=true
-      shift
-      ;;
-    --dest-dir)
-      DEST_DIR="$2"
-      shift 2
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      exit 1
-      ;;
-  esac
-done
-
-normalize_git_url() {
-  local url="$1"
-  url="${url%.git}"
-  url="${url%/}"
-  url=$(echo "$url" | sed -E 's/^(https?:\/\/|ssh:\/\/git@|ssh:\/\/|git@)//')
-  url=$(echo "$url" | sed -E 's/:/\//')
-  echo "$url" | tr '[:upper:]' '[:lower:]'
-}
-
-TARGET_NORM=$(normalize_git_url "$REPO_URL")
-REPO_NAME=$(basename "$TARGET_NORM")
-CURRENT_DIR="$(pwd)"
-
-# Check if a specific directory matches the target URL by inspecting its remotes
-matches_target_url() {
-  local dir="$1"
-  if [ ! -d "$dir/.git" ]; then
-    return 1
-  fi
-
-  # Check all configured remotes (origin, upstream, etc.)
-  local remotes
-  remotes=$(git -C "$dir" config --get-regexp '^remote\..*\.url' 2>/dev/null | awk '{print $2}' || true)
-  for r in $remotes; do
-    local r_norm
-    r_norm=$(normalize_git_url "$r")
-    if [ "$r_norm" = "$TARGET_NORM" ]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-FOUND_PATH=""
-
-# ------------------------------------------------------------------------------
-# Pass 1: Fast Probe of Standard Conventions
-# ------------------------------------------------------------------------------
-FAST_CANDIDATES=(
-  "${DEST_DIR:-}"
-  "$HOME/projects/$REPO_NAME"
-  "$(dirname "$CURRENT_DIR")/$REPO_NAME"
-  "$CURRENT_DIR/$REPO_NAME"
-  "$CURRENT_DIR"
-)
-
-for cand in "${FAST_CANDIDATES[@]}"; do
-  [ -z "$cand" ] && continue
-  if matches_target_url "$cand"; then
-    FOUND_PATH="$(cd "$cand" && pwd)"
-    break
-  fi
-done
-
-# ------------------------------------------------------------------------------
-# Pass 2: Deep Scan Across Sibling & Project Roots (Handles ANY folder name!)
-# ------------------------------------------------------------------------------
-if [ -z "$FOUND_PATH" ]; then
-  SEARCH_ROOTS=()
-  PARENT_DIR="$(dirname "$CURRENT_DIR")"
-  SEARCH_ROOTS+=("$PARENT_DIR")
-  [ -d "$HOME/projects" ] && [ "$HOME/projects" != "$PARENT_DIR" ] && SEARCH_ROOTS+=("$HOME/projects")
-  [ -d "$HOME/workspace" ] && SEARCH_ROOTS+=("$HOME/workspace")
-  [ -d "$HOME/dev" ] && SEARCH_ROOTS+=("$HOME/dev")
-  [ -d "$HOME/code" ] && SEARCH_ROOTS+=("$HOME/code")
-
-  for root in "${SEARCH_ROOTS[@]}"; do
-    [ ! -d "$root" ] && continue
-    # Search maxdepth 2 for any .git directory
-    while IFS= read -r gitdir; do
-      repo_candidate="$(dirname "$gitdir")"
-      if matches_target_url "$repo_candidate"; then
-        FOUND_PATH="$(cd "$repo_candidate" && pwd)"
-        break 2
-      fi
-    done < <(find "$root" -maxdepth 2 -name ".git" -type d 2>/dev/null || true)
-  done
-fi
-
-# ------------------------------------------------------------------------------
-# Output Resolution
-# ------------------------------------------------------------------------------
-if [ -n "$FOUND_PATH" ]; then
-  BRANCH=$(git -C "$FOUND_PATH" branch --show-current 2>/dev/null || true)
-  if [ -z "$BRANCH" ]; then
-    BRANCH=$(git -C "$FOUND_PATH" rev-parse --short HEAD 2>/dev/null || echo "unknown")
-  fi
-  PORCELAIN=$(git -C "$FOUND_PATH" status --porcelain 2>/dev/null || true)
-  IS_CLEAN="true"
-  if [ -n "$PORCELAIN" ]; then
-    IS_CLEAN="false"
-  fi
-  FOLDER_NAME=$(basename "$FOUND_PATH")
-
-  echo "STATUS=ALREADY_CLONED"
-  echo "LOCAL_PATH=$FOUND_PATH"
-  echo "LOCAL_FOLDER_NAME=$FOLDER_NAME"
-  echo "CANONICAL_SLUG=$TARGET_NORM"
-  echo "CURRENT_BRANCH=$BRANCH"
-  echo "IS_CLEAN=$IS_CLEAN"
-  exit 0
-fi
-
-if [ "$CHECK_ONLY" = true ]; then
-  echo "STATUS=NOT_CLONED"
-  echo "LOCAL_PATH="
-  echo "LOCAL_FOLDER_NAME="
-  echo "CANONICAL_SLUG=$TARGET_NORM"
-  exit 1
-fi
-
-# ------------------------------------------------------------------------------
-# Fallback: Fresh Clone
-# ------------------------------------------------------------------------------
-if [ -z "$DEST_DIR" ]; then
-  if [ -d "$HOME/projects" ]; then
-    DEST_DIR="$HOME/projects/$REPO_NAME"
-  else
-    DEST_DIR="$(dirname "$CURRENT_DIR")/$REPO_NAME"
-  fi
-fi
-
-echo "📥 Repository '$REPO_URL' not found locally under any folder name. Cloning into '$DEST_DIR'..." >&2
-mkdir -p "$(dirname "$DEST_DIR")"
-git clone "$REPO_URL" "$DEST_DIR" >&2
-
-FINAL_PATH="$(cd "$DEST_DIR" && pwd)"
-BRANCH=$(git -C "$FINAL_PATH" branch --show-current 2>/dev/null || true)
-if [ -z "$BRANCH" ]; then
-  BRANCH=$(git -C "$FINAL_PATH" rev-parse --short HEAD 2>/dev/null || echo "unknown")
-fi
-
-echo "STATUS=CLONED_FRESH"
-echo "LOCAL_PATH=$FINAL_PATH"
-echo "LOCAL_FOLDER_NAME=$(basename "$FINAL_PATH")"
-echo "CANONICAL_SLUG=$TARGET_NORM"
-echo "CURRENT_BRANCH=$BRANCH"
-echo "IS_CLEAN=true"
-exit 0