diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml
index b9688796..65d5c623 100644
--- a/.github/workflows/octop-desktop.yml
+++ b/.github/workflows/octop-desktop.yml
@@ -153,6 +153,15 @@ jobs:
         run: |
           set -euo pipefail
           VER=$(sed -nE 's/^version[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' pyproject.toml | head -1)
+          requested_tag="${{ github.event.inputs.release_tag }}"
+          if [[ "${GITHUB_REF}" == refs/tags/v* && "${GITHUB_REF_NAME#v}" != "$VER" ]]; then
+            echo "Refusing desktop release: tag ${GITHUB_REF_NAME} does not match pyproject.toml $VER" >&2
+            exit 1
+          fi
+          if [[ -n "$requested_tag" && "${requested_tag#v}" != "$VER" ]]; then
+            echo "Refusing desktop release: requested tag $requested_tag does not match pyproject.toml $VER" >&2
+            exit 1
+          fi
           echo "OCTOP_VERSION=${VER}" >> "$GITHUB_ENV"
           echo "version=${VER}"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 563a6c19..673f37ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,6 +33,16 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Verify release tag matches package version
+        run: |
+          set -euo pipefail
+          package_version=$(sed -nE 's/^version[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' pyproject.toml | head -1)
+          tag_version="${GITHUB_REF_NAME#v}"
+          if [[ -z "$package_version" || "$package_version" != "$tag_version" ]]; then
+            echo "Refusing release: tag $GITHUB_REF_NAME does not match pyproject.toml $package_version" >&2
+            exit 1
+          fi
+
       - uses: astral-sh/setup-uv@v4
         with:
           enable-cache: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0224afc9..c88b2b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ## [Unreleased]
 
+## [0.0.6] - 2026-09-22
+
 ### 安全
 
 - 桌面安装包与配置模板不再允许嵌入云厂商 API Key（含 DeepSeek）。首次运行不会预填真实密钥：优先本机 Ollama，云调用在密钥为空时直接拒绝并提示用户自行填写（即使环境里有 `DEEPSEEK_API_KEY` / `OPENAI_API_KEY` / `LLM_API_KEY` 也不写入 `providers`）。打包排除 `.env`、`octop.db`、`.freeos`，打 zip 前扫描 staging。生产/air-gap sidecar 不再回退 `LLM_API_KEY`。已发布的 **0.0.1–0.0.4** 安装包须下架（已从 Release 删除），并轮换可能泄露的 DeepSeek 密钥。
@@ -18,6 +20,10 @@
 
 ### 修复
 
+- Windows 最小化到托盘后，从托盘菜单「显示 FreeOS」或再次启动应用可稳定恢复主窗口；宿主会消费隐藏窗口产生的延迟关闭事件，避免窗口显示后立刻再次隐藏。
+- 组织页自动启动不再因 React effect 清理而取消；桌面宿主与 Python 组织启动器不再争抢同一 openXYOS 进程。组织数据库改为原子落盘，模块开关可即时更新导航并在重启后保持。
+- Ollama 模型明确返回“不支持 tools”时，同一轮请求会自动去掉工具定义后重试。`qwen2.5vl:3b` 等视觉/对话模型不再因工具能力缺失连续触发 `stream_error`。
+- 撤回错误标记为 0.0.5、内部实际仍为 0.0.4 的 Windows 构建。桌面更新现在拒绝版本元数据与 portable 包内部版本不一致的下载，也拒绝重复安装当前或更旧版本，防止同一包循环下载、启动时反复解压约 1.15 GB / 6.8 万文件并拖垮系统。Windows WebView2 默认使用软件渲染，降低显卡驱动黑屏风险；发布工作流在标签与 `pyproject.toml` 版本不一致时直接失败。
 - 组织嵌入仍走 openXYOS 自己的登录（`localStorage token` / sidecar JWT），不把 FreeOS 桌面访客（`auth_token` / `POST /api/auth/local-session`）写进组织房间。重启/恢复 sidecar 始终带 `FREEOS_ORG_LOCAL_TEST=1`，保留 `demo@demo.com` / `user@demo.com`。本机会话跳过组织映射行，不删除、不占用 openXYOS 用户。代理剥离宿主 Cookie 与 `X-FreeOS-*`。 / Org embed keeps openXYOS login; FreeOS local-session must not replace org users. Sidecar restart still seeds test accounts. Proxy drops host cookies and identity headers.
 - Windows 升级刷新 `~/.freeos/portable` 时，若目录节点被占用（无法改名为 `portable.previous`，报 “being used by another process”），先尝试结束残留的 portable / `launch.py` 进程，再把新运行时**原地覆盖**进现有文件夹，避免留下空的锁定 `portable` 桩，也不要求重启。 / If renaming `portable` → `portable.previous` fails because the directory is in use, stop leftover host processes and overlay the new runtime in place.
 - 桌面 `POST /api/auth/local-session` 对已有 `~/.freeos`（多用户 / 组织映射行）或 WebView 非 `127.0.0.1` Host 返回 403，前端重试后掉进注册登录。本机会话在 loopback / `*.localhost` / Origin 为本机时签发 JWT 并选用已有工作室账号；SPA 在 `/` 跳到 `/projects` 丢掉 `?desktop=1` 之前记住桌面壳。403 修复后的路径是：可选模型配置（云 Key / 本机，可跳过）→ 第一个智能体 `/chat/main`，不经过登录墙，也不停在工作台列表。`/setup` 在 guest 已创建后不再打回登录页。
diff --git a/README.md b/README.md
index fa609aa5..55df7923 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 <p align="center">
   <a href="https://www.python.org/downloads/"><img alt="Python 3.12+" src="https://img.shields.io/badge/python-3.12%2B-blue?logo=python&logoColor=white" /></a>
-  <a href="https://github.com/XYAIStudio/FreeOS/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.0.4-orange" /></a>
+  <a href="https://github.com/XYAIStudio/FreeOS/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.0.6-orange" /></a>
   <a href="LICENSE"><img alt="License: MIT + Apache-2.0" src="https://img.shields.io/badge/license-MIT%20%2B%20Apache--2.0-green" /></a>
   <a href="https://github.com/TencentCloud/Octop"><img alt="Upstream: Octop" src="https://img.shields.io/badge/Upstream-Octop-1677ff.svg?style=flat" /></a>
   <a href="https://github.com/XYAIStudio/openXYOS"><img alt="Organization module: openXYOS" src="https://img.shields.io/badge/Organization-openXYOS-0f766e.svg?style=flat" /></a>
@@ -136,7 +136,7 @@ Operator detail: [docs/asset-loop.md](docs/asset-loop.md).
    `FreeOS-desktop-windows-arm64-<version>.exe`（ARM 电脑）。
 2. 双击安装包。安装程序会放到「程序文件」并创建开始菜单和桌面快捷方式。
 3. 打开 **FreeOS**。第一次启动会解压内置运行环境（可能要一两分钟），然后直接进入可用会话，无需先登录。
-4. 保存、导出或发布到账号时再在本机完成注册或登录（更广的服务或授权不挡起步）。侧栏 **Organization** 当前默认走宿主内组织能力；桌面 0.0.4 托管 Node + iframe（延续 0.0.3 过渡桥）、以及可选的完整 openXYOS Node 栈（`127.0.0.1:3780`，导出/同步/高级部署）都是 **过渡桥**，终态是把 openXYOS 迁入宿主。组织能力像工作室里另一间可独立布置的房间，与日常对话、助手协作同在一个 FreeOS，两种进入方式不捏成一种。
+4. 保存、导出或发布到账号时再在本机完成注册或登录（更广的服务或授权不挡起步）。侧栏 **Organization** 当前默认走宿主内组织能力；桌面 0.0.6 托管 Node + iframe（延续 0.0.3 过渡桥）、以及可选的完整 openXYOS Node 栈（`127.0.0.1:3780`，导出/同步/高级部署）都是 **过渡桥**，终态是把 openXYOS 迁入宿主。组织能力像工作室里另一间可独立布置的房间，与日常对话、助手协作同在一个 FreeOS，两种进入方式不捏成一种。
 
 数据目录默认是 `%USERPROFILE%\.freeos`（可用环境变量 `FREEOS_HOME` 改）。旧版 Octop 的 `~/.octop` 仍会被识别。卸载安装包会清空安装目录（默认为 `Program Files\FreeOS`）并删除快捷方式，但**不会**删除该用户数据目录；详见 [desktop/README.md](desktop/README.md#windows-uninstall)。
 
diff --git a/README_CN.md b/README_CN.md
index ae0ca174..fd7b3dcc 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -11,7 +11,7 @@
 <p align="center">
   <a href="https://www.python.org/downloads/"><img alt="Python 3.12+" src="https://img.shields.io/badge/python-3.12%2B-blue?logo=python&logoColor=white" /></a>
   <a href="LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-green" /></a>
-  <a href="https://github.com/XYAIStudio/FreeOS/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.0.4-orange" /></a>
+  <a href="https://github.com/XYAIStudio/FreeOS/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.0.6-orange" /></a>
   <a href="https://github.com/TencentCloud/Octop"><img alt="上游：Octop" src="https://img.shields.io/badge/上游-Octop-1677ff.svg?style=flat" /></a>
   <a href="https://github.com/XYAIStudio/openXYOS"><img alt="组织模块：openXYOS" src="https://img.shields.io/badge/组织模块-openXYOS-0f766e.svg?style=flat" /></a>
   <a href="https://pypi.org/project/octop/"><img src="https://img.shields.io/pypi/v/octop" alt="PyPI" /></a>
diff --git a/dashboard/package.json b/dashboard/package.json
index 7aded21b..4d62cdec 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite --host",
-    "build": "tsc -b && NODE_ENV=production vite build",
+    "build": "tsc -b && vite build --mode production",
     "build:docker": "vite build",
     "build:prod": "tsc -b && vite build --mode production",
     "build:test": "tsc -b && vite build --mode test",
diff --git a/dashboard/src/pages/Organization/OrgRestartOverlay.tsx b/dashboard/src/pages/Organization/OrgRestartOverlay.tsx
index 58a57b80..0d9cb2db 100644
--- a/dashboard/src/pages/Organization/OrgRestartOverlay.tsx
+++ b/dashboard/src/pages/Organization/OrgRestartOverlay.tsx
@@ -14,12 +14,14 @@ import styles from "./Organization.module.less";
 type OrgRestartOverlayProps = {
   mode: "restarting" | "needsRestart";
   finished?: boolean;
+  error?: string;
   onRestart: () => void;
 };
 
 export default function OrgRestartOverlay({
   mode,
   finished = false,
+  error = "",
   onRestart,
 }: OrgRestartOverlayProps) {
   const { t } = useTranslation();
@@ -112,7 +114,14 @@ export default function OrgRestartOverlay({
               {t("organization.previewNeedsRestartTitle")}
             </h2>
             <p className={styles.restartGateBody}>
-              {t("organization.previewNeedsRestart")}
+              {error ? (
+                <>
+                  {t("organization.restartSidecarFailed", { detail: "" })}{" "}
+                  {error}
+                </>
+              ) : (
+                t("organization.previewNeedsRestart")
+              )}
             </p>
             <Button
               type="primary"
diff --git a/dashboard/src/pages/Organization/OrganizationEntry.test.tsx b/dashboard/src/pages/Organization/OrganizationEntry.test.tsx
index f2b0de92..3047c516 100644
--- a/dashboard/src/pages/Organization/OrganizationEntry.test.tsx
+++ b/dashboard/src/pages/Organization/OrganizationEntry.test.tsx
@@ -1,3 +1,4 @@
+import { StrictMode } from "react";
 import { render, screen, waitFor } from "@testing-library/react";
 import { MemoryRouter, Route, Routes } from "react-router-dom";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -18,8 +19,8 @@ vi.mock("../../utils/desktopShell", () => ({
   isDesktopShell: vi.fn(),
 }));
 
-function renderEntry() {
-  return render(
+function renderEntry(strict = false) {
+  const tree = (
     <MemoryRouter initialEntries={["/organization"]}>
       <Routes>
         <Route path="/organization" element={<OrganizationEntry />} />
@@ -28,8 +29,9 @@ function renderEntry() {
           element={<div data-testid="org-ui-workspace">workspace</div>}
         />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
+  return render(strict ? <StrictMode>{tree}</StrictMode> : tree);
 }
 
 describe("OrganizationEntry", () => {
@@ -111,6 +113,57 @@ describe("OrganizationEntry", () => {
     expect(screen.queryByTestId("org-openxyos-frame")).toBeNull();
   });
 
+  it("opens the organization after its automatic start becomes healthy", async () => {
+    vi.mocked(isDesktopShell).mockReturnValue(true);
+    vi.mocked(orgModuleApi.identityStatus).mockResolvedValue({
+      integrated: true,
+      authority: "dual",
+    });
+    vi.mocked(orgModuleApi.probeLivez)
+      .mockResolvedValueOnce({
+        reachable: false,
+        url: "http://127.0.0.1:3780",
+        detail: "sidecar unreachable",
+      })
+      .mockResolvedValueOnce({
+        reachable: false,
+        url: "http://127.0.0.1:3780",
+        detail: "sidecar unreachable",
+      })
+      .mockResolvedValue({
+        reachable: true,
+        url: "http://127.0.0.1:3780",
+        detail: "ok",
+      });
+    renderEntry(true);
+    expect(await screen.findByTestId("org-openxyos-frame")).toBeInTheDocument();
+    expect(orgModuleApi.startSidecar).toHaveBeenCalledTimes(1);
+  });
+
+  it("shows the startup failure instead of leaving the user at the port wait step", async () => {
+    vi.mocked(isDesktopShell).mockReturnValue(true);
+    vi.mocked(orgModuleApi.identityStatus).mockResolvedValue({
+      integrated: true,
+      authority: "dual",
+    });
+    vi.mocked(orgModuleApi.probeLivez).mockResolvedValue({
+      reachable: false,
+      url: "http://127.0.0.1:3780",
+      detail: "sidecar unreachable",
+    });
+    vi.mocked(orgModuleApi.startSidecar).mockResolvedValue({
+      started: true,
+      already: false,
+      reachable: false,
+      detail: "database could not be opened",
+    });
+    renderEntry();
+    expect(
+      await screen.findByText(/database could not be opened/),
+    ).toBeInTheDocument();
+    expect(screen.getByTestId("org-sidecar-gate")).toBeInTheDocument();
+  });
+
   it("falls back to the host org-ui workspace when identity status fails", async () => {
     vi.mocked(orgModuleApi.identityStatus).mockRejectedValue(
       new Error("organization identity unavailable"),
diff --git a/dashboard/src/pages/Organization/OrganizationEntry.tsx b/dashboard/src/pages/Organization/OrganizationEntry.tsx
index 4e52b92d..704a7fc3 100644
--- a/dashboard/src/pages/Organization/OrganizationEntry.tsx
+++ b/dashboard/src/pages/Organization/OrganizationEntry.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Navigate } from "react-router-dom";
 import { Spin } from "antd";
 import { orgModuleApi } from "../../api/modules/orgModule";
@@ -28,7 +28,8 @@ export default function OrganizationEntry() {
   const [livezOk, setLivezOk] = useState(false);
   const [probed, setProbed] = useState(false);
   const [restarting, setRestarting] = useState(false);
-  const [autoTried, setAutoTried] = useState(false);
+  const autoTried = useRef(false);
+  const [startError, setStartError] = useState("");
 
   useEffect(() => {
     let active = true;
@@ -68,34 +69,40 @@ export default function OrganizationEntry() {
   }, [embed]);
 
   useEffect(() => {
-    if (!embed || !probed || livezOk || autoTried) return;
-    setAutoTried(true);
+    if (!embed || !probed || livezOk || autoTried.current) return;
+    autoTried.current = true;
     setRestarting(true);
-    let active = true;
+    setStartError("");
     void orgModuleApi
       .startSidecar()
-      .then(() => orgModuleApi.probeLivez())
-      .then((result) => {
-        if (active) setLivezOk(Boolean(result.reachable));
+      .then(async (start) => {
+        const result = await orgModuleApi.probeLivez();
+        setLivezOk(Boolean(result.reachable));
+        if (!result.reachable)
+          setStartError(start.detail || result.detail || "");
       })
-      .catch(() => {
-        if (active) setLivezOk(false);
+      .catch((error: unknown) => {
+        setLivezOk(false);
+        setStartError(error instanceof Error ? error.message : String(error));
       })
-      .finally(() => {
-        if (active) setRestarting(false);
-      });
-    return () => {
-      active = false;
-    };
-  }, [embed, probed, livezOk, autoTried]);
+      .finally(() => setRestarting(false));
+  }, [embed, probed, livezOk]);
 
   const onRestart = () => {
     setRestarting(true);
+    setStartError("");
     void orgModuleApi
       .restartSidecar()
-      .then(() => orgModuleApi.probeLivez())
-      .then((result) => setLivezOk(Boolean(result.reachable)))
-      .catch(() => setLivezOk(false))
+      .then(async (restart) => {
+        const result = await orgModuleApi.probeLivez();
+        setLivezOk(Boolean(result.reachable));
+        if (!result.reachable)
+          setStartError(restart.detail || result.detail || "");
+      })
+      .catch((error: unknown) => {
+        setLivezOk(false);
+        setStartError(error instanceof Error ? error.message : String(error));
+      })
       .finally(() => setRestarting(false));
   };
 
@@ -118,6 +125,7 @@ export default function OrganizationEntry() {
     return (
       <OrgRestartOverlay
         mode={gate === "restarting" ? "restarting" : "needsRestart"}
+        error={startError}
         onRestart={onRestart}
       />
     );
diff --git a/desktop/README.md b/desktop/README.md
index 9e5726aa..9513b7c1 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -147,7 +147,7 @@ opt into `SHIP_OPENXYOS_RUNTIME=1`):
 make -f desktop/portable/Makefile green
 ```
 
-The managed Node sidecar is included in the 0.0.4 desktop release so the
+The managed Node sidecar is included in the 0.0.6 desktop release so the
 integrated Organization workspace works in an offline installation. Set
 `SKIP_ORG_SIDECAR=1` only for an explicitly slim, host-only development build.
 
diff --git a/desktop/src/build/config.yml b/desktop/src/build/config.yml
index d8d2cc63..5cb28f52 100644
--- a/desktop/src/build/config.yml
+++ b/desktop/src/build/config.yml
@@ -11,7 +11,7 @@ info:
   description: "FreeOS desktop — Python host with in-host organization"
   copyright: "(c) 2026, XYAI Studio"
   comments: "Wails v3 + green portable. Node sidecar optional via FREEOS_ORG_SIDECAR=1."
-  version: "0.0.4"
+  version: "0.0.6"
 
 dev_mode:
   root_path: .
diff --git a/desktop/src/build/windows/info.json b/desktop/src/build/windows/info.json
index 9446f255..cde3e291 100644
--- a/desktop/src/build/windows/info.json
+++ b/desktop/src/build/windows/info.json
@@ -1,10 +1,10 @@
 {
   "fixed": {
-    "file_version": "0.0.4"
+    "file_version": "0.0.6"
   },
   "info": {
     "0000": {
-      "ProductVersion": "0.0.4",
+      "ProductVersion": "0.0.6",
       "CompanyName": "XYAI Studio",
       "FileDescription": "FreeOS desktop",
       "LegalCopyright": "Copyright © 2026 XYAI Studio",
diff --git a/desktop/src/desktop_log.go b/desktop/src/desktop_log.go
index d344bd36..5ef8d627 100644
--- a/desktop/src/desktop_log.go
+++ b/desktop/src/desktop_log.go
@@ -32,21 +32,22 @@ func processLogPath(name string) string {
 	return filepath.Join(desktopLogDir(), name+".log")
 }
 
-func initDesktopLog() {
+func initDesktopLog() *os.File {
 	if err := os.MkdirAll(desktopLogDir(), 0o755); err != nil {
 		log.SetOutput(os.Stderr)
 		log.Printf("desktop log dir: %v", err)
-		return
+		return nil
 	}
 	f, err := os.OpenFile(desktopLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o644)
 	if err != nil {
 		log.SetOutput(os.Stderr)
 		log.Printf("desktop log file: %v", err)
-		return
+		return nil
 	}
 	log.SetOutput(io.MultiWriter(f, os.Stderr))
 	log.SetFlags(log.LstdFlags | log.Lmicroseconds)
 	log.Printf("desktop log %s", desktopLogPath())
+	return f
 }
 
 func attachProcessLogFile(name string) (*os.File, error) {
diff --git a/desktop/src/desktop_log_test.go b/desktop/src/desktop_log_test.go
index 2945de05..d2854fcc 100644
--- a/desktop/src/desktop_log_test.go
+++ b/desktop/src/desktop_log_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"log"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -25,7 +26,15 @@ func TestInitDesktopLogWritesFile(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("FREEOS_HOME", home)
 	t.Setenv("OCTOP_HOME", "")
-	initDesktopLog()
+	writer, flags := log.Writer(), log.Flags()
+	logFile := initDesktopLog()
+	t.Cleanup(func() {
+		log.SetOutput(writer)
+		log.SetFlags(flags)
+		if logFile != nil {
+			logFile.Close()
+		}
+	})
 	data, err := os.ReadFile(desktopLogPath())
 	if err != nil {
 		t.Fatal(err)
diff --git a/desktop/src/download.go b/desktop/src/download.go
index 83a68869..a19732b2 100644
--- a/desktop/src/download.go
+++ b/desktop/src/download.go
@@ -569,17 +569,60 @@ func pendingPortableZip() string {
 	if err != nil {
 		return ""
 	}
-	defer reader.Close()
-	if stampFromZip(reader.File) == "" {
+	stamp := stampFromZip(reader.File)
+	archiveVersion, versionErr := versionFromZip(reader.File)
+	_ = reader.Close()
+	if stamp == "" || versionErr != nil || archiveVersion == "" {
+		rejectPendingPortable(path, "archive is missing a valid FreeOS stamp or version")
+		return ""
+	}
+	metaPath := filepath.Join(productHome(), "updates", "pending.json")
+	if data, readErr := os.ReadFile(metaPath); readErr == nil {
+		var meta struct {
+			Version string `json:"version"`
+		}
+		if json.Unmarshal(data, &meta) != nil || strings.TrimSpace(meta.Version) == "" {
+			rejectPendingPortable(path, "pending metadata is invalid")
+			return ""
+		}
+		if compareVersions(meta.Version, archiveVersion) != 0 {
+			rejectPendingPortable(path, fmt.Sprintf(
+				"release version %s does not match archive version %s",
+				meta.Version,
+				archiveVersion,
+			))
+			return ""
+		}
+	}
+	currentVersion := portableVersion(portableDir())
+	if currentVersion != "" && compareVersions(archiveVersion, currentVersion) <= 0 {
+		rejectPendingPortable(path, fmt.Sprintf(
+			"archive version %s is not newer than installed version %s",
+			archiveVersion,
+			currentVersion,
+		))
 		return ""
 	}
 	return path
 }
 
+func rejectPendingPortable(path, reason string) {
+	dir := filepath.Dir(path)
+	log.Printf("portable: rejecting pending update: %s", reason)
+	_ = os.Remove(path)
+	_ = os.Remove(filepath.Join(dir, "pending.json"))
+	_ = os.WriteFile(
+		filepath.Join(dir, "pending-rejected.txt"),
+		[]byte(time.Now().Format(time.RFC3339)+" "+reason+"\n"),
+		0o644,
+	)
+}
+
 func clearPendingPortable() {
 	dir := filepath.Join(productHome(), "updates")
 	_ = os.Remove(filepath.Join(dir, "pending-portable.zip"))
 	_ = os.Remove(filepath.Join(dir, "pending.json"))
+	_ = os.Remove(filepath.Join(dir, "pending-rejected.txt"))
 }
 
 func extractPortable(root string) error {
diff --git a/desktop/src/download_test.go b/desktop/src/download_test.go
index cbc55b64..e4e2d538 100644
--- a/desktop/src/download_test.go
+++ b/desktop/src/download_test.go
@@ -251,6 +251,47 @@ func TestEnsurePortableAppliesPendingFreeOSZip(t *testing.T) {
 	}
 }
 
+func TestEnsurePortableRejectsMislabeledPendingZip(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("OCTOP_HOME", home)
+	t.Setenv("OCTOP_DESKTOP_INSTALL_STAMP_FILE", "")
+	root := portableDir()
+
+	currentZip := filepath.Join(t.TempDir(), "current.zip")
+	writeTestGreenZipWithStamp(t, currentZip, "0.0.4", "current-build")
+	if err := unzipGreen(currentZip, root); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("OCTOP_DESKTOP_PORTABLE_ZIP", currentZip)
+	sentinel := filepath.Join(root, "keep.txt")
+	if err := os.WriteFile(sentinel, []byte("keep"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	pendingDir := filepath.Join(home, "updates")
+	if err := os.MkdirAll(pendingDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	pending := filepath.Join(pendingDir, "pending-portable.zip")
+	writeTestGreenZipWithStamp(t, pending, "0.0.4", "mislabeled-build")
+	if err := os.WriteFile(filepath.Join(pendingDir, "pending.json"), []byte(`{"version":"0.0.5"}`), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := ensurePortable(LocaleZH, func(string) {}); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := os.Stat(sentinel); err != nil {
+		t.Fatalf("rejected update must preserve the current runtime: %v", err)
+	}
+	if _, err := os.Stat(pending); !os.IsNotExist(err) {
+		t.Fatalf("rejected update zip must be removed: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(pendingDir, "pending-rejected.txt")); err != nil {
+		t.Fatalf("rejection reason must be recorded: %v", err)
+	}
+}
+
 func TestEnsurePortableReplacesOctopLineageWithFreeOS(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("OCTOP_HOME", home)
diff --git a/desktop/src/instance_windows.go b/desktop/src/instance_windows.go
index c23159b3..908574b4 100644
--- a/desktop/src/instance_windows.go
+++ b/desktop/src/instance_windows.go
@@ -34,9 +34,11 @@ var (
 	procShowWindow    = user32.NewProc("ShowWindow")
 	procSetForeground = user32.NewProc("SetForegroundWindow")
 	procIsIconic      = user32.NewProc("IsIconic")
+	procIsVisible     = user32.NewProc("IsWindowVisible")
 )
 
 const swRestore = 9
+const swShow = 5
 
 func activateExistingInstance() bool {
 	title, err := syscall.UTF16PtrFromString("FreeOS")
@@ -52,7 +54,12 @@ func activateExistingInstance() bool {
 	if iconic != 0 {
 		_, _, _ = procShowWindow.Call(hwnd, swRestore)
 	} else {
-		_, _, _ = procShowWindow.Call(hwnd, 1) // SW_SHOWNORMAL
+		_, _, _ = procShowWindow.Call(hwnd, swShow)
+	}
+	visible, _, _ := procIsVisible.Call(hwnd)
+	if visible == 0 {
+		log.Printf("FreeOS window could not be restored")
+		return false
 	}
 	_, _, _ = procSetForeground.Call(hwnd)
 	log.Printf("activated existing FreeOS window")
@@ -65,6 +72,10 @@ func otherDesktopInstanceHeld() bool {
 		return false
 	}
 	h, err := windows.CreateMutex(nil, false, name)
+	if err == windows.ERROR_ACCESS_DENIED {
+		// An elevated instance can own the mutex without granting access here.
+		return true
+	}
 	if err == windows.ERROR_ALREADY_EXISTS {
 		if desktopMutex != 0 {
 			if h != 0 && h != desktopMutex {
diff --git a/desktop/src/main.go b/desktop/src/main.go
index 81791a59..656342e8 100644
--- a/desktop/src/main.go
+++ b/desktop/src/main.go
@@ -24,25 +24,32 @@ var assets embed.FS
 const trayDoubleClick = 400 * time.Millisecond
 
 func webviewAcceptanceArgs() []string {
+	args := []string{"--disable-gpu", "--disable-gpu-compositing"}
+	if strings.EqualFold(strings.TrimSpace(os.Getenv("FREEOS_WEBVIEW_GPU")), "1") ||
+		strings.EqualFold(strings.TrimSpace(os.Getenv("FREEOS_WEBVIEW_GPU")), "true") {
+		args = nil
+	}
 	raw := strings.TrimSpace(os.Getenv("FREEOS_WEBVIEW_DEBUG_PORT"))
 	port, err := strconv.Atoi(raw)
 	if err != nil || port < 1024 || port > 65535 {
-		return nil
+		return args
 	}
-	return []string{fmt.Sprintf("--remote-debugging-port=%d", port)}
+	return append(args, fmt.Sprintf("--remote-debugging-port=%d", port))
 }
 
 // App is the Wails service bound to the shell UI.
 type App struct {
-	app            *application.App
-	window         *application.WebviewWindow
-	settingsWindow *application.WebviewWindow
-	store          *settingsStore
-	sleep          *sleepGuard
-	cmd            *exec.Cmd
-	sidecar        *exec.Cmd
-	mu             sync.Mutex
-	quitting       bool
+	app                *application.App
+	window             *application.WebviewWindow
+	settingsWindow     *application.WebviewWindow
+	store              *settingsStore
+	sleep              *sleepGuard
+	cmd                *exec.Cmd
+	sidecar            *exec.Cmd
+	mu                 sync.Mutex
+	quitting           bool
+	trayHidePending    bool
+	trayHideGeneration uint64
 
 	trayClickMu    sync.Mutex
 	lastTrayClick  time.Time
@@ -117,6 +124,10 @@ func (a *App) SaveSettings(next Settings) (Settings, error) {
 }
 
 func (a *App) ShowMain() {
+	log.Printf("ShowMain requested")
+	if a.settingsWindow != nil {
+		a.settingsWindow.Hide()
+	}
 	a.showWindow()
 }
 
@@ -289,10 +300,33 @@ func (a *App) showDashboard(base string) {
 }
 
 func (a *App) hideToTray() {
-	if a.window == nil {
+	if a.window == nil || !a.window.IsVisible() {
 		return
 	}
+	log.Printf("hideToTray: minimised=%v", a.window.IsMinimised())
+	a.mu.Lock()
+	a.trayHidePending = true
+	a.trayHideGeneration++
+	generation := a.trayHideGeneration
+	a.mu.Unlock()
 	a.window.Hide()
+	time.AfterFunc(2*time.Second, func() {
+		a.mu.Lock()
+		if a.trayHideGeneration == generation {
+			a.trayHidePending = false
+		}
+		a.mu.Unlock()
+	})
+}
+
+func (a *App) consumeTrayHideClosing() bool {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if !a.trayHidePending {
+		return false
+	}
+	a.trayHidePending = false
+	return true
 }
 
 func (a *App) showWindow() {
@@ -304,17 +338,7 @@ func (a *App) showWindow() {
 	}
 	a.window.Show()
 	a.window.Focus()
-}
-
-func (a *App) toggleMainWindow() {
-	if a.window == nil {
-		return
-	}
-	if a.window.IsVisible() && !a.window.IsMinimised() {
-		a.hideToTray()
-		return
-	}
-	a.showWindow()
+	log.Printf("showWindow: visible=%v minimised=%v", a.window.IsVisible(), a.window.IsMinimised())
 }
 
 func (a *App) onTrayLeftClick() {
@@ -327,7 +351,7 @@ func (a *App) onTrayLeftClick() {
 	now := time.Now()
 	if !a.lastTrayClick.IsZero() && now.Sub(a.lastTrayClick) < trayDoubleClick {
 		a.lastTrayClick = time.Time{}
-		go a.toggleMainWindow()
+		go a.ShowMain()
 		return
 	}
 	a.lastTrayClick = now
@@ -335,7 +359,7 @@ func (a *App) onTrayLeftClick() {
 		a.trayClickMu.Lock()
 		a.trayClickTimer = nil
 		a.trayClickMu.Unlock()
-		a.showWindow()
+		a.ShowMain()
 	})
 }
 
@@ -377,7 +401,9 @@ func main() {
 		showFatalError("FreeOS", err.Error())
 		return
 	}
-	initDesktopLog()
+	if logFile := initDesktopLog(); logFile != nil {
+		defer logFile.Close()
+	}
 	if exe, err := os.Executable(); err == nil {
 		cwd, _ := os.Getwd()
 		log.Printf("launch exe=%s cwd=%s home=%s", exe, cwd, productHome())
@@ -459,6 +485,7 @@ func main() {
 		win.Minimise()
 	})
 	app.Event.On("desktop:close", func(_ *application.CustomEvent) {
+		log.Printf("desktop:close event")
 		api.hideToTray()
 	})
 	app.Event.On("desktop:select-folder", func(_ *application.CustomEvent) {
@@ -489,6 +516,11 @@ func main() {
 	})
 
 	win.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		log.Printf("WindowClosing event")
+		if api.consumeTrayHideClosing() {
+			e.Cancel()
+			return
+		}
 		api.mu.Lock()
 		quit := api.quitting
 		api.mu.Unlock()
@@ -499,7 +531,8 @@ func main() {
 		api.hideToTray()
 	})
 	win.OnWindowEvent(events.Common.WindowMinimise, func(_ *application.WindowEvent) {
-		if api.store.get().MinimizeToTray {
+		log.Printf("WindowMinimise: minimised=%v", api.window.IsMinimised())
+		if api.store.get().MinimizeToTray && api.window.IsMinimised() {
 			api.hideToTray()
 		}
 	})
diff --git a/desktop/src/settings_home_test.go b/desktop/src/settings_home_test.go
index e1c27646..80340860 100644
--- a/desktop/src/settings_home_test.go
+++ b/desktop/src/settings_home_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 	"testing"
 )
 
@@ -112,17 +113,24 @@ func TestOrgRuntimeProvisionDefaultsOnAndCanBeDisabled(t *testing.T) {
 
 func TestWebviewAcceptanceArgsRequiresValidExplicitPort(t *testing.T) {
 	t.Setenv("FREEOS_WEBVIEW_DEBUG_PORT", "")
-	if got := webviewAcceptanceArgs(); got != nil {
-		t.Fatalf("debugging must be off by default: %v", got)
+	t.Setenv("FREEOS_WEBVIEW_GPU", "")
+	wantSafe := []string{"--disable-gpu", "--disable-gpu-compositing"}
+	if got := webviewAcceptanceArgs(); !reflect.DeepEqual(got, wantSafe) {
+		t.Fatalf("safe default args = %v, want %v", got, wantSafe)
 	}
 	t.Setenv("FREEOS_WEBVIEW_DEBUG_PORT", "9223")
 	got := webviewAcceptanceArgs()
-	if len(got) != 1 || got[0] != "--remote-debugging-port=9223" {
+	wantDebug := append(wantSafe, "--remote-debugging-port=9223")
+	if !reflect.DeepEqual(got, wantDebug) {
 		t.Fatalf("unexpected args: %v", got)
 	}
 	t.Setenv("FREEOS_WEBVIEW_DEBUG_PORT", "80")
+	if got := webviewAcceptanceArgs(); !reflect.DeepEqual(got, wantSafe) {
+		t.Fatalf("privileged or invalid port must be rejected without losing safe defaults: %v", got)
+	}
+	t.Setenv("FREEOS_WEBVIEW_GPU", "1")
 	if got := webviewAcceptanceArgs(); got != nil {
-		t.Fatalf("privileged or invalid port must be rejected: %v", got)
+		t.Fatalf("explicit GPU opt-in should remove software-rendering args: %v", got)
 	}
 }
 
diff --git a/desktop/src/tray_click_test.go b/desktop/src/tray_click_test.go
index 0aa16df3..eb6de934 100644
--- a/desktop/src/tray_click_test.go
+++ b/desktop/src/tray_click_test.go
@@ -15,3 +15,13 @@ func TestNonDarwinTrayLeftClickDoesNotShowSettings(t *testing.T) {
 		}
 	}
 }
+
+func TestTrayHideClosingIsConsumedOnce(t *testing.T) {
+	app := &App{trayHidePending: true}
+	if !app.consumeTrayHideClosing() {
+		t.Fatal("the closing event generated by hiding to tray should be consumed")
+	}
+	if app.consumeTrayHideClosing() {
+		t.Fatal("a later user close must not be mistaken for the tray-hide event")
+	}
+}
diff --git a/docs/freeos-0.0.6-code-audit-2026-09-27.md b/docs/freeos-0.0.6-code-audit-2026-09-27.md
new file mode 100644
index 00000000..ab68d04d
--- /dev/null
+++ b/docs/freeos-0.0.6-code-audit-2026-09-27.md
@@ -0,0 +1,30 @@
+# FreeOS 0.0.6 代码审计与质检（2026-09-28）
+
+审计基线为 PR #93 的 `f302486`，本轮在该分支完成组织启动、模块状态、Windows 窗口恢复、openXYOS 持久化和本机模型兼容修复。发布状态以 GitHub `v0.0.6` Release 与工作流结果为准。
+
+## 已修复问题
+
+| 优先级 | 问题 | 处理与验证 |
+| --- | --- | --- |
+| P1 | 组织页首次自动启动请求会被 React effect 清理取消，页面长期停在端口等待。 | 用 ref 管理单次启动；相关前端回归通过。 |
+| P1 | 桌面宿主与 Python 组织启动器可能同时管理 openXYOS，造成端口与进程竞争。 | Python 检测桌面托管运行时并退出重复生命周期；单元测试通过。 |
+| P1 | openXYOS 数据库直接覆写文件，读取也触发整库落盘。 | 改为临时文件原子替换；读取不再写盘；持久化测试通过。 |
+| P1 | 集成版系统设置使用了错误的模块状态组件，开关不能实时更新侧栏。 | 接回集成模块管理；实际点击关闭/开启后侧栏即时变化，刷新后状态保持。 |
+| P1 | Windows 窗口恢复后会收到隐藏操作产生的延迟关闭事件，再次被隐藏。 | 宿主标记并消费该关闭事件，托盘动作只执行显示；连续 10 轮“最小化→显示”均保持可见和焦点。 |
+| P1 | `qwen2.5vl:3b` 可正常对话，但 Ollama OpenAI 端点拒绝 tools，通用重试最终显示 `stream_error`。 | 仅在服务端明确返回“不支持 tools”时去掉工具重试；直接接口复现与新增中间件测试通过。 |
+
+## 验证门槛
+
+- Windows 桌面：`go test ./...` 通过；Wails 开发 EXE 编译通过。
+- openXYOS：数据库持久化、模块设置、类型检查、lint 和 FreeOS 集成构建通过。
+- Dashboard：Vitest、TypeScript 类型检查和生产构建通过。
+- 仓库门槛：`PYTHONUTF8=1 make all` 全绿，3,575 passed、114 skipped；Ruff 与 mypy（587 个源文件）通过。并行测试的 `DISPLAY` 前提已显式隔离。
+- Windows 实机：组织一键测试登录成功；模块开关关闭、刷新保持、重新开启均通过；窗口恢复连续 10/10 通过。
+- Windows amd64：完整便携包与 NSIS 安装器已重新生成，并包含最新 Dashboard、Python 运行时和 openXYOS 运行时。
+
+## 已知非阻断项
+
+- FastAPI OpenAPI 仍报告组织代理路由重复 Operation ID 警告，当前不影响接口调用，但后续应为代理方法生成唯一标识。
+- Windows 目录被第三方进程长期锁定时，便携运行时覆盖恢复仍依赖系统释放文件句柄；安装前应退出旧版 FreeOS。
+
+安装和升级步骤见 [FreeOS 0.0.6 安装指南](install-0.0.6.zh-CN.md)。
diff --git a/docs/install-0.0.6.zh-CN.md b/docs/install-0.0.6.zh-CN.md
new file mode 100644
index 00000000..a75020c1
--- /dev/null
+++ b/docs/install-0.0.6.zh-CN.md
@@ -0,0 +1,41 @@
+# FreeOS 0.0.6 安装指南
+
+请只从 [GitHub Releases](https://github.com/XYAIStudio/FreeOS/releases/tag/v0.0.6) 下载。文件名中的系统和架构必须与设备一致。
+
+## Windows
+
+- 常见 Intel/AMD 电脑：`FreeOS-desktop-windows-amd64-0.0.6.exe`
+- Windows ARM 电脑：`FreeOS-desktop-windows-arm64-0.0.6.exe`
+- 免安装版：选择对应架构的 `FreeOS-portable-windows-*.zip`，完整解压后运行 FreeOS。
+
+升级前退出托盘里的 FreeOS，再运行新版安装程序。安装程序保留 `~/.freeos` 中的用户数据和设置。首次启动可能需要解压本机运行时，请等待主界面出现，不要重复双击。
+
+## macOS
+
+- Apple Silicon（M1/M2/M3/M4）：`FreeOS-desktop-darwin-arm64-0.0.6.dmg`
+- Intel Mac：`FreeOS-desktop-darwin-amd64-0.0.6.dmg`
+
+打开 DMG，把 FreeOS 拖入“应用程序”。如果系统拦截首次打开，请在“系统设置 → 隐私与安全性”中允许。免安装包为对应架构的 `FreeOS-portable-darwin-*.zip`。
+
+## Linux
+
+- x86-64：`FreeOS-desktop-linux-amd64-0.0.6.tar.gz`
+- ARM64：`FreeOS-desktop-linux-arm64-0.0.6.tar.gz`
+
+解压桌面包后运行其中的 FreeOS。免安装运行时为对应架构的 `FreeOS-portable-linux-*.zip`。桌面环境需要 GTK4 与 WebKitGTK 6。
+
+## 首次使用
+
+1. FreeOS 工作室账号默认走本机注册和登录，不绑定 Octop 官方账号。
+2. 先在“模型”中配置本机 Ollama 或用户自己的云模型密钥。未配置模型时，对话页会引导设置。
+3. “组织”中的 openXYOS 是独立测试环境，有独立用户系统；可用一键测试登录进入，不与 FreeOS 工作室账号互相替代。
+4. 本机 Ollama 模型如果不支持工具调用，0.0.6 会自动退回普通对话，不再连续报 `stream_error`。
+
+## 常见问题
+
+- **组织页一直等待端口**：在组织页点击“重启前后端服务”。0.0.6 会避免桌面宿主与 Python 启动器重复拉起进程。
+- **最小化后无法恢复**：从托盘菜单点击“显示 FreeOS”；0.0.6 已修复显示后又立即隐藏的问题。
+- **模型调用失败**：先在 Ollama 中确认模型已下载并运行，再到“模型”页设为默认。云模型还需检查 API Key 与余额。
+- **诊断日志**：Windows 默认位于 `%USERPROFILE%\.freeos\logs`。提交问题时请附上问题发生时间和相关日志，移除任何密钥。
+
+卸载程序不会主动删除 `~/.freeos` 用户数据。需要彻底清理时，请先备份导出内容，再由用户自行删除该目录。
diff --git a/modules/openxyos/backend/db.ts b/modules/openxyos/backend/db.ts
index 702b168a..4bc0c5a2 100644
--- a/modules/openxyos/backend/db.ts
+++ b/modules/openxyos/backend/db.ts
@@ -14,8 +14,15 @@ export async function initDatabase(): Promise<void> {
 
   if (fs.existsSync(dbPath)) {
     const buf = fs.readFileSync(dbPath);
-    db = new SQL.Database(buf);
-    console.log("[数据库] 加载已有数据库文件");
+    if (buf.every((byte) => byte === 0)) {
+      const quarantined = `${dbPath}.zeroed-${Date.now()}.bak`;
+      fs.renameSync(dbPath, quarantined);
+      console.error(`[数据库] 全零文件已保存在 ${quarantined}，创建新数据库`);
+      db = new SQL.Database();
+    } else {
+      db = new SQL.Database(buf);
+      console.log("[数据库] 加载已有数据库文件");
+    }
   } else {
     db = new SQL.Database();
     console.log("[数据库] 创建新数据库");
@@ -521,7 +528,13 @@ export function saveDb(): void {
   if (!db) return;
   const data = db.export();
   const buffer = Buffer.from(data);
-  fs.writeFileSync(dbPath, buffer);
+  const tempPath = `${dbPath}.${process.pid}.tmp`;
+  try {
+    fs.writeFileSync(tempPath, buffer);
+    fs.renameSync(tempPath, dbPath);
+  } finally {
+    if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath);
+  }
 }
 
 // Helper: query all rows
@@ -533,7 +546,6 @@ export function dbAll(sql: string, params: any[] = []): any[] {
     rows.push(stmt.getAsObject());
   }
   stmt.free();
-  saveDb();
   return rows;
 }
 
diff --git a/modules/openxyos/frontend/src/components/Sidebar.tsx b/modules/openxyos/frontend/src/components/Sidebar.tsx
index 0c4007c2..a955a433 100644
--- a/modules/openxyos/frontend/src/components/Sidebar.tsx
+++ b/modules/openxyos/frontend/src/components/Sidebar.tsx
@@ -248,7 +248,7 @@ export default function Sidebar({
         {showText && (
           <div className="flex-1 min-w-0">
             <h1 className="text-sm font-bold text-text truncate">
-              雄元智脑XYOS
+              openXYOS
             </h1>
           </div>
         )}
diff --git a/modules/openxyos/frontend/src/pages/SettingsPage.tsx b/modules/openxyos/frontend/src/pages/SettingsPage.tsx
index 4b980d00..fe1d9267 100644
--- a/modules/openxyos/frontend/src/pages/SettingsPage.tsx
+++ b/modules/openxyos/frontend/src/pages/SettingsPage.tsx
@@ -5,7 +5,8 @@ import { authFetch } from "../api/authFetch";
 import { EXPERIENCE_MODELS } from "../llm-providers";
 import { useAuthStore } from "../stores/auth";
 import Avatar from "../components/Avatar";
-import ModuleManagementTab from "../components/OpenModuleManagementTab";
+import OpenModuleManagementTab from "../components/OpenModuleManagementTab";
+import ModuleManagementTab from "../components/ModuleManagementTab";
 import { useLocale } from "../i18n";
 
 interface CompanySettings { name: string; settings: Record<string, string>; }
@@ -241,7 +242,9 @@ export default function SettingsPage() {
             </div>
           )}
 
-          {tab === "modules" && isAdmin && user && <ModuleManagementTab currentTenantId={user.tenant_id} isSuperAdmin={isSuperAdmin} />}
+          {tab === "modules" && isAdmin && user && (import.meta.env.VITE_FREEOS_ORG_INTEGRATED === "true"
+            ? <ModuleManagementTab currentTenantId={user.tenant_id} isSuperAdmin={isSuperAdmin} />
+            : <OpenModuleManagementTab currentTenantId={user.tenant_id} isSuperAdmin={isSuperAdmin} />)}
 
           {tab === "ai" && <LLMSettingsTab />}
 
diff --git a/modules/openxyos/package.json b/modules/openxyos/package.json
index 79cba93e..9a9bf822 100644
--- a/modules/openxyos/package.json
+++ b/modules/openxyos/package.json
@@ -11,7 +11,8 @@
     "postinstall": "node scripts/patch-express-types.cjs",
     "typecheck": "tsc --noEmit",
     "lint": "eslint . --ext .ts,.tsx --max-warnings 0",
-    "test": "npm run test:runtime-config && npm run test:cors-origins && npm run test:embed-trap && npm run test:hero-mascot && npm run test:r0-access-control && npm run test:module-settings && npm run test:llm-onboarding && npm run test:agent-studio && npm run test:freeos-ingest && npm run test:file-security && npm run test:download-token && npm run test:ws-ticket && npm run test:auth-provider && npm run test:pep && npm run test:audit-bundle && npm run test:tool-gateway && npm run test:v100",
+    "test": "npm run test:db-persistence && npm run test:runtime-config && npm run test:cors-origins && npm run test:embed-trap && npm run test:hero-mascot && npm run test:r0-access-control && npm run test:module-settings && npm run test:llm-onboarding && npm run test:agent-studio && npm run test:freeos-ingest && npm run test:file-security && npm run test:download-token && npm run test:ws-ticket && npm run test:auth-provider && npm run test:pep && npm run test:audit-bundle && npm run test:tool-gateway && npm run test:v100",
+    "test:db-persistence": "tsx scripts/test-db-persistence.ts",
     "test:runtime-config": "tsx scripts/test-runtime-config.ts",
     "test:cors-origins": "tsx scripts/test-cors-origins.ts",
     "test:embed-trap": "tsx scripts/test-embed-trap.ts",
diff --git a/modules/openxyos/scripts/test-db-persistence.ts b/modules/openxyos/scripts/test-db-persistence.ts
new file mode 100644
index 00000000..250c0c7d
--- /dev/null
+++ b/modules/openxyos/scripts/test-db-persistence.ts
@@ -0,0 +1,28 @@
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+async function main() {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openxyos-db-"));
+  const dbPath = path.join(dir, "xiongyuan.db");
+  try {
+    fs.writeFileSync(dbPath, Buffer.alloc(4096));
+    process.env.DATABASE_PATH = dbPath;
+    const { initDatabase, saveDb, dbRun } = await import("../backend/db");
+    await initDatabase();
+    assert.equal(fs.readdirSync(dir).filter((name) => name.endsWith(".bak")).length, 1);
+    dbRun("CREATE TABLE IF NOT EXISTS persistence_test (value TEXT)");
+    dbRun("INSERT INTO persistence_test (value) VALUES (?)", ["saved"]);
+    saveDb();
+    assert.equal(fs.readFileSync(dbPath).subarray(0, 16).toString(), "SQLite format 3\0");
+    assert.equal(fs.readdirSync(dir).filter((name) => name.endsWith(".tmp")).length, 0);
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/modules/openxyos/scripts/test-module-settings.ts b/modules/openxyos/scripts/test-module-settings.ts
index 306e1a18..a1c22a8c 100644
--- a/modules/openxyos/scripts/test-module-settings.ts
+++ b/modules/openxyos/scripts/test-module-settings.ts
@@ -14,6 +14,7 @@ async function main() {
 
   const { initDatabase, dbRun } = await import("../backend/db");
   const { openModuleSettingsRoutes: moduleSettingsRoutes } = await import("../backend/routes/open-module-settings");
+  const { moduleSettingsRoutes: integratedModuleSettingsRoutes } = await import("../backend/routes/module-settings");
   const { signToken } = await import("../backend/middleware");
   await initDatabase();
 
@@ -32,6 +33,7 @@ async function main() {
   const app = express();
   app.use(express.json());
   app.use("/api/module-settings", moduleSettingsRoutes);
+  app.use("/api/integrated-module-settings", integratedModuleSettingsRoutes);
   const server = app.listen(0, "127.0.0.1");
   let baseUrl = "";
 
@@ -61,6 +63,16 @@ async function main() {
     assert.equal(savedBody.data.modules.find((module: any) => module.key === "employees").label, "协同成员");
     assert.equal(savedBody.data.modules.length, 12);
 
+    const integratedSaved = await request(tokens.admin, "/api/integrated-module-settings", {
+      method: "PUT",
+      body: JSON.stringify({ updates: { chat: false } }),
+    });
+    assert.equal(integratedSaved.status, 200);
+    const integratedRead = await request(tokens.user, "/api/integrated-module-settings");
+    assert.equal(integratedRead.status, 200);
+    const integratedBody = await integratedRead.json() as any;
+    assert.equal(integratedBody.data.modules.find((module: any) => module.key === "chat").enabled, false);
+
     const userWrite = await request(tokens.user, "/api/module-settings", {
       method: "PUT",
       body: JSON.stringify({ updates: { tasks: true } }),
diff --git a/pyproject.toml b/pyproject.toml
index 1ed66d90..2b226f42 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "octop"
-version = "0.0.4"
+version = "0.0.6"
 description = "FreeOS — self-hosted multi-user multi-agent assistant with an optional organization OS module (Octop-compatible package name)"
 readme = "README.md"
 license = { text = "MIT" }
diff --git a/src/octop/__init__.py b/src/octop/__init__.py
index cf42c5dd..51428754 100644
--- a/src/octop/__init__.py
+++ b/src/octop/__init__.py
@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.0.4"
+__version__ = "0.0.6"
diff --git a/src/octop/infra/agents/manager.py b/src/octop/infra/agents/manager.py
index 8e3cee32..c9d42eb9 100644
--- a/src/octop/infra/agents/manager.py
+++ b/src/octop/infra/agents/manager.py
@@ -2782,6 +2782,9 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
         from octop.infra.agents.middleware.binary_read_guard import BinaryReadGuardMiddleware
         from octop.infra.agents.middleware.browser_profile import BrowserProfileMiddleware
         from octop.infra.agents.middleware.group_mentions import GroupMentionMiddleware
+        from octop.infra.agents.middleware.ollama_tool_fallback import (
+            OllamaToolFallbackMiddleware,
+        )
         from octop.infra.agents.middleware.org_governance import OrgGovernanceMiddleware
         from octop.infra.agents.middleware.reasoning import ReasoningRequestMiddleware
         from octop.infra.agents.middleware.thread_artifacts import ThreadArtifactsMiddleware
@@ -2803,6 +2806,7 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
                 usage_repo=self._repos.usage_repo,
             ),
             ReasoningRequestMiddleware(),
+            OllamaToolFallbackMiddleware(),
             GroupMentionMiddleware(lambda: self._harness_manager),
             KnowledgeSearchHintMiddleware(),
             BrowserProfileMiddleware(),
diff --git a/src/octop/infra/agents/middleware/ollama_tool_fallback.py b/src/octop/infra/agents/middleware/ollama_tool_fallback.py
new file mode 100644
index 00000000..10fe61c1
--- /dev/null
+++ b/src/octop/infra/agents/middleware/ollama_tool_fallback.py
@@ -0,0 +1,37 @@
+"""Retry Ollama models without tools when the model rejects tool calling."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from langchain.agents.middleware import AgentMiddleware, ModelRequest, ModelResponse
+
+
+def _is_unsupported_tools_error(exc: Exception) -> bool:
+    message = str(exc).lower()
+    return "does not support tools" in message or "doesn't support tools" in message
+
+
+class OllamaToolFallbackMiddleware(AgentMiddleware[Any, Any]):
+    """Preserve chat for local models that do not implement tool calling.
+
+    Ollama's OpenAI-compatible endpoint rejects such requests with HTTP 400.
+    Retrying the same turn without tools is safe and lets vision/chat-only
+    models answer normally instead of exhausting the generic model retry loop.
+    """
+
+    async def awrap_model_call(
+        self,
+        request: ModelRequest[Any],
+        handler: Callable[[ModelRequest[Any]], Awaitable[ModelResponse[Any]]],
+    ) -> ModelResponse[Any]:
+        try:
+            return await handler(request)
+        except Exception as exc:
+            if not request.tools or not _is_unsupported_tools_error(exc):
+                raise
+            return await handler(request.override(tools=[], tool_choice=None))
+
+
+__all__ = ["OllamaToolFallbackMiddleware"]
diff --git a/src/octop/infra/setup/self_update.py b/src/octop/infra/setup/self_update.py
index 9e69d2c7..695b82ba 100644
--- a/src/octop/infra/setup/self_update.py
+++ b/src/octop/infra/setup/self_update.py
@@ -568,6 +568,14 @@ def run_upgrade(
             success=False,
             error=f"{target} is a pre-release; pass --allow-prerelease to install it",
         )
+
+    local = get_local_version()
+    if local != "0.0.0" and not is_newer(target, local):
+        return UpgradeResult(
+            success=False,
+            error=f"FreeOS {target} is not newer than the installed {local}",
+            installed_version=local,
+        )
     plat = desktop_plat()
     asset = pick_portable_asset(info.assets, plat=plat, version=target)
     if asset is None:
diff --git a/src/octop/modules/org_os/sidecar_launch.py b/src/octop/modules/org_os/sidecar_launch.py
index 2452b996..4556b33a 100644
--- a/src/octop/modules/org_os/sidecar_launch.py
+++ b/src/octop/modules/org_os/sidecar_launch.py
@@ -551,6 +551,23 @@ def start_sidecar(
             detail="sidecar already reachable",
             launcher=launcher_label,
         )
+    if os.environ.get("FREEOS_DESKTOP") == "1" and os.environ.get("OPENXYOS_BASE_URL"):
+        # The desktop host already supervises this Node process. Starting a
+        # second sidecar here would stop/race the managed process and DB writer.
+        latest = _wait_reachable(service, min(wait, 5.0))
+        return SidecarStartResult(
+            started=False,
+            already=latest.reachable,
+            reachable=latest.reachable,
+            url=latest.url,
+            command=command,
+            detail=(
+                "managed runtime reachable"
+                if latest.reachable
+                else "managed runtime is restarting; check logs/organization-runtime.log"
+            ),
+            launcher=launcher_label,
+        )
     if not sidecar_can_start():
         return SidecarStartResult(
             started=False,
@@ -629,7 +646,9 @@ def _wait_until_down(service: OrgModuleService, wait: float = 8.0) -> None:
 
 
 def restart_sidecar(service: OrgModuleService, *, wait: float = 45.0) -> SidecarStartResult:
-    """Stop the live openXYOS Node, then start FE+BE again and wait for livez."""
+    """Restart standalone sidecar; defer to the desktop supervisor when managed."""
+    if os.environ.get("FREEOS_DESKTOP") == "1" and os.environ.get("OPENXYOS_BASE_URL"):
+        return start_sidecar(service, wait=wait)
     root = sidecar_runtime_root()
     if root is not None:
         heal_openxyos_layout(root)
diff --git a/tests/unit/agents/test_ollama_tool_fallback.py b/tests/unit/agents/test_ollama_tool_fallback.py
new file mode 100644
index 00000000..b39885b1
--- /dev/null
+++ b/tests/unit/agents/test_ollama_tool_fallback.py
@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+from typing import Any
+from unittest.mock import Mock
+
+import pytest
+from langchain.agents.middleware import ModelRequest, ModelResponse
+
+from octop.infra.agents.middleware.ollama_tool_fallback import (
+    OllamaToolFallbackMiddleware,
+)
+
+
+def _request(*, tools: list[Any]) -> ModelRequest[Any]:
+    return ModelRequest(model=Mock(), messages=[], tools=tools)
+
+
+@pytest.mark.asyncio
+async def test_retries_without_tools_when_ollama_rejects_them() -> None:
+    middleware = OllamaToolFallbackMiddleware()
+    seen: list[ModelRequest[Any]] = []
+    expected = Mock(spec=ModelResponse)
+
+    async def handler(request: ModelRequest[Any]) -> ModelResponse[Any]:
+        seen.append(request)
+        if len(seen) == 1:
+            raise RuntimeError("qwen2.5vl:3b does not support tools")
+        return expected
+
+    result = await middleware.awrap_model_call(_request(tools=[Mock()]), handler)
+
+    assert result is expected
+    assert len(seen) == 2
+    assert seen[1].tools == []
+    assert seen[1].tool_choice is None
+
+
+@pytest.mark.asyncio
+async def test_does_not_hide_unrelated_model_errors() -> None:
+    middleware = OllamaToolFallbackMiddleware()
+
+    async def handler(_request: ModelRequest[Any]) -> ModelResponse[Any]:
+        raise RuntimeError("authentication failed")
+
+    with pytest.raises(RuntimeError, match="authentication failed"):
+        await middleware.awrap_model_call(_request(tools=[Mock()]), handler)
diff --git a/tests/unit/cli/test_version_cmd.py b/tests/unit/cli/test_version_cmd.py
index 0299f0e8..1885d5d7 100644
--- a/tests/unit/cli/test_version_cmd.py
+++ b/tests/unit/cli/test_version_cmd.py
@@ -13,11 +13,13 @@
 _REPO_ROOT = Path(__file__).resolve().parents[3]
 
 
-def test_product_version_is_002() -> None:
+def _declared_version() -> str:
     with (_REPO_ROOT / "pyproject.toml").open("rb") as fh:
-        declared = tomllib.load(fh)["project"]["version"]
-    assert declared == "0.0.4"
-    assert __version__ == "0.0.4"
+        return str(tomllib.load(fh)["project"]["version"])
+
+
+def test_product_version_matches_package() -> None:
+    assert __version__ == _declared_version()
 
 
 def test_version_prints_orca_version() -> None:
@@ -25,7 +27,7 @@ def test_version_prints_orca_version() -> None:
     result = runner.invoke(cli, ["version"])
     assert result.exit_code == 0
     assert "octop" in result.output.lower()
-    assert "0.0.4" in result.output
+    assert _declared_version() in result.output
 
 
 def test_version_in_help() -> None:
@@ -39,4 +41,4 @@ def test_root_version_flag() -> None:
     result = runner.invoke(cli, ["-v"])
     assert result.exit_code == 0
     assert "octop" in result.output.lower()
-    assert "0.0.4" in result.output
+    assert _declared_version() in result.output
diff --git a/tests/unit/desktop/test_capture_display.py b/tests/unit/desktop/test_capture_display.py
index 8ccfdab5..abf1a73b 100644
--- a/tests/unit/desktop/test_capture_display.py
+++ b/tests/unit/desktop/test_capture_display.py
@@ -5,7 +5,8 @@
 from octop.infra.desktop.capture import display_str, is_linux_virtual_display
 
 
-def test_display_str_defaults() -> None:
+def test_display_str_defaults(monkeypatch) -> None:
+    monkeypatch.delenv("DISPLAY", raising=False)
     assert display_str(None).startswith(":")
 
 
diff --git a/tests/unit/infra/setup/test_self_update.py b/tests/unit/infra/setup/test_self_update.py
index 79b0cf58..c9cf87e3 100644
--- a/tests/unit/infra/setup/test_self_update.py
+++ b/tests/unit/infra/setup/test_self_update.py
@@ -82,6 +82,7 @@ def test_run_upgrade_stages_freeos_portable(
     )
     monkeypatch.setattr("octop.infra.setup.self_update.fetch_release_info", lambda: info)
     monkeypatch.setattr("octop.infra.setup.self_update.desktop_plat", lambda: "linux-amd64")
+    monkeypatch.setattr("octop.infra.setup.self_update.get_local_version", lambda: "0.0.1")
     monkeypatch.setenv("FREEOS_HOME", str(tmp_path))
     monkeypatch.setenv("OCTOP_HOME", str(tmp_path))
     monkeypatch.setenv("OCTOP_DESKTOP", "1")
@@ -104,6 +105,7 @@ def test_run_upgrade_does_not_pip_install_octop(
     info = GitHubReleaseInfo(version="0.0.1", latest_stable="0.0.1", assets=[])
     monkeypatch.setattr("octop.infra.setup.self_update.fetch_release_info", lambda: info)
     monkeypatch.setattr("octop.infra.setup.self_update.desktop_plat", lambda: "linux-amd64")
+    monkeypatch.setattr("octop.infra.setup.self_update.get_local_version", lambda: "0.0.0")
     monkeypatch.setenv("FREEOS_HOME", str(tmp_path))
     monkeypatch.delenv("OCTOP_DESKTOP", raising=False)
     monkeypatch.delenv("FREEOS_DESKTOP", raising=False)
@@ -114,3 +116,31 @@ def test_run_upgrade_does_not_pip_install_octop(
     assert result.error is not None
     assert "PyPI" in result.error or "GitHub" in result.error
     assert "octop==" not in result.error
+
+
+def test_run_upgrade_rejects_same_version_before_download(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    info = GitHubReleaseInfo(
+        version="0.0.6",
+        latest_stable="0.0.6",
+        assets=[
+            ReleaseAsset(
+                name="FreeOS-portable-windows-amd64-0.0.6.zip",
+                url=(
+                    "https://github.com/XYAIStudio/FreeOS/releases/download/"
+                    "v0.0.6/FreeOS-portable-windows-amd64-0.0.6.zip"
+                ),
+            )
+        ],
+    )
+    monkeypatch.setattr("octop.infra.setup.self_update.fetch_release_info", lambda: info)
+    monkeypatch.setattr("octop.infra.setup.self_update.get_local_version", lambda: "0.0.6")
+    monkeypatch.setenv("FREEOS_HOME", str(tmp_path))
+
+    result = run_upgrade(version="0.0.6")
+
+    assert result.success is False
+    assert result.installed_version == "0.0.6"
+    assert "not newer" in (result.error or "")
+    assert not pending_portable_zip(tmp_path).exists()
diff --git a/tests/unit/test_sidecar_launch.py b/tests/unit/test_sidecar_launch.py
index b8d7b72e..6a170536 100644
--- a/tests/unit/test_sidecar_launch.py
+++ b/tests/unit/test_sidecar_launch.py
@@ -96,6 +96,33 @@ def test_start_sidecar_already_reachable(tmp_path: Path, monkeypatch: pytest.Mon
     assert result.started is False
 
 
+def test_desktop_start_does_not_spawn_second_managed_node(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    from octop.modules.org_os import sidecar_launch
+    from octop.modules.org_os.service import SidecarHealth
+
+    service = OrgModuleService(config_path=tmp_path / "config.json", home=tmp_path)
+    monkeypatch.setenv("FREEOS_DESKTOP", "1")
+    monkeypatch.setenv("OPENXYOS_BASE_URL", "http://127.0.0.1:3780")
+    monkeypatch.setattr(
+        service,
+        "probe_sidecar",
+        lambda timeout=2.0: SidecarHealth(reachable=False, url="http://127.0.0.1:3780"),
+    )
+    monkeypatch.setattr(
+        sidecar_launch, "_wait_reachable", lambda service, wait: service.probe_sidecar()
+    )
+    monkeypatch.setattr(sidecar_launch, "_spawn", lambda service: pytest.fail("duplicate spawn"))
+    monkeypatch.setattr(
+        sidecar_launch, "stop_stale_openxyos", lambda root: pytest.fail("managed Node stopped")
+    )
+
+    result = sidecar_launch.restart_sidecar(service, wait=0.1)
+    assert result.reachable is False
+    assert "managed runtime is restarting" in result.detail
+
+
 def test_start_sidecar_restarts_when_embed_blocked(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
diff --git a/uv.lock b/uv.lock
index 6f1cd805..0e814928 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2503,7 +2503,7 @@ wheels = [
 
 [[package]]
 name = "octop"
-version = "0.0.3"
+version = "0.0.6"
 source = { editable = "." }
 dependencies = [
     { name = "acme" },