fix race calling open before wallet-rpc ready

AGENTS.md

@@ -1,9 +1,10 @@
 # Instructions for AI assistants
 
 - Never commit changes unless explicitly told to do so. Always ask first or wait for the user's command.
-- "Apply the changes" / "apply it" / "do it" does NOT mean commit. It means make the file changes. Before any commit (main repo, tap repo, anywhere), stop and ask for explicit permission, and list which files will be committed. Wait for a clear "yes" / "commit it" before running `git commit`.
+- "Apply the changes" / "apply it" / "do it" does NOT mean commit. It means make the file changes. Before any commit (main repo, tap repo, anywhere), stop and ask for explicit permission, and list which files will be committed. Wait for a clear "yes" / "commit it" / "commit and push" before running `git commit`.
 - Never manually edit `.router/router.ts` — sv-router auto-generates it from the filesystem. Just create the route file in the correct filesystem location.
 - Only commit when explicitly told to do so. When asked to commit, always write a single simple line commit message.
 - When asked to publish, always rebuild the DMG first (`bun run build:stable` from `apps/desktop`), wait for notarization to complete, verify with `xcrun stapler validate`, then publish the fresh DMG. Never publish a stale build.
-- Never publish without explicit permission. Before any publish action — running `bun run build:stable`, `gh release upload`, updating the Homebrew cask, or pushing the tap repo — describe the intended action (what will be built, what SHA, which release) and ask for permission. Once you have asked and received a clear affirmative (any clear yes, "go", "publish", etc.), you may proceed — the affirmative applies to the action you described, and you must still pause before each subsequent publish step (e.g. upload, cask update) to ask for permission again.
-- At the end of every response, always surface a "Pending from you" section listing anything you need from the user (decisions, permissions, credentials, confirming a plan, etc.). If nothing is pending, say "Nothing pending."
+- Never publish without explicit permission. Before any publish action — running `bun run build:stable`, `gh release upload`, updating the Homebrew cask, or pushing the tap repo — describe the intended action (what will be built, what SHA, which release) and ask for permission. Once you have asked and received a clear affirmative (any clear yes, "go", "publish", etc.), you may proceed through the whole pipeline without pausing between steps: build, notarize, verify, upload to the GitHub release, update the Homebrew cask, and push the tap repo. One permission covers the entire publish flow. You must still get a separate permission before starting each new publish cycle.
+- Permission to commit ("commit", "commit and push", or similar) authorizes `git commit` and also `git push` of the committed changes. Only push the branches/files described in the permission.
+- At the end of every response, always surface a "Pending from you" section listing anything you need from the user (decisions, permissions, credentials, confirming a plan, etc.). If nothing is pending, say "Nothing pending." List each pending item as a numbered entry (`1.`, `2.`, …) so the user can approve or act on them by number (e.g. "go ahead with 1, 2").

apps/desktop/electrobun.config.ts

@@ -4,7 +4,7 @@ export default {
 	app: {
 		name: 'koins',
 		identifier: 'koins.tzgyn.com',
-		version: '0.0.3',
+		version: '0.0.6',
 	},
 	build: {
 		// Vite builds to dist/, we copy from there

apps/desktop/src/bun/lib/monero/wallet.ts

@@ -1,11 +1,7 @@
-import {
-	MoneroWalletRpc,
-	MoneroRpcConnection,
-	connectToWalletRpc,
-	connectToDaemonRpc,
-} from 'monero-ts'
+import { MoneroWalletRpc, MoneroRpcConnection, connectToWalletRpc, connectToDaemonRpc } from 'monero-ts'
 import { getBinaryPath, getWalletDir } from './binary'
 import { existsSync, readdirSync } from 'fs'
+import { log, logError } from '../logger'
 
 const DEFAULT_DAEMON = 'xmr-node.cakewallet.com:18081'
 
@@ -65,20 +61,13 @@ async function waitForRpc(
 	let lastErr = ''
 	while (Date.now() - start < timeoutMs) {
 		try {
-			await Bun.connect({
-				hostname: '127.0.0.1',
-				port: state.rpcPort,
-				socket: {
-					open(s) {
-						s.end()
-					},
-					close() {},
-					data() {},
-					error() {},
-				},
-			})
-			console.log(`[monero] RPC ready after ${Date.now() - start}ms`)
-			return
+			const conn = rpcConnection(state)
+			const res = await conn.sendJsonRequest('get_version', {})
+			if (res?.result?.version) {
+				console.log(`[monero] RPC ready after ${Date.now() - start}ms`)
+				return
+			}
+			lastErr = JSON.stringify(res)
 		} catch (e) {
 			lastErr = String(e)
 		}
@@ -89,6 +78,28 @@ async function waitForRpc(
 	)
 }
 
+async function connectClient(
+	state: MoneroWalletState,
+): Promise<MoneroWalletRpc> {
+	let lastErr = ''
+	for (let attempt = 1; attempt <= 3; attempt++) {
+		try {
+			const client = (await connectToWalletRpc(
+				rpcUrl(state),
+				state.rpcUser,
+				state.rpcPassword,
+			)) as MoneroWalletRpc
+			console.log(`[monero] MoneroWalletRpc connected (attempt ${attempt})`)
+			return client
+		} catch (e) {
+			lastErr = String(e)
+			console.log(`[monero] connectToWalletRpc attempt ${attempt} failed:`, e)
+			if (attempt < 3) await new Promise((r) => setTimeout(r, 1000))
+		}
+	}
+	throw new Error(`Failed to connect to monero-wallet-rpc: ${lastErr}`)
+}
+
 export async function start(
 	state: MoneroWalletState,
 	daemonAddress: string = DEFAULT_DAEMON,
@@ -169,6 +180,9 @@ export async function start(
 				`[monero] wallet-rpc process exited with code ${exitCode}`,
 				error?.message ?? '',
 			)
+			log(
+				`[monero] wallet-rpc process exited with code ${exitCode} ${error?.message ?? ''}`,
+			)
 			if (state.saveTimer) {
 				clearInterval(state.saveTimer)
 				state.saveTimer = null
@@ -222,12 +236,9 @@ export async function start(
 	console.log(`[monero] RPC server is ready`)
 
 	console.log(`[monero] connecting MoneroWalletRpc client...`)
-	state.wallet = (await connectToWalletRpc(
-		rpcUrl(state),
-		state.rpcUser,
-		state.rpcPassword,
-	)) as MoneroWalletRpc
+	state.wallet = await connectClient(state)
 	console.log(`[monero] MoneroWalletRpc connected successfully`)
+	log(`[monero] wallet-rpc started, RPC ready`)
 }
 
 export async function stop(state: MoneroWalletState) {
@@ -241,21 +252,21 @@ export async function stop(state: MoneroWalletState) {
 		if (state.wallet) {
 			await rawRpc(state, 'store')
 			console.log(`[monero] wallet saved before stop`)
+			log(`[monero] wallet saved before stop`)
 		}
 	} catch (e) {
 		console.log(`[monero] wallet save before stop failed:`, e)
 	}
 	if (state.process) {
-		console.log(
-			`[monero] sending SIGTERM to wallet-rpc (pid ${state.process.pid})`,
-		)
-		state.process.kill()
-		await Promise.race([state.process.exited, sleep(3000)])
-		if (state.process.exitCode === null) {
+		const proc = state.process
+		console.log(`[monero] sending SIGTERM to wallet-rpc (pid ${proc.pid})`)
+		proc.kill()
+		await Promise.race([proc.exited, sleep(3000)])
+		if (proc.exitCode === null) {
 			console.log(
 				`[monero] wallet-rpc did not exit gracefully, sending SIGKILL`,
 			)
-			state.process.kill('SIGKILL')
+			proc.kill('SIGKILL')
 		}
 		state.process = null
 	}
@@ -310,9 +321,20 @@ export async function openWallet(
 	password: string,
 ) {
 	console.log(`[monero] opening wallet: ${name}`)
-	if (!state.wallet) throw new Error('Wallet RPC not started')
-	await state.wallet.openWallet(name, password)
-	console.log(`[monero] wallet opened: ${name}`)
+	// Self-heal: the client connection may have been lost while the
+	// wallet-rpc process is still running (e.g. stale-process cleanup).
+	if (!state.wallet) {
+		if (!state.process) throw new Error('Wallet RPC not started')
+		log(`[monero] reconnecting wallet client before open (${name})`)
+		state.wallet = await connectClient(state)
+	}
+	try {
+		await state.wallet.openWallet(name, password)
+		log(`[monero] wallet opened: ${name}`)
+	} catch (e) {
+		logError(`[monero] wallet open failed (${name})`, e)
+		throw e
+	}
 }
 
 export async function closeWallet(state: MoneroWalletState) {

apps/desktop/src/bun/rpc/monero/index.ts

@@ -24,6 +24,7 @@ import {
 	isConnected,
 } from '../../lib/monero'
 import type { MoneroWalletState } from '../../lib/monero'
+import { log, logError } from '../../lib/logger'
 
 export function createMoneroHandlers(state: {
 	manager: MoneroWalletState | null
@@ -64,10 +65,12 @@ export function createMoneroHandlers(state: {
 				await walletStart(state.manager, daemonAddress)
 			} catch (e) {
 				console.log('[rpc] moneroStart error:', e)
+				logError('[rpc] moneroStart error', e)
 				return { running: false, walletOpen: false, connected: false }
 			}
 			const connected = await isConnected(state.manager)
 			console.log('[rpc] moneroStart complete, connected:', connected)
+			log(`[rpc] moneroStart complete, connected: ${connected}`)
 			return { running: true, walletOpen: false, connected }
 		},
 		moneroStop: async () => {
@@ -129,7 +132,13 @@ export function createMoneroHandlers(state: {
 			console.log('[rpc] moneroOpenWallet:', name)
 			if (!state.manager)
 				throw new Error('Monero wallet RPC not started')
-			await walletOpen(state.manager, name, password)
+			try {
+				await walletOpen(state.manager, name, password)
+				log(`[rpc] moneroOpenWallet ok: ${name}`)
+			} catch (e) {
+				logError(`[rpc] moneroOpenWallet failed (${name})`, e)
+				throw e
+			}
 		},
 		moneroGetBalance: async () => {
 			console.log('[rpc] moneroGetBalance')

apps/desktop/src/lib/states/monero-wallet.svelte.ts

@@ -95,11 +95,21 @@ export const MoneroWallet = () => {
 		if (loginInFlight) return loginInFlight
 		loginInFlight = (async () => {
 			accountType = 'monero'
+			error = ''
 			beginOpening()
 			try {
 				if (installed && !running) {
 					await start()
 					await checkStatus()
+				} else if (startInFlight) {
+					// a start is already in flight (e.g. triggered by init);
+					// wait for it so we don't call open before the server is up
+					await startInFlight.catch(() => {})
+					await checkStatus()
+				}
+				if (!running) {
+					error = 'Wallet server failed to start. Please try again.'
+					return
 				}
 				await listWallets()
 				if (wallets.length > 0) {

apps/desktop/src/routes/index.svelte

@@ -22,6 +22,7 @@
 	let xrpBalances = $state<Record<string, { balance: number; funded: boolean }>>({})
 	let loadingXrp = $state(true)
 	let loadingXmr = $state(true)
+	let fetchXrpInFlight = false
 
 	let feError = $state<string | null>(null)
 
@@ -70,10 +71,13 @@
 		})
 
 	async function fetchXrp() {
+		if (fetchXrpInFlight) return
+		fetchXrpInFlight = true
 		loadingXrp = true
 		const rpc = electrobun.rpc
 		if (!rpc) {
 			loadingXrp = false
+			fetchXrpInFlight = false
 			return
 		}
 		try {
@@ -92,6 +96,7 @@
 			}),
 		)
 		loadingXrp = false
+		fetchXrpInFlight = false
 	}
 
 	async function fetchXmr() {
@@ -111,12 +116,17 @@
 	onMount(() => {
 		frontendLog('dashboard mounted')
 		moneroWallet.init().catch((e) => frontendLogError('moneroWallet.init() failed', e))
-		xrpWallet.init().then(async () => {
-			await fetchXrp()
-		})
+		xrpWallet.init().catch((e) => frontendLogError('xrpWallet.init() failed', e))
 		fetchXmr()
 	})
 
+	// Wait for the XRP wallet list to load, then fetch balances.
+	$effect(() => {
+		if (xrpWallet.ready && xrpWallet.wallets.length > 0) {
+			fetchXrp()
+		}
+	})
+
 	$effect(() => {
 		if (moneroWallet.walletOpen) {
 			fetchXmr()
@@ -205,7 +215,7 @@
 						</CardDescription>
 					</CardHeader>
 					<CardContent class="flex flex-1 flex-col justify-center">
-						{#if loadingXrp}
+						{#if !xrpWallet.ready || loadingXrp || (xrpWallet.wallets.length > 0 && Object.keys(xrpBalances).length === 0)}
 							<div class="h-14 flex items-center"><Loader /></div>
 						{:else}
 							<p class="font-mono text-xl tabular-nums">{fmtBal(xrpTotalBalance)}</p>