Skip to content

Open source Grok Bot alternative, Bring your own agent and subscription: message Claude Code, Codex, Gemini CLI, Cursor, Copilot and 40+ AI agents as bots on your own computer, from iPhone, Mac, Windows, Linux or terminal. Agent-agnostic and free. Also a Muse and Dots alternative. Built in Rust.

feat(apps): sign in with GitHub

leepokai2d1f07907244
diff --git a/README.md b/README.md
index cf10f562..52f22780 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ Data lives in `~/.codync`. The local bearer token authorizes loopback helpers an
**Where does my data go?** Bots, chats and memory stay on your computer. The phone reaches it directly on the same network, or through an end-to-end encrypted relay that can't read your messages.
-**Do I need an account?** Yes, a free one: the apps ask you to sign in with Apple or Google. An account alone never unlocks a computer: you still pair by scanning a QR code, or approve a 6-digit code on the computer.
+**Do I need an account?** Yes, a free one: the apps ask you to sign in with Apple, Google or GitHub. An account alone never unlocks a computer: you still pair by scanning a QR code, or approve a 6-digit code on the computer.
**Which computers can run it?** A Mac, a Windows PC, or a Linux desktop or headless server. The iPhone app and the terminal UI over SSH talk to the same host.
diff --git a/apps/android/WhatsNew.md b/apps/android/WhatsNew.md
index 74c58047..7595aa50 100644
--- a/apps/android/WhatsNew.md
+++ b/apps/android/WhatsNew.md
@@ -9,14 +9,14 @@ else a generic "Bug fixes and improvements" line. Delete old sections.
## 2.36.0
### zh-Hant
-- Codync 現在需要用 Apple 或 Google 登入。以前沒登入就配對的電腦,第一次登入時會一起移進你的賬戶,不用再掃一次。
+- Codync 現在需要用 Apple、Google 或 GitHub 登入。以前沒登入就配對的電腦,第一次登入時會一起移進你的賬戶,不用再掃一次。
- 登出時,這支手機會從它連得到的電腦和你的賬戶中移除。
- 可以在 App 裡刪除賬戶:點 Bots 分頁左上角的賬戶按鈕,再點「刪除賬戶」。
- 配對會確認賬戶:在別人賬戶裡的電腦會告訴你它在誰的賬戶;還不在任何賬戶的電腦,會先在電腦上問一聲,再加入你的賬戶。
- 也可以輸入 `codync-host pair` 印出的短代碼來配對,不用掃 QR code。
### en-US
-- Codync now asks you to sign in with Apple or Google. Computers you paired before come along, no new scan.
+- Codync now asks you to sign in with Apple, Google or GitHub. Computers you paired before come along, no new scan.
- Signing out removes this phone from its computers and your account.
- Delete your account in the app: account button (top left of Bots), then Delete account.
- Pairing checks your account: a computer in another account says whose; one in no account asks first, then joins yours.
diff --git a/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt b/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
index 74ac2368..09ba4268 100644
--- a/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
+++ b/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
@@ -86,9 +86,10 @@ class AccountScreenTest {
compose.setContent { Hosted { AccountSwitcherView(state.value, viewModel()) {} } }
val apple = compose.onNodeWithText("Continue with Apple").assertIsDisplayed().assertIsEnabled().fetchSemanticsNode().boundsInRoot
val google = compose.onNodeWithText("Continue with Google").assertIsDisplayed().fetchSemanticsNode().boundsInRoot
- assertTrue(apple.bottom <= google.top)
- assertEquals(apple.left, google.left, 1f)
- assertEquals(apple.right, google.right, 1f)
+ val github = compose.onNodeWithText("Continue with GitHub").performScrollTo().assertIsDisplayed().fetchSemanticsNode().boundsInRoot
+ assertTrue(apple.bottom <= google.top && google.bottom <= github.top)
+ assertEquals(apple.left, github.left, 1f)
+ assertEquals(apple.right, github.right, 1f)
compose.onNodeWithText("Other sign-in options").performScrollTo().assertIsDisplayed()
compose.onNodeWithText("Sign out").assertDoesNotExist()
compose.onNodeWithText("Delete account").assertDoesNotExist()
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/AccountStoreAccount.kt b/apps/android/app/src/main/kotlin/com/codync/android/AccountStoreAccount.kt
index 40a1e939..6a72d8c0 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/AccountStoreAccount.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/AccountStoreAccount.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.*
internal fun AccountStore.signIn(provider: SignInProvider) = sessionAction {
Analytics.capture(AnalyticsEvent.SignInStarted(provider))
try {
- if (provider == SignInProvider.Hosted) NativeAccounts.hostedSignIn() else NativeAccounts.signIn(apple = provider == SignInProvider.Apple)
+ NativeAccounts.signIn(provider)
} catch (error: CancellationException) { throw error }
catch (error: Exception) {
Analytics.capture(AnalyticsEvent.SignInFailed(provider, (error as? SignInError)?.reason ?: SignInFailure.Error))
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/AnalyticsEvent.kt b/apps/android/app/src/main/kotlin/com/codync/android/AnalyticsEvent.kt
index fb7f4d55..ad4eaefe 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/AnalyticsEvent.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/AnalyticsEvent.kt
@@ -110,7 +110,7 @@ internal enum class OnboardingStep(override val wire: String) : CatalogValue { W
internal enum class OnboardingVia(override val wire: String) : CatalogValue { Paired("paired"), Account("account"), Skipped("skipped") }
-internal enum class SignInProvider(override val wire: String) : CatalogValue { Apple("apple"), Google("google"), Hosted("hosted") }
+internal enum class SignInProvider(override val wire: String) : CatalogValue { Apple("apple"), Google("google"), GitHub("github"), Hosted("hosted") }
/** The signed-out pairings' keys at sign-in: [Moved] with them, or listed to be scanned again ([Rescan]). */
internal enum class MovedKeys(override val wire: String) : CatalogValue { Moved("moved"), Rescan("rescan") }
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/CustomIconEditor.kt b/apps/android/app/src/main/kotlin/com/codync/android/CustomIconEditor.kt
index ad4d9e8b..ed02c1a9 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/CustomIconEditor.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/CustomIconEditor.kt
@@ -33,6 +33,7 @@ import com.codync.android.design.*
listOf(
DialogAction("Continue with Apple") { accounts?.signIn(SignInProvider.Apple) },
DialogAction("Continue with Google") { accounts?.signIn(SignInProvider.Google) },
+ DialogAction("Continue with GitHub") { accounts?.signIn(SignInProvider.GitHub) },
)
}
Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp)) {
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/NativeAccounts.kt b/apps/android/app/src/main/kotlin/com/codync/android/NativeAccounts.kt
index 331ebcda..070ccc60 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/NativeAccounts.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/NativeAccounts.kt
@@ -60,9 +60,16 @@ object NativeAccounts {
private fun Session.usableUserId(): String? = takeIf { it.status == Session.SessionStatus.ACTIVE && it.expireAt > System.currentTimeMillis() }?.user?.id
- suspend fun signIn(apple: Boolean) {
+ internal suspend fun signIn(provider: SignInProvider) = when (provider) {
+ SignInProvider.Apple -> oauthSignIn(OAuthProvider.APPLE)
+ SignInProvider.Google -> oauthSignIn(OAuthProvider.GOOGLE)
+ SignInProvider.GitHub -> oauthSignIn(OAuthProvider.GITHUB)
+ SignInProvider.Hosted -> hostedSignIn()
+ }
+
+ private suspend fun oauthSignIn(provider: OAuthProvider) {
require(Clerk.isInitialized.value) { "Wait for sign-in to finish loading." }
- val result = Clerk.auth.signInWithOAuth(if (apple) OAuthProvider.APPLE else OAuthProvider.GOOGLE)
+ val result = Clerk.auth.signInWithOAuth(provider)
when (result) {
is ClerkResult.Failure -> throw signInError(result)
is ClerkResult.Success -> {
@@ -92,7 +99,7 @@ object NativeAccounts {
}
}
- suspend fun hostedSignIn() {
+ private suspend fun hostedSignIn() {
val result = Clerk.auth.startHostedAuth()
if (result is ClerkResult.Failure) throw signInError(result)
}
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/WelcomeView.kt b/apps/android/app/src/main/kotlin/com/codync/android/WelcomeView.kt
index 6e149e00..9b7ca77e 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/WelcomeView.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/WelcomeView.kt
@@ -164,7 +164,7 @@ private val CREW = listOf(
}
}
-/** Equal access to both account providers at every sign-in entry point (iOS `SignInButtons`). */
+/** Equal access to every account provider at every sign-in entry point (iOS `SignInButtons`). */
@Composable internal fun SignInButtons(state: AccountContext, store: AccountStore) {
val busy = "session" in state.busy
val enabled = state.account.ready && !busy
@@ -177,6 +177,10 @@ private val CREW = listOf(
Image(painterResource(R.drawable.google_logo), null, Modifier.size(20.dp))
Text(tr("Continue with Google"))
}
+ WideButton(primary = false, enabled = enabled, busy = busy, action = { store.signIn(SignInProvider.GitHub) }) {
+ Symbol("github.logo", size = 20.dp)
+ Text(tr("Continue with GitHub"))
+ }
// Clerk's own page covers the sign-ins that need another step (email codes, verification).
LinkButton("Other sign-in options", enabled = enabled, color = Palette.secondary, style = Type.footnote) { store.signIn(SignInProvider.Hosted) }
}
diff --git a/apps/android/design/src/main/kotlin/com/codync/android/design/Symbol.kt b/apps/android/design/src/main/kotlin/com/codync/android/design/Symbol.kt
index 0db2409b..a39899c7 100644
--- a/apps/android/design/src/main/kotlin/com/codync/android/design/Symbol.kt
+++ b/apps/android/design/src/main/kotlin/com/codync/android/design/Symbol.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.unit.dp
"apple.logo" -> painterResource(R.drawable.apple_logo)
"computer.linux" -> painterResource(R.drawable.computer_linux)
"codync.network" -> painterResource(R.drawable.codync_network)
+ "github.logo" -> painterResource(R.drawable.github_logo)
else -> painterResource(symbolRes(name) ?: R.drawable.sf_circle_dotted)
}
val described = if (contentDescription == null) modifier.clearAndSetSemantics {}
diff --git a/apps/android/design/src/main/res/drawable/github_logo.xml b/apps/android/design/src/main/res/drawable/github_logo.xml
new file mode 100644
index 00000000..c6e920d3
--- /dev/null
+++ b/apps/android/design/src/main/res/drawable/github_logo.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The GitHub mark from Simple Icons (CC0), for "Continue with GitHub". -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+ <path android:fillColor="#FF000000"
+ android:pathData="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
+</vector>
diff --git a/apps/desktop/src/main/account.ts b/apps/desktop/src/main/account.ts
index 6cb88888..fe0327d1 100644
--- a/apps/desktop/src/main/account.ts
+++ b/apps/desktop/src/main/account.ts
@@ -17,6 +17,7 @@ import { buildConfig, identity } from './environment'
const SCHEME = identity.appId
const REDIRECT = `${SCHEME}://callback`
+const PROVIDER_NAMES: Record<SignInProvider, string> = { apple: 'Apple', google: 'Google', github: 'GitHub' }
interface Config {
clerkPublishableKey: string | null
@@ -263,7 +264,7 @@ export class AccountService extends EventEmitter {
return 'error'
}
const attempt = ++this.signInAttempt
- const name = provider === 'apple' ? 'Apple' : 'Google'
+ const name = PROVIDER_NAMES[provider]
let failure: SignInFailure | null = null
this.set({ busy: true, error: null })
try {
diff --git a/apps/desktop/src/renderer/components/icon-fallbacks.ts b/apps/desktop/src/renderer/components/icon-fallbacks.ts
index 7ea1528c..673d2fd8 100644
--- a/apps/desktop/src/renderer/components/icon-fallbacks.ts
+++ b/apps/desktop/src/renderer/components/icon-fallbacks.ts
@@ -14,6 +14,9 @@ const appleLogo: IconNode = [
],
]
+// GitHub's mark, from Simple Icons (CC0).
+const githubLogo: IconNode = [['path', { fill: 'currentColor', stroke: 'none', d: 'M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12' }]]
+
// The codync-network mark (host/crates/network/assets/icon.png), drawn on every platform.
const codyncNetwork: IconNode = [['path', { fill: 'currentColor', stroke: 'none', d: 'M11.66 3.41c-0.05 0-0.2 0.03-0.33 0.06c-0.7 0.15-1.33 0.49-1.82 1c-0.6 0.62-0.91 1.34-0.95 2.17c-0.02 0.39 0.01 0.69 0.12 1.1c0.1 0.39 0.1 0.58-0 0.87c-0.14 0.39-0.28 0.57-0.93 1.17c-0.86 0.8-1.38 1.66-1.71 2.81c-0.12 0.41-0.24 0.66-0.43 0.87c-0.23 0.26-0.48 0.39-0.94 0.5c-0.26 0.06-0.61 0.2-0.87 0.33c-0.9 0.48-1.56 1.39-1.73 2.41c-0.05 0.31-0.04 0.92 0.02 1.21c0.14 0.64 0.46 1.22 0.94 1.69c0.55 0.55 1.19 0.85 1.97 0.93c0.67 0.07 1.38-0.1 1.99-0.46c0.28-0.17 0.4-0.27 0.82-0.7c0.42-0.42 0.51-0.49 0.81-0.54c0.27-0.05 0.56 0.02 1.07 0.26c0.86 0.4 1.38 0.54 2.14 0.57c0.79 0.03 1.56-0.13 2.39-0.52c0.19-0.09 0.45-0.2 0.57-0.24c0.38-0.13 0.72-0.1 0.99 0.07c0.11 0.06 0.25 0.21 0.62 0.61c0.38 0.42 0.77 0.68 1.28 0.85c0.34 0.12 0.51 0.14 1 0.14c0.41-0 0.47-0.01 0.72-0.07c0.66-0.17 1.13-0.43 1.59-0.91c0.49-0.49 0.8-1.05 0.94-1.74c0.07-0.35 0.07-0.94-0-1.3c-0.13-0.64-0.45-1.22-0.93-1.7c-0.61-0.62-1.38-0.95-2.37-1.04c-1.1-0.09-2.12 0.25-2.83 0.96c-0.22 0.21-0.38 0.43-0.87 1.1c-0.27 0.37-0.8 0.92-1.09 1.12c-0.69 0.48-1.41 0.68-2.19 0.62c-1.65-0.13-2.95-1.29-3.32-2.94c-0.07-0.32-0.08-1.14-0.01-1.47c0.24-1.16 0.95-2.18 1.96-2.77c0.34-0.2 0.79-0.36 1.2-0.44c0.3-0.05 0.95-0.04 1.25 0.03c0.83 0.18 1.51 0.61 1.87 1.2c0.11 0.17 0.23 0.45 0.38 0.89c0.1 0.29 0.2 0.46 0.36 0.63c0.5 0.54 1.31 0.56 1.81 0.04c0.16-0.16 0.29-0.4 0.33-0.58c0.04-0.16 0.03-0.48-0.01-0.67c-0.06-0.24-0.3-0.71-0.54-1.03c-0.12-0.16-0.41-0.48-0.69-0.77c-0.54-0.55-0.65-0.68-0.79-0.96c-0.18-0.37-0.21-0.65-0.12-1.03c0.25-1.04 0.12-1.97-0.4-2.77c-0.66-1.02-1.75-1.62-2.93-1.6c-0.15 0-0.31 0.01-0.36 0.01z' }]]
@@ -100,6 +103,7 @@ const map: Record<string, IconNode> = {
folder: L.Folder,
'gauge.with.dots.needle.33percent': L.Gauge,
gearshape: L.Settings,
+ 'github.logo': githubLogo,
globe: L.Globe,
'house.fill': L.House,
hammer: L.Hammer,
diff --git a/apps/desktop/src/renderer/views/AccountWelcomeView.tsx b/apps/desktop/src/renderer/views/AccountWelcomeView.tsx
index 36b98219..7e5126b2 100644
--- a/apps/desktop/src/renderer/views/AccountWelcomeView.tsx
+++ b/apps/desktop/src/renderer/views/AccountWelcomeView.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState, type CSSProperties } from 'react'
+import { useCallback, useEffect, useState, type CSSProperties, type ReactNode } from 'react'
import { CharacterAvatar, type Mood } from '../components/Avatar'
import { Button, Spinner } from '../components/Controls'
import { Icon } from '../components/Icon'
@@ -11,6 +11,7 @@ import { prefs, usePref } from '../lib/prefs'
import { account, useAccount } from '../store/account'
import { analytics } from '../store/analytics'
import googleLogo from '../assets/google.svg'
+import type { SignInProvider } from '@shared/analytics'
import './account-welcome.css'
const deviceName = window.codync.platform === 'darwin' ? 'Mac' : 'computer'
@@ -86,26 +87,9 @@ export function AccountWelcomeView({ onContinue }: { onContinue: () => void }) {
{onThis}
</Button>
)}
- <Button onClick={() => void account.signIn('apple')} disabled={!account.isConfigured || account.isBusy} className="welcome-button">
- {account.isBusy ? (
- <Spinner size={18} />
- ) : (
- <HStack as="span" gap={10}>
- <Icon name="apple.logo" size={20} />
- {tr('Continue with Apple')}
- </HStack>
- )}
- </Button>
- <Button kind="secondary" onClick={() => void account.signIn('google')} disabled={!account.isConfigured || account.isBusy} className="welcome-button">
- {account.isBusy ? (
- <Spinner size={18} />
- ) : (
- <HStack as="span" gap={10}>
- <img src={googleLogo} alt="" width={20} height={20} />
- {tr('Continue with Google')}
- </HStack>
- )}
- </Button>
+ <ProviderButton provider="apple" mark={<Icon name="apple.logo" size={20} />} title="Continue with Apple" />
+ <ProviderButton provider="google" kind="secondary" mark={<img src={googleLogo} alt="" width={20} height={20} />} title="Continue with Google" />
+ <ProviderButton provider="github" kind="secondary" mark={<Icon name="github.logo" size={20} />} title="Continue with GitHub" />
{!account.isConfigured ? (
<Text as="div" size="footnote" tone="tertiary">{tr(deviceName === 'Mac' ? "Sign-in isn't configured in this build. You can still use Codync on this Mac." : "Sign-in isn't configured in this build. You can still use Codync on this computer.")}</Text>
) : null}
@@ -116,6 +100,24 @@ export function AccountWelcomeView({ onContinue }: { onContinue: () => void }) {
)
}
+/** One provider's sign-in button; every one shares the busy spinner and the disabled rule. */
+function ProviderButton({ provider, kind, mark, title }: { provider: SignInProvider; kind?: 'primary' | 'secondary'; mark: ReactNode; title: string }) {
+ const account = useAccount()
+ const tr = useTr()
+ return (
+ <Button kind={kind} onClick={() => void account.signIn(provider)} disabled={!account.isConfigured || account.isBusy} className="welcome-button">
+ {account.isBusy ? (
+ <Spinner size={18} />
+ ) : (
+ <HStack as="span" gap={10}>
+ {mark}
+ {tr(title)}
+ </HStack>
+ )}
+ </Button>
+ )
+}
+
const crew: { shape: string; color: string; size: number; x: number; y: number; mood: Mood }[] = [
{ shape: 'blob', color: 'blue', size: 92, x: 0, y: 0, mood: 'working' },
{ shape: 'squircle', color: 'orange', size: 64, x: -104, y: -34, mood: 'idle' },
diff --git a/apps/desktop/src/renderer/views/PanelMenus.tsx b/apps/desktop/src/renderer/views/PanelMenus.tsx
index 7b6d32f7..738e9e40 100644
--- a/apps/desktop/src/renderer/views/PanelMenus.tsx
+++ b/apps/desktop/src/renderer/views/PanelMenus.tsx
@@ -63,6 +63,7 @@ export function AccountPanelLayer({ compact, approvals, onDismiss, onUsage, onSe
: [
{ title: 'Continue with Apple', icon: 'apple.logo', disabled: isBusy, action: () => { onDismiss(); void account.signIn('apple') } },
{ title: 'Continue with Google', icon: 'person.crop.circle.badge.plus', image: googleLogo, disabled: isBusy, action: () => { onDismiss(); void account.signIn('google') } },
+ { title: 'Continue with GitHub', icon: 'github.logo', disabled: isBusy, action: () => { onDismiss(); void account.signIn('github') } },
]
const open = (url: string, link: Link) => {
onDismiss()
diff --git a/apps/desktop/src/renderer/views/bots/CustomIconEditor.tsx b/apps/desktop/src/renderer/views/bots/CustomIconEditor.tsx
index 281adf3f..11a471ae 100644
--- a/apps/desktop/src/renderer/views/bots/CustomIconEditor.tsx
+++ b/apps/desktop/src/renderer/views/bots/CustomIconEditor.tsx
@@ -63,6 +63,7 @@ export function CustomIconEditor({ target }: { target: string }) {
onClose={() => setNeedsSignIn(false)} actions={[
{ title: 'Continue with Apple', action: () => { setNeedsSignIn(false); void account.signIn('apple') } },
{ title: 'Continue with Google', action: () => { setNeedsSignIn(false); void account.signIn('google') } },
+ { title: 'Continue with GitHub', action: () => { setNeedsSignIn(false); void account.signIn('github') } },
]} />
{(editor.error || session.errorMessage) && <Text size="caption" tone="danger">{editor.error || session.errorMessage}</Text>}
</VStack>
diff --git a/apps/desktop/src/renderer/views/settings/SettingsView.tsx b/apps/desktop/src/renderer/views/settings/SettingsView.tsx
index b645db03..f624613b 100644
--- a/apps/desktop/src/renderer/views/settings/SettingsView.tsx
+++ b/apps/desktop/src/renderer/views/settings/SettingsView.tsx
@@ -167,6 +167,9 @@ function GeneralSettings() {
<Button kind="secondary" onClick={() => void account.signIn('google')} disabled={account.isBusy}>
Google
</Button>
+ <Button kind="secondary" onClick={() => void account.signIn('github')} disabled={account.isBusy}>
+ GitHub
+ </Button>
</>
)}
</div>
diff --git a/apps/desktop/src/shared/analytics.ts b/apps/desktop/src/shared/analytics.ts
index 5b70e148..7ac27098 100644
--- a/apps/desktop/src/shared/analytics.ts
+++ b/apps/desktop/src/shared/analytics.ts
@@ -23,7 +23,7 @@ export type Screen =
/** Outbound links, by what they lead to. */
export type Link = 'github' | 'docs' | 'issues' | 'discord' | 'app_store' | 'demo' | 'tailscale' | 'privacy' | 'support' | 'install_command'
-export type SignInProvider = 'apple' | 'google'
+export type SignInProvider = 'apple' | 'google' | 'github'
/** Why a sign-in ended without an account. */
export type SignInFailure = 'cancelled' | 'timeout' | 'verification' | 'error'
diff --git a/apps/ios/App/AccountSession.swift b/apps/ios/App/AccountSession.swift
index d677dad3..d16a9257 100644
--- a/apps/ios/App/AccountSession.swift
+++ b/apps/ios/App/AccountSession.swift
@@ -112,44 +112,44 @@ final class AccountSession {
var errorDescription: String? { "Sign in again to reach your account." }
}
- enum SignInProvider: String {
- case google = "Google"
- case apple = "Apple"
- }
-
- func signIn(provider: SignInProvider = .google) async {
+ func signIn(provider: AnalyticsEvent.SignInProvider) async {
guard !isBusy else { return }
guard let clerk else { return }
- let tracked: AnalyticsEvent.SignInProvider = provider == .apple ? .apple : .google
- Analytics.shared.capture(.signInStarted(tracked))
+ Analytics.shared.capture(.signInStarted(provider))
isBusy = true
errorMessage = nil
defer { isBusy = false }
do {
- // Both providers use Clerk's transfer flow and activate the same kind of session.
+ // Every provider uses Clerk's transfer flow and activates the same kind of session.
+ let name: String
let result: TransferFlowResult
switch provider {
- case .google:
- result = try await clerk.auth.signInWithOAuth(provider: .google, prefersEphemeralWebBrowserSession: isSignedIn)
case .apple:
+ name = "Apple"
result = try await clerk.auth.signInWithApple()
+ case .google:
+ name = "Google"
+ result = try await clerk.auth.signInWithOAuth(provider: .google, prefersEphemeralWebBrowserSession: isSignedIn)
+ case .github:
+ name = "GitHub"
+ result = try await clerk.auth.signInWithOAuth(provider: .github, prefersEphemeralWebBrowserSession: isSignedIn)
}
switch result {
case .signIn(let signIn):
if signIn.status != .complete {
- errorMessage = "\(provider.rawValue) sign-in needs additional verification. Your account is not signed in yet."
+ errorMessage = "\(name) sign-in needs additional verification. Your account is not signed in yet."
}
case .signUp(let signUp):
if signUp.status != .complete {
- errorMessage = "\(provider.rawValue) sign-up needs additional account information. Your account is not signed in yet."
+ errorMessage = "\(name) sign-up needs additional account information. Your account is not signed in yet."
}
}
- Analytics.shared.capture(errorMessage == nil ? .signedIn(tracked) : .signInFailed(tracked, reason: .verification))
+ Analytics.shared.capture(errorMessage == nil ? .signedIn(provider) : .signInFailed(provider, reason: .verification))
} catch where Self.isCancellation(error) {
- Analytics.shared.capture(.signInFailed(tracked, reason: .cancelled))
+ Analytics.shared.capture(.signInFailed(provider, reason: .cancelled))
} catch {
errorMessage = "Couldn't sign in. Check your connection and try again."
- Analytics.shared.capture(.signInFailed(tracked, reason: .error))
+ Analytics.shared.capture(.signInFailed(provider, reason: .error))
}
}
diff --git a/apps/ios/App/CodyncApp.swift b/apps/ios/App/CodyncApp.swift
index a14375fb..d90c0121 100644
--- a/apps/ios/App/CodyncApp.swift
+++ b/apps/ios/App/CodyncApp.swift
@@ -36,8 +36,7 @@ struct CodyncApp: App {
.environment(\.customIconAccount, CustomIconAccount(
signedIn: app.account.isSignedIn, loading: app.account.isBusy || !app.account.isReady,
error: app.account.errorMessage,
- signInApple: { Task { await app.account.signIn(provider: .apple) } },
- signInGoogle: { Task { await app.account.signIn(provider: .google) } }))
+ signIn: { provider in Task { await app.account.signIn(provider: provider) } }))
// A computer needs a newer app: its App Store page has the Update button.
.environment(\.appUpdate, AppUpdateAction {
Analytics.shared.capture(.linkOpened(.appStore))
diff --git a/apps/ios/Kit/Sources/CodyncKit/Analytics/AnalyticsEvent.swift b/apps/ios/Kit/Sources/CodyncKit/Analytics/AnalyticsEvent.swift
index b8e451cb..b1a5d459 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Analytics/AnalyticsEvent.swift
+++ b/apps/ios/Kit/Sources/CodyncKit/Analytics/AnalyticsEvent.swift
@@ -37,7 +37,7 @@ public enum AnalyticsEvent: Equatable, Sendable {
public enum Notifications: String, Sendable { case allowed, denied, notAsked = "not_asked" }
public enum OnboardingStep: String, Sendable { case welcome, install, scan }
public enum OnboardingVia: String, Sendable { case paired, account, skipped }
- public enum SignInProvider: String, Sendable { case apple, google }
+ public enum SignInProvider: String, Sendable { case apple, google, github }
public enum SignInFailure: String, Sendable { case cancelled, verification, error }
public enum MovedKeys: String, Sendable { case moved, rescan }
public enum PairVia: String, Sendable { case qr, link, account }
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/de.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/de.json
index 2a72cb32..67c0afc3 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/de.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/de.json
@@ -53,6 +53,7 @@
"Connection": "Verbindung",
"Continue": "Weiter",
"Continue with Apple": "Weiter mit Apple",
+ "Continue with GitHub": "Weiter mit GitHub",
"Continue with Google": "Weiter mit Google",
"Copied": "Kopiert",
"Copy": "Kopieren",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "Anmeldung konnte nicht abgeschlossen werden. Versuche es erneut.",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "Die Apple-Anmeldung benötigt eine zusätzliche Bestätigung. Dein Konto ist noch nicht angemeldet.",
"Google sign-in needs additional verification. Your account is not signed in yet.": "Die Google-Anmeldung benötigt eine zusätzliche Bestätigung. Dein Konto ist noch nicht angemeldet.",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "Die GitHub-Anmeldung benötigt eine zusätzliche Bestätigung. Dein Konto ist noch nicht angemeldet.",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "Die Apple-Registrierung benötigt zusätzliche Kontodaten. Dein Konto ist noch nicht angemeldet.",
"Google sign-up needs additional account information. Your account is not signed in yet.": "Die Google-Registrierung benötigt zusätzliche Kontodaten. Dein Konto ist noch nicht angemeldet.",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "Die GitHub-Registrierung benötigt zusätzliche Kontodaten. Dein Konto ist noch nicht angemeldet.",
"Sign in again to reach your account.": "Melde dich erneut an, um auf dein Konto zuzugreifen.",
"Codync account": "Codync-Konto",
"Usage analytics": "Nutzungsanalyse",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/es.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/es.json
index a6c9a053..fd80d1b0 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/es.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/es.json
@@ -53,6 +53,7 @@
"Connection": "Conexión",
"Continue": "Continuar",
"Continue with Apple": "Continuar con Apple",
+ "Continue with GitHub": "Continuar con GitHub",
"Continue with Google": "Continuar con Google",
"Copied": "Copiado",
"Copy": "Copiar",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "No se pudo completar el inicio de sesión. Vuelve a intentarlo.",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "El inicio de sesión con Apple requiere verificación adicional. Tu cuenta aún no ha iniciado sesión.",
"Google sign-in needs additional verification. Your account is not signed in yet.": "El inicio de sesión con Google requiere verificación adicional. Tu cuenta aún no ha iniciado sesión.",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "El inicio de sesión con GitHub requiere verificación adicional. Tu cuenta aún no ha iniciado sesión.",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "El registro con Apple requiere información adicional de la cuenta. Tu cuenta aún no ha iniciado sesión.",
"Google sign-up needs additional account information. Your account is not signed in yet.": "El registro con Google requiere información adicional de la cuenta. Tu cuenta aún no ha iniciado sesión.",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "El registro con GitHub requiere información adicional de la cuenta. Tu cuenta aún no ha iniciado sesión.",
"Sign in again to reach your account.": "Inicia sesión de nuevo para acceder a tu cuenta.",
"Codync account": "Cuenta de Codync",
"Usage analytics": "Análisis de uso",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/fr.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/fr.json
index 321284c1..0594c776 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/fr.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/fr.json
@@ -53,6 +53,7 @@
"Connection": "Connexion",
"Continue": "Continuer",
"Continue with Apple": "Continuer avec Apple",
+ "Continue with GitHub": "Continuer avec GitHub",
"Continue with Google": "Continuer avec Google",
"Copied": "Copié",
"Copy": "Copier",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "Impossible de terminer la connexion. Réessayez.",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "La connexion Apple nécessite une vérification supplémentaire. Votre compte n’est pas encore connecté.",
"Google sign-in needs additional verification. Your account is not signed in yet.": "La connexion Google nécessite une vérification supplémentaire. Votre compte n’est pas encore connecté.",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "La connexion GitHub nécessite une vérification supplémentaire. Votre compte n’est pas encore connecté.",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "L’inscription Apple nécessite des informations supplémentaires. Votre compte n’est pas encore connecté.",
"Google sign-up needs additional account information. Your account is not signed in yet.": "L’inscription Google nécessite des informations supplémentaires. Votre compte n’est pas encore connecté.",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "L’inscription GitHub nécessite des informations supplémentaires. Votre compte n’est pas encore connecté.",
"Sign in again to reach your account.": "Reconnectez-vous pour accéder à votre compte.",
"Codync account": "Compte Codync",
"Usage analytics": "Analyse d’utilisation",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ja.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ja.json
index b6d83b2e..516c3369 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ja.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ja.json
@@ -53,6 +53,7 @@
"Connection": "接続",
"Continue": "続ける",
"Continue with Apple": "Appleで続ける",
+ "Continue with GitHub": "GitHubで続ける",
"Continue with Google": "Googleで続ける",
"Copied": "コピーされました",
"Copy": "コピー",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "サインインを完了できませんでした。もう一度お試しください。",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "Apple サインインには追加の検証が必要です。あなたのアカウントはまだサインインしていません。",
"Google sign-in needs additional verification. Your account is not signed in yet.": "Google サインインには追加の検証が必要です。あなたのアカウントはまだサインインしていません。",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "GitHub サインインには追加の検証が必要です。あなたのアカウントはまだサインインしていません。",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "Apple のサインアップには追加のアカウント情報が必要です。あなたのアカウントはまだサインインしていません。",
"Google sign-up needs additional account information. Your account is not signed in yet.": "Google サインアップには追加のアカウント情報が必要です。あなたのアカウントはまだサインインしていません。",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "GitHub サインアップには追加のアカウント情報が必要です。あなたのアカウントはまだサインインしていません。",
"Sign in again to reach your account.": "もう一度サインインしてアカウントにアクセスします。",
"Codync account": "Codyncアカウント",
"Usage analytics": "使用状況分析",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ko.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ko.json
index 852486af..9775fc3e 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ko.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/ko.json
@@ -53,6 +53,7 @@
"Connection": "연결",
"Continue": "계속",
"Continue with Apple": "Apple로 계속",
+ "Continue with GitHub": "GitHub로 계속",
"Continue with Google": "Google로 계속",
"Copied": "복사됨",
"Copy": "복사",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "로그인을 완료하지 못했습니다. 다시 시도하세요.",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "Apple 로그인에 추가 인증이 필요합니다. 아직 계정에 로그인되지 않았습니다.",
"Google sign-in needs additional verification. Your account is not signed in yet.": "Google 로그인에 추가 인증이 필요합니다. 아직 계정에 로그인되지 않았습니다.",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "GitHub 로그인에 추가 인증이 필요합니다. 아직 계정에 로그인되지 않았습니다.",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "Apple 가입에 추가 계정 정보가 필요합니다. 아직 계정에 로그인되지 않았습니다.",
"Google sign-up needs additional account information. Your account is not signed in yet.": "Google 가입에 추가 계정 정보가 필요합니다. 아직 계정에 로그인되지 않았습니다.",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "GitHub 가입에 추가 계정 정보가 필요합니다. 아직 계정에 로그인되지 않았습니다.",
"Sign in again to reach your account.": "계정에 접근하려면 다시 로그인하세요.",
"Codync account": "Codync 계정",
"Usage analytics": "사용 분석",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hans.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hans.json
index 4678321b..d5429c26 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hans.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hans.json
@@ -53,6 +53,7 @@
"Connection": "连接",
"Continue": "继续",
"Continue with Apple": "通过 Apple 继续",
+ "Continue with GitHub": "通过 GitHub 继续",
"Continue with Google": "通过 Google 继续",
"Copied": "已复制",
"Copy": "复制",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "登录没有完成。请再试一次。",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "Apple 登录还需要额外验证。账户还没有登录。",
"Google sign-in needs additional verification. Your account is not signed in yet.": "Google 登录还需要额外验证。账户还没有登录。",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "GitHub 登录还需要额外验证。账户还没有登录。",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "Apple 注册还需要补充账户信息。账户还没有登录。",
"Google sign-up needs additional account information. Your account is not signed in yet.": "Google 注册还需要补充账户信息。账户还没有登录。",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "GitHub 注册还需要补充账户信息。账户还没有登录。",
"Sign in again to reach your account.": "重新登录后才能使用账户。",
"Codync account": "Codync 账户",
"Usage analytics": "用量分析",
diff --git a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hant.json b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hant.json
index 4c827439..52435e59 100644
--- a/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hant.json
+++ b/apps/ios/Kit/Sources/CodyncKit/Resources/Languages/zh-Hant.json
@@ -53,6 +53,7 @@
"Connection": "連線",
"Continue": "繼續",
"Continue with Apple": "透過 Apple 繼續",
+ "Continue with GitHub": "透過 GitHub 繼續",
"Continue with Google": "透過 Google 繼續",
"Copied": "已複製",
"Copy": "複製",
@@ -779,8 +780,10 @@
"Couldn't finish signing in. Please try again.": "登入沒有完成。請再試一次。",
"Apple sign-in needs additional verification. Your account is not signed in yet.": "Apple 登入還需要額外驗證。賬戶還沒有登入。",
"Google sign-in needs additional verification. Your account is not signed in yet.": "Google 登入還需要額外驗證。賬戶還沒有登入。",
+ "GitHub sign-in needs additional verification. Your account is not signed in yet.": "GitHub 登入還需要額外驗證。賬戶還沒有登入。",
"Apple sign-up needs additional account information. Your account is not signed in yet.": "Apple 註冊還需要補充賬戶資訊。賬戶還沒有登入。",
"Google sign-up needs additional account information. Your account is not signed in yet.": "Google 註冊還需要補充賬戶資訊。賬戶還沒有登入。",
+ "GitHub sign-up needs additional account information. Your account is not signed in yet.": "GitHub 註冊還需要補充賬戶資訊。賬戶還沒有登入。",
"Sign in again to reach your account.": "重新登入後才能使用賬戶。",
"Codync account": "Codync 賬戶",
"Usage analytics": "用量分析",
diff --git a/apps/ios/Kit/Sources/CodyncUI/Bots/CustomIconEditor.swift b/apps/ios/Kit/Sources/CodyncUI/Bots/CustomIconEditor.swift
index 27a31a61..7b29d5d2 100644
--- a/apps/ios/Kit/Sources/CodyncUI/Bots/CustomIconEditor.swift
+++ b/apps/ios/Kit/Sources/CodyncUI/Bots/CustomIconEditor.swift
@@ -58,8 +58,9 @@ struct CustomIconEditor: View {
.frame(maxWidth: .infinity)
.disabled(editor.busy || account?.loading == true || store.connection != .online)
.codyncDialog("Sign in required", isPresented: $needsSignIn, message: "Sign in to use custom images.") {
- [DialogAction("Continue with Apple") { account?.signInApple() },
- DialogAction("Continue with Google") { account?.signInGoogle() }]
+ [DialogAction("Continue with Apple") { account?.signIn(.apple) },
+ DialogAction("Continue with Google") { account?.signIn(.google) },
+ DialogAction("Continue with GitHub") { account?.signIn(.github) }]
}
.fileImporter(isPresented: $choosing, allowedContentTypes: [.png, .jpeg, .webP, .svg]) { result in
switch result {
diff --git a/apps/ios/Kit/Sources/CodyncUI/CustomIconAccount.swift b/apps/ios/Kit/Sources/CodyncUI/CustomIconAccount.swift
index 9b61d7af..66affff4 100644
--- a/apps/ios/Kit/Sources/CodyncUI/CustomIconAccount.swift
+++ b/apps/ios/Kit/Sources/CodyncUI/CustomIconAccount.swift
@@ -1,3 +1,4 @@
+import CodyncKit
import SwiftUI
/// App-owned authentication intents used by the shared icon editor.
@@ -5,17 +6,14 @@ public struct CustomIconAccount: Sendable {
public let signedIn: Bool
public let loading: Bool
public let error: String?
- let signInApple: @MainActor @Sendable () -> Void
- let signInGoogle: @MainActor @Sendable () -> Void
+ let signIn: @MainActor @Sendable (AnalyticsEvent.SignInProvider) -> Void
public init(signedIn: Bool, loading: Bool, error: String?,
- signInApple: @escaping @MainActor @Sendable () -> Void,
- signInGoogle: @escaping @MainActor @Sendable () -> Void) {
+ signIn: @escaping @MainActor @Sendable (AnalyticsEvent.SignInProvider) -> Void) {
self.signedIn = signedIn
self.loading = loading
self.error = error
- self.signInApple = signInApple
- self.signInGoogle = signInGoogle
+ self.signIn = signIn
}
}
diff --git a/apps/ios/Resources/Assets.xcassets/github.imageset/Contents.json b/apps/ios/Resources/Assets.xcassets/github.imageset/Contents.json
new file mode 100644
index 00000000..8317b920
--- /dev/null
+++ b/apps/ios/Resources/Assets.xcassets/github.imageset/Contents.json
@@ -0,0 +1,5 @@
+{
+ "images" : [ { "filename" : "github.svg", "idiom" : "universal" } ],
+ "info" : { "author" : "xcode", "version" : 1 },
+ "properties" : { "template-rendering-intent" : "template", "preserves-vector-representation" : true }
+}
diff --git a/apps/ios/Resources/Assets.xcassets/github.imageset/github.svg b/apps/ios/Resources/Assets.xcassets/github.imageset/github.svg
new file mode 100644
index 00000000..9910a3b6
--- /dev/null
+++ b/apps/ios/Resources/Assets.xcassets/github.imageset/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
diff --git a/apps/ios/Views/AccountSwitcherView.swift b/apps/ios/Views/AccountSwitcherView.swift
index 20e952dd..fdd092e1 100644
--- a/apps/ios/Views/AccountSwitcherView.swift
+++ b/apps/ios/Views/AccountSwitcherView.swift
@@ -174,29 +174,6 @@ struct AccountSwitcherView: View {
}
}
-/// Google's mark plus the one line it needs; used wherever sign-in is offered.
-struct GoogleSignInButton: View {
- @Environment(AccountSession.self) private var account
-
- var body: some View {
- Button { Task { await account.signIn() } } label: {
- ZStack {
- HStack(spacing: 10) {
- Image("google").resizable().frame(width: 20, height: 20)
- Text(L10n.tr("Continue with Google"))
- }
- .opacity(account.isBusy ? 0 : 1)
- if account.isBusy { Spinner(size: 18) }
- }
- .font(.headline)
- .frame(maxWidth: .infinity, minHeight: 50)
- }
- .buttonStyle(.secondary)
- .disabled(account.isBusy)
- .animation(Motion.fade, value: account.isBusy)
- }
-}
-
/// The account's photo; its first letter on a tinted circle until (or unless) the photo loads.
struct AccountAvatar: View {
let url: URL?
diff --git a/apps/ios/Views/SignInButtons.swift b/apps/ios/Views/SignInButtons.swift
index e49c4084..a2d4af0d 100644
--- a/apps/ios/Views/SignInButtons.swift
+++ b/apps/ios/Views/SignInButtons.swift
@@ -2,28 +2,47 @@ import CodyncKit
import CodyncUI
import SwiftUI
-/// Equal access to both account providers at every sign-in entry point.
+/// Equal access to every account provider at every sign-in entry point.
struct SignInButtons: View {
+ var body: some View {
+ VStack(spacing: 10) {
+ ProviderButton(provider: .apple, title: "Continue with Apple") {
+ Image(systemName: "apple.logo").font(.system(size: 20))
+ }
+ .buttonStyle(.primary)
+ ProviderButton(provider: .google, title: "Continue with Google") {
+ Image("google").resizable().frame(width: 20, height: 20)
+ }
+ .buttonStyle(.secondary)
+ ProviderButton(provider: .github, title: "Continue with GitHub") {
+ Image("github").resizable().frame(width: 20, height: 20)
+ }
+ .buttonStyle(.secondary)
+ }
+ }
+}
+
+/// One provider's full-width button: its mark and line, a spinner while a sign-in runs (styled by the caller).
+private struct ProviderButton<Mark: View>: View {
@Environment(AccountSession.self) private var account
+ let provider: AnalyticsEvent.SignInProvider
+ let title: String
+ @ViewBuilder let mark: Mark
var body: some View {
- VStack(spacing: 10) {
- Button { Task { await account.signIn(provider: .apple) } } label: {
- ZStack {
- HStack(spacing: 10) {
- Image(systemName: "apple.logo").font(.system(size: 20))
- Text(L10n.tr("Continue with Apple"))
- }
- .opacity(account.isBusy ? 0 : 1)
- if account.isBusy { Spinner(size: 18) }
+ Button { Task { await account.signIn(provider: provider) } } label: {
+ ZStack {
+ HStack(spacing: 10) {
+ mark
+ Text(L10n.tr(title))
}
- .font(.headline)
- .frame(maxWidth: .infinity, minHeight: 50)
+ .opacity(account.isBusy ? 0 : 1)
+ if account.isBusy { Spinner(size: 18) }
}
- .buttonStyle(.primary)
- .disabled(account.isBusy)
- .animation(Motion.fade, value: account.isBusy)
- GoogleSignInButton()
+ .font(.headline)
+ .frame(maxWidth: .infinity, minHeight: 50)
}
+ .disabled(account.isBusy)
+ .animation(Motion.fade, value: account.isBusy)
}
}
diff --git a/apps/ios/WhatsNew.md b/apps/ios/WhatsNew.md
index 14522d8f..4f7fd649 100644
--- a/apps/ios/WhatsNew.md
+++ b/apps/ios/WhatsNew.md
@@ -8,14 +8,14 @@ a version without one gets a generic "Bug fixes and improvements" line. Delete o
## 2.36.0
### zh-Hant
-- Codync 現在需要用 Apple 或 Google 登入。以前沒登入就配對的電腦,第一次登入時會一起移進你的賬戶,不用再掃一次。
+- Codync 現在需要用 Apple、Google 或 GitHub 登入。以前沒登入就配對的電腦,第一次登入時會一起移進你的賬戶,不用再掃一次。
- 登出時,這支手機會從它連得到的電腦和你的賬戶中移除。
- 可以在 App 裡刪除賬戶:點 Bots 分頁左上角的賬戶按鈕,再點「刪除賬戶」。
- 配對會確認賬戶:在別人賬戶裡的電腦會告訴你它在誰的賬戶;還不在任何賬戶的電腦,會先在電腦上問一聲,再加入你的賬戶。
- 也可以輸入 `codync-host pair` 印出的短代碼來配對,不用掃 QR code。
### en-US
-- Codync now asks you to sign in with Apple or Google. Computers you paired without signing in move into your account the first time you sign in, with no new scan.
+- Codync now asks you to sign in with Apple, Google or GitHub. Computers you paired without signing in move into your account the first time you sign in, with no new scan.
- Signing out now also removes this phone from the computers it can reach and from your account.
- You can delete your account in the app: tap the account button at the top left of the Bots tab, then Delete account.
- Pairing checks your account: a computer in someone else's account tells you whose, and a computer in no account asks on the computer first, then joins your account.
diff --git a/docs/design/mobile-widgets.md b/docs/design/mobile-widgets.md
index bddeebbb..6a7903c0 100644
--- a/docs/design/mobile-widgets.md
+++ b/docs/design/mobile-widgets.md
@@ -13,7 +13,7 @@
## Onboarding 與帳號
-1. 首次開啟由 Welcome 提供 Apple/Google 登入(必須登入;沒有 Clerk 的 build 才有 Get started),再進入配對/帳號電腦流程。
+1. 首次開啟由 Welcome 提供 Apple/Google/GitHub 登入(必須登入;沒有 Clerk 的 build 才有 Get started),再進入配對/帳號電腦流程。
2. 儲存第一台配對電腦後,記錄此裝置的 `onboardingCompleted`。
3. 既有已配對安裝自動視為完成 onboarding。
4. 完成後才顯示帳號入口;切換到沒有電腦的帳號,或解除配對後,入口仍保留,避免無法切回原帳號。
diff --git a/docs/features/computer-order.md b/docs/features/computer-order.md
index 55371000..89824120 100644
--- a/docs/features/computer-order.md
+++ b/docs/features/computer-order.md
@@ -4,8 +4,8 @@ A computer's identity is its host signing key's `computerId`, not its display na
address, Apple login or transport. Pairing and account discovery of the same host
reuse that ID; iOS keeps one store per ID. Different computers may have the same
name without being merged. Resetting the host's data/keys makes a new identity:
-its old offline entry may need removing. Signing in with Apple and Google shares
-this state only when both reach the same Codync account.
+its old offline entry may need removing. Signing in with Apple, Google or GitHub shares
+this state only when they reach the same Codync account.
Desktop and iOS show one section per selected computer, or no computer headings when
only one is selected. Drag a section heading to reorder it. Desktop also supports
diff --git a/docs/guides/accounts-and-ssh.md b/docs/guides/accounts-and-ssh.md
index e46aeb9d..c299e418 100644
--- a/docs/guides/accounts-and-ssh.md
+++ b/docs/guides/accounts-and-ssh.md
@@ -28,12 +28,16 @@ connects to its local host; neither has this phone access-request screen.
The iOS app uses `apps/ios/App/AccountSession.swift`. Public keys and cloud URLs come from `apps/shared/Config/<env>.plist`, copied into the bundle as `AccountConfig.plist` by `project.yml`; `iOS Dev` (`DevDebug` / `DevRelease`) selects dev and `iOS` (`Debug` / `Release`) selects main. The desktop app reads the same plist through `node apps/desktop/tools/account-config.mjs <env>` (run by `npm run dev` and `npm run dist:*:<env>`), which writes `resources/account-config.json` (`CODYNC_CLERK_PUBLISHABLE_KEY` / `CODYNC_CLOUD_URL` override it). See [environments](environments-and-deployment.md).
-Confirm Apple and Google sign-in, Native API and the native app registrations in the intended Clerk instance. The desktop app uses `com.pokai.Codync`, iOS uses `com.pokai.Codync.ios`, with their matching `://callback` URLs. Dashboard configuration and actual OAuth consent must be verified independently of the checked-in plist. Do not bundle Clerk secret keys.
+Confirm Apple, Google and GitHub sign-in, Native API and the native app registrations in the intended Clerk instance. The desktop app uses `com.pokai.Codync`, iOS uses `com.pokai.Codync.ios`, with their matching `://callback` URLs. Dashboard configuration and actual OAuth consent must be verified independently of the checked-in plist. Do not bundle Clerk secret keys.
+
+### GitHub sign-in
+
+**Continue with GitHub** sits under Google on every sign-in surface (welcome, account menu, custom icon dialog; desktop Settings → General → Account). It is Clerk's built-in GitHub connection, run like Google: `oauth_github` through the system browser on the desktop, `clerk.auth.signInWithOAuth(provider: .github)` on iOS, `OAuthProvider.GITHUB` on Android. GitHub gives Clerk the account's verified email, so nothing in `cloud/` changes. The development instance can use Clerk's shared credentials; production needs a GitHub OAuth App (GitHub → Settings → Developer settings → OAuth Apps) whose callback URL is the one Clerk shows under SSO connections → GitHub → Use custom credentials, with its Client ID and secret pasted there. Enable it in production before a release with the button ships.
### Desktop Sign in with Apple
The welcome screen (`apps/desktop/src/renderer/views/AccountWelcomeView.tsx`) offers
-**Continue with Apple** and **Continue with Google**; **Settings → General → Account**
+**Continue with Apple**, **Continue with Google** and **Continue with GitHub**; **Settings → General → Account**
has Sign out.
On the desktop, `AccountService.signIn('apple')` starts Clerk's `oauth_apple` sign-in
@@ -68,9 +72,9 @@ still need to be checked on a release build.
### iOS Sign in with Apple
The welcome, pairing and account screens offer **Continue with Apple** alongside
-Google, with matching headline typography and button sizing. Apple's native
+Google and GitHub, with matching headline typography and button sizing. Apple's native
authorization is presented by Clerk. Adding another account lets the user choose
-either provider. `AccountSession.signIn(provider: .apple)` calls
+any provider. `AccountSession.signIn(provider: .apple)` calls
`clerk.auth.signInWithApple()`; Clerk owns Apple's credential exchange, new-user
transfer, session activation and persistence. Cancellation is silent and
incomplete sign-in/sign-up results remain explicit errors.
@@ -171,12 +175,12 @@ computer approves each device after comparing a 6-digit code
desktop app with `npm run dev` in `apps/desktop/`.
- Open the account menu from either sidebar layout; test arrows, Return, Escape
and clicking outside the panel.
-- Sign in with Apple and Google test users, verify the avatar/email, restart the app and
+- Sign in with Apple, Google and GitHub test users, verify the avatar/email, restart the app and
verify session restoration, then log out and verify the anonymous state.
- Cancel the browser flow and verify no error; retry with networking unavailable
and verify that the application stays usable.
-Dashboard creation and the end-to-end Apple/Google flows require the user's browser
+Dashboard creation and the end-to-end Apple/Google/GitHub flows require the user's browser
consent; compilation alone does not verify those steps.
References:
diff --git a/docs/guides/environments-and-deployment.md b/docs/guides/environments-and-deployment.md
index e6009db1..2018cb10 100644
--- a/docs/guides/environments-and-deployment.md
+++ b/docs/guides/environments-and-deployment.md
@@ -19,7 +19,7 @@ The environment is chosen when building, never stored: the host compiles in its
## Checked-in readiness
- **Development:** app configuration and Worker configuration target `https://dev-api.codync.dev`; dev Clerk issuer and D1 binding are configured in source. Exercise the live path before claiming readiness.
-- **Production:** `main.plist` targets `https://api.codync.dev` with the Clerk production instance (`clerk.codync.dev`, Google sign-in through the `codync-auth` Google Cloud project, published). The root Worker is deployed with D1 `codync`, `CLERK_SECRET_KEY` and `CLERK_WEBHOOK_SECRET` (Clerk webhook endpoint `https://api.codync.dev/v1/webhooks/clerk`, `user.deleted`), and `RELEASE_GATE_TOKEN` (dispatches the release gate; renewal in the [cloud README](../../cloud/README.md)).
+- **Production:** `main.plist` targets `https://api.codync.dev` with the Clerk production instance (`clerk.codync.dev`, Google sign-in through the `codync-auth` Google Cloud project, published; GitHub sign-in not enabled yet: it needs its GitHub OAuth App before the release that ships the button, see [GitHub sign-in](accounts-and-ssh.md#github-sign-in)). The root Worker is deployed with D1 `codync`, `CLERK_SECRET_KEY` and `CLERK_WEBHOOK_SECRET` (Clerk webhook endpoint `https://api.codync.dev/v1/webhooks/clerk`, `user.deleted`), and `RELEASE_GATE_TOKEN` (dispatches the release gate; renewal in the [cloud README](../../cloud/README.md)).
- **Cloud assistants (MCP connector):** the Worker also serves `mcp.codync.dev` (main) and `dev-mcp.codync.dev` (dev), deployed 2026-10-26. Each Clerk instance lists its URL under Agents → MCP server (public checks pass) with CIMD on and DCR off, and the zone's "no Browser Integrity Check" rule covers both hosts ([cloud assistants](../features/cloud-assistants.md)).
- **Local:** Wrangler's `local` environment supports the isolated integration test and its test issuer. It is not a real Google sign-in test.
- **Host names:** a dev host is the production name with a `dev-` prefix (`api` → `dev-api`, `mcp` → `dev-mcp`), never a `-dev` suffix: the suffix position is for regions (`relay-na`, so its dev host is `dev-relay-na`). Keep every host one level under `codync.dev` (a hyphen, not `dev.api.codync.dev`) so Cloudflare's universal certificate for `*.codync.dev` covers it.
diff --git a/docs/plans/require-sign-in.md b/docs/plans/require-sign-in.md
index ac949625..9b527c18 100644
--- a/docs/plans/require-sign-in.md
+++ b/docs/plans/require-sign-in.md
@@ -69,7 +69,7 @@ The two calls are best effort, with a short timeout each. Signing out never fail
**iPhone (`RootView.swift`, `WelcomeView.swift`)**
- `WelcomeView` keeps the crew, the chat glimpse and **Watch the demo**.
-- With Clerk configured, **Get started** is replaced by `SignInButtons` (Apple, Google) as the primary actions.
+- With Clerk configured, **Get started** is replaced by `SignInButtons` (Apple, Google, GitHub) as the primary actions.
- The pairing screen's **Skip** stays: a signed-in user may look around before pairing.
- When the signed-out context has computers, one more line appears: "Sign in to keep using your {n} computers. They move into your account; you won't need to scan again."
- `RootView`'s condition becomes "configured and ready and signed out" instead of `!onboardingCompleted && !welcomed`. Signing out of the last account lands back on this screen.
@@ -80,7 +80,7 @@ The two calls are best effort, with a short timeout each. Signing out never fail
- `NativeAccounts.configured` stands in for `isConfigured`.
**Desktop (`ChatWindow.tsx`, `AccountWelcomeView.tsx`)**
-- With Clerk configured, **Continue on this Mac** (the button and the skip link) goes, and the welcome shows only **Continue with Apple** / **Continue with Google**.
+- With Clerk configured, **Continue on this Mac** (the button and the skip link) goes, and the welcome shows only **Continue with Apple** / **Continue with Google** / **Continue with GitHub**.
- `onboarded` alone no longer opens the chat window. The welcome shows whenever the app is configured, ready and signed out, so signing out from the account menu returns to it.
- The host keeps running while signed out, and so do the tray and menu bar.
- Signing out also revokes the desktop app's own cloud device (`DELETE /v1/devices/{id}`, best effort, on a token taken before Clerk signs out) once Clerk has signed out, then its key file goes: the cloud refuses a revoked key, so the next sign-in makes a new one.
diff --git a/docs/reference/analytics-events.md b/docs/reference/analytics-events.md
index 312afd06..3344e348 100644
--- a/docs/reference/analytics-events.md
+++ b/docs/reference/analytics-events.md
@@ -40,7 +40,7 @@ host answers and sends it once the host is up.
| `onboarding_step_viewed` | iOS, Android | An onboarding screen appears. `welcome` is also the sign-in screen, so it's sent again after each sign-out (builds with accounts require sign-in): count persons, or the first one per person, for first runs | `step` (`welcome`/`install`/`scan`) |
| `onboarding_completed` | host `track` (desktop), iOS, Android | Once per setup. Desktop: the first run's welcome is finished (by signing in, in a build with accounts). Phones: the first-run screens are finished and the tabs appear (a computer paired, signed in to an account with computers, or skipped). | desktop `signed_in`; phones `via` (`paired`/`account`/`skipped`) |
| `computer_access_finished` | host `track` (desktop) | The *Computer access* step is left | `ready` (screen recording and control granted), `onboarding` |
-| `sign_in_started` | host `track` (desktop), iOS, Android | A sign-in button is pressed | `provider` (`apple`/`google`/`hosted`) |
+| `sign_in_started` | host `track` (desktop), iOS, Android | A sign-in button is pressed | `provider` (`apple`/`google`/`github`/`hosted`) |
| `sign_in_failed` | host `track` (desktop), iOS, Android | Sign-in ended without an account | `provider`, `reason` (`cancelled`/`timeout`/`verification`/`error`) |
| `signed_in` | host `track` (desktop), iOS, Android | Signed in to a Codync account | `provider` |
| `signed_out` | host `track` (desktop), iOS, Android | Signed out | — |
diff --git a/host/src/analytics/reported.rs b/host/src/analytics/reported.rs
index eb8a4aa8..60403cac 100644
--- a/host/src/analytics/reported.rs
+++ b/host/src/analytics/reported.rs
@@ -91,6 +91,7 @@ pub enum Reported {
pub enum Provider {
Apple,
Google,
+ Github,
Hosted,
#[serde(other)]
Other,
@@ -280,6 +281,7 @@ mod tests {
Event::SignInFailed,
),
(json!({"event": "signed_in", "app": "desktop", "provider": "google"}), Event::SignedIn),
+ (json!({"event": "signed_in", "app": "desktop", "provider": "github"}), Event::SignedIn),
(json!({"event": "signed_out", "app": "desktop"}), Event::SignedOut),
(
json!({"event": "star_prompt_answered", "app": "desktop", "ask": "second", "starred": true}),
diff --git a/web/app/compare/rivals.ts b/web/app/compare/rivals.ts
index 7f24ba0e..832163dc 100644
--- a/web/app/compare/rivals.ts
+++ b/web/app/compare/rivals.ts
@@ -24,7 +24,7 @@ const us = {
apps: "iPhone, Mac, Windows and Linux apps, plus a terminal UI over SSH.",
data: "Stays on your computer. The phone connects directly, or through an end-to-end encrypted relay.",
source: "Open source, Apache 2.0.",
- account: "Sign in with Apple or Google, free. An account never unlocks a computer: each one approves each device itself.",
+ account: "Sign in with Apple, Google or GitHub, free. An account never unlocks a computer: each one approves each device itself.",
approvals: "Edits and commands come to your phone: allow once, always allow or deny.",
rooms: "Group chats where every bot answers in its own session, and replies that quote any message.",
memory: "Memory per bot, and routines that run on a schedule or from a webhook.",
diff --git a/web/app/components/questions.tsx b/web/app/components/questions.tsx
index 44527280..c6cf24da 100644
--- a/web/app/components/questions.tsx
+++ b/web/app/components/questions.tsx
@@ -18,7 +18,7 @@ const questions: [string, string][] = [
],
[
"How do I start?",
- "Install Codync on the computer your agents run on and create a bot. Then sign in on your iPhone with Apple or Google and pair it by scanning the code from the Mac menu bar, the Windows or Linux app, or codync-host pair.",
+ "Install Codync on the computer your agents run on and create a bot. Then sign in on your iPhone with Apple, Google or GitHub and pair it by scanning the code from the Mac menu bar, the Windows or Linux app, or codync-host pair.",
],
[
"Where does my data go?",
@@ -26,7 +26,7 @@ const questions: [string, string][] = [
],
[
"Do I need an account?",
- "Yes, a free one: the apps ask you to sign in with Apple or Google. It lists every computer on your account on your phone. An account alone never unlocks a computer: you still pair in person by scanning a code, or approve a 6-digit code on the computer.",
+ "Yes, a free one: the apps ask you to sign in with Apple, Google or GitHub. It lists every computer on your account on your phone. An account alone never unlocks a computer: you still pair in person by scanning a code, or approve a 6-digit code on the computer.",
],
[
"Which computers can run it?",
diff --git a/web/app/privacy/page.tsx b/web/app/privacy/page.tsx
index 86029e9f..e3223368 100644
--- a/web/app/privacy/page.tsx
+++ b/web/app/privacy/page.tsx
@@ -37,7 +37,7 @@ export default function Privacy() {
</Section>
<Section title="Codync account">
- The Codync apps ask you to sign in with Apple or Google, so your phones can find your computers. Your account keeps your email address, an account ID, and the names of the phones and computers you connect with it. You can delete it at any time: see <a href="#delete-account" className="underline">Delete your Codync account</a> below.
+ The Codync apps ask you to sign in with Apple, Google or GitHub, so your phones can find your computers. Your account keeps your email address, an account ID, and the names of the phones and computers you connect with it. You can delete it at any time: see <a href="#delete-account" className="underline">Delete your Codync account</a> below.
</Section>
<Section title="Data we collect">
diff --git a/web/content/docs/getting-started.mdx b/web/content/docs/getting-started.mdx
index 88303aab..e65df939 100644
--- a/web/content/docs/getting-started.mdx
+++ b/web/content/docs/getting-started.mdx
@@ -41,7 +41,7 @@ You can also install the host with Homebrew (`brew install leepokai/codync/codyn
### The first launch of the desktop app
-The app first asks you to sign in with Apple or Google. The computer joins your account, so your phone can find it there. It then offers **Computer access**, which bots need only to use the screen; choose **Set up later** to skip it. See [Computer use](/docs/computer-use).
+The app first asks you to sign in with Apple, Google or GitHub. The computer joins your account, so your phone can find it there. It then offers **Computer access**, which bots need only to use the screen; choose **Set up later** to skip it. See [Computer use](/docs/computer-use).
Setup also offers an optional GitHub star. If you skip it, the desktop app can remind you once after seven days. That reminder has two actions: **Star on GitHub** opens the repository, and **Not now** dismisses it. You can also dismiss it by clicking outside the card or pressing Escape. Opening the repository or dismissing this reminder ends further reminders on that computer.
@@ -70,7 +70,7 @@ Every iPhone release goes through Apple's App Review first, so the App Store ver
## 3. Pair your iPhone
-Pairing connects your phone to your computer with a QR code. The phone needs to be signed in first, with Apple or Google, and with the same account as the desktop app: a computer in another account turns the phone away. Apple with Hide My Email on one and Google on the other are two different accounts (more in [Remote access](/docs/remote-access#pairing)).
+Pairing connects your phone to your computer with a QR code. The phone needs to be signed in first, with Apple, Google or GitHub, and with the same account as the desktop app: a computer in another account turns the phone away. Apple with Hide My Email on one and Google on the other are two different accounts (more in [Remote access](/docs/remote-access#pairing)).
On the computer, show the pairing code:
@@ -79,7 +79,7 @@ On the computer, show the pairing code:
- **Any desktop app:** Settings → Computers, then the **Pair iPhone** button on the computer.
- **Terminal:** run `codync-host pair`, or press `P` in the terminal UI.
-On the iPhone, open Codync, sign in with Apple or Google, tap **Continue**, then scan the code. The iPhone Camera app can scan it too. If you can't scan, copy the pairing link on the computer and paste it into the field under the viewfinder. To pair later, tap the account button at the top left of the Bots tab, then **Scan a computer's code**.
+On the iPhone, open Codync, sign in with Apple, Google or GitHub, tap **Continue**, then scan the code. The iPhone Camera app can scan it too. If you can't scan, copy the pairing link on the computer and paste it into the field under the viewfinder. To pair later, tap the account button at the top left of the Bots tab, then **Scan a computer's code**.
The iPhone app has three tabs: **Bots** (your bots and chats), **State** (widgets, Live Activities and usage limits) and **Settings** (this iPhone's own settings). Each computer's settings, such as Extensions, voice chat and push notifications, are in **Manage computers**: tap the connection status at the top of the Bots tab (such as **1 connected**).
diff --git a/web/content/docs/remote-access.mdx b/web/content/docs/remote-access.mdx
index 10a058ee..1dae4552 100644
--- a/web/content/docs/remote-access.mdx
+++ b/web/content/docs/remote-access.mdx
@@ -40,7 +40,7 @@ Changing the account a computer belongs to (moving it, or **Remove from account*
## Signing in
-The iPhone, Android and desktop apps ask you to sign in with Apple or Google before you use them. Signing in doesn't give any device access by itself. It lets your phone find the computers in your account without scanning a code:
+The iPhone, Android and desktop apps ask you to sign in with Apple, Google or GitHub before you use them. Signing in doesn't give any device access by itself. It lets your phone find the computers in your account without scanning a code:
1. On the computer, sign in to the desktop app. The computer joins your account. For an SSH computer, choose **Add to account** on its card in **Settings → Computers**.
2. On the iPhone, sign in with the same account and open **Manage computers**. Your account's computers are listed there. Tap **Ask for access**. The phone shows a 6-digit code.