gentle-pi 2.2.0 → 2.4.0

package/lib/sdd-status.ts

@@ -6,7 +6,10 @@ import {
 	type DomainCollision,
 } from "./openspec-guardrails.ts";
 
-export type SddArtifactStore = "openspec" | "engram" | "both" | "none";
+// Canonical names match gentle-ai, which owns this contract. The dual-store
+// mode was called "both" here; "hybrid" is the provider's name for the same
+// thing, and normalizeSddArtifactStore keeps already-persisted "both" loading.
+export type SddArtifactStore = "openspec" | "engram" | "hybrid" | "none";
 export type ArtifactState = "missing" | "done" | "partial";
 export type DependencyState = "blocked" | "ready" | "all_done" | "not_applicable";
 export type ApplyState = "blocked" | "ready" | "all_done" | "not_applicable";
@@ -98,6 +101,12 @@ export interface SddStatus {
 	relationships: SddRelationships;
 	collisions: SddDomainCollisionReport[];
 	legacyFlatSpec?: { path: string; hasDomainSpecs: boolean };
+	/**
+	 * Positive terminal projection: the change was archived. `path` is the
+	 * repo-relative archive folder (openspec/changes/archive/YYYY-MM-DD-<change>).
+	 * When set, `nextRecommended` is "archived" and no further phase is recommended.
+	 */
+	archived?: { path: string };
 	nextRecommended: string;
 	instructions?: SddPhaseInstructions;
 	blockedReasons: string[];
@@ -111,36 +120,12 @@ export interface SddStatus {
 	isNonAuthoritative: boolean;
 }
 
-export interface ValidatedReviewAuthorityResolution {
-	activeAuthorityId: string;
-}
-
-/**
- * Optional controller-owned recovery overlay. Status never infers authority from
- * OpenSpec artifacts: callers opt in only when a repository review binding exists.
- */
-export interface SddReviewAuthorityOverlay {
-	expected: boolean;
-	resolve: () => ValidatedReviewAuthorityResolution | undefined;
-}
-
-/** Read-only native bound-change evidence supplied by the controller. */
-export interface NativeReviewReadinessOverlay {
-	expected: boolean;
-	ready: boolean;
-	lineageId?: string;
-	bindingRevision?: string;
-	reason?: string;
-}
-
 export interface ResolveSddStatusOptions {
 	cwd: string;
 	changeName?: string;
 	includeInstructions?: boolean;
 	workspaceRoot?: string;
 	artifactStore?: SddArtifactStore;
-	reviewAuthority?: SddReviewAuthorityOverlay;
-	nativeReviewReadiness?: NativeReviewReadinessOverlay;
 }
 
 const EMPTY_PATHS: SddArtifactPaths = {
@@ -273,43 +258,7 @@ function reportIsClearlyPassing(path: string | undefined): boolean {
 	return hasPassSignal && !hasBlocker;
 }
 
-function withRecoveryBlock(status: SddStatus, reviewAuthority?: SddReviewAuthorityOverlay, nativeReviewReadiness?: NativeReviewReadinessOverlay): SddStatus {
-	if (nativeReviewReadiness?.expected && !nativeReviewReadiness.ready) {
-		const reason = `resolve-review: ${nativeReviewReadiness.reason ?? "native bound review readiness is unavailable."}`;
-		return {
-			...status,
-			applyState: "blocked",
-			dependencies: { apply: "blocked", verify: "blocked", sync: "blocked", archive: "blocked" },
-			nextRecommended: "resolve-review",
-			blockedReasons: status.blockedReasons.includes(reason) ? status.blockedReasons : [...status.blockedReasons, reason],
-		};
-	}
-	if (!reviewAuthority?.expected) return status;
-	try {
-		const resolved = reviewAuthority.resolve();
-		if (resolved?.activeAuthorityId) return status;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		const reason = `resolve-review: ${message}`;
-		return {
-			...status,
-			applyState: "blocked",
-			dependencies: { apply: "blocked", verify: "blocked", sync: "blocked", archive: "blocked" },
-			nextRecommended: "resolve-review",
-			blockedReasons: status.blockedReasons.includes(reason) ? status.blockedReasons : [...status.blockedReasons, reason],
-		};
-	}
-	const reason = "resolve-review: validated active review authority is missing.";
-	return {
-		...status,
-		applyState: "blocked",
-		dependencies: { apply: "blocked", verify: "blocked", sync: "blocked", archive: "blocked" },
-		nextRecommended: "resolve-review",
-		blockedReasons: status.blockedReasons.includes(reason) ? status.blockedReasons : [...status.blockedReasons, reason],
-	};
-}
-
-function emptyStatus(cwd: string, changeName: string | null, blockedReasons: string[], artifactStore: SddArtifactStore = "openspec", isNonAuthoritative = false, reviewAuthority?: SddReviewAuthorityOverlay): SddStatus {
+function emptyStatus(cwd: string, changeName: string | null, blockedReasons: string[], artifactStore: SddArtifactStore = "openspec", isNonAuthoritative = false): SddStatus {
 	const root = resolve(cwd);
 	const changesDir = join(root, "openspec", "changes");
 	const actionContext: SddActionContext = {
@@ -318,7 +267,7 @@ function emptyStatus(cwd: string, changeName: string | null, blockedReasons: str
 		allowedEditRoots: [root],
 		warnings: [],
 	};
-	return withRecoveryBlock({
+	return {
 		schemaName: "gentle-pi.sdd-status",
 		schemaVersion: 1,
 		changeName,
@@ -353,7 +302,32 @@ function emptyStatus(cwd: string, changeName: string | null, blockedReasons: str
 		nextRecommended: blockedReasons[0] ?? "Start an SDD change.",
 		blockedReasons,
 		isNonAuthoritative,
-	}, reviewAuthority, undefined);
+	};
+}
+
+/**
+ * Find the newest archive entry for a change. Archive folders are named
+ * `YYYY-MM-DD-<change>`; only an exact `-<change>` suffix after a full date
+ * prefix matches (change "foo-bar" never matches "2026-01-01-foo-bar-baz").
+ * safeDirectories sorts lexicographically, so the last match is the newest date.
+ */
+function findArchivedChangeEntry(root: string, changeName: string): string | undefined {
+	return safeDirectories(join(root, "openspec", "changes", "archive"))
+		.filter(
+			(entry) =>
+				/^\d{4}-\d{2}-\d{2}-$/.test(entry.slice(0, 11)) && entry.slice(11) === changeName,
+		)
+		.at(-1);
+}
+
+/** Positive terminal projection for a change whose folder moved to the archive. */
+function archivedStatus(cwd: string, changeName: string, archiveEntry: string, artifactStore: SddArtifactStore): SddStatus {
+	const status = emptyStatus(cwd, changeName, [], artifactStore);
+	status.applyState = "all_done";
+	status.dependencies = { apply: "all_done", verify: "all_done", sync: "all_done", archive: "all_done" };
+	status.archived = { path: join("openspec", "changes", "archive", archiveEntry) };
+	status.nextRecommended = "archived";
+	return status;
 }
 
 export function listActiveOpenSpecChanges(cwd: string): string[] {
@@ -482,7 +456,7 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 	//   - store engram or none: always non-authoritative (no disk backing)
 	//   - store both, no openspec/ dir: non-authoritative (no disk to scan)
 	// The both-with-openspec cases are handled below after listing active changes.
-	if (store === "engram" || store === "none" || (store === "both" && !hasOpenSpecDir)) {
+	if (store === "engram" || store === "none" || (store === "hybrid" && !hasOpenSpecDir)) {
 		const changeName = options.changeName?.trim() || null;
 		return nonAuthoritativeStatus(options.cwd, changeName, store, options.includeInstructions);
 	}
@@ -500,16 +474,16 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 			// store both + openspec/ present + zero active changes + no changeName:
 			// The change may live only in Engram — non-authoritative, not a false block.
 			// Pure openspec with zero changes is a real block (run sdd-new).
-			if (store === "both") {
+			if (store === "hybrid") {
 				return nonAuthoritativeStatus(options.cwd, null, store, options.includeInstructions);
 			}
-			return emptyStatus(root, null, ["No active SDD changes found."], store, false, options.reviewAuthority);
+			return emptyStatus(root, null, ["No active SDD changes found."], store);
 		} else {
 			// Multiple active changes and no changeName: legit selection prompt (changes DO exist
 			// on disk). Keep the existing authoritative ambiguous-selection behavior for both stores.
 			return emptyStatus(root, null, [
 				`Change selection is ambiguous: ${activeChanges.join(", ")}.`,
-			], store, false, options.reviewAuthority);
+			], store);
 		}
 	}
 
@@ -517,10 +491,16 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 		// store both + openspec/ present + named change NOT found on disk:
 		// The change may live only in Engram — non-authoritative.
 		// Pure openspec still blocks (legit "run sdd-new").
-		if (store === "both") {
+		if (store === "hybrid") {
 			return nonAuthoritativeStatus(options.cwd, changeName, store, options.includeInstructions);
 		}
-		return emptyStatus(root, changeName, [`Active change not found: ${changeName}.`], store, false, options.reviewAuthority);
+		// Issue #535: an absent active folder may mean the change was archived.
+		// Project explicit completion instead of a false "run sdd-new" block.
+		const archiveEntry = findArchivedChangeEntry(root, changeName);
+		if (archiveEntry) {
+			return archivedStatus(root, changeName, archiveEntry, store);
+		}
+		return emptyStatus(root, changeName, [`Active change not found: ${changeName}.`], store);
 	}
 
 	const changeRoot = join(changesDir, changeName);
@@ -587,33 +567,13 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 		blockedReasons.push(`Legacy flat spec is present without domain specs: ${legacyFlatSpec.path}.`);
 	}
 
-	// Planning-only status remains filesystem-read-only: do not invoke a resolver
-	// unless the controller has established that review authority is expected.
-	if (options.reviewAuthority?.expected) {
-		try {
-			const resolved = options.reviewAuthority.resolve();
-			if (!resolved || typeof resolved.activeAuthorityId !== "string" || resolved.activeAuthorityId.length === 0) {
-				blockedReasons.push("resolve-review: validated active review authority is missing.");
-			}
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			blockedReasons.push(`resolve-review: ${message}`);
-		}
-	}
-	if (options.nativeReviewReadiness?.expected && !options.nativeReviewReadiness.ready) {
-		blockedReasons.push(`resolve-review: ${options.nativeReviewReadiness.reason ?? "native bound review readiness is unavailable."}`);
-	}
-
 	const coreArtifactsReady = artifacts.proposal === "done" && artifacts.specs === "done" && artifacts.design === "done" && artifacts.tasks === "done" && taskProgress.total > 0 && !flatOnly;
-	const reviewBlocked = blockedReasons.some((reason) => reason.startsWith("resolve-review:"));
 	const taskArtifactBlocked = taskAccounting.errors.length > 0;
-	const reviewApproved = Boolean((options.reviewAuthority?.expected || options.nativeReviewReadiness?.expected) && !reviewBlocked);
-	const applyState: ApplyState = !coreArtifactsReady || reviewBlocked || taskArtifactBlocked
+	const applyState: ApplyState = !coreArtifactsReady || taskArtifactBlocked
 		? "blocked"
 		: taskProgress.remaining === 0
 			? "all_done"
 			: "ready";
-	const parentLifecycleRequired = applyState === "all_done" && !reviewApproved;
 	const verifyClean = reportIsClearlyPassing(artifactPaths.verifyReport[0]);
 	const syncClean = reportIsClearlyPassing(artifactPaths.syncReport[0]);
 	const syncPrerequisitesReady = coreArtifactsReady && verifyClean && collisions.length === 0 && !flatOnly;
@@ -624,31 +584,27 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 		: "blocked";
 	const verifyState: DependencyState = verifyClean
 		? "all_done"
-		: reviewApproved && artifacts.tasks === "done" && taskProgress.total > 0 && (artifacts.applyProgress === "done" || applyState === "all_done")
+		: artifacts.tasks === "done" && taskProgress.total > 0 && (artifacts.applyProgress === "done" || applyState === "all_done")
 			? "ready"
 			: "blocked";
 	const dependencies: SddStatus["dependencies"] = {
 		apply: applyState === "blocked" ? "blocked" : applyState,
 		verify: verifyState,
 		sync: syncState,
-		archive: coreArtifactsReady && reviewApproved && verifyClean && syncClean && taskProgress.remaining === 0 && taskAccounting.parent.remaining === 0 && !reviewBlocked && !taskArtifactBlocked ? "ready" : "blocked",
+		archive: coreArtifactsReady && verifyClean && syncClean && taskProgress.remaining === 0 && !taskArtifactBlocked ? "ready" : "blocked",
 	};
 	const archiveReady = dependencies.archive === "ready";
-	const nextRecommended = reviewBlocked
-		? "resolve-review"
-		: taskArtifactBlocked
-			? "fix-task-ownership-marker"
-			: parentLifecycleRequired
-				? "parent-lifecycle"
-				: dependencies.apply === "ready"
-					? "sdd-apply"
-					: dependencies.verify === "ready"
-						? "sdd-verify"
-						: dependencies.sync === "ready"
-							? "sdd-sync"
-							: archiveReady
-								? "sdd-archive"
-								: blockedReasons[0] ?? "Resolve blockers.";
+	const nextRecommended = taskArtifactBlocked
+		? "fix-task-ownership-marker"
+		: dependencies.apply === "ready"
+			? "sdd-apply"
+			: dependencies.verify === "ready"
+				? "sdd-verify"
+				: dependencies.sync === "ready"
+					? "sdd-sync"
+					: archiveReady
+						? "sdd-archive"
+						: blockedReasons[0] ?? "Resolve blockers.";
 
 	const status: SddStatus = {
 		schemaName: "gentle-pi.sdd-status",
@@ -681,9 +637,8 @@ export function resolveSddStatus(options: ResolveSddStatusOptions): SddStatus {
 		blockedReasons,
 		isNonAuthoritative: false,
 	};
-	const resolvedStatus = withRecoveryBlock(status, options.reviewAuthority, options.nativeReviewReadiness);
-	if (options.includeInstructions) resolvedStatus.instructions = renderPhaseInstructions(resolvedStatus);
-	return resolvedStatus;
+	if (options.includeInstructions) status.instructions = renderPhaseInstructions(status);
+	return status;
 }
 
 export function isNonAuthoritativeStatus(status: SddStatus): boolean {

package/lib/terminal-theme.ts

@@ -1,6 +1,6 @@
 const NON_OSC_ANSI_ESCAPE_PATTERN =
 	/\x1B\[[0-?]*[ -/]*[@-~]|\x1B[@-Z\\-_]|\x9B[0-?]*[ -/]*[@-~]/g;
-const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g;
+const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000b-\u000d\u000e-\u001f\u007f-\u009f]/g;
 const OSC_ESCAPE_PATTERN = /(?:\x1B\]|\x9D)[\s\S]*?(?:\x07|\x1B\\|\x9C|$)/g;
 
 export function stripAnsi(value: string): string {

package/package.json

@@ -1,84 +1,85 @@
 {
-  "name": "gentle-pi",
-  "version": "2.2.0",
-  "description": "Turn Pi into el Gentleman: a senior-architect development harness with SDD/OpenSpec, subagents, strict TDD evidence, review guardrails, and skill discovery.",
-  "license": "MIT",
-  "type": "module",
-  "keywords": [
-    "pi-package",
-    "pi",
-    "pi-coding-agent",
-    "gentle-pi",
-    "gentle-ai",
-    "sdd",
-    "openspec",
-    "subagents",
-    "tdd",
-    "code-review",
-    "ai-coding-agent",
-    "agent-harness"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Gentleman-Programming/gentle-pi.git"
-  },
-  "files": [
-    "assets/",
-    "contracts/",
-    "docs/",
-    "extensions/",
-    "lib/",
-    "prompts/",
-	"runtime/",
-    "skills/",
-    "scripts/",
-    "tests/",
-    "themes/",
-    "README.md"
-  ],
-  "scripts": {
-	"build:transaction-runner": "node scripts/build-git-commit-transaction-runner.mjs --write",
-	"check:transaction-runner": "node scripts/build-git-commit-transaction-runner.mjs --check",
-	"check:provider-contract": "node scripts/check-provider-contract.mjs",
-    "postinstall": "node scripts/install-gentle-ai.mjs",
-    "test": "node --experimental-strip-types --test tests/*.test.ts && pnpm run check:provider-contract && pnpm run test:harness",
-    "test:harness": "node --experimental-strip-types tests/runtime-harness.mjs",
-    "test:dev-binary": "node --experimental-strip-types --test tests/devbinary/*.devtest.ts",
-    "test:cross-lane": "node tests/crosslane/cross-lane.mjs",
-    "test:maintainer": "node --experimental-strip-types --test tests/maintainer/*.maintest.ts",
-	"test:packed-runner": "node scripts/test-packed-runner.mjs",
-    "prepack": "pnpm test && node scripts/verify-package-files.mjs",
-    "prepublishOnly": "pnpm test && node scripts/verify-package-files.mjs && pnpm run test:packed-runner"
-  },
-  "pi": {
-    "image": "https://cdn.jsdelivr.net/npm/gentle-pi/assets/gentle-logo-only.png",
-    "extensions": [
-      "./extensions"
-    ],
-    "themes": [
-      "./themes"
-    ],
-    "prompts": [
-      "./prompts"
-    ],
-    "skills": [
-      "./skills"
-    ]
-  },
-  "dependencies": {
-    "@earendil-works/pi-tui": "*",
-    "@heyhuynhgiabuu/pi-pretty": "0.6.14"
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@earendil-works/pi-coding-agent": "*"
-  },
-  "packageManager": "pnpm@11.1.1"
+	"name": "gentle-pi",
+	"version": "2.4.0",
+	"description": "Turn Pi into el Gentleman: a senior-architect development harness with SDD/OpenSpec, subagents, strict TDD evidence, review guardrails, and skill discovery.",
+	"license": "MIT",
+	"type": "module",
+	"keywords": [
+		"pi-package",
+		"pi",
+		"pi-coding-agent",
+		"gentle-pi",
+		"gentle-ai",
+		"sdd",
+		"openspec",
+		"subagents",
+		"tdd",
+		"code-review",
+		"ai-coding-agent",
+		"agent-harness"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Gentleman-Programming/gentle-pi.git"
+	},
+	"files": [
+		"assets/",
+		"contracts/",
+		"docs/",
+		"extensions/",
+		"lib/",
+		"prompts/",
+		"runtime/",
+		"skills/",
+		"scripts/",
+		"tests/",
+		"themes/",
+		"README.md"
+	],
+	"scripts": {
+		"check:provider-contract": "node scripts/check-provider-contract.mjs",
+		"postinstall": "node scripts/install-gentle-ai.mjs",
+		"test": "node --experimental-strip-types --test tests/*.test.ts && pnpm run check:provider-contract && pnpm run test:harness",
+		"test:harness": "node --experimental-strip-types tests/runtime-harness.mjs",
+		"test:dev-binary": "node --experimental-strip-types --test tests/devbinary/*.devtest.ts",
+		"test:cross-lane": "node tests/crosslane/cross-lane.mjs",
+		"test:maintainer": "node --experimental-strip-types --test tests/maintainer/*.maintest.ts",
+		"build:runtime-modules": "node scripts/build-runtime-modules.mjs --write",
+		"check:runtime-modules": "node scripts/build-runtime-modules.mjs --check",
+		"test:packed-package": "node scripts/test-packed-runner.mjs",
+		"prepack": "pnpm test && pnpm run check:runtime-modules && node scripts/verify-package-files.mjs",
+		"prepublishOnly": "pnpm test && pnpm run check:runtime-modules && node scripts/verify-package-files.mjs && pnpm run test:packed-package"
+	},
+	"pi": {
+		"image": "https://cdn.jsdelivr.net/npm/gentle-pi/assets/gentle-logo-only.png",
+		"extensions": [
+			"./extensions"
+		],
+		"themes": [
+			"./themes"
+		],
+		"prompts": [
+			"./prompts"
+		],
+		"skills": [
+			"./skills"
+		]
+	},
+	"dependencies": {
+		"@earendil-works/pi-tui": "*",
+		"@heyhuynhgiabuu/pi-pretty": "0.6.14"
+	},
+	"peerDependencies": {
+		"@earendil-works/pi-coding-agent": "*",
+		"typebox": "*"
+	},
+	"peerDependenciesMeta": {
+		"@earendil-works/pi-coding-agent": {
+			"optional": true
+		}
+	},
+	"devDependencies": {
+		"@earendil-works/pi-coding-agent": "*"
+	},
+	"packageManager": "pnpm@11.1.1"
 }

package/runtime/gentle-ai-binary.mjs

@@ -1,4 +1,4 @@
-// Generated by scripts/build-git-commit-transaction-runner.mjs. Do not edit.
+// Generated by scripts/build-runtime-modules.mjs. Do not edit.
 import { createHash } from "node:crypto";
 import { existsSync, lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";