Bugfix: SMB "Connect directly" login dialog shows server name

vdavid · vdavid · commit 0d84e4e7f3cc · 2026-05-15T09:52:43.000+02:00
- Add `rename_all_fields = "camelCase"` to `UpgradeResult` so `display_name`/`username_hint` ship as `displayName`/`usernameHint`. Was rendering `Sign in to "undefined/naspi"` and silently skipping the username pre-fill.
- New `ipc-enum-camelcase` check scans `specta::Type` enums with `rename_all = "camelCase"` and struct variants, flags any missing `rename_all_fields`. 4 other enums also lacked it (all single-word fields, wire-identical); fixed for consistency.
- Document the serde cascade gotcha in `apps/desktop/src/lib/ipc/CLAUDE.md` § Type shape constraints.
- Drop the misleading "wire format is camelCase" comment in `networking.ts`; re-export `UpgradeResult` from typed bindings instead of duplicating it.
- Regen `bindings.ts`.
diff --git a/apps/desktop/src-tauri/src/file_system/listing/streaming.rs b/apps/desktop/src-tauri/src/file_system/listing/streaming.rs
@@ -24,7 +24,7 @@ use crate::file_system::watcher::start_watching;
 
 /// Status of a streaming directory listing
 #[derive(Debug, Clone, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase", tag = "status")]
+#[serde(rename_all = "camelCase", rename_all_fields = "camelCase", tag = "status")]
 pub enum ListingStatus {
     Loading,
     Ready,
diff --git a/apps/desktop/src-tauri/src/file_system/validation.rs b/apps/desktop/src-tauri/src/file_system/validation.rs
@@ -18,7 +18,7 @@ pub const MAX_PATH_BYTES: usize = 1024;
 
 /// Validation error types for filename and path checks.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, specta::Type)]
-#[serde(rename_all = "camelCase", tag = "kind")]
+#[serde(rename_all = "camelCase", rename_all_fields = "camelCase", tag = "kind")]
 pub enum ValidationError {
     /// Name is empty or whitespace-only after trimming.
     Empty,
diff --git a/apps/desktop/src-tauri/src/licensing/verification.rs b/apps/desktop/src-tauri/src/licensing/verification.rs
@@ -15,7 +15,7 @@ use tauri_plugin_store::StoreExt;
 /// Serialized with `tag = "code"` so the frontend receives `{ code: "badSignature", ... }` and
 /// can switch on the code instead of pattern-matching English error strings.
 #[derive(Debug, Clone, Serialize, specta::Type)]
-#[serde(tag = "code", rename_all = "camelCase")]
+#[serde(tag = "code", rename_all = "camelCase", rename_all_fields = "camelCase")]
 pub enum LicenseActivationError {
     /// Key doesn't have the expected format (no dot separator, wrong structure).
     InvalidFormat,
diff --git a/apps/desktop/src-tauri/src/network/smb_upgrade.rs b/apps/desktop/src-tauri/src/network/smb_upgrade.rs
@@ -9,7 +9,7 @@ use crate::network::get_discovered_hosts;
 
 /// Result of an SMB volume upgrade attempt.
 #[derive(serde::Serialize, specta::Type)]
-#[serde(tag = "status", rename_all = "camelCase")]
+#[serde(tag = "status", rename_all = "camelCase", rename_all_fields = "camelCase")]
 pub enum UpgradeResult {
     /// Upgrade succeeded: volume now uses direct smb2.
     Success,
diff --git a/apps/desktop/src-tauri/src/stubs/mtp.rs b/apps/desktop/src-tauri/src/stubs/mtp.rs
@@ -40,7 +40,7 @@ pub struct ConnectedDeviceInfo {
 
 /// Error types for MTP connection operations (stub version).
 #[derive(Debug, Clone, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase", tag = "type")]
+#[serde(rename_all = "camelCase", rename_all_fields = "camelCase", tag = "type")]
 pub enum MtpConnectionError {
     NotSupported { message: String },
 }
diff --git a/apps/desktop/src-tauri/src/stubs/network.rs b/apps/desktop/src-tauri/src/stubs/network.rs
@@ -345,7 +345,7 @@ pub async fn mount_network_share(
 
 /// Result of an SMB volume upgrade attempt (stub version mirrors real type).
 #[derive(serde::Serialize, specta::Type)]
-#[serde(tag = "status", rename_all = "camelCase")]
+#[serde(tag = "status", rename_all = "camelCase", rename_all_fields = "camelCase")]
 pub enum UpgradeResult {
     NetworkError { message: String },
 }
diff --git a/apps/desktop/src/lib/ipc/CLAUDE.md b/apps/desktop/src/lib/ipc/CLAUDE.md
@@ -81,6 +81,13 @@ Two patterns specta rc.24 can't handle. New code must avoid them; existing exclu
   type names in the TS output. Workaround: replace `Value` with a typed struct or enum. For genuinely free-form data
   where typing has no value, keep the call on raw `invoke()` with the standard opt-out comment (see § Excluded commands
   below). Try not to add new uses of `Value` at IPC boundaries.
+- **Internally-tagged enums with struct variants need `rename_all_fields`**: `#[serde(tag = "...", rename_all =
+  "camelCase")]` renames variant *tags* but does not cascade into the variants' fields. A `display_name: String` field
+  on a struct variant ships as `display_name` on the wire (and in `bindings.ts`), not `displayName`. Always pair the
+  enum attribute with `rename_all_fields = "camelCase"` so field names follow the convention too. Symptom when missed:
+  TS code reading `info.displayName` gets `undefined`; single-word fields (`share`, `port`) silently work, multi-word
+  fields don't. There's a guardrail check (`scripts/check/checks/ipc-enum-camelcase.go`) that flags any
+  `#[serde(tag = ..., rename_all = "camelCase")]` enum with struct variants that's missing `rename_all_fields`.
 
 ## Excluded commands
 
diff --git a/apps/desktop/src/lib/ipc/bindings.ts b/apps/desktop/src/lib/ipc/bindings.ts
@@ -2961,9 +2961,9 @@ export type UpgradeResult =
       share: string
       port: number
       // Friendly display name for the server (mDNS hostname or IP).
-      display_name: string
+      displayName: string
       // Username hint from stored credentials or the OS mount.
-      username_hint: string | null
+      usernameHint: string | null
       // Optional message explaining why credentials are needed.
       message: string | null
     }
diff --git a/apps/desktop/src/lib/tauri-commands/networking.ts b/apps/desktop/src/lib/tauri-commands/networking.ts
@@ -2,7 +2,7 @@
 
 import { listen, type UnlistenFn } from '@tauri-apps/api/event'
 import { commands } from '$lib/ipc/bindings'
-import type { MountResult, SmbCredentials } from '$lib/ipc/bindings'
+import type { MountResult, SmbCredentials, UpgradeResult } from '$lib/ipc/bindings'
 import { throwIpcError } from './ipc-types'
 import type {
   AuthOptions,
@@ -305,18 +305,7 @@ export async function mountNetworkShare(
 }
 
 /** Result of an SMB volume upgrade attempt. */
-export type UpgradeResult =
-  | { status: 'success' }
-  | {
-      status: 'credentialsNeeded'
-      server: string
-      share: string
-      port: number
-      displayName: string
-      usernameHint: string | null
-      message: string | null
-    }
-  | { status: 'networkError'; message: string }
+export type { UpgradeResult }
 
 /**
  * Upgrades an existing OS-mounted SMB volume to use a direct smb2 connection.
@@ -327,8 +316,7 @@ export type UpgradeResult =
 export async function upgradeToSmbVolume(volumeId: string): Promise<UpgradeResult> {
   const res = await commands.upgradeToSmbVolume(volumeId)
   if (res.status === 'error') throwIpcError(res.error)
-  // specta rc.24 emits snake_case for these enum fields; actual wire format is camelCase (serde rename_all).
-  return res.data as unknown as UpgradeResult
+  return res.data
 }
 
 /**
@@ -342,8 +330,7 @@ export async function upgradeToSmbVolumeWithCredentials(
 ): Promise<UpgradeResult> {
   const res = await commands.upgradeToSmbVolumeWithCredentials(volumeId, username, password, rememberInKeychain)
   if (res.status === 'error') throwIpcError(res.error)
-  // specta rc.24 emits snake_case for these enum fields; actual wire format is camelCase (serde rename_all).
-  return res.data as unknown as UpgradeResult
+  return res.data
 }
 
 /**
diff --git a/scripts/check/CLAUDE.md b/scripts/check/CLAUDE.md
@@ -200,7 +200,7 @@ before tests.
 
 | App        | Tech    | Checks                                                                                                                                                                                              |
 | ---------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Desktop    | Rust    | rustfmt, clippy, cargo-audit, cargo-deny, cargo-udeps, jscpd, log-error-macro, error-string-match, bindings-fresh, tests, integration-tests (Docker SMB), tests-linux (slow)                        |
+| Desktop    | Rust    | rustfmt, clippy, cargo-audit, cargo-deny, cargo-udeps, jscpd, log-error-macro, error-string-match, bindings-fresh, ipc-enum-camelcase, tests, integration-tests (Docker SMB), tests-linux (slow)    |
 | Desktop    | Svelte  | prettier, eslint, eslint-typecheck (slow), stylelint, css-unused, a11y-contrast, svelte-check, import-cycles, knip, type-drift, tests, e2e-linux-typecheck, e2e-linux (slow), e2e-playwright (slow) |
 | Website    | Astro   | prettier, eslint, typecheck, build, html-validate, e2e                                                                                                                                              |
 | Website    | Docker  | docker-build                                                                                                                                                                                        |
diff --git a/scripts/check/checks/desktop-rust-ipc-enum-camelcase.go b/scripts/check/checks/desktop-rust-ipc-enum-camelcase.go
@@ -0,0 +1,206 @@
+package checks
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+// RunIpcEnumCamelCase verifies that internally-tagged specta::Type enums with `rename_all = "camelCase"`
+// and struct variants also have `rename_all_fields = "camelCase"`. Without the latter, field names
+// inside struct variants ship as snake_case on the wire even though the variant tags are camelCase.
+// See apps/desktop/src/lib/ipc/CLAUDE.md "Type shape constraints" for the rationale.
+func RunIpcEnumCamelCase(ctx *CheckContext) (CheckResult, error) {
+	rustSrcDir := filepath.Join(ctx.RootDir, "apps", "desktop", "src-tauri", "src")
+
+	violations, scanned, err := scanIpcEnums(rustSrcDir)
+	if err != nil {
+		return CheckResult{}, fmt.Errorf("failed to scan Rust files: %w", err)
+	}
+
+	if len(violations) > 0 {
+		var sb strings.Builder
+		for _, v := range violations {
+			sb.WriteString(fmt.Sprintf("  %s:%d: enum `%s` has `rename_all = \"camelCase\"` and struct variants but is missing `rename_all_fields = \"camelCase\"`\n",
+				v.relPath, v.line, v.enumName))
+		}
+		return CheckResult{}, fmt.Errorf(
+			"found %d IPC %s missing `rename_all_fields = \"camelCase\"`:\n%sfix: add `rename_all_fields = \"camelCase\"` to the `#[serde(...)]` attribute and run `pnpm bindings:regen` (see `apps/desktop/src/lib/ipc/CLAUDE.md` § Type shape constraints)",
+			len(violations), Pluralize(len(violations), "enum", "enums"), sb.String(),
+		)
+	}
+
+	return Success(fmt.Sprintf(
+		"%d specta-typed %s scanned, all camelCase-renamed enums with struct variants opt into `rename_all_fields`",
+		scanned, Pluralize(scanned, "enum", "enums"),
+	)), nil
+}
+
+type ipcEnumViolation struct {
+	relPath  string
+	line     int
+	enumName string
+}
+
+// Matches enum declarations after we've found a relevant serde attribute.
+var enumDeclPattern = regexp.MustCompile(`^\s*(?:pub(?:\s*\([^)]*\))?\s+)?enum\s+(\w+)`)
+
+// Matches struct-variant lines inside an enum body: `VariantName { ... }` (open brace on same line).
+var structVariantPattern = regexp.MustCompile(`^\s*\w+\s*\{`)
+
+// Matches a bare variant name on its own line (followed by `{` on the next line).
+var bareVariantNamePattern = regexp.MustCompile(`^\s*\w+\s*$`)
+
+// Matches a `derive(...)` list that mentions `specta::Type`.
+var deriveSpectaTypePattern = regexp.MustCompile(`derive\s*\([^)]*\bspecta::Type\b`)
+
+// Captures the body of `#[serde(...)]` (single-line attributes only).
+var serdeAttrPattern = regexp.MustCompile(`#\[serde\(([^\]]*)\)\]`)
+
+func scanIpcEnums(srcDir string) ([]ipcEnumViolation, int, error) {
+	var violations []ipcEnumViolation
+	scanned := 0
+
+	err := filepath.WalkDir(srcDir, func(path string, d os.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if d.IsDir() || !strings.HasSuffix(d.Name(), ".rs") {
+			return nil
+		}
+
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		lines := strings.Split(string(data), "\n")
+
+		for i := range lines {
+			match := enumDeclPattern.FindStringSubmatch(lines[i])
+			if match == nil {
+				continue
+			}
+			enumName := match[1]
+
+			// Collect the preceding attribute block (derive + serde).
+			attrs := collectPrecedingAttributes(lines, i)
+			if !isSpectaType(attrs) {
+				continue
+			}
+			scanned++
+
+			serdeAttr := findSerdeAttribute(attrs)
+			if serdeAttr == "" {
+				continue
+			}
+			if !strings.Contains(serdeAttr, `rename_all = "camelCase"`) {
+				continue
+			}
+			if strings.Contains(serdeAttr, `rename_all_fields`) {
+				continue
+			}
+			if !enumHasStructVariant(lines, i) {
+				continue
+			}
+
+			relPath := relPathFromRoot(srcDir, path)
+			violations = append(violations, ipcEnumViolation{
+				relPath:  relPath,
+				line:     i + 1,
+				enumName: enumName,
+			})
+		}
+
+		return nil
+	})
+
+	return violations, scanned, err
+}
+
+// collectPrecedingAttributes returns the concatenated text of all `#[...]` attribute blocks
+// (single-line) immediately preceding the line at lineIdx. Stops at the first non-attribute,
+// non-blank line. Multi-line attributes are not in use anywhere relevant here.
+func collectPrecedingAttributes(lines []string, lineIdx int) string {
+	var collected []string
+	for j := lineIdx - 1; j >= 0; j-- {
+		trimmed := strings.TrimSpace(lines[j])
+		if trimmed == "" {
+			continue
+		}
+		if !strings.HasPrefix(trimmed, "#[") {
+			break
+		}
+		collected = append([]string{trimmed}, collected...)
+	}
+	return strings.Join(collected, "\n")
+}
+
+// isSpectaType returns true if the attribute block lists `specta::Type` in a `derive(...)`.
+func isSpectaType(attrs string) bool {
+	return deriveSpectaTypePattern.MatchString(attrs)
+}
+
+// findSerdeAttribute extracts the `serde(...)` attribute body from the attribute block, or "".
+func findSerdeAttribute(attrs string) string {
+	matches := serdeAttrPattern.FindStringSubmatch(attrs)
+	if matches == nil {
+		return ""
+	}
+	return matches[1]
+}
+
+// enumHasStructVariant scans forward from the enum declaration line, tracking brace depth,
+// and returns true if any variant at depth 1 is a struct variant (`Name { ... }`).
+func enumHasStructVariant(lines []string, enumLineIdx int) bool {
+	// Find the opening brace of the enum body.
+	depth := 0
+	started := false
+	for i := enumLineIdx; i < len(lines); i++ {
+		line := lines[i]
+		for _, ch := range line {
+			if ch == '{' {
+				depth++
+				started = true
+			} else if ch == '}' {
+				depth--
+				if started && depth == 0 {
+					return false
+				}
+			}
+		}
+		if !started {
+			continue
+		}
+		// At depth 1 we are between enum variants. Look for struct-variant pattern,
+		// but skip lines that are attributes or the enum declaration itself.
+		if depth == 1 && i > enumLineIdx {
+			trimmed := strings.TrimSpace(line)
+			if trimmed == "" || strings.HasPrefix(trimmed, "//") || strings.HasPrefix(trimmed, "#[") {
+				continue
+			}
+			// A struct variant has `Name {` somewhere on its line, OR `Name` followed by `{` on a later line.
+			if structVariantPattern.MatchString(line) {
+				return true
+			}
+			// Handle `VariantName` on its own line with `{` on the next.
+			if bareVariantNamePattern.MatchString(line) && i+1 < len(lines) {
+				next := strings.TrimSpace(lines[i+1])
+				if strings.HasPrefix(next, "{") {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+func relPathFromRoot(srcDir, path string) string {
+	rootDir := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(srcDir))))
+	rel, err := filepath.Rel(rootDir, path)
+	if err != nil {
+		return path
+	}
+	return rel
+}
diff --git a/scripts/check/checks/desktop-rust-ipc-enum-camelcase_test.go b/scripts/check/checks/desktop-rust-ipc-enum-camelcase_test.go
diff --git a/scripts/check/checks/registry.go b/scripts/check/checks/registry.go

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pub struct ConnectedDeviceInfo {`
`40`	`40`
`41`	`41`	`/// Error types for MTP connection operations (stub version).`
`42`	`42`	`#[derive(Debug, Clone, Serialize, Deserialize, specta::Type)]`
`43`		`-#[serde(rename_all = "camelCase", tag = "type")]`
	`43`	`+#[serde(rename_all = "camelCase", rename_all_fields = "camelCase", tag = "type")]`
`44`	`44`	`pub enum MtpConnectionError {`
`45`	`45`	`NotSupported { message: String },`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ pub async fn mount_network_share(`
`345`	`345`
`346`	`346`	`/// Result of an SMB volume upgrade attempt (stub version mirrors real type).`
`347`	`347`	`#[derive(serde::Serialize, specta::Type)]`
`348`		`-#[serde(tag = "status", rename_all = "camelCase")]`
	`348`	`+#[serde(tag = "status", rename_all = "camelCase", rename_all_fields = "camelCase")]`
`349`	`349`	`pub enum UpgradeResult {`
`350`	`350`	`NetworkError { message: String },`
`351`	`351`	`}`