guardian-framework 0.1.128 → 0.1.130

package/dist/cli.js

@@ -3202,7 +3202,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.128", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.130", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {
@@ -3213,7 +3213,10 @@ var init_package = __esm(() => {
   bin = {
     "guardian-framework": "dist/cli.js"
   };
-  files = ["dist/", "templates/"];
+  files = [
+    "dist/",
+    "templates/"
+  ];
   engines = {
     bun: ">=1.0.0"
   };
@@ -3231,9 +3234,15 @@ var init_package = __esm(() => {
     access: "public"
   };
   pi = {
-    extensions: ["./templates/pi/extensions"],
-    skills: ["./templates/pi/skills"],
-    prompts: ["./templates/pi/prompts"]
+    extensions: [
+      "./templates/pi/extensions"
+    ],
+    skills: [
+      "./templates/pi/skills"
+    ],
+    prompts: [
+      "./templates/pi/prompts"
+    ]
   };
   repository = {
     type: "git",
@@ -12178,6 +12187,60 @@ function answerExploration(sessionId, responseJson, options) {
     warnings
   };
 }
+function moduleHasImplementation(projectDir, moduleName) {
+  const sanitized = (moduleName || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+  if (!sanitized)
+    return false;
+  const roots = ["src", "crates", "packages", "internal", "lib", "app", "modules"];
+  const exts = ".*.(java|kt|ts|tsx|js|jsx|rs|py|go)$";
+  for (const root of roots) {
+    const base = path2.join(projectDir, root);
+    if (!fs.existsSync(base))
+      continue;
+    try {
+      const walk = (dir, depth) => {
+        if (depth > 6)
+          return false;
+        let entries;
+        try {
+          entries = fs.readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return false;
+        }
+        for (const e of entries) {
+          if (e.name === "node_modules" || e.name === "target" || e.name === "dist" || e.name === ".git")
+            continue;
+          const full = path2.join(dir, e.name);
+          if (e.isDirectory()) {
+            if (e.name === sanitized && hasSourceBelow(full, depth))
+              return true;
+            if (walk(full, depth + 1))
+              return true;
+          }
+        }
+        return false;
+      };
+      const hasSourceBelow = (dir, depth) => {
+        let entries;
+        try {
+          entries = fs.readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return false;
+        }
+        for (const e of entries) {
+          if (e.isFile() && new RegExp(exts).test(e.name) && !/test|spec/i.test(e.name))
+            return true;
+          if (e.isDirectory() && e.name !== "node_modules" && e.name !== "target" && depth < 6 && hasSourceBelow(path2.join(dir, e.name), depth + 1))
+            return true;
+        }
+        return false;
+      };
+      if (walk(base, 0))
+        return true;
+    } catch {}
+  }
+  return false;
+}
 function readExplorationSession(sessionId, projectDir) {
   const root = projectDir ?? process.cwd();
   const filePath = path2.join(root, ".pi", "domain", "exploration", `${sessionId}.md`);
@@ -12378,11 +12441,16 @@ function scaffoldFromExploration(sessionId, options) {
     const invariants = bc.invariants || [];
     const force = options?.overwrite === true;
     if (!dryRun && fs.existsSync(filePath)) {
-      if (!force) {
-        warnings.push(`Module already exists, preserved (use overwrite:true to replace): ${fileName}`);
+      const implemented = moduleHasImplementation(projectDir, moduleName);
+      if (implemented && !force) {
+        warnings.push(`Module is IMPLEMENTED, preserved (use overwrite:true to force): ${fileName}`);
         continue;
       }
-      warnings.push(`Module already exists, will be overwritten: ${fileName}`);
+      if (implemented && force) {
+        warnings.push(`Overwriting implemented module doc (--force): ${fileName}`);
+      } else {
+        warnings.push(`Refreshing planned module doc (no implementation yet): ${fileName}`);
+      }
     }
     const aggregateRoots = contextEntities.filter((e) => e.type === "aggregate-root");
     const regularEntities = contextEntities.filter((e) => e.type === "entity");
@@ -13155,7 +13223,7 @@ async function runDomain(targetDir, args, options) {
       await runExplore(targetDir, options);
       break;
     case "scaffold":
-      await runScaffold(targetDir, args[1], options);
+      await runScaffold(targetDir, args[1], { ...options, overwrite: args.includes("--force") });
       break;
     case "answer":
       await runAnswer(targetDir, args[1], args[2], options);
@@ -13262,7 +13330,8 @@ async function runScaffold(targetDir, sessionId, options) {
   try {
     const result = scaffoldFromExploration(sessionId, {
       projectDir: targetDir,
-      dryRun: options.dryRun
+      dryRun: options.dryRun,
+      overwrite: options.overwrite
     });
     if (options.dryRun) {
       outro(`Dry-run: would generate ${result.modulesGenerated} module(s)`);

package/dist/exports.js

@@ -1987,7 +1987,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.128", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.130", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {
@@ -1998,7 +1998,10 @@ var init_package = __esm(() => {
   bin = {
     "guardian-framework": "dist/cli.js"
   };
-  files = ["dist/", "templates/"];
+  files = [
+    "dist/",
+    "templates/"
+  ];
   engines = {
     bun: ">=1.0.0"
   };
@@ -2016,9 +2019,15 @@ var init_package = __esm(() => {
     access: "public"
   };
   pi = {
-    extensions: ["./templates/pi/extensions"],
-    skills: ["./templates/pi/skills"],
-    prompts: ["./templates/pi/prompts"]
+    extensions: [
+      "./templates/pi/extensions"
+    ],
+    skills: [
+      "./templates/pi/skills"
+    ],
+    prompts: [
+      "./templates/pi/prompts"
+    ]
   };
   repository = {
     type: "git",
@@ -12502,6 +12511,60 @@ function answerExploration(sessionId, responseJson, options) {
     warnings
   };
 }
+function moduleHasImplementation(projectDir, moduleName) {
+  const sanitized = (moduleName || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+  if (!sanitized)
+    return false;
+  const roots = ["src", "crates", "packages", "internal", "lib", "app", "modules"];
+  const exts = ".*.(java|kt|ts|tsx|js|jsx|rs|py|go)$";
+  for (const root of roots) {
+    const base = path11.join(projectDir, root);
+    if (!fs12.existsSync(base))
+      continue;
+    try {
+      const walk = (dir, depth) => {
+        if (depth > 6)
+          return false;
+        let entries;
+        try {
+          entries = fs12.readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return false;
+        }
+        for (const e of entries) {
+          if (e.name === "node_modules" || e.name === "target" || e.name === "dist" || e.name === ".git")
+            continue;
+          const full = path11.join(dir, e.name);
+          if (e.isDirectory()) {
+            if (e.name === sanitized && hasSourceBelow(full, depth))
+              return true;
+            if (walk(full, depth + 1))
+              return true;
+          }
+        }
+        return false;
+      };
+      const hasSourceBelow = (dir, depth) => {
+        let entries;
+        try {
+          entries = fs12.readdirSync(dir, { withFileTypes: true });
+        } catch {
+          return false;
+        }
+        for (const e of entries) {
+          if (e.isFile() && new RegExp(exts).test(e.name) && !/test|spec/i.test(e.name))
+            return true;
+          if (e.isDirectory() && e.name !== "node_modules" && e.name !== "target" && depth < 6 && hasSourceBelow(path11.join(dir, e.name), depth + 1))
+            return true;
+        }
+        return false;
+      };
+      if (walk(base, 0))
+        return true;
+    } catch {}
+  }
+  return false;
+}
 function readExplorationSession(sessionId, projectDir) {
   const root = projectDir ?? process.cwd();
   const filePath = path11.join(root, ".pi", "domain", "exploration", `${sessionId}.md`);
@@ -12702,11 +12765,16 @@ function scaffoldFromExploration(sessionId, options) {
     const invariants = bc.invariants || [];
     const force = options?.overwrite === true;
     if (!dryRun && fs12.existsSync(filePath)) {
-      if (!force) {
-        warnings.push(`Module already exists, preserved (use overwrite:true to replace): ${fileName}`);
+      const implemented = moduleHasImplementation(projectDir, moduleName);
+      if (implemented && !force) {
+        warnings.push(`Module is IMPLEMENTED, preserved (use overwrite:true to force): ${fileName}`);
         continue;
       }
-      warnings.push(`Module already exists, will be overwritten: ${fileName}`);
+      if (implemented && force) {
+        warnings.push(`Overwriting implemented module doc (--force): ${fileName}`);
+      } else {
+        warnings.push(`Refreshing planned module doc (no implementation yet): ${fileName}`);
+      }
     }
     const aggregateRoots = contextEntities.filter((e) => e.type === "aggregate-root");
     const regularEntities = contextEntities.filter((e) => e.type === "entity");
@@ -13479,7 +13547,7 @@ async function runDomain(targetDir, args, options) {
       await runExplore(targetDir, options);
       break;
     case "scaffold":
-      await runScaffold(targetDir, args[1], options);
+      await runScaffold(targetDir, args[1], { ...options, overwrite: args.includes("--force") });
       break;
     case "answer":
       await runAnswer(targetDir, args[1], args[2], options);
@@ -13586,7 +13654,8 @@ async function runScaffold(targetDir, sessionId, options) {
   try {
     const result = scaffoldFromExploration(sessionId, {
       projectDir: targetDir,
-      dryRun: options.dryRun
+      dryRun: options.dryRun,
+      overwrite: options.overwrite
     });
     if (options.dryRun) {
       outro(`Dry-run: would generate ${result.modulesGenerated} module(s)`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "guardian-framework",
-	"version": "0.1.128",
+	"version": "0.1.130",
 	"description": "Token-optimized agentic framework scaffolder with pi-first architecture",
 	"type": "module",
 	"main": "dist/exports.js",
@@ -14,7 +14,10 @@
 	"bin": {
 		"guardian-framework": "dist/cli.js"
 	},
-	"files": ["dist/", "templates/"],
+	"files": [
+		"dist/",
+		"templates/"
+	],
 	"engines": {
 		"bun": ">=1.0.0"
 	},
@@ -32,9 +35,15 @@
 		"access": "public"
 	},
 	"pi": {
-		"extensions": ["./templates/pi/extensions"],
-		"skills": ["./templates/pi/skills"],
-		"prompts": ["./templates/pi/prompts"]
+		"extensions": [
+			"./templates/pi/extensions"
+		],
+		"skills": [
+			"./templates/pi/skills"
+		],
+		"prompts": [
+			"./templates/pi/prompts"
+		]
 	},
 	"repository": {
 		"type": "git",

package/templates/pi/extensions/domain-explorer.ts

@@ -239,6 +239,231 @@ function mergeRawJson(existing: Record<string, unknown>, incoming: Record<string
 	return merged;
 }
 
+// True when a module has real implementation code (not just a planned doc).
+// ── Self-driving exploration driver ─────────────────────────────────────────
+// After every successful domain_save_result merge the driver inspects the saved
+// session and dispatches the NEXT phase as its own small agent turn. The model is
+// never asked to carry the whole protocol, and a truncation anywhere only loses
+// the current small batch — /domain --resume <session> re-dispatches exactly the
+// next unfinished phase from persisted state (nothing is ever re-derived).
+
+type PhaseKind = "strategic" | "requirements" | "usecases" | "context" | "done";
+
+function nextPhaseDecision(raw: Record<string, unknown>): { kind: PhaseKind; contextName?: string } {
+	const bcs = Array.isArray(raw.boundedContexts) ? (raw.boundedContexts as Record<string, unknown>[]) : [];
+	if (bcs.length === 0) return { kind: "strategic" };
+	const prog = (raw.protocolProgress as Record<string, unknown>) ?? {};
+	if (prog.requirementsComplete !== true) return { kind: "requirements" };
+	if (prog.usecasesComplete !== true) return { kind: "usecases" };
+	// Per-context tactical passes for every non-supporting/generic context that is
+	// not yet enriched (all strategic-listed entities present or any entity saved).
+	const supporting = new Set(bcs
+		.filter((bc) => /supporting|generic/i.test(String(bc.subdomainType ?? "")))
+		.map((bc) => String(bc.name ?? "")));
+	const saved = Array.isArray(raw.entities) ? (raw.entities as Record<string, unknown>[]) : [];
+	const byContext = new Map<string, Set<string>>();
+	for (const e of saved) {
+		const c = String(e.context ?? "");
+		const n = String(e.name ?? "");
+		if (!c || !n) continue;
+		if (!byContext.has(c)) byContext.set(c, new Set());
+		byContext.get(c)!.add(n);
+	}
+	const enriched = (name: string): boolean => {
+		const bc = bcs.find((x) => String(x.name ?? "") === name);
+		const need = (Array.isArray(bc?.entities) ? (bc!.entities as unknown[]) : []).map(String).filter(Boolean);
+		const have = byContext.get(name);
+		if (need.length > 0) return need.every((n) => have?.has(n));
+		return (have?.size ?? 0) > 0 || (Array.isArray(bc?.invariants) && (bc!.invariants as unknown[]).length > 0);
+	};
+	for (const bc of bcs) {
+		const name = String(bc.name ?? "");
+		if (!name || supporting.has(name) || enriched(name)) continue;
+		const remaining = (Array.isArray(bc.entities) ? (bc.entities as unknown[]) : [])
+			.map(String).filter((n) => !byContext.get(name)?.has(n));
+		return { kind: "context", contextName: name };
+	}
+	return { kind: "done" };
+}
+
+function maxSeqId(items: unknown[] | undefined, prefix: string): number {
+	let max = 0;
+	for (const it of (items ?? []) as Record<string, unknown>[]) {
+		const m = String(it.id ?? "").match(new RegExp("^" + prefix + "-(\\d+)$"));
+		if (m) max = Math.max(max, Number(m[1]));
+	}
+	return max;
+}
+
+const DRIVER_RULES = [
+	"- Reply with ONLY the small JSON for the requested step — no prose, no fences, no reasoning.",
+	"- Emit AT MOST 5 items per message (fewer if any item is long). Keep the JSON well under",
+	"  ~2,500 tokens so the domain_save_result call that follows always fits in the same message.",
+	"- Call domain_save_result with { sessionId, responseJson: <that exact JSON> } and STOP —",
+	"  nothing after the tool call. The driver sends your next step after it saves.",
+].join("\n");
+
+function buildStrategicMessage(sessionId: string, businessContext: string): string {
+	return [
+		"Analyze this business domain with Domain-Driven Design. Work in SMALL incremental steps —",
+		"one phase per message; the driver will send each next phase after you save. This first",
+		"message is the STRATEGIC PASS only.",
+		"",
+		"Session: " + sessionId,
+		"Business Context: " + businessContext,
+		"",
+		"Reply with ONLY this JSON:",
+		'```json',
+		'{',
+		'  "businessContext": "one-line summary of the domain",',
+		'  "actors": [{ "name": "...", "description": "...", "interactions": "..." }],',
+		'  "assumptions": [{ "assumption": "...", "impactIfWrong": "...", "mitigation": "..." }],',
+		'  "boundedContexts": [',
+		'    { "name": "...", "description": "...", "entities": ["..."],',
+		'      "subdomainType": "core|supporting|generic", "subdomainRationale": "one line" }',
+		'  ],',
+		'  "contextMap": [{ "from": "A", "to": "B", "relationship": "partnership|shared-kernel|conformist|anticorruption-layer|open-host", "note": "..." }],',
+		'  "openQuestions": "..."',
+		'}',
+		'```',
+		"",
+		DRIVER_RULES,
+	].join("\n");
+}
+
+function buildRequirementsMessage(raw: Record<string, unknown>, sessionId: string): string {
+	const fr = Array.isArray(raw.functionalRequirements) ? (raw.functionalRequirements as Record<string, unknown>[]) : [];
+	const nfr = Array.isArray(raw.nonFunctionalRequirements) ? (raw.nonFunctionalRequirements as Record<string, unknown>[]) : [];
+	const nextFr = maxSeqId(fr, "FR") + 1;
+	const nextNfr = maxSeqId(nfr, "NFR") + 1;
+	return [
+		"Session " + sessionId + " — REQUIREMENTS PASS (batch). Saved so far: " +
+			fr.length + " functional, " + nfr.length + " non-functional.",
+		"Produce the NEXT contiguous batch: up to 5 functional requirements starting at FR-" +
+			String(nextFr).padStart(3, "0") + (fr.length === 0 ? "" : " (continue from the last saved id)") +
+			" and/or up to 5 non-functional requirements starting at NFR-" + String(nextNfr).padStart(3, "0") + ".",
+		"Only include the type you still have left to deliver.",
+		"",
+		"Reply with ONLY this JSON:",
+		'```json',
+		'{',
+		'  "functionalRequirements": [',
+		'    { "id": "FR-001", "requirement": "The system shall...", "priority": "critical|high|medium|low", "boundedContext": "ContextName" }',
+		'  ],',
+		'  "nonFunctionalRequirements": [',
+		'    { "id": "NFR-001", "requirement": "The system shall...", "category": "performance|security|scalability|availability|maintainability", "target": "measurable target" }',
+		'  ]',
+		'}',
+		'```',
+		"On your FINAL requirements batch add \"requirementsComplete\": true to the JSON",
+		"(omit both arrays if a type is done and only send the flag).",
+		"",
+		DRIVER_RULES,
+	].join("\n");
+}
+
+function buildUsecasesMessage(sessionId: string): string {
+	return [
+		"Session " + sessionId + " — USE-CASES PASS (batch). Produce up to 4 application services for the",
+		"core contexts (name the owning context exactly as in the strategic pass).",
+		"",
+		"Reply with ONLY this JSON:",
+		'```json',
+		'{',
+		'  "applicationServices": [',
+		'    { "name": "ApproveRequest", "context": "ApprovalWorkflow", "useCase": "what this application service orchestrates",',
+		'      "commands": ["verify intent", "consume"], "aggregates": ["ApprovalTicket"], "mapsToFr": "FR-00x" }',
+		'  ]',
+		'}',
+		'```',
+		"On your FINAL use-cases batch add \"usecasesComplete\": true to the JSON.",
+		"",
+		DRIVER_RULES,
+	].join("\n");
+}
+
+function buildContextMessage(raw: Record<string, unknown>, sessionId: string, contextName: string): string {
+	const bc = (Array.isArray(raw.boundedContexts) ? (raw.boundedContexts as Record<string, unknown>[]) : [])
+		.find((x) => String(x.name ?? "") === contextName);
+	const need = (Array.isArray(bc?.entities) ? (bc!.entities as unknown[]) : []).map(String).filter(Boolean);
+	const done = Array.isArray(raw.entities) ? (raw.entities as Record<string, unknown>[])
+		.filter((e) => String(e.context ?? "") === contextName).map((e) => String(e.name ?? "")) : [];
+	const remaining = need.filter((n) => !done.includes(n));
+	return [
+		"Session " + sessionId + " — PER-CONTEXT PASS for \"" + contextName + "\"" +
+			(remaining.length > 0 ? " (still needed from strategic list: " + remaining.join(", ") + ")" : "") + ".",
+		"Enrich this ONE context: entities with entity-vs-VO justification, domain events with triage,",
+		"invariants, and this context's ubiquitous language. Up to 6 entities per message — if the",
+		"context has more, the driver will ask you to continue this same context.",
+		"",
+		"Reply with ONLY this JSON:",
+		'```json',
+		'{',
+		'  "boundedContexts": [{ "name": "' + contextName + '", "description": "...", "entities": ["Entity1"],',
+		'    "invariants": [{ "rule": "...", "illegalStatePrevented": "..." }] }],',
+		'  "entities": [',
+		'    { "name": "Entity1", "context": "' + contextName + '", "type": "entity|value-object|aggregate-root",',
+		'      "description": "...",',
+		'      "justification": { "identityPersists": true, "immutable": false, "equalByState": false } }',
+		'  ],',
+		'  "domainEvents": [',
+		'    { "name": "Event", "context": "' + contextName + '", "description": "...", "triggeredBy": "...",',
+		'      "triage": { "domainExpertCares": true, "crossesAggregateBoundary": false, "needsAudit": false } }',
+		'  ],',
+		'  "ubiquitousLanguage": [{ "term": "...", "definition": "...", "boundedContext": "' + contextName + '", "aliases": [], "examples": "" }]',
+		'}',
+		'```',
+		"",
+		DRIVER_RULES,
+	].join("\n");
+}
+
+function buildPhaseMessage(kind: PhaseKind, raw: Record<string, unknown>, sessionId: string, contextName?: string): string {
+	if (kind === "strategic") return buildStrategicMessage(sessionId, String(raw.businessContext ?? ""));
+	if (kind === "requirements") return buildRequirementsMessage(raw, sessionId);
+	if (kind === "usecases") return buildUsecasesMessage(sessionId);
+	if (kind === "context") return buildContextMessage(raw, sessionId, contextName ?? "");
+	return "";
+}
+
+function moduleHasCode(cwd: string, moduleName: string): boolean {
+	const sanitized = (moduleName || "").toLowerCase().replace(/[^a-z0-9]/g, "");
+	if (!sanitized) return false;
+	const roots = ["src", "crates", "packages", "internal", "lib", "app", "modules"];
+	const codeFile = (n: string): boolean => /.*\.(java|kt|ts|tsx|js|jsx|rs|py|go)$/.test(n) && !/test|spec/i.test(n);
+	const walk = (dir: string, depth: number): boolean => {
+		if (depth > 6) return false;
+		let entries;
+		try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return false; }
+		for (const e of entries) {
+			if (["node_modules", "target", "dist", ".git"].includes(e.name)) continue;
+			const full = path.join(dir, e.name);
+			if (e.isFile() && codeFile(e.name)) return true;
+			if (e.isDirectory() && (e.name === sanitized || walk(full, depth + 1))) {
+				// entered the module dir: any code file below counts
+				if (e.name === sanitized && hasCodeBelow(full, depth)) return true;
+			}
+		}
+		return false;
+	};
+	const hasCodeBelow = (dir: string, depth: number): boolean => {
+		let entries;
+		try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return false; }
+		for (const e of entries) {
+			if (["node_modules", "target", "dist"].includes(e.name)) continue;
+			const full = path.join(dir, e.name);
+			if (e.isFile() && codeFile(e.name)) return true;
+			if (e.isDirectory() && depth < 6 && hasCodeBelow(full, depth + 1)) return true;
+		}
+		return false;
+	};
+	for (const r of roots) {
+		const base = path.join(cwd, r);
+		if (fs.existsSync(base) && walk(base, 0)) return true;
+	}
+	return false;
+}
+
 function buildExplorationPrompt(context: string): string {
 	return [
 		"You are a Domain-Driven Design expert. Analyze the following business",
@@ -422,6 +647,14 @@ export default function (pi: ExtensionAPI) {
 				return { content: [{ type: "text" as const, text: "ERROR: Failed to parse JSON: " + String(e) }] };
 			}
 
+			// Phase-completion flags ride along on the model's JSON but are not part of
+			// the persisted schema — pull them off before merging so they never pollute
+			// the raw session, then fold them into protocolProgress below.
+			const flagsRc = parsedJson.requirementsComplete === true;
+			const flagsUc = parsedJson.usecasesComplete === true;
+			delete parsedJson.requirementsComplete;
+			delete parsedJson.usecasesComplete;
+
 			// Incremental: merge into any previously saved structured session
 			// (<session>.raw.json) so large domains can be saved in parts.
 			const rawPath = path.join(ctx.cwd, ".pi", "domain", "exploration", sessionId + ".raw.json");
@@ -437,6 +670,19 @@ export default function (pi: ExtensionAPI) {
 			parsedJson.status = String(parsedJson.status ?? "draft");
 			parsedJson.createdAt = parsedJson.createdAt ?? new Date().toISOString();
 
+			// Self-driving protocol progress. The driver asks the model ONE phase at a
+			// time; these markers say which phases are finished. Stored separately so
+			// the model schema stays clean and id-keyed merges never disturb them.
+			const prevRawForProg = (() => {
+				try { return JSON.parse(fs.readFileSync(rawPath, "utf-8")) as Record<string, unknown>; }
+				catch { return {}; }
+			})();
+			const prevProg = (prevRawForProg.protocolProgress as Record<string, unknown>) ?? {};
+			parsedJson.protocolProgress = {
+				requirementsComplete: prevProg.requirementsComplete === true || flagsRc,
+				usecasesComplete: prevProg.usecasesComplete === true || flagsUc,
+			};
+
 			// Derive aggregate roots from the entities table — never let the
 			// rendered "## Aggregate Roots" contradict entities marked
 			// aggregate-root (the protocol passes don't carry this field).
@@ -571,7 +817,27 @@ export default function (pi: ExtensionAPI) {
 			}
 
 			onUpdate?.({ content: [{ type: "text", text: "Domain exploration saved for session: " + sessionId }] });
-			return { content: [{ type: "text" as const, text: "Domain exploration saved for " + sessionId + ". Next: /domain --architect-scaffold " + sessionId + " or review .pi/domain/exploration.md" }] };
+
+			// Self-driving: after every successful save, dispatch the next phase as a
+			// fresh small agent turn (or tell the model exploration is complete). If a
+			// phase needs more batches (requirements >5, context >6 entities) the same
+			// decision re-issues that phase with progress hints — never a reset.
+			const decision = nextPhaseDecision(parsedJson);
+			const savedNote = "Domain exploration saved for " + sessionId + ".";
+			if (decision.kind === "done") {
+				return { content: [{ type: "text" as const, text: savedNote + " Exploration content complete — run /domain --validate " + sessionId }] };
+			}
+			const label = decision.kind === "context" ? "context " + (decision.contextName ?? "") : decision.kind;
+			const nextMsg = buildPhaseMessage(decision.kind, parsedJson, sessionId, decision.contextName);
+			try {
+				pi.sendMessage(
+					{ content: nextMsg, display: true },
+					{ deliverAs: "followUp", triggerTurn: true },
+				);
+				return { content: [{ type: "text" as const, text: savedNote + " Next phase dispatched: " + label }] };
+			} catch {
+				return { content: [{ type: "text" as const, text: savedNote + "\n\nNEXT PHASE (" + label + "):\n" + nextMsg }] };
+			}
 		},
 	});
 
@@ -880,86 +1146,7 @@ export default function (pi: ExtensionAPI) {
 				// Inject the DDD analysis prompt as a follow-up message to the agent.
 				// Using sendMessage with triggerTurn=true causes the agent to process
 				// this as a new conversation turn, not as a command response.
-				const analysisPrompt = [
-					"Analyze this business domain with Domain-Driven Design. You MUST work in SMALL",
-					"incremental steps — never produce the whole model in one message, or you will be",
-					"truncated mid-JSON and lose work.",
-					"",
-					"Session: " + sessionId,
-					"Business Context: " + sanitized,
-					"",
-					"STEP PROTOCOL (strict — one step per message, each message <= ~1,500 tokens of JSON):",
-					"",
-					"1. STRATEGIC PASS (this message): reply with ONLY this JSON, nothing else —",
-					'```json',
-					'{',
-					'  "businessContext": "one-line summary of the domain",',
-					'  "actors": [{ "name": "...", "description": "...", "interactions": "..." }],',
-					'  "assumptions": [{ "assumption": "...", "impactIfWrong": "...", "mitigation": "..." }],',
-					'  "boundedContexts": [',
-					'    { "name": "...", "description": "...", "entities": ["..."],',
-					'      "subdomainType": "core|supporting|generic", "subdomainRationale": "one line" }',
-					'  ],',
-					'  "contextMap": [{ "from": "A", "to": "B", "relationship": "partnership|shared-kernel|conformist|anticorruption-layer|open-host", "note": "..." }],',
-					'  "openQuestions": "..."',
-					'}',
-					'```',
-					"then call domain_save_result with { sessionId, responseJson: <that JSON> }. It merges;",
-					"the file is saved for you. Do NOT also edit exploration.md by hand.",
-					"",
-					"1b. REQUIREMENTS PASS (next message): reply with ONLY this JSON, then call domain_save_result",
-					"again (merge is by id — existing entries are untouched):",
-					'```json',
-					'{',
-					'  "functionalRequirements": [',
-					'    { "id": "FR-001", "requirement": "The system shall...", "priority": "critical|high|medium|low", "boundedContext": "ContextName" }',
-					'  ],',
-					'  "nonFunctionalRequirements": [',
-					'    { "id": "NFR-001", "requirement": "The system shall...", "category": "performance|security|scalability|availability|maintainability", "target": "measurable target" }',
-					'  ]',
-					'}',
-					'```',
-					"",
-					"1c. USE-CASES PASS (next message): reply with ONLY this JSON for ALL core contexts, then call",
-					"domain_save_result (merge is by name+context):",
-					'```json',
-					'{',
-					'  "applicationServices": [',
-					'    { "name": "ApproveRequest", "context": "ApprovalWorkflow", "useCase": "what this application service orchestrates",',
-					'      "commands": ["verify intent", "consume"], "aggregates": ["ApprovalTicket"], "mapsToFr": "FR-00x" }',
-					'  ]',
-					'}',
-					'```',
-					"",
-					"2. PER-CONTEXT PASS (repeat for EACH core/tactical bounded context, one context per message):",
-					"reply with ONLY this JSON for one context, then call domain_save_result again:",
-					'```json',
-					'{',
-					'  "boundedContexts": [{ "name": "TheContext", "description": "...", "entities": ["Entity1"],',
-					'    "invariants": [{ "rule": "...", "illegalStatePrevented": "..." }] }],',
-					'  "entities": [',
-					'    { "name": "Entity1", "context": "TheContext", "type": "entity|value-object|aggregate-root",',
-					'      "description": "...",',
-					'      "justification": { "identityPersists": true, "immutable": false, "equalByState": false } }',
-					'  ],',
-					'  "domainEvents": [',
-					'    { "name": "Event", "context": "TheContext", "description": "...", "triggeredBy": "...",',
-					'      "triage": { "domainExpertCares": true, "crossesAggregateBoundary": false, "needsAudit": false } }',
-					'  ],',
-					'  "ubiquitousLanguage": [{ "term": "...", "definition": "...", "boundedContext": "TheContext", "aliases": [], "examples": "" }]',
-					'}',
-					'```',
-					"Supporting/generic contexts need no detail pass — the strategic entry is enough.",
-					"",
-					"RULES:",
-					"- If a message of yours is cut off mid-JSON, continue from exactly where you stopped in the",
-					"  NEXT message (never restart the whole model).",
-					"- Never emit the full model in one response and never exceed ~1,500 tokens of JSON per message.",
-					"- HARD RULE: never narrate or reason in chat. No prose analysis, no relationship",
-					"  deliberation, no summaries — those burn your output budget and truncate the JSON.",
-					"  Emit ONLY the small JSON step for the current phase and stop.",
-					"- After the last context, run /domain --validate " + sessionId + " and report the checks.",
-				].join("\n");
+				const analysisPrompt = buildStrategicMessage(sessionId, sanitized);
 				
 
 				try {
@@ -975,6 +1162,43 @@ export default function (pi: ExtensionAPI) {
 				return "Domain analysis dispatched to agent. Session: " + sessionId;
 			}
 
+			// /domain --resume <session-id> — re-dispatch the next unfinished phase from
+			// persisted state. Truncation anywhere in the protocol is recoverable with
+			// this: it never asks the model to reproduce saved content.
+			if (trimmed.startsWith("--resume")) {
+				const sessionId = trimmed.slice("--resume".length).trim().split(/\s+/)[0] || "";
+				if (!sessionId) {
+					ctx.ui.notify("Usage: /domain --resume <session-id>", "error");
+					return "(domain command handled)";
+				}
+				const explorationDir = path.join(ctx.cwd, ".pi", "domain", "exploration");
+				const rawPath = path.join(explorationDir, sessionId + ".raw.json");
+				if (!fs.existsSync(rawPath)) {
+					ctx.ui.notify("Session not found: " + sessionId + ". Run /domain --explore first.", "error");
+					return "(domain command handled)";
+				}
+				let raw: Record<string, unknown> = {};
+				try { raw = JSON.parse(fs.readFileSync(rawPath, "utf-8")) as Record<string, unknown>; }
+				catch { ctx.ui.notify("Session raw state unreadable for " + sessionId, "error"); return "(domain command handled)"; }
+				const decision = nextPhaseDecision(raw);
+				if (decision.kind === "done") {
+					ctx.ui.notify("Exploration content is complete — run /domain --validate " + sessionId, "info");
+					return "(domain command handled)";
+				}
+				const label = decision.kind === "context" ? "context " + decision.contextName : decision.kind;
+				ctx.ui.notify("Resumed " + sessionId + " at phase: " + label, "success");
+				const msg = buildPhaseMessage(decision.kind, raw, sessionId, decision.contextName);
+				try {
+					pi.sendMessage(
+						{ content: msg, display: true },
+						{ deliverAs: "followUp", triggerTurn: true },
+					);
+					return "Resumed " + sessionId + " at phase: " + label;
+				} catch {
+					return msg;
+				}
+			}
+
 			// /domain --architect-scaffold <session-id>
 			// /domain --architect-scaffold <session-id>
 			if (trimmed.startsWith("--architect-scaffold")) {
@@ -1058,7 +1282,7 @@ export default function (pi: ExtensionAPI) {
 				let scaffoldError = "";
 
 				try {
-					const cmd = "guardian-framework domain scaffold " + sessionId + " 2>&1";
+					const cmd = "guardian-framework domain scaffold " + sessionId + (forceScaffold ? " --force" : "") + " 2>&1";
 					const shellResult = await shellExec(ctx, cmd);
 					if (shellResult.exitCode === 0) {
 						const outputLines = shellResult.stdout.split("\n");
@@ -1281,7 +1505,9 @@ export default function (pi: ExtensionAPI) {
 				}
 				const preserved: string[] = [];
 				const moduleFiles = sessionModules.filter((f) => {
-					if (fs.existsSync(path.join(modulesDir, f)) && !forceEnrich) {
+					const exists = fs.existsSync(path.join(modulesDir, f));
+					const implemented = moduleHasCode(ctx.cwd, f.replace(/\.md$/, ""));
+					if (exists && implemented && !forceEnrich) {
 						preserved.push(f);
 						return false;
 					}

package/templates/pi/preflight_report.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2026-09-06T13:11:45Z",
+  "timestamp": "2026-09-06T14:57:05Z",
   "mode": "all",
   "stages_run": [],
   "summary": {