@@ -0,0 +1,10 @@
+---
+'@object-ui/app-shell': patch
+---
+
+fix(app-shell): a full-page record form opened by direct URL returns inside the app after save or cancel
+
+Clause-②: no
+Metadata-protocol: none
+
+The full-page create and edit forms (`/new`, `/record/ID/edit`) went Back after a save or cancel whenever the browser tab had any history, including entries from before the console loaded. A form reached by a pasted URL, a new tab or a deep link therefore left the app (often for the console home), and the save toast was lost with the unloaded page. The form now goes Back only when an earlier page of this console session is behind it; otherwise it goes to the record (edit) or the object list (create), as in-app entry does when nothing is behind it, and the toast is shown there.
@@ -0,0 +1,112 @@
+/**
+ * objectstack-ai/objectstack#27454 — a full-page record form entered by direct
+ * URL returns INSIDE the app after save or cancel: the record detail (edit) or
+ * the object list (create), as in-app entry does with nothing behind it. The
+ * tab's own history is longer than the console's, so `window.history.length`
+ * is simulated as 3 on every cell. Direction, written before the run: keyed on
+ * `window.history.length > 1`, every direct-URL cell RED; in-app cells GREEN.
+ */
+
+import '@testing-library/jest-dom/vitest';
+import * as React from 'react';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { render, screen, cleanup, fireEvent } from '@testing-library/react';
+import { MemoryRouter, Routes, Route, useLocation } from 'react-router-dom';
+import { I18nProvider } from '@object-ui/i18n';
+import { RecordFormPage } from './RecordFormPage';
+
+const h = React.createElement;
+
+const { toastSuccess } = vi.hoisted(() => ({ toastSuccess: vi.fn() }));
+
+vi.mock('sonner', () => ({
+  toast: Object.assign(vi.fn(), { success: toastSuccess, error: vi.fn(), info: vi.fn(), dismiss: vi.fn() }),
+}));
+
+vi.mock('@object-ui/auth', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  useAuth: () => ({
+    user: { id: 'u1', name: 'Ada', email: 'ada@example.com', role: 'admin' },
+    getAuthConfig: async () => ({ features: {} }),
+    activeOrganization: null,
+  }),
+}));
+
+// Stand-in form: one button per exit, as `ObjectForm` calls `onSuccess(result)` / `onCancel()`.
+vi.mock('@object-ui/plugin-form', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  ObjectForm: ({ schema }: { schema: { onSuccess?: (s?: unknown) => void; onCancel?: () => void } }) =>
+    h(
+      'div',
+      null,
+      h('button', { type: 'button', 'data-testid': 'fire-success', onClick: () => schema.onSuccess?.({ id: 't1', subject: 'Quarterly review' }) }, 'ok'),
+      h('button', { type: 'button', 'data-testid': 'fire-cancel', onClick: () => schema.onCancel?.() }, 'cancel'),
+    ),
+}));
+
+const TASK = { name: 'showcase_task', label: 'Task', nameField: 'subject', fields: { subject: { type: 'text' } } };
+const METADATA = { objects: [TASK], loading: false };
+vi.mock('../providers/MetadataProvider', () => ({ useMetadata: () => METADATA }));
+vi.mock('../providers/AdapterProvider', () => ({ useAdapter: () => null }));
+
+const Where = () => h('div', { 'data-testid': 'where' }, useLocation().pathname);
+
+const LIST = '/apps/crm/showcase_task';
+const DETAIL = '/apps/crm/showcase_task/record/t1';
+const VIEW = '/apps/crm/showcase_task/view/open';
+
+beforeEach(() => {
+  toastSuccess.mockClear();
+  vi.spyOn(window.history, 'length', 'get').mockReturnValue(3);
+});
+afterEach(() => { cleanup(); vi.restoreAllMocks(); });
+
+/** Mount the form behind `before` (none = direct URL), fire `exit`, return where it lands. */
+function exitFrom(mode: 'create' | 'edit', exit: 'success' | 'cancel', before?: string): string {
+  const form = mode === 'create' ? `${LIST}/new` : `${DETAIL}/edit`;
+  const entries = before ? [before, form] : [form];
+  render(
+    h(I18nProvider, {
+      config: { defaultLanguage: 'en', detectBrowserLanguage: false },
+      children: h(
+        MemoryRouter,
+        { initialEntries: entries, initialIndex: entries.length - 1 },
+        h(
+          Routes,
+          null,
+          h(Route, { path: '/apps/:appName/:objectName/new', element: h(RecordFormPage, { mode: 'create' }) }),
+          h(Route, { path: '/apps/:appName/:objectName/record/:recordId/edit', element: h(RecordFormPage, { mode: 'edit' }) }),
+          h(Route, { path: '*', element: h(Where) }),
+        ),
+      ),
+    }),
+  );
+  fireEvent.click(screen.getByTestId(exit === 'success' ? 'fire-success' : 'fire-cancel'));
+  return screen.getByTestId('where').textContent ?? '';
+}
+
+describe('RecordFormPage — direct-URL entry returns inside the app (objectstack-ai/objectstack#27454)', () => {
+  it('edit, direct URL: saves, toasts, lands on the record detail', () => {
+    expect(exitFrom('edit', 'success')).toBe(DETAIL);
+    expect(toastSuccess).toHaveBeenCalledWith('Task "Quarterly review" updated');
+  });
+
+  it('create, direct URL: saves, toasts, lands on the object list', () => {
+    expect(exitFrom('create', 'success')).toBe(LIST);
+    expect(toastSuccess).toHaveBeenCalledWith('Task "Quarterly review" created');
+  });
+
+  it('edit, direct URL: cancel lands on the record detail, no toast', () => {
+    expect(exitFrom('edit', 'cancel')).toBe(DETAIL);
+    expect(toastSuccess).not.toHaveBeenCalled();
+  });
+
+  it('edit, in-app entry: save goes back to the page it came from', () => {
+    expect(exitFrom('edit', 'success', VIEW)).toBe(VIEW);
+    expect(toastSuccess).toHaveBeenCalledTimes(1);
+  });
+
+  it('create, in-app entry: cancel goes back to the page it came from', () => {
+    expect(exitFrom('create', 'cancel', VIEW)).toBe(VIEW);
+  });
+});
@@ -18,18 +18,18 @@
  *     fetches the existing record (in edit mode) via `dataSource.findOne`,
  *     so this page does not need to manage its own loading state for
  *     record data.
- *   - On success / cancel, navigates back if the user has history, otherwise
- *     falls back to a sensible parent route (record detail in edit mode,
- *     object list in create mode). Cancel always navigates back without a
- *     toast.
+ *   - On success / cancel, navigates back when an earlier entry of THIS
+ *     console session is behind the page, otherwise goes to the parent route
+ *     (record detail in edit mode, object list in create mode). Cancel never
+ *     toasts.
  *   - Wraps the form in a sticky page header (back button + title) for a
  *     consistent full-screen chrome.
  *
  * @module views/RecordFormPage
  */
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useParams, useNavigate, useSearchParams, Link } from 'react-router-dom';
+import { useParams, useNavigate, useLocation, useSearchParams, Link } from 'react-router-dom';
 import { ObjectForm } from '@object-ui/plugin-form';
 import { Button, Empty, EmptyTitle, EmptyDescription } from '@object-ui/components';
 import { ArrowLeft, Building2, Database } from 'lucide-react';
@@ -71,6 +71,7 @@ export function RecordFormPage({ mode }: RecordFormPageProps) {
     recordId: string;
   }>();
   const navigate = useNavigate();
+  const location = useLocation();
   const [searchParams] = useSearchParams();
   const dataSource = useAdapter();
   const { objects, loading: metadataLoading } = useMetadata();
@@ -120,18 +121,22 @@ export function RecordFormPage({ mode }: RecordFormPageProps) {
 
   /**
    * Navigate back to the most relevant location.
-   * Prefer `history.back()` so users return to the exact list/view they came
-   * from (preserving filters, scroll position, etc.). Fall back to the
-   * record detail (edit mode) or list (create mode) when there is no
-   * history entry — happens on direct/refreshed loads of the URL.
+   * Back when a page of this console is behind this one (react-router keys
+   * the entry it started on `'default'`, as `FormPage`'s cancel reads it), so
+   * users return to the exact list/view they came from. ⛔ Not
+   * `window.history.length`: it counts the tab's entries from before the
+   * console loaded, so a pasted URL went Back out of the app and lost the save
+   * toast (objectstack-ai/objectstack#27454). Otherwise the record detail
+   * (edit) or list (create), inside the app.
    */
+  const hasInAppHistory = location.key !== 'default';
   const goBack = useCallback(() => {
-    if (typeof window !== 'undefined' && window.history.length > 1) {
+    if (hasInAppHistory) {
       navigate(-1);
     } else {
       navigate(recordDetailUrl, { replace: true });
     }
-  }, [navigate, recordDetailUrl]);
+  }, [navigate, recordDetailUrl, hasInAppHistory]);
 
   // Two names, not one (objectui#11733): the title and the toasts speak of ONE
   // record, so they keep the singular; the breadcrumb link opens the object's