@beignet/cli 0.0.49 → 0.0.51

package/src/git-changes.ts

@@ -0,0 +1,511 @@
+import { createHash } from "node:crypto";
+import type { Stats } from "node:fs";
+import { createReadStream } from "node:fs";
+import { lstat, readlink } from "node:fs/promises";
+import path from "node:path";
+import { spawnCommand } from "./db.js";
+
+const emptyTreeObjectIds = {
+  sha1: "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
+  sha256: "6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321",
+} as const;
+const maxGitOutputBytes = 64 * 1024 * 1024;
+
+type GitCommandResult = Omit<
+  Awaited<ReturnType<typeof spawnCommand>>,
+  "stderr" | "stdout"
+> & {
+  stderr: string;
+  stdout: string;
+};
+
+/** Git status values represented by changed-app mapping. */
+export type GitChangedFileStatus =
+  | "added"
+  | "copied"
+  | "deleted"
+  | "modified"
+  | "renamed"
+  | "type-changed"
+  | "unmerged"
+  | "unknown"
+  | "untracked";
+
+export type GitChangedFile = {
+  status: GitChangedFileStatus;
+  path: string;
+  oldPath?: string;
+};
+
+/** Resolved local Git comparison used by changed-app mapping. */
+export type GitChangeComparison =
+  | {
+      mode: "worktree";
+      comparisonCommit: string;
+      head?: string;
+    }
+  | {
+      mode: "base";
+      base: string;
+      baseCommit: string;
+      mergeBase: string;
+      head: string;
+    };
+
+export type GitChangeSet = {
+  repositoryRoot: string;
+  comparison: GitChangeComparison;
+  files: GitChangedFile[];
+};
+
+export async function readGitChangeSet(options: {
+  cwd: string;
+  base?: string;
+}): Promise<GitChangeSet> {
+  if (options.base !== undefined && options.base.length === 0) {
+    throw new Error("Git base must not be empty.");
+  }
+  const repositoryRoot = path.resolve(
+    await gitText(options.cwd, ["rev-parse", "--show-toplevel"]),
+  );
+  const head = await resolveHeadCommit(repositoryRoot);
+
+  let comparison: GitChangeComparison;
+  let comparisonCommit: string;
+  if (options.base !== undefined) {
+    if (!head) {
+      throw new Error(
+        `Cannot compare --base ${JSON.stringify(options.base)} because this repository does not have a HEAD commit.`,
+      );
+    }
+    const baseCommit = await gitText(repositoryRoot, [
+      "rev-parse",
+      "--verify",
+      "--end-of-options",
+      `${options.base}^{commit}`,
+    ]).catch(() => {
+      throw new Error(
+        `Could not resolve local Git base ${JSON.stringify(options.base)}. Fetch it before running Beignet; changed mapping never accesses the network.`,
+      );
+    });
+    const mergeBase = await gitText(repositoryRoot, [
+      "merge-base",
+      baseCommit,
+      head,
+    ]).catch(() => {
+      throw new Error(
+        `Could not find a merge base between ${JSON.stringify(options.base)} and HEAD.`,
+      );
+    });
+    comparisonCommit = mergeBase;
+    comparison = {
+      mode: "base",
+      base: options.base,
+      baseCommit,
+      mergeBase,
+      head,
+    };
+  } else {
+    comparisonCommit = head ?? (await emptyTreeObjectId(repositoryRoot));
+    comparison = {
+      mode: "worktree",
+      comparisonCommit,
+      ...(head ? { head } : {}),
+    };
+  }
+
+  const committed =
+    comparison.mode === "base"
+      ? await gitDiffOutput(repositoryRoot, [
+          comparison.mergeBase,
+          comparison.head,
+        ])
+      : "";
+  const staged = await gitDiffOutput(repositoryRoot, [
+    "--cached",
+    head ?? comparisonCommit,
+  ]);
+  const unstaged = await gitDiffOutput(repositoryRoot, []);
+  const untracked = await gitOutput(repositoryRoot, [
+    "ls-files",
+    "--others",
+    "--exclude-standard",
+    "-z",
+  ]);
+  const files = mergeChangedFiles(
+    parseNameStatus(committed),
+    parseNameStatus(staged),
+    parseNameStatus(unstaged),
+    parseUntracked(untracked),
+  );
+
+  return { repositoryRoot, comparison, files };
+}
+
+async function emptyTreeObjectId(repositoryRoot: string): Promise<string> {
+  const objectFormat =
+    (await tryGitText(repositoryRoot, [
+      "rev-parse",
+      "--show-object-format=storage",
+    ])) ?? "sha1";
+  const objectId =
+    emptyTreeObjectIds[objectFormat as keyof typeof emptyTreeObjectIds];
+  if (!objectId) {
+    throw new Error(
+      `Unsupported Git object format ${JSON.stringify(objectFormat)}.`,
+    );
+  }
+  return objectId;
+}
+
+export async function hashGitChanges(
+  changeSet: Pick<GitChangeSet, "comparison" | "files" | "repositoryRoot">,
+  files = changeSet.files,
+): Promise<string> {
+  const hash = createHash("sha256");
+  const indexEntries = await readGitIndexEntries(changeSet.repositoryRoot);
+  hash.update(JSON.stringify(changeSet.comparison));
+  hash.update("\0");
+
+  for (const file of [...files].sort(compareChangedFiles)) {
+    hash.update(
+      JSON.stringify({
+        status: file.status,
+        path: file.path,
+        oldPath: file.oldPath,
+      }),
+    );
+    hash.update("\0");
+    for (const relativePath of uniquePaths([file.path, file.oldPath])) {
+      hash.update(relativePath);
+      hash.update("\0index\0");
+      hash.update(indexEntries.get(relativePath) ?? "missing");
+      hash.update("\0worktree\0");
+      await hashCurrentPath(hash, changeSet.repositoryRoot, relativePath);
+      hash.update("\0");
+    }
+  }
+
+  return `sha256:${hash.digest("hex")}`;
+}
+
+async function readGitIndexEntries(
+  repositoryRoot: string,
+): Promise<Map<string, string>> {
+  const output = await gitOutput(repositoryRoot, ["ls-files", "--stage", "-z"]);
+  const entries = new Map<string, string[]>();
+  for (const field of output.split("\0").filter(Boolean)) {
+    const separator = field.indexOf("\t");
+    if (separator === -1) {
+      throw new Error("Git returned an incomplete index entry.");
+    }
+    const metadata = field.slice(0, separator);
+    const file = normalizeGitPath(field.slice(separator + 1));
+    const values = entries.get(file) ?? [];
+    values.push(metadata);
+    entries.set(file, values);
+  }
+  return new Map(
+    [...entries].map(([file, values]) => [file, [...values].sort().join("\0")]),
+  );
+}
+
+async function hashCurrentPath(
+  hash: ReturnType<typeof createHash>,
+  repositoryRoot: string,
+  relativePath: string,
+): Promise<void> {
+  const absolutePath = path.join(repositoryRoot, relativePath);
+  let stats: Stats;
+  try {
+    stats = await lstat(absolutePath);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+      hash.update("missing");
+      return;
+    }
+    throw error;
+  }
+
+  if (stats.isSymbolicLink()) {
+    hash.update("symlink\0");
+    hash.update(String(stats.mode));
+    hash.update("\0");
+    hash.update(await readlink(absolutePath));
+    return;
+  }
+  if (stats.isDirectory()) {
+    hash.update("directory\0");
+    const head = await tryGitText(absolutePath, [
+      "rev-parse",
+      "--verify",
+      "HEAD^{commit}",
+    ]);
+    const status = await tryGitOutput(absolutePath, [
+      "status",
+      "--porcelain=v1",
+      "-z",
+      "--untracked-files=all",
+    ]);
+    hash.update(head ?? "unknown-head");
+    hash.update("\0");
+    hash.update(status ?? "unknown-status");
+    return;
+  }
+  if (!stats.isFile()) {
+    hash.update("special");
+    return;
+  }
+
+  hash.update("file\0");
+  hash.update(String(stats.mode));
+  hash.update("\0");
+  for await (const chunk of createReadStream(absolutePath)) {
+    hash.update(chunk as Buffer);
+  }
+}
+
+function parseNameStatus(output: string): GitChangedFile[] {
+  if (!output) return [];
+  const fields = output.split("\0");
+  const files: GitChangedFile[] = [];
+  for (let index = 0; index < fields.length; ) {
+    const rawStatus = fields[index++];
+    if (!rawStatus) continue;
+    const status = changedFileStatus(rawStatus[0]);
+    if (status === "renamed" || status === "copied") {
+      const oldPath = fields[index++];
+      const nextPath = fields[index++];
+      if (!oldPath || !nextPath) {
+        throw new Error("Git returned an incomplete rename or copy record.");
+      }
+      files.push({
+        status,
+        oldPath: normalizeGitPath(oldPath),
+        path: normalizeGitPath(nextPath),
+      });
+      continue;
+    }
+    const file = fields[index++];
+    if (!file)
+      throw new Error("Git returned an incomplete changed-file record.");
+    files.push({ status, path: normalizeGitPath(file) });
+  }
+  return files;
+}
+
+function parseUntracked(output: string): GitChangedFile[] {
+  return output
+    .split("\0")
+    .filter(Boolean)
+    .map((file) => ({ status: "untracked", path: normalizeGitPath(file) }));
+}
+
+function mergeChangedFiles(...groups: GitChangedFile[][]): GitChangedFile[] {
+  const files = new Map<string, GitChangedFile>();
+  for (const group of groups) {
+    for (const file of group) {
+      if (file.status === "renamed" && file.oldPath) {
+        const source = files.get(file.oldPath);
+        if (source) {
+          files.delete(file.oldPath);
+          const composed = composeRename(source, file);
+          files.set(
+            composed.path,
+            mergeSameDestination(files.get(composed.path), composed),
+          );
+          continue;
+        }
+      }
+      files.set(file.path, mergeSameDestination(files.get(file.path), file));
+    }
+  }
+  return [...files.values()].sort(compareChangedFiles);
+}
+
+function composeRename(
+  source: GitChangedFile,
+  rename: GitChangedFile,
+): GitChangedFile {
+  if (source.status === "renamed" && source.oldPath) {
+    return rename.path === source.oldPath
+      ? source
+      : { status: "renamed", oldPath: source.oldPath, path: rename.path };
+  }
+  if (source.status === "copied" && source.oldPath) {
+    return { status: "copied", oldPath: source.oldPath, path: rename.path };
+  }
+  if (source.status === "added" || source.status === "untracked") {
+    return { status: source.status, path: rename.path };
+  }
+  return rename;
+}
+
+function mergeSameDestination(
+  previous: GitChangedFile | undefined,
+  next: GitChangedFile,
+): GitChangedFile {
+  if (
+    previous &&
+    (previous.status === "added" ||
+      previous.status === "copied" ||
+      previous.status === "renamed" ||
+      previous.status === "untracked") &&
+    next.status !== "unmerged" &&
+    next.status !== "unknown"
+  ) {
+    return previous;
+  }
+  return next;
+}
+
+function uniquePaths(paths: Array<string | undefined>): string[] {
+  return [...new Set(paths.filter((file): file is string => Boolean(file)))];
+}
+
+function changedFileStatus(status: string | undefined): GitChangedFileStatus {
+  switch (status) {
+    case "A":
+      return "added";
+    case "C":
+      return "copied";
+    case "D":
+      return "deleted";
+    case "M":
+      return "modified";
+    case "R":
+      return "renamed";
+    case "T":
+      return "type-changed";
+    case "U":
+      return "unmerged";
+    default:
+      return "unknown";
+  }
+}
+
+function compareChangedFiles(
+  left: GitChangedFile,
+  right: GitChangedFile,
+): number {
+  return `${left.path}\0${left.oldPath ?? ""}\0${left.status}`.localeCompare(
+    `${right.path}\0${right.oldPath ?? ""}\0${right.status}`,
+  );
+}
+
+function normalizeGitPath(file: string): string {
+  return process.platform === "win32" ? file.replaceAll("\\", "/") : file;
+}
+
+async function gitText(cwd: string, args: readonly string[]): Promise<string> {
+  return (await gitOutput(cwd, args)).trim();
+}
+
+async function resolveHeadCommit(
+  repositoryRoot: string,
+): Promise<string | undefined> {
+  const head = await runGit(repositoryRoot, [
+    "rev-parse",
+    "--verify",
+    "HEAD^{commit}",
+  ]);
+  if (head.exitCode === 0) return head.stdout.trim();
+
+  const symbolicHead = await runGit(repositoryRoot, [
+    "symbolic-ref",
+    "--quiet",
+    "HEAD",
+  ]);
+  if (symbolicHead.exitCode !== 0) {
+    throw gitCommandError(["rev-parse", "--verify", "HEAD^{commit}"], head);
+  }
+
+  const ref = symbolicHead.stdout.trim();
+  const refExists = await runGit(repositoryRoot, [
+    "show-ref",
+    "--verify",
+    "--quiet",
+    ref,
+  ]);
+  if (refExists.exitCode === 1) return undefined;
+  throw gitCommandError(["rev-parse", "--verify", "HEAD^{commit}"], head);
+}
+
+async function tryGitText(
+  cwd: string,
+  args: readonly string[],
+): Promise<string | undefined> {
+  try {
+    return await gitText(cwd, args);
+  } catch {
+    return undefined;
+  }
+}
+
+async function tryGitOutput(
+  cwd: string,
+  args: readonly string[],
+): Promise<string | undefined> {
+  try {
+    return await gitOutput(cwd, args);
+  } catch {
+    return undefined;
+  }
+}
+
+async function gitOutput(
+  cwd: string,
+  args: readonly string[],
+): Promise<string> {
+  const result = await runGit(cwd, args);
+  if (result.exitCode !== 0) throw gitCommandError(args, result);
+  return result.stdout;
+}
+
+async function runGit(
+  cwd: string,
+  args: readonly string[],
+): Promise<GitCommandResult> {
+  const result = await spawnCommand("git", args, cwd, {
+    captureOutput: true,
+    maxOutputBytes: maxGitOutputBytes,
+  });
+  if (result.outputTruncated) {
+    throw new Error(
+      `Git output exceeded ${maxGitOutputBytes} bytes; changed mapping cannot produce a complete report.`,
+    );
+  }
+  return {
+    ...result,
+    stdout: result.stdout ?? "",
+    stderr: result.stderr ?? "",
+  };
+}
+
+function gitCommandError(
+  args: readonly string[],
+  result: GitCommandResult,
+): Error {
+  const detail = result.stderr.trim() || result.stdout.trim();
+  return new Error(
+    `Git command failed: git ${args.join(" ")}${detail ? `\n${detail}` : ""}`,
+  );
+}
+
+async function gitDiffOutput(
+  repositoryRoot: string,
+  comparisonArgs: readonly string[],
+): Promise<string> {
+  return gitOutput(repositoryRoot, [
+    "diff",
+    "--no-ext-diff",
+    "--no-textconv",
+    "--name-status",
+    "-z",
+    "--find-renames=50%",
+    "--find-copies=50%",
+    "--find-copies-harder",
+    ...comparisonArgs,
+    "--",
+  ]);
+}

package/src/index.ts

@@ -8,6 +8,7 @@ import {
   type CommandContext,
   type FlagParametersForType,
   proposeCompletions,
+  type RouteMap,
   run,
   type StricliDynamicCommandContext,
   type StricliProcess,
@@ -120,6 +121,8 @@ type RoutesFlags = {
 type MapFlags = RoutesFlags & {
   feature?: string;
   kind?: readonly AppMapNodeKind[];
+  changed?: boolean;
+  base?: string;
 };
 
 type ExplainFlags = RoutesFlags;
@@ -178,6 +181,7 @@ type OutboxDrainFlags = {
   json?: boolean;
   module?: string;
   batchSize?: number;
+  concurrency?: number;
   cwd?: string;
 };
 
@@ -391,6 +395,15 @@ const routesFlagParameters = {
 
 const mapFlagParameters = {
   json: jsonFlag,
+  changed: {
+    kind: "boolean",
+    optional: true,
+    withNegated: false,
+    brief: "Map the current Git change set to potentially affected concepts.",
+  },
+  base: parsedStringFlag(
+    "Include committed changes since the merge base of this local Git ref. Requires --changed.",
+  ),
   feature: parsedStringFlag(
     "Project one feature and its direct relationships.",
   ),
@@ -475,7 +488,13 @@ const outboxDrainFlagParameters = {
     kind: "parsed",
     parse: parsePositiveInteger,
     optional: true,
-    brief: "Maximum messages to claim in one drain pass.",
+    brief: "Maximum eligible messages to handle in one drain pass.",
+  },
+  concurrency: {
+    kind: "parsed",
+    parse: parsePositiveInteger,
+    optional: true,
+    brief: "Maximum concurrent deliveries; values above one are unordered.",
   },
   cwd: cwdFlag,
 } satisfies FlagParametersForType<OutboxDrainFlags, CliContext>;
@@ -889,7 +908,7 @@ const mapCommand = buildCommand<MapFlags, [], CliContext>({
   docs: {
     brief: "Map the app's architecture and registered workflows.",
     fullDescription:
-      "Build a deterministic graph of features, HTTP contracts, routes, use cases, policies, workflows, ports, providers, OpenAPI, tests, dependencies, and doctor findings.",
+      "Build a deterministic graph of features, HTTP contracts, routes, use cases, policies, workflows, ports, providers, OpenAPI, tests, dependencies, and doctor findings. Use --changed for a bounded, report-only semantic map of the current Git change set.",
   },
   parameters: {
     flags: mapFlagParameters,
@@ -898,8 +917,35 @@ const mapCommand = buildCommand<MapFlags, [], CliContext>({
     const { formatAppMap, mapApp, projectAppMap } = await import(
       "./app-map.js"
     );
+    const { formatAppChangeImpact, mapAppChanges } = await import(
+      "./app-map-changes.js"
+    );
 
     return async function runMap(this: CliContext, flags: MapFlags) {
+      if (flags.base !== undefined && !flags.changed) {
+        throw new Error("map --base requires --changed.");
+      }
+      if (
+        flags.changed &&
+        (flags.feature !== undefined || flags.kind !== undefined)
+      ) {
+        throw new Error(
+          "map --changed cannot be combined with --feature or --kind.",
+        );
+      }
+      if (flags.changed) {
+        const changed = await mapAppChanges({
+          cwd: flags.cwd,
+          base: flags.base,
+        });
+        writeOutput(
+          this,
+          flags.json
+            ? JSON.stringify(changed, null, 2)
+            : formatAppChangeImpact(changed),
+        );
+        return;
+      }
       const result = projectAppMap(
         await mapApp({ cwd: flags.cwd, strict: true }),
         {
@@ -1559,6 +1605,7 @@ const outboxDrainCommand = buildCommand<OutboxDrainFlags, [], CliContext>({
         cwd: flags.cwd,
         modulePath: flags.module,
         batchSize: flags.batchSize,
+        concurrency: flags.concurrency,
       });
 
       writeOutput(
@@ -1567,6 +1614,9 @@ const outboxDrainCommand = buildCommand<OutboxDrainFlags, [], CliContext>({
           ? JSON.stringify(result, null, 2)
           : outboxDrainNextSteps(result),
       );
+      if (result.result.settlementFailed > 0 || result.result.leaseLost > 0) {
+        this.process.exitCode = 1;
+      }
     };
   },
 });
@@ -2410,6 +2460,27 @@ Run npm create beignet@latest (or bun create beignet) to scaffold a new app.`,
   },
 });
 
+const completionProposalCommandPath = ["completion", "propose"] as const;
+
+function commandPathsFromRouteMap(
+  routeMap: RouteMap<CliContext>,
+  prefix: readonly string[] = [],
+): string[][] {
+  return routeMap.getAllEntries().flatMap((entry) => {
+    const path = [...prefix, entry.name["convert-camel-to-kebab"]];
+    if ("getAllEntries" in entry.target) {
+      return commandPathsFromRouteMap(entry.target, path);
+    }
+    return [path];
+  });
+}
+
+/** Every canonical CLI command path, derived from runtime routing definitions. */
+export const cliCommandPaths: readonly (readonly string[])[] = [
+  ...commandPathsFromRouteMap(rootRoutes),
+  completionProposalCommandPath,
+].sort((left, right) => left.join(" ").localeCompare(right.join(" ")));
+
 const cli = buildApplication(rootRoutes, {
   name: "beignet",
   versionInfo: {
@@ -2503,6 +2574,9 @@ type OutboxDrainNextStepsResult = {
     delivered: number;
     retried: number;
     deadLettered: number;
+    abandonedDeadLettered: number;
+    settlementFailed: number;
+    leaseLost: number;
   };
 };
 
@@ -2570,7 +2644,10 @@ Result:
   claimed: ${result.result.claimed}
   delivered: ${result.result.delivered}
   retried: ${result.result.retried}
-  deadLettered: ${result.result.deadLettered}`;
+  deadLettered: ${result.result.deadLettered}
+  abandonedDeadLettered: ${result.result.abandonedDeadLettered}
+  settlementFailed: ${result.result.settlementFailed}
+  leaseLost: ${result.result.leaseLost}`;
 }
 
 function formatOutboxDate(value: Date | string | null | undefined): string {
@@ -3015,7 +3092,10 @@ export async function main(
   // Shell completion scripts call `beignet completion propose <words...>`.
   // Handle it before stricli parses the inputs: the trailing words are a
   // partial command line, not flags for this CLI.
-  if (inputs[0] === "completion" && inputs[1] === "propose") {
+  if (
+    inputs[0] === completionProposalCommandPath[0] &&
+    inputs[1] === completionProposalCommandPath[1]
+  ) {
     await writeCompletionProposals(inputs.slice(2), context);
     return;
   }