@harborppm/cli 0.8.0 → 0.9.0

package/README.md

@@ -63,7 +63,7 @@ It runs on the same engine as the website: health, task keys, limits and undo wo
 
 ```
 harbor harbors                              the harbors you belong to
-harbor use HARBOR|none                      the harbor commands mean when you're in several
+harbor use HARBOR|none                      the harbor to work in when you're in several
 harbor mine                                 what's on you, late first
 harbor tasks [words] [--project P] [--assignee me|none|NAME] [--late] [--status S,S]
 harbor show TASK                            one task in full
@@ -83,7 +83,7 @@ harbor issue "TITLE" --project P|--program P [--impact 1-5] [--owner NAME]
 
 Every command takes `--json` for the raw result, 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.
 
-When you belong to more than one harbor, say which: `--harbor NAME` on the command, or `harbor use NAME` once (it's saved with your sign-in; `harbor use none` forgets it). With neither, the commands ask rather than guess, so nothing lands in the wrong harbor. The full-screen app opens the one `harbor use` set too.
+When you belong to more than one harbor, say which: `--harbor NAME` on the command, or `harbor use NAME` once (it's saved with your sign-in; `harbor use none` forgets it). With neither, the commands ask rather than guess, so nothing lands in the wrong harbor. The full-screen app shares the same choice: it opens the harbor `harbor use` set, asks which one the first time if none is set, and a harbor you switch to in the app becomes the one the commands use.
 
 Harbor holds back what it would hold back in the app: finishing a task that still waits on another, or going past a column's limit. The CLI says so and names the flag that goes ahead (`--confirm`, `--over-limit`).
 

package/dist/app.mjs

@@ -3052,7 +3052,7 @@ function inboxOf(data, personId, now = clockNow()) {
 		});
 	}
 	for (const blocker of mine) {
-		const waiting = (waitersByBlocker(data.tasks).get(blocker.id) ?? []).filter((t) => t.status !== "done" && t.id !== blocker.id);
+		const waiting = (waitersByBlocker(data.tasks).get(blocker.id) ?? []).filter((t) => t.status !== "done" && t.id !== blocker.id && t.assigneeId !== blocker.assigneeId);
 		if (waiting.length === 0) continue;
 		const project = projectOf(data, blocker);
 		const names = [...new Set(waiting.map((t) => {
@@ -3865,24 +3865,21 @@ function HarborSwitch({ harbors, current, width, onPick, onClose }) {
 	});
 }
 const HELP = [
-	["1–8", "Today, Inbox, Projects, Programs, Risks, People, Roadmap, History"],
-	[":", "anything: a screen, something new, a project or program by name"],
+	["1–8", "the screens, as the sidebar lists them"],
+	[":", "anything: a screen, something new, a name"],
 	["/", "find a task by key or words"],
 	["H", "switch harbor"],
 	["Tab", "between the sidebar and the screen"],
-	["↑↓ or j k", "move; ←→ or h l across board columns and lists"],
-	["Enter", "open"],
-	["Esc", "back"],
-	["n", "new: a task, or what the screen lists (project, program, risk)"],
-	["e", "change what's open: its health, lead, dates, budget"],
+	["↑↓ or j k", "move; ←→ or h l across columns and lists"],
+	["Enter / Esc", "open / back"],
+	["n", "new: a task, or what the screen lists"],
+	["e", "change what's open (health, lead, dates)"],
 	["[ ]", "move a card one column left or right"],
-	["x", "mark done"],
-	["d", "delete (asks first)"],
-	["u", "undo your last change"],
+	["x / d", "mark done / delete (asks first)"],
+	["u / r", "undo your last change / retry saving"],
 	["v", "on a project: board, list, budget"],
-	["m / R", "on a program: new milestone; anywhere: log a risk"],
+	["m / R", "new milestone on a program / log a risk"],
 	["c / a", "on a task: comment / add a checklist step"],
-	["r", "retry saving now"],
 	["q", "quit (saves first)"]
 ];
 /**
@@ -3890,7 +3887,7 @@ const HELP = [
 * the 16-pixel mark, and the box's border and padding. Narrower, the lines
 * would wrap and split the mark.
 */
-const HELP_WITH_MARK = 11 + Math.max(...HELP.map(([, what]) => what.length)) + 2 + LOGO_SMALL[0].length + 4;
+const HELP_WITH_MARK = 13 + Math.max(...HELP.map(([, what]) => what.length)) + 2 + LOGO_SMALL[0].length + 4;
 function Help({ width, onClose }) {
 	useInput((input, key) => {
 		if (key.escape || key.return || input === "?" || input === "q") onClose();
@@ -3911,11 +3908,11 @@ function Help({ width, onClose }) {
 				}),
 				HELP.map(([k, what]) => /* @__PURE__ */ jsxs(Text, { children: [/* @__PURE__ */ jsx(Text, {
 					bold: true,
-					children: k.padEnd(11)
+					children: k.padEnd(13)
 				}), what] }, k)),
 				/* @__PURE__ */ jsx(Text, {
 					color: theme.muted,
-					children: "Everything saves as you go, and shows on the website for everyone."
+					children: "Everything saves as you go and shows on the website."
 				})
 			]
 		}), width >= HELP_WITH_MARK ? /* @__PURE__ */ jsxs(Box, {
@@ -5921,7 +5918,7 @@ const SAVE_LABEL = {
 	offline: ["● offline, will save", "bad"]
 };
 function App({ ui }) {
-	const { store, sync, account, harbors, today } = useDeps();
+	const { store, sync, account, harbors, today, remember } = useDeps();
 	const { exit } = useApp();
 	const { columns, rows } = useWindowSize();
 	const harborName = useHarbor((s) => s.harborName);
@@ -6014,7 +6011,10 @@ function App({ ui }) {
 	const switchHarbor = (id) => {
 		goScreen("today");
 		notify("Opening…");
-		sync.flush().then(() => sync.open(id)).then((h) => notify(`Opened ${h.name}.`)).catch((e) => notify(`Couldn't open it: ${e.message}`));
+		sync.flush().then(() => sync.open(id)).then(async (h) => {
+			const saved = remember ? await remember(h).then(() => true, () => false) : false;
+			notify(saved ? `Opened ${h.name}. Commands use it too.` : `Opened ${h.name}.`);
+		}).catch((e) => notify(`Couldn't open it: ${e.message}`));
 	};
 	const quit = async () => {
 		setQuitting(true);
@@ -7247,6 +7247,104 @@ function normalizeRules(rules) {
 	};
 }
 
+//#endregion
+//#region src/lib/sample-project.ts
+/**
+* A small project a new harbor can add to try things on: a few cards in each
+* column, one that waits on another, a checklist and a risk. Nothing is late,
+* so it doesn't turn a fresh harbor red, and every card says what to try.
+*/
+const SAMPLE_PROJECT_NAME = "Website refresh (sample)";
+function sampleProject(opts) {
+	const { ownerId, today, now, makeId } = opts;
+	const day = (n) => todayISO(addDays(parseDate$1(today), n));
+	const end = opts.programEnd && opts.programEnd < day(30) ? opts.programEnd : day(30);
+	const projectId = makeId("pj");
+	const project = {
+		id: projectId,
+		programId: opts.programId,
+		name: SAMPLE_PROJECT_NAME,
+		description: "A project to try things on. Move cards, add tasks, change dates. Delete it from Details when you’re done.",
+		swatch: "sea",
+		ownerId,
+		health: "on-track",
+		startDate: today,
+		endDate: end,
+		budget: 0,
+		spent: 0
+	};
+	const task = (title, status, o = {}) => ({
+		id: makeId("t"),
+		projectId,
+		title,
+		description: o.description ?? "",
+		status,
+		priority: o.priority ?? "medium",
+		assigneeId: ownerId,
+		dueDate: o.due == null ? null : day(o.due),
+		createdAt: now,
+		completedAt: status === "done" ? now : null,
+		checklist: (o.checklist ?? []).map(([t, done]) => ({
+			id: makeId("ck"),
+			title: t,
+			done
+		})),
+		blockedById: o.waitsOn ?? null,
+		blockedByIds: o.waitsOn ? [o.waitsOn] : []
+	});
+	const draft = task("Draft the new home page", "doing", {
+		description: "A sample card. Tick the checklist, leave a comment, or drag it to Review on the board.",
+		due: 3,
+		priority: "high",
+		checklist: [
+			["Headline and one line under it", true],
+			["Three reasons to stay", false],
+			["One clear button", false]
+		]
+	});
+	return {
+		project,
+		tasks: [
+			task("Agree what the refresh is for", "done", { description: "Finished. Move it back if it turns out it wasn’t." }),
+			task("List the pages people actually use", "done"),
+			draft,
+			task("Write the pricing page copy", "review", {
+				description: "Waiting for a second pair of eyes. Move it to Done when it reads well.",
+				due: 5
+			}),
+			task("Pick the photos", "todo", {
+				description: "Hand this one to someone else from the card’s Owner field.",
+				due: 7
+			}),
+			task("Check every page on a phone", "todo", {
+				description: "Waits on the home page draft, so it shows as waiting until that card is done.",
+				due: 10,
+				waitsOn: draft.id
+			}),
+			task("Send old links to the new pages", "backlog", { description: "No date yet. Backlog is for what isn’t planned." }),
+			task("Tell customers what changed", "backlog", { priority: "low" })
+		],
+		raidItems: [{
+			id: makeId("r"),
+			kind: "risk",
+			projectId,
+			title: "Photos may not be cleared in time",
+			description: "A sample risk. If the photos aren’t licensed before launch, the home page ships with placeholders.",
+			severity: "medium",
+			status: "open",
+			ownerId,
+			dueDate: day(7),
+			probability: 3,
+			impact: 3,
+			mitigation: "Shortlist stock photos we already own as a fallback.",
+			createdById: ownerId,
+			createdAt: now,
+			updatedAt: now,
+			updates: []
+		}]
+	};
+}
+
 //#endregion
 //#region src/lib/slices/hierarchy.ts
 /** Portfolios, programs and projects: create, edit, custom fields, automations, health overrides, boards and cascading delete. */
@@ -7294,6 +7392,31 @@ function hierarchySlice({ get, write }) {
 			get().log(`opened project ${row.name}`, `/projects/${id}`);
 			return id;
 		},
+		addSampleProject: () => {
+			const state = get();
+			const program = state.programs[0];
+			if (!program) return null;
+			const rows = sampleProject({
+				programId: program.id,
+				ownerId: state.currentUserId,
+				today: todayISO(),
+				programEnd: program.endDate,
+				now: stamp(),
+				makeId: uid
+			});
+			const id = rows.project.id;
+			write({
+				projects: [...state.projects, rows.project],
+				tasks: [...state.tasks, ...rows.tasks],
+				raidItems: [...state.raidItems, ...rows.raidItems],
+				boardConfigs: {
+					...state.boardConfigs ?? {},
+					[id]: defaultBoardConfig()
+				}
+			});
+			get().log(`added the sample project`, `/projects/${id}`);
+			return id;
+		},
 		updatePortfolio: (id, patch) => {
 			write({ portfolios: get().portfolios.map((p) => p.id === id ? {
 				...p,
@@ -9115,6 +9238,26 @@ function addFirstProject(store, name, accountId, today) {
 		ownerId: me?.id ?? ""
 	}, { programId: program.id }, today);
 }
+/**
+* Someone in several harbors with none picked: ask which, as the commands
+* would refuse to guess. A number from the list or a name answers; anything
+* else asks again.
+*/
+async function pickHarbor(deps) {
+	deps.say(`You're in ${deps.harbors.length} harbors. Which one should harbor open?`);
+	deps.harbors.forEach((h, i) => deps.say(`  ${i + 1}. ${h.name}`));
+	for (;;) {
+		const answer = (await deps.ask(`Number or name (1-${deps.harbors.length}): `)).trim();
+		if (!answer) continue;
+		const n = Number(answer);
+		if (Number.isInteger(n) && n >= 1 && n <= deps.harbors.length) return deps.harbors[n - 1];
+		try {
+			return deps.named(answer);
+		} catch (error) {
+			deps.say(error.message);
+		}
+	}
+}
 
 //#endregion
 //#region src/tui/main.tsx
@@ -9170,7 +9313,8 @@ async function startApp(deps, options = {}) {
 			transport,
 			account,
 			harbors,
-			today
+			today,
+			remember: deps.remember
 		},
 		children: /* @__PURE__ */ jsx(App, { ui })
 	}));
@@ -9225,6 +9369,22 @@ async function runApp(opts) {
 			terminal.close();
 		}
 	} else if (opts.harbor) workspaceId = harborNamed(harbors, opts.harbor).id;
+	else if (opts.saved && harbors.some((h) => h.id === opts.saved)) workspaceId = opts.saved;
+	else if (harbors.length > 1) {
+		const terminal = terminalAsk();
+		try {
+			const picked = await pickHarbor({
+				ask: terminal.ask,
+				say: (line) => process.stdout.write(`${plain(line)}\n`),
+				harbors,
+				named: (key) => harborNamed(harbors, key)
+			});
+			workspaceId = picked.id;
+			await opts.remember?.(picked);
+		} finally {
+			terminal.close();
+		}
+	}
 	const { instance } = await startApp({
 		transport,
 		account,
@@ -9232,7 +9392,8 @@ async function runApp(opts) {
 		workspaceId,
 		splashMs: SPLASH_MS,
 		theme,
-		firstRun
+		firstRun,
+		remember: opts.remember
 	}, { alternateScreen: true });
 	await instance.waitUntilExit();
 }

package/lib/cli.mjs

@@ -28,7 +28,7 @@ export const HELP = `harbor: Harbor from the terminal
   harbor login [--server URL] [--read-only]   sign in (opens your browser once)
   harbor logout                               forget the sign-in on this machine
   harbor harbors                              the harbors you belong to
-  harbor use HARBOR|none                      which harbor commands use
+  harbor use HARBOR|none                      the harbor to work in
   harbor theme [auto|light|dark]              the app's colours
   harbor --version                            which version this is
 
@@ -326,10 +326,26 @@ export async function run(argv, io = {}) {
       }
     }
     const { runApp } = await loadApp();
+    // The app and the commands share one harbor choice: what harbor use set,
+    // or what's picked or switched to in the app. Each write reads the file
+    // first, so a renewed token and a new choice don't undo each other.
+    const keepHarbor = async (c) => {
+      const now = await readCredentials(env);
+      return now ? { ...c, harbor: now.harbor ?? null, harborName: now.harborName ?? null } : c;
+    };
     await runApp({
-      source: tokenSource({ creds, save: (c) => writeCredentials(c, env), fetcher }),
+      source: tokenSource({
+        creds,
+        save: async (c) => writeCredentials(await keepHarbor(c), env),
+        fetcher,
+      }),
       fetcher,
-      harbor: values.harbor ?? creds.harbor ?? undefined,
+      harbor: values.harbor,
+      saved: creds.harbor ?? null,
+      remember: async (h) => {
+        const now = (await readCredentials(env)) ?? creds;
+        await writeCredentials({ ...now, harbor: h.id, harborName: h.name }, env);
+      },
       theme: (await readSettings(env)).theme,
     });
     return 0;

package/lib/format.mjs

@@ -36,7 +36,8 @@ export function myWork(w, opts) {
   if (w.raid?.length) {
     out.push("", "Yours in the register:");
     for (const r of w.raid)
-      out.push(`  ${r.id}  ${r.kind}: ${r.title}${r.due ? ` (review by ${r.due})` : ""}`);
+      // No command takes a risk's id, so it isn't shown.
+      out.push(`  ${r.kind}: ${r.title}${r.due ? ` (review by ${r.due})` : ""}`);
   }
   return out.join("\n");
 }
@@ -53,7 +54,14 @@ export function taskList(r, opts) {
 export function harbors(r) {
   const list = r.harbors ?? [];
   if (!list.length) return "You aren't in any harbor yet. Run harbor to make one.";
-  return list.map((h) => `${h.id}  ${h.name}${h.role ? `  (${h.role})` : ""}`).join("\n");
+  // The website's words for a role, not the stored ones; names, not ids
+  // (harbor use and --harbor take a name).
+  const label = (role) =>
+    role === "owner" ? "Owner" : role === "viewer" ? "Can view" : role ? "Can edit" : "";
+  const width = Math.min(40, Math.max(...list.map((h) => h.name.length)));
+  return list
+    .map((h) => (h.role ? `${h.name.padEnd(width)}  ${label(h.role)}` : h.name))
+    .join("\n");
 }
 
 export function todayLocal(d = new Date()) {

package/package.json

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