diff --git a/app/_layout.tsx b/app/_layout.tsx
index 95fdec4..84aae37 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -6,18 +6,18 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
import { OpenCodeProvider, useOpenCode } from '../src/providers/OpenCodeProvider';
function AuthRedirect({ children }: { children: React.ReactNode }) {
- const { connected, connecting, connect } = useOpenCode();
+ const { connected, connecting, connect, storageReady, hasSavedServerUrl } = useOpenCode();
const segments = useSegments();
const router = useRouter();
const [autoConnectAttempted, setAutoConnectAttempted] = useState(false);
// Auto-connect on mount
useEffect(() => {
- if (!autoConnectAttempted) {
+ if (!autoConnectAttempted && storageReady && hasSavedServerUrl) {
setAutoConnectAttempted(true);
connect();
}
- }, [autoConnectAttempted, connect]);
+ }, [autoConnectAttempted, connect, storageReady, hasSavedServerUrl]);
useEffect(() => {
// Wait for auto-connect to finish
diff --git a/app/index.tsx b/app/index.tsx
index bcaeb5e..8638a1b 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -2,16 +2,11 @@ import { Redirect } from 'expo-router';
import { useOpenCode } from '../src/providers/OpenCodeProvider';
export default function Index() {
- const { connected, connecting } = useOpenCode();
-
- // While connecting, show nothing (the layout handles the redirect)
- if (connecting) {
- return null;
- }
+ const { connected } = useOpenCode();
if (connected) {
return ;
}
-
+
return ;
}
diff --git a/package-lock.json b/package-lock.json
index 5442014..02cbb63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
"dependencies": {
"@expo/vector-icons": "^15.0.3",
"@opencode-ai/sdk": "^1.0.167",
+ "@react-native-async-storage/async-storage": "^2.1.0",
"expo": "~54.0.30",
"expo-blur": "^15.0.8",
"expo-glass-effect": "^0.1.8",
@@ -22,8 +23,8 @@
"react-native": "0.81.5",
"react-native-markdown-display": "^7.0.2",
"react-native-safe-area-context": "^5.6.2",
- "react-native-screens": "^4.19.0",
- "react-native-svg": "^15.15.1"
+ "react-native-screens": "~4.16.0",
+ "react-native-svg": "15.12.1"
},
"devDependencies": {
"@types/react": "~19.1.0",
@@ -67,6 +68,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
"integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/code-frame": "^7.27.1",
"@babel/generator": "^7.28.5",
@@ -1421,6 +1423,7 @@
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
"integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=6.9.0"
}
@@ -2931,6 +2934,18 @@
}
}
},
+ "node_modules/@react-native-async-storage/async-storage": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-2.2.0.tgz",
+ "integrity": "sha512-gvRvjR5JAaUZF8tv2Kcq/Gbt3JHwbKFYfmb445rhOj6NUMx3qPLixmDx5pZAyb9at1bYvJ4/eTUipU5aki45xw==",
+ "license": "MIT",
+ "dependencies": {
+ "merge-options": "^3.0.4"
+ },
+ "peerDependencies": {
+ "react-native": "^0.0.0-0 || >=0.65 <1.0"
+ }
+ },
"node_modules/@react-native/assets-registry": {
"version": "0.81.5",
"resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.81.5.tgz",
@@ -3268,6 +3283,7 @@
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.26.tgz",
"integrity": "sha512-RhKmeD0E2ejzKS6z8elAfdfwShpcdkYY8zJzvHYLq+wv183BBcElTeyMLcIX6wIn7QutXeI92Yi21t7aUWfqNQ==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@react-navigation/core": "^7.13.7",
"escape-string-regexp": "^4.0.0",
@@ -3431,8 +3447,9 @@
"version": "19.1.17",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.17.tgz",
"integrity": "sha512-Qec1E3mhALmaspIrhWt9jkQMNdw6bReVu64mjvhbhq2NFPftLPVr+l1SZgmw/66WwBNpDh7ao5AT6gF5v41PFA==",
- "dev": true,
+ "devOptional": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"csstype": "^3.0.2"
}
@@ -4054,6 +4071,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -4566,7 +4584,7 @@
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
"integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
- "dev": true,
+ "devOptional": true,
"license": "MIT"
},
"node_modules/debug": {
@@ -4879,6 +4897,7 @@
"resolved": "https://registry.npmjs.org/expo/-/expo-54.0.30.tgz",
"integrity": "sha512-6q+aFfKL0SpT8prfdpR3V8HcN51ov0mCGuwQTzyuk6eeO9rg7a7LWbgPv9rEVXGZEuyULstL8LGNwHqusand7Q==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/runtime": "^7.20.0",
"@expo/cli": "54.0.20",
@@ -4942,6 +4961,7 @@
"resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-18.0.12.tgz",
"integrity": "sha512-WzcKYMVNRRu4NcSzfIVRD5aUQFnSpTZgXFrlWmm19xJoDa4S3/PQNi6PNTBRc49xz9h8FT7HMxRKaC8lr0gflA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@expo/config": "~12.0.12",
"@expo/env": "~2.0.8"
@@ -4956,6 +4976,7 @@
"resolved": "https://registry.npmjs.org/expo-font/-/expo-font-14.0.10.tgz",
"integrity": "sha512-UqyNaaLKRpj4pKAP4HZSLnuDQqueaO5tB1c/NWu5vh1/LF9ulItyyg2kF/IpeOp0DeOLk0GY0HrIXaKUMrwB+Q==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"fontfaceobserver": "^2.1.0"
},
@@ -4992,6 +5013,7 @@
"resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-8.0.11.tgz",
"integrity": "sha512-+VSaNL5om3kOp/SSKO5qe6cFgfSIWnnQDSbA7XLs3ECkYzXRquk5unxNS3pg7eK5kNUmQ4kgLI7MhTggAEUBLA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"expo-constants": "~18.0.12",
"invariant": "^2.2.4"
@@ -5105,6 +5127,7 @@
"resolved": "https://registry.npmjs.org/expo-router/-/expo-router-6.0.21.tgz",
"integrity": "sha512-wjTUjrnWj6gRYjaYl1kYfcRnNE4ZAQ0kz0+sQf6/mzBd/OU6pnOdD7WrdAW3pTTpm52Q8sMoeX98tNQEddg2uA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@expo/metro-runtime": "^6.1.2",
"@expo/schema-utils": "^0.1.8",
@@ -6263,6 +6286,15 @@
"node": ">=0.12.0"
}
},
+ "node_modules/is-plain-obj": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+ "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/is-wsl": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -7209,6 +7241,18 @@
"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
"license": "MIT"
},
+ "node_modules/merge-options": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz",
+ "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==",
+ "license": "MIT",
+ "dependencies": {
+ "is-plain-obj": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -8292,6 +8336,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
"integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -8306,6 +8351,25 @@
"ws": "^7"
}
},
+ "node_modules/react-dom": {
+ "version": "19.2.3",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
+ "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "scheduler": "^0.27.0"
+ },
+ "peerDependencies": {
+ "react": "^19.2.3"
+ }
+ },
+ "node_modules/react-dom/node_modules/scheduler": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+ "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+ "license": "MIT"
+ },
"node_modules/react-fast-compare": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
@@ -8335,6 +8399,7 @@
"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.81.5.tgz",
"integrity": "sha512-1w+/oSjEXZjMqsIvmkCRsOc8UBYv163bTWKTI8+1mxztvQPhCRYGTvZ/PL1w16xXHneIj/SLGfxWg2GWN2uexw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@jest/create-cache-key-function": "^29.7.0",
"@react-native/assets-registry": "0.81.5",
@@ -8427,18 +8492,21 @@
"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.6.2.tgz",
"integrity": "sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg==",
"license": "MIT",
+ "peer": true,
"peerDependencies": {
"react": "*",
"react-native": "*"
}
},
"node_modules/react-native-screens": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.19.0.tgz",
- "integrity": "sha512-qSDAO3AL5bti0Ri7KZRSVmWlhDr8MV86N5GruiKVQfEL7Zx2nUi3Dl62lqHUAD/LnDvOPuDDsMHCfIpYSv3hPQ==",
+ "version": "4.16.0",
+ "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.16.0.tgz",
+ "integrity": "sha512-yIAyh7F/9uWkOzCi1/2FqvNvK6Wb9Y1+Kzn16SuGfN9YFJDTbwlzGRvePCNTOX0recpLQF3kc2FmvMUhyTCH1Q==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"react-freeze": "^1.0.0",
+ "react-native-is-edge-to-edge": "^1.2.1",
"warn-once": "^0.1.0"
},
"peerDependencies": {
@@ -8447,10 +8515,11 @@
}
},
"node_modules/react-native-svg": {
- "version": "15.15.1",
- "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.15.1.tgz",
- "integrity": "sha512-ZUD1xwc3Hwo4cOmOLumjJVoc7lEf9oQFlHnLmgccLC19fNm6LVEdtB+Cnip6gEi0PG3wfvVzskViEtrySQP8Fw==",
+ "version": "15.12.1",
+ "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.12.1.tgz",
+ "integrity": "sha512-vCuZJDf8a5aNC2dlMovEv4Z0jjEUET53lm/iILFnFewa15b4atjVxU6Wirm6O9y6dEsdjDZVD7Q3QM4T1wlI8g==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"css-select": "^5.1.0",
"css-tree": "^1.1.3",
@@ -8550,6 +8619,7 @@
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
"integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -9550,6 +9620,7 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=12"
},
diff --git a/package.json b/package.json
index 0d1d3c0..b457bf4 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"dependencies": {
"@expo/vector-icons": "^15.0.3",
"@opencode-ai/sdk": "^1.0.167",
+ "@react-native-async-storage/async-storage": "^2.1.0",
"expo": "~54.0.30",
"expo-blur": "^15.0.8",
"expo-glass-effect": "^0.1.8",
@@ -23,8 +24,8 @@
"react-native": "0.81.5",
"react-native-markdown-display": "^7.0.2",
"react-native-safe-area-context": "^5.6.2",
- "react-native-screens": "^4.19.0",
- "react-native-svg": "^15.15.1"
+ "react-native-screens": "~4.16.0",
+ "react-native-svg": "15.12.1"
},
"devDependencies": {
"@types/react": "~19.1.0",
diff --git a/src/providers/OpenCodeProvider.tsx b/src/providers/OpenCodeProvider.tsx
index 165a54f..2e8eedc 100644
--- a/src/providers/OpenCodeProvider.tsx
+++ b/src/providers/OpenCodeProvider.tsx
@@ -1,5 +1,6 @@
import React, { createContext, useContext, useState, useCallback, useRef, useEffect, ReactNode } from 'react';
import { createOpencodeClient } from '@opencode-ai/sdk/client';
+import AsyncStorage from '@react-native-async-storage/async-storage';
export type OpenCodeClient = ReturnType;
@@ -76,6 +77,8 @@ interface OpenCodeContextValue {
connecting: boolean;
error: string | null;
serverUrl: string;
+ storageReady: boolean;
+ hasSavedServerUrl: boolean;
// Connection actions
connect: (url?: string) => Promise;
@@ -125,8 +128,11 @@ export function OpenCodeProvider({ children, defaultServerUrl = 'http://10.0.10.
const [connecting, setConnecting] = useState(false);
const [error, setError] = useState(null);
const [serverUrl, setServerUrl] = useState(defaultServerUrl);
+ const [storageReady, setStorageReady] = useState(false);
+ const [hasSavedServerUrl, setHasSavedServerUrl] = useState(false);
const clientRef = useRef(null);
+ const storageKeyRef = useRef('opencode.serverUrl');
// Cache
const cacheRef = useRef({
@@ -152,7 +158,7 @@ export function OpenCodeProvider({ children, defaultServerUrl = 'http://10.0.10.
// SSE subscription state
const [activeSessionId, setActiveSessionId] = useState(null);
const sseAbortControllerRef = useRef(null);
- const pollingIntervalRef = useRef(null);
+ const pollingIntervalRef = useRef | null>(null);
// Sending state
const [isSending, setIsSending] = useState(false);
@@ -192,6 +198,8 @@ export function OpenCodeProvider({ children, defaultServerUrl = 'http://10.0.10.
clientRef.current = client;
setServerUrl(targetUrl);
+ await AsyncStorage.setItem(storageKeyRef.current, targetUrl);
+ setHasSavedServerUrl(true);
setConnected(true);
setConnecting(false);
return true;
@@ -225,6 +233,27 @@ export function OpenCodeProvider({ children, defaultServerUrl = 'http://10.0.10.
setSessionMessagesState(new Map());
setProjects([]);
}, []);
+
+ // Load saved server URL on boot
+ useEffect(() => {
+ const loadSavedUrl = async () => {
+ try {
+ const savedUrl = await AsyncStorage.getItem(storageKeyRef.current);
+ if (savedUrl) {
+ setServerUrl(savedUrl);
+ setHasSavedServerUrl(true);
+ } else {
+ setHasSavedServerUrl(false);
+ }
+ } catch {
+ setHasSavedServerUrl(false);
+ } finally {
+ setStorageReady(true);
+ }
+ };
+
+ loadSavedUrl();
+ }, []);
// Fetch sessions with stale-while-revalidate
const fetchSessions = useCallback(async (isRefresh = false) => {
@@ -575,6 +604,8 @@ export function OpenCodeProvider({ children, defaultServerUrl = 'http://10.0.10.
connecting,
error,
serverUrl,
+ storageReady,
+ hasSavedServerUrl,
connect,
disconnect,
setServerUrl,