pi-orchestrator-config 4.3.9 → 4.3.10

package/extensions/orchestrator/enforcement-helpers.ts

@@ -810,6 +810,15 @@ function bodyAlreadySigned(text: string): boolean {
   return /\*Assisted-by:/.test(text) || /(?:^|\n|\\n)Assisted-by:\s/.test(text);
 }
 
+/** 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\})\)\*/g;
+  const replaced = payload.replace(unresolvedFooter, "");
+  if (replaced !== payload)
+    enfLog.debug("injectGhBodySignature replaced unresolved PI_MODEL footer");
+  return replaced;
+}
+
 /** Index of the matching closer for a quote at `openIdx`, honoring POSIX escapes. */
 function matchingQuoteIndex(s: string, openIdx: number): number | null {
   const q = s[openIdx];
@@ -888,10 +897,6 @@ export function injectGhBodySignature(command: string, signature: string): strin
     enfLog.debug("injectGhBodySignature skip not a gh body command");
     return command;
   }
-  if (bodyAlreadySigned(command)) {
-    enfLog.debug("injectGhBodySignature skip already present");
-    return command;
-  }
   const footer = commentSignatureFooter(signature);
   const span = findLastQuotedBodySpan(command);
   if (!span) {
@@ -899,6 +904,19 @@ export function injectGhBodySignature(command: string, signature: string): strin
     return command;
   }
 
+  const payload = command.slice(span.open + 1, span.close);
+  const normalizedPayload = replaceUnresolvedModelFooters(payload);
+  if (normalizedPayload !== payload) {
+    // Re-parse positions after removal 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);
+  }
+  if (bodyAlreadySigned(payload)) {
+    enfLog.debug("injectGhBodySignature skip already present in body");
+    return command;
+  }
+
   const last = lastHeredocInSpan(command, span.open, span.close);
   if (last) {
     const delim = last[2];
@@ -911,7 +929,6 @@ export function injectGhBodySignature(command: string, signature: string): strin
     }
   }
 
-  const payload = command.slice(span.open + 1, span.close);
   if (payload.startsWith("$(")) {
     enfLog.warn("injectGhBodySignature --body command subst without heredoc match");
     return command;

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

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

package/extensions/providers/index.ts

@@ -27,7 +27,6 @@ import type {
   StreamOptions,
 } from "@earendil-works/pi-ai";
 import { createLogger } from "../shared/logger.js";
-import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import { asStringArray, getSetting } from "../orchestrator/project-settings.js";
@@ -80,12 +79,35 @@ const DISCOVERY_TIMEOUT_MS = 30_000;
 
 const registry = new ProviderDriverRegistry();
 
+let createAssistantMessageEventStream: () => AssistantMessageEventStream;
+
 /** Track which instances are CLI vs ACPX for configured gates. */
 const cliInstances = new Map<string, ProviderInstance>();
 const acpxInstances = new Map<string, ProviderInstance>();
 
 let projectCwd = "";
 
+interface ProviderDiscoverySummary {
+  summary: string;
+}
+
+/** Render durable discovery entries without adding a TUI package dependency. */
+function providerDiscoverySummaryComponent(
+  summary: string,
+  theme: { fg: (color: "muted", text: string) => string },
+) {
+  log.debug("rendering CLI/ACPX discovery summary", { summary });
+  return {
+    render: (_width: number): string[] => {
+      log.debug("rendered CLI/ACPX discovery summary");
+      return [theme.fg("muted", summary)];
+    },
+    invalidate: (): void => {
+      log.debug("invalidated CLI/ACPX discovery summary");
+    },
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Configured Gates
 // ---------------------------------------------------------------------------
@@ -294,7 +316,17 @@ log.debug("providers module loaded");
 
 const cwdHookBound = new WeakSet<object>();
 
-export default async function (pi: ExtensionAPI) {
+export default async function (
+  pi: ExtensionAPI,
+  testOptions?: { providerSummaryParts?: readonly string[] },
+) {
+  if (typeof pi.registerEntryRenderer === "function") {
+    pi.registerEntryRenderer<ProviderDiscoverySummary>(
+      "provider-discovery-summary",
+      (entry, _options, theme) => providerDiscoverySummaryComponent(entry.data?.summary ?? "", theme),
+    );
+  }
+
   // pi --help / --version — skip discovery
   if (isPiMetaInvocation()) return;
 
@@ -319,6 +351,9 @@ export default async function (pi: ExtensionAPI) {
     return;
   }
   markProvidersInitialized();
+  if (!testOptions?.providerSummaryParts) {
+    ({ createAssistantMessageEventStream } = await import("@earendil-works/pi-ai"));
+  }
   log.debug(
     "providers factory: proceeding after reset / first load — re-entering discovery",
   );
@@ -548,15 +583,23 @@ export default async function (pi: ExtensionAPI) {
 
   // Show discovery summary on session start; restore saved default model when
   // findInitialModel raced hasConfiguredAuth false → wrong initial model (#753).
-  const providerSummaryParts: string[] = [];
-  for (const [agent, inst] of cliInstances) {
-    const count = inst.snapshot.getSnapshot().models.length;
-    providerSummaryParts.push(`cli-${agent} (${count})`);
-  }
-  for (const [agent, inst] of acpxInstances) {
-    const count = inst.snapshot.getSnapshot().models.length;
-    providerSummaryParts.push(`acpx-${agent} (${count})`);
-  }
+  const providerSummaryParts = testOptions?.providerSummaryParts
+    ? [...testOptions.providerSummaryParts]
+    : (() => {
+      const parts: string[] = [];
+      for (const [agent, inst] of cliInstances) {
+        const count = inst.snapshot.getSnapshot().models.length;
+        parts.push(`cli-${agent} (${count})`);
+      }
+      for (const [agent, inst] of acpxInstances) {
+        const count = inst.snapshot.getSnapshot().models.length;
+        parts.push(`acpx-${agent} (${count})`);
+      }
+      log.debug("built CLI/ACPX provider discovery summary", {
+        providerCount: parts.length,
+      });
+      return parts;
+    })();
 
   // Fire-and-forget restore so session_start is not blocked by retries (#753).
   // Omit registeredProviders: cli/acpx-only lists falsely fail-fast native defaults.
@@ -578,15 +621,18 @@ export default async function (pi: ExtensionAPI) {
 
   pi.on("session_start", (event, ctx) => {
     const reason = typeof event?.reason === "string" ? event.reason : "";
-    if (providerSummaryParts.length > 0 && ctx.hasUI) {
+    const summary = `Providers: ${providerSummaryParts.join(", ")}`;
+    // Entries survive reload/resume. Only append for a newly started session;
+    // its persisted entry renders on later lifecycle events without duplication.
+    if (providerSummaryParts.length > 0 && (reason === "startup" || reason === "new")) {
       try {
-        ctx.ui.notify(`Providers: ${providerSummaryParts.join(", ")}`, "info");
+        pi.appendEntry<ProviderDiscoverySummary>("provider-discovery-summary", { summary });
+        log.info("persisted CLI/ACPX discovery summary", { reason, summary });
       } catch (err) {
-        log.debug(
-          "providers notify skipped",
-          err instanceof Error ? err.message : String(err),
-        );
+        log.warn("provider discovery summary append failed", err instanceof Error ? err.name : typeof err);
       }
+    } else if (providerSummaryParts.length > 0) {
+      log.debug("provider discovery summary retained", { reason: reason || "unknown" });
     }
     applyCliAcpxThinking(
       ctx.model

package/extensions/shared/openai-compatible-discovery.ts

@@ -30,6 +30,10 @@ export interface OpenAiCompatibleModelRecord {
   cost?: unknown;
   contextWindow?: unknown;
   maxTokens?: unknown;
+  /** LiteLLM's generic input capacity alias. */
+  max_input_tokens?: unknown;
+  /** LiteLLM's generic output capacity alias. */
+  max_output_tokens?: unknown;
 }
 
 /** Pi's models.json defaults for omitted static-model metadata. */
@@ -461,6 +465,7 @@ export function materializeOpenAiCompatibleModels(
   baseUrl: string,
   providerId: string,
 ): Model<Api>[] {
+  log.debug("materializing OpenAI-compatible models", { providerId, recordCount: records.length });
   const models: Model<Api>[] = [];
   const seenIds = new Set<string>();
   for (const record of records) {
@@ -477,8 +482,21 @@ export function materializeOpenAiCompatibleModels(
         : PI_STATIC_MODEL_DEFAULTS.reasoning,
       input: materializeInput(record.input),
       cost: materializeCost(record.cost),
-      contextWindow: positiveFiniteNumber(record.contextWindow, PI_STATIC_MODEL_DEFAULTS.contextWindow),
-      maxTokens: positiveFiniteNumber(record.maxTokens, PI_STATIC_MODEL_DEFAULTS.maxTokens),
+      // Native Pi metadata wins. LiteLLM commonly exposes only generic input
+      // and output capacities, whose combined capacity is Pi's context window.
+      contextWindow: positiveFiniteNumber(
+        record.contextWindow,
+        (() => {
+          const input = positiveFiniteNumber(record.max_input_tokens, 0);
+          const output = positiveFiniteNumber(record.max_output_tokens, 0);
+          const capacity = input > 0 && output > 0 ? input + output : 0;
+          return positiveFiniteNumber(capacity, PI_STATIC_MODEL_DEFAULTS.contextWindow);
+        })(),
+      ),
+      maxTokens: positiveFiniteNumber(
+        record.maxTokens,
+        positiveFiniteNumber(record.max_output_tokens, PI_STATIC_MODEL_DEFAULTS.maxTokens),
+      ),
     });
   }
   return models;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-orchestrator-config",
-  "version": "4.3.9",
+  "version": "4.3.10",
   "description": "Orchestrator pattern for pi: specialist subagents, enforcement, code review loop, workflow commands",
   "keywords": [
     "pi-package"