@robbeverhelst/do 1.344.0 → 1.346.0

package/dist/do.js

@@ -14420,7 +14420,7 @@ var configError = (message) => new CliError("config", message, EXIT.CONFIG);
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.344.0";
+var VERSION = "1.346.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -28034,6 +28034,9 @@ var healthShares = pgTable("health_shares", {
   snapshot: jsonb("snapshot").notNull(),
   note: text("note"),
   attachments: jsonb("attachments").notNull().default(sql`'[]'::jsonb`),
+  periodFrom: date5("period_from", { mode: "string" }),
+  periodTo: date5("period_to", { mode: "string" }),
+  singleOpen: boolean4("single_open").notNull().default(false),
   tokenHash: text("token_hash").notNull().unique(),
   expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
   revokedAt: timestamp("revoked_at", { withTimezone: true }),
@@ -30066,7 +30069,7 @@ var habitOperations = defineOperations({
     scopes: ["habits:read"],
     tag: "Habits",
     summary: "Habit due dates in a range",
-    description: "Plan's Month and agendas (V3-22): every growing habit's due days from `from` through `to` (the key's member's civil days, both included, at most 62), by its schedule alone, the same rule the list and today read. A day it rests (paused, away) or before it began isn't one; quit and event-scheduled habits are left out. Each row is `{ habitId, title, date, time, scheduleLabel, daily, streakLabel }`: `time` its exact `HH:MM` or null, `daily` true for a habit due every day, `streakLabel` `N days` for a daily habit and `N in a row` otherwise. Sorted by date, then time.",
+    description: "Plan's Month and agendas (V3-22): every growing habit's due days from `from` through `to` (the key's member's civil days, both included, at most 62), by its schedule alone, the same rule the list and today read. A day it rests (paused, away) or before it began isn't one; quit habits are left out, and an event-scheduled one sits on its event days (V3-46). Each row is `{ habitId, title, date, time, scheduleLabel, daily, streakLabel }`: `time` its exact `HH:MM` or null, `daily` true for a habit due every day, `streakLabel` `N days` for a daily habit and `N in a row` otherwise. Sorted by date, then time.",
     query: [
       { name: "from", description: "The first day (YYYY-MM-DD).", format: "date", required: true },
       {
@@ -35759,6 +35762,27 @@ var orcaOperations = defineOperations({
     status: 200,
     response: { description: "The Orca overview." }
   },
+  machines: {
+    method: "get",
+    path: "/orca/machines",
+    scopes: ["orca:read"],
+    tag: "Orca",
+    summary: "List Orca machines",
+    description: "Every machine Orca knows, with its health (OS, disk, memory, load, updates, uptime or battery, null where it can't be read) beside its Orca reachability (`orca.reachable`, its `route`, since when, and why not), the repos and agents it runs and its sessions; `summary` holds the counts (machines awake and asleep, sessions running and waiting for you, reachable through Orca). A machine Orca can't reach is still listed. Read live; nothing is stored.",
+    status: 200,
+    response: { description: "The machines and their summary." },
+    errors: { 503: unavailable }
+  },
+  status: {
+    method: "get",
+    path: "/orca/status",
+    scopes: ["orca:read"],
+    tag: "Orca",
+    summary: "Read Orca status",
+    description: "The orca-bridge itself (`bridge`: reachable, its address, the machine it runs on, its version and since when it runs; null while Orca isn't connected), the calls do and the agent made through it over the last 7 days, newest first (metadata only: when, `kind` read / send / list, a short label, who, to which machine, how it went and how long; never a session's output), `callsToday`, and the current `problems` in plain words (an `error` one always says nothing is lost).",
+    status: 200,
+    response: { description: "The bridge's status, its calls and problems." }
+  },
   output: {
     method: "get",
     path: "/orca/hosts/{host}/terminals/{handle}/output",
@@ -41013,6 +41037,118 @@ function assertDestructiveAllowed(flags, action) {
   }
 }
 
+// ../../packages/schema/src/contracts/orca-machines.ts
+var ORCA_MACHINE_ROUTES = ["local", "same-machine", "tailnet"];
+var orcaMachineRouteSchema = _enum2(ORCA_MACHINE_ROUTES);
+var ORCA_MACHINE_AWAKE = ["awake", "asleep", "unknown"];
+var orcaMachineAwakeSchema = _enum2(ORCA_MACHINE_AWAKE);
+var orcaMachineAmountSchema = object({
+  usedGb: number2().nonnegative(),
+  totalGb: number2().nonnegative()
+});
+var orcaMachineReachSchema = object({
+  reachable: boolean2(),
+  route: orcaMachineRouteSchema.nullable(),
+  since: exports_coerce.date().nullable(),
+  error: string2().nullable()
+});
+var orcaMachineHealthSchema = object({
+  host: orcaHostNameSchema,
+  role: string2().nullable(),
+  os: string2().nullable(),
+  awake: orcaMachineAwakeSchema,
+  lastSeenAt: exports_coerce.date().nullable(),
+  orca: orcaMachineReachSchema,
+  disk: orcaMachineAmountSchema.nullable(),
+  memory: orcaMachineAmountSchema.nullable(),
+  load: object({ pct: number2().min(0), line: string2().nullable() }).nullable(),
+  updatesWaiting: number2().int().nonnegative().nullable(),
+  uptimeDays: number2().nonnegative().nullable(),
+  battery: _enum2(["charging", "on battery"]).nullable(),
+  repos: array(string2()),
+  agentKinds: array(orcaAgentKindSchema),
+  sleepsAfter: string2().nullable()
+});
+var orcaBridgeMachinesSchema = object({
+  machines: array(orcaMachineHealthSchema)
+});
+var orcaMachineSchema = orcaMachineHealthSchema.extend({
+  sessions: number2().int().nonnegative(),
+  running: number2().int().nonnegative(),
+  waitingForYou: number2().int().nonnegative(),
+  pendingCalls: number2().int().nonnegative()
+});
+var orcaMachinesSummarySchema = object({
+  machines: object({
+    total: number2().int().nonnegative(),
+    awake: number2().int().nonnegative(),
+    asleep: number2().int().nonnegative()
+  }),
+  sessions: object({
+    total: number2().int().nonnegative(),
+    running: number2().int().nonnegative(),
+    waitingForYou: number2().int().nonnegative()
+  }),
+  reachable: object({
+    count: number2().int().nonnegative(),
+    total: number2().int().nonnegative()
+  })
+});
+var orcaMachinesSchema = object({
+  machines: array(orcaMachineSchema),
+  summary: orcaMachinesSummarySchema
+});
+
+// ../../packages/schema/src/contracts/orca-status.ts
+var ORCA_CALLS_KEPT_DAYS = 7;
+var ORCA_CALL_KINDS = ["read", "send", "list"];
+var orcaCallKindSchema = _enum2(ORCA_CALL_KINDS);
+var ORCA_CALL_SOURCES = ["app", "cli", "agent"];
+var orcaCallSourceSchema = _enum2(ORCA_CALL_SOURCES);
+var orcaCallResultSchema = object({
+  kind: _enum2(["done", "waiting", "error"]),
+  word: string2().min(1).max(40)
+});
+var orcaCallRecordSchema = object({
+  id: string2().min(1).max(64),
+  at: exports_coerce.date(),
+  kind: orcaCallKindSchema,
+  what: string2().min(1).max(120),
+  source: orcaCallSourceSchema,
+  to: union([orcaHostNameSchema, literal("all")]),
+  result: orcaCallResultSchema,
+  durationMs: number2().int().nonnegative()
+});
+var orcaCallSchema = orcaCallRecordSchema.extend({
+  from: string2().min(1)
+});
+var orcaProblemSchema = object({
+  kind: _enum2(["error", "waiting"]),
+  title: string2().min(1),
+  body: string2().min(1),
+  action: object({ label: string2().min(1), callIds: array(string2()) }).nullable()
+});
+var orcaBridgeInfoSchema = object({
+  reachable: boolean2(),
+  address: string2(),
+  host: orcaHostNameSchema.nullable(),
+  version: string2().nullable(),
+  runningSince: exports_coerce.date().nullable()
+});
+var orcaBridgeHealthSchema = object({
+  ok: boolean2(),
+  version: string2().nullish(),
+  startedAt: exports_coerce.date().nullish()
+});
+var orcaBridgeStatusSchema = object({
+  bridge: orcaBridgeInfoSchema.nullable(),
+  calls: array(orcaCallSchema),
+  problems: array(orcaProblemSchema),
+  callsToday: number2().int().nonnegative(),
+  keptDays: literal(ORCA_CALLS_KEPT_DAYS),
+  token: object({ name: string2(), scopeLine: string2() })
+});
+
 // ../../packages/schema/src/when.ts
 var WEEKDAYS = [
   { name: "sunday", dow: 0, code: "SU" },
@@ -41728,6 +41864,143 @@ function toCollectionTypeSummary(config) {
 }
 var COLLECTION_TYPE_SUMMARIES = COLLECTION_TYPE_LIST.map(toCollectionTypeSummary);
 
+// ../../packages/domain/src/date.ts
+function orUndefined(value) {
+  return value && value.trim() !== "" ? value : undefined;
+}
+var formatters = new Map;
+function dateTimeFormat(locale, options) {
+  const key = `${locale ?? ""}|${JSON.stringify(options)}`;
+  let formatter = formatters.get(key);
+  if (!formatter) {
+    formatter = new Intl.DateTimeFormat(locale, options);
+    formatters.set(key, formatter);
+  }
+  return formatter;
+}
+var STYLES = ["dateStyle", "timeStyle"];
+var DATE_FIELDS = ["weekday", "year", "month", "day", ...STYLES];
+var hasAny = (o, keys) => keys.some((k) => o[k] !== undefined);
+var wordMonth = (o) => o.month !== undefined && o.month !== "numeric" && o.month !== "2-digit" || o.dateStyle !== undefined && o.dateStyle !== "short";
+var isEnglish = (formatter) => formatter.resolvedOptions().locale.split("-")[0] === "en";
+var DATE_PARTS = ["weekday", "day", "month", "year"];
+var CLOCK_PARTS = new Set(["hour", "minute", "second", "fractionalSecond", "dayPeriod"]);
+function dayFirstEnglish(formatter, at) {
+  const parts = formatter.formatToParts(at);
+  const clock = parts.flatMap((p, i) => CLOCK_PARTS.has(p.type) ? [i] : []);
+  const date = DATE_PARTS.flatMap((type) => {
+    const value = parts.find((p) => p.type === type)?.value;
+    if (value === undefined)
+      return [];
+    return [type === "month" ? value.replace(/^Sept$/, "Sep") : value];
+  }).join(" ");
+  if (clock.length === 0)
+    return date;
+  const time = parts.slice(clock[0], (clock.at(-1) ?? 0) + 1).map((p) => p.value).join("");
+  return `${date}, ${time}`;
+}
+function formatDate(value, opts = {}) {
+  const { locale, timeZone, ...format } = opts;
+  const options = { ...format, timeZone: orUndefined(timeZone) };
+  if (!hasAny(options, DATE_FIELDS)) {
+    Object.assign(options, { year: "numeric", month: "numeric", day: "numeric" });
+  }
+  const formatter = dateTimeFormat(orUndefined(locale), options);
+  if (wordMonth(options) && isEnglish(formatter))
+    return dayFirstEnglish(formatter, new Date(value));
+  if (options.weekday && options.day && !options.month && !options.year) {
+    const parts = formatter.formatToParts(new Date(value));
+    const weekday = parts.findIndex((p) => p.type === "weekday");
+    const day = parts.findIndex((p) => p.type === "day");
+    if (day < weekday)
+      return `${parts[weekday]?.value} ${parts[day]?.value}`;
+  }
+  return formatter.format(new Date(value));
+}
+function formatTime(value, opts = {}) {
+  const { locale, timeZone, ...format } = opts;
+  const options = {
+    hour: "numeric",
+    minute: "2-digit",
+    ...format,
+    timeZone: orUndefined(timeZone)
+  };
+  return dateTimeFormat(orUndefined(locale), options).format(new Date(value));
+}
+function formatClock(value, opts = {}) {
+  return formatTime(value, { ...opts, hour: "2-digit", minute: "2-digit", hourCycle: "h23" });
+}
+function dayInZone(now, zone) {
+  return dateTimeFormat("en-CA", {
+    timeZone: zone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).format(now);
+}
+function dayOfUtc(t) {
+  const d = new Date(t);
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${d.getUTCFullYear()}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}`;
+}
+function utcOfDay(day) {
+  const [y, m, d] = day.split("-").map(Number);
+  return Date.UTC(y, m - 1, d);
+}
+function shiftDay2(day, n) {
+  return dayOfUtc(utcOfDay(day) + n * 86400000);
+}
+function mondayOfDay(day) {
+  const weekday = (new Date(utcOfDay(day)).getUTCDay() + 6) % 7;
+  return shiftDay2(day, -weekday);
+}
+
+// ../../packages/domain/src/agent-machines.ts
+var plural = (n, one, many) => `${n} ${n === 1 ? one : many}`;
+function machineSummaryTiles(summary) {
+  const { machines, sessions, reachable } = summary;
+  return [
+    {
+      value: plural(machines.total, "machine", "machines"),
+      line: `${machines.awake} awake, ${machines.asleep} asleep`
+    },
+    {
+      value: plural(sessions.total, "session", "sessions"),
+      line: `${sessions.running} running, ${sessions.waitingForYou} waiting for you`
+    },
+    { value: `${reachable.count} of ${reachable.total}`, line: "reachable through Orca" }
+  ];
+}
+function reachabilityWord(m, { timeZone } = {}) {
+  const { reachable, route, since } = m.orca;
+  if (!reachable) {
+    return {
+      text: since ? `Orca unreachable since ${formatClock(since, { timeZone })}` : "Orca unreachable",
+      kind: "error"
+    };
+  }
+  const how = route === "same-machine" ? ", it lives here" : route === "local" ? ", local network" : route === "tailnet" ? ", over the tailnet" : "";
+  return { text: `Orca reachable${how}`, kind: "done" };
+}
+function lastSeen(m, now, timeZone) {
+  if (m.orca.reachable)
+    return "Now";
+  if (!m.lastSeenAt)
+    return "Never";
+  const zone = timeZone || Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return dayInZone(m.lastSeenAt, zone) === dayInZone(now, zone) ? formatClock(m.lastSeenAt, { timeZone }) : formatDate(m.lastSeenAt, { timeZone, day: "numeric", month: "short" });
+}
+function machineFacts(m, { now = new Date, timeZone } = {}) {
+  const disk = m.disk && m.disk.totalGb > 0 ? `${Math.round(m.disk.usedGb / m.disk.totalGb * 100)}% used` : "Unknown";
+  const fourth = m.updatesWaiting && m.updatesWaiting > 0 ? { label: "Updates", value: `${m.updatesWaiting} waiting` } : m.battery ? { label: "Battery", value: m.battery === "charging" ? "Charging" : "On battery" } : m.uptimeDays !== null ? { label: "Uptime", value: plural(m.uptimeDays, "day", "days") } : { label: "Uptime", value: "Unknown" };
+  return [
+    { label: "Sessions", value: String(m.sessions) },
+    { label: "Last seen", value: lastSeen(m, now, timeZone) },
+    { label: "Disk", value: disk },
+    fourth
+  ];
+}
+
 // src/output.ts
 function resolveOutputMode(io, flags) {
   const json = flags.json === true || !io.isTty;
@@ -42214,6 +42487,57 @@ var ORCA_STATUS = {
   idle: "idle",
   waiting: "waiting for you"
 };
+function renderOrcaMachines(data, mode) {
+  const parsed = orcaMachinesSchema.safeParse(data);
+  if (!parsed.success)
+    return renderRecord(data, mode);
+  const { machines, summary } = parsed.data;
+  if (machines.length === 0)
+    return paint(mode, "dim", "No machines: Orca isn't connected to this Space.");
+  const lines = [
+    machineSummaryTiles(summary).map((t) => `${t.value} ${paint(mode, "dim", `(${t.line})`)}`).join("  \xB7  ")
+  ];
+  for (const m of machines) {
+    const reach = reachabilityWord(m);
+    lines.push("");
+    lines.push(`${m.host}${m.role ? paint(mode, "dim", `  ${m.role}`) : ""}`);
+    lines.push(`  ${paint(mode, reach.kind === "error" ? "yellow" : "green", reach.text)}`);
+    if (m.orca.error)
+      lines.push(paint(mode, "dim", `  ${m.orca.error}`));
+    if (m.os)
+      lines.push(paint(mode, "dim", `  ${m.os}`));
+    lines.push(`  ${machineFacts(m).map((f) => `${f.label}: ${f.value}`).join("  \xB7  ")}`);
+  }
+  return lines.join(`
+`);
+}
+function renderOrcaStatus(data, mode) {
+  const parsed = orcaBridgeStatusSchema.safeParse(data);
+  if (!parsed.success)
+    return renderRecord(data, mode);
+  const { bridge, calls, problems, callsToday, keptDays } = parsed.data;
+  if (!bridge)
+    return paint(mode, "dim", "Orca isn't connected to this Space.");
+  const where = [bridge.address, bridge.host ? `on ${bridge.host}` : null, bridge.version].filter(Boolean).join(" \xB7 ");
+  const lines = [
+    `${paint(mode, bridge.reachable ? "green" : "yellow", bridge.reachable ? "Bridge answers" : "Bridge doesn't answer")}  ${paint(mode, "dim", where)}`
+  ];
+  if (bridge.runningSince) {
+    lines.push(paint(mode, "dim", `  running since ${bridge.runningSince.toISOString()}`));
+  }
+  for (const p of problems) {
+    lines.push("");
+    lines.push(paint(mode, p.kind === "error" ? "yellow" : "dim", p.title));
+    lines.push(`  ${p.body}`);
+  }
+  lines.push("");
+  lines.push(paint(mode, "dim", `${callsToday} calls today \xB7 kept ${keptDays} days`));
+  for (const c of calls) {
+    lines.push(`  ${c.at.toISOString().slice(0, 16).replace("T", " ")}  ${c.kind.padEnd(4)}  ${c.what}  ${paint(mode, "dim", `${c.from} \u2192 ${c.to}`)}  ${c.result.word}`);
+  }
+  return lines.join(`
+`);
+}
 function renderOrca(data, mode) {
   const v = data ?? {};
   if (v.state === "not_configured")
@@ -47201,45 +47525,6 @@ var commands16 = [
   }
 ];
 
-// ../../packages/domain/src/date.ts
-var formatters = new Map;
-function dateTimeFormat(locale, options) {
-  const key = `${locale ?? ""}|${JSON.stringify(options)}`;
-  let formatter = formatters.get(key);
-  if (!formatter) {
-    formatter = new Intl.DateTimeFormat(locale, options);
-    formatters.set(key, formatter);
-  }
-  return formatter;
-}
-var STYLES = ["dateStyle", "timeStyle"];
-var DATE_FIELDS = ["weekday", "year", "month", "day", ...STYLES];
-var CLOCK_PARTS = new Set(["hour", "minute", "second", "fractionalSecond", "dayPeriod"]);
-function dayInZone(now, zone) {
-  return dateTimeFormat("en-CA", {
-    timeZone: zone,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit"
-  }).format(now);
-}
-function dayOfUtc(t) {
-  const d = new Date(t);
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${d.getUTCFullYear()}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}`;
-}
-function utcOfDay(day) {
-  const [y, m, d] = day.split("-").map(Number);
-  return Date.UTC(y, m - 1, d);
-}
-function shiftDay2(day, n) {
-  return dayOfUtc(utcOfDay(day) + n * 86400000);
-}
-function mondayOfDay(day) {
-  const weekday = (new Date(utcOfDay(day)).getUTCDay() + 6) % 7;
-  return shiftDay2(day, -weekday);
-}
-
 // src/commands/food.ts
 var commands17 = [
   {
@@ -47937,7 +48222,7 @@ var SCHEDULE_FLAGS = [
   },
   { name: "data", type: "string", description: "JSON for any other field of the contract." }
 ];
-var SCHEDULE_NOTES = "One of --every-day, --on mo,we,fr, --every 3d|2w [--from YYYY-MM-DD], --monthly 1|last sets its schedule; days it isn't due never break the streak. Without one, it keeps `period` + `frequencyCount` (3\xD7 a week). The reply's `nextDue` lists its next 4 due days. --time 16:30|morning|midday|evening and --for 20m put it on your do calendar at that time on each due day (a part of day at 08:00, 12:30 or 19:00; 15 minutes without --for).";
+var SCHEDULE_NOTES = 'One of --every-day, --on mo,we,fr, --every 3d|2w [--from YYYY-MM-DD], --monthly 1|last sets its schedule; days it isn\'t due never break the streak. Without one, it keeps `period` + `frequencyCount` (3\xD7 a week). A schedule that follows the waste calendar goes in --data: `{"schedule":{"kind":"event","sourceId":"<its connection id>","match":"bin collection","offset":"day_before_evening"}}` (or `same_day`; a match naming a kind, "PMD", follows only those pickups). The reply\'s `nextDue` lists its next 4 due days. --time 16:30|morning|midday|evening and --for 20m put it on your do calendar at that time on each due day (a part of day at 08:00, 12:30 or 19:00; 15 minutes without --for).';
 function localToday() {
   const now = new Date;
   const pad = (n) => String(n).padStart(2, "0");
@@ -48246,7 +48531,7 @@ var commands20 = [
       ],
       scopes: [...habitOperations.due.scopes],
       returns: "HabitDueDate[]",
-      notes: `${routeOf(habitOperations.due)}?from=&to=. Your saved time zone's days, both ends included. One row per habit per due day: \`time\` (HH:MM or null), \`scheduleLabel\`, \`daily\` (due every day) and \`streakLabel\` (\`N days\` daily, \`N in a row\` otherwise). Paused days, quit and event-scheduled habits are left out.`
+      notes: `${routeOf(habitOperations.due)}?from=&to=. Your saved time zone's days, both ends included. One row per habit per due day: \`time\` (HH:MM or null), \`scheduleLabel\`, \`daily\` (due every day) and \`streakLabel\` (\`N days\` daily, \`N in a row\` otherwise). Paused days and quit habits are left out; an event-scheduled habit sits on its event days.`
     },
     run: async ({ flags, requireClient }) => {
       const from = flagString(flags, "from");
@@ -52890,6 +53175,30 @@ var commands35 = [
     },
     run: readOperation(orcaOperations.overview, renderOrca)
   },
+  {
+    spec: {
+      path: ["orca", "machines"],
+      summary: "List the machines Orca knows: health beside Orca reachability.",
+      args: [],
+      flags: [],
+      scopes: [...orcaOperations.machines.scopes],
+      returns: "OrcaMachines",
+      notes: "Each machine's OS, disk, memory, load, updates, uptime or battery (null where it can't be read), whether Orca reaches it (route, since, why not), its repos, agents and sessions; summary holds the counts. A machine Orca can't reach is still listed. Read live; nothing is stored."
+    },
+    run: readOperation(orcaOperations.machines, renderOrcaMachines)
+  },
+  {
+    spec: {
+      path: ["orca", "status"],
+      summary: "Show the Orca bridge's status, its calls this week and its problems.",
+      args: [],
+      flags: [],
+      scopes: [...orcaOperations.status.scopes],
+      returns: "OrcaBridgeStatus",
+      notes: "The bridge (reachable, address, the machine it runs on, version, running since), the calls do and the agent made through it over the last 7 days, newest first (metadata only, never output), callsToday, and the problems in plain words. Read live."
+    },
+    run: readOperation(orcaOperations.status, renderOrcaStatus)
+  },
   {
     spec: {
       path: ["orca", "output"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robbeverhelst/do",
-  "version": "1.344.0",
+  "version": "1.346.0",
   "private": false,
   "description": "do — the agent-drivable CLI over the public /api/v1 surface",
   "homepage": "https://github.com/robbeverhelst/do/tree/main/apps/cli",