@harborppm/cli 0.11.1 → 0.12.0

package/README.md

@@ -26,16 +26,16 @@ harbor             # name your harbor and its first project, and you're in
 
 `harbor` on its own takes over the terminal, like `htop` or `lazygit`, and gives it back when you press `q`. It opens on Harbor's mark (the teal tile, the H and three boats, drawn in half blocks) while your harbor loads; after that the sidebar holds just the screens. Then:
 
-1. **Today**: what's on you, late first; who's waiting on you; your risks and issues.
+1. **Today**: today's focus (`f` adds or takes off the task you're on, up to three) and your check-in (`c`); what's on you, late first; who's waiting on you; your risks and issues.
 2. **Inbox**: the same pings as the website: waiting on you, sign-offs, mentions. Enter opens one; it's marked read.
-3. **Projects**: every portfolio, program and project with its health. A project opens on its board (columns side by side), its list, or its budget and spend ledger (`v`); `e` changes its details: lead, dates, budget, health by hand with a note.
+3. **Projects**: every portfolio, program and project with its health. A project opens on its board (columns side by side; `f` and `p` show only someone's cards or one priority), its list, or its budget and spend ledger (`v`); `e` changes its details: lead, dates, budget, health by hand with a note.
 4. **Programs**: a program's projects and milestones side by side (`m` adds a milestone, space ticks one), its next move and health.
 5. **Risks**: the register, worst first. Enter changes one (status, owner, likelihood, impact, mitigation); `n` logs a risk, issue or decision.
 6. **People**: open and late work and the next four weeks against each person's capacity; Enter changes their capacity, role, or the time they're promised to a program.
 7. **Roadmap**: a portfolio's programs and projects across the months, in their health's colour, ◆ for milestones.
 8. **History**: who changed what, for a portfolio, program or project (`s` picks which).
 
-A task changes in place too: title, status, owner, due date (`2026-10-14`, `today`, `+3`), priority, project, notes, checklist steps, comments.
+A task changes in place too: title, status, owner, due date (`2026-10-14`, `today`, `+3`), priority, project, what it waits on (type a key or words), how it repeats, notes, checklist steps, comments (`C` changes or takes out one of yours).
 
 Keys: `↑↓` (or `j k`) and `←→` (or `h l`) move, Enter opens, Esc goes back, `:` finds anything (a screen, "new project", a project or program by name), `/` finds a task by its key or words, `n` makes something new, `e` changes what's open, `[` `]` move a card a column, `x` marks it done, `d` deletes (it asks first), `u` undoes your last change, `H` switches harbor, `?` lists them all.
 
@@ -94,13 +94,17 @@ harbor add "TITLE" --project P [--assignee me|NAME] [--due DATE]
                    [--priority low|medium|high|urgent] [--status S] [--over-limit]
 harbor start TASK | review TASK | done TASK [--confirm] [--over-limit]
 harbor edit TASK [--title T] [--assignee me|none|NAME] [--due DATE|none]
-                 [--priority P] [--status S] [--confirm] [--over-limit]
+                 [--priority P] [--status S] [--notes TEXT]
+                 [--repeat weekly|biweekly|monthly|never]
+                 [--waits-on TASK,TASK|none] [--confirm] [--over-limit]
 harbor comment TASK "TEXT"
 harbor checkin "WHAT YOU'RE DOING" [--on-blocker]
 harbor risk "TITLE" --project P|--program P [--impact 1-5] [--probability 1-5]
                    [--owner NAME] [--due DATE]
 harbor issue "TITLE" --project P|--program P [--impact 1-5] [--owner NAME]
                     [--due DATE]
+harbor decision "TITLE" --project P|--program P [--owner NAME] [--due DATE]
+harbor risks [words] [--kind risk,issue,decision] [--project P] [--closed]
 ```
 
 Every command takes `--json` for the raw result (a refusal then comes out as `{"error": "…"}` on standard output, still with exit code 1), and `harbor COMMAND --help` shows just that command. Statuses are backlog, todo, doing, review and done. A `DATE` is YYYY-MM-DD, `today`, `tomorrow`, or `+N` for N days from today.

package/dist/app.mjs

@@ -2088,6 +2088,14 @@ function forecastLine(f) {
 	const side = f.variance >= 0 ? "under" : "over";
 	return `At this rate it ends at ${money(Math.round(f.eac))} (${money(gap)} ${side} budget)`;
 }
+const NO_FILTER = {
+	who: "any",
+	priority: "any"
+};
+function filterTasks(tasks, f) {
+	if (f.who === "any" && f.priority === "any") return tasks;
+	return tasks.filter((t) => (f.who === "any" || (f.who === "none" ? t.assigneeId === null : t.assigneeId === f.who)) && (f.priority === "any" || t.priority === f.priority));
+}
 
 //#endregion
 //#region src/tui/theme.ts
@@ -3348,19 +3356,23 @@ function RowList({ title, right, rows, empty, active, width, height, onOpen, key
 		]
 	});
 }
-/** Every project, under its program and portfolio, with health and progress. */
+/** Every project, under its program and portfolio, with health and progress. Done
+*  projects and programs stay out of the way until D shows them. */
 function ProjectsView({ active, width, height, go }) {
 	const portfolios = useHarbor((s) => s.portfolios);
 	const programs = useHarbor((s) => s.programs);
 	const projects = useHarbor((s) => s.projects);
 	const tasks = useHarbor((s) => s.tasks);
 	const { today } = useDeps();
-	const rows = useMemo(() => {
+	const [showDone, setShowDone] = useState(false);
+	const { rows, shown, hidden } = useMemo(() => {
 		const data = {
 			tasks,
 			projects
 		};
 		const out = [];
+		let shown = 0;
+		let hidden = 0;
 		for (const portfolio of portfolios) {
 			out.push({
 				id: portfolio.id,
@@ -3371,6 +3383,11 @@ function ProjectsView({ active, width, height, go }) {
 				health: portfolio.health
 			});
 			for (const program of programs.filter((g) => g.portfolioId === portfolio.id)) {
+				const { open, done } = splitDone(projects.filter((p) => p.programId === program.id));
+				if (program.health === "done" && open.length === 0) {
+					hidden += 1 + done.length;
+					if (!showDone) continue;
+				} else hidden += done.length;
 				out.push({
 					id: program.id,
 					kind: "program",
@@ -3378,8 +3395,9 @@ function ProjectsView({ active, width, height, go }) {
 					title: program.name,
 					health: program.health
 				});
-				for (const project of projects.filter((p) => p.programId === program.id)) {
-					const { done, total } = projectSummary(data, project);
+				for (const project of showDone ? [...open, ...done] : open) {
+					shown++;
+					const { done: finished, total } = projectSummary(data, project);
 					const late = tasksOf(tasks, project.id).filter((t) => isLate(t, today())).length;
 					out.push({
 						id: project.id,
@@ -3387,22 +3405,27 @@ function ProjectsView({ active, width, height, go }) {
 						depth: 2,
 						title: `${project.name}${project.key ? ` ${project.key}` : ""}`,
 						health: project.health,
-						detail: `${done}/${total} done${late ? ` · ${late} late` : ""} · ends ${shortDay(project.endDate, today())}`
+						detail: `${finished}/${total} done${late ? ` · ${late} late` : ""} · ends ${shortDay(project.endDate, today())}`
 					});
 				}
 			}
 		}
-		return out;
+		return {
+			rows: out,
+			shown,
+			hidden
+		};
 	}, [
 		portfolios,
 		programs,
 		projects,
 		tasks,
-		today
+		today,
+		showDone
 	]);
 	return /* @__PURE__ */ jsx(RowList, {
 		title: "Portfolios, programs and projects",
-		right: `${count(projects.length, "project")} · n new project · e edit`,
+		right: `${count(shown, "project")}${hidden ? ` · ${hidden} done ${showDone ? "shown" : "hidden"} (D)` : ""} · n new project · e edit`,
 		rows,
 		empty: "No projects yet. n adds one.",
 		active,
@@ -3414,7 +3437,8 @@ function ProjectsView({ active, width, height, go }) {
 				const programId = r?.kind === "program" ? r.id : r?.kind === "project" ? projects.find((p) => p.id === r.id)?.programId : void 0;
 				go.create("project", programId ? { programId } : {});
 			},
-			e: (r) => r && r.kind !== "raid" && r.kind !== "person" && go.openPanel(r.kind, r.id)
+			e: (r) => r && r.kind !== "raid" && r.kind !== "person" && go.openPanel(r.kind, r.id),
+			D: () => hidden > 0 && setShowDone((v) => !v)
 		}
 	});
 }
@@ -3892,11 +3916,9 @@ function HarborSwitch({ harbors, current, width, onPick, onClose }) {
 	});
 }
 const HELP = [
-	["1–8", "the screens, as the sidebar lists them"],
+	["1–8 / Tab", "the screens / between the sidebar and a screen"],
 	[":", "anything: a screen, something new, a name"],
-	["/", "find a task by key or words"],
-	["H", "switch harbor"],
-	["Tab", "between the sidebar and the screen"],
+	["/ / H", "find a task by key or words / switch harbor"],
 	["↑↓ or j k", "move; ←→ or h l across columns and lists"],
 	["Enter / Esc", "open / back"],
 	["n", "new: a task, or what the screen lists"],
@@ -3907,7 +3929,9 @@ const HELP = [
 	["v", "on a project: board, list, budget"],
 	["m / R", "new milestone on a program / log a risk"],
 	["D", "show or hide Done projects and programs"],
-	["c / a", "on a task: comment / add a checklist step"],
+	["c / a / C", "on a task: comment / add a step / change yours"],
+	["f / c", "on Today: focus on a task / check in"],
+	["f / p", "on a board: filter by owner / priority"],
 	["q", "quit (saves first)"]
 ];
 /**
@@ -4116,7 +4140,7 @@ function healthField(kind, item, go, set, clear) {
 		}
 	};
 }
-function ProgramPanel({ id, width, height, go, onClose }) {
+function ProgramPanel({ id, width, height, go, active, onClose }) {
 	const { store, today } = useDeps();
 	const program = useHarbor((s) => s.programs.find((p) => p.id === id));
 	const people = useHarbor((s) => s.people);
@@ -4212,10 +4236,11 @@ function ProgramPanel({ id, width, height, go, onClose }) {
 				onClose();
 			}, "Delete");
 		} },
+		active,
 		onClose
 	});
 }
-function PortfolioPanel({ id, width, height, go, onClose }) {
+function PortfolioPanel({ id, width, height, go, active, onClose }) {
 	const { store } = useDeps();
 	const portfolio = useHarbor((s) => s.portfolios.find((p) => p.id === id));
 	const people = useHarbor((s) => s.people);
@@ -4279,10 +4304,11 @@ function PortfolioPanel({ id, width, height, go, onClose }) {
 				onClose();
 			}, "Delete");
 		} },
+		active,
 		onClose
 	});
 }
-function ProjectPanel({ id, width, height, go, onClose }) {
+function ProjectPanel({ id, width, height, go, active, onClose }) {
 	const { store, today } = useDeps();
 	const project = useHarbor((s) => s.projects.find((p) => p.id === id));
 	const people = useHarbor((s) => s.people);
@@ -4392,10 +4418,11 @@ function ProjectPanel({ id, width, height, go, onClose }) {
 				onClose();
 			}, "Delete");
 		} },
+		active,
 		onClose
 	});
 }
-function MilestonePanel({ id, width, height, go, onClose }) {
+function MilestonePanel({ id, width, height, go, active, onClose }) {
 	const { store, today } = useDeps();
 	const milestone = useHarbor((s) => s.milestones.find((m) => m.id === id));
 	const people = useHarbor((s) => s.people);
@@ -4466,10 +4493,11 @@ function MilestonePanel({ id, width, height, go, onClose }) {
 				onClose();
 			}, "Delete")
 		},
+		active,
 		onClose
 	});
 }
-function RaidPanel({ id, width, height, go, onClose }) {
+function RaidPanel({ id, width, height, go, active, onClose }) {
 	const { store, today } = useDeps();
 	const item = useHarbor((s) => s.raidItems.find((r) => r.id === id));
 	const people = useHarbor((s) => s.people);
@@ -4616,10 +4644,11 @@ function RaidPanel({ id, width, height, go, onClose }) {
 				onClose();
 			}, "Delete")
 		},
+		active,
 		onClose
 	});
 }
-function PersonPanel({ id, width, height, go, onClose }) {
+function PersonPanel({ id, width, height, go, active, onClose }) {
 	const { store } = useDeps();
 	const person = useHarbor((s) => s.people.find((p) => p.id === id));
 	const programs = useHarbor((s) => s.programs);
@@ -4703,6 +4732,7 @@ function PersonPanel({ id, width, height, go, onClose }) {
 				]
 			}, a.programId))
 		] }) : null,
+		active,
 		onClose
 	});
 }
@@ -5020,8 +5050,21 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 		people,
 		boardConfigs
 	]);
-	const columns = useMemo(() => boardOf(data, projectId), [data, projectId]);
-	const list = useMemo(() => projectTasks(data, projectId), [data, projectId]);
+	const [filter, setFilter] = useState(NO_FILTER);
+	const columns = useMemo(() => boardOf(data, projectId).map((c) => ({
+		...c,
+		all: c.tasks.length,
+		tasks: filterTasks(c.tasks, filter)
+	})), [
+		data,
+		projectId,
+		filter
+	]);
+	const list = useMemo(() => filterTasks(projectTasks(data, projectId), filter), [
+		data,
+		projectId,
+		filter
+	]);
 	const [mode, setMode] = useState("board");
 	const [spendAt, setSpendAt] = useState(0);
 	const spendEntries = useHarbor((s) => s.spendEntries) ?? [];
@@ -5053,6 +5096,38 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 		if (input === "v") return setMode((m) => m === "board" ? "list" : m === "list" ? "budget" : "board");
 		if (input === "e") return go.openPanel("project", projectId);
 		if (input === "R") return go.create("raid", { projectId });
+		if (input === "f" && mode !== "budget") return go.pick("Show cards assigned to", [
+			{
+				label: "Anyone",
+				value: "any"
+			},
+			{
+				label: "Me",
+				value: store.getState().currentUserId
+			},
+			{
+				label: "Nobody yet",
+				value: "none"
+			},
+			...people.map((p) => ({
+				label: p.name,
+				value: p.id,
+				hint: p.role
+			}))
+		], (who) => setFilter((f) => ({
+			...f,
+			who
+		})));
+		if (input === "p" && mode !== "budget") return go.pick("Show cards of priority", [{
+			label: "Any priority",
+			value: "any"
+		}, ...PRIORITIES.map((p) => ({
+			label: PRIORITY_LABEL[p],
+			value: p
+		}))], (priority) => setFilter((f) => ({
+			...f,
+			priority
+		})));
 		if (mode === "budget") {
 			const entries = project ? budgetOf({ spendEntries }, project, /* @__PURE__ */ new Date()).entries : [];
 			const entry = entries[Math.min(spendAt, entries.length - 1)];
@@ -5092,6 +5167,7 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 		})
 	});
 	const { done, total } = projectSummary(data, project);
+	const filtered = [filter.who === "none" ? "nobody's" : filter.who !== "any" ? `${people.find((p) => p.id === filter.who)?.name ?? "someone"}'s` : null, filter.priority !== "any" ? PRIORITY_LABEL[filter.priority].toLowerCase() : null].filter(Boolean);
 	const lead = people.find((p) => p.id === project.ownerId);
 	const body = height - 3;
 	const fit = Math.max(1, Math.floor((width - 2) / 14));
@@ -5140,7 +5216,16 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 							lead ? ` · ${lead.name}` : "",
 							" · ",
 							mode,
-							" · v next · e details"
+							filtered.length && mode !== "budget" ? /* @__PURE__ */ jsxs(Text, {
+								color: theme.warn,
+								children: [
+									" · only ",
+									filtered.join(", "),
+									" cards"
+								]
+							}) : null,
+							" ",
+							"· v next · f p filter · e details"
 						]
 					})
 				})]
@@ -5164,7 +5249,7 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 					const on = active && ci === col;
 					const r = Math.min(rowByCol[ci] ?? 0, Math.max(0, c.tasks.length - 1));
 					const view = windowOf(c.tasks, r, Math.max(1, Math.floor((body - 3) / 3)));
-					const over = c.limit != null && c.tasks.length > c.limit;
+					const over = c.limit != null && c.all > c.limit;
 					return /* @__PURE__ */ jsxs(Box, {
 						flexDirection: "column",
 						width: w,
@@ -5189,7 +5274,11 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 											" ",
 											/* @__PURE__ */ jsxs(Text, {
 												color: over ? theme.bad : theme.muted,
-												children: [c.tasks.length, c.limit != null ? `/${c.limit}` : ""]
+												children: [
+													c.tasks.length < c.all ? `${c.tasks.length} of ` : "",
+													c.all,
+													c.limit != null ? `/${c.limit}` : ""
+												]
 											})
 										]
 									})
@@ -5481,6 +5570,78 @@ function RoadmapView({ active, width, height, go }) {
 	});
 }
 
+//#endregion
+//#region src/lib/deps.ts
+/**
+* Everything that waits on `id`, directly or through others: the items that
+* would close a loop if `id` waited on them. One walk backwards from `id`,
+* instead of a walk forwards from every candidate.
+*/
+function waitingOnChain(items, id) {
+	const waiters = /* @__PURE__ */ new Map();
+	for (const n of items) for (const b of blockerIds(n)) {
+		const list = waiters.get(b);
+		if (list) list.push(n.id);
+		else waiters.set(b, [n.id]);
+	}
+	const out = /* @__PURE__ */ new Set();
+	const stack = [...waiters.get(id) ?? []];
+	while (stack.length) {
+		const cursor = stack.pop();
+		if (out.has(cursor)) continue;
+		out.add(cursor);
+		stack.push(...waiters.get(cursor) ?? []);
+	}
+	return out;
+}
+/** The things `id` may wait on: everything except itself and anything already waiting on it, directly or through others. */
+function blockerOptions(items, id) {
+	const loops = waitingOnChain(items, id);
+	return items.filter((n) => n.id !== id && !loops.has(n.id));
+}
+
+//#endregion
+//#region src/lib/recurrence.ts
+const REPEAT_LABEL = {
+	weekly: "Every week",
+	biweekly: "Every two weeks",
+	monthly: "Every month"
+};
+const iso$1 = (d) => {
+	return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+};
+/** The due date one interval after `from`. */
+function nextDueDate(from, repeat) {
+	const d = /* @__PURE__ */ new Date(`${from}T12:00:00`);
+	if (repeat === "weekly") return iso$1(addDays(d, 7));
+	if (repeat === "biweekly") return iso$1(addDays(d, 14));
+	return iso$1(addMonths(d, 1));
+}
+/**
+* The next occurrence of a repeating task once this one is done: same
+* title, owner, priority and checklist (unticked), due one interval after
+* the old due date (or after today when it had none), back in To do.
+* Null when the task does not repeat.
+*/
+function nextOccurrence(task, id, today, createdAt) {
+	if (!task.repeat) return null;
+	const anchor = task.dueDate && task.dueDate >= today ? task.dueDate : today;
+	return {
+		...task,
+		id,
+		status: "todo",
+		dueDate: nextDueDate(anchor, task.repeat),
+		createdAt,
+		completedAt: null,
+		blockedById: null,
+		blockedByIds: [],
+		checklist: (task.checklist ?? []).map((c) => ({
+			...c,
+			done: false
+		}))
+	};
+}
+
 //#endregion
 //#region src/tui/views/task.tsx
 const FIELDS = [
@@ -5508,19 +5669,34 @@ const FIELDS = [
 		field: "project",
 		label: "Project"
 	},
+	{
+		field: "waits",
+		label: "Waits on"
+	},
+	{
+		field: "repeat",
+		label: "Repeats"
+	},
 	{
 		field: "notes",
 		label: "Notes"
 	}
 ];
+const REPEATS = [
+	null,
+	"weekly",
+	"biweekly",
+	"monthly"
+];
 /** Everything about one task, every field editable: ↑↓ to a field, Enter to change it. */
-function TaskPanel({ taskId, width, height, go, onClose }) {
+function TaskPanel({ taskId, width, height, go, active = true, onClose }) {
 	const { store, today } = useDeps();
 	const tasks = useHarbor((s) => s.tasks);
 	const projects = useHarbor((s) => s.projects);
 	const people = useHarbor((s) => s.people);
 	const comments = useHarbor((s) => s.comments);
 	const viewOnly = useHarbor((s) => s.myRole === "viewer" || s.keepPaused);
+	const me = useHarbor((s) => s.currentUserId);
 	const task = tasks.find((t) => t.id === taskId);
 	const [at, setAt] = useState(0);
 	const [editing, setEditing] = useState(null);
@@ -5533,6 +5709,10 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 		if (key.downArrow || input === "j") return setAt((i) => step(i, 1, rows));
 		if (input === "c") return setEditing({ kind: "comment" });
 		if (input === "a") return setEditing({ kind: "step" });
+		if (input === "C") {
+			if (comments.some((c) => c.taskId === task.id && c.authorId === me)) return setEditing({ kind: "mine" });
+			return go.notify("You haven't commented on this task.");
+		}
 		if (input === "x") return moveTask(store, go, task, "done");
 		if (input === "d") return go.confirm(`Delete ${keyOf({ projects }, task)} “${task.title}”? u undoes it.`, () => {
 			store.getState().deleteTask(task.id);
@@ -5545,12 +5725,14 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 			kind: "field",
 			field: FIELDS[at].field
 		});
-	}, { isActive: editing === null });
+	}, { isActive: active && editing === null });
 	if (!task) return null;
 	const project = projects.find((p) => p.id === task.projectId);
 	const owner = people.find((p) => p.id === task.assigneeId);
 	const waits = openBlockerNames(task, tasks);
 	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 done = () => setEditing(null);
 	const value = {
 		title: task.title,
@@ -5559,6 +5741,8 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 		due: task.dueDate ? `${shortDay(task.dueDate, day)}${isLate(task, day) ? " (late)" : ""}` : "None",
 		priority: PRIORITY_LABEL[task.priority],
 		project: project ? `${project.name}${project.key ? ` (${project.key})` : ""}` : "",
+		waits: blockers.length ? blockers.map((b) => `${keyOf({ projects }, b)}${b.status === "done" ? " (done)" : ""}`).join(", ") : "Nothing",
+		repeat: task.repeat ? REPEAT_LABEL[task.repeat] : "Never",
 		notes: task.description.replace(/\s+/g, " ").trim() || "None"
 	};
 	let editor = null;
@@ -5579,7 +5763,44 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 			done();
 		}
 	});
-	else if (editing?.kind === "field") {
+	else if (editing?.kind === "mine") editor = /* @__PURE__ */ jsx(Picker, {
+		title: "One of your comments: Enter to change it or take it out",
+		choices: mine.map((c) => ({
+			label: c.body.replace(/\s+/g, " "),
+			value: c.id
+		})),
+		initial: mine.length - 1,
+		onCancel: done,
+		onPick: (id) => {
+			const c = mine.find((x) => x.id === id);
+			setEditing(null);
+			go.pick("This comment", [{
+				label: "Change the words",
+				value: "edit"
+			}, {
+				label: "Take it out",
+				value: "delete"
+			}], (what) => {
+				if (what === "edit") setEditing({
+					kind: "reword",
+					id: c.id
+				});
+				else go.confirm("Take out your comment? u undoes it.", () => store.getState().deleteComment(c.id), "Take it out");
+			});
+		}
+	});
+	else if (editing?.kind === "reword") {
+		const c = comments.find((x) => x.id === editing.id);
+		editor = /* @__PURE__ */ jsx(TextField, {
+			label: "Your comment",
+			initial: c?.body ?? "",
+			onCancel: done,
+			onSubmit: (text) => {
+				if (c && text.trim() && text.trim() !== c.body) store.getState().updateComment(c.id, text.trim());
+				done();
+			}
+		});
+	} else if (editing?.kind === "field") {
 		const f = editing.field;
 		if (f === "title" || f === "notes") editor = /* @__PURE__ */ jsx(TextField, {
 			label: f === "title" ? "Title" : "Notes",
@@ -5647,7 +5868,24 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 					done();
 				}
 			});
-		} else if (f === "project") {
+		} else if (f === "repeat") editor = /* @__PURE__ */ jsx(Picker, {
+			title: "Repeats (finishing it queues the next one)",
+			choices: REPEATS.map((r) => ({
+				label: r ? REPEAT_LABEL[r] : "Never",
+				value: r
+			})),
+			initial: REPEATS.indexOf(task.repeat ?? null),
+			onCancel: done,
+			onPick: (r) => {
+				store.getState().updateTask(task.id, { repeat: r });
+				done();
+			}
+		});
+		else if (f === "waits") editor = /* @__PURE__ */ jsx(WaitsEditor, {
+			task,
+			onDone: done
+		});
+		else if (f === "project") {
 			const choices = projects.map((p) => ({
 				label: p.name,
 				value: p.id,
@@ -5780,7 +6018,7 @@ function TaskPanel({ taskId, width, height, go, onClose }) {
 			editor ?? /* @__PURE__ */ jsx(Text, {
 				color: theme.muted,
 				wrap: "truncate-end",
-				children: "↑↓ field · Enter change · c comment · a add step · space tick · x done · d delete · Esc close"
+				children: "↑↓ field · Enter change · c comment · C yours · a add step · space tick · x done · d delete · Esc close"
 			})
 		]
 	});
@@ -5803,16 +6041,140 @@ function DueField({ initial, today, onSubmit, onCancel }) {
 		})
 	});
 }
+/**
+* What a task waits on. Empty, it lists the current ones (Enter stops
+* waiting on one); typing finds others by key or words (Enter adds it).
+* Tasks already waiting on this one aren't offered, so nothing loops.
+*/
+function WaitsEditor({ task, onDone }) {
+	const { store } = useDeps();
+	const tasks = useHarbor((s) => s.tasks);
+	const projects = useHarbor((s) => s.projects);
+	const [query, setQuery] = useState("");
+	const [at, setAt] = useState(0);
+	const current = blockersOf(task, tasks);
+	const hits = useMemo(() => {
+		if (!query.trim()) return [];
+		const taken = new Set(current.map((b) => b.id));
+		const open = blockerOptions(tasks, task.id).filter((t) => !taken.has(t.id));
+		return searchTasks(open, projects, query.trim(), 8).map((h) => h.item);
+	}, [
+		query,
+		tasks,
+		projects,
+		task.id,
+		current
+	]);
+	const list = query.trim() ? hits : current;
+	const set = (ids) => store.getState().updateTask(task.id, blockersPatch(ids));
+	useInput((input, key) => {
+		if (key.escape) return onDone();
+		if (key.upArrow) return setAt((i) => step(i, -1, list.length));
+		if (key.downArrow) return setAt((i) => step(i, 1, list.length));
+		if (key.return) {
+			const pick = list[Math.min(at, list.length - 1)];
+			if (!pick) return onDone();
+			if (query.trim()) {
+				set([...current.map((b) => b.id), pick.id]);
+				setQuery("");
+			} else set(current.filter((b) => b.id !== pick.id).map((b) => b.id));
+			return setAt(0);
+		}
+		if (key.backspace || key.delete) {
+			setAt(0);
+			return setQuery((q) => q.slice(0, -1));
+		}
+		if (key.ctrl || key.meta || key.tab || key.leftArrow || key.rightArrow) return;
+		if (input) {
+			setAt(0);
+			setQuery((q) => q + input.replace(/[\r\n]+/g, " "));
+		}
+	});
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		borderColor: theme.border,
+		paddingX: 1,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Waits on"
+			}),
+			/* @__PURE__ */ jsxs(Text, { children: [query || /* @__PURE__ */ jsx(Text, {
+				color: theme.muted,
+				children: "type a key like RR-42, or words, to add one"
+			}), /* @__PURE__ */ jsx(Text, {
+				inverse: true,
+				children: " "
+			})] }),
+			list.length === 0 ? /* @__PURE__ */ jsx(Text, {
+				color: theme.muted,
+				children: query.trim() ? "Nothing matches." : "Nothing yet."
+			}) : null,
+			list.map((t, i) => {
+				const on = i === Math.min(at, list.length - 1);
+				return /* @__PURE__ */ jsxs(Text, {
+					color: on ? theme.selected : void 0,
+					bold: on,
+					wrap: "truncate-end",
+					children: [
+						on ? "› " : "  ",
+						/* @__PURE__ */ jsx(Text, {
+							color: theme.muted,
+							children: keyOf({ projects }, t).padEnd(7)
+						}),
+						t.title,
+						/* @__PURE__ */ jsxs(Text, {
+							color: theme.muted,
+							children: [" · ", STATUS_LABEL[t.status]]
+						})
+					]
+				}, t.id);
+			}),
+			/* @__PURE__ */ jsxs(Text, {
+				color: theme.muted,
+				children: [query.trim() ? "Enter adds it" : "Enter stops waiting on it", " · Esc done"]
+			})
+		]
+	});
+}
+
+//#endregion
+//#region src/lib/focus.ts
+const FOCUS_CAP = 3;
+const CHECK_IN_QUESTION = "On the blocker, or on something else?";
+function focusIdsOf(data, personId, date = todayISO()) {
+	return (data.ropes ?? []).find((r) => r.personId === personId && r.date === date)?.taskIds ?? [];
+}
+function upsertFocus(ropes, personId, date, taskIds) {
+	const rest = (ropes ?? []).filter((r) => !(r.personId === personId && r.date === date));
+	if (taskIds.length === 0) return rest;
+	return [...rest, {
+		personId,
+		date,
+		taskIds: taskIds.slice(0, 3)
+	}];
+}
+function myCheckIn(data, personId, date = todayISO()) {
+	return (data.checkIns ?? []).find((c) => c.personId === personId && c.date === date);
+}
 
 //#endregion
 //#region src/tui/views/today.tsx
-/** What's on you: your open tasks, late first; who waits on you; your risks and issues. */
+/**
+* What's on you: today's focus and check-in, your open tasks, late first;
+* who waits on you; your risks and issues.
+*/
 function TodayView({ active, width, height, go }) {
 	const { store, today } = useDeps();
 	const tasks = useHarbor((s) => s.tasks);
 	const projects = useHarbor((s) => s.projects);
 	const raidItems = useHarbor((s) => s.raidItems);
 	const me = useHarbor((s) => s.currentUserId);
+	const ropes = useHarbor((s) => s.ropes);
+	const checkIns = useHarbor((s) => s.checkIns);
+	const focus = focusIdsOf({ ropes }, me).map((id) => tasks.find((t) => t.id === id)).filter((t) => t !== void 0 && t.status !== "done");
+	const said = myCheckIn({ checkIns }, me);
 	const day = today();
 	const data = useMemo(() => ({
 		tasks,
@@ -5841,8 +6203,24 @@ function TodayView({ active, width, height, go }) {
 		else if (key.return && selected) go.openTask(selected.id);
 		else if (input === "x" && selected) moveTask(store, go, selected, "done");
 		else if (input === "n") go.newTask(selected?.projectId ?? null);
+		else if (input === "f" && selected) {
+			if (store.getState().toggleFocus(selected.id) === "full") go.notify(`Today's focus holds ${3}. f on one of them takes it off first.`);
+		} else if (input === "c") go.ask("Check in: what are you on today? (one sentence)", (text) => {
+			const note = text.trim().slice(0, 280);
+			if (!note) return;
+			go.pick(CHECK_IN_QUESTION, [{
+				label: "On the blocker",
+				value: true
+			}, {
+				label: "Other work",
+				value: false
+			}], (onDrum) => {
+				store.getState().submitCheckIn(note, onDrum === true);
+				go.notify("Checked in for today.");
+			});
+		}, said?.body);
 	}, { isActive: active });
-	const extra = (waits.length ? waits.length + 2 : 0) + (risks.length ? Math.min(risks.length, 5) + 2 : 0);
+	const extra = (focus.length ? focus.length + 2 : 0) + 1 + (waits.length ? waits.length + 2 : 0) + (risks.length ? Math.min(risks.length, 5) + 2 : 0);
 	const rows = Math.max(3, height - 2 - extra);
 	const view = windowOf(mine, at, rows);
 	return /* @__PURE__ */ jsxs(Box, {
@@ -5851,8 +6229,32 @@ function TodayView({ active, width, height, go }) {
 		height,
 		paddingX: 1,
 		children: [
+			focus.length > 0 && /* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [/* @__PURE__ */ jsx(Heading, {
+					right: `${focus.length} of ${3} · f takes one off`,
+					children: "Today's focus"
+				}), focus.map((t) => /* @__PURE__ */ jsxs(Text, {
+					wrap: "truncate-end",
+					children: [
+						"  ",
+						/* @__PURE__ */ jsx(Text, {
+							color: theme.accent,
+							children: keyOf({ projects }, t)
+						}),
+						" ",
+						t.title
+					]
+				}, t.id))]
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				color: theme.muted,
+				wrap: "truncate-end",
+				children: said ? `Your check-in: ${said.body}${said.onDrum ? " (on the blocker)" : ""} · c changes it` : "No check-in today · c checks in"
+			}),
 			/* @__PURE__ */ jsx(Heading, {
-				right: `${mine.length} open${late ? ` · ${late} late` : ""}`,
+				right: `${mine.length} open${late ? ` · ${late} late` : ""} · f focus`,
 				children: "On you"
 			}),
 			mine.length === 0 ? /* @__PURE__ */ jsx(Text, {
@@ -6272,6 +6674,7 @@ function App({ ui }) {
 		width: mainWidth,
 		height: bodyHeight,
 		go,
+		active: !covered,
 		onClose: () => setPanel(null)
 	};
 	let panelNode = null;
@@ -6311,6 +6714,7 @@ function App({ ui }) {
 		["x", "done"],
 		["d", "delete"],
 		["v", "board/list/budget"],
+		["f p", "filter"],
 		["e", "details"],
 		["Esc", "back"]
 	] : page ? [
@@ -6437,9 +6841,8 @@ function App({ ui }) {
 							display: overlayNode || panelNode ? "none" : "flex",
 							children: screenNode
 						}),
-						panelNode && !overlayNode ? panelNode : null,
-						panelNode && overlayNode ? /* @__PURE__ */ jsx(Box, {
-							display: "none",
+						panelNode ? /* @__PURE__ */ jsx(Box, {
+							display: overlayNode ? "none" : "flex",
 							children: panelNode
 						}) : null
 					]
@@ -6477,7 +6880,7 @@ function recordHealth(history, health, at, override, note) {
 
 //#endregion
 //#region src/lib/derived-health.ts
-const iso$1 = (d) => {
+const iso = (d) => {
 	return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
 };
 function parseDate(value) {
@@ -6520,7 +6923,7 @@ let overdueDay = "";
 const overdueByDue = /* @__PURE__ */ new Map();
 function daysOverdue(dueDate, now) {
 	if (!dueDate) return 0;
-	const today = iso$1(now);
+	const today = iso(now);
 	if (today !== overdueDay) {
 		overdueDay = today;
 		overdueByDue.clear();
@@ -6541,7 +6944,7 @@ let untilDay = "";
 const untilByDate = /* @__PURE__ */ new Map();
 function daysUntil(date, now) {
 	if (!date) return null;
-	const today = iso$1(now);
+	const today = iso(now);
 	if (today !== untilDay) {
 		untilDay = today;
 		untilByDate.clear();
@@ -6602,7 +7005,7 @@ function effectiveProjectHealth(project, data, now) {
 }
 /** Milestones past their date and still open. */
 function lateMilestonesOf(milestones, now) {
-	const today = iso$1(now);
+	const today = iso(now);
 	return milestones.filter((m) => !m.done && m.dueDate < today);
 }
 /**
@@ -7825,56 +8228,6 @@ function applyAutomations(project, prev, next, opts) {
 	};
 }
 
-//#endregion
-//#region src/lib/focus.ts
-const FOCUS_CAP = 3;
-function upsertFocus(ropes, personId, date, taskIds) {
-	const rest = (ropes ?? []).filter((r) => !(r.personId === personId && r.date === date));
-	if (taskIds.length === 0) return rest;
-	return [...rest, {
-		personId,
-		date,
-		taskIds: taskIds.slice(0, 3)
-	}];
-}
-
-//#endregion
-//#region src/lib/recurrence.ts
-const iso = (d) => {
-	return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
-};
-/** The due date one interval after `from`. */
-function nextDueDate(from, repeat) {
-	const d = /* @__PURE__ */ new Date(`${from}T12:00:00`);
-	if (repeat === "weekly") return iso(addDays(d, 7));
-	if (repeat === "biweekly") return iso(addDays(d, 14));
-	return iso(addMonths(d, 1));
-}
-/**
-* The next occurrence of a repeating task once this one is done: same
-* title, owner, priority and checklist (unticked), due one interval after
-* the old due date (or after today when it had none), back in To do.
-* Null when the task does not repeat.
-*/
-function nextOccurrence(task, id, today, createdAt) {
-	if (!task.repeat) return null;
-	const anchor = task.dueDate && task.dueDate >= today ? task.dueDate : today;
-	return {
-		...task,
-		id,
-		status: "todo",
-		dueDate: nextDueDate(anchor, task.repeat),
-		createdAt,
-		completedAt: null,
-		blockedById: null,
-		blockedByIds: [],
-		checklist: (task.checklist ?? []).map((c) => ({
-			...c,
-			done: false
-		}))
-	};
-}
-
 //#endregion
 //#region src/lib/assignment.ts
 /**

package/lib/cli.mjs

@@ -19,6 +19,7 @@ import {
 import {
   harbors,
   myWork,
+  raidList,
   programTree,
   projectList,
   taskLine,
@@ -59,13 +60,18 @@ export const HELP = `harbor: Harbor from the terminal
                      [--over-limit]
   harbor start TASK | review TASK | done TASK [--confirm] [--over-limit]
   harbor edit TASK [--title T] [--assignee me|none|NAME] [--due DATE|none]
-                   [--priority P] [--status S] [--confirm] [--over-limit]
+                   [--priority P] [--status S] [--notes TEXT]
+                   [--repeat weekly|biweekly|monthly|never]
+                   [--waits-on TASK,TASK|none] [--confirm] [--over-limit]
   harbor comment TASK "TEXT"
   harbor checkin "WHAT YOU'RE DOING" [--on-blocker]
   harbor risk "TITLE" --project P|--program P [--impact 1-5] [--probability 1-5]
                      [--owner NAME] [--due DATE]
   harbor issue "TITLE" --project P|--program P [--impact 1-5] [--owner NAME]
                        [--due DATE]
+  harbor decision "TITLE" --project P|--program P [--owner NAME] [--due DATE]
+  harbor risks [words] [--kind risk,issue,decision] [--project P] [--closed]
+                                              the register, worst first
 
   Every command takes --json, and --harbor NAME when you're in more than one
   harbor (or set one with harbor use). harbor help COMMAND shows just that one.
@@ -144,6 +150,7 @@ const level = (v, name) => {
   return n;
 };
 const nullable = (v) => (v === "none" ? null : v);
+const REPEAT_WORD = { weekly: "every week", biweekly: "every two weeks", monthly: "every month" };
 
 /** --due as people say it: today, tomorrow, +3, or a date. Anything else goes to Harbor to judge. */
 export function dueDate(v, today = new Date()) {
@@ -176,6 +183,9 @@ const FLAG = {
   query: "the words",
   task: "the task",
   note: "the check-in",
+  waitsOn: "--waits-on",
+  repeat: "--repeat",
+  description: "--notes",
   body: "the comment",
 };
 
@@ -213,7 +223,7 @@ export function hint(message) {
     .replace(/Find it with search_tasks\.$/, "Find it with harbor tasks.")
     .replace(
       /^Nothing to change: pass a field to update\.$/,
-      "Nothing to change. Say what with --title, --assignee, --due, --priority or --status.",
+      "Nothing to change. Say what with --title, --assignee, --due, --priority, --status, --notes, --repeat or --waits-on.",
     )
     .replace(
       /^This connection was allowed to read only\..*$/s,
@@ -782,8 +792,12 @@ export async function run(argv, io = {}) {
     }
     case "edit": {
       const { positionals, values, harbor } = parse(
-        spec(["confirm", "over-limit"], ["title", "assignee", "due", "priority", "status"]),
+        spec(
+          ["confirm", "over-limit"],
+          ["title", "assignee", "due", "priority", "status", "notes", "repeat", "waits-on"],
+        ),
       );
+      const waits = values["waits-on"];
       return call(
         "update_task",
         {
@@ -794,10 +808,28 @@ export async function run(argv, io = {}) {
           due: values.due === undefined ? undefined : nullable(dueDate(values.due)),
           priority: values.priority,
           status: values.status,
+          description: values.notes,
+          repeat: values.repeat,
+          waitsOn:
+            waits === undefined
+              ? undefined
+              : waits === "none"
+                ? []
+                : waits
+                    .split(",")
+                    .map((x) => x.trim())
+                    .filter(Boolean),
           confirmed: values.confirm || undefined,
           overLimit: values["over-limit"] || undefined,
         },
-        (r) => `Updated: ${taskLine(r.updated, opts)}`,
+        (r) =>
+          [
+            `Updated: ${taskLine(r.updated, opts)}`,
+            r.updated.waitsOn ? `Waits on ${r.updated.waitsOn.join(", ")}.` : null,
+            r.updated.repeat ? `Repeats ${REPEAT_WORD[r.updated.repeat]}.` : null,
+          ]
+            .filter(Boolean)
+            .join("\n"),
       );
     }
     case "comment": {
@@ -823,13 +855,34 @@ export async function run(argv, io = {}) {
         () => "Checked in for today.",
       );
     }
+    case "risks": {
+      const { positionals, values, harbor } = parse(spec(["closed"], ["kind", "project"]));
+      const kind = values.kind
+        ?.split(",")
+        .map((x) => x.trim().replace(/s$/, ""))
+        .filter(Boolean);
+      const bad = kind?.find((k) => !["risk", "issue", "decision"].includes(k));
+      if (bad) throw new HarborError(`--kind is risk, issue or decision (not "${bad}").`);
+      return call(
+        "list_risks",
+        {
+          harbor,
+          kind,
+          project: values.project,
+          includeClosed: Boolean(values.closed),
+          limit: 50,
+        },
+        (r) => raidList(r, positionals.join(" ")),
+      );
+    }
     case "risk":
-    case "issue": {
+    case "issue":
+    case "decision": {
       const { positionals, values, harbor } = parse(
         spec(
           [],
-          ["project", "program", "owner", "impact", "due"].concat(
-            command === "risk" ? ["probability"] : [],
+          ["project", "program", "owner", "due"].concat(
+            command === "risk" ? ["impact", "probability"] : command === "issue" ? ["impact"] : [],
           ),
         ),
       );

package/lib/format.mjs

@@ -158,3 +158,28 @@ export function todayLocal(d = new Date()) {
   const p = (n) => String(n).padStart(2, "0");
   return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
+
+/** The register, worst first: kind, title, then status, scores, owner and where it sits. */
+export function raidList(r, words = "") {
+  const want = words.trim().toLowerCase();
+  const items = (r.items ?? []).filter(
+    (x) => !want || `${x.title} ${x.description ?? ""}`.toLowerCase().includes(want),
+  );
+  if (!items.length) return want ? "Nothing in the register matches." : "The register is clear.";
+  const lines = items.map((x) => {
+    const bits = [
+      x.status?.toLowerCase(),
+      x.probability != null ? `likelihood ${x.probability}` : null,
+      x.impact != null ? `impact ${x.impact}` : null,
+      x.owner,
+      x.project ?? x.program ?? x.portfolio ?? null,
+      x.due ? `${x.kind === "Decision" ? "decide by" : "review by"} ${x.due}` : null,
+    ].filter(Boolean);
+    return `${x.kind.toLowerCase().padEnd(8)}  ${x.title}  (${bits.join(" · ")})`;
+  });
+  const more =
+    !want && r.total > items.length
+      ? `\n…and ${r.total - items.length} more. Narrow it with --kind or --project.`
+      : "";
+  return lines.join("\n") + more;
+}

package/package.json

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