fix: improve external component permission guidance

shm11C3 · web-flow · commit 6fc5b979e7ba · 2026-06-21T21:45:57.000+09:00
Classify external component permission failures and show the elevated startup action when administrator rights are likely required. Also ensure Core creates the SQLite database file before startup migrations so clean first-run native E2E can reach the UI.
diff --git a/core/src/infrastructure/database/db.rs b/core/src/infrastructure/database/db.rs
@@ -1,7 +1,7 @@
 use std::path::{Path, PathBuf};
 use std::sync::OnceLock;
 
-use sqlx::sqlite::SqlitePool;
+use sqlx::sqlite::{SqliteConnectOptions, SqlitePool};
 
 /// Process-wide database location. Set once at App startup via [`init`]
 /// (typically `<AppData>/<bundle-id>/hv-database.db`). Core has no way
@@ -41,12 +41,52 @@ fn db_path() -> &'static Path {
 /// is intentionally out of scope for #1407 — see "Out of Scope" in the
 /// issue ("Schema redesigns or migrations.").
 pub async fn get_pool() -> Result<SqlitePool, sqlx::Error> {
-  let path = db_path();
-  if let Some(parent) = path.parent() {
+  open_pool(db_path()).await
+}
+
+async fn open_pool(path: &Path) -> Result<SqlitePool, sqlx::Error> {
+  ensure_parent_dir(path).await?;
+  let options = SqliteConnectOptions::new()
+    .filename(path)
+    .create_if_missing(true);
+  SqlitePool::connect_with(options).await
+}
+
+async fn ensure_parent_dir(path: &Path) -> Result<(), sqlx::Error> {
+  if let Some(parent) = path.parent().filter(|p| !p.as_os_str().is_empty()) {
     tokio::fs::create_dir_all(parent)
       .await
       .map_err(sqlx::Error::Io)?;
   }
-  let database_url = format!("sqlite:{}", path.to_string_lossy());
-  SqlitePool::connect(&database_url).await
+  Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use tempfile::TempDir;
+
+  #[tokio::test]
+  async fn open_pool_creates_missing_database_file() {
+    let dir = TempDir::new().unwrap();
+    let db_path = dir.path().join("missing").join("hv-database.db");
+
+    assert!(!db_path.exists());
+
+    let pool = open_pool(&db_path).await.unwrap();
+    sqlx::query("CREATE TABLE smoke (id INTEGER PRIMARY KEY)")
+      .execute(&pool)
+      .await
+      .unwrap();
+    pool.close().await;
+
+    assert!(db_path.exists());
+  }
+
+  #[tokio::test]
+  async fn ensure_parent_dir_allows_filename_only_database_paths() {
+    ensure_parent_dir(Path::new("hv-database.db"))
+      .await
+      .unwrap();
+  }
 }
diff --git a/core/src/models/external_component_guidance.rs b/core/src/models/external_component_guidance.rs
@@ -89,10 +89,24 @@ impl ExternalComponentGuidanceCandidate {
 pub fn classify_external_component_reason(detail: &str) -> ExternalComponentReasonKind {
   let normalized = detail.to_ascii_lowercase();
 
-  if normalized.contains("permission denied")
-    || normalized.contains("access is denied")
-    || normalized.contains("operation not permitted")
-    || normalized.contains("administrator")
+  let permission_patterns = [
+    "permission denied",
+    "access denied",
+    "access is denied",
+    "operation not permitted",
+    "administrator",
+    "e_accessdenied",
+    "0x80070005",
+  ];
+  let windows_permission_patterns = ["os error 5"];
+
+  if permission_patterns
+    .iter()
+    .any(|pattern| normalized.contains(pattern))
+    || (cfg!(target_os = "windows")
+      && windows_permission_patterns
+        .iter()
+        .any(|pattern| normalized.contains(pattern)))
   {
     return ExternalComponentReasonKind::Permission;
   }
@@ -143,4 +157,34 @@ mod tests {
       ExternalComponentReasonKind::Missing
     );
   }
+
+  #[test]
+  fn classify_external_component_reason_treats_access_denied_as_permission() {
+    assert_eq!(
+      classify_external_component_reason("CreateFile failed: access denied"),
+      ExternalComponentReasonKind::Permission
+    );
+  }
+
+  #[test]
+  fn classify_external_component_reason_treats_hresult_as_permission() {
+    assert_eq!(
+      classify_external_component_reason("pawnio_open failed: 0x80070005"),
+      ExternalComponentReasonKind::Permission
+    );
+  }
+
+  #[test]
+  fn classify_external_component_reason_treats_os_error_5_as_windows_only() {
+    let expected = if cfg!(target_os = "windows") {
+      ExternalComponentReasonKind::Permission
+    } else {
+      ExternalComponentReasonKind::Failed
+    };
+
+    assert_eq!(
+      classify_external_component_reason("open failed: os error 5"),
+      expected
+    );
+  }
 }
diff --git a/src/components/shared/ExternalComponentGuidanceDialog.test.tsx b/src/components/shared/ExternalComponentGuidanceDialog.test.tsx
@@ -0,0 +1,109 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import "@/lib/i18n";
+import type { ExternalComponentGuidanceCandidate } from "@/rspc/bindings";
+import { ExternalComponentGuidanceDialog } from "./ExternalComponentGuidanceDialog";
+
+const mocks = vi.hoisted(() => ({
+  acknowledgeExternalComponentGuidanceKey: vi.fn(),
+  deferExternalComponentGuidanceForSession: vi.fn(),
+  error: vi.fn(),
+  getExternalComponentGuidanceCandidates: vi.fn(),
+  openURL: vi.fn(),
+  platform: vi.fn(() => "windows"),
+  setElevatedStartupMode: vi.fn(),
+}));
+
+vi.mock("@tauri-apps/plugin-os", () => ({
+  platform: mocks.platform,
+}));
+
+vi.mock("@/hooks/useTauriDialog", () => ({
+  useTauriDialog: () => ({
+    error: mocks.error,
+  }),
+}));
+
+vi.mock("@/lib/openUrl", () => ({
+  openURL: mocks.openURL,
+}));
+
+vi.mock("@/rspc/bindings", () => ({
+  commands: {
+    acknowledgeExternalComponentGuidanceKey:
+      mocks.acknowledgeExternalComponentGuidanceKey,
+    deferExternalComponentGuidanceForSession:
+      mocks.deferExternalComponentGuidanceForSession,
+    getExternalComponentGuidanceCandidates:
+      mocks.getExternalComponentGuidanceCandidates,
+    setElevatedStartupMode: mocks.setElevatedStartupMode,
+  },
+}));
+
+const candidate = (
+  overrides: Partial<ExternalComponentGuidanceCandidate> = {},
+): ExternalComponentGuidanceCandidate => ({
+  key: "pawnio:cpu-package-temperature:v1",
+  component: "pawnio",
+  usage: "cpuPackageTemperature",
+  reasonKind: "permission",
+  missingSignals: ["cpu-temperature"],
+  affectedDeviceCount: null,
+  diagnosticDetail: "pawnio_open failed: 0x80070005",
+  ...overrides,
+});
+
+describe("ExternalComponentGuidanceDialog", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.platform.mockReturnValue("windows");
+    mocks.getExternalComponentGuidanceCandidates.mockResolvedValue({
+      status: "ok",
+      data: [candidate()],
+    });
+    mocks.setElevatedStartupMode.mockResolvedValue({
+      status: "ok",
+      data: null,
+    });
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  it("shows the elevated startup action instead of details for Windows permission guidance", async () => {
+    const user = userEvent.setup();
+
+    render(<ExternalComponentGuidanceDialog displayTarget="dashboard" />);
+
+    await user.click(
+      await screen.findByRole("button", {
+        name: "Restart as administrator",
+      }),
+    );
+
+    expect(screen.queryByRole("button", { name: "Open details" })).toBeNull();
+    expect(mocks.setElevatedStartupMode).toHaveBeenCalledWith(true);
+    expect(mocks.openURL).not.toHaveBeenCalled();
+  });
+
+  it("keeps the details action for permission guidance outside Windows", async () => {
+    const user = userEvent.setup();
+    mocks.platform.mockReturnValue("linux");
+
+    render(<ExternalComponentGuidanceDialog displayTarget="dashboard" />);
+
+    await user.click(
+      await screen.findByRole("button", {
+        name: "Open details",
+      }),
+    );
+
+    expect(
+      screen.queryByRole("button", { name: "Restart as administrator" }),
+    ).toBeNull();
+    expect(mocks.openURL).toHaveBeenCalledTimes(1);
+    expect(mocks.setElevatedStartupMode).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/components/shared/ExternalComponentGuidanceDialog.tsx b/src/components/shared/ExternalComponentGuidanceDialog.tsx
@@ -1,4 +1,10 @@
-import { ChevronDownIcon, ExternalLinkIcon, EyeOffIcon } from "lucide-react";
+import { platform } from "@tauri-apps/plugin-os";
+import {
+  ChevronDownIcon,
+  ExternalLinkIcon,
+  EyeOffIcon,
+  ShieldIcon,
+} from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
@@ -23,6 +29,7 @@ import { commands } from "@/rspc/bindings";
 import { isError } from "@/types/result";
 import type { SelectedDisplayType } from "@/types/ui";
 import {
+  externalComponentGuidanceActionKey,
   externalComponentGuidanceCopyKey,
   externalComponentGuidanceDocsUrl,
   externalComponentGuidanceViewForDisplayTarget,
@@ -42,6 +49,8 @@ export const ExternalComponentGuidanceDialog = ({
   const [candidates, setCandidates] = useState<
     ExternalComponentGuidanceCandidate[]
   >([]);
+  const [isEnablingElevatedStartupMode, setIsEnablingElevatedStartupMode] =
+    useState(false);
 
   const view = useMemo(
     () => externalComponentGuidanceViewForDisplayTarget(displayTarget),
@@ -90,6 +99,11 @@ export const ExternalComponentGuidanceDialog = ({
   const copyKey = candidate
     ? externalComponentGuidanceCopyKey(candidate)
     : null;
+  const actionKey = candidate
+    ? externalComponentGuidanceActionKey(candidate)
+    : null;
+  const shouldShowElevatedStartupAction =
+    candidate?.reasonKind === "permission" && platform() === "windows";
 
   const removeCandidate = (key: string) => {
     setCandidates((current) => current.filter((item) => item.key !== key));
@@ -157,7 +171,31 @@ export const ExternalComponentGuidanceDialog = ({
     }
   };
 
-  if (!candidate || !copyKey) {
+  const handleEnableElevatedStartupMode = async () => {
+    if (!candidate) return;
+
+    setIsEnablingElevatedStartupMode(true);
+    try {
+      const result = await commands.setElevatedStartupMode(true);
+      if (isError(result)) {
+        console.error(
+          "Failed to enable elevated startup mode from external component guidance:",
+          result.error,
+        );
+        await error(t("externalComponentGuidance.errors.elevatedStartupMode"));
+      }
+    } catch (err) {
+      console.error(
+        "Failed to enable elevated startup mode from external component guidance:",
+        err,
+      );
+      await error(t("externalComponentGuidance.errors.elevatedStartupMode"));
+    } finally {
+      setIsEnablingElevatedStartupMode(false);
+    }
+  };
+
+  if (!candidate || !copyKey || !actionKey) {
     return null;
   }
 
@@ -185,17 +223,29 @@ export const ExternalComponentGuidanceDialog = ({
               <GuidanceRow
                 label={t("externalComponentGuidance.labels.action")}
                 value={t(
-                  `externalComponentGuidance.candidates.${copyKey}.action`,
+                  `externalComponentGuidance.candidates.${copyKey}.${actionKey}`,
                 )}
               />
             </div>
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter className="gap-2">
-          <Button onClick={handleOpenDetails} type="button" variant="outline">
-            <ExternalLinkIcon className="size-4" />
-            {t("externalComponentGuidance.actions.openDetails")}
-          </Button>
+          {shouldShowElevatedStartupAction ? (
+            <Button
+              disabled={isEnablingElevatedStartupMode}
+              onClick={() => void handleEnableElevatedStartupMode()}
+              type="button"
+              variant="outline"
+            >
+              <ShieldIcon className="size-4" />
+              {t("externalComponentGuidance.actions.enableElevatedStartupMode")}
+            </Button>
+          ) : (
+            <Button onClick={handleOpenDetails} type="button" variant="outline">
+              <ExternalLinkIcon className="size-4" />
+              {t("externalComponentGuidance.actions.openDetails")}
+            </Button>
+          )}
           <DropdownMenu modal={false}>
             <DropdownMenuTrigger asChild>
               <Button type="button" variant="secondary">
diff --git a/src/components/shared/externalComponentGuidance.test.ts b/src/components/shared/externalComponentGuidance.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import type { ExternalComponentGuidanceCandidate } from "@/rspc/bindings";
 import {
+  externalComponentGuidanceActionKey,
   externalComponentGuidanceCopyKey,
   externalComponentGuidanceDocsBaseUrl,
   externalComponentGuidanceDocsUrl,
@@ -51,6 +52,18 @@ describe("externalComponentGuidance", () => {
     expect(externalComponentGuidanceDocsUrl(smartctl)).toContain("#smartctl");
   });
 
+  it("uses permission action copy for permission failures", () => {
+    const missing = candidate("pawnio:cpu-package-temperature:v1");
+    const permission = candidate("pawnio:cpu-package-temperature:v1", {
+      reasonKind: "permission",
+    });
+
+    expect(externalComponentGuidanceActionKey(missing)).toBe("action");
+    expect(externalComponentGuidanceActionKey(permission)).toBe(
+      "permissionAction",
+    );
+  });
+
   it("uses Japanese docs URLs for Japanese UI languages", () => {
     const pawnio = candidate("pawnio:cpu-package-temperature:v1");
 
diff --git a/src/components/shared/externalComponentGuidance.ts b/src/components/shared/externalComponentGuidance.ts
@@ -20,6 +20,8 @@ type ExternalComponentGuidanceCopyKey =
   | "smartctlStorageHealth"
   | "generic";
 
+type ExternalComponentGuidanceActionKey = "action" | "permissionAction";
+
 const EXTERNAL_COMPONENT_COPY_KEYS: Record<
   string,
   ExternalComponentGuidanceCopyKey
@@ -46,6 +48,11 @@ export const externalComponentGuidanceCopyKey = (
 ): ExternalComponentGuidanceCopyKey =>
   EXTERNAL_COMPONENT_COPY_KEYS[candidate.key] ?? "generic";
 
+export const externalComponentGuidanceActionKey = (
+  candidate: ExternalComponentGuidanceCandidate,
+): ExternalComponentGuidanceActionKey =>
+  candidate.reasonKind === "permission" ? "permissionAction" : "action";
+
 export const externalComponentGuidanceDocsBaseUrl = (
   language?: string | null,
 ) =>
diff --git a/src/lang/en.json b/src/lang/en.json
diff --git a/src/lang/ja.json b/src/lang/ja.json
diff --git a/src/lang/ru.json b/src/lang/ru.json
