Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/wizard-gui/src/hub_auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,16 @@ pub(crate) async fn open_hub(app: tauri::AppHandle, theme: String) -> Result<(),
.map_err(|error| error.message().to_owned())
}

/// Opens the registration page in the system browser, leaving Wizard open.
#[tauri::command]
pub(crate) async fn open_hub_registration() -> Result<(), String> {
let url = Url::parse("https://hub.coreinfra.ai/register")
.map_err(|_| "Некорректный адрес регистрации")?;
login::open_browser(&url)
.await
.map_err(|error| error.message().to_owned())
}

/// Republishes the saved account after a session change, keeping `pending` and `error`.
pub(crate) fn republish(app: &tauri::AppHandle) {
app.state::<RevisionSignal<HubAccount>>().update(|account| {
Expand Down
1 change: 1 addition & 0 deletions crates/wizard-gui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ pub fn run_application() -> Result<()> {
hub_auth::logout_hub_account,
hub_auth::select_hub,
hub_auth::open_hub,
hub_auth::open_hub_registration,
hub_tokens::get_hub_tokens_state,
hub_tokens::get_configured_token_info,
hub_tokens::refresh_hub_tokens,
Expand Down
2 changes: 2 additions & 0 deletions crates/wizard-gui/wizard-ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { SidebarLayout } from "./components/catalyst/sidebar-layout";
import { ErrorText } from "./components/ErrorText";
import { OpenLogsButton } from "./logs/OpenLogsButton";
import { useHubAccountControl } from "./settings/HubAccount";
import { HubSignIn } from "./settings/HubSignIn";
import { SettingsPage } from "./settings/SettingsPage";
import { useUpdateState } from "./updates/update";
import { UpdateScreen } from "./updates/UpdateScreen";
Expand Down Expand Up @@ -48,6 +49,7 @@ function App() {
navbar={null}
sidebar={<AppSidebar page={page} account={account} update={update} />}
>
<HubSignIn hub={account} />
{page === "settings" && <SettingsPage />}
{page !== "settings" && agents.status === "loading" && <Badge color="sky" className="animate-pulse">Загрузка…</Badge>}
{page !== "settings" && agents.status === "error" && <ErrorText>Не удалось загрузить состояние агентов: {agents.message}</ErrorText>}
Expand Down
20 changes: 0 additions & 20 deletions crates/wizard-gui/wizard-ui/src/agents/AgentPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -295,22 +295,6 @@ export function AgentPage({ agents, page, proxy, account }: {
}
}

const signIn = !account.signedIn && (
<Fieldset className="mt-10">
<Legend>CoreInfra AI Hub</Legend>
<Text>Войдите в CoreInfra AI Hub, чтобы подключить агента. Вход в аккаунт не изменяет настройки агентов.</Text>
<FieldGroup>
<div>
<Button outline disabled={!account.account || account.submitting} onClick={account.change}>
{account.account?.pending ? "Ожидание входа…" : "Войти через CoreInfra Hub"}
</Button>
{/* The sidebar footer shows the error on wide windows; narrow ones hide the sidebar. */}
{account.error && <div className="mt-3 lg:hidden"><ErrorText>{account.error}</ErrorText></div>}
</div>
</FieldGroup>
</Fieldset>
);

let content: ReactNode;
switch (page) {
// Keep a prepared plan alive while the settings page is selected.
Expand Down Expand Up @@ -343,7 +327,6 @@ export function AgentPage({ agents, page, proxy, account }: {
)}
</DescriptionList>
)}
{(codex.status === "found" || !chatGptInstall.hidden) && signIn}
{codex.status === "found" && (
<RoutingFieldset agent="codex" token={chatGptInstall.hidden ? undefined : codexToken} modes={routingModes("Codex")} mode={codex.data.routing_mode}
toChange={(mode) => ({ CodexSetRouting: mode })} agentToken={codex.data.token} hub={hub}
Expand Down Expand Up @@ -375,7 +358,6 @@ export function AgentPage({ agents, page, proxy, account }: {
<RoutingRows mode={claude.data.routing_mode} agentToken={claude.data.token} hub={hub} />
)}
</DescriptionList>
{claude.status === "found" && signIn}
{claude.status === "found" && (
<RoutingFieldset agent="claude" modes={routingModes("Claude")} mode={claude.data.routing_mode}
toChange={(mode) => ({ ClaudeSetRouting: mode })} agentToken={claude.data.token} hub={hub}
Expand All @@ -401,7 +383,6 @@ export function AgentPage({ agents, page, proxy, account }: {
</>
)}
</DescriptionList>
{signIn}
{desktop.status === "found" && (
<RoutingFieldset agent="claude_desktop" token={claudeDesktopToken} modes={routingModes("Claude")} mode={desktop.data.routing_mode}
toChange={(mode) => ({ ClaudeDesktopSetRouting: mode })} agentToken={desktop.data.token} hub={hub}
Expand Down Expand Up @@ -434,7 +415,6 @@ export function AgentPage({ agents, page, proxy, account }: {
<RoutingRows mode={detection.data.routing_mode} agentToken={detection.data.token} hub={hub} />
)}
</DescriptionList>
{detection.status === "found" && signIn}
{detection.status === "found" && (
<RoutingFieldset agent={page} modes={hubModes} mode={detection.data.routing_mode}
toChange={(mode) => (page === "opencode" ? { SetOpenCodeHub: mode } : { SetPiHub: mode })}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion crates/wizard-gui/wizard-ui/src/settings/HubAccount.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRef, useState, useSyncExternalStore, type MouseEvent } from "react";
import { MenuButton, useClose } from "@headlessui/react";
import { ComputerDesktopIcon, EllipsisHorizontalIcon, MoonIcon, SunIcon } from "@heroicons/react/20/solid";
import { hubDisplayName, loginHubAccount, logoutHubAccount, openHub, selectHub, useHubAccount } from "./hub_account";
import { hubDisplayName, loginHubAccount, logoutHubAccount, openHub, openHubRegistration, selectHub, useHubAccount } from "./hub_account";
import { getTheme, setTheme, subscribeTheme } from "./theme";
import { Dropdown, DropdownDescription, DropdownDivider, DropdownHeader, DropdownHeading, DropdownItem, DropdownLabel, DropdownMenu, DropdownSection } from "../components/catalyst/dropdown";
import { SidebarItem, SidebarLabel } from "../components/catalyst/sidebar";
Expand Down Expand Up @@ -44,6 +44,7 @@ export function useHubAccountControl() {
if (!agentBusy) void run(() => selectHub(hubId));
},
open: () => void run(() => openHub(getTheme())),
register: () => void run(openHubRegistration),
};
}

Expand Down
191 changes: 191 additions & 0 deletions crates/wizard-gui/wizard-ui/src/settings/HubSignIn.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
/* Neutral Catalyst zinc palette, with a quiet inset highlight like a native panel. */
.hub-onboarding {
position: relative;
min-height: 128px;
background: linear-gradient(160deg, var(--color-zinc-50), var(--color-zinc-100));
box-shadow: inset 0 1px 0 rgb(255 255 255 / 0.85), 0 2px 6px rgb(0 0 0 / 0.02);
}

[data-theme="dark"] .hub-onboarding {
background: linear-gradient(160deg, var(--color-zinc-800), var(--color-zinc-900));
box-shadow: inset 0 1px 0 rgb(255 255 255 / 0.04), 0 2px 6px rgb(0 0 0 / 0.08);
}

.hub-onboarding-symbol {
position: absolute;
top: 50%;
left: 50%;
width: 48px;
height: 48px;
transform: translate(-50%, -50%);
visibility: hidden;
pointer-events: none;
}

.hub-onboarding-dots {
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
gap: 6px;
opacity: 0;
}

.hub-onboarding-dots span {
width: 5px;
height: 5px;
border-radius: 50%;
background: var(--color-zinc-400);
}

.hub-onboarding-mark,
.hub-onboarding-mark-gray,
.hub-onboarding-mark-color {
position: absolute;
inset: 0;
}

.hub-onboarding-mark-gray {
overflow: hidden;
/* Original site favicon: https://hub.coreinfra.ai/favicon.png. Bundled for offline use. */
mask: url("../assets/coreinfra-favicon.png") center / contain no-repeat;
background: linear-gradient(145deg, var(--color-zinc-400), var(--color-zinc-600));
}

[data-theme="dark"] .hub-onboarding-mark-gray {
background: linear-gradient(145deg, var(--color-zinc-300), var(--color-zinc-500));
}

.hub-onboarding-mark-gray::after {
content: "";
position: absolute;
inset: -25%;
background: linear-gradient(110deg, transparent 20%, rgb(255 255 255 / 0.7) 50%, transparent 80%);
filter: blur(5px);
transform: translateX(-120%);
}

.hub-onboarding-mark-color {
background: url("../assets/coreinfra-favicon.png") center / contain no-repeat;
}

.hub-onboarding-reveal {
display: grid;
grid-template-rows: 1fr;
}

.hub-onboarding-content {
min-height: 0;
overflow: hidden;
/* Keep keyboard focus rings inside the animated clipping area. */
margin: -4px;
padding: 4px;
}

/* Dots → matte light over gray → original color → expand and fade → text. */
.hub-onboarding[data-intro] {
animation: hub-welcome-arrive 300ms ease-out both;
}

.hub-onboarding[data-intro] .hub-onboarding-symbol {
visibility: visible;
}

.hub-onboarding[data-intro] .hub-onboarding-dots {
animation: hub-welcome-dots-out 180ms 620ms ease-out both;
}

.hub-onboarding[data-intro] .hub-onboarding-dots span {
animation: hub-welcome-pulse 560ms ease-in-out 2 both;
}

.hub-onboarding[data-intro] .hub-onboarding-dots span:nth-child(2) { animation-delay: 110ms; }
.hub-onboarding[data-intro] .hub-onboarding-dots span:nth-child(3) { animation-delay: 220ms; }

.hub-onboarding[data-intro] .hub-onboarding-mark {
animation:
hub-welcome-mark-in 320ms 700ms cubic-bezier(0.22, 1, 0.36, 1) both,
hub-welcome-mark-out 420ms 2380ms cubic-bezier(0.4, 0, 0.2, 1) forwards;
}

.hub-onboarding[data-intro] .hub-onboarding-mark-gray::after {
animation: hub-welcome-shine 750ms 950ms ease-in-out both;
}

.hub-onboarding[data-intro] .hub-onboarding-mark-color {
animation: hub-welcome-color-in 500ms 1700ms cubic-bezier(0.4, 0, 0.2, 1) both;
}

.hub-onboarding[data-intro] .hub-onboarding-reveal {
animation: hub-welcome-unfold 650ms 2800ms cubic-bezier(0.22, 1, 0.36, 1) both;
}

.hub-onboarding[data-intro] .hub-onboarding-title {
animation: hub-welcome-text-in 450ms 2830ms ease-out both;
}

.hub-onboarding[data-intro] .hub-onboarding-copy {
animation: hub-welcome-text-in 450ms 2940ms ease-out both;
}

.hub-onboarding[data-intro] .hub-onboarding-action {
animation: hub-welcome-text-in 400ms 3060ms ease-out both;
}

@keyframes hub-welcome-arrive {
from { opacity: 0; transform: translateY(4px); }
to { opacity: 1; transform: translateY(0); }
}

@keyframes hub-welcome-pulse {
0%, 100% { opacity: 0.25; transform: scale(0.85); }
50% { opacity: 0.85; transform: scale(1); }
}

@keyframes hub-welcome-dots-out {
from { opacity: 1; }
to { opacity: 0; }
}

@keyframes hub-welcome-mark-in {
from { opacity: 0; transform: scale(0.88); filter: blur(2px); }
to { opacity: 1; transform: scale(1); filter: blur(0); }
}

@keyframes hub-welcome-shine {
from { transform: translateX(-120%); }
to { transform: translateX(120%); }
}

@keyframes hub-welcome-color-in {
from { clip-path: inset(0 100% 0 0); }
to { clip-path: inset(0 0 0 0); }
}

@keyframes hub-welcome-mark-out {
from { opacity: 1; transform: scale(1); filter: blur(0); }
to { opacity: 0; transform: scale(1.75); filter: blur(4px); }
}

@keyframes hub-welcome-unfold {
from { grid-template-rows: 0fr; }
to { grid-template-rows: 1fr; }
}

@keyframes hub-welcome-text-in {
from { opacity: 0; transform: translateY(-6px); }
to { opacity: 1; transform: translateY(0); }
}

@media (prefers-reduced-motion: reduce) {
.hub-onboarding[data-intro],
.hub-onboarding[data-intro] *,
.hub-onboarding[data-intro] *::after {
animation: none;
}

.hub-onboarding[data-intro] .hub-onboarding-symbol {
visibility: hidden;
}
}
74 changes: 74 additions & 0 deletions crates/wizard-gui/wizard-ui/src/settings/HubSignIn.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { useCallback, useEffect, useState } from "react";
import { useReducedMotion } from "motion/react";
import { Button } from "../components/catalyst/button";
import { Link } from "../components/catalyst/link";
import { ErrorText } from "../components/ErrorText";
import type { HubAccountControl } from "./HubAccount";
import "./HubSignIn.css";

// The CSS sequence finishes at 3.5s. Focus or a click can finish it immediately.
const INTRO_DURATION_MS = 3500;

// Keep the first step visible even if agent detection is loading or fails.
export function HubSignIn({ hub }: { hub: HubAccountControl }) {
const reducedMotion = useReducedMotion();
const [introduced, setIntroduced] = useState(false);
const finishIntro = useCallback(() => setIntroduced(true), []);
const accountLoaded = hub.account !== undefined;
const pending = hub.account?.pending;
const animateIntro = !introduced && !reducedMotion && !pending && !hub.error;

useEffect(() => {
if (introduced) return;
if (hub.signedIn || reducedMotion || pending || hub.error) {
finishIntro();
return;
}
if (!accountLoaded) return;
const timer = window.setTimeout(finishIntro, INTRO_DURATION_MS);
return () => window.clearTimeout(timer);
}, [accountLoaded, introduced, hub.signedIn, hub.error, pending, reducedMotion, finishIntro]);

// Do not flash the welcome animation while restoring a saved account.
if (hub.signedIn || (!accountLoaded && !hub.error)) return null;

return (
<section aria-label="Вход в CoreInfra AI Hub"
data-intro={animateIntro ? "" : undefined}
onPointerDownCapture={finishIntro} onFocusCapture={finishIntro}
className="hub-onboarding mb-10 rounded-3xl border border-zinc-950/5 px-6 py-7 text-left sm:p-8 dark:border-white/10">
<div className="hub-onboarding-symbol" aria-hidden="true">
<div className="hub-onboarding-dots"><span /><span /><span /></div>
<div className="hub-onboarding-mark">
<div className="hub-onboarding-mark-gray" />
<div className="hub-onboarding-mark-color" />
</div>
</div>
<div className="hub-onboarding-reveal">
<div className="hub-onboarding-content">
<div aria-live="polite">
<h2 className="hub-onboarding-title text-2xl/8 font-semibold tracking-tight text-zinc-950 dark:text-white">
{pending ? "Завершите вход в браузере" : "Ура!"}
</h2>
<p className="hub-onboarding-copy mt-3 max-w-lg text-sm/6 text-zinc-600 dark:text-zinc-400">
{pending
? "После входа вернитесь в Wizard — аккаунт подключится автоматически."
: <>Wizard установлен, теперь войдите в аккаунт хаба, если аккаунта нет – <Link
href="https://hub.coreinfra.ai/register" target="_blank" rel="noreferrer"
className="text-zinc-800 underline decoration-zinc-400 underline-offset-2 hover:decoration-current focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500 dark:text-zinc-200 dark:decoration-zinc-500"
aria-disabled={hub.submitting || undefined}
onClick={(event) => { event.preventDefault(); hub.register(); }}
>создайте его</Link>, для этого потребуется всего лишь нажать одну кнопку.</>}
</p>
</div>
<div className="hub-onboarding-action mt-5">
<Button color="blue" disabled={!hub.account || hub.submitting || hub.agentBusy} onClick={hub.change}>
{hub.submitting ? "Открываем браузер…" : pending ? "Продолжить вход" : "Войти в CoreInfra Hub"}
</Button>
</div>
{hub.error && <div role="alert" className="mt-4"><ErrorText>{hub.error}</ErrorText></div>}
</div>
</div>
</section>
);
}
1 change: 1 addition & 0 deletions crates/wizard-gui/wizard-ui/src/settings/hub_account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ export const loginHubAccount = () => invoke<void>("login_hub_account");
export const logoutHubAccount = () => invoke<void>("logout_hub_account");
export const selectHub = (hubId: string) => invoke<void>("select_hub", { hubId });
export const openHub = (theme: string) => invoke<void>("open_hub", { theme });
export const openHubRegistration = () => invoke<void>("open_hub_registration");
Loading