pi-soly 1.16.0 → 1.16.2

package/commands.ts

@@ -589,12 +589,12 @@ What must the LLM do?
 				}
 				switch (verb) {
 					case "new": {
-						const r = buildNewTransform(cmd, state, ui, ctx.cwd);
+						const r = buildNewTransform(cmd, state, ui, ctx.cwd, getConfig().plan.defaultBranchPrefix);
 						if (r.handled && r.transformedText) ui.notify(r.transformedText, "info");
 						return;
 					}
 					case "done": {
-						const r = buildDoneTransform(cmd, state, ui, ctx.cwd);
+						const r = buildDoneTransform(cmd, state, ui, ctx.cwd, { defaultBranchPrefix: getConfig().plan.defaultBranchPrefix });
 						if (r.handled && r.transformedText) ui.notify(r.transformedText, "info");
 						return;
 					}

package/config.ts

@@ -121,6 +121,18 @@ export interface SolyConfig {
 		 *  0 = keep forever. */
 		retentionDays: number;
 	};
+	plan: {
+		/** Optional branch prefix prepended when the user runs `soly new <slug>`
+		 *  without an explicit `<prefix>/<slug>` form. Common values:
+		 *    "feature"   → branches like `feature/statistic-preparation`
+		 *    "fix"       → branches like `fix/login-redirect`
+		 *    "" (default)→ no prefix; branch = slug verbatim.
+		 *  Per-project only (set in `.agents/soly.json`). User-supplied
+		 *  `<prefix>/<slug>` always wins over this default.
+		 *  Plan dir is always `.agents/plans/<prefix>-<slug>` (flattened)
+		 *  so the on-disk layout stays one-deep. */
+		defaultBranchPrefix: string;
+	};
 }
 
 export const DEFAULT_CONFIG: SolyConfig = {
@@ -184,6 +196,9 @@ export const DEFAULT_CONFIG: SolyConfig = {
 		theme: "",
 		retentionDays: 7,
 	},
+	plan: {
+		defaultBranchPrefix: "", // "" = no prefix; branch = slug verbatim
+	},
 };
 
 /** Raw parsed shape from a config.json — could be partial, could have wrong types. */
@@ -256,6 +271,17 @@ function deepMerge(base: SolyConfig, over: RawConfig): SolyConfig {
 	if (over.editor && typeof over.editor.command === "string") {
 		merged.editor.command = over.editor.command;
 	}
+	if (over.plan && typeof over.plan.defaultBranchPrefix === "string") {
+		// 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;
+	}
 	if (over.chrome) {
 		if (typeof over.chrome.enabled === "boolean") merged.chrome.enabled = over.chrome.enabled;
 		if (typeof over.chrome.ascii === "boolean") merged.chrome.ascii = over.chrome.ascii;

package/index.ts

@@ -694,6 +694,7 @@ export default function solyExtension(pi: ExtensionAPI) {
 			buildNudgeSection(heuristics, {
 				hasProject: state.exists,
 				confirmBeforeCode: getActiveConfig().agent.confirmBeforeCode,
+				defaultBranchPrefix: getActiveConfig().plan.defaultBranchPrefix,
 			}),
 		);
 

package/nudge.ts

@@ -117,7 +117,11 @@ const ASK_DIRECTIVE = `**Confirm before coding.** Don't jump straight into writi
 
 export function buildNudgeSection(
 	heuristics: TaskHeuristics,
-	opts: { hasProject?: boolean; confirmBeforeCode?: boolean | ConfirmLevel } = {},
+	opts: {
+		hasProject?: boolean;
+		confirmBeforeCode?: boolean | ConfirmLevel;
+		defaultBranchPrefix?: string;
+	} = {},
 ): string {
 	// Always-on rules (cheap to add, high signal):
 	//   - Don't dive in on non-trivial tasks without a brief check
@@ -145,20 +149,27 @@ export function buildNudgeSection(
 	// model toward the workflow lifecycle instead of ad-hoc edits. This block
 	// also tells the model it may *itself* scaffold a new plan after asking the
 	// user — the user explicitly opted into this in 1.16.0.
+	const prefix = opts.defaultBranchPrefix ?? "";
+	const branchLine = prefix
+		? `Branches look like \`${prefix}/<slug>\` (the project default is **\`"${prefix}"\`**). Plan dir: \`.agents/plans/${prefix}-<slug>/\`.`
+		: `Branches look like \`<slug>\` (no project default prefix is set). Plan dir: \`.agents/plans/<slug>/\`.`;
 	const workflowPoint =
 		opts.hasProject && heuristics.nonTrivial
-			? `\n\n4. **Route project work through the soly plan workflow.** Each plan is a git branch named by a kebab-case slug (\`statistic-preparation\`, \`login-redirect-bug\`, \`stats-rollup\`, …) with \`.agents/plans/<slug>/PLAN.md\` on it. Two parallel plans don't collide.
+			? `\n\n4. **Route project work through the soly plan workflow.** Each plan is a git branch with \`.agents/plans/<slug>/PLAN.md\` on it. Two parallel plans don't collide.
+
+   **Branch naming convention for THIS project:** ${branchLine}
+   \`soly new <slug>\` applies the project prefix automatically. \`soly new <prefix>/<slug>\` overrides it (use this when the work isn't a "feature" — e.g. \`soly new fix/login-redirect-bug\`).
 
    Lifecycle (text commands you type — pi routes them through the workflow handlers):
-      - \`soly new <slug>\`        — scaffold: branch + plan dir + stub PLAN.md + commit
-      - \`soly discuss <slug>\`    — interactive discussion of the plan (uses ask_pro)
-      - \`soly plan <slug>\`       — flesh out PLAN.md via ask_pro
-      - \`soly execute <slug>\`    — execute the plan in a subagent
-      - \`soly done <slug>\`       — commit + push + open draft PR via gh
-      - \`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 first via ask_pro (\"I'll create plan 'statistic-preparation' — continue?\"), then type \`soly new statistic-preparation\` in your next output. Don't ask for confirmation on trivial one-liners or when the user already said "go". Skip only for a genuine one-off that doesn't deserve a plan branch.`
+      - \`soly new <slug-or-prefix>/<slug>\`   — scaffold: branch + plan dir + stub PLAN.md + commit
+      - \`soly discuss <slug>\`                — interactive discussion of the plan (uses ask_pro)
+      - \`soly plan <slug>\`                   — flesh out PLAN.md via ask_pro
+      - \`soly execute <slug>\`                — execute the plan in a subagent
+      - \`soly done <slug>\`                   — commit + push + open draft PR via gh
+      - \`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.`
 			: "";
 
 	// Confirm-before-coding gate: for non-trivial implementation, pull the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "1.16.0",
+  "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/done.ts

@@ -84,7 +84,7 @@ export function buildDoneTransform(
 	state: SolyState,
 	ui: Notifier,
 	projectRoot: string,
-	opts: { ghPath?: string } = {},
+	opts: { ghPath?: string; defaultBranchPrefix?: string } = {},
 ): DoneResult {
 	if (!state.exists) {
 		return reply(`soly done: no .agents/ directory in cwd — run /soly init first.`);
@@ -93,10 +93,11 @@ export function buildDoneTransform(
 	const raw = cmd.args.join(" ").trim();
 	const parsed = parsePlanName(raw);
 	if ("error" in parsed) {
-		return reply(`soly done: ${parsed.error}\n\nUsage: soly done <slug>`);
+		return reply(`soly done: ${parsed.error}\n\nUsage: soly done <slug> OR soly done <prefix>/<slug>`);
 	}
-	const { name } = parsed;
-	const branchName = name;
+	const { name, prefix } = parsed;
+	const effectivePrefix = prefix ?? opts.defaultBranchPrefix ?? "";
+	const branchName = effectivePrefix ? `${effectivePrefix}/${name}` : name;
 
 	// 1. Preconditions
 	const currentBranch = git(["branch", "--show-current"], { cwd: projectRoot });

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

@@ -148,7 +148,13 @@ export function registerWorkflows(pi: ExtensionAPI, deps: WorkflowsDeps): void {
 		}
 
 		if (cmd.verb === "new") {
-			const result = buildNewTransform(cmd, state, ctx.ui, ctx.cwd);
+			const result = buildNewTransform(
+				cmd,
+				state,
+				ctx.ui,
+				ctx.cwd,
+				getConfig().plan.defaultBranchPrefix,
+			);
 			if (!result.handled || !result.transformedText) return;
 			// Direct execution (the workflow already called ui.notify). The
 			// transformed text goes to the model so it can also tell the user
@@ -157,7 +163,9 @@ export function registerWorkflows(pi: ExtensionAPI, deps: WorkflowsDeps): void {
 		}
 
 		if (cmd.verb === "done") {
-			const result = buildDoneTransform(cmd, state, ctx.ui, ctx.cwd);
+			const result = buildDoneTransform(cmd, state, ctx.ui, ctx.cwd, {
+				defaultBranchPrefix: getConfig().plan.defaultBranchPrefix,
+			});
 			if (!result.handled || !result.transformedText) return;
 			// Direct execution — workflow already called ui.notify. The
 			// transformed text tells the LLM (and the user in chat) what happened.

package/workflows/new.ts

@@ -80,6 +80,7 @@ export function buildNewTransform(
 	state: SolyState,
 	ui: Notifier,
 	projectRoot: string,
+	defaultBranchPrefix = "",
 ): NewResult {
 	if (!state.exists) {
 		return reply(`soly new: no .agents/ directory in cwd — run /soly init first.`);
@@ -88,16 +89,18 @@ export function buildNewTransform(
 	const parsed = parsePlanName(cmd.args.join(" "));
 	if ("error" in parsed) return reply(`soly new: ${parsed.error}`);
 
-	const { name } = parsed;
-	// Branch IS the slug (no <type>/ prefix). Convention chosen over
-	// Conventional-Branches because `soly new` users tend to give a full
-	// descriptive name already; the type prefix adds noise without info.
-	const branchName = name;
-	// Path used by `git add`/`commit` — relative to projectRoot (where `.git/` is).
-	// The plan lives at `<root>/.agents/plans/<name>/`, so the repo-relative path
-	// is `.agents/plans/<name>`.
-	const planDirRel = `.agents/plans/${name}`;
-	const planDirAbs = `${state.solyDir}/plans/${name}`;
+	const { name, prefix } = parsed;
+	// Branch can be one of three shapes:
+	//   - "feature/statistic-preparation" (user typed <prefix>/<slug>)
+	//   - "feature/statistic-preparation" (config has defaultBranchPrefix "feature", user typed "statistic-preparation")
+	//   - "statistic-preparation"          (no prefix anywhere)
+	// The plan dir is always flattened to keep the on-disk layout one-deep:
+	// `.agents/plans/<prefix>-<slug>` or `.agents/plans/<slug>`.
+	const effectivePrefix = prefix ?? defaultBranchPrefix;
+	const branchName = effectivePrefix ? `${effectivePrefix}/${name}` : name;
+	const dirSlug = effectivePrefix ? `${effectivePrefix}-${name}` : name;
+	const planDirRel = `.agents/plans/${dirSlug}`;
+	const planDirAbs = `${state.solyDir}/plans/${dirSlug}`;
 	const planFile = `${planDirAbs}/PLAN.md`;
 
 	// 1. Preconditions

package/workflows/parser.ts

@@ -37,17 +37,44 @@ export type WorkflowVerb =
  *   soly new login-redirect-bug
  *   soly new stats-rollup
  */
-export function parsePlanName(raw: string): { name: string } | { error: string } {
+export function parsePlanName(
+	raw: string,
+): { name: string; prefix: string | null } | { error: string } {
 	const trimmed = raw.trim();
 	if (!trimmed) return { error: "missing plan name" };
-	// Must contain at least one letter — pure-digit strings are reserved for
-	// phase numbers (`soly plan 11` → phase 11), not plan slugs.
+
+	// Optional `<prefix>/<slug>` form: prefix is one kebab-case word
+	// (no internal slashes), slug is the same kebab-case shape. Examples:
+	//   feature/statistic-preparation
+	//   fix/login-redirect-bug
+	//   chore/upgrade-deps
+	// Plan dirs flatten the slash: `.agents/plans/<prefix>-<slug>`.
+	const slashIdx = trimmed.indexOf("/");
+	if (slashIdx > 0) {
+		const prefix = trimmed.slice(0, slashIdx);
+		const slug = trimmed.slice(slashIdx + 1);
+		const prefixOk = /^[a-z][a-z0-9-]*[a-z0-9]$/.test(prefix);
+		const slugOk = /^[a-z][a-z0-9-]*[a-z0-9]$/.test(slug);
+		if (!prefixOk || !slugOk) {
+			return {
+				error:
+					`bad plan name "${trimmed}".\n` +
+					`\nExpected: <slug> OR <prefix>/<slug>\n` +
+					`  prefix: one kebab-case word (e.g. "feature", "fix", "chore")\n` +
+					`  slug:   kebab-case (lowercase letters, digits, hyphens)\n` +
+					`\nExample: soly new feature/statistic-preparation`,
+			};
+		}
+		return { name: slug, prefix };
+	}
+
+	// Plain slug form. Must contain at least one letter — pure-digit strings
+	// are reserved for phase numbers (`soly plan 11` → phase 11), not slugs.
 	if (!/[a-z]/.test(trimmed)) {
 		return {
 			error:
 				`bad plan name "${trimmed}".\n` +
-				`\nExpected: <slug> (kebab-case, no type prefix, must contain a letter)\n` +
-				`  length: 2-64 chars\n` +
+				`\nExpected: <slug> OR <prefix>/<slug>\n` +
 				`  chars:  lowercase letters, digits, and hyphens\n` +
 				`         must start and end with a letter or digit\n` +
 				`\nExample: soly new statistic-preparation`,
@@ -58,7 +85,7 @@ export function parsePlanName(raw: string): { name: string } | { error: string }
 		return {
 			error:
 				`bad plan name "${trimmed}".\n` +
-				`\nExpected: <slug> (kebab-case, no type prefix)\n` +
+				`\nExpected: <slug> OR <prefix>/<slug>\n` +
 				`  length: 2-64 chars\n` +
 				`  chars:  lowercase letters, digits, and hyphens\n` +
 				`         must start and end with a letter or digit\n` +
@@ -68,7 +95,7 @@ export function parsePlanName(raw: string): { name: string } | { error: string }
 	if (trimmed.length > 64) {
 		return { error: `name "${trimmed}" is too long (max 64 chars)` };
 	}
-	return { name: trimmed };
+	return { name: trimmed, prefix: null };
 }
 
 export interface SolyCommand {
@@ -214,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 };
@@ -260,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);
@@ -286,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 };
@@ -334,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 {