@youtyan/code-viewer 0.8.3 → 0.8.4

package/dist/code-viewer.js

@@ -94,6 +94,157 @@ var init_sqlite_driver = __esm(() => {
   NPX_CACHE_GUIDE = 'Stale npx cache likely contains a binary compiled for a different Node.js version. Fix: `rm -rf ~/.npm/_npx` (macOS / Linux) or `Remove-Item -Recurse -Force "$(npm config get cache)\\_npx"` (Windows), ' + "then re-run `npx -y @youtyan/code-viewer@latest …`.";
 });
 
+// web-src/core/id.ts
+function bytesToHex(bytes) {
+  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+}
+function bytesToBase36(bytes) {
+  return Array.from(bytes, (b) => BASE36_ALPHABET[b % BASE36_ALPHABET.length]).join("");
+}
+function randomBase36(length) {
+  const cryptoApi = globalThis.crypto;
+  if (typeof cryptoApi?.getRandomValues === "function") {
+    const bytes = new Uint8Array(length);
+    cryptoApi.getRandomValues(bytes);
+    return bytesToBase36(bytes);
+  }
+  return Math.random().toString(36).slice(2, 2 + length).padEnd(length, "0");
+}
+function makeId(prefix) {
+  const cryptoApi = globalThis.crypto;
+  if (typeof cryptoApi?.randomUUID === "function") {
+    return `${prefix}-${cryptoApi.randomUUID().replace(/-/g, "").slice(0, 16)}`;
+  }
+  if (typeof cryptoApi?.getRandomValues === "function") {
+    const bytes = new Uint8Array(8);
+    cryptoApi.getRandomValues(bytes);
+    return `${prefix}-${bytesToHex(bytes)}`;
+  }
+  return `${prefix}-${Date.now().toString(36)}${Math.random().toString(36).slice(2, 10)}`;
+}
+function makeTimedId(prefix) {
+  const time = Date.now().toString(36);
+  const random = randomBase36(6);
+  return `${prefix}-${time}${random}`;
+}
+var BASE36_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+// web-src/core/routes.ts
+function assertNever(value) {
+  throw new Error(`unhandled route: ${JSON.stringify(value)}`);
+}
+function parseLineTarget(value) {
+  const raw = value || "";
+  const range = /^(\d+)-(\d+)$/.exec(raw);
+  if (range) {
+    const a = Number(range[1]);
+    const b = Number(range[2]);
+    const start = Math.min(a, b);
+    const end = Math.max(a, b);
+    if (start > 0)
+      return { start, end };
+    return;
+  }
+  const line = Number(raw);
+  return Number.isInteger(line) && line > 0 ? line : undefined;
+}
+function formatLineTarget(line) {
+  return typeof line === "number" ? String(line) : `${line.start}-${line.end}`;
+}
+function buildRoute(route) {
+  switch (route.screen) {
+    case "repo": {
+      const params = new URLSearchParams;
+      if (route.ref && route.ref !== "worktree")
+        params.set("ref", route.ref);
+      if (route.path)
+        params.set("path", route.path);
+      const qs = params.toString();
+      return `/${qs ? `?${qs}` : ""}`;
+    }
+    case "file":
+      if (route.view === "blob") {
+        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=blob" + (route.preview ? "&preview=1" : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
+      }
+      if (route.view === "blame") {
+        const ref = route.ref || "worktree";
+        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(ref) + "&view=blame" + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
+      }
+      if (route.view === "history") {
+        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=history" + (route.commit ? `&commit=${encodeURIComponent(route.commit)}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
+      }
+      return "/file?path=" + encodeURIComponent(route.path) + "&ref=" + encodeURIComponent(route.ref || "worktree") + "&from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
+    case "diff":
+      return "/todif?from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree") + (route.path ? `&path=${encodeURIComponent(route.path)}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
+    case "help": {
+      const params = new URLSearchParams;
+      if (route.lang && route.lang !== "en")
+        params.set("lang", route.lang);
+      if (route.section && route.section !== "overview")
+        params.set("section", route.section);
+      const qs = params.toString();
+      return `/help${qs ? `?${qs}` : ""}`;
+    }
+    case "history": {
+      const params = new URLSearchParams;
+      if (route.ref && route.ref !== "HEAD")
+        params.set("ref", route.ref);
+      if (route.commit)
+        params.set("commit", route.commit);
+      const qs = params.toString();
+      return `/history${qs ? `?${qs}` : ""}`;
+    }
+    case "journal": {
+      const params = new URLSearchParams;
+      if (route.tab && route.tab !== "journal")
+        params.set("tab", route.tab);
+      if (route.date)
+        params.set("date", route.date);
+      if (route.label)
+        params.set("label", route.label);
+      if (route.task)
+        params.set("task", route.task);
+      const qs = params.toString();
+      return `/journal${qs ? `?${qs}` : ""}`;
+    }
+    case "database": {
+      const params = new URLSearchParams;
+      if (route.db)
+        params.set("db", route.db);
+      if (route.schema)
+        params.set("schema", route.schema);
+      if (route.table)
+        params.set("table", route.table);
+      if (route.tab)
+        params.set("tab", route.tab);
+      if (route.diffBefore)
+        params.set("diffBefore", route.diffBefore);
+      if (route.diffAfter)
+        params.set("diffAfter", route.diffAfter);
+      const qs = params.toString();
+      return `/database${qs ? `?${qs}` : ""}`;
+    }
+    case "unknown":
+      return "/todif?from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree");
+    default:
+      return assertNever(route);
+  }
+}
+var SPA_PATHS, APP_ENTRY_PATHS;
+var init_routes = __esm(() => {
+  SPA_PATHS = [
+    "/todif",
+    "/todiff",
+    "/file",
+    "/help",
+    "/history",
+    "/journal",
+    "/database",
+    "/doctor"
+  ];
+  APP_ENTRY_PATHS = ["/", "/index.html"];
+});
+
 // web-src/server/json-store.ts
 import { randomBytes } from "node:crypto";
 import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
@@ -205,6 +356,11 @@ function createJsonFileStore(options) {
 }
 var init_json_store = () => {};
 
+// web-src/server/ordered-insert.ts
+function orderedInsertOptionCount(input) {
+  return (input.before_id ? 1 : 0) + (input.after_id ? 1 : 0) + (input.position !== undefined ? 1 : 0);
+}
+
 // web-src/server/annotations.ts
 import { join } from "node:path";
 function annotationsFilePath(root) {
@@ -214,9 +370,7 @@ function emptyAnnotationsState() {
   return { version: 1, sessions: [] };
 }
 function makeAnnotationId(prefix) {
-  const random = Math.random().toString(36).slice(2, 8);
-  const time = Date.now().toString(36);
-  return `${prefix}-${time}${random}`;
+  return makeTimedId(prefix);
 }
 function normalizeLineRange(raw) {
   if (!raw || typeof raw !== "object")
@@ -229,16 +383,10 @@ function normalizeLineRange(raw) {
   return { start, end: endValue };
 }
 function parseAnnotationLine(raw) {
-  const range = /^(\d+)-(\d+)$/.exec(raw);
-  if (range) {
-    const a = Number(range[1]);
-    const b = Number(range[2]);
-    const start = Math.min(a, b);
-    const end = Math.max(a, b);
-    return start > 0 ? { start, end } : undefined;
-  }
-  const line = Number(raw);
-  return Number.isInteger(line) && line > 0 ? { start: line, end: line } : undefined;
+  const target = parseLineTarget(raw);
+  if (target === undefined)
+    return;
+  return typeof target === "number" ? { start: target, end: target } : target;
 }
 function normalizeRange(raw) {
   const from = raw && typeof raw === "object" && typeof raw.from === "string" ? raw.from || "HEAD" : "HEAD";
@@ -441,11 +589,8 @@ function startAnnotationSession(state, title, now, id = makeAnnotationId("s")) {
     session
   };
 }
-function insertOptionCount(input) {
-  return (input.before_id ? 1 : 0) + (input.after_id ? 1 : 0) + (input.position !== undefined ? 1 : 0);
-}
 function entryInsertIndex(entries, input) {
-  if (insertOptionCount(input) > 1)
+  if (orderedInsertOptionCount(input) > 1)
     return { ok: false, error: "use only one of before, after, or position" };
   if (input.before_id) {
     const index = entries.findIndex((entry) => entry.id === input.before_id);
@@ -471,7 +616,7 @@ function entryInsertIndex(entries, input) {
 function findSessionByEntryId(sessions, entryId) {
   return sessions.find((session) => session.entries.some((entry) => entry.id === entryId));
 }
-function addAnnotationEntry(state, input, now, makeId = makeAnnotationId) {
+function addAnnotationEntry(state, input, now, makeId2 = makeAnnotationId) {
   const target = normalizeAnnotationTarget(input.target);
   if (target?.kind === "database" && !target.db)
     return { ok: false, error: "database annotation requires db" };
@@ -514,13 +659,13 @@ function addAnnotationEntry(state, input, now, makeId = makeAnnotationId) {
     session = sessions[sessions.length - 1];
   }
   if (!session) {
-    const started = startAnnotationSession(state, input.session_title || "", now, makeId("s"));
+    const started = startAnnotationSession(state, input.session_title || "", now, makeId2("s"));
     sessions = started.state.sessions;
     session = started.session;
     createdSession = true;
   }
   const entry = {
-    id: makeId("a"),
+    id: makeId2("a"),
     created_at: now,
     path,
     range: normalizeRange(input.range),
@@ -554,7 +699,7 @@ function addAnnotationEntry(state, input, now, makeId = makeAnnotationId) {
   };
 }
 function moveAnnotationEntry(state, id, input) {
-  if (insertOptionCount(input) !== 1)
+  if (orderedInsertOptionCount(input) !== 1)
     return { ok: false, error: "move requires before, after, or position" };
   const sourceSession = findSessionByEntryId(state.sessions, id);
   const entry = sourceSession?.entries.find((e) => e.id === id);
@@ -654,6 +799,7 @@ function deleteAnnotationById(state, id) {
 }
 var CODE_VIEWER_DIR = ".code-viewer", ANNOTATIONS_FILE_NAME = "annotations.json", ANNOTATION_BODY_MAX_BYTES, ANNOTATION_TITLE_MAX_CHARS = 300, MAX_ANNOTATIONS_JSON_BYTES = 5000000, annotationsStore;
 var init_annotations = __esm(() => {
+  init_routes();
   init_json_store();
   ANNOTATION_BODY_MAX_BYTES = 64 * 1024;
   annotationsStore = createJsonFileStore({
@@ -666,47 +812,9 @@ var init_annotations = __esm(() => {
   });
 });
 
-// web-src/server/cache.ts
-import { lstatSync } from "node:fs";
-import { join as join2 } from "node:path";
-function cacheFresh(cached, now = Date.now(), ttlMs = CACHE_TTL_MS) {
-  return !!cached && now - cached.storedAt <= ttlMs;
-}
-function setTimedCacheEntry(cache, key, value, now = Date.now(), maxEntries = MAX_TIMED_CACHE_ENTRIES) {
-  cache.set(key, { ...value, storedAt: now });
-  while (cache.size > maxEntries) {
-    const oldest = cache.keys().next().value;
-    if (oldest === undefined)
-      break;
-    cache.delete(oldest);
-  }
-}
-function worktreeFileSignature(path, cwd) {
-  try {
-    const stats = lstatSync(join2(cwd, path));
-    const inode = "ino" in stats ? stats.ino : 0;
-    return `state:file|size:${stats.size}|mtime:${stats.mtimeMs}|ctime:${stats.ctimeMs}|ino:${inode}`;
-  } catch {
-    return "state:missing";
-  }
-}
-function fileDiffCacheKey(options) {
-  const worktreeTarget = options.range.from === "worktree" || !options.range.to || options.range.to === "worktree";
-  if (options.isUntracked && !worktreeTarget) {
-    throw new Error("untracked file diffs require a worktree range");
-  }
-  const signature = worktreeTarget ? `\x00${worktreeFileSignature(options.path, options.cwd)}` : "";
-  if (options.isUntracked) {
-    return `u\x00${options.path}${signature}\x00${options.extras.join("\x00")}`;
-  }
-  return `t\x00${options.path}\x00${options.oldPath || ""}${signature}\x00${[...options.extras, ...options.args].join("\x00")}`;
-}
-var CACHE_TTL_MS = 1500, MAX_TIMED_CACHE_ENTRIES = 200;
-var init_cache = () => {};
-
 // web-src/server/command-resolver.ts
 import { accessSync, constants, realpathSync, statSync } from "node:fs";
-import { dirname as dirname2, isAbsolute, join as join3, relative } from "node:path";
+import { dirname as dirname2, isAbsolute, join as join2, relative } from "node:path";
 function isExternalCommandName(value) {
   return commandNameSet.has(value);
 }
@@ -841,7 +949,7 @@ function findGitRootByWalking(start) {
   let current = start;
   for (;; ) {
     try {
-      statSync(join3(current, ".git"));
+      statSync(join2(current, ".git"));
       return realpathSync(current);
     } catch {}
     const parent = dirname2(current);
@@ -873,6 +981,44 @@ var init_command_resolver = __esm(() => {
   activeOverrides = new Map;
 });
 
+// web-src/server/cache.ts
+import { lstatSync } from "node:fs";
+import { join as join3 } from "node:path";
+function cacheFresh(cached, now = Date.now(), ttlMs = CACHE_TTL_MS) {
+  return !!cached && now - cached.storedAt <= ttlMs;
+}
+function setTimedCacheEntry(cache, key, value, now = Date.now(), maxEntries = MAX_TIMED_CACHE_ENTRIES) {
+  cache.set(key, { ...value, storedAt: now });
+  while (cache.size > maxEntries) {
+    const oldest = cache.keys().next().value;
+    if (oldest === undefined)
+      break;
+    cache.delete(oldest);
+  }
+}
+function worktreeFileSignature(path, cwd) {
+  try {
+    const stats = lstatSync(join3(cwd, path));
+    const inode = "ino" in stats ? stats.ino : 0;
+    return `state:file|size:${stats.size}|mtime:${stats.mtimeMs}|ctime:${stats.ctimeMs}|ino:${inode}`;
+  } catch {
+    return "state:missing";
+  }
+}
+function fileDiffCacheKey(options) {
+  const worktreeTarget = options.range.from === "worktree" || !options.range.to || options.range.to === "worktree";
+  if (options.isUntracked && !worktreeTarget) {
+    throw new Error("untracked file diffs require a worktree range");
+  }
+  const signature = worktreeTarget ? `\x00${worktreeFileSignature(options.path, options.cwd)}` : "";
+  if (options.isUntracked) {
+    return `u\x00${options.path}${signature}\x00${options.extras.join("\x00")}`;
+  }
+  return `t\x00${options.path}\x00${options.oldPath || ""}${signature}\x00${[...options.extras, ...options.args].join("\x00")}`;
+}
+var CACHE_TTL_MS = 1500, MAX_TIMED_CACHE_ENTRIES = 200;
+var init_cache = () => {};
+
 // web-src/server/name-pattern.ts
 function parseGlobSegment(pattern) {
   const matchers = [];
@@ -985,6 +1131,21 @@ import {
 } from "node:http";
 import { Readable } from "node:stream";
 function runSync(args, cwd, options = {}) {
+  const proc = runBytesSync(args, cwd, options);
+  return {
+    code: proc.code,
+    stdout: new TextDecoder().decode(proc.stdout),
+    stderr: proc.stderr
+  };
+}
+function runAsync(args, cwd, options = {}) {
+  return runBytesAsync(args, cwd, options).then((proc) => ({
+    code: proc.code,
+    stdout: new TextDecoder().decode(proc.stdout),
+    stderr: proc.stderr
+  }));
+}
+function runBytesSync(args, cwd, options = {}) {
   const proc = spawnSync(args[0], args.slice(1), {
     cwd,
     encoding: "buffer",
@@ -995,17 +1156,10 @@ function runSync(args, cwd, options = {}) {
   });
   return {
     code: proc.status ?? (proc.error ? 1 : 0),
-    stdout: new TextDecoder().decode(proc.stdout || new Uint8Array),
+    stdout: new Uint8Array(proc.stdout || new Uint8Array),
     stderr: appendProcessError(new TextDecoder().decode(proc.stderr || new Uint8Array), proc.error)
   };
 }
-function runAsync(args, cwd, options = {}) {
-  return runBytesAsync(args, cwd, options).then((proc) => ({
-    code: proc.code,
-    stdout: new TextDecoder().decode(proc.stdout),
-    stderr: proc.stderr
-  }));
-}
 function runBytesAsync(args, cwd, options = {}) {
   const maxBuffer = options.maxBuffer ?? 64 * 1024 * 1024;
   return new Promise((resolve) => {
@@ -3089,6 +3243,33 @@ function takeValue(argv, index, flag) {
     return { error: `${flag} requires a value` };
   return { value, next: index + 1 };
 }
+function takeGlobalCliOption(argv, index, options) {
+  const flag = argv[index];
+  if (flag === "--cwd" || flag === "--server" && options.allowServer) {
+    const taken = takeValue(argv, index, flag);
+    if ("error" in taken)
+      return { kind: "error", error: taken.error };
+    return {
+      kind: flag === "--cwd" ? "cwd" : "server",
+      value: taken.value,
+      next: taken.next
+    };
+  }
+  if (flag === "--bin" && options.allowedCommands) {
+    const taken = takeValue(argv, index, flag);
+    if ("error" in taken)
+      return { kind: "error", error: taken.error };
+    const parsed = parseExternalCommandOverride(taken.value, "--bin", options.allowedCommands);
+    if (parsed.ok === false)
+      return { kind: "error", error: parsed.error };
+    return {
+      kind: "command-override",
+      override: parsed.override,
+      next: taken.next
+    };
+  }
+  return { kind: "unhandled" };
+}
 function shellSingleQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
@@ -3108,7 +3289,7 @@ function isUnsafeText(value) {
     return true;
   return false;
 }
-function validateRefValue(value, flag) {
+function validateSafeCliValue(value, flag) {
   if (!value)
     return `${flag} requires a non-empty value`;
   if (isUnsafeText(value))
@@ -3117,13 +3298,16 @@ function validateRefValue(value, flag) {
     return `${flag} must not start with '-'`;
   return;
 }
+function validateRefValue(value, flag) {
+  const error = validateSafeCliValue(value, flag);
+  if (error)
+    return error;
+  return;
+}
 function validateRepoRelativePathValue(value, flag) {
-  if (!value)
-    return `${flag} requires a non-empty value`;
-  if (isUnsafeText(value))
-    return `${flag} must be single-line and must not contain NUL`;
-  if (value.startsWith("-"))
-    return `${flag} must not start with '-'`;
+  const error = validateSafeCliValue(value, flag);
+  if (error)
+    return error;
   if (value.startsWith("/") || value.startsWith("\\"))
     return `${flag} must be repo-relative`;
   const parts = value.split(/[\\/]+/);
@@ -3237,6 +3421,7 @@ function extractErrorDetail(rawBody, isJson, status) {
   return trimmed;
 }
 var init_cli_helpers = __esm(() => {
+  init_command_resolver();
   init_git();
   init_server_registry();
 });
@@ -3256,6 +3441,28 @@ function parsePosition(value) {
   const n = Number(value);
   return Number.isInteger(n) && n > 0 ? n : Number.NaN;
 }
+function parseAnnotationAddOptions(options) {
+  const body = options.get("--body");
+  const bodyFile = options.get("--body-file");
+  if (body !== undefined && bodyFile !== undefined)
+    return { ok: false, error: "use either --body or --body-file" };
+  const position = parsePosition(options.get("--position"));
+  if (Number.isNaN(position))
+    return { ok: false, error: "--position must be a positive integer" };
+  return {
+    ok: true,
+    options: {
+      title: options.get("--title"),
+      session: options.get("--session"),
+      sessionTitle: options.get("--session-title"),
+      body,
+      bodyFile,
+      before: options.get("--before"),
+      after: options.get("--after"),
+      position
+    }
+  };
+}
 function parseFilter(value) {
   const idx = value.indexOf("=");
   if (idx <= 0)
@@ -3310,15 +3517,15 @@ function parseAnnotateArgs(argv) {
     const arg = argv[i];
     if (arg === "--help" || arg === "-h")
       return { ok: true, args: { command: { kind: "help" } } };
-    if (arg === "--cwd" || arg === "--server") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      if (arg === "--cwd")
-        cwd = taken.value;
-      else
-        server = taken.value;
-      i = taken.next;
+    const global = takeGlobalCliOption(argv, i, { allowServer: true });
+    if (global.kind === "error")
+      return { ok: false, error: global.error };
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
+    } else if (global.kind === "server") {
+      server = global.value;
+      i = global.next;
     } else if (valueFlags.has(arg)) {
       const taken = takeValue(argv, i, arg);
       if ("error" in taken)
@@ -3363,13 +3570,9 @@ function parseAnnotateArgs(argv) {
       if (!line)
         return { ok: false, error: "--line must be <n> or <n>-<m>" };
     }
-    const body = options.get("--body");
-    const bodyFile = options.get("--body-file");
-    if (body !== undefined && bodyFile !== undefined)
-      return { ok: false, error: "use either --body or --body-file" };
-    const position = parsePosition(options.get("--position"));
-    if (Number.isNaN(position))
-      return { ok: false, error: "--position must be a positive integer" };
+    const commonOptions = parseAnnotationAddOptions(options);
+    if (commonOptions.ok === false)
+      return { ok: false, error: commonOptions.error };
     return {
       ok: true,
       args: {
@@ -3379,14 +3582,7 @@ function parseAnnotateArgs(argv) {
           line,
           from: options.get("--from"),
           to: options.get("--to"),
-          title: options.get("--title"),
-          session: options.get("--session"),
-          sessionTitle: options.get("--session-title"),
-          body,
-          bodyFile,
-          before: options.get("--before"),
-          after: options.get("--after"),
-          position
+          ...commonOptions.options
         },
         cwd,
         server
@@ -3396,13 +3592,9 @@ function parseAnnotateArgs(argv) {
   if (subcommand === "add-db") {
     if (!options.get("--db"))
       return { ok: false, error: "add-db requires --db <id>" };
-    const body = options.get("--body");
-    const bodyFile = options.get("--body-file");
-    if (body !== undefined && bodyFile !== undefined)
-      return { ok: false, error: "use either --body or --body-file" };
-    const position = parsePosition(options.get("--position"));
-    if (Number.isNaN(position))
-      return { ok: false, error: "--position must be a positive integer" };
+    const commonOptions = parseAnnotationAddOptions(options);
+    if (commonOptions.ok === false)
+      return { ok: false, error: commonOptions.error };
     const rawTab = options.get("--tab");
     const tab = normalizeDatabaseTab(rawTab);
     if (rawTab !== undefined && tab === undefined)
@@ -3477,14 +3669,7 @@ function parseAnnotateArgs(argv) {
           searchTerm: options.get("--search-term"),
           includeNonText: flags.has("--include-non-text") || undefined,
           searchAutoRun: flags.has("--run-search"),
-          title: options.get("--title"),
-          session: options.get("--session"),
-          sessionTitle: options.get("--session-title"),
-          body,
-          bodyFile,
-          before: options.get("--before"),
-          after: options.get("--after"),
-          position
+          ...commonOptions.options
         },
         cwd,
         server
@@ -3597,6 +3782,14 @@ function printList(state) {
     });
   }
 }
+function printAddedAnnotation(result, location, serverUrl) {
+  const sessionTitle = result.session_title || "Untitled session";
+  if (result.created_session) {
+    console.error(`created new annotation session ${result.session_id} (${sessionTitle})`);
+  }
+  console.log(`annotated ${location} ` + `[${result.entry.id}] in session ${result.session_id} (${sessionTitle})`);
+  console.error(`view annotations at ${serverUrl}/ with the code annotations panel`);
+}
 async function annotationBodyFromCommand(command) {
   let body = command.body;
   if (body === undefined && command.bodyFile !== undefined) {
@@ -3657,11 +3850,7 @@ async function runAnnotateCli(argv) {
       after_id: command.after,
       position: command.position
     });
-    if (result.created_session) {
-      console.error(`created new annotation session ${result.session_id} (${result.session_title || "Untitled session"})`);
-    }
-    console.log(`annotated ${result.entry.path}${formatLine(result.entry.line)} ` + `[${result.entry.id}] in session ${result.session_id} (${result.session_title || "Untitled session"})`);
-    console.error(`view annotations at ${serverUrl}/ with the code annotations panel`);
+    printAddedAnnotation(result, `${result.entry.path}${formatLine(result.entry.line)}`, serverUrl);
     return;
   }
   if (command.kind === "add-db") {
@@ -3711,11 +3900,7 @@ async function runAnnotateCli(argv) {
       after_id: command.after,
       position: command.position
     });
-    if (result.created_session) {
-      console.error(`created new annotation session ${result.session_id} (${result.session_title || "Untitled session"})`);
-    }
-    console.log(`annotated ${result.entry.path} ` + `[${result.entry.id}] in session ${result.session_id} (${result.session_title || "Untitled session"})`);
-    console.error(`view annotations at ${serverUrl}/ with the code annotations panel`);
+    printAddedAnnotation(result, result.entry.path, serverUrl);
     return;
   }
   if (command.kind === "list") {
@@ -4274,25 +4459,19 @@ function parseFileArgs(argv) {
   for (let i = 0;i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "--help" || arg === "-h") {
-      return { ok: true, args: { command: { kind: "help" } } };
-    }
-    if (arg === "--cwd") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      cwd = taken.value;
-      i = taken.next;
-    } else if (arg === "--bin") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      const parsed = parseExternalCommandOverride(taken.value, "--bin", [
-        "git"
-      ]);
-      if (parsed.ok === false)
-        return { ok: false, error: parsed.error };
-      commandOverrides.push(parsed.override);
-      i = taken.next;
+      return { ok: true, args: { command: { kind: "help" } } };
+    }
+    const global = takeGlobalCliOption(argv, i, {
+      allowedCommands: ["git"]
+    });
+    if (global.kind === "error")
+      return { ok: false, error: global.error };
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
+    } else if (global.kind === "command-override") {
+      commandOverrides.push(global.override);
+      i = global.next;
     } else if (VALUE_FLAGS.has(arg)) {
       const taken = takeValue(argv, i, arg);
       if ("error" in taken)
@@ -5534,26 +5713,21 @@ function parseJournalArgs(argv) {
       const arg = argv[i];
       if (arg === "--help" || arg === "-h")
         return { ok: true, args: { command: { kind: "help" }, dryRun: false } };
-      if (arg === "--cwd" || arg === "--server") {
-        const taken = takeValue(argv, i, arg);
-        if ("error" in taken)
-          return { ok: false, error: taken.error };
-        if (arg === "--cwd")
-          cwd = taken.value;
-        else
-          server = taken.value;
-        i = taken.next;
-      } else if (arg === "--bin") {
-        const taken = takeValue(argv, i, arg);
-        if ("error" in taken)
-          return { ok: false, error: taken.error };
-        const parsed = parseExternalCommandOverride(taken.value, "--bin", [
-          "gh"
-        ]);
-        if (parsed.ok === false)
-          return { ok: false, error: parsed.error };
-        commandOverrides.push(parsed.override);
-        i = taken.next;
+      const global = takeGlobalCliOption(argv, i, {
+        allowServer: true,
+        allowedCommands: ["gh"]
+      });
+      if (global.kind === "error")
+        return { ok: false, error: global.error };
+      if (global.kind === "cwd") {
+        cwd = global.value;
+        i = global.next;
+      } else if (global.kind === "server") {
+        server = global.value;
+        i = global.next;
+      } else if (global.kind === "command-override") {
+        commandOverrides.push(global.override);
+        i = global.next;
       } else if (valueFlags.has(arg)) {
         const taken = takeValue(argv, i, arg);
         if ("error" in taken)
@@ -6338,107 +6512,6 @@ var init_journal_cli = __esm(() => {
   init_github_issues();
 });
 
-// web-src/core/routes.ts
-function assertNever(value) {
-  throw new Error(`unhandled route: ${JSON.stringify(value)}`);
-}
-function formatLineTarget(line) {
-  return typeof line === "number" ? String(line) : `${line.start}-${line.end}`;
-}
-function buildRoute(route) {
-  switch (route.screen) {
-    case "repo": {
-      const params = new URLSearchParams;
-      if (route.ref && route.ref !== "worktree")
-        params.set("ref", route.ref);
-      if (route.path)
-        params.set("path", route.path);
-      const qs = params.toString();
-      return `/${qs ? `?${qs}` : ""}`;
-    }
-    case "file":
-      if (route.view === "blob") {
-        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=blob" + (route.preview ? "&preview=1" : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
-      }
-      if (route.view === "blame") {
-        const ref = route.ref || "worktree";
-        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(ref) + "&view=blame" + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
-      }
-      if (route.view === "history") {
-        return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=history" + (route.commit ? `&commit=${encodeURIComponent(route.commit)}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
-      }
-      return "/file?path=" + encodeURIComponent(route.path) + "&ref=" + encodeURIComponent(route.ref || "worktree") + "&from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
-    case "diff":
-      return "/todif?from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree") + (route.path ? `&path=${encodeURIComponent(route.path)}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
-    case "help": {
-      const params = new URLSearchParams;
-      if (route.lang && route.lang !== "en")
-        params.set("lang", route.lang);
-      if (route.section && route.section !== "overview")
-        params.set("section", route.section);
-      const qs = params.toString();
-      return `/help${qs ? `?${qs}` : ""}`;
-    }
-    case "history": {
-      const params = new URLSearchParams;
-      if (route.ref && route.ref !== "HEAD")
-        params.set("ref", route.ref);
-      if (route.commit)
-        params.set("commit", route.commit);
-      const qs = params.toString();
-      return `/history${qs ? `?${qs}` : ""}`;
-    }
-    case "journal": {
-      const params = new URLSearchParams;
-      if (route.tab && route.tab !== "journal")
-        params.set("tab", route.tab);
-      if (route.date)
-        params.set("date", route.date);
-      if (route.label)
-        params.set("label", route.label);
-      if (route.task)
-        params.set("task", route.task);
-      const qs = params.toString();
-      return `/journal${qs ? `?${qs}` : ""}`;
-    }
-    case "database": {
-      const params = new URLSearchParams;
-      if (route.db)
-        params.set("db", route.db);
-      if (route.schema)
-        params.set("schema", route.schema);
-      if (route.table)
-        params.set("table", route.table);
-      if (route.tab)
-        params.set("tab", route.tab);
-      if (route.diffBefore)
-        params.set("diffBefore", route.diffBefore);
-      if (route.diffAfter)
-        params.set("diffAfter", route.diffAfter);
-      const qs = params.toString();
-      return `/database${qs ? `?${qs}` : ""}`;
-    }
-    case "unknown":
-      return "/todif?from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree");
-    default:
-      return assertNever(route);
-  }
-}
-var SPA_PATHS, APP_ENTRY_PATHS;
-var init_routes = __esm(() => {
-  SPA_PATHS = [
-    "/todif",
-    "/todiff",
-    "/file",
-    "/help",
-    "/history",
-    "/journal",
-    "/database",
-    "/doctor"
-  ];
-  APP_ENTRY_PATHS = ["/", "/index.html"];
-});
-
 // web-src/server/query-cli.ts
 var exports_query_cli = {};
 __export(exports_query_cli, {
@@ -6481,26 +6554,21 @@ function parseQueryArgs(argv) {
     const arg = argv[i];
     if (arg === "--help" || arg === "-h")
       return { ok: true, args: { command: { kind: "help" } } };
-    if (arg === "--cwd" || arg === "--server") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      if (arg === "--cwd")
-        cwd = taken.value;
-      else
-        server = taken.value;
-      i = taken.next;
-    } else if (arg === "--bin") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      const parsed = parseExternalCommandOverride(taken.value, "--bin", [
-        "git"
-      ]);
-      if (parsed.ok === false)
-        return { ok: false, error: parsed.error };
-      commandOverrides.push(parsed.override);
-      i = taken.next;
+    const global = takeGlobalCliOption(argv, i, {
+      allowServer: true,
+      allowedCommands: ["git"]
+    });
+    if (global.kind === "error")
+      return { ok: false, error: global.error };
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
+    } else if (global.kind === "server") {
+      server = global.value;
+      i = global.next;
+    } else if (global.kind === "command-override") {
+      commandOverrides.push(global.override);
+      i = global.next;
     } else if (VALUE_FLAGS2.has(arg)) {
       const taken = takeValue(argv, i, arg);
       if ("error" in taken)
@@ -9139,6 +9207,18 @@ __export(exports_search_cli, {
   SEARCH_AGENT_HELP: () => SEARCH_AGENT_HELP,
   FILE_NAME_SEARCH_DEFAULT_MAX: () => FILE_NAME_SEARCH_DEFAULT_MAX
 });
+function parseSearchMax(raw, hardCap) {
+  if (raw === undefined)
+    return { value: undefined };
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value <= 0) {
+    return { error: `--max must be a positive integer (got ${raw})` };
+  }
+  if (value > hardCap) {
+    return { error: `--max must be <= ${hardCap} (got ${value})` };
+  }
+  return { value };
+}
 function parseSearchArgs(argv) {
   const rest = [];
   let cwd;
@@ -9152,26 +9232,21 @@ function parseSearchArgs(argv) {
     if (arg === "--help" || arg === "-h") {
       return { ok: true, args: { command: { kind: "help" } } };
     }
-    if (arg === "--cwd" || arg === "--server") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      if (arg === "--cwd")
-        cwd = taken.value;
-      else
-        server = taken.value;
-      i = taken.next;
-    } else if (arg === "--bin") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      const parsed = parseExternalCommandOverride(taken.value, "--bin", [
-        "git"
-      ]);
-      if (parsed.ok === false)
-        return { ok: false, error: parsed.error };
-      commandOverrides.push(parsed.override);
-      i = taken.next;
+    const global = takeGlobalCliOption(argv, i, {
+      allowServer: true,
+      allowedCommands: ["git"]
+    });
+    if (global.kind === "error")
+      return { ok: false, error: global.error };
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
+    } else if (global.kind === "server") {
+      server = global.value;
+      i = global.next;
+    } else if (global.kind === "command-override") {
+      commandOverrides.push(global.override);
+      i = global.next;
     } else if (REPEATABLE_VALUE_FLAGS.has(arg)) {
       const taken = takeValue(argv, i, arg);
       if ("error" in taken)
@@ -9230,24 +9305,10 @@ function parseSearchArgs(argv) {
         error: "search files does not accept --path"
       };
     }
-    const maxRaw2 = options.get("--max");
-    let max2 = FILE_NAME_SEARCH_DEFAULT_MAX;
-    if (maxRaw2 !== undefined) {
-      const n = Number(maxRaw2);
-      if (!Number.isInteger(n) || n <= 0) {
-        return {
-          ok: false,
-          error: `--max must be a positive integer (got ${maxRaw2})`
-        };
-      }
-      if (n > FILE_SEARCH_ABSOLUTE_MAX) {
-        return {
-          ok: false,
-          error: `--max must be <= ${FILE_SEARCH_ABSOLUTE_MAX} (got ${n})`
-        };
-      }
-      max2 = n;
-    }
+    const parsedMax2 = parseSearchMax(options.get("--max"), FILE_SEARCH_ABSOLUTE_MAX);
+    if ("error" in parsedMax2)
+      return { ok: false, error: parsedMax2.error };
+    const max = parsedMax2.value ?? FILE_NAME_SEARCH_DEFAULT_MAX;
     return {
       ok: true,
       args: {
@@ -9255,7 +9316,7 @@ function parseSearchArgs(argv) {
           kind: "files",
           term,
           ref: options.get("--ref"),
-          max: max2,
+          max,
           json: flags.has("--json")
         },
         cwd,
@@ -9264,24 +9325,9 @@ function parseSearchArgs(argv) {
       }
     };
   }
-  const maxRaw = options.get("--max");
-  let max;
-  if (maxRaw !== undefined) {
-    const n = Number(maxRaw);
-    if (!Number.isInteger(n) || n <= 0) {
-      return {
-        ok: false,
-        error: `--max must be a positive integer (got ${maxRaw})`
-      };
-    }
-    if (n > GREP_ABSOLUTE_MAX) {
-      return {
-        ok: false,
-        error: `--max must be <= ${GREP_ABSOLUTE_MAX} (got ${n})`
-      };
-    }
-    max = n;
-  }
+  const parsedMax = parseSearchMax(options.get("--max"), GREP_ABSOLUTE_MAX);
+  if ("error" in parsedMax)
+    return { ok: false, error: parsedMax.error };
   return {
     ok: true,
     args: {
@@ -9291,7 +9337,7 @@ function parseSearchArgs(argv) {
         ref: options.get("--ref"),
         paths,
         regex: flags.has("--regex"),
-        max,
+        max: parsedMax.value,
         json: flags.has("--json")
       },
       cwd,
@@ -9843,23 +9889,17 @@ function parseStatusArgs(argv) {
     if (arg === "--help" || arg === "-h") {
       return { ok: true, args: { command: { kind: "help" } } };
     }
-    if (arg === "--cwd") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      cwd = taken.value;
-      i = taken.next;
-    } else if (arg === "--bin") {
-      const taken = takeValue(argv, i, arg);
-      if ("error" in taken)
-        return { ok: false, error: taken.error };
-      const parsed = parseExternalCommandOverride(taken.value, "--bin", [
-        "git"
-      ]);
-      if (parsed.ok === false)
-        return { ok: false, error: parsed.error };
-      commandOverrides.push(parsed.override);
-      i = taken.next;
+    const global = takeGlobalCliOption(argv, i, {
+      allowedCommands: ["git"]
+    });
+    if (global.kind === "error")
+      return { ok: false, error: global.error };
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
+    } else if (global.kind === "command-override") {
+      commandOverrides.push(global.override);
+      i = global.next;
     } else if (VALUE_FLAGS4.has(arg)) {
       const taken = takeValue(argv, i, arg);
       if ("error" in taken)
@@ -10421,6 +10461,9 @@ function placeValue(coerced, kind, useParams, params) {
 function coerceCell(cell, columnType) {
   return coerceDbValue(cell.value, columnType);
 }
+function formatWriteComparisons(cells, columnTypes, kind, useParams, params, separator) {
+  return cells.map((cell) => `${sanitizeIdentifier(cell.column, kind)} = ${placeValue(coerceCell(cell, columnTypes.get(cell.column) ?? "TEXT"), kind, useParams, params)}`).join(separator);
+}
 function buildInsertSql(table, cells, columnTypes, kind) {
   if (cells.length === 0) {
     throw new Error("insert requires at least one column value");
@@ -10441,8 +10484,8 @@ function buildUpdateSql(table, set, pk, columnTypes, kind) {
   }
   const useParams = useParamsFor(kind);
   const params = [];
-  const setSql = set.map((c) => `${sanitizeIdentifier(c.column, kind)} = ${placeValue(coerceCell(c, columnTypes.get(c.column) ?? "TEXT"), kind, useParams, params)}`).join(", ");
-  const whereSql = pk.map((c) => `${sanitizeIdentifier(c.column, kind)} = ${placeValue(coerceCell(c, columnTypes.get(c.column) ?? "TEXT"), kind, useParams, params)}`).join(" AND ");
+  const setSql = formatWriteComparisons(set, columnTypes, kind, useParams, params, ", ");
+  const whereSql = formatWriteComparisons(pk, columnTypes, kind, useParams, params, " AND ");
   const sql = `UPDATE ${sanitizeIdentifier(table, kind)} SET ${setSql} WHERE ${whereSql}`;
   return { sql, params };
 }
@@ -10452,7 +10495,7 @@ function buildDeleteSql(table, pk, columnTypes, kind) {
   }
   const useParams = useParamsFor(kind);
   const params = [];
-  const whereSql = pk.map((c) => `${sanitizeIdentifier(c.column, kind)} = ${placeValue(coerceCell(c, columnTypes.get(c.column) ?? "TEXT"), kind, useParams, params)}`).join(" AND ");
+  const whereSql = formatWriteComparisons(pk, columnTypes, kind, useParams, params, " AND ");
   const sql = `DELETE FROM ${sanitizeIdentifier(table, kind)} WHERE ${whereSql}`;
   return { sql, params };
 }
@@ -15563,23 +15606,6 @@ var init_discovery = __esm(() => {
   supabaseDiscoveryCache = new Map;
 });
 
-// web-src/core/id.ts
-function bytesToHex(bytes) {
-  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
-}
-function makeId(prefix) {
-  const cryptoApi = globalThis.crypto;
-  if (typeof cryptoApi?.randomUUID === "function") {
-    return `${prefix}-${cryptoApi.randomUUID().replace(/-/g, "").slice(0, 16)}`;
-  }
-  if (typeof cryptoApi?.getRandomValues === "function") {
-    const bytes = new Uint8Array(8);
-    cryptoApi.getRandomValues(bytes);
-    return `${prefix}-${bytesToHex(bytes)}`;
-  }
-  return `${prefix}-${Date.now().toString(36)}${Math.random().toString(36).slice(2, 10)}`;
-}
-
 // web-src/server/worktree-watcher.ts
 import {
   lstatSync as lstatSync3,
@@ -15850,15 +15876,17 @@ function optionalString(value, maxLen) {
 function optionalBoolean(value) {
   return typeof value === "boolean" ? value : undefined;
 }
-function optionalNumber(value, min, max) {
+function optionalFiniteNumber(value, min, max, round) {
   if (typeof value !== "number" || !Number.isFinite(value))
     return;
-  return Math.max(min, Math.min(max, Math.round(value)));
+  const normalized = round ? Math.round(value) : value;
+  return Math.max(min, Math.min(max, normalized));
+}
+function optionalNumber(value, min, max) {
+  return optionalFiniteNumber(value, min, max, true);
 }
 function optionalFloat(value, min, max) {
-  if (typeof value !== "number" || !Number.isFinite(value))
-    return;
-  return Math.max(min, Math.min(max, value));
+  return optionalFiniteNumber(value, min, max, false);
 }
 function optionalFontSize(value) {
   return value === "compact" || value === "regular" || value === "large" || value === "xlarge" ? value : undefined;
@@ -16690,6 +16718,25 @@ function asStringArray(value) {
 function asNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
+function asDynamoDbItemsResult(raw) {
+  return {
+    items: Array.isArray(raw.Items) ? raw.Items : [],
+    count: asNumber(raw.Count),
+    scannedCount: asNumber(raw.ScannedCount),
+    ...raw.LastEvaluatedKey ? { lastEvaluatedKey: asObject(raw.LastEvaluatedKey) } : {}
+  };
+}
+function dynamoDbItemsRequestFields(opts) {
+  return {
+    ...opts.limit ? { Limit: Math.min(1000, Math.max(1, opts.limit)) } : {},
+    ...opts.exclusiveStartKey ? { ExclusiveStartKey: opts.exclusiveStartKey } : {},
+    ...opts.indexName ? { IndexName: opts.indexName } : {},
+    ...opts.projectionExpression ? { ProjectionExpression: opts.projectionExpression } : {},
+    ...opts.filterExpression ? { FilterExpression: opts.filterExpression } : {},
+    ...opts.expressionAttributeNames ? { ExpressionAttributeNames: opts.expressionAttributeNames } : {},
+    ...opts.expressionAttributeValues ? { ExpressionAttributeValues: opts.expressionAttributeValues } : {}
+  };
+}
 function createDynamoDbAdapter(config) {
   async function signedJsonRequest(action, body, signal, deadline = createDynamoDbTransportDeadline(config)) {
     const requestBody = JSON.stringify(body);
@@ -16772,41 +16819,19 @@ function createDynamoDbAdapter(config) {
     assertTableName(opts.tableName);
     const raw = await signedJsonRequest("Scan", {
       TableName: opts.tableName,
-      ...opts.limit ? { Limit: Math.min(1000, Math.max(1, opts.limit)) } : {},
-      ...opts.exclusiveStartKey ? { ExclusiveStartKey: opts.exclusiveStartKey } : {},
-      ...opts.indexName ? { IndexName: opts.indexName } : {},
-      ...opts.projectionExpression ? { ProjectionExpression: opts.projectionExpression } : {},
-      ...opts.filterExpression ? { FilterExpression: opts.filterExpression } : {},
-      ...opts.expressionAttributeNames ? { ExpressionAttributeNames: opts.expressionAttributeNames } : {},
-      ...opts.expressionAttributeValues ? { ExpressionAttributeValues: opts.expressionAttributeValues } : {}
+      ...dynamoDbItemsRequestFields(opts)
     }, opts.signal);
-    return {
-      items: Array.isArray(raw.Items) ? raw.Items : [],
-      count: asNumber(raw.Count),
-      scannedCount: asNumber(raw.ScannedCount),
-      ...raw.LastEvaluatedKey ? { lastEvaluatedKey: asObject(raw.LastEvaluatedKey) } : {}
-    };
+    return asDynamoDbItemsResult(raw);
   }
   async function queryAsync(opts) {
     assertTableName(opts.tableName);
     const raw = await signedJsonRequest("Query", {
       TableName: opts.tableName,
       KeyConditionExpression: opts.keyConditionExpression,
-      ...opts.limit ? { Limit: Math.min(1000, Math.max(1, opts.limit)) } : {},
-      ...opts.exclusiveStartKey ? { ExclusiveStartKey: opts.exclusiveStartKey } : {},
-      ...opts.indexName ? { IndexName: opts.indexName } : {},
-      ...opts.projectionExpression ? { ProjectionExpression: opts.projectionExpression } : {},
-      ...opts.filterExpression ? { FilterExpression: opts.filterExpression } : {},
-      ...opts.expressionAttributeNames ? { ExpressionAttributeNames: opts.expressionAttributeNames } : {},
-      ...opts.expressionAttributeValues ? { ExpressionAttributeValues: opts.expressionAttributeValues } : {},
+      ...dynamoDbItemsRequestFields(opts),
       ...opts.scanIndexForward !== undefined ? { ScanIndexForward: opts.scanIndexForward } : {}
     }, opts.signal);
-    return {
-      items: Array.isArray(raw.Items) ? raw.Items : [],
-      count: asNumber(raw.Count),
-      scannedCount: asNumber(raw.ScannedCount),
-      ...raw.LastEvaluatedKey ? { lastEvaluatedKey: asObject(raw.LastEvaluatedKey) } : {}
-    };
+    return asDynamoDbItemsResult(raw);
   }
   async function getItemAsync(opts) {
     assertTableName(opts.tableName);
@@ -22497,29 +22522,20 @@ function parseDoctorCliArgs(argv) {
       json2 = true;
       continue;
     }
-    if (arg === "--cwd") {
-      const next = argv[++i];
-      if (!next)
-        return { kind: "error", message: "--cwd requires a value" };
-      cwd = next;
+    const global = takeGlobalCliOption(argv, i, {
+      allowedCommands: ["git", "docker", "gh"]
+    });
+    if (global.kind === "error") {
+      return { kind: "error", message: global.error };
+    }
+    if (global.kind === "cwd") {
+      cwd = global.value;
+      i = global.next;
       continue;
     }
-    if (arg === "--bin") {
-      const next = argv[++i];
-      if (!next) {
-        return {
-          kind: "error",
-          message: "--bin requires <name>=<absolute-path>"
-        };
-      }
-      const parsed = parseExternalCommandOverride(next, "--bin", [
-        "git",
-        "docker",
-        "gh"
-      ]);
-      if (parsed.ok === false)
-        return { kind: "error", message: parsed.error };
-      commandOverrides.push(parsed.override);
+    if (global.kind === "command-override") {
+      commandOverrides.push(global.override);
+      i = global.next;
       continue;
     }
     if (arg === "--port") {
@@ -22646,6 +22662,7 @@ Exit codes:
 `, STATUS_SYMBOL;
 var init_doctor_cli = __esm(() => {
   init_command_resolver();
+  init_cli_helpers();
   init_doctor();
   init_git();
   STATUS_SYMBOL = {
@@ -22711,9 +22728,7 @@ function emptyJournalTaskState() {
   return { version: 1, tasks: [] };
 }
 function makeJournalId(prefix) {
-  const random = Math.random().toString(36).slice(2, 8);
-  const time = Date.now().toString(36);
-  return `${prefix}-${time}${random}`;
+  return makeTimedId(prefix);
 }
 function optionalString4(value, maxLen) {
   if (typeof value !== "string")
@@ -22867,11 +22882,8 @@ async function updateDailyJournalState(root, updater) {
 async function updateJournalTaskState(root, updater) {
   return journalTaskStore.update(root, updater);
 }
-function insertOptionCount2(input) {
-  return (input.before_id ? 1 : 0) + (input.after_id ? 1 : 0) + (input.position !== undefined ? 1 : 0);
-}
 function taskInsertIndex(tasks, status, input) {
-  if (insertOptionCount2(input) > 1)
+  if (orderedInsertOptionCount(input) > 1)
     return { ok: false, error: "use only one of before, after, or position" };
   if (input.before_id || input.after_id) {
     const anchorId = input.before_id || input.after_id || "";
@@ -23039,6 +23051,16 @@ function addJournalTask(state, input, now, makeId3 = makeJournalId) {
   tasks.splice(insertAt.index, 0, task);
   return { ok: true, state: { version: 1, tasks }, task };
 }
+function journalTaskResult(state, task) {
+  return {
+    ok: true,
+    state: {
+      version: 1,
+      tasks: state.tasks.map((item) => item.id === task.id ? task : item)
+    },
+    task
+  };
+}
 function updateJournalTask(state, id, patch, now) {
   const task = state.tasks.find((item) => item.id === id);
   if (!task)
@@ -23093,14 +23115,7 @@ function updateJournalTask(state, id, patch, now) {
     else
       delete next.journal_entry_id;
   }
-  return {
-    ok: true,
-    state: {
-      version: 1,
-      tasks: state.tasks.map((item) => item.id === id ? next : item)
-    },
-    task: next
-  };
+  return journalTaskResult(state, next);
 }
 function moveJournalTask(state, id, input, now) {
   const source = state.tasks.find((task) => task.id === id);
@@ -23210,8 +23225,7 @@ function claimJournalTask(state, id, input, now) {
   if (!task)
     return { ok: false, error: "task not found" };
   const nowMs = Date.parse(now);
-  const activeClaim = task.claim && Number.isFinite(Date.parse(task.claim.lease_expires_at)) && Date.parse(task.claim.lease_expires_at) > nowMs;
-  if (activeClaim)
+  if (taskClaimActive(task, nowMs))
     return { ok: false, error: "task is already claimed" };
   if (task.status !== "todo" && task.status !== "doing")
     return {
@@ -23222,12 +23236,9 @@ function claimJournalTask(state, id, input, now) {
   const wipLimit = input.wip_limit;
   if (wipLimit !== undefined && wipLimit > 0) {
     const activeDoing = state.tasks.filter((item) => {
-      if (item.status !== "doing" || !item.claim)
-        return false;
-      if (item.claim.by !== by)
+      if (item.status !== "doing" || item.claim?.by !== by)
         return false;
-      const expires = Date.parse(item.claim.lease_expires_at);
-      return Number.isFinite(expires) && expires > nowMs;
+      return taskClaimActive(item, nowMs);
     }).length;
     if (activeDoing >= wipLimit)
       return { ok: false, error: "WIP limit reached" };
@@ -23244,14 +23255,7 @@ function claimJournalTask(state, id, input, now) {
       lease_expires_at: leaseExpiresAt
     }
   };
-  return {
-    ok: true,
-    state: {
-      version: 1,
-      tasks: state.tasks.map((item) => item.id === id ? next : item)
-    },
-    task: next
-  };
+  return journalTaskResult(state, next);
 }
 function completeJournalTask(state, id, input, now, makeId3 = makeJournalId) {
   const task = state.tasks.find((item) => item.id === id);
@@ -23260,8 +23264,7 @@ function completeJournalTask(state, id, input, now, makeId3 = makeJournalId) {
   if (task.status !== "doing")
     return { ok: false, error: "only doing tasks can be completed" };
   const nowMs = Date.parse(now);
-  const activeClaim = task.claim && Number.isFinite(Date.parse(task.claim.lease_expires_at)) && Date.parse(task.claim.lease_expires_at) > nowMs;
-  if (!activeClaim)
+  if (!taskClaimActive(task, nowMs))
     return { ok: false, error: "task must be claimed before completion" };
   const by = optionalString4(input.by, 128);
   if (!by)
@@ -23291,14 +23294,7 @@ function completeJournalTask(state, id, input, now, makeId3 = makeJournalId) {
     ...notes.length ? { notes } : {}
   };
   delete next.claim;
-  return {
-    ok: true,
-    state: {
-      version: 1,
-      tasks: state.tasks.map((item) => item.id === id ? next : item)
-    },
-    task: next
-  };
+  return journalTaskResult(state, next);
 }
 function deleteJournalTask(state, id) {
   const tasks = state.tasks.filter((task) => task.id !== id);