Fix Windows taskbar icon resource refresh

Root cause: changing src-tauri/icons/icon.ico did not always rebuild the native Windows resource, so target/release/cc-switch.exe and the installed exe could keep an old embedded taskbar icon even when icon.ico itself was current.

Declare icon and Tauri config files as build.rs rerun dependencies so Cargo regenerates the native resource when icons change. Regenerate taskbar/app icon assets directly from the CCSwitchMulti brand master instead of maintaining a separate hand-drawn small-icon variant, while keeping DIB-encoded small ICO frames for Windows shell compatibility.

Also extend NSIS shortcut repair and install verification to cover an optional pinned taskbar shortcut. Verified with py_compile, full export build after cargo clean, installed exe/source ico associated-icon hash match, shortcut IconLocation checks, Explorer icon cache refresh, and live taskbar screenshot.

Author: BigStrongSun

memory.md

@@ -7,6 +7,14 @@
 - `/models` 获取能力和可路由模型目录是两回事：没有 Base URL/API Key 只代表不能在线刷新模型列表，不代表不能生成路由。已有 `modelCatalog` 的 provider 应显示“已有 modelCatalog，可跳过 /models 在线读取；如需刷新再补 Base URL/API Key”，不要再写“未配置在线获取参数”这种像错误的提示。
 - 回归测试：`tests/components/CodexMultiRouterWizard.test.tsx` 覆盖 catalog-only provider 不显示旧提示，以及 `OpenAI Official Backup` 带旧 `openai_chat` metadata 时配置页展示 `Responses API` 并提示覆盖旧配置；数据层已有 `inferWizardApiFormat` 测试覆盖最终 route 保存为 `openai_responses`。
 
+## 2026-06-29 Windows Taskbar Icon Embedded Resource Root Fix
+
+- 用户再次截图反馈任务栏图标仍像白色圆团后，重新沿真实链路排查：`src-tauri/icons/icon.ico` 已更新且小帧仍是 DIB，但 `src-tauri/target/release/cc-switch.exe` 与 `%LOCALAPPDATA%\CCSwitchMulti\cc-switch.exe` 的 `ExtractAssociatedIcon()` hash 仍是旧值。根因不是安装覆盖失败，而是 Cargo/Tauri 构建复用了旧 `resource.lib`，`build.rs` 没有声明 `icons/icon.ico`/相关 PNG 为 `rerun-if-changed`。
+- 修复：`src-tauri/build.rs` 显式声明 `icons/icon.ico`、`32x32.png`、`128x128.png`、`128x128@2x.png` 和 `tauri.conf.json` 的构建依赖。修改图标后必须触发 native resource 重新生成，不能只看 `icon.ico` 文件时间。
+- 图标生成策略调整：`scripts/generate-windows-icons.py` 不再手绘一套任务栏小图；`16/24/32/48/64` 也从 `assets/brand/ccswitchmulti-codex-app-icon-1024.png` 缩放生成，保持任务栏、安装器、应用内和网站图标同一个品牌 master。ICO 小帧仍写入 32-bit DIB，保留 Windows shell 兼容性。
+- 安装链路补强：`src-tauri/nsis/installer-hooks.nsh` 继续修开始菜单/桌面快捷方式，并额外修存在时的任务栏固定项 `CCSwitchMulti.lnk`；`scripts/verify-windows-install-icon.ps1` 也检查可选任务栏固定项。
+- 验证：运行 `python scripts/generate-windows-icons.py` 和 `python -m py_compile scripts/generate-windows-icons.py`；执行 `cargo clean --manifest-path src-tauri\Cargo.toml -p cc-switch` 后重新 `scripts\export-latest-ccswitchmulti.ps1 -ReleaseRoot C:\Users\sunda\Documents\LLMservice\ccswitchmulti-iconfix-install`，确认源 `icon.ico`、`src-tauri\target\release\cc-switch.exe`、raw exe 的 associated icon hash 全部为 `3E1F633E16DBD922D6A7A4538B1450276803745DDCC20C0BE5F8AB3875A9F3E5`；静默安装后 `scripts\verify-windows-install-icon.ps1` 通过，安装目录 exe hash 与源 ico 一致，开始菜单/桌面快捷方式 `IconLocation` 均为 `%LOCALAPPDATA%\CCSwitchMulti\cc-switch.exe,0`。刷新 Explorer 图标缓存并重启安装版后，任务栏截图确认图标为暗色圆角底的新品牌图。
+
 ## 2026-06-29 Codex MultiRouter 502 Official Route Diagnosis
 
 - 用户截图里 `OpenAI Multi-Model Router` 在 `06/29 16:07` 连续出现 5 条 502，但同一时间段 `codex-router.log` 证明每次都已命中 `route_id=openai-official`，`effective_provider=codex-openai-router::route::openai-official`，`effective_endpoint=/responses`，`upstream_url=https://chatgpt.com/backend-api/codex/responses`，`responses_to_chat=false`，`auth_strategy=CodexOAuth`。因此这不是 route miss、不是官方 GPT 被错误转 Chat、也不是模型重名映射错误。

scripts/generate-windows-icons.py

@@ -7,7 +7,7 @@
 import struct
 from pathlib import Path
 
-from PIL import Image, ImageDraw, ImageFilter
+from PIL import Image
 
 
 REPO_ROOT = Path(__file__).resolve().parents[1]
@@ -16,68 +16,11 @@
 APP_ICON = REPO_ROOT / "src" / "assets" / "icons" / "app-icon.png"
 
 
-def rounded_rectangle(draw: ImageDraw.ImageDraw, box: tuple[int, int, int, int], radius: int, fill) -> None:
-    """绘制圆角矩形，统一小尺寸和大尺寸图标的背景形状。"""
-    draw.rounded_rectangle(box, radius=radius, fill=fill)
-
-
-def draw_cloud(draw: ImageDraw.ImageDraw, scale: float, offset_x: float, offset_y: float, fill: str) -> None:
-    """绘制简化云形主体，小尺寸下只保留高对比轮廓。"""
-    def p(value: float) -> int:
-        return int(round(value * scale))
-
-    ox = int(round(offset_x))
-    oy = int(round(offset_y))
-    circles = [
-        (15, 31, 25),
-        (28, 24, 29),
-        (44, 29, 27),
-        (23, 43, 26),
-        (41, 44, 26),
-    ]
-    for cx, cy, r in circles:
-        draw.ellipse((ox + p(cx - r), oy + p(cy - r), ox + p(cx + r), oy + p(cy + r)), fill=fill)
-    draw.rounded_rectangle((ox + p(12), oy + p(30), ox + p(58), oy + p(56)), radius=p(12), fill=fill)
-
-
 def draw_small_icon(size: int) -> Image.Image:
-    """生成专门给 Windows 任务栏使用的小尺寸图标，避免复杂阴影被缓存缩放成糊块。"""
-    supersample = 4
-    canvas_size = size * supersample
-    image = Image.new("RGBA", (canvas_size, canvas_size), (0, 0, 0, 0))
-    draw = ImageDraw.Draw(image)
-    s = canvas_size / 64
-
-    rounded_rectangle(
-        draw,
-        (int(4 * s), int(4 * s), int(60 * s), int(60 * s)),
-        int(14 * s),
-        (15, 22, 29, 255),
-    )
-    draw_cloud(draw, s * 0.8, 4 * s, 8 * s, "#f4fbff")
-
-    stroke = max(2, int(round(5.5 * s)))
-    dark = (15, 24, 31, 255)
-    draw.line(
-        [(int(27 * s), int(27 * s)), (int(34 * s), int(38 * s)), (int(27 * s), int(49 * s))],
-        fill=dark,
-        width=stroke,
-        joint="curve",
-    )
-    draw.line(
-        [(int(39 * s), int(43 * s)), (int(50 * s), int(43 * s))],
-        fill=dark,
-        width=max(2, int(round(4.5 * s))),
-    )
-
-    if size >= 32:
-        route_width = max(2, int(round(4 * s)))
-        draw.line([(int(48 * s), int(25 * s)), (int(58 * s), int(23 * s))], fill=(247, 216, 106, 255), width=route_width)
-        draw.line([(int(49 * s), int(34 * s)), (int(60 * s), int(34 * s))], fill=(119, 243, 208, 255), width=route_width)
-        draw.line([(int(48 * s), int(43 * s)), (int(58 * s), int(45 * s))], fill=(103, 216, 255, 255), width=route_width)
-
+    """从品牌 master 生成任务栏小尺寸图标，保持任务栏、安装器和网站图标一致。"""
+    source = Image.open(BRAND_ICON).convert("RGBA")
     resample = Image.Resampling.LANCZOS if size >= 32 else Image.Resampling.BICUBIC
-    return image.resize((size, size), resample)
+    return source.resize((size, size), resample)
 
 
 def load_large_icon(size: int) -> Image.Image:

scripts/verify-windows-install-icon.ps1

@@ -115,9 +115,11 @@ if ($sourceHash -ne $installedHash) {
 
 $startMenuLink = Join-Path $env:APPDATA "Microsoft\Windows\Start Menu\Programs\$AppName.lnk"
 $desktopLink = Join-Path $env:USERPROFILE "Desktop\$AppName.lnk"
+$taskbarLink = Join-Path $env:APPDATA "Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\$AppName.lnk"
 $shortcutResults = @(
     (Assert-ShortcutIcon -ShortcutPath $startMenuLink -ExpectedTarget $installedExe -Required $true)
     (Assert-ShortcutIcon -ShortcutPath $desktopLink -ExpectedTarget $installedExe -Required $false)
+    (Assert-ShortcutIcon -ShortcutPath $taskbarLink -ExpectedTarget $installedExe -Required $false)
 )
 
 [pscustomobject]@{

src-tauri/build.rs

@@ -1,4 +1,13 @@
 fn main() {
+    // Windows 任务栏图标最终来自 build script 生成的 native resource。
+    // Tauri 默认配置文件变化会触发构建，但 Cargo 不一定知道 icons/icon.ico
+    // 已更新；显式声明依赖，避免复用旧 resource.lib 后 exe 仍嵌旧图标。
+    println!("cargo:rerun-if-changed=icons/icon.ico");
+    println!("cargo:rerun-if-changed=icons/32x32.png");
+    println!("cargo:rerun-if-changed=icons/128x128.png");
+    println!("cargo:rerun-if-changed=icons/128x128@2x.png");
+    println!("cargo:rerun-if-changed=tauri.conf.json");
+
     tauri_build::build();
 
     // Windows: Embed Common Controls v6 manifest for test binaries