From cef3f93a01597e4ddc07794467da25de7ccc39c2 Mon Sep 17 00:00:00 2001
From: Merge Sim <sim@local>
Date: Wed, 2 Sep 2026 13:29:25 -0700
Subject: [PATCH] fix(mobile): expose safe host display labels

---
 .../orca-runtime-tests/paired-settings.spec.ts   |  6 ++++++
 src/main/runtime/runtime-client-settings.ts      | 16 +++++++++++++++-
 src/main/runtime/runtime-store-contract.ts       |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/orca-runtime-tests/paired-settings.spec.ts b/src/main/runtime/orca-runtime-tests/paired-settings.spec.ts
index 85a6099a8b2..ac3fdd4154d 100644
--- a/src/main/runtime/orca-runtime-tests/paired-settings.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/paired-settings.spec.ts
@@ -23,6 +23,9 @@ describe('OrcaRuntimeService', () => {
       ...store,
       getSettings: () => ({
         ...store.getSettings(),
+        hostSettingOverrides: {
+          'ssh:target-1': { displayLabel: 'Build host', defaultWorktreeLocation: '/srv/worktrees' }
+        },
         experimentalNewWorktreeCardStyle: true,
         compactWorktreeCards: true,
         minimaxGroupId: 'group-42',
@@ -39,6 +42,9 @@ describe('OrcaRuntimeService', () => {
       minimaxUsageModels: 'general,abab6.5'
     })
     expect(runtime.getClientSettings()).not.toHaveProperty('terminalQuickCommands')
+    expect(runtime.getClientSettings().hostSettingOverrides).toEqual({
+      'ssh:target-1': { displayLabel: 'Build host' }
+    })
     expect(runtime.getClientTerminalQuickCommands()).toEqual(terminalQuickCommands)
   })
 
diff --git a/src/main/runtime/runtime-client-settings.ts b/src/main/runtime/runtime-client-settings.ts
index 1fb815936e6..41a251ce649 100644
--- a/src/main/runtime/runtime-client-settings.ts
+++ b/src/main/runtime/runtime-client-settings.ts
@@ -10,6 +10,8 @@ import {
 } from '../../shared/terminal-quick-commands'
 import { haveSameDisabledTuiAgents } from '../../shared/tui-agent-selection'
 import type { GlobalSettings } from '../../shared/global-settings-types'
+import { getHostDisplayLabelOverrides } from '../../shared/host-setting-overrides'
+import type { ExecutionHostId } from '../../shared/execution-host'
 import type { TerminalQuickCommand } from '../../shared/terminal-quick-command-types'
 import { recordManagedHookInstallFailure } from '../agent-hooks/install-telemetry'
 import { applyAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls'
@@ -37,6 +39,13 @@ export type RuntimeClientSettings = Pick<
   | 'artifactSharingEnabled'
   | 'worktreeVisibilityDefaults'
   | 'agentSkillSharingEnabled'
+> & {
+  hostSettingOverrides: RuntimeHostDisplayLabelOverrides
+}
+
+/** Safe paired projection: host labels only; filesystem defaults stay host-private. */
+export type RuntimeHostDisplayLabelOverrides = Partial<
+  Record<ExecutionHostId, { displayLabel: string }>
 >
 
 export type RuntimeClientSettingsUpdate = Pick<
@@ -94,7 +103,12 @@ export class RuntimeClientSettingsController {
       prBotAuthorOverrides: settings.prBotAuthorOverrides ?? [],
       artifactSharingEnabled: isArtifactSharingEnabled(settings),
       worktreeVisibilityDefaults: settings.worktreeVisibilityDefaults ?? { external: 'hide' },
-      agentSkillSharingEnabled: isAgentSkillSharingEnabled(settings)
+      agentSkillSharingEnabled: isAgentSkillSharingEnabled(settings),
+      hostSettingOverrides: Object.fromEntries(
+        [
+          ...getHostDisplayLabelOverrides({ hostSettingOverrides: settings.hostSettingOverrides })
+        ].map(([hostId, displayLabel]) => [hostId, { displayLabel }])
+      ) as RuntimeHostDisplayLabelOverrides
     }
   }
 
diff --git a/src/main/runtime/runtime-store-contract.ts b/src/main/runtime/runtime-store-contract.ts
index e160e039533..b0cef1a9985 100644
--- a/src/main/runtime/runtime-store-contract.ts
+++ b/src/main/runtime/runtime-store-contract.ts
@@ -111,6 +111,7 @@ export type RuntimeStore = {
     terminalHiddenDeliveryGate?: GlobalSettings['terminalHiddenDeliveryGate']
     terminalModelQueryAuthority?: GlobalSettings['terminalModelQueryAuthority']
     worktreeVisibilityDefaults?: GlobalSettings['worktreeVisibilityDefaults']
+    hostSettingOverrides?: GlobalSettings['hostSettingOverrides']
     agentSkillSharingEnabled?: GlobalSettings['agentSkillSharingEnabled']
   }
   // Why: narrow to `unknown` return so test mocks can return void without