@harborppm/cli 0.86.0 → 0.87.0

package/dist/app.mjs

@@ -1898,7 +1898,20 @@ function boardPositions(tasks) {
 		return out;
 	});
 }
-var ids$1, projectTasks$1, EMPTY, waiting, positions;
+/** For each task id, the tasks that name it as their parent, in list order (src/lib/subtasks.ts reads it). */
+function childrenByParent(tasks) {
+	return cached$1(children, tasks, () => {
+		const out = /* @__PURE__ */ new Map();
+		for (const t of tasks) {
+			if (!t.parentTaskId) continue;
+			const list = out.get(t.parentTaskId);
+			if (list) list.push(t);
+			else out.set(t.parentTaskId, [t]);
+		}
+		return out;
+	});
+}
+var ids$1, projectTasks$1, EMPTY, waiting, positions, children;
 var init_indexes = __esmMin((() => {
 	init_blockers();
 	ids$1 = /* @__PURE__ */ new WeakMap();
@@ -1906,6 +1919,7 @@ var init_indexes = __esmMin((() => {
 	EMPTY = Object.freeze([]);
 	waiting = /* @__PURE__ */ new WeakMap();
 	positions = /* @__PURE__ */ new WeakMap();
+	children = /* @__PURE__ */ new WeakMap();
 }));
 
 // src/lib/premortem.ts
@@ -4765,6 +4779,54 @@ var init_task_people = __esmMin((() => {
 	init_agents();
 }));
 
+// src/lib/subtasks.ts
+/** The parent `task` is a piece of, when that link holds; otherwise null. */
+function parentOf(task, tasks) {
+	const id = task.parentTaskId;
+	if (!id || id === task.id) return null;
+	const parent = byId(tasks).get(id);
+	if (!parent || parent.projectId !== task.projectId || parent.parentTaskId) return null;
+	return parent;
+}
+/** Whether `task` shows inside its parent rather than on its own. */
+function isSubtask(task, tasks) {
+	return parentOf(task, tasks) !== null;
+}
+/** The subtasks of `parent`, in list order. Empty for a task that is itself a subtask. */
+function subtasksOf(parent, tasks) {
+	if (isSubtask(parent, tasks)) return NONE$2;
+	const list = childrenByParent(tasks).get(parent.id);
+	if (!list) return NONE$2;
+	return list.filter((t) => t.projectId === parent.projectId && t.id !== parent.id);
+}
+/** The tasks that stand on their own: what a board or a list shows. */
+function topLevel(list, tasks) {
+	return list.filter((t) => !isSubtask(t, tasks));
+}
+/**
+* Why `childId` can't become a subtask of `parentId`, or null when it can.
+* The parent must be another task in the same project that isn't a subtask,
+* and the child mustn't have subtasks of its own (one level only).
+*/
+function subtaskProblem(childId, parentId, tasks) {
+	const index = byId(tasks);
+	const child = index.get(childId);
+	const parent = index.get(parentId);
+	if (!parent) return "That task isn't here any more.";
+	if (childId === parentId) return "A task can't be a subtask of itself.";
+	if (child && child.projectId !== parent.projectId) return "A subtask has to be in the same project as its parent.";
+	if (isSubtask(parent, tasks)) return "That task is already a subtask; subtasks go one level deep.";
+	if (child && subtasksOf(child, tasks).length > 0) return "This task has subtasks of its own, so it can't go inside another.";
+	if (subtasksOf(parent, tasks).filter((t) => t.id !== childId).length >= 50) return `A task can hold up to ${50} subtasks.`;
+	return null;
+}
+var SUBTASKS_MAX, NONE$2;
+var init_subtasks = __esmMin((() => {
+	init_indexes();
+	SUBTASKS_MAX = 50;
+	NONE$2 = Object.freeze([]);
+}));
+
 // src/lib/board.ts
 /** The column's cap after "No cap" (`uncapped`) or a number is picked. */
 function withWipLimit(col, limit) {
@@ -4943,11 +5005,12 @@ function wipFullMessage(overflow) {
 function columnWip(data, projectId, status, extra = 1) {
 	const col = boardConfigOf(data, projectId).columns.find((c) => c.status === status);
 	if (!col) return null;
-	const current = tasksOf(data.tasks, projectId).filter((t) => t.status === status).length;
+	const current = tasksOf(data.tasks, projectId).filter((t) => t.status === status && !isSubtask(t, data.tasks)).length;
 	return wipOverflow(col, current, extra);
 }
 var BOARD_PRESETS, ALL_FIELDS, DEFAULT_DOING_WIP, DEFAULT_REVIEW_WIP, WIP_CAP_CHOICES;
 var init_board = __esmMin((() => {
+	init_subtasks();
 	init_indexes();
 	init_swatches();
 	BOARD_PRESETS = [
@@ -5979,6 +6042,7 @@ init_date_fns();
 init_date_text();
 init_first_voyage();
 init_indexes();
+init_subtasks();
 init_tide();
 init_format();
 init_raid();
@@ -6049,7 +6113,7 @@ function myRaid(data, personId) {
 /** A project's board: its visible columns, in order, with their tasks. */
 function boardOf(data, projectId) {
 	const config = boardConfigOf(data, projectId);
-	const tasks = tasksOf(data.tasks, projectId);
+	const tasks = topLevel(tasksOf(data.tasks, projectId), data.tasks);
 	return visibleColumns(config).map((col) => ({
 		status: col.status,
 		label: columnLabel(col),
@@ -6065,7 +6129,7 @@ function neighbourStatus(data, projectId, status, step) {
 	return cols[at + step] ?? null;
 }
 function projectTasks(data, projectId) {
-	return [...tasksOf(data.tasks, projectId)].sort((a, b) => STATUS_ORDER.indexOf(a.status) - STATUS_ORDER.indexOf(b.status) || (a.number ?? 0) - (b.number ?? 0));
+	return topLevel(tasksOf(data.tasks, projectId), data.tasks).sort((a, b) => STATUS_ORDER.indexOf(a.status) - STATUS_ORDER.indexOf(b.status) || (a.number ?? 0) - (b.number ?? 0));
 }
 /**
 * The project a new task goes in when none was picked: the only open one,
@@ -19822,11 +19886,7 @@ function fieldValueText(def, value, nameOf) {
 }
 
 // src/lib/exports.ts
-/**
-* The spreadsheets Harbor hands out: a project's tasks, the risk register and
-* the review. The website downloads them, agents and the terminal get the
-* same text (the export_csv tool, `harbor export`).
-*/
+init_subtasks();
 init_derived_health();
 init_priority();
 init_raid();
@@ -19861,6 +19921,7 @@ function tasksCsv(data, projectId) {
 		"Done",
 		"Blocked by",
 		"Description",
+		"Subtask of",
 		...fields.map((f) => f.name)
 	], tasks.map((t) => [
 		taskKey(t, project) ?? "",
@@ -19872,6 +19933,7 @@ function tasksCsv(data, projectId) {
 		t.status === "done" ? "yes" : "no",
 		blockerIds(t).map((id) => here.get(id)).filter((b) => Boolean(b)).map(name).join("; "),
 		t.description,
+		((p) => p ? name(p) : "")(parentOf(t, data.tasks)),
 		...fields.map((f) => f.type === "url" ? safeLink(t.customFieldValues?.[f.id]) ?? "" : fieldValueText(f, t.customFieldValues?.[f.id], nameOf))
 	]));
 }
@@ -20482,16 +20544,7 @@ function approvalsWaitingOn(tasks, personId) {
 }
 
 // src/lib/mcp/tools.ts
-/**
-* What an agent can read about a harbor, as MCP tools. Each tool is a pure
-* function of one harbor's document (health already stamped) and who is
-* asking, so it is tested against the demo without a server. The route in
-* src/routes/api/mcp.ts signs the caller in, picks the harbor and loads it.
-*
-* Read only: nothing here changes a workspace. Answers carry ids so an agent
-* can ask about one thing next, and every list is capped and pageable, since
-* a harbor can hold thousands of tasks.
-*/
+init_subtasks();
 init_thanks();
 init_task_keys();
 init_brief();
@@ -21267,7 +21320,7 @@ const HARBOR_TOOLS = [
 	tool({
 		name: "get_task",
 		title: "Task details",
-		description: "One task: its owner (assignee) and anyone also on it (alsoOn), notes, checklist, its files, what it waits on, what waits on it, its latest comments, the earliest due date its owner's queue suggests (pilotDue: fits says whether the due date holds; absent with no owner, an agent owner, or once done), its place in its board column (`position`, from 1 at the top), time logged on it (timeLogged: the total and the latest entries, when there is any), its values for the project's own fields by name (fields, when it has any; set them with set_field), and its url on the website." + DATA_NOTE,
+		description: "One task: its owner (assignee) and anyone also on it (alsoOn), notes, checklist, its files, what it waits on, what waits on it, its latest comments, the earliest due date its owner's queue suggests (pilotDue: fits says whether the due date holds; absent with no owner, an agent owner, or once done), its place in its board column (`position`, from 1 at the top), time logged on it (timeLogged: the total and the latest entries, when there is any), its values for the project's own fields by name (fields, when it has any; set them with set_field), its subtasks or the task it's a subtask of (subtaskOf), and its url on the website." + DATA_NOTE,
 		input: object({
 			harbor: harborArg,
 			task: string().min(1).max(100).describe("Task id or key (\"RR-42\"), from search_tasks or my_work.")
@@ -21319,6 +21372,12 @@ const HARBOR_TOOLS = [
 				...t.time?.length ? { timeLogged: timeOut(t, people) } : {},
 				waitingOn: blockersOf(t, data.tasks).map(brief),
 				waitedOnBy: waiters.map(brief),
+				...((parent) => parent ? { subtaskOf: brief(parent) } : {})(parentOf(t, data.tasks)),
+				...((subs) => subs.length ? { subtasks: subs.map((x) => ({
+					...brief(x),
+					assignee: nameOf$2(people, x.assigneeId),
+					due: dayOf(x.dueDate)
+				})) } : {})(subtasksOf(t, data.tasks)),
 				...t.sounding ? { sounding: soundingOut(data, t, me(ctx)?.id ?? null, ctx.now) } : {},
 				...t.approval ? { approval: approvalOut(data, t.approval) } : {},
 				...((v) => v ? { fields: v } : {})(fieldValuesOut(data, project, t)),
@@ -23888,7 +23947,9 @@ function tasksSlice({ set, get, write }) {
 			get().log(`added ${who?.name ?? "someone"} as a second pair of hands on ${taskIds.length + raidIds.length} item${taskIds.length + raidIds.length === 1 ? "" : "s"}`, "/people");
 		},
 		addTask: (t, opts) => {
-			if (!opts?.allowOverCap) {
+			const wanted = t.parentTaskId ? byId(get().tasks).get(t.parentTaskId) : void 0;
+			const parentTaskId = wanted && wanted.projectId === t.projectId && !subtaskProblem("", wanted.id, get().tasks) ? wanted.id : null;
+			if (!opts?.allowOverCap && !parentTaskId) {
 				if (columnWip(get(), t.projectId, t.status, 1)) return "";
 			}
 			const id = uid("t");
@@ -23899,6 +23960,7 @@ function tasksSlice({ set, get, write }) {
 				createdById: get().currentUserId || null,
 				completedAt: t.status === "done" ? t.completedAt ?? stamp() : null,
 				checklist: t.checklist ?? [],
+				..."parentTaskId" in t ? { parentTaskId } : {},
 				...blockersPatch(blockerIds({
 					id,
 					blockedById: t.blockedById,
@@ -23925,6 +23987,10 @@ function tasksSlice({ set, get, write }) {
 		},
 		updateTask: (id, patch, opts) => {
 			const task = get().tasks.find((row) => row.id === id);
+			if (task && patch.parentTaskId && subtaskProblem(id, patch.parentTaskId, get().tasks)) {
+				patch = { ...patch };
+				delete patch.parentTaskId;
+			}
 			if (task && patch.status && patch.status !== task.status) {
 				if (patch.status === "done" && !opts?.allowBlocked && isBlocked$1(task, get().tasks)) {
 					set({ blockPending: {
@@ -23936,13 +24002,24 @@ function tasksSlice({ set, get, write }) {
 					} });
 					return;
 				}
-				if (!opts?.allowOverCap) {
+				if (!opts?.allowOverCap && !isSubtask(task, get().tasks)) {
 					if (columnWip(get(), task.projectId, patch.status, 1)) return;
 				}
 			}
+			const moving = task && patch.projectId && patch.projectId !== task.projectId;
+			const carried = moving ? new Set(subtasksOf(task, get().tasks).map((t) => t.id)) : null;
+			if (moving && task.parentTaskId && !("parentTaskId" in patch)) patch = {
+				...patch,
+				parentTaskId: null
+			};
 			const project = get().projects.find((p) => p.id === task?.projectId);
 			const newComments = [];
 			const tasks = get().tasks.map((row) => {
+				if (carried?.has(row.id)) return {
+					...row,
+					projectId: patch.projectId,
+					touchedAt: stamp()
+				};
 				if (row.id !== id) return row;
 				const next = {
 					...row,
@@ -23992,7 +24069,7 @@ function tasksSlice({ set, get, write }) {
 				} });
 				return;
 			}
-			if (!opts?.allowOverCap) {
+			if (!opts?.allowOverCap && !isSubtask(task, get().tasks)) {
 				if (columnWip(get(), task.projectId, status, 1)) return;
 			}
 			const nextRow = withStatus(task, status);
@@ -24412,6 +24489,7 @@ var init_tasks = __esmMin((() => {
 	init_assignment();
 	init_bulk();
 	init_task_people();
+	init_subtasks();
 }));
 
 // src/lib/raid-history.ts
@@ -30471,6 +30549,7 @@ init_clock();
 init_date_text();
 init_work();
 init_blockers();
+init_subtasks();
 init_recurrence();
 init_task_people();
 init_search();
@@ -30589,6 +30668,8 @@ function TaskPanel({ taskId, width, height, go, active = true, onClose }) {
 	const thread = comments.filter((c) => c.taskId === task.id).slice(-4);
 	const mine = comments.filter((c) => c.taskId === task.id && c.authorId === me);
 	const blockers = blockersOf(task, tasks);
+	const subtaskOf = parentOf(task, tasks);
+	const subs = subtasksOf(task, tasks);
 	const done = () => setEditing(null);
 	const nameOf = (id) => people.find((p) => p.id === id)?.name;
 	const setCustom = (fieldId, value) => store.getState().setTaskCustomFieldValue(task.id, fieldId, value);
@@ -30941,6 +31022,40 @@ function TaskPanel({ taskId, width, height, go, active = true, onClose }) {
 					]
 				}, item.id);
 			}),
+			subtaskOf ? /* @__PURE__ */ jsxs(Text, {
+				color: theme.muted,
+				wrap: "truncate-end",
+				children: [
+					"  ",
+					"Subtask of ",
+					keyOf$1({ projects }, subtaskOf),
+					" ",
+					subtaskOf.title
+				]
+			}) : null,
+			subs.length > 0 ? /* @__PURE__ */ jsxs(Text, {
+				color: theme.muted,
+				children: [
+					"  ",
+					"Subtasks ",
+					subs.filter((x) => x.status === "done").length,
+					"/",
+					subs.length
+				]
+			}) : null,
+			subs.map((x) => /* @__PURE__ */ jsxs(Text, {
+				wrap: "truncate-end",
+				children: [
+					"  ",
+					x.status === "done" ? "[x] " : "[ ] ",
+					keyOf$1({ projects }, x),
+					" ",
+					x.status === "done" ? /* @__PURE__ */ jsx(Text, {
+						strikethrough: true,
+						children: x.title
+					}) : x.title
+				]
+			}, x.id)),
 			(task.github ?? []).slice(0, 3).map((ref) => /* @__PURE__ */ jsxs(Text, {
 				color: theme.muted,
 				wrap: "truncate-end",

package/lib/cli.mjs

@@ -168,7 +168,7 @@ export const HELP = `harbor: Harbor from the terminal
                      [--also "NAME, NAME"] [--due DATE|pilot]
                      [--priority low|medium|high|urgent]
                      [--status S] [--comment TEXT] [--over-limit] [--dry-run]
-                     [--literal] [--template NAME]
+                     [--literal] [--template NAME] [--parent TASK]
                                               reads plain words in TITLE as the
                                               website does: @name, by friday,
                                               !high, #project (--literal: keep
@@ -183,7 +183,8 @@ export const HELP = `harbor: Harbor from the terminal
                    [--also "NAME, NAME"|none] [--due DATE|pilot|none]
                    [--priority P] [--status S] [--notes TEXT]
                    [--repeat weekly|biweekly|monthly|never]
-                   [--waits-on TASK,TASK|none] [--confirm] [--over-limit]
+                   [--waits-on TASK,TASK|none] [--parent TASK|none]
+                   [--confirm] [--over-limit]
   harbor limit PROJECT [COLUMN N|none]        how many tasks a board column
                                               takes at once; the owner sets it
   harbor week [--next|--last|--week DATE] [--review]
@@ -704,7 +705,7 @@ export function hint(message, project) {
     )
     .replace(
       /^Nothing to change: pass a field to update\.$/,
-      "Nothing to change. Say what with --title, --assignee, --also, --due, --priority, --status, --notes, --repeat or --waits-on.",
+      "Nothing to change. Say what with --title, --assignee, --also, --due, --priority, --status, --notes, --repeat, --waits-on or --parent.",
     )
     .replace(
       /^This connection was allowed to read only\..*$/s,
@@ -785,6 +786,10 @@ const DETAIL = {
     "  notes, priority, owner, others on it, checklist and due offset fill what",
     "  the flags don't. Leave out TITLE to take the template's.",
     "",
+    "  --parent TASK adds it inside that task as a subtask: a whole task with its",
+    "  own owner and date, shown in the parent's details rather than on the",
+    "  board. It goes in the parent's project; subtasks go one level deep.",
+    "",
     "  --due pilot takes the earliest day the owner's queue suggests: their open",
     "  work due first, their weekly pace, time away, what it waits on and how",
     "  long their similar tasks took. It needs an owner (--assignee none is",
@@ -2288,6 +2293,7 @@ export async function run(argv, io = {}) {
           ),
         ];
         if (t.alsoOn?.length) lines.push(`Also on it: ${t.alsoOn.join(", ")}.`);
+        if (t.subtaskOf) lines.push(`Subtask of ${t.subtaskOf.key ?? t.subtaskOf.id}  ${t.subtaskOf.title}.`);
         if (t.repeats) lines.push(`Repeats ${REPEAT_WORD[t.repeats] ?? t.repeats}.`);
         for (const [name, v] of Object.entries(t.fields ?? {}))
           lines.push(`${name}: ${Array.isArray(v) ? v.join(", ") : v === true ? "yes" : v}`);
@@ -2296,6 +2302,15 @@ export async function run(argv, io = {}) {
         if (t.description) lines.push("", t.description);
         if (t.checklist.length)
           lines.push("", ...t.checklist.map((c) => `  [${c.done ? "x" : " "}] ${c.step}`));
+        if (t.subtasks?.length)
+          lines.push(
+            "",
+            `Subtasks (${t.subtasks.filter((x) => x.status === "done").length}/${t.subtasks.length} done):`,
+            ...t.subtasks.map(
+              (x) =>
+                `  [${x.status === "done" ? "x" : " "}] ${x.key ?? x.id}  ${x.title}${x.assignee ? `, ${x.assignee}` : ""}${x.due ? `, due ${x.due}` : ""}`,
+            ),
+          );
         if (t.waitingOn.length)
           lines.push(
             "",
@@ -2531,9 +2546,12 @@ export async function run(argv, io = {}) {
       const { positionals, values, harbor } = parse(
         spec(
           ["over-limit", "dry-run", "literal"],
-          ["project", "assignee", "also", "due", "priority", "status", "comment", "template"],
+          ["project", "assignee", "also", "due", "priority", "status", "comment", "template", "parent"],
         ),
       );
+      // A subtask goes in its parent's project.
+      if (values.parent && !values.project)
+        values.project = (await client.call("get_task", { harbor, task: values.parent })).projectId;
       // --template with no title: the template's own title.
       const fromTemplate = values.template !== undefined && positionals.length === 0;
       // Several at once: one title a line on stdin, with no title (or -) after add.
@@ -2636,6 +2654,7 @@ export async function run(argv, io = {}) {
             suggestedDue: duePilot(values.due),
             priority: values.priority ?? words.priority?.value,
             status: values.status === undefined ? undefined : statusWord(values.status),
+            parent: values.parent,
             overLimit: values["over-limit"] || undefined,
           })
           .catch((err) => {
@@ -2761,6 +2780,7 @@ export async function run(argv, io = {}) {
             "notes",
             "repeat",
             "waits-on",
+            "parent",
           ],
         ),
       );
@@ -2791,12 +2811,18 @@ export async function run(argv, io = {}) {
                     .split(",")
                     .map((x) => x.trim())
                     .filter(Boolean),
+          parent: values.parent,
           confirmed: values.confirm || undefined,
           overLimit: values["over-limit"] || undefined,
         },
         (r) =>
           [
             `Updated: ${taskLine(r.updated, opts)}`,
+            values.parent !== undefined
+              ? r.updated.subtaskOf
+                ? `A subtask of ${r.updated.subtaskOf}.`
+                : "A task of its own now."
+              : null,
             values.also !== undefined
               ? r.updated.alsoOn?.length
                 ? `Also on it: ${r.updated.alsoOn.join(", ")}.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harborppm/cli",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "Harbor from the terminal: a full-screen app with everything, plus commands for scripts and agents.",
   "keywords": [
     "harbor",