Skip to content

Open-source platform for 3D AI agents. Turn text or a photo into a rigged, animated GLB avatar, give it an LLM brain, memory and a wallet, and embed it anywhere with one web component. Remote MCP server, x402 payments, Three.js, browser-native.

fix(forge-desktop): build the dev Python env from the staged runtime and let users retry a failed three.ws connection

nirholas187d28f05505
diff --git a/apps/forge-desktop/api/uv_unwrapper/uv_unwrapper/csrc/bvh.h b/apps/forge-desktop/api/uv_unwrapper/uv_unwrapper/csrc/bvh.h
index 91f48f4f7..036c17277 100644
--- a/apps/forge-desktop/api/uv_unwrapper/uv_unwrapper/csrc/bvh.h
+++ b/apps/forge-desktop/api/uv_unwrapper/uv_unwrapper/csrc/bvh.h
@@ -26,7 +26,6 @@ struct alignas(32) Triangle {
uv_float2 centroid;
bool overlaps(const Triangle &other) {
- // return tri_tri_overlap_test_2d(v0, v1, v2, other.v0, other.v1, other.v2);
return triangle_triangle_intersection(v0, v1, v2, other.v0, other.v1,
other.v2);
}
diff --git a/apps/forge-desktop/electron/main/python-setup.ts b/apps/forge-desktop/electron/main/python-setup.ts
index be787aea9..cbf2b8429 100644
--- a/apps/forge-desktop/electron/main/python-setup.ts
+++ b/apps/forge-desktop/electron/main/python-setup.ts
@@ -318,9 +318,12 @@ export async function runFullSetup(win: BrowserWindow, userData: string): Promis
const venvPython = getVenvPythonExe(userData)
await installRequirements(venvPython, requirementsPath, win)
} else {
- // Linux / macOS dev: use system Python
+ // Linux / macOS dev: prefer the runtime `npm run prepare-resources` staged
+ // (it always carries ensurepip, which Debian's system Python lacks), and
+ // fall back to system Python when it has not been downloaded.
win.webContents.send('setup:progress', { step: 'venv', percent: 5 })
- const python3 = findSystemPython()
+ const embedded = getEmbeddedPythonExe()
+ const python3 = existsSync(embedded) ? embedded : findSystemPython()
await createVenv(python3, venvDir, win)
const venvPython = getVenvPythonExe(userData)
await installRequirements(venvPython, requirementsPath, win)
diff --git a/apps/forge-desktop/eslint.config.mjs b/apps/forge-desktop/eslint.config.mjs
index acc2a489c..43d8af574 100644
--- a/apps/forge-desktop/eslint.config.mjs
+++ b/apps/forge-desktop/eslint.config.mjs
@@ -18,7 +18,7 @@ export default tseslint.config(
},
js.configs.recommended,
...tseslint.configs.recommended,
- // Renderer (React, browser environment)
+ // The renderer is React running in a browser environment.
{
files: ['src/**/*.{ts,tsx}'],
plugins: { 'react-hooks': reactHooks },
diff --git a/apps/forge-desktop/scripts/release-manifest.mjs b/apps/forge-desktop/scripts/release-manifest.mjs
index d12fc82ff..16573c31e 100644
--- a/apps/forge-desktop/scripts/release-manifest.mjs
+++ b/apps/forge-desktop/scripts/release-manifest.mjs
@@ -24,7 +24,8 @@ export const DEFAULT_BASE_URL = 'https://three.ws/releases/forge';
// Electron 42 supports macOS 12 and later and Windows 10 and later. The mac
// build is arm64 only because the bundled CPython is per-architecture. Local
-// GPU generation additionally needs an NVIDIA GPU (CUDA) or Apple silicon;
+// GPU generation additionally needs an NVIDIA GPU (CUDA), an AMD Radeon GPU
+// (ROCm, Windows and Linux) or Apple silicon;
// cloud generation runs on any of these.
export const MINIMUM_OS = {
mac: 'macOS 12 Monterey or later on Apple silicon',
diff --git a/apps/forge-desktop/src/areas/settings/components/ThreeWsSection.tsx b/apps/forge-desktop/src/areas/settings/components/ThreeWsSection.tsx
index c08b9d52d..67eca703a 100644
--- a/apps/forge-desktop/src/areas/settings/components/ThreeWsSection.tsx
+++ b/apps/forge-desktop/src/areas/settings/components/ThreeWsSection.tsx
@@ -246,7 +246,9 @@ export function ThreeWsSection(): JSX.Element {
const account = useThreeWsStore((s) => s.account)
const loading = useThreeWsStore((s) => s.loading)
const error = useThreeWsStore((s) => s.error)
+ const errorRetryable = useThreeWsStore((s) => s.errorRetryable)
const refresh = useThreeWsStore((s) => s.refresh)
+ const dismissError = useThreeWsStore((s) => s.dismissError)
useEffect(() => { void refresh() }, [refresh])
@@ -255,7 +257,11 @@ export function ThreeWsSection(): JSX.Element {
{error && (
<div role="alert" className="mb-4 px-4 py-3 rounded-lg bg-red-500/10 border border-red-500/20 text-xs text-red-300 flex items-center justify-between gap-4">
<span>{error}</span>
- <button type="button" onClick={() => void refresh()} className="shrink-0 text-red-200 hover:underline">Retry</button>
+ {errorRetryable ? (
+ <button type="button" onClick={() => void refresh()} className="shrink-0 text-red-200 hover:underline">Retry</button>
+ ) : (
+ <button type="button" onClick={dismissError} className="shrink-0 text-red-200 hover:underline">Dismiss</button>
+ )}
</div>
)}
{account === null && loading ? (
diff --git a/apps/forge-desktop/src/shared/stores/threeWsStore.ts b/apps/forge-desktop/src/shared/stores/threeWsStore.ts
index 6811e3ecc..2ded3c8ae 100644
--- a/apps/forge-desktop/src/shared/stores/threeWsStore.ts
+++ b/apps/forge-desktop/src/shared/stores/threeWsStore.ts
@@ -13,8 +13,11 @@ interface ThreeWsStore {
account: ThreeWsAccount | null
loading: boolean
error: string | null
+ /** True when `error` came from reading the account, which a retry can fix. */
+ errorRetryable: boolean
link: LinkState
refresh: () => Promise<void>
+ dismissError: () => void
startLink: () => Promise<void>
cancelLink: () => Promise<void>
signInWithKey: (key: string) => Promise<boolean>
@@ -29,7 +32,7 @@ export const useThreeWsStore = create<ThreeWsStore>((set, get) => {
listening = true
window.electron.threews.onLinkResult((result) => {
if (result.ok) set({ account: result.value, error: null, link: { status: 'idle' } })
- else set({ error: result.error, link: { status: 'idle' } })
+ else set({ error: result.error, errorRetryable: false, link: { status: 'idle' } })
})
}
@@ -37,6 +40,7 @@ export const useThreeWsStore = create<ThreeWsStore>((set, get) => {
account: null,
loading: false,
error: null,
+ errorRetryable: false,
link: { status: 'idle' },
refresh: async () => {
@@ -44,15 +48,17 @@ export const useThreeWsStore = create<ThreeWsStore>((set, get) => {
set({ loading: true })
const result = await window.electron.threews.account()
if (result.ok) set({ account: result.value, loading: false, error: null })
- else set({ loading: false, error: result.error })
+ else set({ loading: false, error: result.error, errorRetryable: true })
},
+ dismissError: () => set({ error: null }),
+
startLink: async () => {
listen()
set({ link: { status: 'starting' }, error: null })
const result = await window.electron.threews.startLink()
if (result.ok) set({ link: { status: 'waiting', link: result.value, startedAt: Date.now() } })
- else set({ link: { status: 'idle' }, error: result.error })
+ else set({ link: { status: 'idle' }, error: result.error, errorRetryable: false })
},
cancelLink: async () => {
@@ -67,7 +73,7 @@ export const useThreeWsStore = create<ThreeWsStore>((set, get) => {
set({ account: result.value, loading: false })
return true
}
- set({ loading: false, error: result.error })
+ set({ loading: false, error: result.error, errorRetryable: false })
return false
},
@@ -75,7 +81,7 @@ export const useThreeWsStore = create<ThreeWsStore>((set, get) => {
if (get().link.status !== 'idle') await get().cancelLink()
const result = await window.electron.threews.signOut()
if (result.ok) set({ account: result.value, error: null })
- else set({ error: result.error })
+ else set({ error: result.error, errorRetryable: false })
},
}
})