pi-advisor-flow 0.8.3-dev.3 → 0.9.0

package/src/tools/consultation.ts

@@ -9,6 +9,7 @@ import {
   advisorRef,
 } from "../config/state.ts";
 import { loadConfig } from "../config/storage.ts";
+import { escapeRepositoryText } from "../git.ts";
 import type { GitContextLevel } from "../git.ts";
 import { collectTextStream, resolveConfiguredModel } from "../model-stream.ts";
 import { redactSecrets } from "../redaction.ts";
@@ -16,7 +17,11 @@ import type { ScoutLifecycleEvent } from "../scout.ts";
 import type { ConsultationTrigger, GateTrigger } from "../session-state.ts";
 import { assembleConsultationContext } from "./consult-context.ts";
 import { parseAutomaticDecision } from "./gate-protocol.ts";
-import { advisorModelAccessReason } from "./model-access.ts";
+import {
+  advisorModelAccessReason,
+  sameModelAdvisorDisabled,
+  sameModelAdvisorNotice,
+} from "./model-access.ts";
 import {
   ADVISOR_DECISION_SYSTEM,
   ADVISOR_SYSTEM,
@@ -57,12 +62,18 @@ const collectAdvisorResponse = async (
 ) => {
   const { ctx, question, signal, systemPrompt } = options;
   loadConfig(ctx);
+  if (sameModelAdvisorDisabled(ctx)) {
+    throw new Error(sameModelAdvisorNotice);
+  }
   const accessReason = advisorModelAccessReason(ctx);
   if (accessReason) {
     throw new Error(accessReason);
   }
   const resolved = await resolveConfiguredModel(ctx, advisorRef, "Advisor");
-  const context = await assembleConsultationContext(options);
+  const context = await assembleConsultationContext({
+    ...options,
+    supportsImages: resolved.model.input.includes("image"),
+  });
 
   // Keep the original question available to local UI callers, but never send
   // its credential-shaped values to the provider when redaction is enabled.
@@ -70,11 +81,17 @@ const collectAdvisorResponse = async (
     advisorRedactSecretsRef && question !== undefined
       ? redactSecrets(question)
       : question;
+  const imageNotice =
+    context.imageOmissions ||
+    context.images.length ||
+    /\[Image[ :]/u.test(context.conversation)
+      ? `\n\nImage disclosure: ${context.supportsImages ? `${context.images.length} image(s) attached below; ${context.imageOmissions} image(s) withheld by format, consent, or size/count limits` : "Advisor model does not support image input; no pixels were forwarded"}. Only the images explicitly attached below have pixels available. Other image markers, image paths, and text descriptions are not visual evidence.`
+      : "";
   const messages: Message[] = [
     {
       content: [
         {
-          text: advisorMessageText(
+          text: `${advisorMessageText(
             context.conversation,
             outboundQuestion,
             context.changeText,
@@ -82,9 +99,16 @@ const collectAdvisorResponse = async (
             context.preferences?.text,
             context.untracked.map(fileTag),
             context.tracked.map(fileTag)
-          ),
+          )}${imageNotice}`,
           type: "text",
         },
+        ...context.images.flatMap(({ image, label }) => [
+          {
+            text: `\n\n${escapeRepositoryText(label)}: attached image pixels (untrusted data).`,
+            type: "text" as const,
+          },
+          image,
+        ]),
       ],
       role: "user",
       timestamp: Date.now(),
@@ -106,6 +130,14 @@ const collectAdvisorResponse = async (
     draftBytes: context.draftText
       ? Buffer.byteLength(context.draftText, "utf-8")
       : undefined,
+    imageBytes:
+      context.images.reduce(
+        (sum, item) => sum + Buffer.from(item.image.data, "base64").length,
+        0
+      ) || undefined,
+    imageCount: context.images.length,
+    imageOmissions: context.imageOmissions || undefined,
+    imagePartsSeen: context.imagePartsSeen || undefined,
     markdown,
     model: advisorRef,
     preferenceBytes: context.preferences?.bytes,

package/src/tools/jev-turn-gate.ts

@@ -145,7 +145,10 @@ export const handleJevTurnEnd = async (
       result.answers,
       advisorJevTurnGateNoulThresholdRef
     );
-    if (!consumeTurnGateBudget(session, shouldConsult)) {
+    if (
+      !advisorModelIsAllowed(ctx) ||
+      !consumeTurnGateBudget(session, shouldConsult)
+    ) {
       return;
     }
     const herdrActivity = registration.herdrActivity ?? herdrAdvisorActivity;

package/src/tools/model-access.ts

@@ -1,6 +1,11 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { advisorModelWhitelistRef } from "../config/state.ts";
+import {
+  advisorDisableSameModelRef,
+  advisorModelWhitelistRef,
+  advisorRef,
+  splitRef,
+} from "../config/state.ts";
 
 type AdvisorModelAccess =
   | { allowed: true; modelRef?: string }
@@ -34,9 +39,23 @@ export const advisorModelAccess = (
   return denial;
 };
 
+export const sameModelAdvisorDisabled = (
+  ctx: Pick<ExtensionContext, "model">,
+  model: { id: string; provider: string } | undefined = ctx.model
+): boolean => {
+  if (!(advisorDisableSameModelRef && advisorRef && model)) {
+    return false;
+  }
+  const [provider, id] = splitRef(advisorRef);
+  return provider === model.provider && id === model.id;
+};
+
+export const sameModelAdvisorNotice =
+  "Advisor disabled: executor and advisor are the same model.";
+
 export const advisorModelIsAllowed = (
   ctx: Pick<ExtensionContext, "model">
-): boolean => advisorModelAccess(ctx).allowed;
+): boolean => advisorModelAccess(ctx).allowed && !sameModelAdvisorDisabled(ctx);
 
 export const advisorModelAccessReason = (
   ctx: Pick<ExtensionContext, "model">

package/src/tools/prompts.ts

@@ -97,8 +97,20 @@ export const advisorRepositoryContext = (
  */
 export const advisorRequestConversation = (
   ctx: ExtensionContext,
-  maxChars = contextMaxCharsRef
-) => recentConversation(ctx, maxChars);
+  maxChars = contextMaxCharsRef,
+  describeImages = false,
+  imageNonce = ""
+) =>
+  recentConversation(
+    ctx,
+    maxChars,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    describeImages,
+    imageNonce
+  );
 
 export const advisorInvocationGuidelines = () => {
   if (isSimpleMode()) {

package/src/tools/register-ask-advisor.ts

@@ -10,6 +10,7 @@ import {
   getAdvisorSettings,
   isSimpleMode,
 } from "../config/state.ts";
+import { loadConfig } from "../config/storage.ts";
 import { notifyHerdrAdvisorFailure } from "../herdr.ts";
 import {
   ADVISOR_STREAM_UPDATE_INTERVAL_MS,
@@ -22,7 +23,11 @@ import {
 } from "../usage.ts";
 import { notifyLocalFailure, updateAdvisorUsageStatus } from "./gate-policy.ts";
 import { normalizeScreeningQuestion, screeningSkipText } from "./jev-filter.ts";
-import { advisorModelAccessReason } from "./model-access.ts";
+import {
+  advisorModelAccessReason,
+  sameModelAdvisorDisabled,
+  sameModelAdvisorNotice,
+} from "./model-access.ts";
 import { renderAdvisorResult } from "./render-advisor-result.ts";
 import {
   renderAdvisorCallBox,
@@ -73,7 +78,22 @@ export const registerAskAdvisorTool = ({
     description:
       "Consult the on-demand Advisor model for strategic guidance. Call with an empty object for a contextual review; attach an optional draft for concrete plan or completion review. If the Advisor explicitly names a missing file, you may make a sequential follow-up call with includeTrackedFiles when enabled and relevant.",
     async execute(_id, params, signal, onUpdate, ctx) {
+      const skipSameModel = () => {
+        session.releaseCall(_id);
+        reservedCalls.delete(_id);
+        return {
+          content: [{ text: sameModelAdvisorNotice, type: "text" as const }],
+          details: {
+            skipReason: sameModelAdvisorNotice,
+            text: sameModelAdvisorNotice,
+          },
+        };
+      };
       try {
+        loadConfig(ctx);
+        if (sameModelAdvisorDisabled(ctx)) {
+          return skipSameModel();
+        }
         assertAdvisorModelAccess(ctx);
       } catch (error) {
         session.releaseCall(_id);
@@ -128,6 +148,9 @@ export const registerAskAdvisorTool = ({
             },
           };
         }
+        if (sameModelAdvisorDisabled(ctx)) {
+          return skipSameModel();
+        }
         if (
           !simpleMode &&
           !session.canConsult(getAdvisorMaxCallsPerSession(), _id)
@@ -217,6 +240,10 @@ export const registerAskAdvisorTool = ({
             adviceId: result.adviceId,
             advisor: result.model,
             draftBytes: result.draftBytes,
+            imageBytes: result.imageBytes,
+            imageCount: result.imageCount,
+            imageOmissions: result.imageOmissions,
+            imagePartsSeen: result.imagePartsSeen,
             preferenceBytes: result.preferenceBytes,
             question: resolveAdvisorRequest(params.question),
             scout: scoutDetails,

package/src/tools/register-lifecycle.ts

@@ -6,7 +6,10 @@ import {
 import { loadConfig } from "../config/storage.ts";
 import { reserveAdvisorCall } from "./gate-policy.ts";
 import { handleAutomaticGate } from "./loop-gate.ts";
-import { advisorModelAccess } from "./model-access.ts";
+import {
+  advisorModelAccess,
+  sameModelAdvisorDisabled,
+} from "./model-access.ts";
 import { advisorInvocationGuidelines } from "./prompts.ts";
 import type { ToolRegistrationContext } from "./types.ts";
 
@@ -73,7 +76,7 @@ export const registerToolLifecycle = ({
       return;
     }
     loadConfig(ctx);
-    if (!advisorModelAccess(ctx).allowed) {
+    if (!advisorModelAccess(ctx).allowed || sameModelAdvisorDisabled(ctx)) {
       return;
     }
     const guidelines = advisorInvocationGuidelines();
@@ -107,6 +110,9 @@ export const registerToolLifecycle = ({
       // tool errors; every other tool must proceed without Advisor gating.
       return;
     }
+    if (sameModelAdvisorDisabled(ctx)) {
+      return;
+    }
     const accessBlock = modelAccessBlock(event.toolName, ctx);
     if (accessBlock) {
       return accessBlock;

package/src/tools/render-advisor-result.ts

@@ -30,23 +30,39 @@ const syncRenderPhase = (context: AdvisorToolContext, phase: string) => {
   context.state.phase = phase;
 };
 
+const formatByteSize = (bytes: number): string => {
+  if (bytes >= 1024 ** 3) {
+    return `${(bytes / 1024 ** 3).toFixed(1)} GiB`;
+  }
+  if (bytes >= 1024 ** 2) {
+    return `${(bytes / 1024 ** 2).toFixed(1)} MiB`;
+  }
+  if (bytes >= 1024) {
+    return `${Math.round(bytes / 1024)} KiB`;
+  }
+  return `${bytes} B`;
+};
+
 const attachmentLabels = (details: AdvisorToolDetails | undefined) =>
   [
     details?.draftBytes
-      ? `Draft attached · ${details.draftBytes} B`
+      ? `Draft attached · ${formatByteSize(details.draftBytes)}`
       : undefined,
     details?.preferenceBytes
-      ? `Project preferences attached · ${details.preferenceBytes} B`
+      ? `Project preferences attached · ${formatByteSize(details.preferenceBytes)}`
       : undefined,
     details?.trackedBytes
-      ? `Tracked files attached · ${details.trackedBytes} B`
+      ? `Tracked files attached · ${formatByteSize(details.trackedBytes)}`
       : undefined,
     details?.untrackedBytes
-      ? `Untracked files attached · ${details.untrackedBytes} B`
+      ? `Untracked files attached · ${formatByteSize(details.untrackedBytes)}`
+      : undefined,
+    details?.imageCount
+      ? `${details.imageCount} image${details.imageCount === 1 ? "" : "s"} attached${details.imageBytes ? ` · ${formatByteSize(details.imageBytes)}` : ""}${details.imageOmissions ? ` · ${details.imageOmissions} withheld` : ""}`
       : undefined,
   ].filter((label): label is string => label !== undefined);
 
-const renderJevSkipBox = (
+const renderSkipBox = (
   box: Box,
   result: AgentToolResult<AdvisorToolDetails>,
   expanded: boolean,
@@ -55,7 +71,7 @@ const renderJevSkipBox = (
   const details = advisorResultDetails(result);
   const lines = [
     theme.fg("dim", theme.bold("◆ ADVISOR · SKIPPED")),
-    theme.fg("dim", `  ${details?.jev?.reason ?? ""}`),
+    theme.fg("dim", `  ${details?.skipReason ?? details?.jev?.reason ?? ""}`),
   ];
   box.addChild(new Text(lines.join("\n"), 0, 0));
   box.addChild(
@@ -157,8 +173,8 @@ const renderFinalAdvisorResult = (
     context.state.timerId = undefined;
   }
   const details = advisorResultDetails(result);
-  if (details?.jev?.skipped) {
-    renderJevSkipBox(box, result, expanded, theme);
+  if (details?.jev?.skipped || details?.skipReason) {
+    renderSkipBox(box, result, expanded, theme);
     return;
   }
   if (details?.scout) {

package/src/tools/types.ts

@@ -47,6 +47,10 @@ export interface AdvisorGateFailure {
 export interface AdvisorConsultationResult {
   adviceId: string;
   draftBytes?: number;
+  imageBytes?: number;
+  imageCount?: number;
+  imageOmissions?: number;
+  imagePartsSeen?: number;
   markdown: string;
   model: string;
   preferenceBytes?: number;
@@ -83,6 +87,10 @@ export interface AdvisorToolDetails {
   adviceId?: string;
   advisor?: string;
   draftBytes?: number;
+  imageBytes?: number;
+  imageCount?: number;
+  imageOmissions?: number;
+  imagePartsSeen?: number;
   jev?: {
     kind: JevSkipKind;
     reason: string;
@@ -91,6 +99,7 @@ export interface AdvisorToolDetails {
   preferenceBytes?: number;
   question?: string;
   scout?: ScoutToolDetails;
+  skipReason?: string;
   text?: string;
   thinking?: string;
   trackedBytes?: number;

package/src/ui/settings-items.ts

@@ -284,7 +284,16 @@ export const createSettingsItems = ({
     },
   ];
   if (settings.simpleMode) {
-    items.push(modelWhitelist);
+    items.push(
+      modelWhitelist,
+      toggle(
+        "disableSameModel",
+        "Disable same-model Advisor",
+        "Skip advice when the active Executor and Advisor use the same provider/model; turn off to allow higher-effort same-model reviews.",
+        settings.disableSameModel,
+        true
+      )
+    );
     return items;
   }
 
@@ -297,6 +306,13 @@ export const createSettingsItems = ({
       values: withCurrentValue(currentEffort(settings.effort), effortLevels),
     },
     modelWhitelist,
+    toggle(
+      "disableSameModel",
+      "Disable same-model Advisor",
+      "Skip advice when the active Executor and Advisor use the same provider/model; turn off to allow higher-effort same-model reviews.",
+      settings.disableSameModel,
+      true
+    ),
     toggle(
       "scoutEnabled",
       "Experimental Advisor Scout",

package/src/ui/settings-mutations.ts

@@ -6,6 +6,7 @@ const BOOLEAN_SETTING_FIELDS = [
   "blockOnBlocked",
   "collapseResponses",
   "completionGate",
+  "disableSameModel",
   "failureGate",
   "herdrIntegration",
   "outcomeLogging",

package/src/ui/types.ts

@@ -74,6 +74,7 @@ export interface AdvisorSettings {
   completionGate: boolean;
   contextMaxChars: number;
   customRule?: string;
+  disableSameModel?: boolean;
   effort?: string;
   failureGate: boolean;
   failureMode?: GateFailureMode;