Merge branch 'main' into dependabot/github_actions/actions-e98f365c3b

Author: mastermanas805

public/llms.txt

@@ -186,8 +186,9 @@ export const PRICING_GRID_TIERS: TierDefinition[] = [
       { text: 'unlimited deployments · 50 custom domains' },
       { text: 'unlimited vault entries · multi-env' },
       { text: '90-day backups · self-serve restore' },
-      { text: 'RBAC + audit log · SSO / SAML' },
-      { text: '99.9% SLA' },
+      { text: 'RBAC + audit log' },
+      { text: 'SSO / SAML (coming soon)' },
+      { text: '99.9% SLA (coming soon)' },
     ],
   },
 ]

src/components/PricingGrid.tsx

@@ -53,14 +53,26 @@ describe('useDashboardCtx', () => {
     await waitFor(() => expect(result.current.me).not.toBeNull())
     expect(result.current.me?.user.email).toBe('a@b.com')
     await waitFor(() => expect(result.current.billing?.status).toBe('active'))
-    // production filter → 1 of the 2 resources; deployments 1; vault 1.
-    expect(result.current.counts.resources).toBe(1)
+    // No env filter (global switcher removed) → both resources count; the
+    // sidebar lists all envs. Deployments 1; vault 1 (still per-env).
+    expect(result.current.counts.resources).toBe(2)
     expect(result.current.counts.deployments).toBe(1)
     expect(result.current.counts.vault).toBe(1)
-    // env merged from resource list.
+    // env names still merged from the resource list (for VaultPage tabs).
     expect(result.current.envs).toContain('staging')
   })
 
+  it('deployments count falls back to 0 when listDeployments rejects (catch arm)', async () => {
+    listDeployments.mockRejectedValue(new Error('deployments down'))
+    const mod = await load()
+    const { result } = renderHook(() => mod.useDashboardCtx())
+    await waitFor(() => expect(result.current.me).not.toBeNull())
+    // refreshCounts swallows the deployments failure → count 0, and the other
+    // counts (resources/vault) still resolve.
+    await waitFor(() => expect(result.current.counts.resources).toBe(2))
+    expect(result.current.counts.deployments).toBe(0)
+  })
+
   it('does NOT bootstrap when there is no token', async () => {
     getToken.mockReturnValue('')
     const mod = await load()
@@ -87,8 +99,9 @@ describe('useDashboardCtx', () => {
     expect(result.current.env).toBe('staging')
     expect(localStorage.getItem('instanode.env')).toBe('staging')
     await waitFor(() => expect(listResources).toHaveBeenCalled())
-    // staging filter → 1 resource.
-    await waitFor(() => expect(result.current.counts.resources).toBe(1))
+    // setEnv still re-fetches (vault is per-env), but resources count spans
+    // all envs now (switcher removed) → both mock resources count.
+    await waitFor(() => expect(result.current.counts.resources).toBe(2))
   })
 
   it('setEnv is a no-op when the env is unchanged', async () => {

src/hooks/useDashboardCtx.test.ts

@@ -2,17 +2,20 @@
 // state": the signed-in user, their team, the active env, and the live
 // resource/vault counts shown in the sidebar.
 //
-// Env scope — IMPORTANT:
-//   The backend does NOT yet honor a multi-env filter on resources/stacks.
-//   The only surface where `env` is genuinely backed by per-env data is
-//   VaultPage (vault_secrets.env is real). Everywhere else, `env` is a
-//   cosmetic display value snapshotted at provision time and surfacing
-//   filter chips would imply a backend capability that doesn't exist yet
-//   (env promotion is the §10.17 Pro-tier feature still in development).
+// Env scope — IMPORTANT (2026-06-03):
+//   The backend DOES support per-env filtering (GET /api/v1/resources?env=,
+//   /deployments?env=, and real per-env vault isolation). But the broader
+//   multi-environment UX (choosing env at create time, env promotion — the
+//   §10.17 Pro-tier feature) is unfinished, so the GLOBAL env switcher has
+//   been removed from the chrome to avoid surfacing a half-built capability.
 //
-//   Keep `env` / `envs` / `setEnv` / `addEnv` here for VaultPage and for
-//   the sidebar's vault subtitle. Do NOT add new env-filter call sites
-//   without also wiring a real server-side filter behind them.
+//   Consequence: Resources / Deployments / Overview deliberately fetch
+//   WITHOUT an env filter (all envs visible) so nothing is hidden now that
+//   the user can't switch env globally. The ONLY surface that still scopes
+//   by env is VaultPage, which has its OWN env tabs and where per-env
+//   isolation is genuinely finished. `env` / `envs` / `setEnv` / `addEnv`
+//   remain here solely for VaultPage. Do NOT re-add a global env switcher or
+//   new env-filter call sites until the multi-env UX is finished.
 
 import { useEffect, useSyncExternalStore } from 'react'
 import * as api from '../api'
@@ -105,7 +108,8 @@ export function setEnv(next: string) {
 //
 //   Fix: align the JS regex with the api regex, enforce the 32-char
 //   cap up front, and return early if validation fails. The caller
-//   (EnvSwitcher) already gates `addEnv` behind a non-empty draft so
+//   (VaultPage's new-env input — the global EnvSwitcher was removed
+//   2026-06-03) already gates `addEnv` behind a non-empty draft so
 //   no UI plumbing changes are required.
 const ENV_REGEX = /^[a-z0-9-]{1,32}$/
 const ENV_MAX_LEN = 32
@@ -149,24 +153,26 @@ async function refreshCounts() {
     // are NOT rows in the `resources` list (resource_type === 'deploy' never
     // appears there), so the sidebar deployments count must be sourced from
     // api.listDeployments(), not a filter over `resources`.
+    // Resources + deployments are fetched WITHOUT an env filter: the global
+    // env switcher is hidden (multi-env UX unfinished), so the sidebar counts
+    // must reflect every env or they'd undercount. Vault stays per-env (real).
     const [r, v, d] = await Promise.all([
       api.listResources().catch(() => ({ items: [], total: 0 })),
       api.listVault(state.env).catch(() => ({ entries: [] })),
-      api.listDeployments(state.env).catch(() => ({ ok: true as const, items: [], total: 0 })),
+      api.listDeployments().catch(() => ({ ok: true as const, items: [], total: 0 })),
     ])
-    // Merge envs from resources too — surfaces real env names.
+    // Merge envs from resources too — surfaces real env names for VaultPage tabs.
     const fromAPI = new Set(state.envs)
     for (const it of (r as any).items ?? []) if (it.env) fromAPI.add(it.env)
     const envs = Array.from(fromAPI)
 
     const items = ((r as any).items ?? []) as Resource[]
-    const filtered = items.filter((x) => (x.env ?? 'production') === state.env)
     state = {
       ...state,
       envs,
       resources: items,
       counts: {
-        resources: filtered.length,
+        resources: items.length,
         deployments: ((d as any).items ?? []).length,
         vault: ((v as any).entries ?? []).length,
         team: 1, // no /team/members endpoint; placeholder

src/hooks/useDashboardCtx.ts

@@ -0,0 +1,92 @@
+/* AppShell.env.test.tsx — environment-switcher REMOVAL guard.
+ *
+ * 2026-06-03: the global environment switcher was removed from the dashboard
+ * chrome. The backend supports per-env filtering, but the broader multi-env
+ * UX (choosing env at create time, env promotion) is unfinished, so surfacing
+ * a global switcher advertised a half-built capability. It's hidden until the
+ * feature is done. Per-env vault tabs remain on VaultPage (isolation is real
+ * there).
+ *
+ * These tests pin that the switcher stays gone, so a future refactor can't
+ * silently re-introduce it.
+ */
+
+import { describe, it, expect, afterEach, vi } from 'vitest'
+import { render, screen, cleanup } from '@testing-library/react'
+import { MemoryRouter } from 'react-router-dom'
+
+vi.mock('../api', async () => {
+  const actual = await vi.importActual<typeof import('../api')>('../api')
+  return {
+    ...actual,
+    fetchTeamSummary: vi.fn().mockResolvedValue({ ok: true, teams: [] }),
+  }
+})
+
+vi.mock('../hooks/useDashboardCtx', async () => {
+  const actual = await vi.importActual<typeof import('../hooks/useDashboardCtx')>(
+    '../hooks/useDashboardCtx',
+  )
+  return {
+    ...actual,
+    useDashboardCtx: () => ({
+      me: {
+        user: { id: 'u_test', email: 'aanya@acme.dev', tier: 'pro' },
+        team: { id: 't_test', slug: 'acme', name: 'acme', tier: 'pro' },
+      },
+      meErr: null,
+      meLoading: false,
+      env: 'development',
+      envs: ['development', 'production'],
+      counts: { resources: 3, deployments: 2, vault: 5, team: 1 },
+      resources: [],
+      billing: null,
+      billingLoading: false,
+    }),
+  }
+})
+
+import { AppShell } from './AppShell'
+
+afterEach(() => cleanup())
+
+function renderShell(path = '/app') {
+  return render(
+    <MemoryRouter initialEntries={[path]}>
+      <AppShell />
+    </MemoryRouter>,
+  )
+}
+
+describe('AppShell — global env switcher is hidden (2026-06-03)', () => {
+  it('does NOT render a global environment switcher in the chrome', () => {
+    renderShell()
+    expect(screen.queryByTestId('env-switcher')).toBeNull()
+    expect(screen.queryByTestId('env-create-input')).toBeNull()
+  })
+
+  it('still renders the org/team block (switcher removal did not break the sidebar)', () => {
+    renderShell()
+    expect(screen.getByTestId('org')).toBeTruthy()
+    expect(screen.getByTestId('org-name')).toBeTruthy()
+  })
+})
+
+describe('AppShell — breadcrumbs no longer show env (count-only after switcher removal)', () => {
+  it('resources crumb shows the count, not the env', () => {
+    renderShell('/app/resources')
+    expect(screen.getAllByText('3 active').length).toBeGreaterThan(0)
+    // env name must not leak into the crumb anymore.
+    expect(screen.queryByText(/development · /)).toBeNull()
+  })
+
+  it('deployments crumb shows the count, not the env', () => {
+    renderShell('/app/deployments')
+    expect(screen.getAllByText('2 active').length).toBeGreaterThan(0)
+  })
+
+  it('vault crumb shows the entry count, not the env', () => {
+    renderShell('/app/vault')
+    expect(screen.getAllByText('5 entries').length).toBeGreaterThan(0)
+  })
+})

src/layout/AppShell.env.test.tsx

@@ -1,7 +1,7 @@
 import { Link, NavLink, Outlet, useLocation } from 'react-router-dom'
 import { Brand, ExpiryWarningBanner, ScopePill, useExpiryTick } from '../components/Common'
 import { useEffect, useState, type ReactNode } from 'react'
-import { addEnv, setEnv, useDashboardCtx, type DashboardCtx } from '../hooks/useDashboardCtx'
+import { useDashboardCtx, type DashboardCtx } from '../hooks/useDashboardCtx'
 import * as api from '../api'
 import type { TeamSummary } from '../api'
 import { UserMenu } from './UserMenu'
@@ -53,9 +53,9 @@ function computeMeta(routeKey: string, pathname: string, ctx: DashboardCtx): Pag
 function computeCrumb(routeKey: string, pathname: string, ctx: DashboardCtx): string {
   switch (routeKey) {
     case '/':
-      return ctx.env
+      return 'overview'
     case '/resources':
-      return `${ctx.env} · ${ctx.counts.resources} active`
+      return `${ctx.counts.resources} active`
     case '/resources/:id': {
       // Try to resolve resource_type from the loaded resource list (the
       // detail page id appears in the URL). Fall back to em-dash if we
@@ -66,11 +66,11 @@ function computeCrumb(routeKey: string, pathname: string, ctx: DashboardCtx): st
       return `resources / ${kind}`
     }
     case '/deployments':
-      return `${ctx.env} · ${ctx.counts.deployments} active`
+      return `${ctx.counts.deployments} active`
     case '/deployments/:id':
       return 'deployments / live'
     case '/vault':
-      return `${ctx.env} · ${ctx.counts.vault} entries`
+      return `${ctx.counts.vault} entries`
     case '/team':
       return 'members & invites'
     case '/billing':
@@ -209,8 +209,11 @@ export function AppShell() {
               <div className="av">{teamInitial}</div>
               <div className="org-info">
                 <div className="org-name" data-testid="org-name">{teamSlug}</div>
+                {/* Global env switcher intentionally removed (2026-06-03): the
+                    multi-environment UX is unfinished, so it's hidden to avoid
+                    surfacing a half-built capability. Per-env vault tabs live
+                    on VaultPage where isolation is real. */}
                 <div className="org-env">
-                  <EnvSwitcher value={ctx.env} options={ctx.envs} />
                   <span className="switch-hint">{tier}</span>
                 </div>
               </div>
@@ -467,56 +470,3 @@ function routeIdToKey(_id: string, pathname: string): string {
   if (/^\/deployments\/[^/]+$/.test(stripped)) return '/deployments/:id'
   return stripped
 }
-
-// ──────────────────────────────────────────────────────────────────────────
-// EnvSwitcher — pill-shaped <select> wired to the dashboard ctx. Selecting
-// "+ new env" opens a tiny inline input that creates an env locally; the
-// next API call carries the new env in the query string.
-function EnvSwitcher({ value, options }: { value: string; options: string[] }) {
-  const [creating, setCreating] = useState(false)
-  const [draft, setDraft] = useState('')
-  if (creating) {
-    return (
-      <span className="env-pill prod" style={{ display: 'inline-flex', gap: 4, padding: '2px 6px' }}>
-        <input
-          autoFocus
-          value={draft}
-          onChange={(e) => setDraft(e.target.value)}
-          onBlur={() => { if (draft.trim()) addEnv(draft); setCreating(false); setDraft('') }}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter' && draft.trim()) { addEnv(draft); setCreating(false); setDraft('') }
-            if (e.key === 'Escape') { setCreating(false); setDraft('') }
-          }}
-          placeholder="staging"
-          data-testid="env-create-input"
-          style={{
-            background: 'transparent', border: 0, outline: 'none', color: 'var(--accent)',
-            font: 'inherit', width: 80, fontFamily: 'var(--font-mono)', fontSize: 11,
-          }}
-        />
-      </span>
-    )
-  }
-  return (
-    <select
-      data-testid="env-switcher"
-      className="env-pill prod"
-      value={value}
-      onChange={(e) => {
-        if (e.target.value === '__new__') setCreating(true)
-        else setEnv(e.target.value)
-      }}
-      style={{
-        appearance: 'none', WebkitAppearance: 'none', cursor: 'pointer',
-        border: '1px solid var(--accent-glow)', background: 'var(--accent-soft)',
-        color: 'var(--accent)', fontFamily: 'var(--font-mono)', fontSize: 11,
-        padding: '2px 8px', borderRadius: 4,
-      }}
-    >
-      {options.map((o) => (
-        <option key={o} value={o}>{o}</option>
-      ))}
-      <option value="__new__" style={{ color: 'var(--violet)' }}>+ new env…</option>
-    </select>
-  )
-}

src/layout/AppShell.tsx

@@ -86,14 +86,14 @@ export function DeploymentsPage() {
   }, [items, statusFilter, sort])
 
   // Source of truth: GET /api/v1/deployments (single-container apps via
-  // POST /deploy/new). The env switcher in the sidebar drives the ?env=
-  // query param; switching envs triggers a refetch via the dep array.
+  // POST /deploy/new). No env filter — the global env switcher is hidden
+  // (multi-env UX unfinished), so deployments from every env are listed.
   useEffect(() => {
     let cancelled = false
     setErr(null)
     setLoading(true)
     api
-      .listDeployments(ctx.env)
+      .listDeployments()
       .then((r) => {
         if (cancelled) return
         setItems(r.items)
@@ -115,7 +115,7 @@ export function DeploymentsPage() {
     return () => {
       cancelled = true
     }
-  }, [ctx.env])
+  }, [])
 
   return (
     <>

src/pages/DeploymentsPage.tsx

@@ -97,11 +97,15 @@ describe('MarketingPage — claim consistency (T18 P1-4 / P1-6)', () => {
     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/)
+    // MCP tools card lists the seven provisioning tools (must still list
+    // webhook — anti-regression for the dropped-webhook bug) AND, per the
+    // 2026-06-03 gap fix, also surfaces the stack/deployment management tools
+    // (the MCP server registers more than seven; "Seven tools registered" was
+    // an understatement).
+    expect(text).not.toMatch(/Six provisioning tools/)
+    expect(text).toMatch(/Seven provisioning tools/)
     expect(text).toMatch(/webhook/)
+    expect(text).toMatch(/list_deployments/)
   })
 
   it("Deploy service card claims a build window consistent with content/llms.txt (~60s, not '<10s')", () => {