diff --git a/.storybook/main.ts b/.storybook/main.ts index f5ad7e338..9555b498b 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -3,7 +3,7 @@ import { mergeConfig } from "vite"; import path from "path"; const config: StorybookConfig = { - stories: ["../src/**/*.stories.@(ts|tsx)"], + stories: ["../src/browser/**/*.stories.@(ts|tsx)"], addons: ["@storybook/addon-links", "@storybook/addon-docs", "@storybook/addon-interactions"], framework: { name: "@storybook/react-vite", diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index a9ec4fd71..e1ddd4ca8 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -1,5 +1,5 @@ import type { Preview } from "@storybook/react-vite"; -import "../src/styles/globals.css"; +import "../src/browser/styles/globals.css"; const preview: Preview = { decorators: [ diff --git a/Makefile b/Makefile index 339f8190b..00009f2e6 100644 --- a/Makefile +++ b/Makefile @@ -157,18 +157,18 @@ start: node_modules/.installed build-main build-preload build-static ## Build an ## Build targets (can run in parallel) build: node_modules/.installed src/version.ts build-renderer build-main build-preload build-icons build-static ## Build all targets -build-main: node_modules/.installed dist/main.js ## Build main process +build-main: node_modules/.installed dist/cli/index.js ## Build main process -dist/main.js: src/version.ts tsconfig.main.json tsconfig.json $(TS_SOURCES) +dist/cli/index.js: src/cli/index.ts src/desktop/main.ts src/cli/server.ts src/version.ts tsconfig.main.json tsconfig.json $(TS_SOURCES) @echo "Building main process..." @NODE_ENV=production $(TSGO) -p tsconfig.main.json @NODE_ENV=production bun x tsc-alias -p tsconfig.main.json build-preload: node_modules/.installed dist/preload.js ## Build preload script -dist/preload.js: src/preload.ts $(TS_SOURCES) +dist/preload.js: src/desktop/preload.ts $(TS_SOURCES) @echo "Building preload script..." - @NODE_ENV=production bun build src/preload.ts \ + @NODE_ENV=production bun build src/desktop/preload.ts \ --format=cjs \ --target=node \ --external=electron \ diff --git a/bun.lock b/bun.lock index f572c24a2..c1643b2ca 100644 --- a/bun.lock +++ b/bun.lock @@ -7,6 +7,7 @@ "dependencies": { "@ai-sdk/anthropic": "^2.0.44", "@ai-sdk/openai": "^2.0.66", + "@homebridge/node-pty-prebuilt-multiarch": "^0.11.14", "@openrouter/ai-sdk-provider": "^1.2.2", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", @@ -32,7 +33,6 @@ "markdown-it": "^14.1.0", "minimist": "^1.2.8", "motion": "^12.23.24", - "node-pty": "1.1.0-beta39", "ollama-ai-provider-v2": "^1.5.4", "rehype-harden": "^1.1.5", "shescape": "^2.1.6", @@ -335,6 +335,8 @@ "@hapi/topo": ["@hapi/topo@5.1.0", "", { "dependencies": { "@hapi/hoek": "^9.0.0" } }, "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="], + "@homebridge/node-pty-prebuilt-multiarch": ["@homebridge/node-pty-prebuilt-multiarch@0.11.14", "", { "dependencies": { "nan": "^2.19.0", "prebuild-install": "^7.1.2" } }, "sha512-fuiq5kb4i0Ao0BTf7O6kvtwUhCCCJHLhWLWaaUaLuniDGS4xmj+gxvkidJpxYVT/zTXdbcLuCY44UnoWC7xODg=="], + "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="], "@humanfs/node": ["@humanfs/node@0.16.7", "", { "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ=="], @@ -1453,6 +1455,8 @@ "deep-eql": ["deep-eql@5.0.2", "", {}, "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q=="], + "deep-extend": ["deep-extend@0.6.0", "", {}, "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="], + "deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="], "deepmerge": ["deepmerge@4.3.1", "", {}, "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="], @@ -1639,6 +1643,8 @@ "exit-x": ["exit-x@0.2.2", "", {}, "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ=="], + "expand-template": ["expand-template@2.0.3", "", {}, "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="], + "expand-tilde": ["expand-tilde@1.2.2", "", { "dependencies": { "os-homedir": "^1.0.1" } }, "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q=="], "expect": ["expect@30.2.0", "", { "dependencies": { "@jest/expect-utils": "30.2.0", "@jest/get-type": "30.1.0", "jest-matcher-utils": "30.2.0", "jest-message-util": "30.2.0", "jest-mock": "30.2.0", "jest-util": "30.2.0" } }, "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw=="], @@ -1759,6 +1765,8 @@ "ghostty-web": ["ghostty-web@0.1.1", "", {}, "sha512-uPlk+EDNtA0uS47yxsn9VpRIFC57rm1zoRf1vCZ0Lh8DN5kw+Szyof591G+RFYNBqL1FJxMFGVzVjY8ykzteiw=="], + "github-from-package": ["github-from-package@0.0.0", "", {}, "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="], + "glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="], "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="], @@ -2357,6 +2365,8 @@ "mkdirp": ["mkdirp@1.0.4", "", { "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="], + "mkdirp-classic": ["mkdirp-classic@0.5.3", "", {}, "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="], + "mlly": ["mlly@1.8.0", "", { "dependencies": { "acorn": "^8.15.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.1" } }, "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g=="], "motion": ["motion@12.23.24", "", { "dependencies": { "framer-motion": "^12.23.24", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-Rc5E7oe2YZ72N//S3QXGzbnXgqNrTESv8KKxABR20q2FLch9gHLo0JLyYo2hZ238bZ9Gx6cWhj9VO0IgwbMjCw=="], @@ -2369,8 +2379,12 @@ "mylas": ["mylas@2.1.14", "", {}, "sha512-BzQguy9W9NJgoVn2mRWzbFrFWWztGCcng2QI9+41frfk+Athwgx3qhqhvStz7ExeUUu7Kzw427sNzHpEZNINog=="], + "nan": ["nan@2.23.1", "", {}, "sha512-r7bBUGKzlqk8oPBDYxt6Z0aEdF1G1rwlMcLk8LCOMbOzf0mG+JUfUzG4fIMWwHWP0iyaLWEQZJmtB7nOHEm/qw=="], + "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], + "napi-build-utils": ["napi-build-utils@2.0.0", "", {}, "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA=="], + "napi-postinstall": ["napi-postinstall@0.3.4", "", { "bin": { "napi-postinstall": "lib/cli.js" } }, "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ=="], "natural-compare": ["natural-compare@1.4.0", "", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="], @@ -2385,7 +2399,7 @@ "node-abi": ["node-abi@4.24.0", "", { "dependencies": { "semver": "^7.6.3" } }, "sha512-u2EC1CeNe25uVtX3EZbdQ275c74zdZmmpzrHEQh2aIYqoVjlglfUpOX9YY85x1nlBydEKDVaSmMNhR7N82Qj8A=="], - "node-addon-api": ["node-addon-api@7.1.1", "", {}, "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="], + "node-addon-api": ["node-addon-api@3.2.1", "", {}, "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="], "node-api-version": ["node-api-version@0.2.1", "", { "dependencies": { "semver": "^7.3.5" } }, "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q=="], @@ -2397,8 +2411,6 @@ "node-preload": ["node-preload@0.2.1", "", { "dependencies": { "process-on-spawn": "^1.0.0" } }, "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ=="], - "node-pty": ["node-pty@1.1.0-beta39", "", { "dependencies": { "node-addon-api": "^7.1.0" } }, "sha512-1xnN2dbS0QngT4xenpS/6Q77QtaDQo5vE6f4slATgZsFIv3NP4ObE7vAjYnZtMFG5OEh3jyDRZc+hy1DjDF7dg=="], - "node-releases": ["node-releases@2.0.27", "", {}, "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="], "nodemon": ["nodemon@3.1.11", "", { "dependencies": { "chokidar": "^3.5.2", "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", "semver": "^7.5.3", "simple-update-notifier": "^2.0.0", "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.5" }, "bin": { "nodemon": "bin/nodemon.js" } }, "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g=="], @@ -2535,6 +2547,8 @@ "preact": ["preact@10.27.2", "", {}, "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg=="], + "prebuild-install": ["prebuild-install@7.1.3", "", { "dependencies": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", "github-from-package": "0.0.0", "minimist": "^1.2.3", "mkdirp-classic": "^0.5.3", "napi-build-utils": "^2.0.0", "node-abi": "^3.3.0", "pump": "^3.0.0", "rc": "^1.2.7", "simple-get": "^4.0.0", "tar-fs": "^2.0.0", "tunnel-agent": "^0.6.0" }, "bin": { "prebuild-install": "bin.js" } }, "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug=="], + "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="], "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="], @@ -2587,6 +2601,8 @@ "raw-body": ["raw-body@3.0.1", "", { "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", "iconv-lite": "0.7.0", "unpipe": "1.0.0" } }, "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA=="], + "rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": { "rc": "./cli.js" } }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="], + "react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="], "react-compiler-runtime": ["react-compiler-runtime@1.0.0", "", { "peerDependencies": { "react": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^0.0.0-experimental" } }, "sha512-rRfjYv66HlG8896yPUDONgKzG5BxZD1nV9U6rkm+7VCuvQc903C4MjcoZR4zPw53IKSOX9wMQVpA1IAbRtzQ7w=="], @@ -2759,6 +2775,10 @@ "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="], + "simple-concat": ["simple-concat@1.0.1", "", {}, "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="], + + "simple-get": ["simple-get@4.0.1", "", { "dependencies": { "decompress-response": "^6.0.0", "once": "^1.3.1", "simple-concat": "^1.0.0" } }, "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="], + "simple-update-notifier": ["simple-update-notifier@2.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w=="], "sisteransi": ["sisteransi@1.0.5", "", {}, "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="], @@ -2867,6 +2887,8 @@ "tar": ["tar@6.2.1", "", { "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" } }, "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="], + "tar-fs": ["tar-fs@2.1.4", "", { "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^2.1.4" } }, "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ=="], + "tar-stream": ["tar-stream@2.2.0", "", { "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" } }, "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="], "temp-file": ["temp-file@3.4.0", "", { "dependencies": { "async-exit-hook": "^2.0.1", "fs-extra": "^10.0.0" } }, "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="], @@ -2917,6 +2939,8 @@ "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], + "tunnel-agent": ["tunnel-agent@0.6.0", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="], + "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="], "type-detect": ["type-detect@4.0.8", "", {}, "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="], @@ -3435,8 +3459,6 @@ "log-symbols/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="], - "lzma-native/node-addon-api": ["node-addon-api@3.2.1", "", {}, "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="], - "make-dir/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], "make-fetch-happen/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="], @@ -3491,12 +3513,16 @@ "pkg-dir/find-up": ["find-up@4.1.0", "", { "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="], + "prebuild-install/node-abi": ["node-abi@3.85.0", "", { "dependencies": { "semver": "^7.3.5" } }, "sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg=="], + "pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="], "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], "raw-body/iconv-lite": ["iconv-lite@0.7.0", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ=="], + "rc/strip-json-comments": ["strip-json-comments@2.0.1", "", {}, "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="], + "react-docgen/doctrine": ["doctrine@3.0.0", "", { "dependencies": { "esutils": "^2.0.2" } }, "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="], "read-config-file/dotenv": ["dotenv@9.0.2", "", {}, "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="], @@ -3527,6 +3553,8 @@ "string-length/strip-ansi": ["strip-ansi@7.1.2", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA=="], + "tar-fs/chownr": ["chownr@1.1.4", "", {}, "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="], + "test-exclude/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="], "tsc-alias/commander": ["commander@9.5.0", "", {}, "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="], diff --git a/eslint.config.mjs b/eslint.config.mjs index 070e6c8c6..6d7d61ccc 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -121,7 +121,7 @@ export default defineConfig([ "!eslint.config.mjs", "vite.config.ts", "electron.vite.config.ts", - "src/main.tsx", + "src/browser/main.tsx", ], }, js.configs.recommended, @@ -349,18 +349,18 @@ export default defineConfig([ // Temporarily allow sync fs methods in files with existing usage // TODO: Gradually migrate these to async operations files: [ - "src/config.ts", - "src/debug/**/*.ts", - "src/git.ts", - "src/main-desktop.ts", - "src/config.test.ts", - "src/services/gitService.ts", - "src/services/log.ts", - "src/services/streamManager.ts", - "src/services/tempDir.ts", - "src/services/tools/bash.ts", - "src/services/tools/bash.test.ts", - "src/services/tools/testHelpers.ts", + "src/node/config.ts", + "src/cli/debug/**/*.ts", + "src/node/git.ts", + "src/desktop/main.ts", + "src/node/config.test.ts", + "src/node/services/gitService.ts", + "src/node/services/log.ts", + "src/node/services/streamManager.ts", + "src/node/services/tempDir.ts", + "src/node/services/tools/bash.ts", + "src/node/services/tools/bash.test.ts", + "src/node/services/tools/testHelpers.ts", ], rules: { "local/no-sync-fs-methods": "off", @@ -368,11 +368,11 @@ export default defineConfig([ }, { // Frontend architectural boundary - prevent services and tokenizer imports - // Note: src/utils/** and src/stores/** are not included because: + // Note: src/browser/utils/** and src/browser/stores/** are not included because: // - Some utils are shared between main/renderer (e.g., utils/tools registry) // - Stores can import from utils/messages which is renderer-safe - // - Type-only imports from services are safe (types live in src/types/) - files: ["src/components/**", "src/contexts/**", "src/hooks/**", "src/App.tsx"], + // - Type-only imports from services are safe (types live in src/common/types/) + files: ["src/browser/components/**", "src/browser/contexts/**", "src/browser/hooks/**", "src/browser/App.tsx"], rules: { "no-restricted-imports": [ "error", @@ -402,18 +402,14 @@ export default defineConfig([ // Renderer process (frontend) architectural boundary - prevent Node.js API usage files: ["src/**/*.ts", "src/**/*.tsx"], ignores: [ - "src/main*.ts", - "src/preload.ts", - "src/services/**", - "src/runtime/**", - "src/utils/main/**", - "src/utils/providers/**", - "src/telemetry/**", - "src/git.ts", - "src/config.ts", - "src/debug/**", + "src/cli/**", + "src/desktop/**", + "src/node/**", "**/*.test.ts", "**/*.test.tsx", + // This file is only used by Node.js code (cli/debug) but lives in common/ + // TODO: Consider moving to node/utils/ + "src/common/utils/providers/ensureProvidersConfig.ts", ], rules: { "no-restricted-globals": [ diff --git a/index.html b/index.html index 2be5c48e7..a96f986c4 100644 --- a/index.html +++ b/index.html @@ -26,6 +26,6 @@
- + diff --git a/jest.config.js b/jest.config.js index 74eda6695..e58a37e86 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,8 +5,9 @@ module.exports = { collectCoverageFrom: [ "src/**/*.ts", "!src/**/*.d.ts", - "!src/preload.ts", - "!src/main.ts", // Exclude main Electron file from coverage + "!src/desktop/preload.ts", + "!src/cli/index.ts", + "!src/desktop/main.ts", ], setupFilesAfterEnv: ["/tests/setup.ts"], moduleNameMapper: { diff --git a/package.json b/package.json index ce3232155..083c5ef18 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "0.5.1", "description": "mux - coder multiplexer", "author": "Coder", - "main": "dist/main.js", + "main": "dist/cli/index.js", "bin": { - "mux": "dist/main.js" + "mux": "dist/cli/index.js" }, "license": "AGPL-3.0-only", "repository": { @@ -21,7 +21,7 @@ "build": "make build", "start": "make start", "typecheck": "make typecheck", - "debug": "bun src/debug/index.ts", + "debug": "bun src/cli/debug/index.ts", "lint": "make lint", "lint:fix": "make lint-fix", "fmt": "make fmt", diff --git a/src/App.stories.tsx b/src/browser/App.stories.tsx similarity index 99% rename from src/App.stories.tsx rename to src/browser/App.stories.tsx index 180f1480e..b03c5f51c 100644 --- a/src/App.stories.tsx +++ b/src/browser/App.stories.tsx @@ -1,11 +1,11 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { useRef } from "react"; import { AppLoader } from "./components/AppLoader"; -import type { ProjectConfig } from "./config"; -import type { FrontendWorkspaceMetadata } from "./types/workspace"; -import type { IPCApi } from "./types/ipc"; -import type { ChatStats } from "./types/chatStats"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { ProjectConfig } from "@/node/config"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { IPCApi } from "@/common/types/ipc"; +import type { ChatStats } from "@/common/types/chatStats"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; // Stable timestamp for testing active states (use fixed time minus small offsets) // This ensures workspaces don't show as "Older than 1 day" and keeps stories deterministic diff --git a/src/App.tsx b/src/browser/App.tsx similarity index 98% rename from src/App.tsx rename to src/browser/App.tsx index 5d8f8a905..6afb546e1 100644 --- a/src/App.tsx +++ b/src/browser/App.tsx @@ -3,7 +3,7 @@ import "./styles/globals.css"; import { useWorkspaceContext } from "./contexts/WorkspaceContext"; import { useProjectContext } from "./contexts/ProjectContext"; import type { WorkspaceSelection } from "./components/ProjectSidebar"; -import type { FrontendWorkspaceMetadata } from "./types/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; import { LeftSidebar } from "./components/LeftSidebar"; import { ProjectCreateModal } from "./components/ProjectCreateModal"; import { AIView } from "./components/AIView"; @@ -25,11 +25,11 @@ import { ThinkingProvider } from "./contexts/ThinkingContext"; import { CommandPalette } from "./components/CommandPalette"; import { buildCoreSources, type BuildSourcesParams } from "./utils/commands/sources"; -import type { ThinkingLevel } from "./types/thinking"; -import { CUSTOM_EVENTS } from "./constants/events"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import { CUSTOM_EVENTS } from "@/common/constants/events"; import { isWorkspaceForkSwitchEvent } from "./utils/workspaceFork"; -import { getThinkingLevelKey } from "./constants/storage"; -import type { BranchListResult } from "./types/ipc"; +import { getThinkingLevelKey } from "@/common/constants/storage"; +import type { BranchListResult } from "@/common/types/ipc"; import { useTelemetry } from "./hooks/useTelemetry"; import { useStartWorkspaceCreation, getFirstProjectPath } from "./hooks/useStartWorkspaceCreation"; diff --git a/src/browser/api.ts b/src/browser/api.ts index 8db0acc67..ff8f0a66b 100644 --- a/src/browser/api.ts +++ b/src/browser/api.ts @@ -1,8 +1,8 @@ /** * Browser API client. Used when running cmux in server mode. */ -import { IPC_CHANNELS, getChatChannel } from "@/constants/ipc-constants"; -import type { IPCApi } from "@/types/ipc"; +import { IPC_CHANNELS, getChatChannel } from "@/common/constants/ipc-constants"; +import type { IPCApi } from "@/common/types/ipc"; // Backend URL - defaults to same origin, but can be overridden via VITE_BACKEND_URL // This allows frontend (Vite :8080) to connect to backend (:3000) in dev mode diff --git a/src/assets/icons/anthropic.svg b/src/browser/assets/icons/anthropic.svg similarity index 100% rename from src/assets/icons/anthropic.svg rename to src/browser/assets/icons/anthropic.svg diff --git a/src/assets/icons/openai.svg b/src/browser/assets/icons/openai.svg similarity index 100% rename from src/assets/icons/openai.svg rename to src/browser/assets/icons/openai.svg diff --git a/src/components/AIView.tsx b/src/browser/components/AIView.tsx similarity index 94% rename from src/components/AIView.tsx rename to src/browser/components/AIView.tsx index 56c99b4bb..88b5f6320 100644 --- a/src/components/AIView.tsx +++ b/src/browser/components/AIView.tsx @@ -1,32 +1,32 @@ import React, { useState, useCallback, useEffect, useRef } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; import { MessageRenderer } from "./Messages/MessageRenderer"; import { InterruptedBarrier } from "./Messages/ChatBarrier/InterruptedBarrier"; import { StreamingBarrier } from "./Messages/ChatBarrier/StreamingBarrier"; import { RetryBarrier } from "./Messages/ChatBarrier/RetryBarrier"; import { PinnedTodoList } from "./PinnedTodoList"; -import { getAutoRetryKey, VIM_ENABLED_KEY } from "@/constants/storage"; +import { getAutoRetryKey, VIM_ENABLED_KEY } from "@/common/constants/storage"; import { ChatInput, type ChatInputAPI } from "./ChatInput/index"; import { RightSidebar, type TabType } from "./RightSidebar"; -import { useResizableSidebar } from "@/hooks/useResizableSidebar"; +import { useResizableSidebar } from "@/browser/hooks/useResizableSidebar"; import { shouldShowInterruptedBarrier, mergeConsecutiveStreamErrors, -} from "@/utils/messages/messageUtils"; -import { hasInterruptedStream } from "@/utils/messages/retryEligibility"; -import { ThinkingProvider } from "@/contexts/ThinkingContext"; -import { ModeProvider } from "@/contexts/ModeContext"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { useAutoScroll } from "@/hooks/useAutoScroll"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { useThinking } from "@/contexts/ThinkingContext"; -import { useWorkspaceState, useWorkspaceAggregator } from "@/stores/WorkspaceStore"; +} from "@/browser/utils/messages/messageUtils"; +import { hasInterruptedStream } from "@/browser/utils/messages/retryEligibility"; +import { ThinkingProvider } from "@/browser/contexts/ThinkingContext"; +import { ModeProvider } from "@/browser/contexts/ModeContext"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { useAutoScroll } from "@/browser/hooks/useAutoScroll"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { useThinking } from "@/browser/contexts/ThinkingContext"; +import { useWorkspaceState, useWorkspaceAggregator } from "@/browser/stores/WorkspaceStore"; import { WorkspaceHeader } from "./WorkspaceHeader"; -import { getModelName } from "@/utils/ai/models"; -import type { DisplayedMessage } from "@/types/message"; -import type { RuntimeConfig } from "@/types/runtime"; -import { useAIViewKeybinds } from "@/hooks/useAIViewKeybinds"; -import { evictModelFromLRU } from "@/hooks/useModelLRU"; +import { getModelName } from "@/common/utils/ai/models"; +import type { DisplayedMessage } from "@/common/types/message"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { useAIViewKeybinds } from "@/browser/hooks/useAIViewKeybinds"; +import { evictModelFromLRU } from "@/browser/hooks/useModelLRU"; interface AIViewProps { workspaceId: string; diff --git a/src/components/AppLoader.tsx b/src/browser/components/AppLoader.tsx similarity index 100% rename from src/components/AppLoader.tsx rename to src/browser/components/AppLoader.tsx diff --git a/src/components/ChatInput/CreationCenterContent.tsx b/src/browser/components/ChatInput/CreationCenterContent.tsx similarity index 100% rename from src/components/ChatInput/CreationCenterContent.tsx rename to src/browser/components/ChatInput/CreationCenterContent.tsx diff --git a/src/components/ChatInput/CreationControls.tsx b/src/browser/components/ChatInput/CreationControls.tsx similarity index 97% rename from src/components/ChatInput/CreationControls.tsx rename to src/browser/components/ChatInput/CreationControls.tsx index cab849f28..a769cc707 100644 --- a/src/components/ChatInput/CreationControls.tsx +++ b/src/browser/components/ChatInput/CreationControls.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { RUNTIME_MODE, type RuntimeMode } from "@/types/runtime"; +import { RUNTIME_MODE, type RuntimeMode } from "@/common/types/runtime"; import { TooltipWrapper, Tooltip } from "../Tooltip"; import { Select } from "../Select"; diff --git a/src/components/ChatInput/index.tsx b/src/browser/components/ChatInput/index.tsx similarity index 97% rename from src/components/ChatInput/index.tsx rename to src/browser/components/ChatInput/index.tsx index 64a32798f..e5485a56b 100644 --- a/src/components/ChatInput/index.tsx +++ b/src/browser/components/ChatInput/index.tsx @@ -12,49 +12,54 @@ import { CommandSuggestions, COMMAND_SUGGESTION_KEYS } from "../CommandSuggestio import type { Toast } from "../ChatInputToast"; import { ChatInputToast } from "../ChatInputToast"; import { createCommandToast, createErrorToast } from "../ChatInputToasts"; -import { parseCommand } from "@/utils/slashCommands/parser"; -import { usePersistedState, updatePersistedState } from "@/hooks/usePersistedState"; -import { useMode } from "@/contexts/ModeContext"; +import { parseCommand } from "@/browser/utils/slashCommands/parser"; +import { usePersistedState, updatePersistedState } from "@/browser/hooks/usePersistedState"; +import { useMode } from "@/browser/contexts/ModeContext"; import { ThinkingSliderComponent } from "../ThinkingSlider"; import { Context1MCheckbox } from "../Context1MCheckbox"; -import { useSendMessageOptions } from "@/hooks/useSendMessageOptions"; +import { useSendMessageOptions } from "@/browser/hooks/useSendMessageOptions"; import { getModelKey, getInputKey, VIM_ENABLED_KEY, getProjectScopeId, getPendingScopeId, -} from "@/constants/storage"; +} from "@/common/constants/storage"; import { handleNewCommand, handleCompactCommand, forkWorkspace, prepareCompactionMessage, type CommandHandlerContext, -} from "@/utils/chatCommands"; -import { CUSTOM_EVENTS } from "@/constants/events"; +} from "@/browser/utils/chatCommands"; +import { CUSTOM_EVENTS } from "@/common/constants/events"; import { getSlashCommandSuggestions, type SlashSuggestion, -} from "@/utils/slashCommands/suggestions"; +} from "@/browser/utils/slashCommands/suggestions"; import { TooltipWrapper, Tooltip, HelpIndicator } from "../Tooltip"; import { ModeSelector } from "../ModeSelector"; -import { matchesKeybind, formatKeybind, KEYBINDS, isEditableElement } from "@/utils/ui/keybinds"; +import { + matchesKeybind, + formatKeybind, + KEYBINDS, + isEditableElement, +} from "@/browser/utils/ui/keybinds"; import { ModelSelector, type ModelSelectorRef } from "../ModelSelector"; -import { useModelLRU } from "@/hooks/useModelLRU"; +import { useModelLRU } from "@/browser/hooks/useModelLRU"; import { VimTextArea } from "../VimTextArea"; import { ImageAttachments, type ImageAttachment } from "../ImageAttachments"; import { extractImagesFromClipboard, extractImagesFromDrop, processImageFiles, -} from "@/utils/imageHandling"; +} from "@/browser/utils/imageHandling"; -import type { ThinkingLevel } from "@/types/thinking"; -import type { MuxFrontendMetadata } from "@/types/message"; -import { useTelemetry } from "@/hooks/useTelemetry"; -import { setTelemetryEnabled } from "@/telemetry"; -import { getTokenCountPromise } from "@/utils/tokenizer/rendererClient"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import type { MuxFrontendMetadata } from "@/common/types/message"; +import { useTelemetry } from "@/browser/hooks/useTelemetry"; +import { setTelemetryEnabled } from "@/node/telemetry"; +import { getTokenCountPromise } from "@/browser/utils/tokenizer/rendererClient"; import { CreationCenterContent } from "./CreationCenterContent"; import { CreationControls } from "./CreationControls"; import { useCreationWorkspace } from "./useCreationWorkspace"; diff --git a/src/components/ChatInput/types.ts b/src/browser/components/ChatInput/types.ts similarity index 94% rename from src/components/ChatInput/types.ts rename to src/browser/components/ChatInput/types.ts index 69da80edd..8e456b20b 100644 --- a/src/components/ChatInput/types.ts +++ b/src/browser/components/ChatInput/types.ts @@ -1,4 +1,4 @@ -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; export interface ChatInputAPI { focus: () => void; diff --git a/src/components/ChatInput/useCreationWorkspace.ts b/src/browser/components/ChatInput/useCreationWorkspace.ts similarity index 90% rename from src/components/ChatInput/useCreationWorkspace.ts rename to src/browser/components/ChatInput/useCreationWorkspace.ts index d00dded3f..83d9df36e 100644 --- a/src/components/ChatInput/useCreationWorkspace.ts +++ b/src/browser/components/ChatInput/useCreationWorkspace.ts @@ -1,10 +1,10 @@ import { useState, useEffect, useCallback } from "react"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { RuntimeConfig, RuntimeMode } from "@/types/runtime"; -import { parseRuntimeString } from "@/utils/chatCommands"; -import { useDraftWorkspaceSettings } from "@/hooks/useDraftWorkspaceSettings"; -import { useSendMessageOptions } from "@/hooks/useSendMessageOptions"; -import { getProjectScopeId } from "@/constants/storage"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { RuntimeConfig, RuntimeMode } from "@/common/types/runtime"; +import { parseRuntimeString } from "@/browser/utils/chatCommands"; +import { useDraftWorkspaceSettings } from "@/browser/hooks/useDraftWorkspaceSettings"; +import { useSendMessageOptions } from "@/browser/hooks/useSendMessageOptions"; +import { getProjectScopeId } from "@/common/constants/storage"; import { extractErrorMessage } from "./utils"; interface UseCreationWorkspaceOptions { diff --git a/src/components/ChatInput/utils.ts b/src/browser/components/ChatInput/utils.ts similarity index 83% rename from src/components/ChatInput/utils.ts rename to src/browser/components/ChatInput/utils.ts index a07bcec96..0866f257b 100644 --- a/src/components/ChatInput/utils.ts +++ b/src/browser/components/ChatInput/utils.ts @@ -1,4 +1,4 @@ -import type { SendMessageError } from "@/types/errors"; +import type { SendMessageError } from "@/common/types/errors"; /** * Extract error message from SendMessageError or string diff --git a/src/components/ChatInputToast.tsx b/src/browser/components/ChatInputToast.tsx similarity index 99% rename from src/components/ChatInputToast.tsx rename to src/browser/components/ChatInputToast.tsx index b9993cd4a..2a4a40b22 100644 --- a/src/components/ChatInputToast.tsx +++ b/src/browser/components/ChatInputToast.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from "react"; import React, { useEffect, useCallback } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; const toastTypeStyles: Record<"success" | "error", string> = { success: "bg-toast-success-bg border border-accent-dark text-toast-success-text", diff --git a/src/components/ChatInputToasts.test.ts b/src/browser/components/ChatInputToasts.test.ts similarity index 97% rename from src/components/ChatInputToasts.test.ts rename to src/browser/components/ChatInputToasts.test.ts index c73d89459..229b4e1b2 100644 --- a/src/components/ChatInputToasts.test.ts +++ b/src/browser/components/ChatInputToasts.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "@jest/globals"; import { createErrorToast } from "./ChatInputToasts"; -import type { SendMessageError } from "@/types/errors"; +import type { SendMessageError } from "@/common/types/errors"; describe("ChatInputToasts", () => { describe("createErrorToast", () => { diff --git a/src/components/ChatInputToasts.tsx b/src/browser/components/ChatInputToasts.tsx similarity index 96% rename from src/components/ChatInputToasts.tsx rename to src/browser/components/ChatInputToasts.tsx index c073cab23..69597203c 100644 --- a/src/components/ChatInputToasts.tsx +++ b/src/browser/components/ChatInputToasts.tsx @@ -1,9 +1,9 @@ import React from "react"; import type { Toast } from "./ChatInputToast"; import { SolutionLabel } from "./ChatInputToast"; -import type { ParsedCommand } from "@/utils/slashCommands/types"; -import type { SendMessageError as SendMessageErrorType } from "@/types/errors"; -import { formatSendMessageError } from "@/utils/errors/formatSendError"; +import type { ParsedCommand } from "@/browser/utils/slashCommands/types"; +import type { SendMessageError as SendMessageErrorType } from "@/common/types/errors"; +import { formatSendMessageError } from "@/node/utils/errors/formatSendError"; /** * Creates a toast message for command-related errors and help messages diff --git a/src/components/ChatMetaSidebar.tsx b/src/browser/components/ChatMetaSidebar.tsx similarity index 88% rename from src/components/ChatMetaSidebar.tsx rename to src/browser/components/ChatMetaSidebar.tsx index 909b3af61..12c11bbd0 100644 --- a/src/components/ChatMetaSidebar.tsx +++ b/src/browser/components/ChatMetaSidebar.tsx @@ -1,12 +1,12 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { useWorkspaceUsage } from "@/stores/WorkspaceStore"; -import { use1MContext } from "@/hooks/use1MContext"; -import { useResizeObserver } from "@/hooks/useResizeObserver"; +import { cn } from "@/common/lib/utils"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { useWorkspaceUsage } from "@/browser/stores/WorkspaceStore"; +import { use1MContext } from "@/browser/hooks/use1MContext"; +import { useResizeObserver } from "@/browser/hooks/useResizeObserver"; import { CostsTab } from "./RightSidebar/CostsTab"; import { VerticalTokenMeter } from "./RightSidebar/VerticalTokenMeter"; -import { calculateTokenMeterData } from "@/utils/tokens/tokenMeterUtils"; +import { calculateTokenMeterData } from "@/common/utils/tokens/tokenMeterUtils"; interface ChatMetaSidebarProps { workspaceId: string; diff --git a/src/components/ChatToggles.tsx b/src/browser/components/ChatToggles.tsx similarity index 100% rename from src/components/ChatToggles.tsx rename to src/browser/components/ChatToggles.tsx diff --git a/src/components/CommandPalette.stories.tsx b/src/browser/components/CommandPalette.stories.tsx similarity index 96% rename from src/components/CommandPalette.stories.tsx rename to src/browser/components/CommandPalette.stories.tsx index 7ec208d01..ad5b22da8 100644 --- a/src/components/CommandPalette.stories.tsx +++ b/src/browser/components/CommandPalette.stories.tsx @@ -1,10 +1,10 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { action } from "storybook/actions"; import { CommandPalette } from "./CommandPalette"; -import { CommandRegistryProvider } from "@/contexts/CommandRegistryContext"; -import type { CommandAction } from "@/contexts/CommandRegistryContext"; +import { CommandRegistryProvider } from "@/browser/contexts/CommandRegistryContext"; +import type { CommandAction } from "@/browser/contexts/CommandRegistryContext"; import { useEffect } from "react"; -import { useCommandRegistry } from "@/contexts/CommandRegistryContext"; +import { useCommandRegistry } from "@/browser/contexts/CommandRegistryContext"; // Mock command actions for the demo const mockCommands: CommandAction[] = [ diff --git a/src/components/CommandPalette.test.ts b/src/browser/components/CommandPalette.test.ts similarity index 96% rename from src/components/CommandPalette.test.ts rename to src/browser/components/CommandPalette.test.ts index 7dc4ea8de..550d2dd74 100644 --- a/src/components/CommandPalette.test.ts +++ b/src/browser/components/CommandPalette.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "bun:test"; -import { filterCommandsByPrefix } from "@/utils/commandPaletteFiltering"; -import { CommandIds, CommandIdMatchers } from "@/utils/commandIds"; +import { filterCommandsByPrefix } from "@/browser/utils/commandPaletteFiltering"; +import { CommandIds, CommandIdMatchers } from "@/browser/utils/commandIds"; /** * Tests for command palette filtering logic diff --git a/src/components/CommandPalette.tsx b/src/browser/components/CommandPalette.tsx similarity index 96% rename from src/components/CommandPalette.tsx rename to src/browser/components/CommandPalette.tsx index 434e882ef..6183609e2 100644 --- a/src/components/CommandPalette.tsx +++ b/src/browser/components/CommandPalette.tsx @@ -1,11 +1,16 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { Command } from "cmdk"; -import { useCommandRegistry } from "@/contexts/CommandRegistryContext"; -import type { CommandAction } from "@/contexts/CommandRegistryContext"; -import { formatKeybind, KEYBINDS, isEditableElement, matchesKeybind } from "@/utils/ui/keybinds"; -import { getSlashCommandSuggestions } from "@/utils/slashCommands/suggestions"; -import { CUSTOM_EVENTS, createCustomEvent } from "@/constants/events"; -import { filterCommandsByPrefix } from "@/utils/commandPaletteFiltering"; +import { useCommandRegistry } from "@/browser/contexts/CommandRegistryContext"; +import type { CommandAction } from "@/browser/contexts/CommandRegistryContext"; +import { + formatKeybind, + KEYBINDS, + isEditableElement, + matchesKeybind, +} from "@/browser/utils/ui/keybinds"; +import { getSlashCommandSuggestions } from "@/browser/utils/slashCommands/suggestions"; +import { CUSTOM_EVENTS, createCustomEvent } from "@/common/constants/events"; +import { filterCommandsByPrefix } from "@/browser/utils/commandPaletteFiltering"; interface CommandPaletteProps { getSlashContext?: () => { providerNames: string[]; workspaceId?: string }; diff --git a/src/components/CommandSuggestions.tsx b/src/browser/components/CommandSuggestions.tsx similarity index 97% rename from src/components/CommandSuggestions.tsx rename to src/browser/components/CommandSuggestions.tsx index fd607c3ea..432812739 100644 --- a/src/components/CommandSuggestions.tsx +++ b/src/browser/components/CommandSuggestions.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; -import { cn } from "@/lib/utils"; -import type { SlashSuggestion } from "@/utils/slashCommands/types"; +import { cn } from "@/common/lib/utils"; +import type { SlashSuggestion } from "@/browser/utils/slashCommands/types"; // Export the keys that CommandSuggestions handles export const COMMAND_SUGGESTION_KEYS = ["Tab", "ArrowUp", "ArrowDown", "Escape"]; diff --git a/src/components/Context1MCheckbox.tsx b/src/browser/components/Context1MCheckbox.tsx similarity index 89% rename from src/components/Context1MCheckbox.tsx rename to src/browser/components/Context1MCheckbox.tsx index e98ad1831..1ee5ee68f 100644 --- a/src/components/Context1MCheckbox.tsx +++ b/src/browser/components/Context1MCheckbox.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { use1MContext } from "@/hooks/use1MContext"; -import { supports1MContext } from "@/utils/ai/models"; +import { use1MContext } from "@/browser/hooks/use1MContext"; +import { supports1MContext } from "@/common/utils/ai/models"; import { TooltipWrapper, Tooltip } from "./Tooltip"; interface Context1MCheckboxProps { diff --git a/src/components/ErrorBoundary.tsx b/src/browser/components/ErrorBoundary.tsx similarity index 100% rename from src/components/ErrorBoundary.tsx rename to src/browser/components/ErrorBoundary.tsx diff --git a/src/components/ErrorMessage.stories.tsx b/src/browser/components/ErrorMessage.stories.tsx similarity index 100% rename from src/components/ErrorMessage.stories.tsx rename to src/browser/components/ErrorMessage.stories.tsx diff --git a/src/components/ErrorMessage.tsx b/src/browser/components/ErrorMessage.tsx similarity index 100% rename from src/components/ErrorMessage.tsx rename to src/browser/components/ErrorMessage.tsx diff --git a/src/components/ForceDeleteModal.tsx b/src/browser/components/ForceDeleteModal.tsx similarity index 100% rename from src/components/ForceDeleteModal.tsx rename to src/browser/components/ForceDeleteModal.tsx diff --git a/src/components/GitStatusIndicator.tsx b/src/browser/components/GitStatusIndicator.tsx similarity index 98% rename from src/components/GitStatusIndicator.tsx rename to src/browser/components/GitStatusIndicator.tsx index cfd6136ac..88960d489 100644 --- a/src/components/GitStatusIndicator.tsx +++ b/src/browser/components/GitStatusIndicator.tsx @@ -1,5 +1,5 @@ import React, { useState, useRef, useEffect } from "react"; -import type { GitStatus } from "@/types/workspace"; +import type { GitStatus } from "@/common/types/workspace"; import { GitStatusIndicatorView } from "./GitStatusIndicatorView"; import { useGitBranchDetails } from "./hooks/useGitBranchDetails"; diff --git a/src/components/GitStatusIndicatorView.stories.tsx b/src/browser/components/GitStatusIndicatorView.stories.tsx similarity index 99% rename from src/components/GitStatusIndicatorView.stories.tsx rename to src/browser/components/GitStatusIndicatorView.stories.tsx index 6b175dab4..93416ef51 100644 --- a/src/components/GitStatusIndicatorView.stories.tsx +++ b/src/browser/components/GitStatusIndicatorView.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { expect, userEvent, waitFor } from "storybook/test"; import { GitStatusIndicatorView } from "./GitStatusIndicatorView"; -import type { GitCommit, GitBranchHeader } from "@/utils/git/parseGitLog"; +import type { GitCommit, GitBranchHeader } from "@/node/utils/git/parseGitLog"; import { useState } from "react"; // Type for the wrapped component props (without interaction handlers) diff --git a/src/components/GitStatusIndicatorView.tsx b/src/browser/components/GitStatusIndicatorView.tsx similarity index 97% rename from src/components/GitStatusIndicatorView.tsx rename to src/browser/components/GitStatusIndicatorView.tsx index 638129017..e2602ebcc 100644 --- a/src/components/GitStatusIndicatorView.tsx +++ b/src/browser/components/GitStatusIndicatorView.tsx @@ -1,8 +1,8 @@ import React from "react"; import { createPortal } from "react-dom"; -import type { GitStatus } from "@/types/workspace"; -import type { GitCommit, GitBranchHeader } from "@/utils/git/parseGitLog"; -import { cn } from "@/lib/utils"; +import type { GitStatus } from "@/common/types/workspace"; +import type { GitCommit, GitBranchHeader } from "@/node/utils/git/parseGitLog"; +import { cn } from "@/common/lib/utils"; // Helper for indicator colors const getIndicatorColor = (branch: number): string => { diff --git a/src/components/ImageAttachments.tsx b/src/browser/components/ImageAttachments.tsx similarity index 100% rename from src/components/ImageAttachments.tsx rename to src/browser/components/ImageAttachments.tsx diff --git a/src/components/KebabMenu.stories.tsx b/src/browser/components/KebabMenu.stories.tsx similarity index 100% rename from src/components/KebabMenu.stories.tsx rename to src/browser/components/KebabMenu.stories.tsx diff --git a/src/components/KebabMenu.tsx b/src/browser/components/KebabMenu.tsx similarity index 99% rename from src/components/KebabMenu.tsx rename to src/browser/components/KebabMenu.tsx index 808441863..3b79182e8 100644 --- a/src/components/KebabMenu.tsx +++ b/src/browser/components/KebabMenu.tsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from "react"; import { createPortal } from "react-dom"; import { TooltipWrapper, Tooltip } from "./Tooltip"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; export interface KebabMenuItem { label: string; diff --git a/src/components/LeftSidebar.tsx b/src/browser/components/LeftSidebar.tsx similarity index 94% rename from src/components/LeftSidebar.tsx rename to src/browser/components/LeftSidebar.tsx index fba3fe325..a4d732658 100644 --- a/src/components/LeftSidebar.tsx +++ b/src/browser/components/LeftSidebar.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; +import { cn } from "@/common/lib/utils"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; import ProjectSidebar from "./ProjectSidebar"; import { TitleBar } from "./TitleBar"; diff --git a/src/components/LoadingScreen.tsx b/src/browser/components/LoadingScreen.tsx similarity index 100% rename from src/components/LoadingScreen.tsx rename to src/browser/components/LoadingScreen.tsx diff --git a/src/components/Messages/AssistantMessage.stories.tsx b/src/browser/components/Messages/AssistantMessage.stories.tsx similarity index 99% rename from src/components/Messages/AssistantMessage.stories.tsx rename to src/browser/components/Messages/AssistantMessage.stories.tsx index f33338db4..4259a209e 100644 --- a/src/components/Messages/AssistantMessage.stories.tsx +++ b/src/browser/components/Messages/AssistantMessage.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { AssistantMessage } from "./AssistantMessage"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; import { action } from "storybook/actions"; // Stable timestamp for visual testing (Apple demo time: Jan 24, 2024, 9:41 AM PST) diff --git a/src/components/Messages/AssistantMessage.tsx b/src/browser/components/Messages/AssistantMessage.tsx similarity index 92% rename from src/components/Messages/AssistantMessage.tsx rename to src/browser/components/Messages/AssistantMessage.tsx index 07ca5a42f..b5e5ece13 100644 --- a/src/components/Messages/AssistantMessage.tsx +++ b/src/browser/components/Messages/AssistantMessage.tsx @@ -1,8 +1,8 @@ -import { COMPACTED_EMOJI } from "@/constants/ui"; -import { useCopyToClipboard } from "@/hooks/useCopyToClipboard"; -import { useStartHere } from "@/hooks/useStartHere"; -import type { DisplayedMessage } from "@/types/message"; -import { copyToClipboard } from "@/utils/clipboard"; +import { COMPACTED_EMOJI } from "@/common/constants/ui"; +import { useCopyToClipboard } from "@/browser/hooks/useCopyToClipboard"; +import { useStartHere } from "@/browser/hooks/useStartHere"; +import type { DisplayedMessage } from "@/common/types/message"; +import { copyToClipboard } from "@/browser/utils/clipboard"; import { Clipboard, ClipboardCheck, FileText, ListStart } from "lucide-react"; import React, { useState } from "react"; import { CompactingMessageContent } from "./CompactingMessageContent"; diff --git a/src/components/Messages/ChatBarrier/BaseBarrier.tsx b/src/browser/components/Messages/ChatBarrier/BaseBarrier.tsx similarity index 96% rename from src/components/Messages/ChatBarrier/BaseBarrier.tsx rename to src/browser/components/Messages/ChatBarrier/BaseBarrier.tsx index efa05f7aa..becde41fd 100644 --- a/src/components/Messages/ChatBarrier/BaseBarrier.tsx +++ b/src/browser/components/Messages/ChatBarrier/BaseBarrier.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface BaseBarrierProps { text: string; diff --git a/src/components/Messages/ChatBarrier/InterruptedBarrier.tsx b/src/browser/components/Messages/ChatBarrier/InterruptedBarrier.tsx similarity index 100% rename from src/components/Messages/ChatBarrier/InterruptedBarrier.tsx rename to src/browser/components/Messages/ChatBarrier/InterruptedBarrier.tsx diff --git a/src/components/Messages/ChatBarrier/RetryBarrier.tsx b/src/browser/components/Messages/ChatBarrier/RetryBarrier.tsx similarity index 91% rename from src/components/Messages/ChatBarrier/RetryBarrier.tsx rename to src/browser/components/Messages/ChatBarrier/RetryBarrier.tsx index 5827baaa4..42f60a913 100644 --- a/src/components/Messages/ChatBarrier/RetryBarrier.tsx +++ b/src/browser/components/Messages/ChatBarrier/RetryBarrier.tsx @@ -1,13 +1,16 @@ import React, { useState, useEffect, useMemo } from "react"; -import { usePersistedState, updatePersistedState } from "@/hooks/usePersistedState"; -import { getRetryStateKey, getAutoRetryKey } from "@/constants/storage"; -import { CUSTOM_EVENTS, createCustomEvent } from "@/constants/events"; -import { cn } from "@/lib/utils"; -import type { RetryState } from "@/hooks/useResumeManager"; -import { useWorkspaceState } from "@/stores/WorkspaceStore"; -import { isEligibleForAutoRetry, isNonRetryableSendError } from "@/utils/messages/retryEligibility"; -import { formatSendMessageError } from "@/utils/errors/formatSendError"; -import { createManualRetryState, calculateBackoffDelay } from "@/utils/messages/retryState"; +import { usePersistedState, updatePersistedState } from "@/browser/hooks/usePersistedState"; +import { getRetryStateKey, getAutoRetryKey } from "@/common/constants/storage"; +import { CUSTOM_EVENTS, createCustomEvent } from "@/common/constants/events"; +import { cn } from "@/common/lib/utils"; +import type { RetryState } from "@/browser/hooks/useResumeManager"; +import { useWorkspaceState } from "@/browser/stores/WorkspaceStore"; +import { + isEligibleForAutoRetry, + isNonRetryableSendError, +} from "@/browser/utils/messages/retryEligibility"; +import { formatSendMessageError } from "@/node/utils/errors/formatSendError"; +import { createManualRetryState, calculateBackoffDelay } from "@/browser/utils/messages/retryState"; interface RetryBarrierProps { workspaceId: string; diff --git a/src/components/Messages/ChatBarrier/StreamingBarrier.tsx b/src/browser/components/Messages/ChatBarrier/StreamingBarrier.tsx similarity index 100% rename from src/components/Messages/ChatBarrier/StreamingBarrier.tsx rename to src/browser/components/Messages/ChatBarrier/StreamingBarrier.tsx diff --git a/src/components/Messages/CodeBlockSSR.tsx b/src/browser/components/Messages/CodeBlockSSR.tsx similarity index 100% rename from src/components/Messages/CodeBlockSSR.tsx rename to src/browser/components/Messages/CodeBlockSSR.tsx diff --git a/src/components/Messages/CompactingMessageContent.tsx b/src/browser/components/Messages/CompactingMessageContent.tsx similarity index 100% rename from src/components/Messages/CompactingMessageContent.tsx rename to src/browser/components/Messages/CompactingMessageContent.tsx diff --git a/src/components/Messages/CompactionBackground.tsx b/src/browser/components/Messages/CompactionBackground.tsx similarity index 100% rename from src/components/Messages/CompactionBackground.tsx rename to src/browser/components/Messages/CompactionBackground.tsx diff --git a/src/components/Messages/HistoryHiddenMessage.stories.tsx b/src/browser/components/Messages/HistoryHiddenMessage.stories.tsx similarity index 95% rename from src/components/Messages/HistoryHiddenMessage.stories.tsx rename to src/browser/components/Messages/HistoryHiddenMessage.stories.tsx index bbbbb63f8..15967a060 100644 --- a/src/components/Messages/HistoryHiddenMessage.stories.tsx +++ b/src/browser/components/Messages/HistoryHiddenMessage.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { HistoryHiddenMessage } from "./HistoryHiddenMessage"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; const meta = { title: "Messages/HistoryHiddenMessage", diff --git a/src/components/Messages/HistoryHiddenMessage.tsx b/src/browser/components/Messages/HistoryHiddenMessage.tsx similarity index 85% rename from src/components/Messages/HistoryHiddenMessage.tsx rename to src/browser/components/Messages/HistoryHiddenMessage.tsx index d0124a1f7..6b3dfae50 100644 --- a/src/components/Messages/HistoryHiddenMessage.tsx +++ b/src/browser/components/Messages/HistoryHiddenMessage.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { DisplayedMessage } from "@/types/message"; +import { cn } from "@/common/lib/utils"; +import type { DisplayedMessage } from "@/common/types/message"; interface HistoryHiddenMessageProps { message: DisplayedMessage & { type: "history-hidden" }; diff --git a/src/components/Messages/InitMessage.tsx b/src/browser/components/Messages/InitMessage.tsx similarity index 93% rename from src/components/Messages/InitMessage.tsx rename to src/browser/components/Messages/InitMessage.tsx index 62a33a13f..1217dd2b6 100644 --- a/src/components/Messages/InitMessage.tsx +++ b/src/browser/components/Messages/InitMessage.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { DisplayedMessage } from "@/types/message"; +import { cn } from "@/common/lib/utils"; +import type { DisplayedMessage } from "@/common/types/message"; interface InitMessageProps { message: Extract; diff --git a/src/components/Messages/MarkdownComponents.tsx b/src/browser/components/Messages/MarkdownComponents.tsx similarity index 96% rename from src/components/Messages/MarkdownComponents.tsx rename to src/browser/components/Messages/MarkdownComponents.tsx index b3b9b6387..be98648e8 100644 --- a/src/components/Messages/MarkdownComponents.tsx +++ b/src/browser/components/Messages/MarkdownComponents.tsx @@ -5,9 +5,9 @@ import { getShikiHighlighter, mapToShikiLang, SHIKI_THEME, -} from "@/utils/highlighting/shikiHighlighter"; -import { extractShikiLines } from "@/utils/highlighting/shiki-shared"; -import { CopyButton } from "@/components/ui/CopyButton"; +} from "@/browser/utils/highlighting/shikiHighlighter"; +import { extractShikiLines } from "@/browser/utils/highlighting/shiki-shared"; +import { CopyButton } from "@/browser/components/ui/CopyButton"; interface CodeProps { node?: unknown; diff --git a/src/components/Messages/MarkdownCore.tsx b/src/browser/components/Messages/MarkdownCore.tsx similarity index 100% rename from src/components/Messages/MarkdownCore.tsx rename to src/browser/components/Messages/MarkdownCore.tsx diff --git a/src/components/Messages/MarkdownRenderer.tsx b/src/browser/components/Messages/MarkdownRenderer.tsx similarity index 95% rename from src/components/Messages/MarkdownRenderer.tsx rename to src/browser/components/Messages/MarkdownRenderer.tsx index b2224ac88..9eef6e3ef 100644 --- a/src/components/Messages/MarkdownRenderer.tsx +++ b/src/browser/components/Messages/MarkdownRenderer.tsx @@ -1,6 +1,6 @@ import React from "react"; import { MarkdownCore } from "./MarkdownCore"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface MarkdownRendererProps { content: string; diff --git a/src/components/Messages/MarkdownStyles.ts b/src/browser/components/Messages/MarkdownStyles.ts similarity index 100% rename from src/components/Messages/MarkdownStyles.ts rename to src/browser/components/Messages/MarkdownStyles.ts diff --git a/src/components/Messages/Mermaid.test.tsx b/src/browser/components/Messages/Mermaid.test.tsx similarity index 100% rename from src/components/Messages/Mermaid.test.tsx rename to src/browser/components/Messages/Mermaid.test.tsx diff --git a/src/components/Messages/Mermaid.tsx b/src/browser/components/Messages/Mermaid.tsx similarity index 99% rename from src/components/Messages/Mermaid.tsx rename to src/browser/components/Messages/Mermaid.tsx index 222267aa0..5d9c2252e 100644 --- a/src/components/Messages/Mermaid.tsx +++ b/src/browser/components/Messages/Mermaid.tsx @@ -2,7 +2,7 @@ import type { CSSProperties, ReactNode } from "react"; import React, { useContext, useEffect, useRef, useState } from "react"; import mermaid from "mermaid"; import { StreamingContext } from "./StreamingContext"; -import { usePersistedState } from "@/hooks/usePersistedState"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; const MIN_HEIGHT = 300; const MAX_HEIGHT = 1200; diff --git a/src/components/Messages/MessageRenderer.tsx b/src/browser/components/Messages/MessageRenderer.tsx similarity index 96% rename from src/components/Messages/MessageRenderer.tsx rename to src/browser/components/Messages/MessageRenderer.tsx index 47d45ce6a..8170bec5a 100644 --- a/src/components/Messages/MessageRenderer.tsx +++ b/src/browser/components/Messages/MessageRenderer.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; import { UserMessage } from "./UserMessage"; import { AssistantMessage } from "./AssistantMessage"; import { ToolMessage } from "./ToolMessage"; diff --git a/src/components/Messages/MessageWindow.tsx b/src/browser/components/Messages/MessageWindow.tsx similarity index 96% rename from src/components/Messages/MessageWindow.tsx rename to src/browser/components/Messages/MessageWindow.tsx index 388d0744f..0caea8e5c 100644 --- a/src/components/Messages/MessageWindow.tsx +++ b/src/browser/components/Messages/MessageWindow.tsx @@ -1,6 +1,6 @@ -import { cn } from "@/lib/utils"; -import type { DisplayedMessage, MuxMessage } from "@/types/message"; -import { formatTimestamp } from "@/utils/ui/dateTime"; +import { cn } from "@/common/lib/utils"; +import type { DisplayedMessage, MuxMessage } from "@/common/types/message"; +import { formatTimestamp } from "@/browser/utils/ui/dateTime"; import { Code2Icon } from "lucide-react"; import type { ReactNode } from "react"; import React, { useMemo, useState } from "react"; diff --git a/src/components/Messages/ModelDisplay.tsx b/src/browser/components/Messages/ModelDisplay.tsx similarity index 86% rename from src/components/Messages/ModelDisplay.tsx rename to src/browser/components/Messages/ModelDisplay.tsx index 86162e7e0..cfa57ca66 100644 --- a/src/components/Messages/ModelDisplay.tsx +++ b/src/browser/components/Messages/ModelDisplay.tsx @@ -1,8 +1,8 @@ import React from "react"; -import AnthropicIcon from "@/assets/icons/anthropic.svg?react"; -import OpenAIIcon from "@/assets/icons/openai.svg?react"; -import { TooltipWrapper, Tooltip } from "@/components/Tooltip"; -import { formatModelDisplayName } from "@/utils/ai/modelDisplay"; +import AnthropicIcon from "@/browser/assets/icons/anthropic.svg?react"; +import OpenAIIcon from "@/browser/assets/icons/openai.svg?react"; +import { TooltipWrapper, Tooltip } from "@/browser/components/Tooltip"; +import { formatModelDisplayName } from "@/common/utils/ai/modelDisplay"; interface ModelDisplayProps { modelString: string; diff --git a/src/components/Messages/ReasoningMessage.stories.tsx b/src/browser/components/Messages/ReasoningMessage.stories.tsx similarity index 98% rename from src/components/Messages/ReasoningMessage.stories.tsx rename to src/browser/components/Messages/ReasoningMessage.stories.tsx index 4f85438ae..19253b7fb 100644 --- a/src/components/Messages/ReasoningMessage.stories.tsx +++ b/src/browser/components/Messages/ReasoningMessage.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { ReasoningMessage } from "./ReasoningMessage"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; // Stable timestamp for visual testing (Apple demo time: Jan 24, 2024, 9:41 AM PST) const STABLE_TIMESTAMP = new Date("2024-01-24T09:41:00-08:00").getTime(); diff --git a/src/components/Messages/ReasoningMessage.tsx b/src/browser/components/Messages/ReasoningMessage.tsx similarity index 96% rename from src/components/Messages/ReasoningMessage.tsx rename to src/browser/components/Messages/ReasoningMessage.tsx index 42f68ceba..7c7d62497 100644 --- a/src/components/Messages/ReasoningMessage.tsx +++ b/src/browser/components/Messages/ReasoningMessage.tsx @@ -1,8 +1,8 @@ import React, { useState, useEffect } from "react"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; import { MarkdownRenderer } from "./MarkdownRenderer"; import { TypewriterMarkdown } from "./TypewriterMarkdown"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; import { Shimmer } from "../ai-elements/shimmer"; import { Lightbulb } from "lucide-react"; diff --git a/src/components/Messages/StreamErrorMessage.stories.tsx b/src/browser/components/Messages/StreamErrorMessage.stories.tsx similarity index 96% rename from src/components/Messages/StreamErrorMessage.stories.tsx rename to src/browser/components/Messages/StreamErrorMessage.stories.tsx index acd6b0f3e..48c3e6eae 100644 --- a/src/components/Messages/StreamErrorMessage.stories.tsx +++ b/src/browser/components/Messages/StreamErrorMessage.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { StreamErrorMessage } from "./StreamErrorMessage"; -import type { DisplayedMessage } from "@/types/message"; -import type { StreamErrorType } from "@/types/errors"; +import type { DisplayedMessage } from "@/common/types/message"; +import type { StreamErrorType } from "@/common/types/errors"; // Stable timestamp for visual testing (Apple demo time: Jan 24, 2024, 9:41 AM PST) const STABLE_TIMESTAMP = new Date("2024-01-24T09:41:00-08:00").getTime(); diff --git a/src/components/Messages/StreamErrorMessage.tsx b/src/browser/components/Messages/StreamErrorMessage.tsx similarity index 92% rename from src/components/Messages/StreamErrorMessage.tsx rename to src/browser/components/Messages/StreamErrorMessage.tsx index e02bc0824..050dcb7c4 100644 --- a/src/components/Messages/StreamErrorMessage.tsx +++ b/src/browser/components/Messages/StreamErrorMessage.tsx @@ -1,6 +1,6 @@ import React from "react"; -import type { DisplayedMessage } from "@/types/message"; -import { cn } from "@/lib/utils"; +import type { DisplayedMessage } from "@/common/types/message"; +import { cn } from "@/common/lib/utils"; interface StreamErrorMessageProps { message: DisplayedMessage & { type: "stream-error" }; diff --git a/src/components/Messages/StreamingContext.tsx b/src/browser/components/Messages/StreamingContext.tsx similarity index 100% rename from src/components/Messages/StreamingContext.tsx rename to src/browser/components/Messages/StreamingContext.tsx diff --git a/src/components/Messages/TerminalOutput.stories.tsx b/src/browser/components/Messages/TerminalOutput.stories.tsx similarity index 100% rename from src/components/Messages/TerminalOutput.stories.tsx rename to src/browser/components/Messages/TerminalOutput.stories.tsx diff --git a/src/components/Messages/TerminalOutput.tsx b/src/browser/components/Messages/TerminalOutput.tsx similarity index 93% rename from src/components/Messages/TerminalOutput.tsx rename to src/browser/components/Messages/TerminalOutput.tsx index c6c370ee6..fd8b88c4a 100644 --- a/src/components/Messages/TerminalOutput.tsx +++ b/src/browser/components/Messages/TerminalOutput.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; export interface TerminalOutputProps { output: string; diff --git a/src/components/Messages/ToolMessage.tsx b/src/browser/components/Messages/ToolMessage.tsx similarity index 97% rename from src/components/Messages/ToolMessage.tsx rename to src/browser/components/Messages/ToolMessage.tsx index ba1f819b2..9348dbc86 100644 --- a/src/components/Messages/ToolMessage.tsx +++ b/src/browser/components/Messages/ToolMessage.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; -import type { DisplayedMessage } from "@/types/message"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; +import type { DisplayedMessage } from "@/common/types/message"; import { GenericToolCall } from "../tools/GenericToolCall"; import { BashToolCall } from "../tools/BashToolCall"; import { FileEditToolCall } from "../tools/FileEditToolCall"; @@ -25,7 +25,7 @@ import type { TodoWriteToolResult, StatusSetToolArgs, StatusSetToolResult, -} from "@/types/tools"; +} from "@/common/types/tools"; interface ToolMessageProps { message: DisplayedMessage & { type: "tool" }; diff --git a/src/components/Messages/TypewriterMarkdown.tsx b/src/browser/components/Messages/TypewriterMarkdown.tsx similarity index 96% rename from src/components/Messages/TypewriterMarkdown.tsx rename to src/browser/components/Messages/TypewriterMarkdown.tsx index 4f9631a47..3ac52f2fb 100644 --- a/src/components/Messages/TypewriterMarkdown.tsx +++ b/src/browser/components/Messages/TypewriterMarkdown.tsx @@ -1,5 +1,5 @@ import React, { useMemo } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; import { MarkdownCore } from "./MarkdownCore"; import { StreamingContext } from "./StreamingContext"; diff --git a/src/components/Messages/UserMessage.stories.tsx b/src/browser/components/Messages/UserMessage.stories.tsx similarity index 98% rename from src/components/Messages/UserMessage.stories.tsx rename to src/browser/components/Messages/UserMessage.stories.tsx index 71521233f..105268c7f 100644 --- a/src/components/Messages/UserMessage.stories.tsx +++ b/src/browser/components/Messages/UserMessage.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { action } from "storybook/actions"; import { UserMessage } from "./UserMessage"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; // Stable timestamp for visual testing (Apple demo time: Jan 24, 2024, 9:41 AM PST) const STABLE_TIMESTAMP = new Date("2024-01-24T09:41:00-08:00").getTime(); diff --git a/src/components/Messages/UserMessage.tsx b/src/browser/components/Messages/UserMessage.tsx similarity index 89% rename from src/components/Messages/UserMessage.tsx rename to src/browser/components/Messages/UserMessage.tsx index d812c3588..41b9c8add 100644 --- a/src/components/Messages/UserMessage.tsx +++ b/src/browser/components/Messages/UserMessage.tsx @@ -1,13 +1,13 @@ import React from "react"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; import type { ButtonConfig } from "./MessageWindow"; import { MessageWindow } from "./MessageWindow"; import { TerminalOutput } from "./TerminalOutput"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { useCopyToClipboard } from "@/hooks/useCopyToClipboard"; -import { copyToClipboard } from "@/utils/clipboard"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { VIM_ENABLED_KEY } from "@/constants/storage"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { useCopyToClipboard } from "@/browser/hooks/useCopyToClipboard"; +import { copyToClipboard } from "@/browser/utils/clipboard"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { VIM_ENABLED_KEY } from "@/common/constants/storage"; import { Clipboard, ClipboardCheck, Pencil } from "lucide-react"; interface UserMessageProps { diff --git a/src/components/Modal.stories.tsx b/src/browser/components/Modal.stories.tsx similarity index 100% rename from src/components/Modal.stories.tsx rename to src/browser/components/Modal.stories.tsx diff --git a/src/components/Modal.tsx b/src/browser/components/Modal.tsx similarity index 98% rename from src/components/Modal.tsx rename to src/browser/components/Modal.tsx index a8c45ee97..edd311a19 100644 --- a/src/components/Modal.tsx +++ b/src/browser/components/Modal.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useCallback, useId } from "react"; -import { cn } from "@/lib/utils"; -import { matchesKeybind, KEYBINDS } from "@/utils/ui/keybinds"; +import { cn } from "@/common/lib/utils"; +import { matchesKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; // Export utility components for backwards compatibility export const ModalOverlay: React.FC<{ diff --git a/src/components/ModeSelector.tsx b/src/browser/components/ModeSelector.tsx similarity index 93% rename from src/components/ModeSelector.tsx rename to src/browser/components/ModeSelector.tsx index 254695462..d38d19a3d 100644 --- a/src/components/ModeSelector.tsx +++ b/src/browser/components/ModeSelector.tsx @@ -1,9 +1,9 @@ import React from "react"; import { ToggleGroup, type ToggleOption } from "./ToggleGroup"; import { TooltipWrapper, Tooltip, HelpIndicator } from "./Tooltip"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import type { UIMode } from "@/types/mode"; -import { cn } from "@/lib/utils"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import type { UIMode } from "@/common/types/mode"; +import { cn } from "@/common/lib/utils"; const MODE_OPTIONS: Array> = [ { value: "exec", label: "Exec", activeClassName: "bg-exec-mode text-white" }, diff --git a/src/components/ModelSelector.stories.tsx b/src/browser/components/ModelSelector.stories.tsx similarity index 100% rename from src/components/ModelSelector.stories.tsx rename to src/browser/components/ModelSelector.stories.tsx diff --git a/src/components/ModelSelector.tsx b/src/browser/components/ModelSelector.tsx similarity index 99% rename from src/components/ModelSelector.tsx rename to src/browser/components/ModelSelector.tsx index 95f8a1ba8..12f4961e9 100644 --- a/src/components/ModelSelector.tsx +++ b/src/browser/components/ModelSelector.tsx @@ -6,7 +6,7 @@ import React, { useImperativeHandle, forwardRef, } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface ModelSelectorProps { value: string; diff --git a/src/components/PinnedTodoList.tsx b/src/browser/components/PinnedTodoList.tsx similarity index 91% rename from src/components/PinnedTodoList.tsx rename to src/browser/components/PinnedTodoList.tsx index df1e8569e..2679ccf8d 100644 --- a/src/components/PinnedTodoList.tsx +++ b/src/browser/components/PinnedTodoList.tsx @@ -1,8 +1,8 @@ import React, { useSyncExternalStore } from "react"; import { TodoList } from "./TodoList"; -import { useWorkspaceStoreRaw } from "@/stores/WorkspaceStore"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { cn } from "@/lib/utils"; +import { useWorkspaceStoreRaw } from "@/browser/stores/WorkspaceStore"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { cn } from "@/common/lib/utils"; interface PinnedTodoListProps { workspaceId: string; diff --git a/src/components/ProjectCreateModal.tsx b/src/browser/components/ProjectCreateModal.tsx similarity index 98% rename from src/components/ProjectCreateModal.tsx rename to src/browser/components/ProjectCreateModal.tsx index 6cb042678..97756becd 100644 --- a/src/components/ProjectCreateModal.tsx +++ b/src/browser/components/ProjectCreateModal.tsx @@ -1,6 +1,6 @@ import React, { useState, useCallback } from "react"; import { Modal, ModalActions, CancelButton, PrimaryButton } from "./Modal"; -import type { ProjectConfig } from "@/config"; +import type { ProjectConfig } from "@/node/config"; interface ProjectCreateModalProps { isOpen: boolean; diff --git a/src/components/ProjectSidebar.tsx b/src/browser/components/ProjectSidebar.tsx similarity index 97% rename from src/components/ProjectSidebar.tsx rename to src/browser/components/ProjectSidebar.tsx index 3dd0522a0..45eaf60ac 100644 --- a/src/components/ProjectSidebar.tsx +++ b/src/browser/components/ProjectSidebar.tsx @@ -1,27 +1,31 @@ import React, { useState, useEffect, useCallback, useRef } from "react"; import { createPortal } from "react-dom"; -import { cn } from "@/lib/utils"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { usePersistedState } from "@/hooks/usePersistedState"; +import { cn } from "@/common/lib/utils"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; import { DndProvider } from "react-dnd"; import { HTML5Backend, getEmptyImage } from "react-dnd-html5-backend"; import { useDrag, useDrop, useDragLayer } from "react-dnd"; -import { sortProjectsByOrder, reorderProjects, normalizeOrder } from "@/utils/projectOrdering"; -import { matchesKeybind, formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { PlatformPaths } from "@/utils/paths"; +import { + sortProjectsByOrder, + reorderProjects, + normalizeOrder, +} from "@/common/utils/projectOrdering"; +import { matchesKeybind, formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { PlatformPaths } from "@/common/utils/paths"; import { partitionWorkspacesByAge, formatOldWorkspaceThreshold, -} from "@/utils/ui/workspaceFiltering"; +} from "@/browser/utils/ui/workspaceFiltering"; import { TooltipWrapper, Tooltip } from "./Tooltip"; import SecretsModal from "./SecretsModal"; -import type { Secret } from "@/types/secrets"; +import type { Secret } from "@/common/types/secrets"; import { ForceDeleteModal } from "./ForceDeleteModal"; import { WorkspaceListItem } from "./WorkspaceListItem"; -import { RenameProvider } from "@/contexts/WorkspaceRenameContext"; -import { useProjectContext } from "@/contexts/ProjectContext"; +import { RenameProvider } from "@/browser/contexts/WorkspaceRenameContext"; +import { useProjectContext } from "@/browser/contexts/ProjectContext"; import { ChevronRight, KeyRound } from "lucide-react"; -import { useWorkspaceContext } from "@/contexts/WorkspaceContext"; +import { useWorkspaceContext } from "@/browser/contexts/WorkspaceContext"; // Re-export WorkspaceSelection for backwards compatibility export type { WorkspaceSelection } from "./WorkspaceListItem"; diff --git a/src/components/RightSidebar.tsx b/src/browser/components/RightSidebar.tsx similarity index 95% rename from src/components/RightSidebar.tsx rename to src/browser/components/RightSidebar.tsx index e99b8929b..34d75f068 100644 --- a/src/components/RightSidebar.tsx +++ b/src/browser/components/RightSidebar.tsx @@ -1,15 +1,15 @@ import React from "react"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { useWorkspaceUsage } from "@/stores/WorkspaceStore"; -import { use1MContext } from "@/hooks/use1MContext"; -import { useResizeObserver } from "@/hooks/useResizeObserver"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { useWorkspaceUsage } from "@/browser/stores/WorkspaceStore"; +import { use1MContext } from "@/browser/hooks/use1MContext"; +import { useResizeObserver } from "@/browser/hooks/useResizeObserver"; import { CostsTab } from "./RightSidebar/CostsTab"; import { VerticalTokenMeter } from "./RightSidebar/VerticalTokenMeter"; import { ReviewPanel } from "./RightSidebar/CodeReview/ReviewPanel"; -import { calculateTokenMeterData } from "@/utils/tokens/tokenMeterUtils"; -import { matchesKeybind, KEYBINDS, formatKeybind } from "@/utils/ui/keybinds"; +import { calculateTokenMeterData } from "@/common/utils/tokens/tokenMeterUtils"; +import { matchesKeybind, KEYBINDS, formatKeybind } from "@/browser/utils/ui/keybinds"; import { TooltipWrapper, Tooltip } from "./Tooltip"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface SidebarContainerProps { collapsed: boolean; diff --git a/src/components/RightSidebar/CodeReview/FileTree.tsx b/src/browser/components/RightSidebar/CodeReview/FileTree.tsx similarity index 97% rename from src/components/RightSidebar/CodeReview/FileTree.tsx rename to src/browser/components/RightSidebar/CodeReview/FileTree.tsx index 40e53d900..a38b661dc 100644 --- a/src/components/RightSidebar/CodeReview/FileTree.tsx +++ b/src/browser/components/RightSidebar/CodeReview/FileTree.tsx @@ -3,10 +3,10 @@ */ import React from "react"; -import type { FileTreeNode } from "@/utils/git/numstatParser"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { getFileTreeExpandStateKey } from "@/constants/storage"; -import { cn } from "@/lib/utils"; +import type { FileTreeNode } from "@/node/utils/git/numstatParser"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { getFileTreeExpandStateKey } from "@/common/constants/storage"; +import { cn } from "@/common/lib/utils"; /** * Compute read status for a directory by recursively checking all descendant files diff --git a/src/components/RightSidebar/CodeReview/HunkViewer.tsx b/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx similarity index 96% rename from src/components/RightSidebar/CodeReview/HunkViewer.tsx rename to src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx index f01ceb71e..29deaa163 100644 --- a/src/components/RightSidebar/CodeReview/HunkViewer.tsx +++ b/src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx @@ -3,17 +3,17 @@ */ import React, { useState, useMemo } from "react"; -import type { DiffHunk } from "@/types/review"; +import type { DiffHunk } from "@/common/types/review"; import { SelectableDiffRenderer } from "../../shared/DiffRenderer"; import { type SearchHighlightConfig, highlightSearchInText, -} from "@/utils/highlighting/highlightSearchTerms"; +} from "@/browser/utils/highlighting/highlightSearchTerms"; import { Tooltip, TooltipWrapper } from "../../Tooltip"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { getReviewExpandStateKey } from "@/constants/storage"; -import { KEYBINDS, formatKeybind } from "@/utils/ui/keybinds"; -import { cn } from "@/lib/utils"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { getReviewExpandStateKey } from "@/common/constants/storage"; +import { KEYBINDS, formatKeybind } from "@/browser/utils/ui/keybinds"; +import { cn } from "@/common/lib/utils"; interface HunkViewerProps { hunk: DiffHunk; diff --git a/src/components/RightSidebar/CodeReview/RefreshButton.tsx b/src/browser/components/RightSidebar/CodeReview/RefreshButton.tsx similarity index 93% rename from src/components/RightSidebar/CodeReview/RefreshButton.tsx rename to src/browser/components/RightSidebar/CodeReview/RefreshButton.tsx index a7f6a2ecd..2e3aae015 100644 --- a/src/components/RightSidebar/CodeReview/RefreshButton.tsx +++ b/src/browser/components/RightSidebar/CodeReview/RefreshButton.tsx @@ -3,9 +3,9 @@ */ import React, { useState, useRef, useEffect } from "react"; -import { TooltipWrapper, Tooltip } from "@/components/Tooltip"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { cn } from "@/lib/utils"; +import { TooltipWrapper, Tooltip } from "@/browser/components/Tooltip"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { cn } from "@/common/lib/utils"; interface RefreshButtonProps { onClick: () => void; diff --git a/src/components/RightSidebar/CodeReview/ReviewControls.tsx b/src/browser/components/RightSidebar/CodeReview/ReviewControls.tsx similarity index 97% rename from src/components/RightSidebar/CodeReview/ReviewControls.tsx rename to src/browser/components/RightSidebar/CodeReview/ReviewControls.tsx index a4989c207..10f19aa0a 100644 --- a/src/components/RightSidebar/CodeReview/ReviewControls.tsx +++ b/src/browser/components/RightSidebar/CodeReview/ReviewControls.tsx @@ -3,8 +3,8 @@ */ import React, { useState } from "react"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import type { ReviewFilters, ReviewStats } from "@/types/review"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import type { ReviewFilters, ReviewStats } from "@/common/types/review"; import { RefreshButton } from "./RefreshButton"; import { UntrackedStatus } from "./UntrackedStatus"; diff --git a/src/components/RightSidebar/CodeReview/ReviewPanel.tsx b/src/browser/components/RightSidebar/CodeReview/ReviewPanel.tsx similarity index 97% rename from src/components/RightSidebar/CodeReview/ReviewPanel.tsx rename to src/browser/components/RightSidebar/CodeReview/ReviewPanel.tsx index 965830a4f..f41b2ea1d 100644 --- a/src/components/RightSidebar/CodeReview/ReviewPanel.tsx +++ b/src/browser/components/RightSidebar/CodeReview/ReviewPanel.tsx @@ -26,17 +26,17 @@ import React, { useState, useEffect, useMemo, useCallback, useRef } from "react" import { HunkViewer } from "./HunkViewer"; import { ReviewControls } from "./ReviewControls"; import { FileTree } from "./FileTree"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { useReviewState } from "@/hooks/useReviewState"; -import { parseDiff, extractAllHunks } from "@/utils/git/diffParser"; -import { getReviewSearchStateKey } from "@/constants/storage"; -import { Tooltip, TooltipWrapper } from "@/components/Tooltip"; -import { parseNumstat, buildFileTree, extractNewPath } from "@/utils/git/numstatParser"; -import type { DiffHunk, ReviewFilters as ReviewFiltersType } from "@/types/review"; -import type { FileTreeNode } from "@/utils/git/numstatParser"; -import { matchesKeybind, KEYBINDS, formatKeybind } from "@/utils/ui/keybinds"; -import { applyFrontendFilters } from "@/utils/review/filterHunks"; -import { cn } from "@/lib/utils"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { useReviewState } from "@/browser/hooks/useReviewState"; +import { parseDiff, extractAllHunks } from "@/node/utils/git/diffParser"; +import { getReviewSearchStateKey } from "@/common/constants/storage"; +import { Tooltip, TooltipWrapper } from "@/browser/components/Tooltip"; +import { parseNumstat, buildFileTree, extractNewPath } from "@/node/utils/git/numstatParser"; +import type { DiffHunk, ReviewFilters as ReviewFiltersType } from "@/common/types/review"; +import type { FileTreeNode } from "@/node/utils/git/numstatParser"; +import { matchesKeybind, KEYBINDS, formatKeybind } from "@/browser/utils/ui/keybinds"; +import { applyFrontendFilters } from "@/browser/utils/review/filterHunks"; +import { cn } from "@/common/lib/utils"; interface ReviewPanelProps { workspaceId: string; diff --git a/src/components/RightSidebar/CodeReview/UntrackedStatus.tsx b/src/browser/components/RightSidebar/CodeReview/UntrackedStatus.tsx similarity index 99% rename from src/components/RightSidebar/CodeReview/UntrackedStatus.tsx rename to src/browser/components/RightSidebar/CodeReview/UntrackedStatus.tsx index 91c6b890b..9ddae6998 100644 --- a/src/components/RightSidebar/CodeReview/UntrackedStatus.tsx +++ b/src/browser/components/RightSidebar/CodeReview/UntrackedStatus.tsx @@ -3,7 +3,7 @@ */ import React, { useState, useEffect, useRef } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface UntrackedStatusProps { workspaceId: string; diff --git a/src/components/RightSidebar/ConsumerBreakdown.tsx b/src/browser/components/RightSidebar/ConsumerBreakdown.tsx similarity index 98% rename from src/components/RightSidebar/ConsumerBreakdown.tsx rename to src/browser/components/RightSidebar/ConsumerBreakdown.tsx index 21893ddbd..98dbc7c73 100644 --- a/src/components/RightSidebar/ConsumerBreakdown.tsx +++ b/src/browser/components/RightSidebar/ConsumerBreakdown.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { WorkspaceConsumersState } from "@/stores/WorkspaceStore"; +import type { WorkspaceConsumersState } from "@/browser/stores/WorkspaceStore"; import { TooltipWrapper, Tooltip, HelpIndicator } from "../Tooltip"; // Format token display - show k for thousands with 1 decimal diff --git a/src/components/RightSidebar/CostsTab.tsx b/src/browser/components/RightSidebar/CostsTab.tsx similarity index 97% rename from src/components/RightSidebar/CostsTab.tsx rename to src/browser/components/RightSidebar/CostsTab.tsx index 5808da625..0705a8aff 100644 --- a/src/components/RightSidebar/CostsTab.tsx +++ b/src/browser/components/RightSidebar/CostsTab.tsx @@ -1,12 +1,12 @@ import React from "react"; -import { useWorkspaceUsage, useWorkspaceConsumers } from "@/stores/WorkspaceStore"; -import { getModelStats } from "@/utils/tokens/modelStats"; -import { sumUsageHistory } from "@/utils/tokens/usageAggregator"; -import { usePersistedState } from "@/hooks/usePersistedState"; +import { useWorkspaceUsage, useWorkspaceConsumers } from "@/browser/stores/WorkspaceStore"; +import { getModelStats } from "@/common/utils/tokens/modelStats"; +import { sumUsageHistory } from "@/common/utils/tokens/usageAggregator"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; import { ToggleGroup, type ToggleOption } from "../ToggleGroup"; -import { use1MContext } from "@/hooks/use1MContext"; -import { supports1MContext } from "@/utils/ai/models"; -import { TOKEN_COMPONENT_COLORS } from "@/utils/tokens/tokenMeterUtils"; +import { use1MContext } from "@/browser/hooks/use1MContext"; +import { supports1MContext } from "@/common/utils/ai/models"; +import { TOKEN_COMPONENT_COLORS } from "@/common/utils/tokens/tokenMeterUtils"; import { ConsumerBreakdown } from "./ConsumerBreakdown"; // Format token display - show k for thousands with 1 decimal diff --git a/src/components/RightSidebar/TokenMeter.tsx b/src/browser/components/RightSidebar/TokenMeter.tsx similarity index 92% rename from src/components/RightSidebar/TokenMeter.tsx rename to src/browser/components/RightSidebar/TokenMeter.tsx index f0dbf0ff9..7cd8cb748 100644 --- a/src/components/RightSidebar/TokenMeter.tsx +++ b/src/browser/components/RightSidebar/TokenMeter.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { TokenSegment } from "@/utils/tokens/tokenMeterUtils"; +import { cn } from "@/common/lib/utils"; +import type { TokenSegment } from "@/common/utils/tokens/tokenMeterUtils"; interface TokenMeterProps { segments: TokenSegment[]; diff --git a/src/components/RightSidebar/VerticalTokenMeter.tsx b/src/browser/components/RightSidebar/VerticalTokenMeter.tsx similarity index 97% rename from src/components/RightSidebar/VerticalTokenMeter.tsx rename to src/browser/components/RightSidebar/VerticalTokenMeter.tsx index f4eee373c..959a13d43 100644 --- a/src/components/RightSidebar/VerticalTokenMeter.tsx +++ b/src/browser/components/RightSidebar/VerticalTokenMeter.tsx @@ -1,7 +1,11 @@ import React from "react"; import { TooltipWrapper, Tooltip } from "../Tooltip"; import { TokenMeter } from "./TokenMeter"; -import { type TokenMeterData, formatTokens, getSegmentLabel } from "@/utils/tokens/tokenMeterUtils"; +import { + type TokenMeterData, + formatTokens, + getSegmentLabel, +} from "@/common/utils/tokens/tokenMeterUtils"; const VerticalTokenMeterComponent: React.FC<{ data: TokenMeterData }> = ({ data }) => { if (data.segments.length === 0) return null; diff --git a/src/components/RuntimeBadge.tsx b/src/browser/components/RuntimeBadge.tsx similarity index 86% rename from src/components/RuntimeBadge.tsx rename to src/browser/components/RuntimeBadge.tsx index 16ef6a29f..e0b399d52 100644 --- a/src/components/RuntimeBadge.tsx +++ b/src/browser/components/RuntimeBadge.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { RuntimeConfig } from "@/types/runtime"; -import { isSSHRuntime } from "@/types/runtime"; -import { extractSshHostname } from "@/utils/ui/runtimeBadge"; +import { cn } from "@/common/lib/utils"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { isSSHRuntime } from "@/common/types/runtime"; +import { extractSshHostname } from "@/browser/utils/ui/runtimeBadge"; import { TooltipWrapper, Tooltip } from "./Tooltip"; interface RuntimeBadgeProps { diff --git a/src/components/SecretsModal.tsx b/src/browser/components/SecretsModal.tsx similarity index 99% rename from src/components/SecretsModal.tsx rename to src/browser/components/SecretsModal.tsx index b05c1fac9..28522b56b 100644 --- a/src/components/SecretsModal.tsx +++ b/src/browser/components/SecretsModal.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import { Modal, ModalInfo, ModalActions, CancelButton, PrimaryButton } from "./Modal"; -import type { Secret } from "@/types/secrets"; +import type { Secret } from "@/common/types/secrets"; // Visibility toggle icon component const ToggleVisibilityIcon: React.FC<{ visible: boolean }> = ({ visible }) => { diff --git a/src/components/Select.tsx b/src/browser/components/Select.tsx similarity index 100% rename from src/components/Select.tsx rename to src/browser/components/Select.tsx diff --git a/src/components/StartHereModal.tsx b/src/browser/components/StartHereModal.tsx similarity index 100% rename from src/components/StartHereModal.tsx rename to src/browser/components/StartHereModal.tsx diff --git a/src/components/TerminalView.tsx b/src/browser/components/TerminalView.tsx similarity index 99% rename from src/components/TerminalView.tsx rename to src/browser/components/TerminalView.tsx index ee05a709c..e6f1a266d 100644 --- a/src/components/TerminalView.tsx +++ b/src/browser/components/TerminalView.tsx @@ -1,6 +1,6 @@ import { useRef, useEffect, useState } from "react"; import { Terminal, FitAddon } from "ghostty-web"; -import { useTerminalSession } from "@/hooks/useTerminalSession"; +import { useTerminalSession } from "@/browser/hooks/useTerminalSession"; interface TerminalViewProps { workspaceId: string; diff --git a/src/components/ThinkingSlider.stories.tsx b/src/browser/components/ThinkingSlider.stories.tsx similarity index 98% rename from src/components/ThinkingSlider.stories.tsx rename to src/browser/components/ThinkingSlider.stories.tsx index 815c2f036..0b324cc7a 100644 --- a/src/components/ThinkingSlider.stories.tsx +++ b/src/browser/components/ThinkingSlider.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite"; import { expect, within } from "storybook/test"; import { ThinkingSliderComponent } from "./ThinkingSlider"; -import { ThinkingProvider } from "@/contexts/ThinkingContext"; +import { ThinkingProvider } from "@/browser/contexts/ThinkingContext"; const meta = { title: "Components/ThinkingSlider", diff --git a/src/components/ThinkingSlider.tsx b/src/browser/components/ThinkingSlider.tsx similarity index 93% rename from src/components/ThinkingSlider.tsx rename to src/browser/components/ThinkingSlider.tsx index 8d58d7cce..a93331141 100644 --- a/src/components/ThinkingSlider.tsx +++ b/src/browser/components/ThinkingSlider.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useId } from "react"; -import type { ThinkingLevel, ThinkingLevelOn } from "@/types/thinking"; -import { useThinkingLevel } from "@/hooks/useThinkingLevel"; +import type { ThinkingLevel, ThinkingLevelOn } from "@/common/types/thinking"; +import { useThinkingLevel } from "@/browser/hooks/useThinkingLevel"; import { TooltipWrapper, Tooltip } from "./Tooltip"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { getThinkingPolicyForModel } from "@/utils/thinking/policy"; -import { updatePersistedState } from "@/hooks/usePersistedState"; -import { getLastThinkingByModelKey } from "@/constants/storage"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { getThinkingPolicyForModel } from "@/browser/utils/thinking/policy"; +import { updatePersistedState } from "@/browser/hooks/usePersistedState"; +import { getLastThinkingByModelKey } from "@/common/constants/storage"; // Subtle consistent glow for active levels const GLOW = { diff --git a/src/components/TipsCarousel.stories.tsx b/src/browser/components/TipsCarousel.stories.tsx similarity index 100% rename from src/components/TipsCarousel.stories.tsx rename to src/browser/components/TipsCarousel.stories.tsx diff --git a/src/components/TipsCarousel.tsx b/src/browser/components/TipsCarousel.tsx similarity index 97% rename from src/components/TipsCarousel.tsx rename to src/browser/components/TipsCarousel.tsx index c18b9efc3..ed59d6110 100644 --- a/src/components/TipsCarousel.tsx +++ b/src/browser/components/TipsCarousel.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; // Extend window with tip debugging functions declare global { diff --git a/src/components/TitleBar.tsx b/src/browser/components/TitleBar.tsx similarity index 98% rename from src/components/TitleBar.tsx rename to src/browser/components/TitleBar.tsx index 89032c1c1..d384bb77a 100644 --- a/src/components/TitleBar.tsx +++ b/src/browser/components/TitleBar.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useRef } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; import { VERSION } from "@/version"; import { TooltipWrapper, Tooltip } from "./Tooltip"; -import type { UpdateStatus } from "@/types/ipc"; -import { isTelemetryEnabled } from "@/telemetry"; +import type { UpdateStatus } from "@/common/types/ipc"; +import { isTelemetryEnabled } from "@/node/telemetry"; // Update check intervals const UPDATE_CHECK_INTERVAL_MS = 4 * 60 * 60 * 1000; // 4 hours diff --git a/src/components/TodoList.tsx b/src/browser/components/TodoList.tsx similarity index 97% rename from src/components/TodoList.tsx rename to src/browser/components/TodoList.tsx index 003b9e260..eef1de637 100644 --- a/src/components/TodoList.tsx +++ b/src/browser/components/TodoList.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import type { TodoItem } from "@/types/tools"; +import { cn } from "@/common/lib/utils"; +import type { TodoItem } from "@/common/types/tools"; const statusBgColors: Record = { completed: "color-mix(in srgb, #4caf50, transparent 92%)", diff --git a/src/components/ToggleGroup.stories.tsx b/src/browser/components/ToggleGroup.stories.tsx similarity index 99% rename from src/components/ToggleGroup.stories.tsx rename to src/browser/components/ToggleGroup.stories.tsx index aa288764c..aaccb16a9 100644 --- a/src/components/ToggleGroup.stories.tsx +++ b/src/browser/components/ToggleGroup.stories.tsx @@ -4,7 +4,7 @@ import { expect, userEvent, within, waitFor } from "storybook/test"; import { useArgs } from "storybook/preview-api"; import { ToggleGroup, type ToggleOption } from "./ToggleGroup"; import { useState } from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; const meta = { title: "Components/ToggleGroup", diff --git a/src/components/ToggleGroup.tsx b/src/browser/components/ToggleGroup.tsx similarity index 98% rename from src/components/ToggleGroup.tsx rename to src/browser/components/ToggleGroup.tsx index bc223e646..8525c983c 100644 --- a/src/components/ToggleGroup.tsx +++ b/src/browser/components/ToggleGroup.tsx @@ -1,4 +1,4 @@ -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; export interface ToggleOption { value: T; diff --git a/src/components/Tooltip.stories.tsx b/src/browser/components/Tooltip.stories.tsx similarity index 100% rename from src/components/Tooltip.stories.tsx rename to src/browser/components/Tooltip.stories.tsx diff --git a/src/components/Tooltip.tsx b/src/browser/components/Tooltip.tsx similarity index 99% rename from src/components/Tooltip.tsx rename to src/browser/components/Tooltip.tsx index a07b8506d..09603c808 100644 --- a/src/components/Tooltip.tsx +++ b/src/browser/components/Tooltip.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useLayoutEffect, createContext, useContext } from "react"; import { createPortal } from "react-dom"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; // Context for passing hover state and trigger ref from wrapper to tooltip interface TooltipContextValue { diff --git a/src/components/VimTextArea.tsx b/src/browser/components/VimTextArea.tsx similarity index 96% rename from src/components/VimTextArea.tsx rename to src/browser/components/VimTextArea.tsx index 0fc29f34b..b296a5f79 100644 --- a/src/components/VimTextArea.tsx +++ b/src/browser/components/VimTextArea.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useMemo, useRef, useState } from "react"; -import type { UIMode } from "@/types/mode"; -import * as vim from "@/utils/vim"; +import type { UIMode } from "@/common/types/mode"; +import * as vim from "@/browser/utils/vim"; import { TooltipWrapper, Tooltip, HelpIndicator } from "./Tooltip"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { cn } from "@/lib/utils"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { VIM_ENABLED_KEY } from "@/constants/storage"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { cn } from "@/common/lib/utils"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { VIM_ENABLED_KEY } from "@/common/constants/storage"; /** * VimTextArea – minimal Vim-like editing for a textarea. diff --git a/src/components/WorkspaceHeader.tsx b/src/browser/components/WorkspaceHeader.tsx similarity index 93% rename from src/components/WorkspaceHeader.tsx rename to src/browser/components/WorkspaceHeader.tsx index 6f5d76a8c..d74f201db 100644 --- a/src/components/WorkspaceHeader.tsx +++ b/src/browser/components/WorkspaceHeader.tsx @@ -2,9 +2,9 @@ import React, { useCallback } from "react"; import { GitStatusIndicator } from "./GitStatusIndicator"; import { RuntimeBadge } from "./RuntimeBadge"; import { TooltipWrapper, Tooltip } from "./Tooltip"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { useGitStatus } from "@/stores/GitStatusStore"; -import type { RuntimeConfig } from "@/types/runtime"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { useGitStatus } from "@/browser/stores/GitStatusStore"; +import type { RuntimeConfig } from "@/common/types/runtime"; import { WorkspaceStatusDot } from "./WorkspaceStatusDot"; interface WorkspaceHeaderProps { diff --git a/src/components/WorkspaceListItem.tsx b/src/browser/components/WorkspaceListItem.tsx similarity index 95% rename from src/components/WorkspaceListItem.tsx rename to src/browser/components/WorkspaceListItem.tsx index 65b18ab81..bb8e17db4 100644 --- a/src/components/WorkspaceListItem.tsx +++ b/src/browser/components/WorkspaceListItem.tsx @@ -1,8 +1,8 @@ -import { useRename } from "@/contexts/WorkspaceRenameContext"; -import { cn } from "@/lib/utils"; -import { useGitStatus } from "@/stores/GitStatusStore"; -import { useWorkspaceSidebarState } from "@/stores/WorkspaceStore"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; +import { useRename } from "@/browser/contexts/WorkspaceRenameContext"; +import { cn } from "@/common/lib/utils"; +import { useGitStatus } from "@/browser/stores/GitStatusStore"; +import { useWorkspaceSidebarState } from "@/browser/stores/WorkspaceStore"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; import React, { useCallback, useState } from "react"; import { GitStatusIndicator } from "./GitStatusIndicator"; import { RuntimeBadge } from "./RuntimeBadge"; diff --git a/src/components/WorkspaceStatusDot.tsx b/src/browser/components/WorkspaceStatusDot.tsx similarity index 92% rename from src/components/WorkspaceStatusDot.tsx rename to src/browser/components/WorkspaceStatusDot.tsx index f7c22bfc5..40f495ab7 100644 --- a/src/components/WorkspaceStatusDot.tsx +++ b/src/browser/components/WorkspaceStatusDot.tsx @@ -1,6 +1,6 @@ -import { cn } from "@/lib/utils"; -import { useWorkspaceSidebarState } from "@/stores/WorkspaceStore"; -import { getStatusTooltip } from "@/utils/ui/statusTooltip"; +import { cn } from "@/common/lib/utils"; +import { useWorkspaceSidebarState } from "@/browser/stores/WorkspaceStore"; +import { getStatusTooltip } from "@/browser/utils/ui/statusTooltip"; import { memo, useMemo } from "react"; import { Tooltip, TooltipWrapper } from "./Tooltip"; diff --git a/src/components/WorkspaceStatusIndicator.tsx b/src/browser/components/WorkspaceStatusIndicator.tsx similarity index 94% rename from src/components/WorkspaceStatusIndicator.tsx rename to src/browser/components/WorkspaceStatusIndicator.tsx index 9371ac9e2..31191240a 100644 --- a/src/components/WorkspaceStatusIndicator.tsx +++ b/src/browser/components/WorkspaceStatusIndicator.tsx @@ -1,4 +1,4 @@ -import { useWorkspaceSidebarState } from "@/stores/WorkspaceStore"; +import { useWorkspaceSidebarState } from "@/browser/stores/WorkspaceStore"; import { ExternalLinkIcon } from "lucide-react"; import { memo } from "react"; import { Tooltip, TooltipWrapper } from "./Tooltip"; diff --git a/src/components/ai-elements/shimmer.tsx b/src/browser/components/ai-elements/shimmer.tsx similarity index 97% rename from src/components/ai-elements/shimmer.tsx rename to src/browser/components/ai-elements/shimmer.tsx index be8593849..ce67337ad 100644 --- a/src/components/ai-elements/shimmer.tsx +++ b/src/browser/components/ai-elements/shimmer.tsx @@ -1,6 +1,6 @@ "use client"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; import { motion } from "motion/react"; import { type CSSProperties, type ElementType, type JSX, memo, useMemo } from "react"; diff --git a/src/components/hooks/useGitBranchDetails.ts b/src/browser/components/hooks/useGitBranchDetails.ts similarity index 98% rename from src/components/hooks/useGitBranchDetails.ts rename to src/browser/components/hooks/useGitBranchDetails.ts index c0ae791aa..fa28c8239 100644 --- a/src/components/hooks/useGitBranchDetails.ts +++ b/src/browser/components/hooks/useGitBranchDetails.ts @@ -1,7 +1,11 @@ import { useState, useRef, useEffect, useCallback } from "react"; import { z } from "zod"; -import type { GitStatus } from "@/types/workspace"; -import { parseGitShowBranch, type GitCommit, type GitBranchHeader } from "@/utils/git/parseGitLog"; +import type { GitStatus } from "@/common/types/workspace"; +import { + parseGitShowBranch, + type GitCommit, + type GitBranchHeader, +} from "@/node/utils/git/parseGitLog"; const GitBranchDataSchema = z.object({ showBranch: z.string(), diff --git a/src/components/icons/CopyIcon.tsx b/src/browser/components/icons/CopyIcon.tsx similarity index 100% rename from src/components/icons/CopyIcon.tsx rename to src/browser/components/icons/CopyIcon.tsx diff --git a/src/components/shared/DiffRenderer.test.tsx b/src/browser/components/shared/DiffRenderer.test.tsx similarity index 100% rename from src/components/shared/DiffRenderer.test.tsx rename to src/browser/components/shared/DiffRenderer.test.tsx diff --git a/src/components/shared/DiffRenderer.tsx b/src/browser/components/shared/DiffRenderer.tsx similarity index 98% rename from src/components/shared/DiffRenderer.tsx rename to src/browser/components/shared/DiffRenderer.tsx index 9a4233b55..426a2421d 100644 --- a/src/components/shared/DiffRenderer.tsx +++ b/src/browser/components/shared/DiffRenderer.tsx @@ -5,15 +5,18 @@ */ import React, { useEffect, useState } from "react"; -import { cn } from "@/lib/utils"; -import { getLanguageFromPath } from "@/utils/git/languageDetector"; +import { cn } from "@/common/lib/utils"; +import { getLanguageFromPath } from "@/node/utils/git/languageDetector"; import { Tooltip, TooltipWrapper } from "../Tooltip"; -import { groupDiffLines } from "@/utils/highlighting/diffChunking"; -import { highlightDiffChunk, type HighlightedChunk } from "@/utils/highlighting/highlightDiffChunk"; +import { groupDiffLines } from "@/browser/utils/highlighting/diffChunking"; +import { + highlightDiffChunk, + type HighlightedChunk, +} from "@/browser/utils/highlighting/highlightDiffChunk"; import { highlightSearchMatches, type SearchHighlightConfig, -} from "@/utils/highlighting/highlightSearchTerms"; +} from "@/browser/utils/highlighting/highlightSearchTerms"; // Shared type for diff line types export type DiffLineType = "add" | "remove" | "context" | "header"; diff --git a/src/components/tools/BashToolCall.tsx b/src/browser/components/tools/BashToolCall.tsx similarity index 96% rename from src/components/tools/BashToolCall.tsx rename to src/browser/components/tools/BashToolCall.tsx index 5247c02df..50ad8a7e3 100644 --- a/src/components/tools/BashToolCall.tsx +++ b/src/browser/components/tools/BashToolCall.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from "react"; -import type { BashToolArgs, BashToolResult } from "@/types/tools"; -import { BASH_DEFAULT_TIMEOUT_SECS } from "@/constants/toolLimits"; +import type { BashToolArgs, BashToolResult } from "@/common/types/tools"; +import { BASH_DEFAULT_TIMEOUT_SECS } from "@/common/constants/toolLimits"; import { ToolContainer, ToolHeader, diff --git a/src/components/tools/FileEditToolCall.tsx b/src/browser/components/tools/FileEditToolCall.tsx similarity index 98% rename from src/components/tools/FileEditToolCall.tsx rename to src/browser/components/tools/FileEditToolCall.tsx index bb40ee70e..c48d7082a 100644 --- a/src/components/tools/FileEditToolCall.tsx +++ b/src/browser/components/tools/FileEditToolCall.tsx @@ -7,7 +7,7 @@ import type { FileEditReplaceStringToolResult, FileEditReplaceLinesToolArgs, FileEditReplaceLinesToolResult, -} from "@/types/tools"; +} from "@/common/types/tools"; import { ToolContainer, ToolHeader, @@ -19,7 +19,7 @@ import { LoadingDots, } from "./shared/ToolPrimitives"; import { useToolExpansion, getStatusDisplay, type ToolStatus } from "./shared/toolUtils"; -import { useCopyToClipboard } from "@/hooks/useCopyToClipboard"; +import { useCopyToClipboard } from "@/browser/hooks/useCopyToClipboard"; import { TooltipWrapper, Tooltip } from "../Tooltip"; import { DiffContainer, DiffRenderer, SelectableDiffRenderer } from "../shared/DiffRenderer"; import { KebabMenu, type KebabMenuItem } from "../KebabMenu"; diff --git a/src/components/tools/FileReadToolCall.tsx b/src/browser/components/tools/FileReadToolCall.tsx similarity index 98% rename from src/components/tools/FileReadToolCall.tsx rename to src/browser/components/tools/FileReadToolCall.tsx index 39c9a802e..a5c0b2fb8 100644 --- a/src/components/tools/FileReadToolCall.tsx +++ b/src/browser/components/tools/FileReadToolCall.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { FileReadToolArgs, FileReadToolResult } from "@/types/tools"; +import type { FileReadToolArgs, FileReadToolResult } from "@/common/types/tools"; import { ToolContainer, ToolHeader, diff --git a/src/components/tools/GenericToolCall.tsx b/src/browser/components/tools/GenericToolCall.tsx similarity index 100% rename from src/components/tools/GenericToolCall.tsx rename to src/browser/components/tools/GenericToolCall.tsx diff --git a/src/components/tools/ProposePlanToolCall.tsx b/src/browser/components/tools/ProposePlanToolCall.tsx similarity index 97% rename from src/components/tools/ProposePlanToolCall.tsx rename to src/browser/components/tools/ProposePlanToolCall.tsx index 715d5198a..d743b2ba5 100644 --- a/src/components/tools/ProposePlanToolCall.tsx +++ b/src/browser/components/tools/ProposePlanToolCall.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import type { ProposePlanToolArgs, ProposePlanToolResult } from "@/types/tools"; +import type { ProposePlanToolArgs, ProposePlanToolResult } from "@/common/types/tools"; import { ToolContainer, ToolHeader, @@ -10,11 +10,11 @@ import { } from "./shared/ToolPrimitives"; import { useToolExpansion, getStatusDisplay, type ToolStatus } from "./shared/toolUtils"; import { MarkdownRenderer } from "../Messages/MarkdownRenderer"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { useStartHere } from "@/hooks/useStartHere"; -import { useCopyToClipboard } from "@/hooks/useCopyToClipboard"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { useStartHere } from "@/browser/hooks/useStartHere"; +import { useCopyToClipboard } from "@/browser/hooks/useCopyToClipboard"; import { TooltipWrapper, Tooltip } from "../Tooltip"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; interface ProposePlanToolCallProps { args: ProposePlanToolArgs; diff --git a/src/components/tools/StatusSetToolCall.tsx b/src/browser/components/tools/StatusSetToolCall.tsx similarity index 93% rename from src/components/tools/StatusSetToolCall.tsx rename to src/browser/components/tools/StatusSetToolCall.tsx index fc9942d46..46717b799 100644 --- a/src/components/tools/StatusSetToolCall.tsx +++ b/src/browser/components/tools/StatusSetToolCall.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { StatusSetToolArgs, StatusSetToolResult } from "@/types/tools"; +import type { StatusSetToolArgs, StatusSetToolResult } from "@/common/types/tools"; import { ToolContainer, ToolHeader, StatusIndicator } from "./shared/ToolPrimitives"; import { getStatusDisplay, type ToolStatus } from "./shared/toolUtils"; import { TooltipWrapper, Tooltip } from "../Tooltip"; diff --git a/src/components/tools/TodoToolCall.tsx b/src/browser/components/tools/TodoToolCall.tsx similarity index 93% rename from src/components/tools/TodoToolCall.tsx rename to src/browser/components/tools/TodoToolCall.tsx index 68404e829..b8238b5d8 100644 --- a/src/components/tools/TodoToolCall.tsx +++ b/src/browser/components/tools/TodoToolCall.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { TodoWriteToolArgs, TodoWriteToolResult } from "@/types/tools"; +import type { TodoWriteToolArgs, TodoWriteToolResult } from "@/common/types/tools"; import { ToolContainer, ToolHeader, diff --git a/src/components/tools/shared/ToolPrimitives.tsx b/src/browser/components/tools/shared/ToolPrimitives.tsx similarity index 99% rename from src/components/tools/shared/ToolPrimitives.tsx rename to src/browser/components/tools/shared/ToolPrimitives.tsx index 8c79e7c11..7fccb3952 100644 --- a/src/components/tools/shared/ToolPrimitives.tsx +++ b/src/browser/components/tools/shared/ToolPrimitives.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; /** * Shared styled components for tool UI diff --git a/src/components/tools/shared/toolUtils.tsx b/src/browser/components/tools/shared/toolUtils.tsx similarity index 100% rename from src/components/tools/shared/toolUtils.tsx rename to src/browser/components/tools/shared/toolUtils.tsx diff --git a/src/components/ui/CopyButton.stories.tsx b/src/browser/components/ui/CopyButton.stories.tsx similarity index 100% rename from src/components/ui/CopyButton.stories.tsx rename to src/browser/components/ui/CopyButton.stories.tsx diff --git a/src/components/ui/CopyButton.tsx b/src/browser/components/ui/CopyButton.tsx similarity index 89% rename from src/components/ui/CopyButton.tsx rename to src/browser/components/ui/CopyButton.tsx index 44816a56a..7f1c3226d 100644 --- a/src/components/ui/CopyButton.tsx +++ b/src/browser/components/ui/CopyButton.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; -import { CopyIcon } from "@/components/icons/CopyIcon"; -import { copyToClipboard } from "@/utils/clipboard"; +import { CopyIcon } from "@/browser/components/icons/CopyIcon"; +import { copyToClipboard } from "@/browser/utils/clipboard"; interface CopyButtonProps { /** diff --git a/src/components/ui/button.tsx b/src/browser/components/ui/button.tsx similarity index 97% rename from src/components/ui/button.tsx rename to src/browser/components/ui/button.tsx index 87ce3b990..ea22745db 100644 --- a/src/components/ui/button.tsx +++ b/src/browser/components/ui/button.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { Slot } from "@radix-ui/react-slot"; import { cva, type VariantProps } from "class-variance-authority"; -import { cn } from "@/lib/utils"; +import { cn } from "@/common/lib/utils"; const buttonVariants = cva( "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0", diff --git a/src/contexts/CommandRegistryContext.tsx b/src/browser/contexts/CommandRegistryContext.tsx similarity index 100% rename from src/contexts/CommandRegistryContext.tsx rename to src/browser/contexts/CommandRegistryContext.tsx diff --git a/src/contexts/ModeContext.tsx b/src/browser/contexts/ModeContext.tsx similarity index 88% rename from src/contexts/ModeContext.tsx rename to src/browser/contexts/ModeContext.tsx index b8abf7bdd..58fab29db 100644 --- a/src/contexts/ModeContext.tsx +++ b/src/browser/contexts/ModeContext.tsx @@ -1,9 +1,9 @@ import type { ReactNode } from "react"; import React, { createContext, useContext, useEffect } from "react"; -import type { UIMode } from "@/types/mode"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { matchesKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import { getModeKey, getProjectScopeId, GLOBAL_SCOPE_ID } from "@/constants/storage"; +import type { UIMode } from "@/common/types/mode"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { matchesKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import { getModeKey, getProjectScopeId, GLOBAL_SCOPE_ID } from "@/common/constants/storage"; type ModeContextType = [UIMode, (mode: UIMode) => void]; diff --git a/src/contexts/ProjectContext.test.tsx b/src/browser/contexts/ProjectContext.test.tsx similarity index 99% rename from src/contexts/ProjectContext.test.tsx rename to src/browser/contexts/ProjectContext.test.tsx index 95b008238..e30daabf9 100644 --- a/src/contexts/ProjectContext.test.tsx +++ b/src/browser/contexts/ProjectContext.test.tsx @@ -1,5 +1,5 @@ -import type { ProjectConfig } from "@/config"; -import type { IPCApi } from "@/types/ipc"; +import type { ProjectConfig } from "@/node/config"; +import type { IPCApi } from "@/common/types/ipc"; import { act, cleanup, render, waitFor } from "@testing-library/react"; import { afterEach, describe, expect, mock, test } from "bun:test"; import { GlobalWindow } from "happy-dom"; diff --git a/src/contexts/ProjectContext.tsx b/src/browser/contexts/ProjectContext.tsx similarity index 97% rename from src/contexts/ProjectContext.tsx rename to src/browser/contexts/ProjectContext.tsx index c443859db..71d3c0982 100644 --- a/src/contexts/ProjectContext.tsx +++ b/src/browser/contexts/ProjectContext.tsx @@ -8,9 +8,9 @@ import { useState, type ReactNode, } from "react"; -import type { ProjectConfig } from "@/config"; -import type { BranchListResult } from "@/types/ipc"; -import type { Secret } from "@/types/secrets"; +import type { ProjectConfig } from "@/node/config"; +import type { BranchListResult } from "@/common/types/ipc"; +import type { Secret } from "@/common/types/secrets"; interface WorkspaceModalState { isOpen: boolean; diff --git a/src/contexts/ThinkingContext.tsx b/src/browser/contexts/ThinkingContext.tsx similarity index 84% rename from src/contexts/ThinkingContext.tsx rename to src/browser/contexts/ThinkingContext.tsx index a07d69831..613e92760 100644 --- a/src/contexts/ThinkingContext.tsx +++ b/src/browser/contexts/ThinkingContext.tsx @@ -1,8 +1,12 @@ import type { ReactNode } from "react"; import React, { createContext, useContext } from "react"; -import type { ThinkingLevel } from "@/types/thinking"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { getThinkingLevelKey, getProjectScopeId, GLOBAL_SCOPE_ID } from "@/constants/storage"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { + getThinkingLevelKey, + getProjectScopeId, + GLOBAL_SCOPE_ID, +} from "@/common/constants/storage"; interface ThinkingContextType { thinkingLevel: ThinkingLevel; diff --git a/src/contexts/WorkspaceContext.test.tsx b/src/browser/contexts/WorkspaceContext.test.tsx similarity index 99% rename from src/contexts/WorkspaceContext.test.tsx rename to src/browser/contexts/WorkspaceContext.test.tsx index df58f3189..119f12817 100644 --- a/src/contexts/WorkspaceContext.test.tsx +++ b/src/browser/contexts/WorkspaceContext.test.tsx @@ -1,12 +1,12 @@ -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { IPCApi } from "@/types/ipc"; -import type { ProjectConfig } from "@/types/project"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { IPCApi } from "@/common/types/ipc"; +import type { ProjectConfig } from "@/common/types/project"; import { act, cleanup, render, waitFor } from "@testing-library/react"; import { afterEach, describe, expect, mock, test } from "bun:test"; import { GlobalWindow } from "happy-dom"; import type { WorkspaceContext } from "./WorkspaceContext"; import { WorkspaceProvider, useWorkspaceContext } from "./WorkspaceContext"; -import { ProjectProvider } from "@/contexts/ProjectContext"; +import { ProjectProvider } from "@/browser/contexts/ProjectContext"; // Helper to create test workspace metadata with default runtime config const createWorkspaceMetadata = ( diff --git a/src/contexts/WorkspaceContext.tsx b/src/browser/contexts/WorkspaceContext.tsx similarity index 96% rename from src/contexts/WorkspaceContext.tsx rename to src/browser/contexts/WorkspaceContext.tsx index 5720c2ec2..2289fe5c0 100644 --- a/src/contexts/WorkspaceContext.tsx +++ b/src/browser/contexts/WorkspaceContext.tsx @@ -7,12 +7,12 @@ import { useState, type ReactNode, } from "react"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { WorkspaceSelection } from "@/components/ProjectSidebar"; -import type { RuntimeConfig } from "@/types/runtime"; -import { deleteWorkspaceStorage } from "@/constants/storage"; -import { usePersistedState } from "@/hooks/usePersistedState"; -import { useProjectContext } from "@/contexts/ProjectContext"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { WorkspaceSelection } from "@/browser/components/ProjectSidebar"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { deleteWorkspaceStorage } from "@/common/constants/storage"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { useProjectContext } from "@/browser/contexts/ProjectContext"; /** * Ensure workspace metadata has createdAt timestamp. diff --git a/src/contexts/WorkspaceRenameContext.tsx b/src/browser/contexts/WorkspaceRenameContext.tsx similarity index 100% rename from src/contexts/WorkspaceRenameContext.tsx rename to src/browser/contexts/WorkspaceRenameContext.tsx diff --git a/src/hooks/use1MContext.ts b/src/browser/hooks/use1MContext.ts similarity index 70% rename from src/hooks/use1MContext.ts rename to src/browser/hooks/use1MContext.ts index a1eebe79d..e7db24d75 100644 --- a/src/hooks/use1MContext.ts +++ b/src/browser/hooks/use1MContext.ts @@ -1,5 +1,5 @@ -import { usePersistedState } from "@/hooks/usePersistedState"; -import { USE_1M_CONTEXT_KEY } from "@/constants/storage"; +import { usePersistedState } from "@/browser/hooks/usePersistedState"; +import { USE_1M_CONTEXT_KEY } from "@/common/constants/storage"; /** * Custom hook for 1M context state. diff --git a/src/hooks/useAIViewKeybinds.ts b/src/browser/hooks/useAIViewKeybinds.ts similarity index 88% rename from src/hooks/useAIViewKeybinds.ts rename to src/browser/hooks/useAIViewKeybinds.ts index f78e86525..bf6d8212e 100644 --- a/src/hooks/useAIViewKeybinds.ts +++ b/src/browser/hooks/useAIViewKeybinds.ts @@ -1,14 +1,14 @@ import { useEffect } from "react"; -import type { ChatInputAPI } from "@/components/ChatInput"; -import { matchesKeybind, KEYBINDS, isEditableElement } from "@/utils/ui/keybinds"; -import { getLastThinkingByModelKey, getModelKey } from "@/constants/storage"; -import { updatePersistedState, readPersistedState } from "@/hooks/usePersistedState"; -import type { ThinkingLevel, ThinkingLevelOn } from "@/types/thinking"; -import { DEFAULT_THINKING_LEVEL } from "@/types/thinking"; -import { getThinkingPolicyForModel } from "@/utils/thinking/policy"; -import { getDefaultModelFromLRU } from "@/hooks/useModelLRU"; -import type { StreamingMessageAggregator } from "@/utils/messages/StreamingMessageAggregator"; -import { isCompactingStream, cancelCompaction } from "@/utils/compaction/handler"; +import type { ChatInputAPI } from "@/browser/components/ChatInput"; +import { matchesKeybind, KEYBINDS, isEditableElement } from "@/browser/utils/ui/keybinds"; +import { getLastThinkingByModelKey, getModelKey } from "@/common/constants/storage"; +import { updatePersistedState, readPersistedState } from "@/browser/hooks/usePersistedState"; +import type { ThinkingLevel, ThinkingLevelOn } from "@/common/types/thinking"; +import { DEFAULT_THINKING_LEVEL } from "@/common/types/thinking"; +import { getThinkingPolicyForModel } from "@/browser/utils/thinking/policy"; +import { getDefaultModelFromLRU } from "@/browser/hooks/useModelLRU"; +import type { StreamingMessageAggregator } from "@/browser/utils/messages/StreamingMessageAggregator"; +import { isCompactingStream, cancelCompaction } from "@/node/utils/compaction/handler"; interface UseAIViewKeybindsParams { workspaceId: string; diff --git a/src/hooks/useAutoCompactContinue.ts b/src/browser/hooks/useAutoCompactContinue.ts similarity index 96% rename from src/hooks/useAutoCompactContinue.ts rename to src/browser/hooks/useAutoCompactContinue.ts index 10f20bf4b..dbb881ba0 100644 --- a/src/hooks/useAutoCompactContinue.ts +++ b/src/browser/hooks/useAutoCompactContinue.ts @@ -1,6 +1,6 @@ import { useRef, useEffect } from "react"; -import { useWorkspaceStoreRaw } from "@/stores/WorkspaceStore"; -import { buildSendMessageOptions } from "@/hooks/useSendMessageOptions"; +import { useWorkspaceStoreRaw } from "@/browser/stores/WorkspaceStore"; +import { buildSendMessageOptions } from "@/browser/hooks/useSendMessageOptions"; /** * Hook to manage auto-continue after compaction using structured message metadata diff --git a/src/hooks/useAutoScroll.ts b/src/browser/hooks/useAutoScroll.ts similarity index 100% rename from src/hooks/useAutoScroll.ts rename to src/browser/hooks/useAutoScroll.ts diff --git a/src/hooks/useCopyToClipboard.ts b/src/browser/hooks/useCopyToClipboard.ts similarity index 86% rename from src/hooks/useCopyToClipboard.ts rename to src/browser/hooks/useCopyToClipboard.ts index 93c77ebfb..2c5e71f2d 100644 --- a/src/hooks/useCopyToClipboard.ts +++ b/src/browser/hooks/useCopyToClipboard.ts @@ -1,6 +1,6 @@ import { useState, useCallback } from "react"; -import { COPY_FEEDBACK_DURATION_MS } from "@/constants/ui"; -import { copyToClipboard as copyToClipboardUtil } from "@/utils/clipboard"; +import { COPY_FEEDBACK_DURATION_MS } from "@/common/constants/ui"; +import { copyToClipboard as copyToClipboardUtil } from "@/browser/utils/clipboard"; /** * Hook for copy-to-clipboard functionality with temporary "copied" feedback state. diff --git a/src/hooks/useDraftWorkspaceSettings.ts b/src/browser/hooks/useDraftWorkspaceSettings.ts similarity index 91% rename from src/hooks/useDraftWorkspaceSettings.ts rename to src/browser/hooks/useDraftWorkspaceSettings.ts index 14ef5f4a9..8908a7df4 100644 --- a/src/hooks/useDraftWorkspaceSettings.ts +++ b/src/browser/hooks/useDraftWorkspaceSettings.ts @@ -2,17 +2,21 @@ import { useEffect } from "react"; import { usePersistedState } from "./usePersistedState"; import { use1MContext } from "./use1MContext"; import { useThinkingLevel } from "./useThinkingLevel"; -import { useMode } from "@/contexts/ModeContext"; +import { useMode } from "@/browser/contexts/ModeContext"; import { useModelLRU } from "./useModelLRU"; -import { type RuntimeMode, parseRuntimeModeAndHost, buildRuntimeString } from "@/types/runtime"; +import { + type RuntimeMode, + parseRuntimeModeAndHost, + buildRuntimeString, +} from "@/common/types/runtime"; import { getModelKey, getRuntimeKey, getTrunkBranchKey, getProjectScopeId, -} from "@/constants/storage"; -import type { UIMode } from "@/types/mode"; -import type { ThinkingLevel } from "@/types/thinking"; +} from "@/common/constants/storage"; +import type { UIMode } from "@/common/types/mode"; +import type { ThinkingLevel } from "@/common/types/thinking"; /** * Centralized draft workspace settings for project-level persistence diff --git a/src/hooks/useModelLRU.ts b/src/browser/hooks/useModelLRU.ts similarity index 96% rename from src/hooks/useModelLRU.ts rename to src/browser/hooks/useModelLRU.ts index 8dbbafaa8..eed4de70e 100644 --- a/src/hooks/useModelLRU.ts +++ b/src/browser/hooks/useModelLRU.ts @@ -1,7 +1,7 @@ import { useCallback, useEffect } from "react"; import { usePersistedState, readPersistedState, updatePersistedState } from "./usePersistedState"; -import { MODEL_ABBREVIATIONS } from "@/utils/slashCommands/registry"; -import { defaultModel } from "@/utils/ai/models"; +import { MODEL_ABBREVIATIONS } from "@/browser/utils/slashCommands/registry"; +import { defaultModel } from "@/common/utils/ai/models"; const MAX_LRU_SIZE = 8; const LRU_KEY = "model-lru"; diff --git a/src/hooks/usePersistedState.ts b/src/browser/hooks/usePersistedState.ts similarity index 99% rename from src/hooks/usePersistedState.ts rename to src/browser/hooks/usePersistedState.ts index ad34e9eb4..2af314f86 100644 --- a/src/hooks/usePersistedState.ts +++ b/src/browser/hooks/usePersistedState.ts @@ -1,6 +1,6 @@ import type { Dispatch, SetStateAction } from "react"; import { useState, useCallback, useEffect, useRef } from "react"; -import { getStorageChangeEvent } from "@/constants/events"; +import { getStorageChangeEvent } from "@/common/constants/events"; type SetValue = T | ((prev: T) => T); /** diff --git a/src/hooks/useResizableSidebar.ts b/src/browser/hooks/useResizableSidebar.ts similarity index 100% rename from src/hooks/useResizableSidebar.ts rename to src/browser/hooks/useResizableSidebar.ts diff --git a/src/hooks/useResizeObserver.ts b/src/browser/hooks/useResizeObserver.ts similarity index 100% rename from src/hooks/useResizeObserver.ts rename to src/browser/hooks/useResizeObserver.ts diff --git a/src/hooks/useResumeManager.ts b/src/browser/hooks/useResumeManager.ts similarity index 93% rename from src/hooks/useResumeManager.ts rename to src/browser/hooks/useResumeManager.ts index e0b35e728..507ab7523 100644 --- a/src/hooks/useResumeManager.ts +++ b/src/browser/hooks/useResumeManager.ts @@ -1,17 +1,20 @@ import { useEffect, useRef } from "react"; -import { useWorkspaceStoreRaw, type WorkspaceState } from "@/stores/WorkspaceStore"; -import { CUSTOM_EVENTS, type CustomEventType } from "@/constants/events"; -import { getAutoRetryKey, getRetryStateKey } from "@/constants/storage"; -import { getSendOptionsFromStorage } from "@/utils/messages/sendOptions"; +import { useWorkspaceStoreRaw, type WorkspaceState } from "@/browser/stores/WorkspaceStore"; +import { CUSTOM_EVENTS, type CustomEventType } from "@/common/constants/events"; +import { getAutoRetryKey, getRetryStateKey } from "@/common/constants/storage"; +import { getSendOptionsFromStorage } from "@/browser/utils/messages/sendOptions"; import { readPersistedState, updatePersistedState } from "./usePersistedState"; -import { isEligibleForAutoRetry, isNonRetryableSendError } from "@/utils/messages/retryEligibility"; -import { applyCompactionOverrides } from "@/utils/messages/compactionOptions"; -import type { SendMessageError } from "@/types/errors"; +import { + isEligibleForAutoRetry, + isNonRetryableSendError, +} from "@/browser/utils/messages/retryEligibility"; +import { applyCompactionOverrides } from "@/browser/utils/messages/compactionOptions"; +import type { SendMessageError } from "@/common/types/errors"; import { createFailedRetryState, calculateBackoffDelay, INITIAL_DELAY, -} from "@/utils/messages/retryState"; +} from "@/browser/utils/messages/retryState"; export interface RetryState { attempt: number; diff --git a/src/hooks/useReviewState.test.ts b/src/browser/hooks/useReviewState.test.ts similarity index 98% rename from src/hooks/useReviewState.test.ts rename to src/browser/hooks/useReviewState.test.ts index 1088814fa..07d0aa2d0 100644 --- a/src/hooks/useReviewState.test.ts +++ b/src/browser/hooks/useReviewState.test.ts @@ -7,7 +7,7 @@ */ import { describe, it, expect } from "bun:test"; -import type { HunkReadState } from "@/types/review"; +import type { HunkReadState } from "@/common/types/review"; import { evictOldestReviews } from "./useReviewState"; describe("evictOldestReviews", () => { diff --git a/src/hooks/useReviewState.ts b/src/browser/hooks/useReviewState.ts similarity index 98% rename from src/hooks/useReviewState.ts rename to src/browser/hooks/useReviewState.ts index a4fe2c1ca..91f82faed 100644 --- a/src/hooks/useReviewState.ts +++ b/src/browser/hooks/useReviewState.ts @@ -5,7 +5,7 @@ import { useCallback, useMemo, useEffect, useState } from "react"; import { usePersistedState } from "./usePersistedState"; -import type { ReviewState, HunkReadState } from "@/types/review"; +import type { ReviewState, HunkReadState } from "@/common/types/review"; /** * Maximum number of read states to keep per workspace (LRU eviction) diff --git a/src/hooks/useSendMessageOptions.ts b/src/browser/hooks/useSendMessageOptions.ts similarity index 82% rename from src/hooks/useSendMessageOptions.ts rename to src/browser/hooks/useSendMessageOptions.ts index fa54a075d..67c11bba7 100644 --- a/src/hooks/useSendMessageOptions.ts +++ b/src/browser/hooks/useSendMessageOptions.ts @@ -1,15 +1,15 @@ import { use1MContext } from "./use1MContext"; import { useThinkingLevel } from "./useThinkingLevel"; -import { useMode } from "@/contexts/ModeContext"; +import { useMode } from "@/browser/contexts/ModeContext"; import { usePersistedState } from "./usePersistedState"; import { useModelLRU } from "./useModelLRU"; -import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/utils/ui/modeUtils"; -import { getModelKey } from "@/constants/storage"; -import type { SendMessageOptions } from "@/types/ipc"; -import type { UIMode } from "@/types/mode"; -import type { ThinkingLevel } from "@/types/thinking"; -import { getSendOptionsFromStorage } from "@/utils/messages/sendOptions"; -import { enforceThinkingPolicy } from "@/utils/thinking/policy"; +import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/browser/utils/ui/modeUtils"; +import { getModelKey } from "@/common/constants/storage"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { UIMode } from "@/common/types/mode"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import { getSendOptionsFromStorage } from "@/browser/utils/messages/sendOptions"; +import { enforceThinkingPolicy } from "@/browser/utils/thinking/policy"; /** * Construct SendMessageOptions from raw values diff --git a/src/hooks/useSortedWorkspacesByProject.ts b/src/browser/hooks/useSortedWorkspacesByProject.ts similarity index 77% rename from src/hooks/useSortedWorkspacesByProject.ts rename to src/browser/hooks/useSortedWorkspacesByProject.ts index c08b76ac3..855181009 100644 --- a/src/hooks/useSortedWorkspacesByProject.ts +++ b/src/browser/hooks/useSortedWorkspacesByProject.ts @@ -1,8 +1,8 @@ -import { useProjectContext } from "@/contexts/ProjectContext"; -import { useWorkspaceContext } from "@/contexts/WorkspaceContext"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { useWorkspaceRecency } from "@/stores/WorkspaceStore"; -import { useStableReference, compareMaps } from "@/hooks/useStableReference"; +import { useProjectContext } from "@/browser/contexts/ProjectContext"; +import { useWorkspaceContext } from "@/browser/contexts/WorkspaceContext"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { useWorkspaceRecency } from "@/browser/stores/WorkspaceStore"; +import { useStableReference, compareMaps } from "@/browser/hooks/useStableReference"; export function useSortedWorkspacesByProject() { const { projects } = useProjectContext(); diff --git a/src/hooks/useStableReference.test.ts b/src/browser/hooks/useStableReference.test.ts similarity index 100% rename from src/hooks/useStableReference.test.ts rename to src/browser/hooks/useStableReference.test.ts diff --git a/src/hooks/useStableReference.ts b/src/browser/hooks/useStableReference.ts similarity index 100% rename from src/hooks/useStableReference.ts rename to src/browser/hooks/useStableReference.ts diff --git a/src/hooks/useStartHere.ts b/src/browser/hooks/useStartHere.ts similarity index 93% rename from src/hooks/useStartHere.ts rename to src/browser/hooks/useStartHere.ts index 6a2eaa2e5..0d7057f19 100644 --- a/src/hooks/useStartHere.ts +++ b/src/browser/hooks/useStartHere.ts @@ -1,8 +1,8 @@ import { useState } from "react"; import React from "react"; -import { COMPACTED_EMOJI } from "@/constants/ui"; -import { StartHereModal } from "@/components/StartHereModal"; -import { createMuxMessage } from "@/types/message"; +import { COMPACTED_EMOJI } from "@/common/constants/ui"; +import { StartHereModal } from "@/browser/components/StartHereModal"; +import { createMuxMessage } from "@/common/types/message"; /** * Replace chat history with a specific message. diff --git a/src/hooks/useStartWorkspaceCreation.test.ts b/src/browser/hooks/useStartWorkspaceCreation.test.ts similarity index 95% rename from src/hooks/useStartWorkspaceCreation.test.ts rename to src/browser/hooks/useStartWorkspaceCreation.test.ts index c1a5bacee..d7bab6c67 100644 --- a/src/hooks/useStartWorkspaceCreation.test.ts +++ b/src/browser/hooks/useStartWorkspaceCreation.test.ts @@ -12,10 +12,10 @@ import { getProjectScopeId, getRuntimeKey, getTrunkBranchKey, -} from "@/constants/storage"; -import type { ProjectConfig } from "@/config"; +} from "@/common/constants/storage"; +import type { ProjectConfig } from "@/node/config"; -import type { updatePersistedState } from "@/hooks/usePersistedState"; +import type { updatePersistedState } from "@/browser/hooks/usePersistedState"; type PersistFn = typeof updatePersistedState; type PersistCall = [string, unknown, unknown?]; diff --git a/src/hooks/useStartWorkspaceCreation.ts b/src/browser/hooks/useStartWorkspaceCreation.ts similarity index 90% rename from src/hooks/useStartWorkspaceCreation.ts rename to src/browser/hooks/useStartWorkspaceCreation.ts index d67e58c8e..10d55de5d 100644 --- a/src/hooks/useStartWorkspaceCreation.ts +++ b/src/browser/hooks/useStartWorkspaceCreation.ts @@ -1,8 +1,8 @@ import { useCallback, useEffect } from "react"; -import type { ProjectConfig } from "@/config"; -import type { WorkspaceSelection } from "@/components/ProjectSidebar"; -import { CUSTOM_EVENTS, type CustomEventPayloads } from "@/constants/events"; -import { updatePersistedState } from "@/hooks/usePersistedState"; +import type { ProjectConfig } from "@/node/config"; +import type { WorkspaceSelection } from "@/browser/components/ProjectSidebar"; +import { CUSTOM_EVENTS, type CustomEventPayloads } from "@/common/constants/events"; +import { updatePersistedState } from "@/browser/hooks/usePersistedState"; import { getInputKey, getModelKey, @@ -10,8 +10,8 @@ import { getProjectScopeId, getRuntimeKey, getTrunkBranchKey, -} from "@/constants/storage"; -import { RUNTIME_MODE, SSH_RUNTIME_PREFIX } from "@/types/runtime"; +} from "@/common/constants/storage"; +import { RUNTIME_MODE, SSH_RUNTIME_PREFIX } from "@/common/types/runtime"; export type StartWorkspaceCreationDetail = CustomEventPayloads[typeof CUSTOM_EVENTS.START_WORKSPACE_CREATION]; diff --git a/src/hooks/useTelemetry.ts b/src/browser/hooks/useTelemetry.ts similarity index 96% rename from src/hooks/useTelemetry.ts rename to src/browser/hooks/useTelemetry.ts index d3b41ee0a..18977eb4c 100644 --- a/src/hooks/useTelemetry.ts +++ b/src/browser/hooks/useTelemetry.ts @@ -1,6 +1,6 @@ import { useCallback } from "react"; -import { trackEvent, getBaseTelemetryProperties, roundToBase2 } from "../telemetry"; -import type { ErrorContext } from "../telemetry/payload"; +import { trackEvent, getBaseTelemetryProperties, roundToBase2 } from "@/node/telemetry"; +import type { ErrorContext } from "@/node/telemetry/payload"; /** * Hook for clean telemetry integration in React components diff --git a/src/hooks/useTerminalSession.ts b/src/browser/hooks/useTerminalSession.ts similarity index 100% rename from src/hooks/useTerminalSession.ts rename to src/browser/hooks/useTerminalSession.ts diff --git a/src/hooks/useThinkingLevel.ts b/src/browser/hooks/useThinkingLevel.ts similarity index 83% rename from src/hooks/useThinkingLevel.ts rename to src/browser/hooks/useThinkingLevel.ts index c8e92e13f..d28ed96b4 100644 --- a/src/hooks/useThinkingLevel.ts +++ b/src/browser/hooks/useThinkingLevel.ts @@ -1,4 +1,4 @@ -import { useThinking } from "@/contexts/ThinkingContext"; +import { useThinking } from "@/browser/contexts/ThinkingContext"; /** * Custom hook for thinking level state. diff --git a/src/hooks/useUnreadTracking.ts b/src/browser/hooks/useUnreadTracking.ts similarity index 95% rename from src/hooks/useUnreadTracking.ts rename to src/browser/hooks/useUnreadTracking.ts index 7c376ff5f..621a09030 100644 --- a/src/hooks/useUnreadTracking.ts +++ b/src/browser/hooks/useUnreadTracking.ts @@ -1,5 +1,5 @@ import { useEffect, useCallback } from "react"; -import type { WorkspaceSelection } from "@/components/ProjectSidebar"; +import type { WorkspaceSelection } from "@/browser/components/ProjectSidebar"; import { usePersistedState } from "./usePersistedState"; /** diff --git a/src/main.tsx b/src/browser/main.tsx similarity index 91% rename from src/main.tsx rename to src/browser/main.tsx index e655cd1ae..6bf826d57 100644 --- a/src/main.tsx +++ b/src/browser/main.tsx @@ -1,11 +1,11 @@ import React from "react"; import ReactDOM from "react-dom/client"; -import { AppLoader } from "./components/AppLoader"; -import { initTelemetry, trackAppStarted } from "./telemetry"; +import { AppLoader } from "@/browser/components/AppLoader"; +import { initTelemetry, trackAppStarted } from "@/node/telemetry"; // Shims the `window.api` object with the browser API. // This occurs if we are not running in Electron. -import "./browser/api"; +import "./api"; // Initialize telemetry on app startup initTelemetry(); diff --git a/src/stores/GitStatusStore.test.ts b/src/browser/stores/GitStatusStore.test.ts similarity index 97% rename from src/stores/GitStatusStore.test.ts rename to src/browser/stores/GitStatusStore.test.ts index aa72c7a6c..81656182d 100644 --- a/src/stores/GitStatusStore.test.ts +++ b/src/browser/stores/GitStatusStore.test.ts @@ -1,10 +1,10 @@ -import type { Result } from "@/types/result"; -import type { BashToolResult } from "@/types/tools"; +import type { Result } from "@/common/types/result"; +import type { BashToolResult } from "@/common/types/tools"; import { describe, it, test, expect, beforeEach, afterEach, jest } from "@jest/globals"; import { GitStatusStore } from "./GitStatusStore"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; /** * Unit tests for GitStatusStore. diff --git a/src/stores/GitStatusStore.ts b/src/browser/stores/GitStatusStore.ts similarity index 98% rename from src/stores/GitStatusStore.ts rename to src/browser/stores/GitStatusStore.ts index bbfab2ce0..9681323c9 100644 --- a/src/stores/GitStatusStore.ts +++ b/src/browser/stores/GitStatusStore.ts @@ -1,13 +1,13 @@ -import type { FrontendWorkspaceMetadata, GitStatus } from "@/types/workspace"; -import { parseGitShowBranchForStatus } from "@/utils/git/parseGitStatus"; +import type { FrontendWorkspaceMetadata, GitStatus } from "@/common/types/workspace"; +import { parseGitShowBranchForStatus } from "@/node/utils/git/parseGitStatus"; import { GIT_STATUS_SCRIPT, GIT_FETCH_SCRIPT, parseGitStatusScriptOutput, -} from "@/utils/git/gitStatus"; +} from "@/node/utils/git/gitStatus"; import { useSyncExternalStore } from "react"; import { MapStore } from "./MapStore"; -import { isSSHRuntime } from "@/types/runtime"; +import { isSSHRuntime } from "@/common/types/runtime"; /** * External store for git status of all workspaces. diff --git a/src/stores/MapStore.test.ts b/src/browser/stores/MapStore.test.ts similarity index 100% rename from src/stores/MapStore.test.ts rename to src/browser/stores/MapStore.test.ts diff --git a/src/stores/MapStore.ts b/src/browser/stores/MapStore.ts similarity index 100% rename from src/stores/MapStore.ts rename to src/browser/stores/MapStore.ts diff --git a/src/stores/WorkspaceConsumerManager.ts b/src/browser/stores/WorkspaceConsumerManager.ts similarity index 97% rename from src/stores/WorkspaceConsumerManager.ts rename to src/browser/stores/WorkspaceConsumerManager.ts index ea473f74f..e5877ed0a 100644 --- a/src/stores/WorkspaceConsumerManager.ts +++ b/src/browser/stores/WorkspaceConsumerManager.ts @@ -1,8 +1,8 @@ import type { WorkspaceConsumersState } from "./WorkspaceStore"; -import type { StreamingMessageAggregator } from "@/utils/messages/StreamingMessageAggregator"; -import type { ChatStats } from "@/types/chatStats"; -import type { MuxMessage } from "@/types/message"; -import assert from "@/utils/assert"; +import type { StreamingMessageAggregator } from "@/browser/utils/messages/StreamingMessageAggregator"; +import type { ChatStats } from "@/common/types/chatStats"; +import type { MuxMessage } from "@/common/types/message"; +import assert from "@/common/utils/assert"; const TOKENIZER_CANCELLED_MESSAGE = "Cancelled by newer request"; diff --git a/src/stores/WorkspaceStore.test.ts b/src/browser/stores/WorkspaceStore.test.ts similarity index 99% rename from src/stores/WorkspaceStore.test.ts rename to src/browser/stores/WorkspaceStore.test.ts index 59ea95e37..1f4342457 100644 --- a/src/stores/WorkspaceStore.test.ts +++ b/src/browser/stores/WorkspaceStore.test.ts @@ -1,5 +1,5 @@ -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; import { WorkspaceStore } from "./WorkspaceStore"; // Mock window.api diff --git a/src/stores/WorkspaceStore.ts b/src/browser/stores/WorkspaceStore.ts similarity index 96% rename from src/stores/WorkspaceStore.ts rename to src/browser/stores/WorkspaceStore.ts index 32867c40d..2927ed6ab 100644 --- a/src/stores/WorkspaceStore.ts +++ b/src/browser/stores/WorkspaceStore.ts @@ -1,25 +1,30 @@ -import assert from "@/utils/assert"; -import type { MuxMessage, DisplayedMessage } from "@/types/message"; -import { createMuxMessage } from "@/types/message"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { WorkspaceChatMessage } from "@/types/ipc"; -import type { TodoItem } from "@/types/tools"; -import { StreamingMessageAggregator } from "@/utils/messages/StreamingMessageAggregator"; -import { updatePersistedState } from "@/hooks/usePersistedState"; -import { getRetryStateKey } from "@/constants/storage"; -import { CUSTOM_EVENTS, createCustomEvent } from "@/constants/events"; +import assert from "@/common/utils/assert"; +import type { MuxMessage, DisplayedMessage } from "@/common/types/message"; +import { createMuxMessage } from "@/common/types/message"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { WorkspaceChatMessage } from "@/common/types/ipc"; +import type { TodoItem } from "@/common/types/tools"; +import { StreamingMessageAggregator } from "@/browser/utils/messages/StreamingMessageAggregator"; +import { updatePersistedState } from "@/browser/hooks/usePersistedState"; +import { getRetryStateKey } from "@/common/constants/storage"; +import { CUSTOM_EVENTS, createCustomEvent } from "@/common/constants/events"; import { useSyncExternalStore } from "react"; -import { isCaughtUpMessage, isStreamError, isDeleteMessage, isMuxMessage } from "@/types/ipc"; +import { + isCaughtUpMessage, + isStreamError, + isDeleteMessage, + isMuxMessage, +} from "@/common/types/ipc"; import { MapStore } from "./MapStore"; -import { createDisplayUsage } from "@/utils/tokens/displayUsage"; +import { createDisplayUsage } from "@/common/utils/tokens/displayUsage"; import { WorkspaceConsumerManager } from "./WorkspaceConsumerManager"; -import type { ChatUsageDisplay } from "@/utils/tokens/usageAggregator"; -import { sumUsageHistory } from "@/utils/tokens/usageAggregator"; -import type { TokenConsumer } from "@/types/chatStats"; +import type { ChatUsageDisplay } from "@/common/utils/tokens/usageAggregator"; +import { sumUsageHistory } from "@/common/utils/tokens/usageAggregator"; +import type { TokenConsumer } from "@/common/types/chatStats"; import type { LanguageModelV2Usage } from "@ai-sdk/provider"; -import { getCancelledCompactionKey } from "@/constants/storage"; -import { isCompactingStream, findCompactionRequestMessage } from "@/utils/compaction/handler"; -import { createFreshRetryState } from "@/utils/messages/retryState"; +import { getCancelledCompactionKey } from "@/common/constants/storage"; +import { isCompactingStream, findCompactionRequestMessage } from "@/node/utils/compaction/handler"; +import { createFreshRetryState } from "@/browser/utils/messages/retryState"; export interface WorkspaceState { name: string; // User-facing workspace name (e.g., "feature-branch") diff --git a/src/styles/globals.css b/src/browser/styles/globals.css similarity index 99% rename from src/styles/globals.css rename to src/browser/styles/globals.css index 130a45863..30819dbbf 100644 --- a/src/styles/globals.css +++ b/src/browser/styles/globals.css @@ -4,7 +4,7 @@ /* Geist Font Declarations */ @font-face { font-family: "Geist"; - src: url("../../node_modules/geist/dist/fonts/geist-sans/Geist-Variable.woff2") format("woff2"); + src: url("../../../node_modules/geist/dist/fonts/geist-sans/Geist-Variable.woff2") format("woff2"); font-weight: 100 900; font-style: normal; font-display: swap; @@ -12,7 +12,7 @@ @font-face { font-family: "Geist Mono"; - src: url("../../node_modules/geist/dist/fonts/geist-mono/GeistMono-Variable.woff2") format("woff2"); + src: url("../../../node_modules/geist/dist/fonts/geist-mono/GeistMono-Variable.woff2") format("woff2"); font-weight: 100 900; font-style: normal; font-display: swap; diff --git a/src/terminal-window.tsx b/src/browser/terminal-window.tsx similarity index 95% rename from src/terminal-window.tsx rename to src/browser/terminal-window.tsx index b7f53049c..09dc258d0 100644 --- a/src/terminal-window.tsx +++ b/src/browser/terminal-window.tsx @@ -7,11 +7,11 @@ import React from "react"; import ReactDOM from "react-dom/client"; -import { TerminalView } from "./components/TerminalView"; +import { TerminalView } from "@/browser/components/TerminalView"; import "./styles/globals.css"; // Shims the `window.api` object with the browser API if not running in Electron -import "./browser/api"; +import "./api"; // Get workspace ID from query parameter const params = new URLSearchParams(window.location.search); diff --git a/src/utils/chatCommands.test.ts b/src/browser/utils/chatCommands.test.ts similarity index 100% rename from src/utils/chatCommands.test.ts rename to src/browser/utils/chatCommands.test.ts diff --git a/src/utils/chatCommands.ts b/src/browser/utils/chatCommands.ts similarity index 94% rename from src/utils/chatCommands.ts rename to src/browser/utils/chatCommands.ts index 77ab1de00..e150f49d0 100644 --- a/src/utils/chatCommands.ts +++ b/src/browser/utils/chatCommands.ts @@ -6,17 +6,17 @@ * to ensure consistent behavior and avoid duplication. */ -import type { SendMessageOptions } from "@/types/ipc"; -import type { MuxFrontendMetadata, CompactionRequestData } from "@/types/message"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { RuntimeConfig } from "@/types/runtime"; -import { RUNTIME_MODE, SSH_RUNTIME_PREFIX } from "@/types/runtime"; -import { CUSTOM_EVENTS, createCustomEvent } from "@/constants/events"; -import type { Toast } from "@/components/ChatInputToast"; -import type { ParsedCommand } from "@/utils/slashCommands/types"; -import { applyCompactionOverrides } from "@/utils/messages/compactionOptions"; -import { resolveCompactionModel } from "@/utils/messages/compactionModelPreference"; -import { getRuntimeKey } from "@/constants/storage"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { MuxFrontendMetadata, CompactionRequestData } from "@/common/types/message"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { RUNTIME_MODE, SSH_RUNTIME_PREFIX } from "@/common/types/runtime"; +import { CUSTOM_EVENTS, createCustomEvent } from "@/common/constants/events"; +import type { Toast } from "@/browser/components/ChatInputToast"; +import type { ParsedCommand } from "@/browser/utils/slashCommands/types"; +import { applyCompactionOverrides } from "@/browser/utils/messages/compactionOptions"; +import { resolveCompactionModel } from "@/browser/utils/messages/compactionModelPreference"; +import { getRuntimeKey } from "@/common/constants/storage"; // ============================================================================ // Workspace Creation diff --git a/src/utils/clipboard.ts b/src/browser/utils/clipboard.ts similarity index 100% rename from src/utils/clipboard.ts rename to src/browser/utils/clipboard.ts diff --git a/src/utils/commandIds.ts b/src/browser/utils/commandIds.ts similarity index 100% rename from src/utils/commandIds.ts rename to src/browser/utils/commandIds.ts diff --git a/src/utils/commandPaletteFiltering.ts b/src/browser/utils/commandPaletteFiltering.ts similarity index 94% rename from src/utils/commandPaletteFiltering.ts rename to src/browser/utils/commandPaletteFiltering.ts index e92902d84..579de51af 100644 --- a/src/utils/commandPaletteFiltering.ts +++ b/src/browser/utils/commandPaletteFiltering.ts @@ -3,7 +3,7 @@ * Separates workspace switching from all other commands */ -import { CommandIdMatchers } from "@/utils/commandIds"; +import { CommandIdMatchers } from "@/browser/utils/commandIds"; export interface CommandActionMinimal { id: string; diff --git a/src/utils/commands/sources.test.ts b/src/browser/utils/commands/sources.test.ts similarity index 93% rename from src/utils/commands/sources.test.ts rename to src/browser/utils/commands/sources.test.ts index c46aa6dfb..8b6d613d7 100644 --- a/src/utils/commands/sources.test.ts +++ b/src/browser/utils/commands/sources.test.ts @@ -1,7 +1,7 @@ import { buildCoreSources } from "./sources"; -import type { ProjectConfig } from "@/config"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { ProjectConfig } from "@/node/config"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; const mk = (over: Partial[0]> = {}) => { const projects = new Map(); diff --git a/src/utils/commands/sources.ts b/src/browser/utils/commands/sources.ts similarity index 96% rename from src/utils/commands/sources.ts rename to src/browser/utils/commands/sources.ts index c29c6faec..2c3aa9348 100644 --- a/src/utils/commands/sources.ts +++ b/src/browser/utils/commands/sources.ts @@ -1,12 +1,12 @@ -import type { CommandAction } from "@/contexts/CommandRegistryContext"; -import { formatKeybind, KEYBINDS } from "@/utils/ui/keybinds"; -import type { ThinkingLevel } from "@/types/thinking"; -import { CUSTOM_EVENTS, createCustomEvent } from "@/constants/events"; -import { CommandIds } from "@/utils/commandIds"; +import type { CommandAction } from "@/browser/contexts/CommandRegistryContext"; +import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import { CUSTOM_EVENTS, createCustomEvent } from "@/common/constants/events"; +import { CommandIds } from "@/browser/utils/commandIds"; -import type { ProjectConfig } from "@/config"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import type { BranchListResult } from "@/types/ipc"; +import type { ProjectConfig } from "@/node/config"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { BranchListResult } from "@/common/types/ipc"; export interface BuildSourcesParams { projects: Map; diff --git a/src/utils/highlighting/diffChunking.test.ts b/src/browser/utils/highlighting/diffChunking.test.ts similarity index 100% rename from src/utils/highlighting/diffChunking.test.ts rename to src/browser/utils/highlighting/diffChunking.test.ts diff --git a/src/utils/highlighting/diffChunking.ts b/src/browser/utils/highlighting/diffChunking.ts similarity index 96% rename from src/utils/highlighting/diffChunking.ts rename to src/browser/utils/highlighting/diffChunking.ts index cbf239aee..27dbe1069 100644 --- a/src/utils/highlighting/diffChunking.ts +++ b/src/browser/utils/highlighting/diffChunking.ts @@ -1,4 +1,4 @@ -import type { DiffLineType } from "@/components/shared/DiffRenderer"; +import type { DiffLineType } from "@/browser/components/shared/DiffRenderer"; export interface DiffChunk { type: Exclude; // 'add' | 'remove' | 'context' diff --git a/src/utils/highlighting/highlightDiffChunk.test.ts b/src/browser/utils/highlighting/highlightDiffChunk.test.ts similarity index 100% rename from src/utils/highlighting/highlightDiffChunk.test.ts rename to src/browser/utils/highlighting/highlightDiffChunk.test.ts diff --git a/src/utils/highlighting/highlightDiffChunk.ts b/src/browser/utils/highlighting/highlightDiffChunk.ts similarity index 100% rename from src/utils/highlighting/highlightDiffChunk.ts rename to src/browser/utils/highlighting/highlightDiffChunk.ts diff --git a/src/utils/highlighting/highlightSearchTerms.ts b/src/browser/utils/highlighting/highlightSearchTerms.ts similarity index 100% rename from src/utils/highlighting/highlightSearchTerms.ts rename to src/browser/utils/highlighting/highlightSearchTerms.ts diff --git a/src/utils/highlighting/shiki-shared.ts b/src/browser/utils/highlighting/shiki-shared.ts similarity index 100% rename from src/utils/highlighting/shiki-shared.ts rename to src/browser/utils/highlighting/shiki-shared.ts diff --git a/src/utils/highlighting/shikiHighlighter.ts b/src/browser/utils/highlighting/shikiHighlighter.ts similarity index 100% rename from src/utils/highlighting/shikiHighlighter.ts rename to src/browser/utils/highlighting/shikiHighlighter.ts diff --git a/src/utils/imageHandling.test.ts b/src/browser/utils/imageHandling.test.ts similarity index 100% rename from src/utils/imageHandling.test.ts rename to src/browser/utils/imageHandling.test.ts diff --git a/src/utils/imageHandling.ts b/src/browser/utils/imageHandling.ts similarity index 97% rename from src/utils/imageHandling.ts rename to src/browser/utils/imageHandling.ts index 77b6af611..a6684f705 100644 --- a/src/utils/imageHandling.ts +++ b/src/browser/utils/imageHandling.ts @@ -1,4 +1,4 @@ -import type { ImageAttachment } from "@/components/ImageAttachments"; +import type { ImageAttachment } from "@/browser/components/ImageAttachments"; /** * Generates a unique ID for an image attachment diff --git a/src/utils/messages/StreamingMessageAggregator.init.test.ts b/src/browser/utils/messages/StreamingMessageAggregator.init.test.ts similarity index 100% rename from src/utils/messages/StreamingMessageAggregator.init.test.ts rename to src/browser/utils/messages/StreamingMessageAggregator.init.test.ts diff --git a/src/utils/messages/StreamingMessageAggregator.status.test.ts b/src/browser/utils/messages/StreamingMessageAggregator.status.test.ts similarity index 100% rename from src/utils/messages/StreamingMessageAggregator.status.test.ts rename to src/browser/utils/messages/StreamingMessageAggregator.status.test.ts diff --git a/src/utils/messages/StreamingMessageAggregator.test.ts b/src/browser/utils/messages/StreamingMessageAggregator.test.ts similarity index 100% rename from src/utils/messages/StreamingMessageAggregator.test.ts rename to src/browser/utils/messages/StreamingMessageAggregator.test.ts diff --git a/src/utils/messages/StreamingMessageAggregator.ts b/src/browser/utils/messages/StreamingMessageAggregator.ts similarity index 98% rename from src/utils/messages/StreamingMessageAggregator.ts rename to src/browser/utils/messages/StreamingMessageAggregator.ts index d7c05fcee..2c0e8610b 100644 --- a/src/utils/messages/StreamingMessageAggregator.ts +++ b/src/browser/utils/messages/StreamingMessageAggregator.ts @@ -1,5 +1,10 @@ -import type { MuxMessage, MuxMetadata, MuxImagePart, DisplayedMessage } from "@/types/message"; -import { createMuxMessage } from "@/types/message"; +import type { + MuxMessage, + MuxMetadata, + MuxImagePart, + DisplayedMessage, +} from "@/common/types/message"; +import { createMuxMessage } from "@/common/types/message"; import type { StreamStartEvent, StreamDeltaEvent, @@ -10,17 +15,17 @@ import type { ToolCallEndEvent, ReasoningDeltaEvent, ReasoningEndEvent, -} from "@/types/stream"; -import type { TodoItem, StatusSetToolResult } from "@/types/tools"; +} from "@/common/types/stream"; +import type { TodoItem, StatusSetToolResult } from "@/common/types/tools"; -import type { WorkspaceChatMessage, StreamErrorMessage, DeleteMessage } from "@/types/ipc"; -import { isInitStart, isInitOutput, isInitEnd, isMuxMessage } from "@/types/ipc"; +import type { WorkspaceChatMessage, StreamErrorMessage, DeleteMessage } from "@/common/types/ipc"; +import { isInitStart, isInitOutput, isInitEnd, isMuxMessage } from "@/common/types/ipc"; import type { DynamicToolPart, DynamicToolPartPending, DynamicToolPartAvailable, -} from "@/types/toolParts"; -import { isDynamicToolPart } from "@/types/toolParts"; +} from "@/common/types/toolParts"; +import { isDynamicToolPart } from "@/common/types/toolParts"; import { createDeltaStorage, type DeltaRecordStorage } from "./StreamingTPSCalculator"; import { computeRecencyTimestamp } from "./recency"; diff --git a/src/utils/messages/StreamingTPSCalculator.test.ts b/src/browser/utils/messages/StreamingTPSCalculator.test.ts similarity index 100% rename from src/utils/messages/StreamingTPSCalculator.test.ts rename to src/browser/utils/messages/StreamingTPSCalculator.test.ts diff --git a/src/utils/messages/StreamingTPSCalculator.ts b/src/browser/utils/messages/StreamingTPSCalculator.ts similarity index 100% rename from src/utils/messages/StreamingTPSCalculator.ts rename to src/browser/utils/messages/StreamingTPSCalculator.ts diff --git a/src/utils/messages/applyToolOutputRedaction.ts b/src/browser/utils/messages/applyToolOutputRedaction.ts similarity index 87% rename from src/utils/messages/applyToolOutputRedaction.ts rename to src/browser/utils/messages/applyToolOutputRedaction.ts index 90128d3d9..5c6dda168 100644 --- a/src/utils/messages/applyToolOutputRedaction.ts +++ b/src/browser/utils/messages/applyToolOutputRedaction.ts @@ -2,8 +2,8 @@ * Apply centralized tool-output redaction to a list of MuxMessages. * Produces a cloned array safe for sending to providers without touching persisted history/UI. */ -import type { MuxMessage } from "@/types/message"; -import type { DynamicToolPart } from "@/types/toolParts"; +import type { MuxMessage } from "@/common/types/message"; +import type { DynamicToolPart } from "@/common/types/toolParts"; import { redactToolOutput } from "./toolOutputRedaction"; export function applyToolOutputRedaction(messages: MuxMessage[]): MuxMessage[] { diff --git a/src/utils/messages/compactionModelPreference.ts b/src/browser/utils/messages/compactionModelPreference.ts similarity index 92% rename from src/utils/messages/compactionModelPreference.ts rename to src/browser/utils/messages/compactionModelPreference.ts index bf55852b5..150f0ea76 100644 --- a/src/utils/messages/compactionModelPreference.ts +++ b/src/browser/utils/messages/compactionModelPreference.ts @@ -4,7 +4,7 @@ * Handles the sticky global preference for which model to use during compaction. */ -import { PREFERRED_COMPACTION_MODEL_KEY } from "@/constants/storage"; +import { PREFERRED_COMPACTION_MODEL_KEY } from "@/common/constants/storage"; /** * Resolve the effective compaction model, saving preference if a model is specified. diff --git a/src/utils/messages/compactionOptions.test.ts b/src/browser/utils/messages/compactionOptions.test.ts similarity index 93% rename from src/utils/messages/compactionOptions.test.ts rename to src/browser/utils/messages/compactionOptions.test.ts index d223ee4b7..dd5efd6c5 100644 --- a/src/utils/messages/compactionOptions.test.ts +++ b/src/browser/utils/messages/compactionOptions.test.ts @@ -3,9 +3,9 @@ */ import { applyCompactionOverrides } from "./compactionOptions"; -import type { SendMessageOptions } from "@/types/ipc"; -import type { CompactionRequestData } from "@/types/message"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { CompactionRequestData } from "@/common/types/message"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; describe("applyCompactionOverrides", () => { const baseOptions: SendMessageOptions = { diff --git a/src/utils/messages/compactionOptions.ts b/src/browser/utils/messages/compactionOptions.ts similarity index 91% rename from src/utils/messages/compactionOptions.ts rename to src/browser/utils/messages/compactionOptions.ts index 63ddd347f..eda71e44f 100644 --- a/src/utils/messages/compactionOptions.ts +++ b/src/browser/utils/messages/compactionOptions.ts @@ -5,8 +5,8 @@ * Used by both ChatInput (initial send) and useResumeManager (resume after interruption). */ -import type { SendMessageOptions } from "@/types/ipc"; -import type { CompactionRequestData } from "@/types/message"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { CompactionRequestData } from "@/common/types/message"; /** * Apply compaction-specific option overrides to base options. diff --git a/src/utils/messages/messageUtils.test.ts b/src/browser/utils/messages/messageUtils.test.ts similarity index 99% rename from src/utils/messages/messageUtils.test.ts rename to src/browser/utils/messages/messageUtils.test.ts index 66fe5224c..8c86ba58a 100644 --- a/src/utils/messages/messageUtils.test.ts +++ b/src/browser/utils/messages/messageUtils.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from "@jest/globals"; import { mergeConsecutiveStreamErrors } from "./messageUtils"; -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; describe("mergeConsecutiveStreamErrors", () => { it("returns empty array for empty input", () => { diff --git a/src/utils/messages/messageUtils.ts b/src/browser/utils/messages/messageUtils.ts similarity index 97% rename from src/utils/messages/messageUtils.ts rename to src/browser/utils/messages/messageUtils.ts index a8a34f22f..32d40640f 100644 --- a/src/utils/messages/messageUtils.ts +++ b/src/browser/utils/messages/messageUtils.ts @@ -1,4 +1,4 @@ -import type { DisplayedMessage } from "@/types/message"; +import type { DisplayedMessage } from "@/common/types/message"; /** * Determines if the interrupted barrier should be shown for a DisplayedMessage. diff --git a/src/utils/messages/modelMessageTransform.test.ts b/src/browser/utils/messages/modelMessageTransform.test.ts similarity index 99% rename from src/utils/messages/modelMessageTransform.test.ts rename to src/browser/utils/messages/modelMessageTransform.test.ts index 5b0b2e66a..1a5339a02 100644 --- a/src/utils/messages/modelMessageTransform.test.ts +++ b/src/browser/utils/messages/modelMessageTransform.test.ts @@ -7,7 +7,7 @@ import { injectModeTransition, filterEmptyAssistantMessages, } from "./modelMessageTransform"; -import type { MuxMessage } from "@/types/message"; +import type { MuxMessage } from "@/common/types/message"; describe("modelMessageTransform", () => { describe("transformModelMessages", () => { diff --git a/src/utils/messages/modelMessageTransform.ts b/src/browser/utils/messages/modelMessageTransform.ts similarity index 99% rename from src/utils/messages/modelMessageTransform.ts rename to src/browser/utils/messages/modelMessageTransform.ts index 5251fb820..c0ae3bd1d 100644 --- a/src/utils/messages/modelMessageTransform.ts +++ b/src/browser/utils/messages/modelMessageTransform.ts @@ -4,7 +4,7 @@ */ import type { ModelMessage, AssistantModelMessage, ToolModelMessage } from "ai"; -import type { MuxMessage } from "@/types/message"; +import type { MuxMessage } from "@/common/types/message"; /** * Filter out assistant messages that are empty or only contain reasoning parts. diff --git a/src/utils/messages/recency.test.ts b/src/browser/utils/messages/recency.test.ts similarity index 99% rename from src/utils/messages/recency.test.ts rename to src/browser/utils/messages/recency.test.ts index 6dc9c1183..8bdad00e8 100644 --- a/src/utils/messages/recency.test.ts +++ b/src/browser/utils/messages/recency.test.ts @@ -1,5 +1,5 @@ import { computeRecencyTimestamp } from "./recency"; -import { createMuxMessage } from "@/types/message"; +import { createMuxMessage } from "@/common/types/message"; describe("computeRecencyTimestamp", () => { it("returns null for empty messages array", () => { diff --git a/src/utils/messages/recency.ts b/src/browser/utils/messages/recency.ts similarity index 96% rename from src/utils/messages/recency.ts rename to src/browser/utils/messages/recency.ts index 4de925c1b..f1e571746 100644 --- a/src/utils/messages/recency.ts +++ b/src/browser/utils/messages/recency.ts @@ -1,4 +1,4 @@ -import type { MuxMessage } from "@/types/message"; +import type { MuxMessage } from "@/common/types/message"; /** * Compute recency timestamp for workspace sorting. diff --git a/src/utils/messages/retryEligibility.test.ts b/src/browser/utils/messages/retryEligibility.test.ts similarity index 99% rename from src/utils/messages/retryEligibility.test.ts rename to src/browser/utils/messages/retryEligibility.test.ts index 9719b4a76..fb8d1be51 100644 --- a/src/utils/messages/retryEligibility.test.ts +++ b/src/browser/utils/messages/retryEligibility.test.ts @@ -4,8 +4,8 @@ import { isEligibleForAutoRetry, isNonRetryableSendError, } from "./retryEligibility"; -import type { DisplayedMessage } from "@/types/message"; -import type { SendMessageError } from "@/types/errors"; +import type { DisplayedMessage } from "@/common/types/message"; +import type { SendMessageError } from "@/common/types/errors"; describe("hasInterruptedStream", () => { it("returns false for empty messages", () => { diff --git a/src/utils/messages/retryEligibility.ts b/src/browser/utils/messages/retryEligibility.ts similarity index 97% rename from src/utils/messages/retryEligibility.ts rename to src/browser/utils/messages/retryEligibility.ts index eadc49054..3d5f6fff2 100644 --- a/src/utils/messages/retryEligibility.ts +++ b/src/browser/utils/messages/retryEligibility.ts @@ -1,5 +1,5 @@ -import type { DisplayedMessage } from "@/types/message"; -import type { StreamErrorType, SendMessageError } from "@/types/errors"; +import type { DisplayedMessage } from "@/common/types/message"; +import type { StreamErrorType, SendMessageError } from "@/common/types/errors"; /** * Debug flag to force all errors to be retryable diff --git a/src/utils/messages/retryState.test.ts b/src/browser/utils/messages/retryState.test.ts similarity index 100% rename from src/utils/messages/retryState.test.ts rename to src/browser/utils/messages/retryState.test.ts diff --git a/src/utils/messages/retryState.ts b/src/browser/utils/messages/retryState.ts similarity index 96% rename from src/utils/messages/retryState.ts rename to src/browser/utils/messages/retryState.ts index 7f5691f69..b63b9a04a 100644 --- a/src/utils/messages/retryState.ts +++ b/src/browser/utils/messages/retryState.ts @@ -1,4 +1,4 @@ -import type { RetryState } from "@/hooks/useResumeManager"; +import type { RetryState } from "@/browser/hooks/useResumeManager"; export const INITIAL_DELAY = 1000; // 1 second export const MAX_DELAY = 60000; // 60 seconds diff --git a/src/utils/messages/sanitizeToolInput.test.ts b/src/browser/utils/messages/sanitizeToolInput.test.ts similarity index 98% rename from src/utils/messages/sanitizeToolInput.test.ts rename to src/browser/utils/messages/sanitizeToolInput.test.ts index 4300ce47a..e955b7657 100644 --- a/src/utils/messages/sanitizeToolInput.test.ts +++ b/src/browser/utils/messages/sanitizeToolInput.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "@jest/globals"; -import type { MuxMessage } from "@/types/message"; +import type { MuxMessage } from "@/common/types/message"; import { sanitizeToolInputs } from "./sanitizeToolInput"; describe("sanitizeToolInputs", () => { diff --git a/src/utils/messages/sanitizeToolInput.ts b/src/browser/utils/messages/sanitizeToolInput.ts similarity index 96% rename from src/utils/messages/sanitizeToolInput.ts rename to src/browser/utils/messages/sanitizeToolInput.ts index d69205f83..55a76c973 100644 --- a/src/utils/messages/sanitizeToolInput.ts +++ b/src/browser/utils/messages/sanitizeToolInput.ts @@ -1,4 +1,4 @@ -import type { MuxMessage, MuxToolPart } from "@/types/message"; +import type { MuxMessage, MuxToolPart } from "@/common/types/message"; /** * Sanitizes tool inputs in messages to ensure they are valid objects. diff --git a/src/utils/messages/sendOptions.ts b/src/browser/utils/messages/sendOptions.ts similarity index 74% rename from src/utils/messages/sendOptions.ts rename to src/browser/utils/messages/sendOptions.ts index 6fd6623b4..2defc44ef 100644 --- a/src/utils/messages/sendOptions.ts +++ b/src/browser/utils/messages/sendOptions.ts @@ -3,14 +3,14 @@ import { getThinkingLevelKey, getModeKey, USE_1M_CONTEXT_KEY, -} from "@/constants/storage"; -import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/utils/ui/modeUtils"; -import { readPersistedState } from "@/hooks/usePersistedState"; -import type { SendMessageOptions } from "@/types/ipc"; -import type { UIMode } from "@/types/mode"; -import type { ThinkingLevel } from "@/types/thinking"; -import { enforceThinkingPolicy } from "@/utils/thinking/policy"; -import { getDefaultModelFromLRU } from "@/hooks/useModelLRU"; +} from "@/common/constants/storage"; +import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/browser/utils/ui/modeUtils"; +import { readPersistedState } from "@/browser/hooks/usePersistedState"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { UIMode } from "@/common/types/mode"; +import type { ThinkingLevel } from "@/common/types/thinking"; +import { enforceThinkingPolicy } from "@/browser/utils/thinking/policy"; +import { getDefaultModelFromLRU } from "@/browser/hooks/useModelLRU"; /** * Get send options from localStorage diff --git a/src/utils/messages/toolOutputRedaction.ts b/src/browser/utils/messages/toolOutputRedaction.ts similarity index 99% rename from src/utils/messages/toolOutputRedaction.ts rename to src/browser/utils/messages/toolOutputRedaction.ts index 51ffb79e0..d578f65e9 100644 --- a/src/utils/messages/toolOutputRedaction.ts +++ b/src/browser/utils/messages/toolOutputRedaction.ts @@ -14,7 +14,7 @@ import type { FileEditInsertToolResult, FileEditReplaceStringToolResult, FileEditReplaceLinesToolResult, -} from "@/types/tools"; +} from "@/common/types/tools"; // Tool-output from AI SDK is often wrapped like: { type: 'json', value: } // Keep this helper local so all redactors handle both wrapped and plain objects consistently. diff --git a/src/utils/review/filterHunks.ts b/src/browser/utils/review/filterHunks.ts similarity index 97% rename from src/utils/review/filterHunks.ts rename to src/browser/utils/review/filterHunks.ts index dd51616a8..88c104a51 100644 --- a/src/utils/review/filterHunks.ts +++ b/src/browser/utils/review/filterHunks.ts @@ -1,4 +1,4 @@ -import type { DiffHunk } from "@/types/review"; +import type { DiffHunk } from "@/common/types/review"; /** * Frontend hunk filters - applied to already-loaded hunks in memory. diff --git a/src/utils/slashCommands/compact.test.ts b/src/browser/utils/slashCommands/compact.test.ts similarity index 99% rename from src/utils/slashCommands/compact.test.ts rename to src/browser/utils/slashCommands/compact.test.ts index 5013defc3..906ee006d 100644 --- a/src/utils/slashCommands/compact.test.ts +++ b/src/browser/utils/slashCommands/compact.test.ts @@ -1,7 +1,7 @@ /** * Tests for compact command parser using minimist */ -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; import { parseCommand } from "./parser"; describe("compact command parser", () => { diff --git a/src/utils/slashCommands/fork.test.ts b/src/browser/utils/slashCommands/fork.test.ts similarity index 100% rename from src/utils/slashCommands/fork.test.ts rename to src/browser/utils/slashCommands/fork.test.ts diff --git a/src/utils/slashCommands/new.test.ts b/src/browser/utils/slashCommands/new.test.ts similarity index 100% rename from src/utils/slashCommands/new.test.ts rename to src/browser/utils/slashCommands/new.test.ts diff --git a/src/utils/slashCommands/parser.test.ts b/src/browser/utils/slashCommands/parser.test.ts similarity index 98% rename from src/utils/slashCommands/parser.test.ts rename to src/browser/utils/slashCommands/parser.test.ts index cdf703b8e..099c98cbe 100644 --- a/src/utils/slashCommands/parser.test.ts +++ b/src/browser/utils/slashCommands/parser.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "bun:test"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; import { parseCommand } from "./parser"; // Test helpers diff --git a/src/utils/slashCommands/parser.ts b/src/browser/utils/slashCommands/parser.ts similarity index 100% rename from src/utils/slashCommands/parser.ts rename to src/browser/utils/slashCommands/parser.ts diff --git a/src/utils/slashCommands/parser_multiline.test.ts b/src/browser/utils/slashCommands/parser_multiline.test.ts similarity index 94% rename from src/utils/slashCommands/parser_multiline.test.ts rename to src/browser/utils/slashCommands/parser_multiline.test.ts index b753f050e..d38d0e6fd 100644 --- a/src/utils/slashCommands/parser_multiline.test.ts +++ b/src/browser/utils/slashCommands/parser_multiline.test.ts @@ -1,7 +1,7 @@ /** * Tests to ensure multiline support doesn't break other commands */ -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; import { parseCommand } from "./parser"; describe("parser multiline compatibility", () => { diff --git a/src/utils/slashCommands/registry.ts b/src/browser/utils/slashCommands/registry.ts similarity index 99% rename from src/utils/slashCommands/registry.ts rename to src/browser/utils/slashCommands/registry.ts index 38261fb2d..16e6fed0a 100644 --- a/src/utils/slashCommands/registry.ts +++ b/src/browser/utils/slashCommands/registry.ts @@ -9,7 +9,7 @@ import type { SuggestionDefinition, } from "./types"; import minimist from "minimist"; -import { MODEL_ABBREVIATIONS } from "@/constants/knownModels"; +import { MODEL_ABBREVIATIONS } from "@/common/constants/knownModels"; /** * Parse multiline command input into first-line tokens and remaining message diff --git a/src/utils/slashCommands/suggestions.test.ts b/src/browser/utils/slashCommands/suggestions.test.ts similarity index 100% rename from src/utils/slashCommands/suggestions.test.ts rename to src/browser/utils/slashCommands/suggestions.test.ts diff --git a/src/utils/slashCommands/suggestions.ts b/src/browser/utils/slashCommands/suggestions.ts similarity index 100% rename from src/utils/slashCommands/suggestions.ts rename to src/browser/utils/slashCommands/suggestions.ts diff --git a/src/utils/slashCommands/types.ts b/src/browser/utils/slashCommands/types.ts similarity index 100% rename from src/utils/slashCommands/types.ts rename to src/browser/utils/slashCommands/types.ts diff --git a/src/utils/thinking/policy.test.ts b/src/browser/utils/thinking/policy.test.ts similarity index 100% rename from src/utils/thinking/policy.test.ts rename to src/browser/utils/thinking/policy.test.ts diff --git a/src/utils/thinking/policy.ts b/src/browser/utils/thinking/policy.ts similarity index 97% rename from src/utils/thinking/policy.ts rename to src/browser/utils/thinking/policy.ts index 0fda17318..6f5f089b6 100644 --- a/src/utils/thinking/policy.ts +++ b/src/browser/utils/thinking/policy.ts @@ -12,7 +12,7 @@ * - Multiple elements = User can select from options */ -import type { ThinkingLevel } from "@/types/thinking"; +import type { ThinkingLevel } from "@/common/types/thinking"; /** * Thinking policy is simply the set of allowed thinking levels for a model. diff --git a/src/utils/tokenizer/rendererClient.ts b/src/browser/utils/tokenizer/rendererClient.ts similarity index 98% rename from src/utils/tokenizer/rendererClient.ts rename to src/browser/utils/tokenizer/rendererClient.ts index 804cd7e46..8e618bc84 100644 --- a/src/utils/tokenizer/rendererClient.ts +++ b/src/browser/utils/tokenizer/rendererClient.ts @@ -1,4 +1,4 @@ -import type { IPCApi } from "@/types/ipc"; +import type { IPCApi } from "@/common/types/ipc"; const MAX_CACHE_ENTRIES = 256; diff --git a/src/utils/ui/dateTime.test.ts b/src/browser/utils/ui/dateTime.test.ts similarity index 100% rename from src/utils/ui/dateTime.test.ts rename to src/browser/utils/ui/dateTime.test.ts diff --git a/src/utils/ui/dateTime.ts b/src/browser/utils/ui/dateTime.ts similarity index 100% rename from src/utils/ui/dateTime.ts rename to src/browser/utils/ui/dateTime.ts diff --git a/src/utils/ui/keybinds.test.ts b/src/browser/utils/ui/keybinds.test.ts similarity index 100% rename from src/utils/ui/keybinds.test.ts rename to src/browser/utils/ui/keybinds.test.ts diff --git a/src/utils/ui/keybinds.ts b/src/browser/utils/ui/keybinds.ts similarity index 100% rename from src/utils/ui/keybinds.ts rename to src/browser/utils/ui/keybinds.ts diff --git a/src/utils/ui/modeUtils.ts b/src/browser/utils/ui/modeUtils.ts similarity index 90% rename from src/utils/ui/modeUtils.ts rename to src/browser/utils/ui/modeUtils.ts index 7f2e27af4..1e40f3eac 100644 --- a/src/utils/ui/modeUtils.ts +++ b/src/browser/utils/ui/modeUtils.ts @@ -1,5 +1,5 @@ -import type { UIMode } from "@/types/mode"; -import type { ToolPolicy } from "@/utils/tools/toolPolicy"; +import type { UIMode } from "@/common/types/mode"; +import type { ToolPolicy } from "@/common/utils/tools/toolPolicy"; /** * System instruction for Plan Mode diff --git a/src/utils/ui/runtimeBadge.test.ts b/src/browser/utils/ui/runtimeBadge.test.ts similarity index 96% rename from src/utils/ui/runtimeBadge.test.ts rename to src/browser/utils/ui/runtimeBadge.test.ts index 8fa1a1230..f34519057 100644 --- a/src/utils/ui/runtimeBadge.test.ts +++ b/src/browser/utils/ui/runtimeBadge.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from "@jest/globals"; import { extractSshHostname } from "./runtimeBadge"; -import type { RuntimeConfig } from "@/types/runtime"; +import type { RuntimeConfig } from "@/common/types/runtime"; describe("extractSshHostname", () => { it("should return null for undefined runtime config", () => { diff --git a/src/utils/ui/runtimeBadge.ts b/src/browser/utils/ui/runtimeBadge.ts similarity index 91% rename from src/utils/ui/runtimeBadge.ts rename to src/browser/utils/ui/runtimeBadge.ts index 95d5e67d2..d9b01a915 100644 --- a/src/utils/ui/runtimeBadge.ts +++ b/src/browser/utils/ui/runtimeBadge.ts @@ -1,4 +1,4 @@ -import type { RuntimeConfig } from "@/types/runtime"; +import type { RuntimeConfig } from "@/common/types/runtime"; /** * Extract hostname from SSH runtime config. diff --git a/src/utils/ui/statusTooltip.tsx b/src/browser/utils/ui/statusTooltip.tsx similarity index 91% rename from src/utils/ui/statusTooltip.tsx rename to src/browser/utils/ui/statusTooltip.tsx index aadd5da4b..7f67bc66a 100644 --- a/src/utils/ui/statusTooltip.tsx +++ b/src/browser/utils/ui/statusTooltip.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { ModelDisplay } from "@/components/Messages/ModelDisplay"; -import { formatRelativeTime } from "@/utils/ui/dateTime"; +import { ModelDisplay } from "@/browser/components/Messages/ModelDisplay"; +import { formatRelativeTime } from "@/browser/utils/ui/dateTime"; /** * Compute tooltip content for StatusIndicator based on workspace state. diff --git a/src/utils/ui/workspaceFiltering.test.ts b/src/browser/utils/ui/workspaceFiltering.test.ts similarity index 96% rename from src/utils/ui/workspaceFiltering.test.ts rename to src/browser/utils/ui/workspaceFiltering.test.ts index 5d18d6158..81efe2247 100644 --- a/src/utils/ui/workspaceFiltering.test.ts +++ b/src/browser/utils/ui/workspaceFiltering.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect } from "@jest/globals"; import { partitionWorkspacesByAge, formatOldWorkspaceThreshold } from "./workspaceFiltering"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; describe("partitionWorkspacesByAge", () => { const now = Date.now(); diff --git a/src/utils/ui/workspaceFiltering.ts b/src/browser/utils/ui/workspaceFiltering.ts similarity index 95% rename from src/utils/ui/workspaceFiltering.ts rename to src/browser/utils/ui/workspaceFiltering.ts index a42733c7f..55dec9f2d 100644 --- a/src/utils/ui/workspaceFiltering.ts +++ b/src/browser/utils/ui/workspaceFiltering.ts @@ -1,4 +1,4 @@ -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; /** * Time threshold for considering a workspace "old" (24 hours in milliseconds) diff --git a/src/utils/vim.test.ts b/src/browser/utils/vim.test.ts similarity index 100% rename from src/utils/vim.test.ts rename to src/browser/utils/vim.test.ts diff --git a/src/utils/vim.ts b/src/browser/utils/vim.ts similarity index 100% rename from src/utils/vim.ts rename to src/browser/utils/vim.ts diff --git a/src/utils/workspaceFork.ts b/src/browser/utils/workspaceFork.ts similarity index 90% rename from src/utils/workspaceFork.ts rename to src/browser/utils/workspaceFork.ts index fb8dc5fd9..18356de61 100644 --- a/src/utils/workspaceFork.ts +++ b/src/browser/utils/workspaceFork.ts @@ -3,10 +3,10 @@ * Handles forking workspaces and switching UI state */ -import type { SendMessageOptions } from "@/types/ipc"; -import type { FrontendWorkspaceMetadata } from "@/types/workspace"; -import { CUSTOM_EVENTS } from "@/constants/events"; -import { copyWorkspaceStorage } from "@/constants/storage"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { CUSTOM_EVENTS } from "@/common/constants/events"; +import { copyWorkspaceStorage } from "@/common/constants/storage"; export interface ForkOptions { sourceWorkspaceId: string; diff --git a/src/debug/agentSessionCli.ts b/src/cli/debug/agentSessionCli.ts similarity index 94% rename from src/debug/agentSessionCli.ts rename to src/cli/debug/agentSessionCli.ts index 0b2ba6580..3d0bdf95b 100644 --- a/src/debug/agentSessionCli.ts +++ b/src/cli/debug/agentSessionCli.ts @@ -1,16 +1,16 @@ #!/usr/bin/env bun -import assert from "@/utils/assert"; +import assert from "@/common/utils/assert"; import * as fs from "fs/promises"; import * as path from "path"; -import { PlatformPaths } from "../utils/paths"; +import { PlatformPaths } from "@/common/utils/paths"; import { parseArgs } from "util"; -import { Config } from "@/config"; -import { HistoryService } from "@/services/historyService"; -import { PartialService } from "@/services/partialService"; -import { InitStateManager } from "@/services/initStateManager"; -import { AIService } from "@/services/aiService"; -import { AgentSession, type AgentSessionChatEvent } from "@/services/agentSession"; +import { Config } from "@/node/config"; +import { HistoryService } from "@/node/services/historyService"; +import { PartialService } from "@/node/services/partialService"; +import { InitStateManager } from "@/node/services/initStateManager"; +import { AIService } from "@/node/services/aiService"; +import { AgentSession, type AgentSessionChatEvent } from "@/node/services/agentSession"; import { isCaughtUpMessage, isStreamAbort, @@ -23,12 +23,16 @@ import { isToolCallStart, type SendMessageOptions, type WorkspaceChatMessage, -} from "@/types/ipc"; -import { getDefaultModelFromLRU } from "@/hooks/useModelLRU"; -import { ensureProvidersConfig } from "@/utils/providers/ensureProvidersConfig"; -import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/utils/ui/modeUtils"; -import { extractAssistantText, extractReasoning, extractToolCalls } from "@/debug/chatExtractors"; -import type { ThinkingLevel } from "@/types/thinking"; +} from "@/common/types/ipc"; +import { getDefaultModelFromLRU } from "@/browser/hooks/useModelLRU"; +import { ensureProvidersConfig } from "@/common/utils/providers/ensureProvidersConfig"; +import { modeToToolPolicy, PLAN_MODE_INSTRUCTION } from "@/browser/utils/ui/modeUtils"; +import { + extractAssistantText, + extractReasoning, + extractToolCalls, +} from "@/cli/debug/chatExtractors"; +import type { ThinkingLevel } from "@/common/types/thinking"; interface CliResult { success: boolean; diff --git a/src/debug/chatExtractors.ts b/src/cli/debug/chatExtractors.ts similarity index 93% rename from src/debug/chatExtractors.ts rename to src/cli/debug/chatExtractors.ts index 2b385d7c4..45d9ee9f9 100644 --- a/src/debug/chatExtractors.ts +++ b/src/cli/debug/chatExtractors.ts @@ -1,5 +1,5 @@ -import assert from "@/utils/assert"; -import type { MuxReasoningPart, MuxTextPart, MuxToolPart } from "@/types/message"; +import assert from "@/common/utils/assert"; +import type { MuxReasoningPart, MuxTextPart, MuxToolPart } from "@/common/types/message"; export function extractAssistantText(parts: unknown): string { if (!Array.isArray(parts)) { diff --git a/src/debug/costs.ts b/src/cli/debug/costs.ts similarity index 94% rename from src/debug/costs.ts rename to src/cli/debug/costs.ts index ba5de64a6..d42d4adbb 100644 --- a/src/debug/costs.ts +++ b/src/cli/debug/costs.ts @@ -1,9 +1,9 @@ import * as fs from "fs"; import * as path from "path"; -import { defaultConfig } from "@/config"; -import type { MuxMessage } from "@/types/message"; -import { calculateTokenStats } from "@/utils/tokens/tokenStatsCalculator"; -import { getDefaultModelFromLRU } from "@/hooks/useModelLRU"; +import { defaultConfig } from "@/node/config"; +import type { MuxMessage } from "@/common/types/message"; +import { calculateTokenStats } from "@/common/utils/tokens/tokenStatsCalculator"; +import { getDefaultModelFromLRU } from "@/browser/hooks/useModelLRU"; /** * Debug command to display cost/token statistics for a workspace diff --git a/src/debug/git-status.ts b/src/cli/debug/git-status.ts similarity index 95% rename from src/debug/git-status.ts rename to src/cli/debug/git-status.ts index ee0b0f9fd..a11f9133c 100644 --- a/src/debug/git-status.ts +++ b/src/cli/debug/git-status.ts @@ -11,9 +11,9 @@ import { join } from "path"; import { execSync } from "child_process"; // Import production code - script and parser stay in sync -import { GIT_STATUS_SCRIPT, parseGitStatusScriptOutput } from "../utils/git/gitStatus"; -import { parseGitShowBranchForStatus } from "../utils/git/parseGitStatus"; -import { getMuxSrcDir } from "../constants/paths"; +import { GIT_STATUS_SCRIPT, parseGitStatusScriptOutput } from "@/node/utils/git/gitStatus"; +import { parseGitShowBranchForStatus } from "@/node/utils/git/parseGitStatus"; +import { getMuxSrcDir } from "@/common/constants/paths"; function findWorkspaces(): Array<{ id: string; path: string }> { const workspaces: Array<{ id: string; path: string }> = []; diff --git a/src/debug/index.ts b/src/cli/debug/index.ts similarity index 100% rename from src/debug/index.ts rename to src/cli/debug/index.ts diff --git a/src/debug/list-workspaces.ts b/src/cli/debug/list-workspaces.ts similarity index 92% rename from src/debug/list-workspaces.ts rename to src/cli/debug/list-workspaces.ts index f2bf59af9..61eaebeb4 100644 --- a/src/debug/list-workspaces.ts +++ b/src/cli/debug/list-workspaces.ts @@ -1,7 +1,7 @@ -import { defaultConfig } from "@/config"; -import { PlatformPaths } from "../utils/paths"; +import { defaultConfig } from "@/node/config"; +import { PlatformPaths } from "@/common/utils/paths"; import * as fs from "fs"; -import { getMuxSessionsDir } from "@/constants/paths"; +import { getMuxSessionsDir } from "@/common/constants/paths"; export function listWorkspacesCommand() { const config = defaultConfig.loadConfigOrDefault(); diff --git a/src/debug/replay-history.ts b/src/cli/debug/replay-history.ts similarity index 94% rename from src/debug/replay-history.ts rename to src/cli/debug/replay-history.ts index 3898f27fc..aa99ac8f7 100644 --- a/src/debug/replay-history.ts +++ b/src/cli/debug/replay-history.ts @@ -14,13 +14,13 @@ import * as fs from "fs"; import * as path from "path"; import { parseArgs } from "util"; -import { defaultConfig } from "@/config"; -import type { MuxMessage } from "@/types/message"; -import { createMuxMessage } from "@/types/message"; -import { InitStateManager } from "@/services/initStateManager"; -import { AIService } from "@/services/aiService"; -import { HistoryService } from "@/services/historyService"; -import { PartialService } from "@/services/partialService"; +import { defaultConfig } from "@/node/config"; +import type { MuxMessage } from "@/common/types/message"; +import { createMuxMessage } from "@/common/types/message"; +import { InitStateManager } from "@/node/services/initStateManager"; +import { AIService } from "@/node/services/aiService"; +import { HistoryService } from "@/node/services/historyService"; +import { PartialService } from "@/node/services/partialService"; const { positionals, values } = parseArgs({ args: process.argv.slice(2), diff --git a/src/debug/send-message.ts b/src/cli/debug/send-message.ts similarity index 94% rename from src/debug/send-message.ts rename to src/cli/debug/send-message.ts index f32f3cafc..38b8e4e15 100644 --- a/src/debug/send-message.ts +++ b/src/cli/debug/send-message.ts @@ -1,10 +1,10 @@ import * as fs from "fs"; import * as path from "path"; -import { defaultConfig } from "@/config"; -import type { MuxMessage } from "@/types/message"; -import type { SendMessageOptions } from "@/types/ipc"; -import { getDefaultModelFromLRU } from "@/hooks/useModelLRU"; -import { getMuxSessionsDir } from "@/constants/paths"; +import { defaultConfig } from "@/node/config"; +import type { MuxMessage } from "@/common/types/message"; +import type { SendMessageOptions } from "@/common/types/ipc"; +import { getDefaultModelFromLRU } from "@/browser/hooks/useModelLRU"; +import { getMuxSessionsDir } from "@/common/constants/paths"; /** * Debug command to send a message to a workspace, optionally editing an existing message diff --git a/src/main.ts b/src/cli/index.ts similarity index 86% rename from src/main.ts rename to src/cli/index.ts index d6f2d9058..f1c49999a 100644 --- a/src/main.ts +++ b/src/cli/index.ts @@ -6,8 +6,8 @@ if (isServer) { // Remove 'server' from args since main-server doesn't expect it as a positional argument. process.argv.splice(2, 1); // eslint-disable-next-line @typescript-eslint/no-require-imports - require("./main-server"); + require("./server"); } else { // eslint-disable-next-line @typescript-eslint/no-require-imports - require("./main-desktop"); + require("../desktop/main"); } diff --git a/src/main-server.ts b/src/cli/server.ts similarity index 97% rename from src/main-server.ts rename to src/cli/server.ts index 69688652b..4b29866f0 100644 --- a/src/main-server.ts +++ b/src/cli/server.ts @@ -2,10 +2,10 @@ * HTTP/WebSocket Server for mux * Allows accessing mux backend from mobile devices */ -import { Config } from "./config"; -import { IPC_CHANNELS } from "@/constants/ipc-constants"; -import { IpcMain } from "./services/ipcMain"; -import { migrateCmuxToMux } from "./constants/paths"; +import { Config } from "@/node/config"; +import { IPC_CHANNELS } from "@/common/constants/ipc-constants"; +import { IpcMain } from "@/node/services/ipcMain"; +import { migrateCmuxToMux } from "@/common/constants/paths"; import cors from "cors"; import type { BrowserWindow, IpcMain as ElectronIpcMain } from "electron"; import express from "express"; @@ -14,7 +14,7 @@ import * as path from "path"; import type { RawData } from "ws"; import { WebSocket, WebSocketServer } from "ws"; import { Command } from "commander"; -import { validateProjectPath } from "./utils/pathUtils"; +import { validateProjectPath } from "@/node/utils/pathUtils"; // Parse command line arguments const program = new Command(); diff --git a/src/constants/env.ts b/src/common/constants/env.ts similarity index 100% rename from src/constants/env.ts rename to src/common/constants/env.ts diff --git a/src/constants/events.ts b/src/common/constants/events.ts similarity index 98% rename from src/constants/events.ts rename to src/common/constants/events.ts index 00b1e66a9..d249cbe87 100644 --- a/src/constants/events.ts +++ b/src/common/constants/events.ts @@ -5,7 +5,7 @@ * Each event has a corresponding type in CustomEventPayloads for type safety */ -import type { ThinkingLevel } from "@/types/thinking"; +import type { ThinkingLevel } from "@/common/types/thinking"; export const CUSTOM_EVENTS = { /** diff --git a/src/constants/exitCodes.ts b/src/common/constants/exitCodes.ts similarity index 100% rename from src/constants/exitCodes.ts rename to src/common/constants/exitCodes.ts diff --git a/src/constants/ipc-constants.ts b/src/common/constants/ipc-constants.ts similarity index 100% rename from src/constants/ipc-constants.ts rename to src/common/constants/ipc-constants.ts diff --git a/src/constants/knownModels.ts b/src/common/constants/knownModels.ts similarity index 100% rename from src/constants/knownModels.ts rename to src/common/constants/knownModels.ts diff --git a/src/constants/paths.ts b/src/common/constants/paths.ts similarity index 100% rename from src/constants/paths.ts rename to src/common/constants/paths.ts diff --git a/src/constants/providers.test.ts b/src/common/constants/providers.test.ts similarity index 100% rename from src/constants/providers.test.ts rename to src/common/constants/providers.test.ts diff --git a/src/constants/providers.ts b/src/common/constants/providers.ts similarity index 100% rename from src/constants/providers.ts rename to src/common/constants/providers.ts diff --git a/src/constants/storage.ts b/src/common/constants/storage.ts similarity index 100% rename from src/constants/storage.ts rename to src/common/constants/storage.ts diff --git a/src/constants/toolLimits.ts b/src/common/constants/toolLimits.ts similarity index 100% rename from src/constants/toolLimits.ts rename to src/common/constants/toolLimits.ts diff --git a/src/constants/ui.ts b/src/common/constants/ui.ts similarity index 100% rename from src/constants/ui.ts rename to src/common/constants/ui.ts diff --git a/src/constants/workspace.ts b/src/common/constants/workspace.ts similarity index 78% rename from src/constants/workspace.ts rename to src/common/constants/workspace.ts index dc37cbf3e..c45cc0c67 100644 --- a/src/constants/workspace.ts +++ b/src/common/constants/workspace.ts @@ -1,4 +1,4 @@ -import type { RuntimeConfig } from "@/types/runtime"; +import type { RuntimeConfig } from "@/common/types/runtime"; /** * Default runtime configuration for local workspaces diff --git a/src/lib/utils.ts b/src/common/lib/utils.ts similarity index 100% rename from src/lib/utils.ts rename to src/common/lib/utils.ts diff --git a/src/mocks/mermaidStub.ts b/src/common/mocks/mermaidStub.ts similarity index 100% rename from src/mocks/mermaidStub.ts rename to src/common/mocks/mermaidStub.ts diff --git a/src/types/chatStats.ts b/src/common/types/chatStats.ts similarity index 88% rename from src/types/chatStats.ts rename to src/common/types/chatStats.ts index 01570b442..6d8ea7ef7 100644 --- a/src/types/chatStats.ts +++ b/src/common/types/chatStats.ts @@ -1,4 +1,4 @@ -import type { ChatUsageDisplay } from "@/utils/tokens/usageAggregator"; +import type { ChatUsageDisplay } from "@/common/utils/tokens/usageAggregator"; export interface TokenConsumer { name: string; // "User", "Assistant", "bash", "readFile", etc. diff --git a/src/types/errors.ts b/src/common/types/errors.ts similarity index 100% rename from src/types/errors.ts rename to src/common/types/errors.ts diff --git a/src/types/global.d.ts b/src/common/types/global.d.ts similarity index 100% rename from src/types/global.d.ts rename to src/common/types/global.d.ts diff --git a/src/types/ipc.ts b/src/common/types/ipc.ts similarity index 98% rename from src/types/ipc.ts rename to src/common/types/ipc.ts index d77f549f0..ce91019d6 100644 --- a/src/types/ipc.ts +++ b/src/common/types/ipc.ts @@ -2,10 +2,10 @@ import type { Result } from "./result"; import type { FrontendWorkspaceMetadata, WorkspaceMetadata } from "./workspace"; import type { MuxMessage, MuxFrontendMetadata } from "./message"; import type { ChatStats } from "./chatStats"; -import type { ProjectConfig } from "@/config"; +import type { ProjectConfig } from "@/node/config"; import type { SendMessageError, StreamErrorType } from "./errors"; import type { ThinkingLevel } from "./thinking"; -import type { ToolPolicy } from "@/utils/tools/toolPolicy"; +import type { ToolPolicy } from "@/common/utils/tools/toolPolicy"; import type { BashToolResult } from "./tools"; import type { Secret } from "./secrets"; import type { MuxProviderOptions } from "./providerOptions"; @@ -24,7 +24,7 @@ import type { } from "./stream"; // Import constants from constants module (single source of truth) -import { IPC_CHANNELS, getChatChannel } from "@/constants/ipc-constants"; +import { IPC_CHANNELS, getChatChannel } from "@/common/constants/ipc-constants"; // Re-export for TypeScript consumers export { IPC_CHANNELS, getChatChannel }; diff --git a/src/types/message.ts b/src/common/types/message.ts similarity index 98% rename from src/types/message.ts rename to src/common/types/message.ts index c14b5e24f..c388b57e1 100644 --- a/src/types/message.ts +++ b/src/common/types/message.ts @@ -1,8 +1,8 @@ import type { UIMessage } from "ai"; import type { LanguageModelV2Usage } from "@ai-sdk/provider"; import type { StreamErrorType } from "./errors"; -import type { ToolPolicy } from "@/utils/tools/toolPolicy"; -import type { ChatUsageDisplay } from "@/utils/tokens/usageAggregator"; +import type { ToolPolicy } from "@/common/utils/tools/toolPolicy"; +import type { ChatUsageDisplay } from "@/common/utils/tokens/usageAggregator"; // Parsed compaction request data (shared type for consistency) export interface CompactionRequestData { diff --git a/src/types/mode.ts b/src/common/types/mode.ts similarity index 100% rename from src/types/mode.ts rename to src/common/types/mode.ts diff --git a/src/types/project.ts b/src/common/types/project.ts similarity index 100% rename from src/types/project.ts rename to src/common/types/project.ts diff --git a/src/types/providerOptions.ts b/src/common/types/providerOptions.ts similarity index 100% rename from src/types/providerOptions.ts rename to src/common/types/providerOptions.ts diff --git a/src/types/result.ts b/src/common/types/result.ts similarity index 100% rename from src/types/result.ts rename to src/common/types/result.ts diff --git a/src/types/review.ts b/src/common/types/review.ts similarity index 100% rename from src/types/review.ts rename to src/common/types/review.ts diff --git a/src/types/runtime.test.ts b/src/common/types/runtime.test.ts similarity index 100% rename from src/types/runtime.test.ts rename to src/common/types/runtime.test.ts diff --git a/src/types/runtime.ts b/src/common/types/runtime.ts similarity index 100% rename from src/types/runtime.ts rename to src/common/types/runtime.ts diff --git a/src/types/secrets.ts b/src/common/types/secrets.ts similarity index 100% rename from src/types/secrets.ts rename to src/common/types/secrets.ts diff --git a/src/types/stream.ts b/src/common/types/stream.ts similarity index 100% rename from src/types/stream.ts rename to src/common/types/stream.ts diff --git a/src/types/terminal.ts b/src/common/types/terminal.ts similarity index 100% rename from src/types/terminal.ts rename to src/common/types/terminal.ts diff --git a/src/types/thinking.ts b/src/common/types/thinking.ts similarity index 100% rename from src/types/thinking.ts rename to src/common/types/thinking.ts diff --git a/src/types/toolParts.ts b/src/common/types/toolParts.ts similarity index 100% rename from src/types/toolParts.ts rename to src/common/types/toolParts.ts diff --git a/src/types/tools.ts b/src/common/types/tools.ts similarity index 100% rename from src/types/tools.ts rename to src/common/types/tools.ts diff --git a/src/types/undici.d.ts b/src/common/types/undici.d.ts similarity index 100% rename from src/types/undici.d.ts rename to src/common/types/undici.d.ts diff --git a/src/types/workspace.ts b/src/common/types/workspace.ts similarity index 100% rename from src/types/workspace.ts rename to src/common/types/workspace.ts diff --git a/src/utils/ai/cacheStrategy.ts b/src/common/utils/ai/cacheStrategy.ts similarity index 100% rename from src/utils/ai/cacheStrategy.ts rename to src/common/utils/ai/cacheStrategy.ts diff --git a/src/utils/ai/modelDisplay.test.ts b/src/common/utils/ai/modelDisplay.test.ts similarity index 100% rename from src/utils/ai/modelDisplay.test.ts rename to src/common/utils/ai/modelDisplay.test.ts diff --git a/src/utils/ai/modelDisplay.ts b/src/common/utils/ai/modelDisplay.ts similarity index 100% rename from src/utils/ai/modelDisplay.ts rename to src/common/utils/ai/modelDisplay.ts diff --git a/src/utils/ai/models.ts b/src/common/utils/ai/models.ts similarity index 94% rename from src/utils/ai/models.ts rename to src/common/utils/ai/models.ts index 0f240ad64..48d802a7f 100644 --- a/src/utils/ai/models.ts +++ b/src/common/utils/ai/models.ts @@ -2,7 +2,7 @@ * Model configuration and constants */ -import { DEFAULT_MODEL } from "@/constants/knownModels"; +import { DEFAULT_MODEL } from "@/common/constants/knownModels"; export const defaultModel = DEFAULT_MODEL; diff --git a/src/utils/ai/providerFactory.ts b/src/common/utils/ai/providerFactory.ts similarity index 100% rename from src/utils/ai/providerFactory.ts rename to src/common/utils/ai/providerFactory.ts diff --git a/src/utils/ai/providerOptions.ts b/src/common/utils/ai/providerOptions.ts similarity index 97% rename from src/utils/ai/providerOptions.ts rename to src/common/utils/ai/providerOptions.ts index d5d93c86b..d5b737666 100644 --- a/src/utils/ai/providerOptions.ts +++ b/src/common/utils/ai/providerOptions.ts @@ -6,15 +6,15 @@ import type { AnthropicProviderOptions } from "@ai-sdk/anthropic"; import type { OpenAIResponsesProviderOptions } from "@ai-sdk/openai"; -import type { ThinkingLevel } from "@/types/thinking"; +import type { ThinkingLevel } from "@/common/types/thinking"; import { ANTHROPIC_THINKING_BUDGETS, OPENAI_REASONING_EFFORT, OPENROUTER_REASONING_EFFORT, -} from "@/types/thinking"; -import { log } from "@/services/log"; -import type { MuxMessage } from "@/types/message"; -import { enforceThinkingPolicy } from "@/utils/thinking/policy"; +} from "@/common/types/thinking"; +import { log } from "@/node/services/log"; +import type { MuxMessage } from "@/common/types/message"; +import { enforceThinkingPolicy } from "@/browser/utils/thinking/policy"; /** * Extended OpenAI Responses provider options to include truncation diff --git a/src/utils/arrays.test.ts b/src/common/utils/arrays.test.ts similarity index 100% rename from src/utils/arrays.test.ts rename to src/common/utils/arrays.test.ts diff --git a/src/utils/arrays.ts b/src/common/utils/arrays.ts similarity index 100% rename from src/utils/arrays.ts rename to src/common/utils/arrays.ts diff --git a/src/utils/assert.ts b/src/common/utils/assert.ts similarity index 100% rename from src/utils/assert.ts rename to src/common/utils/assert.ts diff --git a/src/utils/env.ts b/src/common/utils/env.ts similarity index 100% rename from src/utils/env.ts rename to src/common/utils/env.ts diff --git a/src/utils/errors.ts b/src/common/utils/errors.ts similarity index 100% rename from src/utils/errors.ts rename to src/common/utils/errors.ts diff --git a/src/utils/hasher.ts b/src/common/utils/hasher.ts similarity index 100% rename from src/utils/hasher.ts rename to src/common/utils/hasher.ts diff --git a/src/utils/paths.ts b/src/common/utils/paths.ts similarity index 100% rename from src/utils/paths.ts rename to src/common/utils/paths.ts diff --git a/src/utils/projectOrdering.test.ts b/src/common/utils/projectOrdering.test.ts similarity index 99% rename from src/utils/projectOrdering.test.ts rename to src/common/utils/projectOrdering.test.ts index 6012cf8db..e6a2a0c56 100644 --- a/src/utils/projectOrdering.test.ts +++ b/src/common/utils/projectOrdering.test.ts @@ -5,7 +5,7 @@ import { normalizeOrder, equalOrders, } from "./projectOrdering"; -import type { ProjectConfig } from "@/config"; +import type { ProjectConfig } from "@/node/config"; describe("projectOrdering", () => { const createProjects = (paths: string[]): Map => { diff --git a/src/utils/projectOrdering.ts b/src/common/utils/projectOrdering.ts similarity index 97% rename from src/utils/projectOrdering.ts rename to src/common/utils/projectOrdering.ts index 462d63835..487f97a10 100644 --- a/src/utils/projectOrdering.ts +++ b/src/common/utils/projectOrdering.ts @@ -4,7 +4,7 @@ // - We represent order as an array of project paths (string[]). // - This file is intentionally framework-agnostic and pure for easy testing. -import type { ProjectConfig } from "@/config"; +import type { ProjectConfig } from "@/node/config"; /** * Sort projects by the provided order array. Unknown projects go to the end preserving natural order. diff --git a/src/utils/providers/ensureProvidersConfig.ts b/src/common/utils/providers/ensureProvidersConfig.ts similarity index 99% rename from src/utils/providers/ensureProvidersConfig.ts rename to src/common/utils/providers/ensureProvidersConfig.ts index 0ec771057..b2213febc 100644 --- a/src/utils/providers/ensureProvidersConfig.ts +++ b/src/common/utils/providers/ensureProvidersConfig.ts @@ -1,4 +1,4 @@ -import type { Config, ProviderConfig, ProvidersConfig } from "@/config"; +import type { Config, ProviderConfig, ProvidersConfig } from "@/node/config"; const trim = (value: unknown): string => (typeof value === "string" ? value.trim() : ""); diff --git a/src/utils/tokens/displayUsage.ts b/src/common/utils/tokens/displayUsage.ts similarity index 100% rename from src/utils/tokens/displayUsage.ts rename to src/common/utils/tokens/displayUsage.ts diff --git a/src/utils/tokens/modelStats.test.ts b/src/common/utils/tokens/modelStats.test.ts similarity index 98% rename from src/utils/tokens/modelStats.test.ts rename to src/common/utils/tokens/modelStats.test.ts index 3c8999889..33ff95194 100644 --- a/src/utils/tokens/modelStats.test.ts +++ b/src/common/utils/tokens/modelStats.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test, it } from "bun:test"; import { getModelStats } from "./modelStats"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; describe("getModelStats", () => { describe("direct model lookups", () => { diff --git a/src/utils/tokens/modelStats.ts b/src/common/utils/tokens/modelStats.ts similarity index 100% rename from src/utils/tokens/modelStats.ts rename to src/common/utils/tokens/modelStats.ts diff --git a/src/utils/tokens/models-extra.ts b/src/common/utils/tokens/models-extra.ts similarity index 100% rename from src/utils/tokens/models-extra.ts rename to src/common/utils/tokens/models-extra.ts diff --git a/src/utils/tokens/models.json b/src/common/utils/tokens/models.json similarity index 100% rename from src/utils/tokens/models.json rename to src/common/utils/tokens/models.json diff --git a/src/utils/tokens/tokenMeterUtils.ts b/src/common/utils/tokens/tokenMeterUtils.ts similarity index 100% rename from src/utils/tokens/tokenMeterUtils.ts rename to src/common/utils/tokens/tokenMeterUtils.ts diff --git a/src/utils/tokens/tokenStatsCalculator.test.ts b/src/common/utils/tokens/tokenStatsCalculator.test.ts similarity index 99% rename from src/utils/tokens/tokenStatsCalculator.test.ts rename to src/common/utils/tokens/tokenStatsCalculator.test.ts index 50ed89730..eda0ddf61 100644 --- a/src/utils/tokens/tokenStatsCalculator.test.ts +++ b/src/common/utils/tokens/tokenStatsCalculator.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "bun:test"; -import type { MuxMessage } from "@/types/message"; +import type { MuxMessage } from "@/common/types/message"; import type { LanguageModelV2Usage } from "@ai-sdk/provider"; import { collectUniqueToolNames, diff --git a/src/utils/tokens/tokenStatsCalculator.ts b/src/common/utils/tokens/tokenStatsCalculator.ts similarity index 98% rename from src/utils/tokens/tokenStatsCalculator.ts rename to src/common/utils/tokens/tokenStatsCalculator.ts index 7abc443d9..fbfe6e75e 100644 --- a/src/utils/tokens/tokenStatsCalculator.ts +++ b/src/common/utils/tokens/tokenStatsCalculator.ts @@ -6,14 +6,14 @@ * For renderer-safe usage utilities, use displayUsage.ts instead. */ -import type { MuxMessage } from "@/types/message"; -import type { ChatStats, TokenConsumer } from "@/types/chatStats"; +import type { MuxMessage } from "@/common/types/message"; +import type { ChatStats, TokenConsumer } from "@/common/types/chatStats"; import { getTokenizerForModel, countTokensForData, getToolDefinitionTokens, type Tokenizer, -} from "@/utils/main/tokenizer"; +} from "@/node/utils/main/tokenizer"; import { createDisplayUsage } from "./displayUsage"; import type { ChatUsageDisplay } from "./usageAggregator"; diff --git a/src/utils/tokens/usageAggregator.ts b/src/common/utils/tokens/usageAggregator.ts similarity index 100% rename from src/utils/tokens/usageAggregator.ts rename to src/common/utils/tokens/usageAggregator.ts diff --git a/src/utils/tools/toolDefinitions.ts b/src/common/utils/tools/toolDefinitions.ts similarity index 99% rename from src/utils/tools/toolDefinitions.ts rename to src/common/utils/tools/toolDefinitions.ts index b8c838e8a..66ed80fd3 100644 --- a/src/utils/tools/toolDefinitions.ts +++ b/src/common/utils/tools/toolDefinitions.ts @@ -12,8 +12,8 @@ import { BASH_MAX_LINE_BYTES, BASH_MAX_TOTAL_BYTES, STATUS_MESSAGE_MAX_LENGTH, -} from "@/constants/toolLimits"; -import { TOOL_EDIT_WARNING } from "@/types/tools"; +} from "@/common/constants/toolLimits"; +import { TOOL_EDIT_WARNING } from "@/common/types/tools"; import { zodToJsonSchema } from "zod-to-json-schema"; diff --git a/src/utils/tools/toolPolicy.test.ts b/src/common/utils/tools/toolPolicy.test.ts similarity index 100% rename from src/utils/tools/toolPolicy.test.ts rename to src/common/utils/tools/toolPolicy.test.ts diff --git a/src/utils/tools/toolPolicy.ts b/src/common/utils/tools/toolPolicy.ts similarity index 100% rename from src/utils/tools/toolPolicy.ts rename to src/common/utils/tools/toolPolicy.ts diff --git a/src/utils/tools/tools.ts b/src/common/utils/tools/tools.ts similarity index 81% rename from src/utils/tools/tools.ts rename to src/common/utils/tools/tools.ts index b86f70412..93eae316f 100644 --- a/src/utils/tools/tools.ts +++ b/src/common/utils/tools/tools.ts @@ -1,17 +1,17 @@ import { type Tool } from "ai"; -import { createFileReadTool } from "@/services/tools/file_read"; -import { createBashTool } from "@/services/tools/bash"; -import { createFileEditReplaceStringTool } from "@/services/tools/file_edit_replace_string"; -// DISABLED: import { createFileEditReplaceLinesTool } from "@/services/tools/file_edit_replace_lines"; -import { createFileEditInsertTool } from "@/services/tools/file_edit_insert"; -import { createProposePlanTool } from "@/services/tools/propose_plan"; -import { createTodoWriteTool, createTodoReadTool } from "@/services/tools/todo"; -import { createStatusSetTool } from "@/services/tools/status_set"; -import { wrapWithInitWait } from "@/services/tools/wrapWithInitWait"; -import { log } from "@/services/log"; +import { createFileReadTool } from "@/node/services/tools/file_read"; +import { createBashTool } from "@/node/services/tools/bash"; +import { createFileEditReplaceStringTool } from "@/node/services/tools/file_edit_replace_string"; +// DISABLED: import { createFileEditReplaceLinesTool } from "@/node/services/tools/file_edit_replace_lines"; +import { createFileEditInsertTool } from "@/node/services/tools/file_edit_insert"; +import { createProposePlanTool } from "@/node/services/tools/propose_plan"; +import { createTodoWriteTool, createTodoReadTool } from "@/node/services/tools/todo"; +import { createStatusSetTool } from "@/node/services/tools/status_set"; +import { wrapWithInitWait } from "@/node/services/tools/wrapWithInitWait"; +import { log } from "@/node/services/log"; -import type { Runtime } from "@/runtime/Runtime"; -import type { InitStateManager } from "@/services/initStateManager"; +import type { Runtime } from "@/node/runtime/Runtime"; +import type { InitStateManager } from "@/node/services/initStateManager"; /** * Configuration for tools that need runtime context diff --git a/src/utils/validation/workspaceValidation.test.ts b/src/common/utils/validation/workspaceValidation.test.ts similarity index 100% rename from src/utils/validation/workspaceValidation.test.ts rename to src/common/utils/validation/workspaceValidation.test.ts diff --git a/src/utils/validation/workspaceValidation.ts b/src/common/utils/validation/workspaceValidation.ts similarity index 100% rename from src/utils/validation/workspaceValidation.ts rename to src/common/utils/validation/workspaceValidation.ts diff --git a/src/main-desktop.ts b/src/desktop/main.ts similarity index 95% rename from src/main-desktop.ts rename to src/desktop/main.ts index d8761c8cb..84e4c536f 100644 --- a/src/main-desktop.ts +++ b/src/desktop/main.ts @@ -14,15 +14,15 @@ import { } from "electron"; import * as fs from "fs"; import * as path from "path"; -import type { Config } from "./config"; -import type { IpcMain } from "./services/ipcMain"; -import { VERSION } from "./version"; -import { IPC_CHANNELS } from "./constants/ipc-constants"; -import { getMuxHome, migrateCmuxToMux } from "./constants/paths"; -import { log } from "./services/log"; -import { parseDebugUpdater } from "./utils/env"; -import assert from "./utils/assert"; -import { loadTokenizerModules } from "./utils/main/tokenizer"; +import type { Config } from "@/node/config"; +import type { IpcMain } from "@/node/services/ipcMain"; +import { VERSION } from "@/version"; +import { IPC_CHANNELS } from "@/common/constants/ipc-constants"; +import { getMuxHome, migrateCmuxToMux } from "@/common/constants/paths"; +import { log } from "@/node/services/log"; +import { parseDebugUpdater } from "@/common/utils/env"; +import assert from "@/common/utils/assert"; +import { loadTokenizerModules } from "@/node/utils/main/tokenizer"; // React DevTools for development profiling // Using require() instead of import since it's dev-only and conditionally loaded @@ -69,7 +69,7 @@ if (!app.isPackaged) { let config: Config | null = null; let ipcMain: IpcMain | null = null; // eslint-disable-next-line @typescript-eslint/consistent-type-imports -let updaterService: typeof import("./services/updater").UpdaterService.prototype | null = null; +let updaterService: typeof import("@/desktop/updater").UpdaterService.prototype | null = null; const isE2ETest = process.env.MUX_E2E === "1"; const forceDistLoad = process.env.MUX_E2E_LOAD_DIST === "1"; @@ -255,7 +255,7 @@ async function showSplashScreen() { }); // Wait for splash HTML to load - await splashWindow.loadFile(path.join(__dirname, "splash.html")); + await splashWindow.loadFile(path.join(__dirname, "../splash.html")); // Wait for the window to actually be shown and rendered before continuing // This ensures the splash is visible before we block the event loop with heavy work @@ -310,10 +310,10 @@ async function loadServices(): Promise { { UpdaterService: UpdaterServiceClass }, { TerminalWindowManager: TerminalWindowManagerClass }, ] = await Promise.all([ - import("./config"), - import("./services/ipcMain"), - import("./services/updater"), - import("./services/terminalWindowManager"), + import("@/node/config"), + import("@/node/services/ipcMain"), + import("@/desktop/updater"), + import("@/desktop/terminalWindowManager"), ]); /* eslint-enable no-restricted-syntax */ config = new ConfigClass(); @@ -367,7 +367,7 @@ function createWindow() { webPreferences: { nodeIntegration: false, contextIsolation: true, - preload: path.join(__dirname, "preload.js"), + preload: path.join(__dirname, "../preload.js"), }, title: "cmux - coder multiplexer", // Hide menu bar on Linux by default (like VS Code) @@ -465,7 +465,7 @@ function createWindow() { } } else { // Production mode: load built files - const htmlPath = path.join(__dirname, "index.html"); + const htmlPath = path.join(__dirname, "../index.html"); console.log(`[${timestamp()}] [window] Loading from file: ${htmlPath}`); void mainWindow.loadFile(htmlPath); } diff --git a/src/preload.ts b/src/desktop/preload.ts similarity index 97% rename from src/preload.ts rename to src/desktop/preload.ts index f003be55a..61807a03f 100644 --- a/src/preload.ts +++ b/src/desktop/preload.ts @@ -19,10 +19,10 @@ */ import { contextBridge, ipcRenderer } from "electron"; -import type { IPCApi, WorkspaceChatMessage, UpdateStatus } from "./types/ipc"; -import type { FrontendWorkspaceMetadata } from "./types/workspace"; -import type { ProjectConfig } from "./types/project"; -import { IPC_CHANNELS, getChatChannel } from "./constants/ipc-constants"; +import type { IPCApi, WorkspaceChatMessage, UpdateStatus } from "@/common/types/ipc"; +import type { FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { ProjectConfig } from "@/common/types/project"; +import { IPC_CHANNELS, getChatChannel } from "@/common/constants/ipc-constants"; // Build the API implementation using the shared interface const api: IPCApi = { diff --git a/src/services/terminalWindowManager.ts b/src/desktop/terminalWindowManager.ts similarity index 97% rename from src/services/terminalWindowManager.ts rename to src/desktop/terminalWindowManager.ts index cad15b9cb..d63e1e995 100644 --- a/src/services/terminalWindowManager.ts +++ b/src/desktop/terminalWindowManager.ts @@ -7,8 +7,8 @@ import { BrowserWindow } from "electron"; import * as path from "path"; -import { log } from "./log"; -import type { Config } from "@/config"; +import { log } from "@/node/services/log"; +import type { Config } from "@/node/config"; export class TerminalWindowManager { private windows = new Map>(); // workspaceId -> Set of windows diff --git a/src/services/updater.test.ts b/src/desktop/updater.test.ts similarity index 100% rename from src/services/updater.test.ts rename to src/desktop/updater.test.ts diff --git a/src/services/updater.ts b/src/desktop/updater.ts similarity index 98% rename from src/services/updater.ts rename to src/desktop/updater.ts index 748c83e01..d03468f02 100644 --- a/src/services/updater.ts +++ b/src/desktop/updater.ts @@ -1,9 +1,9 @@ import { autoUpdater } from "electron-updater"; import type { UpdateInfo } from "electron-updater"; import type { BrowserWindow } from "electron"; -import { IPC_CHANNELS } from "@/constants/ipc-constants"; -import { log } from "./log"; -import { parseDebugUpdater } from "@/utils/env"; +import { IPC_CHANNELS } from "@/common/constants/ipc-constants"; +import { log } from "@/node/services/log"; +import { parseDebugUpdater } from "@/common/utils/env"; // Update check timeout in milliseconds (30 seconds) const UPDATE_CHECK_TIMEOUT_MS = 30_000; diff --git a/src/bench/headlessEnvironment.ts b/src/node/bench/headlessEnvironment.ts similarity index 97% rename from src/bench/headlessEnvironment.ts rename to src/node/bench/headlessEnvironment.ts index 4d73d662c..8289bc382 100644 --- a/src/bench/headlessEnvironment.ts +++ b/src/node/bench/headlessEnvironment.ts @@ -3,8 +3,8 @@ import * as path from "path"; import * as fs from "fs/promises"; import createIPCMock from "electron-mock-ipc"; import type { BrowserWindow, IpcMain as ElectronIpcMain, WebContents } from "electron"; -import { Config } from "@/config"; -import { IpcMain } from "@/services/ipcMain"; +import { Config } from "@/node/config"; +import { IpcMain } from "@/node/services/ipcMain"; type MockedElectron = ReturnType; diff --git a/src/config.test.ts b/src/node/config.test.ts similarity index 100% rename from src/config.test.ts rename to src/node/config.test.ts diff --git a/src/config.ts b/src/node/config.ts similarity index 98% rename from src/config.ts rename to src/node/config.ts index c02755c92..429c26bd6 100644 --- a/src/config.ts +++ b/src/node/config.ts @@ -3,12 +3,12 @@ import * as path from "path"; import * as crypto from "crypto"; import * as jsonc from "jsonc-parser"; import writeFileAtomic from "write-file-atomic"; -import type { WorkspaceMetadata, FrontendWorkspaceMetadata } from "./types/workspace"; -import type { Secret, SecretsConfig } from "./types/secrets"; -import type { Workspace, ProjectConfig, ProjectsConfig } from "./types/project"; -import { DEFAULT_RUNTIME_CONFIG } from "./constants/workspace"; -import { getMuxHome } from "./constants/paths"; -import { PlatformPaths } from "./utils/paths"; +import type { WorkspaceMetadata, FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import type { Secret, SecretsConfig } from "@/common/types/secrets"; +import type { Workspace, ProjectConfig, ProjectsConfig } from "@/common/types/project"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; +import { getMuxHome } from "@/common/constants/paths"; +import { PlatformPaths } from "@/common/utils/paths"; // Re-export project types from dedicated types file (for preload usage) export type { Workspace, ProjectConfig, ProjectsConfig }; diff --git a/src/git.test.ts b/src/node/git.test.ts similarity index 100% rename from src/git.test.ts rename to src/node/git.test.ts diff --git a/src/git.ts b/src/node/git.ts similarity index 97% rename from src/git.ts rename to src/node/git.ts index 9eb5b69c4..105a60310 100644 --- a/src/git.ts +++ b/src/node/git.ts @@ -1,8 +1,8 @@ import * as fs from "fs"; import * as path from "path"; -import type { Config } from "./config"; -import type { RuntimeConfig } from "./types/runtime"; -import { execAsync } from "./utils/disposableExec"; +import type { Config } from "@/node/config"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { execAsync } from "@/node/utils/disposableExec"; import { createRuntime } from "./runtime/runtimeFactory"; export interface WorktreeResult { diff --git a/src/runtime/LocalRuntime.test.ts b/src/node/runtime/LocalRuntime.test.ts similarity index 100% rename from src/runtime/LocalRuntime.test.ts rename to src/node/runtime/LocalRuntime.test.ts diff --git a/src/runtime/LocalRuntime.ts b/src/node/runtime/LocalRuntime.ts similarity index 97% rename from src/runtime/LocalRuntime.ts rename to src/node/runtime/LocalRuntime.ts index 784f2e122..81012cd12 100644 --- a/src/runtime/LocalRuntime.ts +++ b/src/node/runtime/LocalRuntime.ts @@ -17,19 +17,19 @@ import type { InitLogger, } from "./Runtime"; import { RuntimeError as RuntimeErrorClass } from "./Runtime"; -import { NON_INTERACTIVE_ENV_VARS } from "../constants/env"; -import { getBashPath } from "../utils/main/bashPath"; -import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "../constants/exitCodes"; -import { listLocalBranches } from "../git"; +import { NON_INTERACTIVE_ENV_VARS } from "@/common/constants/env"; +import { getBashPath } from "@/node/utils/main/bashPath"; +import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "@/common/constants/exitCodes"; +import { listLocalBranches } from "@/node/git"; import { checkInitHookExists, getInitHookPath, createLineBufferedLoggers, getInitHookEnv, } from "./initHook"; -import { execAsync, DisposableProcess } from "../utils/disposableExec"; -import { getProjectName } from "../utils/runtime/helpers"; -import { getErrorMessage } from "../utils/errors"; +import { execAsync, DisposableProcess } from "@/node/utils/disposableExec"; +import { getProjectName } from "@/node/utils/runtime/helpers"; +import { getErrorMessage } from "@/common/utils/errors"; import { expandTilde } from "./tildeExpansion"; /** diff --git a/src/runtime/Runtime.ts b/src/node/runtime/Runtime.ts similarity index 100% rename from src/runtime/Runtime.ts rename to src/node/runtime/Runtime.ts diff --git a/src/runtime/SSHRuntime.test.ts b/src/node/runtime/SSHRuntime.test.ts similarity index 100% rename from src/runtime/SSHRuntime.test.ts rename to src/node/runtime/SSHRuntime.test.ts diff --git a/src/runtime/SSHRuntime.ts b/src/node/runtime/SSHRuntime.ts similarity index 99% rename from src/runtime/SSHRuntime.ts rename to src/node/runtime/SSHRuntime.ts index dc770c98f..ea27d04cb 100644 --- a/src/runtime/SSHRuntime.ts +++ b/src/node/runtime/SSHRuntime.ts @@ -15,16 +15,16 @@ import type { InitLogger, } from "./Runtime"; import { RuntimeError as RuntimeErrorClass } from "./Runtime"; -import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "../constants/exitCodes"; -import { log } from "../services/log"; +import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "@/common/constants/exitCodes"; +import { log } from "@/node/services/log"; import { checkInitHookExists, createLineBufferedLoggers, getInitHookEnv } from "./initHook"; import { streamProcessToLogger } from "./streamProcess"; import { expandTildeForSSH, cdCommandForSSH } from "./tildeExpansion"; -import { getProjectName } from "../utils/runtime/helpers"; -import { getErrorMessage } from "../utils/errors"; -import { execAsync, DisposableProcess } from "../utils/disposableExec"; +import { getProjectName } from "@/node/utils/runtime/helpers"; +import { getErrorMessage } from "@/common/utils/errors"; +import { execAsync, DisposableProcess } from "@/node/utils/disposableExec"; import { getControlPath } from "./sshConnectionPool"; -import { getBashPath } from "../utils/main/bashPath"; +import { getBashPath } from "@/node/utils/main/bashPath"; /** * Shell-escape helper for remote bash. diff --git a/src/runtime/initHook.test.ts b/src/node/runtime/initHook.test.ts similarity index 100% rename from src/runtime/initHook.test.ts rename to src/node/runtime/initHook.test.ts diff --git a/src/runtime/initHook.ts b/src/node/runtime/initHook.ts similarity index 100% rename from src/runtime/initHook.ts rename to src/node/runtime/initHook.ts diff --git a/src/runtime/runtimeFactory.ts b/src/node/runtime/runtimeFactory.ts similarity index 92% rename from src/runtime/runtimeFactory.ts rename to src/node/runtime/runtimeFactory.ts index 33de00a37..86995490d 100644 --- a/src/runtime/runtimeFactory.ts +++ b/src/node/runtime/runtimeFactory.ts @@ -1,7 +1,7 @@ import type { Runtime } from "./Runtime"; import { LocalRuntime } from "./LocalRuntime"; import { SSHRuntime } from "./SSHRuntime"; -import type { RuntimeConfig } from "@/types/runtime"; +import type { RuntimeConfig } from "@/common/types/runtime"; /** * Create a Runtime instance based on the configuration diff --git a/src/runtime/sshConnectionPool.test.ts b/src/node/runtime/sshConnectionPool.test.ts similarity index 100% rename from src/runtime/sshConnectionPool.test.ts rename to src/node/runtime/sshConnectionPool.test.ts diff --git a/src/runtime/sshConnectionPool.ts b/src/node/runtime/sshConnectionPool.ts similarity index 100% rename from src/runtime/sshConnectionPool.ts rename to src/node/runtime/sshConnectionPool.ts diff --git a/src/runtime/streamProcess.ts b/src/node/runtime/streamProcess.ts similarity index 100% rename from src/runtime/streamProcess.ts rename to src/node/runtime/streamProcess.ts diff --git a/src/runtime/tildeExpansion.test.ts b/src/node/runtime/tildeExpansion.test.ts similarity index 100% rename from src/runtime/tildeExpansion.test.ts rename to src/node/runtime/tildeExpansion.test.ts diff --git a/src/runtime/tildeExpansion.ts b/src/node/runtime/tildeExpansion.ts similarity index 97% rename from src/runtime/tildeExpansion.ts rename to src/node/runtime/tildeExpansion.ts index 63c25b9b7..a65732a43 100644 --- a/src/runtime/tildeExpansion.ts +++ b/src/node/runtime/tildeExpansion.ts @@ -8,7 +8,7 @@ * For local paths, tildes should be expanded to actual file system paths. */ -import { PlatformPaths } from "../utils/paths.main"; +import { PlatformPaths } from "@/node/utils/paths.main"; /** * Expand tilde to actual home directory path for local file system operations. diff --git a/src/services/ExtensionMetadataService.ts b/src/node/services/ExtensionMetadataService.ts similarity index 99% rename from src/services/ExtensionMetadataService.ts rename to src/node/services/ExtensionMetadataService.ts index 63ca6dd59..e99098038 100644 --- a/src/services/ExtensionMetadataService.ts +++ b/src/node/services/ExtensionMetadataService.ts @@ -6,7 +6,7 @@ import { type ExtensionMetadata, type ExtensionMetadataFile, getExtensionMetadataPath, -} from "@/utils/extensionMetadata"; +} from "@/node/utils/extensionMetadata"; /** * Stateless service for managing workspace metadata used by VS Code extension integration. diff --git a/src/services/agentSession.ts b/src/node/services/agentSession.ts similarity index 93% rename from src/services/agentSession.ts rename to src/node/services/agentSession.ts index d394527f6..4384ec948 100644 --- a/src/services/agentSession.ts +++ b/src/node/services/agentSession.ts @@ -1,22 +1,26 @@ -import assert from "@/utils/assert"; +import assert from "@/common/utils/assert"; import { EventEmitter } from "events"; import * as path from "path"; -import { PlatformPaths } from "@/utils/paths"; -import { createMuxMessage } from "@/types/message"; -import type { Config } from "@/config"; -import type { AIService } from "@/services/aiService"; -import type { HistoryService } from "@/services/historyService"; -import type { PartialService } from "@/services/partialService"; -import type { InitStateManager } from "@/services/initStateManager"; -import type { WorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; -import type { WorkspaceChatMessage, StreamErrorMessage, SendMessageOptions } from "@/types/ipc"; -import type { SendMessageError } from "@/types/errors"; -import { createUnknownSendMessageError } from "@/services/utils/sendMessageError"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import { enforceThinkingPolicy } from "@/utils/thinking/policy"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { PlatformPaths } from "@/common/utils/paths"; +import { createMuxMessage } from "@/common/types/message"; +import type { Config } from "@/node/config"; +import type { AIService } from "@/node/services/aiService"; +import type { HistoryService } from "@/node/services/historyService"; +import type { PartialService } from "@/node/services/partialService"; +import type { InitStateManager } from "@/node/services/initStateManager"; +import type { WorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; +import type { + WorkspaceChatMessage, + StreamErrorMessage, + SendMessageOptions, +} from "@/common/types/ipc"; +import type { SendMessageError } from "@/common/types/errors"; +import { createUnknownSendMessageError } from "@/node/services/utils/sendMessageError"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import { enforceThinkingPolicy } from "@/browser/utils/thinking/policy"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; interface ImagePart { url: string; diff --git a/src/services/aiService.test.ts b/src/node/services/aiService.test.ts similarity index 96% rename from src/services/aiService.test.ts rename to src/node/services/aiService.test.ts index fab2bfb6a..a2736cff4 100644 --- a/src/services/aiService.test.ts +++ b/src/node/services/aiService.test.ts @@ -7,7 +7,7 @@ import { AIService } from "./aiService"; import { HistoryService } from "./historyService"; import { PartialService } from "./partialService"; import { InitStateManager } from "./initStateManager"; -import { Config } from "@/config"; +import { Config } from "@/node/config"; describe("AIService", () => { let service: AIService; diff --git a/src/services/aiService.ts b/src/node/services/aiService.ts similarity index 96% rename from src/services/aiService.ts rename to src/node/services/aiService.ts index 5fc5f845b..644f8142b 100644 --- a/src/services/aiService.ts +++ b/src/node/services/aiService.ts @@ -2,23 +2,23 @@ import * as fs from "fs/promises"; import * as os from "os"; import { EventEmitter } from "events"; import { convertToModelMessages, type LanguageModel } from "ai"; -import { applyToolOutputRedaction } from "@/utils/messages/applyToolOutputRedaction"; -import { sanitizeToolInputs } from "@/utils/messages/sanitizeToolInput"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import type { WorkspaceMetadata } from "@/types/workspace"; -import { PROVIDER_REGISTRY } from "@/constants/providers"; - -import type { MuxMessage, MuxTextPart } from "@/types/message"; -import { createMuxMessage } from "@/types/message"; -import type { Config, ProviderConfig } from "@/config"; +import { applyToolOutputRedaction } from "@/browser/utils/messages/applyToolOutputRedaction"; +import { sanitizeToolInputs } from "@/browser/utils/messages/sanitizeToolInput"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import type { WorkspaceMetadata } from "@/common/types/workspace"; +import { PROVIDER_REGISTRY } from "@/common/constants/providers"; + +import type { MuxMessage, MuxTextPart } from "@/common/types/message"; +import { createMuxMessage } from "@/common/types/message"; +import type { Config, ProviderConfig } from "@/node/config"; import { StreamManager } from "./streamManager"; import type { InitStateManager } from "./initStateManager"; -import type { SendMessageError } from "@/types/errors"; -import { getToolsForModel } from "@/utils/tools/tools"; -import { createRuntime } from "@/runtime/runtimeFactory"; -import { secretsToRecord } from "@/types/secrets"; -import type { MuxProviderOptions } from "@/types/providerOptions"; +import type { SendMessageError } from "@/common/types/errors"; +import { getToolsForModel } from "@/common/utils/tools/tools"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; +import { secretsToRecord } from "@/common/types/secrets"; +import type { MuxProviderOptions } from "@/common/types/providerOptions"; import { log } from "./log"; import { transformModelMessages, @@ -26,21 +26,21 @@ import { addInterruptedSentinel, filterEmptyAssistantMessages, injectModeTransition, -} from "@/utils/messages/modelMessageTransform"; -import { applyCacheControl } from "@/utils/ai/cacheStrategy"; +} from "@/browser/utils/messages/modelMessageTransform"; +import { applyCacheControl } from "@/common/utils/ai/cacheStrategy"; import type { HistoryService } from "./historyService"; import type { PartialService } from "./partialService"; import { buildSystemMessage } from "./systemMessage"; -import { getTokenizerForModel } from "@/utils/main/tokenizer"; -import { buildProviderOptions } from "@/utils/ai/providerOptions"; -import type { ThinkingLevel } from "@/types/thinking"; +import { getTokenizerForModel } from "@/node/utils/main/tokenizer"; +import { buildProviderOptions } from "@/common/utils/ai/providerOptions"; +import type { ThinkingLevel } from "@/common/types/thinking"; import type { StreamAbortEvent, StreamDeltaEvent, StreamEndEvent, StreamStartEvent, -} from "@/types/stream"; -import { applyToolPolicy, type ToolPolicy } from "@/utils/tools/toolPolicy"; +} from "@/common/types/stream"; +import { applyToolPolicy, type ToolPolicy } from "@/common/utils/tools/toolPolicy"; import { MockScenarioPlayer } from "./mock/mockScenarioPlayer"; import { Agent } from "undici"; diff --git a/src/services/bashExecutionService.ts b/src/node/services/bashExecutionService.ts similarity index 99% rename from src/services/bashExecutionService.ts rename to src/node/services/bashExecutionService.ts index a03ea130d..9f46c455c 100644 --- a/src/services/bashExecutionService.ts +++ b/src/node/services/bashExecutionService.ts @@ -1,7 +1,7 @@ import { spawn } from "child_process"; import type { ChildProcess } from "child_process"; import { log } from "./log"; -import { getBashPath } from "../utils/main/bashPath"; +import { getBashPath } from "@/node/utils/main/bashPath"; /** * Configuration for bash execution diff --git a/src/services/historyService.test.ts b/src/node/services/historyService.test.ts similarity index 99% rename from src/services/historyService.test.ts rename to src/node/services/historyService.test.ts index 50585df80..71540a161 100644 --- a/src/services/historyService.test.ts +++ b/src/node/services/historyService.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, beforeEach, afterEach } from "bun:test"; import { HistoryService } from "./historyService"; -import { Config } from "@/config"; -import { createMuxMessage } from "@/types/message"; +import { Config } from "@/node/config"; +import { createMuxMessage } from "@/common/types/message"; import * as fs from "fs/promises"; import * as path from "path"; import * as os from "os"; diff --git a/src/services/historyService.ts b/src/node/services/historyService.ts similarity index 97% rename from src/services/historyService.ts rename to src/node/services/historyService.ts index 4a310a0f5..1f3b51722 100644 --- a/src/services/historyService.ts +++ b/src/node/services/historyService.ts @@ -1,13 +1,13 @@ import * as fs from "fs/promises"; import * as path from "path"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import type { MuxMessage } from "@/types/message"; -import type { Config } from "@/config"; -import { workspaceFileLocks } from "@/utils/concurrency/workspaceFileLocks"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import type { MuxMessage } from "@/common/types/message"; +import type { Config } from "@/node/config"; +import { workspaceFileLocks } from "@/node/utils/concurrency/workspaceFileLocks"; import { log } from "./log"; -import { getTokenizerForModel } from "@/utils/main/tokenizer"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { getTokenizerForModel } from "@/node/utils/main/tokenizer"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; /** * HistoryService - Manages chat history persistence and sequence numbering diff --git a/src/services/initStateManager.test.ts b/src/node/services/initStateManager.test.ts similarity index 99% rename from src/services/initStateManager.test.ts rename to src/node/services/initStateManager.test.ts index d5cb9721c..5c84097c9 100644 --- a/src/services/initStateManager.test.ts +++ b/src/node/services/initStateManager.test.ts @@ -2,9 +2,9 @@ import * as fs from "fs/promises"; import * as path from "path"; import * as os from "os"; import { describe, it, expect, beforeEach, afterEach } from "bun:test"; -import { Config } from "@/config"; +import { Config } from "@/node/config"; import { InitStateManager } from "./initStateManager"; -import type { WorkspaceInitEvent } from "@/types/ipc"; +import type { WorkspaceInitEvent } from "@/common/types/ipc"; describe("InitStateManager", () => { let tempDir: string; diff --git a/src/services/initStateManager.ts b/src/node/services/initStateManager.ts similarity index 98% rename from src/services/initStateManager.ts rename to src/node/services/initStateManager.ts index 3d90082f7..336521a84 100644 --- a/src/services/initStateManager.ts +++ b/src/node/services/initStateManager.ts @@ -1,8 +1,8 @@ import { EventEmitter } from "events"; -import type { Config } from "@/config"; -import { EventStore } from "@/utils/eventStore"; -import type { WorkspaceInitEvent } from "@/types/ipc"; -import { log } from "@/services/log"; +import type { Config } from "@/node/config"; +import { EventStore } from "@/node/utils/eventStore"; +import type { WorkspaceInitEvent } from "@/common/types/ipc"; +import { log } from "@/node/services/log"; /** * Output line with timestamp for replay timing. diff --git a/src/services/ipcMain.ts b/src/node/services/ipcMain.ts similarity index 97% rename from src/services/ipcMain.ts rename to src/node/services/ipcMain.ts index 6c25321ec..1a50f7b51 100644 --- a/src/services/ipcMain.ts +++ b/src/node/services/ipcMain.ts @@ -1,39 +1,39 @@ -import assert from "@/utils/assert"; +import assert from "@/common/utils/assert"; import type { IpcMain as ElectronIpcMain, BrowserWindow } from "electron"; import { spawn, spawnSync } from "child_process"; import * as fsPromises from "fs/promises"; import * as path from "path"; -import type { Config, ProjectConfig } from "@/config"; -import { listLocalBranches, detectDefaultTrunkBranch } from "@/git"; -import { AIService } from "@/services/aiService"; -import { HistoryService } from "@/services/historyService"; -import { PartialService } from "@/services/partialService"; -import { AgentSession } from "@/services/agentSession"; -import type { MuxMessage } from "@/types/message"; -import { log } from "@/services/log"; -import { countTokens, countTokensBatch } from "@/utils/main/tokenizer"; -import { calculateTokenStats } from "@/utils/tokens/tokenStatsCalculator"; -import { IPC_CHANNELS, getChatChannel } from "@/constants/ipc-constants"; -import { SUPPORTED_PROVIDERS } from "@/constants/providers"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; -import type { SendMessageError } from "@/types/errors"; -import type { SendMessageOptions, DeleteMessage } from "@/types/ipc"; -import { Ok, Err } from "@/types/result"; -import { validateWorkspaceName } from "@/utils/validation/workspaceValidation"; -import type { WorkspaceMetadata, FrontendWorkspaceMetadata } from "@/types/workspace"; -import { createBashTool } from "@/services/tools/bash"; -import type { BashToolResult } from "@/types/tools"; -import { secretsToRecord } from "@/types/secrets"; -import { DisposableTempDir } from "@/services/tempDir"; -import { InitStateManager } from "@/services/initStateManager"; -import { createRuntime } from "@/runtime/runtimeFactory"; -import type { RuntimeConfig } from "@/types/runtime"; -import { isSSHRuntime } from "@/types/runtime"; -import { validateProjectPath } from "@/utils/pathUtils"; -import { PTYService } from "@/services/ptyService"; -import type { TerminalWindowManager } from "@/services/terminalWindowManager"; -import type { TerminalCreateParams, TerminalResizeParams } from "@/types/terminal"; -import { ExtensionMetadataService } from "@/services/ExtensionMetadataService"; +import type { Config, ProjectConfig } from "@/node/config"; +import { listLocalBranches, detectDefaultTrunkBranch } from "@/node/git"; +import { AIService } from "@/node/services/aiService"; +import { HistoryService } from "@/node/services/historyService"; +import { PartialService } from "@/node/services/partialService"; +import { AgentSession } from "@/node/services/agentSession"; +import type { MuxMessage } from "@/common/types/message"; +import { log } from "@/node/services/log"; +import { countTokens, countTokensBatch } from "@/node/utils/main/tokenizer"; +import { calculateTokenStats } from "@/common/utils/tokens/tokenStatsCalculator"; +import { IPC_CHANNELS, getChatChannel } from "@/common/constants/ipc-constants"; +import { SUPPORTED_PROVIDERS } from "@/common/constants/providers"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; +import type { SendMessageError } from "@/common/types/errors"; +import type { SendMessageOptions, DeleteMessage } from "@/common/types/ipc"; +import { Ok, Err } from "@/common/types/result"; +import { validateWorkspaceName } from "@/common/utils/validation/workspaceValidation"; +import type { WorkspaceMetadata, FrontendWorkspaceMetadata } from "@/common/types/workspace"; +import { createBashTool } from "@/node/services/tools/bash"; +import type { BashToolResult } from "@/common/types/tools"; +import { secretsToRecord } from "@/common/types/secrets"; +import { DisposableTempDir } from "@/node/services/tempDir"; +import { InitStateManager } from "@/node/services/initStateManager"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; +import type { RuntimeConfig } from "@/common/types/runtime"; +import { isSSHRuntime } from "@/common/types/runtime"; +import { validateProjectPath } from "@/node/utils/pathUtils"; +import { PTYService } from "@/node/services/ptyService"; +import type { TerminalWindowManager } from "@/desktop/terminalWindowManager"; +import type { TerminalCreateParams, TerminalResizeParams } from "@/common/types/terminal"; +import { ExtensionMetadataService } from "@/node/services/ExtensionMetadataService"; import { generateWorkspaceName } from "./workspaceTitleGenerator"; /** * IpcMain - Manages all IPC handlers and service coordination diff --git a/src/services/log.ts b/src/node/services/log.ts similarity index 98% rename from src/services/log.ts rename to src/node/services/log.ts index dceb506fe..ee625e898 100644 --- a/src/services/log.ts +++ b/src/node/services/log.ts @@ -11,8 +11,8 @@ import * as fs from "fs"; import * as path from "path"; import chalk from "chalk"; -import { defaultConfig } from "@/config"; -import { parseBoolEnv } from "@/utils/env"; +import { defaultConfig } from "@/node/config"; +import { parseBoolEnv } from "@/common/utils/env"; const DEBUG_OBJ_DIR = path.join(defaultConfig.rootDir, "debug_obj"); diff --git a/src/services/mock/mockScenarioPlayer.test.ts b/src/node/services/mock/mockScenarioPlayer.test.ts similarity index 91% rename from src/services/mock/mockScenarioPlayer.test.ts rename to src/node/services/mock/mockScenarioPlayer.test.ts index d974da322..29f0a3782 100644 --- a/src/services/mock/mockScenarioPlayer.test.ts +++ b/src/node/services/mock/mockScenarioPlayer.test.ts @@ -1,11 +1,11 @@ import { describe, expect, test } from "bun:test"; import { EventEmitter } from "events"; import { MockScenarioPlayer } from "./mockScenarioPlayer"; -import { createMuxMessage, type MuxMessage } from "@/types/message"; +import { createMuxMessage, type MuxMessage } from "@/common/types/message"; import { allScenarios } from "./scenarios"; -import { Ok } from "@/types/result"; -import type { HistoryService } from "@/services/historyService"; -import type { AIService } from "@/services/aiService"; +import { Ok } from "@/common/types/result"; +import type { HistoryService } from "@/node/services/historyService"; +import type { AIService } from "@/node/services/aiService"; class InMemoryHistoryService { public appended: Array<{ workspaceId: string; message: MuxMessage }> = []; diff --git a/src/services/mock/mockScenarioPlayer.ts b/src/node/services/mock/mockScenarioPlayer.ts similarity index 94% rename from src/services/mock/mockScenarioPlayer.ts rename to src/node/services/mock/mockScenarioPlayer.ts index 9aac0f071..9230d15f9 100644 --- a/src/services/mock/mockScenarioPlayer.ts +++ b/src/node/services/mock/mockScenarioPlayer.ts @@ -1,12 +1,12 @@ -import assert from "@/utils/assert"; -import type { MuxMessage } from "@/types/message"; -import { createMuxMessage } from "@/types/message"; -import type { HistoryService } from "@/services/historyService"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import type { SendMessageError } from "@/types/errors"; -import type { AIService } from "@/services/aiService"; -import { log } from "@/services/log"; +import assert from "@/common/utils/assert"; +import type { MuxMessage } from "@/common/types/message"; +import { createMuxMessage } from "@/common/types/message"; +import type { HistoryService } from "@/node/services/historyService"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import type { SendMessageError } from "@/common/types/errors"; +import type { AIService } from "@/node/services/aiService"; +import { log } from "@/node/services/log"; import type { MockAssistantEvent, MockStreamErrorEvent, @@ -14,11 +14,11 @@ import type { ScenarioTurn, } from "./scenarioTypes"; import { allScenarios } from "./scenarios"; -import type { StreamStartEvent, StreamDeltaEvent, StreamEndEvent } from "@/types/stream"; -import type { ToolCallStartEvent, ToolCallEndEvent } from "@/types/stream"; -import type { ReasoningDeltaEvent } from "@/types/stream"; -import { getTokenizerForModel } from "@/utils/main/tokenizer"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import type { StreamStartEvent, StreamDeltaEvent, StreamEndEvent } from "@/common/types/stream"; +import type { ToolCallStartEvent, ToolCallEndEvent } from "@/common/types/stream"; +import type { ReasoningDeltaEvent } from "@/common/types/stream"; +import { getTokenizerForModel } from "@/node/utils/main/tokenizer"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; const MOCK_TOKENIZER_MODEL = KNOWN_MODELS.GPT.id; const TOKENIZE_TIMEOUT_MS = 150; diff --git a/src/services/mock/scenarioTypes.ts b/src/node/services/mock/scenarioTypes.ts similarity index 90% rename from src/services/mock/scenarioTypes.ts rename to src/node/services/mock/scenarioTypes.ts index cf06a3da4..112fa79e9 100644 --- a/src/services/mock/scenarioTypes.ts +++ b/src/node/services/mock/scenarioTypes.ts @@ -1,6 +1,6 @@ -import type { CompletedMessagePart } from "@/types/stream"; -import type { StreamErrorType } from "@/types/errors"; -import type { ThinkingLevel } from "@/types/thinking"; +import type { CompletedMessagePart } from "@/common/types/stream"; +import type { StreamErrorType } from "@/common/types/errors"; +import type { ThinkingLevel } from "@/common/types/thinking"; export type MockEventKind = | "stream-start" diff --git a/src/services/mock/scenarios.ts b/src/node/services/mock/scenarios.ts similarity index 100% rename from src/services/mock/scenarios.ts rename to src/node/services/mock/scenarios.ts diff --git a/src/services/mock/scenarios/basicChat.ts b/src/node/services/mock/scenarios/basicChat.ts similarity index 87% rename from src/services/mock/scenarios/basicChat.ts rename to src/node/services/mock/scenarios/basicChat.ts index f401269f4..c3f13a7f2 100644 --- a/src/services/mock/scenarios/basicChat.ts +++ b/src/node/services/mock/scenarios/basicChat.ts @@ -1,6 +1,6 @@ -import type { ScenarioTurn } from "../scenarioTypes"; -import { STREAM_BASE_DELAY } from "../scenarioTypes"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import type { ScenarioTurn } from "@/node/services/mock/scenarioTypes"; +import { STREAM_BASE_DELAY } from "@/node/services/mock/scenarioTypes"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; export const LIST_PROGRAMMING_LANGUAGES = "List 3 programming languages"; diff --git a/src/services/mock/scenarios/permissionModes.ts b/src/node/services/mock/scenarios/permissionModes.ts similarity index 95% rename from src/services/mock/scenarios/permissionModes.ts rename to src/node/services/mock/scenarios/permissionModes.ts index dc35cb9f1..a5832e50c 100644 --- a/src/services/mock/scenarios/permissionModes.ts +++ b/src/node/services/mock/scenarios/permissionModes.ts @@ -1,6 +1,6 @@ -import type { ScenarioTurn } from "../scenarioTypes"; -import { KNOWN_MODELS } from "@/constants/knownModels"; -import { STREAM_BASE_DELAY } from "../scenarioTypes"; +import type { ScenarioTurn } from "@/node/services/mock/scenarioTypes"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; +import { STREAM_BASE_DELAY } from "@/node/services/mock/scenarioTypes"; export const PERMISSION_MODE_PROMPTS = { PLAN_REFACTOR: "How should I refactor this function?", diff --git a/src/services/mock/scenarios/review.ts b/src/node/services/mock/scenarios/review.ts similarity index 96% rename from src/services/mock/scenarios/review.ts rename to src/node/services/mock/scenarios/review.ts index a33c6dc52..4f88195dc 100644 --- a/src/services/mock/scenarios/review.ts +++ b/src/node/services/mock/scenarios/review.ts @@ -1,6 +1,6 @@ -import type { ScenarioTurn } from "../scenarioTypes"; -import { KNOWN_MODELS } from "@/constants/knownModels"; -import { STREAM_BASE_DELAY } from "../scenarioTypes"; +import type { ScenarioTurn } from "@/node/services/mock/scenarioTypes"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; +import { STREAM_BASE_DELAY } from "@/node/services/mock/scenarioTypes"; export const REVIEW_PROMPTS = { SUMMARIZE_BRANCHES: "Let's summarize the current branches.", diff --git a/src/services/mock/scenarios/slashCommands.ts b/src/node/services/mock/scenarios/slashCommands.ts similarity index 92% rename from src/services/mock/scenarios/slashCommands.ts rename to src/node/services/mock/scenarios/slashCommands.ts index 627be57a4..922abbd96 100644 --- a/src/services/mock/scenarios/slashCommands.ts +++ b/src/node/services/mock/scenarios/slashCommands.ts @@ -1,6 +1,6 @@ -import type { ScenarioTurn } from "../scenarioTypes"; -import { KNOWN_MODELS } from "@/constants/knownModels"; -import { STREAM_BASE_DELAY } from "../scenarioTypes"; +import type { ScenarioTurn } from "@/node/services/mock/scenarioTypes"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; +import { STREAM_BASE_DELAY } from "@/node/services/mock/scenarioTypes"; export const SLASH_COMMAND_PROMPTS = { MODEL_STATUS: "Please confirm which model is currently active for this conversation.", diff --git a/src/services/mock/scenarios/toolFlows.ts b/src/node/services/mock/scenarios/toolFlows.ts similarity index 98% rename from src/services/mock/scenarios/toolFlows.ts rename to src/node/services/mock/scenarios/toolFlows.ts index 937162784..905605395 100644 --- a/src/services/mock/scenarios/toolFlows.ts +++ b/src/node/services/mock/scenarios/toolFlows.ts @@ -1,6 +1,6 @@ -import type { ScenarioTurn } from "../scenarioTypes"; -import { KNOWN_MODELS } from "@/constants/knownModels"; -import { STREAM_BASE_DELAY } from "../scenarioTypes"; +import type { ScenarioTurn } from "@/node/services/mock/scenarioTypes"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; +import { STREAM_BASE_DELAY } from "@/node/services/mock/scenarioTypes"; export const TOOL_FLOW_PROMPTS = { FILE_READ: "What's in README.md?", diff --git a/src/services/partialService.test.ts b/src/node/services/partialService.test.ts similarity index 97% rename from src/services/partialService.test.ts rename to src/node/services/partialService.test.ts index 5370c9566..d1c5b84d2 100644 --- a/src/services/partialService.test.ts +++ b/src/node/services/partialService.test.ts @@ -2,9 +2,9 @@ import { describe, test, expect, beforeEach, mock } from "bun:test"; import { PartialService } from "./partialService"; import type { HistoryService } from "./historyService"; -import type { Config } from "@/config"; -import type { MuxMessage } from "@/types/message"; -import { Ok } from "@/types/result"; +import type { Config } from "@/node/config"; +import type { MuxMessage } from "@/common/types/message"; +import { Ok } from "@/common/types/result"; // Mock Config const createMockConfig = (): Config => { diff --git a/src/services/partialService.ts b/src/node/services/partialService.ts similarity index 95% rename from src/services/partialService.ts rename to src/node/services/partialService.ts index afb110029..6962641e9 100644 --- a/src/services/partialService.ts +++ b/src/node/services/partialService.ts @@ -1,11 +1,11 @@ import * as fs from "fs/promises"; import * as path from "path"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import type { MuxMessage } from "@/types/message"; -import type { Config } from "@/config"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import type { MuxMessage } from "@/common/types/message"; +import type { Config } from "@/node/config"; import type { HistoryService } from "./historyService"; -import { workspaceFileLocks } from "@/utils/concurrency/workspaceFileLocks"; +import { workspaceFileLocks } from "@/node/utils/concurrency/workspaceFileLocks"; /** * PartialService - Manages partial message persistence for interrupted streams diff --git a/src/services/ptyService.ts b/src/node/services/ptyService.ts similarity index 95% rename from src/services/ptyService.ts rename to src/node/services/ptyService.ts index bc5273ba8..2c1994cce 100644 --- a/src/services/ptyService.ts +++ b/src/node/services/ptyService.ts @@ -5,16 +5,20 @@ * Uses callbacks for output/exit events to avoid circular dependencies. */ -import { log } from "@/services/log"; -import type { Runtime } from "@/runtime/Runtime"; -import type { TerminalSession, TerminalCreateParams, TerminalResizeParams } from "@/types/terminal"; -import type { IPty } from "@homebridge/node-pty-prebuilt-multiarch"; -import { SSHRuntime, type SSHRuntimeConfig } from "@/runtime/SSHRuntime"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; +import { log } from "@/node/services/log"; +import type { Runtime } from "@/node/runtime/Runtime"; +import type { + TerminalSession, + TerminalCreateParams, + TerminalResizeParams, +} from "@/common/types/terminal"; +import type { IPty } from "node-pty"; +import { SSHRuntime, type SSHRuntimeConfig } from "@/node/runtime/SSHRuntime"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; import { access } from "fs/promises"; import { constants } from "fs"; -import { getControlPath } from "@/runtime/sshConnectionPool"; -import { expandTildeForSSH } from "@/runtime/tildeExpansion"; +import { getControlPath } from "@/node/runtime/sshConnectionPool"; +import { expandTildeForSSH } from "@/node/runtime/tildeExpansion"; interface SessionData { pty: IPty; // Used for both local and SSH sessions diff --git a/src/services/streamManager.test.ts b/src/node/services/streamManager.test.ts similarity index 99% rename from src/services/streamManager.test.ts rename to src/node/services/streamManager.test.ts index 38bd978f4..2a23ed0ae 100644 --- a/src/services/streamManager.test.ts +++ b/src/node/services/streamManager.test.ts @@ -1,12 +1,12 @@ import { describe, test, expect, beforeEach, mock } from "bun:test"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; import { StreamManager } from "./streamManager"; import { APICallError } from "ai"; import type { HistoryService } from "./historyService"; import type { PartialService } from "./partialService"; import { createAnthropic } from "@ai-sdk/anthropic"; -import { shouldRunIntegrationTests, validateApiKeys } from "../../tests/testUtils"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { shouldRunIntegrationTests, validateApiKeys } from "../../../tests/testUtils"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; // Skip integration tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/src/services/streamManager.ts b/src/node/services/streamManager.ts similarity index 98% rename from src/services/streamManager.ts rename to src/node/services/streamManager.ts index 58538d7dc..5b59f56eb 100644 --- a/src/services/streamManager.ts +++ b/src/node/services/streamManager.ts @@ -1,6 +1,6 @@ import { EventEmitter } from "events"; import * as path from "path"; -import { PlatformPaths } from "@/utils/paths"; +import { PlatformPaths } from "@/common/utils/paths"; import { streamText, stepCountIs, @@ -12,8 +12,8 @@ import { RetryError, } from "ai"; import type { LanguageModelV2Usage } from "@ai-sdk/provider"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; import { log } from "./log"; import type { StreamStartEvent, @@ -21,17 +21,17 @@ import type { ErrorEvent, ToolCallEndEvent, CompletedMessagePart, -} from "@/types/stream"; +} from "@/common/types/stream"; -import type { SendMessageError, StreamErrorType } from "@/types/errors"; -import type { MuxMetadata, MuxMessage } from "@/types/message"; +import type { SendMessageError, StreamErrorType } from "@/common/types/errors"; +import type { MuxMetadata, MuxMessage } from "@/common/types/message"; import type { PartialService } from "./partialService"; import type { HistoryService } from "./historyService"; -import { AsyncMutex } from "@/utils/concurrency/asyncMutex"; -import type { ToolPolicy } from "@/utils/tools/toolPolicy"; -import { StreamingTokenTracker } from "@/utils/main/StreamingTokenTracker"; -import type { Runtime } from "@/runtime/Runtime"; -import { execBuffered } from "@/utils/runtime/helpers"; +import { AsyncMutex } from "@/node/utils/concurrency/asyncMutex"; +import type { ToolPolicy } from "@/common/utils/tools/toolPolicy"; +import { StreamingTokenTracker } from "@/node/utils/main/StreamingTokenTracker"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { execBuffered } from "@/node/utils/runtime/helpers"; // Type definitions for stream parts with extended properties interface ReasoningDeltaPart { diff --git a/src/services/systemMessage.test.ts b/src/node/services/systemMessage.test.ts similarity index 96% rename from src/services/systemMessage.test.ts rename to src/node/services/systemMessage.test.ts index 34f12e754..b6eb051e1 100644 --- a/src/services/systemMessage.test.ts +++ b/src/node/services/systemMessage.test.ts @@ -2,10 +2,10 @@ import * as fs from "fs/promises"; import * as os from "os"; import * as path from "path"; import { buildSystemMessage } from "./systemMessage"; -import type { WorkspaceMetadata } from "@/types/workspace"; -import { DEFAULT_RUNTIME_CONFIG } from "@/constants/workspace"; +import type { WorkspaceMetadata } from "@/common/types/workspace"; +import { DEFAULT_RUNTIME_CONFIG } from "@/common/constants/workspace"; import { describe, test, expect, beforeEach, afterEach, spyOn, type Mock } from "bun:test"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; describe("buildSystemMessage", () => { let tempDir: string; diff --git a/src/services/systemMessage.ts b/src/node/services/systemMessage.ts similarity index 92% rename from src/services/systemMessage.ts rename to src/node/services/systemMessage.ts index edea14668..fbf35a60f 100644 --- a/src/services/systemMessage.ts +++ b/src/node/services/systemMessage.ts @@ -1,8 +1,11 @@ -import type { WorkspaceMetadata } from "@/types/workspace"; -import { readInstructionSet, readInstructionSetFromRuntime } from "@/utils/main/instructionFiles"; -import { extractModeSection } from "@/utils/main/markdown"; -import type { Runtime } from "@/runtime/Runtime"; -import { getMuxHome } from "@/constants/paths"; +import type { WorkspaceMetadata } from "@/common/types/workspace"; +import { + readInstructionSet, + readInstructionSetFromRuntime, +} from "@/node/utils/main/instructionFiles"; +import { extractModeSection } from "@/node/utils/main/markdown"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { getMuxHome } from "@/common/constants/paths"; // NOTE: keep this in sync with the docs/models.md file diff --git a/src/services/tempDir.ts b/src/node/services/tempDir.ts similarity index 100% rename from src/services/tempDir.ts rename to src/node/services/tempDir.ts diff --git a/src/services/tools/bash.test.ts b/src/node/services/tools/bash.test.ts similarity index 99% rename from src/services/tools/bash.test.ts rename to src/node/services/tools/bash.test.ts index d5ebf29e3..b2c95103f 100644 --- a/src/services/tools/bash.test.ts +++ b/src/node/services/tools/bash.test.ts @@ -1,11 +1,11 @@ import { describe, it, expect } from "bun:test"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; import { createBashTool } from "./bash"; -import type { BashToolArgs, BashToolResult } from "@/types/tools"; -import { BASH_MAX_TOTAL_BYTES } from "@/constants/toolLimits"; +import type { BashToolArgs, BashToolResult } from "@/common/types/tools"; +import { BASH_MAX_TOTAL_BYTES } from "@/common/constants/toolLimits"; import * as fs from "fs"; import { TestTempDir, createTestToolConfig, getTestDeps } from "./testHelpers"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; import type { ToolCallOptions } from "ai"; // Mock ToolCallOptions for testing diff --git a/src/services/tools/bash.ts b/src/node/services/tools/bash.ts similarity index 97% rename from src/services/tools/bash.ts rename to src/node/services/tools/bash.ts index 8dc7ee56a..96b53532c 100644 --- a/src/services/tools/bash.ts +++ b/src/node/services/tools/bash.ts @@ -9,12 +9,12 @@ import { BASH_MAX_FILE_BYTES, BASH_TRUNCATE_MAX_TOTAL_BYTES, BASH_TRUNCATE_MAX_FILE_BYTES, -} from "@/constants/toolLimits"; -import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "@/constants/exitCodes"; +} from "@/common/constants/toolLimits"; +import { EXIT_CODE_ABORTED, EXIT_CODE_TIMEOUT } from "@/common/constants/exitCodes"; -import type { BashToolResult } from "@/types/tools"; -import type { ToolConfiguration, ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { BashToolResult } from "@/common/types/tools"; +import type { ToolConfiguration, ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; /** * Validates bash script input for common issues diff --git a/src/services/tools/fileCommon.test.ts b/src/node/services/tools/fileCommon.test.ts similarity index 98% rename from src/services/tools/fileCommon.test.ts rename to src/node/services/tools/fileCommon.test.ts index a1bf20478..4c9dd9dfe 100644 --- a/src/services/tools/fileCommon.test.ts +++ b/src/node/services/tools/fileCommon.test.ts @@ -1,12 +1,12 @@ import { describe, it, expect } from "bun:test"; -import type { FileStat } from "@/runtime/Runtime"; +import type { FileStat } from "@/node/runtime/Runtime"; import { validatePathInCwd, validateFileSize, validateNoRedundantPrefix, MAX_FILE_SIZE, } from "./fileCommon"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; describe("fileCommon", () => { describe("validateFileSize", () => { diff --git a/src/services/tools/fileCommon.ts b/src/node/services/tools/fileCommon.ts similarity index 98% rename from src/services/tools/fileCommon.ts rename to src/node/services/tools/fileCommon.ts index c3d8582ca..3c5c95fb8 100644 --- a/src/services/tools/fileCommon.ts +++ b/src/node/services/tools/fileCommon.ts @@ -1,7 +1,7 @@ import * as path from "path"; import { createPatch } from "diff"; -import type { FileStat, Runtime } from "@/runtime/Runtime"; -import { SSHRuntime } from "@/runtime/SSHRuntime"; +import type { FileStat, Runtime } from "@/node/runtime/Runtime"; +import { SSHRuntime } from "@/node/runtime/SSHRuntime"; /** * Maximum file size for file operations (1MB) diff --git a/src/services/tools/file_edit_insert.test.ts b/src/node/services/tools/file_edit_insert.test.ts similarity index 97% rename from src/services/tools/file_edit_insert.test.ts rename to src/node/services/tools/file_edit_insert.test.ts index b3fad60a8..aeb64911f 100644 --- a/src/services/tools/file_edit_insert.test.ts +++ b/src/node/services/tools/file_edit_insert.test.ts @@ -3,9 +3,9 @@ import * as fs from "fs/promises"; import * as path from "path"; import * as os from "os"; import { createFileEditInsertTool } from "./file_edit_insert"; -import type { FileEditInsertToolArgs, FileEditInsertToolResult } from "@/types/tools"; +import type { FileEditInsertToolArgs, FileEditInsertToolResult } from "@/common/types/tools"; import type { ToolCallOptions } from "ai"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; import { getTestDeps } from "./testHelpers"; const mockToolCallOptions: ToolCallOptions = { diff --git a/src/services/tools/file_edit_insert.ts b/src/node/services/tools/file_edit_insert.ts similarity index 93% rename from src/services/tools/file_edit_insert.ts rename to src/node/services/tools/file_edit_insert.ts index 6f0c49d1e..267b6d00c 100644 --- a/src/services/tools/file_edit_insert.ts +++ b/src/node/services/tools/file_edit_insert.ts @@ -1,13 +1,13 @@ import { tool } from "ai"; -import type { FileEditInsertToolArgs, FileEditInsertToolResult } from "@/types/tools"; -import { EDIT_FAILED_NOTE_PREFIX, NOTE_READ_FILE_RETRY } from "@/types/tools"; -import type { ToolConfiguration, ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { FileEditInsertToolArgs, FileEditInsertToolResult } from "@/common/types/tools"; +import { EDIT_FAILED_NOTE_PREFIX, NOTE_READ_FILE_RETRY } from "@/common/types/tools"; +import type { ToolConfiguration, ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; import { generateDiff, validateAndCorrectPath, validatePathInCwd } from "./fileCommon"; import { executeFileEditOperation } from "./file_edit_operation"; -import { fileExists } from "@/utils/runtime/fileExists"; -import { writeFileString } from "@/utils/runtime/helpers"; -import { RuntimeError } from "@/runtime/Runtime"; +import { fileExists } from "@/node/utils/runtime/fileExists"; +import { writeFileString } from "@/node/utils/runtime/helpers"; +import { RuntimeError } from "@/node/runtime/Runtime"; const READ_AND_RETRY_NOTE = `${EDIT_FAILED_NOTE_PREFIX} ${NOTE_READ_FILE_RETRY}`; diff --git a/src/services/tools/file_edit_operation.test.ts b/src/node/services/tools/file_edit_operation.test.ts similarity index 98% rename from src/services/tools/file_edit_operation.test.ts rename to src/node/services/tools/file_edit_operation.test.ts index 3bc198dcf..de13e93a2 100644 --- a/src/services/tools/file_edit_operation.test.ts +++ b/src/node/services/tools/file_edit_operation.test.ts @@ -1,6 +1,6 @@ import { describe, test, expect, jest } from "@jest/globals"; import { executeFileEditOperation } from "./file_edit_operation"; -import type { Runtime } from "@/runtime/Runtime"; +import type { Runtime } from "@/node/runtime/Runtime"; import { createTestToolConfig, getTestDeps } from "./testHelpers"; diff --git a/src/services/tools/file_edit_operation.ts b/src/node/services/tools/file_edit_operation.ts similarity index 94% rename from src/services/tools/file_edit_operation.ts rename to src/node/services/tools/file_edit_operation.ts index 7f085e2b3..ccf5bf20d 100644 --- a/src/services/tools/file_edit_operation.ts +++ b/src/node/services/tools/file_edit_operation.ts @@ -1,13 +1,13 @@ -import type { FileEditDiffSuccessBase, FileEditErrorResult } from "@/types/tools"; -import type { ToolConfiguration } from "@/utils/tools/tools"; +import type { FileEditDiffSuccessBase, FileEditErrorResult } from "@/common/types/tools"; +import type { ToolConfiguration } from "@/common/utils/tools/tools"; import { generateDiff, validateFileSize, validatePathInCwd, validateAndCorrectPath, } from "./fileCommon"; -import { RuntimeError } from "@/runtime/Runtime"; -import { readFileString, writeFileString } from "@/utils/runtime/helpers"; +import { RuntimeError } from "@/node/runtime/Runtime"; +import { readFileString, writeFileString } from "@/node/utils/runtime/helpers"; type FileEditOperationResult = | { diff --git a/src/services/tools/file_edit_replace.test.ts b/src/node/services/tools/file_edit_replace.test.ts similarity index 97% rename from src/services/tools/file_edit_replace.test.ts rename to src/node/services/tools/file_edit_replace.test.ts index 87b64e3df..b9b85c608 100644 --- a/src/services/tools/file_edit_replace.test.ts +++ b/src/node/services/tools/file_edit_replace.test.ts @@ -9,9 +9,9 @@ import type { FileEditReplaceStringToolResult, FileEditReplaceLinesToolArgs, FileEditReplaceLinesToolResult, -} from "@/types/tools"; +} from "@/common/types/tools"; import type { ToolCallOptions } from "ai"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; import { getTestDeps } from "./testHelpers"; // Mock ToolCallOptions for testing diff --git a/src/services/tools/file_edit_replace_lines.ts b/src/node/services/tools/file_edit_replace_lines.ts similarity index 91% rename from src/services/tools/file_edit_replace_lines.ts rename to src/node/services/tools/file_edit_replace_lines.ts index 13b641e87..891c14b5f 100644 --- a/src/services/tools/file_edit_replace_lines.ts +++ b/src/node/services/tools/file_edit_replace_lines.ts @@ -1,6 +1,6 @@ import { tool } from "ai"; -import type { ToolConfiguration, ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { ToolConfiguration, ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; import { executeFileEditOperation } from "./file_edit_operation"; import { handleLineReplace, type LineReplaceArgs } from "./file_edit_replace_shared"; diff --git a/src/services/tools/file_edit_replace_shared.test.ts b/src/node/services/tools/file_edit_replace_shared.test.ts similarity index 100% rename from src/services/tools/file_edit_replace_shared.test.ts rename to src/node/services/tools/file_edit_replace_shared.test.ts diff --git a/src/services/tools/file_edit_replace_shared.ts b/src/node/services/tools/file_edit_replace_shared.ts similarity index 99% rename from src/services/tools/file_edit_replace_shared.ts rename to src/node/services/tools/file_edit_replace_shared.ts index 4ab833c85..78dd75256 100644 --- a/src/services/tools/file_edit_replace_shared.ts +++ b/src/node/services/tools/file_edit_replace_shared.ts @@ -10,7 +10,7 @@ import { NOTE_READ_FILE_FIRST_RETRY, NOTE_READ_FILE_RETRY, NOTE_READ_FILE_AGAIN_RETRY, -} from "@/types/tools"; +} from "@/common/types/tools"; interface OperationMetadata { edits_applied: number; diff --git a/src/services/tools/file_edit_replace_string.ts b/src/node/services/tools/file_edit_replace_string.ts similarity index 88% rename from src/services/tools/file_edit_replace_string.ts rename to src/node/services/tools/file_edit_replace_string.ts index abdeaf788..4e3d44bfa 100644 --- a/src/services/tools/file_edit_replace_string.ts +++ b/src/node/services/tools/file_edit_replace_string.ts @@ -1,6 +1,6 @@ import { tool } from "ai"; -import type { ToolConfiguration, ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { ToolConfiguration, ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; import { executeFileEditOperation } from "./file_edit_operation"; import { handleStringReplace, type StringReplaceArgs } from "./file_edit_replace_shared"; diff --git a/src/services/tools/file_read.test.ts b/src/node/services/tools/file_read.test.ts similarity index 98% rename from src/services/tools/file_read.test.ts rename to src/node/services/tools/file_read.test.ts index 3d48684f6..9d86c6e11 100644 --- a/src/services/tools/file_read.test.ts +++ b/src/node/services/tools/file_read.test.ts @@ -1,10 +1,10 @@ import { describe, it, expect, beforeEach, afterEach } from "bun:test"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; import * as fs from "fs/promises"; import * as path from "path"; import * as os from "os"; import { createFileReadTool } from "./file_read"; -import type { FileReadToolArgs, FileReadToolResult } from "@/types/tools"; +import type { FileReadToolArgs, FileReadToolResult } from "@/common/types/tools"; import type { ToolCallOptions } from "ai"; import { TestTempDir, createTestToolConfig, getTestDeps } from "./testHelpers"; diff --git a/src/services/tools/file_read.ts b/src/node/services/tools/file_read.ts similarity index 95% rename from src/services/tools/file_read.ts rename to src/node/services/tools/file_read.ts index 0c0cb3d5c..1075ed92b 100644 --- a/src/services/tools/file_read.ts +++ b/src/node/services/tools/file_read.ts @@ -1,10 +1,10 @@ import { tool } from "ai"; -import type { FileReadToolResult } from "@/types/tools"; -import type { ToolConfiguration, ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { FileReadToolResult } from "@/common/types/tools"; +import type { ToolConfiguration, ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; import { validatePathInCwd, validateFileSize, validateAndCorrectPath } from "./fileCommon"; -import { RuntimeError } from "@/runtime/Runtime"; -import { readFileString } from "@/utils/runtime/helpers"; +import { RuntimeError } from "@/node/runtime/Runtime"; +import { readFileString } from "@/node/utils/runtime/helpers"; /** * File read tool factory for AI assistant diff --git a/src/services/tools/propose_plan.ts b/src/node/services/tools/propose_plan.ts similarity index 85% rename from src/services/tools/propose_plan.ts rename to src/node/services/tools/propose_plan.ts index 15771abc7..7ea89bd94 100644 --- a/src/services/tools/propose_plan.ts +++ b/src/node/services/tools/propose_plan.ts @@ -1,6 +1,6 @@ import { tool } from "ai"; -import type { ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; +import type { ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; /** * Propose plan tool factory for AI assistant diff --git a/src/services/tools/status_set.test.ts b/src/node/services/tools/status_set.test.ts similarity index 97% rename from src/services/tools/status_set.test.ts rename to src/node/services/tools/status_set.test.ts index 18e3612cf..27c0c161d 100644 --- a/src/services/tools/status_set.test.ts +++ b/src/node/services/tools/status_set.test.ts @@ -1,9 +1,9 @@ import { describe, it, expect } from "bun:test"; import { createStatusSetTool } from "./status_set"; -import type { ToolConfiguration } from "@/utils/tools/tools"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import type { ToolConfiguration } from "@/common/utils/tools/tools"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; import type { ToolCallOptions } from "ai"; -import { STATUS_MESSAGE_MAX_LENGTH } from "@/constants/toolLimits"; +import { STATUS_MESSAGE_MAX_LENGTH } from "@/common/constants/toolLimits"; describe("status_set tool validation", () => { const mockConfig: ToolConfiguration = { diff --git a/src/services/tools/status_set.ts b/src/node/services/tools/status_set.ts similarity index 90% rename from src/services/tools/status_set.ts rename to src/node/services/tools/status_set.ts index 954bdb38d..0a8b138cc 100644 --- a/src/services/tools/status_set.ts +++ b/src/node/services/tools/status_set.ts @@ -1,8 +1,8 @@ import { tool } from "ai"; -import type { ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; -import { STATUS_MESSAGE_MAX_LENGTH } from "@/constants/toolLimits"; -import type { StatusSetToolResult } from "@/types/tools"; +import type { ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; +import { STATUS_MESSAGE_MAX_LENGTH } from "@/common/constants/toolLimits"; +import type { StatusSetToolResult } from "@/common/types/tools"; /** * Validates that a string is a single emoji character diff --git a/src/services/tools/testHelpers.ts b/src/node/services/tools/testHelpers.ts similarity index 88% rename from src/services/tools/testHelpers.ts rename to src/node/services/tools/testHelpers.ts index 78dba3fc3..77beb749e 100644 --- a/src/services/tools/testHelpers.ts +++ b/src/node/services/tools/testHelpers.ts @@ -1,10 +1,10 @@ import * as fs from "fs"; import * as path from "path"; import * as os from "os"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; -import { InitStateManager } from "@/services/initStateManager"; -import { Config } from "@/config"; -import type { ToolConfiguration } from "@/utils/tools/tools"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; +import { InitStateManager } from "@/node/services/initStateManager"; +import { Config } from "@/node/config"; +import type { ToolConfiguration } from "@/common/utils/tools/tools"; /** * Disposable test temp directory that auto-cleans when disposed diff --git a/src/services/tools/todo.test.ts b/src/node/services/tools/todo.test.ts similarity index 98% rename from src/services/tools/todo.test.ts rename to src/node/services/tools/todo.test.ts index fded1c4da..0ea3d47d7 100644 --- a/src/services/tools/todo.test.ts +++ b/src/node/services/tools/todo.test.ts @@ -3,9 +3,9 @@ import * as fs from "fs/promises"; import * as os from "os"; import * as path from "path"; import { clearTodosForTempDir, getTodosForTempDir, setTodosForTempDir } from "./todo"; -import type { TodoItem } from "@/types/tools"; -import type { Runtime } from "@/runtime/Runtime"; -import { createRuntime } from "@/runtime/runtimeFactory"; +import type { TodoItem } from "@/common/types/tools"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { createRuntime } from "@/node/runtime/runtimeFactory"; describe("Todo Storage", () => { let runtimeTempDir: string; diff --git a/src/services/tools/todo.ts b/src/node/services/tools/todo.ts similarity index 93% rename from src/services/tools/todo.ts rename to src/node/services/tools/todo.ts index 77bbd49f3..b20b55b90 100644 --- a/src/services/tools/todo.ts +++ b/src/node/services/tools/todo.ts @@ -1,11 +1,11 @@ import { tool } from "ai"; import * as path from "path"; -import type { Runtime } from "@/runtime/Runtime"; -import type { ToolFactory } from "@/utils/tools/tools"; -import { TOOL_DEFINITIONS } from "@/utils/tools/toolDefinitions"; -import type { TodoItem } from "@/types/tools"; -import { MAX_TODOS } from "@/constants/toolLimits"; -import { readFileString, writeFileString, execBuffered } from "@/utils/runtime/helpers"; +import type { Runtime } from "@/node/runtime/Runtime"; +import type { ToolFactory } from "@/common/utils/tools/tools"; +import { TOOL_DEFINITIONS } from "@/common/utils/tools/toolDefinitions"; +import type { TodoItem } from "@/common/types/tools"; +import { MAX_TODOS } from "@/common/constants/toolLimits"; +import { readFileString, writeFileString, execBuffered } from "@/node/utils/runtime/helpers"; /** * Get path to todos.json file in the stream's temporary directory diff --git a/src/services/tools/wrapWithInitWait.ts b/src/node/services/tools/wrapWithInitWait.ts similarity index 95% rename from src/services/tools/wrapWithInitWait.ts rename to src/node/services/tools/wrapWithInitWait.ts index 86ad002cb..55e78b4dc 100644 --- a/src/services/tools/wrapWithInitWait.ts +++ b/src/node/services/tools/wrapWithInitWait.ts @@ -1,5 +1,5 @@ import type { Tool } from "ai"; -import type { InitStateManager } from "@/services/initStateManager"; +import type { InitStateManager } from "@/node/services/initStateManager"; /** * Wraps a tool to wait for workspace initialization before execution. diff --git a/src/services/utils/sendMessageError.ts b/src/node/services/utils/sendMessageError.ts similarity index 81% rename from src/services/utils/sendMessageError.ts rename to src/node/services/utils/sendMessageError.ts index a14d7bdce..4e2e9812a 100644 --- a/src/services/utils/sendMessageError.ts +++ b/src/node/services/utils/sendMessageError.ts @@ -1,5 +1,5 @@ -import assert from "@/utils/assert"; -import type { SendMessageError } from "@/types/errors"; +import assert from "@/common/utils/assert"; +import type { SendMessageError } from "@/common/types/errors"; /** * Helper to wrap arbitrary errors into SendMessageError structures. diff --git a/src/services/workspaceTitleGenerator.ts b/src/node/services/workspaceTitleGenerator.ts similarity index 97% rename from src/services/workspaceTitleGenerator.ts rename to src/node/services/workspaceTitleGenerator.ts index e5c14c3a2..f680e9665 100644 --- a/src/services/workspaceTitleGenerator.ts +++ b/src/node/services/workspaceTitleGenerator.ts @@ -1,10 +1,10 @@ import { generateObject, type LanguageModel } from "ai"; import { z } from "zod"; -import type { Config } from "@/config"; +import type { Config } from "@/node/config"; import { log } from "./log"; import { createAnthropic } from "@ai-sdk/anthropic"; import { createOpenAI } from "@ai-sdk/openai"; -import { MODEL_NAMES } from "@/constants/knownModels"; +import { MODEL_NAMES } from "@/common/constants/knownModels"; const workspaceNameSchema = z.object({ name: z diff --git a/src/telemetry/client.test.ts b/src/node/telemetry/client.test.ts similarity index 100% rename from src/telemetry/client.test.ts rename to src/node/telemetry/client.test.ts diff --git a/src/telemetry/client.ts b/src/node/telemetry/client.ts similarity index 100% rename from src/telemetry/client.ts rename to src/node/telemetry/client.ts diff --git a/src/telemetry/index.ts b/src/node/telemetry/index.ts similarity index 100% rename from src/telemetry/index.ts rename to src/node/telemetry/index.ts diff --git a/src/telemetry/lifecycle.ts b/src/node/telemetry/lifecycle.ts similarity index 100% rename from src/telemetry/lifecycle.ts rename to src/node/telemetry/lifecycle.ts diff --git a/src/telemetry/payload.ts b/src/node/telemetry/payload.ts similarity index 100% rename from src/telemetry/payload.ts rename to src/node/telemetry/payload.ts diff --git a/src/telemetry/utils.ts b/src/node/telemetry/utils.ts similarity index 96% rename from src/telemetry/utils.ts rename to src/node/telemetry/utils.ts index b6b30008f..b6f847bfc 100644 --- a/src/telemetry/utils.ts +++ b/src/node/telemetry/utils.ts @@ -3,7 +3,7 @@ */ import type { BaseTelemetryProperties } from "./payload"; -import { VERSION } from "../version"; +import { VERSION } from "@/version"; /** * Get base telemetry properties included with all events diff --git a/src/utils/compaction/handler.ts b/src/node/utils/compaction/handler.ts similarity index 95% rename from src/utils/compaction/handler.ts rename to src/node/utils/compaction/handler.ts index 45f2fbfb8..e8d54101f 100644 --- a/src/utils/compaction/handler.ts +++ b/src/node/utils/compaction/handler.ts @@ -11,8 +11,8 @@ * - Reload-safe: localStorage persists, messageId ensures freshness */ -import type { StreamingMessageAggregator } from "@/utils/messages/StreamingMessageAggregator"; -import { getCancelledCompactionKey } from "@/constants/storage"; +import type { StreamingMessageAggregator } from "@/browser/utils/messages/StreamingMessageAggregator"; +import { getCancelledCompactionKey } from "@/common/constants/storage"; /** * Check if the workspace is currently in a compaction stream diff --git a/src/utils/concurrency/asyncMutex.ts b/src/node/utils/concurrency/asyncMutex.ts similarity index 100% rename from src/utils/concurrency/asyncMutex.ts rename to src/node/utils/concurrency/asyncMutex.ts diff --git a/src/utils/concurrency/mutexMap.ts b/src/node/utils/concurrency/mutexMap.ts similarity index 100% rename from src/utils/concurrency/mutexMap.ts rename to src/node/utils/concurrency/mutexMap.ts diff --git a/src/utils/concurrency/workspaceFileLocks.ts b/src/node/utils/concurrency/workspaceFileLocks.ts similarity index 100% rename from src/utils/concurrency/workspaceFileLocks.ts rename to src/node/utils/concurrency/workspaceFileLocks.ts diff --git a/src/utils/disposableExec.test.ts b/src/node/utils/disposableExec.test.ts similarity index 100% rename from src/utils/disposableExec.test.ts rename to src/node/utils/disposableExec.test.ts diff --git a/src/utils/disposableExec.ts b/src/node/utils/disposableExec.ts similarity index 100% rename from src/utils/disposableExec.ts rename to src/node/utils/disposableExec.ts diff --git a/src/utils/errors/formatSendError.ts b/src/node/utils/errors/formatSendError.ts similarity index 94% rename from src/utils/errors/formatSendError.ts rename to src/node/utils/errors/formatSendError.ts index b9e7d680e..e287ab3cd 100644 --- a/src/utils/errors/formatSendError.ts +++ b/src/node/utils/errors/formatSendError.ts @@ -3,7 +3,7 @@ * Used by both RetryBarrier and ChatInputToasts */ -import type { SendMessageError } from "@/types/errors"; +import type { SendMessageError } from "@/common/types/errors"; export interface FormattedError { message: string; diff --git a/src/utils/eventStore.test.ts b/src/node/utils/eventStore.test.ts similarity index 99% rename from src/utils/eventStore.test.ts rename to src/node/utils/eventStore.test.ts index 9c46919a8..0960f92a8 100644 --- a/src/utils/eventStore.test.ts +++ b/src/node/utils/eventStore.test.ts @@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, afterEach } from "@jest/globals"; import * as fs from "fs/promises"; import * as path from "path"; import { EventStore } from "./eventStore"; -import type { Config } from "@/config"; +import type { Config } from "@/node/config"; // Test types interface TestState { diff --git a/src/utils/eventStore.ts b/src/node/utils/eventStore.ts similarity index 97% rename from src/utils/eventStore.ts rename to src/node/utils/eventStore.ts index 34b8fde7f..f4ae9f7df 100644 --- a/src/utils/eventStore.ts +++ b/src/node/utils/eventStore.ts @@ -1,6 +1,6 @@ -import { SessionFileManager } from "@/utils/sessionFile"; -import type { Config } from "@/config"; -import { log } from "@/services/log"; +import { SessionFileManager } from "@/node/utils/sessionFile"; +import type { Config } from "@/node/config"; +import { log } from "@/node/services/log"; /** * EventStore - Generic state management with persistence and replay for workspace events. diff --git a/src/utils/extensionMetadata.ts b/src/node/utils/extensionMetadata.ts similarity index 95% rename from src/utils/extensionMetadata.ts rename to src/node/utils/extensionMetadata.ts index 51de9c905..e90025518 100644 --- a/src/utils/extensionMetadata.ts +++ b/src/node/utils/extensionMetadata.ts @@ -1,5 +1,5 @@ import { readFileSync, existsSync } from "fs"; -import { getMuxExtensionMetadataPath } from "../constants/paths"; +import { getMuxExtensionMetadataPath } from "@/common/constants/paths"; /** * Extension metadata for a single workspace. diff --git a/src/utils/git/diffParser.test.ts b/src/node/utils/git/diffParser.test.ts similarity index 99% rename from src/utils/git/diffParser.test.ts rename to src/node/utils/git/diffParser.test.ts index a60fac14d..a16b0a617 100644 --- a/src/utils/git/diffParser.test.ts +++ b/src/node/utils/git/diffParser.test.ts @@ -10,7 +10,7 @@ import { join } from "path"; import { tmpdir } from "os"; import { execSync } from "child_process"; import { parseDiff, extractAllHunks } from "./diffParser"; -import { buildGitDiffCommand } from "@/components/RightSidebar/CodeReview/ReviewPanel"; +import { buildGitDiffCommand } from "@/browser/components/RightSidebar/CodeReview/ReviewPanel"; describe("git diff parser (real repository)", () => { let testRepoPath: string; diff --git a/src/utils/git/diffParser.ts b/src/node/utils/git/diffParser.ts similarity index 98% rename from src/utils/git/diffParser.ts rename to src/node/utils/git/diffParser.ts index 510771ee7..ee0defe6e 100644 --- a/src/utils/git/diffParser.ts +++ b/src/node/utils/git/diffParser.ts @@ -2,7 +2,7 @@ * Git diff parser - parses unified diff output into structured hunks */ -import type { DiffHunk, FileDiff } from "@/types/review"; +import type { DiffHunk, FileDiff } from "@/common/types/review"; /** * Generate a stable content-based ID for a hunk diff --git a/src/utils/git/gitStatus.ts b/src/node/utils/git/gitStatus.ts similarity index 100% rename from src/utils/git/gitStatus.ts rename to src/node/utils/git/gitStatus.ts diff --git a/src/utils/git/languageDetector.test.ts b/src/node/utils/git/languageDetector.test.ts similarity index 100% rename from src/utils/git/languageDetector.test.ts rename to src/node/utils/git/languageDetector.test.ts diff --git a/src/utils/git/languageDetector.ts b/src/node/utils/git/languageDetector.ts similarity index 100% rename from src/utils/git/languageDetector.ts rename to src/node/utils/git/languageDetector.ts diff --git a/src/utils/git/numstatParser.test.ts b/src/node/utils/git/numstatParser.test.ts similarity index 100% rename from src/utils/git/numstatParser.test.ts rename to src/node/utils/git/numstatParser.test.ts diff --git a/src/utils/git/numstatParser.ts b/src/node/utils/git/numstatParser.ts similarity index 100% rename from src/utils/git/numstatParser.ts rename to src/node/utils/git/numstatParser.ts diff --git a/src/utils/git/parseGitLog.test.ts b/src/node/utils/git/parseGitLog.test.ts similarity index 100% rename from src/utils/git/parseGitLog.test.ts rename to src/node/utils/git/parseGitLog.test.ts diff --git a/src/utils/git/parseGitLog.ts b/src/node/utils/git/parseGitLog.ts similarity index 100% rename from src/utils/git/parseGitLog.ts rename to src/node/utils/git/parseGitLog.ts diff --git a/src/utils/git/parseGitStatus.test.ts b/src/node/utils/git/parseGitStatus.test.ts similarity index 100% rename from src/utils/git/parseGitStatus.test.ts rename to src/node/utils/git/parseGitStatus.test.ts diff --git a/src/utils/git/parseGitStatus.ts b/src/node/utils/git/parseGitStatus.ts similarity index 98% rename from src/utils/git/parseGitStatus.ts rename to src/node/utils/git/parseGitStatus.ts index da3527c3d..65d57c7b1 100644 --- a/src/utils/git/parseGitStatus.ts +++ b/src/node/utils/git/parseGitStatus.ts @@ -1,4 +1,4 @@ -import type { GitStatus } from "@/types/workspace"; +import type { GitStatus } from "@/common/types/workspace"; /** * Parse the output of `git rev-list --left-right --count HEAD...origin/branch` diff --git a/src/utils/main/README.md b/src/node/utils/main/README.md similarity index 100% rename from src/utils/main/README.md rename to src/node/utils/main/README.md diff --git a/src/utils/main/StreamingTokenTracker.test.ts b/src/node/utils/main/StreamingTokenTracker.test.ts similarity index 96% rename from src/utils/main/StreamingTokenTracker.test.ts rename to src/node/utils/main/StreamingTokenTracker.test.ts index feef3167c..309e70c18 100644 --- a/src/utils/main/StreamingTokenTracker.test.ts +++ b/src/node/utils/main/StreamingTokenTracker.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, jest, test } from "@jest/globals"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; import { StreamingTokenTracker } from "./StreamingTokenTracker"; jest.setTimeout(20000); diff --git a/src/utils/main/StreamingTokenTracker.ts b/src/node/utils/main/StreamingTokenTracker.ts similarity index 100% rename from src/utils/main/StreamingTokenTracker.ts rename to src/node/utils/main/StreamingTokenTracker.ts diff --git a/src/utils/main/bashPath.ts b/src/node/utils/main/bashPath.ts similarity index 100% rename from src/utils/main/bashPath.ts rename to src/node/utils/main/bashPath.ts diff --git a/src/utils/main/instructionFiles.test.ts b/src/node/utils/main/instructionFiles.test.ts similarity index 100% rename from src/utils/main/instructionFiles.test.ts rename to src/node/utils/main/instructionFiles.test.ts diff --git a/src/utils/main/instructionFiles.ts b/src/node/utils/main/instructionFiles.ts similarity index 97% rename from src/utils/main/instructionFiles.ts rename to src/node/utils/main/instructionFiles.ts index e7ea2fd83..5cb9c941f 100644 --- a/src/utils/main/instructionFiles.ts +++ b/src/node/utils/main/instructionFiles.ts @@ -1,7 +1,7 @@ import * as fs from "fs/promises"; import * as path from "path"; -import type { Runtime } from "@/runtime/Runtime"; -import { readFileString } from "@/utils/runtime/helpers"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { readFileString } from "@/node/utils/runtime/helpers"; const MARKDOWN_COMMENT_REGEX = //g; diff --git a/src/utils/main/markdown.test.ts b/src/node/utils/main/markdown.test.ts similarity index 100% rename from src/utils/main/markdown.test.ts rename to src/node/utils/main/markdown.test.ts diff --git a/src/utils/main/markdown.ts b/src/node/utils/main/markdown.ts similarity index 100% rename from src/utils/main/markdown.ts rename to src/node/utils/main/markdown.ts diff --git a/src/utils/main/tokenizer.test.ts b/src/node/utils/main/tokenizer.test.ts similarity index 95% rename from src/utils/main/tokenizer.test.ts rename to src/node/utils/main/tokenizer.test.ts index 8b19066e3..29d8be509 100644 --- a/src/utils/main/tokenizer.test.ts +++ b/src/node/utils/main/tokenizer.test.ts @@ -7,7 +7,7 @@ import { getTokenizerForModel, loadTokenizerModules, } from "./tokenizer"; -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; jest.setTimeout(20000); diff --git a/src/utils/main/tokenizer.ts b/src/node/utils/main/tokenizer.ts similarity index 97% rename from src/utils/main/tokenizer.ts rename to src/node/utils/main/tokenizer.ts index d34c35700..934c1b0f9 100644 --- a/src/utils/main/tokenizer.ts +++ b/src/node/utils/main/tokenizer.ts @@ -1,11 +1,11 @@ -import assert from "@/utils/assert"; +import assert from "@/common/utils/assert"; import CRC32 from "crc-32"; import { LRUCache } from "lru-cache"; -import { getAvailableTools, getToolSchemas } from "@/utils/tools/toolDefinitions"; +import { getAvailableTools, getToolSchemas } from "@/common/utils/tools/toolDefinitions"; import type { CountTokensInput } from "./tokenizer.worker"; import { models, type ModelName } from "ai-tokenizer"; import { run } from "./workerPool"; -import { TOKENIZER_MODEL_OVERRIDES, DEFAULT_WARM_MODELS } from "@/constants/knownModels"; +import { TOKENIZER_MODEL_OVERRIDES, DEFAULT_WARM_MODELS } from "@/common/constants/knownModels"; /** * Public tokenizer interface exposed to callers. diff --git a/src/utils/main/tokenizer.worker.ts b/src/node/utils/main/tokenizer.worker.ts similarity index 100% rename from src/utils/main/tokenizer.worker.ts rename to src/node/utils/main/tokenizer.worker.ts diff --git a/src/utils/main/workerPool.ts b/src/node/utils/main/workerPool.ts similarity index 100% rename from src/utils/main/workerPool.ts rename to src/node/utils/main/workerPool.ts diff --git a/src/utils/pathUtils.test.ts b/src/node/utils/pathUtils.test.ts similarity index 100% rename from src/utils/pathUtils.test.ts rename to src/node/utils/pathUtils.test.ts diff --git a/src/utils/pathUtils.ts b/src/node/utils/pathUtils.ts similarity index 100% rename from src/utils/pathUtils.ts rename to src/node/utils/pathUtils.ts diff --git a/src/utils/paths.main.ts b/src/node/utils/paths.main.ts similarity index 100% rename from src/utils/paths.main.ts rename to src/node/utils/paths.main.ts diff --git a/src/utils/paths.test.ts b/src/node/utils/paths.test.ts similarity index 100% rename from src/utils/paths.test.ts rename to src/node/utils/paths.test.ts diff --git a/src/utils/runtime/fileExists.ts b/src/node/utils/runtime/fileExists.ts similarity index 89% rename from src/utils/runtime/fileExists.ts rename to src/node/utils/runtime/fileExists.ts index 7504c9ac7..7de9a766d 100644 --- a/src/utils/runtime/fileExists.ts +++ b/src/node/utils/runtime/fileExists.ts @@ -1,4 +1,4 @@ -import type { Runtime } from "@/runtime/Runtime"; +import type { Runtime } from "@/node/runtime/Runtime"; /** * Check if a path exists using runtime.stat() diff --git a/src/utils/runtime/helpers.ts b/src/node/utils/runtime/helpers.ts similarity index 95% rename from src/utils/runtime/helpers.ts rename to src/node/utils/runtime/helpers.ts index ec2518dce..4c13ca647 100644 --- a/src/utils/runtime/helpers.ts +++ b/src/node/utils/runtime/helpers.ts @@ -1,5 +1,5 @@ -import type { Runtime, ExecOptions } from "@/runtime/Runtime"; -import { PlatformPaths } from "../paths"; +import type { Runtime, ExecOptions } from "@/node/runtime/Runtime"; +import { PlatformPaths } from "@/node/utils/paths.main"; /** * Convenience helpers for working with streaming Runtime APIs. diff --git a/src/utils/sessionFile.ts b/src/node/utils/sessionFile.ts similarity index 92% rename from src/utils/sessionFile.ts rename to src/node/utils/sessionFile.ts index 79f457fc8..707b6473f 100644 --- a/src/utils/sessionFile.ts +++ b/src/node/utils/sessionFile.ts @@ -1,9 +1,9 @@ import * as fs from "fs/promises"; import * as path from "path"; -import type { Result } from "@/types/result"; -import { Ok, Err } from "@/types/result"; -import type { Config } from "@/config"; -import { workspaceFileLocks } from "@/utils/concurrency/workspaceFileLocks"; +import type { Result } from "@/common/types/result"; +import { Ok, Err } from "@/common/types/result"; +import type { Config } from "@/node/config"; +import { workspaceFileLocks } from "@/node/utils/concurrency/workspaceFileLocks"; /** * Shared utility for managing JSON files in workspace session directories. diff --git a/terminal.html b/terminal.html index e0d72cbc0..40bce29ac 100644 --- a/terminal.html +++ b/terminal.html @@ -19,6 +19,6 @@
- + diff --git a/tests/e2e/electronTest.ts b/tests/e2e/electronTest.ts index 4ffe758fd..a8f0aade6 100644 --- a/tests/e2e/electronTest.ts +++ b/tests/e2e/electronTest.ts @@ -27,7 +27,8 @@ const shouldLoadDist = process.env.MUX_E2E_LOAD_DIST === "1"; const REQUIRED_DIST_FILES = [ path.join(appRoot, "dist", "index.html"), - path.join(appRoot, "dist", "main.js"), + path.join(appRoot, "dist", "cli", "index.js"), + path.join(appRoot, "dist", "desktop", "main.js"), path.join(appRoot, "dist", "preload.js"), ] as const; diff --git a/tests/e2e/scenarios/basicChat.spec.ts b/tests/e2e/scenarios/basicChat.spec.ts index c3d3d8985..595754284 100644 --- a/tests/e2e/scenarios/basicChat.spec.ts +++ b/tests/e2e/scenarios/basicChat.spec.ts @@ -1,5 +1,5 @@ import { electronTest as test, electronExpect as expect } from "../electronTest"; -import { LIST_PROGRAMMING_LANGUAGES } from "@/services/mock/scenarios/basicChat"; +import { LIST_PROGRAMMING_LANGUAGES } from "@/node/services/mock/scenarios/basicChat"; const SIMPLE_PROMPT = LIST_PROGRAMMING_LANGUAGES; diff --git a/tests/e2e/scenarios/permissionModes.spec.ts b/tests/e2e/scenarios/permissionModes.spec.ts index c4f59c7da..39f195142 100644 --- a/tests/e2e/scenarios/permissionModes.spec.ts +++ b/tests/e2e/scenarios/permissionModes.spec.ts @@ -1,5 +1,5 @@ import { electronTest as test, electronExpect as expect } from "../electronTest"; -import { PERMISSION_MODE_PROMPTS } from "@/services/mock/scenarios/permissionModes"; +import { PERMISSION_MODE_PROMPTS } from "@/node/services/mock/scenarios/permissionModes"; test.skip( ({ browserName }) => browserName !== "chromium", diff --git a/tests/e2e/scenarios/review.spec.ts b/tests/e2e/scenarios/review.spec.ts index 5d6577ef6..2d2ce4be0 100644 --- a/tests/e2e/scenarios/review.spec.ts +++ b/tests/e2e/scenarios/review.spec.ts @@ -1,5 +1,5 @@ import { electronTest as test } from "../electronTest"; -import { REVIEW_PROMPTS } from "@/services/mock/scenarios/review"; +import { REVIEW_PROMPTS } from "@/node/services/mock/scenarios/review"; test.skip( ({ browserName }) => browserName !== "chromium", diff --git a/tests/e2e/scenarios/slashCommands.spec.ts b/tests/e2e/scenarios/slashCommands.spec.ts index b118633ec..e751a747a 100644 --- a/tests/e2e/scenarios/slashCommands.spec.ts +++ b/tests/e2e/scenarios/slashCommands.spec.ts @@ -2,11 +2,11 @@ import fs from "fs/promises"; import path from "path"; import { parse } from "jsonc-parser"; import { electronTest as test, electronExpect as expect } from "../electronTest"; -import { TOOL_FLOW_PROMPTS } from "@/services/mock/scenarios/toolFlows"; +import { TOOL_FLOW_PROMPTS } from "@/node/services/mock/scenarios/toolFlows"; import { COMPACT_SUMMARY_TEXT, SLASH_COMMAND_PROMPTS, -} from "@/services/mock/scenarios/slashCommands"; +} from "@/node/services/mock/scenarios/slashCommands"; test.skip( ({ browserName }) => browserName !== "chromium", diff --git a/tests/e2e/scenarios/toolFlows.spec.ts b/tests/e2e/scenarios/toolFlows.spec.ts index 76ca32a1d..42ae704f3 100644 --- a/tests/e2e/scenarios/toolFlows.spec.ts +++ b/tests/e2e/scenarios/toolFlows.spec.ts @@ -1,7 +1,7 @@ import path from "path"; import fs from "fs/promises"; import { electronTest as test, electronExpect as expect } from "../electronTest"; -import { TOOL_FLOW_PROMPTS } from "@/services/mock/scenarios/toolFlows"; +import { TOOL_FLOW_PROMPTS } from "@/node/services/mock/scenarios/toolFlows"; test.skip( ({ browserName }) => browserName !== "chromium", diff --git a/tests/e2e/utils/demoProject.ts b/tests/e2e/utils/demoProject.ts index b1fc18198..d1b3be035 100644 --- a/tests/e2e/utils/demoProject.ts +++ b/tests/e2e/utils/demoProject.ts @@ -1,6 +1,6 @@ import fs from "fs"; import path from "path"; -import { Config } from "../../../src/config"; +import { Config } from "../../../src/node/config"; export interface DemoProjectConfig { projectPath: string; diff --git a/tests/ipcMain/createWorkspace.test.ts b/tests/ipcMain/createWorkspace.test.ts index 3aa12ef99..9d20e3d72 100644 --- a/tests/ipcMain/createWorkspace.test.ts +++ b/tests/ipcMain/createWorkspace.test.ts @@ -16,20 +16,20 @@ import { exec } from "child_process"; import { promisify } from "util"; import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; import type { TestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, generateBranchName } from "./helpers"; -import { detectDefaultTrunkBranch } from "../../src/git"; +import { detectDefaultTrunkBranch } from "../../src/node/git"; import { isDockerAvailable, startSSHServer, stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; -import type { FrontendWorkspaceMetadata } from "../../src/types/workspace"; -import { createRuntime } from "../../src/runtime/runtimeFactory"; -import type { SSHRuntime } from "../../src/runtime/SSHRuntime"; -import { streamToString } from "../../src/runtime/SSHRuntime"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; +import type { FrontendWorkspaceMetadata } from "../../src/common/types/workspace"; +import { createRuntime } from "../../src/node/runtime/runtimeFactory"; +import type { SSHRuntime } from "../../src/node/runtime/SSHRuntime"; +import { streamToString } from "../../src/node/runtime/SSHRuntime"; const execAsync = promisify(exec); diff --git a/tests/ipcMain/doubleRegister.test.ts b/tests/ipcMain/doubleRegister.test.ts index fd0b178cc..4c8290d73 100644 --- a/tests/ipcMain/doubleRegister.test.ts +++ b/tests/ipcMain/doubleRegister.test.ts @@ -1,5 +1,5 @@ import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/executeBash.test.ts b/tests/ipcMain/executeBash.test.ts index d55119737..22750eef2 100644 --- a/tests/ipcMain/executeBash.test.ts +++ b/tests/ipcMain/executeBash.test.ts @@ -1,7 +1,7 @@ import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, createWorkspace } from "./helpers"; -import type { WorkspaceMetadata } from "../../src/types/workspace"; +import type { WorkspaceMetadata } from "../../src/common/types/workspace"; type WorkspaceCreationResult = Awaited>; diff --git a/tests/ipcMain/forkWorkspace.test.ts b/tests/ipcMain/forkWorkspace.test.ts index 2d3948e2f..b4a1c7009 100644 --- a/tests/ipcMain/forkWorkspace.test.ts +++ b/tests/ipcMain/forkWorkspace.test.ts @@ -5,7 +5,7 @@ import { setupWorkspace, validateApiKeys, } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, @@ -15,9 +15,9 @@ import { waitFor, modelString, } from "./helpers"; -import { detectDefaultTrunkBranch } from "../../src/git"; -import { HistoryService } from "../../src/services/historyService"; -import { createMuxMessage } from "../../src/types/message"; +import { detectDefaultTrunkBranch } from "../../src/node/git"; +import { HistoryService } from "../../src/node/services/historyService"; +import { createMuxMessage } from "../../src/common/types/message"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/helpers.ts b/tests/ipcMain/helpers.ts index 46596b428..71a38169a 100644 --- a/tests/ipcMain/helpers.ts +++ b/tests/ipcMain/helpers.ts @@ -1,21 +1,21 @@ import type { IpcRenderer } from "electron"; -import { IPC_CHANNELS, getChatChannel } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS, getChatChannel } from "../../src/common/constants/ipc-constants"; import type { SendMessageOptions, WorkspaceChatMessage, WorkspaceInitEvent, -} from "../../src/types/ipc"; -import { isInitStart, isInitOutput, isInitEnd } from "../../src/types/ipc"; -import type { Result } from "../../src/types/result"; -import type { SendMessageError } from "../../src/types/errors"; -import type { FrontendWorkspaceMetadata } from "../../src/types/workspace"; +} from "../../src/common/types/ipc"; +import { isInitStart, isInitOutput, isInitEnd } from "../../src/common/types/ipc"; +import type { Result } from "../../src/common/types/result"; +import type { SendMessageError } from "../../src/common/types/errors"; +import type { FrontendWorkspaceMetadata } from "../../src/common/types/workspace"; import * as path from "path"; import * as os from "os"; -import { detectDefaultTrunkBranch } from "../../src/git"; +import { detectDefaultTrunkBranch } from "../../src/node/git"; import type { TestEnvironment } from "./setup"; -import type { RuntimeConfig } from "../../src/types/runtime"; -import { KNOWN_MODELS } from "../../src/constants/knownModels"; -import type { ToolPolicy } from "../../src/utils/tools/toolPolicy"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; +import { KNOWN_MODELS } from "../../src/common/constants/knownModels"; +import type { ToolPolicy } from "../../src/common/utils/tools/toolPolicy"; // Test constants - centralized for consistency across all tests export const INIT_HOOK_WAIT_MS = 1500; // Wait for async init hook completion (local runtime) @@ -94,7 +94,7 @@ export async function createWorkspace( projectPath: string, branchName: string, trunkBranch?: string, - runtimeConfig?: import("../../src/types/runtime").RuntimeConfig + runtimeConfig?: import("../../src/common/types/runtime").RuntimeConfig ): Promise< { success: true; metadata: FrontendWorkspaceMetadata } | { success: false; error: string } > { @@ -764,8 +764,8 @@ export async function buildLargeHistory( textPrefix?: string; } = {} ): Promise { - const { HistoryService } = await import("../../src/services/historyService"); - const { createMuxMessage } = await import("../../src/types/message"); + const { HistoryService } = await import("../../src/node/services/historyService"); + const { createMuxMessage } = await import("../../src/common/types/message"); // HistoryService only needs getSessionDir, so we can cast the partial config const historyService = new HistoryService(config as any); diff --git a/tests/ipcMain/initWorkspace.test.ts b/tests/ipcMain/initWorkspace.test.ts index 22ae08416..3e7c8b21e 100644 --- a/tests/ipcMain/initWorkspace.test.ts +++ b/tests/ipcMain/initWorkspace.test.ts @@ -7,7 +7,7 @@ import { setupProviders, type TestEnvironment, } from "./setup"; -import { IPC_CHANNELS, getChatChannel } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS, getChatChannel } from "../../src/common/constants/ipc-constants"; import { generateBranchName, createWorkspace, @@ -16,8 +16,8 @@ import { collectInitEvents, waitFor, } from "./helpers"; -import type { WorkspaceChatMessage, WorkspaceInitEvent } from "../../src/types/ipc"; -import { isInitStart, isInitOutput, isInitEnd } from "../../src/types/ipc"; +import type { WorkspaceChatMessage, WorkspaceInitEvent } from "../../src/common/types/ipc"; +import { isInitStart, isInitOutput, isInitEnd } from "../../src/common/types/ipc"; import * as path from "path"; import * as os from "os"; import { @@ -26,7 +26,7 @@ import { stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/modelNotFound.test.ts b/tests/ipcMain/modelNotFound.test.ts index 635c192b3..eaf5e6627 100644 --- a/tests/ipcMain/modelNotFound.test.ts +++ b/tests/ipcMain/modelNotFound.test.ts @@ -1,9 +1,9 @@ import { setupWorkspace, shouldRunIntegrationTests, validateApiKeys } from "./setup"; import { sendMessageWithModel, createEventCollector, waitFor, modelString } from "./helpers"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; -import type { Result } from "../../src/types/result"; -import type { SendMessageError } from "../../src/types/errors"; -import type { StreamErrorMessage } from "../../src/types/ipc"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; +import type { Result } from "../../src/common/types/result"; +import type { SendMessageError } from "../../src/common/types/errors"; +import type { StreamErrorMessage } from "../../src/common/types/ipc"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/ollama.test.ts b/tests/ipcMain/ollama.test.ts index 9bbd139b9..b3ed80295 100644 --- a/tests/ipcMain/ollama.test.ts +++ b/tests/ipcMain/ollama.test.ts @@ -90,7 +90,7 @@ describeOllama("IpcMain Ollama integration tests", () => { // Load tokenizer modules and ensure model is available before all tests beforeAll(async () => { // Load tokenizers (takes ~14s) - const { loadTokenizerModules } = await import("../../src/utils/main/tokenizer"); + const { loadTokenizerModules } = await import("../../src/node/utils/main/tokenizer"); await loadTokenizerModules(); // Ensure Ollama model is available (idempotent - fast if cached) diff --git a/tests/ipcMain/projectCreate.test.ts b/tests/ipcMain/projectCreate.test.ts index 57bb8dd4f..def98596e 100644 --- a/tests/ipcMain/projectCreate.test.ts +++ b/tests/ipcMain/projectCreate.test.ts @@ -12,7 +12,7 @@ import * as path from "path"; import * as os from "os"; import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; import type { TestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/removeWorkspace.test.ts b/tests/ipcMain/removeWorkspace.test.ts index 620775272..b27e651e4 100644 --- a/tests/ipcMain/removeWorkspace.test.ts +++ b/tests/ipcMain/removeWorkspace.test.ts @@ -13,7 +13,7 @@ import { shouldRunIntegrationTests, type TestEnvironment, } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, @@ -33,8 +33,8 @@ import { stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; -import { execAsync } from "../../src/utils/disposableExec"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; +import { execAsync } from "../../src/node/utils/disposableExec"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/renameWorkspace.test.ts b/tests/ipcMain/renameWorkspace.test.ts index a849ec07b..67203931b 100644 --- a/tests/ipcMain/renameWorkspace.test.ts +++ b/tests/ipcMain/renameWorkspace.test.ts @@ -16,7 +16,7 @@ import { exec } from "child_process"; import { promisify } from "util"; import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; import type { TestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, @@ -32,7 +32,7 @@ import { stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; const execAsync = promisify(exec); diff --git a/tests/ipcMain/resumeStream.test.ts b/tests/ipcMain/resumeStream.test.ts index 713537b7a..1e755019d 100644 --- a/tests/ipcMain/resumeStream.test.ts +++ b/tests/ipcMain/resumeStream.test.ts @@ -1,10 +1,10 @@ import { setupWorkspace, shouldRunIntegrationTests, validateApiKeys } from "./setup"; import { sendMessageWithModel, createEventCollector, waitFor, modelString } from "./helpers"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; -import type { Result } from "../../src/types/result"; -import type { SendMessageError } from "../../src/types/errors"; -import { HistoryService } from "../../src/services/historyService"; -import { createMuxMessage } from "../../src/types/message"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; +import type { Result } from "../../src/common/types/result"; +import type { SendMessageError } from "../../src/common/types/errors"; +import { HistoryService } from "../../src/node/services/historyService"; +import { createMuxMessage } from "../../src/common/types/message"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/runtimeExecuteBash.test.ts b/tests/ipcMain/runtimeExecuteBash.test.ts index 1decaa388..3ae124bc9 100644 --- a/tests/ipcMain/runtimeExecuteBash.test.ts +++ b/tests/ipcMain/runtimeExecuteBash.test.ts @@ -14,7 +14,7 @@ import { getApiKey, setupProviders, } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, @@ -32,9 +32,9 @@ import { stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; -import type { WorkspaceChatMessage } from "../../src/types/ipc"; -import type { ToolPolicy } from "../../src/utils/tools/toolPolicy"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; +import type { WorkspaceChatMessage } from "../../src/common/types/ipc"; +import type { ToolPolicy } from "../../src/common/utils/tools/toolPolicy"; // Tool policy: Only allow bash tool const BASH_ONLY: ToolPolicy = [ diff --git a/tests/ipcMain/runtimeFileEditing.test.ts b/tests/ipcMain/runtimeFileEditing.test.ts index e53ed497c..3a19b6ab8 100644 --- a/tests/ipcMain/runtimeFileEditing.test.ts +++ b/tests/ipcMain/runtimeFileEditing.test.ts @@ -18,7 +18,7 @@ import { setupProviders, type TestEnvironment, } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { createTempGitRepo, cleanupTempGitRepo, @@ -38,8 +38,8 @@ import { stopSSHServer, type SSHServerConfig, } from "../runtime/ssh-fixture"; -import type { RuntimeConfig } from "../../src/types/runtime"; -import type { ToolPolicy } from "../../src/utils/tools/toolPolicy"; +import type { RuntimeConfig } from "../../src/common/types/runtime"; +import type { ToolPolicy } from "../../src/common/utils/tools/toolPolicy"; // Tool policy: Only allow file tools (disable bash to isolate file tool issues) const FILE_TOOLS_ONLY: ToolPolicy = [ diff --git a/tests/ipcMain/sendMessage.test.ts b/tests/ipcMain/sendMessage.test.ts index e389d131d..2e2148822 100644 --- a/tests/ipcMain/sendMessage.test.ts +++ b/tests/ipcMain/sendMessage.test.ts @@ -19,8 +19,8 @@ import { TEST_IMAGES, modelString, } from "./helpers"; -import type { StreamDeltaEvent } from "../../src/types/stream"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import type { StreamDeltaEvent } from "../../src/common/types/stream"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; @@ -30,7 +30,7 @@ if (shouldRunIntegrationTests()) { validateApiKeys(["OPENAI_API_KEY", "ANTHROPIC_API_KEY"]); } -import { KNOWN_MODELS } from "@/constants/knownModels"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; // Test both providers with their respective models const PROVIDER_CONFIGS: Array<[string, string]> = [ diff --git a/tests/ipcMain/setup.ts b/tests/ipcMain/setup.ts index bf984a3bb..0ed9c175f 100644 --- a/tests/ipcMain/setup.ts +++ b/tests/ipcMain/setup.ts @@ -4,9 +4,9 @@ import * as fs from "fs/promises"; import type { BrowserWindow, IpcMain as ElectronIpcMain, WebContents } from "electron"; import type { IpcRenderer } from "electron"; import createIPCMock from "electron-mock-ipc"; -import { Config } from "../../src/config"; -import { IpcMain } from "../../src/services/ipcMain"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { Config } from "../../src/node/config"; +import { IpcMain } from "../../src/node/services/ipcMain"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; import { generateBranchName, createWorkspace } from "./helpers"; import { shouldRunIntegrationTests, validateApiKeys, getApiKey } from "../testUtils"; @@ -139,8 +139,8 @@ export { shouldRunIntegrationTests, validateApiKeys, getApiKey }; */ export async function preloadTestModules(): Promise { const [{ loadTokenizerModules }, { preloadAISDKProviders }] = await Promise.all([ - import("../../src/utils/main/tokenizer"), - import("../../src/services/aiService"), + import("../../src/node/utils/main/tokenizer"), + import("../../src/node/services/aiService"), ]); await Promise.all([loadTokenizerModules(), preloadAISDKProviders()]); } diff --git a/tests/ipcMain/streamErrorRecovery.test.ts b/tests/ipcMain/streamErrorRecovery.test.ts index ea7d193a1..ad5cb149f 100644 --- a/tests/ipcMain/streamErrorRecovery.test.ts +++ b/tests/ipcMain/streamErrorRecovery.test.ts @@ -23,7 +23,7 @@ import { readChatHistory, modelString, } from "./helpers"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/truncate.test.ts b/tests/ipcMain/truncate.test.ts index 1cd4aa3da..1513b8e44 100644 --- a/tests/ipcMain/truncate.test.ts +++ b/tests/ipcMain/truncate.test.ts @@ -5,10 +5,10 @@ import { assertStreamSuccess, waitFor, } from "./helpers"; -import { HistoryService } from "../../src/services/historyService"; -import { createMuxMessage } from "../../src/types/message"; -import type { DeleteMessage } from "../../src/types/ipc"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { HistoryService } from "../../src/node/services/historyService"; +import { createMuxMessage } from "../../src/common/types/message"; +import type { DeleteMessage } from "../../src/common/types/ipc"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/ipcMain/windowTitle.test.ts b/tests/ipcMain/windowTitle.test.ts index 865150726..814551b5a 100644 --- a/tests/ipcMain/windowTitle.test.ts +++ b/tests/ipcMain/windowTitle.test.ts @@ -1,5 +1,5 @@ import { shouldRunIntegrationTests, createTestEnvironment, cleanupTestEnvironment } from "./setup"; -import { IPC_CHANNELS } from "../../src/constants/ipc-constants"; +import { IPC_CHANNELS } from "../../src/common/constants/ipc-constants"; const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/models/knownModels.test.ts b/tests/models/knownModels.test.ts index 696216cc6..380b9e769 100644 --- a/tests/models/knownModels.test.ts +++ b/tests/models/knownModels.test.ts @@ -6,8 +6,8 @@ */ import { describe, test, expect } from "@jest/globals"; -import { KNOWN_MODELS } from "@/constants/knownModels"; -import modelsJson from "@/utils/tokens/models.json"; +import { KNOWN_MODELS } from "@/common/constants/knownModels"; +import modelsJson from "@/common/utils/tokens/models.json"; describe("Known Models Integration", () => { test("all known models exist in models.json", () => { diff --git a/tests/runtime/runtime.test.ts b/tests/runtime/runtime.test.ts index 910e80bfd..4a862711a 100644 --- a/tests/runtime/runtime.test.ts +++ b/tests/runtime/runtime.test.ts @@ -16,9 +16,9 @@ import { type SSHServerConfig, } from "./ssh-fixture"; import { createTestRuntime, TestWorkspace, type RuntimeType } from "./test-helpers"; -import { execBuffered, readFileString, writeFileString } from "@/utils/runtime/helpers"; -import type { Runtime } from "@/runtime/Runtime"; -import { RuntimeError } from "@/runtime/Runtime"; +import { execBuffered, readFileString, writeFileString } from "@/node/utils/runtime/helpers"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { RuntimeError } from "@/node/runtime/Runtime"; // Skip all tests if TEST_INTEGRATION is not set const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip; diff --git a/tests/runtime/test-helpers.ts b/tests/runtime/test-helpers.ts index 9d85239de..c7eea3003 100644 --- a/tests/runtime/test-helpers.ts +++ b/tests/runtime/test-helpers.ts @@ -6,9 +6,9 @@ import * as fs from "fs/promises"; import { realpathSync } from "fs"; import * as os from "os"; import * as path from "path"; -import type { Runtime } from "@/runtime/Runtime"; -import { LocalRuntime } from "@/runtime/LocalRuntime"; -import { SSHRuntime } from "@/runtime/SSHRuntime"; +import type { Runtime } from "@/node/runtime/Runtime"; +import { LocalRuntime } from "@/node/runtime/LocalRuntime"; +import { SSHRuntime } from "@/node/runtime/SSHRuntime"; import type { SSHServerConfig } from "./ssh-fixture"; /** diff --git a/tests/testUtils.js b/tests/testUtils.js new file mode 100644 index 000000000..4146d5803 --- /dev/null +++ b/tests/testUtils.js @@ -0,0 +1,86 @@ +"use strict"; +/** + * Shared test utilities for integration tests + * + * This module handles: + * - Loading .env configuration for tests + * - Checking TEST_INTEGRATION flag + * - Validating required API keys + */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +exports.shouldRunIntegrationTests = shouldRunIntegrationTests; +exports.validateApiKeys = validateApiKeys; +exports.getApiKey = getApiKey; +const dotenv_1 = require("dotenv"); +const path = __importStar(require("path")); +// Load .env from project root on module import +// This runs once when the module is first imported +(0, dotenv_1.config)({ path: path.resolve(__dirname, "../.env"), quiet: true }); +/** + * Check if integration tests should run + * Tests are skipped if TEST_INTEGRATION env var is not set + */ +function shouldRunIntegrationTests() { + return process.env.TEST_INTEGRATION === "1"; +} +/** + * Validate required API keys are present + * Throws if TEST_INTEGRATION is set but API keys are missing + */ +function validateApiKeys(requiredKeys) { + if (!shouldRunIntegrationTests()) { + return; // Skip validation if not running integration tests + } + const missing = requiredKeys.filter((key) => !process.env[key]); + if (missing.length > 0) { + throw new Error(`Integration tests require the following environment variables: ${missing.join(", ")}\n` + + `Please set them or unset TEST_INTEGRATION to skip these tests.`); + } +} +/** + * Get API key from environment or throw if missing (when TEST_INTEGRATION is set) + */ +function getApiKey(keyName) { + if (!shouldRunIntegrationTests()) { + throw new Error("getApiKey should only be called when TEST_INTEGRATION is set"); + } + const value = process.env[keyName]; + if (!value) { + throw new Error(`Environment variable ${keyName} is required for integration tests`); + } + return value; +} +//# sourceMappingURL=testUtils.js.map \ No newline at end of file diff --git a/tests/testUtils.js.map b/tests/testUtils.js.map new file mode 100644 index 000000000..5b70e5e64 --- /dev/null +++ b/tests/testUtils.js.map @@ -0,0 +1 @@ +{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["testUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,mCAAgC;AAChC,MAAY,IAAI,iCAAa;AAE7B,+CAA+C;AAC/C,mDAAmD;AACnD,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAElE;;;GAGG;AACH,qCAAqD;IACnD,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG,CAAC;AAAA,CAC7C;AAED;;;GAGG;AACH,yBAAgC,YAAsB,EAAQ;IAC5D,IAAI,CAAC,yBAAyB,EAAE,EAAE,CAAC;QACjC,OAAO,CAAC,mDAAmD;IAC7D,CAAC;IAED,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAEhE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,kEAAkE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACtF,gEAAgE,CACnE,CAAC;IACJ,CAAC;AAAA,CACF;AAED;;GAEG;AACH,mBAA0B,OAAe,EAAU;IACjD,IAAI,CAAC,yBAAyB,EAAE,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,oCAAoC,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,KAAK,CAAC;AAAA,CACd","sourcesContent":["/**\n * Shared test utilities for integration tests\n *\n * This module handles:\n * - Loading .env configuration for tests\n * - Checking TEST_INTEGRATION flag\n * - Validating required API keys\n */\n\nimport { config } from \"dotenv\";\nimport * as path from \"path\";\n\n// Load .env from project root on module import\n// This runs once when the module is first imported\nconfig({ path: path.resolve(__dirname, \"../.env\"), quiet: true });\n\n/**\n * Check if integration tests should run\n * Tests are skipped if TEST_INTEGRATION env var is not set\n */\nexport function shouldRunIntegrationTests(): boolean {\n return process.env.TEST_INTEGRATION === \"1\";\n}\n\n/**\n * Validate required API keys are present\n * Throws if TEST_INTEGRATION is set but API keys are missing\n */\nexport function validateApiKeys(requiredKeys: string[]): void {\n if (!shouldRunIntegrationTests()) {\n return; // Skip validation if not running integration tests\n }\n\n const missing = requiredKeys.filter((key) => !process.env[key]);\n\n if (missing.length > 0) {\n throw new Error(\n `Integration tests require the following environment variables: ${missing.join(\", \")}\\n` +\n `Please set them or unset TEST_INTEGRATION to skip these tests.`\n );\n }\n}\n\n/**\n * Get API key from environment or throw if missing (when TEST_INTEGRATION is set)\n */\nexport function getApiKey(keyName: string): string {\n if (!shouldRunIntegrationTests()) {\n throw new Error(\"getApiKey should only be called when TEST_INTEGRATION is set\");\n }\n\n const value = process.env[keyName];\n if (!value) {\n throw new Error(`Environment variable ${keyName} is required for integration tests`);\n }\n\n return value;\n}\n"]} \ No newline at end of file diff --git a/tsconfig.main.json b/tsconfig.main.json index 489e5f627..566b966f3 100644 --- a/tsconfig.main.json +++ b/tsconfig.main.json @@ -2,6 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "module": "CommonJS", + "rootDir": "src", "outDir": "dist", "noEmit": false, "sourceMap": true @@ -11,13 +12,11 @@ "excludeFiles": ["**/*.d.ts.map"] }, "include": [ - "src/main.ts", - "src/main-server.ts", - "src/main-desktop.ts", - "src/constants/**/*", - "src/web/**/*", - "src/utils/main/**/*", - "src/types/**/*.d.ts" + "src/cli/index.ts", + "src/cli/server.ts", + "src/desktop/**/*", + "src/node/**/*", + "src/common/**/*" ], - "exclude": ["src/App.tsx", "src/main.tsx"] + "exclude": ["src/browser/**/*", "src/cli/debug/**/*"] } diff --git a/vscode/src/cmuxConfig.ts b/vscode/src/cmuxConfig.ts index 50ba2ff8f..2b03ea723 100644 --- a/vscode/src/cmuxConfig.ts +++ b/vscode/src/cmuxConfig.ts @@ -1,10 +1,10 @@ import * as path from "path"; import * as os from "os"; -import { Config } from "cmux/config"; -import type { WorkspaceMetadata } from "cmux/types/workspace"; -import { type ExtensionMetadata, readExtensionMetadata } from "cmux/utils/extensionMetadata"; -import { getProjectName } from "cmux/utils/runtime/helpers"; -import { createRuntime } from "cmux/runtime/runtimeFactory"; +import { Config } from "cmux/node/config"; +import type { WorkspaceMetadata } from "cmux/common/types/workspace"; +import { type ExtensionMetadata, readExtensionMetadata } from "cmux/node/utils/extensionMetadata"; +import { getProjectName } from "cmux/node/utils/runtime/helpers"; +import { createRuntime } from "cmux/node/runtime/runtimeFactory"; /** * Workspace with extension metadata for display in VS Code extension. diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts index efc5c0da5..2ff6d34f7 100644 --- a/vscode/src/extension.ts +++ b/vscode/src/extension.ts @@ -1,7 +1,7 @@ import * as vscode from "vscode"; import { getAllWorkspaces, WorkspaceWithContext } from "./cmuxConfig"; import { openWorkspace } from "./workspaceOpener"; -import { formatRelativeTime } from "cmux/utils/ui/dateTime"; +import { formatRelativeTime } from "cmux/browser/utils/ui/dateTime"; /** * Format workspace for display in QuickPick