@oevery/rsp 3.3.0 → 4.1.0

package/dist/client-EHRWH5Q7.mjs

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+import {
+  discoverService,
+  serviceRequest,
+  viewerRuntime
+} from "./chunk-U56XMIOO.mjs";
+import "./chunk-P3KO3GZW.mjs";
+
+// src/viewer/client.ts
+import { spawn } from "child_process";
+import { randomBytes } from "crypto";
+import { chmod, mkdir, readFile, realpath, rm, stat, writeFile } from "fs/promises";
+import { join } from "path";
+import { setTimeout as delay } from "timers/promises";
+async function startService() {
+  const runtime = await viewerRuntime();
+  await mkdir(runtime.directory, { recursive: true, mode: 448 });
+  await chmod(runtime.directory, 448);
+  for (let attempt = 0; attempt < 100; attempt++) {
+    const existing = await discoverService(runtime.recordPath, runtime.identity);
+    if (existing)
+      return existing;
+    try {
+      await mkdir(runtime.lockPath, { mode: 448 });
+    } catch (error) {
+      if (error.code !== "EEXIST")
+        throw error;
+      try {
+        const pid = Number(await readFile(join(runtime.lockPath, "pid"), "utf8"));
+        if (Number.isInteger(pid) && pid > 0) {
+          try {
+            process.kill(pid, 0);
+          } catch (dead) {
+            if (dead.code === "ESRCH")
+              await rm(runtime.lockPath, { recursive: true, force: true });
+          }
+        }
+      } catch {
+        try {
+          if (Date.now() - (await stat(runtime.lockPath)).mtimeMs > 1e4)
+            await rm(runtime.lockPath, { recursive: true, force: true });
+        } catch {
+        }
+      }
+      await delay(150);
+      continue;
+    }
+    try {
+      await writeFile(join(runtime.lockPath, "pid"), String(process.pid), { mode: 384 });
+      const current = await discoverService(runtime.recordPath, runtime.identity);
+      if (current)
+        return current;
+      const child = spawn(process.execPath, [join(runtime.root, "dist/viewer-service.mjs")], { detached: true, stdio: "ignore", env: { ...process.env, RSP_VIEWER_BOOT: JSON.stringify({ ...runtime, adminToken: randomBytes(32).toString("hex"), readToken: randomBytes(32).toString("hex") }) } });
+      child.unref();
+      let spawnError;
+      child.on("error", (error) => {
+        spawnError = error;
+      });
+      for (let poll = 0; poll < 100; poll++) {
+        if (spawnError)
+          throw spawnError;
+        const record = await discoverService(runtime.recordPath, runtime.identity);
+        if (record)
+          return record;
+        await delay(100);
+      }
+      throw new Error("Viewer service did not become ready; rebuild this package and retry");
+    } finally {
+      await rm(runtime.lockPath, { recursive: true, force: true });
+    }
+  }
+  throw new Error("Another viewer startup has not completed; retry after it exits");
+}
+async function runView(action, open = true) {
+  if (action && !["status", "stop"].includes(action))
+    throw new Error("rsp view accepts only status, stop, or --no-open");
+  const runtime = await viewerRuntime();
+  if (action) {
+    const service2 = await discoverService(runtime.recordPath, runtime.identity);
+    if (!service2) {
+      console.log("Viewer service is not running for this runtime.");
+      return;
+    }
+    if (action === "stop") {
+      await serviceRequest(service2, "/control/stop", {});
+      for (let attempt = 0; attempt < 25 && await discoverService(runtime.recordPath, runtime.identity); attempt++)
+        await delay(40);
+      console.log("Viewer stopped; all workspaces in this runtime are disconnected.");
+      return;
+    }
+    const status = await serviceRequest(service2, "/control/status");
+    console.log(JSON.stringify({ runtime: runtime.identity, pid: status.pid, port: status.port, workspaces: status.workspaces }, null, 2));
+    return;
+  }
+  const service = await startService();
+  const registered = await serviceRequest(service, "/control/register", { root: await realpath(process.cwd()) }, 3e4);
+  const url = `http://127.0.0.1:${service.port}/?workspace=${registered.workspace}#token=${service.readToken}`;
+  console.log(url);
+  if (open) {
+    const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "explorer.exe" : "xdg-open";
+    const browser = spawn(command, [url], { detached: true, stdio: "ignore" });
+    browser.on("error", () => console.error("Could not open browser; use the printed URL."));
+    browser.unref();
+  }
+}
+export {
+  runView
+};

package/dist/{entry-GIDNR7CJ.mjs → entry-NDASTAI5.mjs}

@@ -1,14 +1,10 @@
 #!/usr/bin/env node
 import {
   ArchiveHistoryError,
-  SPECS_DEFAULT_RESULT_LIMIT,
-  SPECS_SEARCH_EXCERPT_CODE_POINTS,
   WorkRefError,
   historyInspectionComplete,
   inspectArchiveHistory,
   inspectProjectStatus,
-  inspectSpecs,
-  normalizeLogicalPath,
   projectDependencyForest,
   projectSpecsDetail,
   projectSpecsSearch,
@@ -17,16 +13,19 @@ import {
   readArchiveHistoryDetail,
   readArchiveHistoryDocument,
   resolveWorkRefPath
-} from "./chunk-TSUDEX5Y.mjs";
+} from "./chunk-VDRXFKBP.mjs";
 import {
-  displayWidth,
-  openTerminalSession,
-  truncateDisplay,
-  wrapDisplay
-} from "./chunk-JOMFFQRG.mjs";
+  SPECS_DEFAULT_RESULT_LIMIT,
+  SPECS_SEARCH_EXCERPT_CODE_POINTS,
+  inspectSpecs,
+  normalizeLogicalPath
+} from "./chunk-LGDCIQYL.mjs";
 import {
-  CHANGES_DIR
-} from "./chunk-7HXQNBIG.mjs";
+  CHANGES_DIR,
+  isMarkdownComment,
+  markdownText,
+  parseMarkdown
+} from "./chunk-P3KO3GZW.mjs";
 
 // src/tui/entry.tsx
 import process from "process";
@@ -37,6 +36,81 @@ import React from "react";
 import { Box as Box3, Text as Text3, useApp, useInput, useStdout } from "ink";
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
 
+// src/tui/display.ts
+var segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+function isWide(codePoint) {
+  return codePoint >= 4352 && (codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || codePoint >= 11904 && codePoint <= 42191 && codePoint !== 12351 || codePoint >= 44032 && codePoint <= 55203 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65040 && codePoint <= 65049 || codePoint >= 65072 && codePoint <= 65135 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127744 && codePoint <= 129791 || codePoint >= 131072 && codePoint <= 262141);
+}
+function displayWidth(value) {
+  let width = 0;
+  for (const { segment } of segmenter.segment(value)) {
+    const codePoint = segment.codePointAt(0) ?? 0;
+    if (/^\p{Mark}$/u.test(segment) || codePoint === 8205)
+      continue;
+    width += isWide(codePoint) ? 2 : 1;
+  }
+  return width;
+}
+function truncateDisplay(value, maxWidth) {
+  if (displayWidth(value) <= maxWidth)
+    return value;
+  if (maxWidth <= 1)
+    return "\u2026".slice(0, maxWidth);
+  let result = "";
+  for (const { segment } of segmenter.segment(value)) {
+    if (displayWidth(result + segment) > maxWidth - 1)
+      break;
+    result += segment;
+  }
+  return `${result}\u2026`;
+}
+function wrapDisplay(value, maxWidth, firstPrefix = "", continuationPrefix = firstPrefix) {
+  const width = Math.max(1, maxWidth);
+  if (displayWidth(firstPrefix) >= width)
+    return [truncateDisplay(`${firstPrefix}${value}`, width)];
+  const lines = [];
+  let prefix = firstPrefix;
+  let line = prefix;
+  const pushLine = () => {
+    lines.push(line);
+    prefix = continuationPrefix;
+    line = prefix;
+  };
+  const appendUnbroken = (token) => {
+    for (const { segment } of segmenter.segment(token)) {
+      if (displayWidth(line + segment) > width && line !== prefix)
+        pushLine();
+      if (displayWidth(line + segment) > width) {
+        lines.push(truncateDisplay(line + segment, width));
+        prefix = continuationPrefix;
+        line = prefix;
+        continue;
+      }
+      line += segment;
+    }
+  };
+  let pendingWhitespace = "";
+  for (const token of value.split(/(\s+)/u).filter(Boolean)) {
+    if (token.trim().length === 0) {
+      if (line !== prefix)
+        pendingWhitespace += token;
+      continue;
+    }
+    const separator = line === prefix ? "" : pendingWhitespace;
+    if (displayWidth(line + separator + token) <= width) {
+      line += `${separator}${token}`;
+    } else {
+      if (line !== prefix && separator)
+        pushLine();
+      appendUnbroken(token);
+    }
+    pendingWhitespace = "";
+  }
+  if (line !== prefix || lines.length === 0)
+    lines.push(line);
+  return lines;
+}
+
 // src/tui/history-display.ts
 function formatHistoryRow(record, width) {
   const boundedWidth = Math.max(1, width);
@@ -138,18 +212,17 @@ function projectHistoryEvidence(evidence, options) {
 }
 
 // src/tui/markdown-presentation.ts
-import { fromMarkdown } from "mdast-util-from-markdown";
-import { gfmFromMarkdown } from "mdast-util-gfm";
-import { gfm } from "micromark-extension-gfm";
 var EMPTY_LINE = { spans: [{ text: "" }] };
 var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function markdownLineText(line) {
   return line.spans.map((span) => span.text).join("");
 }
 function projectMarkdownLines(content, width) {
-  const root = fromMarkdown(sanitizeMarkdown(stripFrontmatter(content)), { extensions: [gfm()], mdastExtensions: [gfmFromMarkdown()] });
+  const root = parseMarkdown(sanitizeMarkdown(content)).root;
   const logical = [];
   root.children.forEach((node, index) => {
+    if (node.type === "yaml" || isMarkdownComment(node))
+      return;
     if (index > 0 && logical.length > 0 && markdownLineText(logical.at(-1)) !== "")
       logical.push(EMPTY_LINE);
     logical.push(...projectBlock(node, 0, Math.max(1, width)));
@@ -173,9 +246,6 @@ function projectMarkdownLineViewport(lines, options) {
     hasNext: end < lines.length
   };
 }
-function stripFrontmatter(content) {
-  return content.replace(/^---\r?\n[\s\S]*?\r?\n(?:---|\.\.\.)\r?\n/u, "");
-}
 function sanitizeMarkdown(value) {
   let result = "";
   for (let index = 0; index < value.length; index++) {
@@ -222,7 +292,7 @@ function projectBlock(node, depth, width) {
     case "table":
       return projectTable(node, width);
     case "html":
-      return [metavariableLine(node.value) ?? { spans: [{ text: node.value, dim: true }] }];
+      return [metavariableLine(node.value) ?? { spans: [{ text: markdownText(node).trim(), dim: true }] }];
     default:
       return "children" in node ? inlineLines(node.children.filter((child) => isPhrasing(child))) : [];
   }
@@ -263,11 +333,13 @@ function inlineLines(children, style = {}, prefix = "") {
   return lines;
 }
 function projectInline(node, inherited) {
+  if (isMarkdownComment(node))
+    return [];
   switch (node.type) {
     case "text":
       return [{ text: node.value, ...inherited }];
     case "html":
-      return metavariableSpan(node.value, inherited) ?? [{ text: node.value, ...inherited, dim: true }];
+      return metavariableSpan(node.value, inherited) ?? [{ text: markdownText(node), ...inherited, dim: true }];
     case "inlineCode":
       return [{ text: node.value, ...inherited, code: true, color: "cyan" }];
     case "break":
@@ -751,16 +823,8 @@ function projectItemDependencyForest(item, snapshot) {
   const forest = projectDependencyForest(snapshot.plan, roots);
   return item.type === "change" ? forest[0]?.children ?? [] : forest;
 }
-function projectExternalBlockers(item, snapshot) {
-  if (item.type !== "change")
-    return [];
-  const edges = snapshot.plan.edges.filter((edge) => edge.change === item.workRef);
-  return item.record.blockerEntries.filter((entry) => {
-    const dependency = entry.match(/^requires\s+`([^`]+)`:\s*(\S.*)$/i);
-    if (!dependency)
-      return true;
-    return !edges.some((edge) => edge.requires === dependency[1] && edge.reason === dependency[2]);
-  });
+function projectExternalBlockers(item) {
+  return item.type === "change" ? item.record.externalBlockers : [];
 }
 function projectNextAction(item, snapshot) {
   if (item.type === "history")
@@ -808,9 +872,7 @@ function projectWorkDetailLines(item, snapshot, messages, width) {
     add(messages.none);
   if (item.type === "group")
     add(`${messages.changes}: ${item.group.slices.length ? item.group.slices.map((slice) => `${slice.name} (${slice.state})`).join(", ") : messages.none}`);
-  const external = projectExternalBlockers(item, snapshot);
-  const blockers = external.length ? external.join("; ") : item.type === "group" && item.group.blockers || snapshot.plan.blocked.some((blocked) => blocked.change === item.workRef && blocked.external) ? messages.yes : messages.none;
-  add(`${messages.blockers}: ${blockers}`);
+  add(`${messages.blockers}: ${blockersLabel(item, snapshot, messages)}`);
   const next = projectNextAction(item, snapshot);
   add(`${next.kind === "command" ? messages.nextCommand : next.kind === "blocked" ? messages.nextAction : messages.reviewGroupBrief}: ${next.kind === "blocked" ? messages.awaitingOwnerDecision : next.value}`);
   return lines;
@@ -821,6 +883,13 @@ function workStateLabel(item, snapshot, messages) {
   const state = projectItemState(item, snapshot);
   return (state.focused ? [messages.focused, messages[state.execution]] : [messages[state.execution]]).join(" \xB7 ");
 }
+function blockersLabel(item, snapshot, messages) {
+  const external = projectExternalBlockers(item);
+  if (external.length)
+    return external.join("; ");
+  const inherited = item.type === "group" && item.group.blockers || snapshot.plan.blocked.some((blocked) => blocked.change === item.workRef && blocked.external);
+  return inherited ? messages.yes : messages.none;
+}
 function dependencySymbol(node, snapshot) {
   if (snapshot.focused.includes(node.name))
     return "\u25CE";
@@ -861,9 +930,8 @@ function WorkDetail({ expanded, item, messages, snapshot, width }) {
   if (!item || item.type === "history")
     return /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: messages.noWork });
   const forest = projectItemDependencyForest(item, snapshot);
-  const externalBlockers = projectExternalBlockers(item, snapshot);
   const nextAction = projectNextAction(item, snapshot);
-  const blockers = externalBlockers.length ? externalBlockers.join("; ") : item.type === "group" && item.group.blockers || snapshot.plan.blocked.some((blocked) => blocked.change === item.workRef && blocked.external) ? messages.yes : messages.none;
+  const blockers = blockersLabel(item, snapshot, messages);
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", paddingLeft: 1, width, children: [
     /* @__PURE__ */ jsxs2(Text2, { bold: true, children: [
       messages.detail,
@@ -982,10 +1050,16 @@ function scopeNavigation(scope, messages, width) {
   const navigation = labels.map(([candidate, label]) => candidate === scope ? `[${label}]` : label).join(" ");
   return truncateDisplay(`${messages.title}  ${navigation}`, width);
 }
+function terminalDimensions(stdout) {
+  return {
+    width: "columns" in stdout && typeof stdout.columns === "number" ? stdout.columns : 80,
+    height: "rows" in stdout && typeof stdout.rows === "number" ? stdout.rows : 24
+  };
+}
 function DashboardApp({ initialDimensions, initialSnapshot, inspectHistory, inspectHistoryDetail, inspectHistoryDocument, inspectStatus, messages, specsSource, workSource }) {
   const { exit } = useApp();
   const { stdout } = useStdout();
-  const dimensions = initialDimensions ?? { width: stdout.columns ?? 80, height: stdout.rows ?? 24 };
+  const dimensions = initialDimensions ?? terminalDimensions(stdout);
   const [state, dispatch] = useReducer(reduceDashboard, initialDashboardState(initialSnapshot, dimensions));
   const filterRefs = useRef({ work: "", specs: "", history: "" });
   const refreshing = useRef(false);
@@ -1182,7 +1256,7 @@ function DashboardApp({ initialDimensions, initialSnapshot, inspectHistory, insp
     }
   }, [detailDocumentState, inspectHistoryDocument, selected, state.scope, workSource]);
   useEffect(() => {
-    const resize = () => dispatch({ type: "resize", width: stdout.columns ?? 80, height: stdout.rows ?? 24 });
+    const resize = () => dispatch({ type: "resize", ...terminalDimensions(stdout) });
     stdout.on("resize", resize);
     return () => {
       stdout.off("resize", resize);
@@ -1655,6 +1729,22 @@ function createTuiSpecsSource(dependencies = defaultDependencies2) {
   };
 }
 
+// src/tui/terminal.ts
+function openTerminalSession(stdout, options) {
+  let cleaned = false;
+  if (!options.screenReader)
+    stdout.write("\x1B[?1049h\x1B[?25l");
+  return {
+    cleanup() {
+      if (cleaned)
+        return;
+      cleaned = true;
+      if (!options.screenReader)
+        stdout.write("\x1B[?25h\x1B[?1049l");
+    }
+  };
+}
+
 // src/tui/work-source.ts
 import { Buffer } from "buffer";
 import { constants } from "fs";