@quantiya/codevibe-core 2.0.49 → 2.0.51

package/dist/orchestration-shell/cli.js

@@ -1696,6 +1696,34 @@ function fileStoreHasCredentials() {
     return !1;
   }
 }
+function isKeytarBinaryMissing(loadError) {
+  return loadError !== null && /Cannot find module ['"][^'"]*keytar\.node['"]/.test(loadError);
+}
+function keytarInstallRoot() {
+  try {
+    let nodeRequire = eval("require"), packageDir = path4.dirname(nodeRequire.resolve("keytar/package.json"));
+    return path4.dirname(path4.dirname(packageDir));
+  } catch {
+    return null;
+  }
+}
+function keytarBinaryMissingMessage(loadError, installRoot, migratedToKeyring = !1) {
+  return [
+    "CodeVibe's keyring module (keytar) is installed without its native binary,",
+    "so CodeVibe cannot read the credentials it keeps in the OS keyring.",
+    "This is an incomplete installation, not a sign-in problem: `codevibe login`",
+    "will not fix it. Repair the module with:",
+    installRoot ? `  (cd "${installRoot}" && npm rebuild prebuild-install keytar)` : "  npm rebuild prebuild-install keytar   (in the directory whose node_modules holds keytar)",
+    "(`codevibe update` also repairs this for the Claude Code plugin.)",
+    // On a migrated machine the fail-closed guarantee must stay visible: file storage is
+    // retired here, and using it would fork the device identity.
+    ...migratedToKeyring ? ["Refusing to fall back to file storage \u2014 that would fork the device identity."] : [],
+    // First line only: Node appends a multi-line "Require stack" that buries the fix.
+    `(keytar load error: ${loadError.split(`
+`)[0]})`
+  ].join(`
+`);
+}
 function autoSelectFileBackend(reason) {
   warnToStderr([
     "",
@@ -1790,7 +1818,15 @@ function initBackends() {
       backend = "keytar", logger.info("[keychain-backend] Using keytar (migrated-to-keyring tombstone present)"), markKeytarUsed();
       return;
     }
-    keytarModule = null, initError = new KeychainBackendUnavailableError(
+    if (keytarModule = null, tombstoneKeytarError && isKeytarBinaryMissing(tombstoneKeytarError)) {
+      initError = new KeychainBackendUnavailableError(
+        keytarBinaryMissingMessage(tombstoneKeytarError, keytarInstallRoot(), !0)
+      ), logger.warn(
+        "[keychain-backend] migrated-to-keyring tombstone but keytar has no native binary \u2014 failing closed (incomplete installation)"
+      );
+      return;
+    }
+    initError = new KeychainBackendUnavailableError(
       [
         "This machine migrated its CodeVibe credentials to the OS keyring, but the",
         "keyring is not reachable in this session (no desktop session / D-Bus).",
@@ -1843,6 +1879,12 @@ function initBackends() {
     autoFileOrRefuse("keytar_load_failed");
     return;
   }
+  if (keytarLoadError && isKeytarBinaryMissing(keytarLoadError)) {
+    initError = new KeychainBackendUnavailableError(
+      keytarBinaryMissingMessage(keytarLoadError, keytarInstallRoot())
+    );
+    return;
+  }
   initError = new KeychainBackendUnavailableError(
     [
       "CodeVibe could not load the OS-native keyring (keytar).",
@@ -4659,6 +4701,20 @@ var RECONNECT_CONFIG = {
 function shouldDeliverSubscribedEvent(event, receiveDesktopEvents) {
   return !!(event.source === "MOBILE" /* MOBILE */ || receiveDesktopEvents && event.source === "DESKTOP" /* DESKTOP */);
 }
+var CREDENTIAL_STORAGE_UNAVAILABLE_EXIT_CODE = 78;
+function describeStoredAuthFailure(kind, detail) {
+  return kind === "credential_storage_unavailable" ? {
+    exitCode: CREDENTIAL_STORAGE_UNAVAILABLE_EXIT_CODE,
+    message: [
+      "CodeVibe could not read its stored credentials. This is not a sign-in problem.",
+      detail ?? "The credential store is unavailable."
+    ].join(`
+`)
+  } : kind === "refresh_network" ? {
+    exitCode: 1,
+    message: "Could not reach the CodeVibe sign-in service to refresh your session. Check your network connection and try again; you are still signed in."
+  } : { exitCode: 1, message: 'Not authenticated. Run "codevibe login" to sign in.' };
+}
 var DEFAULT_HEARTBEAT_INTERVAL_MS = 12e4, MIN_HEARTBEAT_INTERVAL_MS = 1e3, MAX_HEARTBEAT_INTERVAL_MS = 3e5;
 function isRecognizedNonProductionEnvironment(env = process.env) {
   let canonicalEnv = getEnvironment(env);
@@ -4685,6 +4741,11 @@ var AppSyncClient = class _AppSyncClient {
      * round-1 Codex M1.
      */
     this.lastAuthFailureKind = null;
+    /**
+     * The credential-store error message behind a `credential_storage_unavailable`
+     * failure (it names the cause and the fix). `null` for every other outcome.
+     */
+    this.lastAuthFailureDetail = null;
     /**
      * Sentinel set inside `performRefresh` / `callCognitoRefresh` when
      * the refresh round-trip fails with a network-shaped error (DNS,
@@ -4801,6 +4862,10 @@ var AppSyncClient = class _AppSyncClient {
   getLastAuthFailureKind() {
     return this.lastAuthFailureKind;
   }
+  /** The credential-store error message behind a `credential_storage_unavailable` failure. */
+  getLastAuthFailureDetail() {
+    return this.lastAuthFailureDetail;
+  }
   /**
    * Heuristic — does the error message look like a transient network
    * failure rather than an auth-token rejection? Used for refresh-path
@@ -4815,13 +4880,13 @@ var AppSyncClient = class _AppSyncClient {
    * Authenticate using stored OAuth tokens from keychain
    */
   async authenticateWithStoredTokens() {
-    this.lastAuthFailureKind = null;
+    this.lastAuthFailureKind = null, this.lastAuthFailureDetail = null;
     try {
       let tokens;
       try {
         tokens = await keychainManager.getTokens(this.environment);
       } catch (error) {
-        return logger.error("[AppSyncClient] Could not read stored authentication tokens:", error), this.lastAuthFailureKind = "credential_storage_unavailable", !1;
+        return logger.error("[AppSyncClient] Could not read stored authentication tokens:", error), this.lastAuthFailureKind = "credential_storage_unavailable", this.lastAuthFailureDetail = error instanceof Error ? error.message : String(error), !1;
       }
       if (!tokens)
         return logger.debug("[AppSyncClient] No stored tokens found"), this.lastAuthFailureKind = "no_tokens", !1;
@@ -5691,6 +5756,23 @@ var AppSyncClient = class _AppSyncClient {
       throw new Error("generatePlannerAdvisory: prompt ciphertext is required");
     if (input.prompt.length > 2e5)
       throw new Error(`generatePlannerAdvisory: prompt ciphertext exceeds 200,000 chars ceiling (${input.prompt.length})`);
+    if (input.images !== void 0) {
+      if (!Array.isArray(input.images))
+        throw new Error("generatePlannerAdvisory: images must be an array of string ciphertexts");
+      if (input.images.length > 5)
+        throw new Error(`generatePlannerAdvisory: images count exceeds maximum of 5 (got ${input.images.length})`);
+      let totalCiphertextLen = input.prompt.length;
+      for (let i = 0; i < input.images.length; i++) {
+        let imgCipher = input.images[i];
+        if (typeof imgCipher != "string" || imgCipher.trim().length === 0)
+          throw new Error(`generatePlannerAdvisory: image at index ${i} must be a non-empty string ciphertext`);
+        if (imgCipher.length > 27e5)
+          throw new Error(`generatePlannerAdvisory: image at index ${i} exceeds ciphertext limit of 2,700,000 chars (got ${imgCipher.length})`);
+        totalCiphertextLen += imgCipher.length;
+      }
+      if (totalCiphertextLen > 45e5)
+        throw new Error(`generatePlannerAdvisory: total request ciphertext exceeds 4,500,000 chars ceiling (${totalCiphertextLen})`);
+    }
     if (input.maxTokens !== void 0 && (input.maxTokens < 1 || input.maxTokens > 1536))
       throw new Error(`generatePlannerAdvisory: maxTokens must be between 1 and 1536 (got ${input.maxTokens})`);
     if (input.temperature !== void 0 && (input.temperature < 0 || input.temperature > 1))
@@ -17270,6 +17352,14 @@ function attachmentsToBase64(attachments, opts) {
   }
   return { images, failed };
 }
+function isBlindImageClarification(prompt, clarifyingQuestion) {
+  if (clarifyingQuestion && clarifyingQuestion.trim().length > 0) {
+    let q = clarifyingQuestion.toLowerCase();
+    return /what .*like me to do with the (screenshot|image)/i.test(q) || /what .*want me to do with the (screenshot|image)/i.test(q) || /how should i use (that|this) information/i.test(q) || /information from the (screenshot|image)/i.test(q) || /rephrase that as a specific command or request/i.test(q) || /cannot (see|view|read|inspect) (the )?(image|screenshot)/i.test(q) || /describe what you('d| would) like me to do with (the )?(screenshot|image)/i.test(q);
+  }
+  let p = prompt.toLowerCase();
+  return /what('s| is| do you see) (in |on )?(the |this )?(screenshot|image|picture)/i.test(p) || /what does (the |this )?(screenshot|image|picture) (show|contain|depict)/i.test(p) || /what (shape|color|text) is (in |on )?(this |the )?(image|screenshot)/i.test(p);
+}
 
 // src/orchestration-shell/slash-suggest.ts
 function isSlashCommandInProgress(value) {
@@ -20927,6 +21017,310 @@ function assembleParagraphs(paragraphs, indices, maxChars) {
 `);
   return result.length > maxChars ? result.slice(0, maxChars) : result;
 }
+var GENERIC_RELEVANCE_STOPWORDS = /* @__PURE__ */ new Set([
+  // Basic query, auxiliary, and question words
+  "what",
+  "when",
+  "where",
+  "which",
+  "who",
+  "whom",
+  "whose",
+  "why",
+  "how",
+  "this",
+  "that",
+  "these",
+  "those",
+  "there",
+  "their",
+  "theirs",
+  "here",
+  "about",
+  "above",
+  "below",
+  "from",
+  "with",
+  "within",
+  "without",
+  "under",
+  "over",
+  "have",
+  "having",
+  "has",
+  "had",
+  "been",
+  "would",
+  "could",
+  "should",
+  "might",
+  "must",
+  "more",
+  "most",
+  "some",
+  "many",
+  "much",
+  "also",
+  "just",
+  "only",
+  "other",
+  "such",
+  "does",
+  "did",
+  "doing",
+  "done",
+  "will",
+  "shall",
+  "can",
+  "cant",
+  "cannot",
+  "into",
+  "onto",
+  "upon",
+  "than",
+  "then",
+  "them",
+  "they",
+  "your",
+  "yours",
+  // Conversational verbs and common nouns
+  "explain",
+  "explanation",
+  "algorithm",
+  "algorithms",
+  "code",
+  "coding",
+  "function",
+  "functions",
+  "write",
+  "writing",
+  "create",
+  "build",
+  "make",
+  "implement",
+  "implementation",
+  "test",
+  "tests",
+  "testing",
+  "file",
+  "files",
+  "error",
+  "errors",
+  "run",
+  "running",
+  "use",
+  "using",
+  "work",
+  "works",
+  "working",
+  "difference",
+  "between",
+  "better",
+  "best",
+  "example",
+  "examples",
+  "help",
+  "please",
+  "know",
+  "want",
+  "need",
+  "like",
+  "good",
+  "bad",
+  "worse",
+  "worst",
+  "mean",
+  "means",
+  "problem",
+  "problems",
+  "issue",
+  "issues",
+  "question",
+  "questions",
+  "answer",
+  "answers",
+  "search",
+  "searching",
+  "read",
+  "reading",
+  "view",
+  "look",
+  "looks",
+  "looking",
+  "show",
+  "find",
+  "get",
+  "set",
+  "data",
+  "type",
+  "types",
+  "system",
+  "method",
+  "methods",
+  "class",
+  "classes",
+  "object",
+  "objects",
+  "program",
+  "programs",
+  "language",
+  "languages",
+  "value",
+  "values",
+  "script",
+  "prompt",
+  "model",
+  "query",
+  "input",
+  "output",
+  "state",
+  "process",
+  "node",
+  "call",
+  // Conversational follow-ups, speaking, evaluation & opinions
+  "say",
+  "says",
+  "said",
+  "saying",
+  "tell",
+  "tells",
+  "told",
+  "sound",
+  "sounds",
+  "sounding",
+  "think",
+  "thinks",
+  "thinking",
+  "thought",
+  "thoughts",
+  "opinion",
+  "opinions",
+  "take",
+  "takes",
+  "critique",
+  "critiques",
+  "perspective",
+  "perspectives",
+  "viewpoint",
+  "viewpoints",
+  "summary",
+  "summarize",
+  "summarizes",
+  "summarizing",
+  "takeaway",
+  "takeaways",
+  "key",
+  "keys",
+  "pros",
+  "cons",
+  "pro",
+  "con",
+  "detail",
+  "details",
+  "information",
+  "info",
+  // Shopping, consumer evaluation, and general follow-up adjectives
+  "worth",
+  "buy",
+  "buys",
+  "buying",
+  "bought",
+  "purchase",
+  "purchasing",
+  "purchases",
+  "cost",
+  "costs",
+  "costing",
+  "price",
+  "prices",
+  "pricing",
+  "expensive",
+  "cheap",
+  "recommend",
+  "recommends",
+  "recommended",
+  "recommendation",
+  "recommendations",
+  "scratches",
+  "scratch",
+  "scratching",
+  "easily",
+  "easy",
+  "hard",
+  "completely",
+  "thing",
+  "things",
+  "item",
+  "items",
+  "stuff",
+  "possible",
+  "possibility",
+  "reverse",
+  "reversing",
+  "place",
+  "places",
+  // Page / Document references and meta-terms
+  "page",
+  "pages",
+  "article",
+  "articles",
+  "site",
+  "sites",
+  "website",
+  "websites",
+  "url",
+  "urls",
+  "webpage",
+  "webpages",
+  "document",
+  "documents",
+  "post",
+  "posts",
+  "blog",
+  "blogs",
+  "review",
+  "reviews",
+  "author",
+  "writer",
+  "writers",
+  "wrote",
+  "source",
+  "sources",
+  "results",
+  "result",
+  "findings",
+  "finding"
+]);
+function isPromptRelevantToRetainedPage(prompt, retainedPage) {
+  if (!retainedPage || !retainedPage.text || retainedPage.text.trim().length === 0)
+    return !1;
+  let cleanPrompt = (prompt || "").trim();
+  if (!cleanPrompt) return !1;
+  let pageTitle = (retainedPage.title || "").toLowerCase(), pageUrl = (retainedPage.url || "").toLowerCase(), DEICTIC_PHRASE_REGEX = /\b(this|that|the|current)\s+(?:web\s+)?(page|article|site|website|url|link|post|webpage|document|blog|review)\b/i, PREPOSITIONAL_PAGE_REGEX = /\b(from|on|in)\s+(the|this|that)\s+(?:web\s+)?(page|article|site|website|post|document|link|webpage)\b/i, AUTHOR_REF_REGEX = /\b(author|who wrote|who is the author)\b/i, CJK_DEICTIC_REGEX = /(这篇文章|该文章|这个网页|该网页|这个页面|该页面|这个网站|该网站|原文|作者|出处)/, CJK_EVALUATIVE_FOLLOWUP_REGEX = /(总结|概括|看法|观点|优缺点|评价|详细说说|你怎么看)/;
+  if (DEICTIC_PHRASE_REGEX.test(cleanPrompt) || PREPOSITIONAL_PAGE_REGEX.test(cleanPrompt) || AUTHOR_REF_REGEX.test(cleanPrompt) || CJK_DEICTIC_REGEX.test(cleanPrompt) || CJK_EVALUATIVE_FOLLOWUP_REGEX.test(cleanPrompt))
+    return !0;
+  function tokenMatchesWordStart(token, text2) {
+    if (!text2) return !1;
+    if (/[\u4e00-\u9fff\u3040-\u30ff\uac00-\ud7af]/.test(token))
+      return text2.includes(token);
+    let escaped = escapeRegex2(token);
+    return /^[a-zA-Z0-9_]+$/.test(token) ? new RegExp(`\\b${escaped}`, "i").test(text2) : new RegExp(`(?<=^|[\\s\\p{P}])${escaped}`, "gui").test(text2);
+  }
+  let distinctiveTokens = extractQueryTokens(cleanPrompt).filter(
+    (t) => t.length >= 3 && !GENERIC_RELEVANCE_STOPWORDS.has(t.toLowerCase())
+  ), matchingTokens = distinctiveTokens.filter(
+    (token) => tokenMatchesWordStart(token, pageTitle) || tokenMatchesWordStart(token, pageUrl) || tokenMatchesWordStart(token, retainedPage.text || "")
+  );
+  if (distinctiveTokens.length > 0 && matchingTokens.length === 0)
+    return !1;
+  let SUMMARY_FOLLOWUP_REGEX = /\b(summarize|summary|takeaways?|tl;?dr)\b|\b(pros\s+and\s+cons|pros|cons)(\s*\?|\s*$|\s+(of|about)\s+(it|this|that|them|the\s+(page|article|site|website|post|document|device|product|phone|display)))/i, OPINION_FOLLOWUP_REGEX = /\b(your\s+(opinion|thoughts?|take|critique|perspective))\b/i, THINK_FOLLOWUP_REGEX = /\bwhat do you think(\?|$|\s+(about|of)\s+(it|this|that|them|the\s+(page|article|site|website|post|document|device|product|phone|display)))/i, PRONOUN_FOLLOWUP_REGEX = /\b(is|does|can|will|should|would)\s+it\b/i, ABOUT_IT_REGEX = /\b(about|of)\s+(it|this|them)\b/i, TELL_ME_MORE_REGEX = /\b(tell me more|more details)\b/i;
+  if ((SUMMARY_FOLLOWUP_REGEX.test(cleanPrompt) || OPINION_FOLLOWUP_REGEX.test(cleanPrompt) || THINK_FOLLOWUP_REGEX.test(cleanPrompt) || PRONOUN_FOLLOWUP_REGEX.test(cleanPrompt) || ABOUT_IT_REGEX.test(cleanPrompt) || TELL_ME_MORE_REGEX.test(cleanPrompt)) && (distinctiveTokens.length === 0 || matchingTokens.length >= 2 || matchingTokens.some((t) => t.length >= 6) || matchingTokens.length >= 1 && matchingTokens.length / distinctiveTokens.length >= 0.5))
+    return !0;
+  for (let token of distinctiveTokens)
+    if (pageTitle.length > 0 && tokenMatchesWordStart(token, pageTitle) || pageUrl.length > 0 && tokenMatchesWordStart(token, pageUrl))
+      return !0;
+  return distinctiveTokens.length === 0 ? !1 : matchingTokens.length >= 2 || matchingTokens.some((t) => t.length >= 6);
+}
 
 // src/orchestration-shell/web/fetch.ts
 var http2 = __toESM(require("node:http")), https3 = __toESM(require("node:https")), dns2 = __toESM(require("node:dns")), zlib = __toESM(require("node:zlib")), import_node_string_decoder = require("node:string_decoder");
@@ -71309,7 +71703,7 @@ async function routeReadOnlyAgentMention(args) {
       localOnly: !0
     });
   }
-  let retainedPage = args.retainedPage !== void 0 ? args.retainedPage : getFreshRetainedBrowsePage(retainedBrowsePages, sessionId), hasRetainedPage = !!(retainedPage && retainedPage.text.trim().length > 0), preparedBrief = composeBrainstormPanelBrief({
+  let rawRetainedPage = args.retainedPage !== void 0 ? args.retainedPage : getFreshRetainedBrowsePage(retainedBrowsePages, sessionId), retainedPage = rawRetainedPage && (args.retainedPage !== void 0 || isPromptRelevantToRetainedPage(requestBrief, rawRetainedPage)) ? rawRetainedPage : null, hasRetainedPage = !!(retainedPage && retainedPage.text.trim().length > 0), preparedBrief = composeBrainstormPanelBrief({
     priorContext,
     requestBrief,
     retainedPage
@@ -72275,14 +72669,6 @@ async function routeBrainstorm(deps) {
       return;
     }
     let isHostedBrainstorm = args.localAdvisoryRunner.providerKind === "hosted";
-    if (images && images.length > 0 && isHostedBrainstorm) {
-      store.dispatch({
-        type: "SHELL_ADVISORY",
-        source: "shell",
-        text: "The local CodeVibe model is required to analyze attached images during brainstorming. Enable it with `codevibe model install` from a Pro/Max account, then ask again. No hosted model was called and no code was changed."
-      });
-      return;
-    }
     store.dispatch({
       type: "SHELL_ADVISORY",
       source: "shell",
@@ -72363,18 +72749,10 @@ async function routeAdvisory(deps) {
     return;
   }
   let isHostedAdvisory = args.localAdvisoryRunner.providerKind === "hosted";
-  if (hasImages && isHostedAdvisory) {
-    store.dispatch({
-      type: "SHELL_ADVISORY",
-      source: "shell",
-      text: "The local CodeVibe model is required to analyze an attached image. Enable it with `codevibe model install` from a Pro/Max account, then ask again. No hosted model was called and no code was changed."
-    });
-    return;
-  }
   store.dispatch({
     type: "SHELL_ADVISORY",
     source: "shell",
-    text: hasImages ? "Analyzing the attached image(s) with local Gemma\u2026" : isHostedAdvisory ? "Answering with hosted Gemma\u2026" : "Answering with local Gemma\u2026"
+    text: hasImages ? isHostedAdvisory ? "Analyzing the attached image(s) with hosted Gemma\u2026" : "Analyzing the attached image(s) with local Gemma\u2026" : isHostedAdvisory ? "Answering with hosted Gemma\u2026" : "Answering with local Gemma\u2026"
   });
   let MAX_ADVISORY_CLARIFICATIONS = 4, MAX_ADVISORY_CLARIFICATION_QUESTION_CHARS = 400, MAX_ADVISORY_CLARIFICATION_ANSWER_CHARS = 1e3, MAX_ADVISORY_CANONICAL_CONTEXT_CHARS = 6e3, MAX_ADVISORY_USER_PROMPT_CHARS = 4e3, MAX_ADVISORY_PROMPT_CHARS = 42e3, MAX_ADVISORY_PAGE_CHARS = 24e3, MAX_ADVISORY_STATUS_CHARS = 1500, MAX_ADVISORY_PAGE_TOKENS = 6e3, MAX_ADVISORY_PROMPT_TOKENS = 13500, statusText = "";
   try {
@@ -72384,7 +72762,7 @@ async function routeAdvisory(deps) {
     statusText = "";
   }
   let retainedPage = deps.retainedPage, pageText = "";
-  if (retainedPage && retainedPage.text.trim().length > 0) {
+  if (retainedPage && retainedPage.text.trim().length > 0 && isPromptRelevantToRetainedPage(userPrompt, retainedPage)) {
     let relevant = extractQueryRelevantSnippets(retainedPage.text, userPrompt, {
       maxChars: MAX_ADVISORY_PAGE_CHARS - 100
     });
@@ -72396,7 +72774,7 @@ async function routeAdvisory(deps) {
     canonicalContextText = rawContext.length > MAX_ADVISORY_CANONICAL_CONTEXT_CHARS ? `[older context omitted]
 ` + rawContext.slice(-MAX_ADVISORY_CANONICAL_CONTEXT_CHARS) : rawContext;
   }
-  let sanitizedUserPrompt = redactAbsoluteLocalPaths(userPrompt.trim()), boundedUserPrompt = sanitizedUserPrompt.length > MAX_ADVISORY_USER_PROMPT_CHARS ? sanitizedUserPrompt.slice(0, MAX_ADVISORY_USER_PROMPT_CHARS) + "\u2026" : sanitizedUserPrompt, advisoryClarifications = [];
+  let sanitizedUserPrompt = redactAbsoluteLocalPaths(userPrompt.trim()), effectiveUserPrompt = hasImages && sanitizedUserPrompt.replace(/\[Image #\d+\]/g, "").trim().length === 0 ? "Describe what is shown in the attached image(s)." : sanitizedUserPrompt, boundedUserPrompt = effectiveUserPrompt.length > MAX_ADVISORY_USER_PROMPT_CHARS ? effectiveUserPrompt.slice(0, MAX_ADVISORY_USER_PROMPT_CHARS) + "\u2026" : effectiveUserPrompt, advisoryClarifications = [];
   if (deps.clarifications && deps.clarifications.length > 0) {
     let sanitized = deps.clarifications.map((c) => {
       let q = redactAbsoluteLocalPaths(c.question.trim()), a = redactAbsoluteLocalPaths(c.answer.trim());
@@ -72484,7 +72862,7 @@ async function routeAdvisory(deps) {
       chars: prompt.length
     }), pageText = "", prompt = buildPrompt());
   }
-  let advisoryRunner = args.localAdvisoryRunner, generate2 = (p) => advisoryRunner.generateAdvisory(p, {
+  let advisoryRunner = args.localAdvisoryRunner, beforeProviderKind = advisoryRunner.providerKind, generate2 = (p) => advisoryRunner.generateAdvisory(p, {
     responseFormat: "text",
     numPredict: 1400,
     ...images.length > 0 ? { images } : {}
@@ -72499,6 +72877,12 @@ async function routeAdvisory(deps) {
       else
         throw err;
     }
+    let afterProviderKind = advisoryRunner.providerKind;
+    beforeProviderKind !== "hosted" && afterProviderKind === "hosted" && store.dispatch({
+      type: "SHELL_ADVISORY",
+      source: "shell",
+      text: hasImages ? "Local model unavailable; falling back to hosted Gemma for image analysis. No code was changed." : "Local model unavailable; falling back to hosted Gemma. No code was changed."
+    });
     let answer = sanitizeForTerminal(raw.trim());
     if (answer) {
       store.dispatch({
@@ -72525,11 +72909,25 @@ async function routeAdvisory(deps) {
       text: hasImages ? `${modelNoun} returned no answer for the attached image(s). ${trustLine}` : `${modelNoun} returned an empty answer. Try rephrasing with a bit more detail. ${trustLine}`
     });
   } catch (err) {
-    logger.warn("[orchestration-shell] local advisory failed", {
+    let afterProviderKind = args.localAdvisoryRunner.providerKind;
+    beforeProviderKind !== "hosted" && afterProviderKind === "hosted" && store.dispatch({
+      type: "SHELL_ADVISORY",
+      source: "shell",
+      text: hasImages ? "Local model unavailable; falling back to hosted Gemma for image analysis. No code was changed." : "Local model unavailable; falling back to hosted Gemma. No code was changed."
+    }), logger.warn("[orchestration-shell] local advisory failed", {
       error: err.message,
       hasImages,
       runtimeLabel: args.localAdvisoryRunner.runtimeLabel
     });
+    let errMsg = err?.message ?? "";
+    if (hasImages && /exceeds size limit|image limit exceeded|maximum 5 images|exceeds backend limit|exceeds ciphertext limit|total request ciphertext/i.test(errMsg)) {
+      store.dispatch({
+        type: "SHELL_ADVISORY",
+        source: "shell",
+        text: `Unable to analyze image: ${errMsg} No code was changed.`
+      });
+      return;
+    }
     let fallback = deps.fallbackSummary?.trim(), effectiveIsHosted = args.localAdvisoryRunner.providerKind === "hosted", modelLabel = effectiveIsHosted ? "Hosted Gemma" : "Local Gemma", trustLine = effectiveIsHosted ? "No code was changed." : "No hosted model was called and no code was changed.", generationScope = effectiveIsHosted ? "hosted" : "local";
     if (fallback) {
       let reason = renderLocalBrainstormFailureReason(err);
@@ -73903,18 +74301,21 @@ async function handleShellUserInput(deps) {
     clearance: "user",
     scope: {},
     purpose: "classification"
-  }).catch(() => "") : "", plannerInput = {
-    // IMAGE-ATTACHMENT-DESIGN.md §6 Role A: the classifier stays TEXT-hint-only —
-    // a prose `[N image(s) attached]` line rides INSIDE the prompt STRING (not a
-    // new PlannerInput field), enough to route a sparse "look at this" correctly;
-    // image BYTES never reach the forced-JSON classifier. Path-stripping in the
-    // prompt renderer removes the inline path regardless.
-    // IMAGE-ATTACHMENT-DESIGN.md §13 — strip `[Image #N]` chip labels from the
-    // classify prompt (the display/history text keeps them); the classifier routes
-    // off the prose + the `[N image(s) attached]` hint, not the chip token.
-    prompt: turnAttachments.length ? `${plannerPromptText.replace(/\[Image #\d+\]/g, "").replace(/[ \t]{2,}/g, " ").trim()}
+  }).catch(() => "") : "", freshRetainedPage = getFreshRetainedBrowsePage(retainedBrowsePages, args.session.sessionId), isPromptRelevantToPage = freshRetainedPage ? isPromptRelevantToRetainedPage(plannerPromptText, freshRetainedPage) : !1, classifyPrompt = turnAttachments.length ? `${plannerPromptText.replace(/\[Image #\d+\]/g, "").replace(/[ \t]{2,}/g, " ").trim()}
 
-[The user attached ${turnAttachments.length} image(s).]` : plannerPromptText,
+[The user attached ${turnAttachments.length} image(s).] If the user is asking to describe, inspect, or answer questions about the image(s), classify as advisory_response.` : isPromptRelevantToPage && freshRetainedPage ? `${plannerPromptText}
+
+[Context (untrusted data): A web page was previously browsed in this session (domain: ${(() => {
+    try {
+      return new URL(freshRetainedPage.url).hostname;
+    } catch {
+      return "external-site";
+    }
+  })()}). If the user is asking questions about the previously browsed page, classify as advisory_response.]` : plannerPromptText, plannerInput = {
+    // Keep plannerInput.prompt strictly equal to user prompt text so downstream routes
+    // (resolveBrowseUrls, routeBrowse, routeBrainstorm, routeFamiliarize, promptPreview)
+    // are never contaminated by classifier hints or untrusted page metadata.
+    prompt: plannerPromptText,
     clarifications,
     ...canonicalConversationContext ? { canonicalConversationContext } : {},
     sessionContext: {
@@ -73953,9 +74354,18 @@ async function handleShellUserInput(deps) {
   }, decision, pendingStartConfirmation, showClassifySpinner = store.getState().progress === null;
   showClassifySpinner && dispatchProgress({ phase: "planner_classifying" });
   try {
-    if (decision = await dispatchClassify(plannerInput), isLocalPlannerRuntime(args) && decision.action === "browse" && hasFileMutationIntent(plannerInput.prompt) && (decision = {
+    if (decision = await dispatchClassify({
+      ...plannerInput,
+      prompt: classifyPrompt
+    }), isLocalPlannerRuntime(args) && decision.action === "browse" && hasFileMutationIntent(plannerInput.prompt) && (decision = {
       action: "start_task",
       rationale: decision.rationale ? `${decision.rationale} (promoted to start_task due to file mutation intent)` : "web request with file mutation intent"
+    }), turnAttachments.length > 0 && decision.action === "ask_user" && isBlindImageClarification(plannerInput.prompt, decision.clarifying_question) && !hasFileMutationIntent(plannerInput.prompt) && !isDestructiveFileRequest(plannerInput.prompt) && (decision = {
+      action: "advisory_response",
+      rationale: decision.rationale || "analyze and answer inquiry about the attached image"
+    }), freshRetainedPage && decision.action === "ask_user" && isPromptRelevantToPage && !hasFileMutationIntent(plannerInput.prompt) && !isDestructiveFileRequest(plannerInput.prompt) && (decision = {
+      action: "advisory_response",
+      rationale: decision.rationale || "answer inquiry using retained web page context"
     }), isLocalPlannerRuntime(args) && decision.action === "start_task" && plannerInput.clarifications.length === 0 && isDestructiveFileRequest(plannerInput.prompt))
       logger.warn(
         "[orchestration-shell] P43 backstop: a destructive file request was classified start_task without a confirmation this turn; asking first",
@@ -75800,21 +76210,35 @@ var HostedGemmaAdvisoryRunner = class {
     this.providerKind = "hosted";
   }
   async generateAdvisory(promptText, options) {
-    if (options?.images && options.images.length > 0)
-      throw new Error(
-        "HostedGemmaAdvisoryRunner: image attachments are not supported by hosted Bedrock Gemma. A local vision model is required."
-      );
     let sessionId = this.deps.activeSessionIdHolder.value;
     if (!sessionId)
       throw new Error("Hosted Gemma advisory generation failed: no active session ID");
     let sessionKey = await this.deps.sessionKeyResolver.getSessionKey(sessionId);
     if (!sessionKey)
       throw new Error(`Hosted Gemma advisory generation failed: session key unresolved for session ${sessionId}`);
-    let encryptedPrompt = this.deps.crypto.encryptString(promptText, sessionKey), maxTokens = options?.numPredict, temperature = options?.temperature, start = Date.now();
+    let encryptedPrompt = this.deps.crypto.encryptString(promptText, sessionKey), encryptedImages;
+    if (options?.images && options.images.length > 0) {
+      if (options.images.length > 5)
+        throw new Error(
+          `Hosted Gemma image limit exceeded: at most 5 images are supported (received ${options.images.length}).`
+        );
+      for (let i = 0; i < options.images.length; i++) {
+        let img = options.images[i];
+        if (typeof img != "string" || img.trim().length === 0)
+          throw new Error(`Hosted Gemma image at index ${i} is empty or invalid.`);
+        if (img.length > 2e6)
+          throw new Error(
+            `Hosted Gemma image at index ${i} exceeds size limit of 2,000,000 characters (~1.5 MB). Please provide a smaller or downscaled image.`
+          );
+      }
+      encryptedImages = options.images.map((img) => this.deps.crypto.encryptString(img, sessionKey));
+    }
+    let maxTokens = options?.numPredict, temperature = options?.temperature, start = Date.now();
     try {
       let response = await this.deps.transport.generatePlannerAdvisory({
         sessionId,
         prompt: encryptedPrompt,
+        ...encryptedImages && encryptedImages.length > 0 ? { images: encryptedImages } : {},
         ...maxTokens !== void 0 ? { maxTokens } : {},
         ...temperature !== void 0 ? { temperature } : {}
       });
@@ -75853,14 +76277,7 @@ var CompositeAdvisoryRunner = class {
     if (this.opts.tier === "FREE") {
       if (!this.opts.localRunner)
         throw new Error(
-          "LocalModelUnavailable: local Gemma is not installed or enabled. Free tier operates in local-only mode."
-        );
-      return this.opts.localRunner.generateAdvisory(promptText, options);
-    }
-    if (options?.images && options.images.length > 0) {
-      if (!this.localHealthy || !this.opts.localRunner)
-        throw new Error(
-          "LocalModelUnavailable: local CodeVibe vision model is required to analyze attached images."
+          options?.images && options.images.length > 0 ? "LocalModelUnavailable: local CodeVibe vision model is required to analyze attached images. Free tier operates in local-only mode." : "LocalModelUnavailable: local Gemma is not installed or enabled. Free tier operates in local-only mode."
         );
       return this.opts.localRunner.generateAdvisory(promptText, options);
     }
@@ -75868,9 +76285,17 @@ var CompositeAdvisoryRunner = class {
       try {
         return await this.opts.localRunner.generateAdvisory(promptText, options);
       } catch (err) {
+        let hasImages = !!(options?.images && options.images.length > 0);
         logger.warn("[composite-advisory] local advisory failed; falling back to hosted Bedrock Gemma", {
-          error: err?.message
-        }), this.localHealthy = !1, this.opts.onFallbackToHosted?.(err);
+          error: err?.message,
+          hasImages
+        }), this.localHealthy = !1, this.opts.onNotice && this.opts.onNotice(
+          hasImages ? `
+Local vision model error. Falling back to hosted Gemma on AWS.
+` : `
+Local advisory error. Falling back to hosted Gemma on AWS.
+`
+        ), this.opts.onFallbackToHosted?.(err);
       }
     return this.opts.hostedRunner.generateAdvisory(promptText, options);
   }
@@ -77273,7 +77698,7 @@ function renderPreflight(agents, auth, connectivity, orphans) {
       let reason = agent.error ? `(${agent.error})` : "(not in $PATH)";
       console.log(`  [${colors.yellow}missing${colors.reset}] ${agent.name} ${colors.dim}${reason}${colors.reset}`);
     }
-  agents.filter((a) => a.installed).length === 0 && console.log(`  ${colors.red}! At least one agent CLI (Claude, Codex, or Antigravity) is required.${colors.reset}`), console.log(), console.log(`${colors.bold}Authentication & Credentials:${colors.reset}`), auth.error ? console.log(`  [${colors.red}error${colors.reset}] Auth check failed: ${auth.error}`) : !auth.authenticated && !auth.tokenExpired ? (console.log(`  [${colors.yellow}missing${colors.reset}] Not authenticated.`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to sign in.${colors.reset}`)) : auth.tokenExpired ? (console.log(`  [${colors.yellow}expired${colors.reset}] Token expired for ${auth.email ?? "user"}`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe doctor --repair --yes${colors.reset}${colors.dim}' to refresh.${colors.reset}`)) : console.log(`  [${colors.green}ok${colors.reset}] Authenticated as ${auth.email ?? "user"}${auth.expiresAt ? ` ${colors.dim}(valid until ${auth.expiresAt})${colors.reset}` : ""}`), auth.deviceIdentityError ? (console.log(`  [${colors.red}error${colors.reset}] Device Identity: ${auth.deviceIdentityError}`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to re-establish device credentials.${colors.reset}`)) : auth.deviceIdentityPresent ? console.log(`  [${colors.green}ok${colors.reset}] Device Identity ${auth.deviceIdentityId ? `${colors.dim}(${auth.deviceIdentityId})${colors.reset}` : ""}`) : (console.log(`  [${colors.yellow}missing${colors.reset}] Device Identity not found`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to generate device credentials.${colors.reset}`));
+  agents.filter((a) => a.installed).length === 0 && console.log(`  ${colors.red}! At least one agent CLI (Claude, Codex, or Antigravity) is required.${colors.reset}`), console.log(), console.log(`${colors.bold}Authentication & Credentials:${colors.reset}`), auth.error ? console.log(`  [${colors.red}error${colors.reset}] Auth check failed: ${auth.error}`) : !auth.authenticated && !auth.tokenExpired ? (console.log(`  [${colors.yellow}missing${colors.reset}] Not authenticated.`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to sign in.${colors.reset}`)) : auth.tokenExpired ? (console.log(`  [${colors.yellow}expired${colors.reset}] Token expired for ${auth.email ?? "user"}`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe doctor --repair --yes${colors.reset}${colors.dim}' to refresh.${colors.reset}`)) : console.log(`  [${colors.green}ok${colors.reset}] Authenticated as ${auth.email ?? "user"}${auth.expiresAt ? ` ${colors.dim}(valid until ${auth.expiresAt})${colors.reset}` : ""}`), auth.error ? console.log(`  [${colors.yellow}unknown${colors.reset}] Device Identity: not checked (the credential store could not be read \u2014 see above)`) : auth.deviceIdentityError ? (console.log(`  [${colors.red}error${colors.reset}] Device Identity: ${auth.deviceIdentityError}`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to re-establish device credentials.${colors.reset}`)) : auth.deviceIdentityPresent ? console.log(`  [${colors.green}ok${colors.reset}] Device Identity ${auth.deviceIdentityId ? `${colors.dim}(${auth.deviceIdentityId})${colors.reset}` : ""}`) : (console.log(`  [${colors.yellow}missing${colors.reset}] Device Identity not found`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe login${colors.reset}${colors.dim}' to generate device credentials.${colors.reset}`));
   let backendName = auth.vendorKeys.custodyBackend === "keytar" ? "OS Keychain" : "File Store";
   if (console.log(`  [${auth.vendorKeys.anthropic ? colors.green + "ok" : colors.dim + "none"}${colors.reset}] Anthropic Vendor Key ${colors.dim}(${auth.vendorKeys.anthropic ? backendName : "not set"})${colors.reset}`), console.log(`  [${auth.vendorKeys.openai ? colors.green + "ok" : colors.dim + "none"}${colors.reset}] OpenAI Credential ${colors.dim}(${auth.vendorKeys.openai ? backendName : "not set"})${colors.reset}`), console.log(), console.log(`${colors.bold}Backend Connectivity:${colors.reset}`), connectivity.appsyncReachable ? console.log(`  [${colors.green}ok${colors.reset}] AppSync API (${connectivity.latencyMs ?? 0}ms) ${colors.dim}${connectivity.appsyncUrl}${colors.reset}`) : console.log(`  [${colors.red}unreachable${colors.reset}] AppSync API: ${connectivity.error ?? "unreachable"} ${colors.dim}(${connectivity.appsyncUrl})${colors.reset}`), console.log(), console.log(`${colors.bold}Workspace & Process State:${colors.reset}`), orphans.error ? console.log(`  [${colors.red}error${colors.reset}] Orphan inspection failed: ${orphans.error}`) : orphans.orphanedShadowCount > 0 || orphans.deadProcessOwnersCount > 0 ? (console.log(`  [${colors.yellow}residue${colors.reset}] ${orphans.orphanedShadowCount} orphaned worktree shadow(s), ${orphans.deadProcessOwnersCount} dead process registration(s)`), console.log(`         ${colors.dim}Run '${colors.reset}${colors.bold}codevibe doctor --repair --yes${colors.reset}${colors.dim}' to prune.${colors.reset}`)) : console.log(`  [${colors.green}ok${colors.reset}] Clean \u2014 0 orphaned shadows, 0 dead process registrations.`), orphans.retainedStateDiagnostics && orphans.retainedStateDiagnostics.length > 0)
     for (let diag of orphans.retainedStateDiagnostics)
@@ -80457,13 +80882,20 @@ async function requireCliAuthentication(client) {
   }
   if (authenticated) return;
   let failureKind = client.getLastAuthFailureKind();
-  throw failureKind === "refresh_network" ? new CliAuthenticationError(
-    "auth_unavailable",
-    "CodeVibe could not verify your sign-in because the authentication service is unreachable. Check your connection and try again."
-  ) : failureKind === "credential_storage_unavailable" ? new CliAuthenticationError(
-    "credential_storage_unavailable",
-    "CodeVibe could not read stored sign-in credentials. Unlock or repair your credential store, then try again."
-  ) : new CliAuthenticationError(
+  if (failureKind === "refresh_network")
+    throw new CliAuthenticationError(
+      "auth_unavailable",
+      "CodeVibe could not verify your sign-in because the authentication service is unreachable. Check your connection and try again."
+    );
+  if (failureKind === "credential_storage_unavailable") {
+    let detail = client.getLastAuthFailureDetail?.() ?? null;
+    throw new CliAuthenticationError(
+      "credential_storage_unavailable",
+      "CodeVibe could not read stored sign-in credentials. Unlock or repair your credential store, then try again." + (detail ? `
+${detail}` : "")
+    );
+  }
+  throw new CliAuthenticationError(
     "auth_required",
     "Not signed in. Run `codevibe login`, then launch CodeVibe again."
   );
@@ -81102,13 +81534,14 @@ Note: --export will overwrite any existing file at <path>.
   try {
     authenticated = await appsyncClient.authenticateWithStoredTokens();
   } catch (e) {
-    return err(
-      `Not signed in \u2014 run \`codevibe login\` first (${e?.message ?? "auth unavailable"}).
-`
-    ), 2;
+    return err(`CodeVibe could not verify your sign-in (${e?.message ?? "auth unavailable"}).
+`), 2;
+  }
+  if (!authenticated) {
+    let kind = appsyncClient.getLastAuthFailureKind?.() ?? null;
+    return kind === "credential_storage_unavailable" || kind === "refresh_network" ? (err(`${describeStoredAuthFailure(kind, appsyncClient.getLastAuthFailureDetail?.() ?? null).message}
+`), 2) : (err("Not signed in \u2014 run `codevibe login` first.\n"), 2);
   }
-  if (!authenticated)
-    return err("Not signed in \u2014 run `codevibe login` first.\n"), 2;
   let sessionId = parsed.sessionId ?? null;
   if (!sessionId) {
     let resolveSessionId = deps?.resolveSessionIdFn ?? resolveActiveSessionId;
@@ -81507,12 +81940,15 @@ function resolvePlannerAdapter(args) {
         localRuntimeLabel: args.localPlanner.runtimeLabel,
         hostedHealth: hostedStack.health,
         onNotice: (msg) => {
-          process.stdout.write(msg);
+          logger.info("[planner] " + msg);
         }
       }), compositeAdvisoryRunner = new CompositeAdvisoryRunner({
         localRunner: args.localPlanner.advisoryRunner,
         hostedRunner: hostedStack.hostedAdvisoryRunner,
-        tier
+        tier,
+        onNotice: (msg) => {
+          logger.info("[planner] " + msg);
+        }
       });
       return {
         adapter: compositeAdapter,