From f96116a050d93e73dcca91a3b7a6c7fb6445daa0 Mon Sep 17 00:00:00 2001
From: dadachann <185672915+dadachann@users.noreply.github.com>
Date: Sat, 25 Jul 2026 21:42:05 +0800
Subject: [PATCH] fix(cloud): surface runtime and workspace plan status

---
 .../pkg/api/http/controller/groups/box.py     | 12 +++++++
 .../api/http/controller/groups/workspaces.py  | 33 +++++++++++--------
 tests/integration/api/test_box_security.py    | 18 ++++++++++
 tests/integration/api/test_workspaces.py      |  6 ++++
 .../components/home-sidebar/HomeSidebar.tsx   |  2 +-
 .../WorkspaceSettingsPanel.tsx                | 30 ++++++++++-------
 .../workspace-settings/WorkspaceSwitcher.tsx  | 13 +++-----
 .../overview-cards/SystemStatusCards.tsx      |  2 +-
 web/src/app/infra/http/BackendClient.ts       |  4 +++
 .../unit/workspace-switcher-layout.test.mjs   | 25 ++++++++++++--
 10 files changed, 108 insertions(+), 37 deletions(-)

diff --git a/src/langbot/pkg/api/http/controller/groups/box.py b/src/langbot/pkg/api/http/controller/groups/box.py
index 4a7c87ed1..d63e9d7b5 100644
--- a/src/langbot/pkg/api/http/controller/groups/box.py
+++ b/src/langbot/pkg/api/http/controller/groups/box.py
@@ -27,6 +27,18 @@ class BoxRouterGroup(group.RouterGroup):
             status['hidden'] = should_hide_box_runtime_status(constants.edition, status.get('enabled'))
             return self.success(data=status)
 
+        @self.route(
+            '/runtime-status',
+            methods=['GET'],
+            auth_type=group.AuthType.USER_TOKEN,
+            permission=Permission.RESOURCE_VIEW,
+        )
+        async def _(request_context: RequestContext) -> str:
+            del request_context
+            status = await self.ap.box_service.get_backend_status()
+            status['hidden'] = should_hide_box_runtime_status(constants.edition, status.get('enabled'))
+            return self.success(data=status)
+
         @self.route(
             '/sessions',
             methods=['GET'],
diff --git a/src/langbot/pkg/api/http/controller/groups/workspaces.py b/src/langbot/pkg/api/http/controller/groups/workspaces.py
index 4917d5db9..72964c881 100644
--- a/src/langbot/pkg/api/http/controller/groups/workspaces.py
+++ b/src/langbot/pkg/api/http/controller/groups/workspaces.py
@@ -70,19 +70,26 @@ class WorkspacesRouterGroup(group.RouterGroup):
             """
 
             accesses = await self.ap.workspace_collaboration_service.list_account_workspaces(account.uuid)
-            return self.success(
-                data={
-                    'workspaces': [
-                        {
-                            'workspace': _workspace_payload(access.workspace),
-                            'membership': _membership_payload(access.membership, email=account.user),
-                            'permissions': sorted(permissions_for_role(access.membership.role)),
-                            'placement_generation': access.execution.placement_generation,
-                        }
-                        for access in accesses
-                    ]
-                }
-            )
+            resolver = getattr(self.ap, 'entitlement_resolver', None)
+            workspaces: list[dict[str, typing.Any]] = []
+            for access in accesses:
+                plan_name: str | None = None
+                if access.workspace.source == WorkspaceSource.CLOUD_PROJECTION.value and resolver is not None:
+                    entitlement = await resolver.resolve(
+                        access.workspace.uuid,
+                        minimum_revision=access.membership.projection_revision,
+                    )
+                    plan_name = entitlement.plan_name
+                workspaces.append(
+                    {
+                        'workspace': _workspace_payload(access.workspace),
+                        'membership': _membership_payload(access.membership, email=account.user),
+                        'permissions': sorted(permissions_for_role(access.membership.role)),
+                        'placement_generation': access.execution.placement_generation,
+                        'plan_name': plan_name,
+                    }
+                )
+            return self.success(data={'workspaces': workspaces})
 
         @self.route('', methods=['GET'], auth_type=group.AuthType.ACCOUNT_TOKEN)
         async def _(account) -> typing.Any:
diff --git a/tests/integration/api/test_box_security.py b/tests/integration/api/test_box_security.py
index f0a901366..0a40f230a 100644
--- a/tests/integration/api/test_box_security.py
+++ b/tests/integration/api/test_box_security.py
@@ -42,6 +42,9 @@ async def box_security_api():
         side_effect=lambda account_uuid, _workspace_uuid: _access(account_uuid)
     )
     application.box_service.get_status = AsyncMock(return_value={'enabled': True})
+    application.box_service.get_backend_status = AsyncMock(
+        return_value={'available': True, 'enabled': True, 'backend': {'name': 'nsjail'}}
+    )
     application.box_service.get_sessions = AsyncMock(return_value=[{'session_id': 'private-session'}])
     application.box_service.get_recent_errors = Mock(return_value=[{'error': 'private error'}])
     application.box_service.managed_admission_required = False
@@ -99,3 +102,18 @@ async def test_box_status_returns_explicit_403_when_workspace_has_no_managed_san
     assert response.status_code == 403
     payload = await response.get_json()
     assert payload['code'] == 'managed_sandbox_unavailable'
+
+
+@pytest.mark.asyncio
+async def test_runtime_status_reports_connector_health_without_consuming_workspace_entitlement(box_security_api):
+    application, client = box_security_api
+    application.box_service.get_status.side_effect = EntitlementUnavailableError(
+        'Workspace entitlement does not grant managed_sandbox'
+    )
+
+    response = await client.get('/api/v1/box/runtime-status', headers=_headers('viewer-token'))
+
+    assert response.status_code == 200
+    assert (await response.get_json())['data']['available'] is True
+    application.box_service.get_backend_status.assert_awaited_once()
+    application.box_service.get_status.assert_not_awaited()
diff --git a/tests/integration/api/test_workspaces.py b/tests/integration/api/test_workspaces.py
index 129bdbedc..9ec261870 100644
--- a/tests/integration/api/test_workspaces.py
+++ b/tests/integration/api/test_workspaces.py
@@ -484,6 +484,12 @@ async def test_cloud_projection_is_selected_explicitly_and_directory_writes_use_
             )
 
     application.entitlement_resolver = PlanResolver()
+    bootstrap_with_plans = await client.get('/api/v1/workspaces/bootstrap', headers=_auth(owner_token))
+    bootstrap_by_uuid = {
+        item['workspace']['uuid']: item for item in (await bootstrap_with_plans.get_json())['data']['workspaces']
+    }
+    assert bootstrap_by_uuid[cloud_workspace_uuid]['plan_name'] == 'free'
+    assert bootstrap_by_uuid[singleton_uuid]['plan_name'] is None
     current_response = await client.get(
         '/api/v1/workspaces/current',
         headers=_auth(owner_token, cloud_workspace_uuid),
diff --git a/web/src/app/home/components/home-sidebar/HomeSidebar.tsx b/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
index 75da46850..99df6f7f6 100644
--- a/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
+++ b/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
@@ -1916,7 +1916,7 @@ export default function HomeSidebar({
         </SidebarHeader>
 
         <div className="px-2 group-data-[collapsible=icon]:px-0">
-          <WorkspaceSwitcher className="w-full group-data-[collapsible=icon]:min-w-0 group-data-[collapsible=icon]:px-2" />
+          <WorkspaceSwitcher className="w-1/2 max-w-36 group-data-[collapsible=icon]:min-w-0 group-data-[collapsible=icon]:px-2" />
         </div>
 
         {/* Navigation items grouped by section */}
diff --git a/web/src/app/home/components/workspace-settings/WorkspaceSettingsPanel.tsx b/web/src/app/home/components/workspace-settings/WorkspaceSettingsPanel.tsx
index be98d906c..5a58bd0bc 100644
--- a/web/src/app/home/components/workspace-settings/WorkspaceSettingsPanel.tsx
+++ b/web/src/app/home/components/workspace-settings/WorkspaceSettingsPanel.tsx
@@ -225,22 +225,13 @@ export default function WorkspaceSettingsPanel({
           </Badge>
         )}
         {isCloudProjection && workspaceInfo && (
-          <Button asChild size="sm" variant="outline">
+          <Button asChild size="sm">
             <a href={cloudPortalURL} target="_blank" rel="noopener noreferrer">
               {t('workspace.upgradePlan')}
               <ExternalLink className="size-3.5" />
             </a>
           </Button>
         )}
-        {canManageCloudMembers && (
-          <Button asChild size="sm" variant="outline">
-            <a href={cloudMembersURL} target="_blank" rel="noopener noreferrer">
-              <UserPlus />
-              {t('workspace.inviteMember')}
-              <ExternalLink className="size-3.5" />
-            </a>
-          </Button>
-        )}
       </PanelToolbar>
 
       <PanelBody className="space-y-6">
@@ -315,7 +306,24 @@ export default function WorkspaceSettingsPanel({
 
         {canViewMembers && (
           <section className="space-y-3">
-            <h3 className="text-sm font-semibold">{t('workspace.members')}</h3>
+            <div className="flex items-center justify-between gap-3">
+              <h3 className="text-sm font-semibold">
+                {t('workspace.members')}
+              </h3>
+              {canManageCloudMembers && (
+                <Button asChild size="sm" variant="outline">
+                  <a
+                    href={cloudMembersURL}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    <UserPlus className="size-4" />
+                    {t('workspace.inviteMember')}
+                    <ExternalLink className="size-3.5" />
+                  </a>
+                </Button>
+              )}
+            </div>
             <div className="space-y-2">
               {members.map((member) => {
                 const isSelf =
diff --git a/web/src/app/home/components/workspace-settings/WorkspaceSwitcher.tsx b/web/src/app/home/components/workspace-settings/WorkspaceSwitcher.tsx
index 9e079eef6..06e64a908 100644
--- a/web/src/app/home/components/workspace-settings/WorkspaceSwitcher.tsx
+++ b/web/src/app/home/components/workspace-settings/WorkspaceSwitcher.tsx
@@ -39,17 +39,14 @@ export default function WorkspaceSwitcher({
         <Button
           variant="outline"
           size="sm"
-          className={cn(
-            'h-11 min-w-52 max-w-72 justify-start px-3 text-[15px]',
-            className,
-          )}
+          className={cn('h-9 min-w-0 justify-start px-2.5 text-sm', className)}
           aria-label={t('workspace.switchWorkspace')}
         >
           <Building2 className="size-4 shrink-0" />
           <span className="truncate">{currentWorkspace.workspace.name}</span>
         </Button>
       </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="min-w-80 p-2">
+      <DropdownMenuContent align="start" className="w-64 p-1.5">
         <DropdownMenuLabel className="px-3 py-2 text-sm">
           {t('workspace.switchWorkspace')}
         </DropdownMenuLabel>
@@ -59,14 +56,14 @@ export default function WorkspaceSwitcher({
           return (
             <DropdownMenuItem
               key={entry.workspace.uuid}
-              className="min-h-14 gap-3 px-3 py-2"
+              className="min-h-11 gap-2 px-2 py-1.5"
               onClick={() => {
                 if (!selected)
                   void switchWorkspaceAndReload(entry.workspace.uuid);
               }}
             >
-              <Building2 className="size-5" />
-              <span className="min-w-0 flex-1 truncate font-medium">
+              <Building2 className="size-4 shrink-0" />
+              <span className="max-w-[7rem] min-w-0 flex-1 truncate font-medium">
                 {entry.workspace.name}
               </span>
               {entry.workspace.source === 'cloud_projection' && (
diff --git a/web/src/app/home/monitoring/components/overview-cards/SystemStatusCards.tsx b/web/src/app/home/monitoring/components/overview-cards/SystemStatusCards.tsx
index 9e8c916e9..ca49c6d05 100644
--- a/web/src/app/home/monitoring/components/overview-cards/SystemStatusCards.tsx
+++ b/web/src/app/home/monitoring/components/overview-cards/SystemStatusCards.tsx
@@ -67,7 +67,7 @@ export default function SystemStatusCard({
     try {
       const [plugin, box] = await Promise.all([
         httpClient.getPluginSystemStatus().catch(() => null),
-        httpClient.getBoxStatus().catch(() => null),
+        httpClient.getBoxRuntimeStatus().catch(() => null),
       ]);
       const sessions = box?.hidden
         ? []
diff --git a/web/src/app/infra/http/BackendClient.ts b/web/src/app/infra/http/BackendClient.ts
index 563c9fb89..04feaa932 100644
--- a/web/src/app/infra/http/BackendClient.ts
+++ b/web/src/app/infra/http/BackendClient.ts
@@ -1067,6 +1067,10 @@ export class BackendClient extends BaseHttpClient {
     return this.get('/api/v1/plugins/debug-info');
   }
 
+  public getBoxRuntimeStatus(): Promise<ApiRespBoxStatus> {
+    return this.get('/api/v1/box/runtime-status');
+  }
+
   public getBoxStatus(): Promise<ApiRespBoxStatus> {
     return this.get('/api/v1/box/status');
   }
diff --git a/web/tests/unit/workspace-switcher-layout.test.mjs b/web/tests/unit/workspace-switcher-layout.test.mjs
index db280bdbc..48f84e008 100644
--- a/web/tests/unit/workspace-switcher-layout.test.mjs
+++ b/web/tests/unit/workspace-switcher-layout.test.mjs
@@ -83,9 +83,28 @@ test('moves Cloud plan upgrades into Workspace Settings', () => {
   assert.match(workspaceSettingsPanelSource, /workspace\.upgradePlan/);
   assert.match(workspaceSettingsPanelSource, /cloudPortalURL/);
   assert.match(workspaceSettingsPanelSource, /step=plan/);
+  const toolbarEnd = workspaceSettingsPanelSource.indexOf('</PanelToolbar>');
+  const membersHeading =
+    workspaceSettingsPanelSource.indexOf('workspace.members');
+  const cloudInvite = workspaceSettingsPanelSource.indexOf(
+    'href={cloudMembersURL}',
+  );
+  assert.ok(toolbarEnd < membersHeading && membersHeading < cloudInvite);
 });
 
-test('uses a larger workspace trigger and menu surface', () => {
-  assert.match(workspaceSwitcherSource, /h-11/);
-  assert.match(workspaceSwitcherSource, /min-w-80/);
+test('keeps the workspace trigger compact and truncates long names', () => {
+  assert.match(homeSidebarSource, /<WorkspaceSwitcher className="w-1\/2/);
+  assert.match(workspaceSwitcherSource, /h-9/);
+  assert.match(workspaceSwitcherSource, /w-64/);
+  assert.doesNotMatch(workspaceSwitcherSource, /min-w-80/);
+  assert.match(workspaceSwitcherSource, /max-w-\[7rem\][^>]*truncate/);
+});
+
+test('uses an infrastructure-level Box health endpoint in monitoring', () => {
+  const statusCardSource = readSource(
+    'src/app/home/monitoring/components/overview-cards/SystemStatusCards.tsx',
+  );
+  const backendClientSource = readSource('src/app/infra/http/BackendClient.ts');
+  assert.match(backendClientSource, /getBoxRuntimeStatus/);
+  assert.match(statusCardSource, /getBoxRuntimeStatus/);
 });