diff --git a/desktop/package.json b/desktop/package.json index 8f548b26b..0c728445a 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -60,7 +60,7 @@ "devDependencies": { "@playwright/test": "^1.44.1", "@sveltejs/vite-plugin-svelte": "^4.0.0", - "@tauri-apps/cli": "^2.9.4", + "@tauri-apps/cli": "1.5.11", "@testing-library/jest-dom": "^6.9.1", "@testing-library/svelte": "^5.2.9", "@testing-library/user-event": "^14.5.2", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index 68fdc52a7..30d2f1cb4 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -104,3 +104,11 @@ assets = [ ["icons/128x128.png", "usr/share/icons/hicolor/128x128/apps/terraphim-ai.png", "644"], ["../../README.md", "usr/share/doc/terraphim-ai-desktop/README", "644"], ] + +[package.metadata.rpm] +requires = "$auto, webkit2gtk4.0, gtk3" +assets = [ + ["target/release/terraphim-ai-desktop", "/usr/bin/terraphim-ai-desktop", "755"], + ["icons/128x128.png", "/usr/share/icons/hicolor/128x128/apps/terraphim-ai.png", "644"], + ["../../README.md", "/usr/share/doc/terraphim-ai-desktop/README", "644"], +] diff --git a/desktop/yarn.lock b/desktop/yarn.lock index f79249f89..4fd59b6bc 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -725,77 +725,71 @@ resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.6.0.tgz#745b7e4e26782c3b2ad9510d558fa5bb2cf29186" integrity sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg== -"@tauri-apps/cli-darwin-arm64@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.9.4.tgz#08804e64cda29a212f346cdca60bf21b85421aa1" - integrity sha512-9rHkMVtbMhe0AliVbrGpzMahOBg3rwV46JYRELxR9SN6iu1dvPOaMaiC4cP6M/aD1424ziXnnMdYU06RAH8oIw== - -"@tauri-apps/cli-darwin-x64@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.9.4.tgz#4c8db3747d1f7bf2087ba168debb872675ea955b" - integrity sha512-VT9ymNuT06f5TLjCZW2hfSxbVtZDhORk7CDUDYiq5TiSYQdxkl8MVBy0CCFFcOk4QAkUmqmVUA9r3YZ/N/vPRQ== - -"@tauri-apps/cli-linux-arm-gnueabihf@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.9.4.tgz#a86da00beb32dc06c34da1d0a4cb30bec3c53f45" - integrity sha512-tTWkEPig+2z3Rk0zqZYfjUYcgD+aSm72wdrIhdYobxbQZOBw0zfn50YtWv+av7bm0SHvv75f0l7JuwgZM1HFow== - -"@tauri-apps/cli-linux-arm64-gnu@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.9.4.tgz#f3e4dc1285e7b8f630831d3d9163f9d23f83ff57" - integrity sha512-ql6vJ611qoqRYHxkKPnb2vHa27U+YRKRmIpLMMBeZnfFtZ938eao7402AQCH1mO2+/8ioUhbpy9R/ZcLTXVmkg== - -"@tauri-apps/cli-linux-arm64-musl@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.9.4.tgz#95adb1614411458321797faa1c05267b4b0f2f7f" - integrity sha512-vg7yNn7ICTi6hRrcA/6ff2UpZQP7un3xe3SEld5QM0prgridbKAiXGaCKr3BnUBx/rGXegQlD/wiLcWdiiraSw== - -"@tauri-apps/cli-linux-riscv64-gnu@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.9.4.tgz#0e3b8ae202545de5982a5c9e88e41810417fb57c" - integrity sha512-l8L+3VxNk6yv5T/Z/gv5ysngmIpsai40B9p6NQQyqYqxImqYX37pqREoEBl1YwG7szGnDibpWhidPrWKR59OJA== - -"@tauri-apps/cli-linux-x64-gnu@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.9.4.tgz#7ce6a43b8d8bcede78f4cd7b8123d98581d498ba" - integrity sha512-PepPhCXc/xVvE3foykNho46OmCyx47E/aG676vKTVp+mqin5d+IBqDL6wDKiGNT5OTTxKEyNlCQ81Xs2BQhhqA== - -"@tauri-apps/cli-linux-x64-musl@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.9.4.tgz#dbf05e7cc29752630dbc4966121eb63c9bc887ae" - integrity sha512-zcd1QVffh5tZs1u1SCKUV/V7RRynebgYUNWHuV0FsIF1MjnULUChEXhAhug7usCDq4GZReMJOoXa6rukEozWIw== - -"@tauri-apps/cli-win32-arm64-msvc@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.9.4.tgz#d9f1f5503fc4f3b773738b09378ae8a4d2d57021" - integrity sha512-/7ZhnP6PY04bEob23q8MH/EoDISdmR1wuNm0k9d5HV7TDMd2GGCDa8dPXA4vJuglJKXIfXqxFmZ4L+J+MO42+w== - -"@tauri-apps/cli-win32-ia32-msvc@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.9.4.tgz#fd5aa0a9c75d2bd107f63b05ee229224153b63b0" - integrity sha512-1LmAfaC4Cq+3O1Ir1ksdhczhdtFSTIV51tbAGtbV/mr348O+M52A/xwCCXQank0OcdBxy5BctqkMtuZnQvA8uQ== - -"@tauri-apps/cli-win32-x64-msvc@2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.9.4.tgz#6cf3ba230c688661324665a2f396cc5438bee22e" - integrity sha512-EdYd4c9wGvtPB95kqtEyY+bUR+k4kRw3IA30mAQ1jPH6z57AftT8q84qwv0RDp6kkEqOBKxeInKfqi4BESYuqg== - -"@tauri-apps/cli@^2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.9.4.tgz#ffa80bd12d7a1395d2ec0d42e8fc9c0af8fa02f6" - integrity sha512-pvylWC9QckrOS9ATWXIXcgu7g2hKK5xTL5ZQyZU/U0n9l88SEFGcWgLQNa8WZmd+wWIOWhkxOFcOl3i6ubDNNw== +"@tauri-apps/cli-darwin-arm64@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.11.tgz#a831f98f685148e46e8050dbdddbf4bcdda9ddc6" + integrity sha512-2NLSglDb5VfvTbMtmOKWyD+oaL/e8Z/ZZGovHtUFyUSFRabdXc6cZOlcD1BhFvYkHqm+TqGaz5qtPR5UbqDs8A== + +"@tauri-apps/cli-darwin-x64@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.5.11.tgz#0afae17fe1e84b9699a6b9824cd83b60c6ebfa59" + integrity sha512-/RQllHiJRH2fJOCudtZlaUIjofkHzP3zZgxi71ZUm7Fy80smU5TDfwpwOvB0wSVh0g/ciDjMArCSTo0MRvL+ag== + +"@tauri-apps/cli-linux-arm-gnueabihf@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.5.11.tgz#c46166d7f6c1022105a13d530b1d1336f628981f" + integrity sha512-IlBuBPKmMm+a5LLUEK6a21UGr9ZYd6zKuKLq6IGM4tVweQa8Sf2kP2Nqs74dMGIUrLmMs0vuqdURpykQg+z4NQ== + +"@tauri-apps/cli-linux-arm64-gnu@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.5.11.tgz#fd5c539a03371e0ab6cd00563dced1610ceb8943" + integrity sha512-w+k1bNHCU/GbmXshtAhyTwqosThUDmCEFLU4Zkin1vl2fuAtQry2RN7thfcJFepblUGL/J7yh3Q/0+BCjtspKQ== + +"@tauri-apps/cli-linux-arm64-musl@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.11.tgz#bf7f940c3aca981d7c240857a86568d5b6e8310f" + integrity sha512-PN6/dl+OfYQ/qrAy4HRAfksJ2AyWQYn2IA/2Wwpaa7SDRz2+hzwTQkvajuvy0sQ5L2WCG7ymFYRYMbpC6Hk9Pg== + +"@tauri-apps/cli-linux-x64-gnu@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.5.11.tgz#17323105e3863a3f36d51771e642e489037ba59b" + integrity sha512-MTVXLi89Nj7Apcvjezw92m7ZqIDKT5SFKZtVPCg6RoLUBTzko/BQoXYIRWmdoz2pgkHDUHgO2OMJ8oKzzddXbw== + +"@tauri-apps/cli-linux-x64-musl@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.11.tgz#83e22026771ec8ab094922ab114a7385532aa16c" + integrity sha512-kwzAjqFpz7rvTs7WGZLy/a5nS5t15QKr3E9FG95MNF0exTl3d29YoAUAe1Mn0mOSrTJ9Z+vYYAcI/QdcsGBP+w== + +"@tauri-apps/cli-win32-arm64-msvc@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.5.11.tgz#817874d230fdb09e7211013006a9a22f66ace573" + integrity sha512-L+5NZ/rHrSUrMxjj6YpFYCXp6wHnq8c8SfDTBOX8dO8x+5283/vftb4vvuGIsLS4UwUFXFnLt3XQr44n84E67Q== + +"@tauri-apps/cli-win32-ia32-msvc@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.5.11.tgz#dee1a00eb9e216415d9d6ab9386c35849613c560" + integrity sha512-oVlD9IVewrY0lZzTdb71kNXkjdgMqFq+ohb67YsJb4Rf7o8A9DTlFds1XLCe3joqLMm4M+gvBKD7YnGIdxQ9vA== + +"@tauri-apps/cli-win32-x64-msvc@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.11.tgz#c003ce00b36d056a8b08e0ecf4633c2bba00c497" + integrity sha512-1CexcqUFCis5ypUIMOKllxUBrna09McbftWENgvVXMfA+SP+yPDPAVb8fIvUcdTIwR/yHJwcIucmTB4anww4vg== + +"@tauri-apps/cli@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.5.11.tgz#02beb559b3b55836c90a1ba9121b3fc50e3760cd" + integrity sha512-B475D7phZrq5sZ3kDABH4g2mEoUIHtnIO+r4ZGAAfsjMbZCwXxR/jlMGTEL+VO3YzjpF7gQe38IzB4vLBbVppw== optionalDependencies: - "@tauri-apps/cli-darwin-arm64" "2.9.4" - "@tauri-apps/cli-darwin-x64" "2.9.4" - "@tauri-apps/cli-linux-arm-gnueabihf" "2.9.4" - "@tauri-apps/cli-linux-arm64-gnu" "2.9.4" - "@tauri-apps/cli-linux-arm64-musl" "2.9.4" - "@tauri-apps/cli-linux-riscv64-gnu" "2.9.4" - "@tauri-apps/cli-linux-x64-gnu" "2.9.4" - "@tauri-apps/cli-linux-x64-musl" "2.9.4" - "@tauri-apps/cli-win32-arm64-msvc" "2.9.4" - "@tauri-apps/cli-win32-ia32-msvc" "2.9.4" - "@tauri-apps/cli-win32-x64-msvc" "2.9.4" + "@tauri-apps/cli-darwin-arm64" "1.5.11" + "@tauri-apps/cli-darwin-x64" "1.5.11" + "@tauri-apps/cli-linux-arm-gnueabihf" "1.5.11" + "@tauri-apps/cli-linux-arm64-gnu" "1.5.11" + "@tauri-apps/cli-linux-arm64-musl" "1.5.11" + "@tauri-apps/cli-linux-x64-gnu" "1.5.11" + "@tauri-apps/cli-linux-x64-musl" "1.5.11" + "@tauri-apps/cli-win32-arm64-msvc" "1.5.11" + "@tauri-apps/cli-win32-ia32-msvc" "1.5.11" + "@tauri-apps/cli-win32-x64-msvc" "1.5.11" "@testing-library/dom@9.x.x || 10.x.x": version "10.4.1" diff --git a/memories.md b/memories.md index d2e2d1af4..da640ae76 100644 --- a/memories.md +++ b/memories.md @@ -1,5 +1,15 @@ # Memories - Terraphim AI Development +## Session: 2025-12-08 - Repo sync & Tauri build validation +- Pulled main (fast-forward to dd8a02d4); latest changes in `crates/haystack_discourse/Cargo.toml` and `scripts/ci-check-frontend.sh`. +- Open PRs reviewed: Tauri migration (#295 complete, #291 earlier), TUI build fix (#268), pre-commit/npm infra (#320), task_decomposition fix (#329), MCP auth/proxy (#287), KG schema linter (#294), CI 1Password secrets (#296); all still OPEN. +- Tauri build check on Linux with deb/rpm/appimage bundles failed: CLI `@tauri-apps/cli` 2.9.4 mismatches Rust crates/config still on Tauri 1.x, causing schema errors (`identifier` required, devPath/distDir unexpected). Need version alignment before packaging. + +## Session: 2025-12-08 (later) - Tauri CLI pinned & rebuild attempt +- Set `@tauri-apps/cli` to 1.5.11 and regenerated yarn.lock. +- Added `[package.metadata.rpm]` to `desktop/src-tauri/Cargo.toml` mirroring deb assets; requires `webkit2gtk4.0, gtk3`. +- `yarn tauri build --bundles deb rpm appimage --target x86_64-unknown-linux-gnu`: Rust build succeeded; `.deb` produced; AppImage failed because `appimagetool` is missing; rpm bundling not attempted after AppImage failure. Need `appimagetool` installed (or `TAURI_BUNDLE_APPIMAGE_BUNDLE_BIN` set) then rerun to produce rpm/appimage artifacts. + ## Session: 2025-10-08 - TruthForge Phase 5 UI Development (COMPLETE ✅) ### Context diff --git a/scratchpad.md b/scratchpad.md index 5fc1ba615..a2b12cf5a 100644 --- a/scratchpad.md +++ b/scratchpad.md @@ -1,5 +1,17 @@ # Scratchpad - Active Development Tasks +## 2025-12-08 - Repo sync & Tauri build check +- Pulled main (fast-forward to dd8a02d4); changes touched `crates/haystack_discourse/Cargo.toml` and `scripts/ci-check-frontend.sh`. +- Reviewed open PRs: Tauri migrations (#295 complete, #291 older), TUI build fix (#268), pre-commit/npm infra (#320), task_decomposition fix (#329), MCP auth (#287), KG schema linter (#294), 1Password CI secrets (#296); none merged yet. +- Tauri build status: `yarn tauri build --bundles deb rpm appimage` fails because devDependency `@tauri-apps/cli` is 2.9.4 while Rust crates/config are Tauri 1.x, so schema validation fails (`identifier` required, devPath/distDir unexpected). +- Next: align Tauri versions (either pin CLI to 1.x or land PR #295 migration), add rpm metadata if needed, then re-run build for deb/rpm/appimage on Linux. + +## 2025-12-08 (later) - Tauri CLI pinned and rebuild attempt +- Pinned `@tauri-apps/cli` to 1.5.11 and regenerated yarn.lock. +- Added `[package.metadata.rpm]` in `desktop/src-tauri/Cargo.toml` mirroring deb assets/requires. +- Re-ran `yarn tauri build --bundles deb rpm appimage --target x86_64-unknown-linux-gnu`. Deb built, AppImage failed due to missing `appimagetool`; rpm was not reached. +- Need to install `appimagetool` (or set TAURI_BUNDLE_APPIMAGE_BUNDLE_BIN) and re-run to get rpm/appimage artifacts; updater warning is expected because updater bundle not requested. + ## Current Session: ✅ Phase 1 Security Testing Complete - Ready for Phase 2 **Date**: October 18, 2025 (Continued from 2025-10-07)