.exe`（ARM 电脑）。
2. 双击安装包。安装程序会放到「程序文件」并创建开始菜单和桌面快捷方式。
3. 打开 **FreeOS**。第一次启动会解压内置运行环境（可能要一两分钟），然后直接进入可用会话，无需先登录。
-4. 保存、导出或发布到账号时再注册或登录。组织控制台（openXYOS）已随安装包内置，无需再装 Node；侧栏 **Organization** 默认打开。
+4. 保存、导出或发布到账号时再注册或登录。侧栏 **Organization** 使用宿主内组织能力，不必再装 Node，也不依赖本机 `127.0.0.1:3780`。完整 openXYOS Node 栈是可选项（导出/同步/高级部署）。
数据目录默认是 `%USERPROFILE%\.freeos`（可用环境变量 `FREEOS_HOME` 改）。旧版 Octop 的 `~/.octop` 仍会被识别。卸载安装包会清空安装目录（默认为 `Program Files\FreeOS`）并删除快捷方式，但**不会**删除该用户数据目录；详见 [desktop/README.md](desktop/README.md#windows-uninstall)。
@@ -71,7 +71,7 @@ Operator detail: [docs/asset-loop.md](docs/asset-loop.md).
### Prerequisites
- Python 3.12+ (the project uses [uv](https://docs.astral.sh/uv/))
-- Node.js 20.19+ only if you start the organization sidecar from source, or rebuild the dashboard. The Windows installer already bundles Node + openXYOS.
+- Node.js 20.19+ only if you opt into the organization sidecar (`FREEOS_ORG_SIDECAR=1`) from source, or rebuild the dashboard. A fresh FreeOS install does not need Node.
### From this repository
@@ -112,22 +112,25 @@ Full host suite: `uv run pytest` / `make test-fast` (needs the usual extra servi
## Enable the organization module
-The host stays Python. openXYOS stays a TypeScript sidecar under `modules/openxyos/`. Toggle it from any of:
+The host stays Python. Organization first paint is the native dashboard page
+plus `/api/org-module/*` (catalog, ingest/import, growth loop, employees).
+The TypeScript sidecar under `modules/openxyos/` is optional.
| Surface | Action |
|---|---|
-| Dashboard | Sidebar → **Organization** → enable switch |
-| CLI | `uv run freeos org enable` · `uv run freeos org status` |
+| Dashboard | Sidebar → **Organization** (in-host workbench) |
+| CLI | `uv run freeos org enable` · `uv run freeos org status` · `uv run freeos org loop run` |
| Plugin | Admin → Plugins → **Organization OS** (`org-os`) |
| API | `PATCH /api/org-module` with `{ "enabled": true }` |
-Then start the sidecar (Node 20+):
+Optional Node sidecar (export/sync/advanced deploy only):
```bash
-bash scripts/run-org-sidecar.sh
+FREEOS_ORG_SIDECAR=1 bash scripts/run-org-sidecar.sh
```
-Default origin: `http://127.0.0.1:3780` (`FREEOS_ORG_SIDECAR_URL` / `OPENXYOS_BASE_URL` / `FREEOS_ORG_SIDECAR_PORT` to override). When `/api/health/livez` succeeds, `/organization` embeds the org console and `/api/org-module/sidecar/*` proxies to it.
+Default origin if opted in: `http://127.0.0.1:3780`. Organization and
+`freeos org loop run` do **not** wait for `/api/health/livez`.
**Auth:** FreeOS JWT users and openXYOS tenants are separate. The proxy forwards `X-FreeOS-User*` and `X-FreeOS-Tenant-Id`. One tenant = one workspace/sandbox — not prompt isolation.
diff --git a/README_CN.md b/README_CN.md
index ff9e225c..c6e95038 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -11,7 +11,7 @@
- 
+ 
diff --git a/dashboard/src/api/modules/orgModule.ts b/dashboard/src/api/modules/orgModule.ts
index 9c11d45a..59f181f8 100644
--- a/dashboard/src/api/modules/orgModule.ts
+++ b/dashboard/src/api/modules/orgModule.ts
@@ -49,8 +49,24 @@ export interface OrgControlPlane {
approvals: number;
}
+export interface OrgColleague {
+ slug: string;
+ name: string;
+ lifecycle: string;
+ agent_id: string;
+ spawned: boolean;
+}
+
+export interface OrgExpert {
+ agent_id: string;
+ slug: string;
+ name: string;
+}
+
export interface OrgOverview {
enabled: boolean;
+ runtime?: "in_host" | string;
+ sidecar_optional?: boolean;
sidecar_reachable: boolean;
sidecar_embed_ok?: boolean;
sidecar_url: string;
@@ -61,6 +77,14 @@ export interface OrgOverview {
last_sync: string | null;
freeos: OrgPlaneCounts;
openxyos: OrgControlPlane;
+ colleagues?: OrgColleague[];
+ experts?: OrgExpert[];
+ org_surfaces?: {
+ employees: number;
+ talent: number;
+ skills: number;
+ plugins: number;
+ };
last_loop: Record | null;
notes: string[];
catalog: OrgCapability[];
diff --git a/dashboard/src/locales/en.json b/dashboard/src/locales/en.json
index e852ab8b..0c2fc469 100644
--- a/dashboard/src/locales/en.json
+++ b/dashboard/src/locales/en.json
@@ -19,10 +19,25 @@
"statusBarTitle": "Organization",
"on": "Enabled",
"off": "Disabled",
- "sidecarUp": "Local openXYOS connected",
- "sidecarEmbedFailed": "Preview failed to load",
- "sidecarDown": "Opening local openXYOS",
- "sidecarOpening": "Opening local openXYOS",
+ "sidecarUp": "Optional openXYOS connected",
+ "sidecarEmbedFailed": "Optional preview failed to load",
+ "sidecarDown": "In-host organization",
+ "sidecarOpening": "In-host organization",
+ "inHostReady": "In-host organization ready",
+ "sidecarOptionalChip": "Node sidecar optional",
+ "advancedConsole": "Advanced: optional openXYOS",
+ "colleaguesTitle": "Colleagues and experts",
+ "colleaguesEmpty": "No colleagues yet. Import, produce, or run the growth loop.",
+ "orgSurfacesTitle": "Organization assets (in-host)",
+ "runtimeInHost": "FreeOS host",
+ "sidecarAdvancedHint": "The Node console on port 3780 is optional export/sync. Organization and the growth loop work without it.",
+ "packLocalDone": "Wrote the local organization mirror. Assets are selectable below and on Experts.",
+ "expertsHint": "Spawned colleagues are also listed on Experts.",
+ "surfaceEmployees": "Employees",
+ "surfaceTalent": "Talent",
+ "surfacePlugins": "Plugins",
+ "openExperts": "Open Experts",
+ "colleagueLifecycle": "Lifecycle",
"lastSync": "Last sync",
"restartSidecar": "Restart openXYOS frontend and backend",
"restartSidecarCta": "Restart frontend and backend",
@@ -104,7 +119,7 @@
"timelineRemote": "Pushed to control plane",
"timelineGovernance": "High-risk tool blocked by governance",
"emptyTitle": "First look at Organization",
- "emptyBody": "FreeOS on the left owns colleagues, experts / assistants not yet in a department, skills, MCP, and tasks. openXYOS on the right owns department employees, blueprints, modules, and approvals. After Setup the local console opens on its own; you can also run the loop once to see a real cycle.",
+ "emptyBody": "FreeOS on the left owns colleagues, experts / assistants not yet in a department, skills, MCP, and tasks. Organization on the right owns department employees, blueprints, modules, and approvals — all in this host. Run the loop once to see a real cycle. The Node sidecar is optional.",
"startSidecarTitle": "Opening local openXYOS",
"startSidecarBody": "Organization opens the local test URL http://127.0.0.1:3780 directly.",
"startSidecarAction": "Open local openXYOS",
diff --git a/dashboard/src/locales/zh.json b/dashboard/src/locales/zh.json
index d25da8a3..66fc3aa6 100644
--- a/dashboard/src/locales/zh.json
+++ b/dashboard/src/locales/zh.json
@@ -19,10 +19,25 @@
"statusBarTitle": "组织",
"on": "已启用",
"off": "已关闭",
- "sidecarUp": "本机 openXYOS 已连接",
- "sidecarEmbedFailed": "预览页未能加载",
- "sidecarDown": "正在打开本机 openXYOS",
- "sidecarOpening": "正在打开本机 openXYOS",
+ "sidecarUp": "可选 openXYOS 已连接",
+ "sidecarEmbedFailed": "可选预览未能加载",
+ "sidecarDown": "宿主内组织已就绪",
+ "sidecarOpening": "宿主内组织已就绪",
+ "inHostReady": "宿主内组织已就绪",
+ "sidecarOptionalChip": "Node 边车可选",
+ "advancedConsole": "高级：可选 openXYOS",
+ "colleaguesTitle": "同事与专家",
+ "colleaguesEmpty": "还没有同事。请导入、从语料生产，或运行自增长循环。",
+ "orgSurfacesTitle": "组织资产（宿主内）",
+ "runtimeInHost": "FreeOS 宿主",
+ "sidecarAdvancedHint": "3780 上的 Node 控制台只用于导出/同步/高级部署。组织页和自增长循环不依赖它。",
+ "packLocalDone": "已写入本地组织镜像。资产可在下方和「专家」页选用。",
+ "expertsHint": "登记后的同事也会出现在「专家」页。",
+ "surfaceEmployees": "员工",
+ "surfaceTalent": "人才",
+ "surfacePlugins": "插件",
+ "openExperts": "打开专家页",
+ "colleagueLifecycle": "生命周期",
"lastSync": "最近同步",
"restartSidecar": "重启 openXYOS 前后端服务",
"restartSidecarCta": "重启前后端服务",
@@ -104,7 +119,7 @@
"timelineRemote": "已推送到控制面",
"timelineGovernance": "高风险工具被治理拦截",
"emptyTitle": "第一次打开组织",
- "emptyBody": "左侧 FreeOS 负责同事、尚未入部门的专家 / 智能助手、技能、MCP 与任务；右侧 openXYOS 负责部门员工、蓝图、模块与审批。安装完成后会自动打开本机 openXYOS；也可直接运行组织循环看一次真实闭环。",
+ "emptyBody": "左侧 FreeOS 负责同事、尚未入部门的专家 / 智能助手、技能、MCP 与任务；右侧组织能力负责部门员工、蓝图、模块与审批——都在本宿主内。直接运行组织循环即可看到真实闭环。Node 边车是可选项。",
"startSidecarTitle": "正在打开本机 openXYOS",
"startSidecarBody": "组织界面直接访问本机测试网址 http://127.0.0.1:3780。",
"startSidecarAction": "打开本机 openXYOS",
diff --git a/dashboard/src/pages/Organization/Organization.module.less b/dashboard/src/pages/Organization/Organization.module.less
index 7c1da28f..9bb3889e 100644
--- a/dashboard/src/pages/Organization/Organization.module.less
+++ b/dashboard/src/pages/Organization/Organization.module.less
@@ -1,13 +1,9 @@
/*
* Organization page layout
* ------------------------
- * The main view is a slim blue status bar + a full-area iframe. The iframe
- * box is height-constrained to the remaining window (not stretched to match
- * leftover chrome). That matters for openXYOS dialogs: `position:fixed`
- * inside the iframe is relative to the iframe element's box. A tall iframe
- * (old two-column layout) centered modals far below the visible FreeOS
- * viewport. Keeping the iframe == the visible pane centers overlays both
- * vertically and horizontally.
+ * The main view is a slim blue status bar + the in-host Organization
+ * workbench (catalog, colleagues, growth loop). The optional Node console
+ * is not required for first paint.
*/
.page {
position: relative;
@@ -19,6 +15,47 @@
gap: 0;
}
+.workbench {
+ flex: 1;
+ min-height: 0;
+ overflow: auto;
+ padding: 20px 24px 32px;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+}
+
+.colleagueList {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.colleagueRow {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ border-radius: 12px;
+ padding: 10px 14px;
+ background: var(--fn-bg-secondary);
+}
+
+.colleagueName {
+ margin: 0;
+ font-size: 14px;
+ font-weight: 650;
+}
+
+.colleagueMeta {
+ margin: 2px 0 0;
+ font-size: 12px;
+ color: var(--fn-text-secondary);
+}
+
.statusBar {
display: flex;
align-items: flex-end;
diff --git a/dashboard/src/pages/Organization/index.test.tsx b/dashboard/src/pages/Organization/index.test.tsx
index c8398851..d8ce6bdc 100644
--- a/dashboard/src/pages/Organization/index.test.tsx
+++ b/dashboard/src/pages/Organization/index.test.tsx
@@ -4,7 +4,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import OrganizationPage from "./index";
import { orgModuleApi, type OrgOverview } from "../../api/modules/orgModule";
import { message } from "../../utils/antdMessage";
-import { tryOpenInOrgBrowser } from "../../utils/orgBrowserHost";
function renderOrg() {
return render(
@@ -22,11 +21,13 @@ function renderOrg() {
const overview: OrgOverview = {
enabled: true,
- sidecar_reachable: true,
- sidecar_embed_ok: true,
+ runtime: "in_host",
+ sidecar_optional: true,
+ sidecar_reachable: false,
+ sidecar_embed_ok: false,
sidecar_url: "http://127.0.0.1:3780",
start_available: false,
- install_ready: true,
+ install_ready: false,
start_command: "",
home: "/tmp",
last_sync: null,
@@ -41,14 +42,27 @@ const overview: OrgOverview = {
tasks: 0,
},
openxyos: {
- reachable: true,
+ reachable: false,
url: "http://127.0.0.1:3780",
- detail: "ok",
+ detail: "sidecar optional; not configured",
modules: 4,
governance: true,
tenant_id: "1",
approvals: 0,
},
+ colleagues: [
+ {
+ slug: "ops-coordinator",
+ name: "Ops",
+ lifecycle: "active",
+ agent_id: "org-ops-coordinator",
+ spawned: true,
+ },
+ ],
+ experts: [
+ { agent_id: "org-ops-coordinator", slug: "ops-coordinator", name: "Ops" },
+ ],
+ org_surfaces: { employees: 1, talent: 0, skills: 2, plugins: 1 },
last_loop: null,
notes: [],
catalog: [
@@ -105,76 +119,64 @@ describe("OrganizationPage", () => {
vi.mocked(orgModuleApi.startSidecar).mockReset();
vi.mocked(orgModuleApi.restartSidecar).mockReset();
vi.mocked(orgModuleApi.probeLivez).mockReset();
- vi.mocked(orgModuleApi.probeLivez).mockResolvedValue({
- reachable: true,
- url: "http://127.0.0.1:3780",
- detail: "ok",
- });
vi.mocked(orgModuleApi.assemble).mockReset();
vi.mocked(orgModuleApi.pack).mockReset();
+ vi.mocked(orgModuleApi.runLoop).mockReset();
vi.mocked(message.success).mockReset();
vi.mocked(message.error).mockReset();
});
- it("embeds a multi-tab browser for local openXYOS and keeps extras behind drawers", async () => {
+ it("paints the in-host workbench without a 3780 iframe or livez gate", async () => {
renderOrg();
- await waitFor(() => {
- expect(screen.getByTestId("org-mini-browser")).toBeInTheDocument();
- });
- const frame = screen.getByTestId("org-browser-frame");
- expect(frame).toHaveAttribute(
- "src",
- expect.stringMatching(/^http:\/\/127\.0\.0\.1:3780\/\?freeos_embed=1/),
- );
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "http://127.0.0.1:3780/",
- );
- expect(screen.getByTestId("org-browser-back")).toBeDisabled();
- expect(screen.getByTestId("org-browser-forward")).toBeDisabled();
- expect(screen.getByTestId("org-browser-reload")).toBeEnabled();
- const restart = screen.getByTestId("org-restart-sidecar");
- const lastSync = screen.getByTestId("org-last-sync");
- expect(
- restart.compareDocumentPosition(lastSync) &
- Node.DOCUMENT_POSITION_FOLLOWING,
- ).toBeTruthy();
- expect(screen.queryByText("organization.openSidecar")).toBeNull();
- expect(screen.getByTestId("org-download-source")).toHaveTextContent(
- "organization.downloadSourceBar",
- );
-
- expect(screen.queryByText("organization.assembleAction")).toBeNull();
- expect(screen.queryByText("organization.startSidecarAction")).toBeNull();
- expect(screen.queryByTestId("org-download-source-drawer")).toBeNull();
-
- fireEvent.click(screen.getByTestId("org-enable-module"));
expect(
- await screen.findByText("organization.catalogTitle"),
+ await screen.findByTestId("org-native-workbench"),
).toBeInTheDocument();
+ expect(screen.getByTestId("org-runtime-chip")).toHaveTextContent(
+ "organization.inHostReady",
+ );
+ expect(screen.getByText("organization.assembleAction")).toBeInTheDocument();
+ expect(screen.getByText("organization.packAction")).toBeInTheDocument();
+ expect(screen.getByText("organization.loopAction")).toBeInTheDocument();
+ expect(screen.getByTestId("org-colleagues")).toHaveTextContent("Ops");
+ expect(screen.getByTestId("org-surfaces")).toBeInTheDocument();
+ expect(screen.queryByTestId("org-mini-browser")).toBeNull();
+ expect(screen.queryByTestId("org-browser-frame")).toBeNull();
+ expect(screen.queryByTestId("org-sidecar-gate")).toBeNull();
+ expect(screen.queryByTestId("org-restart-sidecar")).toBeNull();
+ expect(screen.queryByTestId("org-restart-overlay")).toBeNull();
+ expect(orgModuleApi.startSidecar).not.toHaveBeenCalled();
+ expect(orgModuleApi.probeLivez).not.toHaveBeenCalled();
+ });
- fireEvent.click(screen.getByTestId("org-manage-os"));
- expect(
- await screen.findByText("organization.assembleTitle"),
- ).toBeInTheDocument();
- expect(screen.getByText("organization.loopTitle")).toBeInTheDocument();
- expect(
- screen.getByTestId("org-download-source-drawer"),
- ).toBeInTheDocument();
- expect(screen.queryByTestId("org-preview-blank")).toBeNull();
+ it("does not auto-start or gate login when the optional sidecar is down", async () => {
+ vi.mocked(orgModuleApi.overview).mockResolvedValue({
+ ...overview,
+ sidecar_reachable: false,
+ start_available: true,
+ install_ready: true,
+ });
+ renderOrg();
+ await screen.findByTestId("org-native-workbench");
+ await new Promise((resolve) => setTimeout(resolve, 30));
+ expect(orgModuleApi.startSidecar).not.toHaveBeenCalled();
+ expect(screen.queryByTestId("org-sidecar-gate")).toBeNull();
+ expect(screen.getByText("organization.assembleAction")).toBeInTheDocument();
});
- it("downloads latest source from the status bar after picking a folder", async () => {
+ it("keeps sidecar start and source download behind Advanced", async () => {
pickDesktopFolder.mockResolvedValue("D:\\源码\\openXYOS");
vi.mocked(orgModuleApi.downloadSource).mockResolvedValue({
path: "D:\\源码\\openXYOS\\openXYOS-main.zip",
});
-
renderOrg();
- fireEvent.click(await screen.findByTestId("org-download-source"));
+ await screen.findByTestId("org-native-workbench");
+ expect(screen.queryByTestId("org-download-source")).toBeNull();
+ expect(screen.queryByTestId("org-start-sidecar")).toBeNull();
+ fireEvent.click(screen.getByTestId("org-advanced-console"));
+ fireEvent.click(await screen.findByTestId("org-download-source"));
await waitFor(() => {
- expect(pickDesktopFolder).toHaveBeenCalled();
expect(orgModuleApi.downloadSource).toHaveBeenCalledWith(
"D:\\源码\\openXYOS",
);
@@ -182,225 +184,37 @@ describe("OrganizationPage", () => {
expect(message.success).toHaveBeenCalledWith(
"organization.downloadSourceDone",
);
- expect(screen.queryByText("organization.assembleTitle")).toBeNull();
- });
-
- it("does not download when the folder picker is cancelled", async () => {
- pickDesktopFolder.mockResolvedValue(null);
-
- renderOrg();
- fireEvent.click(await screen.findByTestId("org-download-source"));
-
- await waitFor(() => {
- expect(pickDesktopFolder).toHaveBeenCalled();
- });
- expect(orgModuleApi.downloadSource).not.toHaveBeenCalled();
- expect(message.error).not.toHaveBeenCalled();
});
- it("opens trapped window.open / host URLs as extra tabs", async () => {
- renderOrg();
- await screen.findByTestId("org-mini-browser");
-
- expect(
- tryOpenInOrgBrowser("https://github.com/XYAIStudio/openXYOS", "GitHub"),
- ).toBe(true);
- await waitFor(() => {
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "https://github.com/XYAIStudio/openXYOS",
- );
- });
- expect(
- screen
- .getAllByTestId("org-browser-frame")
- .some(
- (node) =>
- node.getAttribute("src") ===
- "https://github.com/XYAIStudio/openXYOS",
- ),
- ).toBe(true);
-
- expect(window.open("https://example.com/docs", "_blank")).toBeNull();
- await waitFor(() => {
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "https://example.com/docs",
- );
- });
- });
-
- it("navigates the active tab from the address bar", async () => {
- renderOrg();
- const address = await screen.findByTestId("org-address-bar");
- fireEvent.change(address, {
- target: { value: "https://example.com/path" },
- });
- fireEvent.submit(address.closest("form") as HTMLFormElement);
- await waitFor(() => {
- expect(screen.getByTestId("org-browser-frame")).toHaveAttribute(
- "src",
- "https://example.com/path",
- );
- });
- expect(screen.getByTestId("org-browser-back")).toBeEnabled();
- fireEvent.click(screen.getByTestId("org-browser-back"));
- await waitFor(() => {
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "http://127.0.0.1:3780/",
- );
- });
- fireEvent.click(screen.getByTestId("org-browser-reload"));
- await waitFor(() => {
- expect(screen.getByTestId("org-browser-frame")).toHaveAttribute(
- "data-tab-id",
- "org-home",
- );
- });
- });
-
- it("restarts openXYOS and returns the embed to the local home page", async () => {
- vi.mocked(orgModuleApi.restartSidecar).mockImplementation(async () => {
- await new Promise((resolve) => setTimeout(resolve, 20));
- return {
- started: true,
- already: false,
- reachable: true,
- url: "http://127.0.0.1:3780",
- command: "start-sidecar",
- detail: "restarted openXYOS frontend and backend",
- launcher: "",
- };
- });
- renderOrg();
- const address = await screen.findByTestId("org-address-bar");
- fireEvent.change(address, {
- target: { value: "https://example.com/docs" },
- });
- fireEvent.submit(address.closest("form") as HTMLFormElement);
- fireEvent.click(screen.getByTestId("org-restart-sidecar"));
- const overlay = await screen.findByTestId("org-restart-overlay");
- expect(overlay).toBeInTheDocument();
- expect(overlay).toHaveTextContent("organization.restartOverlayTitle");
- expect(screen.getAllByTestId("org-restart-step")).toHaveLength(5);
- await waitFor(() => {
- expect(orgModuleApi.restartSidecar).toHaveBeenCalled();
- });
- await waitFor(() => {
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "http://127.0.0.1:3780/",
- );
- });
- expect(screen.queryByTestId("org-restart-overlay")).toBeNull();
- expect(message.success).toHaveBeenCalledWith(
- "organization.restartSidecarDone",
- );
- });
-
- it("gates the local test page when livez is down and prompts restart", async () => {
- vi.mocked(orgModuleApi.overview).mockResolvedValue({
- ...overview,
- sidecar_reachable: false,
- sidecar_embed_ok: false,
- start_available: false,
- install_ready: false,
- });
- vi.mocked(orgModuleApi.probeLivez).mockResolvedValue({
- reachable: false,
- url: "http://127.0.0.1:3780",
- detail: "sidecar unreachable",
- });
- renderOrg();
- expect(await screen.findByTestId("org-sidecar-gate")).toBeInTheDocument();
- expect(screen.getByTestId("org-sidecar-gate")).toHaveTextContent(
- "organization.previewNeedsRestart",
- );
- expect(screen.getByTestId("org-browser-frame")).toHaveAttribute(
- "src",
- "about:blank",
- );
- expect(screen.getByTestId("org-restart-sidecar")).toBeInTheDocument();
- vi.mocked(orgModuleApi.restartSidecar).mockImplementation(async () => {
- await new Promise((resolve) => setTimeout(resolve, 80));
- return {
- started: true,
- already: false,
- reachable: true,
- url: "http://127.0.0.1:3780",
- command: "start-sidecar",
- detail: "ok",
- launcher: "",
- };
- });
- fireEvent.click(screen.getByTestId("org-sidecar-gate-restart"));
- expect(
- await screen.findByTestId("org-restart-overlay"),
- ).toBeInTheDocument();
- });
-
- it("probes livez before opening a sidecar URL from the address bar", async () => {
- vi.mocked(orgModuleApi.overview).mockResolvedValue({
- ...overview,
+ it("imports into FreeOS and opens Experts so colleagues are selectable", async () => {
+ vi.mocked(orgModuleApi.assemble).mockResolvedValue({
sidecar_reachable: false,
- start_available: false,
- install_ready: false,
- });
- vi.mocked(orgModuleApi.probeLivez).mockResolvedValue({
- reachable: false,
- url: "http://127.0.0.1:3780",
- detail: "sidecar unreachable",
- });
- renderOrg();
- await screen.findByTestId("org-sidecar-gate");
- fireEvent.submit(
- screen.getByTestId("org-address-bar").closest("form") as HTMLFormElement,
- );
- await waitFor(() => {
- expect(orgModuleApi.probeLivez).toHaveBeenCalled();
+ employees: ["ops-coordinator"],
+ spawned: [
+ {
+ agent_id: "org-ops-coordinator",
+ slug: "ops-coordinator",
+ name: "Ops",
+ },
+ ],
+ imported: { skills: ["org-governance"], plugins: ["bridge"] },
+ skills: ["org-governance"],
+ plugins: ["bridge"],
+ preview_path: "/experts",
+ notes: [
+ "using in-host org storage and bundled openXYOS blueprint fixtures",
+ ],
});
- expect(screen.getByTestId("org-sidecar-gate")).toBeInTheDocument();
- expect(screen.getByTestId("org-browser-frame")).toHaveAttribute(
- "src",
- "about:blank",
- );
- });
- it("auto-starts the sidecar when Organization is opened offline", async () => {
- vi.mocked(orgModuleApi.overview).mockResolvedValue({
- ...overview,
- sidecar_reachable: false,
- sidecar_embed_ok: false,
- start_available: true,
- });
- vi.mocked(orgModuleApi.startSidecar).mockResolvedValue({
- started: true,
- already: false,
- reachable: true,
- url: "http://127.0.0.1:3780",
- command: "",
- detail: "ok",
- launcher: "",
- });
renderOrg();
- await waitFor(() => {
- expect(orgModuleApi.startSidecar).toHaveBeenCalled();
- });
- });
+ fireEvent.click(await screen.findByTestId("org-assemble"));
- it("surfaces a blank-preview error when livez is up but embed origin fails", async () => {
- vi.mocked(orgModuleApi.overview).mockResolvedValue({
- ...overview,
- sidecar_embed_ok: false,
- });
- renderOrg();
- expect(await screen.findByTestId("org-preview-blank")).toHaveTextContent(
- "organization.previewBlank",
- );
- expect(
- screen.getByText("organization.sidecarEmbedFailed"),
- ).toBeInTheDocument();
+ expect(await screen.findByTestId("experts-page")).toBeInTheDocument();
+ expect(orgModuleApi.assemble).toHaveBeenCalled();
+ expect(message.success).toHaveBeenCalledWith("organization.assembleDone");
});
- it("shows pack landed counts and opens the employees preview", async () => {
- vi.mocked(orgModuleApi.overview).mockResolvedValue(overview);
+ it("packs to the in-host mirror without opening a 3780 preview", async () => {
vi.mocked(orgModuleApi.pack).mockResolvedValue({
pack: {
directory: "/tmp/pack",
@@ -413,62 +227,47 @@ describe("OrganizationPage", () => {
applied: {
pack_dir: "/tmp/pack",
mirror_dir: "/tmp/mirror",
- remote_applied: true,
+ remote_applied: false,
mirrored: true,
- notes: ["control plane accepted the FreeOS ingest"],
- tenant_id: 2,
- preview_path: "/employees",
- landed: {
- tenant_id: 2,
- preview: "/employees",
- landed: {
- employees: { created: 2, updated: 0 },
- talent: { created: 2, updated: 0 },
- plugins: { created: 11, updated: 0 },
- skills: { created: 12, updated: 0 },
- mcp: { created: 1, updated: 0 },
- },
- },
+ notes: ["OPENXYOS_BASE_URL unset; applied to local mirror only"],
},
});
renderOrg();
- fireEvent.click(await screen.findByTestId("org-manage-os"));
- fireEvent.click(screen.getByTestId("org-pack"));
+ fireEvent.click(await screen.findByTestId("org-pack"));
- await waitFor(() => {
- expect(screen.getByTestId("org-address-bar")).toHaveValue(
- "http://127.0.0.1:3780/employees",
- );
- });
- expect(screen.queryByText("organization.assembleTitle")).toBeNull();
+ expect(await screen.findByTestId("org-last-receipt")).toHaveTextContent(
+ "organization.packLocalDone",
+ );
+ expect(screen.queryByTestId("org-browser-frame")).toBeNull();
expect(message.success).toHaveBeenCalledWith("organization.packDone");
});
- it("imports into FreeOS and opens Experts so colleagues are selectable", async () => {
- vi.mocked(orgModuleApi.assemble).mockResolvedValue({
- sidecar_reachable: true,
- employees: ["ops-coordinator"],
- spawned: [
- {
- agent_id: "org-ops-coordinator",
- slug: "ops-coordinator",
- name: "Ops",
- },
- ],
- imported: { skills: ["org-governance"], plugins: ["bridge"] },
- skills: ["org-governance"],
- plugins: ["bridge"],
- preview_path: "/experts",
- notes: ["imported live control-plane export"],
+ it("runs the growth loop without requiring sidecar health", async () => {
+ vi.mocked(orgModuleApi.runLoop).mockResolvedValue({
+ ok: true,
+ tenant_id: "1",
+ home: "/tmp",
+ skills: ["org-employees"],
+ employees: ["policy-analyst"],
+ agents: [{ slug: "policy-analyst" }],
+ lifecycle: { active: "active" },
+ pack_dir: "/tmp/pack",
+ mirror_dir: "/tmp/mirror",
+ remote_applied: false,
+ imported_roundtrip: {},
+ governance_blocked: true,
+ governance: {},
+ notes: ["Loop produced colleagues"],
});
renderOrg();
- fireEvent.click(await screen.findByTestId("org-manage-os"));
- fireEvent.click(screen.getByTestId("org-assemble"));
+ fireEvent.click(await screen.findByTestId("org-loop"));
- expect(await screen.findByTestId("experts-page")).toBeInTheDocument();
- expect(orgModuleApi.assemble).toHaveBeenCalled();
- expect(message.success).toHaveBeenCalledWith("organization.assembleDone");
+ await waitFor(() => {
+ expect(orgModuleApi.runLoop).toHaveBeenCalled();
+ });
+ expect(message.success).toHaveBeenCalledWith("organization.loopOk");
+ expect(screen.queryByTestId("org-sidecar-gate")).toBeNull();
});
});
diff --git a/dashboard/src/pages/Organization/index.tsx b/dashboard/src/pages/Organization/index.tsx
index ea711ac1..e723abf8 100644
--- a/dashboard/src/pages/Organization/index.tsx
+++ b/dashboard/src/pages/Organization/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { useNavigate } from "react-router-dom";
import { Button, Drawer, Input, Space, Switch, Tag } from "antd";
import {
@@ -7,7 +7,6 @@ import {
Download,
Package,
Play,
- RefreshCw,
Settings2,
Shield,
Users,
@@ -31,40 +30,10 @@ import {
} from "../../utils/desktopFolder";
import { message } from "../../utils/antdMessage";
import { resolveOpenxyosSourceDest } from "./pickSourceDest";
-import { sidecarRecoverPhase, shouldShowPreviewBlank } from "./sidecarRecover";
-import { confirmSidecarLivez, sidecarPreviewGate } from "./sidecarLivez";
-import OrgMiniBrowser from "./OrgMiniBrowser";
-import OrgRestartOverlay from "./OrgRestartOverlay";
-import {
- DEFAULT_ORG_URL,
- closeOrgTab,
- createHomeTab,
- goBackOrgTab,
- goForwardOrgTab,
- isSidecarOriginUrl,
- navigateOrgTab,
- normalizeOrgUrl,
- openOrgTab,
- parseOrgNavigatedMessage,
- parseOrgOpenTabMessage,
- reloadOrgTab,
- sidecarOriginOf,
- tabTitleFromUrl,
- type OrgBrowserTab,
-} from "./orgBrowser";
-import { installOrgPageWindowTrap } from "./orgPageWindowTrap";
-import { registerOrgBrowserHost } from "../../utils/orgBrowserHost";
import styles from "./Organization.module.less";
-type ActionKey =
- | "assemble"
- | "pack"
- | "loop"
- | "sidecar"
- | "restart"
- | "produce"
- | null;
-type DrawerKey = "module" | "manage" | null;
+type ActionKey = "assemble" | "pack" | "loop" | "sidecar" | "produce" | null;
+type DrawerKey = "module" | "advanced" | null;
type LastReceipt = {
kind: "assemble" | "pack" | "loop";
@@ -123,51 +92,6 @@ export default function OrganizationPage() {
const [produceName, setProduceName] = useState("");
const [produceIma, setProduceIma] = useState("");
const [landed, setLanded] = useState | null>(null);
- const autoStartRef = useRef(false);
- const iframeRefs = useRef>({});
- const livezOkRef = useRef(false);
- const [previewNonce, setPreviewNonce] = useState("");
- const [livezOk, setLivezOk] = useState(false);
- const [autoStarting, setAutoStarting] = useState(false);
- const [autoStartFailed, setAutoStartFailed] = useState(false);
- const [restartFinished, setRestartFinished] = useState(false);
- const [openBlocked, setOpenBlocked] = useState(false);
- const homeTitle = t("organization.homeTabTitle");
- const [tabs, setTabs] = useState(() => [
- createHomeTab(DEFAULT_ORG_URL, homeTitle),
- ]);
- const [activeId, setActiveId] = useState("org-home");
- const [addressValue, setAddressValue] = useState(DEFAULT_ORG_URL);
-
- const showPreview = useCallback(
- (path: string) => {
- const dest = normalizeOrgUrl(
- `${(overview?.sidecar_url || DEFAULT_ORG_URL).replace(/\/$/, "")}${
- path.startsWith("/") ? path : `/${path}`
- }`,
- );
- const origin = sidecarOriginOf(
- (overview?.sidecar_url || DEFAULT_ORG_URL).replace(/\/$/, ""),
- );
- if (isSidecarOriginUrl(dest, origin) && !livezOkRef.current) {
- void confirmSidecarLivez({
- origin,
- apiProbe: orgModuleApi.probeLivez,
- }).then((ok) => {
- setLivezOk(ok);
- livezOkRef.current = ok;
- if (!ok) setOpenBlocked(true);
- });
- }
- setTabs((current) =>
- navigateOrgTab(current, "org-home", dest, homeTitle),
- );
- setActiveId("org-home");
- setAddressValue(dest);
- setPreviewNonce(String(Date.now()));
- },
- [homeTitle, overview?.sidecar_url],
- );
const applyOverview = useCallback(
async (quiet = false) => {
@@ -175,9 +99,6 @@ export default function OrganizationPage() {
try {
const next = await orgModuleApi.overview();
setOverview(next);
- setLivezOk(Boolean(next.sidecar_reachable));
- livezOkRef.current = Boolean(next.sidecar_reachable);
- if (next.sidecar_reachable) setOpenBlocked(false);
if (next.module_toggles) setModuleToggles(next.module_toggles);
const proof = next.last_loop;
if (proof && typeof proof === "object" && proof.landed) {
@@ -198,43 +119,11 @@ export default function OrganizationPage() {
[t],
);
- const load = useCallback(async () => {
- await applyOverview(false);
- }, [applyOverview]);
-
- useEffect(() => {
- void load();
- }, [load]);
-
useEffect(() => {
- if (overview?.sidecar_reachable) return;
- const id = window.setInterval(() => {
- void applyOverview(true);
- }, 4000);
- return () => window.clearInterval(id);
- }, [applyOverview, overview?.sidecar_reachable]);
+ void applyOverview(false);
+ }, [applyOverview]);
- const sidecarUp = Boolean(overview?.sidecar_reachable) && livezOk;
- const embedOk = overview?.sidecar_embed_ok;
- const previewBlank = shouldShowPreviewBlank({
- sidecarUp,
- embedOk,
- });
- const recoverPhase = sidecarRecoverPhase({
- sidecarUp,
- installReady: Boolean(overview?.install_ready),
- startAvailable: Boolean(overview?.start_available),
- autoStarting,
- autoStartFailed,
- });
- const previewGate = sidecarPreviewGate({
- livezOk: sidecarUp,
- restarting: busy === "restart",
- });
- const showRestartGate =
- Boolean(overview) &&
- previewGate === "needsRestart" &&
- (openBlocked || recoverPhase === "needsRestart");
+ const sidecarUp = Boolean(overview?.sidecar_reachable);
const firstRun = useMemo(() => {
if (!overview) return false;
return (
@@ -261,15 +150,6 @@ export default function OrganizationPage() {
}
};
- const waitForSidecar = async () => {
- for (let i = 0; i < 30; i += 1) {
- const next = await applyOverview(true);
- if (next?.sidecar_reachable) return next;
- await new Promise((resolve) => window.setTimeout(resolve, 1000));
- }
- return applyOverview(true);
- };
-
const runAction = async (
key: Exclude,
fn: () => Promise,
@@ -277,7 +157,7 @@ export default function OrganizationPage() {
setBusy(key);
try {
await fn();
- if (key !== "sidecar" && key !== "restart") {
+ if (key !== "sidecar") {
await applyOverview(false);
}
} catch (err) {
@@ -291,46 +171,11 @@ export default function OrganizationPage() {
const startSidecar = () =>
runAction("sidecar", async () => {
- setAutoStarting(true);
- setAutoStartFailed(false);
- try {
- const result = await orgModuleApi.startSidecar();
- setLastActionNotes([result.detail, result.command].filter(Boolean));
- const next = result.reachable
- ? await applyOverview(true)
- : await waitForSidecar();
- if (next?.sidecar_reachable) {
- setAutoStartFailed(false);
- return;
- }
- setAutoStartFailed(true);
- } catch {
- setAutoStartFailed(true);
- } finally {
- setAutoStarting(false);
- }
+ const result = await orgModuleApi.startSidecar();
+ setLastActionNotes([result.detail, result.command].filter(Boolean));
+ await applyOverview(true);
});
- const canSilentStart = Boolean(
- overview?.start_available || overview?.install_ready,
- );
-
- useEffect(() => {
- if (autoStartRef.current) return;
- if (!overview) return;
- const embedBroken =
- overview.sidecar_reachable && overview.sidecar_embed_ok === false;
- if (overview.sidecar_reachable && !embedBroken) return;
- if (!embedBroken && !canSilentStart) return;
- autoStartRef.current = true;
- void startSidecar();
- }, [
- canSilentStart,
- overview,
- overview?.sidecar_reachable,
- overview?.sidecar_embed_ok,
- ]);
-
const toggleModule = async (key: string, enabled: boolean) => {
const next = { ...moduleToggles, [key]: enabled };
setModuleToggles(next);
@@ -448,9 +293,8 @@ export default function OrganizationPage() {
skills: landedCount(result.applied.landed, "skills"),
plugins: landedCount(result.applied.landed, "plugins"),
}),
- t("organization.packPreviewEmployees"),
]
- : [];
+ : [t("organization.packLocalDone")];
setLastActionNotes([
...result.pack.notes,
...result.applied.notes,
@@ -462,9 +306,6 @@ export default function OrganizationPage() {
});
setDrawer(null);
await applyOverview(true);
- if (result.applied.remote_applied) {
- showPreview(result.applied.preview_path || "/employees");
- }
message.success(t("organization.packDone"));
});
@@ -481,25 +322,11 @@ export default function OrganizationPage() {
`${t("organization.timelineRemote")}: ${flagLabel(
Boolean(proof.remote_applied),
)}`,
- ...(proof.remote_applied
- ? [
- t("organization.packLanded", {
- tenant: landedTenant(proof.landed),
- employees: landedCount(proof.landed, "employees"),
- talent: landedCount(proof.landed, "talent"),
- skills: landedCount(proof.landed, "skills"),
- plugins: landedCount(proof.landed, "plugins"),
- }),
- t("organization.packPreviewEmployees"),
- ]
- : []),
+ t("organization.packLocalDone"),
],
});
setDrawer(null);
await applyOverview(true);
- if (proof.remote_applied) {
- showPreview("/employees");
- }
message.success(
proof.ok ? t("organization.loopOk") : t("organization.loopPartial"),
);
@@ -514,8 +341,8 @@ export default function OrganizationPage() {
? t("organization.progressLoop")
: busy === "produce"
? t("organization.progressProduce")
- : busy === "restart"
- ? t("organization.restartingSidecar")
+ : busy === "sidecar"
+ ? t("organization.autoStartingSidecar")
: null;
const lastLoop = (loopProof ?? overview?.last_loop) as OrgLoopProof | null;
@@ -523,209 +350,8 @@ export default function OrganizationPage() {
? formatServerIsoDateTime(overview.last_sync, timeZone)
: t("organization.neverSynced");
const catalog = overview?.catalog ?? [];
- const disabledKeys = useMemo(
- () =>
- catalog
- .filter((row) => moduleToggles[row.key] === false)
- .map((row) => row.key),
- [catalog, moduleToggles],
- );
- const localConsoleUrl = (overview?.sidecar_url || DEFAULT_ORG_URL).replace(
- /\/$/,
- "",
- );
- const sidecarOrigin = sidecarOriginOf(localConsoleUrl);
-
- const confirmLivez = useCallback(async (): Promise => {
- const origin = sidecarOriginOf(
- (overview?.sidecar_url || DEFAULT_ORG_URL).replace(/\/$/, ""),
- );
- const ok = await confirmSidecarLivez({
- origin,
- apiProbe: orgModuleApi.probeLivez,
- });
- setLivezOk(ok);
- livezOkRef.current = ok;
- if (ok) setOpenBlocked(false);
- return ok;
- }, [overview?.sidecar_url]);
-
- const openTab = useCallback(
- (raw: string, title?: string, reuse = true) => {
- const url = normalizeOrgUrl(raw);
- const origin = sidecarOriginOf(
- (overview?.sidecar_url || DEFAULT_ORG_URL).replace(/\/$/, ""),
- );
- if (isSidecarOriginUrl(url, origin) && !livezOkRef.current) {
- void confirmLivez().then((ok) => {
- if (!ok) setOpenBlocked(true);
- });
- }
- const label = title || tabTitleFromUrl(url, homeTitle);
- let nextActive = "";
- let nextAddress = url;
- setTabs((current) => {
- const next = openOrgTab(current, url, label, reuse);
- nextActive = next.activeId;
- nextAddress =
- next.tabs.find((tab) => tab.id === next.activeId)?.url ?? url;
- return next.tabs;
- });
- if (nextActive) setActiveId(nextActive);
- setAddressValue(nextAddress);
- return true;
- },
- [confirmLivez, homeTitle, overview?.sidecar_url],
- );
-
- const submitAddress = useCallback(() => {
- const url = normalizeOrgUrl(addressValue, localConsoleUrl + "/");
- if (isSidecarOriginUrl(url, sidecarOrigin) && !livezOkRef.current) {
- void confirmLivez().then((ok) => {
- if (!ok) setOpenBlocked(true);
- });
- }
- setTabs((current) =>
- navigateOrgTab(current, activeId, url, tabTitleFromUrl(url, homeTitle)),
- );
- setAddressValue(url);
- }, [
- activeId,
- addressValue,
- confirmLivez,
- homeTitle,
- localConsoleUrl,
- sidecarOrigin,
- ]);
-
- const goHomeAfterRestart = useCallback(() => {
- const home = normalizeOrgUrl(localConsoleUrl + "/");
- setTabs([createHomeTab(home, homeTitle)]);
- setActiveId("org-home");
- setAddressValue(home);
- setPreviewNonce(String(Date.now()));
- }, [homeTitle, localConsoleUrl]);
-
- const onBrowserBack = useCallback(() => {
- setTabs((current) => {
- const next = goBackOrgTab(current, activeId, homeTitle);
- const url = next.find((tab) => tab.id === activeId)?.url;
- if (url) setAddressValue(url);
- return next;
- });
- }, [activeId, homeTitle]);
-
- const onBrowserForward = useCallback(() => {
- setTabs((current) => {
- const next = goForwardOrgTab(current, activeId, homeTitle);
- const url = next.find((tab) => tab.id === activeId)?.url;
- if (url) setAddressValue(url);
- return next;
- });
- }, [activeId, homeTitle]);
-
- const onBrowserReload = useCallback(() => {
- const tab = tabs.find((row) => row.id === activeId);
- if (
- tab &&
- isSidecarOriginUrl(tab.url, sidecarOrigin) &&
- !livezOkRef.current
- ) {
- void confirmLivez().then((ok) => {
- if (!ok) setOpenBlocked(true);
- });
- return;
- }
- setTabs((current) => reloadOrgTab(current, activeId));
- }, [activeId, confirmLivez, sidecarOrigin, tabs]);
-
- const restartSidecar = () =>
- runAction("restart", async () => {
- setRestartFinished(false);
- setOpenBlocked(false);
- const result = await orgModuleApi.restartSidecar();
- setLastActionNotes([result.detail, result.command].filter(Boolean));
- const next = result.reachable
- ? await applyOverview(true)
- : await waitForSidecar();
- if (next?.sidecar_reachable) {
- setRestartFinished(true);
- await new Promise((resolve) => window.setTimeout(resolve, 600));
- goHomeAfterRestart();
- message.success(t("organization.restartSidecarDone"));
- return;
- }
- message.error(
- t("organization.restartSidecarFailed", {
- detail: result.detail || t("organization.actionFailed"),
- }),
- );
- });
-
- const pushTogglesToPreview = useCallback(() => {
- for (const frame of Object.values(iframeRefs.current)) {
- frame?.contentWindow?.postMessage(
- { type: "freeos:module-toggles", disabled: disabledKeys },
- "*",
- );
- }
- }, [disabledKeys]);
-
- useEffect(() => {
- pushTogglesToPreview();
- }, [pushTogglesToPreview]);
-
- useEffect(() => {
- const home = normalizeOrgUrl(localConsoleUrl + "/");
- setTabs((current) => {
- const existing = current.find((tab) => tab.id === "org-home");
- if (!existing || existing.url === home) return current;
- if (existing.url !== DEFAULT_ORG_URL) return current;
- return navigateOrgTab(current, "org-home", home, homeTitle);
- });
- setAddressValue((current) =>
- current === DEFAULT_ORG_URL ? home : current,
- );
- }, [homeTitle, localConsoleUrl]);
-
- useEffect(() => {
- const onMessage = (event: MessageEvent) => {
- const opened = parseOrgOpenTabMessage(event.data);
- if (opened) {
- openTab(opened.url, opened.title);
- return;
- }
- const navigated = parseOrgNavigatedMessage(event.data);
- if (!navigated) return;
- setTabs((current) =>
- navigateOrgTab(
- current,
- activeId,
- navigated.url,
- navigated.title || tabTitleFromUrl(navigated.url, homeTitle),
- false,
- ),
- );
- setAddressValue(navigated.url);
- };
- window.addEventListener("message", onMessage);
- return () => window.removeEventListener("message", onMessage);
- }, [activeId, homeTitle, openTab]);
-
- useEffect(() => {
- const stopHost = registerOrgBrowserHost(openTab);
- const stopTrap = installOrgPageWindowTrap();
- return () => {
- stopTrap();
- stopHost();
- };
- }, [openTab]);
-
- useEffect(() => {
- if (sidecarUp) {
- setPreviewNonce((current) => current || String(Date.now()));
- }
- }, [sidecarUp]);
+ const colleagues = overview?.colleagues ?? [];
+ const orgSurfaces = overview?.org_surfaces;
return (
@@ -738,42 +364,19 @@ export default function OrganizationPage() {
{overview?.enabled ? t("organization.on") : t("organization.off")}
+
+ {t("organization.inHostReady")}
+
- {previewBlank
- ? t("organization.sidecarEmbedFailed")
- : sidecarUp
+ {sidecarUp
? t("organization.sidecarUp")
- : t("organization.sidecarOpening")}
+ : t("organization.sidecarOptionalChip")}
- }
- loading={busy === "restart"}
- disabled={busy !== null && busy !== "restart"}
- onClick={() => void restartSidecar()}
- data-testid="org-restart-sidecar"
- title={t("organization.restartSidecar")}
- >
- {t("organization.restartSidecar")}
-
{t("organization.lastSync")}: {lastSync}
- }
- loading={downloading || pickingFolder}
- onClick={() => void downloadSource()}
- data-testid="org-download-source"
- title={t("organization.downloadSource")}
- >
- {t("organization.downloadSourceBar")}
-
- {
- setActiveId(id);
- const tab = tabs.find((row) => row.id === id);
- if (tab) setAddressValue(tab.url);
- }}
- onCloseTab={(id) => {
- let nextActive = activeId;
- let nextAddress = addressValue;
- setTabs((current) => {
- const next = closeOrgTab(current, activeId, id);
- nextActive = next.activeId;
- nextAddress =
- next.tabs.find((row) => row.id === next.activeId)?.url ??
- addressValue;
- return next.tabs;
- });
- setActiveId(nextActive);
- setAddressValue(nextAddress);
- }}
- onNewTab={() => openTab(localConsoleUrl + "/", homeTitle, false)}
- onBack={onBrowserBack}
- onForward={onBrowserForward}
- onReload={onBrowserReload}
- onFrameLoad={pushTogglesToPreview}
- />
- {(busy === "restart" || showRestartGate) && (
- void restartSidecar()}
- />
- )}
-
-
- setDrawer(null)}
- width={480}
- destroyOnHidden
- >
-
-
-
- {t("organization.toggleLabel")}
- void toggle(checked)}
- />
-
-
{t("organization.glossary")}
-
-
- {t("organization.catalogTitle")}
-
-
- {t("organization.catalogToggleHint")}
-
-
- {catalog.map((row) => (
-
-
- {isZh ? row.label_zh : row.label}{" "}
-
- {row.locked
- ? t("organization.locked")
- : moduleToggles[row.key] === false
- ? t("organization.catalogDisabled")
- : t("organization.catalogEnabled")}
-
-
-
- {isZh ? row.description_zh : row.description}
-
- {!row.locked && (
-
- void toggleModule(row.key, checked)
- }
- />
- )}
-
- ))}
-
-
+
{t("organization.heroStory")}
{t("organization.glossary")}
@@ -984,7 +475,9 @@ export default function OrganizationPage() {
{t("organization.controlPlane")}
-
openXYOS
+
+ {t("organization.runtimeInHost")}
+
- {sidecarUp
- ? t("organization.sidecarUp")
- : t("organization.sidecarOpening")}
+ {t("organization.inHostReady")}
{t("organization.metricHealth")}
@@ -1029,6 +520,87 @@ export default function OrganizationPage() {
+
+
+ {t("organization.colleaguesTitle")}
+
+
+ {t("organization.expertsHint")}
+
+ {colleagues.length ? (
+
+ {colleagues.map((row) => (
+ -
+
+
{row.name}
+
+ {row.slug} · {t("organization.colleagueLifecycle")}:{" "}
+ {row.lifecycle}
+ {row.agent_id ? ` · ${row.agent_id}` : ""}
+
+
+ ))}
+
+ ) : (
+
+ {t("organization.colleaguesEmpty")}
+
+ )}
+
+
+
+
+
+ {t("organization.orgSurfacesTitle")}
+
+
+
+
+ {metric(orgSurfaces?.employees)}
+
+
+ {t("organization.surfaceEmployees")}
+
+
+
+
+ {metric(orgSurfaces?.talent)}
+
+
+ {t("organization.surfaceTalent")}
+
+
+
+
+ {metric(orgSurfaces?.skills)}
+
+
+ {t("organization.metricSkills")}
+
+
+
+
+ {metric(orgSurfaces?.plugins)}
+
+
+ {t("organization.surfacePlugins")}
+
+
+
{progressLabel}
@@ -1169,45 +741,115 @@ export default function OrganizationPage() {
)}
-
-
- {t("organization.landedTitle")}
-
- {landed ? (
+ {landed ? (
+
+
+ {t("organization.landedTitle")}
+
{JSON.stringify(landed, null, 2)}
- ) : (
- {t("organization.landedEmpty")}
- )}
+
+ ) : null}
+
+
+
+ {t("organization.catalogTitle")}
+
+
+ {t("organization.catalogToggleHint")}
+
+
+ {catalog.map((row) => (
+
+
+ {isZh ? row.label_zh : row.label}{" "}
+
+ {row.locked
+ ? t("organization.locked")
+ : moduleToggles[row.key] === false
+ ? t("organization.catalogDisabled")
+ : t("organization.catalogEnabled")}
+
+
+
+ {isZh ? row.description_zh : row.description}
+
+ {!row.locked && (
+
+ void toggleModule(row.key, checked)
+ }
+ />
+ )}
+
+ ))}
+
+
- {(sidecarUp || overview?.enabled) && (
-
+ setDrawer(null)}
+ width={480}
+ destroyOnHidden
+ >
+
+
+
+ {t("organization.toggleLabel")}
+ void toggle(checked)}
+ />
+
+
{t("organization.glossary")}
+
+
+ {t("organization.sidecarAdvancedHint")}
+
+
+ {overview?.sidecar_url || "http://127.0.0.1:3780"}
+
+
+
+ }
+ loading={downloading || pickingFolder}
+ onClick={() => void downloadSource()}
+ data-testid="org-download-source"
+ >
+ {t("organization.downloadSource")}
+
+
+ {!canPickDesktopFolder() && (
+
setSourceDest(event.target.value)}
+ placeholder={t("organization.downloadSourceDest")}
+ />
)}
