clawstrap 1.4.1 → 1.5.1

package/dist/index.cjs

@@ -88,6 +88,7 @@ __export(writers_exports, {
   appendToFutureConsiderations: () => appendToFutureConsiderations,
   appendToGotchaLog: () => appendToGotchaLog,
   appendToMemory: () => appendToMemory,
+  appendToOpenThreads: () => appendToOpenThreads,
   writeConventions: () => writeConventions
 });
 function formatEntry(source, text) {
@@ -97,11 +98,11 @@ function formatEntry(source, text) {
 ${text}`;
 }
 function appendToMemory(rootDir, entries, source) {
-  const memoryPath = import_node_path15.default.join(rootDir, ".claude", "memory", "MEMORY.md");
-  import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(memoryPath), { recursive: true });
+  const memoryPath = import_node_path9.default.join(rootDir, ".claude", "memory", "MEMORY.md");
+  import_node_fs8.default.mkdirSync(import_node_path9.default.dirname(memoryPath), { recursive: true });
   let existingContent = "";
-  if (import_node_fs14.default.existsSync(memoryPath)) {
-    existingContent = import_node_fs14.default.readFileSync(memoryPath, "utf-8");
+  if (import_node_fs8.default.existsSync(memoryPath)) {
+    existingContent = import_node_fs8.default.readFileSync(memoryPath, "utf-8");
   }
   const existingEntries = parseMemoryEntries(existingContent);
   const toAppend = [];
@@ -112,34 +113,48 @@ function appendToMemory(rootDir, entries, source) {
   }
   if (toAppend.length > 0) {
     const appendText = "\n" + toAppend.join("\n") + "\n";
-    import_node_fs14.default.appendFileSync(memoryPath, appendText, "utf-8");
+    import_node_fs8.default.appendFileSync(memoryPath, appendText, "utf-8");
   }
+  return toAppend.length;
 }
 function appendToGotchaLog(rootDir, entries) {
-  const logPath = import_node_path15.default.join(rootDir, ".claude", "gotcha-log.md");
-  import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(logPath), { recursive: true });
-  if (!import_node_fs14.default.existsSync(logPath)) {
-    import_node_fs14.default.writeFileSync(
+  const logPath = import_node_path9.default.join(rootDir, ".claude", "gotcha-log.md");
+  import_node_fs8.default.mkdirSync(import_node_path9.default.dirname(logPath), { recursive: true });
+  if (!import_node_fs8.default.existsSync(logPath)) {
+    import_node_fs8.default.writeFileSync(
       logPath,
       "# Gotcha Log\n\nIncident log \u2014 why rules exist.\n\n",
       "utf-8"
     );
   }
   const toAppend = entries.map((e) => formatEntry("session", e)).join("\n");
-  import_node_fs14.default.appendFileSync(logPath, "\n" + toAppend + "\n", "utf-8");
+  import_node_fs8.default.appendFileSync(logPath, "\n" + toAppend + "\n", "utf-8");
 }
 function appendToFutureConsiderations(rootDir, entries) {
-  const fcPath = import_node_path15.default.join(rootDir, ".claude", "future-considerations.md");
-  import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(fcPath), { recursive: true });
-  if (!import_node_fs14.default.existsSync(fcPath)) {
-    import_node_fs14.default.writeFileSync(
+  const fcPath = import_node_path9.default.join(rootDir, ".claude", "future-considerations.md");
+  import_node_fs8.default.mkdirSync(import_node_path9.default.dirname(fcPath), { recursive: true });
+  if (!import_node_fs8.default.existsSync(fcPath)) {
+    import_node_fs8.default.writeFileSync(
       fcPath,
       "# Future Considerations\n\nDeferred ideas and potential improvements.\n\n",
       "utf-8"
     );
   }
   const toAppend = entries.map((e) => formatEntry("session", e)).join("\n");
-  import_node_fs14.default.appendFileSync(fcPath, "\n" + toAppend + "\n", "utf-8");
+  import_node_fs8.default.appendFileSync(fcPath, "\n" + toAppend + "\n", "utf-8");
+}
+function appendToOpenThreads(rootDir, entries) {
+  const otPath = import_node_path9.default.join(rootDir, ".claude", "memory", "open-threads.md");
+  import_node_fs8.default.mkdirSync(import_node_path9.default.dirname(otPath), { recursive: true });
+  if (!import_node_fs8.default.existsSync(otPath)) {
+    import_node_fs8.default.writeFileSync(
+      otPath,
+      "# Open Threads\n\nUnresolved questions and next steps.\n\n",
+      "utf-8"
+    );
+  }
+  const toAppend = entries.map((e) => formatEntry("session", e)).join("\n");
+  import_node_fs8.default.appendFileSync(otPath, "\n" + toAppend + "\n", "utf-8");
 }
 function buildAutoBlock(sections) {
   const lines = [AUTO_START];
@@ -177,14 +192,19 @@ function buildAutoBlock(sections) {
   } else {
     lines.push("- No comment patterns detected.");
   }
+  if (sections.architecture && sections.architecture.length > 0) {
+    lines.push("");
+    lines.push("## Architecture & Design Patterns");
+    for (const item of sections.architecture) lines.push(`- ${item}`);
+  }
   lines.push(AUTO_END);
   return lines.join("\n");
 }
 function writeConventions(rootDir, sections) {
-  const conventionsPath = import_node_path15.default.join(rootDir, ".claude", "rules", "conventions.md");
-  import_node_fs14.default.mkdirSync(import_node_path15.default.dirname(conventionsPath), { recursive: true });
+  const conventionsPath = import_node_path9.default.join(rootDir, ".claude", "rules", "conventions.md");
+  import_node_fs8.default.mkdirSync(import_node_path9.default.dirname(conventionsPath), { recursive: true });
   const autoBlock = buildAutoBlock(sections);
-  if (!import_node_fs14.default.existsSync(conventionsPath)) {
+  if (!import_node_fs8.default.existsSync(conventionsPath)) {
     const content = [
       "# Conventions",
       "",
@@ -195,28 +215,28 @@ function writeConventions(rootDir, sections) {
       "<!-- Add manual conventions below this line -->",
       ""
     ].join("\n");
-    import_node_fs14.default.writeFileSync(conventionsPath, content, "utf-8");
+    import_node_fs8.default.writeFileSync(conventionsPath, content, "utf-8");
     return;
   }
-  const existing = import_node_fs14.default.readFileSync(conventionsPath, "utf-8");
+  const existing = import_node_fs8.default.readFileSync(conventionsPath, "utf-8");
   const startIdx = existing.indexOf(AUTO_START);
   const endIdx = existing.indexOf(AUTO_END);
   if (startIdx === -1 || endIdx === -1) {
     const updated = existing.trimEnd() + "\n\n" + autoBlock + "\n";
-    import_node_fs14.default.writeFileSync(conventionsPath, updated, "utf-8");
+    import_node_fs8.default.writeFileSync(conventionsPath, updated, "utf-8");
   } else {
     const before = existing.slice(0, startIdx);
     const after = existing.slice(endIdx + AUTO_END.length);
     const updated = before + autoBlock + after;
-    import_node_fs14.default.writeFileSync(conventionsPath, updated, "utf-8");
+    import_node_fs8.default.writeFileSync(conventionsPath, updated, "utf-8");
   }
 }
-var import_node_fs14, import_node_path15, AUTO_START, AUTO_END;
+var import_node_fs8, import_node_path9, AUTO_START, AUTO_END;
 var init_writers = __esm({
   "src/watch/writers.ts"() {
     "use strict";
-    import_node_fs14 = __toESM(require("fs"), 1);
-    import_node_path15 = __toESM(require("path"), 1);
+    import_node_fs8 = __toESM(require("fs"), 1);
+    import_node_path9 = __toESM(require("path"), 1);
     init_dedup();
     AUTO_START = "<!-- CLAWSTRAP:AUTO -->";
     AUTO_END = "<!-- CLAWSTRAP:END -->";
@@ -263,12 +283,20 @@ var ClawstrapConfigSchema = import_zod.z.object({
     scan: import_zod.z.object({
       intervalDays: import_zod.z.number().default(7)
     }).default({}),
+    git: import_zod.z.object({
+      pollIntervalMinutes: import_zod.z.number().default(5)
+    }).default({}),
+    synthesis: import_zod.z.object({
+      enabled: import_zod.z.boolean().default(false),
+      triggerEveryN: import_zod.z.number().default(10)
+    }).default({}),
     silent: import_zod.z.boolean().default(false)
   }).optional(),
   watchState: import_zod.z.object({
     lastGitCommit: import_zod.z.string().optional(),
     lastScanAt: import_zod.z.string().optional(),
-    lastTranscriptAt: import_zod.z.string().optional()
+    lastTranscriptAt: import_zod.z.string().optional(),
+    entriesSinceLastSynthesis: import_zod.z.coerce.number().optional()
   }).optional(),
   lastExport: LastExportSchema
 });
@@ -445,7 +473,7 @@ var OUTPUT_MANIFEST = [
 var EMPTY_DIRS = ["tmp", "research", "context", "artifacts"];
 
 // src/templates/governance-file.md.tmpl
-var governance_file_md_default = "# {%governanceFile%} \u2014 Master Governance Rules\n> **Workspace**: {%workspaceName%} | **Generated**: {%generatedDate%} | **Status**: active\n> Loaded every session. Keep lean. Move details to skills or rules files.\n\n---\n\n## Workflow Rules\n\n**Approval-first, always.**\nPlan work and get explicit approval before executing. No speculative actions.\nIf scope changes mid-task, pause and re-confirm.\n\n**If it's not on disk, it didn't happen.**\nSave findings immediately, not at session end. Flush {%flushCadence%}.\nWrite corrections to durable locations before applying them.\n{%#if hasSubagents%}Subagents return file paths, not raw data.{%/if%}\n\n**Quality > context cleanliness > speed > token cost.**\nQuality failures require full rework (100% waste). Never trade quality for tokens.\n{%#if isResearch%}\n**Research-specific:**\n- Cite sources for every claim \u2014 no unsourced assertions\n- Write findings to file immediately, not at session end\n- Separate facts from interpretation in all output\n{%/if%}\n{%#if isContent%}\n**Content-specific:**\n- Every piece of content follows the draft \u2192 review \u2192 approve cycle\n- Never publish or finalize without explicit approval\n- Track all revision feedback in a dedicated file\n{%/if%}\n{%#if isDataProcessing%}\n**Data processing-specific:**\n- Define batch size before starting \u2014 never process unbounded sets\n- Validate schema on every write\n- Log every transformation step for auditability\n{%/if%}\n\n---\n\n## Persistence Hierarchy\n\nFrom most ephemeral to most durable:\n\n| Layer | Location | Loaded When |\n|-------|----------|-------------|\n| Conversation | (in-context) | Always \u2014 volatile |\n| Temp files | `tmp/` | Per-task, gitignored |\n{%#if sessionHandoff%}| Memory | `{%systemDir%}/memory/` | On demand |\n{%/if%}| Skills | `{%systemDir%}/skills/*/SKILL.md` | When triggered |\n| Rules | `{%systemDir%}/rules/*.md` | Every session |\n| **{%governanceFile%}** | `./{%governanceFile%}` | **Every session** |\n\n---\n\n## Context Discipline\n\n- Flush working state to file {%flushCadence%}\n{%#if hasSubagents%}- Subagents write output to `tmp/{task}/{name}.json`; return one-line receipt\n- Main session reads subagent files ONLY if needed for the next step\n- Never hold raw batch results in conversation \u2014 write to disk first\n{%/if%}- Before batch work: write execution plan to file (survives context loss)\n\n---\n{%#if sessionHandoff%}\n## Session Handoff Checklist\n\nRun this at every session end (mandatory, not optional):\n\n1. Save all work to SSOT files\n2. Sync derived files (rebuild from SSOTs)\n3. SSOT integrity check (no duplicates, no stale data)\n4. Update progress tracker\n5. Write next-session plan (with pre-execution hooks listed)\n6. Launch QC on work done this session\n\n---\n{%/if%}\n\n## Security Rules\n\n- Never read `.env` files or echo credentials\n- Never install third-party MCP servers/plugins without explicit approval\n- Never write outside this workspace root \u2014 use project-local `tmp/`, not system `/tmp/`\n- Approved tools only \u2014 ask before using new tools/APIs\n\n---\n\n## Quality Rules\n{%#if isProductionQuality%}\n- QC is a structural gate, not an optional post-step\n- Run spot-checks after every 5 items in batch work (Ralph Loop)\n- Combined agents (extract + classify) beat split agents on quality\n- Disagreements between agents reveal ambiguity \u2014 escalate, don't suppress\n{%/if%}\n{%#if hasQualityGates%}\n{%#unless isProductionQuality%}- QC is a structural gate, not an optional post-step\n- Run QC checkpoints at regular intervals during batch work\n- All results must be reviewed before being marked complete\n{%/unless%}\n{%/if%}\n{%#unless hasQualityGates%}- Run a quick check before finishing any task\n- Review outputs before marking work complete\n{%/unless%}\n\n---\n\n## Pointers to Other Layers\n\n- Rules: `{%systemDir%}/rules/` \u2014 domain-specific rules loaded every session\n- Skills: `{%systemDir%}/skills/SKILL_REGISTRY.md` \u2014 index of all skills\n{%#if hasSubagents%}- Agents: `{%systemDir%}/agents/` \u2014 subagent definitions with governance baked in\n{%/if%}- Gotchas: `{%systemDir%}/gotcha-log.md` \u2014 incident log (why rules exist)\n- Future: `{%systemDir%}/future-considerations.md` \u2014 deferred ideas\n{%#if sddEnabled%}\n---\n\n## Spec-Driven Development\n\nThis workspace uses SDD. Before implementing any feature:\n\n1. Write a spec \u2192 `specs/{name}.md` (use `/spec` or copy `specs/_template.md`)\n2. Get explicit user approval\n3. Implement from the approved spec \u2014 not from the conversation\n\nRule details: `{%systemDir%}/rules/sdd.md`\n{%/if%}\n";
+var governance_file_md_default = "# {%governanceFile%} \u2014 Master Governance Rules\n> **Workspace**: {%workspaceName%} | **Generated**: {%generatedDate%} | **Status**: active\n> Loaded every session. Keep lean. Move details to skills or rules files.\n\n---\n\n## Workflow Rules\n\n**Approval-first, always.**\nPlan work and get explicit approval before executing. No speculative actions.\nIf scope changes mid-task, pause and re-confirm.\n\n**If it's not on disk, it didn't happen.**\nSave findings immediately, not at session end. Flush {%flushCadence%}.\nWrite corrections to durable locations before applying them.\n{%#if hasSubagents%}Subagents return file paths, not raw data.{%/if%}\n\n**Quality > context cleanliness > speed > token cost.**\nQuality failures require full rework (100% waste). Never trade quality for tokens.\n{%#if isResearch%}\n**Research-specific:**\n- Cite sources for every claim \u2014 no unsourced assertions\n- Write findings to file immediately, not at session end\n- Separate facts from interpretation in all output\n{%/if%}\n{%#if isContent%}\n**Content-specific:**\n- Every piece of content follows the draft \u2192 review \u2192 approve cycle\n- Never publish or finalize without explicit approval\n- Track all revision feedback in a dedicated file\n{%/if%}\n{%#if isDataProcessing%}\n**Data processing-specific:**\n- Define batch size before starting \u2014 never process unbounded sets\n- Validate schema on every write\n- Log every transformation step for auditability\n{%/if%}\n\n---\n\n## Persistence Hierarchy\n\nFrom most ephemeral to most durable:\n\n| Layer | Location | Loaded When |\n|-------|----------|-------------|\n| Conversation | (in-context) | Always \u2014 volatile |\n| Temp files | `tmp/` | Per-task, gitignored |\n{%#if sessionHandoff%}| Memory | `{%systemDir%}/memory/` | On demand |\n{%/if%}| Skills | `{%systemDir%}/skills/*/SKILL.md` | When triggered |\n| Rules | `{%systemDir%}/rules/*.md` | Every session |\n| **{%governanceFile%}** | `./{%governanceFile%}` | **Every session** |\n\n---\n\n## Directory Map\n\n| Directory | Purpose | When Claude writes here |\n|-----------|---------|------------------------|\n| `artifacts/` | Architecture docs, ADRs, system overviews | After major design decisions; `artifacts/architecture.md` is the living system doc |\n| `context/` | Execution plans and session checkpoints | Before batch work \u2192 `context/plan-{date}-{task}.md`; every 5 ops \u2192 `context/checkpoint-{date}-{task}.md`; wrap-up \u2192 `context/next-session.md` |\n{%#if sessionHandoff%}| `projects/` | Active sub-projects (copy `projects/_template/`) | When a feature track needs its own `process.md` |\n{%/if%}| `research/` | Reference material from external sources | When reading specs, docs, or papers worth keeping |\n| `tmp/` | Subagent output, session summaries (gitignored) | Summaries \u2192 `tmp/sessions/YYYY-MM-DD-HHmm.md`; subagent output \u2192 `tmp/{task}/` |\n| `{%systemDir%}/memory/` | LLM-processed governance (fed by watch daemon) | Do not write directly \u2014 watch daemon only |\n\n---\n\n## Context Discipline\n\n- Flush working state to file {%flushCadence%}\n{%#if hasSubagents%}- Subagents write output to `tmp/{task}/{name}.json`; return one-line receipt\n- Main session reads subagent files ONLY if needed for the next step\n- Never hold raw batch results in conversation \u2014 write to disk first\n{%/if%}- Before batch work: write execution plan to `context/plan-{date}-{task}.md` (survives context loss)\n\n---\n{%#if sessionHandoff%}\n## Session Handoff Checklist\n\nRun this at every session end (mandatory, not optional):\n\n1. Save all work to SSOT files\n2. Sync derived files (rebuild from SSOTs)\n3. SSOT integrity check (no duplicates, no stale data)\n4. Update progress tracker \u2192 `context/progress-{date}.md`\n5. Write next-session plan \u2192 `context/next-session.md`\n6. Launch QC on work done this session \u2192 write results to `context/qc-{date}.md`\n\n---\n{%/if%}\n\n## Security Rules\n\n- Never read `.env` files or echo credentials\n- Never install third-party MCP servers/plugins without explicit approval\n- Never write outside this workspace root \u2014 use project-local `tmp/`, not system `/tmp/`\n- Approved tools only \u2014 ask before using new tools/APIs\n\n---\n\n## Quality Rules\n{%#if isProductionQuality%}\n- QC is a structural gate, not an optional post-step\n- Run spot-checks after every 5 items in batch work (Ralph Loop)\n- Combined agents (extract + classify) beat split agents on quality\n- Disagreements between agents reveal ambiguity \u2014 escalate, don't suppress\n{%/if%}\n{%#if hasQualityGates%}\n{%#unless isProductionQuality%}- QC is a structural gate, not an optional post-step\n- Run QC checkpoints at regular intervals during batch work\n- All results must be reviewed before being marked complete\n{%/unless%}\n{%/if%}\n{%#unless hasQualityGates%}- Run a quick check before finishing any task\n- Review outputs before marking work complete\n{%/unless%}\n\n---\n\n## Pointers to Other Layers\n\n- Rules: `{%systemDir%}/rules/` \u2014 domain-specific rules loaded every session\n- Skills: `{%systemDir%}/skills/SKILL_REGISTRY.md` \u2014 index of all skills\n{%#if hasSubagents%}- Agents: `{%systemDir%}/agents/` \u2014 subagent definitions with governance baked in\n{%/if%}- Gotchas: `{%systemDir%}/gotcha-log.md` \u2014 incident log (why rules exist)\n- Future: `{%systemDir%}/future-considerations.md` \u2014 deferred ideas\n{%#if sddEnabled%}\n---\n\n## Spec-Driven Development\n\nThis workspace uses SDD. Before implementing any feature:\n\n1. Write a spec \u2192 `specs/{name}.md` (use `/spec` or copy `specs/_template.md`)\n2. Get explicit user approval\n3. Implement from the approved spec \u2014 not from the conversation\n\nRule details: `{%systemDir%}/rules/sdd.md`\n{%/if%}\n";
 
 // src/templates/getting-started.md.tmpl
 var getting_started_md_default = "# Getting Started \u2014 {%workspaceName%}\n> Generated by Clawstrap v{%clawstrapVersion%} on {%generatedDate%}\n\nWelcome to your AI agent workspace. This workspace is configured for\n**{%workloadLabel%}** workflows.\n\n---\n\n## Quick Start\n\n1. **Read `{%governanceFile%}`** \u2014 this is your master governance file. It loads\n   automatically every session and defines the rules your AI assistant follows.\n\n2. **Check `{%systemDir%}/rules/`** \u2014 these rule files also load every session.\n   They contain detailed procedures for context discipline, approval workflows,\n   and quality gates.\n\n3. **Start working** \u2014 open a Claude Code session in this directory. The\n   governance files will load automatically.\n\n---\n\n## What's in This Workspace\n\n```\n{%governanceFile%}                    \u2190 Master governance (always loaded)\nGETTING_STARTED.md               \u2190 You are here\n.clawstrap.json                  \u2190 Your workspace configuration\n\n{%systemDir%}/\n  rules/                         \u2190 Auto-loaded rules (every session)\n  skills/                        \u2190 Skill definitions (loaded when triggered)\n{%#if hasSubagents%}  agents/                        \u2190 Agent definitions\n{%/if%}  gotcha-log.md                  \u2190 Incident log\n  future-considerations.md       \u2190 Deferred ideas\n{%#if sessionHandoff%}  memory/                        \u2190 Persistent memory across sessions\n{%/if%}\nprojects/\n  _template/                     \u2190 Template for new projects\n\ntmp/                             \u2190 Temporary files (gitignored)\nresearch/                        \u2190 Reference material\ncontext/                         \u2190 Session checkpoints\nartifacts/                       \u2190 Durable output\n{%#if sddEnabled%}specs/\n  _template.md                   \u2190 Spec template (copy for each feature)\n{%/if%}```\n\n---\n\n## Key Principles\n\nThis workspace enforces five principles:\n\n1. **If it's not on disk, it didn't happen.** Context windows compress. Sessions\n   end. The only thing that persists is files. Flush work {%flushCadence%}.\n\n2. **Approval-first, always.** Plan work, get approval, then execute. No\n   speculative actions.\n\n3. **Quality is a structural gate.** Quality checks happen during work, not after.\n{%#if hasQualityGates%}   See `{%systemDir%}/rules/quality-gates.md` for the full procedure.{%/if%}\n\n4. **Disagreements reveal ambiguity.** When agents disagree, the rules are\n   ambiguous. Escalate and clarify \u2014 don't suppress.\n\n5. **One decision at a time.** Binary decisions made sequentially compound into\n   reliable outcomes.\n{%#if hasSubagents%}\n\n---\n\n## Working with Multiple Agents\n\nYour workspace is configured for multi-agent workflows. Key rules:\n\n- **Subagents write to `tmp/`** \u2014 they return file paths and one-line summaries,\n  never raw data in conversation.\n- **The main session is an orchestrator** \u2014 it tracks progress, launches agents,\n  and checks output files. It does not hold subagent data in memory.\n- **Agent definitions live in `{%systemDir%}/agents/`** \u2014 each file becomes the\n  system prompt for a subagent. Governance is baked into the definition.\n{%/if%}\n{%#if sessionHandoff%}\n\n---\n\n## Session Handoff\n\nThis workspace uses session handoff checklists. At the end of every session:\n\n1. Save all work to SSOT files\n2. Sync derived files\n3. Check SSOT integrity\n4. Update progress tracker\n5. Write next-session plan\n6. Run QC on session work\n\nThis ensures no context is lost between sessions.\n{%/if%}\n{%#if isResearch%}\n\n---\n\n## Research Tips\n\n- Write findings to disk immediately \u2014 don't accumulate in conversation\n- Cite sources for every claim\n- Separate facts from interpretation\n- Use `research/` for reference material, `artifacts/` for synthesis output\n{%/if%}\n{%#if isContent%}\n\n---\n\n## Content Workflow Tips\n\n- Every piece follows: draft \u2192 review \u2192 approve\n- Track revision feedback in dedicated files\n- Never finalize without explicit approval\n- Use `artifacts/` for final deliverables\n{%/if%}\n{%#if isDataProcessing%}\n\n---\n\n## Data Processing Tips\n\n- Define batch size before starting any processing run\n- Validate schema on every write\n- Checkpoint every 5 batch items\n- Log all transformations for auditability\n{%/if%}\n\n---\n\n{%#if sddEnabled%}\n\n---\n\n## Spec-Driven Development\n\nThis workspace enforces a spec-first workflow. Before any implementation:\n\n1. **Type `/spec`** to start a new spec interactively \u2014 Claude will guide you\n2. Or copy `specs/_template.md` manually, fill it in, and get approval\n3. Only implement after the spec is approved\n\nYour specs live in `specs/`. Each approved spec is the contract between you and\nClaude \u2014 implementation follows the spec, not the conversation.\n\nSee `{%systemDir%}/rules/sdd.md` for the full rules and exemptions.\n{%/if%}\n\n---\n\n*This workspace was generated by [Clawstrap](https://github.com/clawstrap/clawstrap).\nEdit any file to fit your needs \u2014 there's no lock-in.*\n";
@@ -454,7 +482,7 @@ var getting_started_md_default = "# Getting Started \u2014 {%workspaceName%}\n>
 var gitignore_default = "# Dependencies\nnode_modules/\n\n# Temporary files (subagent output, session data)\ntmp/\n\n# Secrets\n.env\n.env.*\ncredentials.json\n*.pem\n*.key\n\n# OS\n.DS_Store\nThumbs.db\n\n# Editor\n*.swp\n*.swo\n*~\n.clawstrap.watch.pid\ntmp/sessions/\n";
 
 // src/templates/rules/context-discipline.md.tmpl
-var context_discipline_md_default = "# Rule: Context Discipline\n> **Scope**: All sessions | **Generated**: {%generatedDate%}\n\n## Flush Cadence\n\nFlush working state to file {%flushCadence%}:\n- Write current state to a context checkpoint file\n- Include: what's done, what's next, accumulated results\n- Path: `context/checkpoint-{date}-{task}.md`\n{%#if hasSubagents%}\n\n## Subagent Output Rules\n\nSubagents MUST:\n1. Write all output to `tmp/{task}/{name}.json` (or `.md`)\n2. Return a one-line receipt: `\"Done. N items. File: {path}. Summary: {1 line}.\"`\n3. NOT dump raw results into the conversation\n\nMain session MUST:\n- Only read the subagent file if needed for the NEXT step\n- Never hold subagent output in conversation memory\n\n## Thin Orchestrator Principle\n\nDuring batch work, the main session is an orchestrator only:\n\n**DO**:\n- Track queue / done / next\n- Launch agents with correct prompts\n- Check output files for completeness\n- Update SSOT data files\n- Run QC gates\n\n**DO NOT**:\n- Read raw extraction data into main context\n- Classify results (agents do that)\n- Hold full subagent output in conversation\n{%/if%}\n\n## Before Batch Work\n\nAlways write an execution plan to `tmp/{task}/plan.md` before starting.\nThis file must survive context loss and be readable by any future session.\n\n## On User Correction\n\n1. FIRST write the correction to its durable home (memory/rule/skill file)\n2. THEN apply the correction to current work\n\nThis ensures the learning persists even if the session ends unexpectedly.\n";
+var context_discipline_md_default = "# Rule: Context Discipline\n> **Scope**: All sessions | **Generated**: {%generatedDate%}\n\n## Flush Cadence\n\nFlush working state to file {%flushCadence%}:\n- Write current state to a context checkpoint file\n- Include: what's done, what's next, accumulated results\n- Path: `context/checkpoint-{date}-{task}.md`\n{%#if hasSubagents%}\n\n## Subagent Output Rules\n\nSubagents MUST:\n1. Write all output to `tmp/{task}/{name}.json` (or `.md`)\n2. Return a one-line receipt: `\"Done. N items. File: {path}. Summary: {1 line}.\"`\n3. NOT dump raw results into the conversation\n\nMain session MUST:\n- Only read the subagent file if needed for the NEXT step\n- Never hold subagent output in conversation memory\n\n## Thin Orchestrator Principle\n\nDuring batch work, the main session is an orchestrator only:\n\n**DO**:\n- Track queue / done / next\n- Launch agents with correct prompts\n- Check output files for completeness\n- Update SSOT data files\n- Run QC gates\n\n**DO NOT**:\n- Read raw extraction data into main context\n- Classify results (agents do that)\n- Hold full subagent output in conversation\n{%/if%}\n\n## Before Batch Work\n\nAlways write an execution plan before starting batch work:\n- Path: `context/plan-{YYYY-MM-DD}-{task-slug}.md`\n- This file must survive context loss and be readable by any future session.\n\nSubagent output goes to `tmp/{task}/` \u2014 not `context/`.\n\n## Session Handoff\n\nNext-session plan goes to `context/next-session.md` (overwrite each time).\nQC results go to `context/qc-{YYYY-MM-DD}.md`.\n\n## On User Correction\n\n1. FIRST write the correction to its durable home (memory/rule/skill file)\n2. THEN apply the correction to current work\n\nThis ensures the learning persists even if the session ends unexpectedly.\n";
 
 // src/templates/rules/approval-first.md.tmpl
 var approval_first_md_default = `# Rule: Approval-First Workflow
@@ -777,7 +805,7 @@ async function init(directory, options) {
     import_node_fs2.default.mkdirSync(targetDir, { recursive: true });
   }
   const config = ClawstrapConfigSchema.parse({
-    version: "1.4.1",
+    version: "1.5.1",
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     workspaceName: answers.workspaceName,
     targetDirectory: directory,
@@ -990,8 +1018,8 @@ Error: project "${name}" already exists at projects/${name}/
 }
 
 // src/status.ts
-var import_node_fs8 = __toESM(require("fs"), 1);
-var import_node_path9 = __toESM(require("path"), 1);
+var import_node_fs10 = __toESM(require("fs"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 
 // src/watch/pid.ts
 var import_node_fs7 = __toESM(require("fs"), 1);
@@ -1026,6 +1054,169 @@ function isDaemonRunning(rootDir) {
   }
 }
 
+// src/watch/promote.ts
+var import_node_fs9 = __toESM(require("fs"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
+init_dedup();
+init_writers();
+
+// src/watch/stopwords.ts
+var STOPWORDS = new Set(
+  "a an the is are was were be been being have has had do does did will would could should may might must can this that these those i we you he she it they of in on at to for with from by about".split(" ")
+);
+
+// src/watch/promote.ts
+var SIMILARITY_THRESHOLD = 0.65;
+var MIN_GROUP_SIZE = 3;
+function tokenize2(text) {
+  return new Set(
+    text.split(/\s+/).map((w) => w.replace(/[^a-z0-9]/gi, "").toLowerCase()).filter((w) => w.length > 1 && !STOPWORDS.has(w))
+  );
+}
+function jaccard2(a, b) {
+  const setA = tokenize2(a);
+  const setB = tokenize2(b);
+  if (setA.size === 0 && setB.size === 0) return 1;
+  if (setA.size === 0 || setB.size === 0) return 0;
+  let intersection = 0;
+  for (const t of setA) {
+    if (setB.has(t)) intersection++;
+  }
+  return intersection / (setA.size + setB.size - intersection);
+}
+function groupSimilar(entries) {
+  const groups = [];
+  for (const entry of entries) {
+    let placed = false;
+    for (const group of groups) {
+      if (group.some((member) => jaccard2(entry, member) >= SIMILARITY_THRESHOLD)) {
+        group.push(entry);
+        placed = true;
+        break;
+      }
+    }
+    if (!placed) groups.push([entry]);
+  }
+  return groups.filter((g) => g.length >= MIN_GROUP_SIZE);
+}
+function deriveSlug(entries) {
+  const freq = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    for (const token of tokenize2(entry)) {
+      freq.set(token, (freq.get(token) ?? 0) + 1);
+    }
+  }
+  const top = [...freq.entries()].sort((a, b) => b[1] - a[1]).slice(0, 3).map(([t]) => t);
+  return top.join("-") || "correction";
+}
+function parseRuleResponse(response) {
+  const titleMatch = response.match(/^TITLE:\s*(.+)$/m);
+  const principleMatch = response.match(/^PRINCIPLE:\s*(.+)$/m);
+  const imperativesMatch = response.match(/^IMPERATIVES:\s*\n((?:\s*-\s*.+\n?)+)/m);
+  if (!titleMatch || !principleMatch || !imperativesMatch) return null;
+  const imperatives = imperativesMatch[1].split("\n").map((l) => l.replace(/^\s*-\s*/, "").trim()).filter(Boolean);
+  if (imperatives.length === 0) return null;
+  return {
+    title: titleMatch[1].trim(),
+    principle: principleMatch[1].trim(),
+    imperatives
+  };
+}
+function writeRuleFile(rulesDir, slug, data) {
+  import_node_fs9.default.mkdirSync(rulesDir, { recursive: true });
+  const imperativeLines = data.imperatives.map((i) => `- ${i}`).join("\n");
+  const content = `---
+status: pending-review
+generated: ${(/* @__PURE__ */ new Date()).toISOString()}
+source: auto-promoted from gotcha-log
+---
+
+# ${data.title}
+
+${data.principle}
+
+## Imperatives
+
+${imperativeLines}
+`;
+  import_node_fs9.default.writeFileSync(import_node_path10.default.join(rulesDir, `${slug}-auto.md`), content, "utf-8");
+}
+async function checkAndPromoteCorrections(rootDir, adapter, ui) {
+  const logPath = import_node_path10.default.join(rootDir, ".claude", "gotcha-log.md");
+  if (!import_node_fs9.default.existsSync(logPath)) return;
+  let content;
+  try {
+    content = import_node_fs9.default.readFileSync(logPath, "utf-8");
+  } catch {
+    return;
+  }
+  const entries = parseMemoryEntries(content);
+  if (entries.length < MIN_GROUP_SIZE) return;
+  const promotableGroups = groupSimilar(entries);
+  if (promotableGroups.length === 0) return;
+  const rulesDir = import_node_path10.default.join(rootDir, ".claude", "rules");
+  let written = 0;
+  for (const group of promotableGroups) {
+    const slug = deriveSlug(group);
+    const ruleFile = import_node_path10.default.join(rulesDir, `${slug}-auto.md`);
+    if (import_node_fs9.default.existsSync(ruleFile)) continue;
+    ui.promoteStart();
+    const prompt = `You are analysing a set of recurring corrections from an AI coding session log.
+
+Corrections:
+${group.map((e, i) => `${i + 1}. ${e}`).join("\n")}
+
+Synthesise these into a governance rule. Respond in this exact format:
+
+TITLE: (short rule name, 2\u20135 words)
+PRINCIPLE: (one sentence \u2014 the core principle this rule enforces)
+IMPERATIVES:
+- (specific imperative 1)
+- (specific imperative 2)
+- (specific imperative 3)
+
+Output only the structured response \u2014 no explanation, no markdown fences.`;
+    let response;
+    try {
+      response = await adapter.complete(prompt);
+    } catch {
+      ui.promoteDone(0);
+      continue;
+    }
+    const data = parseRuleResponse(response);
+    if (!data) {
+      ui.promoteDone(0);
+      continue;
+    }
+    try {
+      writeRuleFile(rulesDir, slug, data);
+      appendToMemory(rootDir, [`Auto-promoted correction group to rule: ${slug}-auto.md \u2014 "${data.title}"`], "promote");
+      written++;
+      ui.promoteDone(1);
+    } catch {
+      ui.promoteDone(0);
+    }
+  }
+  void written;
+}
+function listPendingRules(rootDir) {
+  const rulesDir = import_node_path10.default.join(rootDir, ".claude", "rules");
+  if (!import_node_fs9.default.existsSync(rulesDir)) return [];
+  const results = [];
+  for (const entry of import_node_fs9.default.readdirSync(rulesDir)) {
+    if (!entry.endsWith("-auto.md")) continue;
+    try {
+      const content = import_node_fs9.default.readFileSync(import_node_path10.default.join(rulesDir, entry), "utf-8");
+      if (!content.includes("status: pending-review")) continue;
+      const headingMatch = content.match(/^#\s+(.+)$/m);
+      const title = headingMatch ? headingMatch[1].trim() : "(no title)";
+      results.push({ file: entry, title });
+    } catch {
+    }
+  }
+  return results;
+}
+
 // src/status.ts
 var WORKLOAD_LABELS3 = {
   research: "Research & Analysis",
@@ -1034,27 +1225,29 @@ var WORKLOAD_LABELS3 = {
   custom: "General Purpose"
 };
 function countEntries(dir, exclude = []) {
-  if (!import_node_fs8.default.existsSync(dir)) return 0;
-  return import_node_fs8.default.readdirSync(dir, { withFileTypes: true }).filter((e) => !exclude.includes(e.name) && !e.name.startsWith(".")).length;
+  if (!import_node_fs10.default.existsSync(dir)) return 0;
+  return import_node_fs10.default.readdirSync(dir, { withFileTypes: true }).filter((e) => !exclude.includes(e.name) && !e.name.startsWith(".")).length;
 }
 function countSkills(skillsDir) {
-  if (!import_node_fs8.default.existsSync(skillsDir)) return 0;
-  return import_node_fs8.default.readdirSync(skillsDir, { withFileTypes: true }).filter(
-    (e) => e.isDirectory() && import_node_fs8.default.existsSync(import_node_path9.default.join(skillsDir, e.name, "SKILL.md"))
+  if (!import_node_fs10.default.existsSync(skillsDir)) return 0;
+  return import_node_fs10.default.readdirSync(skillsDir, { withFileTypes: true }).filter(
+    (e) => e.isDirectory() && import_node_fs10.default.existsSync(import_node_path11.default.join(skillsDir, e.name, "SKILL.md"))
   ).length;
 }
 async function showStatus() {
   const { config, vars, rootDir } = loadWorkspace();
   const systemDir = String(vars.systemDir);
-  const agentsDir = import_node_path9.default.join(rootDir, systemDir, "agents");
-  const skillsDir = import_node_path9.default.join(rootDir, systemDir, "skills");
-  const rulesDir = import_node_path9.default.join(rootDir, systemDir, "rules");
-  const projectsDir = import_node_path9.default.join(rootDir, "projects");
+  const agentsDir = import_node_path11.default.join(rootDir, systemDir, "agents");
+  const skillsDir = import_node_path11.default.join(rootDir, systemDir, "skills");
+  const rulesDir = import_node_path11.default.join(rootDir, systemDir, "rules");
+  const projectsDir = import_node_path11.default.join(rootDir, "projects");
   const agentCount = countEntries(agentsDir, ["_template.md"]);
   const skillCount = countSkills(skillsDir);
   const projectCount = countEntries(projectsDir, ["_template"]);
   const ruleCount = countEntries(rulesDir);
   const date = config.createdAt.split("T")[0];
+  const pendingRulesList = listPendingRules(rootDir);
+  const pendingRules = pendingRulesList.length;
   console.log(`
 Clawstrap Workspace: ${config.workspaceName}`);
   console.log(`Created: ${date} | Version: ${config.version}`);
@@ -1075,6 +1268,12 @@ Structure:`);
   console.log(`  Skills:   ${skillCount} (${systemDir}/skills/)`);
   console.log(`  Projects: ${projectCount} (projects/)`);
   console.log(`  Rules:    ${ruleCount} (${systemDir}/rules/)`);
+  if (pendingRules > 0) {
+    console.log(`  Pending rules: ${pendingRules}  (.claude/rules/ \u2014 review *-auto.md files)`);
+    for (const rule of pendingRulesList) {
+      console.log(`    \xB7 ${rule.file.padEnd(30)}  "${rule.title}"`);
+    }
+  }
   if (config.lastExport) {
     const exportDate = config.lastExport.exportedAt.split("T")[0];
     console.log(`
@@ -1103,28 +1302,28 @@ Watch:`);
 }
 
 // src/export-paperclip.ts
-var import_node_fs13 = __toESM(require("fs"), 1);
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_fs15 = __toESM(require("fs"), 1);
+var import_node_path16 = __toESM(require("path"), 1);
 var import_prompts7 = require("@inquirer/prompts");
 
 // src/export-paperclip/translate-agents.ts
-var import_node_fs9 = __toESM(require("fs"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 function slugToName(slug) {
   return slug.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
 }
 function translateAgents(rootDir, systemDir, workspaceName, skillSlugs) {
-  const agentsDir = import_node_path10.default.join(rootDir, systemDir, "agents");
+  const agentsDir = import_node_path12.default.join(rootDir, systemDir, "agents");
   const agents = [];
   const workerNames = [];
   const workerAgents = [];
-  if (import_node_fs9.default.existsSync(agentsDir)) {
-    for (const entry of import_node_fs9.default.readdirSync(agentsDir)) {
+  if (import_node_fs11.default.existsSync(agentsDir)) {
+    for (const entry of import_node_fs11.default.readdirSync(agentsDir)) {
       if (entry === "primary-agent.md" || entry === "_template.md" || entry.startsWith(".") || !entry.endsWith(".md")) {
         continue;
       }
       const slug = entry.replace(/\.md$/, "");
-      const rawBody = import_node_fs9.default.readFileSync(import_node_path10.default.join(agentsDir, entry), "utf-8");
+      const rawBody = import_node_fs11.default.readFileSync(import_node_path12.default.join(agentsDir, entry), "utf-8");
       const roleMatch = rawBody.match(/^>\s*\*\*Purpose\*\*:\s*(.+)/m);
       const description = roleMatch ? roleMatch[1].trim() : "";
       const name = slugToName(slug);
@@ -1234,8 +1433,8 @@ When your work is complete, hand off to the **CEO** for review routing. If a rev
 }
 
 // src/export-paperclip/translate-governance.ts
-var import_node_fs10 = __toESM(require("fs"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 var GOVERNANCE_TIERS = {
   solo: {
     tier: "light",
@@ -1269,39 +1468,39 @@ function getGovernanceConfig(qualityLevel) {
 }
 
 // src/export-paperclip/translate-skills.ts
-var import_node_fs11 = __toESM(require("fs"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_fs13 = __toESM(require("fs"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 function translateSkills(rootDir, systemDir) {
-  const skillsDir = import_node_path12.default.join(rootDir, systemDir, "skills");
+  const skillsDir = import_node_path14.default.join(rootDir, systemDir, "skills");
   const skills = [];
-  if (!import_node_fs11.default.existsSync(skillsDir)) return skills;
-  for (const entry of import_node_fs11.default.readdirSync(skillsDir, { withFileTypes: true })) {
+  if (!import_node_fs13.default.existsSync(skillsDir)) return skills;
+  for (const entry of import_node_fs13.default.readdirSync(skillsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const skillMdPath = import_node_path12.default.join(skillsDir, entry.name, "SKILL.md");
-    if (!import_node_fs11.default.existsSync(skillMdPath)) continue;
+    const skillMdPath = import_node_path14.default.join(skillsDir, entry.name, "SKILL.md");
+    if (!import_node_fs13.default.existsSync(skillMdPath)) continue;
     skills.push({
       name: entry.name,
       sourcePath: `${systemDir}/skills/${entry.name}/SKILL.md`,
-      content: import_node_fs11.default.readFileSync(skillMdPath, "utf-8")
+      content: import_node_fs13.default.readFileSync(skillMdPath, "utf-8")
     });
   }
   return skills;
 }
 
 // src/export-paperclip/translate-goals.ts
-var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_fs14 = __toESM(require("fs"), 1);
+var import_node_path15 = __toESM(require("path"), 1);
 function translateGoals(rootDir) {
-  const projectsDir = import_node_path13.default.join(rootDir, "projects");
+  const projectsDir = import_node_path15.default.join(rootDir, "projects");
   const goals = [];
-  if (!import_node_fs12.default.existsSync(projectsDir)) return goals;
-  for (const entry of import_node_fs12.default.readdirSync(projectsDir, { withFileTypes: true })) {
+  if (!import_node_fs14.default.existsSync(projectsDir)) return goals;
+  for (const entry of import_node_fs14.default.readdirSync(projectsDir, { withFileTypes: true })) {
     if (!entry.isDirectory() || entry.name === "_template" || entry.name.startsWith(".")) {
       continue;
     }
-    const readmePath = import_node_path13.default.join(projectsDir, entry.name, "README.md");
-    if (!import_node_fs12.default.existsSync(readmePath)) continue;
-    const content = import_node_fs12.default.readFileSync(readmePath, "utf-8");
+    const readmePath = import_node_path15.default.join(projectsDir, entry.name, "README.md");
+    if (!import_node_fs14.default.existsSync(readmePath)) continue;
+    const content = import_node_fs14.default.readFileSync(readmePath, "utf-8");
     const descMatch = content.match(
       /## What This Project Is\s*\n+([\s\S]*?)(?=\n---|\n##|$)/
     );
@@ -1329,7 +1528,7 @@ async function exportPaperclip(options) {
     default: `Governed AI workspace for ${String(vars.workloadLabel).toLowerCase()}`
   });
   const companySlug = toSlug(companyName);
-  const outDir = import_node_path14.default.resolve(
+  const outDir = import_node_path16.default.resolve(
     options.out ?? `${config.workspaceName}-paperclip`
   );
   const skills = translateSkills(rootDir, systemDir);
@@ -1359,7 +1558,7 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
     console.log("\nValidation passed. Run without --validate to export.\n");
     return;
   }
-  if (import_node_fs13.default.existsSync(outDir)) {
+  if (import_node_fs15.default.existsSync(outDir)) {
     const proceed = await (0, import_prompts7.confirm)({
       message: `Output directory already exists at ${outDir}. Overwrite?`,
       default: false
@@ -1368,10 +1567,10 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
       console.log("Aborted.\n");
       return;
     }
-    import_node_fs13.default.rmSync(outDir, { recursive: true, force: true });
+    import_node_fs15.default.rmSync(outDir, { recursive: true, force: true });
   }
   console.log("\nExporting to Paperclip format (agentcompanies/v1)...\n");
-  import_node_fs13.default.mkdirSync(outDir, { recursive: true });
+  import_node_fs15.default.mkdirSync(outDir, { recursive: true });
   const goalsYaml = goals.length > 0 ? goals.map((g) => `  - ${g.description.split("\n")[0]}`).join("\n") : `  - ${mission}`;
   const pipelineLines = agents.map((a, i) => {
     return `${i + 1}. **${a.name}** ${a.title.toLowerCase()}`;
@@ -1401,17 +1600,17 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
     `Generated with [Clawstrap](https://github.com/peppinho89/clawstrap) v${CLI_VERSION}`,
     ""
   ].join("\n");
-  import_node_fs13.default.writeFileSync(import_node_path14.default.join(outDir, "COMPANY.md"), companyMd, "utf-8");
+  import_node_fs15.default.writeFileSync(import_node_path16.default.join(outDir, "COMPANY.md"), companyMd, "utf-8");
   console.log("  \u2713 COMPANY.md");
-  import_node_fs13.default.writeFileSync(
-    import_node_path14.default.join(outDir, ".paperclip.yaml"),
+  import_node_fs15.default.writeFileSync(
+    import_node_path16.default.join(outDir, ".paperclip.yaml"),
     "schema: paperclip/v1\n",
     "utf-8"
   );
   console.log("  \u2713 .paperclip.yaml");
   for (const agent of agents) {
-    const agentDir = import_node_path14.default.join(outDir, "agents", agent.slug);
-    import_node_fs13.default.mkdirSync(agentDir, { recursive: true });
+    const agentDir = import_node_path16.default.join(outDir, "agents", agent.slug);
+    import_node_fs15.default.mkdirSync(agentDir, { recursive: true });
     const frontmatterLines = [
       "---",
       `name: ${agent.name}`,
@@ -1426,12 +1625,12 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
     }
     frontmatterLines.push("---");
     const agentMd = frontmatterLines.join("\n") + "\n\n" + agent.body + "\n";
-    import_node_fs13.default.writeFileSync(import_node_path14.default.join(agentDir, "AGENTS.md"), agentMd, "utf-8");
+    import_node_fs15.default.writeFileSync(import_node_path16.default.join(agentDir, "AGENTS.md"), agentMd, "utf-8");
     console.log(`  \u2713 agents/${agent.slug}/AGENTS.md`);
   }
   if (nonCeoAgents.length > 0) {
-    const teamDir = import_node_path14.default.join(outDir, "teams", "engineering");
-    import_node_fs13.default.mkdirSync(teamDir, { recursive: true });
+    const teamDir = import_node_path16.default.join(outDir, "teams", "engineering");
+    import_node_fs15.default.mkdirSync(teamDir, { recursive: true });
     const includesList = nonCeoAgents.map((a) => `  - ../../agents/${a.slug}/AGENTS.md`).join("\n");
     const teamMd = [
       "---",
@@ -1448,13 +1647,13 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
       `The engineering team at ${companyName}. Led by the CEO, who scopes and delegates work to specialists.`,
       ""
     ].join("\n");
-    import_node_fs13.default.writeFileSync(import_node_path14.default.join(teamDir, "TEAM.md"), teamMd, "utf-8");
+    import_node_fs15.default.writeFileSync(import_node_path16.default.join(teamDir, "TEAM.md"), teamMd, "utf-8");
     console.log("  \u2713 teams/engineering/TEAM.md");
   }
   for (const skill of skills) {
-    const skillDir = import_node_path14.default.join(outDir, "skills", skill.name);
-    import_node_fs13.default.mkdirSync(skillDir, { recursive: true });
-    import_node_fs13.default.writeFileSync(import_node_path14.default.join(skillDir, "SKILL.md"), skill.content, "utf-8");
+    const skillDir = import_node_path16.default.join(outDir, "skills", skill.name);
+    import_node_fs15.default.mkdirSync(skillDir, { recursive: true });
+    import_node_fs15.default.writeFileSync(import_node_path16.default.join(skillDir, "SKILL.md"), skill.content, "utf-8");
     console.log(`  \u2713 skills/${skill.name}/SKILL.md`);
   }
   const importScript = [
@@ -1470,26 +1669,26 @@ ${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
     'echo "Done. Open your Paperclip dashboard to review."',
     ""
   ].join("\n");
-  const importPath = import_node_path14.default.join(outDir, "import.sh");
-  import_node_fs13.default.writeFileSync(importPath, importScript, "utf-8");
-  import_node_fs13.default.chmodSync(importPath, 493);
+  const importPath = import_node_path16.default.join(outDir, "import.sh");
+  import_node_fs15.default.writeFileSync(importPath, importScript, "utf-8");
+  import_node_fs15.default.chmodSync(importPath, 493);
   console.log("  \u2713 import.sh");
   const updatedConfig = {
     ...config,
     lastExport: {
       format: "paperclip",
       exportedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      outputDir: import_node_path14.default.relative(rootDir, outDir) || outDir
+      outputDir: import_node_path16.default.relative(rootDir, outDir) || outDir
     }
   };
-  import_node_fs13.default.writeFileSync(
-    import_node_path14.default.join(rootDir, ".clawstrap.json"),
+  import_node_fs15.default.writeFileSync(
+    import_node_path16.default.join(rootDir, ".clawstrap.json"),
     JSON.stringify(updatedConfig, null, 2) + "\n",
     "utf-8"
   );
   console.log(
     `
-Exported to ${import_node_path14.default.relative(process.cwd(), outDir) || outDir}`
+Exported to ${import_node_path16.default.relative(process.cwd(), outDir) || outDir}`
   );
   console.log(
     `${agents.length} agent(s), ${skills.length} skill(s), ${goals.length} goal(s)`
@@ -1499,43 +1698,14 @@ Exported to ${import_node_path14.default.relative(process.cwd(), outDir) || outD
 }
 
 // src/watch.ts
-var import_node_path20 = __toESM(require("path"), 1);
-var import_node_child_process4 = require("child_process");
-var import_node_fs19 = __toESM(require("fs"), 1);
+var import_node_path23 = __toESM(require("path"), 1);
+var import_node_fs22 = __toESM(require("fs"), 1);
 
 // src/watch/git.ts
 var import_node_child_process = require("child_process");
-var import_node_fs15 = __toESM(require("fs"), 1);
-var import_node_path16 = __toESM(require("path"), 1);
+var import_node_fs16 = __toESM(require("fs"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 init_writers();
-var STOPWORDS = /* @__PURE__ */ new Set([
-  "fix",
-  "add",
-  "update",
-  "remove",
-  "feat",
-  "chore",
-  "the",
-  "a",
-  "an",
-  "and",
-  "or",
-  "in",
-  "on",
-  "at",
-  "to",
-  "for",
-  "of",
-  "is",
-  "was",
-  "be",
-  "it",
-  "as",
-  "with",
-  "by",
-  "this",
-  "that"
-]);
 function parseGitLog(output) {
   const entries = [];
   const lines = output.split("\n");
@@ -1563,7 +1733,7 @@ function getTopDirs(entries) {
   for (const entry of entries) {
     const seenDirs = /* @__PURE__ */ new Set();
     for (const file of entry.files) {
-      const dir = import_node_path16.default.dirname(file);
+      const dir = import_node_path17.default.dirname(file);
       if (dir !== "." && !seenDirs.has(dir)) {
         seenDirs.add(dir);
         dirCount.set(dir, (dirCount.get(dir) ?? 0) + 1);
@@ -1596,7 +1766,7 @@ function getRecurringWords(entries) {
   return Array.from(wordCount.entries()).filter(([, count]) => count >= 2).sort((a, b) => b[1] - a[1]).slice(0, 10).map(([word]) => word);
 }
 async function runGitObserver(rootDir, sinceCommit) {
-  if (!import_node_fs15.default.existsSync(import_node_path16.default.join(rootDir, ".git"))) {
+  if (!import_node_fs16.default.existsSync(import_node_path17.default.join(rootDir, ".git"))) {
     return null;
   }
   let headSha;
@@ -1651,8 +1821,8 @@ async function runGitObserver(rootDir, sinceCommit) {
 }
 
 // src/watch/scan.ts
-var import_node_fs16 = __toESM(require("fs"), 1);
-var import_node_path17 = __toESM(require("path"), 1);
+var import_node_fs17 = __toESM(require("fs"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 var SKIP_DIRS = /* @__PURE__ */ new Set([".git", "node_modules", "tmp", "dist", ".claude"]);
 var CODE_EXTS = /* @__PURE__ */ new Set([".ts", ".js", ".tsx", ".jsx"]);
 function walkDir(dir, maxDepth = 10, depth = 0) {
@@ -1660,13 +1830,13 @@ function walkDir(dir, maxDepth = 10, depth = 0) {
   let results = [];
   let entries;
   try {
-    entries = import_node_fs16.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs17.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return [];
   }
   for (const entry of entries) {
     if (SKIP_DIRS.has(entry.name)) continue;
-    const fullPath = import_node_path17.default.join(dir, entry.name);
+    const fullPath = import_node_path18.default.join(dir, entry.name);
     if (entry.isDirectory()) {
       results = results.concat(walkDir(fullPath, maxDepth, depth + 1));
     } else if (entry.isFile()) {
@@ -1699,7 +1869,7 @@ function analyzeNaming(files) {
     other: []
   };
   for (const file of files) {
-    const base = import_node_path17.default.basename(file, import_node_path17.default.extname(file));
+    const base = import_node_path18.default.basename(file, import_node_path18.default.extname(file));
     const style2 = detectNamingCase(base);
     counts[style2]++;
     if (examples[style2].length < 3) examples[style2].push(base);
@@ -1719,14 +1889,14 @@ function analyzeNaming(files) {
   return result;
 }
 function analyzeImports(files) {
-  const sample = files.filter((f) => CODE_EXTS.has(import_node_path17.default.extname(f))).slice(0, 20);
+  const sample = files.filter((f) => CODE_EXTS.has(import_node_path18.default.extname(f))).slice(0, 20);
   let relativeCount = 0;
   let absoluteCount = 0;
   let barrelCount = 0;
   for (const file of sample) {
     let content;
     try {
-      content = import_node_fs16.default.readFileSync(file, "utf-8");
+      content = import_node_fs17.default.readFileSync(file, "utf-8");
     } catch {
       continue;
     }
@@ -1735,7 +1905,7 @@ function analyzeImports(files) {
       if (/from\s+['"]\.\.?\//.test(line)) relativeCount++;
       else if (/from\s+['"]/.test(line)) absoluteCount++;
     }
-    const base = import_node_path17.default.basename(file, import_node_path17.default.extname(file));
+    const base = import_node_path18.default.basename(file, import_node_path18.default.extname(file));
     if (base === "index") barrelCount++;
   }
   const results = [];
@@ -1759,7 +1929,7 @@ function analyzeTesting(files) {
   let hasSpecExt = false;
   let hasTestsDir = false;
   for (const file of files) {
-    const base = import_node_path17.default.basename(file);
+    const base = import_node_path18.default.basename(file);
     if (/\.test\.(ts|js|tsx|jsx)$/.test(base)) hasTestExt = true;
     if (/\.spec\.(ts|js|tsx|jsx)$/.test(base)) hasSpecExt = true;
     if (file.includes("/__tests__/") || file.includes("\\__tests__\\")) hasTestsDir = true;
@@ -1773,13 +1943,13 @@ function analyzeTesting(files) {
   return [`Test patterns found: ${testPatterns.join(", ")}`];
 }
 function analyzeErrorHandling(files) {
-  const sample = files.filter((f) => CODE_EXTS.has(import_node_path17.default.extname(f))).slice(0, 20);
+  const sample = files.filter((f) => CODE_EXTS.has(import_node_path18.default.extname(f))).slice(0, 20);
   let tryCatchCount = 0;
   let resultTypeCount = 0;
   for (const file of sample) {
     let content;
     try {
-      content = import_node_fs16.default.readFileSync(file, "utf-8");
+      content = import_node_fs17.default.readFileSync(file, "utf-8");
     } catch {
       continue;
     }
@@ -1804,14 +1974,14 @@ function analyzeErrorHandling(files) {
   return results;
 }
 function analyzeComments(files) {
-  const sample = files.filter((f) => CODE_EXTS.has(import_node_path17.default.extname(f))).slice(0, 20);
+  const sample = files.filter((f) => CODE_EXTS.has(import_node_path18.default.extname(f))).slice(0, 20);
   let jsdocCount = 0;
   let inlineCount = 0;
   let totalLines = 0;
   for (const file of sample) {
     let content;
     try {
-      content = import_node_fs16.default.readFileSync(file, "utf-8");
+      content = import_node_fs17.default.readFileSync(file, "utf-8");
     } catch {
       continue;
     }
@@ -1844,17 +2014,220 @@ async function runScan(rootDir) {
 init_writers();
 
 // src/watch/daemon.ts
+var import_node_fs21 = __toESM(require("fs"), 1);
+var import_node_path22 = __toESM(require("path"), 1);
+init_writers();
+
+// src/watch/synthesize.ts
 var import_node_fs18 = __toESM(require("fs"), 1);
 var import_node_path19 = __toESM(require("path"), 1);
-init_writers();
+init_dedup();
+var SYNTH_START = "<!-- CLAWSTRAP:SYNTHESIS:START -->";
+var SYNTH_END = "<!-- CLAWSTRAP:SYNTHESIS:END -->";
+var MAX_ENTRIES_TO_SEND = 20;
+function extractExistingSummary(content) {
+  const startIdx = content.indexOf(SYNTH_START);
+  const endIdx = content.indexOf(SYNTH_END);
+  if (startIdx === -1 || endIdx === -1) return null;
+  const block = content.slice(startIdx + SYNTH_START.length, endIdx).trim();
+  const lines = block.split("\n");
+  let start = 0;
+  if (/^##\s+Living Summary/.test(lines[start] ?? "")) start++;
+  if (/^>\s+Updated:/.test(lines[start] ?? "")) start++;
+  return lines.slice(start).join("\n").trim() || null;
+}
+function buildSynthBlock(summary) {
+  const ts = (/* @__PURE__ */ new Date()).toISOString();
+  return [
+    SYNTH_START,
+    "## Living Summary",
+    `> Updated: ${ts}`,
+    "",
+    summary,
+    SYNTH_END
+  ].join("\n");
+}
+function writeSynthBlock(memoryPath, summary) {
+  const content = import_node_fs18.default.existsSync(memoryPath) ? import_node_fs18.default.readFileSync(memoryPath, "utf-8") : "";
+  const block = buildSynthBlock(summary);
+  const startIdx = content.indexOf(SYNTH_START);
+  const endIdx = content.indexOf(SYNTH_END);
+  if (startIdx !== -1 && endIdx !== -1) {
+    const before = content.slice(0, startIdx);
+    const after = content.slice(endIdx + SYNTH_END.length);
+    import_node_fs18.default.writeFileSync(memoryPath, before + block + after, "utf-8");
+    return;
+  }
+  const headingMatch = /^#[^\n]*\n?/m.exec(content);
+  if (headingMatch) {
+    const insertAt = headingMatch.index + headingMatch[0].length;
+    const updated = content.slice(0, insertAt) + "\n" + block + "\n" + content.slice(insertAt);
+    import_node_fs18.default.writeFileSync(memoryPath, updated, "utf-8");
+  } else {
+    import_node_fs18.default.writeFileSync(memoryPath, block + "\n\n" + content, "utf-8");
+  }
+}
+async function synthesizeMemory(rootDir, adapter) {
+  const memoryPath = import_node_path19.default.join(rootDir, ".claude", "memory", "MEMORY.md");
+  if (!import_node_fs18.default.existsSync(memoryPath)) return null;
+  const content = import_node_fs18.default.readFileSync(memoryPath, "utf-8");
+  const contentWithoutSynthBlock = content.replace(
+    /<!-- CLAWSTRAP:SYNTHESIS:START -->[\s\S]*?<!-- CLAWSTRAP:SYNTHESIS:END -->/,
+    ""
+  );
+  const allEntries = parseMemoryEntries(contentWithoutSynthBlock);
+  if (allEntries.length === 0) return null;
+  const recentEntries = allEntries.slice(-MAX_ENTRIES_TO_SEND);
+  const existingSummary = extractExistingSummary(content);
+  let prompt;
+  if (existingSummary) {
+    prompt = `You are maintaining a living summary of an AI agent workspace.
+
+Current summary:
+${existingSummary}
+
+Recent new memory entries:
+${recentEntries.join("\n---\n")}
+
+Update the summary to incorporate the new information. Write 3\u20135 sentences of persistent truths about how this workspace operates. Output only the updated paragraph \u2014 no heading, no markdown, no explanation.`;
+  } else {
+    prompt = `You are summarising an AI agent workspace from its memory log.
+
+Recent memory entries:
+${recentEntries.join("\n---\n")}
+
+Write a concise 3\u20135 sentence summary of the persistent truths about how this workspace operates. Output only the paragraph \u2014 no heading, no markdown, no explanation.`;
+  }
+  let response;
+  try {
+    response = await adapter.complete(prompt);
+  } catch {
+    return null;
+  }
+  const summary = response.replace(/^```(?:markdown)?\s*/m, "").replace(/\s*```\s*$/m, "").trim();
+  if (!summary) return null;
+  try {
+    writeSynthBlock(memoryPath, summary);
+  } catch {
+    return null;
+  }
+  return summary;
+}
+
+// src/watch/infer.ts
+var import_node_child_process2 = require("child_process");
+var import_node_fs19 = __toESM(require("fs"), 1);
+var import_node_path20 = __toESM(require("path"), 1);
+var CODE_EXTS2 = /* @__PURE__ */ new Set([".ts", ".js", ".tsx", ".jsx"]);
+var SKIP_DIRS2 = /* @__PURE__ */ new Set([".git", "node_modules", "tmp", "dist", ".claude"]);
+var MAX_FILES = 10;
+var MAX_LINES_PER_FILE = 150;
+var MIN_FILES = 3;
+function walkCodeFiles(rootDir) {
+  const results = [];
+  function walk(dir, depth = 0) {
+    if (depth > 8) return;
+    let entries;
+    try {
+      entries = import_node_fs19.default.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (SKIP_DIRS2.has(entry.name)) continue;
+      const fullPath = import_node_path20.default.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath, depth + 1);
+      } else if (entry.isFile() && CODE_EXTS2.has(import_node_path20.default.extname(entry.name))) {
+        if (!/\.(test|spec)\.(ts|js|tsx|jsx)$/.test(entry.name)) {
+          results.push(fullPath);
+        }
+      }
+    }
+  }
+  walk(rootDir);
+  return results;
+}
+function getRecentlyChangedFiles(rootDir) {
+  try {
+    const output = (0, import_node_child_process2.execSync)(
+      `git -C "${rootDir}" log --format='' --name-only -n 100`,
+      { encoding: "utf-8" }
+    ).trim();
+    if (!output) return [];
+    const seen = /* @__PURE__ */ new Set();
+    const files = [];
+    for (const line of output.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || seen.has(trimmed)) continue;
+      seen.add(trimmed);
+      const ext = import_node_path20.default.extname(trimmed);
+      if (!CODE_EXTS2.has(ext)) continue;
+      if (/\.(test|spec)\.(ts|js|tsx|jsx)$/.test(trimmed)) continue;
+      const abs = import_node_path20.default.join(rootDir, trimmed);
+      if (import_node_fs19.default.existsSync(abs)) files.push(abs);
+    }
+    return files;
+  } catch {
+    return [];
+  }
+}
+function readTruncated(filePath, rootDir) {
+  let content;
+  try {
+    content = import_node_fs19.default.readFileSync(filePath, "utf-8");
+  } catch {
+    return "";
+  }
+  const lines = content.split("\n");
+  const relPath = import_node_path20.default.relative(rootDir, filePath);
+  const truncated = lines.length > MAX_LINES_PER_FILE ? lines.slice(0, MAX_LINES_PER_FILE).join("\n") + "\n// ... truncated" : lines.join("\n");
+  return `=== ${relPath} ===
+${truncated}`;
+}
+async function inferArchitecturePatterns(rootDir, syntacticSections, adapter) {
+  let candidates = getRecentlyChangedFiles(rootDir);
+  if (candidates.length < MIN_FILES) {
+    candidates = walkCodeFiles(rootDir);
+  }
+  if (candidates.length < MIN_FILES) return [];
+  const sampled = candidates.slice(0, MAX_FILES);
+  const fileSamples = sampled.map((f) => readTruncated(f, rootDir)).filter(Boolean).join("\n\n");
+  if (!fileSamples) return [];
+  const syntacticSummary = [
+    `Naming: ${syntacticSections.naming.join("; ")}`,
+    `Imports: ${syntacticSections.imports.join("; ")}`,
+    `Error handling: ${syntacticSections.errorHandling.join("; ")}`
+  ].join("\n");
+  const prompt = `You are analysing a software project to infer its architectural and design conventions.
+
+Syntactic analysis already found:
+${syntacticSummary}
+
+Source file samples:
+${fileSamples}
+
+Based on the code, identify 3\u20138 architectural or design patterns as imperative rules.
+Rules must be specific to this codebase, not generic best practices.
+Format: one rule per line, starting with "Always", "Never", or "When".
+Output only the rules \u2014 no explanation, no numbering, no markdown.`;
+  let response;
+  try {
+    response = await adapter.complete(prompt);
+  } catch {
+    return [];
+  }
+  const rules = response.replace(/^```(?:markdown)?\s*/m, "").replace(/\s*```\s*$/m, "").split("\n").map((line) => line.replace(/^\s*[-*\d.]+\s*/, "").trim()).filter((line) => /^(Always|Never|When)\b/i.test(line));
+  return rules;
+}
 
 // src/watch/transcripts.ts
-var import_node_fs17 = __toESM(require("fs"), 1);
-var import_node_path18 = __toESM(require("path"), 1);
+var import_node_fs20 = __toESM(require("fs"), 1);
+var import_node_path21 = __toESM(require("path"), 1);
 async function processTranscript(filePath, adapter) {
   let content;
   try {
-    content = import_node_fs17.default.readFileSync(filePath, "utf-8");
+    content = import_node_fs20.default.readFileSync(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -1897,13 +2270,13 @@ Each item must be a concise one-sentence string. Arrays may be empty.`;
   }
 }
 function watchTranscriptDir(rootDir, onNewFile) {
-  const sessionsDir = import_node_path18.default.join(rootDir, "tmp", "sessions");
-  import_node_fs17.default.mkdirSync(sessionsDir, { recursive: true });
-  const watcher = import_node_fs17.default.watch(sessionsDir, (event, filename) => {
+  const sessionsDir = import_node_path21.default.join(rootDir, "tmp", "sessions");
+  import_node_fs20.default.mkdirSync(sessionsDir, { recursive: true });
+  const watcher = import_node_fs20.default.watch(sessionsDir, (event, filename) => {
     if (event !== "rename" || !filename) return;
     if (!filename.endsWith(".md")) return;
-    const filePath = import_node_path18.default.join(sessionsDir, filename);
-    if (!import_node_fs17.default.existsSync(filePath)) return;
+    const filePath = import_node_path21.default.join(sessionsDir, filename);
+    if (!import_node_fs20.default.existsSync(filePath)) return;
     onNewFile(filePath).catch(() => {
     });
   });
@@ -1913,12 +2286,12 @@ function watchTranscriptDir(rootDir, onNewFile) {
 }
 
 // src/watch/adapters/claude-local.ts
-var import_node_child_process2 = require("child_process");
+var import_node_child_process3 = require("child_process");
 var ClaudeLocalAdapter = class {
   async complete(prompt) {
     const escaped = prompt.replace(/'/g, "'\\''");
     try {
-      const result = (0, import_node_child_process2.execSync)(`claude -p '${escaped}'`, {
+      const result = (0, import_node_child_process3.execSync)(`claude -p '${escaped}'`, {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -1999,12 +2372,12 @@ var OllamaAdapter = class {
 };
 
 // src/watch/adapters/codex-local.ts
-var import_node_child_process3 = require("child_process");
+var import_node_child_process4 = require("child_process");
 var CodexLocalAdapter = class {
   async complete(prompt) {
     const escaped = prompt.replace(/'/g, "'\\''");
     try {
-      const result = (0, import_node_child_process3.execSync)(`codex '${escaped}'`, {
+      const result = (0, import_node_child_process4.execSync)(`codex '${escaped}'`, {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -2038,78 +2411,358 @@ function createAdapter(config) {
 }
 
 // src/watch/daemon.ts
-async function runDaemon(rootDir, config) {
-  const silent = config.watch?.silent ?? false;
-  const log = silent ? () => {
-  } : (msg) => process.stdout.write(msg + "\n");
+function serializedAdapter(adapter) {
+  let chain = Promise.resolve();
+  return {
+    complete(prompt) {
+      const result = chain.then(() => adapter.complete(prompt));
+      chain = result.then(() => {
+      }, () => {
+      });
+      return result;
+    }
+  };
+}
+async function runDaemon(rootDir, config, ui) {
   const cleanup = [];
   const shutdown = () => {
     cleanup.forEach((fn) => fn());
+    ui.clear();
     clearPid(rootDir);
     process.exit(0);
   };
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
-  log("[clawstrap watch] daemon started");
+  ui.daemonStarted();
   const sinceCommit = config.watchState?.lastGitCommit ?? null;
+  ui.gitStart();
   const gitResult = await runGitObserver(rootDir, sinceCommit);
+  ui.gitDone(gitResult ? { entriesWritten: gitResult.entriesWritten, lastCommit: gitResult.lastCommit } : null);
+  let lastGitCommit = gitResult?.lastCommit ?? sinceCommit;
   if (gitResult) {
     updateWatchState(rootDir, { lastGitCommit: gitResult.lastCommit });
-    log(`[clawstrap watch] git: ${gitResult.entriesWritten} entries written`);
   }
-  const adapter = createAdapter(config);
+  const adapter = serializedAdapter(createAdapter(config));
+  let entriesSinceLastSynthesis = config.watchState?.entriesSinceLastSynthesis ?? 0;
+  const synthEnabled = config.watch?.synthesis?.enabled ?? false;
+  const triggerEveryN = config.watch?.synthesis?.triggerEveryN ?? 10;
+  const maybeSynthesize = async () => {
+    if (!synthEnabled || entriesSinceLastSynthesis < triggerEveryN) return;
+    ui.synthStart();
+    const summary = await synthesizeMemory(rootDir, adapter);
+    ui.synthDone(summary);
+    entriesSinceLastSynthesis = 0;
+    updateWatchState(rootDir, { entriesSinceLastSynthesis: "0" });
+  };
   const stopTranscripts = watchTranscriptDir(rootDir, async (filePath) => {
-    log(`[clawstrap watch] transcript: processing ${import_node_path19.default.basename(filePath)}`);
+    ui.transcriptStart(import_node_path22.default.basename(filePath));
+    ui.llmCallStart();
     const result = await processTranscript(filePath, adapter);
+    ui.llmCallDone(result ? { decisions: result.decisions.length, corrections: result.corrections.length, openThreads: result.openThreads.length } : null);
     if (result) {
-      const { appendToMemory: appendToMemory2, appendToGotchaLog: appendToGotchaLog2, appendToFutureConsiderations: appendToFutureConsiderations2 } = await Promise.resolve().then(() => (init_writers(), writers_exports));
-      if (result.decisions.length) appendToMemory2(rootDir, result.decisions, "session");
-      if (result.corrections.length) appendToGotchaLog2(rootDir, result.corrections);
+      const { appendToMemory: appendToMemory2, appendToGotchaLog: appendToGotchaLog2, appendToFutureConsiderations: appendToFutureConsiderations2, appendToOpenThreads: appendToOpenThreads2 } = await Promise.resolve().then(() => (init_writers(), writers_exports));
+      let written = 0;
+      if (result.decisions.length) written += appendToMemory2(rootDir, result.decisions, "session");
+      if (result.corrections.length) {
+        appendToGotchaLog2(rootDir, result.corrections);
+        await checkAndPromoteCorrections(rootDir, adapter, ui);
+      }
       if (result.deferredIdeas.length) appendToFutureConsiderations2(rootDir, result.deferredIdeas);
-      updateWatchState(rootDir, { lastTranscriptAt: (/* @__PURE__ */ new Date()).toISOString() });
-      log(
-        `[clawstrap watch] transcript: decisions=${result.decisions.length} corrections=${result.corrections.length}`
-      );
+      if (result.openThreads.length) appendToOpenThreads2(rootDir, result.openThreads);
+      entriesSinceLastSynthesis += written;
+      updateWatchState(rootDir, {
+        lastTranscriptAt: (/* @__PURE__ */ new Date()).toISOString(),
+        entriesSinceLastSynthesis: String(entriesSinceLastSynthesis)
+      });
+      ui.transcriptWriteDone();
+      await maybeSynthesize();
     }
   });
   cleanup.push(stopTranscripts);
+  let gitRunning = false;
+  const pollIntervalMinutes = config.watch?.git?.pollIntervalMinutes ?? 5;
+  const gitPollTimer = setInterval(async () => {
+    if (gitRunning) return;
+    gitRunning = true;
+    try {
+      const result = await runGitObserver(rootDir, lastGitCommit);
+      if (result && result.entriesWritten > 0) {
+        ui.gitPollDone({ entriesWritten: result.entriesWritten, lastCommit: result.lastCommit });
+      }
+      if (result) {
+        lastGitCommit = result.lastCommit;
+        updateWatchState(rootDir, { lastGitCommit: result.lastCommit });
+      }
+    } finally {
+      gitRunning = false;
+    }
+  }, pollIntervalMinutes * 60 * 1e3);
+  cleanup.push(() => clearInterval(gitPollTimer));
   const intervalDays = config.watch?.scan?.intervalDays ?? 7;
   const lastScan = config.watchState?.lastScanAt ? new Date(config.watchState.lastScanAt) : null;
   const msSinceLastScan = lastScan ? Date.now() - lastScan.getTime() : Infinity;
   const scanIntervalMs = intervalDays * 24 * 60 * 60 * 1e3;
   const doScan = async () => {
-    log("[clawstrap watch] scan: running convention scan...");
+    ui.scanStart(lastScan);
+    ui.scanFilesStart();
     const sections = await runScan(rootDir);
+    ui.scanFilesDone();
+    if (config.watch?.adapter) {
+      ui.inferStart();
+      const rules = await inferArchitecturePatterns(rootDir, sections, adapter);
+      ui.inferDone(rules.length > 0 ? rules.length : null);
+      if (rules.length > 0) sections.architecture = rules;
+    }
     writeConventions(rootDir, sections);
     updateWatchState(rootDir, { lastScanAt: (/* @__PURE__ */ new Date()).toISOString() });
-    log("[clawstrap watch] scan: conventions.md updated");
+    ui.scanDone(sections.naming[0] ?? "");
   };
   if (msSinceLastScan >= scanIntervalMs) {
     await doScan();
   }
   const scanTimer = setInterval(doScan, scanIntervalMs);
   cleanup.push(() => clearInterval(scanTimer));
-  log("[clawstrap watch] watching for changes...");
+  ui.showIdle(import_node_path22.default.join(rootDir, "tmp", "sessions"));
   await new Promise(() => {
   });
 }
 function updateWatchState(rootDir, updates) {
-  const configPath = import_node_path19.default.join(rootDir, ".clawstrap.json");
+  const configPath = import_node_path22.default.join(rootDir, ".clawstrap.json");
   try {
-    const raw = JSON.parse(import_node_fs18.default.readFileSync(configPath, "utf-8"));
+    const raw = JSON.parse(import_node_fs21.default.readFileSync(configPath, "utf-8"));
     raw["watchState"] = { ...raw["watchState"] ?? {}, ...updates };
-    import_node_fs18.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
+    import_node_fs21.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
   } catch {
   }
 }
 
+// src/watch/ui.ts
+var import_picocolors = __toESM(require("picocolors"), 1);
+var import_ora = __toESM(require("ora"), 1);
+var ora = typeof import_ora.default === "function" ? import_ora.default : import_ora.default.default;
+function formatAgo(date) {
+  if (!date) return "never";
+  const diffMs = Date.now() - date.getTime();
+  const diffMins = Math.floor(diffMs / 6e4);
+  if (diffMins < 60) return `${diffMins} minute${diffMins === 1 ? "" : "s"} ago`;
+  const diffHours = Math.floor(diffMins / 60);
+  if (diffHours < 24) return `${diffHours} hour${diffHours === 1 ? "" : "s"} ago`;
+  const diffDays = Math.floor(diffHours / 24);
+  return `${diffDays} day${diffDays === 1 ? "" : "s"} ago`;
+}
+var T = {
+  branch: import_picocolors.default.gray("\u251C\u2500"),
+  last: import_picocolors.default.gray("\u2514\u2500"),
+  check: import_picocolors.default.green("\u2713")
+};
+function header(label) {
+  process.stdout.write(`
+${import_picocolors.default.cyan("\u25C6")}  ${import_picocolors.default.bold(label)}
+`);
+}
+function row(connector, label, value) {
+  const val = value !== void 0 ? `  ${import_picocolors.default.bold(value)}` : "";
+  process.stdout.write(`${connector} ${label}${val}
+`);
+}
+var SilentUI = class {
+  daemonStarted() {
+  }
+  gitStart() {
+  }
+  gitDone(_result) {
+  }
+  gitPollDone(_result) {
+  }
+  transcriptStart(_filename) {
+  }
+  llmCallStart() {
+  }
+  llmCallDone(_counts) {
+  }
+  transcriptWriteDone() {
+  }
+  scanStart(_lastRunAt) {
+  }
+  scanFilesStart() {
+  }
+  scanFilesDone() {
+  }
+  scanDone(_namingStyle) {
+  }
+  synthStart() {
+  }
+  synthDone(_summary) {
+  }
+  inferStart() {
+  }
+  inferDone(_rulesCount) {
+  }
+  promoteStart() {
+  }
+  promoteDone(_rulesWritten) {
+  }
+  showIdle(_watchDir) {
+  }
+  clear() {
+  }
+};
+var RichUI = class {
+  spinner = null;
+  daemonStarted() {
+    process.stdout.write(`
+${import_picocolors.default.cyan("clawstrap watch")} ${import_picocolors.default.dim("daemon started")}
+`);
+  }
+  // Git observer ──────────────────────────────────────────────────────────────
+  gitStart() {
+    header("Git observer");
+  }
+  gitDone(result) {
+    if (!result) {
+      row(T.last, import_picocolors.default.dim("No new commits found."));
+      return;
+    }
+    row(T.branch, "Last processed commit", result.lastCommit.slice(0, 7));
+    row(T.branch, "Entries written", String(result.entriesWritten));
+    row(T.last, `Writing to MEMORY.md...  ${T.check} done`);
+  }
+  gitPollDone(result) {
+    const time = (/* @__PURE__ */ new Date()).toTimeString().slice(0, 5);
+    process.stdout.write(
+      `
+${import_picocolors.default.cyan("\u25C6")}  ${import_picocolors.default.bold("Git:")}  +${result.entriesWritten} entr${result.entriesWritten === 1 ? "y" : "ies"} written  ${import_picocolors.default.dim(result.lastCommit.slice(0, 7))}  ${import_picocolors.default.dim(time)}
+`
+    );
+  }
+  // Transcript ────────────────────────────────────────────────────────────────
+  transcriptStart(filename) {
+    header(`New session summary detected  ${import_picocolors.default.cyan(filename)}`);
+  }
+  llmCallStart() {
+    this.spinner = ora({
+      text: `${T.branch} Sending to LLM adapter...`,
+      prefixText: ""
+    }).start();
+  }
+  llmCallDone(counts) {
+    if (this.spinner) {
+      if (counts) {
+        this.spinner.succeed(`${T.branch} Sending to LLM adapter...  ${T.check}`);
+      } else {
+        this.spinner.fail(`${T.branch} Sending to LLM adapter...  failed`);
+      }
+      this.spinner = null;
+    }
+    if (counts) {
+      row(T.branch, "Decisions found    ", String(counts.decisions));
+      row(T.branch, "Corrections found  ", String(counts.corrections));
+      row(T.branch, "Open threads found ", String(counts.openThreads));
+    }
+  }
+  transcriptWriteDone() {
+    row(T.last, `Writing to memory files...  ${T.check} done`);
+  }
+  // Convention scan ───────────────────────────────────────────────────────────
+  scanStart(lastRunAt) {
+    header(`Convention scan  ${import_picocolors.default.dim(`(last run: ${formatAgo(lastRunAt)})`)}`);
+  }
+  scanFilesStart() {
+    this.spinner = ora({
+      text: `${T.branch} Scanning files...`,
+      prefixText: ""
+    }).start();
+  }
+  scanFilesDone() {
+    if (this.spinner) {
+      this.spinner.succeed(`${T.branch} Scanning files...  done`);
+      this.spinner = null;
+    }
+  }
+  scanDone(namingStyle) {
+    if (namingStyle) {
+      row(T.branch, "Naming convention  ", namingStyle);
+    }
+    row(T.last, `Writing conventions.md...  ${T.check} done`);
+  }
+  // Memory synthesis ──────────────────────────────────────────────────────────
+  synthStart() {
+    this.spinner?.stop();
+    this.spinner = ora({
+      text: `${T.branch} Synthesising memory...`,
+      prefixText: ""
+    }).start();
+  }
+  synthDone(summary) {
+    if (this.spinner) {
+      if (summary) {
+        const preview = summary.length > 60 ? summary.slice(0, 60) + "\u2026" : summary;
+        this.spinner.succeed(`${T.branch} Living summary updated  ${import_picocolors.default.dim(preview)}`);
+      } else {
+        this.spinner.fail(`${T.branch} Memory synthesis failed`);
+      }
+      this.spinner = null;
+    }
+  }
+  // Architecture inference ────────────────────────────────────────────────────
+  inferStart() {
+    this.spinner?.stop();
+    this.spinner = ora({
+      text: `${T.branch} Inferring architecture patterns...`,
+      prefixText: ""
+    }).start();
+  }
+  inferDone(rulesCount) {
+    if (this.spinner) {
+      if (rulesCount !== null && rulesCount > 0) {
+        this.spinner.succeed(`${T.branch} Architecture patterns inferred  ${import_picocolors.default.bold(String(rulesCount))} rules`);
+      } else {
+        this.spinner.fail(`${T.branch} Architecture inference failed`);
+      }
+      this.spinner = null;
+    }
+  }
+  // Correction promotion ──────────────────────────────────────────────────────
+  promoteStart() {
+    this.spinner?.stop();
+    this.spinner = ora({
+      text: `${T.branch} Promoting corrections to rule...`,
+      prefixText: ""
+    }).start();
+  }
+  promoteDone(rulesWritten) {
+    if (this.spinner) {
+      if (rulesWritten > 0) {
+        this.spinner.succeed(`${T.branch} Draft rule written to .claude/rules/  ${T.check}`);
+      } else {
+        this.spinner.fail(`${T.branch} Rule promotion failed`);
+      }
+      this.spinner = null;
+    }
+  }
+  // Idle ──────────────────────────────────────────────────────────────────────
+  showIdle(watchDir) {
+    process.stdout.write(`
+${import_picocolors.default.dim("\u25C7")}  ${import_picocolors.default.dim("Watching for changes...")}
+`);
+    row(T.last, import_picocolors.default.dim("Transcripts"), import_picocolors.default.dim(watchDir + "  (listening)"));
+    process.stdout.write("\n");
+  }
+  // Cleanup ───────────────────────────────────────────────────────────────────
+  clear() {
+    if (this.spinner) {
+      this.spinner.stop();
+      this.spinner = null;
+    }
+  }
+};
+function createUI(silent) {
+  return silent ? new SilentUI() : new RichUI();
+}
+
 // src/watch.ts
 async function watch(options) {
   const { config, rootDir } = loadWorkspace();
-  if (options._daemon) {
-    await runDaemon(rootDir, config);
-    return;
-  }
   if (options.stop) {
     const pid = readPid(rootDir);
     if (!pid || !isDaemonRunning(rootDir)) {
@@ -2123,61 +2776,56 @@ Daemon stopped (pid ${pid}).
 `);
     return;
   }
+  const silent = options.silent ?? config.watch?.silent ?? false;
+  const ui = createUI(silent);
   if (options.once) {
-    console.log("\nRunning all observers once...\n");
+    ui.gitStart();
     const gitResult = await runGitObserver(rootDir, config.watchState?.lastGitCommit ?? null);
+    ui.gitDone(gitResult ? { entriesWritten: gitResult.entriesWritten, lastCommit: gitResult.lastCommit } : null);
     if (gitResult) {
       persistWatchState(rootDir, { lastGitCommit: gitResult.lastCommit });
-      console.log(`  \u2713 git: ${gitResult.entriesWritten} entries`);
     }
+    const lastScanAt = config.watchState?.lastScanAt ? new Date(config.watchState.lastScanAt) : null;
+    ui.scanStart(lastScanAt);
+    ui.scanFilesStart();
     const sections = await runScan(rootDir);
+    ui.scanFilesDone();
+    if (config.watch?.adapter) {
+      const adapter = createAdapter(config);
+      ui.inferStart();
+      const rules = await inferArchitecturePatterns(rootDir, sections, adapter);
+      ui.inferDone(rules.length > 0 ? rules.length : null);
+      if (rules.length > 0) sections.architecture = rules;
+    }
     writeConventions(rootDir, sections);
     persistWatchState(rootDir, { lastScanAt: (/* @__PURE__ */ new Date()).toISOString() });
-    console.log("  \u2713 scan: conventions.md updated");
-    console.log("\nDone.\n");
+    ui.scanDone(sections.naming[0] ?? "");
     return;
   }
   if (isDaemonRunning(rootDir)) {
     const pid = readPid(rootDir);
     console.log(`
-Daemon already running (pid ${pid}). Use --stop to stop it.
+Watch is already running (pid ${pid}). Use --stop to stop it.
 `);
     return;
   }
   injectWatchHook(rootDir, config);
-  const self = process.argv[1];
-  const child = (0, import_node_child_process4.spawn)(process.execPath, [self, "watch", "--_daemon"], {
-    detached: true,
-    stdio: "ignore",
-    cwd: rootDir
-  });
-  child.unref();
-  if (child.pid) {
-    writePid(rootDir, child.pid);
-    if (!options.silent) {
-      console.log(`
-Daemon started (pid ${child.pid}).`);
-      console.log(`Run 'clawstrap watch --stop' to stop it.
-`);
-    }
-  } else {
-    console.error("\nFailed to start daemon.\n");
-    process.exit(1);
-  }
+  writePid(rootDir, process.pid);
+  await runDaemon(rootDir, config, ui);
 }
 function persistWatchState(rootDir, updates) {
-  const configPath = import_node_path20.default.join(rootDir, ".clawstrap.json");
+  const configPath = import_node_path23.default.join(rootDir, ".clawstrap.json");
   try {
-    const raw = JSON.parse(import_node_fs19.default.readFileSync(configPath, "utf-8"));
+    const raw = JSON.parse(import_node_fs22.default.readFileSync(configPath, "utf-8"));
     raw.watchState = { ...raw.watchState ?? {}, ...updates };
-    import_node_fs19.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
+    import_node_fs22.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
   } catch {
   }
 }
 function injectWatchHook(rootDir, config) {
-  const governanceFile = import_node_path20.default.join(rootDir, "CLAUDE.md");
-  if (!import_node_fs19.default.existsSync(governanceFile)) return;
-  const content = import_node_fs19.default.readFileSync(governanceFile, "utf-8");
+  const governanceFile = import_node_path23.default.join(rootDir, "CLAUDE.md");
+  if (!import_node_fs22.default.existsSync(governanceFile)) return;
+  const content = import_node_fs22.default.readFileSync(governanceFile, "utf-8");
   if (content.includes("<!-- CLAWSTRAP:WATCH -->")) return;
   const _config = config;
   void _config;
@@ -2204,23 +2852,23 @@ function injectWatchHook(rootDir, config) {
 
 The watch daemon picks this up automatically and updates MEMORY.md and gotcha-log.md.
 `;
-  import_node_fs19.default.appendFileSync(governanceFile, hook, "utf-8");
+  import_node_fs22.default.appendFileSync(governanceFile, hook, "utf-8");
 }
 
 // src/analyze.ts
-var import_node_fs20 = __toESM(require("fs"), 1);
-var import_node_path21 = __toESM(require("path"), 1);
+var import_node_fs23 = __toESM(require("fs"), 1);
+var import_node_path24 = __toESM(require("path"), 1);
 init_writers();
 async function analyze() {
   const { rootDir } = loadWorkspace();
   console.log("\nScanning codebase conventions...\n");
   const sections = await runScan(rootDir);
   writeConventions(rootDir, sections);
-  const configPath = import_node_path21.default.join(rootDir, ".clawstrap.json");
+  const configPath = import_node_path24.default.join(rootDir, ".clawstrap.json");
   try {
-    const raw = JSON.parse(import_node_fs20.default.readFileSync(configPath, "utf-8"));
+    const raw = JSON.parse(import_node_fs23.default.readFileSync(configPath, "utf-8"));
     raw["watchState"] = { ...raw["watchState"] ?? {}, lastScanAt: (/* @__PURE__ */ new Date()).toISOString() };
-    import_node_fs20.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
+    import_node_fs23.default.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
   } catch {
   }
   console.log("  \u2713 .claude/rules/conventions.md updated\n");
@@ -2228,7 +2876,7 @@ async function analyze() {
 
 // src/index.ts
 var program = new import_commander.Command();
-program.name("clawstrap").description("Scaffold a production-ready AI agent workspace").version("1.4.1");
+program.name("clawstrap").description("Scaffold a production-ready AI agent workspace").version("1.5.1");
 program.command("init").description("Create a new AI workspace in the current directory").argument("[directory]", "Target directory", ".").option("-y, --yes", "Use defaults, skip prompts").option("--sdd", "Enable Spec-Driven Development mode").action(async (directory, options) => {
   await init(directory, options);
 });
@@ -2256,7 +2904,7 @@ Unknown format: ${options.format}. Supported: paperclip
   }
   await exportPaperclip(options);
 });
-program.command("watch").description("Start adaptive memory daemon for this workspace").option("--stop", "Stop the running daemon").option("--silent", "Run without output").option("--once", "Run all observers once and exit (no persistent daemon)").option("--_daemon", void 0).action(async (options) => {
+program.command("watch").description("Start adaptive memory daemon for this workspace").option("--stop", "Stop the running daemon").option("--silent", "Run without output").option("--once", "Run all observers once and exit (no persistent daemon)").action(async (options) => {
   await watch(options);
 });
 program.command("analyze").description("Run codebase convention scan immediately").action(async () => {