pi-do-always 0.4.4 → 0.5.0

package/README.md

@@ -112,7 +112,19 @@ Fields:
 
 In the object form you can also configure the selector shortcut:
 
-- `shortcut` (optional) — key that opens the selector, e.g. `"f4"` or `"ctrl+shift+p"`. Set to `null` to disable the shortcut. Defaults to `F4`. The project file's value wins over the global one.
+- `shortcut` (optional) — key that opens the selector, e.g. `"f4"`. Set to `null` to disable the shortcut. Defaults to `F4`. The project file's value wins over the global one.
+- `merge` (optional) — how project tasks combine with the global tasks: `"override"` (default) replaces a global task with the same `name`; `"append"` keeps the global tasks and only adds new project task names (a cascade, like CSS). The project file's value wins over the global one; when neither sets it, the default is `override` (the historical behavior).
+
+Example project file that only *adds* tasks without overriding the global set:
+
+```json
+{
+  "merge": "append",
+  "tasks": [
+    { "name": "deploy", "category": "Ops", "prompt": "Deploy this project to staging." }
+  ]
+}
+```
 
 Reload Pi (or start a new session) after editing a config file.
 

package/extensions/pi-do-always/do-always.json

@@ -30,7 +30,7 @@
 			"name": "Propose features",
 			"category": "Plan",
 			"description": "Propose new features (Plan)",
-			"prompt": "Review this project and propose new features that would add value. For each idea, describe the problem it solves, the user benefit, and a rough implementation approach. Prioritize by impact and effort. Do not make any changes yet."
+			"prompt": "Review this project and propose new features that would add value. For each idea, describe the problem it solves, the user benefit, and a rough implementation approach. Prioritize by impact and effort. Do not make any changes yet. Try to evaluate how many lines this will be in term of changes, if this will breaks API, compatibility issue."
 		},
 		{
 			"name": "Build",

package/extensions/pi-do-always/index.ts

@@ -57,6 +57,7 @@ import {
 	parseConfig,
 	orderTasksByCategory,
 	renderPrompt,
+	evaluateGuards,
 	resolveShortcut,
 	resolveTask,
 	shouldAutoRun,
@@ -70,22 +71,31 @@ import {
  * Project-local tasks override global tasks with the same name; new ones are appended.
  * Falls back to DEFAULT_TASKS when nothing is defined.
  */
-function loadConfig(cwd: string): { tasks: DoAlwaysTask[]; shortcut: string | null } {
+function loadConfig(cwd: string): {
+	tasks: DoAlwaysTask[];
+	shortcut: string | null;
+	merge: "append" | "override";
+} {
 	const globalPath = join(getAgentDir(), "do-always.json");
 	const projectPath = join(cwd, CONFIG_DIR_NAME, "do-always.json");
 
 	const global = existsSync(globalPath)
 		? parseConfig(readFileSync(globalPath, "utf-8"), globalPath)
-		: { tasks: [], shortcut: undefined };
+		: { tasks: [], shortcut: undefined, merge: undefined };
 	const project = existsSync(projectPath)
 		? parseConfig(readFileSync(projectPath, "utf-8"), projectPath)
-		: { tasks: [], shortcut: undefined };
+		: { tasks: [], shortcut: undefined, merge: undefined };
+
+	// The project file's merge mode wins; otherwise the global value; otherwise
+	// override (the historical behavior), so existing configs are unaffected.
+	const mode = project.merge ?? global.merge ?? "override";
 
 	return {
 		// Order the merged list by category so the selector numbers, digit-pick,
 		// `/do-always <n>`, and `list` all share one consistent order.
-		tasks: orderTasksByCategory(mergeTasks(global.tasks, project.tasks, DEFAULT_TASKS)),
+		tasks: orderTasksByCategory(mergeTasks(global.tasks, project.tasks, DEFAULT_TASKS, mode)),
 		shortcut: resolveShortcut(global.shortcut, project.shortcut),
+		merge: mode,
 	};
 }
 
@@ -123,6 +133,13 @@ function buildContext(cwd: string): PromptContext {
 	const lastCommit = git(cwd, ["log", "-1", "--format=%s"]) ?? "unknown";
 	const user = git(cwd, ["config", "user.name"]) ?? "unknown";
 
+	// repo = bare name of the git remote (owner/repo.git -> repo), falling back
+	// to the basename of cwd so monorepo work stays disambiguated everywhere.
+	const remoteUrl = git(cwd, ["config", "--get", "remote.origin.url"]);
+	const repo = remoteUrl
+		? (remoteUrl.replace(/\.git$/, "").split("/").pop() ?? "unknown")
+		: cwd.split(/[\\/]/).filter(Boolean).pop() ?? "unknown";
+
 	const files: string[] = [];
 	const status = git(cwd, ["status", "--porcelain"]);
 	if (status) {
@@ -151,6 +168,10 @@ function buildContext(cwd: string): PromptContext {
 		files_changed: listed,
 		files_changed_count: String(files.length),
 		user,
+		diff_stat: git(cwd, ["diff", "--shortstat"]) ?? "none",
+		repo,
+		staged_files: git(cwd, ["diff", "--cached", "--name-only"]) ?? "none",
+		unstaged_files: git(cwd, ["diff", "--name-only"]) ?? "none",
 	};
 }
 
@@ -182,7 +203,13 @@ export default function doAlwaysExtension(pi: ExtensionAPI) {
 	async function fillPrompt(task: DoAlwaysTask, ctx: ExtensionContext): Promise<void> {
 		// Render the prompt with the current context (branch, changed files, …)
 		// so the injected text matches this directory at this moment.
-		const prompt = renderPrompt(task.prompt, buildContext(ctx.cwd));
+		const context = buildContext(ctx.cwd);
+		const blocked = evaluateGuards(task, context);
+		if (blocked) {
+			ctx.ui.notify(`do-always: ${blocked}`, "info");
+			return;
+		}
+		const prompt = renderPrompt(task.prompt, context);
 		if (shouldAutoRun(task)) {
 			await pi.sendUserMessage(prompt);
 			ctx.ui.notify(`do-always: auto-ran "${task.name}"`, "info");

package/extensions/pi-do-always/tasks.ts

@@ -19,14 +19,30 @@ export interface DoAlwaysTask {
 	 * category: "Plan" tasks auto-run, everything else fills the editor.
 	 */
 	autoRun?: boolean;
+	/**
+	 * Whether the task should be blocked when the working tree is clean
+	 * (`files_changed_count === 0`). When set and unmet, the extension notifies
+	 * instead of injecting, avoiding a no-op round-trip. Guards are evaluated
+	 * against the current prompt context (see `evaluateGuards`).
+	 */
+	requireDirty?: boolean;
 }
 
 /**
  * A config file can be a bare array of tasks, or {"tasks": [...], "shortcut": ...}.
  * `shortcut` is a key id string (e.g. "f4", "ctrl+shift+p"), or null to disable
  * the keyboard shortcut.
+ * `merge` controls how project tasks combine with global tasks:
+ * `override` (default) replaces a global task with the same name;
+ * `append` keeps globals and only adds new project task names (a cascade).
  */
-export type DoAlwaysConfig = DoAlwaysTask[] | { tasks: DoAlwaysTask[]; shortcut?: string | null };
+export type DoAlwaysConfig =
+	| DoAlwaysTask[]
+	| {
+			tasks: DoAlwaysTask[];
+			shortcut?: string | null;
+			merge?: "append" | "override";
+		};
 
 /** Shortcut used when neither config file specifies one. */
 export const DEFAULT_SHORTCUT = "f4";
@@ -39,6 +55,11 @@ export interface ParsedDoAlwaysConfig {
 	 * disabled, undefined when the file does not set one.
 	 */
 	shortcut: string | null | undefined;
+	/**
+	 * The `merge` field, if present: "append" or "override", undefined when the
+	 * file does not set one.
+	 */
+	merge?: "append" | "override" | undefined;
 }
 
 /**
@@ -55,6 +76,10 @@ export const PROMPT_CONTEXT_KEYS = [
 	"files_changed",
 	"files_changed_count",
 	"user",
+	"diff_stat", // NEW: "3 files changed, 41 insertions(+), 7 deletions(-)"
+	"repo", // NEW: basename of cwd or git remote (disambiguates monorepos)
+	"staged_files", // NEW: files staged for commit
+	"unstaged_files", // NEW: modified-but-unstaged files
 ] as const;
 
 /** A fully populated prompt context: one entry per PROMPT_CONTEXT_KEYS. */
@@ -66,8 +91,13 @@ export const DEFAULT_TASKS: DoAlwaysTask[] = [
 		name: "Review",
 		category: "Plan",
 		description: "Review code and double-check changes (Plan)",
+		requireDirty: true,
 		prompt:
-			"Review the changes on branch {{branch}} ({{files_changed_count}} changed files: {{files_changed}}). Last commit: {{last_commit}}. Check `git status` and `git diff` to see what changed, then double-check the changes for bugs, edge cases, security issues, and consistency with the rest of the codebase. Do a plan proposal for the fixes if needed. Do a summary of your findings",
+			"Review the changes on branch {{branch}} ({{files_changed_count}} changed files: {{files_changed}}). " +
+			"Change summary: {{diff_stat}}. Last commit: {{last_commit}}. " +
+			"Check `git status` and `git diff` to see what changed, then double-check the changes for bugs, " +
+			"edge cases, security issues, and consistency with the rest of the codebase. " +
+			"Do a plan proposal for the fixes if needed. Do a summary of your findings",
 	},
 	{
 		name: "Cleanup",
@@ -122,6 +152,7 @@ export const DEFAULT_TASKS: DoAlwaysTask[] = [
 		name: "Commit",
 		category: "Ops",
 		description: "Prepare a clean commit",
+		requireDirty: true,
 		prompt:
 			"Prepare the working tree on branch {{branch}} ({{files_changed_count}} changed files: {{files_changed}}) for a clean commit: stage the relevant changes, and write a clear commit message describing what changed and why. Do not push.",
 	},
@@ -130,7 +161,7 @@ export const DEFAULT_TASKS: DoAlwaysTask[] = [
 		category: "Plan",
 		description: "Propose new features (Plan)",
 		prompt:
-			"Review this project and propose new features that would add value. For each idea, describe the problem it solves, the user benefit, and a rough implementation approach. Prioritize by impact and effort. Do not make any changes yet.",
+			"Review this project and propose new features that would add value. For each idea, describe the problem it solves, the user benefit, and a rough implementation approach. Prioritize by impact and effort. Do not make any changes yet. Try to evaluate how many lines this will be in term of changes, if this will breaks API, compatibility issue.",
 	},
 ];
 
@@ -170,22 +201,27 @@ export function parseConfig(
 			};
 			if (typeof t.description === "string") task.description = t.description;
 			if (typeof t.category === "string" && t.category.trim() !== "") task.category = t.category.trim();
-			if (typeof t.autoRun === "boolean") task.autoRun = t.autoRun;
-			tasks.push(task);
+				if (typeof t.autoRun === "boolean") task.autoRun = t.autoRun;
+				if (typeof t.requireDirty === "boolean") task.requireDirty = t.requireDirty;
+				tasks.push(task);
 		} else {
 			onError(`do-always: skipping invalid task in ${path} (each task needs "name" and "prompt")`);
 		}
 	}
 
 	let shortcut: string | null | undefined;
+	let merge: "append" | "override" | undefined;
 	if (!Array.isArray(data) && "shortcut" in data) {
 		const s = data.shortcut;
 		if (s === null) shortcut = null;
 		else if (typeof s === "string") shortcut = s.trim() === "" ? null : s.trim();
 		else onError(`do-always: ignoring invalid "shortcut" in ${path} (expected a key string or null)`);
 	}
+	if (!Array.isArray(data) && "merge" in data) {
+		merge = parseMerge(data.merge, path, onError);
+	}
 
-	return { tasks, shortcut };
+	return { tasks, shortcut, merge };
 }
 
 const KEY_MODIFIERS = new Set(["ctrl", "shift", "alt", "super"]);
@@ -224,12 +260,53 @@ export function resolveShortcut(
 	return DEFAULT_SHORTCUT;
 }
 
+/**
+ * Parse the optional `merge` field: "append" or "override" (case-insensitive),
+ * or undefined when absent. A non-string or unrecognized value is ignored with
+ * a warning, so it never silently changes behavior.
+ */
+function parseMerge(
+	raw: unknown,
+	path: string,
+	onError: (message: string) => void,
+): "append" | "override" | undefined {
+	if (raw === undefined) return undefined;
+	if (typeof raw !== "string") {
+		onError(`do-always: ignoring invalid "merge" in ${path} (expected "append" or "override")`);
+		return undefined;
+	}
+	const v = raw.trim().toLowerCase();
+	if (v === "append" || v === "override") return v;
+	onError(`do-always: ignoring invalid "merge" in ${path} (expected "append" or "override")`);
+	return undefined;
+}
+
 /**
  * Merge project-local tasks over global tasks.
- * A project task with a name matching a global task replaces it; new names are appended.
+ *
+ * When `mode` is "override" (default), a project task with a name matching a
+ * global task replaces it; new names are appended. When "append", globals are
+ * kept as-is and only new (non-duplicate) project task names are appended.
  * Returns fallback when the merged result is empty.
  */
-export function mergeTasks(globalTasks: DoAlwaysTask[], projectTasks: DoAlwaysTask[], fallback: DoAlwaysTask[]): DoAlwaysTask[] {
+export function mergeTasks(
+	globalTasks: DoAlwaysTask[],
+	projectTasks: DoAlwaysTask[],
+	fallback: DoAlwaysTask[],
+	mode: "append" | "override" = "override",
+): DoAlwaysTask[] {
+	if (mode === "append") {
+		const merged = [...globalTasks];
+		const names = new Set(merged.map((t) => t.name));
+		for (const task of projectTasks) {
+			if (!names.has(task.name)) {
+				merged.push(task);
+				names.add(task.name);
+			}
+		}
+		return merged.length > 0 ? merged : fallback;
+	}
+
 	const merged = [...globalTasks];
 	for (const task of projectTasks) {
 		const idx = merged.findIndex((t) => t.name === task.name);
@@ -301,6 +378,21 @@ export function shouldAutoRun(task: DoAlwaysTask): boolean {
 	return (task.category ?? "").trim().toLowerCase() === "plan";
 }
 
+/**
+ * Evaluate a task's guards against the current prompt context. Returns a
+ * notification message (caller should notify and abort) when a guard fails, or
+ * null when every guard is met and the task may proceed.
+ *
+ * Guards keep low-value round-trips down: e.g. `requireDirty` blocks Review and
+ * Commit on a clean tree so the agent is never asked to inspect nothing.
+ */
+export function evaluateGuards(task: DoAlwaysTask, ctx: PromptContext): string | null {
+	if (task.requireDirty && ctx.files_changed_count === "0") {
+		return "working tree is clean — nothing to review";
+	}
+	return null;
+}
+
 /**
  * Resolve a task from a command argument: by number (1-based) or by name (case-insensitive).
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-do-always",
-	"version": "0.4.4",
+	"version": "0.5.0",
 	"type": "module",
 	"description": "Pi extension: /do-always — pick a common task by number, it fills your prompt",
 	"author": {