march-cli 0.1.21 → 0.1.22

package/src/agent/editing/diff-format.mjs

@@ -1,57 +1,57 @@
-export function formatDiff(oldText, newText, { startLine = 1 } = {}) {
-  if (oldText === "") return newText === "" ? [] : newText.split("\n").map((text, i) => ({ type: "add", text, lineNum: startLine + i }));
-  if (newText === "") return oldText.split("\n").map((text, i) => ({ type: "del", text, lineNum: startLine + i }));
-  const oldLines = oldText.split("\n");
-  const newLines = newText.split("\n");
-
-  let prefix = 0;
-  while (prefix < oldLines.length && prefix < newLines.length && oldLines[prefix] === newLines[prefix]) prefix++;
-
-  let suffix = 0;
-  while (
-    suffix < oldLines.length - prefix &&
-    suffix < newLines.length - prefix &&
-    oldLines[oldLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]
-  ) {
-    suffix++;
-  }
-
-  const ctx = 3;
-  const result = [];
-  const ctxStart = Math.max(0, prefix - ctx);
-  for (let i = ctxStart; i < prefix; i++) result.push({ type: "ctx", text: oldLines[i], lineNum: startLine + i });
-
-  const oldEnd = oldLines.length - suffix;
-  for (let i = prefix; i < oldEnd; i++) result.push({ type: "del", text: oldLines[i], lineNum: startLine + i });
-
-  const newEnd = newLines.length - suffix;
-  for (let i = prefix; i < newEnd; i++) result.push({ type: "add", text: newLines[i], lineNum: startLine + i });
-
-  const postStart = oldLines.length - suffix;
-  const postEnd = Math.min(oldLines.length, postStart + ctx);
-  for (let i = postStart; i < postEnd; i++) result.push({ type: "ctx", text: oldLines[i], lineNum: startLine + i });
-  return result;
-}
-
-export function countDiffChanges(diffLines) {
-  let adds = 0, dels = 0;
-  for (const line of diffLines) {
-    if (line.type === "add") adds++;
-    if (line.type === "del") dels++;
-  }
-  return { adds, dels };
-}
-
-export function formatAppliedDiff(edits) {
-  const lines = ["[diff]"];
-  for (const edit of edits) {
-    const oldLineCount = edit.oldText.split("\n").length;
-    lines.push(`@@ lines ${edit.startLine}-${edit.startLine + oldLineCount - 1} @@`);
-    for (const line of formatDiff(edit.oldText, edit.newText, { startLine: edit.startLine })) {
-      if (line.type === "ctx") lines.push(` ${line.lineNum}: ${line.text}`);
-      if (line.type === "del") lines.push(`-${line.lineNum}: ${line.text}`);
-      if (line.type === "add") lines.push(`+${line.lineNum}: ${line.text}`);
-    }
-  }
-  return lines.join("\n");
-}
+export function formatDiff(oldText, newText, { startLine = 1 } = {}) {
+  if (oldText === "") return newText === "" ? [] : newText.split("\n").map((text, i) => ({ type: "add", text, lineNum: startLine + i }));
+  if (newText === "") return oldText.split("\n").map((text, i) => ({ type: "del", text, lineNum: startLine + i }));
+  const oldLines = oldText.split("\n");
+  const newLines = newText.split("\n");
+
+  let prefix = 0;
+  while (prefix < oldLines.length && prefix < newLines.length && oldLines[prefix] === newLines[prefix]) prefix++;
+
+  let suffix = 0;
+  while (
+    suffix < oldLines.length - prefix &&
+    suffix < newLines.length - prefix &&
+    oldLines[oldLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]
+  ) {
+    suffix++;
+  }
+
+  const ctx = 3;
+  const result = [];
+  const ctxStart = Math.max(0, prefix - ctx);
+  for (let i = ctxStart; i < prefix; i++) result.push({ type: "ctx", text: oldLines[i], lineNum: startLine + i });
+
+  const oldEnd = oldLines.length - suffix;
+  for (let i = prefix; i < oldEnd; i++) result.push({ type: "del", text: oldLines[i], lineNum: startLine + i });
+
+  const newEnd = newLines.length - suffix;
+  for (let i = prefix; i < newEnd; i++) result.push({ type: "add", text: newLines[i], lineNum: startLine + i });
+
+  const postStart = oldLines.length - suffix;
+  const postEnd = Math.min(oldLines.length, postStart + ctx);
+  for (let i = postStart; i < postEnd; i++) result.push({ type: "ctx", text: oldLines[i], lineNum: startLine + i });
+  return result;
+}
+
+export function countDiffChanges(diffLines) {
+  let adds = 0, dels = 0;
+  for (const line of diffLines) {
+    if (line.type === "add") adds++;
+    if (line.type === "del") dels++;
+  }
+  return { adds, dels };
+}
+
+export function formatAppliedDiff(edits) {
+  const lines = ["[diff]"];
+  for (const edit of edits) {
+    const oldLineCount = edit.oldText.split("\n").length;
+    lines.push(`@@ lines ${edit.startLine}-${edit.startLine + oldLineCount - 1} @@`);
+    for (const line of formatDiff(edit.oldText, edit.newText, { startLine: edit.startLine })) {
+      if (line.type === "ctx") lines.push(` ${line.lineNum}: ${line.text}`);
+      if (line.type === "del") lines.push(`-${line.lineNum}: ${line.text}`);
+      if (line.type === "add") lines.push(`+${line.lineNum}: ${line.text}`);
+    }
+  }
+  return lines.join("\n");
+}

package/src/agent/editing/lsp-report.mjs

@@ -1,69 +1,69 @@
-import { formatLspDiagnosticsForPath } from "../../lsp/diagnostics-format.mjs";
-import { sameLspPath } from "../../lsp/path-match.mjs";
-
-export async function waitForLspReport({ lspService, path, lspResult, since = Date.now(), timeoutMs = 3000, intervalMs = 150 }) {
-  const immediate = formatLspResultMessage(lspResult);
-  if (!lspService?.snapshot || !path || lspResult?.status === "unsupported") return immediate;
-  if (lspResult?.status === "unavailable" || lspResult?.status === "failed") return immediate;
-
-  const deadline = Date.now() + timeoutMs;
-  for (;;) {
-    const snapshot = lspService.snapshot();
-    const diagnostics = formatCurrentLspDiagnosticsForPath({ snapshot, path, since });
-    if (diagnostics) return diagnostics;
-    if (hasCurrentDiagnosticPublish({ snapshot, path, since })) return formatNoLspDiagnostics({ snapshot });
-
-    const remaining = deadline - Date.now();
-    if (remaining <= 0) return formatLatestLspMessage({ snapshot, lspResult });
-    await sleep(Math.min(intervalMs, remaining));
-  }
-}
-
-function formatLspResultMessage(result, { timedOut = false } = {}) {
-  if (!result || result.status === "unsupported") return "";
-  if (result.status === "unavailable" || result.status === "failed") {
-    return `<lsp status="${result.status}" server="${result.id ?? "unknown"}">${result.reason ?? "unavailable"}</lsp>`;
-  }
-  if (result.status === "starting") {
-    const detail = timedOut ? "diagnostics still pending; server continues in background" : "diagnostics pending";
-    return `<lsp status="starting" server="${result.id}">${detail}</lsp>`;
-  }
-  return "";
-}
-
-function formatCurrentLspDiagnosticsForPath({ snapshot, path, since }) {
-  const diagnostics = formatLspDiagnosticsForPath({ snapshot, path });
-  if (!diagnostics) return "";
-  if (!Array.isArray(snapshot?.files)) return diagnostics;
-  return hasCurrentDiagnosticPublish({ snapshot, path, since }) ? diagnostics : "";
-}
-
-function hasCurrentDiagnosticPublish({ snapshot, path, since }) {
-  return (snapshot?.files ?? []).some((file) => sameLspPath(file.path, path) && (file.updatedAt ?? 0) >= since);
-}
-
-function formatNoLspDiagnostics({ snapshot }) {
-  const lines = ["[diagnostics]", "source: lsp"];
-  if (snapshot?.status) lines.push(`status: ${snapshot.status}`);
-  lines.push("summary: 0 diagnostics");
-  return lines.join("\n");
-}
-
-function formatLatestLspMessage({ snapshot, lspResult }) {
-  const server = latestServerForResult(snapshot, lspResult);
-  if (server?.status === "failed" || server?.status === "unavailable") {
-    return formatLspResultMessage({ ...lspResult, ...server });
-  }
-  if (server?.status === "idle" || server?.status === "ready") return formatNoLspDiagnostics({ snapshot });
-  return formatLspResultMessage(lspResult, { timedOut: lspResult?.status === "starting" });
-}
-
-function latestServerForResult(snapshot, lspResult) {
-  const servers = snapshot?.servers ?? [];
-  return servers.find((server) => server.id === lspResult?.id && server.root === lspResult?.root)
-    ?? servers.find((server) => server.id === lspResult?.id);
-}
-
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+import { formatLspDiagnosticsForPath } from "../../lsp/diagnostics-format.mjs";
+import { sameLspPath } from "../../lsp/path-match.mjs";
+
+export async function waitForLspReport({ lspService, path, lspResult, since = Date.now(), timeoutMs = 3000, intervalMs = 150 }) {
+  const immediate = formatLspResultMessage(lspResult);
+  if (!lspService?.snapshot || !path || lspResult?.status === "unsupported") return immediate;
+  if (lspResult?.status === "unavailable" || lspResult?.status === "failed") return immediate;
+
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    const snapshot = lspService.snapshot();
+    const diagnostics = formatCurrentLspDiagnosticsForPath({ snapshot, path, since });
+    if (diagnostics) return diagnostics;
+    if (hasCurrentDiagnosticPublish({ snapshot, path, since })) return formatNoLspDiagnostics({ snapshot });
+
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) return formatLatestLspMessage({ snapshot, lspResult });
+    await sleep(Math.min(intervalMs, remaining));
+  }
+}
+
+function formatLspResultMessage(result, { timedOut = false } = {}) {
+  if (!result || result.status === "unsupported") return "";
+  if (result.status === "unavailable" || result.status === "failed") {
+    return `<lsp status="${result.status}" server="${result.id ?? "unknown"}">${result.reason ?? "unavailable"}</lsp>`;
+  }
+  if (result.status === "starting") {
+    const detail = timedOut ? "diagnostics still pending; server continues in background" : "diagnostics pending";
+    return `<lsp status="starting" server="${result.id}">${detail}</lsp>`;
+  }
+  return "";
+}
+
+function formatCurrentLspDiagnosticsForPath({ snapshot, path, since }) {
+  const diagnostics = formatLspDiagnosticsForPath({ snapshot, path });
+  if (!diagnostics) return "";
+  if (!Array.isArray(snapshot?.files)) return diagnostics;
+  return hasCurrentDiagnosticPublish({ snapshot, path, since }) ? diagnostics : "";
+}
+
+function hasCurrentDiagnosticPublish({ snapshot, path, since }) {
+  return (snapshot?.files ?? []).some((file) => sameLspPath(file.path, path) && (file.updatedAt ?? 0) >= since);
+}
+
+function formatNoLspDiagnostics({ snapshot }) {
+  const lines = ["[diagnostics]", "source: lsp"];
+  if (snapshot?.status) lines.push(`status: ${snapshot.status}`);
+  lines.push("summary: 0 diagnostics");
+  return lines.join("\n");
+}
+
+function formatLatestLspMessage({ snapshot, lspResult }) {
+  const server = latestServerForResult(snapshot, lspResult);
+  if (server?.status === "failed" || server?.status === "unavailable") {
+    return formatLspResultMessage({ ...lspResult, ...server });
+  }
+  if (server?.status === "idle" || server?.status === "ready") return formatNoLspDiagnostics({ snapshot });
+  return formatLspResultMessage(lspResult, { timedOut: lspResult?.status === "starting" });
+}
+
+function latestServerForResult(snapshot, lspResult) {
+  const servers = snapshot?.servers ?? [];
+  return servers.find((server) => server.id === lspResult?.id && server.root === lspResult?.root)
+    ?? servers.find((server) => server.id === lspResult?.id);
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}