@harborppm/cli 0.7.0 → 0.8.0

package/README.md

@@ -1,6 +1,6 @@
 # Harbor CLI
 
-[Harbor](https://harborppm.com) in the terminal: a full-screen app with your whole harbor, and commands for scripts and agents.
+[Harbor](https://harborppm.com/?utm_source=npm&utm_medium=readme&utm_campaign=cli) in the terminal: a full-screen app with your whole harbor, and commands for scripts and agents.
 
 ```sh
 npm install -g @harborppm/cli
@@ -68,7 +68,7 @@ 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
 
-harbor add "TITLE" --project P [--assignee me|NAME] [--due YYYY-MM-DD]
+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]
@@ -76,12 +76,12 @@ harbor edit TASK [--title T] [--assignee me|none|NAME] [--due DATE|none]
 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 YYYY-MM-DD]
+                   [--owner NAME] [--due DATE]
 harbor issue "TITLE" --project P|--program P [--impact 1-5] [--owner NAME]
-                    [--due YYYY-MM-DD]
+                    [--due DATE]
 ```
 
-Every command takes `--json` for the raw result, and `harbor COMMAND --help` shows just that command. Statuses are backlog, todo, doing, review and done.
+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.
 

package/dist/app.mjs

@@ -2298,12 +2298,21 @@ function PriorityMark({ priority }) {
 function Heading({ children, right }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		justifyContent: "space-between",
-		children: [/* @__PURE__ */ jsx(Text, {
-			bold: true,
-			children
-		}), right ? /* @__PURE__ */ jsx(Text, {
-			color: theme.muted,
-			children: right
+		columnGap: 2,
+		children: [/* @__PURE__ */ jsx(Box, {
+			flexShrink: 1,
+			children: /* @__PURE__ */ jsx(Text, {
+				bold: true,
+				wrap: "truncate-end",
+				children
+			})
+		}), right ? /* @__PURE__ */ jsx(Box, {
+			flexShrink: 2,
+			children: /* @__PURE__ */ jsx(Text, {
+				color: theme.muted,
+				wrap: "truncate-end",
+				children: right
+			})
 		}) : null]
 	});
 }
@@ -2917,7 +2926,7 @@ function HistoryView({ active, width, height, go }) {
 						on ? "› " : "  ",
 						/* @__PURE__ */ jsx(Text, {
 							color: theme.muted,
-							children: timeAgo(parseIso(row.at)).padEnd(10)
+							children: `${timeAgo(parseIso(row.at))} `.padEnd(16)
 						}),
 						/* @__PURE__ */ jsx(Text, {
 							bold: true,
@@ -2972,7 +2981,9 @@ function constraintIdle(data, constraint) {
 	if (constraint.status !== "active" || !constraint.ownerId) return false;
 	const tasks = tasksInProgramOf(data, constraint.programId);
 	if (!tasks.some((t) => t.status !== "done")) return false;
-	return !tasks.some((t) => t.assigneeId === constraint.ownerId && t.status === "doing");
+	if (tasks.some((t) => t.assigneeId === constraint.ownerId && t.status === "doing")) return false;
+	const here = new Set(tasks.map((t) => t.id));
+	return data.tasks.some((t) => t.assigneeId === constraint.ownerId && t.status === "doing" && !here.has(t.id));
 }
 
 //#endregion
@@ -3267,6 +3278,7 @@ function weeklyLoad(tasks, personId, now, weeks = 6) {
 
 //#endregion
 //#region src/tui/views/lists.tsx
+const count = (n, noun) => `${n} ${noun}${n === 1 ? "" : "s"}`;
 function RowList({ title, right, rows, empty, active, width, height, onOpen, keys = {} }) {
 	const [at, setAt] = useState(0);
 	const row = rows[Math.min(at, rows.length - 1)];
@@ -3368,7 +3380,7 @@ function ProjectsView({ active, width, height, go }) {
 	]);
 	return /* @__PURE__ */ jsx(RowList, {
 		title: "Portfolios, programs and projects",
-		right: `${projects.length} projects · n new project · e edit`,
+		right: `${count(projects.length, "project")} · n new project · e edit`,
 		rows,
 		empty: "No projects yet. n adds one.",
 		active,
@@ -3413,7 +3425,7 @@ function ProgramsView({ active, width, height, go }) {
 	]);
 	return /* @__PURE__ */ jsx(RowList, {
 		title: "Programs",
-		right: `${programs.length} programs · n new · e edit`,
+		right: `${count(programs.length, "program")} · n new · e edit`,
 		rows,
 		empty: "No programs yet. n adds one.",
 		active,
@@ -3502,7 +3514,7 @@ function PeopleView({ active, width, height, go }) {
 	]);
 	return /* @__PURE__ */ jsx(RowList, {
 		title: "People",
-		right: `${people.length} people · Enter to change`,
+		right: `${people.length === 1 ? "1 person" : `${people.length} people`} · Enter to change`,
 		rows,
 		empty: "Nobody here yet. Invite people from the website.",
 		active,
@@ -3801,7 +3813,7 @@ function NewTask({ projectId, status, width, onDone, onFull }) {
 	if (!chosen) return /* @__PURE__ */ jsx(Box, {
 		width,
 		children: /* @__PURE__ */ jsx(Picker, {
-			title: "New task in which project?",
+			title: projects.length ? "New task in which project?" : "No projects yet. Esc, then 3 for Projects and n to start one.",
 			choices: projects.map((p) => ({
 				label: p.name,
 				value: p.id,
@@ -3816,7 +3828,7 @@ function NewTask({ projectId, status, width, onDone, onFull }) {
 		children: /* @__PURE__ */ jsx(TextField, {
 			label: `New task in ${chosen.name}${status ? ` · ${STATUS_LABEL[status]}` : ""}`,
 			placeholder: "What needs doing?",
-			hint: "Enter adds it (yours, to do) · Esc leaves it",
+			hint: `Enter adds it (yours, ${STATUS_LABEL[status ?? "todo"].toLowerCase()}) · Esc leaves it`,
 			onCancel: () => onDone(null),
 			onSubmit: (title) => {
 				if (!title.trim()) return onDone(null);
@@ -4911,7 +4923,7 @@ function PortfolioView({ portfolioId, active, width, height, go, onBack }) {
 			}),
 			/* @__PURE__ */ jsx(Text, { children: " " }),
 			/* @__PURE__ */ jsx(Heading, {
-				right: `${list.length} programs`,
+				right: `${list.length} program${list.length === 1 ? "" : "s"}`,
 				children: "Programs"
 			}),
 			list.length === 0 ? /* @__PURE__ */ jsx(Text, {
@@ -5047,6 +5059,9 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 	const { done, total } = projectSummary(data, project);
 	const lead = people.find((p) => p.id === project.ownerId);
 	const body = height - 3;
+	const fit = Math.max(1, Math.floor((width - 2) / 14));
+	const firstColumn = Math.min(Math.max(0, col - Math.floor(fit / 2)), Math.max(0, columns.length - fit));
+	const shownColumns = columns.slice(firstColumn, firstColumn + fit);
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		width,
@@ -5055,36 +5070,44 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 		children: [
 			/* @__PURE__ */ jsxs(Box, {
 				justifyContent: "space-between",
-				children: [/* @__PURE__ */ jsxs(Text, {
-					wrap: "truncate-end",
-					children: [
-						/* @__PURE__ */ jsx(Text, {
-							bold: true,
-							children: project.name
-						}),
-						" ",
-						/* @__PURE__ */ jsx(Text, {
-							color: theme.muted,
-							children: project.key
-						}),
-						" ",
-						/* @__PURE__ */ jsx(HealthMark, {
-							health: project.health,
-							label: true
-						})
-					]
-				}), /* @__PURE__ */ jsxs(Text, {
-					color: theme.muted,
-					children: [
-						done,
-						" of ",
-						total,
-						" done",
-						lead ? ` · ${lead.name}` : "",
-						" · ",
-						mode,
-						" · v next · e details"
-					]
+				columnGap: 2,
+				children: [/* @__PURE__ */ jsx(Box, {
+					flexShrink: 1,
+					children: /* @__PURE__ */ jsxs(Text, {
+						wrap: "truncate-end",
+						children: [
+							/* @__PURE__ */ jsx(Text, {
+								bold: true,
+								children: project.name
+							}),
+							" ",
+							/* @__PURE__ */ jsx(Text, {
+								color: theme.muted,
+								children: project.key
+							}),
+							" ",
+							/* @__PURE__ */ jsx(HealthMark, {
+								health: project.health,
+								label: true
+							})
+						]
+					})
+				}), /* @__PURE__ */ jsx(Box, {
+					flexShrink: 2,
+					children: /* @__PURE__ */ jsxs(Text, {
+						color: theme.muted,
+						wrap: "truncate-end",
+						children: [
+							done,
+							" of ",
+							total,
+							" done",
+							lead ? ` · ${lead.name}` : "",
+							" · ",
+							mode,
+							" · v next · e details"
+						]
+					})
 				})]
 			}),
 			/* @__PURE__ */ jsx(Text, {
@@ -5100,8 +5123,9 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 				today: day
 			}) : mode === "board" ? /* @__PURE__ */ jsx(Box, {
 				height: body,
-				children: columns.map((c, ci) => {
-					const w = Math.max(14, Math.floor((width - 2) / columns.length));
+				children: shownColumns.map((c, i) => {
+					const ci = firstColumn + i;
+					const w = Math.floor((width - 2) / shownColumns.length);
 					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)));
@@ -5113,19 +5137,33 @@ function ProjectView({ projectId, active, width, height, go, onBack }) {
 						borderColor: on ? theme.accent : theme.border,
 						paddingX: 1,
 						children: [
-							/* @__PURE__ */ jsxs(Text, {
-								bold: true,
-								color: on ? theme.accent : void 0,
-								wrap: "truncate-end",
-								children: [
-									c.label.toUpperCase(),
-									" ",
-									/* @__PURE__ */ jsxs(Text, {
-										color: over ? theme.bad : theme.muted,
-										children: [c.tasks.length, c.limit != null ? `/${c.limit}` : ""]
+							/* @__PURE__ */ jsxs(Box, { children: [
+								i === 0 && firstColumn > 0 ? /* @__PURE__ */ jsx(Text, {
+									color: theme.muted,
+									children: "‹ "
+								}) : null,
+								/* @__PURE__ */ jsx(Box, {
+									flexGrow: 1,
+									flexShrink: 1,
+									children: /* @__PURE__ */ jsxs(Text, {
+										bold: true,
+										color: on ? theme.accent : void 0,
+										wrap: "truncate-end",
+										children: [
+											c.label.toUpperCase(),
+											" ",
+											/* @__PURE__ */ jsxs(Text, {
+												color: over ? theme.bad : theme.muted,
+												children: [c.tasks.length, c.limit != null ? `/${c.limit}` : ""]
+											})
+										]
 									})
-								]
-							}),
+								}),
+								i === shownColumns.length - 1 && ci < columns.length - 1 ? /* @__PURE__ */ jsx(Text, {
+									color: theme.muted,
+									children: " ›"
+								}) : null
+							] }),
 							c.tasks.length === 0 ? /* @__PURE__ */ jsx(Text, {
 								color: theme.muted,
 								children: "—"
@@ -8729,6 +8767,7 @@ function httpTransport(source, fetcher = fetch) {
 			}
 		} catch (error) {
 			if (error instanceof TransportError) throw error;
+			if (error?.signedOut) throw error;
 			throw new TransportError("Can't reach Harbor.", 0, true);
 		}
 		const answer = await res.json().catch(() => ({}));

package/lib/auth.mjs

@@ -67,7 +67,7 @@ export async function listenForCode(state, { timeoutMs = 5 * 60_000 } = {}) {
     if (ok) settle.resolve(url.searchParams.get("code"));
     else
       settle.reject(
-        new Error(
+        new HarborError(
           error === "access_denied"
             ? "You declined in the browser."
             : "The sign-in didn't come back as expected.",
@@ -77,7 +77,7 @@ export async function listenForCode(state, { timeoutMs = 5 * 60_000 } = {}) {
   await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
   const { port } = server.address();
   const timer = setTimeout(
-    () => settle.reject(new Error("No answer from the browser in 5 minutes.")),
+    () => settle.reject(new HarborError("No answer from the browser in 5 minutes. Run harbor login to try again.")),
     timeoutMs,
   );
   const done = code.finally(() => {
@@ -178,7 +178,10 @@ export async function refresh(creds, { fetcher = fetch, now = Date.now } = {}) {
   // Refused: the sign-in was disconnected in Harbor, or renewed by another
   // copy of these credentials (a refresh token is good once).
   if (res.status === 400 || res.status === 401) {
-    throw new HarborError("Your sign-in on this machine has ended. Run harbor login.");
+    const ended = new HarborError("Your sign-in on this machine has ended. Run harbor login.");
+    // The full-screen app says this rather than "Can't reach Harbor".
+    Object.assign(ended, { signedOut: true });
+    throw ended;
   }
   const tokens = await json(res, "Refreshing your sign-in");
   return toCredentials(creds.server, creds.tokenEndpoint, creds.clientId, tokens, now());

package/lib/cli.mjs

@@ -23,36 +23,39 @@ import { jsonText, plain } from "./plain.mjs";
 
 export const HELP = `harbor: Harbor from the terminal
 
-  harbor                                      the full-screen app: everything, with the keyboard
-  harbor signup [--server URL]                new to Harbor: make an account (opens your browser)
+  harbor                                      the full-screen app, by keyboard
+  harbor signup [--server URL]                new to Harbor: make an account
   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                      the harbor commands mean when you're in several
-  harbor theme [auto|light|dark]              the app's colours (auto asks the terminal)
+  harbor use HARBOR|none                      which harbor commands use
+  harbor theme [auto|light|dark]              the app's colours
   harbor --version                            which version this is
 
   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 (TASK: its key, RR-42, or id)
+  harbor tasks [words] [--project P] [--assignee me|none|NAME]
+                     [--late] [--status S,S]
+  harbor show TASK                            one task (TASK: a key like RR-42)
 
-  harbor add "TITLE" --project P [--assignee me|NAME] [--due YYYY-MM-DD]
-                     [--priority low|medium|high|urgent] [--status S] [--over-limit]
+  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]
   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 YYYY-MM-DD]
+                     [--owner NAME] [--due DATE]
   harbor issue "TITLE" --project P|--program P [--impact 1-5] [--owner NAME]
-                       [--due YYYY-MM-DD]
+                       [--due DATE]
 
-  Every command takes --json, and --harbor NAME when you're in more than one harbor
-  (or set one with harbor use). harbor COMMAND --help shows just that command.
+  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.
   Statuses: backlog, todo, doing, review, done.
-  Changes show in Harbor's History as yours, "via Harbor CLI". These commands never
-  delete; the full-screen app can, as the website can, and asks first.
+  DATE: YYYY-MM-DD, today, tomorrow, or +N for N days from today.
+  Changes show in Harbor's History as yours, "via Harbor CLI". These commands
+  never delete; the full-screen app can, as the website can, and asks first.
 `;
 
 export const VERSION = JSON.parse(
@@ -125,6 +128,16 @@ const level = (v, name) => {
 };
 const nullable = (v) => (v === "none" ? null : v);
 
+/** --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()) {
+  if (v === undefined || v === null) return v;
+  const words = { today: 0, tomorrow: 1 };
+  const days = v in words ? words[v] : /^\+\d{1,3}$/.test(v) ? Number(v.slice(1)) : null;
+  if (days === null) return v;
+  const d = new Date(today.getFullYear(), today.getMonth(), today.getDate() + days);
+  return todayLocal(d);
+}
+
 /** Harbor's tool fields, as the CLI's flags. */
 const FLAG = {
   due: "--due",
@@ -158,7 +171,13 @@ export function hint(message) {
       const [path, ...why] = issue.split(": ");
       const field = path.replace(/\.\d+$/, "");
       const flag = FLAG[field] ?? `--${field}`;
-      if (!seen.has(flag)) seen.set(flag, why.join(": "));
+      // zod's "Invalid option: expected one of "low"|"high"" reads as the choices.
+      const said = why
+        .join(": ")
+        .replace(/^Invalid option: expected one of (.*)$/, (_, list) =>
+          `pick one of ${list.replace(/"/g, "").split("|").join(", ")}`,
+        );
+      if (!seen.has(flag)) seen.set(flag, said);
     }
     return [...seen].map(([flag, why]) => `${flag}: ${why}`).join("\n");
   }
@@ -168,6 +187,10 @@ export function hint(message) {
       "Say which with --harbor NAME, or set one with harbor use NAME.",
     )
     .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.",
+    )
     .replace(
       /^This connection was allowed to read only\..*$/s,
       "This sign-in can only read. To make changes, run harbor login again.",
@@ -233,6 +256,13 @@ export async function run(argv, io = {}) {
   const [command, ...rest] = commandFirst(argv);
 
   if (command === "help" || command === "--help" || command === "-h") {
+    // `harbor help mine`: that command's help, as `harbor mine --help` gives it.
+    if (rest[0]) {
+      const help = commandHelp(rest[0]);
+      if (help === null) throw new HarborError(`No command "${rest[0]}". Run harbor help.`);
+      out(help);
+      return 0;
+    }
     const top = banner(io, env, ({ bold, dim }) => [
       bold("Harbor"),
       "Portfolios, programs and projects,",
@@ -382,6 +412,10 @@ export async function run(argv, io = {}) {
     return 0;
   }
 
+  // A mistyped command says so, signed in or not.
+  if (commandHelp(command) === null) {
+    throw new HarborError(`No command "${command}". Run harbor help.`);
+  }
   const creds = await readCredentials(env);
   if (!creds)
     throw new HarborError("Not signed in. Run harbor login, or harbor signup if you're new.");
@@ -419,7 +453,7 @@ export async function run(argv, io = {}) {
         out(
           creds.harbor
             ? plain(`Commands use ${creds.harborName ?? creds.harbor}.`)
-            : "No harbor set: commands use your only harbor, or the one --harbor names.",
+            : "No harbor set. In one harbor, commands use it; in several, set one with harbor use NAME or say --harbor NAME.",
         );
         return 0;
       }
@@ -518,7 +552,7 @@ export async function run(argv, io = {}) {
           project: values.project,
           title: text(positionals, "the task"),
           assignee: values.assignee,
-          due: values.due,
+          due: dueDate(values.due),
           priority: values.priority,
           status: values.status,
           overLimit: values["over-limit"] || undefined,
@@ -560,7 +594,7 @@ export async function run(argv, io = {}) {
           task: one(positionals, "task id"),
           title: values.title,
           assignee: values.assignee,
-          due: values.due === undefined ? undefined : nullable(values.due),
+          due: values.due === undefined ? undefined : nullable(dueDate(values.due)),
           priority: values.priority,
           status: values.status,
           confirmed: values.confirm || undefined,
@@ -616,9 +650,9 @@ export async function run(argv, io = {}) {
           owner: values.owner,
           impact: level(values.impact, "impact"),
           probability: level(values.probability, "probability"),
-          due: values.due,
+          due: dueDate(values.due),
         },
-        (r) => `Logged the ${command} (${r.raised.id}).`,
+        (r) => `Logged the ${command} “${r.raised.title}”.`,
       );
     }
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harborppm/cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Harbor from the terminal: a full-screen app with everything, plus commands for scripts and agents.",
   "keywords": [
     "harbor",
@@ -32,7 +32,7 @@
     "test": "node --test test/*.test.mjs",
     "build": "node build.mjs"
   },
-  "homepage": "https://harborppm.com/ai",
+  "homepage": "https://harborppm.com/ai?utm_source=npm&utm_medium=package&utm_campaign=cli",
   "license": "MIT",
   "dependencies": {
     "ink": "^7.1.1",