Merge branch 'develop' into command-redesign

Cargo.lock

@@ -211,10 +211,12 @@ dependencies = [
  "anyhow",
  "cocoa 0.25.0",
  "core-foundation 0.9.4",
+ "env_logger",
  "glob",
  "image",
  "ini",
  "lnk",
+ "log",
  "objc",
  "parselnk",
  "plist",
@@ -2251,6 +2253,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "epoll"
 version = "4.3.3"
@@ -3261,6 +3276,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.14.31"
@@ -3683,6 +3704,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is-terminal"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
+dependencies = [
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -7873,9 +7905,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shellx"
-version = "2.0.15"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5b6b883070de00f8fd5025aa5b81e3b012a5a3d9f38875cdb45809c71232c"
+checksum = "1b83b29705410452dbfc85f604f3dce2b674047449060b488fcd9f3a907c25ef"
 dependencies = [
  "encoding_rs",
  "open",
@@ -8147,6 +8179,15 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thin-slice"
 version = "0.1.1"

Cargo.toml

@@ -20,7 +20,7 @@ tokio-util = "0.7.12"
 mdns-sd = "0.11.1"
 tauri-plugin-network = { path = "./vendors/tauri-plugin-network" }
 tauri-plugin-keyring = { path = "./vendors/tauri-plugin-keyring" }
-tauri-plugin-shellx = { version = "2.0.15" }
+tauri-plugin-shellx = { version = "2.0.16" }
 tauri-plugin-clipboard = "2.1.11"
 mac-security-rs = { path = "./packages/mac-security-rs" }
 log = "0.4.22"

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kksh/desktop",
-	"version": "0.1.32",
+	"version": "0.1.33",
 	"description": "",
 	"type": "module",
 	"scripts": {
@@ -41,7 +41,7 @@
 		"svelte-sonner": "^0.3.28",
 		"sveltekit-superforms": "^2.23.1",
 		"tauri-plugin-clipboard-api": "^2.1.11",
-		"tauri-plugin-shellx-api": "^2.0.15",
+		"tauri-plugin-shellx-api": "^2.0.16",
 		"tauri-plugin-user-input-api": "workspace:*",
 		"uuid": "^11.1.0"
 	},

apps/desktop/src-tauri/Cargo.toml

@@ -65,7 +65,6 @@ cocoa = "0.24.1"
 mac-security-rs = { workspace = true }
 objc = "0.2.7"
 
-
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-autostart = "2"
 tauri-plugin-cli = "2"

apps/desktop/src/lib/components/main/AppsCmds.svelte

@@ -15,7 +15,8 @@
 </script>
 
 <DraggableCommandGroup heading="Apps">
-	{#each apps.filter((app) => app.name) as app}
+	{#each apps.filter((app) => app.name) as app, idx}
+		{@const iconPath = platform === "windows" ? (app.icon_path ?? app.app_path_exe) : app.icon_path}
 		<Command.Item
 			class="flex justify-between"
 			onSelect={async () => {
@@ -39,14 +40,14 @@
 				await getCurrentWindow().hide()
 				appState.clearSearchTerm()
 			}}
-			value={app.app_desktop_path}
+			value={`app:${idx}:${app.app_desktop_path}`}
 		>
 			<span class="flex gap-2">
 				<IconMultiplexer
-					icon={app.icon_path
+					icon={iconPath
 						? {
 								type: IconEnum.RemoteUrl,
-								value: convertFileSrc(app.icon_path, "appicon")
+								value: convertFileSrc(iconPath, "appicon")
 							}
 						: {
 								type: IconEnum.Iconify,
@@ -55,6 +56,7 @@
 					class="!h-5 !w-5 shrink-0"
 				/>
 				<span>{app.name}</span>
+				<!-- <span>{app.app_path_exe}</span> -->
 			</span>
 		</Command.Item>
 	{/each}

apps/desktop/src/routes/app/extension/store/+page.svelte

@@ -167,7 +167,9 @@
 				{ext}
 				installedVersion={$installedExtsMap[ext.identifier]}
 				isUpgradable={!!$upgradableExpsMap[ext.identifier]}
-				onSelect={() => {}}
+				onSelect={() => {
+					onExtItemSelected(ext)
+				}}
 				onUpgrade={() => onExtItemUpgrade(ext)}
 				onInstall={() => onExtItemInstall(ext)}
 			/>

package.json

@@ -22,7 +22,7 @@
 		"typescript": "^5.0.0",
 		"verify-package-export": "^0.0.3"
 	},
-	"packageManager": "pnpm@10.4.1",
+	"packageManager": "pnpm@9.15.2",
 	"engines": {
 		"node": ">=22"
 	},

packages/api/package.json

@@ -73,7 +73,7 @@
 		"svelte-sonner": "^0.3.28",
 		"tauri-api-adapter": "^0.3.23",
 		"tauri-plugin-network-api": "2.0.5",
-		"tauri-plugin-shellx-api": "^2.0.15",
+		"tauri-plugin-shellx-api": "^2.0.16",
 		"tauri-plugin-system-info-api": "2.0.8",
 		"valibot": "^1.0.0-beta.10"
 	},

packages/api/src/utils/path.ts

@@ -1,6 +1,7 @@
 import * as pathAPI from "@tauri-apps/api/path"
 import { BaseDirectory } from "@tauri-apps/api/path"
 import { exists, mkdir } from "@tauri-apps/plugin-fs"
+import { platform } from "@tauri-apps/plugin-os"
 import { minimatch } from "minimatch"
 import type {
 	FsPermissionScoped,
@@ -92,8 +93,12 @@ export async function matchPathAndScope(
 	scope: string,
 	extensionDir: string
 ): Promise<boolean> {
-	const translatedTarget = await translateScopeToPath(target, extensionDir)
+	let translatedTarget = await translateScopeToPath(target, extensionDir)
-	const translatedScope = await translateScopeToPath(scope, extensionDir)
+	let translatedScope = await translateScopeToPath(scope, extensionDir)
+	if (platform() === "windows") {
+		translatedTarget = translatedTarget.replaceAll("\\", "/")
+		translatedScope = translatedScope.replaceAll("\\", "/")
+	}
 	return minimatch(translatedTarget, translatedScope)
 }
 

packages/tauri-plugins/jarvis/Cargo.toml

@@ -67,6 +67,7 @@ objc = "0.2.7"
 tauri-winres = "0.1.1"
 ico = "0.3.0"
 
+
 [build-dependencies]
 tauri-plugin = { version = "2.0.3", features = ["build"] }
 tonic-build = "0.11"

packages/tauri-plugins/jarvis/src/utils/icns.rs

@@ -7,6 +7,7 @@ use std::{
     path::PathBuf,
 };
 use uuid::Uuid;
+// use windows_icons::get_icon_by_path;
 
 #[cfg(target_os = "macos")]
 use tauri_icns::{IconFamily, IconType};
@@ -94,58 +95,21 @@ pub fn load_icon(path: PathBuf) -> tauri::http::Response<Vec<u8>> {
 
 #[cfg(target_os = "windows")]
 pub fn load_icon(path: PathBuf) -> tauri::http::Response<Vec<u8>> {
-    // tauri::http::Response::builder().body(vec![]).unwrap()
+    match applications::load_icon(&path) {
-    match path.exists() {
+        Ok(icon) => {
-        true => {
+            let bytes = icon.to_png().unwrap().get_bytes().to_vec();
-            let ico_loaded = load_ico(&path);
+            println!("path: {:?} bytes: {:?}", path, bytes.len());
-            if ico_loaded.is_err() {
+            tauri::http::Response::builder()
-                let res = tauri::http::Response::builder()
+                .header("Access-Control-Allow-Origin", "*")
-                    .status(tauri::http::StatusCode::INTERNAL_SERVER_ERROR)
+                .header("Content-Type", "image/png")
-                    .body("Error loading icon".as_bytes().to_vec())
+                .body(bytes)
-                    .unwrap();
+                .unwrap()
-                return res;
-            } else {
-                let ico = ico_loaded.unwrap();
-                // write ico to random file name.png, read it and return
-                // Generate a random file name
-                let id = Uuid::new_v4();
-                let file_name = format!("{}.png", id);
-                // get temp folder
-                let temp_dir = std::env::temp_dir();
-                let file_path = temp_dir.join(file_name);
-                // Write the ico to the random file name.png
-                let file = File::create(&file_path).unwrap();
-                ico.write_png(file).unwrap();
-                // Read the file and return the bytes
-                let bytes = std::fs::read(&file_path).expect("Error reading file");
-                // Delete the file
-                std::fs::remove_file(&file_path).unwrap();
-                tauri::http::Response::builder()
-                    .header("Content-Type", "image/png")
-                    .body(bytes)
-                    .unwrap()
-            }
         }
-        false => {
+        Err(error) => tauri::http::Response::builder()
-            let res = tauri::http::Response::builder()
+            .header("Access-Control-Allow-Origin", "*")
-                .status(tauri::http::StatusCode::NOT_FOUND)
+            .status(tauri::http::StatusCode::INTERNAL_SERVER_ERROR)
-                .body("file not found".as_bytes().to_vec())
+            .body(error.to_string().as_bytes().to_vec())
-                .unwrap();
+            .unwrap(),
-            return res;
-        }
-    }
-}
-
-/// Load .ico image
-#[cfg(target_os = "windows")]
-pub fn load_ico(path: &Path) -> anyhow::Result<ico::IconImage> {
-    let file = std::fs::File::open(path)?;
-    let icon_dir = ico::IconDir::read(file)?;
-    let image = icon_dir.entries().first();
-    if let Some(image) = image {
-        Ok(image.decode()?)
-    } else {
-        Err(anyhow::anyhow!("No image found"))
     }
 }
 

packages/ui/package.json

@@ -62,7 +62,7 @@
 		"tailwind-variants": "^0.3.0",
 		"tailwindcss": "^3.4.17",
 		"tailwindcss-animate": "^1.0.7",
-		"tauri-plugin-shellx-api": "^2.0.15",
+		"tauri-plugin-shellx-api": "^2.0.16",
 		"typescript-eslint": "^8.20.0",
 		"zod": "^3.24.1"
 	},

pnpm-lock.yaml

@@ -279,8 +279,8 @@ importers:
         specifier: ^2.1.11
         version: 2.1.11(typescript@5.6.3)
       tauri-plugin-shellx-api:
-        specifier: ^2.0.15
+        specifier: ^2.0.16
-        version: 2.0.15
+        version: 2.0.16
       tauri-plugin-user-input-api:
         specifier: workspace:*
         version: link:../../vendors/tauri-plugin-user-input
@@ -335,7 +335,7 @@ importers:
         version: 8.25.0(eslint@9.21.0(jiti@2.4.0))(typescript@5.6.3)
       autoprefixer:
         specifier: ^10.4.20
-        version: 10.4.20(postcss@8.5.3)
+        version: 10.4.20(postcss@8.4.49)
       bits-ui:
         specifier: 1.0.0-next.86
         version: 1.0.0-next.86(svelte@5.20.5)
@@ -463,8 +463,8 @@ importers:
         specifier: 2.0.5
         version: 2.0.5(typescript@5.7.2)
       tauri-plugin-shellx-api:
-        specifier: ^2.0.15
+        specifier: ^2.0.16
-        version: 2.0.15
+        version: 2.0.16
       tauri-plugin-system-info-api:
         specifier: 2.0.8
         version: 2.0.8(typescript@5.7.2)
@@ -1326,8 +1326,8 @@ importers:
         specifier: ^1.0.7
         version: 1.0.7(tailwindcss@3.4.17)
       tauri-plugin-shellx-api:
-        specifier: ^2.0.15
+        specifier: ^2.0.16
-        version: 2.0.15
+        version: 2.0.16
       typescript-eslint:
         specifier: ^8.20.0
         version: 8.20.0(eslint@9.21.0(jiti@2.4.0))(typescript@5.7.3)
@@ -11069,8 +11069,8 @@ packages:
   tauri-plugin-network-api@2.0.5:
     resolution: {integrity: sha512-u7CTvmgP4Lt3fK0/mVMD/pcWlXsWenC0YYlJUE2VQCThx8VQzxSAXgyPhcg0+CT5iIoPt5mkfixMfamM8e6v/w==}
 
-  tauri-plugin-shellx-api@2.0.15:
+  tauri-plugin-shellx-api@2.0.16:
-    resolution: {integrity: sha512-MrgArTe90o/zLHbIv/x0kTtLm1tiQiEIPnvUcIwuz1pBCGn45+E0ghOgjjGMlGaA2ln6KRV213e52/Az4MqMPQ==}
+    resolution: {integrity: sha512-I6o/+IoG6++x4L5d20ciOooOeUEn0bOKvMiYhQxlv1Q3zAZPdpJKjAHJxRpZZwpR6yUY788qiQny7IbTywqLFw==}
 
   tauri-plugin-system-info-api@2.0.8:
     resolution: {integrity: sha512-EFdLXNGp6Zu9SNsZCkU+55A8027OnrVw/TQrd0oJHgfZzs4qvm1iMmSvyid4MLftt33iZDhjCzxYijaaOxeKSg==}
@@ -14231,7 +14231,7 @@ snapshots:
       minimatch: 10.0.1
       semver: 7.7.1
       tauri-api-adapter: 0.3.8(tslib@2.8.1)(typescript@5.7.3)
-      tauri-plugin-shellx-api: 2.0.15
+      tauri-plugin-shellx-api: 2.0.16
       valibot: 0.40.0(typescript@5.7.3)
       vue-sonner: 1.2.5
     transitivePeerDependencies:
@@ -18489,16 +18489,6 @@ snapshots:
       postcss: 8.5.1
       postcss-value-parser: 4.2.0
 
-  autoprefixer@10.4.20(postcss@8.5.3):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-lite: 1.0.30001676
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.1.1
-      postcss: 8.5.3
-      postcss-value-parser: 4.2.0
-
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
@@ -24136,7 +24126,7 @@ snapshots:
       shx: 0.3.4
       tauri-plugin-clipboard-api: 2.1.11(typescript@5.7.2)
       tauri-plugin-network-api: 2.0.5(typescript@5.7.2)
-      tauri-plugin-shellx-api: 2.0.15
+      tauri-plugin-shellx-api: 2.0.16
       tauri-plugin-system-info-api: 2.0.8(typescript@5.7.2)
       tsc-alias: 1.8.10
       typescript: 5.7.2
@@ -24164,7 +24154,7 @@ snapshots:
       shx: 0.3.4
       tauri-plugin-clipboard-api: 2.1.11(typescript@5.7.3)
       tauri-plugin-network-api: 2.0.5(typescript@5.7.3)
-      tauri-plugin-shellx-api: 2.0.15
+      tauri-plugin-shellx-api: 2.0.16
       tauri-plugin-system-info-api: 2.0.8(typescript@5.7.3)
       tsc-alias: 1.8.10
       typescript: 5.7.3
@@ -24207,7 +24197,7 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  tauri-plugin-shellx-api@2.0.15:
+  tauri-plugin-shellx-api@2.0.16:
     dependencies:
       '@tauri-apps/api': 2.3.0
 

vendors/applications-rs

@@ -1 +1 @@
-Subproject commit b8e85d01100d47cba226a3d65948a2ac4197fc69
+Subproject commit 04306329f02afb31a8cfc4cd67ce1f8d11d9c4b1