pi-soly 1.16.1 → 1.16.2

package/config.ts

@@ -272,9 +272,13 @@ function deepMerge(base: SolyConfig, over: RawConfig): SolyConfig {
 		merged.editor.command = over.editor.command;
 	}
 	if (over.plan && typeof over.plan.defaultBranchPrefix === "string") {
-		// Sanitize: allow only kebab-case words (no slashes, dots, etc.).
-		// Empty string is allowed and means "no prefix".
-		const sanitized = over.plan.defaultBranchPrefix.replace(/[^a-z0-9-]/gi, "");
+		// Sanitize: lowercase, then allow only kebab-case chars (no
+		// slashes/dots/spaces). Empty string is allowed and means
+		// "no prefix". We do NOT warn on slash/uppercase — the user
+		// probably meant a different prefix shape; silently normalizing
+		// keeps configs from being rejected for cosmetic reasons.
+		const lowercased = over.plan.defaultBranchPrefix.toLowerCase();
+		const sanitized = lowercased.replace(/[^a-z0-9-]/g, "");
 		const collapsed = sanitized.replace(/-+/g, "-").replace(/^-|-$/g, "");
 		merged.plan.defaultBranchPrefix = collapsed;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "1.16.1",
+  "version": "1.16.2",
   "description": "Project management + workflow framework for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker, native footer + welcome chrome — one npm install, zero config. The LLM drives execution and delegates to a worker subagent when available.",
   "type": "module",
   "main": "index.ts",

package/workflows/execute.ts

@@ -274,9 +274,12 @@ When the subagent completes, synthesize the result. Do not re-execute its work.
 		};
 	}
 
-	// === PLAN MODE (new dual-mode: `<type>/<name>` plans live under .agents/plans/<name>/) ===
+	// === PLAN MODE (new dual-mode: `<type>/<name>` plans live under .agents/plans/<prefix>-<name>/) ===
 	if (target.kind === "plan") {
-		const planDirAbs = `${state.solyDir}/plans/${target.name}`;
+		// Plan dir is always flattened: `<prefix>-<name>` if a prefix is
+		// present, else just `<name>`.
+		const dirSlug = target.prefix ? `${target.prefix}-${target.name}` : target.name;
+		const planDirAbs = `${state.solyDir}/plans/${dirSlug}`;
 		const planFile = `${planDirAbs}/PLAN.md`;
 		let planBody: string;
 		try {

package/workflows/parser.ts

@@ -241,7 +241,7 @@ function parseNewTaskFlag(
  */
 export type ExecuteTarget =
 	| { kind: "phase"; phase: number; plan: number | null; raw: string }
-	| { kind: "plan"; name: string; raw: string }
+	| { kind: "plan"; name: string; prefix: string | null; raw: string }
 	| { kind: "task"; taskId: string; raw: string }
 	| { kind: "all"; raw: string }
 	| { kind: "feature"; feature: string; raw: string };
@@ -287,7 +287,7 @@ export function describeExecuteTarget(args: string[]): ExecuteTarget | null {
 
 	const plan = parsePlanName(target);
 	if (!("error" in plan)) {
-		return { kind: "plan", name: plan.name, raw };
+		return { kind: "plan", name: plan.name, prefix: plan.prefix, raw };
 	}
 
 	const phase = parsePhaseShape(target);
@@ -313,7 +313,7 @@ export function describeExecuteTarget(args: string[]): ExecuteTarget | null {
  */
 export type PlanTarget =
 	| { kind: "phase"; phase: number; raw: string }
-	| { kind: "plan"; name: string; raw: string }
+	| { kind: "plan"; name: string; prefix: string | null; raw: string }
 	| { kind: "task"; taskId: string; raw: string }
 	| { kind: "new-task"; slug: string; feature: string; raw: string }
 	| { kind: "feature"; feature: string; raw: string };
@@ -361,7 +361,7 @@ export function describePlanTarget(args: string[]): PlanTarget | null {
 
 	const plan = parsePlanName(target);
 	if (!("error" in plan)) {
-		return { kind: "plan", name: plan.name, raw };
+		return { kind: "plan", name: plan.name, prefix: plan.prefix, raw };
 	}
 
 	// Plan target only matches plain N (no .MM — plan is per-phase, executed

package/workflows/planning.ts

@@ -91,9 +91,13 @@ export function buildPlanTransform(cmd: SolyCommand, state: SolyState): Planning
 		};
 	}
 
-	// === PLAN MODE (new dual-mode: `<type>/<name>` plans live under .agents/plans/<name>/) ===
+	// === PLAN MODE (new dual-mode: `<type>/<name>` plans live under .agents/plans/<prefix>-<name>/) ===
 	if (target.kind === "plan") {
-		const planDirAbs = `${state.solyDir}/plans/${target.name}`;
+		// Plan dir is always flattened: `<prefix>-<name>` if a prefix is
+		// present (user typed `<prefix>/<slug>` or the project default
+		// applied), else just `<name>`.
+		const dirSlug = target.prefix ? `${target.prefix}-${target.name}` : target.name;
+		const planDirAbs = `${state.solyDir}/plans/${dirSlug}`;
 		const planFile = `${planDirAbs}/PLAN.md`;
 		let planBody: string;
 		try {
@@ -514,10 +518,11 @@ export function buildDiscussTransform(
 		};
 	}
 
-	// Plan mode: `<type>/<name>`
+	// Plan mode: `<slug>` or `<prefix>/<slug>`
 	const planParsed = parsePlanName(arg);
 	if (!("error" in planParsed)) {
-		const planDirAbs = `${state.solyDir}/plans/${planParsed.name}`;
+		const dirSlug = planParsed.prefix ? `${planParsed.prefix}-${planParsed.name}` : planParsed.name;
+		const planDirAbs = `${state.solyDir}/plans/${dirSlug}`;
 		const planFile = `${planDirAbs}/PLAN.md`;
 		let planBody: string;
 		try {