@jwilger/pi-development-system 0.8.8 → 0.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilger/pi-development-system",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "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

@@ -18,6 +18,8 @@ type Options = {
   trailers: string[];
   file: string | undefined;
   opaque: boolean;
+  /** Heredoc markers found inside opaque `-m` values (`$(cat <<EOF …)`). */
+  markers: number[];
 };
 
 type Parsed = {
@@ -68,12 +70,21 @@ const OPAQUE_VALUE = /^\s*(?:\$\(|`)|^\$\{?\w+\}?$/;
 function record(options: Options, parsed: Parsed): void {
   if (parsed.kind === "file") options.file = parsed.value;
   else if (parsed.kind === "trailer") options.trailers.push(parsed.value ?? "");
-  else if (parsed.value === undefined || OPAQUE_VALUE.test(parsed.value)) options.opaque = true;
-  else options.messages.push(parsed.value);
+  else if (parsed.value === undefined || OPAQUE_VALUE.test(parsed.value)) {
+    options.opaque = true;
+    for (const hit of (parsed.value ?? "").matchAll(/#HD(\d+)/g))
+      options.markers.push(Number(hit[1]));
+  } else options.messages.push(parsed.value);
 }
 
 function readOptions(args: readonly string[]): Options {
-  const options: Options = { messages: [], trailers: [], file: undefined, opaque: false };
+  const options: Options = {
+    messages: [],
+    trailers: [],
+    file: undefined,
+    opaque: false,
+    markers: [],
+  };
   for (let i = 0; i < args.length; ) {
     const parsed = parseArg(args, i);
     if (parsed !== undefined) record(options, parsed);
@@ -100,7 +111,11 @@ const heredocFrom = (lines: readonly string[], line: number, bodies: readonly st
   return undefined;
 };
 
-function extractOne(args: readonly string[], heredoc: string | undefined): CommitExtraction {
+function extractOne(
+  args: readonly string[],
+  heredoc: string | undefined,
+  bodies: readonly string[],
+): CommitExtraction {
   const options = readOptions(args);
   if (options.file !== undefined && STDIN_PATHS.has(options.file)) {
     return heredoc === undefined
@@ -110,8 +125,12 @@ function extractOne(args: readonly string[], heredoc: string | undefined): Commi
   if (options.file !== undefined) return { kind: "file", path: options.file };
   const parts = [...options.messages];
   if (options.opaque) {
-    if (heredoc === undefined) return unknown(options.trailers, true);
-    parts.push(heredoc);
+    // The value's own heredoc, not whichever heredoc opens first on a shared line.
+    const own = options.markers.flatMap((i) => bodies[i] ?? []);
+    const fallback = heredoc === undefined ? [] : [heredoc];
+    const bodiesOfValue = own.length > 0 ? own : fallback;
+    if (bodiesOfValue.length === 0) return unknown(options.trailers, true);
+    parts.push(...bodiesOfValue);
   }
   if (parts.length === 0) return unknown(options.trailers);
   const trailers = options.trailers.length === 0 ? "" : `\n\n${options.trailers.join("\n")}`;
@@ -124,7 +143,7 @@ export function extractCommits(command: string): CommitExtraction[] {
   const resolution = resolveGit(rest);
   const lines = splitLines(rest);
   const found = resolution.invocations.flatMap((g) =>
-    g.sub === "commit" ? [extractOne(g.args, heredocFrom(lines, g.line, bodies))] : [],
+    g.sub === "commit" ? [extractOne(g.args, heredocFrom(lines, g.line, bodies), bodies)] : [],
   );
   const hidden = opaqueMentions(resolution, "commit");
   return hidden ? [...found, unknown()] : found;

package/src/core/git-invocations.ts

@@ -26,7 +26,6 @@ export type GitInvocation = {
 
 export type GitResolution = {
   readonly invocations: readonly GitInvocation[];
-  /** True when git may run through something the parser cannot see into (xargs, `$CMD`, …). */
   /** Words of segments that may run git in a way that cannot be read (`$GIT push`, `xargs git …`). */
   readonly opaque: readonly string[];
 };

package/src/gates/push-guard.ts

@@ -5,6 +5,7 @@ import {
   isBashToolResult,
   isToolCallEventType,
 } from "@earendil-works/pi-coding-agent";
+import { extractCommits } from "../core/commit-command.ts";
 import { parseConventionalCommit } from "../core/commit-message.ts";
 import type { Exec } from "../core/exec.ts";
 import { type PushTarget, pushTargets } from "../core/push-command.ts";
@@ -177,6 +178,12 @@ export function registerPushGuard(deps: PushGuardDeps): void {
     }
     const status = await getTrunkStatus(deps.exec, { branch: trunk, cwd: ctx.cwd });
     if (status.status !== "red") return undefined;
+    if (extractCommits(command).length > 0) {
+      return {
+        block: true,
+        reason: `CI on ${trunk} is red and this call commits and pushes together, so the push cannot be judged as a fix for it. Commit first in one call, then push in the next.`,
+      };
+    }
     if (await repairsRedTrunk(deps, ctx, loaded.value, status.runId)) return undefined;
     return hardStop(deps, {
       ctx,

package/src/jev/questions/commit.ts

@@ -35,7 +35,9 @@ export const MIX_QUESTION: ClassifierBoolQuestion = {
   },
 };
 
-const clip = (text: string, max: number): string => redactSecrets(text).slice(0, max);
+// Bound the text before redacting (redaction cost grows with run length); keep margin so a secret at the cut is still seen whole.
+const clip = (text: string, max: number): string =>
+  redactSecrets(text.slice(0, max * 2)).slice(0, max);
 
 export async function judgeCommit(
   jev: Jev,

package/src/jev/questions/fix-related.ts

@@ -23,9 +23,9 @@ export async function judgeFixRelated(
 ): Promise<Result<number, JevError>> {
   const asked = await jev.ask(
     {
-      failingLog: redactSecrets(input.failingLog).slice(-4000),
-      message: redactSecrets(input.message).slice(0, 2000),
-      diff: redactSecrets(input.diff).slice(0, 8000),
+      failingLog: redactSecrets(input.failingLog.slice(-8000)).slice(-4000),
+      message: redactSecrets(input.message.slice(0, 4000)).slice(0, 2000),
+      diff: redactSecrets(input.diff.slice(0, 16000)).slice(0, 8000),
     },
     { related: FIX_RELATED_QUESTION },
   );