@jwilger/pi-development-system 0.8.5 → 0.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilger/pi-development-system",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "A pi extension package representing a seasoned approach to software development using a full AI SDLC.",
   "keywords": [
     "pi-package"

package/src/core/commit-command.ts

@@ -1,5 +1,6 @@
 import { splitLines } from "./git-intent.ts";
-import { resolveGit } from "./git-invocations.ts";
+import { opaqueMentions, resolveGit } from "./git-invocations.ts";
+import { stripHeredocs } from "./heredoc.ts";
 
 export type CommitExtraction =
   | { readonly kind: "not-commit" }
@@ -7,22 +8,6 @@ export type CommitExtraction =
   | { readonly kind: "file"; readonly path: string }
   | { readonly kind: "unknown"; readonly trailers: readonly string[] };
 
-const HEREDOC =
-  /<<-?[ \t]*(['"]?)([A-Za-z_][A-Za-z0-9_]*)\1([^\n]*)\n([\s\S]*?)\n[ \t]*\2[ \t]*(?:\n|$)/g;
-
-/**
- * Heredoc bodies are data: take them out so their quotes cannot confuse line splitting. The rest of
- * the opening line stays (`| git commit -F -`) with a `#HD<n>` marker naming the removed body.
- */
-function stripHeredocs(command: string): { rest: string; bodies: string[] } {
-  const bodies: string[] = [];
-  const rest = command.replace(HEREDOC, (...m: unknown[]) => {
-    bodies.push(String(m[4]).trim());
-    return `${String(m[3])} #HD${bodies.length - 1}\n`;
-  });
-  return { rest, bodies };
-}
-
 type Options = {
   messages: string[];
   trailers: string[];
@@ -135,7 +120,7 @@ export function extractCommits(command: string): CommitExtraction[] {
   const found = resolution.invocations.flatMap((g) =>
     g.sub === "commit" ? [extractOne(g.args, heredocFrom(lines, g.line, bodies))] : [],
   );
-  const hidden = resolution.opaque && /\bcommit\b/.test(command);
+  const hidden = opaqueMentions(resolution, "commit");
   return hidden ? [...found, unknown()] : found;
 }
 

package/src/core/git-invocations.ts

@@ -13,6 +13,7 @@ import {
   substitutions,
   WRAPPERS,
 } from "./git-intent.ts";
+import { stripHeredocs } from "./heredoc.ts";
 
 export type GitInvocation = {
   readonly sub: string;
@@ -26,12 +27,13 @@ export type GitInvocation = {
 export type GitResolution = {
   readonly invocations: readonly GitInvocation[];
   /** True when git may run through something the parser cannot see into (xargs, `$CMD`, …). */
-  readonly opaque: boolean;
+  /** Words of segments that may run git in a way that cannot be read (`$GIT push`, `xargs git …`). */
+  readonly opaque: readonly string[];
 };
 
 type Collector = {
   invocations: GitInvocation[];
-  opaque: boolean;
+  opaque: string[];
   dir: string | undefined;
   line: number;
 };
@@ -57,7 +59,7 @@ function visitGit(rest: readonly string[], into: Collector): void {
   }
   const sub = rest[j];
   if (sub === undefined) return;
-  if (sub.startsWith("$")) into.opaque = true;
+  if (sub.startsWith("$")) into.opaque.push(...rest);
   else {
     const args = rest.slice(j + 1);
     const line = into.line;
@@ -88,11 +90,12 @@ function visitSegment(tokens: readonly string[], into: Collector): void {
   if (head === undefined) return;
   const rest = tokens.slice(firstCommand(tokens) + 1);
   const base = basename(head);
-  if (head.startsWith("$")) into.opaque = true;
+  if (head.startsWith("$")) into.opaque.push(...tokens);
   else if (base === "cd") visitCd(rest, into);
   else if (SHELLS.has(base) || base === "eval") visitScript(base, rest, into);
-  else if (OPAQUE.has(base)) into.opaque = into.opaque || gitIndex(rest) >= 0;
-  else if (base === "git") visitGit(rest, into);
+  else if (OPAQUE.has(base)) {
+    if (gitIndex(rest) >= 0) into.opaque.push(...rest);
+  } else if (base === "git") visitGit(rest, into);
   else visitWrapped(base, rest, into);
 }
 
@@ -104,7 +107,7 @@ function visitWrapped(base: string, rest: readonly string[], into: Collector): v
 
 function merge(into: Collector, other: GitResolution): void {
   into.invocations.push(...other.invocations.map((g) => ({ ...g, line: into.line })));
-  if (other.opaque) into.opaque = true;
+  into.opaque.push(...other.opaque);
 }
 
 /**
@@ -112,9 +115,10 @@ function merge(into: Collector, other: GitResolution): void {
  * `timeout`, `if … then`), `bash -c`/`eval` scripts and `$(…)` substitutions. Heredoc bodies are data.
  */
 export function resolveGit(command: string): GitResolution {
-  const into: Collector = { invocations: [], opaque: false, dir: undefined, line: 0 };
+  const into: Collector = { invocations: [], opaque: [], dir: undefined, line: 0 };
   let heredocEnd: string | undefined;
-  const lines = splitLines(command);
+  // Heredoc bodies are data (an apostrophe in one must not unbalance quote tracking).
+  const lines = splitLines(stripHeredocs(command).rest);
   for (const [index, line] of lines.entries()) {
     into.line = index;
     if (heredocEnd !== undefined) {
@@ -127,3 +131,7 @@ export function resolveGit(command: string): GitResolution {
   }
   return into;
 }
+
+/** Whether something unreadable in the command may be running `git <subcommand>`. */
+export const opaqueMentions = (resolution: GitResolution, subcommand: string): boolean =>
+  resolution.opaque.includes(subcommand);

package/src/core/heredoc.ts

@@ -0,0 +1,15 @@
+const HEREDOC =
+  /<<-?[ \t]*(['"]?)([A-Za-z_][A-Za-z0-9_]*)\1([^\n]*)\n([\s\S]*?)\n[ \t]*\2[ \t]*(?:\n|$)/g;
+
+/**
+ * Heredoc bodies are data: take them out so their quotes cannot confuse line splitting. The rest of
+ * the opening line stays (`| git commit -F -`) with a `#HD<n>` marker naming the removed body.
+ */
+export function stripHeredocs(command: string): { rest: string; bodies: string[] } {
+  const bodies: string[] = [];
+  const rest = command.replace(HEREDOC, (...m: unknown[]) => {
+    bodies.push(String(m[4]).trim());
+    return `${String(m[3])} #HD${bodies.length - 1}\n`;
+  });
+  return { rest, bodies };
+}

package/src/core/push-command.ts

@@ -1,4 +1,4 @@
-import { resolveGit } from "./git-invocations.ts";
+import { opaqueMentions, resolveGit } from "./git-invocations.ts";
 
 export type PushTarget = {
   readonly remote: string | undefined;
@@ -73,7 +73,7 @@ export function pushTargets(command: string): PushTarget[] {
     g.sub === "push" && !isDryRun(g.args) ? [toTarget(g.args, g.dir)] : [],
   );
   // git run through something opaque (xargs, `$CMD`): a push cannot be ruled out, so assume the worst.
-  const opaquePush = resolution.opaque && /\bpush\b/.test(command);
+  const opaquePush = opaqueMentions(resolution, "push");
   return opaquePush
     ? [
         ...targets,

package/src/gates/commit-guard.ts

@@ -63,7 +63,8 @@ function messageNeeds(message: string): Need[] {
 
 /** `-a`/`--all`, or a `git add` in the same command, widen the commit beyond what is staged. */
 const stagesEverything = (command: string): boolean =>
-  /\bgit\b[^;&|\n]*\bcommit\b[^;&|\n]*\s(?:-[a-zA-Z]*a[a-zA-Z]*|--all|--include)(?:\s|$)|\bgit\s+add\s+(?:-A|--all|-u|\.)(?:\s|$)/.test(
+  /\bgit\s+add\b/.test(command) ||
+  /\bgit\b[^;&|\n]*\bcommit\b[^;&|\n]*\s(?:-[a-zA-Z]*a[a-zA-Z]*|--all|--include)(?=\s|$|[;&|])/.test(
     command,
   );