@jwilger/pi-development-system 0.8.9 → 0.9.0

package/package.json

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

package/skills/delivery-discipline/SKILL.md

@@ -52,7 +52,7 @@ hides every later failure. A push to a red trunk is a hard stop unless the
 commit is `fix(ci): …` (or another `fix`), touches only what the failing log names, and
 stays small (an unpushed diff over 8000 characters is never exempt); Jev must read it as
 only repairing the failing run, which needs the failing log and Jev online. Otherwise the
-push is a hard stop. If `gh`
+push is a hard stop. A call that commits and pushes together on a red trunk is refused outright (commit in one call, push in the next). If `gh`
 is missing or unauthenticated, CI reads as unknown and the push is allowed:
 check CI by other means before relying on it.
 

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

package/src/state/ci-command.ts

@@ -53,10 +53,14 @@ export async function runCiWatch(
       deps.pi.appendEntry(CI_ENTRY_TYPE, observed);
     },
   });
-  ctx.ui.notify(
-    `CI on ${config.value.delivery.trunk}: ${final.status}${final.sha === undefined ? "" : ` (${final.sha.slice(0, 7)})`}`,
-    final.status === "red" ? "error" : "info",
-  );
+  try {
+    ctx.ui.notify(
+      `CI on ${config.value.delivery.trunk}: ${final.status}${final.sha === undefined ? "" : ` (${final.sha.slice(0, 7)})`}`,
+      final.status === "red" ? "error" : "info",
+    );
+  } catch {
+    // stale context after a reload: the status line and entries were already updated
+  }
   return final;
 }
 
@@ -67,10 +71,15 @@ export function registerCiCommand(deps: CiCommandDeps): void {
     handler: async (_args, ctx) => {
       ctx.ui.notify("watching CI on the trunk…", "info");
       runCiWatch(deps, ctx).catch((cause: unknown) => {
-        ctx.ui.notify(
-          `CI watch failed: ${cause instanceof Error ? cause.message : String(cause)}`,
-          "error",
-        );
+        // ctx goes stale if the session is replaced or reloaded mid-watch; there is nobody left to tell.
+        try {
+          ctx.ui.notify(
+            `CI watch failed: ${cause instanceof Error ? cause.message : String(cause)}`,
+            "error",
+          );
+        } catch {
+          // stale context
+        }
       });
     },
   });