diff --git a/.gitignore b/.gitignore index ba43b497f..3f4bb5edc 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ CLAUDE.local.md # Task CLI .tasks/ + +.debug.conversations/ diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 000000000..ee114d2f1 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +rust 1.85.1 diff --git a/package-lock.json b/package-lock.json index d37d15f25..4efeeea29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,8 @@ "packages/server", "packages/app", "packages/relay", - "packages/website" + "packages/website", + "packages/desktop" ], "dependencies": { "@anthropic-ai/claude-agent-sdk": "^0.2.11" @@ -6313,6 +6314,10 @@ "resolved": "packages/app", "link": true }, + "node_modules/@paseo/desktop": { + "resolved": "packages/desktop", + "link": true + }, "node_modules/@paseo/relay": { "resolved": "packages/relay", "link": true @@ -8410,6 +8415,233 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, + "node_modules/@tauri-apps/api": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.9.1.tgz", + "integrity": "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==", + "license": "Apache-2.0 OR MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/tauri" + } + }, + "node_modules/@tauri-apps/cli": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.9.6.tgz", + "integrity": "sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw==", + "dev": true, + "license": "Apache-2.0 OR MIT", + "bin": { + "tauri": "tauri.js" + }, + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/tauri" + }, + "optionalDependencies": { + "@tauri-apps/cli-darwin-arm64": "2.9.6", + "@tauri-apps/cli-darwin-x64": "2.9.6", + "@tauri-apps/cli-linux-arm-gnueabihf": "2.9.6", + "@tauri-apps/cli-linux-arm64-gnu": "2.9.6", + "@tauri-apps/cli-linux-arm64-musl": "2.9.6", + "@tauri-apps/cli-linux-riscv64-gnu": "2.9.6", + "@tauri-apps/cli-linux-x64-gnu": "2.9.6", + "@tauri-apps/cli-linux-x64-musl": "2.9.6", + "@tauri-apps/cli-win32-arm64-msvc": "2.9.6", + "@tauri-apps/cli-win32-ia32-msvc": "2.9.6", + "@tauri-apps/cli-win32-x64-msvc": "2.9.6" + } + }, + "node_modules/@tauri-apps/cli-darwin-arm64": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.9.6.tgz", + "integrity": "sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-darwin-x64": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.9.6.tgz", + "integrity": "sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.9.6.tgz", + "integrity": "sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.9.6.tgz", + "integrity": "sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm64-musl": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.9.6.tgz", + "integrity": "sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-riscv64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.9.6.tgz", + "integrity": "sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-x64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.9.6.tgz", + "integrity": "sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-x64-musl": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.9.6.tgz", + "integrity": "sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-arm64-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.9.6.tgz", + "integrity": "sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-ia32-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.9.6.tgz", + "integrity": "sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-x64-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.9.6.tgz", + "integrity": "sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", @@ -9507,6 +9739,15 @@ "node": ">=10.0.0" } }, + "node_modules/@xterm/headless": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz", + "integrity": "sha512-5Yj1QINYCyzrZtf8OFIHi47iQtI+0qYFPHmouEfG8dHNxbZ9Tb9YGSuLcsEwj9Z+OL75GJqPyJbyoFer80a2Hw==", + "license": "MIT", + "workspaces": [ + "addons/*" + ] + }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", @@ -17994,9 +18235,7 @@ "version": "2.23.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz", "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==", - "dev": true, - "license": "MIT", - "optional": true + "license": "MIT" }, "node_modules/nanoid": { "version": "3.3.11", @@ -19886,6 +20125,20 @@ "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", "license": "MIT" }, + "node_modules/react-native-webview": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.16.0.tgz", + "integrity": "sha512-Nh13xKZWW35C0dbOskD7OX01nQQavOzHbCw9XoZmar4eXCo7AvrYJ0jlUfRVVIJzqINxHlpECYLdmAdFsl9xDA==", + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^4.0.0", + "invariant": "2.2.4" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native-worklets": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.5.1.tgz", @@ -24597,6 +24850,7 @@ "@react-navigation/elements": "^2.6.3", "@react-navigation/native": "^7.1.8", "@tanstack/react-query": "^5.90.11", + "@tauri-apps/api": "^2.9.1", "buffer": "^6.0.3", "expo": "^54.0.18", "expo-audio": "~1.0.13", @@ -24639,6 +24893,7 @@ "react-native-svg": "^15.14.0", "react-native-unistyles": "^3.0.15", "react-native-web": "~0.21.0", + "react-native-webview": "^13.16.0", "react-native-worklets": "0.5.1", "zod": "^3.23.8", "zustand": "^5.0.9" @@ -24675,6 +24930,13 @@ "url": "https://github.com/sponsors/colinhacks" } }, + "packages/desktop": { + "name": "@paseo/desktop", + "version": "1.0.0", + "devDependencies": { + "@tauri-apps/cli": "^2.9.6" + } + }, "packages/relay": { "name": "@paseo/relay", "version": "0.1.0", @@ -24706,11 +24968,13 @@ "@modelcontextprotocol/sdk": "^1.20.1", "@opencode-ai/sdk": "^1.1.12", "@openrouter/ai-sdk-provider": "^1.2.0", + "@xterm/headless": "^6.0.0", "ai": "^5.0.76", "dotenv": "^17.2.3", "express": "^4.18.2", "express-basic-auth": "^1.2.1", "mnemonic-id": "^3.2.7", + "node-pty": "^1.0.0", "openai": "^4.20.0", "pino": "^10.2.0", "pino-pretty": "^13.1.3", @@ -24931,6 +25195,16 @@ "node": ">= 0.6" } }, + "packages/server/node_modules/node-pty": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz", + "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "nan": "^2.17.0" + } + }, "packages/server/node_modules/qs": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", diff --git a/package.json b/package.json index 342728ad9..b1bc64523 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "packages/server", "packages/app", "packages/relay", - "packages/website" + "packages/website", + "packages/desktop" ], "scripts": { "dev": "NODE_ENV=development tsx packages/server/scripts/dev-runner.ts", @@ -21,6 +22,8 @@ "android:dev-release": "ANDROID_VARIANT=devRelease npm run android --workspace=@paseo/app", "ios": "npm run ios --workspace=@paseo/app", "web": "npm run web --workspace=@paseo/app", + "desktop": "npm run dev --workspace=@paseo/desktop", + "desktop:build": "npm run build --workspace=@paseo/desktop", "postinstall": "patch-package" }, "devDependencies": { diff --git a/packages/app/assets/images/favicon-dark-attention.svg b/packages/app/assets/images/favicon-dark-attention.svg index 1fdc70a29..87e684ddc 100644 --- a/packages/app/assets/images/favicon-dark-attention.svg +++ b/packages/app/assets/images/favicon-dark-attention.svg @@ -1,5 +1,5 @@ - - + + diff --git a/packages/app/assets/images/favicon-dark-running.svg b/packages/app/assets/images/favicon-dark-running.svg index f5a9a9cca..a1e4d95d4 100644 --- a/packages/app/assets/images/favicon-dark-running.svg +++ b/packages/app/assets/images/favicon-dark-running.svg @@ -1,5 +1,5 @@ - - + + diff --git a/packages/app/assets/images/favicon-dark.svg b/packages/app/assets/images/favicon-dark.svg index cc4ac3ecc..0ef308b97 100644 --- a/packages/app/assets/images/favicon-dark.svg +++ b/packages/app/assets/images/favicon-dark.svg @@ -1,4 +1,4 @@ - - + + diff --git a/packages/app/assets/images/favicon-light-attention.svg b/packages/app/assets/images/favicon-light-attention.svg index 1fdc70a29..87e684ddc 100644 --- a/packages/app/assets/images/favicon-light-attention.svg +++ b/packages/app/assets/images/favicon-light-attention.svg @@ -1,5 +1,5 @@ - - + + diff --git a/packages/app/assets/images/favicon-light-running.svg b/packages/app/assets/images/favicon-light-running.svg index f5a9a9cca..a1e4d95d4 100644 --- a/packages/app/assets/images/favicon-light-running.svg +++ b/packages/app/assets/images/favicon-light-running.svg @@ -1,5 +1,5 @@ - - + + diff --git a/packages/app/assets/images/favicon-light.svg b/packages/app/assets/images/favicon-light.svg index cc4ac3ecc..0ef308b97 100644 --- a/packages/app/assets/images/favicon-light.svg +++ b/packages/app/assets/images/favicon-light.svg @@ -1,4 +1,4 @@ - - + + diff --git a/packages/app/assets/images/icon.png b/packages/app/assets/images/icon.png index d0e4e3fe0..fcdf57e9a 100644 Binary files a/packages/app/assets/images/icon.png and b/packages/app/assets/images/icon.png differ diff --git a/packages/app/package.json b/packages/app/package.json index 08b1bd1c9..27a5dc466 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -36,6 +36,7 @@ "@react-navigation/elements": "^2.6.3", "@react-navigation/native": "^7.1.8", "@tanstack/react-query": "^5.90.11", + "@tauri-apps/api": "^2.9.1", "buffer": "^6.0.3", "expo": "^54.0.18", "expo-audio": "~1.0.13", @@ -78,6 +79,7 @@ "react-native-svg": "^15.14.0", "react-native-unistyles": "^3.0.15", "react-native-web": "~0.21.0", + "react-native-webview": "^13.16.0", "react-native-worklets": "0.5.1", "zod": "^3.23.8", "zustand": "^5.0.9" diff --git a/packages/app/src/app/_layout.tsx b/packages/app/src/app/_layout.tsx index 6d2e3428e..1ae6acd5d 100644 --- a/packages/app/src/app/_layout.tsx +++ b/packages/app/src/app/_layout.tsx @@ -28,6 +28,8 @@ import { HorizontalScrollProvider, useHorizontalScrollOptional, } from "@/contexts/horizontal-scroll-context"; +import { getIsTauriMac } from "@/constants/layout"; +import { useTrafficLightPadding } from "@/utils/tauri-window"; function QueryProvider({ children }: { children: ReactNode }) { const [queryClient] = useState( @@ -152,11 +154,17 @@ function AppContainer({ children, selectedAgentId }: AppContainerProps) { [isMobile, isOpen, windowWidth, translateX, backdropOpacity, animateToOpen, animateToClose, openAgentList, isGesturing, horizontalScroll?.isAnyScrolledRight, touchStartX] ); + // When sidebar is collapsed on desktop Tauri macOS, add left padding for traffic lights + const trafficLightPadding = useTrafficLightPadding(); + const needsTrafficLightPadding = !isMobile && !isOpen && getIsTauriMac(); + const content = ( {!isMobile && } - {children} + + {children} + {isMobile && } diff --git a/packages/app/src/app/agent/[serverId]/[agentId].tsx b/packages/app/src/app/agent/[serverId]/[agentId].tsx index 041154201..bf39ae491 100644 --- a/packages/app/src/app/agent/[serverId]/[agentId].tsx +++ b/packages/app/src/app/agent/[serverId]/[agentId].tsx @@ -30,8 +30,6 @@ import { GitBranch, Folder, RotateCcw, - Users, - ChevronRight, PlusIcon, PanelRight, } from "lucide-react-native"; @@ -51,7 +49,6 @@ import { useDaemonConnections } from "@/contexts/daemon-connections-context"; import type { ConnectionStatus } from "@/contexts/daemon-connections-context"; import { formatConnectionStatus } from "@/utils/daemons"; import { useSessionStore } from "@/stores/session-store"; -import type { Agent } from "@/stores/session-store"; import type { StreamItem } from "@/types/stream"; import { buildAgentNavigationKey, @@ -61,6 +58,7 @@ import { } from "@/utils/navigation-timing"; import { extractAgentModel } from "@/utils/extract-agent-model"; import { startPerfMonitor } from "@/utils/perf-monitor"; +import { shortenPath } from "@/utils/shorten-path"; const DROPDOWN_WIDTH = 220; const EMPTY_STREAM_ITEMS: StreamItem[] = []; @@ -294,35 +292,6 @@ function AgentScreenContent({ : undefined ); - // Select the agents Map directly - this is a stable reference that only changes when agents are added/removed - const allAgents = useSessionStore( - (state) => state.sessions[serverId]?.agents - ); - - // Derive child agents in useMemo to avoid creating new references on every store update - // This prevents infinite loops caused by useShallow not doing deep equality on object arrays - const childAgents = useMemo(() => { - if (!resolvedAgentId || !allAgents) return []; - const children: Array<{ - id: string; - title: string | null; - createdAt: Date; - status: Agent["status"]; - }> = []; - for (const [id, a] of allAgents) { - if (a.parentAgentId === resolvedAgentId) { - children.push({ - id, - title: a.title, - createdAt: a.createdAt, - status: a.status, - }); - } - } - children.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()); - return children; - }, [allAgents, resolvedAgentId]); - // Select only the specific stream tail - use stable empty array to avoid infinite loop const streamItemsRaw = useSessionStore((state) => resolvedAgentId @@ -613,20 +582,6 @@ function AgentScreenContent({ router.push({ pathname: "/", params }); }, [agent, agentModel, handleCloseMenu, router, serverId]); - const handleNavigateToChildAgent = useCallback( - (childAgentId: string) => { - handleCloseMenu(); - router.push({ - pathname: "/agent/[serverId]/[agentId]", - params: { - serverId: serverId, - agentId: childAgentId, - }, - }); - }, - [handleCloseMenu, router, serverId] - ); - if (!agent) { return ( @@ -736,7 +691,7 @@ function AgentScreenContent({ numberOfLines={2} ellipsizeMode="middle" > - {agent.cwd} + {shortenPath(agent.cwd)} @@ -784,50 +739,6 @@ function AgentScreenContent({ - {/* Sub-Agents Section */} - - - - Sub-Agents - - {childAgents.length === 0 ? ( - No sub-agents - ) : ( - 3} - > - {childAgents.map((child) => ( - handleNavigateToChildAgent(child.id)} - style={styles.menuSubAgentItem} - > - - {child.title || "Untitled Agent"} - - - {child.status === "running" ? ( - - ) : null} - - - - ))} - - )} - - - - View Changes @@ -1108,57 +1019,4 @@ const styles = StyleSheet.create((theme) => ({ color: theme.colors.foreground, fontWeight: theme.fontWeight.normal, }, - menuSubAgentsSection: { - gap: theme.spacing[2], - }, - menuSubAgentsHeader: { - flexDirection: "row", - alignItems: "center", - gap: theme.spacing[2], - paddingHorizontal: theme.spacing[3], - paddingVertical: theme.spacing[2], - }, - menuSubAgentsLabel: { - fontSize: theme.fontSize.xs, - color: theme.colors.foregroundMuted, - letterSpacing: 0.5, - textTransform: "uppercase", - }, - menuSubAgentsEmpty: { - fontSize: theme.fontSize.base, - color: theme.colors.foregroundMuted, - paddingHorizontal: theme.spacing[3], - paddingVertical: theme.spacing[3], - }, - menuSubAgentsList: { - maxHeight: (theme.spacing[2] * 2 + theme.fontSize.base) * 3, - }, - menuSubAgentsListContent: { - gap: theme.spacing[1], - }, - menuSubAgentItem: { - flexDirection: "row", - alignItems: "center", - justifyContent: "space-between", - paddingVertical: theme.spacing[3], - paddingHorizontal: theme.spacing[3], - borderRadius: theme.borderRadius.md, - }, - menuSubAgentText: { - fontSize: theme.fontSize.base, - color: theme.colors.foreground, - flex: 1, - marginRight: theme.spacing[2], - }, - menuSubAgentMeta: { - flexDirection: "row", - alignItems: "center", - gap: theme.spacing[1], - }, - menuSubAgentDot: { - width: 6, - height: 6, - borderRadius: 999, - backgroundColor: "#3b82f6", - }, })); diff --git a/packages/app/src/app/index.tsx b/packages/app/src/app/index.tsx index 09e46b23a..3ae0c8c91 100644 --- a/packages/app/src/app/index.tsx +++ b/packages/app/src/app/index.tsx @@ -106,7 +106,7 @@ export default function HomeScreen() { const resolvedModel = getParamValue(params.model); const resolvedWorkingDir = getParamValue(params.workingDir); - const initialValues = useMemo(() => { + const initialValues = useMemo((): CreateAgentInitialValues => { const values: CreateAgentInitialValues = {}; if (resolvedWorkingDir) { values.workingDir = resolvedWorkingDir; @@ -117,8 +117,12 @@ export default function HomeScreen() { if (resolvedMode) { values.modeId = resolvedMode; } + if (resolvedModel) { + values.model = resolvedModel; + } return values; - }, [resolvedMode, resolvedProvider, resolvedWorkingDir]); + }, [resolvedMode, resolvedModel, resolvedProvider, resolvedWorkingDir]); + const { selectedServerId, setSelectedServerIdFromUser, @@ -143,21 +147,6 @@ export default function HomeScreen() { isVisible: true, isCreateFlow: true, }); - const hasAppliedModelParamRef = useRef(false); - useEffect(() => { - if (!resolvedModel || hasAppliedModelParamRef.current) { - return; - } - if (availableModels.length === 0) { - return; - } - const isValidModel = availableModels.some((model) => model.id === resolvedModel); - hasAppliedModelParamRef.current = true; - if (!isValidModel) { - return; - } - setModelFromUser(resolvedModel); - }, [availableModels, resolvedModel, setModelFromUser]); const hostEntry = selectedServerId ? connectionStates.get(selectedServerId) : undefined; diff --git a/packages/app/src/app/settings.tsx b/packages/app/src/app/settings.tsx index 917291845..340777ac9 100644 --- a/packages/app/src/app/settings.tsx +++ b/packages/app/src/app/settings.tsx @@ -340,6 +340,37 @@ const styles = StyleSheet.create((theme) => ({ themeToggleTextActive: { color: theme.colors.foreground, }, + // Dev section + devCard: { + backgroundColor: theme.colors.surface2, + borderRadius: theme.borderRadius.lg, + borderWidth: 1, + borderColor: theme.colors.border, + overflow: "hidden", + }, + devButton: { + flexDirection: "row", + alignItems: "center", + gap: theme.spacing[3], + paddingVertical: theme.spacing[4], + paddingHorizontal: theme.spacing[4], + }, + devButtonBorder: { + borderTopWidth: 1, + borderTopColor: theme.colors.border, + }, + devButtonContent: { + flex: 1, + }, + devButtonTitle: { + color: theme.colors.foreground, + fontSize: theme.fontSize.base, + }, + devButtonDescription: { + color: theme.colors.foregroundMuted, + fontSize: theme.fontSize.sm, + marginTop: 2, + }, })); type DaemonTestState = { @@ -760,6 +791,24 @@ export default function SettingsScreen() { + {/* Developer */} + + Developer + + router.push("/audio-test")} + > + + Audio Test + + Test audio recording and playback + + + + + + {/* Footer */} diff --git a/packages/app/src/components/agent-input-area.tsx b/packages/app/src/components/agent-input-area.tsx index 8856717e4..529b6bfc3 100644 --- a/packages/app/src/components/agent-input-area.tsx +++ b/packages/app/src/components/agent-input-area.tsx @@ -101,10 +101,6 @@ export function AgentInputArea({ const setQueuedMessages = useSessionStore((state) => state.setQueuedMessages); - // Noop fallback for sendAgentAudio (required by MessageInput) - const noopSendAgentAudio = useCallback(async () => {}, []); - const sendAgentAudio = methods?.sendAgentAudio ?? noopSendAgentAudio; - const { startRealtime, stopRealtime, isRealtimeMode } = useRealtime(); const [internalInput, setInternalInput] = useState(""); @@ -448,52 +444,47 @@ export function AgentInputArea({ ] ); - const rightContent = ( - <> - - {isRealtimeMode ? ( - - ) : ( - - )} - - {isAgentRunning && ( - - {isCancellingAgent ? ( - - ) : ( - - )} - + const rightContent = isAgentRunning ? ( + + {isCancellingAgent ? ( + + ) : ( + )} - + + ) : ( + + {isRealtimeMode ? ( + + ) : ( + + )} + ); const leftContent = ; @@ -574,7 +565,6 @@ export function AgentInputArea({ onPickImages={handlePickImage} onRemoveImage={handleRemoveImage} client={client} - sendAgentAudio={sendAgentAudio} placeholder="Message agent..." autoFocus={autoFocus} disabled={isRealtimeMode} @@ -630,10 +620,10 @@ const styles = StyleSheet.create(((theme: Theme) => ({ backgroundColor: theme.colors.palette.blue[600], }, cancelButton: { - width: BUTTON_SIZE, - height: BUTTON_SIZE, + width: 34, + height: 34, borderRadius: theme.borderRadius.full, - backgroundColor: theme.colors.palette.red[500], + backgroundColor: theme.colors.palette.red[600], alignItems: "center", justifyContent: "center", }, diff --git a/packages/app/src/components/agent-list.tsx b/packages/app/src/components/agent-list.tsx index e4e86fa7d..d9132c510 100644 --- a/packages/app/src/components/agent-list.tsx +++ b/packages/app/src/components/agent-list.tsx @@ -11,6 +11,7 @@ import { useCallback, useState, type ReactElement } from "react"; import { router, usePathname } from "expo-router"; import { StyleSheet, useUnistyles } from "react-native-unistyles"; import { formatTimeAgo } from "@/utils/time"; +import { shortenPath } from "@/utils/shorten-path"; import { type AggregatedAgent } from "@/hooks/use-aggregated-agents"; import { useSessionStore } from "@/stores/session-store"; import { @@ -144,7 +145,7 @@ export function AgentList({ - {agent.cwd.replace(/^\/(?:Users|home)\/[^/]+/, "~")} · {timeAgo} + {shortenPath(agent.cwd)} · {timeAgo} )} diff --git a/packages/app/src/components/agent-stream-view.tsx b/packages/app/src/components/agent-stream-view.tsx index cf21c52ba..83526b410 100644 --- a/packages/app/src/components/agent-stream-view.tsx +++ b/packages/app/src/components/agent-stream-view.tsx @@ -495,12 +495,6 @@ export function AgentStreamView({ ) : null} - {showWorkingIndicator ? ( - - - - ) : null} - {hasHeadItems ? [...streamHead].reverse().map((item, index) => { const rendered = renderStreamItemContent(item, index); @@ -511,6 +505,12 @@ export function AgentStreamView({ ) : null; }) : null} + + {showWorkingIndicator ? ( + + + + ) : null} ); @@ -555,10 +555,12 @@ export function AgentStreamView({ } ListHeaderComponent={listHeaderComponent} extraData={flatListExtraData} - maintainVisibleContentPosition={{ - minIndexForVisible: 0, - autoscrollToTopThreshold: 40, - }} + maintainVisibleContentPosition={ + // Disable when streaming and user is at bottom - we handle auto-scroll ourselves + agent.status === "running" && isNearBottom + ? undefined + : { minIndexForVisible: 0, autoscrollToTopThreshold: 40 } + } initialNumToRender={12} windowSize={10} inverted @@ -777,8 +779,8 @@ function PermissionRequestCard({ }, [request]); const toolCallDisplay = useMemo( - () => parseToolCallDisplay(request.input, null), - [request.input] + () => parseToolCallDisplay(request.name ?? "unknown", request.input, null), + [request.name, request.input] ); const markdownStyles = useMemo(() => createMarkdownStyles(theme), [theme]); @@ -792,7 +794,7 @@ function PermissionRequestCard({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -806,7 +808,6 @@ function PermissionRequestCard({ {children} @@ -821,7 +822,6 @@ function PermissionRequestCard({ {node.content} @@ -833,7 +833,7 @@ function PermissionRequestCard({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -847,7 +847,6 @@ function PermissionRequestCard({ {node.content} @@ -893,7 +892,6 @@ function PermissionRequestCard({ {bullet} {children} diff --git a/packages/app/src/components/diff-viewer.tsx b/packages/app/src/components/diff-viewer.tsx index 5e8cb3b3a..629418ef1 100644 --- a/packages/app/src/components/diff-viewer.tsx +++ b/packages/app/src/components/diff-viewer.tsx @@ -117,13 +117,13 @@ const styles = StyleSheet.create((theme) => ({ backgroundColor: "rgba(46, 160, 67, 0.15)", }, addText: { - color: theme.colors.palette.green[800], + color: theme.colors.foreground, }, removeLine: { backgroundColor: "rgba(248, 81, 73, 0.1)", }, removeText: { - color: theme.colors.palette.red[800], + color: theme.colors.foreground, }, addHighlight: { backgroundColor: "rgba(46, 160, 67, 0.4)", diff --git a/packages/app/src/components/explorer-sidebar.tsx b/packages/app/src/components/explorer-sidebar.tsx index e16d9acaf..f247da106 100644 --- a/packages/app/src/components/explorer-sidebar.tsx +++ b/packages/app/src/components/explorer-sidebar.tsx @@ -14,14 +14,13 @@ import { MIN_EXPLORER_SIDEBAR_WIDTH, MAX_EXPLORER_SIDEBAR_WIDTH, type ViewMode, + type ExplorerTab, } from "@/stores/panel-store"; import { useExplorerSidebarAnimation } from "@/contexts/explorer-sidebar-animation-context"; import { HEADER_INNER_HEIGHT } from "@/constants/layout"; import { GitDiffPane } from "./git-diff-pane"; import { FileExplorerPane } from "./file-explorer-pane"; -type ExplorerTab = "changes" | "files"; - interface ExplorerSidebarProps { serverId: string; agentId: string; @@ -309,13 +308,11 @@ function SidebarContent({ {/* Content based on active tab */} - {activeTab === "changes" ? ( + {activeTab === "changes" && ( - ) : ( - + )} + {activeTab === "files" && ( + )} diff --git a/packages/app/src/components/file-explorer-pane.tsx b/packages/app/src/components/file-explorer-pane.tsx index 4617b1c66..4b685dacb 100644 --- a/packages/app/src/components/file-explorer-pane.tsx +++ b/packages/app/src/components/file-explorer-pane.tsx @@ -130,7 +130,6 @@ export function FileExplorerPane({ return sorted; }, [rawEntries, sortOption]); const showInitialListLoading = isListingLoading && entries.length === 0; - const showListLoadingBanner = isListingLoading && entries.length > 0; const isPreviewLoading = Boolean( isExplorerLoading && pendingRequest?.mode === "file" && @@ -585,14 +584,9 @@ export function FileExplorerPane({ {renderEntryIcon(displayKind, theme.colors)} - - - {item.name} - - - {formatFileSize({ size: item.size })} · {formatTimeAgo(new Date(item.modifiedAt))} - - + + {item.name} + handleOpenMenu(item, event)} @@ -642,17 +636,9 @@ export function FileExplorerPane({ - {showListLoadingBanner && ( - - - - Loading {formatDirectoryLabel(activePath)}... - - - )} ); - }, [activePath, currentSortLabel, explorerState?.history?.length, handleNavigateBack, handleSortCycle, showListLoadingBanner, theme.colors.mutedForeground]); + }, [activePath, currentSortLabel, explorerState?.history?.length, handleNavigateBack, handleSortCycle]); // Watch for completed file previews and process queue useEffect(() => { @@ -789,6 +775,15 @@ export function FileExplorerPane({ ]} onLayout={handleMenuLayout} > + + + {formatFileSize({ size: menuEntry.size })} + + + {formatTimeAgo(new Date(menuEntry.modifiedAt))} + + + { @@ -866,7 +861,7 @@ export function FileExplorerPane({ ) : ( Binary preview unavailable - + {formatFileSize({ size: preview.size })} @@ -1035,17 +1030,6 @@ const styles = StyleSheet.create((theme) => ({ fontSize: theme.fontSize.lg, color: theme.colors.foreground, }, - loadingBanner: { - flexDirection: "row", - alignItems: "center", - gap: theme.spacing[2], - paddingVertical: theme.spacing[2], - paddingHorizontal: theme.spacing[3], - }, - loadingBannerText: { - color: theme.colors.foregroundMuted, - fontSize: theme.fontSize.sm, - }, sortButton: { flexDirection: "row", alignItems: "center", @@ -1114,8 +1098,8 @@ const styles = StyleSheet.create((theme) => ({ flexDirection: "row", alignItems: "center", justifyContent: "space-between", - paddingVertical: theme.spacing[2], - paddingHorizontal: theme.spacing[3], + paddingVertical: theme.spacing[1], + paddingLeft: theme.spacing[2], borderRadius: theme.borderRadius.md, borderWidth: theme.borderWidth[1], borderColor: theme.colors.border, @@ -1128,24 +1112,16 @@ const styles = StyleSheet.create((theme) => ({ flex: 1, flexDirection: "row", alignItems: "center", - columnGap: theme.spacing[2], - marginRight: theme.spacing[3], + gap: theme.spacing[2], + minWidth: 0, }, entryIcon: { - width: 28, - alignItems: "center", - }, - entryTextContainer: { - flex: 1, + flexShrink: 0, }, entryName: { + flex: 1, color: theme.colors.foreground, - fontSize: theme.fontSize.base, - }, - entryMeta: { - color: theme.colors.foregroundMuted, - fontSize: theme.fontSize.xs, - marginTop: theme.spacing[1], + fontSize: theme.fontSize.sm, }, menuButton: { width: 36, @@ -1168,6 +1144,22 @@ const styles = StyleSheet.create((theme) => ({ backgroundColor: theme.colors.surface2, padding: theme.spacing[1], }, + entryMenuHeader: { + flexDirection: "row", + justifyContent: "space-between", + paddingVertical: theme.spacing[2], + paddingHorizontal: theme.spacing[3], + }, + entryMenuMeta: { + color: theme.colors.foregroundMuted, + fontSize: theme.fontSize.xs, + }, + entryMenuDivider: { + height: 1, + backgroundColor: theme.colors.border, + marginHorizontal: theme.spacing[2], + marginVertical: theme.spacing[1], + }, entryMenuItem: { paddingVertical: theme.spacing[2], paddingHorizontal: theme.spacing[3], diff --git a/packages/app/src/components/headers/screen-header.tsx b/packages/app/src/components/headers/screen-header.tsx index 486241e02..232d35b70 100644 --- a/packages/app/src/components/headers/screen-header.tsx +++ b/packages/app/src/components/headers/screen-header.tsx @@ -3,6 +3,7 @@ import { View, type StyleProp, type ViewStyle } from "react-native"; import { useSafeAreaInsets } from "react-native-safe-area-context"; import { StyleSheet, UnistylesRuntime } from "react-native-unistyles"; import { HEADER_INNER_HEIGHT } from "@/constants/layout"; +import { useTauriDragHandlers } from "@/utils/tauri-window"; interface ScreenHeaderProps { left?: ReactNode; @@ -21,10 +22,14 @@ export function ScreenHeader({ left, right, leftStyle, rightStyle }: ScreenHeade // Only add extra padding on mobile for better touch targets; on desktop, only use safe area insets const topPadding = isMobile ? 8 : 0; + // On Tauri macOS, enable window dragging and double-click to maximize + // Left padding for traffic lights is handled by _layout.tsx when sidebar is collapsed + const dragHandlers = useTauriDragHandlers(); + return ( - + {left} {right} @@ -46,6 +51,7 @@ const styles = StyleSheet.create((theme) => ({ paddingHorizontal: theme.spacing[2], borderBottomWidth: theme.borderWidth[1], borderBottomColor: theme.colors.border, + userSelect: "none", }, left: { flex: 1, diff --git a/packages/app/src/components/message-input.tsx b/packages/app/src/components/message-input.tsx index 6a837d91f..90f2a47d3 100644 --- a/packages/app/src/components/message-input.tsx +++ b/packages/app/src/components/message-input.tsx @@ -27,7 +27,6 @@ import Animated, { import { useDictation } from "@/hooks/use-dictation"; import { DictationOverlay } from "./dictation-controls"; import type { DaemonClientV2 } from "@server/client/daemon-client-v2"; -import type { SessionContextValue } from "@/contexts/session-context"; import { usePanelStore } from "@/stores/panel-store"; export interface ImageAttachment { @@ -52,7 +51,6 @@ export interface MessageInputProps { onPickImages?: () => void; onRemoveImage?: (index: number) => void; client: DaemonClientV2 | null; - sendAgentAudio: SessionContextValue["sendAgentAudio"]; placeholder?: string; autoFocus?: boolean; disabled?: boolean; @@ -104,7 +102,6 @@ export const MessageInput = forwardRef( onPickImages, onRemoveImage, client, - sendAgentAudio, placeholder = "Message...", autoFocus = false, disabled = false, @@ -200,9 +197,7 @@ export const MessageInput = forwardRef( retryFailedDictation, discardFailedDictation, } = useDictation({ - sendAgentAudio, client, - mode: "transcribe_only", onTranscript: handleDictationTranscript, onError: handleDictationError, canStart: canStartDictation, @@ -538,8 +533,23 @@ export const MessageInput = forwardRef( {leftContent} - {/* Right: send/queue button, voice button, rightContent slot */} + {/* Right: voice button, contextual button (realtime/send/cancel) */} + + {isDictating ? ( + + ) : ( + + )} + {shouldShowSendButton && ( ( )} - - {isDictating ? ( - - ) : ( - - )} - - {rightContent} + {!shouldShowSendButton && rightContent} diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx index a4fafd74a..162662566 100644 --- a/packages/app/src/components/message.tsx +++ b/packages/app/src/components/message.tsx @@ -387,16 +387,21 @@ const expandableBadgeStylesheet = StyleSheet.create((theme) => ({ flexShrink: 0, }, detailWrapper: { - marginTop: theme.spacing[2], - borderRadius: theme.borderRadius.md, + borderBottomLeftRadius: theme.borderRadius.lg, + borderBottomRightRadius: theme.borderRadius.lg, borderWidth: theme.borderWidth[1], - borderColor: theme.colors.border, + borderTopWidth: 0, + borderColor: theme.colors.borderAccent, backgroundColor: theme.colors.surface0, padding: theme.spacing[2], gap: theme.spacing[2], flexShrink: 1, minWidth: 0, }, + pressableExpanded: { + borderBottomLeftRadius: 0, + borderBottomRightRadius: 0, + }, })); function isLikelyPathToken(value: string): boolean { @@ -511,7 +516,7 @@ export const AssistantMessage = memo(function AssistantMessage({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -525,7 +530,6 @@ export const AssistantMessage = memo(function AssistantMessage({ {children} @@ -540,7 +544,6 @@ export const AssistantMessage = memo(function AssistantMessage({ {node.content} @@ -552,7 +555,7 @@ export const AssistantMessage = memo(function AssistantMessage({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -576,7 +579,6 @@ export const AssistantMessage = memo(function AssistantMessage({ inheritedStyles, assistantMessageStylesheet.markdownCodeInline, ]} - selectable > {content} @@ -1153,6 +1155,7 @@ const ExpandableBadge = memo(function ExpandableBadge({ pressed && hasDetails ? expandableBadgeStylesheet.pressablePressed : null, + isExpanded && expandableBadgeStylesheet.pressableExpanded, ]} > @@ -1181,12 +1184,12 @@ const ExpandableBadge = memo(function ExpandableBadge({ /> ) : null} - {detailContent ? ( - - {detailContent} - - ) : null} + {detailContent ? ( + + {detailContent} + + ) : null} ); }); @@ -1226,7 +1229,7 @@ export const AgentThoughtMessage = memo(function AgentThoughtMessage({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -1240,7 +1243,6 @@ export const AgentThoughtMessage = memo(function AgentThoughtMessage({ {children} @@ -1255,7 +1257,6 @@ export const AgentThoughtMessage = memo(function AgentThoughtMessage({ {node.content} @@ -1267,7 +1268,7 @@ export const AgentThoughtMessage = memo(function AgentThoughtMessage({ styles: any, inheritedStyles: any = {} ) => ( - + {node.content} ), @@ -1281,7 +1282,6 @@ export const AgentThoughtMessage = memo(function AgentThoughtMessage({ {node.content} @@ -1432,7 +1432,7 @@ export const ToolCall = memo(function ToolCall({ args !== undefined || result !== undefined || error !== undefined; // Parse tool call details for inline rendering - const { display, errorText } = useToolCallDetails({ args, result, error }); + const { display, errorText } = useToolCallDetails({ toolName, args, result, error }); const handleToggle = useCallback(() => { if (!isMobile && isPerfLoggingEnabled()) { @@ -1498,7 +1498,7 @@ export const ToolCall = memo(function ToolCall({ return ( - {/* Header: New Agent button */} - + {/* Header: New Agent button - top padding area is draggable on Tauri */} + [ styles.newAgentButton, @@ -316,6 +322,7 @@ const styles = StyleSheet.create((theme) => ({ paddingHorizontal: theme.spacing[4], paddingTop: theme.spacing[4], paddingBottom: theme.spacing[2], + userSelect: "none", }, newAgentButton: { flexDirection: "row", diff --git a/packages/app/src/components/tool-call-details.tsx b/packages/app/src/components/tool-call-details.tsx index 0686a5557..87022ef32 100644 --- a/packages/app/src/components/tool-call-details.tsx +++ b/packages/app/src/components/tool-call-details.tsx @@ -7,6 +7,7 @@ import { getNowMs, isPerfLoggingEnabled, perfLog } from "@/utils/perf"; import { parseToolCallDisplay, buildLineDiff, + parseUnifiedDiff, type ToolCallDisplay, } from "@/utils/tool-call-parsers"; import { DiffViewer } from "./diff-viewer"; @@ -14,6 +15,7 @@ import { DiffViewer } from "./diff-viewer"; // ---- Types ---- export interface ToolCallDetailsData { + toolName: string; args?: unknown; result?: unknown; error?: unknown; @@ -139,6 +141,10 @@ export function ToolCallDetailsContent({ // Compute diff lines for edit type const diffLines = useMemo(() => { if (display.type !== "edit") return undefined; + // Use pre-computed unified diff if available (e.g., from apply_patch) + if (display.unifiedDiff) { + return parseUnifiedDiff(display.unifiedDiff); + } return buildLineDiff(display.oldString, display.newString); }, [display]); @@ -304,12 +310,12 @@ export function ToolCallDetailsContent({ // ---- Hook for parsing tool call data ---- export function useToolCallDetails(data: ToolCallDetailsData) { - const { args, result, error } = data; + const { toolName, args, result, error } = data; return useMemo(() => { const shouldLog = isPerfLoggingEnabled(); const startMs = shouldLog ? getNowMs() : 0; - const display = parseToolCallDisplay(args, result); + const display = parseToolCallDisplay(toolName, args, result); const errorText = error !== undefined ? formatValue(error) : undefined; if (shouldLog) { const durationMs = getNowMs() - startMs; @@ -329,7 +335,7 @@ export function useToolCallDetails(data: ToolCallDetailsData) { } } return { display, errorText }; - }, [args, result, error]); + }, [toolName, args, result, error]); } // ---- Styles ---- diff --git a/packages/app/src/components/tool-call-sheet.tsx b/packages/app/src/components/tool-call-sheet.tsx index e0abf535b..e03895aed 100644 --- a/packages/app/src/components/tool-call-sheet.tsx +++ b/packages/app/src/components/tool-call-sheet.tsx @@ -144,7 +144,7 @@ function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) { ? toolKindIcons[kind.toLowerCase()] || Wrench : Wrench; - const { display, errorText } = useToolCallDetails({ args, result, error }); + const { display, errorText } = useToolCallDetails({ toolName, args, result, error }); return ( @@ -153,7 +153,7 @@ function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) { - {toolName} + {display.toolName} diff --git a/packages/app/src/constants/layout.ts b/packages/app/src/constants/layout.ts index d31bcebf9..744901763 100644 --- a/packages/app/src/constants/layout.ts +++ b/packages/app/src/constants/layout.ts @@ -1,3 +1,5 @@ +import { Platform } from "react-native"; + export const FOOTER_HEIGHT = 75; // Shared header inner height (excluding safe area insets and border) @@ -7,3 +9,43 @@ export const HEADER_INNER_HEIGHT = 48; // Max width for chat content (stream view, input area, new agent form) export const MAX_CONTENT_WIDTH = 820; + +// Tauri desktop app constants for macOS traffic light buttons +// These buttons (close/minimize/maximize) overlay the top-left corner +export const TAURI_TRAFFIC_LIGHT_WIDTH = 78; +export const TAURI_TRAFFIC_LIGHT_HEIGHT = 56; + +// Check if running in Tauri desktop app on macOS +function isTauriMac(): boolean { + if (Platform.OS !== "web") return false; + if (typeof window === "undefined") return false; + if (!("__TAURI__" in window)) return false; + // Check for macOS via user agent + const ua = navigator.userAgent; + return ua.includes("Mac OS") || ua.includes("Macintosh"); +} + +// Cached result - only cache true, keep checking if false (in case __TAURI__ loads later) +let _isTauriMacCached: boolean | null = null; + +export function getIsTauriMac(): boolean { + if (_isTauriMacCached === true) { + return true; + } + const result = isTauriMac(); + if (result) { + _isTauriMacCached = true; + } + return result; +} + +// Get traffic light padding values (only non-zero on Tauri macOS) +export function getTrafficLightPadding(): { left: number; top: number } { + if (!getIsTauriMac()) { + return { left: 0, top: 0 }; + } + return { + left: TAURI_TRAFFIC_LIGHT_WIDTH, + top: TAURI_TRAFFIC_LIGHT_HEIGHT, + }; +} diff --git a/packages/app/src/contexts/session-context.tsx b/packages/app/src/contexts/session-context.tsx index 5ace09f1d..be3c72a25 100644 --- a/packages/app/src/contexts/session-context.tsx +++ b/packages/app/src/contexts/session-context.tsx @@ -352,12 +352,6 @@ export interface SessionContextValue { message: string, images?: Array<{ uri: string; mimeType?: string }> ) => Promise; - sendAgentAudio: ( - agentId: string | undefined, - audioBlob: Blob, - requestId?: string, - options?: { mode?: "transcribe_only" | "auto_run" } - ) => Promise; deleteAgent: (agentId: string) => void; createAgent: (options: { config: any; @@ -1972,69 +1966,6 @@ export function SessionProvider({ [client] ); - const sendAgentAudio = useCallback( - async ( - agentId: string | undefined, - audioBlob: Blob, - requestId?: string, - options?: { mode?: "transcribe_only" | "auto_run" } - ) => { - try { - if (!client) { - throw new Error("Daemon client unavailable"); - } - if (!client.isConnected) { - throw new Error("Daemon client is disconnected"); - } - const resolvedRequestId = requestId ?? generateMessageId(); - const arrayBuffer = await audioBlob.arrayBuffer(); - const bytes = new Uint8Array(arrayBuffer); - let binary = ""; - for (let i = 0; i < bytes.length; i++) { - binary += String.fromCharCode(bytes[i]); - } - const base64Audio = btoa(binary); - - const deriveFormat = (mimeType: string | undefined): string => { - if (!mimeType || mimeType.length === 0) { - return "webm"; - } - const slashIndex = mimeType.indexOf("/"); - let formatPart = - slashIndex >= 0 ? mimeType.slice(slashIndex + 1) : mimeType; - const semicolonIndex = formatPart.indexOf(";"); - if (semicolonIndex >= 0) { - formatPart = formatPart.slice(0, semicolonIndex); - } - return formatPart.trim().length > 0 ? formatPart.trim() : "webm"; - }; - - const format = deriveFormat(audioBlob.type); - await client.sendAgentAudio({ - ...(agentId ? { agentId } : {}), - audio: base64Audio, - format, - isLast: true, - requestId: resolvedRequestId, - ...(options?.mode ? { mode: options.mode } : {}), - }); - - console.log( - "[Session] Sent audio:", - agentId ?? "(no agent)", - format, - audioBlob.size, - "bytes", - `(requestId: ${resolvedRequestId})` - ); - } catch (error) { - console.error("[Session] Failed to send audio:", error); - throw error; - } - }, - [client] - ); - const createAgent = useCallback( async ({ config, @@ -2344,7 +2275,6 @@ export function SessionProvider({ cancelAgentRun, deleteAgent, sendAgentMessage, - sendAgentAudio, createAgent, setAgentMode, respondToPermission, @@ -2368,7 +2298,6 @@ export function SessionProvider({ cancelAgentRun, deleteAgent, sendAgentMessage, - sendAgentAudio, createAgent, setAgentMode, respondToPermission, @@ -2394,7 +2323,6 @@ export function SessionProvider({ refreshSession, cancelAgentRun, sendAgentMessage, - sendAgentAudio, deleteAgent, createAgent, setAgentMode, @@ -2415,7 +2343,6 @@ export function SessionProvider({ refreshSession, cancelAgentRun, sendAgentMessage, - sendAgentAudio, deleteAgent, createAgent, setAgentMode, diff --git a/packages/app/src/hooks/use-agent-form-state.ts b/packages/app/src/hooks/use-agent-form-state.ts index 0c3bb299d..88850ea61 100644 --- a/packages/app/src/hooks/use-agent-form-state.ts +++ b/packages/app/src/hooks/use-agent-form-state.ts @@ -8,20 +8,47 @@ import type { AgentModelDefinition, AgentProvider, } from "@server/server/agent/agent-sdk-types"; -import type { ProviderModelState } from "@/stores/session-store"; import { useSessionStore } from "@/stores/session-store"; -import { useFormPreferences } from "./use-form-preferences"; +import { useFormPreferences, type FormPreferences } from "./use-form-preferences"; -export type CreateAgentInitialValues = { - workingDir?: string; +// Explicit overrides from URL params or "New Agent" button +export interface FormInitialValues { + serverId?: string | null; provider?: AgentProvider; modeId?: string | null; model?: string | null; + workingDir?: string; +} + +// Tracks which fields the user has explicitly modified in this session +interface UserModifiedFields { + serverId: boolean; + provider: boolean; + modeId: boolean; + model: boolean; + workingDir: boolean; +} + +const INITIAL_USER_MODIFIED: UserModifiedFields = { + serverId: false, + provider: false, + modeId: false, + model: false, + workingDir: false, }; +// Internal form state +interface FormState { + serverId: string | null; + provider: AgentProvider; + modeId: string; + model: string; + workingDir: string; +} + type UseAgentFormStateOptions = { initialServerId?: string | null; - initialValues?: CreateAgentInitialValues; + initialValues?: FormInitialValues; isVisible?: boolean; isCreateFlow?: boolean; isTargetDaemonReady?: boolean; @@ -66,6 +93,106 @@ const DEFAULT_PROVIDER: AgentProvider = fallbackDefinition?.id ?? "claude"; const DEFAULT_MODE_FOR_DEFAULT_PROVIDER = fallbackDefinition?.defaultModeId ?? ""; +/** + * Pure function that resolves form state from multiple data sources. + * Priority: explicit (URL params) > preferences > provider defaults > fallback + * + * Only resolves fields that haven't been user-modified. + */ +function resolveFormState( + initialValues: FormInitialValues | undefined, + preferences: FormPreferences | null, + availableModels: AgentModelDefinition[] | null, + userModified: UserModifiedFields, + currentState: FormState +): FormState { + // Start with current state - we only update non-user-modified fields + const result = { ...currentState }; + + // 1. Resolve provider first (other fields depend on it) + if (!userModified.provider) { + if (initialValues?.provider && providerDefinitionMap.has(initialValues.provider)) { + result.provider = initialValues.provider; + } else if ( + preferences?.provider && + providerDefinitionMap.has(preferences.provider as AgentProvider) + ) { + result.provider = preferences.provider as AgentProvider; + } + // else keep current (initialized to DEFAULT_PROVIDER) + } + + const providerDef = providerDefinitionMap.get(result.provider); + const providerPrefs = preferences?.providerPreferences?.[result.provider]; + + // 2. Resolve modeId (depends on provider) + if (!userModified.modeId) { + const validModeIds = providerDef?.modes.map((m) => m.id) ?? []; + + if ( + typeof initialValues?.modeId === "string" && + initialValues.modeId.length > 0 && + validModeIds.includes(initialValues.modeId) + ) { + result.modeId = initialValues.modeId; + } else if ( + providerPrefs?.mode && + validModeIds.includes(providerPrefs.mode) + ) { + result.modeId = providerPrefs.mode; + } else { + result.modeId = providerDef?.defaultModeId ?? validModeIds[0] ?? ""; + } + } + + // 3. Resolve model (depends on provider + availableModels) + if (!userModified.model) { + const isValidModel = (m: string) => + availableModels?.some((am) => am.id === m) ?? false; + + if ( + typeof initialValues?.model === "string" && + initialValues.model.length > 0 + ) { + // If models aren't loaded yet, trust the initial value + // It will be validated once models load + if (!availableModels || isValidModel(initialValues.model)) { + result.model = initialValues.model; + } else if (providerPrefs?.model && isValidModel(providerPrefs.model)) { + result.model = providerPrefs.model; + } else { + result.model = ""; + } + } else if (providerPrefs?.model && isValidModel(providerPrefs.model)) { + result.model = providerPrefs.model; + } else { + result.model = ""; + } + } + + // 4. Resolve serverId (independent) + if (!userModified.serverId) { + if (initialValues?.serverId !== undefined) { + result.serverId = initialValues.serverId; + } else if (preferences?.serverId) { + result.serverId = preferences.serverId; + } + // else keep current + } + + // 5. Resolve workingDir (independent) + if (!userModified.workingDir) { + if (initialValues?.workingDir !== undefined) { + result.workingDir = initialValues.workingDir; + } else if (preferences?.workingDir) { + result.workingDir = preferences.workingDir; + } + // else keep current (empty string) + } + + return result; +} + export function useAgentFormState( options: UseAgentFormStateOptions = {} ): UseAgentFormStateResult { @@ -80,29 +207,36 @@ export function useAgentFormState( const { preferences, isLoading: isPreferencesLoading, - getProviderPreferences, updatePreferences, updateProviderPreferences, } = useFormPreferences(); - const [selectedServerId, setSelectedServerId] = useState( - initialServerId - ); - const [workingDir, setWorkingDir] = useState(""); - const [selectedProvider, setSelectedProvider] = - useState(DEFAULT_PROVIDER); - const [selectedMode, setSelectedMode] = useState( - DEFAULT_MODE_FOR_DEFAULT_PROVIDER - ); - const [selectedModel, setSelectedModel] = useState(""); + // Track which fields the user has explicitly modified + const [userModified, setUserModified] = useState(INITIAL_USER_MODIFIED); - const hasHydratedRef = useRef(false); - const hasAppliedInitialValuesRef = useRef(false); - const providerModelRequestTimersRef = useRef< - Map> - >(new Map()); + // Form state + const [formState, setFormState] = useState(() => ({ + serverId: initialServerId, + provider: DEFAULT_PROVIDER, + modeId: DEFAULT_MODE_FOR_DEFAULT_PROVIDER, + model: "", + workingDir: "", + })); + + // Track if we've done initial resolution (to avoid flickering) + const hasResolvedRef = useRef(false); + + // Reset user modifications when form becomes invisible + useEffect(() => { + if (!isVisible) { + setUserModified(INITIAL_USER_MODIFIED); + hasResolvedRef.current = false; + } + }, [isVisible]); + + // Get session state for provider models const sessionState = useSessionStore((state) => - selectedServerId ? state.sessions[selectedServerId] : undefined + formState.serverId ? state.sessions[formState.serverId] : undefined ); const providerModels = sessionState?.providerModels; const requestProviderModels = sessionState?.methods?.requestProviderModels; @@ -111,9 +245,73 @@ export function useAgentFormState( [] ); + // Get available models for current provider + const modelState = providerModels?.get(formState.provider); + const availableModels = modelState?.models ?? null; + + // Combine initialValues with initialServerId for resolution + const combinedInitialValues = useMemo((): FormInitialValues | undefined => { + if (!initialValues && initialServerId === null) { + return undefined; + } + return { + ...initialValues, + serverId: initialValues?.serverId ?? initialServerId, + }; + }, [initialValues, initialServerId]); + + // Resolve form state when data sources change + useEffect(() => { + if (!isVisible || !isCreateFlow) { + return; + } + + // Wait for preferences to load before first resolution + if (isPreferencesLoading && !hasResolvedRef.current) { + return; + } + + const resolved = resolveFormState( + combinedInitialValues, + preferences, + availableModels, + userModified, + formState + ); + + // Only update if something changed + if ( + resolved.serverId !== formState.serverId || + resolved.provider !== formState.provider || + resolved.modeId !== formState.modeId || + resolved.model !== formState.model || + resolved.workingDir !== formState.workingDir + ) { + setFormState(resolved); + } + + hasResolvedRef.current = true; + }, [ + isVisible, + isCreateFlow, + isPreferencesLoading, + combinedInitialValues, + preferences, + availableModels, + userModified, + formState, + ]); + + // Provider model request timers + const providerModelRequestTimersRef = useRef< + Map> + >(new Map()); + + // User setters - mark fields as modified and persist to preferences const setSelectedServerIdFromUser = useCallback( (value: string | null) => { - setSelectedServerId(value); + setFormState((prev) => ({ ...prev, serverId: value })); + setUserModified((prev) => ({ ...prev, serverId: true })); void updatePreferences({ serverId: value ?? undefined }); }, [updatePreferences] @@ -121,124 +319,86 @@ export function useAgentFormState( const setProviderFromUser = useCallback( (provider: AgentProvider) => { - setSelectedProvider(provider); + setFormState((prev) => ({ ...prev, provider })); + setUserModified((prev) => ({ ...prev, provider: true })); void updatePreferences({ provider }); - // Restore per-provider preferences if available - const providerPrefs = getProviderPreferences(provider); + // When provider changes, reset mode and model to provider defaults + // (unless user has explicitly set them) const providerDef = providerDefinitionMap.get(provider); + const providerPrefs = preferences?.providerPreferences?.[provider]; - setSelectedModel(providerPrefs?.model ?? ""); - setSelectedMode(providerPrefs?.mode ?? providerDef?.defaultModeId ?? ""); + setFormState((prev) => ({ + ...prev, + provider, + modeId: providerPrefs?.mode ?? providerDef?.defaultModeId ?? "", + model: providerPrefs?.model ?? "", + })); }, - [getProviderPreferences, updatePreferences] + [preferences?.providerPreferences, updatePreferences] ); const setModeFromUser = useCallback( (modeId: string) => { - setSelectedMode(modeId); - void updateProviderPreferences(selectedProvider, { mode: modeId }); + setFormState((prev) => ({ ...prev, modeId })); + setUserModified((prev) => ({ ...prev, modeId: true })); + void updateProviderPreferences(formState.provider, { mode: modeId }); }, - [selectedProvider, updateProviderPreferences] + [formState.provider, updateProviderPreferences] ); const setModelFromUser = useCallback( (modelId: string) => { - setSelectedModel(modelId); - void updateProviderPreferences(selectedProvider, { model: modelId }); + setFormState((prev) => ({ ...prev, model: modelId })); + setUserModified((prev) => ({ ...prev, model: true })); + void updateProviderPreferences(formState.provider, { model: modelId }); }, - [selectedProvider, updateProviderPreferences] + [formState.provider, updateProviderPreferences] ); + const setWorkingDir = useCallback((value: string) => { + setFormState((prev) => ({ ...prev, workingDir: value })); + }, []); + const setWorkingDirFromUser = useCallback( (value: string) => { - setWorkingDir(value); + setFormState((prev) => ({ ...prev, workingDir: value })); + setUserModified((prev) => ({ ...prev, workingDir: true })); void updatePreferences({ workingDir: value }); }, [updatePreferences] ); - const applyInitialValues = useCallback(() => { - if (!isCreateFlow || !initialValues) { - return; - } - - if (Object.prototype.hasOwnProperty.call(initialValues, "workingDir")) { - setWorkingDir(initialValues.workingDir ?? ""); - } - - if (initialValues.provider && providerDefinitionMap.has(initialValues.provider)) { - setSelectedProvider(initialValues.provider); - } - - if (typeof initialValues.modeId === "string" && initialValues.modeId.length > 0) { - setSelectedMode(initialValues.modeId); - } - - if (typeof initialValues.model === "string" && initialValues.model.length > 0) { - setSelectedModel(initialValues.model); - } - }, [initialValues, isCreateFlow]); - - useEffect(() => { - if (!isVisible) { - hasAppliedInitialValuesRef.current = false; - return; - } - if (hasAppliedInitialValuesRef.current) { - return; - } - applyInitialValues(); - hasAppliedInitialValuesRef.current = true; - }, [applyInitialValues, isVisible]); + const setSelectedServerId = useCallback((value: string | null) => { + setFormState((prev) => ({ ...prev, serverId: value })); + }, []); const refreshProviderModels = useCallback(() => { if (!requestProviderModels) { return; } - const trimmed = workingDir.trim(); - requestProviderModels(selectedProvider, { + const trimmed = formState.workingDir.trim(); + requestProviderModels(formState.provider, { cwd: trimmed.length > 0 ? trimmed : undefined, }); - }, [requestProviderModels, selectedProvider, workingDir]); - - // Hydrate form state from preferences once loaded - useEffect(() => { - if (isPreferencesLoading || hasHydratedRef.current) return; - hasHydratedRef.current = true; - - const activeProvider = - preferences.provider && - providerDefinitionMap.has(preferences.provider as AgentProvider) - ? (preferences.provider as AgentProvider) - : DEFAULT_PROVIDER; - - const providerPrefs = preferences.providerPreferences?.[activeProvider]; - const providerDef = providerDefinitionMap.get(activeProvider); - - setSelectedProvider(activeProvider); - if (preferences.workingDir) setWorkingDir(preferences.workingDir); - setSelectedMode(providerPrefs?.mode ?? providerDef?.defaultModeId ?? ""); - if (providerPrefs?.model) setSelectedModel(providerPrefs.model); - if (preferences.serverId) setSelectedServerId(preferences.serverId); - }, [isPreferencesLoading, preferences]); + }, [requestProviderModels, formState.provider, formState.workingDir]); const persistFormPreferences = useCallback(async () => { await updatePreferences({ - workingDir, - provider: selectedProvider, - serverId: selectedServerId ?? undefined, + workingDir: formState.workingDir, + provider: formState.provider, + serverId: formState.serverId ?? undefined, }); - await updateProviderPreferences(selectedProvider, { - mode: selectedMode, - model: selectedModel, + await updateProviderPreferences(formState.provider, { + mode: formState.modeId, + model: formState.model, }); }, [ - selectedMode, - selectedModel, - selectedProvider, - selectedServerId, - workingDir, + formState.modeId, + formState.model, + formState.provider, + formState.serverId, + formState.workingDir, updatePreferences, updateProviderPreferences, ]); @@ -270,7 +430,7 @@ export function useAgentFormState( return; } - const currentState = sessionState.providerModels?.get(selectedProvider); + const currentState = sessionState.providerModels?.get(formState.provider); if (currentState?.models?.length || currentState?.isLoading) { clearQueuedProviderModelRequest(serverId); return; @@ -279,7 +439,7 @@ export function useAgentFormState( const delayMs = options?.delayMs ?? 0; const trigger = () => { providerModelRequestTimersRef.current.delete(serverId); - sessionState.methods?.requestProviderModels(selectedProvider, { + sessionState.methods?.requestProviderModels(formState.provider, { ...(options?.cwd ? { cwd: options.cwd } : {}), }); }; @@ -290,7 +450,7 @@ export function useAgentFormState( trigger(); } }, - [clearQueuedProviderModelRequest, getSessionState, selectedProvider] + [clearQueuedProviderModelRequest, getSessionState, formState.provider] ); useEffect(() => { @@ -303,74 +463,53 @@ export function useAgentFormState( }, []); useEffect(() => { - if (!isVisible || !isTargetDaemonReady || !selectedServerId) { - clearQueuedProviderModelRequest(selectedServerId); + if (!isVisible || !isTargetDaemonReady || !formState.serverId) { + clearQueuedProviderModelRequest(formState.serverId); return; } - const trimmed = workingDir.trim(); - queueProviderModelFetch(selectedServerId, { + const trimmed = formState.workingDir.trim(); + queueProviderModelFetch(formState.serverId, { cwd: trimmed.length > 0 ? trimmed : undefined, delayMs: 180, }); return () => { - clearQueuedProviderModelRequest(selectedServerId); + clearQueuedProviderModelRequest(formState.serverId); }; }, [ clearQueuedProviderModelRequest, isTargetDaemonReady, isVisible, queueProviderModelFetch, - selectedServerId, - workingDir, + formState.serverId, + formState.workingDir, ]); - const agentDefinition = providerDefinitionMap.get(selectedProvider); + const agentDefinition = providerDefinitionMap.get(formState.provider); const modeOptions = agentDefinition?.modes ?? []; - const modelState = providerModels?.get(selectedProvider); - const availableModels = modelState?.models ?? []; const isModelLoading = modelState?.isLoading ?? false; const modelError = modelState?.error ?? null; - useEffect(() => { - if (!agentDefinition) { - return; - } - - if (modeOptions.length === 0) { - if (selectedMode !== "") { - setSelectedMode(""); - } - return; - } - - const availableModeIds = modeOptions.map((mode) => mode.id); - if (!availableModeIds.includes(selectedMode)) { - const fallbackModeId = agentDefinition.defaultModeId ?? availableModeIds[0]; - setSelectedMode(fallbackModeId); - } - }, [agentDefinition, modeOptions, selectedMode]); - - const workingDirIsEmpty = !workingDir.trim(); + const workingDirIsEmpty = !formState.workingDir.trim(); return useMemo( () => ({ - selectedServerId, + selectedServerId: formState.serverId, setSelectedServerId, setSelectedServerIdFromUser, - selectedProvider, + selectedProvider: formState.provider, setProviderFromUser, - selectedMode, + selectedMode: formState.modeId, setModeFromUser, - selectedModel, + selectedModel: formState.model, setModelFromUser, - workingDir, + workingDir: formState.workingDir, setWorkingDir, setWorkingDirFromUser, providerDefinitions, providerDefinitionMap, agentDefinition, modeOptions, - availableModels, + availableModels: availableModels ?? [], isModelLoading, modelError, refreshProviderModels, @@ -380,26 +519,31 @@ export function useAgentFormState( persistFormPreferences, }), [ - agentDefinition, - availableModels, - isModelLoading, - modelError, - modeOptions, - queueProviderModelFetch, - clearQueuedProviderModelRequest, - refreshProviderModels, - selectedMode, - selectedModel, - selectedProvider, - selectedServerId, + formState.serverId, + formState.provider, + formState.modeId, + formState.model, + formState.workingDir, + setSelectedServerId, setSelectedServerIdFromUser, setProviderFromUser, setModeFromUser, setModelFromUser, + setWorkingDir, setWorkingDirFromUser, - workingDir, + agentDefinition, + modeOptions, + availableModels, + isModelLoading, + modelError, + refreshProviderModels, + queueProviderModelFetch, + clearQueuedProviderModelRequest, workingDirIsEmpty, persistFormPreferences, ] ); } + +// Re-export for backwards compatibility +export type CreateAgentInitialValues = FormInitialValues; diff --git a/packages/app/src/hooks/use-dictation.ts b/packages/app/src/hooks/use-dictation.ts index 045aa9204..6ce2696ed 100644 --- a/packages/app/src/hooks/use-dictation.ts +++ b/packages/app/src/hooks/use-dictation.ts @@ -1,7 +1,6 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { useMutation } from "@tanstack/react-query"; -import type { SessionContextValue } from "@/contexts/session-context"; import { useAudioRecorder } from "@/hooks/use-audio-recorder"; import type { DaemonClientV2 } from "@server/client/daemon-client-v2"; import type { TranscriptionResultMessage } from "@server/shared/messages"; @@ -33,10 +32,7 @@ export type DictationOutcome = | { type: "failure"; requestId: string; errorMessage: string; timestamp: number }; export type UseDictationOptions = { - agentId?: string; - sendAgentAudio: SessionContextValue["sendAgentAudio"]; client: DaemonClientV2 | null; - mode?: "transcribe_only" | "auto_run"; onTranscript: (text: string, meta: { requestId: string }) => void; onError?: (error: Error) => void; onRetryAttempt?: (info: DictationRetryInfo) => void; @@ -121,6 +117,16 @@ type CapturedAudioPayload = { type TranscriptionPayload = TranscriptionResultMessage["payload"]; +const blobToBase64 = async (blob: Blob): Promise => { + const arrayBuffer = await blob.arrayBuffer(); + const bytes = new Uint8Array(arrayBuffer); + let binary = ""; + for (let i = 0; i < bytes.length; i++) { + binary += String.fromCharCode(bytes[i]); + } + return btoa(binary); +}; + const deriveFormatFromMime = (mimeType?: string): string => { if (!mimeType || mimeType.length === 0) { return "webm"; @@ -144,10 +150,7 @@ const buildCapturedAudioPayload = (blob: Blob, durationSeconds: number): Capture export function useDictation(options: UseDictationOptions): UseDictationResult { const { - agentId, - sendAgentAudio, client, - mode = "transcribe_only", onTranscript, onError, onRetryAttempt, @@ -172,7 +175,7 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { const maxRetryAttempts = MAX_AUTO_RETRY_ATTEMPTS; const transcriptionMutation = useMutation({ - mutationFn: async (requestId: string): Promise => { + mutationFn: async (): Promise => { const capturedAudio = pendingAudioRef.current; if (!capturedAudio) { throw new Error("No recorded audio available for transcription"); @@ -199,9 +202,7 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { } console.info("[useDictation] sending transcription request", { - requestId, attempt, - agentId, size: capturedAudio.sizeBytes, durationSeconds: capturedAudio.durationSeconds, }); @@ -210,20 +211,12 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setRetryAttempt(attempt); try { - const transcriptionPromise = client.waitForTranscriptionResult( - requestId, - TRANSCRIPTION_TIMEOUT_MS - ); - try { - await sendAgentAudio(agentId, capturedAudio.blob, requestId, { - mode, - }); - } catch (error) { - transcriptionPromise.catch(() => {}); - throw new DictationAttemptError("dispatch", toError(error)); - } - - return await transcriptionPromise; + const base64Audio = await blobToBase64(capturedAudio.blob); + return await client.transcribeAudio({ + audio: base64Audio, + format: capturedAudio.format, + timeout: TRANSCRIPTION_TIMEOUT_MS, + }); } catch (error) { const normalized = toError(error); const reason: DictationRetryReason = isTimeoutError(normalized) @@ -256,7 +249,6 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setRetryInfo(info); onRetryAttemptRef.current?.(info); console.warn("[useDictation] retry scheduled", { - requestId, attempt: nextAttempt, maxAttempts: MAX_AUTO_RETRY_ATTEMPTS, reason: attemptError.reason, @@ -383,12 +375,13 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { }, []); const transmitDictation = useCallback( - async (requestId: string) => runTranscription(requestId), + async () => runTranscription(), [runTranscription] ); const handleTranscriptionSuccess = useCallback( - (transcription: TranscriptionPayload, requestId: string) => { + (transcription: TranscriptionPayload) => { + const requestId = transcription.requestId; pendingRequestIdRef.current = null; setPendingRequestId(null); setIsProcessing(false); @@ -409,16 +402,15 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { requestId, textLength: transcriptText.length, }); - onTranscriptRef.current?.(transcriptText, { - requestId: transcription.requestId ?? requestId, - }); + onTranscriptRef.current?.(transcriptText, { requestId }); }, [onTranscriptRef] ); const handleDictationFailure = useCallback( - (failure: unknown, requestId: string | null) => { + (failure: unknown) => { const normalized = toError(failure); + const failureId = generateMessageId(); pendingRequestIdRef.current = null; setPendingRequestId(null); setIsProcessing(false); @@ -431,16 +423,14 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { if (capturedAudio) { setStatus("failed"); setFailedRecording({ - requestId: requestId ?? generateMessageId(), + requestId: failureId, durationSeconds: capturedAudio.durationSeconds, sizeBytes: capturedAudio.sizeBytes, format: capturedAudio.format, recordedAt: capturedAudio.recordedAt, errorMessage: normalized.message, }); - if (requestId) { - onPermanentFailureRef.current?.(normalized, { requestId }); - } + onPermanentFailureRef.current?.(normalized, { requestId: failureId }); } else { setStatus("idle"); } @@ -448,7 +438,7 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setRetryAttempt(0); setLastOutcome({ type: "failure", - requestId: requestId ?? generateMessageId(), + requestId: failureId, errorMessage: normalized.message, timestamp: Date.now(), }); @@ -571,7 +561,6 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setRetryAttempt(0); setLastOutcome(null); - let requestId: string | null = null; try { const audioData = await stopRecorder(); const recordedDurationSeconds = durationRef.current; @@ -581,21 +570,15 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setIsRecording(false); setVolume(0); - requestId = generateMessageId(); - pendingRequestIdRef.current = requestId; - setPendingRequestId(requestId); - - const transcription = await transmitDictation(requestId); - handleTranscriptionSuccess(transcription, requestId); + const transcription = await transmitDictation(); + handleTranscriptionSuccess(transcription); } catch (err) { resetTranscriptionMutation(); - handleDictationFailure(err, requestId); + handleDictationFailure(err); } }, [ - agentId, canConfirm, isProcessing, - mode, handleDictationFailure, handleTranscriptionSuccess, resetTranscriptionMutation, @@ -615,16 +598,12 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { setIsProcessing(true); setLastOutcome(null); - const requestId = generateMessageId(); - pendingRequestIdRef.current = requestId; - setPendingRequestId(requestId); - try { - const transcription = await transmitDictation(requestId); - handleTranscriptionSuccess(transcription, requestId); + const transcription = await transmitDictation(); + handleTranscriptionSuccess(transcription); } catch (err) { resetTranscriptionMutation(); - handleDictationFailure(err, requestId); + handleDictationFailure(err); } }, [ handleDictationFailure, @@ -687,17 +666,6 @@ export function useDictation(options: UseDictationOptions): UseDictationResult { } }, [autoStopWhenHidden?.isVisible]); - useEffect(() => { - pendingRequestIdRef.current = null; - setPendingRequestId(null); - setIsProcessing(false); - pendingAudioRef.current = null; - setStatus("idle"); - setRetryAttempt(0); - setRetryInfo(null); - setFailedRecording(null); - resetTranscriptionMutation(); - }, [agentId, resetTranscriptionMutation]); useEffect(() => { return () => { diff --git a/packages/app/src/stores/panel-store.ts b/packages/app/src/stores/panel-store.ts index 3f073ec85..53479a13a 100644 --- a/packages/app/src/stores/panel-store.ts +++ b/packages/app/src/stores/panel-store.ts @@ -27,7 +27,7 @@ interface DesktopSidebarState { fileExplorerOpen: boolean; } -type ExplorerTab = "changes" | "files"; +export type ExplorerTab = "changes" | "files"; export type ViewMode = "list" | "grid"; export type SortOption = "name" | "modified" | "size"; diff --git a/packages/app/src/stores/session-store.ts b/packages/app/src/stores/session-store.ts index d3e815bc8..3cbfe6aec 100644 --- a/packages/app/src/stores/session-store.ts +++ b/packages/app/src/stores/session-store.ts @@ -182,12 +182,6 @@ export interface SessionState { message: string, images?: Array<{ uri: string; mimeType?: string }> ) => Promise; - sendAgentAudio: ( - agentId: string | undefined, - audioBlob: Blob, - requestId?: string, - options?: { mode?: "transcribe_only" | "auto_run" } - ) => Promise; deleteAgent: (agentId: string) => void; createAgent: (options: { config: any; diff --git a/packages/app/src/utils/shorten-path.ts b/packages/app/src/utils/shorten-path.ts new file mode 100644 index 000000000..8b0e68ab3 --- /dev/null +++ b/packages/app/src/utils/shorten-path.ts @@ -0,0 +1,10 @@ +/** + * Shortens a file path by replacing the home directory prefix with ~. + * Handles both macOS (/Users/username) and Linux (/home/username) paths. + */ +export function shortenPath(path: string | undefined | null): string { + if (!path) { + return ""; + } + return path.replace(/^\/(?:Users|home)\/[^/]+/, "~"); +} diff --git a/packages/app/src/utils/tauri-window.ts b/packages/app/src/utils/tauri-window.ts new file mode 100644 index 000000000..118bf1a99 --- /dev/null +++ b/packages/app/src/utils/tauri-window.ts @@ -0,0 +1,104 @@ +import { Platform } from "react-native"; +import { useState, useEffect } from "react"; +import { getIsTauriMac, TAURI_TRAFFIC_LIGHT_WIDTH, TAURI_TRAFFIC_LIGHT_HEIGHT } from "@/constants/layout"; + +let tauriWindow: any = null; + +async function getTauriWindow() { + if (tauriWindow) return tauriWindow; + if (!getIsTauriMac()) return null; + + try { + const { getCurrentWindow } = await import("@tauri-apps/api/window"); + tauriWindow = getCurrentWindow(); + return tauriWindow; + } catch { + return null; + } +} + +export async function startDragging() { + const win = await getTauriWindow(); + if (win) { + await win.startDragging(); + } +} + +export async function toggleMaximize() { + const win = await getTauriWindow(); + if (win) { + await win.toggleMaximize(); + } +} + +// Returns event handlers for drag region behavior +export function useTauriDragHandlers() { + if (Platform.OS !== "web" || !getIsTauriMac()) { + return {}; + } + + return { + onMouseDown: (e: React.MouseEvent) => { + // Only handle left click, ignore if clicking on interactive elements + if (e.button !== 0) return; + const target = e.target as HTMLElement; + if (target.closest("button, a, input, [role='button']")) return; + + // Prevent text selection when dragging + e.preventDefault(); + + // Start dragging on mouse down + startDragging(); + }, + onDoubleClick: (e: React.MouseEvent) => { + // Ignore if clicking on interactive elements + const target = e.target as HTMLElement; + if (target.closest("button, a, input, [role='button']")) return; + + e.preventDefault(); + toggleMaximize(); + }, + }; +} + +// Hook that returns traffic light padding, accounting for fullscreen state +// In fullscreen, traffic lights are hidden so no padding is needed +export function useTrafficLightPadding(): { left: number; top: number } { + const [isFullscreen, setIsFullscreen] = useState(false); + + useEffect(() => { + if (Platform.OS !== "web" || !getIsTauriMac()) return; + + let unlisten: (() => void) | undefined; + + async function setup() { + const win = await getTauriWindow(); + if (!win) return; + + // Check initial fullscreen state + const fullscreen = await win.isFullscreen(); + setIsFullscreen(fullscreen); + + // Listen for resize events which include fullscreen changes + unlisten = await win.onResized(async () => { + const fs = await win.isFullscreen(); + setIsFullscreen(fs); + }); + } + + setup(); + + return () => { + unlisten?.(); + }; + }, []); + + if (!getIsTauriMac() || isFullscreen) { + return { left: 0, top: 0 }; + } + + return { + left: TAURI_TRAFFIC_LIGHT_WIDTH, + top: TAURI_TRAFFIC_LIGHT_HEIGHT, + }; +} diff --git a/packages/app/src/utils/tool-call-parsers.test.ts b/packages/app/src/utils/tool-call-parsers.test.ts index 5dd33ccf4..57619fd27 100644 --- a/packages/app/src/utils/tool-call-parsers.test.ts +++ b/packages/app/src/utils/tool-call-parsers.test.ts @@ -42,8 +42,9 @@ describe("parseToolCallDisplay", () => { const input = { command: "pwd", description: "Print working directory" }; const result = { type: "command", command: "pwd", output: "/some/path" }; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("Bash", input, result); expect(display.type).toBe("shell"); + expect(display.toolName).toBe("Shell"); if (display.type === "shell") { expect(display.command).toBe("pwd"); expect(display.output).toBe("/some/path"); @@ -55,8 +56,9 @@ describe("parseToolCallDisplay", () => { const input = { command: "pwd", description: "Print working directory" }; const result = undefined; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("Bash", input, result); expect(display.type).toBe("shell"); + expect(display.toolName).toBe("Shell"); if (display.type === "shell") { expect(display.command).toBe("pwd"); expect(display.output).toBe(""); @@ -67,19 +69,44 @@ describe("parseToolCallDisplay", () => { const input = { command: ["git", "status"] }; const result = { type: "command", output: "On branch main" }; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("shell", input, result); expect(display.type).toBe("shell"); + expect(display.toolName).toBe("Shell"); if (display.type === "shell") { expect(display.command).toBe("git status"); expect(display.output).toBe("On branch main"); } }); + test("normalizes tool names - shell to Shell", () => { + const input = { command: "pwd" }; + const display = parseToolCallDisplay("shell", input, undefined); + expect(display.toolName).toBe("Shell"); + }); + + test("normalizes tool names - Bash to Shell", () => { + const input = { command: "pwd" }; + const display = parseToolCallDisplay("Bash", input, undefined); + expect(display.toolName).toBe("Shell"); + }); + + test("normalizes tool names - read_file to Read", () => { + const input = { file_path: "/some/file.txt" }; + const display = parseToolCallDisplay("read_file", input, undefined); + expect(display.toolName).toBe("Read"); + }); + + test("preserves unknown tool names", () => { + const input = { some_arg: "value" }; + const display = parseToolCallDisplay("MyCustomTool", input, undefined); + expect(display.toolName).toBe("MyCustomTool"); + }); + test("parses non-command tool call into generic type", () => { const input = { file_path: "/some/file.txt" }; const result = { content: "file contents here", lineCount: 42 }; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("SomeTool", input, result); expect(display.type).toBe("generic"); if (display.type === "generic") { expect(display.input).toContainEqual({ key: "file_path", value: "/some/file.txt" }); @@ -92,12 +119,12 @@ describe("parseToolCallDisplay", () => { const input = { file_path: "/some/file.txt", content: "new content" }; const result = { type: "file_write", filePath: "/some/file.txt" }; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("Write", input, result); expect(display.type).toBe("generic"); }); test("handles undefined input and result gracefully", () => { - const display: ToolCallDisplay = parseToolCallDisplay(undefined, undefined); + const display: ToolCallDisplay = parseToolCallDisplay("unknown", undefined, undefined); expect(display.type).toBe("generic"); if (display.type === "generic") { expect(display.input).toEqual([]); @@ -116,7 +143,7 @@ describe("parseToolCallDisplay", () => { filePath: "/some/file.txt", }; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("Edit", input, result); expect(display.type).toBe("edit"); if (display.type === "edit") { expect(display.filePath).toBe("/some/file.txt"); @@ -133,7 +160,7 @@ describe("parseToolCallDisplay", () => { }; const result = undefined; - const display: ToolCallDisplay = parseToolCallDisplay(input, result); + const display: ToolCallDisplay = parseToolCallDisplay("Edit", input, result); expect(display.type).toBe("edit"); if (display.type === "edit") { expect(display.filePath).toBe("/some/file.txt"); @@ -149,7 +176,7 @@ describe("parseToolCallDisplay", () => { new_string: "new content", }; - const display: ToolCallDisplay = parseToolCallDisplay(input, undefined); + const display: ToolCallDisplay = parseToolCallDisplay("Edit", input, undefined); expect(display.type).toBe("edit"); if (display.type === "edit") { expect(display.filePath).toBe("/some/file.txt"); @@ -158,3 +185,111 @@ describe("parseToolCallDisplay", () => { } }); }); + +describe("parseToolCallDisplay - apply_patch (Codex)", () => { + test("parses apply_patch into edit type with unified diff", () => { + const input = { + files: [ + { + path: "/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md", + kind: "update", + }, + ], + }; + const result = { + files: [ + { + path: "/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md", + patch: "@@ -15,3 +15,2 @@\n-This task defines the **design philosophy**\n+This task defines the **updated philosophy**", + kind: "update", + }, + ], + message: "Success. Updated the following files:\nM .tasks/578561c8.md", + success: true, + }; + + const display = parseToolCallDisplay("apply_patch", input, result); + expect(display.type).toBe("edit"); + expect(display.toolName).toBe("Edit"); + if (display.type === "edit") { + expect(display.filePath).toBe("/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md"); + expect(display.unifiedDiff).toBe("@@ -15,3 +15,2 @@\n-This task defines the **design philosophy**\n+This task defines the **updated philosophy**"); + expect(display.oldString).toBe(""); + expect(display.newString).toBe(""); + } + }); + + test("parses pending apply_patch (no result yet)", () => { + const input = { + files: [ + { + path: "/some/file.txt", + kind: "create", + }, + ], + }; + + const display = parseToolCallDisplay("apply_patch", input, undefined); + expect(display.type).toBe("edit"); + expect(display.toolName).toBe("Edit"); + if (display.type === "edit") { + expect(display.filePath).toBe("/some/file.txt"); + expect(display.unifiedDiff).toBeUndefined(); + } + }); + + test("handles apply_patch with multiple files (uses first file)", () => { + const input = { + files: [ + { path: "/first/file.txt", kind: "update" }, + { path: "/second/file.txt", kind: "create" }, + ], + }; + const result = { + files: [ + { path: "/first/file.txt", patch: "@@ -1 +1 @@\n-old\n+new", kind: "update" }, + { path: "/second/file.txt", patch: "@@ -0,0 +1 @@\n+content", kind: "create" }, + ], + success: true, + }; + + const display = parseToolCallDisplay("apply_patch", input, result); + expect(display.type).toBe("edit"); + if (display.type === "edit") { + expect(display.filePath).toBe("/first/file.txt"); + expect(display.unifiedDiff).toBe("@@ -1 +1 @@\n-old\n+new"); + } + }); +}); + +describe("parseToolCallDisplay - read_file (Codex)", () => { + test("parses Codex read_file into read type", () => { + const input = { + path: "/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md", + }; + const result = { + type: "read_file", + path: "/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md", + content: "260 - Source: `**bold**|`\n261 - Action: `Shift+ArrowLeft`", + }; + + const display = parseToolCallDisplay("read_file", input, result); + expect(display.type).toBe("read"); + expect(display.toolName).toBe("Read"); + if (display.type === "read") { + expect(display.filePath).toBe("/Users/moboudra/dev/blankpage/editor/.tasks/578561c8.md"); + expect(display.content).toBe("260 - Source: `**bold**|`\n261 - Action: `Shift+ArrowLeft`"); + } + }); + + test("Codex read_file falls through to generic when result is missing", () => { + const input = { + path: "/some/file.txt", + }; + + const display = parseToolCallDisplay("read_file", input, undefined); + // Without result, it can't match the schema so falls through to generic + expect(display.type).toBe("generic"); + expect(display.toolName).toBe("Read"); + }); +}); diff --git a/packages/app/src/utils/tool-call-parsers.ts b/packages/app/src/utils/tool-call-parsers.ts index 0eeea0678..4a1db371d 100644 --- a/packages/app/src/utils/tool-call-parsers.ts +++ b/packages/app/src/utils/tool-call-parsers.ts @@ -270,7 +270,7 @@ export function buildLineDiff(originalText: string, updatedText: string): DiffLi return diff; } -function parseUnifiedDiff(diffText?: string): DiffLine[] { +export function parseUnifiedDiff(diffText?: string): DiffLine[] { if (!diffText) { return []; } @@ -1023,7 +1023,7 @@ const EditToolCallSchema = z input: EditInputSchema, result: z.unknown(), }) - .transform((data): { type: "edit"; filePath: string; oldString: string; newString: string } => { + .transform((data): { type: "edit"; filePath: string; oldString: string; newString: string; unifiedDiff?: string } => { const filePath = data.input.file_path; const oldString = "old_string" in data.input ? (data.input as { old_string: string }).old_string @@ -1040,6 +1040,52 @@ const EditToolCallSchema = z }; }); +// Codex apply_patch input: { files: [{ path: string, kind: string }] } +const ApplyPatchInputSchema = z.object({ + files: z.array(z.object({ + path: z.string(), + kind: z.string().optional(), + })).min(1), +}).passthrough(); + +// Codex apply_patch result: { files: [{ path: string, patch: string, kind: string }], message: string, success: boolean } +const ApplyPatchResultSchema = z.object({ + files: z.array(z.object({ + path: z.string(), + patch: z.string().optional(), + kind: z.string().optional(), + })).optional(), + message: z.string().optional(), + success: z.boolean().optional(), +}).passthrough(); + +// Apply patch tool call display schema - transforms to edit type with unified diff +const ApplyPatchToolCallSchema = z + .object({ + input: ApplyPatchInputSchema, + result: z.unknown(), + }) + .transform((data): { type: "edit"; filePath: string; oldString: string; newString: string; unifiedDiff?: string } => { + const firstFile = data.input.files[0]; + const filePath = firstFile.path; + + // Try to get the patch from the result + const resultParsed = ApplyPatchResultSchema.safeParse(data.result); + let unifiedDiff: string | undefined; + if (resultParsed.success && resultParsed.data.files) { + const resultFile = resultParsed.data.files.find(f => f.path === filePath) ?? resultParsed.data.files[0]; + unifiedDiff = resultFile?.patch; + } + + return { + type: "edit", + filePath, + oldString: "", + newString: "", + unifiedDiff, + }; + }); + // Read input: { file_path: string, offset?: number, limit?: number } const ReadInputSchema = z.object({ file_path: z.string(), @@ -1054,7 +1100,7 @@ const ReadResultSchema = z.object({ content: z.string(), }).passthrough(); -// Read tool call display schema +// Read tool call display schema (Claude) const ReadToolCallSchema = z .object({ input: ReadInputSchema, @@ -1068,6 +1114,30 @@ const ReadToolCallSchema = z limit: data.input.limit, })); +// Codex read_file input: { path: string } +const CodexReadInputSchema = z.object({ + path: z.string(), +}).passthrough(); + +// Codex read_file result: { type: "read_file", path: string, content: string } +const CodexReadResultSchema = z.object({ + type: z.literal("read_file"), + path: z.string(), + content: z.string(), +}).passthrough(); + +// Codex read_file tool call display schema +const CodexReadToolCallSchema = z + .object({ + input: CodexReadInputSchema, + result: CodexReadResultSchema, + }) + .transform((data): { type: "read"; filePath: string; content: string; offset?: number; limit?: number } => ({ + type: "read", + filePath: data.input.path, + content: data.result.content, + })); + // Generic tool call display schema (fallback) const GenericToolCallSchema = z .object({ @@ -1085,12 +1155,60 @@ const GenericToolCallSchema = z }; }); -const ToolCallDisplaySchema = z.union([ShellToolCallSchema, EditToolCallSchema, ReadToolCallSchema, GenericToolCallSchema]); +// Normalizes tool names for consistent display across agents +const TOOL_NAME_MAP: Record = { + shell: "Shell", + Bash: "Shell", + read_file: "Read", + apply_patch: "Edit", +}; + +const ToolCallDisplaySchema = z + .object({ + toolName: z.string(), + input: z.unknown(), + result: z.unknown(), + }) + .transform((data) => { + const normalizedToolName = TOOL_NAME_MAP[data.toolName] ?? data.toolName; + + // Try each schema in order + const shellParsed = ShellToolCallSchema.safeParse({ input: data.input, result: data.result }); + if (shellParsed.success) { + return { ...shellParsed.data, toolName: normalizedToolName }; + } + + const editParsed = EditToolCallSchema.safeParse({ input: data.input, result: data.result }); + if (editParsed.success) { + return { ...editParsed.data, toolName: normalizedToolName }; + } + + // Codex apply_patch - try before read since it also uses files array + const applyPatchParsed = ApplyPatchToolCallSchema.safeParse({ input: data.input, result: data.result }); + if (applyPatchParsed.success) { + return { ...applyPatchParsed.data, toolName: normalizedToolName }; + } + + const readParsed = ReadToolCallSchema.safeParse({ input: data.input, result: data.result }); + if (readParsed.success) { + return { ...readParsed.data, toolName: normalizedToolName }; + } + + // Codex read_file + const codexReadParsed = CodexReadToolCallSchema.safeParse({ input: data.input, result: data.result }); + if (codexReadParsed.success) { + return { ...codexReadParsed.data, toolName: normalizedToolName }; + } + + // Fallback to generic + const genericParsed = GenericToolCallSchema.parse({ input: data.input, result: data.result }); + return { ...genericParsed, toolName: normalizedToolName }; + }); export type ToolCallDisplay = z.infer; -export function parseToolCallDisplay(input: unknown, result: unknown): ToolCallDisplay { - return ToolCallDisplaySchema.parse({ input, result }); +export function parseToolCallDisplay(toolName: string, input: unknown, result: unknown): ToolCallDisplay { + return ToolCallDisplaySchema.parse({ toolName, input, result }); } // ---- Principal Parameter Extraction ---- diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json new file mode 100644 index 000000000..cbab34ec4 --- /dev/null +++ b/packages/desktop/package-lock.json @@ -0,0 +1,233 @@ +{ + "name": "desktop", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "desktop", + "version": "1.0.0", + "license": "ISC", + "devDependencies": { + "@tauri-apps/cli": "^2.9.6" + } + }, + "node_modules/@tauri-apps/cli": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.9.6.tgz", + "integrity": "sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw==", + "dev": true, + "license": "Apache-2.0 OR MIT", + "bin": { + "tauri": "tauri.js" + }, + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/tauri" + }, + "optionalDependencies": { + "@tauri-apps/cli-darwin-arm64": "2.9.6", + "@tauri-apps/cli-darwin-x64": "2.9.6", + "@tauri-apps/cli-linux-arm-gnueabihf": "2.9.6", + "@tauri-apps/cli-linux-arm64-gnu": "2.9.6", + "@tauri-apps/cli-linux-arm64-musl": "2.9.6", + "@tauri-apps/cli-linux-riscv64-gnu": "2.9.6", + "@tauri-apps/cli-linux-x64-gnu": "2.9.6", + "@tauri-apps/cli-linux-x64-musl": "2.9.6", + "@tauri-apps/cli-win32-arm64-msvc": "2.9.6", + "@tauri-apps/cli-win32-ia32-msvc": "2.9.6", + "@tauri-apps/cli-win32-x64-msvc": "2.9.6" + } + }, + "node_modules/@tauri-apps/cli-darwin-arm64": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.9.6.tgz", + "integrity": "sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-darwin-x64": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.9.6.tgz", + "integrity": "sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.9.6.tgz", + "integrity": "sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.9.6.tgz", + "integrity": "sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-arm64-musl": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.9.6.tgz", + "integrity": "sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-riscv64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.9.6.tgz", + "integrity": "sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-x64-gnu": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.9.6.tgz", + "integrity": "sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-linux-x64-musl": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.9.6.tgz", + "integrity": "sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-arm64-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.9.6.tgz", + "integrity": "sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-ia32-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.9.6.tgz", + "integrity": "sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tauri-apps/cli-win32-x64-msvc": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.9.6.tgz", + "integrity": "sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 OR MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + } + } +} diff --git a/packages/desktop/package.json b/packages/desktop/package.json new file mode 100644 index 000000000..dcb4b6cab --- /dev/null +++ b/packages/desktop/package.json @@ -0,0 +1,14 @@ +{ + "name": "@paseo/desktop", + "version": "1.0.0", + "private": true, + "description": "Paseo desktop app (Tauri wrapper)", + "scripts": { + "dev": "tauri dev", + "build": "tauri build", + "tauri": "tauri" + }, + "devDependencies": { + "@tauri-apps/cli": "^2.9.6" + } +} diff --git a/packages/desktop/src-tauri/.gitignore b/packages/desktop/src-tauri/.gitignore new file mode 100644 index 000000000..502406b4e --- /dev/null +++ b/packages/desktop/src-tauri/.gitignore @@ -0,0 +1,4 @@ +# Generated by Cargo +# will have compiled files and executables +/target/ +/gen/schemas diff --git a/packages/desktop/src-tauri/Cargo.lock b/packages/desktop/src-tauri/Cargo.lock new file mode 100644 index 000000000..9a24f402e --- /dev/null +++ b/packages/desktop/src-tauri/Cargo.lock @@ -0,0 +1,4952 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.17", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_log-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d" + +[[package]] +name = "android_logger" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "atk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +dependencies = [ + "atk-sys", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +dependencies = [ + "serde_core", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2", +] + +[[package]] +name = "borsh" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" +dependencies = [ + "once_cell", + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "brotli" +version = "8.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" + +[[package]] +name = "byte-unit" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6d47a4e2961fb8721bcfc54feae6455f2f64e7054f9bc67e875f0e77f4c58d" +dependencies = [ + "rust_decimal", + "schemars 1.2.0", + "serde", + "utf8-width", +] + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytemuck" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.10.0", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror 1.0.69", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "camino" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "cargo_toml" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +dependencies = [ + "serde", + "toml 0.9.11+spec-1.1.0", +] + +[[package]] +name = "cc" +version = "1.2.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link 0.2.1", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.29.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf 0.10.1", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.114", +] + +[[package]] +name = "ctor" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +dependencies = [ + "quote", + "syn 2.0.114", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.114", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", + "serde_core", +] + +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.114", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.10.0", + "objc2", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "dlopen2" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "dpi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" +dependencies = [ + "serde", +] + +[[package]] +name = "dtoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "embed-resource" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.9.11+spec-1.1.0", + "vswhom", + "winreg", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "env_filter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "erased-serde" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fern" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4316185f709b23713e41e3195f90edef7fb00c3ed4adc79769cf09cc762a3b29" +dependencies = [ + "log", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" + +[[package]] +name = "flate2" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkx11" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib", + "libc", + "x11", +] + +[[package]] +name = "gdkx11-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps", + "x11", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", +] + +[[package]] +name = "gio" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.10.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "glib-macros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate 2.0.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +dependencies = [ + "atk", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" +dependencies = [ + "log", + "mac", + "markup5ever", + "match_token", +] + +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-util" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +dependencies = [ + "equivalent", + "hashbrown 0.16.1", + "serde", + "serde_core", +] + +[[package]] +name = "infer" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" +dependencies = [ + "cfb", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "itoa" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" + +[[package]] +name = "javascriptcore-rs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "jsonptr" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.10.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "kuchikiki" +version = "0.8.8-speedreader" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 2.13.0", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.180" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +dependencies = [ + "bitflags 2.10.0", + "libc", +] + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "markup5ever" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" +dependencies = [ + "log", + "phf 0.11.3", + "phf_codegen 0.11.3", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "match_token" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "muda" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" +dependencies = [ + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "once_cell", + "png", + "serde", + "thiserror 2.0.18", + "windows-sys 0.60.2", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.10.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror 1.0.69", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +dependencies = [ + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", + "objc2-exception-helper", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags 2.10.0", + "block2", + "libc", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-core-image" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", +] + +[[package]] +name = "objc2-core-video" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-io-surface", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags 2.10.0", + "block2", + "libc", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-javascript-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" +dependencies = [ + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", + "objc2-foundation", +] + +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.10.0", + "objc2", + "objc2-core-foundation", + "objc2-foundation", +] + +[[package]] +name = "objc2-web-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "objc2-javascript-core", + "objc2-security", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link 0.2.1", +] + +[[package]] +name = "paseo" +version = "0.1.0" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-log", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", +] + +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher 1.0.1", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "plist" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" +dependencies = [ + "base64 0.22.1", + "indexmap 2.13.0", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit 0.23.10+spec-1.0.0", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-xml" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror 2.0.18", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.12.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + +[[package]] +name = "rkyv" +version = "0.7.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rust_decimal" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schemars" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +dependencies = [ + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", + "uuid", +] + +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.114", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "selectors" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", +] + +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde-untagged" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" +dependencies = [ + "erased-serde", + "serde", + "serde_core", + "typeid", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "serde_json" +version = "1.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.13.0", + "schemars 0.9.0", + "schemars 1.2.0", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "softbuffer" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" +dependencies = [ + "bytemuck", + "js-sys", + "ndk", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "objc2-quartz-core", + "raw-window-handle", + "redox_syscall", + "tracing", + "wasm-bindgen", + "web-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "soup3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "string_cache" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.11.3", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "swift-rs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.2", + "version-compare", +] + +[[package]] +name = "tao" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" +dependencies = [ + "bitflags 2.10.0", + "block2", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "dlopen2", + "dpi", + "gdkwayland-sys", + "gdkx11-sys", + "gtk", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", + "parking_lot", + "raw-window-handle", + "scopeguard", + "tao-macros", + "unicode-segmentation", + "url", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tauri" +version = "2.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" +dependencies = [ + "anyhow", + "bytes", + "cookie", + "dirs", + "dunce", + "embed_plist", + "getrandom 0.3.4", + "glob", + "gtk", + "heck 0.5.0", + "http", + "jni", + "libc", + "log", + "mime", + "muda", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", + "objc2-web-kit", + "percent-encoding", + "plist", + "raw-window-handle", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "swift-rs", + "tauri-build", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "thiserror 2.0.18", + "tokio", + "tray-icon", + "url", + "webkit2gtk", + "webview2-com", + "window-vibrancy", + "windows", +] + +[[package]] +name = "tauri-build" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", + "json-patch", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "toml 0.9.11+spec-1.1.0", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" +dependencies = [ + "base64 0.22.1", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "sha2", + "syn 2.0.114", + "tauri-utils", + "thiserror 2.0.18", + "time", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.114", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377" +dependencies = [ + "anyhow", + "glob", + "plist", + "schemars 0.8.22", + "serde", + "serde_json", + "tauri-utils", + "toml 0.9.11+spec-1.1.0", + "walkdir", +] + +[[package]] +name = "tauri-plugin-log" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7545bd67f070a4500432c826e2e0682146a1d6712aee22a2786490156b574d93" +dependencies = [ + "android_logger", + "byte-unit", + "fern", + "log", + "objc2", + "objc2-foundation", + "serde", + "serde_json", + "serde_repr", + "swift-rs", + "tauri", + "tauri-plugin", + "thiserror 2.0.18", + "time", +] + +[[package]] +name = "tauri-runtime" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" +dependencies = [ + "cookie", + "dpi", + "gtk", + "http", + "jni", + "objc2", + "objc2-ui-kit", + "objc2-web-kit", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror 2.0.18", + "url", + "webkit2gtk", + "webview2-com", + "windows", +] + +[[package]] +name = "tauri-runtime-wry" +version = "2.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" +dependencies = [ + "gtk", + "http", + "jni", + "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", + "percent-encoding", + "raw-window-handle", + "softbuffer", + "tao", + "tauri-runtime", + "tauri-utils", + "url", + "webkit2gtk", + "webview2-com", + "windows", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" +dependencies = [ + "anyhow", + "brotli", + "cargo_metadata", + "ctor", + "dunce", + "glob", + "html5ever", + "http", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.3", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "swift-rs", + "thiserror 2.0.18", + "toml 0.9.11+spec-1.1.0", + "url", + "urlpattern", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-winres" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" +dependencies = [ + "dunce", + "embed-resource", + "toml 0.9.11+spec-1.1.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "time" +version = "0.3.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" + +[[package]] +name = "time-macros" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml" +version = "0.9.11+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +dependencies = [ + "indexmap 2.13.0", + "serde_core", + "serde_spanned 1.0.4", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow 0.7.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.7.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.13.0", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.13.0", + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.3", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.23.10+spec-1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +dependencies = [ + "indexmap 2.13.0", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "winnow 0.7.14", +] + +[[package]] +name = "toml_parser" +version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +dependencies = [ + "winnow 0.7.14", +] + +[[package]] +name = "toml_writer" +version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tray-icon" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c" +dependencies = [ + "crossbeam-channel", + "dirs", + "libappindicator", + "muda", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "once_cell", + "png", + "serde", + "thiserror 2.0.18", + "windows-sys 0.60.2", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", + "serde_derive", +] + +[[package]] +name = "urlpattern" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +dependencies = [ + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1292c0d970b54115d14f2492fe0170adf21d68a1de108eebc51c1df4f346a091" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "serde_core", + "wasm-bindgen", +] + +[[package]] +name = "value-bag" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" + +[[package]] +name = "version-compare" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +dependencies = [ + "cfg-if", + "futures-util", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.114", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup3", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pkg-config", + "soup3-sys", + "system-deps", +] + +[[package]] +name = "webview2-com" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows", + "windows-core 0.61.2", + "windows-implement", + "windows-interface", +] + +[[package]] +name = "webview2-com-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "webview2-com-sys" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c" +dependencies = [ + "thiserror 2.0.18", + "windows", + "windows-core 0.61.2", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-vibrancy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" +dependencies = [ + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "raw-window-handle", + "windows-sys 0.59.0", + "windows-version", +] + +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +dependencies = [ + "cfg-if", + "windows-sys 0.59.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "wry" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" +dependencies = [ + "base64 0.22.1", + "block2", + "cookie", + "crossbeam-channel", + "dirs", + "dpi", + "dunce", + "gdkx11", + "gtk", + "html5ever", + "http", + "javascriptcore-rs", + "jni", + "kuchikiki", + "libc", + "ndk", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "objc2-ui-kit", + "objc2-web-kit", + "once_cell", + "percent-encoding", + "raw-window-handle", + "sha2", + "soup3", + "tao-macros", + "thiserror 2.0.18", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows", + "windows-core 0.61.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "zmij" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2" diff --git a/packages/desktop/src-tauri/Cargo.toml b/packages/desktop/src-tauri/Cargo.toml new file mode 100644 index 000000000..ad189adee --- /dev/null +++ b/packages/desktop/src-tauri/Cargo.toml @@ -0,0 +1,29 @@ +[package] +name = "paseo" +version = "0.1.0" +description = "Paseo Desktop" +authors = ["moboudra"] +license = "MIT" +repository = "https://github.com/moboudra/paseo" +edition = "2021" +rust-version = "1.77.2" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[lib] +name = "paseo_lib" +crate-type = ["staticlib", "cdylib", "rlib"] + +[[bin]] +name = "Paseo" +path = "src/main.rs" + +[build-dependencies] +tauri-build = { version = "2.5.3", features = [] } + +[dependencies] +serde_json = "1.0" +serde = { version = "1.0", features = ["derive"] } +log = "0.4" +tauri = { version = "2.9.5", features = [] } +tauri-plugin-log = "2" diff --git a/packages/desktop/src-tauri/build.rs b/packages/desktop/src-tauri/build.rs new file mode 100644 index 000000000..795b9b7c8 --- /dev/null +++ b/packages/desktop/src-tauri/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/packages/desktop/src-tauri/capabilities/default.json b/packages/desktop/src-tauri/capabilities/default.json new file mode 100644 index 000000000..2dee8d1b9 --- /dev/null +++ b/packages/desktop/src-tauri/capabilities/default.json @@ -0,0 +1,13 @@ +{ + "$schema": "../gen/schemas/desktop-schema.json", + "identifier": "default", + "description": "enables the default permissions", + "windows": [ + "main" + ], + "permissions": [ + "core:default", + "core:window:allow-start-dragging", + "core:window:allow-toggle-maximize" + ] +} diff --git a/packages/desktop/src-tauri/icons/128x128.png b/packages/desktop/src-tauri/icons/128x128.png new file mode 100644 index 000000000..5dd7a1a50 Binary files /dev/null and b/packages/desktop/src-tauri/icons/128x128.png differ diff --git a/packages/desktop/src-tauri/icons/128x128@2x.png b/packages/desktop/src-tauri/icons/128x128@2x.png new file mode 100644 index 000000000..dd0404f40 Binary files /dev/null and b/packages/desktop/src-tauri/icons/128x128@2x.png differ diff --git a/packages/desktop/src-tauri/icons/32x32.png b/packages/desktop/src-tauri/icons/32x32.png new file mode 100644 index 000000000..1cb7bb83c Binary files /dev/null and b/packages/desktop/src-tauri/icons/32x32.png differ diff --git a/packages/desktop/src-tauri/icons/64x64.png b/packages/desktop/src-tauri/icons/64x64.png new file mode 100644 index 000000000..d1e23ce41 Binary files /dev/null and b/packages/desktop/src-tauri/icons/64x64.png differ diff --git a/packages/desktop/src-tauri/icons/Square107x107Logo.png b/packages/desktop/src-tauri/icons/Square107x107Logo.png new file mode 100644 index 000000000..cf1be2299 Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square107x107Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square142x142Logo.png b/packages/desktop/src-tauri/icons/Square142x142Logo.png new file mode 100644 index 000000000..bf1d3a545 Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square142x142Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square150x150Logo.png b/packages/desktop/src-tauri/icons/Square150x150Logo.png new file mode 100644 index 000000000..8391af43d Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square150x150Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square284x284Logo.png b/packages/desktop/src-tauri/icons/Square284x284Logo.png new file mode 100644 index 000000000..6273e28ce Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square284x284Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square30x30Logo.png b/packages/desktop/src-tauri/icons/Square30x30Logo.png new file mode 100644 index 000000000..6b3f9902c Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square30x30Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square310x310Logo.png b/packages/desktop/src-tauri/icons/Square310x310Logo.png new file mode 100644 index 000000000..81b45b1b7 Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square310x310Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square44x44Logo.png b/packages/desktop/src-tauri/icons/Square44x44Logo.png new file mode 100644 index 000000000..1942533c3 Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square44x44Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square71x71Logo.png b/packages/desktop/src-tauri/icons/Square71x71Logo.png new file mode 100644 index 000000000..7a25884cf Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square71x71Logo.png differ diff --git a/packages/desktop/src-tauri/icons/Square89x89Logo.png b/packages/desktop/src-tauri/icons/Square89x89Logo.png new file mode 100644 index 000000000..eb75102d6 Binary files /dev/null and b/packages/desktop/src-tauri/icons/Square89x89Logo.png differ diff --git a/packages/desktop/src-tauri/icons/StoreLogo.png b/packages/desktop/src-tauri/icons/StoreLogo.png new file mode 100644 index 000000000..37804fead Binary files /dev/null and b/packages/desktop/src-tauri/icons/StoreLogo.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..2ffbf24b6 --- /dev/null +++ b/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..2481390b0 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..9da5b6def Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..f797f0443 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..def890fc3 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..050a59499 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..12a0d2cef Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..3d5eba088 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..be486bf3e Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..0f40806fa Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..4aa7b7aff Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..30449a4f0 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e15ca4d56 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..cc8c7eb88 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..061105f11 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..c9271e1a4 Binary files /dev/null and b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml b/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml new file mode 100644 index 000000000..ea9c223a6 --- /dev/null +++ b/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #fff + \ No newline at end of file diff --git a/packages/desktop/src-tauri/icons/icon.icns b/packages/desktop/src-tauri/icons/icon.icns new file mode 100644 index 000000000..ef142f824 Binary files /dev/null and b/packages/desktop/src-tauri/icons/icon.icns differ diff --git a/packages/desktop/src-tauri/icons/icon.ico b/packages/desktop/src-tauri/icons/icon.ico new file mode 100644 index 000000000..679652180 Binary files /dev/null and b/packages/desktop/src-tauri/icons/icon.ico differ diff --git a/packages/desktop/src-tauri/icons/icon.png b/packages/desktop/src-tauri/icons/icon.png new file mode 100644 index 000000000..035a7814a Binary files /dev/null and b/packages/desktop/src-tauri/icons/icon.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png new file mode 100644 index 000000000..787d776b9 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png new file mode 100644 index 000000000..bc28ce3e3 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png new file mode 100644 index 000000000..bc28ce3e3 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png new file mode 100644 index 000000000..9490c65bb Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png new file mode 100644 index 000000000..eb73ffa18 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png new file mode 100644 index 000000000..68a8965ca Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png new file mode 100644 index 000000000..68a8965ca Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png new file mode 100644 index 000000000..df5d03c6c Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png new file mode 100644 index 000000000..bc28ce3e3 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png new file mode 100644 index 000000000..2300e5b7d Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png new file mode 100644 index 000000000..2300e5b7d Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png new file mode 100644 index 000000000..506498926 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png new file mode 100644 index 000000000..db7297ea0 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png new file mode 100644 index 000000000..506498926 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png new file mode 100644 index 000000000..4366ab702 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png new file mode 100644 index 000000000..5bb59f59d Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png new file mode 100644 index 000000000..c7afe7f8f Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png differ diff --git a/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png new file mode 100644 index 000000000..0d555db08 Binary files /dev/null and b/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs new file mode 100644 index 000000000..9990c6c61 --- /dev/null +++ b/packages/desktop/src-tauri/src/lib.rs @@ -0,0 +1,72 @@ +use std::sync::atomic::{AtomicU64, Ordering}; +use tauri::menu::{Menu, MenuItemBuilder, Submenu}; +use tauri::Manager; +use tauri::WebviewWindow; + +// Store zoom as u64 bits (f64 * 100 as integer for atomic ops) +static ZOOM_LEVEL: AtomicU64 = AtomicU64::new(100); + +fn get_zoom_factor() -> f64 { + ZOOM_LEVEL.load(Ordering::Relaxed) as f64 / 100.0 +} + +fn set_zoom_factor(webview: &WebviewWindow, factor: f64) { + let clamped = factor.clamp(0.5, 3.0); + ZOOM_LEVEL.store((clamped * 100.0) as u64, Ordering::Relaxed); + let _ = webview.set_zoom(clamped); +} + +#[cfg_attr(mobile, tauri::mobile_entry_point)] +pub fn run() { + tauri::Builder::default() + .setup(|app| { + if cfg!(debug_assertions) { + app.handle().plugin( + tauri_plugin_log::Builder::default() + .level(log::LevelFilter::Info) + .build(), + )?; + } + + // Build the View menu with zoom controls + let zoom_in = MenuItemBuilder::with_id("zoom_in", "Zoom In") + .accelerator("CmdOrCtrl+=") + .build(app)?; + let zoom_out = MenuItemBuilder::with_id("zoom_out", "Zoom Out") + .accelerator("CmdOrCtrl+-") + .build(app)?; + let zoom_reset = MenuItemBuilder::with_id("zoom_reset", "Actual Size") + .accelerator("CmdOrCtrl+0") + .build(app)?; + + let view_menu = Submenu::with_items( + app, + "View", + true, + &[&zoom_in, &zoom_out, &zoom_reset], + )?; + + let menu = Menu::with_items(app, &[&view_menu])?; + app.set_menu(menu)?; + + let window = app.get_webview_window("main").unwrap(); + let window_clone = window.clone(); + + app.on_menu_event(move |_app, event| { + let id = event.id().as_ref(); + if id == "zoom_in" { + let current = get_zoom_factor(); + set_zoom_factor(&window_clone, current + 0.1); + } else if id == "zoom_out" { + let current = get_zoom_factor(); + set_zoom_factor(&window_clone, current - 0.1); + } else if id == "zoom_reset" { + set_zoom_factor(&window_clone, 1.0); + } + }); + + Ok(()) + }) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} diff --git a/packages/desktop/src-tauri/src/main.rs b/packages/desktop/src-tauri/src/main.rs new file mode 100644 index 000000000..fc1caf371 --- /dev/null +++ b/packages/desktop/src-tauri/src/main.rs @@ -0,0 +1,6 @@ +// Prevents additional console window on Windows in release, DO NOT REMOVE!! +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + +fn main() { + paseo_lib::run(); +} diff --git a/packages/desktop/src-tauri/tauri.conf.json b/packages/desktop/src-tauri/tauri.conf.json new file mode 100644 index 000000000..848b97460 --- /dev/null +++ b/packages/desktop/src-tauri/tauri.conf.json @@ -0,0 +1,41 @@ +{ + "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", + "productName": "Paseo", + "version": "0.1.0", + "identifier": "dev.paseo.desktop", + "build": { + "frontendDist": "../../app/dist", + "devUrl": "http://localhost:8081" + }, + "app": { + "withGlobalTauri": true, + "windows": [ + { + "title": "Paseo", + "width": 1200, + "height": 800, + "minWidth": 800, + "minHeight": 600, + "resizable": true, + "fullscreen": false, + "titleBarStyle": "Overlay", + "hiddenTitle": true, + "trafficLightPosition": { "x": 16, "y": 22 } + } + ], + "security": { + "csp": null + } + }, + "bundle": { + "active": true, + "targets": "all", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] + } +} diff --git a/packages/server/package.json b/packages/server/package.json index ba4540299..9fb248dcb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -33,11 +33,13 @@ "@modelcontextprotocol/sdk": "^1.20.1", "@opencode-ai/sdk": "^1.1.12", "@openrouter/ai-sdk-provider": "^1.2.0", + "@xterm/headless": "^6.0.0", "ai": "^5.0.76", "dotenv": "^17.2.3", "express": "^4.18.2", "express-basic-auth": "^1.2.1", "mnemonic-id": "^3.2.7", + "node-pty": "^1.0.0", "openai": "^4.20.0", "pino": "^10.2.0", "pino-pretty": "^13.1.3", diff --git a/packages/server/src/client/daemon-client-v2.ts b/packages/server/src/client/daemon-client-v2.ts index 3ca26ff98..34b1638a7 100644 --- a/packages/server/src/client/daemon-client-v2.ts +++ b/packages/server/src/client/daemon-client-v2.ts @@ -24,7 +24,12 @@ import type { ListCommandsResponse, ListConversationsResponseMessage, ListProviderModelsResponseMessage, - SendAgentAudio, + ListTerminalsResponse, + CreateTerminalResponse, + SubscribeTerminalResponse, + TerminalOutput, + KillTerminalResponse, + TerminalInput, SendAgentMessage, SessionInboundMessage, SessionOutboundMessage, @@ -137,7 +142,11 @@ export type DaemonClientV2Config = { export type SendMessageOptions = Pick; -export type SendAgentAudioOptions = Omit; +export type TranscribeAudioOptions = { + audio: string; // base64 encoded + format: string; + timeout?: number; +}; type AgentConfigOverrides = Partial>; @@ -164,6 +173,11 @@ type ListProviderModelsPayload = ListProviderModelsResponseMessage["payload"]; type ListCommandsPayload = ListCommandsResponse["payload"]; type TranscriptionResultPayload = TranscriptionResultMessage["payload"]; type AgentPermissionResolvedPayload = AgentPermissionResolvedMessage["payload"]; +type ListTerminalsPayload = ListTerminalsResponse["payload"]; +type CreateTerminalPayload = CreateTerminalResponse["payload"]; +type SubscribeTerminalPayload = SubscribeTerminalResponse["payload"]; +type TerminalOutputPayload = TerminalOutput["payload"]; +type KillTerminalPayload = KillTerminalResponse["payload"]; type AgentCreateFailedStatusPayload = z.infer< typeof AgentCreateFailedStatusPayloadSchema @@ -811,28 +825,13 @@ export class DaemonClientV2 { await this.sendAgentMessage(agentId, text, options); } - async sendAgentAudio(options: SendAgentAudioOptions): Promise { - const requestId = options.requestId ?? this.createRequestId(); - const message = SessionInboundMessageSchema.parse({ - type: "send_agent_audio", - ...(options.agentId ? { agentId: options.agentId } : {}), - audio: options.audio, - format: options.format, - isLast: options.isLast, - requestId, - ...(options.mode ? { mode: options.mode } : {}), - }); - this.sendSessionMessage(message); - } - - async waitForTranscriptionResult( - requestId: string, - timeout = 120000 + async transcribeAudio( + options: TranscribeAudioOptions ): Promise { - if (!requestId) { - throw new Error("requestId is required"); - } - return this.waitFor( + const requestId = this.createRequestId(); + const timeout = options.timeout ?? 120000; + + const responsePromise = this.waitFor( (msg) => { if (msg.type !== "transcription_result") { return null; @@ -845,6 +844,16 @@ export class DaemonClientV2 { timeout, { skipQueue: true } ); + + const message = SessionInboundMessageSchema.parse({ + type: "transcribe_audio_request", + audio: options.audio, + format: options.format, + requestId, + }); + this.sendSessionMessage(message); + + return responsePromise; } async cancelAgent(agentId: string): Promise { @@ -1399,6 +1408,157 @@ export class DaemonClientV2 { ); } + // ============================================================================ + // Terminals + // ============================================================================ + + async listTerminals( + cwd: string, + requestId?: string + ): Promise { + const resolvedRequestId = this.createRequestId(requestId); + const message = SessionInboundMessageSchema.parse({ + type: "list_terminals_request", + cwd, + requestId: resolvedRequestId, + }); + const response = this.waitFor( + (msg) => { + if (msg.type !== "list_terminals_response") { + return null; + } + if (msg.payload.requestId !== resolvedRequestId) { + return null; + } + return msg.payload; + }, + 10000, + { skipQueue: true } + ); + this.sendSessionMessage(message); + return response; + } + + async createTerminal( + cwd: string, + name?: string, + requestId?: string + ): Promise { + const resolvedRequestId = this.createRequestId(requestId); + const message = SessionInboundMessageSchema.parse({ + type: "create_terminal_request", + cwd, + name, + requestId: resolvedRequestId, + }); + const response = this.waitFor( + (msg) => { + if (msg.type !== "create_terminal_response") { + return null; + } + if (msg.payload.requestId !== resolvedRequestId) { + return null; + } + return msg.payload; + }, + 10000, + { skipQueue: true } + ); + this.sendSessionMessage(message); + return response; + } + + async subscribeTerminal( + terminalId: string, + requestId?: string + ): Promise { + const resolvedRequestId = this.createRequestId(requestId); + const message = SessionInboundMessageSchema.parse({ + type: "subscribe_terminal_request", + terminalId, + requestId: resolvedRequestId, + }); + const response = this.waitFor( + (msg) => { + if (msg.type !== "subscribe_terminal_response") { + return null; + } + if (msg.payload.requestId !== resolvedRequestId) { + return null; + } + return msg.payload; + }, + 10000, + { skipQueue: true } + ); + this.sendSessionMessage(message); + return response; + } + + unsubscribeTerminal(terminalId: string): void { + this.sendSessionMessage({ + type: "unsubscribe_terminal_request", + terminalId, + }); + } + + sendTerminalInput( + terminalId: string, + message: TerminalInput["message"] + ): void { + this.sendSessionMessage({ + type: "terminal_input", + terminalId, + message, + }); + } + + async killTerminal( + terminalId: string, + requestId?: string + ): Promise { + const resolvedRequestId = this.createRequestId(requestId); + const message = SessionInboundMessageSchema.parse({ + type: "kill_terminal_request", + terminalId, + requestId: resolvedRequestId, + }); + const response = this.waitFor( + (msg) => { + if (msg.type !== "kill_terminal_response") { + return null; + } + if (msg.payload.requestId !== resolvedRequestId) { + return null; + } + return msg.payload; + }, + 10000, + { skipQueue: true } + ); + this.sendSessionMessage(message); + return response; + } + + async waitForTerminalOutput( + terminalId: string, + timeout = 5000 + ): Promise { + return this.waitFor( + (msg) => { + if (msg.type !== "terminal_output") { + return null; + } + if (msg.payload.terminalId !== terminalId) { + return null; + } + return msg.payload; + }, + timeout, + { skipQueue: true } + ); + } + // ============================================================================ // Internals // ============================================================================ diff --git a/packages/server/src/server/agent/agent-mcp.e2e.test.ts b/packages/server/src/server/agent/agent-mcp.e2e.test.ts index fb1b65266..4e916f922 100644 --- a/packages/server/src/server/agent/agent-mcp.e2e.test.ts +++ b/packages/server/src/server/agent/agent-mcp.e2e.test.ts @@ -91,17 +91,6 @@ describe("agent MCP end-to-end", () => { const staticDir = await mkdtemp(path.join(os.tmpdir(), "paseo-static-")); const agentCwd = await mkdtemp(path.join(os.tmpdir(), "paseo-agent-cwd-")); const port = await getAvailablePort(); - const basicUsers = { test: "pass" }; - const [agentMcpUser, agentMcpPassword] = - Object.entries(basicUsers)[0] ?? []; - const agentMcpAuthHeader = - agentMcpUser && agentMcpPassword - ? `Basic ${Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64")}` - : undefined; - const agentMcpBearerToken = - agentMcpUser && agentMcpPassword - ? Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64") - : undefined; const daemonConfig: PaseoDaemonConfig = { listen: `${port}`, @@ -109,21 +98,12 @@ describe("agent MCP end-to-end", () => { corsAllowedOrigins: [], agentMcpRoute: "/mcp/agents", agentMcpAllowedHosts: [`127.0.0.1:${port}`, `localhost:${port}`], - auth: { - basicUsers, - agentMcpAuthHeader, - agentMcpBearerToken, - realm: "Voice Assistant", - }, staticDir, mcpDebug: false, agentClients: {}, agentRegistryPath: path.join(paseoHome, "agents.json"), agentControlMcp: { url: `http://127.0.0.1:${port}/mcp/agents`, - ...(agentMcpAuthHeader - ? { headers: { Authorization: agentMcpAuthHeader } } - : {}), }, }; @@ -140,10 +120,7 @@ describe("agent MCP end-to-end", () => { await daemon.start(); const transport = new StreamableHTTPClientTransport( - new URL(`http://127.0.0.1:${port}/mcp/agents`), - agentMcpAuthHeader - ? { requestInit: { headers: { Authorization: agentMcpAuthHeader } } } - : undefined + new URL(`http://127.0.0.1:${port}/mcp/agents`) ); const client = (await experimental_createMCPClient({ transport, @@ -247,17 +224,6 @@ describe("agent MCP end-to-end", () => { const staticDir = await mkdtemp(path.join(os.tmpdir(), "paseo-static-")); const agentCwd = await mkdtemp(path.join(os.tmpdir(), "paseo-agent-cwd-")); const port = await getAvailablePort(); - const basicUsers = { test: "pass" }; - const [agentMcpUser, agentMcpPassword] = - Object.entries(basicUsers)[0] ?? []; - const agentMcpAuthHeader = - agentMcpUser && agentMcpPassword - ? `Basic ${Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64")}` - : undefined; - const agentMcpBearerToken = - agentMcpUser && agentMcpPassword - ? Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64") - : undefined; const daemonConfig: PaseoDaemonConfig = { listen: `${port}`, @@ -265,21 +231,12 @@ describe("agent MCP end-to-end", () => { corsAllowedOrigins: [], agentMcpRoute: "/mcp/agents", agentMcpAllowedHosts: [`127.0.0.1:${port}`, `localhost:${port}`], - auth: { - basicUsers, - agentMcpAuthHeader, - agentMcpBearerToken, - realm: "Voice Assistant", - }, staticDir, mcpDebug: false, agentClients: {}, agentRegistryPath: path.join(paseoHome, "agents.json"), agentControlMcp: { url: `http://127.0.0.1:${port}/mcp/agents`, - ...(agentMcpAuthHeader - ? { headers: { Authorization: agentMcpAuthHeader } } - : {}), }, }; @@ -296,10 +253,7 @@ describe("agent MCP end-to-end", () => { await daemon.start(); const transport = new StreamableHTTPClientTransport( - new URL(`http://127.0.0.1:${port}/mcp/agents`), - agentMcpAuthHeader - ? { requestInit: { headers: { Authorization: agentMcpAuthHeader } } } - : undefined + new URL(`http://127.0.0.1:${port}/mcp/agents`) ); const client = (await experimental_createMCPClient({ transport, diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts index 07e498135..993ca4b14 100644 --- a/packages/server/src/server/bootstrap.ts +++ b/packages/server/src/server/bootstrap.ts @@ -1,5 +1,4 @@ import express from "express"; -import basicAuth from "express-basic-auth"; import { createServer as createHTTPServer } from "http"; import { createReadStream, unlinkSync, existsSync } from "fs"; import { stat } from "fs/promises"; @@ -49,6 +48,7 @@ import { initializeTitleGenerator } from "../services/agent-title-generator.js"; import { attachAgentRegistryPersistence } from "./persistence-hooks.js"; import { createAgentMcpServer } from "./agent/mcp-server.js"; import { createAllClients, shutdownProviders } from "./agent/provider-registry.js"; +import { createTerminalManager, type TerminalManager } from "../terminal/terminal-manager.js"; import type { AgentClient, AgentControlMcpConfig, @@ -57,13 +57,6 @@ import type { type AgentMcpTransportMap = Map; -export type PaseoAuthConfig = { - basicUsers: Record; - realm?: string; - agentMcpBearerToken?: string; - agentMcpAuthHeader?: string; -}; - export type PaseoOpenAIConfig = { apiKey?: string; stt?: Partial & { apiKey?: string }; @@ -76,7 +69,6 @@ export type PaseoDaemonConfig = { corsAllowedOrigins: string[]; agentMcpRoute: string; agentMcpAllowedHosts: string[]; - auth: PaseoAuthConfig; staticDir: string; mcpDebug: boolean; agentClients: Partial>; @@ -90,6 +82,7 @@ export interface PaseoDaemon { config: PaseoDaemonConfig; agentManager: AgentManager; agentRegistry: AgentRegistry; + terminalManager: TerminalManager; start(): Promise; stop(): Promise; } @@ -101,13 +94,9 @@ export async function createPaseoDaemon( const logger = rootLogger.child({ module: "bootstrap" }); const agentMcpRoute = config.agentMcpRoute; - const basicAuthUsers = config.auth.basicUsers; const staticDir = config.staticDir; - const authRealm = config.auth.realm ?? "Voice Assistant"; const downloadTokenTtlMs = config.downloadTokenTtlMs ?? 60000; - const agentMcpBearerToken = config.auth.agentMcpBearerToken; - const downloadTokenStore = new DownloadTokenStore({ ttlMs: downloadTokenTtlMs }); const listenTarget = parseListenString(config.listen); @@ -142,31 +131,9 @@ export async function createPaseoDaemon( next(); }); - // Serve static files from public directory (no auth required for APK downloads) + // Serve static files from public directory app.use("/public", express.static(staticDir)); - // Basic authentication (skip for /public routes) - const basicAuthMiddleware = basicAuth({ - users: basicAuthUsers, - challenge: true, - realm: authRealm, - }); - app.use((req, res, next) => { - if (req.path === "/api/files/download") { - return next(); - } - if (agentMcpBearerToken && req.path.startsWith(agentMcpRoute)) { - const authHeader = req.header("authorization") ?? ""; - if (authHeader.startsWith("Bearer ")) { - const token = authHeader.slice("Bearer ".length).trim(); - if (token === agentMcpBearerToken) { - return next(); - } - } - } - return basicAuthMiddleware(req, res, next); - }); - // Middleware app.use(express.json()); @@ -260,6 +227,8 @@ export async function createPaseoDaemon( logger, }); + const terminalManager = createTerminalManager(); + attachAgentRegistryPersistence(logger, agentManager, agentRegistry); const persistedRecords = await agentRegistry.list(); logger.info( @@ -425,7 +394,8 @@ export async function createPaseoDaemon( agentMcpHeaders: config.agentControlMcp.headers, }, { allowedOrigins }, - { stt: sttService, tts: ttsService } + { stt: sttService, tts: ttsService }, + terminalManager ); const start = async () => { @@ -464,6 +434,7 @@ export async function createPaseoDaemon( const stop = async () => { await closeAllAgents(logger, agentManager); await shutdownProviders(logger); + terminalManager.killAll(); await wsServer.close(); await new Promise((resolve) => { httpServer.close(() => resolve()); @@ -478,6 +449,7 @@ export async function createPaseoDaemon( config, agentManager, agentRegistry, + terminalManager, start, stop, }; diff --git a/packages/server/src/server/client-activity.e2e.test.ts b/packages/server/src/server/client-activity.e2e.test.ts index 24845be05..c6f37d022 100644 --- a/packages/server/src/server/client-activity.e2e.test.ts +++ b/packages/server/src/server/client-activity.e2e.test.ts @@ -49,7 +49,6 @@ describe("client activity tracking", () => { async function createClient(): Promise { const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, - authHeader: daemon.agentMcpAuthHeader, messageQueueLimit: null, }); await client.connect(); diff --git a/packages/server/src/server/config.ts b/packages/server/src/server/config.ts index 3e1dbe298..b76babf1b 100644 --- a/packages/server/src/server/config.ts +++ b/packages/server/src/server/config.ts @@ -6,7 +6,6 @@ import type { TTSConfig } from "./agent/tts-openai.js"; import { loadPersistedConfig } from "./persisted-config.js"; const DEFAULT_LISTEN = "127.0.0.1:6767"; -const DEFAULT_BASIC_AUTH_USERS = { mo: "bo" } as const; const DEFAULT_AGENT_MCP_ROUTE = "/mcp/agents"; function parseOpenAIConfig(env: NodeJS.ProcessEnv) { @@ -68,17 +67,6 @@ export function loadConfig( const listen = env.PASEO_LISTEN ?? persisted.listen ?? DEFAULT_LISTEN; const mcpListen = getListenForMcp(listen); - const basicUsers = DEFAULT_BASIC_AUTH_USERS; - const [agentMcpUser, agentMcpPassword] = Object.entries(basicUsers)[0] ?? []; - const agentMcpAuthHeader = - agentMcpUser && agentMcpPassword - ? `Basic ${Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64")}` - : undefined; - const agentMcpBearerToken = - agentMcpUser && agentMcpPassword - ? Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64") - : undefined; - const envCorsOrigins = env.PASEO_CORS_ORIGINS ? env.PASEO_CORS_ORIGINS.split(",").map((s) => s.trim()) : []; @@ -89,18 +77,9 @@ export function loadConfig( corsAllowedOrigins: [...persisted.cors.allowedOrigins, ...envCorsOrigins], agentMcpRoute: DEFAULT_AGENT_MCP_ROUTE, agentMcpAllowedHosts: [mcpListen, `localhost:${mcpListen.split(":")[1]}`], - auth: { - basicUsers, - agentMcpAuthHeader, - agentMcpBearerToken, - realm: "Voice Assistant", - }, mcpDebug: env.MCP_DEBUG === "1", agentControlMcp: { url: `http://${mcpListen}${DEFAULT_AGENT_MCP_ROUTE}`, - ...(agentMcpAuthHeader - ? { headers: { Authorization: agentMcpAuthHeader } } - : {}), }, agentRegistryPath: path.join(paseoHome, "agents.json"), staticDir: "public", diff --git a/packages/server/src/server/daemon-client-v2.e2e.test.ts b/packages/server/src/server/daemon-client-v2.e2e.test.ts index 6735b3a90..9eb4bfce0 100644 --- a/packages/server/src/server/daemon-client-v2.e2e.test.ts +++ b/packages/server/src/server/daemon-client-v2.e2e.test.ts @@ -9,6 +9,7 @@ import { createDaemonTestContext, type DaemonTestContext, } from "./test-utils/index.js"; +import { getFullAccessConfig, getAskModeConfig } from "./daemon-e2e/agent-configs.js"; const defaultEnvPath = path.resolve(process.cwd(), ".env"); const fallbackEnvPath = path.resolve(process.cwd(), "packages", "server", ".env"); @@ -26,10 +27,6 @@ function tmpCwd(): string { return mkdtempSync(path.join(tmpdir(), "daemon-client-v2-")); } -// Use gpt-5.1-codex-mini with low reasoning effort for faster test execution -const CODEX_TEST_MODEL = "gpt-5.1-codex-mini"; -const CODEX_TEST_REASONING_EFFORT = "low"; - function waitForSignal( timeoutMs: number, setup: ( @@ -155,9 +152,7 @@ describe("daemon client v2 E2E", () => { }); const agent = await ctx.client.createAgent({ - provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT, - model: CODEX_TEST_MODEL, - reasoningEffort: CODEX_TEST_REASONING_EFFORT, + ...getFullAccessConfig("codex"), cwd, title: "Daemon Client V2", requestId: createRequestId, @@ -198,9 +193,7 @@ describe("daemon client v2 E2E", () => { }); const failResult = await ctx.client.createAgentExpectFail({ - provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT, - model: CODEX_TEST_MODEL, - reasoningEffort: CODEX_TEST_REASONING_EFFORT, + ...getFullAccessConfig("codex"), cwd: "/this/path/does/not/exist/12345", title: "Should Fail", requestId: failRequestId, @@ -409,12 +402,9 @@ describe("daemon client v2 E2E", () => { const filePath = path.join(cwd, "permission.txt"); const agent = await ctx.client.createAgent({ - provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT, - model: CODEX_TEST_MODEL, - reasoningEffort: CODEX_TEST_REASONING_EFFORT, + ...getAskModeConfig("codex"), cwd, title: "Permission Test", - modeId: "auto", }); const permissionRequestPromise = waitForSignal(60000, (resolve) => { @@ -485,9 +475,7 @@ describe("daemon client v2 E2E", () => { async () => { const cwd = tmpCwd(); const agent = await ctx.client.createAgent({ - provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT, - model: CODEX_TEST_MODEL, - reasoningEffort: CODEX_TEST_REASONING_EFFORT, + ...getFullAccessConfig("codex"), cwd, title: "Raw Events Test", }); @@ -668,9 +656,7 @@ describe("daemon client v2 E2E", () => { writeFileSync(downloadFile, downloadContents, "utf-8"); const agent = await ctx.client.createAgent({ - provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT, - model: CODEX_TEST_MODEL, - reasoningEffort: CODEX_TEST_REASONING_EFFORT, + ...getFullAccessConfig("codex"), cwd, title: "Git/File Test", }); @@ -871,12 +857,8 @@ describe("daemon client v2 E2E", () => { expect(tokenMessage.payload.agentId).toBe(agent.id); expect(tokenMessage.payload.requestId).toBe(tokenRequestId); - const authHeader = ctx.daemon.agentMcpAuthHeader; - expect(authHeader).toBeTruthy(); - const response = await fetch( - `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`, - { headers: { Authorization: authHeader! } } + `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}` ); expect(response.status).toBe(200); diff --git a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts index b94128e96..d2c34b97c 100644 --- a/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts +++ b/packages/server/src/server/daemon-e2e/file-download.e2e.test.ts @@ -54,12 +54,8 @@ describe("daemon E2E", () => { expect(tokenResponse.token).toBeTruthy(); expect(tokenResponse.fileName).toBe("download.txt"); - const authHeader = ctx.daemon.agentMcpAuthHeader; - expect(authHeader).toBeTruthy(); - const response = await fetch( - `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`, - { headers: { Authorization: authHeader! } } + `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}` ); expect(response.status).toBe(200); @@ -80,12 +76,8 @@ describe("daemon E2E", () => { test( "rejects invalid token", async () => { - const authHeader = ctx.daemon.agentMcpAuthHeader; - expect(authHeader).toBeTruthy(); - const response = await fetch( - `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=invalid-token`, - { headers: { Authorization: authHeader! } } + `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=invalid-token` ); expect(response.status).toBe(403); @@ -119,12 +111,8 @@ describe("daemon E2E", () => { await new Promise((resolve) => setTimeout(resolve, 150)); - const authHeader = ctx.daemon.agentMcpAuthHeader; - expect(authHeader).toBeTruthy(); - const response = await fetch( - `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}`, - { headers: { Authorization: authHeader! } } + `http://127.0.0.1:${ctx.daemon.port}/api/files/download?token=${tokenResponse.token}` ); expect(response.status).toBe(403); diff --git a/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts b/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts new file mode 100644 index 000000000..da04265f7 --- /dev/null +++ b/packages/server/src/server/daemon-e2e/terminal.e2e.test.ts @@ -0,0 +1,232 @@ +import { describe, test, expect, beforeEach, afterEach } from "vitest"; +import { mkdtempSync, rmSync } from "fs"; +import { tmpdir } from "os"; +import path from "path"; +import { + createDaemonTestContext, + type DaemonTestContext, +} from "../test-utils/index.js"; + +function tmpCwd(): string { + return mkdtempSync(path.join(tmpdir(), "daemon-terminal-e2e-")); +} + +describe("daemon E2E terminal", () => { + let ctx: DaemonTestContext; + + beforeEach(async () => { + ctx = await createDaemonTestContext(); + }); + + afterEach(async () => { + await ctx.cleanup(); + }, 60000); + + test( + "lists terminals for a directory (auto-creates first)", + async () => { + const cwd = tmpCwd(); + + const result = await ctx.client.listTerminals(cwd); + + expect(result.cwd).toBe(cwd); + expect(result.terminals).toHaveLength(1); + expect(result.terminals[0].name).toBe("Terminal 1"); + expect(result.terminals[0].id).toBeTruthy(); + + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); + + test( + "creates additional terminal with custom name", + async () => { + const cwd = tmpCwd(); + + // First call auto-creates Terminal 1 + await ctx.client.listTerminals(cwd); + + // Create a second terminal with custom name + const result = await ctx.client.createTerminal(cwd, "Dev Server"); + + expect(result.error).toBeNull(); + expect(result.terminal).toBeTruthy(); + expect(result.terminal!.name).toBe("Dev Server"); + expect(result.terminal!.cwd).toBe(cwd); + + // Verify list now shows two terminals + const list = await ctx.client.listTerminals(cwd); + expect(list.terminals).toHaveLength(2); + + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); + + test( + "subscribes to terminal and receives state", + async () => { + const cwd = tmpCwd(); + + // Get terminal (auto-creates) + const list = await ctx.client.listTerminals(cwd); + const terminalId = list.terminals[0].id; + + // Subscribe to terminal + const subscribeResult = await ctx.client.subscribeTerminal(terminalId); + + expect(subscribeResult.error).toBeNull(); + expect(subscribeResult.terminalId).toBe(terminalId); + expect(subscribeResult.state).toBeTruthy(); + expect(subscribeResult.state!.rows).toBeGreaterThan(0); + expect(subscribeResult.state!.cols).toBeGreaterThan(0); + expect(subscribeResult.state!.grid).toBeTruthy(); + expect(subscribeResult.state!.cursor).toBeTruthy(); + + // Unsubscribe + ctx.client.unsubscribeTerminal(terminalId); + + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); + + test( + "sends input to terminal and receives output", + async () => { + const cwd = tmpCwd(); + + // Get terminal + const list = await ctx.client.listTerminals(cwd); + const terminalId = list.terminals[0].id; + + // Subscribe to terminal + await ctx.client.subscribeTerminal(terminalId); + + // Send input + ctx.client.sendTerminalInput(terminalId, { type: "input", data: "echo hello\r" }); + + // Wait for output containing "hello" - may need multiple updates + let foundHello = false; + const start = Date.now(); + const timeout = 10000; + + while (!foundHello && Date.now() - start < timeout) { + try { + const output = await ctx.client.waitForTerminalOutput(terminalId, 2000); + expect(output.terminalId).toBe(terminalId); + expect(output.state).toBeTruthy(); + + // Extract text from grid + const gridText = output.state.grid + .map((row) => row.map((cell) => cell.char).join("").trimEnd()) + .filter((line) => line.length > 0) + .join("\n"); + + if (gridText.includes("hello")) { + foundHello = true; + } + } catch { + // Timeout waiting for output, try again + } + } + + expect(foundHello).toBe(true); + + // Cleanup + ctx.client.unsubscribeTerminal(terminalId); + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); + + test( + "kills terminal", + async () => { + const cwd = tmpCwd(); + + // Create terminal + const createResult = await ctx.client.createTerminal(cwd, "To Kill"); + expect(createResult.terminal).toBeTruthy(); + const terminalId = createResult.terminal!.id; + + // Kill terminal + const killResult = await ctx.client.killTerminal(terminalId); + expect(killResult.success).toBe(true); + expect(killResult.terminalId).toBe(terminalId); + + // Verify terminal is gone by trying to subscribe + const subscribeResult = await ctx.client.subscribeTerminal(terminalId); + expect(subscribeResult.error).toBe("Terminal not found"); + + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); + + test( + "returns error for relative path", + async () => { + // Try to list terminals with relative path + const list = await ctx.client.listTerminals("relative/path"); + + // Should return empty terminals (error case) + expect(list.terminals).toHaveLength(0); + }, + 30000 + ); + + test( + "preserves color mode in terminal output (fgMode/bgMode)", + async () => { + const cwd = tmpCwd(); + + // Get terminal + const list = await ctx.client.listTerminals(cwd); + const terminalId = list.terminals[0].id; + + // Subscribe to terminal + await ctx.client.subscribeTerminal(terminalId); + + // Send printf with ANSI red color (mode 1) + ctx.client.sendTerminalInput(terminalId, { + type: "input", + data: "printf '\\033[31mRED\\033[0m\\n'\r", + }); + + // Wait for output with colored text + let foundColoredCell = false; + const start = Date.now(); + const timeout = 10000; + + while (!foundColoredCell && Date.now() - start < timeout) { + try { + const output = await ctx.client.waitForTerminalOutput(terminalId, 2000); + + // Look for a cell with fgMode set + for (const row of output.state.grid) { + for (const cell of row) { + if (cell.fgMode !== undefined && cell.fgMode > 0) { + foundColoredCell = true; + // Verify the mode is correct (1 = 16 ANSI colors) + expect(cell.fgMode).toBe(1); + expect(cell.fg).toBe(1); // ANSI red + break; + } + } + if (foundColoredCell) break; + } + } catch { + // Timeout waiting for output, try again + } + } + + expect(foundColoredCell).toBe(true); + + ctx.client.unsubscribeTerminal(terminalId); + rmSync(cwd, { recursive: true, force: true }); + }, + 30000 + ); +}); diff --git a/packages/server/src/server/index.ts b/packages/server/src/server/index.ts index 596be907a..e23ca7ced 100644 --- a/packages/server/src/server/index.ts +++ b/packages/server/src/server/index.ts @@ -19,8 +19,14 @@ async function main() { await daemon.start(); + let shuttingDown = false; const handleShutdown = async (signal: string) => { - logger.info(`${signal} received, shutting down gracefully...`); + if (shuttingDown) { + logger.info("Forcing exit..."); + process.exit(1); + } + shuttingDown = true; + logger.info(`${signal} received, shutting down gracefully... (press Ctrl+C again to force exit)`); const forceExit = setTimeout(() => { logger.warn("Forcing shutdown - HTTP server didn't close in time"); diff --git a/packages/server/src/server/session.ts b/packages/server/src/server/session.ts index 3cd86cbe5..a41d1bb4d 100644 --- a/packages/server/src/server/session.ts +++ b/packages/server/src/server/session.ts @@ -19,7 +19,14 @@ import { type FileExplorerRequest, type FileDownloadTokenRequest, type GitSetupOptions, + type ListTerminalsRequest, + type CreateTerminalRequest, + type SubscribeTerminalRequest, + type UnsubscribeTerminalRequest, + type TerminalInput, + type KillTerminalRequest, } from "./messages.js"; +import type { TerminalManager } from "../terminal/terminal-manager.js"; import { parseAndHighlightDiff, type ParsedDiffFile } from "./utils/diff-highlighter.js"; import { getSystemPrompt } from "./agent/system-prompt.js"; import { getAllTools } from "./agent/llm-openai.js"; @@ -252,6 +259,8 @@ export class Session { lastActivityAt: Date; appVisible: boolean; } | null = null; + private readonly terminalManager: TerminalManager | null; + private terminalSubscriptions: Map void> = new Map(); constructor( clientId: string, @@ -264,6 +273,7 @@ export class Session { agentMcpConfig: AgentMcpClientConfig, stt: OpenAISTT | null, tts: OpenAITTS | null, + terminalManager: TerminalManager | null, options?: { conversationId?: string; initialMessages?: ModelMessage[]; @@ -277,6 +287,7 @@ export class Session { this.agentManager = agentManager; this.agentRegistry = agentRegistry; this.agentMcpConfig = agentMcpConfig; + this.terminalManager = terminalManager; this.abortController = new AbortController(); this.sessionLogger = logger.child({ module: "session", @@ -777,8 +788,8 @@ export class Session { ); break; - case "send_agent_audio": - await this.handleSendAgentAudio(msg); + case "transcribe_audio_request": + await this.handleTranscribeAudio(msg); break; case "create_agent_request": @@ -856,6 +867,30 @@ export class Session { case "register_push_token": this.handleRegisterPushToken(msg.token); break; + + case "list_terminals_request": + await this.handleListTerminalsRequest(msg); + break; + + case "create_terminal_request": + await this.handleCreateTerminalRequest(msg); + break; + + case "subscribe_terminal_request": + await this.handleSubscribeTerminalRequest(msg); + break; + + case "unsubscribe_terminal_request": + this.handleUnsubscribeTerminalRequest(msg); + break; + + case "terminal_input": + this.handleTerminalInput(msg); + break; + + case "kill_terminal_request": + await this.handleKillTerminalRequest(msg); + break; } } catch (error: any) { this.sessionLogger.error( @@ -1112,65 +1147,28 @@ export class Session { } /** - * Handle audio message to agent (transcribe then send) + * Handle audio transcription request */ - private async handleSendAgentAudio( - msg: Extract + private async handleTranscribeAudio( + msg: Extract ): Promise { - const { agentId, audio, format, isLast, requestId, mode } = msg; - const shouldAutoRun = mode === "auto_run"; + const { audio, format, requestId } = msg; - // agentId is required for auto_run mode - if (shouldAutoRun && !agentId) { - this.sessionLogger.error("agentId is required for auto_run mode"); - return; - } - - // Use placeholder for logging when agentId is not provided - const logAgentId = agentId ?? "transcription"; - - // Decode base64 const audioBuffer = Buffer.from(audio, "base64"); - // For now, we'll process each audio segment immediately - // In the future, we might want to buffer chunks similar to realtime audio - if (!isLast) { - this.sessionLogger.debug( - { agentId: logAgentId }, - `Buffering agent audio chunk for agent ${logAgentId}` - ); - // TODO: Implement buffering if needed - return; - } - - this.sessionLogger.debug( - { agentId: logAgentId }, - `Transcribing audio for agent ${logAgentId}` - ); + this.sessionLogger.debug({ requestId }, "Transcribing audio"); try { - // Transcribe the audio const result = await this.sttManager.transcribe(audioBuffer, format, { - agentId: logAgentId, requestId, - label: shouldAutoRun ? "dictation:auto_run" : "dictation", + label: "dictation", }); - const transcriptText = result.text.trim(); - if (!transcriptText) { - this.sessionLogger.debug( - { agentId: logAgentId }, - `Empty transcription for agent ${logAgentId}, ignoring` - ); - return; - } - this.sessionLogger.info( - { agentId: logAgentId, transcriptText }, - `Transcribed audio for agent ${logAgentId}` + { requestId, textLength: result.text.length }, + "Transcription complete" ); - // Emit transcription result to client with requestId this.emit({ type: "transcription_result", payload: { @@ -1185,67 +1183,15 @@ export class Session { debugRecordingPath: result.debugRecordingPath, }, }); - - if (!shouldAutoRun) { - this.sessionLogger.info( - { agentId: logAgentId, requestId }, - `Completed transcription for agent ${logAgentId} (requestId: ${requestId})` - ); - return; - } - - // At this point, agentId is guaranteed to be defined (validated at function start) - const validAgentId = agentId!; - - try { - await this.ensureAgentLoaded(validAgentId); - } catch (error) { - this.handleAgentRunError( - validAgentId, - error, - "Failed to initialize agent before sending audio prompt" - ); - return; - } - - try { - await this.interruptAgentIfRunning(validAgentId); - } catch (error) { - this.handleAgentRunError( - validAgentId, - error, - "Failed to interrupt running agent before sending audio prompt" - ); - return; - } - - try { - this.agentManager.recordUserMessage(validAgentId, transcriptText); - } catch (recordError) { - this.sessionLogger.error( - { err: recordError, agentId: validAgentId }, - `Failed to record transcribed user message for agent ${validAgentId}` - ); - } - - // Send transcribed text to agent - this.startAgentStream(validAgentId, transcriptText); - this.sessionLogger.info( - { agentId: validAgentId }, - `Sent transcribed text to agent ${validAgentId}` - ); } catch (error: any) { - this.sessionLogger.error( - { err: error, agentId: logAgentId }, - `Failed to process audio for agent ${logAgentId}` - ); + this.sessionLogger.error({ err: error, requestId }, "Transcription failed"); this.emit({ type: "activity_log", payload: { id: uuidv4(), timestamp: new Date(), type: "error", - content: `Failed to process audio for agent: ${error.message}`, + content: `Transcription failed: ${error.message}`, }, }); throw error; @@ -3493,5 +3439,202 @@ export class Session { this.agentTools = null; } + // Unsubscribe from all terminals + for (const unsubscribe of this.terminalSubscriptions.values()) { + unsubscribe(); + } + this.terminalSubscriptions.clear(); + } + + // ============================================================================ + // Terminal Handlers + // ============================================================================ + + private async handleListTerminalsRequest(msg: ListTerminalsRequest): Promise { + if (!this.terminalManager) { + this.emit({ + type: "list_terminals_response", + payload: { + cwd: msg.cwd, + terminals: [], + requestId: msg.requestId, + }, + }); + return; + } + + try { + const terminals = await this.terminalManager.getTerminals(msg.cwd); + this.emit({ + type: "list_terminals_response", + payload: { + cwd: msg.cwd, + terminals: terminals.map((t) => ({ id: t.id, name: t.name })), + requestId: msg.requestId, + }, + }); + } catch (error: any) { + this.sessionLogger.error({ err: error, cwd: msg.cwd }, "Failed to list terminals"); + this.emit({ + type: "list_terminals_response", + payload: { + cwd: msg.cwd, + terminals: [], + requestId: msg.requestId, + }, + }); + } + } + + private async handleCreateTerminalRequest(msg: CreateTerminalRequest): Promise { + if (!this.terminalManager) { + this.emit({ + type: "create_terminal_response", + payload: { + terminal: null, + error: "Terminal manager not available", + requestId: msg.requestId, + }, + }); + return; + } + + try { + const session = await this.terminalManager.createTerminal({ + cwd: msg.cwd, + name: msg.name, + }); + this.emit({ + type: "create_terminal_response", + payload: { + terminal: { id: session.id, name: session.name, cwd: session.cwd }, + error: null, + requestId: msg.requestId, + }, + }); + } catch (error: any) { + this.sessionLogger.error({ err: error, cwd: msg.cwd }, "Failed to create terminal"); + this.emit({ + type: "create_terminal_response", + payload: { + terminal: null, + error: error.message, + requestId: msg.requestId, + }, + }); + } + } + + private async handleSubscribeTerminalRequest(msg: SubscribeTerminalRequest): Promise { + if (!this.terminalManager) { + this.emit({ + type: "subscribe_terminal_response", + payload: { + terminalId: msg.terminalId, + state: null, + error: "Terminal manager not available", + requestId: msg.requestId, + }, + }); + return; + } + + const session = this.terminalManager.getTerminal(msg.terminalId); + if (!session) { + this.emit({ + type: "subscribe_terminal_response", + payload: { + terminalId: msg.terminalId, + state: null, + error: "Terminal not found", + requestId: msg.requestId, + }, + }); + return; + } + + // Unsubscribe from previous subscription if any + const existing = this.terminalSubscriptions.get(msg.terminalId); + if (existing) { + existing(); + } + + // Subscribe to terminal updates + const unsubscribe = session.subscribe((serverMsg) => { + if (serverMsg.type === "full") { + this.emit({ + type: "terminal_output", + payload: { + terminalId: msg.terminalId, + state: serverMsg.state, + }, + }); + } + }); + this.terminalSubscriptions.set(msg.terminalId, unsubscribe); + + // Send initial state + this.emit({ + type: "subscribe_terminal_response", + payload: { + terminalId: msg.terminalId, + state: session.getState(), + error: null, + requestId: msg.requestId, + }, + }); + } + + private handleUnsubscribeTerminalRequest(msg: UnsubscribeTerminalRequest): void { + const unsubscribe = this.terminalSubscriptions.get(msg.terminalId); + if (unsubscribe) { + unsubscribe(); + this.terminalSubscriptions.delete(msg.terminalId); + } + } + + private handleTerminalInput(msg: TerminalInput): void { + if (!this.terminalManager) { + return; + } + + const session = this.terminalManager.getTerminal(msg.terminalId); + if (!session) { + this.sessionLogger.warn({ terminalId: msg.terminalId }, "Terminal not found for input"); + return; + } + + session.send(msg.message); + } + + private async handleKillTerminalRequest(msg: KillTerminalRequest): Promise { + if (!this.terminalManager) { + this.emit({ + type: "kill_terminal_response", + payload: { + terminalId: msg.terminalId, + success: false, + requestId: msg.requestId, + }, + }); + return; + } + + // Unsubscribe first + const unsubscribe = this.terminalSubscriptions.get(msg.terminalId); + if (unsubscribe) { + unsubscribe(); + this.terminalSubscriptions.delete(msg.terminalId); + } + + this.terminalManager.killTerminal(msg.terminalId); + this.emit({ + type: "kill_terminal_response", + payload: { + terminalId: msg.terminalId, + success: true, + requestId: msg.requestId, + }, + }); } } diff --git a/packages/server/src/server/test-utils/daemon-test-context.ts b/packages/server/src/server/test-utils/daemon-test-context.ts index 16db24ce3..714745162 100644 --- a/packages/server/src/server/test-utils/daemon-test-context.ts +++ b/packages/server/src/server/test-utils/daemon-test-context.ts @@ -37,7 +37,6 @@ export async function createDaemonTestContext( const daemon = await createTestPaseoDaemon(options); const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, - authHeader: daemon.agentMcpAuthHeader, }); await client.connect(); diff --git a/packages/server/src/server/test-utils/paseo-daemon.ts b/packages/server/src/server/test-utils/paseo-daemon.ts index d5d865c3e..6a3b953aa 100644 --- a/packages/server/src/server/test-utils/paseo-daemon.ts +++ b/packages/server/src/server/test-utils/paseo-daemon.ts @@ -7,7 +7,6 @@ import pino from "pino"; import { createPaseoDaemon, type PaseoDaemonConfig } from "../bootstrap.js"; type TestPaseoDaemonOptions = { - basicUsers?: Record; downloadTokenTtlMs?: number; corsAllowedOrigins?: string[]; listen?: string; @@ -19,8 +18,6 @@ export type TestPaseoDaemon = { port: number; paseoHome: string; staticDir: string; - agentMcpAuthHeader?: string; - agentMcpBearerToken?: string; close: () => Promise; }; @@ -42,16 +39,6 @@ async function getAvailablePort(): Promise { export async function createTestPaseoDaemon( options: TestPaseoDaemonOptions = {} ): Promise { - const basicUsers = options.basicUsers ?? { test: "pass" }; - const [agentMcpUser, agentMcpPassword] = Object.entries(basicUsers)[0] ?? []; - const agentMcpAuthHeader = - agentMcpUser && agentMcpPassword - ? `Basic ${Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64")}` - : undefined; - const agentMcpBearerToken = - agentMcpUser && agentMcpPassword - ? Buffer.from(`${agentMcpUser}:${agentMcpPassword}`).toString("base64") - : undefined; const openaiApiKey = process.env.OPENAI_API_KEY; const maxAttempts = 5; let lastError: unknown; @@ -68,21 +55,12 @@ export async function createTestPaseoDaemon( corsAllowedOrigins: options.corsAllowedOrigins ?? [], agentMcpRoute: "/mcp/agents", agentMcpAllowedHosts: [`127.0.0.1:${port}`, `localhost:${port}`, `${listenHost}:${port}`], - auth: { - basicUsers, - agentMcpAuthHeader, - agentMcpBearerToken, - realm: "Voice Assistant", - }, staticDir, mcpDebug: false, agentClients: {}, agentRegistryPath: path.join(paseoHome, "agents.json"), agentControlMcp: { url: `http://127.0.0.1:${port}/mcp/agents`, - ...(agentMcpAuthHeader - ? { headers: { Authorization: agentMcpAuthHeader } } - : {}), }, openai: openaiApiKey ? { apiKey: openaiApiKey } : undefined, downloadTokenTtlMs: options.downloadTokenTtlMs, @@ -106,8 +84,6 @@ export async function createTestPaseoDaemon( port, paseoHome, staticDir, - agentMcpAuthHeader, - agentMcpBearerToken, close, }; } catch (error) { diff --git a/packages/server/src/server/websocket-server.ts b/packages/server/src/server/websocket-server.ts index e30d351af..a9f7364e7 100644 --- a/packages/server/src/server/websocket-server.ts +++ b/packages/server/src/server/websocket-server.ts @@ -18,6 +18,7 @@ import { PushTokenStore } from "./push/token-store.js"; import { PushService } from "./push/push-service.js"; import type { OpenAISTT } from "./agent/stt-openai.js"; import type { OpenAITTS } from "./agent/tts-openai.js"; +import type { TerminalManager } from "../terminal/terminal-manager.js"; import type pino from "pino"; type AgentMcpClientConfig = { @@ -47,6 +48,7 @@ export class VoiceAssistantWebSocketServer { private readonly agentMcpConfig: AgentMcpClientConfig; private readonly stt: OpenAISTT | null; private readonly tts: OpenAITTS | null; + private readonly terminalManager: TerminalManager | null; constructor( server: HTTPServer, @@ -56,7 +58,8 @@ export class VoiceAssistantWebSocketServer { downloadTokenStore: DownloadTokenStore, agentMcpConfig: AgentMcpClientConfig, wsConfig: WebSocketServerConfig, - speech?: { stt: OpenAISTT | null; tts: OpenAITTS | null } + speech?: { stt: OpenAISTT | null; tts: OpenAITTS | null }, + terminalManager?: TerminalManager | null ) { this.logger = logger.child({ module: "websocket-server" }); this.agentManager = agentManager; @@ -64,6 +67,7 @@ export class VoiceAssistantWebSocketServer { this.downloadTokenStore = downloadTokenStore; this.stt = speech?.stt ?? null; this.tts = speech?.tts ?? null; + this.terminalManager = terminalManager ?? null; const pushLogger = this.logger.child({ module: "push" }); this.pushTokenStore = new PushTokenStore(pushLogger); @@ -140,6 +144,7 @@ export class VoiceAssistantWebSocketServer { this.agentMcpConfig, this.stt, this.tts, + this.terminalManager, { conversationId, initialMessages: initialMessages || undefined, diff --git a/packages/server/src/shared/messages.ts b/packages/server/src/shared/messages.ts index f8b67721b..88a681b37 100644 --- a/packages/server/src/shared/messages.ts +++ b/packages/server/src/shared/messages.ts @@ -318,16 +318,11 @@ export const SendAgentMessageSchema = z.object({ })).optional(), }); -export const SendAgentAudioSchema = z.object({ - type: z.literal("send_agent_audio"), - agentId: z.string().optional(), // Required for auto_run mode, optional for transcribe_only +export const TranscribeAudioRequestSchema = z.object({ + type: z.literal("transcribe_audio_request"), audio: z.string(), // base64 encoded format: z.string(), - isLast: z.boolean(), - requestId: z.string(), // Client-provided ID for tracking transcription - mode: z - .enum(["transcribe_only", "auto_run"]) - .optional(), + requestId: z.string(), }); const GitSetupOptionsSchema = z.object({ @@ -528,6 +523,58 @@ export const RegisterPushTokenMessageSchema = z.object({ token: z.string(), }); +// ============================================================================ +// Terminal Messages +// ============================================================================ + +export const ListTerminalsRequestSchema = z.object({ + type: z.literal("list_terminals_request"), + cwd: z.string(), + requestId: z.string(), +}); + +export const CreateTerminalRequestSchema = z.object({ + type: z.literal("create_terminal_request"), + cwd: z.string(), + name: z.string().optional(), + requestId: z.string(), +}); + +export const SubscribeTerminalRequestSchema = z.object({ + type: z.literal("subscribe_terminal_request"), + terminalId: z.string(), + requestId: z.string(), +}); + +export const UnsubscribeTerminalRequestSchema = z.object({ + type: z.literal("unsubscribe_terminal_request"), + terminalId: z.string(), +}); + +const TerminalClientMessageSchema = z.discriminatedUnion("type", [ + z.object({ type: z.literal("input"), data: z.string() }), + z.object({ type: z.literal("resize"), rows: z.number(), cols: z.number() }), + z.object({ + type: z.literal("mouse"), + row: z.number(), + col: z.number(), + button: z.number(), + action: z.enum(["down", "up", "move"]), + }), +]); + +export const TerminalInputSchema = z.object({ + type: z.literal("terminal_input"), + terminalId: z.string(), + message: TerminalClientMessageSchema, +}); + +export const KillTerminalRequestSchema = z.object({ + type: z.literal("kill_terminal_request"), + terminalId: z.string(), + requestId: z.string(), +}); + export const SessionInboundMessageSchema = z.discriminatedUnion("type", [ UserTextMessageSchema, RealtimeAudioChunkMessageSchema, @@ -539,7 +586,7 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [ DeleteAgentRequestMessageSchema, SetRealtimeModeMessageSchema, SendAgentMessageSchema, - SendAgentAudioSchema, + TranscribeAudioRequestSchema, CreateAgentRequestMessageSchema, ListProviderModelsRequestMessageSchema, ResumeAgentRequestMessageSchema, @@ -558,6 +605,12 @@ export const SessionInboundMessageSchema = z.discriminatedUnion("type", [ ClientHeartbeatMessageSchema, ListCommandsRequestSchema, RegisterPushTokenMessageSchema, + ListTerminalsRequestSchema, + CreateTerminalRequestSchema, + SubscribeTerminalRequestSchema, + UnsubscribeTerminalRequestSchema, + TerminalInputSchema, + KillTerminalRequestSchema, ]); export type SessionInboundMessage = z.infer; @@ -884,6 +937,80 @@ export const ListCommandsResponseSchema = z.object({ }), }); +// ============================================================================ +// Terminal Outbound Messages +// ============================================================================ + +const TerminalInfoSchema = z.object({ + id: z.string(), + name: z.string(), + cwd: z.string(), +}); + +const TerminalCellSchema = z.object({ + char: z.string(), + fg: z.number().optional(), + bg: z.number().optional(), + fgMode: z.number().optional(), + bgMode: z.number().optional(), + bold: z.boolean().optional(), + italic: z.boolean().optional(), + underline: z.boolean().optional(), +}); + +const TerminalStateSchema = z.object({ + rows: z.number(), + cols: z.number(), + grid: z.array(z.array(TerminalCellSchema)), + scrollback: z.array(z.array(TerminalCellSchema)), + cursor: z.object({ row: z.number(), col: z.number() }), +}); + +export const ListTerminalsResponseSchema = z.object({ + type: z.literal("list_terminals_response"), + payload: z.object({ + cwd: z.string(), + terminals: z.array(TerminalInfoSchema.omit({ cwd: true })), + requestId: z.string(), + }), +}); + +export const CreateTerminalResponseSchema = z.object({ + type: z.literal("create_terminal_response"), + payload: z.object({ + terminal: TerminalInfoSchema.nullable(), + error: z.string().nullable(), + requestId: z.string(), + }), +}); + +export const SubscribeTerminalResponseSchema = z.object({ + type: z.literal("subscribe_terminal_response"), + payload: z.object({ + terminalId: z.string(), + state: TerminalStateSchema.nullable(), + error: z.string().nullable(), + requestId: z.string(), + }), +}); + +export const TerminalOutputSchema = z.object({ + type: z.literal("terminal_output"), + payload: z.object({ + terminalId: z.string(), + state: TerminalStateSchema, + }), +}); + +export const KillTerminalResponseSchema = z.object({ + type: z.literal("kill_terminal_response"), + payload: z.object({ + terminalId: z.string(), + success: z.boolean(), + requestId: z.string(), + }), +}); + export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [ ActivityLogMessageSchema, AssistantChunkMessageSchema, @@ -910,6 +1037,11 @@ export const SessionOutboundMessageSchema = z.discriminatedUnion("type", [ GitRepoInfoResponseSchema, ListProviderModelsResponseMessageSchema, ListCommandsResponseSchema, + ListTerminalsResponseSchema, + CreateTerminalResponseSchema, + SubscribeTerminalResponseSchema, + TerminalOutputSchema, + KillTerminalResponseSchema, ]); export type SessionOutboundMessage = z.infer< @@ -948,7 +1080,7 @@ export type ActivityLogPayload = z.infer; export type UserTextMessage = z.infer; export type RealtimeAudioChunkMessage = z.infer; export type SendAgentMessage = z.infer; -export type SendAgentAudio = z.infer; +export type TranscribeAudioRequest = z.infer; export type CreateAgentRequestMessage = z.infer; export type ListProviderModelsRequestMessage = z.infer< typeof ListProviderModelsRequestMessageSchema @@ -974,6 +1106,19 @@ export type ListCommandsRequest = z.infer; export type ListCommandsResponse = z.infer; export type RegisterPushTokenMessage = z.infer; +// Terminal message types +export type ListTerminalsRequest = z.infer; +export type ListTerminalsResponse = z.infer; +export type CreateTerminalRequest = z.infer; +export type CreateTerminalResponse = z.infer; +export type SubscribeTerminalRequest = z.infer; +export type SubscribeTerminalResponse = z.infer; +export type UnsubscribeTerminalRequest = z.infer; +export type TerminalInput = z.infer; +export type TerminalOutput = z.infer; +export type KillTerminalRequest = z.infer; +export type KillTerminalResponse = z.infer; + // ============================================================================ // WebSocket Level Messages (wraps session messages) // ============================================================================ diff --git a/packages/server/src/tasks/cli.ts b/packages/server/src/tasks/cli.ts index 04e0c56b3..c1057fb23 100644 --- a/packages/server/src/tasks/cli.ts +++ b/packages/server/src/tasks/cli.ts @@ -609,11 +609,28 @@ program interface AgentConfig { cli: "claude" | "codex"; model?: string; + effort?: string; } -function getAgentConfig(model: ModelName): AgentConfig { +// Parse model string like "gpt-5.2-xhigh" into model and effort +function parseModelString(modelStr: string): { model: string; effort?: string } { + // GPT models with effort: gpt-5.2-low, gpt-5.2-medium, gpt-5.2-high, gpt-5.2-xhigh + const effortLevels = ["low", "medium", "high", "xhigh"]; + for (const effort of effortLevels) { + if (modelStr.endsWith(`-${effort}`)) { + return { + model: modelStr.slice(0, -(effort.length + 1)), + effort, + }; + } + } + return { model: modelStr }; +} + +function getAgentConfig(modelStr: string): AgentConfig { + const { model, effort } = parseModelString(modelStr); if (model.startsWith("gpt-")) { - return { cli: "codex", model }; + return { cli: "codex", model, effort }; } // Claude CLI accepts aliases directly: haiku, sonnet, opus return { cli: "claude", model }; @@ -621,10 +638,10 @@ function getAgentConfig(model: ModelName): AgentConfig { function runAgentWithModel( prompt: string, - model: ModelName, + modelStr: string, logFile: string ): { success: boolean; output: string } { - const config = getAgentConfig(model); + const config = getAgentConfig(modelStr); let args: string[]; if (config.cli === "claude") { @@ -634,12 +651,13 @@ function runAgentWithModel( } args.push("-p", prompt); } else { + const effort = config.effort ?? "medium"; args = [ "exec", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "-c", - "model_reasoning_effort=\"medium\"", + `model_reasoning_effort="${effort}"`, ]; if (config.model) { args.push("--model", config.model); @@ -686,28 +704,9 @@ async function buildTaskContext(task: Task, scopeId?: string): Promise { } } - let acceptanceCriteriaText = ""; - if (task.acceptanceCriteria.length > 0) { - acceptanceCriteriaText = "\n## Acceptance Criteria\n\n"; - for (const criterion of task.acceptanceCriteria) { - acceptanceCriteriaText += `- [ ] ${criterion}\n`; - } - } - - let notesText = ""; - if (task.notes.length > 0) { - notesText = "\n## Notes\n"; - for (const note of task.notes) { - notesText += `\n**${note.timestamp}**\n${note.content}\n`; - } - } - return `Working directory: ${process.cwd()} ${scopeContext}${parentContext} -# Task: ${task.title} - -${task.body || "(no body)"} -${acceptanceCriteriaText}${notesText}`; +${task.raw}`; } function makePlannerPrompt(task: Task, context: string, reason: string): string { @@ -917,36 +916,30 @@ You are a WORKER agent implementing this task. Current iteration: ${iteration} -IMPORTANT RULES: -- You CANNOT mark this task as done (task close is forbidden for you) +## How to Work + +Make MEANINGFUL progress toward the acceptance criteria: +- If the task can be completed in one iteration, do it all +- If it's too large, make the largest meaningful chunk of progress you can +- Read the notes from previous iterations - don't repeat work, BUILD on it +- A judge will verify your work against the acceptance criteria and leave feedback + +The judge's feedback (in notes) tells you exactly what's still failing. Address it. + +## Rules + +- You CANNOT mark this task as done (a judge verifies completion) - You MUST add a note documenting what you did: \`task note ${task.id} "WORKER: what you did"\` -- You CAN use \`task show ${task.id}\` to see full context -- You CAN use \`task children ${task.id}\` to see subtasks +- You CAN use \`task show ${task.id}\` to refresh context -Focus on implementing the task. The acceptance criteria will be verified by a separate judge agent. - -When you've done your best work, add a note explaining what you did and exit. +When you've made meaningful progress, add a note explaining what you did and exit. `; } function makeJudgePrompt(task: Task): string { - let criteriaText = ""; - if (task.acceptanceCriteria.length > 0) { - criteriaText = "## Acceptance Criteria to Verify\n\n"; - for (let i = 0; i < task.acceptanceCriteria.length; i++) { - criteriaText += `${i + 1}. ${task.acceptanceCriteria[i]}\n`; - } - } else { - criteriaText = "No explicit acceptance criteria defined. Verify the task is reasonably complete based on the title and body.\n"; - } - return `You are a JUDGE agent. Your ONLY job is to verify if acceptance criteria are met. -# Task: ${task.title} - -${task.body || "(no body)"} - -${criteriaText} +${task.raw} ## Your Instructions @@ -954,6 +947,28 @@ ${criteriaText} 2. You may run commands to check (e.g., \`npm run test\`, \`npm run typecheck\`, check file existence, run the code) 3. After checking all criteria, output your verdict +## FAIL EARLY for NOT_DONE + +For large tasks, the worker may yield after implementing incremental progress. Don't waste time +checking every criterion if it's obvious the task isn't complete. + +**Fail early strategy:** +- Start with a quick smoke test (e.g., does \`npm run typecheck\` or \`npm test\` pass?) +- If the smoke test fails badly, you can immediately return NOT_DONE +- If you find ANY failing criterion, you can immediately return NOT_DONE +- No need to check all criteria if you already know the verdict is NOT_DONE + +**Example:** If you run \`npm test\` and see 15 failures, don't methodically check each acceptance +criterion - just note the failures and return NOT_DONE. + +## For DONE: Full Verification Required + +Unlike NOT_DONE, you CANNOT shortcut DONE. To mark something DONE: +- You MUST verify EVERY acceptance criterion explicitly +- You MUST run the actual commands to check (not assume from context) +- You MUST confirm each criterion passes before concluding DONE +- No shortcuts, no assumptions, no "it probably works" + ## CRITICAL: No Excuses Policy You are evaluating RESULTS, not effort or intent. The following are NOT acceptable reasons to mark something DONE: @@ -977,18 +992,38 @@ After verifying, you MUST leave feedback for the worker by adding a note. The wo this note in the next iteration - it's their ONLY way to know what went wrong and what's missing. \`\`\` -task note ${task.id} "JUDGE: [verdict] - [specific feedback for the worker]" +task note ${task.id} "JUDGE: [verdict] - [observed facts only]" \`\`\` -Your feedback should tell the worker exactly what to fix: -- Which specific tests failed and with what error messages -- Which files or commands still need attention -- What's missing from the acceptance criteria +**CRITICAL: State ONLY observed facts. Do NOT provide solutions or debugging advice.** -BAD: "tests failed" (useless - worker doesn't know which ones) -GOOD: "3 tests fail: codex-mcp-agent.test.ts 'Session not found', opencode-agent.test.ts timeout after 60s, tool-calls.e2e.test.ts shell assertion" +You are a verification agent, not a debugging assistant. The worker has access to the task body +which contains the full context and instructions. Your job is to report WHAT failed, not HOW to fix it. -The worker cannot see your output - only the notes you leave. +DO: +- State which tests failed and their error messages +- State which commands returned non-zero exit codes +- State which files are missing or have wrong content +- Quote exact error output + +DO NOT: +- Suggest fixes or solutions +- Explain why something might have failed +- Offer debugging strategies +- Recommend approaches or alternatives + +BAD: "3 tests fail - try mocking the database connection" +BAD: "typecheck fails - you need to add the missing type annotation" +GOOD: "3 tests fail: auth.test.ts:42 'expected 200, got 401', user.test.ts:15 'timeout after 5000ms'" +GOOD: "npm run typecheck exit 1: src/api.ts:23 - Property 'foo' does not exist on type 'Bar'" + +For non-test criteria, state observable facts about the code: +GOOD: "validateUser() in auth.ts:45-72 duplicates validateAdmin() in admin.ts:23-50 (criterion: no code duplication)" +GOOD: "processOrder() is 187 lines (criterion: functions under 50 lines)" +GOOD: "UserService calls database directly at line 34 (criterion: all DB access via repository layer)" +GOOD: "auth module exports JWT secret at line 12 (criterion: secrets not exported from modules)" + +The worker has the task body with full instructions. Just tell them what's broken. ## Output Format - CRITICAL @@ -1030,26 +1065,29 @@ program .description("Run agent loop on tasks with planner/worker/judge") .option("--plan", "Enable planner agent") .option("--planner ", "Planner model (default: gpt-5.2)", "gpt-5.2") - .option("--judge ", "Judge model (default: haiku)", "haiku") + .option("--worker-model ", "Worker model (default: sonnet). For GPT models, append effort: gpt-5.2-high", "sonnet") + .option("--judge-model ", "Judge model (default: haiku)", "haiku") .option("--max-iterations ", "Max worker/judge iterations per task (0 = no limit)", "0") .option("-w, --watch", "Keep running and wait for new tasks") .action(async (scopeId: string | undefined, opts) => { const enablePlanner = opts.plan; - const plannerModel = opts.planner as ModelName; - const judgeModel = opts.judge as ModelName; + const plannerModel = opts.planner as string; + const baseWorkerModel = opts.workerModel as string; + const judgeModel = opts.judgeModel as string; const maxIterations = parseInt(opts.maxIterations, 10); const watchMode = opts.watch; const logFile = getLogFile(); process.stdout.write("Task Runner started (planner/worker/judge loop)\n"); process.stdout.write(`Planner: ${enablePlanner ? plannerModel : "disabled"}\n`); + process.stdout.write(`Worker: ${baseWorkerModel}\n`); process.stdout.write(`Judge: ${judgeModel}\n`); process.stdout.write(`Max iterations: ${maxIterations === 0 ? "unlimited" : maxIterations}\n`); if (scopeId) process.stdout.write(`Scope: ${scopeId}\n`); process.stdout.write(`Log: ${logFile}\n`); process.stdout.write("\n"); - log(logFile, `Started with planner=${enablePlanner ? plannerModel : "disabled"} judge=${judgeModel} maxIter=${maxIterations} scope=${scopeId || "all"}`); + log(logFile, `Started with planner=${enablePlanner ? plannerModel : "disabled"} worker=${baseWorkerModel} judge=${judgeModel} maxIter=${maxIterations} scope=${scopeId || "all"}`); const runPlanner = async (task: Task, reason: string): Promise => { log(logFile, `[PLANNER] Running ${plannerModel} (${reason})...`); @@ -1113,13 +1151,12 @@ program } const task = ready[0]; - const baseModel = ( - task.assignee === "codex" ? "gpt-5.2-codex" : - task.assignee ? task.assignee : - "sonnet" - ) as ModelName; - let workerModel = baseModel; - const canUpgrade = baseModel === "sonnet"; // Only upgrade if starting from sonnet + // CLI --worker-model takes precedence, then task assignee, then default + let workerModel = baseWorkerModel; + if (!workerModel && task.assignee) { + workerModel = task.assignee === "codex" ? "gpt-5.2-codex" : task.assignee; + } + const canUpgrade = workerModel === "sonnet"; // Only upgrade if starting from sonnet log(logFile, `\n=== Starting task: ${task.id} - ${task.title} ===`); await store.start(task.id); diff --git a/packages/server/src/tasks/task-store.test.ts b/packages/server/src/tasks/task-store.test.ts index f7519a1d2..01f974a05 100644 --- a/packages/server/src/tasks/task-store.test.ts +++ b/packages/server/src/tasks/task-store.test.ts @@ -103,6 +103,20 @@ describe("FileTaskStore", () => { expect(task.created >= before).toBe(true); expect(task.created <= after).toBe(true); }); + + it("returns task with raw content", async () => { + const task = await store.create("Test task", { + body: "Task body here", + acceptanceCriteria: ["criterion 1", "criterion 2"], + }); + + expect(task.raw).toContain("---"); + expect(task.raw).toContain("title: Test task"); + expect(task.raw).toContain("Task body here"); + expect(task.raw).toContain("## Acceptance Criteria"); + expect(task.raw).toContain("criterion 1"); + expect(task.raw).toContain("criterion 2"); + }); }); describe("get", () => { @@ -125,6 +139,24 @@ describe("FileTaskStore", () => { expect(retrieved?.assignee).toBe("codex"); }); + + it("returns raw content matching the file", async () => { + const created = await store.create("Task with body", { + body: "Some body content", + acceptanceCriteria: ["test passes", "lint passes"], + }); + await store.addNote(created.id, "A note was added"); + + const retrieved = await store.get(created.id); + + expect(retrieved?.raw).toContain("title: Task with body"); + expect(retrieved?.raw).toContain("Some body content"); + expect(retrieved?.raw).toContain("## Acceptance Criteria"); + expect(retrieved?.raw).toContain("test passes"); + expect(retrieved?.raw).toContain("lint passes"); + expect(retrieved?.raw).toContain("## Notes"); + expect(retrieved?.raw).toContain("A note was added"); + }); }); describe("list", () => { @@ -935,6 +967,29 @@ describe("FileTaskStore", () => { expect(retrieved?.priority).toBe(3); }); + + it("persists raw content across store instances", async () => { + const task = await store.create("Task with everything", { + body: "Detailed body", + acceptanceCriteria: ["tests pass", "build succeeds"], + assignee: "claude", + priority: 1, + }); + await store.addNote(task.id, "Implementation note"); + + const store2 = new FileTaskStore(tempDir); + const retrieved = await store2.get(task.id); + + expect(retrieved?.raw).toContain("title: Task with everything"); + expect(retrieved?.raw).toContain("Detailed body"); + expect(retrieved?.raw).toContain("## Acceptance Criteria"); + expect(retrieved?.raw).toContain("tests pass"); + expect(retrieved?.raw).toContain("build succeeds"); + expect(retrieved?.raw).toContain("## Notes"); + expect(retrieved?.raw).toContain("Implementation note"); + expect(retrieved?.raw).toContain("assignee: claude"); + expect(retrieved?.raw).toContain("priority: 1"); + }); }); describe("parent-child hierarchy", () => { diff --git a/packages/server/src/tasks/task-store.ts b/packages/server/src/tasks/task-store.ts index cecbe4744..26cc920d4 100644 --- a/packages/server/src/tasks/task-store.ts +++ b/packages/server/src/tasks/task-store.ts @@ -155,6 +155,7 @@ function parseTask(content: string): Task { created: getValue("created") || new Date().toISOString(), assignee: assignee || undefined, priority, + raw: content, }; } @@ -387,10 +388,13 @@ export class FileTaskStore implements TaskStore { created: new Date().toISOString(), assignee: opts?.assignee, priority: opts?.priority, + raw: "", // will be set after serialization }; await this.writeTask(task); - return task; + // Re-read to get the raw content + const saved = await this.get(task.id); + return saved!; } async update( diff --git a/packages/server/src/tasks/types.ts b/packages/server/src/tasks/types.ts index 1a9d1c0b1..18d288587 100644 --- a/packages/server/src/tasks/types.ts +++ b/packages/server/src/tasks/types.ts @@ -25,6 +25,7 @@ export interface Task { created: string; // ISO date assignee?: AgentType; // optional agent override priority?: number; // lower number = higher priority (1 is highest), tasks with priority sort before those without + raw: string; // the raw markdown file content } export interface CreateTaskOptions { diff --git a/packages/server/src/terminal/terminal-manager.test.ts b/packages/server/src/terminal/terminal-manager.test.ts new file mode 100644 index 000000000..5b9e27926 --- /dev/null +++ b/packages/server/src/terminal/terminal-manager.test.ts @@ -0,0 +1,172 @@ +import { describe, it, expect, afterEach } from "vitest"; +import { createTerminalManager, type TerminalManager } from "./terminal-manager.js"; + +describe("TerminalManager", () => { + let manager: TerminalManager; + + afterEach(() => { + if (manager) { + manager.killAll(); + } + }); + + describe("getTerminals", () => { + it("auto-creates first terminal for new cwd", async () => { + manager = createTerminalManager(); + const terminals = await manager.getTerminals("/tmp"); + + expect(terminals.length).toBe(1); + expect(terminals[0].name).toBe("Terminal 1"); + expect(terminals[0].cwd).toBe("/tmp"); + }); + + it("returns existing terminals on subsequent calls", async () => { + manager = createTerminalManager(); + const first = await manager.getTerminals("/tmp"); + const second = await manager.getTerminals("/tmp"); + + expect(first).toBe(second); + expect(first.length).toBe(1); + }); + + it("throws for relative paths", async () => { + manager = createTerminalManager(); + await expect(manager.getTerminals("tmp")).rejects.toThrow("cwd must be absolute path"); + }); + + it("creates separate terminals for different cwds", async () => { + manager = createTerminalManager(); + const tmpTerminals = await manager.getTerminals("/tmp"); + const homeTerminals = await manager.getTerminals("/home"); + + expect(tmpTerminals.length).toBe(1); + expect(homeTerminals.length).toBe(1); + expect(tmpTerminals[0].id).not.toBe(homeTerminals[0].id); + }); + }); + + describe("createTerminal", () => { + it("creates additional terminal with auto-incrementing name", async () => { + manager = createTerminalManager(); + await manager.getTerminals("/tmp"); + const second = await manager.createTerminal({ cwd: "/tmp" }); + + expect(second.name).toBe("Terminal 2"); + + const terminals = await manager.getTerminals("/tmp"); + expect(terminals.length).toBe(2); + }); + + it("uses custom name when provided", async () => { + manager = createTerminalManager(); + const session = await manager.createTerminal({ cwd: "/tmp", name: "Dev Server" }); + + expect(session.name).toBe("Dev Server"); + }); + + it("creates first terminal if none exist", async () => { + manager = createTerminalManager(); + const session = await manager.createTerminal({ cwd: "/tmp" }); + + expect(session.name).toBe("Terminal 1"); + + const terminals = await manager.getTerminals("/tmp"); + expect(terminals.length).toBe(1); + expect(terminals[0].id).toBe(session.id); + }); + + it("throws for relative paths", async () => { + manager = createTerminalManager(); + await expect(manager.createTerminal({ cwd: "tmp" })).rejects.toThrow("cwd must be absolute path"); + }); + }); + + describe("getTerminal", () => { + it("returns terminal by id", async () => { + manager = createTerminalManager(); + const terminals = await manager.getTerminals("/tmp"); + const found = manager.getTerminal(terminals[0].id); + + expect(found).toBe(terminals[0]); + }); + + it("returns undefined for unknown id", () => { + manager = createTerminalManager(); + const found = manager.getTerminal("unknown-id"); + + expect(found).toBeUndefined(); + }); + }); + + describe("killTerminal", () => { + it("removes terminal from manager", async () => { + manager = createTerminalManager(); + const terminals = await manager.getTerminals("/tmp"); + const id = terminals[0].id; + + manager.killTerminal(id); + + expect(manager.getTerminal(id)).toBeUndefined(); + }); + + it("removes cwd entry when last terminal is killed", async () => { + manager = createTerminalManager(); + const terminals = await manager.getTerminals("/tmp"); + + manager.killTerminal(terminals[0].id); + + expect(manager.listDirectories()).not.toContain("/tmp"); + }); + + it("keeps cwd entry when other terminals remain", async () => { + manager = createTerminalManager(); + await manager.getTerminals("/tmp"); + const second = await manager.createTerminal({ cwd: "/tmp" }); + + const terminals = await manager.getTerminals("/tmp"); + manager.killTerminal(terminals[0].id); + + expect(manager.listDirectories()).toContain("/tmp"); + const remaining = await manager.getTerminals("/tmp"); + expect(remaining.length).toBe(1); + expect(remaining[0].id).toBe(second.id); + }); + + it("is no-op for unknown id", () => { + manager = createTerminalManager(); + expect(() => manager.killTerminal("unknown-id")).not.toThrow(); + }); + }); + + describe("listDirectories", () => { + it("returns empty array initially", () => { + manager = createTerminalManager(); + expect(manager.listDirectories()).toEqual([]); + }); + + it("returns all cwds with active terminals", async () => { + manager = createTerminalManager(); + await manager.getTerminals("/tmp"); + await manager.getTerminals("/home"); + + const dirs = manager.listDirectories(); + expect(dirs).toContain("/tmp"); + expect(dirs).toContain("/home"); + expect(dirs.length).toBe(2); + }); + }); + + describe("killAll", () => { + it("kills all terminals and clears state", async () => { + manager = createTerminalManager(); + const tmpTerminals = await manager.getTerminals("/tmp"); + const homeTerminals = await manager.getTerminals("/home"); + + manager.killAll(); + + expect(manager.listDirectories()).toEqual([]); + expect(manager.getTerminal(tmpTerminals[0].id)).toBeUndefined(); + expect(manager.getTerminal(homeTerminals[0].id)).toBeUndefined(); + }); + }); +}); diff --git a/packages/server/src/terminal/terminal-manager.ts b/packages/server/src/terminal/terminal-manager.ts new file mode 100644 index 000000000..1fe8847a7 --- /dev/null +++ b/packages/server/src/terminal/terminal-manager.ts @@ -0,0 +1,88 @@ +import { createTerminal, type TerminalSession } from "./terminal.js"; + +export interface TerminalManager { + getTerminals(cwd: string): Promise; + createTerminal(options: { cwd: string; name?: string }): Promise; + getTerminal(id: string): TerminalSession | undefined; + killTerminal(id: string): void; + listDirectories(): string[]; + killAll(): void; +} + +export function createTerminalManager(): TerminalManager { + const terminalsByCwd = new Map(); + const terminalsById = new Map(); + + function assertAbsolutePath(cwd: string): void { + if (!cwd.startsWith("/")) { + throw new Error("cwd must be absolute path"); + } + } + + return { + async getTerminals(cwd: string): Promise { + assertAbsolutePath(cwd); + + let terminals = terminalsByCwd.get(cwd); + if (!terminals || terminals.length === 0) { + const session = await createTerminal({ cwd, name: "Terminal 1" }); + terminals = [session]; + terminalsByCwd.set(cwd, terminals); + terminalsById.set(session.id, session); + } + return terminals; + }, + + async createTerminal(options: { cwd: string; name?: string }): Promise { + assertAbsolutePath(options.cwd); + + const terminals = terminalsByCwd.get(options.cwd) ?? []; + const defaultName = `Terminal ${terminals.length + 1}`; + const session = await createTerminal({ + cwd: options.cwd, + name: options.name ?? defaultName, + }); + + terminals.push(session); + terminalsByCwd.set(options.cwd, terminals); + terminalsById.set(session.id, session); + + return session; + }, + + getTerminal(id: string): TerminalSession | undefined { + return terminalsById.get(id); + }, + + killTerminal(id: string): void { + const session = terminalsById.get(id); + if (!session) return; + + session.kill(); + terminalsById.delete(id); + + const terminals = terminalsByCwd.get(session.cwd); + if (terminals) { + const index = terminals.indexOf(session); + if (index !== -1) { + terminals.splice(index, 1); + } + if (terminals.length === 0) { + terminalsByCwd.delete(session.cwd); + } + } + }, + + listDirectories(): string[] { + return Array.from(terminalsByCwd.keys()); + }, + + killAll(): void { + for (const session of terminalsById.values()) { + session.kill(); + } + terminalsByCwd.clear(); + terminalsById.clear(); + }, + }; +} diff --git a/packages/server/src/terminal/terminal.test.ts b/packages/server/src/terminal/terminal.test.ts new file mode 100644 index 000000000..d47eef735 --- /dev/null +++ b/packages/server/src/terminal/terminal.test.ts @@ -0,0 +1,565 @@ +import { describe, it, expect, afterEach } from "vitest"; +import { createTerminal, type TerminalSession } from "./terminal.js"; + +// Extract text from a single row +function getRowText(state: ReturnType, rowIndex: number): string { + return state.grid[rowIndex].map((cell) => cell.char).join("").trimEnd(); +} + +// Extract all visible lines as array (trimmed, empty lines included) +function getLines(state: ReturnType): string[] { + return state.grid.map((row) => row.map((cell) => cell.char).join("").trimEnd()); +} + +// Wait for terminal state to match expected lines +async function waitForLines( + session: TerminalSession, + expectedLines: string[], + timeoutMs = 5000 +): Promise { + const start = Date.now(); + while (Date.now() - start < timeoutMs) { + const lines = getLines(session.getState()); + let matches = true; + for (let i = 0; i < expectedLines.length; i++) { + if (lines[i] !== expectedLines[i]) { + matches = false; + break; + } + } + if (matches) { + return; + } + await new Promise((resolve) => setTimeout(resolve, 50)); + } + const actual = getLines(session.getState()).slice(0, expectedLines.length); + throw new Error( + `Timeout waiting for expected lines.\nExpected:\n${JSON.stringify(expectedLines, null, 2)}\nActual:\n${JSON.stringify(actual, null, 2)}` + ); +} + +describe("Terminal", () => { + const sessions: TerminalSession[] = []; + + afterEach(async () => { + for (const session of sessions) { + session.kill(); + } + sessions.length = 0; + }); + + function trackSession(session: TerminalSession): TerminalSession { + sessions.push(session); + return session; + } + + describe("createTerminal", () => { + it("creates a terminal session with an id, name, and cwd", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + expect(session.id).toBeDefined(); + expect(typeof session.id).toBe("string"); + expect(session.id.length).toBeGreaterThan(0); + expect(session.name).toBe("Terminal"); + expect(session.cwd).toBe("/tmp"); + }); + + it("uses custom name when provided", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + name: "Dev Server", + }) + ); + + expect(session.name).toBe("Dev Server"); + }); + + it("uses default shell if not specified", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + }) + ); + + expect(session.id).toBeDefined(); + }); + + it("uses default rows and cols", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + const state = session.getState(); + expect(state.rows).toBe(24); + expect(state.cols).toBe(80); + }); + + it("respects custom rows and cols", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + rows: 40, + cols: 120, + }) + ); + + const state = session.getState(); + expect(state.rows).toBe(40); + expect(state.cols).toBe(120); + }); + }); + + describe("send input", () => { + it("executes a simple echo command", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + // Wait for initial prompt, then send command + await waitForLines(session, ["$"]); + + session.send({ type: "input", data: "echo hello\r" }); + + // After running "echo hello", terminal should show: + // Line 0: "$ echo hello" + // Line 1: "hello" + // Line 2: "$" + await waitForLines(session, ["$ echo hello", "hello", "$"]); + + const state = session.getState(); + expect(getRowText(state, 0)).toBe("$ echo hello"); + expect(getRowText(state, 1)).toBe("hello"); + expect(getRowText(state, 2)).toBe("$"); + }); + + it("executes multiple commands sequentially", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + session.send({ type: "input", data: "echo first\r" }); + await waitForLines(session, ["$ echo first", "first", "$"]); + + session.send({ type: "input", data: "echo second\r" }); + await waitForLines(session, [ + "$ echo first", + "first", + "$ echo second", + "second", + "$", + ]); + + const state = session.getState(); + expect(getRowText(state, 0)).toBe("$ echo first"); + expect(getRowText(state, 1)).toBe("first"); + expect(getRowText(state, 2)).toBe("$ echo second"); + expect(getRowText(state, 3)).toBe("second"); + expect(getRowText(state, 4)).toBe("$"); + }); + + it("captures output from pwd in specified cwd", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + session.send({ type: "input", data: "pwd\r" }); + + await waitForLines(session, ["$ pwd", "/tmp", "$"]); + + const state = session.getState(); + expect(getRowText(state, 0)).toBe("$ pwd"); + expect(getRowText(state, 1)).toBe("/tmp"); + expect(getRowText(state, 2)).toBe("$"); + }); + }); + + describe("colors", () => { + it("captures ANSI 16 color codes (mode 1)", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ ", TERM: "xterm-256color" }, + }) + ); + + await waitForLines(session, ["$"]); + + // \033[31m = ANSI red (color 1) + session.send({ type: "input", data: "printf '\\033[31mRED\\033[0m'\r" }); + + await waitForLines(session, ["$ printf '\\033[31mRED\\033[0m'", "RED$"]); + + const state = session.getState(); + const outputRow = state.grid[1]; + + expect(outputRow[0].char).toBe("R"); + expect(outputRow[0].fg).toBe(1); // ANSI red = 1 + expect(outputRow[0].fgMode).toBe(1); // Mode 1 = 16 ANSI colors + + // The "$" after RED should have default color + expect(outputRow[3].char).toBe("$"); + expect(outputRow[3].fg).toBe(undefined); + expect(outputRow[3].fgMode).toBe(undefined); + }); + + it("captures 256 color codes (mode 2)", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ ", TERM: "xterm-256color" }, + }) + ); + + await waitForLines(session, ["$"]); + + // \033[38;5;208m = 256-color orange (color 208) + session.send({ type: "input", data: "printf '\\033[38;5;208mORG\\033[0m'\r" }); + + await waitForLines(session, ["$ printf '\\033[38;5;208mORG\\033[0m'", "ORG$"]); + + const state = session.getState(); + const outputRow = state.grid[1]; + + // Check O cell + expect(outputRow[0].char).toBe("O"); + expect(outputRow[0].fg).toBe(208); // 256-color index + expect(outputRow[0].fgMode).toBe(2); // Mode 2 = 256 colors + }); + + it("captures true color RGB (mode 3)", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ ", TERM: "xterm-256color" }, + }) + ); + + await waitForLines(session, ["$"]); + + // \033[38;2;255;128;64m = true color RGB(255, 128, 64) + session.send({ type: "input", data: "printf '\\033[38;2;255;128;64mRGB\\033[0m'\r" }); + + await waitForLines(session, ["$ printf '\\033[38;2;255;128;64mRGB\\033[0m'", "RGB$"]); + + const state = session.getState(); + const outputRow = state.grid[1]; + + // Check R cell + expect(outputRow[0].char).toBe("R"); + expect(outputRow[0].fgMode).toBe(3); // Mode 3 = true color + + // The color value should be packed RGB: (255 << 16) | (128 << 8) | 64 + const expectedPacked = (255 << 16) | (128 << 8) | 64; + expect(outputRow[0].fg).toBe(expectedPacked); + }); + + it("captures background colors", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ ", TERM: "xterm-256color" }, + }) + ); + + await waitForLines(session, ["$"]); + + // \033[41m = ANSI red background + session.send({ type: "input", data: "printf '\\033[41mBG\\033[0m'\r" }); + + await waitForLines(session, ["$ printf '\\033[41mBG\\033[0m'", "BG$"]); + + const state = session.getState(); + const outputRow = state.grid[1]; + + expect(outputRow[0].char).toBe("B"); + expect(outputRow[0].bg).toBe(1); // ANSI red = 1 + expect(outputRow[0].bgMode).toBe(1); // Mode 1 = 16 ANSI colors + }); + }); + + describe("resize", () => { + it("updates terminal dimensions on resize", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + rows: 24, + cols: 80, + }) + ); + + session.send({ type: "resize", rows: 40, cols: 120 }); + + await new Promise((resolve) => setTimeout(resolve, 100)); + + const state = session.getState(); + expect(state.rows).toBe(40); + expect(state.cols).toBe(120); + }); + + it("grid reflects new dimensions after resize", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + rows: 24, + cols: 80, + }) + ); + + session.send({ type: "resize", rows: 10, cols: 40 }); + await new Promise((resolve) => setTimeout(resolve, 100)); + + const state = session.getState(); + expect(state.grid.length).toBe(10); + expect(state.grid[0].length).toBe(40); + }); + }); + + describe("subscribe", () => { + it("receives full state on initial subscription", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + const messages: Array<{ type: string }> = []; + const unsubscribe = session.subscribe((msg) => { + messages.push(msg); + }); + + await new Promise((resolve) => setTimeout(resolve, 100)); + + expect(messages.length).toBeGreaterThan(0); + expect(messages[0].type).toBe("full"); + + unsubscribe(); + }); + + it("receives messages on updates", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + const messages: Array<{ type: string }> = []; + const unsubscribe = session.subscribe((msg) => { + messages.push(msg); + }); + + messages.length = 0; + + session.send({ type: "input", data: "echo test\r" }); + + await waitForLines(session, ["$ echo test", "test", "$"]); + + expect(messages.length).toBeGreaterThan(0); + + unsubscribe(); + }); + + it("unsubscribe stops receiving messages", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + const messages: Array<{ type: string }> = []; + const unsubscribe = session.subscribe((msg) => { + messages.push(msg); + }); + + unsubscribe(); + messages.length = 0; + + session.send({ type: "input", data: "echo after\r" }); + await new Promise((resolve) => setTimeout(resolve, 200)); + + expect(messages.length).toBe(0); + }); + }); + + describe("getState", () => { + it("returns current terminal state with grid", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + rows: 24, + cols: 80, + }) + ); + + const state = session.getState(); + + expect(state.rows).toBe(24); + expect(state.cols).toBe(80); + expect(state.grid).toBeDefined(); + expect(state.grid.length).toBe(24); + expect(state.grid[0].length).toBe(80); + expect(state.cursor).toBeDefined(); + expect(typeof state.cursor.row).toBe("number"); + expect(typeof state.cursor.col).toBe("number"); + }); + + it("grid cells have char and color attributes", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + const state = session.getState(); + // First cell should be "$" + expect(state.grid[0][0].char).toBe("$"); + expect(state.grid[0][0]).toHaveProperty("fg"); + expect(state.grid[0][0]).toHaveProperty("bg"); + }); + }); + + describe("scrollback", () => { + it("preserves scrollback buffer", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + rows: 5, + cols: 80, + }) + ); + + await waitForLines(session, ["$"]); + + // seq 1 20 produces 20 lines of output + // With 5 rows, we expect lines to scroll into scrollback + session.send({ type: "input", data: "seq 1 20\r" }); + + // Wait for command to finish - final prompt appears after "20" + // In a 5-row terminal, we'll see the last lines plus prompt + // The visible area will show something like: 17, 18, 19, 20, $ + await waitForLines(session, ["17", "18", "19", "20", "$"]); + + const state = session.getState(); + + // Scrollback should contain the earlier output + expect(state.scrollback.length).toBeGreaterThan(0); + + const scrollbackText = state.scrollback + .map((row) => row.map((cell) => cell.char).join("").trimEnd()) + .filter((line) => line.length > 0); + + // The scrollback should contain the command and early numbers + expect(scrollbackText).toContain("$ seq 1 20"); + expect(scrollbackText).toContain("1"); + expect(scrollbackText).toContain("2"); + expect(scrollbackText).toContain("3"); + }); + }); + + describe("kill", () => { + it("terminates the shell process", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + await waitForLines(session, ["$"]); + + session.kill(); + + // Should not throw when trying to get state after kill + const state = session.getState(); + expect(state).toBeDefined(); + }); + + it("send after kill is a no-op", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + session.kill(); + + // Should not throw + session.send({ type: "input", data: "echo test\r" }); + }); + }); + + describe("mouse events", () => { + it("accepts mouse events without throwing", async () => { + const session = trackSession( + await createTerminal({ + cwd: "/tmp", + shell: "/bin/sh", + env: { PS1: "$ " }, + }) + ); + + // Should not throw + session.send({ type: "mouse", row: 0, col: 0, button: 0, action: "down" }); + session.send({ type: "mouse", row: 0, col: 0, button: 0, action: "up" }); + }); + }); +}); diff --git a/packages/server/src/terminal/terminal.ts b/packages/server/src/terminal/terminal.ts new file mode 100644 index 000000000..2394dbb22 --- /dev/null +++ b/packages/server/src/terminal/terminal.ts @@ -0,0 +1,276 @@ +import * as pty from "node-pty"; +import xterm, { type Terminal as TerminalType } from "@xterm/headless"; +import { randomUUID } from "crypto"; + +const { Terminal } = xterm; + +export interface Cell { + char: string; + fg: number | undefined; + bg: number | undefined; + fgMode?: number; // 0=default, 1=16 ANSI, 2=256, 3=RGB + bgMode?: number; + bold?: boolean; + italic?: boolean; + underline?: boolean; +} + +export interface Pos { + row: number; + col: number; +} + +export interface TerminalState { + rows: number; + cols: number; + grid: Cell[][]; + scrollback: Cell[][]; + cursor: Pos; +} + +export interface CellChange { + row: number; + col: number; + cell: Cell; +} + +export type ClientMessage = + | { type: "input"; data: string } + | { type: "resize"; rows: number; cols: number } + | { type: "mouse"; row: number; col: number; button: number; action: "down" | "up" | "move" }; + +export type ServerMessage = + | { type: "full"; state: TerminalState } + | { type: "diff"; changes: CellChange[]; cursor: Pos }; + +export interface TerminalSession { + id: string; + name: string; + cwd: string; + send(msg: ClientMessage): void; + subscribe(listener: (msg: ServerMessage) => void): () => void; + getState(): TerminalState; + kill(): void; +} + +export interface CreateTerminalOptions { + cwd: string; + shell?: string; + env?: Record; + rows?: number; + cols?: number; + name?: string; +} + +function extractCell(terminal: TerminalType, row: number, col: number): Cell { + const buffer = terminal.buffer.active; + const line = buffer.getLine(row); + if (!line) { + return { char: " ", fg: undefined, bg: undefined }; + } + + const cell = line.getCell(col); + if (!cell) { + return { char: " ", fg: undefined, bg: undefined }; + } + + // Color modes from xterm.js: 0=DEFAULT, 1=16 colors (ANSI), 2=256 colors, 3=RGB + // getFgColorMode() returns packed value with mode in upper byte (e.g. 0x01000000 for mode 1) + const fgModeRaw = cell.getFgColorMode(); + const bgModeRaw = cell.getBgColorMode(); + const fgMode = fgModeRaw >> 24; + const bgMode = bgModeRaw >> 24; + + // Only return color if not default (mode 0) + const fg = fgMode !== 0 ? cell.getFgColor() : undefined; + const bg = bgMode !== 0 ? cell.getBgColor() : undefined; + + return { + char: cell.getChars() || " ", + fg, + bg, + fgMode: fgMode !== 0 ? fgMode : undefined, + bgMode: bgMode !== 0 ? bgMode : undefined, + bold: cell.isBold() !== 0, + italic: cell.isItalic() !== 0, + underline: cell.isUnderline() !== 0, + }; +} + +function extractGrid(terminal: TerminalType): Cell[][] { + const grid: Cell[][] = []; + const buffer = terminal.buffer.active; + // Visible viewport starts at baseY + const baseY = buffer.baseY; + + for (let row = 0; row < terminal.rows; row++) { + const rowCells: Cell[] = []; + for (let col = 0; col < terminal.cols; col++) { + rowCells.push(extractCell(terminal, baseY + row, col)); + } + grid.push(rowCells); + } + + return grid; +} + +function extractScrollback(terminal: TerminalType): Cell[][] { + const scrollback: Cell[][] = []; + const buffer = terminal.buffer.active; + // baseY is the first row of the visible viewport (0-indexed) + // Lines 0 to baseY-1 are in scrollback, lines baseY onwards are visible + const scrollbackLines = buffer.baseY; + + for (let row = 0; row < scrollbackLines; row++) { + const rowCells: Cell[] = []; + const line = buffer.getLine(row); + for (let col = 0; col < terminal.cols; col++) { + if (line) { + const cell = line.getCell(col); + if (cell) { + const fgModeRaw = cell.getFgColorMode(); + const bgModeRaw = cell.getBgColorMode(); + const fgMode = fgModeRaw >> 24; + const bgMode = bgModeRaw >> 24; + const fg = fgMode !== 0 ? cell.getFgColor() : undefined; + const bg = bgMode !== 0 ? cell.getBgColor() : undefined; + rowCells.push({ + char: cell.getChars() || " ", + fg, + bg, + fgMode: fgMode !== 0 ? fgMode : undefined, + bgMode: bgMode !== 0 ? bgMode : undefined, + bold: cell.isBold() !== 0, + italic: cell.isItalic() !== 0, + underline: cell.isUnderline() !== 0, + }); + } else { + rowCells.push({ char: " ", fg: undefined, bg: undefined }); + } + } else { + rowCells.push({ char: " ", fg: undefined, bg: undefined }); + } + } + scrollback.push(rowCells); + } + + return scrollback; +} + +export async function createTerminal(options: CreateTerminalOptions): Promise { + const { + cwd, + shell = process.env.SHELL || "/bin/sh", + env = {}, + rows = 24, + cols = 80, + name = "Terminal", + } = options; + + const id = randomUUID(); + const listeners = new Set<(msg: ServerMessage) => void>(); + let killed = false; + + // Create xterm.js headless terminal + const terminal = new Terminal({ + rows, + cols, + scrollback: 1000, + allowProposedApi: true, + }); + + // Create PTY + const ptyProcess = pty.spawn(shell, [], { + name: "xterm-256color", + cols, + rows, + cwd, + env: { + ...process.env, + ...env, + TERM: "xterm-256color", + }, + }); + + // Pipe PTY output to terminal emulator + ptyProcess.onData((data) => { + if (killed) return; + terminal.write(data, () => { + // Notify listeners of changes + const state = getState(); + for (const listener of listeners) { + listener({ type: "full", state }); + } + }); + }); + + ptyProcess.onExit(() => { + killed = true; + }); + + function getState(): TerminalState { + return { + rows: terminal.rows, + cols: terminal.cols, + grid: extractGrid(terminal), + scrollback: extractScrollback(terminal), + cursor: { + row: terminal.buffer.active.cursorY, + col: terminal.buffer.active.cursorX, + }, + }; + } + + function send(msg: ClientMessage): void { + if (killed) return; + + switch (msg.type) { + case "input": + ptyProcess.write(msg.data); + break; + case "resize": + terminal.resize(msg.cols, msg.rows); + ptyProcess.resize(msg.cols, msg.rows); + break; + case "mouse": + // Mouse events can be sent as escape sequences if terminal supports it + // For now, we'll just ignore them - can be implemented later + break; + } + } + + function subscribe(listener: (msg: ServerMessage) => void): () => void { + listeners.add(listener); + + // Send initial full state + queueMicrotask(() => { + if (listeners.has(listener)) { + listener({ type: "full", state: getState() }); + } + }); + + return () => { + listeners.delete(listener); + }; + } + + function kill(): void { + if (killed) return; + killed = true; + ptyProcess.kill(); + terminal.dispose(); + } + + // Small delay to let shell initialize + await new Promise((resolve) => setTimeout(resolve, 50)); + + return { + id, + name, + cwd, + send, + subscribe, + getState, + kill, + }; +} diff --git a/packages/server/src/utils/tool-call-parsers.test.ts b/packages/server/src/utils/tool-call-parsers.test.ts new file mode 100644 index 000000000..45ad7141e --- /dev/null +++ b/packages/server/src/utils/tool-call-parsers.test.ts @@ -0,0 +1,107 @@ +import { describe, expect, test } from "vitest"; +import { + stripShellWrapperPrefix, + extractPrincipalParam, + stripCwdPrefix, +} from "./tool-call-parsers.js"; + +describe("stripShellWrapperPrefix", () => { + test("strips /bin/zsh -lc cd path && prefix", () => { + const command = "/bin/zsh -lc cd /Users/moboudra/dev/blankpage/editor && npm run format"; + expect(stripShellWrapperPrefix(command)).toBe("npm run format"); + }); + + test("strips /bin/zsh -c cd path && prefix", () => { + const command = "/bin/zsh -c cd /path/to/project && git status"; + expect(stripShellWrapperPrefix(command)).toBe("git status"); + }); + + test("strips /bin/bash -lc cd path && prefix", () => { + const command = "/bin/bash -lc cd /home/user/project && npm test"; + expect(stripShellWrapperPrefix(command)).toBe("npm test"); + }); + + test("strips /bin/sh -c cd path && prefix", () => { + const command = "/bin/sh -c cd /tmp && ls -la"; + expect(stripShellWrapperPrefix(command)).toBe("ls -la"); + }); + + test("returns command unchanged when no prefix", () => { + const command = "npm run build"; + expect(stripShellWrapperPrefix(command)).toBe("npm run build"); + }); + + test("returns command unchanged for partial match", () => { + const command = "/bin/zsh -lc npm run build"; + expect(stripShellWrapperPrefix(command)).toBe("/bin/zsh -lc npm run build"); + }); + + test("handles paths with spaces in quotes", () => { + // The regex matches \S+ for the path, so quoted paths won't fully match + // This is acceptable - quoted paths are edge cases + const command = '/bin/zsh -lc cd "/path with spaces" && npm test'; + // Won't strip because the path pattern expects non-whitespace + expect(stripShellWrapperPrefix(command)).toBe('/bin/zsh -lc cd "/path with spaces" && npm test'); + }); +}); + +describe("extractPrincipalParam", () => { + test("extracts and strips shell wrapper from command string", () => { + const args = { command: "/bin/zsh -lc cd /Users/dev/project && npm run format" }; + expect(extractPrincipalParam(args)).toBe("npm run format"); + }); + + test("extracts and strips shell wrapper from command array", () => { + const args = { command: ["/bin/bash", "-lc", "cd /path && git status"] }; + // Array is joined with spaces first: "/bin/bash -lc cd /path && git status" + // Then shell wrapper is stripped + expect(extractPrincipalParam(args)).toBe("git status"); + }); + + test("extracts plain command without shell wrapper", () => { + const args = { command: "npm run build" }; + expect(extractPrincipalParam(args)).toBe("npm run build"); + }); + + test("extracts file_path and strips cwd", () => { + const args = { file_path: "/Users/dev/project/src/file.ts" }; + expect(extractPrincipalParam(args, "/Users/dev/project")).toBe("src/file.ts"); + }); + + test("extracts pattern without modification", () => { + const args = { pattern: "*.ts" }; + expect(extractPrincipalParam(args)).toBe("*.ts"); + }); + + test("extracts query without modification", () => { + const args = { query: "search term" }; + expect(extractPrincipalParam(args)).toBe("search term"); + }); + + test("extracts url without modification", () => { + const args = { url: "https://example.com" }; + expect(extractPrincipalParam(args)).toBe("https://example.com"); + }); + + test("returns undefined for empty object", () => { + expect(extractPrincipalParam({})).toBeUndefined(); + }); +}); + +describe("stripCwdPrefix", () => { + test("strips cwd prefix from file path", () => { + expect(stripCwdPrefix("/Users/dev/project/src/file.ts", "/Users/dev/project")).toBe("src/file.ts"); + }); + + test("returns . for exact cwd match", () => { + expect(stripCwdPrefix("/Users/dev/project", "/Users/dev/project")).toBe("."); + }); + + test("returns path unchanged when no cwd prefix", () => { + expect(stripCwdPrefix("/other/path/file.ts", "/Users/dev/project")).toBe("/other/path/file.ts"); + }); + + test("returns path unchanged when no cwd provided", () => { + expect(stripCwdPrefix("/Users/dev/project/file.ts")).toBe("/Users/dev/project/file.ts"); + }); +}); diff --git a/packages/server/src/utils/tool-call-parsers.ts b/packages/server/src/utils/tool-call-parsers.ts index c5ee84c74..eb80781e7 100644 --- a/packages/server/src/utils/tool-call-parsers.ts +++ b/packages/server/src/utils/tool-call-parsers.ts @@ -18,9 +18,9 @@ const PrincipalParamSchema = z.union([ z.object({ filePath: z.string() }).transform((d) => ({ type: "path" as const, value: d.filePath })), z.object({ path: z.string() }).transform((d) => ({ type: "path" as const, value: d.path })), // Command as string - z.object({ command: z.string() }).transform((d) => ({ type: "text" as const, value: d.command })), + z.object({ command: z.string() }).transform((d) => ({ type: "command" as const, value: d.command })), // Command as array (Codex sends this) - z.object({ command: z.array(z.string()).nonempty() }).transform((d) => ({ type: "text" as const, value: d.command.join(" ") })), + z.object({ command: z.array(z.string()).nonempty() }).transform((d) => ({ type: "command" as const, value: d.command.join(" ") })), // Other text params z.object({ pattern: z.string() }).transform((d) => ({ type: "text" as const, value: d.pattern })), z.object({ query: z.string() }).transform((d) => ({ type: "text" as const, value: d.query })), @@ -53,6 +53,14 @@ export function stripCwdPrefix(filePath: string, cwd?: string): string { return filePath; } +// Strips shell wrapper prefixes like "/bin/zsh -lc cd /path && " from commands +// This is used for display purposes to show the actual command being run +const SHELL_WRAPPER_PATTERN = /^\/bin\/(?:zsh|bash|sh)\s+(?:-[a-zA-Z]+\s+)?cd\s+\S+\s+&&\s+/; + +export function stripShellWrapperPrefix(command: string): string { + return command.replace(SHELL_WRAPPER_PATTERN, ""); +} + export function extractPrincipalParam(args: unknown, cwd?: string): string | undefined { const parsed = PrincipalParamSchema.safeParse(args); if (!parsed.success) { @@ -60,7 +68,13 @@ export function extractPrincipalParam(args: unknown, cwd?: string): string | und } const { type, value } = parsed.data; - return type === "path" ? stripCwdPrefix(value, cwd) : value; + if (type === "path") { + return stripCwdPrefix(value, cwd); + } + if (type === "command") { + return stripShellWrapperPrefix(value); + } + return value; } // ---- TodoWrite Extraction ----