@jwilger/pi-development-system 0.36.0 → 0.37.0

package/package.json

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

package/src/context/turn-verifier.ts

@@ -29,14 +29,19 @@ export function assistantParts(message: AgentMessage): Parts | undefined {
   return { text, callsTools: message.content.some((c) => c.type === "toolCall") };
 }
 
-/** True when the last non-empty line of the message ends with a question mark. */
+const LIST_ITEM = /^(?:\d+[.)]|[-*+])\s/;
+
+/**
+ * True when the message ends by asking the user something: the last non-empty line that is not an
+ * option-list item ends with a question mark, optionally followed by a short parenthetical ("(y/n)").
+ */
 export function asksUser(text: string): boolean {
   const last = text
     .split("\n")
     .map((l) => l.trim())
-    .filter((l) => l !== "")
+    .filter((l) => l !== "" && !LIST_ITEM.test(l))
     .at(-1);
-  return last !== undefined && /\?[\s)"'*_`]*$/.test(last);
+  return last !== undefined && /\?(?:\s*\([^()]{0,40}\))?[\s)"'*_`]*$/.test(last);
 }
 
 const claimMessage = (): string =>
@@ -83,6 +88,8 @@ export function registerTurnVerifier(deps: TurnVerifierDeps): void {
   });
 
   deps.pi.on("turn_end", async (event, ctx) => {
+    // An aborted or errored turn is dropped by pi; judging it would delay the abort and spend a correction.
+    if (event.outcome !== "completed") return undefined;
     const state = deps.state.get();
     if (!VERIFIED_PHASES.has(state.phase)) return undefined;
     const parts = assistantParts(event.message);

package/src/core/model-advice.ts

@@ -38,19 +38,21 @@ const matches = (candidates: readonly string[], model: string): boolean => {
   );
 };
 
+const direct = (matrix: ModelMatrix, tier: Tier): string[] =>
+  // `fast` falls back to `@strong`; expanding it would make every strong model fast.
+  matrix[tier].filter((c) => !c.startsWith("@"));
+
 /**
- * The lowest tier whose candidates include `provider/id`: a model that appears as a fallback in a
- * higher tier (sol in frontier) still belongs to the tier it is natively listed in. Undefined when
- * the model is in none of them.
+ * The tier a model natively belongs to: the lowest tier that lists it (sol is a fallback in
+ * frontier but lives in strong). Undefined when it is in none of them.
  */
 export function tierOf(matrix: ModelMatrix, model: string): Tier | undefined {
-  // Direct candidates only: `fast` falls back to `@strong`, which must not make strong models fast.
-  return [...TIERS].reverse().find((tier) =>
-    matches(
-      matrix[tier].filter((c) => !c.startsWith("@")),
-      model,
-    ),
-  );
+  return [...TIERS].reverse().find((tier) => matches(direct(matrix, tier), model));
+}
+
+/** The best tier that lists the model at all: what a slot resolving to it is asking for. */
+function bestTierOf(matrix: ModelMatrix, model: string): Tier | undefined {
+  return TIERS.find((tier) => matches(direct(matrix, tier), model));
 }
 
 export type AdviceInput = {
@@ -74,7 +76,7 @@ export function adviseModel(input: AdviceInput): string | undefined {
   // Anything the slot itself lists is acceptable for the phase, whatever tier it natively sits in.
   if (matches(flattenSlot(input.matrix, slot), input.model)) return undefined;
   const have = tierOf(input.matrix, input.model);
-  const need = tierOf(input.matrix, wanted.value.model);
+  const need = bestTierOf(input.matrix, wanted.value.model);
   if (have === undefined || need === undefined) return undefined;
   if (TIERS.indexOf(have) <= TIERS.indexOf(need)) return undefined;
   return `${input.phase} on ${input.model} (${have} tier) — the matrix prefers ${wanted.value.model} (${need} tier) for the ${slot} slot. Consider asking an advisor subagent for the hard decisions, or continue and record a departure (gate models.phase-mismatch). The system never switches your model for you.`;

package/src/core/test-runner.ts

@@ -86,9 +86,10 @@ function reportedExit(result: ResultLike): number {
 
 /** The last few non-empty output lines, redacted and bounded: what the runner said at the end. */
 export function summarizeOutput(output: string): string {
-  const lines = output
+  // Redact first: a multi-line secret (PEM key) must be recognised before the tail is cut off its BEGIN line.
+  const lines = redactSecrets(output)
     .split("\n")
     .map((l) => l.trim())
     .filter((l) => l !== "" && !/^Command exited with code \d+$/.test(l));
-  return redactSecrets(lines.slice(-SUMMARY_LINES).join(" | ")).slice(0, SUMMARY_MAX);
+  return lines.slice(-SUMMARY_LINES).join(" | ").slice(0, SUMMARY_MAX);
 }