pi-orchestrator-config 4.6.2 → 4.6.3

package/agents/github-expert.md

@@ -27,16 +27,10 @@ This agent does NOT run tests. When tests are required (e.g., before creating a
 1. Ask orchestrator: "Have all tests passed?"
 2. If NO/UNKNOWN: "Please delegate to test-runner, then call me again"
 
-## Project Settings
+## Attribution
 
-{{SETTINGS:comment_signature}}
-
-- If `comment_signature` is `true`: append a signature to every GitHub body you write —
-  PR/issue **create**, **edit --body**, and **comment**.
-  Format: `\n\n---\n*Assisted-by: PI (<model>)*` using `$PI_MODEL` for model.
-  If `$PI_COMMENT_SIGNATURE` is set, use: `\n\n---\n*$PI_COMMENT_SIGNATURE*`.
-  Skip if the body already contains `Assisted-by`.
-  Runtime enforcement also injects this on `gh pr|issue create|comment|edit` `--body` / heredoc.
+Runtime owns attribution for `gh pr` and `gh issue` create, edit, and comment bodies passed with `--body`.
+Never manually add a signature, including raw `$PI_MODEL`, or use a manual fallback.
 
 ## Core Operations
 

package/extensions/orchestrator/async-agents.ts

@@ -1041,6 +1041,7 @@ export function registerAsyncAgents(
     // Resolve base branch for reviewers so they diff against the correct target
     const spawnEnv: Record<string, string | undefined> = {
       ...process.env,
+      PI_MODEL: effectiveModel || undefined,
       PI_SUBAGENT_CHILD: "1",
       PI_AGENT_NAME: agentName,
       PI_PRIMARY_MODEL: process.env.PI_PRIMARY_MODEL || process.env.PI_MODEL || "",

package/extensions/orchestrator/enforcement-helpers.ts

@@ -806,17 +806,38 @@ function commentSignatureFooter(signature: string): string {
   return `\n\n---\n*${signature}*`;
 }
 
+const ghSignatureModel = /^[\w:./+@-]+(?: [\w:./+@-]+)*$/;
+const ghSignatureLine = /(^|\n|\\n)(?:(?:\n|\\n)---(?:\n|\\n))?\*Assisted-by: PI \(([^\r\n]*?)\)\*(?=\r?\n|\\n|$)/g;
+
 function bodyAlreadySigned(text: string): boolean {
-  return /\*Assisted-by:/.test(text) || /(?:^|\n|\\n)Assisted-by:\s/.test(text);
+  const lines = text.matchAll(ghSignatureLine);
+  for (const line of lines) {
+    if (ghSignatureModel.test(line[2])) return true;
+  }
+  return false;
 }
 
-/** Unresolved model placeholders are stale template footers, not signatures. */
-function replaceUnresolvedModelFooters(payload: string): string {
-  const unresolvedFooter = /(?:\n|\\n){2}---(?:\n|\\n)\*Assisted-by: PI \((?:\$PI_MODEL|\$\{PI_MODEL(?::-unknown)?\})\)\*/g;
-  const replaced = payload.replace(unresolvedFooter, "");
-  if (replaced !== payload)
-    enfLog.debug("injectGhBodySignature replaced unresolved PI_MODEL footer");
-  return replaced;
+/** Keep the first standalone valid footer, but use the current operation's model. */
+function normalizeGhBodyFooters(payload: string, signature: string): string {
+  let signed = false;
+  return payload.replace(ghSignatureLine, (block, _prefix: string, model: string) => {
+    if (model.includes("PI_MODEL")) {
+      enfLog.debug("injectGhBodySignature removed unresolved PI_MODEL footer");
+      return "";
+    }
+    if (ghSignatureModel.test(model)) {
+      if (signed) {
+        enfLog.debug("injectGhBodySignature removed duplicate valid footer", model);
+        return "";
+      }
+      signed = true;
+      if (`Assisted-by: PI (${model})` !== signature) {
+        enfLog.debug("injectGhBodySignature replaced stale footer", model);
+        return block.replace(`*Assisted-by: PI (${model})*`, `*${signature}*`);
+      }
+    }
+    return block;
+  });
 }
 
 /** Index of the matching closer for a quote at `openIdx`, honoring POSIX escapes. */
@@ -829,6 +850,17 @@ function matchingQuoteIndex(s: string, openIdx: number): number | null {
     return close < 0 ? null : close;
   }
   for (let i = openIdx + 1; i < s.length; i++) {
+    if (s.startsWith("<<", i)) {
+      const opener = /^<<(-?)[ \t]*(['"]?)([\w-]+)\2[^\n]*\n/.exec(s.slice(i));
+      if (opener) {
+        const closer = new RegExp(String.raw`\n${opener[1] ? "\\t*" : ""}${opener[3]}\r?(?=\n|$)`).exec(s.slice(i + opener[0].length - 1));
+        if (closer) {
+          enfLog.debug("matchingQuoteIndex skip heredoc", opener[3]);
+          i += opener[0].length - 1 + closer.index + closer[0].length - 1;
+          continue;
+        }
+      }
+    }
     if (s[i] === "\\") {
       i++;
       continue;
@@ -873,7 +905,7 @@ function lastHeredocInSpan(
   spanStart: number,
   spanEnd: number,
 ): RegExpExecArray | null {
-  const heredocRe = /<<(?:-)?\s*(['"]?)(\w+)\1[^\n]*\n([\s\S]*?)\n([ \t]*)\2\s*(?=\n|$)/g;
+  const heredocRe = /<<-?[ \t]*(['"]?)([\w-]+)\1[^\n]*\n([\s\S]*?)\n([ \t]*)\2\r?(?=\n|$)/g;
   let last: RegExpExecArray | null = null;
   let m: RegExpExecArray | null;
   while ((m = heredocRe.exec(command)) !== null) {
@@ -905,9 +937,9 @@ export function injectGhBodySignature(command: string, signature: string): strin
   }
 
   const payload = command.slice(span.open + 1, span.close);
-  const normalizedPayload = replaceUnresolvedModelFooters(payload);
+  const normalizedPayload = normalizeGhBodyFooters(payload, signature);
   if (normalizedPayload !== payload) {
-    // Re-parse positions after removal so command-substitution heredocs still
+    // Re-parse positions after cleanup so command-substitution heredocs still
     // receive their footer before the closing delimiter.
     const normalizedCommand = command.slice(0, span.open + 1) + normalizedPayload + command.slice(span.close);
     return injectGhBodySignature(normalizedCommand, signature);
@@ -925,7 +957,9 @@ export function injectGhBodySignature(command: string, signature: string): strin
     const closeIdx = last.index + last[0].lastIndexOf(closeToken);
     if (closeIdx >= last.index) {
       enfLog.debug("injectGhBodySignature heredoc in --body", delim);
-      return command.slice(0, closeIdx) + footer + command.slice(closeIdx);
+      const crlf = command[closeIdx - 1] === "\r";
+      const insertAt = crlf ? closeIdx - 1 : closeIdx;
+      return command.slice(0, insertAt) + (crlf ? footer.replaceAll("\n", "\r\n") : footer) + command.slice(insertAt);
     }
   }
 

package/extensions/orchestrator/enforcement.ts

@@ -389,7 +389,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     cachedTrailerSelection = null;
     // Set comment signature env var for CLI tools to read
     if (getSetting(ctx.cwd, "comment_signature")) {
-      const modelId = (process.env.PI_PRIMARY_MODEL || process.env.PI_MODEL || (ctx as any).model?.id || "unknown").replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
+      const modelId = ((ctx as any).model?.id || process.env.PI_MODEL || process.env.PI_PRIMARY_MODEL || "unknown").replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
       process.env.PI_COMMENT_SIGNATURE = `Assisted-by: PI (${modelId})`;
     } else {
       delete process.env.PI_COMMENT_SIGNATURE;
@@ -535,12 +535,12 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     // comment_signature: inject Assisted-by footer into gh pr/issue create|comment|edit bodies
     if (getSetting(ctx.cwd, "comment_signature")) {
       const modelId = (
-        process.env.PI_PRIMARY_MODEL ||
-        process.env.PI_MODEL ||
         (ctx as any).model?.id ||
+        process.env.PI_MODEL ||
+        process.env.PI_PRIMARY_MODEL ||
         "unknown"
       ).replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
-      const signature = process.env.PI_COMMENT_SIGNATURE || `Assisted-by: PI (${modelId})`;
+      const signature = `Assisted-by: PI (${modelId})`;
       const injected = injectGhBodySignature(event.input.command, signature);
       if (injected !== event.input.command) {
         log.info("comment_signature injected into gh body command", signature);

package/extensions/orchestrator/subagent-tool.ts

@@ -485,7 +485,7 @@ export async function runSingleAgent(
         cwd: cwd,
         shell: false,
         stdio: ["ignore", "pipe", "pipe"],
-        env: { ...process.env, PI_SUBAGENT_CHILD: "1", PI_AGENT_NAME: agentName, PI_PRIMARY_MODEL: process.env.PI_PRIMARY_MODEL || process.env.PI_MODEL || "", __PI_CONFIG_SESSION_ID: (globalThis as any).__piConfigSessionId || "", __PI_PARENT_SESSION_ID: (globalThis as any).__piConfigSessionId || "" },
+        env: { ...process.env, PI_MODEL: effectiveModel || undefined, PI_SUBAGENT_CHILD: "1", PI_AGENT_NAME: agentName, PI_PRIMARY_MODEL: process.env.PI_PRIMARY_MODEL || process.env.PI_MODEL || "", __PI_CONFIG_SESSION_ID: (globalThis as any).__piConfigSessionId || "", __PI_PARENT_SESSION_ID: (globalThis as any).__piConfigSessionId || "" },
       });
       let buf = "";
 

package/extensions/pidiff/pidiff-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pidiff-ui",
   "private": true,
-  "version": "4.6.2",
+  "version": "4.6.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-orchestrator-config",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "description": "Orchestrator pattern for pi: specialist subagents, enforcement, code review loop, workflow commands",
   "keywords": [
     "pi-package"
@@ -59,11 +59,14 @@
     "skills/",
     "settings-keys.json"
   ],
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": "*",
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "typebox": "*"
+  },
   "dependencies": {
-    "@earendil-works/pi-agent-core": ">=0.87.0",
-    "@earendil-works/pi-ai": ">=0.87.0",
-    "@earendil-works/pi-coding-agent": ">=0.87.0",
-    "@earendil-works/pi-tui": ">=0.87.0",
     "@huggingface/transformers": "^4.2.0",
     "acpx": ">=0.12.0 <1",
     "chokidar": "^5.0.0",