pi-do-always 0.4.5 → 0.5.0

package/README.md

@@ -113,6 +113,18 @@ Fields:
 In the object form you can also configure the selector shortcut:
 
 - `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/index.ts

@@ -71,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,
 	};
 }
 

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

@@ -32,8 +32,17 @@ export interface DoAlwaysTask {
  * 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";
@@ -46,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;
 }
 
 /**
@@ -196,14 +210,18 @@ export function parseConfig(
 	}
 
 	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"]);
@@ -242,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);

package/package.json

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