pi-orchestrator-config 4.2.1 → 4.3.2

package/extensions/orchestrator/enforcement.ts

@@ -5,6 +5,7 @@
  * review state tracking and gitignore checks.
  */
 
+import { createLogger } from "../shared/logger.js";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { isToolCallEventType } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
@@ -34,6 +35,9 @@ import {
   checkTempFileEnforcement,
   hasGitAddBulk,
   hasGitAddForce,
+  isRealGitCommitOrPush,
+  injectSignoff,
+  injectGhBodySignature,
   isReadOnlyStatement,
   isRmInProjectTmp,
   normalizeForRepeatCheck,
@@ -41,9 +45,16 @@ import {
   stripHeredocBodies,
   escapeForDoubleQuote,
   escapeForSingleQuote,
+  commandHasTrailerByName,
   isTestRunnerCommand,
+  isBumpVersionBranch,
+  getCachedBranch,
 } from "./enforcement-helpers.js";
 
+const log = createLogger("enforcement");
+
+export { isBumpVersionBranch, getCachedBranch };
+
 type EnforcementResult = { block: true; reason: string } | { autofix: true; modifiedCommand: string; reason: string } | undefined;
 
 // Repeat detection via temp file — immune to module reload / closure issues
@@ -72,7 +83,7 @@ function writeRepeatState(state: { lastCmd: string; count: number }): void {
   if (!REPEAT_FILE) return;
   try {
     writeFileSync(REPEAT_FILE, JSON.stringify(state));
-  } catch (e: any) { console.debug("[enforcement] write repeat state failed:", e?.message || e); }
+  } catch (e: any) { log.debug("enforcement: write repeat state failed:", e?.message || e); }
 }
 
 
@@ -82,7 +93,7 @@ async function handleCommitTrailer(command: string, event: any, ctx: any, gitCwd
   const trailerSetting = getSetting(gitCwd, "commit_trailer");
   if (typeof trailerSetting !== "string") return undefined;
 
-  const modelId = (process.env.PI_MODEL || (ctx as any).model?.id || "unknown").replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
+  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 piIdentity = `PI (${modelId}) <noreply@pi.dev>`;
   let trailerName: string;
@@ -122,10 +133,6 @@ async function handleCommitTrailer(command: string, event: any, ctx: any, gitCwd
     trailerName = trailerSetting;
   }
 
-  // Raw trailer line for duplicate detection (what the commit message should contain)
-  const rawTrailerLine = `${trailerName}: ${piIdentity}`;
-  if (command.includes(rawTrailerLine)) return undefined;
-
   // Pattern A: echo "..." | git commit -F -
   const pipeIdx = command.lastIndexOf("|");
   if (pipeIdx !== -1 && /git\s+commit\s+.*-F\s*-/.test(command.slice(pipeIdx))) {
@@ -137,6 +144,14 @@ async function handleCommitTrailer(command: string, event: any, ctx: any, gitCwd
     if (lastQuoteIdx > 0) {
       // Determine quote context for correct escaping
       const quoteChar = echoPart[lastQuoteIdx];
+      // Scope dedup to the echo/message-construction portion (before the pipe), which
+      // excludes the git args. Do NOT attempt to slice out the exact quoted substring
+      // by backward-scanning for a quote — escaped quotes (\") inside the message would
+      // misparse the boundary and cause a missed trailer -> duplicate injection.
+      if (commandHasTrailerByName(echoPart, trailerName)) {
+        log.debug("commit_trailer already present in echo message (by name) — skipping injection", trailerName);
+        return undefined;
+      }
       const escaped = quoteChar === "'"
         ? `${escapeForSingleQuote(trailerName)}: ${piIdentity}`
         : `${escapeForDoubleQuote(trailerName)}: ${piIdentity}`;
@@ -149,6 +164,14 @@ async function handleCommitTrailer(command: string, event: any, ctx: any, gitCwd
     const mFlagMatch = command.match(/git\s+commit\s+.*-m\s+(["'])([\s\S]*?)\1/);
     if (mFlagMatch) {
       const quoteChar = mFlagMatch[1];
+      // Scope duplicate-by-name detection to the -m message payload only
+      // (mFlagMatch[2]) — not the whole command — so an unrelated arg/env var
+      // containing the trailer token does not wrongly skip injection.
+      const payload = mFlagMatch[2];
+      if (commandHasTrailerByName(payload, trailerName)) {
+        log.debug("commit_trailer already present in message (by name) — skipping injection", trailerName);
+        return undefined;
+      }
       const escaped = quoteChar === "'"
         ? `${escapeForSingleQuote(trailerName)}: ${piIdentity}`
         : `${escapeForDoubleQuote(trailerName)}: ${piIdentity}`;
@@ -268,12 +291,17 @@ async function checkGitProtection(command: string, event: any, ctx: any, gitCwd:
     const trailerResult = await handleCommitTrailer(command, event, ctx, gitCwd);
     if (trailerResult) return trailerResult;
 
-    // DCO enforcement — inject --signoff when dco setting is enabled
-    if (getSetting(gitCwd, "dco") && !/(?:^|\s)--signoff(?:\s|$)/.test(command) && !/(?:^|\s)-s(?:\s|$)/.test(command)) {
-      event.input.command = event.input.command.replace(
-        /\bgit\b((?:\s+(?:-[a-zA-Z]\s+\S+|-\S+))*\s+)commit\b/,
-        "git$1commit --signoff",
-      );
+    // DCO enforcement — inject --signoff into the REAL git commit invocation only.
+    // injectSignoff scopes to the actual invocation (after the last pipe for
+    // `echo ... | git commit -F -`, or the command-position-anchored `git commit`),
+    // so a `git commit` mention inside the echo/message body is never corrupted.
+    // The already-signed (--signoff/-s) guards live inside injectSignoff.
+    if (getSetting(gitCwd, "dco")) {
+      const signed = injectSignoff(event.input.command);
+      if (signed !== event.input.command) {
+        log.debug("DCO: injected --signoff into real git commit invocation");
+        event.input.command = signed;
+      }
     }
   }
 
@@ -361,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_MODEL || (ctx as any).model?.id || "unknown").replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
+      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";
       process.env.PI_COMMENT_SIGNATURE = `Assisted-by: PI (${modelId})`;
     } else {
       delete process.env.PI_COMMENT_SIGNATURE;
@@ -383,6 +411,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
         const matches = matchToolCall(blockEntries, toolName, input);
         if (matches.length > 0) {
           const rule = matches[0].rule;
+          log.info("enforcement_block", toolName, rule.text);
           return { block: true, reason: `⛔ ENFORCEMENT [${rule.entry.class}]: ${rule.text}` };
         }
       }
@@ -395,7 +424,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
         const toolUsed = isToolCallEventType("edit", event) ? "edit" : "write";
         return {
           block: true,
-          reason: `⛔ Orchestrator cannot use ${toolUsed} directly. Delegate to a subagent (e.g. worker, python-expert, ts-expert) via the subagent tool.`,
+          reason: `⛔ Orchestrator cannot use ${toolUsed} directly. Delegate to the appropriate specialist subagent via the subagent tool.`,
         };
       }
     }
@@ -406,7 +435,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
       if (filePath && resolve(ctx.cwd, filePath) === statePath(ctx.cwd)) {
         return {
           block: true,
-          reason: "\u26d4 Direct modification of pi-config-review-state.json blocked. The review state is managed by the enforcement system.",
+          reason: "\u26d4 Direct modification of pi-config-review-state.jsonl blocked. The review state is managed by the enforcement system.",
         };
       }
     }
@@ -421,7 +450,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     if (getSetting(ctx.cwd, "review_loop_enforcement") && cmdLower.includes("pi-config-review-state")) {
       return {
         block: true,
-        reason: "\u26d4 Bash command targeting pi-config-review-state blocked. The review state is managed by the enforcement system.",
+        reason: "\u26d4 Bash command targeting pi-config-review-state blocked. The review state is managed exclusively by the enforcement system.",
       };
     }
 
@@ -486,14 +515,14 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     // On acpx, do not push async (unsupported); foreground waits are allowed.
     const hasLoop = /\b(while|for|until)\b/.test(command);
     const sleepMatch = command.match(/\bsleep\s+(\d+)/);
-    if (parentSupportsAsyncLlm && hasLoop && sleepMatch && parseInt(sleepMatch[1], 10) > 5) {
+    if (parentSupportsAsyncLlm && hasLoop && sleepMatch && parseInt(sleepMatch[1], 10) > getSetting(ctx.cwd, "enforcement_loop_sleep_threshold_s")) {
       return {
         block: true,
         reason: `⚠️ Polling loop with sleep ${sleepMatch[1]}s blocked. Use subagent with async: true for polling/monitoring tasks instead of blocking the session.`,
       };
     }
 
-    if (parentSupportsAsyncLlm && !hasLoop && sleepMatch && parseInt(sleepMatch[1], 10) > 30) {
+    if (parentSupportsAsyncLlm && !hasLoop && sleepMatch && parseInt(sleepMatch[1], 10) > getSetting(ctx.cwd, "enforcement_sleep_threshold_s")) {
       return {
         block: true,
         reason: `⚠️ sleep ${sleepMatch[1]}s blocked — too long. Use subagent with async: true instead of blocking the session.`,
@@ -503,9 +532,28 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     const remoteCheck = checkRemoteExecBlock(cmdLower);
     if (remoteCheck) return remoteCheck;
 
-    // Enforce git commit/push only via git-expert agent
+    // 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 ||
+        "unknown"
+      ).replace(/[^a-zA-Z0-9._:@/ -]/g, "").trim() || "unknown";
+      const signature = process.env.PI_COMMENT_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);
+        event.input.command = injected;
+      }
+    }
+
+    // Enforce git commit/push only via git-expert agent.
+    // Use isRealGitCommitOrPush (heredoc-stripped + command-position aware) so that
+    // file CONTENT / string args / paths that merely MENTION "git commit" do not trip
+    // the guard (BUG #3). Only genuine git commit/push invocations are blocked.
     if (process.env.PI_AGENT_NAME !== "git-expert") {
-      if (hasGitSub(command, "commit") || hasGitSub(command, "push")) {
+      if (isRealGitCommitOrPush(command)) {
         return {
           block: true,
           reason: "⛔ git commit/push blocked. Use git-expert agent for commit and push operations.",
@@ -517,7 +565,9 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     // Use resolveEffectiveCwd to detect the worktree from cd commands (e.g., cd .worktrees/issue-622 && git commit)
     if (process.env.PI_AGENT_NAME === "git-expert" && hasGitSub(command, "commit")) {
       const commitCwd = resolveEffectiveCwd(command, ctx.cwd);
-      if (getSetting(ctx.cwd, "review_loop_enforcement") && !isCommitAllowed(commitCwd)) {
+      // Skip review enforcement on version bump branches (release workflow only)
+      const commitBranch = getCurrentBranch(commitCwd);
+      if (!isBumpVersionBranch(commitBranch) && getSetting(commitCwd, "review_loop_enforcement") && !isCommitAllowed(commitCwd)) {
         const state = readReviewState(commitCwd);
         const testInfo = state.status === "clean" && !state.tests_passed ? " Tests have not passed yet — run tests before committing." : "";
         const reviewAdvice = state.status !== "clean" ? " Fix findings and re-run all reviewers until 0 comments." : "";
@@ -555,9 +605,10 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     try {
       entries = loadEnforcedEntries(ctx.cwd);
     } catch (e: any) {
-      console.debug("[enforcement] loadEnforcedEntries failed:", e?.message?.slice(0, 100));
+      log.debug("enforcement: loadEnforcedEntries failed:", e?.message?.slice(0, 100));
       return;
     }
+    log.info("enforcement_loaded", entries.length);
     if (entries.length === 0) return;
 
 
@@ -570,7 +621,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
       const details = (event as any).details;
       const results = Array.isArray(details?.results) ? details.results : [];
       if (!Array.isArray(details?.results) && details?.results) {
-        console.debug(`[enforcement] subagent details.results is ${typeof details.results} (expected array), skipping bash extraction`);
+        log.debug(`enforcement: subagent details.results is ${typeof details.results} (expected array), skipping bash extraction`);
       }
       const nonBlockEntries = entries.filter(e => e.action !== "block");
       const seen = new Set<string>();
@@ -649,6 +700,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
       }
 
       if (rule.action === "warn") {
+        log.warn("enforcement_warn", toolName, rule.text);
         appendMessages.push({
           type: "text",
           text: `\n⚠️ ENFORCEMENT WARNING: ${rule.text}`,
@@ -690,6 +742,8 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
     } catch {
       effectiveCwd = ctx.cwd; // fallback to session cwd
     }
+    // Skip review tracking on version bump branches (release workflow only)
+    if (isBumpVersionBranch(getCachedBranch(effectiveCwd))) return;
     const relativePath = path.relative(effectiveCwd, absPath);
 
     // Skip gitignored files (build artifacts, .pi/tmp/, node_modules, etc.)
@@ -708,7 +762,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
 
     // Retry markNeedsReview on lock failure — missing this would leave state
     // as 'clean' and allow commits to slip through enforcement.
-    // Uses effectiveCwd so each worktree gets its own pi-config-review-state.json.
+    // Uses effectiveCwd so each worktree gets its own pi-config-review-state.jsonl.
     for (let attempt = 0; attempt < 3; attempt++) {
       try { markNeedsReview(effectiveCwd); break; } catch {
         if (attempt === 2) {
@@ -721,7 +775,7 @@ export function registerEnforcement(pi: ExtensionAPI, inContainer?: boolean): vo
 
   // ── Test command detection (auto-mark tests_passed in review state) ──
   // Runs in ALL processes (orchestrator + subagents) to catch test runs from any agent.
-  // When a test command exits successfully, marks tests_passed=true in pi-config-review-state.json.
+  // When a test command exits successfully, marks tests_passed=true in pi-config-review-state.jsonl.
   // When it fails, marks tests_passed=false. Any subsequent file edit resets tests_passed
   // via markNeedsReview(), so stale results are impossible.
   // NOTE: Code reviewers are excluded — they may run tests to verify behavior but their

package/extensions/orchestrator/extended-autocomplete.ts

@@ -316,6 +316,12 @@ function registerCompletions(
       }
       return null;
     },
+    "pi-config-settings": (prefix: string) => {
+      return filter([
+        { value: "project", label: "project", description: "Edit project-level settings" },
+        { value: "global", label: "global", description: "Edit global settings" },
+      ], prefix);
+    },
 
   };
 
@@ -348,6 +354,7 @@ function setupPromptTemplateInterceptor(
   const promptTemplateCommands = new Set([
     "external-ai", "pr-review", "issue-review", "coderabbit-rate-limit",
     "review-local", "release", "review-handler", "cron", "create-skill", "create-coms-feature-manager",
+    "pi-config-settings",
   ]);
 
   // /external-ai-models-refresh command — clears cache and re-fetches

package/extensions/orchestrator/git-helpers.ts

@@ -20,9 +20,9 @@ export function runGit(
         GCM_INTERACTIVE: "Never",
       },
     });
-    return { stdout: stdout.trim(), code: 0 };
+    return { stdout: stdout.trimEnd(), code: 0 };
   } catch (e: any) {
-    return { stdout: (e.stdout || "").trim(), code: e.status || 1 };
+    return { stdout: (e.stdout || "").trimEnd(), code: e.status || 1 };
   }
 }
 

package/extensions/orchestrator/index.ts

@@ -34,24 +34,34 @@ import { registerPreferenceExtractor } from "./preference-extractor.js";
 import { registerMemoryTools } from "./memory-tools.js";
 import { registerReviewUI } from "./review-ui.js";
 import { registerSessionSearch } from "./session-search.js";
+import { registerSettingsTui } from "./settings-tui.js";
+import { registerMarkdownTransformer } from "./markdown-transformer.js";
 import { ensureGitSshTimeout, isRunningInContainer, terminalNotify } from "./utils.js";
+import { createLogger } from "../shared/logger.js";
+import { setGlobalSessionId } from "../shared/file-logger.js";
 
 const IN_CONTAINER = isRunningInContainer();
 ensureGitSshTimeout();
 
-// Shared command handler registry — pidash uses this to execute commands from the browser
-export const commandHandlerRegistry = new Map<string, (args: string, ctx: any) => Promise<void>>();
-
-// Latest ExtensionCommandContext captured from any command handler.
-// Commands provide the full context (switchSession, newSession, etc.)
-// while session_start only provides basic ExtensionContext.
-export let latestCommandCtx: any = null;
+const log = createLogger("orchestrator");
 
 export default function (pi: ExtensionAPI) {
-  // Wrap registerCommand to capture all handler functions AND command context.
-  // Any command the user runs upgrades latestCommandCtx to a real ExtensionCommandContext
-  // which has switchSession()/newSession() methods.
+  // Set global session ID FIRST so all fileLog callers get per-session files.
+  pi.on("session_start", (_event, ctx) => {
+    const reason = (_event as any)?.reason ?? "unknown";
+    const sid = ctx.sessionManager?.getSessionId?.();
+    log.info("session_start", reason, sid ?? "?");
+    if (sid) setGlobalSessionId(sid);
+  });
+
+  // ── Pidash command handler bridge ──────────────────────────────────
+  // TODO: Remove once pidash uses PiClient/RemoteSession (#732) — native
+  // command dispatch via RemoteSession.submit() eliminates the need for
+  // this event-based handler forwarding.
   const originalRegisterCommand = pi.registerCommand.bind(pi);
+  let latestCommandCtx: any = null;
+  const commandHandlerRegistry = new Map<string, Function>();
+
   pi.registerCommand = (name: string, options: any) => {
     if (options?.handler) {
       const origHandler = options.handler;
@@ -69,6 +79,7 @@ export default function (pi: ExtensionAPI) {
 
   // Replay all registered command handlers when pidash requests them
   // (handles extension load order — pidash may load after orchestrator)
+  // TODO: Remove once pidash uses PiClient/RemoteSession (#732)
   pi.events.on("pidash:request-commands", () => {
     for (const [name, handler] of commandHandlerRegistry) {
       pi.events.emit("pidash:register-command", { name, handler });
@@ -98,6 +109,8 @@ export default function (pi: ExtensionAPI) {
   registerPreferenceExtractor(pi);
   registerMemoryTools(pi);
   registerSessionSearch(pi);
+  registerSettingsTui(pi);
+  registerMarkdownTransformer(pi);
 
   // ── list_models tool — LLM-callable model discovery ──
   pi.registerTool({