InstaNode-dev
diff --git a/‎e2e/navigation.spec.ts‎
Lines changed: 17 additions & 0 deletions b/‎e2e/navigation.spec.ts‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎src/pages/DeploymentsPage.test.tsx‎
Lines changed: 57 additions & 14 deletions b/‎src/pages/DeploymentsPage.test.tsx‎
Lines changed: 57 additions & 14 deletions
diff --git a/‎src/pages/DeploymentsPage.tsx‎
Lines changed: 67 additions & 9 deletions b/‎src/pages/DeploymentsPage.tsx‎
Lines changed: 67 additions & 9 deletions
diff --git a/‎src/pages/MarketingPage.test.tsx‎
Lines changed: 58 additions & 0 deletions b/‎src/pages/MarketingPage.test.tsx‎
Lines changed: 58 additions & 0 deletions
diff --git a/‎src/pages/MarketingPage.tsx‎
Lines changed: 21 additions & 3 deletions b/‎src/pages/MarketingPage.tsx‎
Lines changed: 21 additions & 3 deletions
@@ -40,4 +40,21 @@ test.describe('Navigation', () => {
       await expect(page.getByRole('heading', { level: 1 }).first()).toBeVisible()
     }
   })
+
+  // T15 P2-2 regression guard: clicking a resource row on /app/resources
+  // must land directly on /app/resources/<token> — no intermediate
+  // /resources/<token> hop through LegacyResourceRedirect. The previous
+  // implementation linked rows at the unprefixed legacy path, which
+  // resolved via <Navigate replace> → render→navigate→render, adding
+  // a wrong intermediate entry to the browser history.
+  test('resource row links go straight to /app/resources/:id (no legacy hop)', async ({ page }) => {
+    await page.goto('/app/resources')
+    // The first row's `<a class="res-name">` wraps the resource name +
+    // identifiers. Its href must already be the /app/-prefixed path.
+    const firstRow = page.getByRole('link').filter({ hasText: /flashcards-db/i }).first()
+    await expect(firstRow).toBeVisible()
+    const href = await firstRow.getAttribute('href')
+    expect(href).toMatch(/^\/app\/resources\//)
+    expect(href).not.toMatch(/^\/resources\//)
+  })
 })
@@ -104,15 +104,31 @@ describe('DeploymentsPage — empty state', () => {
     expect(text).toMatch(/\/deploy\/new/)
   })
 
-  it('renders the same honest empty state when listDeployments rejects', async () => {
-    // The page swallows errors and falls back to the empty state — better
-    // than rendering a fabricated row. The contract test in index.test.ts
-    // asserts the API helper *does* propagate so a future surface could
-    // render a real error banner; this surface chooses empty for now.
+  it('surfaces a real error banner (not "No deployments yet") when listDeployments rejects', async () => {
+    // T15 P2-7 fix: a 429 or 5xx must NOT collapse to "No deployments
+    // yet" — that lies about platform state and looks like normal empty
+    // state. The page renders a dedicated error banner via retryHint and
+    // an honest empty list under it. Regression guard: catch any future
+    // refactor that re-swallows the error.
     mockListDeployments.mockRejectedValueOnce(new Error('network'))
     render(withRouter(<DeploymentsPage />))
-    const empty = await screen.findByTestId('deployments-empty')
-    expect(empty.textContent).toMatch(/No deployments yet/)
+    const banner = await screen.findByTestId('deployments-error')
+    expect(banner.textContent).toMatch(/Could not load deployments/)
+  })
+
+  it('renders a 429 rate-limit hint with the Retry-After seconds', async () => {
+    // Regression guard for T15 P2-7: DeploymentsPage now consumes
+    // retryHint just like TeamPage. A rejected fetch carrying status=429
+    // + retryAfter must render the user-friendly retry hint, not a raw
+    // error string.
+    const rateLimited: Error & { status?: number; retryAfter?: number } = new Error('rate limited')
+    rateLimited.status = 429
+    rateLimited.retryAfter = 30
+    mockListDeployments.mockRejectedValueOnce(rateLimited)
+    render(withRouter(<DeploymentsPage />))
+    const banner = await screen.findByTestId('deployments-error')
+    expect(banner.textContent).toMatch(/Too many requests/i)
+    expect(banner.textContent).toMatch(/30 seconds/i)
   })
 })
 
@@ -135,14 +151,22 @@ describe('DeploymentsPage — non-empty state', () => {
       expect(container.querySelector('[data-testid="deployments-empty"]')).toBeNull(),
     )
 
-    // Each row is a <Link to="/deployments/:app_id"> — we route by app_id
-    // (not the UUID `id`) because GET /api/v1/deployments/:id on the
-    // agent API resolves `:id` against the app_id column. Routing by
-    // UUID would 404.
-    const links = Array.from(container.querySelectorAll('a[href^="/deployments/"]'))
+    // Each row is a <Link to="/app/deployments/:app_id"> — we route by
+    // app_id (not the UUID `id`) because GET /api/v1/deployments/:id on
+    // the agent API resolves `:id` against the app_id column. Routing
+    // by UUID would 404. Linking to /app/deployments/* directly (rather
+    // than the unprefixed legacy path) avoids the
+    // LegacyDeploymentRedirect render→Navigate→render double-hop on
+    // every row click — regression guard for T15 P2-2.
+    const links = Array.from(container.querySelectorAll('a[href^="/app/deployments/"]'))
     expect(links.length).toBe(2)
-    expect(links.map((a) => a.getAttribute('href'))).toContain('/deployments/app-a')
-    expect(links.map((a) => a.getAttribute('href'))).toContain('/deployments/app-b')
+    expect(links.map((a) => a.getAttribute('href'))).toContain('/app/deployments/app-a')
+    expect(links.map((a) => a.getAttribute('href'))).toContain('/app/deployments/app-b')
+    // Negative assertion: no unprefixed /deployments/* links. The legacy
+    // unprefixed route exists for external bookmarks only; internal nav
+    // must skip the redirect.
+    const legacyLinks = Array.from(container.querySelectorAll('a[href^="/deployments/"]'))
+    expect(legacyLinks.length).toBe(0)
 
     // URL column renders the hostname (https:// stripped). Use textContent
     // on the full page rather than scoping to row — the row uses CSS grid
@@ -229,4 +253,23 @@ describe('DeploymentsPage — private deploy section, tier-gated', () => {
     expect(toggle.checked).toBe(false)
     expect(screen.queryByTestId('ip-allow-list')).toBeNull()
   })
+
+  // T15 P2-3 regression guard: DeploymentsPage must read the
+  // private-deploy tier gate from team.tier, NOT user.tier. The team is
+  // the billing entity; reading from user.tier was a latent divergence
+  // that would silently break the gate the moment the API splits the
+  // two fields. Construct a `me` shape where team.tier='pro' but
+  // user.tier='hobby' — under the bug, the page would render the
+  // hobby upsell; under the fix it must render the pro configurator.
+  it('uses team.tier (not user.tier) for the private-deploy gate', async () => {
+    mockMe = {
+      user: { id: 'u', email: 'me@test', tier: 'hobby', team_id: 't', created_at: '' },
+      team: { id: 't', slug: 't', name: 't', owner_id: 'u', member_count: 1, tier: 'pro', created_at: '' },
+    }
+    render(withRouter(<DeploymentsPage />))
+    await waitFor(() => screen.getByTestId('private-deploy-section'))
+    // team.tier=pro → configurator renders, upsell does NOT.
+    expect(screen.getByTestId('private-deploy-configurator')).toBeTruthy()
+    expect(screen.queryByTestId('private-deploy-upsell')).toBeNull()
+  })
 })
@@ -10,6 +10,7 @@ import { TtlBadge } from '../components/TtlBadge'
 import * as api from '../api'
 import type { DashboardDeployment, Tier } from '../api'
 import { useDashboardCtx } from '../hooks/useDashboardCtx'
+import { isRateLimited, retryAfterSeconds, formatRetryHint } from '../lib/retryHint'
 
 // B7-P2 (2026-05-20): status filter + sort chips. The sidebar env switch
 // already filters by env on the API side, but a Pro user with 10 deploys
@@ -35,13 +36,27 @@ function statusBucket(s: DashboardDeployment['status']): StatusFilter {
 // will reject.
 const PRIVATE_DEPLOY_TIERS: ReadonlySet<Tier> = new Set(['pro', 'team', 'growth'])
 
+// LoadError mirrors TeamPage's shape — the 429 retry-hint pattern is
+// shared. A rate-limited or 5xx fetch must NOT collapse to "No deployments
+// yet" (which mis-reports the platform state and erodes trust); we surface
+// a real error banner instead and honor any Retry-After hint.
+type LoadError = { message: string; rateLimited: boolean; retrySeconds: number | null }
+
 export function DeploymentsPage() {
   const ctx = useDashboardCtx()
   const [items, setItems] = useState<DashboardDeployment[]>([])
   const [loading, setLoading] = useState(true)
   const [statusFilter, setStatusFilter] = useState<StatusFilter>('all')
   const [sort, setSort] = useState<SortKey>('recent')
-  const tier = (ctx.me?.user.tier ?? 'anonymous') as Tier
+  const [err, setErr] = useState<LoadError | null>(null)
+  // T15 P2-3: Tier is a TEAM attribute (billing entity is the team, not
+  // the individual user). All other pages — BillingPage, ResourcesPage,
+  // VaultPage, OverviewPage, TeamPage, AppShell — read ctx.me?.team.tier.
+  // Reading ctx.me?.user.tier here was a latent divergence: today
+  // fetchMe() populates both fields from the same `me.tier`, so they
+  // agree, but the moment the API splits per-user vs per-team tier the
+  // private-deploy gate on this one page silently drifts.
+  const tier = (ctx.me?.team?.tier ?? 'anonymous') as Tier
   const canUsePrivateDeploy = PRIVATE_DEPLOY_TIERS.has(tier)
 
   // Derived view: env is server-filtered (?env= query, see useEffect dep);
@@ -75,20 +90,27 @@ export function DeploymentsPage() {
   // query param; switching envs triggers a refetch via the dep array.
   useEffect(() => {
     let cancelled = false
+    setErr(null)
+    setLoading(true)
     api
       .listDeployments(ctx.env)
       .then((r) => {
         if (cancelled) return
         setItems(r.items)
         setLoading(false)
       })
-      .catch(() => {
-        // Honest empty state on failure — the page renders the no-
-        // deployments hint rather than fabricating placeholder rows.
-        if (!cancelled) {
-          setItems([])
-          setLoading(false)
-        }
+      .catch((e) => {
+        if (cancelled) return
+        // T15 P2-7: a 429 or 5xx must NOT silently collapse the list to
+        // "No deployments yet" — that lies about platform state. Surface
+        // the error banner instead (rate-limit aware via retryHint).
+        setItems([])
+        setErr({
+          message: e?.message ?? 'Could not load deployments',
+          rateLimited: isRateLimited(e),
+          retrySeconds: retryAfterSeconds(e),
+        })
+        setLoading(false)
       })
     return () => {
       cancelled = true
@@ -102,6 +124,35 @@ export function DeploymentsPage() {
           for paid-tier consideration. */}
       <QuotaWallBanner teamId={ctx.me?.team?.id} />
 
+      {/* Rate-limit / load-error banner. Sits ABOVE the empty-state row
+          so a 429 or 5xx is impossible to mistake for "you have no
+          deployments". Matches the TeamPage error-banner pattern so the
+          dashboard handles the API's structured error envelope the same
+          way across pages. */}
+      {err && (
+        <div
+          role="alert"
+          data-testid="deployments-error"
+          className="card"
+          style={{
+            padding: '10px 14px',
+            marginBottom: 16,
+            borderColor: err.rateLimited ? 'var(--amber)' : 'var(--rose)',
+            color: err.rateLimited ? 'var(--amber)' : 'var(--rose)',
+            fontSize: 12.5,
+          }}
+        >
+          {err.rateLimited ? (
+            <>
+              Too many requests — the deployments list is rate-limited.{' '}
+              {formatRetryHint(err.retrySeconds)}
+            </>
+          ) : (
+            <>Could not load deployments — {err.message}. Reload the page to try again.</>
+          )}
+        </div>
+      )}
+
       {/* W9: human-driven "Create stack" entry-point. The dashboard
           stays read-only everywhere else, but POST /stacks/new is
           multipart-only — agents can't tar up source either, so this
@@ -238,8 +289,15 @@ export function DeploymentsPage() {
           // app_id column. Routing by UUID would 404. app_id is also the
           // segment used by /deploy/:id/logs, so the same param threads
           // through to the SSE log stream on DeployDetailPage.
+          //
+          // T15 P2-2: link directly to /app/deployments/:id — the prefixed
+          // dashboard route. The unprefixed /deployments/:id path also
+          // resolves but through LegacyDeploymentRedirect (App.tsx) which
+          // does a render → <Navigate replace> → render double-hop. The
+          // legacy route is for external/bookmarked links only; internal
+          // nav should go straight to the canonical /app/* path.
           <Link
-            to={`/deployments/${d.app_id}`}
+            to={`/app/deployments/${d.app_id}`}
             key={d.id}
             className="table-row"
             style={{ gridTemplateColumns: '1.5fr 1fr 100px 80px 100px 110px 80px 28px', textDecoration: 'none', color: 'inherit' }}
 
@@ -59,3 +59,61 @@ describe('MarketingPage — legal footer links (W12 H15)', () => {
     expect(a!.getAttribute('href')).toBe('https://instanode.dev/llms.txt')
   })
 })
+
+// ─── T18 P1-2 / P1-4 / P1-6 regression guards ──────────────────────────────
+//
+// These pin the post-bug-bash invariants on the homepage 'For agents' nav
+// link and the page's own claim copy. The nav-drift guard (T18 P1-1) is
+// covered by sibling PR #107's MarketingNav shared module, so this PR
+// sticks to the residual fixes #107 did not address.
+describe('MarketingPage — homepage nav drift (T18 P1-2)', () => {
+  it("homepage nav 'For agents' link points at /for-agents (not '#for-agents')", () => {
+    const { container } = render(
+      <MemoryRouter initialEntries={['/']}>
+        <MarketingPage />
+      </MemoryRouter>,
+    )
+    // T18 P1-2: every 'For agents' anchor in the homepage nav routes to
+    // the dedicated page. (The page also still has an `id="for-agents"`
+    // section so direct hash-links continue to scroll; this test just
+    // pins that the nav label routes consistently.)
+    const anchors = Array.from(container.querySelectorAll('a')).filter(
+      (a) => (a.textContent ?? '').trim() === 'For agents',
+    )
+    expect(anchors.length).toBeGreaterThan(0)
+    for (const a of anchors) {
+      expect(a.getAttribute('href')).toBe('/for-agents')
+    }
+  })
+})
+
+describe('MarketingPage — claim consistency (T18 P1-4 / P1-6)', () => {
+  it("'Seven services' headline matches the MCP tools card (both say seven, listing webhook)", () => {
+    const { container } = render(
+      <MemoryRouter initialEntries={['/']}>
+        <MarketingPage />
+      </MemoryRouter>,
+    )
+    const text = container.textContent ?? ''
+    // Headline says "Seven services. One bundle."
+    expect(text).toMatch(/Seven services\. One bundle\./)
+    // MCP tools card must NOT say "Six tools registered" (the dropped-
+    // webhook regression). It must say "Seven" and list webhook.
+    expect(text).not.toMatch(/Six tools registered/)
+    expect(text).toMatch(/Seven tools registered/)
+    expect(text).toMatch(/webhook/)
+  })
+
+  it("Deploy service card claims a build window consistent with content/llms.txt (~60s, not '<10s')", () => {
+    const { container } = render(
+      <MemoryRouter initialEntries={['/']}>
+        <MarketingPage />
+      </MemoryRouter>,
+    )
+    const text = container.textContent ?? ''
+    // The previous '<10s' claim contradicted content/llms.txt's ~30–90s
+    // kaniko-build window. The honest number is ~60s.
+    expect(text).not.toMatch(/<10s/)
+    expect(text).toMatch(/~60s/)
+  })
+})
@@ -77,13 +77,20 @@ const HOMEPAGE_USECASE_SLUGS = [
 // Anchors and route paths used throughout the page. Centralized so we don't
 // scatter hardcoded string fragments — easy to update when /pricing or /docs
 // gets wired in.
+//
+// T18 P1-2 (2026-05-20): `forAgents` previously pointed at `#for-agents`,
+// a same-page anchor. Every other shell (PublicShell) linked to the
+// real `/for-agents` page. Same label, two destinations. Now both point
+// at the route — the homepage anchor `id="for-agents"` still scrolls for
+// users already on the page, but the nav link routes consistently so
+// the standalone page is no longer orphaned from the homepage nav.
 const ROUTES = {
   signin: '/login',
   pricing: '/pricing',
   docs: '/docs',
   blog: '/blog',
   changelog: '/changelog',
-  forAgents: '#for-agents',
+  forAgents: '/for-agents',
   playground: '#playground',
 } as const
 
@@ -104,7 +111,13 @@ const SERVICES: Service[] = [
   // Renamed to avoid the brand-tie-in confusion.
   { id: 'st', name: 'Storage (S3-compatible)', curl: 'POST /storage/new', liveIn: '0.8s' },
   { id: 'wh', name: 'Webhook',        curl: 'POST /webhook/new', liveIn: '0.3s' },
-  { id: 'dp', name: 'Deploy',         curl: 'POST /deploy/new',  liveIn: '<10s' },
+  // T18 P1-6 (2026-05-20): liveIn was '<10s', which contradicted both
+  // content/llms.txt ("~30–90s") and content/docs/deploy.md ("~30s build")
+  // by 3–9×. The actual kaniko build pipeline (Dockerfile → image layer
+  // cache → Service → Ingress → cert-manager) lands in the 30–90s range.
+  // '~60s' matches docs and llms.txt — a 3–9× shipping-window lie on the
+  // primary acquisition surface was the headline bug here.
+  { id: 'dp', name: 'Deploy',         curl: 'POST /deploy/new',  liveIn: '~60s' },
 ]
 
 type Plan = {
@@ -648,7 +661,12 @@ export function MarketingPage() {
                   {'\n  '}{'}'}
                   {'\n'}{'}'}
                 </div>
-                <p>Six tools registered: <code>postgres</code>, <code>redis</code>, <code>mongo</code>, <code>queue</code>, <code>storage</code>, <code>deploy</code>.</p>
+                {/* T18 P1-4 (2026-05-20): list the same seven tools as
+                    the "Seven services. One bundle." headline (and the
+                    SERVICES array). The earlier "Six tools" copy dropped
+                    webhook — a real MCP tool — and contradicted the same
+                    page. */}
+                <p>Seven tools registered: <code>postgres</code>, <code>redis</code>, <code>mongo</code>, <code>queue</code>, <code>storage</code>, <code>webhook</code>, <code>deploy</code>.</p>
               </div>
             </div>