Sync fork with upstream/main (64e90a99)

app/src/main/java/com/yugahashimoto/andcode/AndCodeApplication.kt

@@ -74,6 +74,7 @@ import com.yugahashimoto.andcode.runtime.local.LocalRuntimeReleaseClient
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeServiceController
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeTarget
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeUpdater
+import com.yugahashimoto.andcode.runtime.local.StartupCommandsRunner
 import com.yugahashimoto.andcode.runtime.local.SystemPromptStore
 import com.yugahashimoto.andcode.runtime.local.VerifiedRuntimeDownloader
 import com.yugahashimoto.andcode.runtime.local.applyOpenCodeSystemPrompt
@@ -287,6 +288,13 @@ class AndCodeApplication : Application() {
                 accessCoordinator = accessCoordinator,
             )
         localRuntimeInstaller = installer
+        // Guest startup commands (issue #379): read from the workspace on every runtime start,
+        // launched detached so they can neither block nor fail the start itself.
+        val startupCommandsRunner =
+            StartupCommandsRunner(
+                runtimeDirectory = runtimeDirectory,
+                githubToken = { settings.githubToken },
+            )
         val launcher =
             LocalRuntimeProcessLauncher(
                 runtimeDirectory = runtimeDirectory,
@@ -300,6 +308,7 @@ class AndCodeApplication : Application() {
                             if (settings.githubToken.isNullOrBlank()) helper.remove() else helper.install()
                         }
                     }
+                    runCatching { startupCommandsRunner.schedule(installed) }
                 },
             )
         commandRunner =

app/src/main/java/com/yugahashimoto/andcode/core/api/OpenCodeV2ApiClient.kt

@@ -184,13 +184,17 @@ class OpenCodeV2ApiClient(
         )
     }
 
+    /**
+     * Internal V2 agents (compaction, title, summary) are reported as `mode: primary` with
+     * `hidden: true`; the app's agent model has no hidden flag yet, so they are dropped here to
+     * keep them out of the mode picker and settings.
+     */
     override suspend fun agents(): List<OpenCodeAgent> =
-        getData<List<V2Agent>>("api/agent").map { agent ->
+        getData<List<V2Agent>>("api/agent").filterNot { it.hidden }.map { agent ->
             OpenCodeAgent(
                 name = agent.id,
                 description = agent.description,
                 mode = agent.mode,
-                hidden = agent.hidden,
             )
         }
 
@@ -527,6 +531,7 @@ class OpenCodeV2ApiClient(
         directory: String?,
     ): Boolean {
         sendVoid(requestBuilder("api/session/${encodePath(sessionId)}").delete())
+        sessionLocks.remove(sessionId)
         return true
     }
 

app/src/main/java/com/yugahashimoto/andcode/core/api/ProtocolDetectingOpenCodeApi.kt

@@ -22,6 +22,7 @@ import okhttp3.Credentials
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import java.io.IOException
 
 /** Which HTTP API a server speaks. V2 servers answer under the `api/` prefix; V1 servers answer the legacy routes. */
 enum class OpenCodeProtocol { V1, V2 }
@@ -298,24 +299,43 @@ class ProtocolDetectingOpenCodeApi(
      *
      * V1 servers answer `api/info` with the single-page-app HTML, which is not conclusive by itself.
      * V1 is only confirmed when `global/health` succeeds, so an outage or proxy error cannot be
-     * mistaken for a V1 server. Transient statuses (5xx, 408, 429) are thrown and not cached.
+     * mistaken for a V1 server.
+     *
+     * Older V1 servers, and V1 builds without an embedded web UI, proxy unknown paths such as
+     * `api/info` to app.opencode.ai, so a 5xx or a timeout there can be a perfectly healthy V1
+     * server whose upstream web host is unreachable. Those failures still try `global/health`, but
+     * only a 1.x version on it is accepted as V1: a V2 server answers that path with HTML, so its
+     * transient failures keep throwing and are never cached as V1.
      */
     private suspend fun probe(): Probe =
         withContext(Dispatchers.IO) {
-            val info = fetchStatus("api/info")
+            val info =
+                try {
+                    fetchStatus("api/info")
+                } catch (error: IOException) {
+                    return@withContext confirmLegacyMajorOne() ?: throw error
+                }
             when {
                 info.code in 200..299 -> versionOf(info.body)?.let { Probe.V2(it) } ?: confirmLegacy()
                 info.code == 401 && isUnauthorizedTag(info.body) -> Probe.V2Unauthorized
                 info.code == 401 || info.code == 403 || info.code == 404 || info.code in 300..399 -> confirmLegacy()
-                else -> throw OpenCodeApiException(statusCode = info.code, message = "OpenCode probe failed (HTTP ${info.code})")
+                else ->
+                    confirmLegacyMajorOne()
+                        ?: throw OpenCodeApiException(statusCode = info.code, message = "OpenCode probe failed (HTTP ${info.code})")
             }
         }
 
+    /** [confirmLegacy] for an inconclusive `api/info`: a 1.x server, or null when that is not proven. */
+    private fun confirmLegacyMajorOne(): Probe.Legacy? =
+        runCatching { confirmLegacy() }
+            .getOrNull()
+            ?.takeIf { legacy -> legacy.health.version.trim().removePrefix("v").substringBefore('.') == "1" }
+
     /**
      * Confirms a V1 server with `global/health`; any non-success is not a V1 verdict. The body is
      * kept so that [health] can return it without a second request.
      */
-    private fun confirmLegacy(): Probe {
+    private fun confirmLegacy(): Probe.Legacy {
         // A V1 server may run with a custom OPENCODE_SERVER_USERNAME, which the V1 client honours,
         // so the V1 confirmation authenticates as the profile does rather than as V2's fixed user.
         val response = fetchStatus("global/health", username = profile.username.ifBlank { OpenCodeV2ApiClient.USERNAME })

app/src/main/java/com/yugahashimoto/andcode/di/AppModule.kt

@@ -32,6 +32,7 @@ import com.yugahashimoto.andcode.runtime.local.LocalRuntimeReleaseClient
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeServiceController
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeTarget
 import com.yugahashimoto.andcode.runtime.local.LocalRuntimeUpdater
+import com.yugahashimoto.andcode.runtime.local.StartupCommandsRunner
 import com.yugahashimoto.andcode.runtime.local.VerifiedRuntimeDownloader
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -88,6 +89,13 @@ val appModule =
             val providerCredentials: LocalProviderCredentialStore = get()
             val customProviders: CustomProviderStore = get()
             val runtimeDirectory: File = get()
+            // Guest startup commands (issue #379): read from the workspace on every runtime start,
+            // launched detached so they can neither block nor fail the start itself.
+            val startupCommandsRunner =
+                StartupCommandsRunner(
+                    runtimeDirectory = runtimeDirectory,
+                    githubToken = { settings.githubToken },
+                )
             LocalRuntimeProcessLauncher(
                 runtimeDirectory = runtimeDirectory,
                 portProbe = LocalRuntimeManager::defaultPortProbe,
@@ -100,6 +108,7 @@ val appModule =
                             if (settings.githubToken.isNullOrBlank()) helper.remove() else helper.install()
                         }
                     }
+                    runCatching { startupCommandsRunner.schedule(installed) }
                 },
             )
         }

app/src/main/java/com/yugahashimoto/andcode/di/ViewModelModule.kt

@@ -5,6 +5,7 @@ import com.yugahashimoto.andcode.feature.activity.ActivityViewModel
 import com.yugahashimoto.andcode.feature.chat.ChatViewModel
 import com.yugahashimoto.andcode.feature.settings.SettingsViewModel
 import com.yugahashimoto.andcode.feature.workspace.WorkspaceViewModel
+import com.yugahashimoto.andcode.runtime.local.CustomProviderModelFetcher
 import kotlinx.coroutines.flow.first
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.viewModel
@@ -53,6 +54,13 @@ val viewModelModule =
                     androidContext().getString(com.yugahashimoto.andcode.R.string.provider_disconnect_rejected),
                 customProviderInvalidMessage =
                     androidContext().getString(com.yugahashimoto.andcode.R.string.provider_custom_invalid),
+                modelFetcher = CustomProviderModelFetcher(get()),
+                customProviderFetchNeedsBaseUrlMessage =
+                    androidContext().getString(com.yugahashimoto.andcode.R.string.provider_custom_fetch_needs_base_url),
+                customProviderFetchEmptyMessage =
+                    androidContext().getString(com.yugahashimoto.andcode.R.string.provider_custom_fetch_empty),
+                customProviderFetchFailedMessage =
+                    androidContext().getString(com.yugahashimoto.andcode.R.string.provider_custom_fetch_failed),
             )
         }
 

app/src/main/java/com/yugahashimoto/andcode/feature/chat/ChatHomeScreen.kt

@@ -672,6 +672,7 @@ fun ChatHomeScreen(
                             .firstOrNull { it.id == selectedProviderId }
                             ?.models?.get(selectedModelId)
                             ?.limit?.context ?: 0L,
+                    tokensPerSecond = state.connectionQuality?.tokensPerSecond ?: 0.0,
                     showSlashCommands = showSlashCommands,
                     slashCommands = state.slashCommands,
                     slashSkills = state.slashSkills,
@@ -1257,6 +1258,7 @@ private fun ChatComposer(
     enterToSend: Boolean,
     contextTokensUsed: Long,
     contextLimit: Long,
+    tokensPerSecond: Double,
     showSlashCommands: Boolean,
     slashCommands: List<OpenCodeCommand>,
     slashSkills: List<OpenCodeSkill>,
@@ -1630,6 +1632,9 @@ private fun ChatComposer(
                     contextLimit = contextLimit,
                 )
             }
+            if (isRunning && tokensPerSecond >= 0.05) {
+                CompactTokenSpeed(tokensPerSecond)
+            }
         }
     }
 }
@@ -2167,6 +2172,20 @@ private fun formatTokenCount(tokens: Long): String =
         else -> tokens.toString()
     }
 
+@Composable
+private fun CompactTokenSpeed(tokensPerSecond: Double) {
+    Text(
+        text = stringResource(R.string.chat_token_speed, formatTokenRate(tokensPerSecond)),
+        style = MaterialTheme.typography.labelSmall,
+        fontSize = 9.sp,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        modifier = Modifier.padding(horizontal = 2.dp),
+    )
+}
+
+private fun formatTokenRate(tokensPerSecond: Double): String =
+    if (tokensPerSecond >= 10.0) "%.0f".format(tokensPerSecond) else "%.1f".format(tokensPerSecond)
+
 @Preview(showBackground = true)
 @Composable
 private fun ChatHomeScreenEmptyPreview() {

app/src/main/java/com/yugahashimoto/andcode/feature/settings/CustomProviderDialog.kt

@@ -2,18 +2,27 @@ package com.yugahashimoto.andcode.feature.settings
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
 import com.yugahashimoto.andcode.R
 
@@ -24,12 +33,20 @@ fun CustomProviderDialog(
     onNameChange: (String) -> Unit,
     onBaseUrlChange: (String) -> Unit,
     onModelsChange: (String) -> Unit,
+    onApiKeyChange: (String) -> Unit,
+    onFetchModels: () -> Unit,
     onSubmit: () -> Unit,
     onDismiss: () -> Unit,
 ) {
     AlertDialog(
         onDismissRequest = { if (!state.isSubmitting) onDismiss() },
-        title = { Text(stringResource(R.string.provider_add_custom_title)) },
+        title = {
+            Text(
+                stringResource(
+                    if (state.editing) R.string.provider_edit_custom_title else R.string.provider_add_custom_title,
+                ),
+            )
+        },
         text = {
             Column(
                 modifier = Modifier.verticalScroll(rememberScrollState()),
@@ -46,7 +63,7 @@ fun CustomProviderDialog(
                     label = { Text(stringResource(R.string.provider_custom_id_label)) },
                     placeholder = { Text(stringResource(R.string.provider_custom_id_hint)) },
                     singleLine = true,
-                    enabled = !state.isSubmitting,
+                    enabled = !state.isBusy && !state.editing,
                     modifier = Modifier.fillMaxWidth(),
                 )
                 OutlinedTextField(
@@ -55,7 +72,7 @@ fun CustomProviderDialog(
                     label = { Text(stringResource(R.string.provider_custom_name_label)) },
                     placeholder = { Text(stringResource(R.string.provider_custom_name_hint)) },
                     singleLine = true,
-                    enabled = !state.isSubmitting,
+                    enabled = !state.isBusy,
                     modifier = Modifier.fillMaxWidth(),
                 )
                 OutlinedTextField(
@@ -64,16 +81,63 @@ fun CustomProviderDialog(
                     label = { Text(stringResource(R.string.provider_custom_base_url_label)) },
                     placeholder = { Text(stringResource(R.string.provider_custom_base_url_hint)) },
                     singleLine = true,
-                    enabled = !state.isSubmitting,
+                    enabled = !state.isBusy,
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
                     modifier = Modifier.fillMaxWidth(),
                 )
+                OutlinedTextField(
+                    value = state.apiKey,
+                    onValueChange = onApiKeyChange,
+                    label = { Text(stringResource(R.string.api_key_hint)) },
+                    supportingText = {
+                        Text(
+                            stringResource(
+                                if (state.hasStoredApiKey) {
+                                    R.string.provider_custom_api_key_stored_help
+                                } else {
+                                    R.string.provider_custom_api_key_help
+                                },
+                            ),
+                        )
+                    },
+                    singleLine = true,
+                    enabled = !state.isBusy,
+                    visualTransformation = PasswordVisualTransformation(),
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                Row(
+                    horizontalArrangement = Arrangement.spacedBy(10.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    OutlinedButton(onClick = onFetchModels, enabled = !state.isBusy) {
+                        Text(stringResource(R.string.provider_custom_fetch_models))
+                    }
+                    if (state.isFetchingModels) {
+                        CircularProgressIndicator(strokeWidth = 2.dp, modifier = Modifier.size(20.dp))
+                    }
+                }
+                state.fetchedModelCount?.let { count ->
+                    Text(
+                        pluralStringResource(R.plurals.provider_custom_fetch_success, count, count),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.primary,
+                    )
+                }
+                state.fetchError?.let { error ->
+                    Text(
+                        error,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.error,
+                    )
+                }
                 OutlinedTextField(
                     value = state.models,
                     onValueChange = onModelsChange,
                     label = { Text(stringResource(R.string.provider_custom_models_label)) },
                     placeholder = { Text(stringResource(R.string.provider_custom_models_hint)) },
-                    singleLine = true,
-                    enabled = !state.isSubmitting,
+                    maxLines = 6,
+                    enabled = !state.isBusy,
                     modifier = Modifier.fillMaxWidth(),
                 )
                 state.error?.let { error ->
@@ -86,8 +150,8 @@ fun CustomProviderDialog(
             }
         },
         confirmButton = {
-            Button(onClick = onSubmit, enabled = !state.isSubmitting) {
-                Text(stringResource(R.string.continue_label))
+            Button(onClick = onSubmit, enabled = !state.isBusy) {
+                Text(stringResource(if (state.editing) R.string.save else R.string.continue_label))
             }
         },
         dismissButton = {

app/src/main/java/com/yugahashimoto/andcode/feature/settings/McpViewModel.kt

@@ -6,6 +6,7 @@ import com.yugahashimoto.andcode.core.api.McpServer
 import com.yugahashimoto.andcode.runtime.LocalAgent
 import com.yugahashimoto.andcode.runtime.OpenCodeBackend
 import com.yugahashimoto.andcode.runtime.RuntimeRegistry
+import com.yugahashimoto.andcode.runtime.RuntimeTarget
 import com.yugahashimoto.andcode.runtime.local.ClaudeCodeTarget
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -77,7 +78,16 @@ class McpViewModel(
             _state.update { it.copy(isLoading = true, error = null) }
             runCatching { backend.mcpServers() }
                 .onSuccess { servers ->
-                    _state.update { it.copy(servers = servers, isLoading = false) }
+                    // Read after the list call: that call is what lets a remote target detect its
+                    // protocol, and an OpenCode V2 server has no MCP OAuth endpoints to offer.
+                    val oauthOffered = (backend as? RuntimeTarget)?.capabilities?.mcpOAuth != false
+                    _state.update {
+                        it.copy(
+                            servers = servers,
+                            isLoading = false,
+                            supportsOAuth = agent == LocalAgent.OPEN_CODE && oauthOffered,
+                        )
+                    }
                 }
                 .onFailure { e ->
                     _state.update { it.copy(error = e.message, isLoading = false) }