pi-soly 1.16.1 → 1.16.3

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/nudge.ts

@@ -169,7 +169,15 @@ export function buildNudgeSection(
       - \`soly verify\`                         — self-review loop until clean
       - \`soly status\`                         — current position + progress (no LLM round-trip)
 
-   **You may scaffold a new plan yourself** when the user asks for a new piece of work and the scope is clear (or the user just confirmed). Propose the slug AND the full branch name first via ask_pro — offer the default \`${prefix ? prefix + "/" : ""}<slug>\` plus the alternatives \`fix/<slug>\`, \`chore/<slug>\`, or just \`<slug>\` (no prefix). Pick whatever fits the work, then type \`soly new …\` in your next output. Don't ask for trivial one-liners or when the user already said "go". Skip only for a genuine one-off that doesn't deserve a plan branch.`
+   **You may scaffold a new plan yourself** when the user asks for a new piece of work and the scope is clear (or the user just confirmed). Propose the slug AND the full branch name first via ask_pro — offer the default \`${prefix ? prefix + "/" : ""}<slug>\` plus the alternatives \`fix/<slug>\`, \`chore/<slug>\`, or just \`<slug>\` (no prefix). Pick whatever fits the work, then type \`soly new …\` in your next output. Don't ask for trivial one-liners or when the user already said "go". Skip only for a genuine one-off that doesn't deserve a plan branch.
+
+   **STUDY THE REPO before scaffolding or fleshing out a plan.** Before you write or edit any plan, use the available tools to understand the area you're about to touch:
+   - \`soly_snippet(path, offset, limit)\` and \`soly_doc_search(query)\` for bounded reads of the relevant files (don't \`read\` the whole tree — that's why these tools exist).
+   - The \`## project layout\` section in this system prompt for a directory overview.
+   - \`.agents/docs/\` (intent) for *why* the project is the way it is.
+   - \`git log --oneline -20\` for recent context (existing patterns, prior decisions).
+
+   What to extract: where similar features live, the naming/file-layout conventions, how errors are handled, how tests are written, and any constraints you missed in the prompt. Surface ambiguities as \`ask_pro\` questions BEFORE writing the plan — a plan that knows "the tests go in __tests__/" beats a plan that picks an arbitrary location and rewrites.`
 			: "";
 
 	// Confirm-before-coding gate: for non-trivial implementation, pull the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "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

@@ -181,6 +181,8 @@ The worker reads this file first — it contains intent, STATE, ROADMAP (n/a for
 
 **0-POINT CHECK.** Worker must re-read .agents/docs/ (intent) and .agents/features/${task.feature}/README.md before implementing.
 
+**STUDY THE REPO.** The worker MUST use \`soly_snippet(path, offset, limit)\`, \`soly_doc_search(query)\`, and \`## project layout\` from the system prompt to understand the area before changing any file. Read at least: the module being modified, one similar feature for the pattern, and the corresponding test file. Do NOT change code based on assumptions about how the existing code works.
+
 Launch a single subagent for this work. Do NOT do the work inline.
 
 subagent({
@@ -274,9 +276,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 {
@@ -323,6 +328,8 @@ ${planBody.slice(0, 4000)}${planBody.length > 4000 ? "\n…(truncated)" : ""}
 
 **0-POINT CHECK.** Worker must re-read .agents/docs/ (intent) before implementing.
 
+**STUDY THE REPO.** Worker MUST use \`soly_snippet(path, offset, limit)\`, \`soly_doc_search(query)\`, and \`## project layout\` from the system prompt to map the area before editing. Read at least: the module(s) the plan touches, one adjacent feature for the convention, and any test files in the same area. Do NOT edit code on assumptions about how existing code is structured.
+
 Launch a single subagent to execute the plan. Do NOT do the work inline.
 
 subagent({

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 {
@@ -114,6 +118,8 @@ ${planBody.slice(0, 4000)}${planBody.length > 4000 ? "\n…(truncated)" : ""}
 
 **0-POINT CHECK.** Re-read .agents/docs/ (intent) before fleshing out the plan.
 
+**STUDY THE REPO.** Before writing PLAN.md, use \`soly_snippet(path, offset, limit)\` and \`soly_doc_search(query)\` to understand the area this plan will touch. Look at how similar features are implemented in this codebase (naming, file layout, error handling, test convention), and check \`## project layout\` from the system prompt for orientation. Extract enough context that the plan names concrete files and conventions, not abstractions. Surface ambiguities as \`ask_pro\` questions BEFORE writing PLAN.md.
+
 If ask_pro is available, use it ONCE to gather goal / steps / acceptance criteria (freeText questions, batched). Then write PLAN.md with the answers. If ask_pro is NOT available, write a sensible stub plan and tell the user to refine it via \`soly plan ${target.raw}\` again.
 
 Hard rules:
@@ -514,10 +520,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 {
@@ -538,6 +545,8 @@ ${planBody.slice(0, 4000)}${planBody.length > 4000 ? "\n…(truncated)" : ""}
 
 **0-POINT CHECK.** Re-read .agents/docs/ (intent) before discussing.
 
+**STUDY THE REPO.** Use \`soly_snippet(path, offset, limit)\`, \`soly_doc_search(query)\`, and \`## project layout\` from the system prompt to understand the area the plan touches. The discussion should resolve real ambiguities in the existing code, not invent new ones. If the plan body mentions files you haven't read, read them first.
+
 Use \`soly_finish_discuss\` to capture the discussion outcome. The flow:
 1. Read the plan above.
 2. Identify ambiguities / open questions / scope clarifications.