feat(ui-desktop): modernize chat UX + fix install, runtime, and orchestrator regressions

Author: alex-sandrk

proxy-router/internal/aiengine/ai_engine.go

@@ -72,12 +72,17 @@ func (a *AiEngine) GetAdapter(ctx context.Context, chatID, modelID, sessionID co
 
 	if storeChatContext {
 		var actualModelID common.Hash
-		if modelID == (common.Hash{}) {
-			modelID, err := a.service.GetModelIdSession(ctx, sessionID)
+		// Only recover modelID from the session when we actually have one.
+		// `modelID == zero` is the legitimate identifier for the bundled
+		// local (tinyllama) model, so we must not treat zero as "missing"
+		// when there's no session to look up — that path returns
+		// "session not found" and breaks local chats.
+		if modelID == (common.Hash{}) && sessionID != (common.Hash{}) {
+			recoveredModelID, err := a.service.GetModelIdSession(ctx, sessionID)
 			if err != nil {
 				return nil, err
 			}
-			actualModelID = modelID
+			actualModelID = recoveredModelID
 		} else {
 			actualModelID = modelID
 		}

ui-desktop/.env.example

@@ -3,24 +3,27 @@
 
 # MAINNET VALUES - BASE Mainnet
 CHAIN_ID=8453
+CHAIN_NAME=Base
 COOKIE_FILE_PATH=./.cookie
 DIAMOND_ADDRESS=0x6aBE1d282f72B474E54527D93b979A4f64d3030a
-CHAIN_NAME=Base
 EXPLORER_URL=https://basescan.org/tx/{{hash}}
 TOKEN_ADDRESS=0x7431ada8a591c955a994a21710752ef9b882b8e3
 DEV_TOOLS=false
 SYMBOL_ETH=ETH # remove it
 SYMBOL_COIN=MOR # remove it
+BLOCKSCOUT_API_URL="https://base.blockscout.com/api/v2"
 
 # TESTNET VALUES
 #CHAIN_ID=84532
+#CHAIN_NAME=Base Sepolia
 #DIAMOND_ADDRESS=0x6e4d0B775E3C3b02683A6F277Ac80240C4aFF930
 #DISPLAY_NAME=Base Sepolia
 #EXPLORER_URL=https://sepolia.basescan.org/tx/{{hash}}
 #TOKEN_ADDRESS=0x5C80Ddd187054E1E4aBBfFCD750498e81d34FfA3
 #DEV_TOOLS=true
 #SYMBOL_ETH=ETH
 #SYMBOL_COIN=MOR
+#BLOCKSCOUT_API_URL="https://base-sepolia.blockscout.com/api/v2"
 
 # COMMON
 BYPASS_AUTH=false

ui-desktop/electron.vite.config.ts

@@ -3,15 +3,9 @@ import { defineConfig, externalizeDepsPlugin, loadEnv } from 'electron-vite'
 import react from '@vitejs/plugin-react'
 import svgr from 'vite-plugin-svgr'
 import { nodePolyfills } from 'vite-plugin-node-polyfills'
-import { Env, EnvSchema } from './env.schema'
+import { EnvSchema } from './env.schema'
 import { newAjv } from './validator'
 
-declare global {
-  namespace NodeJS {
-    interface ProcessEnv extends Env {}
-  }
-}
-
 const envsToInject = Object.keys(EnvSchema.properties)
 
 export default defineConfig(({ /*command,*/ mode }) => {
@@ -63,8 +57,13 @@ export default defineConfig(({ /*command,*/ mode }) => {
     preload: {
       build: {
         rollupOptions: {
+          // CJS for the preload script. Electron 28's ESM preload support is
+          // patchy (notably, the bundled sandbox bootstrap fails with
+          // "object null is not iterable"). CJS sidesteps the whole CJS↔ESM
+          // interop issue around `electron` named imports and just works.
           output: {
-            format: 'es'
+            format: 'cjs',
+            entryFileNames: '[name].js'
           }
         }
       },

ui-desktop/env.schema.ts

@@ -45,3 +45,12 @@ export const EnvSchema = Type.Object({
 
 // Inferred type of environment variables
 export type Env = Static<typeof EnvSchema>
+
+// Augment `process.env` with the validated/typed env so config-reading code
+// (both main and renderer) sees the correct types. Validation in
+// `electron.vite.config.ts` is what makes this safe at runtime.
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv extends Env {}
+  }
+}

ui-desktop/orchestrator.config.ts

@@ -37,7 +37,7 @@ const configMacArm = {
       buildLocalModelsConfig(
         'tiny-llama-1.1B-chat',
         'openai',
-        `http://localhost:${process.env.SERVICE_AI_API_PORT}/v1`
+        `http://localhost:${process.env.SERVICE_AI_API_PORT}/v1/chat/completions`
       )
     ),
     ratingConfig: JSON.stringify(buildLocalRatingConfig()),

ui-desktop/package.json

@@ -39,10 +39,13 @@
     "pkg": "electron-builder --config electron.builder.config.ts --mac"
   },
   "dependencies": {
-    "@electron-toolkit/preload": "^3.0.0",
+    "@electron-toolkit/preload": "^2.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@electron/remote": "^2.1.2",
-    "@reach/menu-button": "^0.18.0",
+    "@ethereumjs/wallet": "^10.0.0",
+    "@paralleldrive/cuid2": "^3.3.0",
+    "@popperjs/core": "^2.11.8",
+    "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@sinclair/typebox": "^0.34.33",
     "@tabler/icons-react": "^3.1.0",
     "@types/tar-stream": "^3.1.3",
@@ -55,7 +58,6 @@
     "chalk": "^5.3.0",
     "credential-plus": "^2.0.7",
     "credential-plus-pbkdf2": "^2.0.4",
-    "cuid": "^3.0.0",
     "dotenv": "^16.4.5",
     "electron-context-menu": "^3.6.1",
     "electron-debug": "^3.2.0",
@@ -65,7 +67,7 @@
     "electron-settings": "^4.0.2",
     "electron-updater": "^6.1.7",
     "electron-window-state": "^5.0.3",
-    "ethereumjs-wallet": "^1.0.2",
+    "framer-motion": "^12.38.0",
     "json-stringify-safe": "^5.0.1",
     "keytar": "^7.9.0",
     "lodash.debounce": "^4.0.8",
@@ -80,20 +82,18 @@
     "react-markdown": "^9.0.1",
     "react-modal": "^3.16.1",
     "react-modern-drawer": "^1.2.2",
-    "react-motion": "^0.5.2",
     "react-redux": "^9.1.0",
     "react-router-dom": "7.1.5",
     "react-select": "^5.8.0",
     "react-simple-image-viewer": "^1.2.2",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.3",
     "react-virtualized": "9.22.6",
-    "redux": "4.2.0",
+    "redux": "^5.0.1",
     "redux-actions": "2.3.0",
     "reselect": "^5.1.0",
     "styled-components": "4.1.2",
     "tar-stream": "^3.1.7",
-    "universal-analytics": "^0.5.3",
     "web3-utils": "1.10.4",
     "yauzl": "^3.2.0",
     "zxcvbn3": "^0.1.1"
@@ -112,8 +112,9 @@
     "@types/styled-components": "^5.1.34",
     "@types/yauzl": "^2.10.3",
     "@vitejs/plugin-react": "^4.2.1",
+    "babel-plugin-styled-components": "^2.1.4",
     "electron": "^28.2.0",
-    "electron-builder": "^26.0.12",
+    "electron-builder": "26.0.12",
     "electron-vite": "^2.3.0",
     "eslint": "^8.56.0",
     "eslint-plugin-react": "^7.33.2",

ui-desktop/src/main/analytics.js

@@ -24,7 +24,7 @@ function createWindow(): void {
     autoHideMenuBar: true,
     // ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
-      preload: join(__dirname, '../preload/index.mjs'),
+      preload: join(__dirname, '../preload/index.js'),
       sandbox: false
     }
   })

ui-desktop/src/main/index.ts

@@ -0,0 +1,3 @@
+// Re-export shim. The renderer imports orchestrator types from this path
+// historically; the real definitions live in `./orchestrator/orchestrator.types`.
+export * from './orchestrator/orchestrator.types'

ui-desktop/src/main/orchestrator.types.ts

@@ -25,6 +25,12 @@ export class Orchestrator {
   private cfg: OrchestratorConfig
   private log: typeof logger
 
+  // Mutex-style guard: ensures only one startAll pipeline is in flight at a
+  // time. Re-entrant callers (e.g. an auto-resume after a successful
+  // restartService while the initial startAll hasn't returned yet) await the
+  // existing promise instead of racing a second pipeline.
+  private startInProgress: Promise<void> | null = null
+
   private proxyDownloadState: DownloadItem = {
     name: 'Proxy Router',
     status: 'pending',
@@ -63,7 +69,20 @@ export class Orchestrator {
     })
   }
 
-  async startAll() {
+  async startAll(): Promise<void> {
+    if (this.startInProgress) {
+      this.log.info('startAll already in progress; awaiting existing run')
+      return this.startInProgress
+    }
+    this.startInProgress = this.runStartupPipeline()
+    try {
+      await this.startInProgress
+    } finally {
+      this.startInProgress = null
+    }
+  }
+
+  private async runStartupPipeline() {
     this.log.info('Orchestrator started')
     await this.resetState()
     this.emitStateUpdate()
@@ -86,7 +105,7 @@ export class Orchestrator {
     this.proxyDownloadState.status = 'success'
     this.emitStateUpdate()
 
-    if (this.cfg.aiRuntime.downloadUrl) {
+    if (this.cfg.aiRuntime.downloadUrl && this.cfg.aiRuntime.extractPath) {
       if (fs.existsSync(resolveAppDataPath(this.cfg.aiRuntime.extractPath))) {
         this.log.info(
           'AI runtime already exists, skipping download',
@@ -146,6 +165,7 @@ export class Orchestrator {
 
     if (
       this.cfg.ipfs.downloadUrl &&
+      this.cfg.ipfs.extractPath &&
       !fs.existsSync(resolveAppDataPath(this.cfg.ipfs.extractPath))
     ) {
       await downloadFile(
@@ -225,7 +245,7 @@ export class Orchestrator {
     const proxyFolder = path.dirname(resolveAppDataPath(this.cfg.proxyRouter.runPath))
 
     // writting local config files if not exist
-    await this.writeEnvFile(path.join(proxyFolder, '.env'), this.cfg.proxyRouter.env)
+    await this.writeEnvFile(path.join(proxyFolder, '.env'), this.cfg.proxyRouter.env ?? {})
     await this.writeLocalConfigFile(
       path.join(proxyFolder, 'models-config.json'),
       this.cfg.proxyRouter.modelsConfig
@@ -286,8 +306,39 @@ export class Orchestrator {
     await process.stop()
     this.emitStateUpdate()
 
-    await process.start()
-    this.emitStateUpdate()
+    try {
+      await process.start()
+    } finally {
+      this.emitStateUpdate()
+    }
+
+    // If the original startAll pipeline aborted before reaching downstream
+    // services (e.g. IPFS failed, so containerRuntime + proxyRouter were
+    // never started), resume the pipeline now that this service is healthy.
+    // startAll is idempotent: downloads check fs.exists, and each process's
+    // start() short-circuits when already running.
+    if (process.getState() === 'running' && !this.allServicesRunning()) {
+      this.log.info(
+        `Service ${service} restarted; resuming startup pipeline for any downstream services still pending`
+      )
+      try {
+        await this.startAll()
+      } catch (err) {
+        this.log.error('Resume after restart failed', err)
+        // Don't rethrow — the explicit restart did succeed; downstream
+        // failures are surfaced via the per-service state.
+      }
+    }
+  }
+
+  private allServicesRunning(): boolean {
+    const all = [
+      this.ipfsProcess,
+      this.aiRuntimeProcess,
+      this.containerRuntimeProcess,
+      this.proxyRouterProcess
+    ]
+    return all.every((p) => p?.getState() === 'running')
   }
 
   async ping(service: keyof OrchestratorConfig): Promise<boolean> {
@@ -435,21 +486,29 @@ export class Orchestrator {
   }
 
   private async resetState() {
+    // Only reset processes that aren't already running. This preserves the
+    // healthy ones across a resume (e.g. when restartService kicks off a
+    // pipeline re-run, we don't want to flap IPFS / AI Runtime).
     this.proxyRouterProcess?.getState() !== 'running' && (await this.proxyRouterProcess?.reset())
     this.aiRuntimeProcess?.getState() !== 'running' && (await this.aiRuntimeProcess?.reset())
     this.ipfsProcess?.getState() !== 'running' && (await this.ipfsProcess?.reset())
     this.containerRuntimeProcess?.getState() !== 'running' &&
       (await this.containerRuntimeProcess?.reset())
 
-    this.proxyDownloadState.error = undefined
-    this.aiRuntimeDownloadState.error = undefined
-    this.aiModelDownloadState.error = undefined
-    this.ipfsDownloadState.error = undefined
-
-    this.proxyDownloadState.status = 'pending'
-    this.aiRuntimeDownloadState.status = 'pending'
-    this.aiModelDownloadState.status = 'pending'
-    this.ipfsDownloadState.status = 'pending'
+    // Preserve `success` download statuses across resume so the UI doesn't
+    // flash completed bars back to pending. Clear errors regardless — they
+    // belong to the previous attempt.
+    for (const dl of [
+      this.proxyDownloadState,
+      this.aiRuntimeDownloadState,
+      this.aiModelDownloadState,
+      this.ipfsDownloadState
+    ]) {
+      dl.error = undefined
+      if (dl.status !== 'success') {
+        dl.status = 'pending'
+      }
+    }
   }
 }