@harborppm/cli 0.85.0 → 0.86.0

package/dist/app.mjs

@@ -5266,6 +5266,49 @@ function cascadeSummary(counts, kind) {
 	if (list.length === 1) return list[0];
 	return `${list.slice(0, -1).join(", ")} and ${list.at(-1)}`;
 }
+/** `data` with the cut links put back, wherever both ends exist again. */
+function relink(data, links) {
+	const out = {};
+	const exists = (key) => new Set(data[key].map((r) => r.id));
+	const targetOf = {
+		programs: "programs",
+		projects: "projects",
+		tasks: "tasks",
+		milestones: "projects"
+	};
+	for (const key of [
+		"programs",
+		"projects",
+		"tasks",
+		"milestones"
+	]) {
+		const cut = links.blockers[key];
+		if (!cut) continue;
+		const there = exists(targetOf[key]);
+		out[key] = data[key].map((row) => {
+			const was = cut[row.id];
+			if (!was) return row;
+			const ids = [.../* @__PURE__ */ new Set([...was, ...blockerIds(row)])].filter((id) => there.has(id));
+			return ids.length === blockerIds(row).length ? row : {
+				...row,
+				...blockersPatch(ids)
+			};
+		});
+	}
+	if (Object.keys(links.focus).length) {
+		const tasks = exists("tasks");
+		out.ropes = (data.ropes ?? []).map((r) => {
+			const lost = links.focus[`${r.personId}|${r.date}`];
+			if (!lost) return r;
+			const back = lost.filter((id) => tasks.has(id) && !r.taskIds.includes(id));
+			return back.length ? {
+				...r,
+				taskIds: [...r.taskIds, ...back]
+			} : r;
+		});
+	}
+	return out;
+}
 var init_cascade = __esmMin((() => {
 	init_blockers();
 }));
@@ -5731,15 +5774,19 @@ function roadmapDoneCount(data, portfolioId) {
 }
 
 // src/lib/search.ts
+/** Lower case without accents, so "cafe" finds "Café" and "Zoë" finds "Zoe". */
+function fold(text) {
+	return text.normalize("NFD").replace(/\p{M}/gu, "").toLowerCase();
+}
 function tokensOf(query) {
-	return query.toLowerCase().split(/\s+/).filter(Boolean);
+	return fold(query).split(/\s+/).filter(Boolean);
 }
 /** Score a thing by its own name first, then by everything else it carries. */
 function scoreMatch(query, name, ...secondary) {
-	const q = query.trim().toLowerCase();
+	const q = fold(query.trim());
 	if (!q) return SCORE.anywhere;
 	const tokens = tokensOf(q);
-	const n = name.toLowerCase();
+	const n = fold(name);
 	if (n === q) return SCORE.exact;
 	if (n.startsWith(q)) return SCORE.prefix;
 	const words = n.split(/\s+/);
@@ -5747,7 +5794,7 @@ function scoreMatch(query, name, ...secondary) {
 		const bonus = tokens.every((t) => words.some((w) => w.startsWith(t))) ? 5 : 0;
 		return SCORE.name + bonus;
 	}
-	const blob = [n, ...secondary.filter((s) => Boolean(s)).map((s) => s.toLowerCase())].join(" ");
+	const blob = [n, ...secondary.filter((s) => Boolean(s)).map(fold)].join(" ");
 	return tokens.every((t) => blob.includes(t)) ? SCORE.anywhere : 0;
 }
 /** Keep what matches, best first. Ties keep the caller's order. */
@@ -21202,12 +21249,13 @@ const HARBOR_TOOLS = [
 			if (input.query) {
 				const q = input.query;
 				const named = findByKey(data, q);
+				const names = new Map(data.projects.map((p) => [p.id, p.name]));
 				list = list.map((t) => ({
 					t,
-					s: scoreMatch(q, t.title, t.description)
+					s: scoreMatch(q, t.title, t.description, names.get(t.projectId))
 				})).filter((h) => h.s > 0 && h.t !== named).sort((a, b) => b.s - a.s).map((h) => h.t);
 				if (named) list.unshift(named);
-				if (!input.status?.length) doneMatches = data.tasks.filter((t) => t.status === "done" && t !== named && fits(t) && scoreMatch(q, t.title, t.description) > 0).length;
+				if (!input.status?.length) doneMatches = data.tasks.filter((t) => t.status === "done" && t !== named && fits(t) && scoreMatch(q, t.title, t.description, names.get(t.projectId)) > 0).length;
 			} else list = [...list].sort((a, b) => a.status === "done" && b.status === "done" ? (b.completedAt ?? "").localeCompare(a.completedAt ?? "") : Number(a.status === "done") - Number(b.status === "done") || (a.dueDate ?? "9999").localeCompare(b.dueDate ?? "9999"));
 			return {
 				...doneMatches ? { doneMatches } : {},
@@ -22878,7 +22926,10 @@ function withStatus(task, status) {
 		touchedAt: stamp()
 	};
 	if (status === "done") next.completedAt = stamp();
-	else if (task.status === "done") next.completedAt = null;
+	else if (task.status === "done") {
+		next.completedAt = null;
+		if (task.approval?.status === "approved") next.approval = null;
+	}
 	return next;
 }
 var init_shared = __esmMin((() => {}));
@@ -23051,6 +23102,26 @@ var init_session = __esmMin((() => {
 	init_format();
 }));
 
+// src/lib/assignment.ts
+/**
+* Record who set a task's assignee and when. Only a change of assignee
+* stamps; clearing the assignee clears the stamp.
+*/
+function stampAssignment(before, next, by, at) {
+	if (before && before.assigneeId === next.assigneeId) return next;
+	if (!next.assigneeId) return {
+		...next,
+		assignedBy: null,
+		assignedAt: null
+	};
+	return {
+		...next,
+		assignedBy: by,
+		assignedAt: at
+	};
+}
+var init_assignment = __esmMin((() => {}));
+
 // src/lib/first-week.ts
 /** The program launch named for you, when nobody has renamed it yet. */
 function starterProgram(data) {
@@ -23377,13 +23448,13 @@ function hierarchySlice({ get, write }) {
 			const program = get().programs.find((p) => p.id === programId);
 			get().log(`moved ${ids.length} project${ids.length === 1 ? "" : "s"} to ${program?.name ?? "a program"}`, `/programs/${programId}`);
 		},
-		restoreRows: (rows) => {
+		restoreRows: (rows, links) => {
 			const state = get();
 			const back = (current, add) => {
 				const have = new Set((current ?? []).map((r) => r.id));
 				return [...current ?? [], ...(add ?? []).filter((r) => !have.has(r.id))];
 			};
-			write({
+			const next = {
 				portfolios: back(state.portfolios, rows.portfolios),
 				programs: back(state.programs, rows.programs),
 				projects: back(state.projects, rows.projects),
@@ -23399,7 +23470,14 @@ function hierarchySlice({ get, write }) {
 					...rows.boardConfigs ?? {},
 					...state.boardConfigs ?? {}
 				}
-			});
+			};
+			write(links ? {
+				...next,
+				...relink({
+					...state,
+					...next
+				}, links)
+			} : next);
 			const name = rows.portfolios?.[0]?.name ?? rows.programs?.[0]?.name ?? rows.projects?.[0]?.name;
 			if (name) get().log(`put back “${name}”`);
 		},
@@ -23410,10 +23488,13 @@ function hierarchySlice({ get, write }) {
 				const ids = have(current);
 				return [...current, ...(more ?? []).filter((r) => !ids.has(r.id))];
 			};
+			const small = (rows.tasks?.length ?? 0) <= 20;
+			const at = stamp();
+			const incoming = small ? rows.tasks?.map((t) => stampAssignment(void 0, t, state.currentUserId, at)) : rows.tasks;
 			write({
 				programs: add(state.programs, rows.programs),
 				projects: add(state.projects, rows.projects),
-				tasks: add(state.tasks, rows.tasks),
+				tasks: add(state.tasks, incoming),
 				people: add(state.people, rows.people),
 				raidItems: add(state.raidItems, rows.raidItems)
 			});
@@ -23484,6 +23565,7 @@ function hierarchySlice({ get, write }) {
 		}
 	};
 }
+var SMALL_IMPORT;
 var init_hierarchy = __esmMin((() => {
 	init_board();
 	init_cascade();
@@ -23493,11 +23575,13 @@ var init_hierarchy = __esmMin((() => {
 	init_health_history();
 	init_derived_health();
 	init_shared();
+	init_assignment();
 	init_hill();
 	init_charter_lines();
 	init_format();
 	init_empty();
 	init_first_week();
+	SMALL_IMPORT = 20;
 }));
 
 // src/lib/github-refs.ts
@@ -23546,6 +23630,16 @@ function runActions(actions, start, ctx) {
 	for (const action of actions) switch (action.type) {
 		case "set_status": {
 			if (!action.status) break;
+			if (action.status === "done" && task.status !== "done" && ctx.waiting?.(task)) {
+				comments.push({
+					taskId: task.id,
+					authorId: ctx.authorId,
+					body: "Left open: this still waits on unfinished work, so the rule didn’t finish it.",
+					createdAt: ctx.now,
+					mentionedIds: []
+				});
+				break;
+			}
 			const wasDone = task.status === "done";
 			const completedAt = action.status === "done" ? task.completedAt ?? ctx.now : wasDone ? null : task.completedAt;
 			task = {
@@ -23611,7 +23705,8 @@ function applyAutomations(project, prev, next, opts) {
 	const ctx = {
 		authorId: opts.currentUserId,
 		now,
-		today
+		today,
+		waiting: opts.waiting
 	};
 	let task = next;
 	const comments = [];
@@ -23717,26 +23812,6 @@ var init_recurrence = __esmMin((() => {
 	step = (d, repeat, n) => repeat === "weekly" ? addDays(d, 7 * n) : repeat === "biweekly" ? addDays(d, 14 * n) : addMonths$1(d, n);
 }));
 
-// src/lib/assignment.ts
-/**
-* Record who set a task's assignee and when. Only a change of assignee
-* stamps; clearing the assignee clears the stamp.
-*/
-function stampAssignment(before, next, by, at) {
-	if (before && before.assigneeId === next.assigneeId) return next;
-	if (!next.assigneeId) return {
-		...next,
-		assignedBy: null,
-		assignedAt: null
-	};
-	return {
-		...next,
-		assignedBy: by,
-		assignedAt: at
-	};
-}
-var init_assignment = __esmMin((() => {}));
-
 // src/lib/bulk.ts
 /** A task's due date moved by `days`, or null when it has none. */
 function shiftedDue(due, days) {
@@ -23833,7 +23908,8 @@ function tasksSlice({ set, get, write }) {
 			const project = get().projects.find((p) => p.id === t.projectId);
 			const { task: automated, comments: autoComments } = applyAutomations(project, void 0, row, {
 				created: true,
-				currentUserId: get().currentUserId
+				currentUserId: get().currentUserId,
+				waiting: (t) => isBlocked$1(t, get().tasks)
 			});
 			const finalRow = stampAssignment(void 0, automated, get().currentUserId, stamp());
 			write({
@@ -23876,12 +23952,16 @@ function tasksSlice({ set, get, write }) {
 				if (next.assigneeId && next.followerIds?.includes(next.assigneeId)) next.followerIds = alsoOnIds(next);
 				if (patch.status && patch.status !== row.status) {
 					if (patch.status === "done" && !patch.completedAt) next.completedAt = stamp();
-					else if (row.status === "done" && patch.status !== "done") next.completedAt = null;
+					else if (row.status === "done" && patch.status !== "done") {
+						next.completedAt = null;
+						if (row.approval?.status === "approved" && !("approval" in patch)) next.approval = null;
+					}
 					if (patch.status === "done" && isBlocked$1(row, get().tasks)) Object.assign(next, blockersPatch([]));
 				}
 				const { task: finalTask, comments: autoComments } = applyAutomations(project, row, next, {
 					created: false,
-					currentUserId: get().currentUserId
+					currentUserId: get().currentUserId,
+					waiting: (t) => isBlocked$1(t, get().tasks)
 				});
 				newComments.push(...autoComments.map((c) => ({
 					...c,
@@ -23920,7 +24000,8 @@ function tasksSlice({ set, get, write }) {
 			const project = get().projects.find((p) => p.id === task.projectId);
 			const { task: finalRow, comments: autoComments } = applyAutomations(project, task, nextRow, {
 				created: false,
-				currentUserId: get().currentUserId
+				currentUserId: get().currentUserId,
+				waiting: (t) => isBlocked$1(t, get().tasks)
 			});
 			const follow = status === "done" ? nextOccurrence(finalRow, uid("t"), todayISO(), stamp(), tasksOf(get().tasks, task.projectId)) : null;
 			const moved = get().tasks.map((row) => row.id === id ? finalRow : row);
@@ -24002,7 +24083,8 @@ function tasksSlice({ set, get, write }) {
 		},
 		updateComment: (id, body) => {
 			const comment = get().comments.find((c) => c.id === id);
-			if (!comment || comment.authorId !== get().currentUserId) return;
+			if (!comment) return;
+			if (comment.authorId !== get().currentUserId && get().myRole !== "owner") return;
 			const trimmed = body.trim();
 			if (!trimmed) return;
 			const mentionedIds = parseMentions(trimmed, get().people).filter((pid) => pid !== get().currentUserId);
@@ -24015,7 +24097,8 @@ function tasksSlice({ set, get, write }) {
 		},
 		deleteComment: (id) => {
 			const comment = get().comments.find((c) => c.id === id);
-			if (!comment || comment.authorId !== get().currentUserId) return;
+			if (!comment) return;
+			if (comment.authorId !== get().currentUserId && get().myRole !== "owner") return;
 			set({ comments: get().comments.filter((c) => c.id !== id) });
 		},
 		addChecklistItem: (taskId, title) => {
@@ -24196,7 +24279,8 @@ function tasksSlice({ set, get, write }) {
 				}
 				const { task: automated, comments } = applyAutomations(projects.get(row.projectId), row, next, {
 					created: false,
-					currentUserId: me
+					currentUserId: me,
+					waiting: (t) => isBlocked$1(t, s.tasks)
 				});
 				newComments.push(...comments.map((c) => ({
 					...c,

package/lib/cli.mjs

@@ -2737,7 +2737,7 @@ export async function run(argv, io = {}) {
         },
         (r) =>
           [
-            `${r.updated.title}: ${{ doing: "started", review: "in review", done: "done" }[status]}.`,
+            `${r.updated.title}: ${r.reopened ? "reopened, " : ""}${{ doing: "started", review: "in review", done: "done" }[status]}.`,
             r.queuedNext ? `Next one: ${taskLine(r.queuedNext, opts)}` : "",
             r.projectFinished
               ? `That was the last open task in ${r.projectFinished}. Mark the project Done in the app (harbor) or on the website.`

package/package.json

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