@jwilger/pi-development-system 0.8.5 → 0.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilger/pi-development-system",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "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 { 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[];

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;
@@ -114,7 +115,8 @@ function merge(into: Collector, other: GitResolution): void {
 export function resolveGit(command: string): GitResolution {
   const into: Collector = { invocations: [], opaque: false, 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) {

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/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,
   );