From 22021e76c389b861914d9160e51267ae7abe5a40 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Wed, 14 Oct 2026 20:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B9=B3=E5=8F=B0=20FE-5=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=9D=A2=EF=BC=9A=E8=A1=A8=E5=8D=95=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E5=99=A8=E4=B8=8E=E5=AD=90=E9=9B=86=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E3=80=81=E5=BE=85=E5=8A=9E=E5=8D=A1=EF=BC=88=E4=BC=9A=E7=AD=BE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E3=80=81=E5=8A=A8=E4=BD=9C=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=93=88=E5=B8=8C=E5=8D=A1=E3=80=81=E6=A0=B8=E5=AE=9E=E9=80=89?= =?UTF-8?q?=E9=A1=B9=EF=BC=89=E3=80=81=E8=A7=86=E5=9B=BE=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E4=B8=8E=E7=BB=84=E4=BB=B6=E7=9B=AE=E5=BD=95=20v1=20=E7=9A=84?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=99=A8=EF=BC=88=E5=8D=B0=E7=AB=A0=E3=80=81?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E7=82=B9=E5=BC=80=E5=87=BA=E5=A4=84=E3=80=81?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E4=B8=8E=E5=9B=BE=E8=A1=A8=E3=80=81=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E3=80=81=E6=8A=A5=E5=91=8A=EF=BC=89=E3=80=81=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=A6=96=E9=A1=B5=20/=20=E5=BA=94=E7=94=A8=E9=A1=B5?= =?UTF-8?q?=20/=20=E5=8F=91=E8=B5=B7=20/=20=E5=AE=9E=E4=BE=8B=20/=20?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=20/=20=E7=99=BB=E5=BD=95=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=8A=A0=E3=80=8C=E5=BA=94=E7=94=A8=E3=80=8D?= =?UTF-8?q?=E4=B8=8E=E5=BE=BD=E6=A0=87=E6=8C=89=E6=9D=A5=E6=BA=90=E5=88=86?= =?UTF-8?q?=E5=BC=80=E3=80=81=E6=8C=89=E8=A7=92=E8=89=B2=E6=94=B6=E8=B5=B7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E3=80=81401=20=E8=B7=B3=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=B8=8E=E8=AF=B7=E6=B1=82=E5=A4=B4=EF=BC=9B=E6=96=B0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=84=9A=E6=9C=AC=20check-apps=E3=80=81check-inbox?= =?UTF-8?q?=E3=80=81check-auth=EF=BC=88=E5=90=AB=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=90=8E=E7=9A=84=E4=BF=AE=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 229 ++++++-- frontend/src/api/apps.ts | 8 + frontend/src/api/http.ts | 33 +- frontend/src/apps/EvidenceDrawer.tsx | 143 +++++ frontend/src/apps/Plot.tsx | 289 ++++++++++ frontend/src/apps/Stamp.tsx | 70 +++ frontend/src/apps/ViewRenderer.tsx | 86 ++- frontend/src/apps/components/display.tsx | 386 +++++++++++++ frontend/src/apps/components/index.ts | 45 ++ frontend/src/apps/components/input.tsx | 69 +++ frontend/src/apps/components/layout.tsx | 76 +++ frontend/src/apps/components/process.tsx | 280 +++++++++ frontend/src/apps/context.ts | 79 +++ frontend/src/components/CommandPalette.tsx | 72 ++- frontend/src/components/PrincipalPicker.tsx | 99 +++- frontend/src/components/SchemaForm.tsx | 294 +++++++++- frontend/src/components/ui.tsx | 22 +- frontend/src/index.css | 16 + frontend/src/lib/schemaForm.ts | 198 +++++++ frontend/src/lib/termsApp.ts | 369 +++++++++++- frontend/src/pages/LoginPage.tsx | 112 +++- frontend/src/pages/apps/AppPage.tsx | 79 ++- frontend/src/pages/apps/AppsHome.tsx | 234 +++++++- frontend/src/pages/apps/EntryPage.tsx | 109 +++- frontend/src/pages/apps/InstancePage.tsx | 85 ++- frontend/src/pages/apps/TaskPage.tsx | 37 +- frontend/src/pages/apps/shared.tsx | 102 ++++ frontend/src/run/DualCheckApproval.tsx | 17 +- frontend/src/run/TaskCard.tsx | 609 +++++++++++++++++++- frontend/src/store/auth.ts | 89 +++ frontend/src/store/catalog.ts | 45 +- scripts/check-apps.mjs | 393 +++++++++++++ scripts/check-auth.mjs | 207 +++++++ scripts/check-inbox.mjs | 253 ++++++++ scripts/check-shell.mjs | 42 +- 35 files changed, 5097 insertions(+), 179 deletions(-) create mode 100644 frontend/src/apps/EvidenceDrawer.tsx create mode 100644 frontend/src/apps/Plot.tsx create mode 100644 frontend/src/apps/Stamp.tsx create mode 100644 frontend/src/apps/components/display.tsx create mode 100644 frontend/src/apps/components/index.ts create mode 100644 frontend/src/apps/components/input.tsx create mode 100644 frontend/src/apps/components/layout.tsx create mode 100644 frontend/src/apps/components/process.tsx create mode 100644 frontend/src/apps/context.ts create mode 100644 frontend/src/lib/schemaForm.ts create mode 100644 frontend/src/pages/apps/shared.tsx create mode 100644 frontend/src/store/auth.ts create mode 100644 scripts/check-apps.mjs create mode 100644 scripts/check-auth.mjs create mode 100644 scripts/check-inbox.mjs diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index dddfb205..57ec1858 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef, useState } from 'react' import type { ReactNode, RefObject } from 'react' import { Link, NavLink, Navigate, Route, Routes, useLocation, useNavigate } from 'react-router-dom' -import { Bell, BellOff, Moon, RotateCw, Sun, UserRound } from 'lucide-react' +import { Bell, BellOff, LogOut, Moon, RotateCw, Sun, UserRound } from 'lucide-react' import clsx from 'clsx' import { ApiError, NETWORK_MESSAGE, api } from './api/client' import { CATALOG_TIMEOUT_MS, catalogListState, useCatalog, useOnReconnect } from './store/catalog' @@ -31,8 +31,9 @@ import { LoginPage } from './pages/LoginPage' import { Logo } from './components/Logo' import { CommandPalette, PAGES, ShortcutHelp, flushThemePref, openShortcutHelp, toggleCommandPalette, toggleNotify, - toggleTheme, useTheme, waitedFor, + toggleTheme, usePages, useTheme, visiblePages, waitedFor, } from './components/CommandPalette' +import { atLeast, loginOn, loginUrl, needsLogin, principalName, useAuth } from './store/auth' import { ErrorBoundary, Kbd, OfflineBanner, Spinner, StatusBadge, isComposing, toast, useTicker } from './components/ui' import { applyTheme, normalizeTheme } from './lib/theme' import { ariaShortcut, isTypingTarget, matchShortcut } from './lib/keys' @@ -45,7 +46,10 @@ import { import type { Attention, FaviconDot } from './lib/notify' import { useLeaveBlocker } from './lib/leave' import { useLocalActor } from './lib/actor' -import { RUN_COMPARE_TEXT, runName } from './lib/terms' +import { APP_TEXT, AUTH_MODE_LABEL, AUTH_TEXT, ROLE_LABEL, RUN_COMPARE_TEXT, runName } from './lib/terms' + +/** 启动时认人(/auth/me)最多等多久再取目录 */ +const AUTH_WAIT_MS = 2500 export default function App() { const loaded = useCatalog((s) => s.loaded) @@ -55,9 +59,32 @@ export default function App() { const location = useLocation() const [offlineOk, setOfflineOk] = useState(false) - useEffect(() => { void useCatalog.getState().refresh() }, []) - // 连着时每 4 秒拉一次待审批,顺带当心跳;断开后的退避重试由 catalog 自己排 - useEffect(() => useCatalog.getState().startHeartbeat(), []) + const navigate = useNavigate() + // 先认人(/auth/me)再取目录:使用者(开了登录的 user 角色)不取那几张表;开了登录还没登录的去登录页,什么都不取。 + // 关登录时 /me 恒为 off,和以前一样直接取 + useEffect(() => { + void (async () => { + // 认人最多等 AUTH_WAIT_MS:服务端卡着不回时不能把目录也一起拖住(启动页的「比平时慢」要点得出是哪几张表)。 + // 晚到的 401 自己会整页跳登录页(api/http) + const me = await Promise.race([ + useAuth.getState().load(), + new Promise((resolve) => setTimeout(() => resolve(null), AUTH_WAIT_MS)), + ]) + if (needsLogin(me)) { + if (window.location.pathname !== '/login') navigate(loginUrl(), { replace: true }) + return + } + void useCatalog.getState().refresh() + })() + // 只在启动时认一次;登录、退出都整页重新加载 + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + // 启动时没连上、没认出人:恢复后再认一次(catalog 自己会重拉它那几张表) + useOnReconnect(() => { if (!useAuth.getState().ready) void useAuth.getState().load() }) + // 连着时每 4 秒拉一次待审批和待办数,顺带当心跳;断开后的退避重试由 catalog 自己排。没登录时不拉 + const signedOut = useAuth((s) => needsLogin(s.me)) + useEffect(() => (signedOut ? undefined : useCatalog.getState().startHeartbeat()), [signedOut]) + const roleRedirect = useRoleRedirect() // 主题的真源在后端设置里。启动时没连上就等恢复再读一次,不然这次会话一直用缓存。 // 读到过、或者人在这台设备上换过(导航、⌘K 都派发 agentlab:theme),就不再读, @@ -88,7 +115,9 @@ export default function App() { const offlineAtBoot = !everOk && (backend === 'down' || (allFailed && backend === 'checking')) const booting = !offlineOk && (!loaded || offlineAtBoot) // 启动页的清单自己会说哪几项还在等、哪几项失败了;进了外壳才需要当面提醒 - useCatalogWarning(stalled, !booting) + useCatalogWarning(stalled, !booting && location.pathname !== '/login') + // 登录页不在外壳里:没登录时导航、目录、心跳都还没有 + if (location.pathname === '/login') return if (booting) return setOfflineOk(true)} /> return ( @@ -105,9 +134,11 @@ export default function App() { 藏在一个问号里下次就没人记得它存在了。 导航高亮不用动——NavLink 默认前缀匹配,/chat/abc 照样点亮「问数据」。*/} + {/* 开了登录的使用者只到得了「应用」和「设置」:别的地址(旧书签、手输)送回应用首页 */} + {roleRedirect ? : ( - {/* 默认落到对话页:多数人要的是答案,画布留给要自己编排的人 */} - } /> + {/* 默认落到对话页:多数人要的是答案,画布留给要自己编排的人。使用者落到应用首页 */} + } /> } /> } /> } /> @@ -138,13 +169,14 @@ export default function App() { } /> } /> } /> - } /> + {/* /login 不在这里:它不在外壳里,App 开头就单独画了 */} {/* 数据源搬到了顶级「数据」页;旧书签和各处「去设置 → 数据源」的链接还在 */} } /> } /> } /> } /> + )} @@ -158,6 +190,21 @@ export default function App() { ) } +/** 首页:使用者(开了登录的 user 角色)落到应用首页,其余落到问数据 */ +function HomeRedirect() { + const me = useAuth((s) => s.me) + return +} + +/** 使用者到了看不到的页面:送回应用首页。搭建者以上、关登录时不管 */ +function useRoleRedirect(): string | null { + const me = useAuth((s) => s.me) + const { pathname } = useLocation() + if (!loginOn(me) || atLeast(me, 'builder') || pathname === '/') return null + const ok = visiblePages(me).some((p) => pathname === p.to || pathname.startsWith(`${p.to}/`)) + return ok ? null : '/apps' +} + // ------------------------------------------------------------------------- // 全局快捷键 // ------------------------------------------------------------------------- @@ -198,7 +245,7 @@ function ShellKeys() { openShortcutHelp() return } - const page = PAGES.find((p) => matchShortcut(e, p.shortcut)) + const page = visiblePages(useAuth.getState().me).find((p) => matchShortcut(e, p.shortcut)) if (page) { e.preventDefault() // 有没保存的改动时由 LeaveBlocker 先问,这里照常跳 @@ -265,16 +312,17 @@ function Nav({ stalled }: { stalled: CatalogCheck[] }) { const chat = useChatActivity() const live = studio.startsWith('run') || chat === 'run' - // 整条导航约 580px 高(八个导航项),窗口再矮,最底下的遥测点和署名就被切掉、够不着。 - // 矮窗口(≤600px)按高度收紧到 455px 左右(导航项 36px),而不是让导航滚动:导航一旦 - // overflow,挂在右侧的悬停提示和遥测浮层也会被一起裁掉。加导航项时在 480px 高的窗口里 - // 量一遍(check-shell 的「窗口高 480px」) + const pages = usePages() + // 整条导航约 640px 高(九个导航项),窗口再矮,最底下的遥测点和署名就被切掉、够不着。 + // 矮窗口(≤660px)按高度收紧到 500px 左右(导航项 36px),≤520px 再收一档到 460px 左右(导航项 32px、 + // 图标和字之间只留 2px),而不是让导航滚动:导航一旦 overflow,挂在右侧的悬停提示和遥测浮层也会被 + // 一起裁掉。加导航项时在 600px、480px 高的窗口里量一遍(check-shell 的「窗口高 …px」) return (