Merge pull request #47 from saieeshward/feat/combined-windows-msi

Feat/combined windows msi

Author: batunii

.github/workflows/release.yml

@@ -52,8 +52,8 @@ jobs:
           # retired the macos-13 (last Intel) runner image.
           - os: macos-latest
             target: x86_64-apple-darwin
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
+          # No Windows entry: Windows ships a single combined MSI (CLI + viewer)
+          # from the `desktop` job below, not a standalone CLI archive.
     steps:
       - uses: actions/checkout@v4
 
@@ -159,6 +159,29 @@ jobs:
         working-directory: app
         run: npm ci
 
+      # Windows ships ONE combined MSI: build the `clan` CLI and stage it as a
+      # Tauri sidecar so the viewer installer also installs the CLI. The
+      # Windows-only tauri.windows.conf.json picks it up via externalBin and a
+      # WiX fragment (wix/cli-path.wxs) adds the install dir to the system PATH.
+      - name: Stage CLI into viewer installer (Windows)
+        if: matrix.os == 'windows-latest'
+        shell: pwsh
+        run: |
+          cargo build -p clan-cli --release
+          New-Item -ItemType Directory -Force -Path app/src-tauri/binaries | Out-Null
+          Copy-Item target/release/clan.exe app/src-tauri/binaries/clan-x86_64-pc-windows-msvc.exe
+
+      # Linux .deb / .rpm install the `clan` CLI to /usr/bin (on PATH) alongside
+      # the viewer. tauri.linux.conf.json maps binaries/clan -> /usr/bin/clan via
+      # deb.files / rpm.files. The AppImage stays viewer-only (it can't place
+      # files on the host PATH), so the standalone CLI tarball is kept above.
+      - name: Stage CLI into Linux packages (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          cargo build -p clan-cli --release
+          mkdir -p app/src-tauri/binaries
+          cp target/release/clan app/src-tauri/binaries/clan
+
       - name: Build & publish desktop bundles
         uses: tauri-apps/tauri-action@v0
         env:

.gitignore

@@ -7,3 +7,6 @@
 target/
 target-gnu/
 Cargo.lock
+
+# CLI sidecar staged into the viewer MSI during the release build (see release.yml).
+app/src-tauri/binaries/

TODO.md

@@ -114,6 +114,10 @@ Priority order: fix blockers first, then correctness, then packaging, then optim
 - [x] Viewer: attach `.dmg`, `.msi`, `.AppImage` to GitHub Release via `tauri-action`
 - [ ] Spec: host `spec/CLAN-SPEC.md` at a versioned URL and reference from crates.io docs
 - [ ] Packages on github for download : Discuss
+- [ ] Combined Installer for all the releases
+  - [x] Windows
+  - [x] Linux
+  - [x] MacOs
 
 ### Launch announcements (drafts ready 2026-06-12, kept local until posted)
 

app/src-tauri/tauri.linux.conf.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "bundle": {
+    "linux": {
+      "deb": {
+        "files": {
+          "/usr/bin/clan": "binaries/clan"
+        }
+      },
+      "rpm": {
+        "files": {
+          "/usr/bin/clan": "binaries/clan"
+        }
+      }
+    }
+  }
+}

app/src-tauri/tauri.windows.conf.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "bundle": {
+    "targets": ["msi"],
+    "externalBin": ["binaries/clan"],
+    "windows": {
+      "wix": {
+        "fragmentPaths": ["wix/cli-path.wxs"],
+        "componentGroupRefs": ["ClanCliPath"]
+      }
+    }
+  }
+}

app/src-tauri/wix/cli-path.wxs

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Adds the viewer install directory to the system PATH so the bundled `clan`
+  CLI sidecar works from any terminal after a combined-MSI install.
+
+  Wired up in tauri.windows.conf.json:
+    bundle.externalBin                    -> ["binaries/clan"]   (puts clan.exe in INSTALLDIR)
+    bundle.windows.wix.fragmentPaths      -> ["wix/cli-path.wxs"]
+    bundle.windows.wix.componentGroupRefs -> ["ClanCliPath"]
+
+  INSTALLDIR is the directory id Tauri's WiX template installs the app into.
+  The <Environment> element is core MSI (no WiX extension required) and is
+  removed on uninstall (Permanent="no"). System="yes" writes the machine PATH,
+  which requires the per-machine elevation the Tauri MSI already performs.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <ComponentGroup Id="ClanCliPath">
+      <Component Id="ClanCliPathEnvironment" Directory="INSTALLDIR" Guid="7C9B2E14-3A6D-4F58-B1E0-9D2C4A7F8E51">
+        <Environment Id="ClanCliPathEnvVar"
+                     Name="PATH"
+                     Value="[INSTALLDIR]"
+                     Action="set"
+                     Part="last"
+                     System="yes"
+                     Permanent="no" />
+        <!-- A component needs a keypath; a PATH entry can't be one, so anchor
+             to a small HKLM marker that owns this component. -->
+        <RegistryValue Root="HKLM"
+                       Key="Software\CLAN\Viewer"
+                       Name="CliOnPath"
+                       Type="integer"
+                       Value="1"
+                       KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>