@agent-native/core 0.165.1 → 0.165.3

package/corpus/templates/plan/CHANGELOG.md

@@ -3,8 +3,39 @@
 All notable user-facing changes to Agent-Native Plan are documented here. Open it any
 time from the command menu (Cmd+K → "What's new").
 
-## 2026-06-23
+Older updates live in [the changelog folder](./changelog/) and are included in the in-app "What's new" view.
 
-### Added
+## 2026-08-19
 
-- See what's new right inside Agent-Native Plan — a changelog now lives in the command menu (Cmd+K).
+### Improved
+
+- Plan prompts now guide you to connect AI before sending and offer a clear retry after setup.
+
+## 2026-08-12
+
+### Improved
+
+- Shared plans now distinguish read-only viewers from commenters who can add review feedback without editing the plan.
+
+## 2026-08-11
+
+### Improved
+
+- Plan sharing now identifies viewers who can add comments
+
+### Fixed
+
+- Chrome no longer offers to install Plan as a desktop app.
+- Plan no longer reloads when runtime state changes
+
+## 2026-08-10
+
+### Improved
+
+- Full-page chat now uses the available width up to 1000px for more comfortable prompts and responses.
+
+## 2026-08-07
+
+### Improved
+
+- Inline help icons now stay visually balanced with nearby text

package/corpus/templates/slides/CHANGELOG.md

@@ -3,8 +3,79 @@
 All notable user-facing changes to Agent-Native Slides are documented here. Open it any
 time from the command menu (Cmd+K → "What's new").
 
-## 2026-06-23
+Older updates live in [the changelog folder](./changelog/) and are included in the in-app "What's new" view.
+
+## 2026-08-18
+
+### Improved
+
+- Private deck links now explain access and let viewers notify the owner
+
+### Fixed
+
+- Decks now appear correctly under Mine.
+- Generated slides now preserve requested speaker notes.
+
+## 2026-08-17
+
+### Improved
+
+- Slides now keep generated layouts stable, surface both-axis overflow, and make slide and text-box editing easier to discover.
+
+## 2026-08-13
 
 ### Added
 
-- See what's new right inside Agent-Native Slides — a changelog now lives in the command menu (Cmd+K).
+- Slide transitions can be set from a visible control in the slide toolbar instead of being agent-only
+
+### Fixed
+
+- Clicking a slide thumbnail now focuses it, so the slide copy, paste, and delete shortcuts work after a plain click
+- Duplicating or undoing the deletion of a slide now keeps its transition, animations, and image data after reload
+- Opening presentation mode from the agent now starts on the requested slide instead of the first one
+
+## 2026-08-12
+
+### Added
+
+- Duplicate a slide from the film strip with Cmd/Ctrl+C then Cmd/Ctrl+V
+
+### Improved
+
+- Shared decks now distinguish read-only viewers from commenters who can add comments without editing slides.
+
+### Fixed
+
+- Arrow-key navigation in the slide film strip now scrolls slides below the fold into view
+- Presenting a deck now returns you to the slide you were viewing when you exit
+
+## 2026-08-11
+
+### Added
+
+- Slides can copy and paste element styles with Cmd+Option+C/V and the context menu
+
+### Improved
+
+- Agent chat now follows the current slide and selection
+- Faster Slides chat deck reads
+- History now opens from the deck overflow menu
+- Images can be dropped directly onto slides and resized or repositioned freely
+- Selected slide layers can be nudged precisely with arrow keys
+- Share dialog roles now use Commenter terminology for people who can view and add comments.
+- Slides chat can read one slide without loading the full deck
+- Slides clearly indicate when an AI agent is editing alongside you.
+- Slides support atomic code-style HTML patches without regenerating whole slides
+- The style toolbar now uses the full available width
+
+### Fixed
+
+- Chrome no longer offers to install Slides as a desktop app.
+- Imported decks now use slide content for their title instead of a placeholder filename.
+- New decks now transition directly to a full-page editor loading state
+- PDF requests to restyle and preserve a source deck now import the full deck before editing
+- Slide edits preserve their layout without introducing hidden duplicate elements or stale click reveals
+- Slides reliably imports uploaded PDFs and presentations
+- Slides shows one compact AI marker and keeps your current slide selected while new slides load as skeletons
+- Text edits preserve slide layout when no changes are made
+- Undo and redo now move one visible slide state at a time

package/corpus/templates/tasks/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Changelog
+
+All notable user-facing changes to this app are documented here.
+
+Older updates live in [the changelog folder](./changelog/) and are included in the in-app "What's new" view.
+
+## 2026-08-11
+
+### Fixed
+
+- Chrome no longer offers to install Tasks as a desktop app.
+
+## 2026-08-03
+
+### Fixed
+
+- The Agent sidebar now opens the full Agent workspace for context, resources, connections, automations, and access.
+
+## 2026-07-31
+
+### Improved
+
+- Clicking the Agent Native logo now toggles the app sidebar.
+
+## 2026-07-29
+
+### Improved
+
+- Sidebar footers now keep Feedback, Search, and Collapse together, with language preferences available in Settings.
+
+## 2026-07-24
+
+### Improved
+
+- Secondary controls and dashboard surfaces now use quieter borderless styling.

package/corpus/templates/tasks/app/root.tsx

@@ -26,6 +26,8 @@ import { i18nCatalog } from "@/i18n";
 import { APP_TITLE } from "@/lib/app-config";
 import { TAB_ID } from "@/lib/tab-id";
 
+import changelog from "../CHANGELOG.md?raw";
+
 import stylesheet from "./global.css?url";
 
 configureTracking({
@@ -135,7 +137,12 @@ function AppContent() {
   useCommandMenuShortcut(useCallback(() => setCmdkOpen(true), []));
   return (
     <>
-      <CommandMenu open={cmdkOpen} onOpenChange={setCmdkOpen}>
+      <CommandMenu
+        open={cmdkOpen}
+        onOpenChange={setCmdkOpen}
+        changelog={changelog}
+        changelogKey="tasks"
+      >
         <CommandMenu.Group heading="Actions">
           <CommandMenu.Item onSelect={() => {}}>Search</CommandMenu.Item>
         </CommandMenu.Group>

package/dist/changelog/parse.d.ts

@@ -24,7 +24,7 @@ export interface ChangelogEntry {
     /** Markdown body beneath the heading (until the next `## ` section). */
     body: string;
 }
-/** A not-yet-released entry authored as a `changelog/<file>.md` file. */
+/** A folder-backed entry authored as a `changelog/<file>.md` file. */
 export interface PendingChangelogEntry {
     /** Category — `added`, `improved`, `fixed`, `changed`, etc. */
     type: ChangelogChangeType;
@@ -34,6 +34,8 @@ export interface PendingChangelogEntry {
     text: string;
 }
 export type ChangelogChangeType = "added" | "improved" | "fixed" | "changed" | "removed" | "security";
+export declare const DEFAULT_CHANGELOG_RELEASE_LIMIT = 5;
+export declare const CHANGELOG_ARCHIVE_NOTE = "Older updates live in [the changelog folder](./changelog/) and are included in the in-app \"What's new\" view.";
 /**
  * Order changes are grouped under a release heading. Anything not listed here
  * falls back to the "changed" group, then renders in insertion order.
@@ -70,9 +72,15 @@ declare const CHANGELOG_HEADER: string;
 export declare function rollupChangelog(existing: string, pending: PendingChangelogEntry[], releaseDate: string): string;
 /**
  * Render an app-facing changelog that includes both released CHANGELOG.md
- * sections and adjacent pending `changelog/*.md` entries. Unlike `release`,
- * this is pure and non-destructive, so build/dev bundles can show current
- * product notes without deleting the conflict-free pending files.
+ * sections and adjacent folder-backed `changelog/*.md` entries. This is pure
+ * and non-destructive, so build/dev bundles can show current product notes
+ * without moving or deleting the conflict-free entry files.
  */
 export declare function mergePendingChangelog(existing: string, pending: PendingChangelogEntry[]): string;
+/**
+ * Keep a short, human-readable release window in `CHANGELOG.md` while the
+ * dated `changelog/*.md` files remain the complete source for app history.
+ * The Vite raw-import path can still expand the full folder-backed history.
+ */
+export declare function compactChangelog(existing: string, folderEntries: PendingChangelogEntry[], releaseLimit?: number): string;
 export { CHANGELOG_HEADER, GROUP_LABELS };

package/dist/changelog/parse.js

@@ -11,6 +11,8 @@
  * markdown shape is the conventional "Keep a Changelog" layout — a top-level
  * `# Changelog` heading followed by one `## <release>` section per release.
  */
+export const DEFAULT_CHANGELOG_RELEASE_LIMIT = 5;
+export const CHANGELOG_ARCHIVE_NOTE = 'Older updates live in [the changelog folder](./changelog/) and are included in the in-app "What\'s new" view.';
 /**
  * Order changes are grouped under a release heading. Anything not listed here
  * falls back to the "changed" group, then renders in insertion order.
@@ -218,48 +220,84 @@ function pendingSectionSort(a, b) {
         return 1;
     return a.localeCompare(b);
 }
+function normalizedChangelogText(value) {
+    return value
+        .replace(/^\s*-\s?/gm, "")
+        .replace(/\s+/g, " ")
+        .trim();
+}
 /**
  * Render an app-facing changelog that includes both released CHANGELOG.md
- * sections and adjacent pending `changelog/*.md` entries. Unlike `release`,
- * this is pure and non-destructive, so build/dev bundles can show current
- * product notes without deleting the conflict-free pending files.
+ * sections and adjacent folder-backed `changelog/*.md` entries. This is pure
+ * and non-destructive, so build/dev bundles can show current product notes
+ * without moving or deleting the conflict-free entry files.
  */
 export function mergePendingChangelog(existing, pending) {
-    const pendingWithText = pending.filter((entry) => entry.text.trim());
+    const existingEntries = parseChangelog(existing);
+    const pendingWithText = pending.filter((entry) => {
+        const text = entry.text.trim();
+        if (!text)
+            return false;
+        return !existingEntries.some((existingEntry) => {
+            if (entry.date &&
+                existingEntry.date &&
+                entry.date !== existingEntry.date) {
+                return false;
+            }
+            return normalizedChangelogText(existingEntry.body).includes(normalizedChangelogText(text));
+        });
+    });
     if (pendingWithText.length === 0)
         return existing || CHANGELOG_HEADER;
-    const existingEntries = parseChangelog(existing);
-    const usedExistingIndexes = new Set();
     const pendingByTitle = new Map();
     for (const entry of pendingWithText) {
         const title = pendingSectionTitle(entry);
         pendingByTitle.set(title, [...(pendingByTitle.get(title) ?? []), entry]);
     }
-    const sections = [];
+    const sections = existingEntries.map((entry) => ({
+        title: entry.title,
+        date: entry.date,
+        body: entry.body,
+    }));
     for (const title of [...pendingByTitle.keys()].sort(pendingSectionSort)) {
         const body = renderReleaseBody(pendingByTitle.get(title) ?? []);
         if (!body)
             continue;
-        const existingIndex = existingEntries.findIndex((entry, index) => {
-            if (usedExistingIndexes.has(index))
-                return false;
+        const existingIndex = sections.findIndex((entry) => {
             return entry.date === title || entry.title === title;
         });
-        if (existingIndex === -1) {
-            sections.push(`## ${title}\n\n${body}`);
+        if (existingIndex !== -1) {
+            sections[existingIndex].body = [body, sections[existingIndex].body]
+                .filter(Boolean)
+                .join("\n\n");
             continue;
         }
-        usedExistingIndexes.add(existingIndex);
-        const existingEntry = existingEntries[existingIndex];
-        sections.push(`## ${existingEntry.title}\n\n${[body, existingEntry.body]
-            .filter(Boolean)
-            .join("\n\n")}`);
+        const newSection = { title, date: title.match(ISO_DATE)?.[1], body };
+        const insertAt = newSection.date
+            ? sections.findIndex((entry) => entry.date && entry.date < newSection.date)
+            : 0;
+        sections.splice(insertAt === -1 ? sections.length : insertAt, 0, newSection);
     }
-    existingEntries.forEach((entry, index) => {
-        if (usedExistingIndexes.has(index))
-            return;
-        sections.push(`## ${entry.title}\n\n${entry.body}`);
-    });
-    return `${changelogHeader(existing)}\n\n${sections.join("\n\n")}\n`;
+    return `${changelogHeader(existing)}\n\n${sections
+        .map((entry) => `## ${entry.title}\n\n${entry.body}`)
+        .join("\n\n")}\n`;
+}
+/**
+ * Keep a short, human-readable release window in `CHANGELOG.md` while the
+ * dated `changelog/*.md` files remain the complete source for app history.
+ * The Vite raw-import path can still expand the full folder-backed history.
+ */
+export function compactChangelog(existing, folderEntries, releaseLimit = DEFAULT_CHANGELOG_RELEASE_LIMIT) {
+    const merged = mergePendingChangelog(existing, folderEntries);
+    const entries = parseChangelog(merged).slice(0, Math.max(1, releaseLimit));
+    const header = changelogHeader(merged)
+        .replace(CHANGELOG_ARCHIVE_NOTE, "")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
+    const sections = entries.map((entry) => `## ${entry.title}\n\n${entry.body}`);
+    if (sections.length === 0) {
+        return `${header || CHANGELOG_HEADER.trim()}\n\n${CHANGELOG_ARCHIVE_NOTE}\n`;
+    }
+    return `${header || CHANGELOG_HEADER.trim()}\n\n${CHANGELOG_ARCHIVE_NOTE}\n\n${sections.join("\n\n")}\n`;
 }
 export { CHANGELOG_HEADER, GROUP_LABELS };

package/dist/cli/changelog.js

@@ -3,18 +3,19 @@
  *
  * The model mirrors changesets: instead of editing the shared CHANGELOG.md
  * directly (which conflicts when many agents work in parallel), each change
- * drops a small pending entry file under `changelog/`. A later `release` rolls
- * every pending file up into a single dated section of CHANGELOG.md.
+ * drops a small dated entry file under `changelog/`. A later `release`
+ * refreshes the recent CHANGELOG.md window while retaining those files as the
+ * complete history.
  *
  *   agent-native changelog add "Recordings can be trimmed before sharing" --type added
- *   agent-native changelog release           # roll pending → CHANGELOG.md (today)
+ *   agent-native changelog release           # refresh recent window
  *   agent-native changelog list              # show pending + released
  *
  * Runs in the current app directory (process.cwd()).
  */
 import fs from "fs";
 import path from "path";
-import { parsePendingEntry, parseChangelog, rollupChangelog, changelogSlug, CHANGELOG_HEADER, } from "../changelog/parse.js";
+import { parsePendingEntry, parseChangelog, compactChangelog, changelogSlug, CHANGELOG_HEADER, } from "../changelog/parse.js";
 import { createAgentNativeConfigContext, loadResolvedAgentNativeConfig, } from "../vite/agent-native-config-loader.js";
 const CHANGELOG_FILE = "CHANGELOG.md";
 const PENDING_DIR = "changelog";
@@ -61,7 +62,7 @@ function printUsage() {
         "  agent-native changelog list",
         "",
         "Entries are user-facing notes. `add` writes a pending file under",
-        `  ${PENDING_DIR}/; \`release\` rolls all pending files into ${CHANGELOG_FILE}.`,
+        `  ${PENDING_DIR}/; \`release\` refreshes the recent window in ${CHANGELOG_FILE}.`,
         "Generation requires changelog.enabled: true in agent-native.config.ts.",
     ].join("\n"));
 }
@@ -126,17 +127,14 @@ async function cmdRelease(args) {
         console.log("No pending changelog entries to release.");
         return 0;
     }
-    const pending = pendingFiles.map((p) => parsePendingEntry(p.content));
+    const pending = pendingFiles.map((p) => parsePendingEntry(p.content, path.basename(p.file).match(/^(\d{4}-\d{2}-\d{2})(?:-|\.md$)/)?.[1]));
     const changelogPath = path.resolve(CHANGELOG_FILE);
     const existing = fs.existsSync(changelogPath)
         ? fs.readFileSync(changelogPath, "utf-8")
         : "";
-    const next = rollupChangelog(existing, pending, date);
+    const next = compactChangelog(existing, pending);
     fs.writeFileSync(changelogPath, next, "utf-8");
-    // Remove the pending entries now that they're released.
-    for (const p of pendingFiles)
-        fs.rmSync(p.file);
-    console.log(`Released ${pendingFiles.length} entr${pendingFiles.length === 1 ? "y" : "ies"} into ${CHANGELOG_FILE} (## ${date}).`);
+    console.log(`Refreshed ${CHANGELOG_FILE} from ${pendingFiles.length} folder entr${pendingFiles.length === 1 ? "y" : "ies"} (latest release date: ${date}).`);
     return 0;
 }
 function cmdList() {

package/dist/client/blocks/library/diagram.js

@@ -63,7 +63,7 @@ function HtmlDiagram({ data, ctx, compact, }) {
             ? scopeDesignCss(safeCss, `[data-plan-diagram-scope="${scopeId}"]`)
             : "";
     }, [data.css, scopeId]);
-    return (_jsxs("div", { ref: ref, className: cn("plan-diagram-shell", compact && "plan-diagram-compact"), children: [_jsxs("div", { className: "plan-diagram-frame", dir: ctx.textDirection, "data-theme": isDark ? "dark" : "light", "data-style": style, "data-frame": showFrame ? "show" : "hide", "data-text-direction": ctx.textDirection, "data-plan-diagram-scope": scopeId, children: [scopedCss && _jsx("style", { children: scopedCss }), _jsx("div", { className: "plan-diagram-frame-content", dangerouslySetInnerHTML: { __html: safeHtml } })] }), _jsx(RoughOverlay, { scopeRef: ref, enabled: !designMode && style === "sketchy", drawFrame: showFrame, selector: DIAGRAM_ROUGH_SELECTOR }), data.caption && !compact && (_jsx("p", { className: "mt-3 text-sm leading-6 text-muted-foreground", children: data.caption }))] }));
+    return (_jsxs("div", { ref: ref, className: cn("plan-diagram-shell", compact && "plan-diagram-compact"), children: [_jsxs("div", { className: "plan-diagram-frame", dir: ctx.textDirection, "data-theme": isDark ? "dark" : "light", "data-style": style, "data-frame": showFrame ? "show" : "hide", "data-text-direction": ctx.textDirection, "data-plan-diagram-scope": scopeId, children: [scopedCss && _jsx("style", { children: scopedCss }), _jsx("div", { className: "plan-diagram-frame-content", "data-theme": isDark ? "dark" : "light", dangerouslySetInnerHTML: { __html: safeHtml } })] }), _jsx(RoughOverlay, { scopeRef: ref, enabled: !designMode && style === "sketchy", drawFrame: showFrame, selector: DIAGRAM_ROUGH_SELECTOR }), data.caption && !compact && (_jsx("p", { className: "mt-3 text-sm leading-6 text-muted-foreground", children: data.caption }))] }));
 }
 function resolveVisualFrame(frame, ctx) {
     const resolved = frame && frame !== "auto" ? frame : (ctx.visualFrame ?? "show");

package/dist/client/chat/run-recovery.js

@@ -213,10 +213,15 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
     const shouldShowMissingProviderSetup = isMissingLlmProviderRunError(info);
     const isProviderAuthError = isProviderAuthenticationError([info.message, info.details].filter(Boolean).join("\n"), info.errorCode);
     // Blocked on something the reader goes and fixes elsewhere, then comes back
-    // to. Without a retry the card is a dead end and its own copy ("then retry")
-    // points at a button that isn't there.
+    // to. Recoverable runs and email verification keep a retry path; rejected
+    // provider credentials use the setup flow below so the same bad key is not
+    // replayed.
     const isUnblockableExternally = info.errorCode === "email_verification_required";
-    const canRetry = canRecover || isProviderAuthError || isUnblockableExternally;
+    // Rejected provider keys already have a recovery path: update/connect the
+    // credential, then let the setup callback re-run the turn. Exposing a
+    // separate retry button here just replays the same rejected credential and
+    // turns a permanent auth failure into a loop.
+    const canRetry = canRecover || isUnblockableExternally;
     const builderReconnectResolved = shouldShowBuilderReconnect &&
         builderReconnect.hasFetchedStatus &&
         builderReconnect.configured;

package/dist/collab/routes.d.ts

@@ -26,8 +26,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
  * Body: { update: string (base64), requestSource?: string }
  */
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/deploy/workspace-deploy.js

@@ -27,6 +27,7 @@ import { assertEmittedBackgroundFunctionOnDisk, isRecurringJobsDeployEnabled, }
 import { cloneServerBundleForFunction } from "./function-bundle.js";
 import { collectImmutableAssetPaths, IMMUTABLE_ASSET_CACHE_HEADERS, } from "./immutable-assets.js";
 const NETLIFY_WORKSPACE_STATIC_DIR = "_workspace_static";
+const DEFAULT_HOSTED_FEEDBACK_URL = "https://forms.agent-native.com/f/agent-native-feedback/_16ewV";
 const NETLIFY_PUBLIC_ASSET_EXTENSIONS = new Set([
     "avif",
     "css",
@@ -152,6 +153,12 @@ function buildOneApp(workspaceRoot, app, preset, execFile, workspaceApps) {
         AGENT_NATIVE_WORKSPACE_APP_ID: app,
         VITE_AGENT_NATIVE_WORKSPACE: "1",
         VITE_AGENT_NATIVE_WORKSPACE_APP_ID: app,
+        ...(preset === "netlify"
+            ? {
+                VITE_AGENT_NATIVE_FEEDBACK_URL: process.env.VITE_AGENT_NATIVE_FEEDBACK_URL ??
+                    DEFAULT_HOSTED_FEEDBACK_URL,
+            }
+            : {}),
         APP_BASE_PATH: `/${app}`,
         VITE_APP_BASE_PATH: `/${app}`,
         AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: workspaceAppAudience,

package/dist/mcp-client/oauth-routes.d.ts

@@ -25,6 +25,7 @@ export interface McpOAuthRoutesOptions {
 export declare function redirectWithStagedCookies(event: H3Event, location: string): Response;
 export declare function mountMcpOAuthRoutes(nitroApp: any, options: McpOAuthRoutesOptions): void;
 export declare function resolveMcpOAuthScope(serverUrl: URL, requestedScope: unknown): RemoteMcpScope | null;
+export declare function stripMcpOAuthAppBasePath(path: string, basePath: string): string;
 export declare function resolveManagedMcpOAuthClient(serverUrl: URL): Promise<StoredOAuthClientInformation | undefined>;
 export declare function setMcpOAuthFlowCookie(event: H3Event, flow: McpOAuthFlow, secure: boolean): void;
 export declare function readMcpOAuthFlowCookie(event: H3Event): McpOAuthFlow | null;

package/dist/mcp-client/oauth-routes.js

@@ -5,7 +5,7 @@ import { decryptSecretValue, encryptSecretValue } from "../secrets/crypto.js";
 import { getSession, safeReturnPath } from "../server/auth.js";
 import { resolveSecret } from "../server/credential-provider.js";
 import { getH3App } from "../server/framework-request-handler.js";
-import { getAppUrl, resolveOAuthRedirectUri } from "../server/google-oauth.js";
+import { getAppBasePath, getAppUrl, resolveOAuthRedirectUri, } from "../server/google-oauth.js";
 import { runWithRequestContext } from "../server/request-context.js";
 import { finishMcpOAuthAuthorization, startMcpOAuthAuthorization, validateMcpOAuthCallbackIssuer, } from "./oauth-client.js";
 import { addOAuthRemoteServer, listRemoteServers, normalizeServerName, replaceOAuthRemoteServer, validateRemoteUrl, } from "./remote-store.js";
@@ -206,6 +206,19 @@ export function resolveMcpOAuthScope(serverUrl, requestedScope) {
     }
     return requestedScope === "org" ? "org" : "user";
 }
+export function stripMcpOAuthAppBasePath(path, basePath) {
+    const normalizedBase = `/${basePath.replace(/^\/+|\/+$/g, "")}`;
+    if (normalizedBase === "/")
+        return path;
+    const suffixStart = path.search(/[?#]/);
+    const pathname = suffixStart === -1 ? path : path.slice(0, suffixStart);
+    const suffix = suffixStart === -1 ? "" : path.slice(suffixStart);
+    if (pathname === normalizedBase)
+        return `/${suffix}`;
+    return pathname.startsWith(`${normalizedBase}/`)
+        ? `${pathname.slice(normalizedBase.length)}${suffix}`
+        : path;
+}
 export async function resolveManagedMcpOAuthClient(serverUrl) {
     const client = MANAGED_MCP_OAUTH_CLIENTS.find((candidate) => candidate.serverOrigin === serverUrl.origin);
     if (!client)
@@ -286,7 +299,7 @@ async function handleMcpOAuthCallback(event, options) {
         await options.reconfigure();
         const returnPath = flow.returnUrl ??
             `/settings/integrations?connected=mcp-${encodeURIComponent(flow.name)}`;
-        return redirectWithStagedCookies(event, getAppUrl(event, returnPath));
+        return redirectWithStagedCookies(event, getAppUrl(event, stripMcpOAuthAppBasePath(returnPath, getAppBasePath())));
     }
     catch {
         setResponseStatus(event, 400);