pi-advisor-flow 0.8.3 → 0.9.1

package/dist/index.js

@@ -52,6 +52,7 @@ var advisorPlanGateRef = true;
 var advisorFailureGateRef = true;
 var advisorCompletionGateRef = true;
 var advisorCustomInvocationRef;
+var advisorDisableSameModelRef = true;
 var advisorCollapseResponsesRef = false;
 var advisorBlockOnBlockedRef = true;
 var advisorAutoLoopGateRef = true;
@@ -122,6 +123,9 @@ var setAdvisorCompletionGateRef = (enabled) => {
 var setAdvisorCustomInvocationRef = (rule) => {
   advisorCustomInvocationRef = rule?.trim() || undefined;
 };
+var setAdvisorDisableSameModelRef = (enabled) => {
+  advisorDisableSameModelRef = enabled;
+};
 var setAdvisorCollapseResponsesRef = (enabled) => {
   advisorCollapseResponsesRef = enabled;
 };
@@ -238,6 +242,7 @@ var getAdvisorSettings = () => ({
   completionGate: advisorCompletionGateRef,
   contextMaxChars: contextMaxCharsRef,
   customRule: advisorCustomInvocationRef,
+  disableSameModel: advisorDisableSameModelRef,
   effort: advisorEffortRef,
   failureGate: advisorFailureGateRef,
   failureMode: advisorFailureModeRef,
@@ -487,6 +492,12 @@ var CONFIG_SCHEMA = {
     persisted: true,
     type: "string"
   },
+  advisorDisableSameModel: {
+    accepted: "true or false",
+    current: () => advisorDisableSameModelRef,
+    persisted: true,
+    type: "boolean"
+  },
   advisorEffort: {
     accepted: "a string",
     current: () => advisorEffortRef,
@@ -852,6 +863,7 @@ var resetDefaults = () => {
   setAdvisorFailureGateRef(true);
   setAdvisorCompletionGateRef(true);
   setAdvisorCustomInvocationRef(undefined);
+  setAdvisorDisableSameModelRef(true);
   setAdvisorCollapseResponsesRef(false);
   setAdvisorBlockOnBlockedRef(true);
   setAdvisorAutoLoopGateRef(true);
@@ -909,6 +921,7 @@ var applyConfig = (config) => {
   applyOptionalConfig(config, "advisorFailureGate", setAdvisorFailureGateRef);
   applyOptionalConfig(config, "advisorCompletionGate", setAdvisorCompletionGateRef);
   applyOptionalConfig(config, "advisorCustomInvocation", setAdvisorCustomInvocationRef);
+  applyOptionalConfig(config, "advisorDisableSameModel", setAdvisorDisableSameModelRef);
   applyOptionalConfig(config, "advisorCollapseResponses", setAdvisorCollapseResponsesRef);
   applyOptionalConfig(config, "advisorBlockOnBlocked", setAdvisorBlockOnBlockedRef);
   applyOptionalConfig(config, "advisorAutoLoopGate", setAdvisorAutoLoopGateRef);
@@ -1070,6 +1083,43 @@ var saveGlobalOutcomeLogging = (enabled) => {
   return path;
 };
 
+// src/tools/model-access.ts
+var currentModelRef = (ctx) => {
+  const { model } = ctx;
+  return model ? `${model.provider}/${model.id}` : undefined;
+};
+var advisorModelAccess = (ctx) => {
+  const modelRef = currentModelRef(ctx);
+  if (advisorModelWhitelistRef.length === 0) {
+    return modelRef ? { allowed: true, modelRef } : { allowed: true };
+  }
+  if (modelRef && advisorModelWhitelistRef.includes(modelRef)) {
+    return { allowed: true, modelRef };
+  }
+  const current = modelRef ?? "no current model";
+  const denial = {
+    allowed: false,
+    reason: `Advisor calls are restricted to the configured model whitelist (${advisorModelWhitelistRef.join(", ")}). Current model: ${current}.`
+  };
+  if (modelRef) {
+    denial.modelRef = modelRef;
+  }
+  return denial;
+};
+var sameModelAdvisorDisabled = (ctx, model = ctx.model) => {
+  if (!(advisorDisableSameModelRef && advisorRef && model)) {
+    return false;
+  }
+  const [provider, id] = splitRef(advisorRef);
+  return provider === model.provider && id === model.id;
+};
+var sameModelAdvisorNotice = "Advisor disabled: executor and advisor are the same model.";
+var advisorModelIsAllowed = (ctx) => advisorModelAccess(ctx).allowed && !sameModelAdvisorDisabled(ctx);
+var advisorModelAccessReason = (ctx) => {
+  const access = advisorModelAccess(ctx);
+  return access.allowed ? undefined : access.reason;
+};
+
 // src/commands/model-options.ts
 var DEFAULT_EFFORT_LEVEL = "Default (Model Default)";
 var SELECTED_PREFIX = "✓ ";
@@ -1710,7 +1760,7 @@ var herdrAdvisorActivity = new HerdrAdvisorActivity(sendToHerdr, () => getAdviso
 var herdrAdvisorBlock = new HerdrAdvisorBlock(sendToHerdr, () => getAdvisorSettings().herdrIntegration);
 
 // src/tools/consultation.ts
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 
 // src/model-stream.ts
 import { stream } from "@earendil-works/pi-ai/compat";
@@ -1859,6 +1909,9 @@ var collectTextStream = async (resolved, options, streamModel = stream) => {
   };
 };
 
+// src/tools/consult-context.ts
+import { randomUUID } from "node:crypto";
+
 // src/attachments.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { constants } from "node:fs";
@@ -1866,6 +1919,15 @@ import { lstat, open, realpath } from "node:fs/promises";
 import { isAbsolute, relative, resolve } from "node:path";
 var ADVISOR_FILE_MAX_BYTES = 8 * 1024;
 var ADVISOR_FILES_TOTAL_MAX_BYTES = 24 * 1024;
+var imageExtensions = new Map([
+  [".png", "image/png"],
+  [".jpg", "image/jpeg"],
+  [".jpeg", "image/jpeg"],
+  [".gif", "image/gif"],
+  [".webp", "image/webp"]
+]);
+var imageMime = (path) => imageExtensions.get(path.slice(path.lastIndexOf(".")).toLowerCase());
+var imageFileCandidate = (path) => Boolean(imageMime(path)) || /\.(?:avif|bmp|heic|svg|tiff?)$/iu.test(path);
 var PATH_SEGMENTS = /[\\/]/u;
 var within = (root, candidate) => {
   const path = relative(root, candidate);
@@ -1967,7 +2029,7 @@ var readFiles = async (cwd, requested, enabled, redact, kind, totalLimit = ADVIS
   let total = 0;
   for (const name of requested) {
     const normalizedName = normalizeRequestedPath(root, name);
-    if (!normalizedName || unique.has(normalizedName)) {
+    if (!normalizedName || unique.has(normalizedName) || imageFileCandidate(normalizedName)) {
       continue;
     }
     unique.add(normalizedName);
@@ -1991,8 +2053,399 @@ var readFiles = async (cwd, requested, enabled, redact, kind, totalLimit = ADVIS
 var readTrackedFiles = (cwd, requested, enabled, redact, totalLimit = ADVISOR_FILES_TOTAL_MAX_BYTES) => readFiles(cwd, requested, enabled, redact, "tracked", totalLimit);
 var readUntrackedFiles = (cwd, requested, enabled, redact, totalLimit = ADVISOR_FILES_TOTAL_MAX_BYTES) => readFiles(cwd, requested, enabled, redact, "untracked", totalLimit);
 
-// src/preferences.ts
+// src/image-attachments.ts
+import { constants as constants2 } from "node:fs";
 import { lstat as lstat2, open as open2, realpath as realpath2 } from "node:fs/promises";
+import { resolve as resolve2 } from "node:path";
+
+// src/images.ts
+import { createHash } from "node:crypto";
+
+// src/image-validation.ts
+import { inflateSync } from "node:zlib";
+var PNG_SIGNATURE = Buffer.from("89504e470d0a1a0a", "hex");
+var isPng = (bytes) => {
+  if (bytes.length < 57 || !bytes.subarray(0, 8).equals(PNG_SIGNATURE)) {
+    return false;
+  }
+  let offset = 8;
+  let hasHeader = false;
+  const compressed = [];
+  while (offset + 12 <= bytes.length) {
+    const length = bytes.readUInt32BE(offset);
+    if (length > bytes.length - offset - 12) {
+      return false;
+    }
+    const type = bytes.toString("ascii", offset + 4, offset + 8);
+    const data = offset + 8;
+    offset += length + 12;
+    if (!hasHeader) {
+      if (type !== "IHDR" || length !== 13 || bytes.readUInt32BE(data) === 0 || bytes.readUInt32BE(data + 4) === 0) {
+        return false;
+      }
+      hasHeader = true;
+    } else if (type === "IDAT") {
+      compressed.push(bytes.subarray(data, data + length));
+    } else if (type === "IEND") {
+      if (length !== 0 || offset !== bytes.length || !compressed.length) {
+        return false;
+      }
+      try {
+        return inflateSync(Buffer.concat(compressed), {
+          maxOutputLength: 32 * 1024 * 1024
+        }).length > 0;
+      } catch {
+        return false;
+      }
+    } else if (type === "IHDR") {
+      return false;
+    }
+  }
+  return false;
+};
+var isFrameMarker = (marker) => [
+  192,
+  193,
+  194,
+  195,
+  197,
+  198,
+  199,
+  201,
+  202,
+  203,
+  205,
+  206,
+  207
+].includes(marker);
+var nextScanMarker = (bytes, from) => {
+  let offset = from;
+  while (offset < bytes.length - 1) {
+    if (bytes[offset] !== 255) {
+      offset += 1;
+      continue;
+    }
+    let next = offset + 1;
+    while (bytes[next] === 255) {
+      next += 1;
+    }
+    if (bytes[next] !== 0 && (bytes[next] < 208 || bytes[next] > 215)) {
+      return offset;
+    }
+    offset = next + 1;
+  }
+  return bytes.length;
+};
+var readJpegSegment = (bytes, at) => {
+  if (bytes[at] !== 255) {
+    return;
+  }
+  let offset = at;
+  while (bytes[offset] === 255) {
+    offset += 1;
+  }
+  const marker = bytes[offset];
+  offset += 1;
+  if (marker === 217) {
+    return { end: offset, frame: false, marker, size: 0 };
+  }
+  if (offset + 2 > bytes.length || marker === 0) {
+    return;
+  }
+  const size = bytes.readUInt16BE(offset);
+  if (size < 2 || offset + size > bytes.length) {
+    return;
+  }
+  const frame = isFrameMarker(marker) && size >= 11 && bytes.readUInt16BE(offset + 3) > 0 && bytes.readUInt16BE(offset + 5) > 0;
+  return { end: offset + size, frame, marker, size };
+};
+var hasJpegEnvelope = (bytes) => bytes.length >= 24 && bytes[0] === 255 && bytes[1] === 216 && bytes.at(-2) === 255 && bytes.at(-1) === 217;
+var isJpeg = (bytes) => {
+  if (!hasJpegEnvelope(bytes)) {
+    return false;
+  }
+  let offset = 2;
+  let frame = false;
+  let scan = false;
+  let quantization = false;
+  let entropyTable = false;
+  while (offset < bytes.length) {
+    const segment = readJpegSegment(bytes, offset);
+    if (!segment) {
+      return false;
+    }
+    const { end, marker, size } = segment;
+    if (marker === 217) {
+      return frame && scan && end === bytes.length;
+    }
+    frame ||= segment.frame;
+    quantization ||= marker === 219;
+    entropyTable ||= marker === 196 || marker === 204;
+    offset = end;
+    if (marker === 218) {
+      if (!(frame && quantization && entropyTable && size >= 6)) {
+        return false;
+      }
+      const next = nextScanMarker(bytes, offset);
+      if (next <= offset) {
+        return false;
+      }
+      scan = true;
+      offset = next;
+    }
+  }
+  return false;
+};
+var skipGifBlocks = (bytes, at) => {
+  let offset = at;
+  while (offset < bytes.length) {
+    const length = bytes[offset];
+    offset += 1;
+    if (length === 0) {
+      return offset;
+    }
+    if (offset + length > bytes.length) {
+      return;
+    }
+    offset += length;
+  }
+};
+var gifColorTableEnd = (bytes, at, packed) => at + ((packed & 128) === 0 ? 0 : 3 * 2 ** ((packed & 7) + 1));
+var gifFrameEnd = (bytes, at) => {
+  if (at + 9 > bytes.length || bytes.readUInt16LE(at + 4) === 0 || bytes.readUInt16LE(at + 6) === 0) {
+    return;
+  }
+  const data = gifColorTableEnd(bytes, at + 9, bytes[at + 8]);
+  if (data + 2 >= bytes.length || bytes[data] < 2 || bytes[data] > 12 || bytes[data + 1] === 0) {
+    return;
+  }
+  return skipGifBlocks(bytes, data + 1);
+};
+var isGif = (bytes) => {
+  if (bytes.length < 20 || !["GIF87a", "GIF89a"].includes(bytes.toString("ascii", 0, 6)) || bytes.readUInt16LE(6) === 0 || bytes.readUInt16LE(8) === 0) {
+    return false;
+  }
+  let offset = gifColorTableEnd(bytes, 13, bytes[10]);
+  let frame = false;
+  while (offset < bytes.length) {
+    const block = bytes[offset];
+    offset += 1;
+    if (block === 59) {
+      return frame && offset === bytes.length;
+    }
+    if (block === 33 && offset < bytes.length) {
+      offset = skipGifBlocks(bytes, offset + 1) ?? bytes.length;
+    } else if (block === 44) {
+      const end = gifFrameEnd(bytes, offset);
+      if (end === undefined) {
+        return false;
+      }
+      frame = true;
+      offset = end;
+    } else {
+      return false;
+    }
+  }
+  return false;
+};
+var validWebpFrame = (bytes, type, data, length) => {
+  if (type === "VP8 ") {
+    return length >= 10 && bytes.toString("hex", data + 3, data + 6) === "9d012a" && (bytes.readUInt16LE(data + 6) & 16383) > 0 && (bytes.readUInt16LE(data + 8) & 16383) > 0;
+  }
+  if (type === "VP8L") {
+    return length >= 5 && bytes[data] === 47;
+  }
+  return type === "ANMF" && length >= 16;
+};
+var isWebp = (bytes) => {
+  if (bytes.length < 30 || bytes.toString("ascii", 0, 4) !== "RIFF" || bytes.toString("ascii", 8, 12) !== "WEBP" || bytes.readUInt32LE(4) !== bytes.length - 8) {
+    return false;
+  }
+  let offset = 12;
+  let frame = false;
+  while (offset + 8 <= bytes.length) {
+    const type = bytes.toString("ascii", offset, offset + 4);
+    const length = bytes.readUInt32LE(offset + 4);
+    const data = offset + 8;
+    const end = data + length + length % 2;
+    if (end > bytes.length) {
+      return false;
+    }
+    frame ||= validWebpFrame(bytes, type, data, length);
+    offset = end;
+  }
+  return frame && offset === bytes.length;
+};
+var detectImageFormat = (bytes) => {
+  if (isPng(bytes)) {
+    return "image/png";
+  }
+  if (isJpeg(bytes)) {
+    return "image/jpeg";
+  }
+  if (isGif(bytes)) {
+    return "image/gif";
+  }
+  if (isWebp(bytes)) {
+    return "image/webp";
+  }
+};
+
+// src/images.ts
+var ADVISOR_IMAGE_MAX_BYTES = 4 * 1024 * 1024;
+var ADVISOR_IMAGES_TOTAL_MAX_BYTES = 8 * 1024 * 1024;
+var ADVISOR_IMAGES_MAX_COUNT = 4;
+var imageFromBytes = (bytes, mimeType) => {
+  if (!bytes.length || bytes.length > ADVISOR_IMAGE_MAX_BYTES) {
+    return;
+  }
+  const actual = detectImageFormat(bytes);
+  if (!actual || mimeType && mimeType !== actual) {
+    return;
+  }
+  return { data: bytes.toString("base64"), mimeType: actual, type: "image" };
+};
+var imageFromPart = (part) => {
+  if (part.type !== "image" || !isString(part.data) || !isString(part.mimeType) || part.data.length > Math.ceil(ADVISOR_IMAGE_MAX_BYTES * 4 / 3) + 4 || !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u.test(part.data)) {
+    return;
+  }
+  const bytes = Buffer.from(part.data, "base64");
+  if (bytes.toString("base64") !== part.data) {
+    return;
+  }
+  return imageFromBytes(bytes, part.mimeType);
+};
+var imageMarker = (part, nonce = "") => {
+  if (part.type !== "image") {
+    return;
+  }
+  const image = imageFromPart(part);
+  if (!image) {
+    return "[Image omitted: unsupported format, invalid data, or over 4 MiB; pixels not reviewed]";
+  }
+  const id = createHash("sha256").update(nonce).update(image.data).digest("hex").slice(0, 24);
+  return `[Image ref=img_${id}; pixels reviewed only if attached below]`;
+};
+var eligibleImagePart = (part) => part.type === "image" && isString(part.data) && isString(part.mimeType);
+var entryImageCensus = (content, conversation, nonce, seen) => {
+  let parts = 0;
+  const selected = [];
+  for (const part of contentParts(content)) {
+    if (!isRecordOf(part)) {
+      continue;
+    }
+    if (eligibleImagePart(part)) {
+      parts += 1;
+    }
+    const marker = imageMarker(part, nonce);
+    if (!marker || seen.has(marker) || !conversation.includes(marker)) {
+      continue;
+    }
+    const image = imageFromPart(part);
+    if (image) {
+      seen.add(marker);
+      selected.push({ image, marker });
+    }
+  }
+  return { parts, selected };
+};
+var selectedConversationImages = (ctx, conversation, policies, selectedEntryIds, nonce) => {
+  if (!conversation) {
+    return { imagePartsSeen: 0, selected: [] };
+  }
+  const entries = selectedEntryIds ? ctx.sessionManager.buildContextEntries() : ctx.sessionManager.getBranch();
+  const images = [];
+  const seen = new Set;
+  let imagePartsSeen = 0;
+  for (const [index, entry] of entries.entries()) {
+    if (entry.type !== "message" || selectedEntryIds && !selectedEntryIds.has(entry.id ?? String(index))) {
+      continue;
+    }
+    const { message } = entry;
+    if (message.role !== "user" && message.role !== "toolResult") {
+      continue;
+    }
+    if (message.role === "toolResult" && (policies[message.toolName] ?? "full") !== "full") {
+      continue;
+    }
+    const census = entryImageCensus(message.content, conversation, nonce, seen);
+    imagePartsSeen += census.parts;
+    images.push(...census.selected);
+  }
+  return { imagePartsSeen, selected: images };
+};
+
+// src/image-attachments.ts
+var readImageAttachment = async (root, name, mimeType, remaining) => {
+  const absolute = resolve2(root, name);
+  if (!within(root, absolute)) {
+    return;
+  }
+  const stats = await lstat2(absolute);
+  if (stats.isSymbolicLink() || !stats.isFile()) {
+    return;
+  }
+  const resolved = await realpath2(absolute);
+  if (!within(root, resolved)) {
+    return;
+  }
+  const flags = constants2.O_NOFOLLOW ? constants2.O_RDONLY + constants2.O_NOFOLLOW : constants2.O_RDONLY;
+  const file = await open2(resolved, flags);
+  try {
+    const opened = await file.stat();
+    if (!opened.isFile() || opened.size > ADVISOR_IMAGE_MAX_BYTES || opened.size > remaining) {
+      return;
+    }
+    const buffer = Buffer.alloc(opened.size + 1);
+    const { bytesRead } = await file.read(buffer, 0, buffer.length, 0);
+    if (bytesRead !== opened.size) {
+      return;
+    }
+    const image = imageFromBytes(buffer.subarray(0, bytesRead), mimeType);
+    return image ? { bytes: bytesRead, image, path: name } : undefined;
+  } finally {
+    await file.close();
+  }
+};
+var readImageFiles = async (cwd, requested, enabled, kind, remainingBytes, remainingCount) => {
+  const names = Array.isArray(requested) ? requested.filter((path) => isString(path) && imageFileCandidate(path)) : [];
+  if (!enabled || !names.length) {
+    return { images: [], omitted: names.length };
+  }
+  const root = await repositoryRoot(cwd);
+  if (!root) {
+    return { images: [], omitted: names.length };
+  }
+  const seen = new Set;
+  const images = [];
+  let omitted = 0;
+  let bytes = 0;
+  for (const path of names) {
+    const name = normalizeRequestedPath(root, path);
+    if (name && seen.has(name)) {
+      continue;
+    }
+    if (name) {
+      seen.add(name);
+    }
+    try {
+      const mime = name && imageMime(name);
+      const image = name && mime && images.length < remainingCount && remainingBytes - bytes > 0 && isPermitted(root, name, kind) ? await readImageAttachment(root, name, mime, remainingBytes - bytes) : undefined;
+      if (image) {
+        images.push(image);
+        bytes += image.bytes;
+      } else {
+        omitted += 1;
+      }
+    } catch {
+      omitted += 1;
+    }
+  }
+  return { images, omitted };
+};
+
+// src/preferences.ts
+import { lstat as lstat3, open as open3, realpath as realpath3 } from "node:fs/promises";
 import { join as join2, relative as relative2 } from "node:path";
 var PREFERENCES_MAX_BYTES = 8 * 1024;
 var PREFERENCES_FILENAME = ["advisor-preferences", "md"].join(".");
@@ -2005,17 +2458,17 @@ var readProjectPreferences = async (ctx, maxBytes = PREFERENCES_MAX_BYTES, redac
     return;
   }
   try {
-    const root = await realpath2(ctx.cwd);
+    const root = await realpath3(ctx.cwd);
     const candidate = join2(ctx.cwd, ".pi", PREFERENCES_FILENAME);
-    const stats = await lstat2(candidate);
+    const stats = await lstat3(candidate);
     if (stats.isSymbolicLink() || !stats.isFile()) {
       return;
     }
-    const resolved = await realpath2(candidate);
+    const resolved = await realpath3(candidate);
     if (!inside(root, resolved)) {
       return;
     }
-    const file = await open2(resolved, "r");
+    const file = await open3(resolved, "r");
     try {
       const buffer = Buffer.alloc(maxBytes + 1);
       const { bytesRead } = await file.read(buffer, 0, buffer.length, 0);
@@ -2029,7 +2482,7 @@ var readProjectPreferences = async (ctx, maxBytes = PREFERENCES_MAX_BYTES, redac
 };
 
 // src/scout-groups.ts
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 
 // src/tool-result-cap.ts
 var OMITTED_MARKER = "[... omitted tool-result section ...]";
@@ -2108,6 +2561,7 @@ var textFromPart = (part) => {
 };
 var textFrom = (content) => contentParts(content).map(textFromPart).join(`
 `).trim();
+var imageNotes = (content, nonce) => contentParts(content).map((part) => isRecordOf(part) ? imageMarker(part, nonce) : undefined).filter(isString);
 var assistantEntry = (message, policies, redact) => {
   const parts = [];
   const text = textFrom(message.content);
@@ -2134,11 +2588,13 @@ var assistantEntry = (message, policies, redact) => {
   return parts.length > 0 ? `Executor: ${parts.join(`
 `)}` : undefined;
 };
-var toolResultEntry = (message, toolResultMaxLines, toolResultMaxBytes, policies, redact) => {
+var toolResultEntry = (message, toolResultMaxLines, toolResultMaxBytes, policies, redact, describeImages, imageNonce) => {
   const status = message.isError ? "error" : "success";
   const toolName = isString(message.toolName) ? message.toolName : "unknown";
   const policy = policies[toolName] ?? "full";
-  const source = textFrom(message.content);
+  const notes = describeImages ? imageNotes(message.content, imageNonce) : [];
+  const source = [textFrom(message.content), ...notes].filter(Boolean).join(`
+`);
   if (policy === "exclude") {
     return `[Tool Result for ${toolName}] (excluded by Advisor tool policy)`;
   }
@@ -2151,7 +2607,7 @@ var toolResultEntry = (message, toolResultMaxLines, toolResultMaxBytes, policies
   return `[Tool Result for ${toolName}] (${message.isError ? "Error " : ""}output):
 ${capped.content}`;
 };
-var conversationEntry = (entry, toolResultMaxLines, toolResultMaxBytes, policies, redact) => {
+var conversationEntry = (entry, toolResultMaxLines, toolResultMaxBytes, policies, redact, describeImages = false, imageNonce = "") => {
   if (!isRecordOf(entry)) {
     return;
   }
@@ -2163,14 +2619,16 @@ var conversationEntry = (entry, toolResultMaxLines, toolResultMaxBytes, policies
   }
   const { message } = entry;
   if (message.role === "user") {
-    const text = textFrom(message.content);
+    const notes = describeImages ? imageNotes(message.content, imageNonce) : [];
+    const text = [textFrom(message.content), ...notes].filter(Boolean).join(`
+`);
     return text ? `User: ${redact ? redactSecrets(text) : text}` : undefined;
   }
   if (message.role === "assistant") {
     return assistantEntry(message, policies, redact);
   }
   if (message.role === "toolResult" || message.role === "tool") {
-    return toolResultEntry(message, toolResultMaxLines, toolResultMaxBytes, policies, redact);
+    return toolResultEntry(message, toolResultMaxLines, toolResultMaxBytes, policies, redact, describeImages, imageNonce);
   }
 };
 var omissionMarker = (omitted) => `[Older context omitted: ${omitted} complete entr${omitted === 1 ? "y" : "ies"}]`;
@@ -2208,11 +2666,11 @@ var selectRecentEntries = (entries, maxChars) => {
   const prefix = `${marker}${separator}${newestTruncated}${separator}`;
   return `${prefix}${entries.at(-1)?.slice(0, Math.max(0, maxChars - prefix.length)) ?? ""}`.slice(0, maxChars);
 };
-var recentConversation = (ctx, maxChars = 15000, toolResultMaxLines = advisorToolResultMaxLinesRef, toolResultMaxBytes = advisorToolResultMaxBytesRef, policies = advisorToolPoliciesRef, redact = advisorRedactSecretsRef) => {
+var recentConversation = (ctx, maxChars = 15000, toolResultMaxLines = advisorToolResultMaxLinesRef, toolResultMaxBytes = advisorToolResultMaxBytesRef, policies = advisorToolPoliciesRef, redact = advisorRedactSecretsRef, describeImages = false, imageNonce = "") => {
   if (maxChars === 0) {
     return "";
   }
-  const entries = ctx.sessionManager.getBranch().map((entry) => conversationEntry(entry, toolResultMaxLines, toolResultMaxBytes, policies, redact)).filter((entry) => entry !== undefined);
+  const entries = ctx.sessionManager.getBranch().map((entry) => conversationEntry(entry, toolResultMaxLines, toolResultMaxBytes, policies, redact, describeImages, imageNonce)).filter((entry) => entry !== undefined);
   return selectRecentEntries(entries, maxChars);
 };
 
@@ -2312,7 +2770,7 @@ var labelFor = (kind, content) => {
   };
   return boundedLabel(`${prefix[kind]}: ${preview || "(no text)"}`);
 };
-var stableId = (index, entryIds, kind, content) => `g_${createHash("sha256").update(JSON.stringify([index, entryIds, kind, content])).digest("hex").slice(0, 16)}`;
+var stableId = (index, entryIds, kind, content) => `g_${createHash2("sha256").update(JSON.stringify([index, entryIds, kind, content])).digest("hex").slice(0, 16)}`;
 var groupWire = (group) => ({
   bytes: group.bytes,
   content: group.content,
@@ -2325,6 +2783,7 @@ var groupWireBytes = (group) => byteLength(JSON.stringify(groupWire(group)));
 var createGroup = (originalIndex, entryIds, kind, content, required) => ({
   bytes: byteLength(content),
   content,
+  entryIds,
   id: stableId(originalIndex, entryIds, kind, content),
   kind,
   label: labelFor(kind, content),
@@ -2341,7 +2800,7 @@ var pendingAdvisorArguments = (part) => {
   }
   return allowed;
 };
-var pendingInvocationDisclosure = (entry, invocationId, toolResultMaxLines, toolResultMaxBytes, policies, redact, disclosed) => {
+var pendingInvocationDisclosure = (entry, invocationId, toolResultMaxLines, toolResultMaxBytes, policies, redact, imageNonce, disclosed) => {
   if (!isRecord(entry.message)) {
     return disclosed;
   }
@@ -2352,7 +2811,7 @@ var pendingInvocationDisclosure = (entry, invocationId, toolResultMaxLines, tool
     }
     return { ...part, arguments: pendingAdvisorArguments(part) };
   });
-  return conversationEntry({ ...entry, message: { ...message, content } }, toolResultMaxLines, toolResultMaxBytes, policies, redact);
+  return conversationEntry({ ...entry, message: { ...message, content } }, toolResultMaxLines, toolResultMaxBytes, policies, redact, true, imageNonce);
 };
 var adjacentResultMismatch = (immediate, index, callIds, callOwners) => {
   if (immediate?.type === "message" && isRecord(immediate.message) && immediate.message.role === "toolResult" && isString(immediate.message.toolCallId) && !callIds.includes(immediate.message.toolCallId) && !callOwners.has(immediate.message.toolCallId)) {
@@ -2377,7 +2836,7 @@ var collectResults = (calls, callIds, index, resultsByCall, consumedResultIndexe
       return `Tool result at context entry ${resultMatch.index} conflicts with call ${callId}.`;
     }
     consumedResultIndexes.add(resultMatch.index);
-    const resultText = conversationEntry(resultMatch.entry, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact);
+    const resultText = conversationEntry(resultMatch.entry, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact, true, caps.imageNonce);
     if (resultText) {
       resultParts.push(resultText);
     }
@@ -2396,7 +2855,7 @@ var missingOutcome = (entry, index, entryId, disclosed, callIds, missing, result
       kind: "omitted"
     };
   }
-  const pendingDisclosed = pendingInvocationDisclosure(entry, currentInvocationId, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact, disclosed);
+  const pendingDisclosed = pendingInvocationDisclosure(entry, currentInvocationId, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact, caps.imageNonce, disclosed);
   return {
     group: createGroup(index, [entryId, ...resultEntryIds], "pending-invocation", [pendingDisclosed ?? disclosed, ...resultParts].join(`
 
@@ -2482,7 +2941,7 @@ var buildGroups = (entries, indexed, caps) => {
     if (!isRecord(entry)) {
       continue;
     }
-    const disclosed = conversationEntry(entry, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact);
+    const disclosed = conversationEntry(entry, caps.toolResultMaxLines, caps.toolResultMaxBytes, caps.policies, caps.redact, true, caps.imageNonce);
     if (!disclosed) {
       continue;
     }
@@ -2548,6 +3007,7 @@ ${synthesis.trim()}` : undefined;
 // src/scout-context.ts
 var resolveCaps = (options) => ({
   currentInvocationId: options.currentInvocationId,
+  imageNonce: options.imageNonce ?? "",
   maxConversationChars: options.maxConversationChars,
   maxGroupBytes: options.maxGroupBytes ?? SCOUT_GROUP_MAX_BYTES,
   maxGroups: options.maxGroups ?? SCOUT_MANIFEST_MAX_GROUPS,
@@ -2994,7 +3454,7 @@ var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = a
 };
 
 // src/scout-curation.ts
-var curateAdvisorConversation = async (ctx, legacyConversation, signal, onScout, enabled = advisorScoutEnabledRef, runScout = runAdvisorScout, currentInvocationId, maxChars) => {
+var curateAdvisorConversation = async (ctx, legacyConversation, signal, onScout, enabled = advisorScoutEnabledRef, runScout = runAdvisorScout, currentInvocationId, maxChars, imageNonce = "") => {
   if (!enabled) {
     return { conversation: legacyConversation };
   }
@@ -3003,6 +3463,7 @@ var curateAdvisorConversation = async (ctx, legacyConversation, signal, onScout,
   }
   const built = buildScoutManifest(ctx, {
     currentInvocationId,
+    imageNonce,
     maxConversationChars: maxChars,
     maxManifestBytes: SCOUT_MANIFEST_MAX_BYTES
   });
@@ -3027,11 +3488,13 @@ var curateAdvisorConversation = async (ctx, legacyConversation, signal, onScout,
   if (!outcome.ok && outcome.cancelled) {
     throw signal?.reason instanceof Error ? signal.reason : new Error("Advisor operation cancelled during Scout.");
   }
-  let conversation = legacyConversation;
   if (outcome.ok) {
-    conversation = maxChars === undefined ? outcome.conversation : reconstructScoutConversation(built.manifest, outcome.selection.selectedIds, outcome.selection.synthesis, maxChars);
+    const selected = new Set(outcome.selection.selectedIds);
+    const selectedEntryIds = built.manifest.groups.filter((group) => group.required || selected.has(group.id)).flatMap((group) => group.entryIds ?? []);
+    const conversation = maxChars === undefined ? outcome.conversation : reconstructScoutConversation(built.manifest, outcome.selection.selectedIds, outcome.selection.synthesis, maxChars);
+    return { conversation, scout: outcome, selectedEntryIds };
   }
-  return { conversation, scout: outcome };
+  return { conversation: legacyConversation, scout: outcome };
 };
 
 // src/tools/prompts.ts
@@ -3097,7 +3560,7 @@ var advisorRepositoryContext = (result, requested, allowed, budget) => {
 
 `);
 };
-var advisorRequestConversation = (ctx, maxChars = contextMaxCharsRef) => recentConversation(ctx, maxChars);
+var advisorRequestConversation = (ctx, maxChars = contextMaxCharsRef, describeImages = false, imageNonce = "") => recentConversation(ctx, maxChars, undefined, undefined, undefined, undefined, describeImages, imageNonce);
 var advisorInvocationGuidelines = () => {
   if (isSimpleMode()) {
     return [
@@ -3149,18 +3612,42 @@ var assembleConsultationContext = async (options) => {
   const changes = collectGitContext(ctx.cwd, level, gitBudget, advisorRedactSecretsRef ? redactSecrets : undefined);
   const changeText = advisorRepositoryContext(changes, options.gitContext ?? allowed, level, gitBudget);
   const conversationBudget = Math.max(0, contextMaxCharsRef - changeText.length);
-  const legacyConversation = advisorRequestConversation(ctx, conversationBudget);
-  const curated = await curateAdvisorConversation(ctx, legacyConversation, options.signal, options.onScout, advisorScoutEnabledRef, runAdvisorScout, options.currentInvocationId, conversationBudget);
+  const imageNonce = randomUUID();
+  const legacyConversation = advisorRequestConversation(ctx, conversationBudget, true, imageNonce);
+  const curated = await curateAdvisorConversation(ctx, legacyConversation, options.signal, options.onScout, advisorScoutEnabledRef, runAdvisorScout, options.currentInvocationId, conversationBudget, imageNonce);
   const preferences = await readProjectPreferences(ctx, ATTACHMENT_TEXT_MAX_BYTES, advisorRedactSecretsRef);
   const draftText = options.draft ? redactAndCapText(options.draft, ATTACHMENT_TEXT_MAX_BYTES, advisorRedactSecretsRef) : undefined;
   const untracked = await readUntrackedFiles(ctx.cwd, options.includeUntracked ?? [], advisorUntrackedContentRef, advisorRedactSecretsRef);
   const tracked = await readTrackedFiles(ctx.cwd, options.includeTracked ?? [], advisorTrackedFileContentRef, advisorRedactSecretsRef, Math.max(0, ATTACHMENTS_TOTAL_MAX_BYTES - untracked.reduce((sum, item) => sum + item.bytes, 0)));
+  const supportsImages = options.supportsImages ?? false;
+  const untrackedImages = await readImageFiles(ctx.cwd, options.includeUntracked ?? [], supportsImages && advisorUntrackedContentRef, "untracked", ADVISOR_IMAGES_TOTAL_MAX_BYTES, ADVISOR_IMAGES_MAX_COUNT);
+  const trackedImages = await readImageFiles(ctx.cwd, options.includeTracked ?? [], supportsImages && advisorTrackedFileContentRef, "tracked", ADVISOR_IMAGES_TOTAL_MAX_BYTES - untrackedImages.images.reduce((sum, item) => sum + item.bytes, 0), ADVISOR_IMAGES_MAX_COUNT - untrackedImages.images.length);
+  const images = [...untrackedImages.images, ...trackedImages.images].map((item) => ({
+    image: item.image,
+    label: `File ${JSON.stringify(item.path)}`
+  }));
+  let remainingBytes = ADVISOR_IMAGES_TOTAL_MAX_BYTES - [...untrackedImages.images, ...trackedImages.images].reduce((sum, item) => sum + item.bytes, 0);
+  let imageOmissions = untrackedImages.omitted + trackedImages.omitted;
+  const census = selectedConversationImages(ctx, curated.conversation, advisorToolPoliciesRef, curated.scout?.ok === true ? new Set(curated.selectedEntryIds) : undefined, imageNonce);
+  for (const item of census.selected) {
+    const bytes = Buffer.from(item.image.data, "base64").length;
+    if (!supportsImages || images.length >= ADVISOR_IMAGES_MAX_COUNT || bytes > remainingBytes) {
+      imageOmissions += 1;
+      continue;
+    }
+    remainingBytes -= bytes;
+    images.push({ image: item.image, label: item.marker });
+  }
   return {
     changeText,
     conversation: curated.conversation,
     draftText,
+    imageOmissions,
+    imagePartsSeen: census.imagePartsSeen,
+    images,
     preferences,
     scout: curated.scout,
+    supportsImages,
     tracked,
     untracked
   };
@@ -3263,35 +3750,6 @@ var adviceForGateText = (result) => `**Decision: ${result.decision}**
 
 ${result.markdown}`;
 
-// src/tools/model-access.ts
-var currentModelRef = (ctx) => {
-  const { model } = ctx;
-  return model ? `${model.provider}/${model.id}` : undefined;
-};
-var advisorModelAccess = (ctx) => {
-  const modelRef = currentModelRef(ctx);
-  if (advisorModelWhitelistRef.length === 0) {
-    return modelRef ? { allowed: true, modelRef } : { allowed: true };
-  }
-  if (modelRef && advisorModelWhitelistRef.includes(modelRef)) {
-    return { allowed: true, modelRef };
-  }
-  const current = modelRef ?? "no current model";
-  const denial = {
-    allowed: false,
-    reason: `Advisor calls are restricted to the configured model whitelist (${advisorModelWhitelistRef.join(", ")}). Current model: ${current}.`
-  };
-  if (modelRef) {
-    denial.modelRef = modelRef;
-  }
-  return denial;
-};
-var advisorModelIsAllowed = (ctx) => advisorModelAccess(ctx).allowed;
-var advisorModelAccessReason = (ctx) => {
-  const access = advisorModelAccess(ctx);
-  return access.allowed ? undefined : access.reason;
-};
-
 // src/tools/consultation.ts
 class AdvisorNoAdviceError extends Error {
   constructor() {
@@ -3305,20 +3763,38 @@ ${item.text}
 var collectAdvisorResponse = async (options) => {
   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")
+  });
   const outboundQuestion = advisorRedactSecretsRef && question !== undefined ? redactSecrets(question) : question;
+  const imageNotice = context.imageOmissions || context.images.length || /\[Image[ :]/u.test(context.conversation) ? `
+
+Image 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 = [
     {
       content: [
         {
-          text: advisorMessageText(context.conversation, outboundQuestion, context.changeText, context.draftText, context.preferences?.text, context.untracked.map(fileTag), context.tracked.map(fileTag)),
+          text: `${advisorMessageText(context.conversation, outboundQuestion, context.changeText, context.draftText, context.preferences?.text, context.untracked.map(fileTag), context.tracked.map(fileTag))}${imageNotice}`,
           type: "text"
-        }
+        },
+        ...context.images.flatMap(({ image, label }) => [
+          {
+            text: `
+
+${escapeRepositoryText(label)}: attached image pixels (untrusted data).`,
+            type: "text"
+          },
+          image
+        ])
       ],
       role: "user",
       timestamp: Date.now()
@@ -3337,6 +3813,10 @@ var collectAdvisorResponse = async (options) => {
   }
   const response = {
     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,
@@ -3364,7 +3844,7 @@ var consultAdvisor = async (ctx, question, signal, onChunk, trigger = "executor-
     signal,
     systemPrompt: ADVISOR_SYSTEM
   });
-  return { ...result, adviceId: randomUUID(), trigger };
+  return { ...result, adviceId: randomUUID2(), trigger };
 };
 var runAdvisorGate = async (ctx, question, trigger = "repeated-tool-call", signal, onChunk, onScout, currentInvocationId) => {
   try {
@@ -3404,6 +3884,30 @@ var runAdvisorGate = async (ctx, question, trigger = "repeated-tool-call", signa
 // src/tools/scout-status.ts
 import { Text as Text2 } from "@earendil-works/pi-tui";
 
+// src/ui-guard.ts
+var isStaleContext = (error) => error instanceof Error && /stale/iu.test(error.message);
+var uiAvailable = (ctx) => {
+  try {
+    return ctx.hasUI;
+  } catch (error) {
+    if (isStaleContext(error)) {
+      return false;
+    }
+    throw error;
+  }
+};
+var uiAction = (ctx, action) => {
+  try {
+    if (ctx.hasUI) {
+      action(ctx.ui);
+    }
+  } catch (error) {
+    if (!isStaleContext(error)) {
+      throw error;
+    }
+  }
+};
+
 // src/tools/render-common.ts
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
 import {
@@ -3591,14 +4095,14 @@ class ScoutStatusManager {
     }
   }
   update(ctx, token, event) {
-    if (this.#retired.has(token) || !ctx.hasUI) {
+    if (this.#retired.has(token) || !uiAvailable(ctx)) {
       return;
     }
     this.#known.add(token);
     if (event.type === "call" || event.type === "chunk") {
       this.#active.add(token);
       if (this.showStatus) {
-        ctx.ui.setStatus("advisor-scout", "Scout curating…");
+        uiAction(ctx, (ui) => ui.setStatus("advisor-scout", "Scout curating…"));
       }
       return;
     }
@@ -3608,10 +4112,10 @@ class ScoutStatusManager {
     this.#active.delete(token);
     this.#known.delete(token);
     this.#retired.add(token);
-    if (!(ctx.hasUI && this.showStatus)) {
+    if (!(uiAvailable(ctx) && this.showStatus)) {
       return;
     }
-    ctx.ui.setStatus("advisor-scout", this.#active.size > 0 ? "Scout curating…" : undefined);
+    uiAction(ctx, (ui) => ui.setStatus("advisor-scout", this.#active.size > 0 ? "Scout curating…" : undefined));
   }
   clear(ctx) {
     for (const token of this.#known) {
@@ -3619,8 +4123,8 @@ class ScoutStatusManager {
     }
     this.#known.clear();
     this.#active.clear();
-    if (ctx.hasUI && this.showStatus) {
-      ctx.ui.setStatus("advisor-scout", undefined);
+    if (this.showStatus) {
+      uiAction(ctx, (ui) => ui.setStatus("advisor-scout", undefined));
     }
   }
 }
@@ -4158,9 +4662,7 @@ var advisorSessionState = new AdvisorSessionState;
 
 // src/commands/runtime.ts
 var notify = (ctx, message, level) => {
-  if (ctx.hasUI) {
-    ctx.ui.notify(message, level);
-  }
+  uiAction(ctx, (ui) => ui.notify(message, level));
 };
 var reportManualBudgetExhausted = (ctx) => {
   const message = "Advisor call budget exhausted for this session.";
@@ -4168,9 +4670,7 @@ var reportManualBudgetExhausted = (ctx) => {
   notifyHerdrAdvisorFailure("Advisor budget exhausted", message);
 };
 var requestManualRender = (ctx) => {
-  if (ctx.hasUI) {
-    ctx.ui.setStatus("advisor-manual", undefined);
-  }
+  uiAction(ctx, (ui) => ui.setStatus("advisor-manual", undefined));
 };
 
 class CommandRuntime {
@@ -4187,6 +4687,7 @@ class CommandRuntime {
   manualProgressSequence = 0;
   pendingExecutorModelRef;
   suppressModelSelectionSync = false;
+  lastSameModelDisabled;
   constructor(pi, dependencies = {}) {
     this.pi = pi;
     this.advisorSessionState = dependencies.sessionState ?? advisorSessionState;
@@ -4197,6 +4698,21 @@ class CommandRuntime {
   flowEnabled() {
     return this.pi.getActiveTools().includes("ask_advisor");
   }
+  resetSameModelNotice() {
+    this.lastSameModelDisabled = undefined;
+  }
+  updateSameModelNotice(ctx, model = ctx.model) {
+    if (!this.flowEnabled()) {
+      return;
+    }
+    const disabled = sameModelAdvisorDisabled(ctx, model);
+    if (disabled && this.lastSameModelDisabled !== true) {
+      notify(ctx, sameModelAdvisorNotice, "info");
+    } else if (!disabled && this.lastSameModelDisabled === true) {
+      notify(ctx, "Advisor re-enabled: executor and advisor models differ.", "info");
+    }
+    this.lastSameModelDisabled = disabled;
+  }
   nextManualProgressId() {
     this.manualProgressSequence += 1;
     return `manual-${this.manualProgressSequence}`;
@@ -4210,9 +4726,7 @@ class CommandRuntime {
     }
   }
   updateAdvisorUsageStatus(ctx) {
-    if (ctx.hasUI) {
-      ctx.ui.setStatus("advisor-usage", getAdvisorSettings().showUsageFooter ? this.advisorSessionState.usageStatus() : undefined);
-    }
+    uiAction(ctx, (ui) => ui.setStatus("advisor-usage", getAdvisorSettings().showUsageFooter ? this.advisorSessionState.usageStatus() : undefined));
   }
 }
 var createCommandRuntime = (pi, dependencies = {}) => new CommandRuntime(pi, dependencies);
@@ -4338,12 +4852,14 @@ var activateAdvisor = async (runtime, args, ctx, announce = true) => {
       "record_advisor_outcome"
     ]);
   }
+  const activeModel = isMarkedSubagent() ? ctx.model : findConfiguredModel(ctx, executorRef);
+  runtime.updateSameModelNotice(ctx, activeModel);
   if (announce) {
     const activeExecutorRef = effectiveExecutorRef(ctx);
     const activeExecutorEffort = effectiveExecutorEffort(ctx);
     notify(ctx, `${ADVISOR_ACTIVATION_EXPLANATION}
 
-Advisor flow ready — Executor: ${activeExecutorRef} (thinking: ${activeExecutorEffort || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`, "info");
+Advisor flow ${sameModelAdvisorDisabled(ctx, activeModel) ? "configured" : "ready"} — Executor: ${activeExecutorRef} (thinking: ${activeExecutorEffort || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`, "info");
   }
 };
 
@@ -4351,10 +4867,13 @@ Advisor flow ready — Executor: ${activeExecutorRef} (thinking: ${activeExecuto
 var registerCommandLifecycle = (runtime, activateAdvisor) => {
   runtime.pi.on("session_start", async (_event, ctx) => {
     runtime.pendingExecutorModelRef = undefined;
+    runtime.resetSameModelNotice();
     try {
       loadConfig(ctx);
       if (alwaysOnRef) {
         await activateAdvisor("", ctx, false);
+      } else {
+        runtime.updateSameModelNotice(ctx);
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -4362,6 +4881,9 @@ var registerCommandLifecycle = (runtime, activateAdvisor) => {
     }
   });
   runtime.pi.on("model_select", (event, ctx) => {
+    if (!runtime.suppressModelSelectionSync) {
+      runtime.updateSameModelNotice(ctx, event.model);
+    }
     if (event.source !== "set" || runtime.suppressModelSelectionSync || isMarkedSubagent()) {
       return;
     }
@@ -5345,9 +5867,10 @@ var screeningSkipText = (outcome) => outcome.kind === "repeat" && outcome.reatta
 
 // src/commands/manual-consultation.ts
 var startManualConsultation = async (runtime, ctx, question, controller, scoutStatusToken, progress, gitContext) => {
+  const isPrintMode = ctx.mode === "print";
   progress.phase = "preparing";
   runtime.requestManualRender(ctx);
-  if (ctx.hasUI) {
+  if (uiAvailable(ctx)) {
     const timer = setInterval(() => {
       if (controller.signal.aborted || runtime.manualConsultations.get(controller) !== scoutStatusToken) {
         clearInterval(timer);
@@ -5412,7 +5935,7 @@ ${markdown}`,
       display: true
     }, {
       deliverAs: "steer",
-      triggerTurn: true
+      triggerTurn: !isPrintMode
     });
   } catch (error) {
     if (controller.signal.aborted) {
@@ -5437,7 +5960,7 @@ ${markdown}`,
         text: `**Advisor consultation failed:** ${message}`
       },
       display: true
-    }, { deliverAs: "steer", triggerTurn: true });
+    }, { deliverAs: "steer", triggerTurn: !isPrintMode });
     notify(ctx, `Advisor consultation failed: ${message}`, "error");
     notifyHerdrAdvisorFailure("Advisor consultation failed", message);
   } finally {
@@ -5464,6 +5987,10 @@ var registerManualCommand = (runtime) => {
       if (!loadCommandConfig(ctx)) {
         return;
       }
+      if (sameModelAdvisorDisabled(ctx)) {
+        notify(ctx, sameModelAdvisorNotice, "info");
+        return;
+      }
       const accessReason = advisorModelAccessReason(ctx);
       if (accessReason) {
         notify(ctx, accessReason, "warning");
@@ -5507,6 +6034,10 @@ var registerManualCommand = (runtime) => {
       } else {
         question = resolveAdvisorRequest(args);
       }
+      if (sameModelAdvisorDisabled(ctx)) {
+        notify(ctx, sameModelAdvisorNotice, "info");
+        return;
+      }
       if (!isSimpleMode()) {
         runtime.advisorSessionState.consumeCall();
       }
@@ -5523,7 +6054,15 @@ var registerManualCommand = (runtime) => {
       runtime.scoutStatus.register(scoutStatusToken);
       runtime.manualConsultations.set(controller, scoutStatusToken);
       runtime.pi.appendEntry?.("advisor-manual-call", { progressId, question });
-      startManualConsultation(runtime, ctx, question, controller, scoutStatusToken, progress, gitContext);
+      if (ctx.mode === "print") {
+        await startManualConsultation(runtime, ctx, question, controller, scoutStatusToken, progress, gitContext);
+        return;
+      }
+      (async () => {
+        try {
+          await startManualConsultation(runtime, ctx, question, controller, scoutStatusToken, progress, gitContext);
+        } catch {}
+      })();
     }
   });
 };
@@ -5561,6 +6100,7 @@ var registerModelCommands = (runtime) => {
         persistExecutor: true
       });
       runtime.pendingExecutorModelRef = undefined;
+      runtime.updateSameModelNotice(ctx);
       ctx.ui.notify(`Saved Executor + Advisor configurations to ${path}`, "info");
     }
   });
@@ -6320,7 +6860,7 @@ var 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;
   }
   items.push({
@@ -6329,7 +6869,7 @@ var createSettingsItems = ({
     id: "effort",
     label: "Advisor reasoning",
     values: withCurrentValue(currentEffort(settings.effort), effortLevels)
-  }, modelWhitelist, toggle("scoutEnabled", "Experimental Advisor Scout", "Enable the experimental Scout before Advisor calls.", settings.scoutEnabled, false), scoutTimeoutItem(settings), toggle("showUsageDetails", "Show usage and cost details", "Show token usage and cost details in Advisor responses.", settings.showUsageDetails, true), toggle("showUsageFooter", "Show usage in footer", "Show the current Advisor usage summary in the footer.", settings.showUsageFooter, false), toggle("planGate", "Plan gate", "Ask the Advisor to review implementation plans.", settings.planGate, true), toggle("failureGate", "Failure gate", "Ask the Advisor to review repeated failures.", settings.failureGate, true), toggle("completionGate", "Completion gate", "Ask the Advisor to review work before declaring success.", settings.completionGate, true), toggle("collapseResponses", "Collapse long responses", "Collapse long Advisor responses in the transcript.", settings.collapseResponses, false), {
+  }, 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", "Enable the experimental Scout before Advisor calls.", settings.scoutEnabled, false), scoutTimeoutItem(settings), toggle("showUsageDetails", "Show usage and cost details", "Show token usage and cost details in Advisor responses.", settings.showUsageDetails, true), toggle("showUsageFooter", "Show usage in footer", "Show the current Advisor usage summary in the footer.", settings.showUsageFooter, false), toggle("planGate", "Plan gate", "Ask the Advisor to review implementation plans.", settings.planGate, true), toggle("failureGate", "Failure gate", "Ask the Advisor to review repeated failures.", settings.failureGate, true), toggle("completionGate", "Completion gate", "Ask the Advisor to review work before declaring success.", settings.completionGate, true), toggle("collapseResponses", "Collapse long responses", "Collapse long Advisor responses in the transcript.", settings.collapseResponses, false), {
     currentValue: settings.customRule || "None",
     description: "Add a rule that triggers Advisor involvement.",
     id: "customRule",
@@ -6507,6 +7047,7 @@ var BOOLEAN_SETTING_FIELDS = [
   "blockOnBlocked",
   "collapseResponses",
   "completionGate",
+  "disableSameModel",
   "failureGate",
   "herdrIntegration",
   "outcomeLogging",
@@ -6779,6 +7320,7 @@ var applySessionSettings = (settings) => {
   setAdvisorPlanGateRef(settings.planGate);
   setAdvisorFailureGateRef(settings.failureGate);
   setAdvisorCompletionGateRef(settings.completionGate);
+  setAdvisorDisableSameModelRef(settings.disableSameModel ?? true);
   setAdvisorCollapseResponsesRef(settings.collapseResponses);
   setAdvisorCustomInvocationRef(settings.customRule);
   setAdvisorBlockOnBlockedRef(settings.blockOnBlocked ?? true);
@@ -6853,6 +7395,7 @@ var registerSettingsCommands = (runtime) => {
         onChange: (settings) => {
           try {
             saveAdvisorSettings(ctx, settings);
+            runtime.updateSameModelNotice(ctx);
             runtime.updateAdvisorUsageStatus(ctx);
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -6869,6 +7412,7 @@ var registerSettingsCommands = (runtime) => {
     description: "Disable on-demand Advisor calls; keep the current model",
     handler: (_args, ctx) => {
       runtime.pi.setActiveTools(runtime.pi.getActiveTools().filter((name) => name !== "ask_advisor" && name !== "record_advisor_outcome"));
+      runtime.resetSameModelNotice();
       const wasAlwaysOn = alwaysOnRef;
       if (wasAlwaysOn) {
         const persisted = getPersistedModelRefs();
@@ -6902,7 +7446,7 @@ import {
   chmod,
   link,
   mkdir,
-  open as open3,
+  open as open4,
   readFile,
   stat,
   unlink,
@@ -6964,7 +7508,7 @@ var withOutcomeLock = async (run) => {
   const lockPath = `${outcomeLogPath()}.lock`;
   for (let attempt = 0;attempt < 200; attempt += 1) {
     try {
-      const lock = await open3(lockPath, "wx", 384);
+      const lock = await open4(lockPath, "wx", 384);
       const identity = await lock.stat();
       try {
         return await run();
@@ -7147,7 +7691,7 @@ var handleJevTurnEnd = async (registration, ctx) => {
     });
     session.recordJevGateCheck(result.usage);
     const shouldConsult = composeTurnGateVerdict(result.answers, advisorJevTurnGateNoulThresholdRef);
-    if (!consumeTurnGateBudget(session, shouldConsult)) {
+    if (!advisorModelIsAllowed(ctx) || !consumeTurnGateBudget(session, shouldConsult)) {
       return;
     }
     const herdrActivity = registration.herdrActivity ?? herdrAdvisorActivity;
@@ -7214,17 +7758,30 @@ var syncRenderPhase = (context, phase) => {
   }
   context.state.phase = phase;
 };
+var formatByteSize = (bytes) => {
+  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`;
+};
 var attachmentLabels = (details) => [
-  details?.draftBytes ? `Draft attached · ${details.draftBytes} B` : undefined,
-  details?.preferenceBytes ? `Project preferences attached · ${details.preferenceBytes} B` : undefined,
-  details?.trackedBytes ? `Tracked files attached · ${details.trackedBytes} B` : undefined,
-  details?.untrackedBytes ? `Untracked files attached · ${details.untrackedBytes} B` : undefined
+  details?.draftBytes ? `Draft attached · ${formatByteSize(details.draftBytes)}` : undefined,
+  details?.preferenceBytes ? `Project preferences attached · ${formatByteSize(details.preferenceBytes)}` : undefined,
+  details?.trackedBytes ? `Tracked files attached · ${formatByteSize(details.trackedBytes)}` : undefined,
+  details?.untrackedBytes ? `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 !== undefined);
-var renderJevSkipBox = (box, result, expanded, theme) => {
+var renderSkipBox = (box, result, expanded, theme) => {
   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 Text5(lines.join(`
 `), 0, 0));
@@ -7239,7 +7796,14 @@ var renderPartialAdvisorResult = (box, result, expanded, theme, context) => {
   const scoutActive = scout?.status === "calling" || scout?.status === "streaming";
   syncRenderPhase(context, scoutActive ? "scout" : "advisor");
   if (!context.state.timerId) {
-    context.state.timerId = setInterval(() => context.invalidate(), 80);
+    context.state.timerId = setInterval(() => {
+      try {
+        context.invalidate();
+      } catch {
+        clearInterval(context.state.timerId);
+        context.state.timerId = undefined;
+      }
+    }, 80);
   }
   if (scout) {
     renderScoutDetails(box, scout, expanded, theme);
@@ -7286,8 +7850,8 @@ var renderFinalAdvisorResult = (box, result, expanded, theme, context) => {
     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) {
@@ -7353,7 +7917,22 @@ var registerAskAdvisorTool = ({
   pi.registerTool({
     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" }],
+          details: {
+            skipReason: sameModelAdvisorNotice,
+            text: sameModelAdvisorNotice
+          }
+        };
+      };
       try {
+        loadConfig(ctx);
+        if (sameModelAdvisorDisabled(ctx)) {
+          return skipSameModel();
+        }
         assertAdvisorModelAccess(ctx);
       } catch (error) {
         session.releaseCall(_id);
@@ -7398,6 +7977,9 @@ var registerAskAdvisorTool = ({
             }
           };
         }
+        if (sameModelAdvisorDisabled(ctx)) {
+          return skipSameModel();
+        }
         if (!simpleMode && !session.canConsult(getAdvisorMaxCallsPerSession(), _id)) {
           throw new Error("Advisor call budget exhausted for this session.");
         }
@@ -7460,6 +8042,10 @@ var 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,
@@ -7713,7 +8299,7 @@ var registerToolLifecycle = ({
       return;
     }
     loadConfig(ctx);
-    if (!advisorModelAccess(ctx).allowed) {
+    if (!advisorModelAccess(ctx).allowed || sameModelAdvisorDisabled(ctx)) {
       return;
     }
     const guidelines = advisorInvocationGuidelines();
@@ -7743,6 +8329,9 @@ ${guidelines.map((rule) => `- ${rule}`).join(`
     if (!loadConfigOrSkipGating(ctx)) {
       return;
     }
+    if (sameModelAdvisorDisabled(ctx)) {
+      return;
+    }
     const accessBlock = modelAccessBlock(event.toolName, ctx);
     if (accessBlock) {
       return accessBlock;