@agent-native/core 0.84.54 → 0.84.56

package/corpus/README.md

@@ -28,4 +28,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 ## Generated Counts
 
 - core files: 2044
-- template files: 5003
+- template files: 5004

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @agent-native/core
 
+## 0.84.56
+
+### Patch Changes
+
+- a0615f8: Make PR visual recap screenshots link directly to the interactive recap and publish source-author metadata for recap comments.
+
+## 0.84.55
+
+### Patch Changes
+
+- ea97dc1: Make agent chat setup, auth, and title state resilient to transient status checks and hidden context payloads.
+
 ## 0.84.54
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.84.54",
+  "version": "0.84.56",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/cli/recap.ts

@@ -1634,6 +1634,20 @@ type GitHubComment = {
 
 type GitHubPullRequest = {
   head?: { sha?: string | null } | null;
+  user?: { login?: string | null; type?: string | null } | null;
+};
+
+type GitHubUserProfile = {
+  login?: string | null;
+  name?: string | null;
+  email?: string | null;
+};
+
+type GitHubPullRequestCommit = {
+  author?: { login?: string | null } | null;
+  commit?: {
+    author?: { name?: string | null; email?: string | null } | null;
+  } | null;
 };
 
 function repoParts(repoFullName: string): { owner: string; repo: string } {
@@ -1642,6 +1656,20 @@ function repoParts(repoFullName: string): { owner: string; repo: string } {
   return { owner, repo };
 }
 
+function nonEmptyTrimmed(value: string | null | undefined): string | undefined {
+  const trimmed = value?.trim();
+  return trimmed || undefined;
+}
+
+function normalizeSourceAuthorEmail(
+  email: string | null | undefined,
+): string | undefined {
+  const trimmed = email?.trim().toLowerCase();
+  if (!trimmed || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(trimmed)) return undefined;
+  if (trimmed.endsWith("@users.noreply.github.com")) return undefined;
+  return trimmed;
+}
+
 async function githubRequest<T>(
   token: string,
   apiPath: string,
@@ -1667,6 +1695,71 @@ async function githubRequest<T>(
   return (await res.json()) as T;
 }
 
+export async function resolveGitHubPullRequestAuthor(input: {
+  token: string;
+  repo: string;
+  pr: string;
+  fetchFn?: typeof fetch;
+}): Promise<{
+  email?: string;
+  name?: string;
+  login?: string;
+}> {
+  const fn = input.fetchFn ?? fetch;
+  const { owner, repo } = repoParts(input.repo);
+  const pr = await githubRequest<GitHubPullRequest>(
+    input.token,
+    `/repos/${encodeURIComponent(owner)}/${encodeURIComponent(
+      repo,
+    )}/pulls/${encodeURIComponent(input.pr)}`,
+    {},
+    fn,
+  );
+  const login = nonEmptyTrimmed(pr.user?.login);
+  const profile = login
+    ? await githubRequest<GitHubUserProfile>(
+        input.token,
+        `/users/${encodeURIComponent(login)}`,
+        {},
+        fn,
+      ).catch(() => null)
+    : null;
+  const profileEmail = normalizeSourceAuthorEmail(profile?.email);
+  const profileName = nonEmptyTrimmed(profile?.name);
+  let commitEmail: string | undefined;
+  let commitName: string | undefined;
+  if (!profileEmail) {
+    const commits = await githubRequest<GitHubPullRequestCommit[]>(
+      input.token,
+      `/repos/${encodeURIComponent(owner)}/${encodeURIComponent(
+        repo,
+      )}/pulls/${encodeURIComponent(input.pr)}/commits?per_page=100`,
+      {},
+      fn,
+    ).catch(() => []);
+    for (const commit of commits) {
+      const commitLogin = nonEmptyTrimmed(commit.author?.login);
+      if (
+        login &&
+        commitLogin &&
+        commitLogin.toLowerCase() !== login.toLowerCase()
+      ) {
+        continue;
+      }
+      const email = normalizeSourceAuthorEmail(commit.commit?.author?.email);
+      if (!email) continue;
+      commitEmail = email;
+      commitName = nonEmptyTrimmed(commit.commit?.author?.name);
+      break;
+    }
+  }
+  return {
+    email: profileEmail ?? commitEmail,
+    name: profileName ?? commitName ?? login,
+    login,
+  };
+}
+
 export async function isPullRequestHeadCurrent(input: {
   token: string;
   owner: string;
@@ -1995,14 +2088,15 @@ export function buildCommentBody(env: NodeJS.ProcessEnv = process.env): string {
 
   lines.push(`Here's a [visual recap](${safeUrl}) of what changed:`);
   lines.push("");
-  lines.push(`<picture>`);
+  const pictureParts = [`<picture>`];
   if (lightImageUrl && darkImageUrl) {
-    lines.push(
+    pictureParts.push(
       `  <source media="(prefers-color-scheme: dark)" srcset="${darkImageUrl}">`,
     );
   }
-  lines.push(`  <img alt="Visual recap" src="${fallbackImageUrl}">`);
-  lines.push(`</picture>`);
+  pictureParts.push(`  <img alt="Visual recap" src="${fallbackImageUrl}">`);
+  pictureParts.push(`</picture>`);
+  lines.push(`<a href="${safeUrl}">${pictureParts.join("")}</a>`);
   lines.push("");
   lines.push(`**Open the [full interactive recap](${safeUrl})**`);
   if (env.DIFF_HUGE === "true") {
@@ -2297,6 +2391,7 @@ function recapPublishIdempotencyKey(input: {
 export async function publishRecapSource(input: {
   appUrl: string;
   token: string;
+  githubToken?: string;
   sourcePath?: string;
   out?: string;
   prevPlanId?: string;
@@ -2308,6 +2403,9 @@ export async function publishRecapSource(input: {
   sourcePrNumber?: string;
   sourcePrState?: string;
   sourcePrMergedAt?: string;
+  sourceAuthorEmail?: string;
+  sourceAuthorName?: string;
+  sourceAuthorLogin?: string;
   fetchFn?: typeof fetch;
   cwd?: string;
 }): Promise<{ ok: true; url: string; out: string }> {
@@ -2330,6 +2428,34 @@ export async function publishRecapSource(input: {
     (sourceRepo && sourcePrNumber ? "pull-request" : undefined);
   const sourcePrState =
     input.sourcePrState ?? (input.sourcePrMergedAt ? "merged" : undefined);
+  const explicitSourceAuthor = {
+    email: normalizeSourceAuthorEmail(input.sourceAuthorEmail),
+    name: nonEmptyTrimmed(input.sourceAuthorName),
+    login: nonEmptyTrimmed(input.sourceAuthorLogin),
+  };
+  let resolvedSourceAuthor:
+    | Awaited<ReturnType<typeof resolveGitHubPullRequestAuthor>>
+    | undefined;
+  if (
+    input.githubToken &&
+    sourceRepo &&
+    sourcePrNumber &&
+    (!explicitSourceAuthor.email ||
+      !explicitSourceAuthor.name ||
+      !explicitSourceAuthor.login)
+  ) {
+    resolvedSourceAuthor = await resolveGitHubPullRequestAuthor({
+      token: input.githubToken,
+      repo: sourceRepo,
+      pr: sourcePrNumber,
+      fetchFn: input.fetchFn,
+    }).catch(() => undefined);
+  }
+  const sourceAuthor = {
+    email: explicitSourceAuthor.email ?? resolvedSourceAuthor?.email,
+    name: explicitSourceAuthor.name ?? resolvedSourceAuthor?.name,
+    login: explicitSourceAuthor.login ?? resolvedSourceAuthor?.login,
+  };
   const idempotencyKey = recapPublishIdempotencyKey({
     prevPlanId: input.prevPlanId,
     repo: input.repo,
@@ -2353,6 +2479,9 @@ export async function publishRecapSource(input: {
     ...(input.sourcePrMergedAt
       ? { sourcePrMergedAt: input.sourcePrMergedAt }
       : {}),
+    ...(sourceAuthor.email ? { sourceAuthorEmail: sourceAuthor.email } : {}),
+    ...(sourceAuthor.name ? { sourceAuthorName: sourceAuthor.name } : {}),
+    ...(sourceAuthor.login ? { sourceAuthorLogin: sourceAuthor.login } : {}),
     currentFocus: "visual recap review",
     status: "review",
     mdx: source.mdx,
@@ -2470,6 +2599,10 @@ async function runPublish(
     const result = await publishRecapSource({
       appUrl,
       token,
+      githubToken:
+        optionalArg(args, "github-token") ??
+        process.env.GH_TOKEN ??
+        process.env.GITHUB_TOKEN,
       sourcePath: optionalArg(args, "source") ?? RECAP_SOURCE_FILENAME,
       out,
       prevPlanId: optionalArg(args, "prev-plan-id"),
@@ -2481,6 +2614,14 @@ async function runPublish(
       sourcePrNumber: optionalArg(args, "source-pr-number"),
       sourcePrState: optionalArg(args, "source-pr-state"),
       sourcePrMergedAt: optionalArg(args, "source-pr-merged-at"),
+      sourceAuthorEmail:
+        optionalArg(args, "source-author-email") ?? process.env.PR_AUTHOR_EMAIL,
+      sourceAuthorName:
+        optionalArg(args, "source-author-name") ?? process.env.PR_AUTHOR_NAME,
+      sourceAuthorLogin:
+        optionalArg(args, "source-author-login") ??
+        process.env.PR_AUTHOR_LOGIN ??
+        process.env.GITHUB_ACTOR,
     });
     writeGitHubOutput("ok", "true");
     writeGitHubOutput("plan_url", result.url);
@@ -4081,7 +4222,7 @@ Usage:
   npx @agent-native/core@latest recap block-reference [--app-url <url>] [--out recap-blocks.md]
   npx @agent-native/core@latest recap scan --diff <path> [--mode off|high-confidence|strict]
   npx @agent-native/core@latest recap build-prompt --pr <n> [--repo owner/name] [--head <sha>] [--app-url <url>] [--diff <path>] [--stat <path>] [--block-reference recap-blocks.md] [--prev-plan-id <id>] [--huge] [--local-files] [--local-dir <folder>] [--skill-source auto|latest|repo] [--out <path>]
-  npx @agent-native/core@latest recap publish [--source recap-source.json] [--out recap-url.txt] [--repo owner/name] [--pr <n>] [--prev-plan-id <id>] [--source-pr-state open|closed|merged] [--source-pr-merged-at <iso>] [--app-url <url>] [--token <planToken>]
+  npx @agent-native/core@latest recap publish [--source recap-source.json] [--out recap-url.txt] [--repo owner/name] [--pr <n>] [--prev-plan-id <id>] [--source-pr-state open|closed|merged] [--source-pr-merged-at <iso>] [--source-author-email <email>] [--source-author-name <name>] [--source-author-login <login>] [--app-url <url>] [--token <planToken>] [--github-token <ghToken>]
   npx @agent-native/core@latest recap shot --url <planUrl> [--token <planToken>] [--app-url <url>] [--out recap.png] [--theme light|dark] [--image-cache-key <key>]
   npx @agent-native/core@latest recap usage --plan-url <planUrl> --result-file <path> --app-url <url> --token <planToken> [--agent claude|codex] [--model <id>]
   npx @agent-native/core@latest recap agent-summary --result-file <path> [--stderr-file <path>] [--exit-code-file <path>] [--agent claude|codex]

package/corpus/core/src/client/AssistantChat.tsx

@@ -89,6 +89,7 @@ import {
   AssistantMessage,
   SelectionAttachedPill,
   RunningActivityStatus,
+  displayableUserMessageText,
 } from "./chat/message-components.js";
 import {
   repoHasAssistantMessage,
@@ -178,6 +179,8 @@ export {
 
 export { displayableUserMessageText } from "./chat/message-components.js";
 
+type AuthSessionCheckResult = "available" | "missing" | "unknown";
+
 const useBrowserLayoutEffect =
   typeof window === "undefined" ? useEffect : useLayoutEffect;
 
@@ -492,13 +495,14 @@ function getMessageText(message: unknown): string {
   const msg = (message as { message?: unknown })?.message ?? message;
   const content = (msg as { content?: unknown })?.content;
   if (Array.isArray(content)) {
-    return content
-      .filter((p: any) => p?.type === "text" && typeof p.text === "string")
-      .map((p: any) => p.text)
-      .join("\n")
-      .trim();
+    return displayableUserMessageText(
+      content
+        .filter((p: any) => p?.type === "text" && typeof p.text === "string")
+        .map((p: any) => p.text)
+        .join("\n"),
+    );
   }
-  return typeof content === "string" ? content.trim() : "";
+  return typeof content === "string" ? displayableUserMessageText(content) : "";
 }
 
 function contentPartFollowKey(part: any): string {
@@ -1263,6 +1267,7 @@ const AssistantChatInner = forwardRef<
   }, [threadRuntime]);
   const agentEngineConfigured = useAgentEngineConfigured(
     providerStatusChecksEnabled,
+    { tabId, threadId },
   );
   const missingApiKey = agentEngineConfigured.missing;
   const isComposerDisabled = missingApiKey || composerDisabled;
@@ -1294,10 +1299,19 @@ const AssistantChatInner = forwardRef<
     setComposerError(LLM_MISSING_CREDENTIALS_MESSAGE);
     setMissingKeyBouncePulse((p) => p + 1);
     if (typeof window !== "undefined") {
-      window.dispatchEvent(new Event("agent-chat:missing-api-key"));
+      window.dispatchEvent(
+        new CustomEvent("agent-chat:missing-api-key", {
+          detail: { tabId, threadId },
+        }),
+      );
     }
     return false;
-  }, [agentEngineConfigured.state, providerStatusChecksEnabled]);
+  }, [
+    agentEngineConfigured.state,
+    providerStatusChecksEnabled,
+    tabId,
+    threadId,
+  ]);
   const [authError, setAuthError] = useState<{
     sessionExpired?: boolean;
   } | null>(null);
@@ -2443,23 +2457,31 @@ const AssistantChatInner = forwardRef<
   }, []);
 
   // Listen for auth error events from the adapter
-  const checkAuthSession = useCallback(async () => {
-    try {
-      const res = await fetch(agentNativePath("/_agent-native/auth/session"), {
-        cache: "no-store",
-      });
-      if (!res.ok) return false;
-      const data = await res.json().catch(() => null);
-      const hasSession = !!data && !data.error;
-      setAuthSessionAvailable(hasSession);
-      if (hasSession) {
-        setAuthError(null);
+  const checkAuthSession =
+    useCallback(async (): Promise<AuthSessionCheckResult> => {
+      try {
+        const res = await fetch(
+          agentNativePath("/_agent-native/auth/session"),
+          {
+            cache: "no-store",
+          },
+        );
+        if (!res.ok) {
+          return res.status === 401 || res.status === 403
+            ? "missing"
+            : "unknown";
+        }
+        const data = await res.json().catch(() => null);
+        const hasSession = !!data && !data.error;
+        setAuthSessionAvailable(hasSession);
+        if (hasSession) {
+          setAuthError(null);
+        }
+        return hasSession ? "available" : "missing";
+      } catch {
+        return "unknown";
       }
-      return hasSession;
-    } catch {
-      return false;
-    }
-  }, []);
+    }, []);
 
   useEffect(() => {
     const handler = (e: Event) => {
@@ -2481,9 +2503,12 @@ const AssistantChatInner = forwardRef<
       ) {
         return;
       }
-      setAuthSessionAvailable(false);
-      setAuthError({ sessionExpired: detail?.reason === "session-expired" });
-      void checkAuthSession();
+      void (async () => {
+        const sessionState = await checkAuthSession();
+        if (sessionState !== "missing") return;
+        setAuthSessionAvailable(false);
+        setAuthError({ sessionExpired: detail?.reason === "session-expired" });
+      })();
     };
     window.addEventListener("agent-chat:auth-error", handler);
     return () => window.removeEventListener("agent-chat:auth-error", handler);
@@ -2499,8 +2524,9 @@ const AssistantChatInner = forwardRef<
     // symptom we want signal on.
     const stuckCapture = window.setTimeout(() => {
       void (async () => {
-        const hasSession = await checkAuthSession();
-        if (hasSession) return;
+        const sessionState = await checkAuthSession();
+        if (sessionState === "available") return;
+        if (sessionState !== "missing") return;
         if (!shouldCaptureStuckAuthCard) return;
         captureError(new Error("agent-chat:auth_error_card_stuck"), {
           tags: {
@@ -3790,9 +3816,9 @@ const AssistantChatInner = forwardRef<
                         <RunningActivityStatus label={runningStatusLabel} />
                       )}
                       {queuedMessages.map((msg) => {
-                        const displayText = msg.text
-                          .replace(/<context>[\s\S]*?<\/context>\n?/g, "")
-                          .trim();
+                        const displayText = displayableUserMessageText(
+                          msg.text,
+                        );
                         return (
                           <div
                             key={msg.id}

package/corpus/core/src/client/agent-chat-adapter.ts

@@ -1526,6 +1526,18 @@ export function createAgentChatAdapter(
         );
       };
 
+      const dispatchMissingApiKey = () => {
+        if (typeof window === "undefined") return;
+        window.dispatchEvent(
+          new CustomEvent("agent-chat:missing-api-key", {
+            detail: {
+              ...(tabId ? { tabId } : {}),
+              ...(threadId ? { threadId } : {}),
+            },
+          }),
+        );
+      };
+
       const tryRecoverAuthOnce = async (): Promise<boolean> => {
         if (authRecoveryAttempted || abortSignal.aborted) return false;
         authRecoveryAttempted = true;
@@ -2418,9 +2430,7 @@ export function createAgentChatAdapter(
                 if (isMissingCredentialMessage(body)) {
                   const failure = missingCredentialFailure(body);
                   if (typeof window !== "undefined") {
-                    window.dispatchEvent(
-                      new Event("agent-chat:missing-api-key"),
-                    );
+                    dispatchMissingApiKey();
                     window.dispatchEvent(
                       new CustomEvent("agent-chat:run-error", {
                         detail: { ...failure.runError, tabId },
@@ -2633,7 +2643,7 @@ export function createAgentChatAdapter(
             if (isMissingCredentialMessage(errMsg)) {
               const failure = missingCredentialFailure(errMsg);
               if (typeof window !== "undefined") {
-                window.dispatchEvent(new Event("agent-chat:missing-api-key"));
+                dispatchMissingApiKey();
                 window.dispatchEvent(
                   new CustomEvent("agent-chat:run-error", {
                     detail: { ...failure.runError, tabId },

package/corpus/core/src/client/chat/message-components.tsx

@@ -75,7 +75,11 @@ const PENDING_SELECTION_KEY = "pending-selection-context";
 // ─── displayableUserMessageText ───────────────────────────────────────────────
 
 export function displayableUserMessageText(text: string): string {
-  return text.replace(/<context>[\s\S]*?<\/context>\n?/g, "").trim();
+  return text
+    .replace(/<context\b[^>]*>[\s\S]*?<\/context>\n?/gi, "")
+    .replace(/<context\b[^>]*>[\s\S]*$/gi, "")
+    .replace(/<\/context>/gi, "")
+    .trim();
 }
 
 // ─── Message timestamp helpers ────────────────────────────────────────────────

package/corpus/core/src/client/sse-event-processor.ts

@@ -601,6 +601,15 @@ function dispatchActivityClear(tabId: string | undefined) {
   );
 }
 
+function dispatchMissingApiKey(tabId: string | undefined) {
+  if (typeof window === "undefined") return;
+  window.dispatchEvent(
+    new CustomEvent("agent-chat:missing-api-key", {
+      detail: { tabId },
+    }),
+  );
+}
+
 function pendingToolNames(content: ContentPart[]): {
   activity: string[];
   running: string[];
@@ -1056,7 +1065,7 @@ export function processEvent(
       errorCode,
     };
     if (typeof window !== "undefined") {
-      window.dispatchEvent(new Event("agent-chat:missing-api-key"));
+      dispatchMissingApiKey(tabId);
       window.dispatchEvent(
         new CustomEvent("agent-chat:run-error", {
           detail: { ...runError, tabId },
@@ -1156,9 +1165,7 @@ export function processEvent(
     }
     const normalized = normalizeChatError(errMsg, ev.errorCode);
     if (isMissingCredentialText(errMsg, ev.errorCode)) {
-      if (typeof window !== "undefined") {
-        window.dispatchEvent(new Event("agent-chat:missing-api-key"));
-      }
+      dispatchMissingApiKey(tabId);
     }
     const runError = {
       message: normalized.message,

package/corpus/core/src/client/use-agent-engine-configured.ts

@@ -15,10 +15,20 @@ export interface UseAgentEngineConfiguredResult {
 }
 
 export interface FetchAgentEngineConfiguredStateOptions {
+  /**
+   * Legacy hint from explicit missing-key stream events. Kept for API
+   * compatibility, but missing state still requires authoritative status
+   * responses so transient endpoint failures do not clobber connected state.
+   */
   missingFallback?: boolean;
   timeoutMs?: number;
 }
 
+export interface UseAgentEngineConfiguredOptions {
+  tabId?: string | null;
+  threadId?: string | null;
+}
+
 const DEFAULT_STATUS_CHECK_TIMEOUT_MS = 2500;
 
 async function fetchStatusJson(
@@ -60,6 +70,27 @@ function hasConfiguredFlag(value: unknown): value is { configured: boolean } {
   );
 }
 
+function missingKeyEventMatchesScope(
+  event: Event,
+  options: UseAgentEngineConfiguredOptions | undefined,
+): boolean {
+  const detail = (event as CustomEvent).detail as
+    | { tabId?: unknown; threadId?: unknown }
+    | undefined;
+  const eventTabId = typeof detail?.tabId === "string" ? detail.tabId : null;
+  const eventThreadId =
+    typeof detail?.threadId === "string" ? detail.threadId : null;
+  if (!eventTabId && !eventThreadId) return true;
+
+  const tabId = options?.tabId ?? null;
+  const threadId = options?.threadId ?? null;
+  if (!tabId && !threadId) return true;
+  return (
+    (eventTabId != null && eventTabId === tabId) ||
+    (eventThreadId != null && eventThreadId === threadId)
+  );
+}
+
 export async function fetchAgentEngineConfiguredState(
   enabled = true,
   options?: FetchAgentEngineConfiguredStateOptions,
@@ -76,22 +107,31 @@ export async function fetchAgentEngineConfiguredState(
     fetchStatusJson("/_agent-native/agent-engine/status", timeoutMs),
   ]);
 
-  // All three failed — likely a flaky network; keep the caller in unknown
-  // unless this check is reacting to an explicit missing-key stream event.
+  // All three failed — likely a flaky network; keep the caller in unknown.
+  // Even an explicit missing-key stream event should not pin the composer into
+  // setup without a fresh authoritative status response.
   if (envKeys == null && builderStatus == null && engineStatus == null) {
-    return options?.missingFallback ? "missing" : "unknown";
+    return "unknown";
   }
 
-  const keys = (envKeys ?? []) as Array<{
-    key: string;
-    configured: boolean;
-  }>;
+  const envKeysKnown = Array.isArray(envKeys);
+  const builderStatusKnown = hasConfiguredFlag(builderStatus);
+  const engineStatusKnown = hasConfiguredFlag(engineStatus);
+  const keys = envKeysKnown
+    ? (envKeys as Array<{
+        key: string;
+        configured: boolean;
+      }>)
+    : [];
   const llmKeys = keys.filter((k) => PROVIDER_ENV_VAR_SET.has(k.key));
   const anyConfigured =
     llmKeys.some((k) => k.configured) ||
-    (hasConfiguredFlag(builderStatus) && builderStatus.configured) ||
-    (hasConfiguredFlag(engineStatus) && engineStatus.configured);
-  return anyConfigured ? "configured" : "missing";
+    (builderStatusKnown && builderStatus.configured) ||
+    (engineStatusKnown && engineStatus.configured);
+  if (anyConfigured) return "configured";
+  return envKeysKnown && builderStatusKnown && engineStatusKnown
+    ? "missing"
+    : "unknown";
 }
 
 /**
@@ -103,6 +143,7 @@ export async function fetchAgentEngineConfiguredState(
  */
 export function useAgentEngineConfigured(
   enabled = true,
+  options?: UseAgentEngineConfiguredOptions,
 ): UseAgentEngineConfiguredResult {
   const [state, setState] = useState<AgentEngineConfiguredState>("unknown");
 
@@ -119,7 +160,8 @@ export function useAgentEngineConfigured(
     const onConfiguredChanged = () => {
       void check();
     };
-    const onMissing = () => {
+    const onMissing = (event: Event) => {
+      if (!missingKeyEventMatchesScope(event, options)) return;
       if (!enabled) {
         setState("configured");
         return;
@@ -143,7 +185,7 @@ export function useAgentEngineConfigured(
       );
       window.removeEventListener("agent-chat:missing-api-key", onMissing);
     };
-  }, [enabled]);
+  }, [enabled, options?.tabId, options?.threadId]);
 
   return { missing: state === "missing", state };
 }

package/corpus/core/src/server/agent-chat-plugin.ts

@@ -7124,11 +7124,15 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
             setResponseStatus(event, 400);
             return { error: "message is required" };
           }
-          // Strip mention markup: @[Name|type] → @Name
-          const cleanMessage = message.replace(
-            /@\[([^\]|]+)\|[^\]]*\]/g,
-            "@$1",
-          );
+          // Strip hidden context and mention markup before title generation.
+          // Fallback titles are often direct truncations, so never let injected
+          // prompt context become a visible tab label.
+          const cleanMessage = message
+            .replace(/<context\b[^>]*>[\s\S]*?<\/context>\n?/gi, "")
+            .replace(/<context\b[^>]*>[\s\S]*$/gi, "")
+            .replace(/<\/context>/gi, "")
+            .replace(/@\[([^\]|]+)\|[^\]]*\]/g, "@$1")
+            .trim();
           // Mirror the chat-run resolution so BYO-key users have title
           // generation billed to their own key instead of the platform key.
           const { getOwnerActiveApiKey } =