diff --git a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary-equality.ts b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary-equality.ts
index 1867b3e35ab..f2e26334b02 100644
--- a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary-equality.ts
+++ b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary-equality.ts
@@ -29,6 +29,7 @@ export function structuredStatusSummariesEqual(
a.latestPrompt === b.latestPrompt &&
a.model === b.model &&
a.permissionMode === b.permissionMode &&
+ a.launchPermissionMode === b.launchPermissionMode &&
a.runtimePermission?.fence === b.runtimePermission?.fence &&
a.runtimePermission?.mode === b.runtimePermission?.mode &&
(a.runtimePermission === undefined) === (b.runtimePermission === undefined) &&
diff --git a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary.ts b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary.ts
index 9b539489762..29433dc124c 100644
--- a/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary.ts
+++ b/src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-summary.ts
@@ -87,6 +87,9 @@ export function structuredAgentSessionStatusSummary({
: {}),
...(model ? { model } : {}),
...(isAgentChatPermissionMode(permissionMode) ? { permissionMode } : {}),
+ ...(session.child?.permissionMode
+ ? { launchPermissionMode: session.child.permissionMode }
+ : {}),
...(effort ? { effort } : {}),
...(fastMode ? { fastMode } : {}),
...(serviceTier ? { serviceTier } : {}),
diff --git a/src/renderer/src/components/native-chat/session/options/controls/NativeChatPermissionModePicker.tsx b/src/renderer/src/components/native-chat/session/options/controls/NativeChatPermissionModePicker.tsx
index 7abecbe6a1a..f98caec23cf 100644
--- a/src/renderer/src/components/native-chat/session/options/controls/NativeChatPermissionModePicker.tsx
+++ b/src/renderer/src/components/native-chat/session/options/controls/NativeChatPermissionModePicker.tsx
@@ -31,10 +31,11 @@ import { runSessionOptionSurfaceCall } from './native-chat-session-option-surfac
export function NativeChatPermissionModeName(props: {
mode: AgentChatPermissionMode
truncate?: boolean
+ label?: string
}): React.JSX.Element {
const t = useTranslate()
const Icon = NATIVE_CHAT_PERMISSION_MODE_ICONS[props.mode]
- const label = nativeChatPermissionModeLabel(props.mode, t)
+ const label = props.label ?? nativeChatPermissionModeLabel(props.mode, t)
const body = (
<>
@@ -129,7 +130,7 @@ function NativeChatPermissionModePickerInner({
className="max-w-40 min-w-0 shrink"
>
{isAgentChatPermissionMode(current) ? (
-
+
) : (
<>
@@ -189,7 +190,7 @@ export function NativeChatComposerPermissionPicker({
{
diff --git a/src/renderer/src/components/native-chat/session/options/structured/use-structured-agent-session-option-state.ts b/src/renderer/src/components/native-chat/session/options/structured/use-structured-agent-session-option-state.ts
index ed53ac6783b..5be42311447 100644
--- a/src/renderer/src/components/native-chat/session/options/structured/use-structured-agent-session-option-state.ts
+++ b/src/renderer/src/components/native-chat/session/options/structured/use-structured-agent-session-option-state.ts
@@ -65,11 +65,8 @@ export function useStructuredAgentSessionOptionState(args: {
target,
worktree
} = args
- const { permissionReport, observation } = useStructuredAgentSessionPermissionStatus(
- sessionId,
- target,
- fence
- )
+ const { permissionReport, launchPermissionMode, observation } =
+ useStructuredAgentSessionPermissionStatus(sessionId, target, fence)
const [reader] = useState(() =>
createStructuredAgentSessionOptionsReadOwner(
firstFrameOptionState(agent, target, {
@@ -227,9 +224,18 @@ export function useStructuredAgentSessionOptionState(args: {
),
permissionReport
),
+ ...(launchPermissionMode === undefined ? {} : { launchPermissionMode }),
permissionOwnSupported
}),
- [reader, owner, controller, permissionReport, fence, permissionOwnSupported]
+ [
+ reader,
+ owner,
+ controller,
+ permissionReport,
+ launchPermissionMode,
+ fence,
+ permissionOwnSupported
+ ]
)
const takesSendOptions = useStructuredAgentSessionHostCapability(
target,
diff --git a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-hooks.ts b/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-hooks.ts
index 92270b8e32c..efc346bee57 100644
--- a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-hooks.ts
+++ b/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-hooks.ts
@@ -32,6 +32,7 @@ export function useStructuredAgentSessionPermissionStatus(
fence: number | null
): {
permissionReport: ReturnType
+ launchPermissionMode: string | undefined
observation: 'live' | 'unverifiable'
} {
const { feed, subscribe } = useSessionFeed(sessionId, target)
@@ -45,7 +46,12 @@ export function useStructuredAgentSessionPermissionStatus(
() => feed.getSessionObservation(sessionId),
() => 'unverifiable' as const
)
- return { permissionReport, observation }
+ const launchPermissionMode = useSyncExternalStore(
+ subscribe,
+ () => feed.getSnapshot().get(sessionId)?.launchPermissionMode,
+ () => undefined
+ )
+ return { permissionReport, launchPermissionMode, observation }
}
export function useStructuredAgentSessionOptionStamp(
diff --git a/src/shared/agent-session/agent-session-wire.ts b/src/shared/agent-session/agent-session-wire.ts
index b77ff8cd979..1f0d5c2e86a 100644
--- a/src/shared/agent-session/agent-session-wire.ts
+++ b/src/shared/agent-session/agent-session-wire.ts
@@ -215,6 +215,8 @@ export type AgentSessionStatusSummary = {
reportedModel?: string
/** The chat's saved permission mode; a client re-reads options when it or `model` moves. */
permissionMode?: string
+ /** Permission choice used to start the currently fenced provider child. */
+ launchPermissionMode?: string
runtimePermission?: { fence: number; mode: string | null } | null
/** The chat's saved effort, Fast and speed picks, encoded; another device's pick moves them so a
* client re-reads options. Absent from older hosts. */
diff --git a/src/shared/agent-session/options/structured-agent-session-options.ts b/src/shared/agent-session/options/structured-agent-session-options.ts
index a20752d205f..6b431100b1e 100644
--- a/src/shared/agent-session/options/structured-agent-session-options.ts
+++ b/src/shared/agent-session/options/structured-agent-session-options.ts
@@ -72,6 +72,8 @@ export type StructuredAgentSessionOptionState = {
defaultsUnsent?: true
/** The permission mode the host or launch last stated; null shows no picker. */
permissionMode: string | null
+ /** Optional live-host launch choice; absent on older hosts. */
+ launchPermissionMode?: string
interactionModeSupported?: boolean
reportedPermissionMode?: string | null
permissionOwnSupported?: boolean | null
diff --git a/src/shared/agent-session/options/structured-agent-session-permission-option.test.ts b/src/shared/agent-session/options/structured-agent-session-permission-option.test.ts
index e4732f69f8d..86bd0e195a9 100644
--- a/src/shared/agent-session/options/structured-agent-session-permission-option.test.ts
+++ b/src/shared/agent-session/options/structured-agent-session-permission-option.test.ts
@@ -99,4 +99,46 @@ describe('the permission mode picker', () => {
)
).toBe(true)
})
+
+ it('labels only a saved choice that differs from the fenced child launch choice as deferred', () => {
+ const state = { ...live('claude', { permissionMode: 'ask' }), permissionOwnSupported: true }
+ expect(
+ permission({ ...state, permissionMode: 'full-access', launchPermissionMode: 'ask' })
+ ).toMatchObject({
+ description: 'Full access — Applies to your next message',
+ valueSource: 'dispatched'
+ })
+ expect(
+ permission({ ...state, permissionMode: 'own', launchPermissionMode: 'own' })
+ ).toMatchObject({
+ description: "Agent's own settings",
+ valueSource: 'applied'
+ })
+ expect(
+ permission({ ...state, permissionMode: 'ask', launchPermissionMode: 'full-access' })
+ ).toMatchObject({
+ description: 'Ask for approval — Applies to your next message',
+ valueSource: 'dispatched'
+ })
+ expect(permission({ ...state, permissionMode: 'full-access' })).toMatchObject({
+ description: 'Full access',
+ valueSource: 'applied'
+ })
+ expect(
+ permission({
+ ...state,
+ permissionMode: 'full-access',
+ launchPermissionMode: 'ask',
+ reportedPermissionMode: 'plan'
+ })
+ ).toMatchObject({ valueSource: 'dispatched' })
+ expect(
+ permission({
+ ...state,
+ permissionMode: 'full-access',
+ launchPermissionMode: 'ask',
+ reportedPermissionMode: 'unknown-mode'
+ })
+ ).toMatchObject({ valueSource: 'dispatched' })
+ })
})
diff --git a/src/shared/agent-session/options/structured-agent-session-permission-option.ts b/src/shared/agent-session/options/structured-agent-session-permission-option.ts
index ee2a7a0f848..e5aa1e30945 100644
--- a/src/shared/agent-session/options/structured-agent-session-permission-option.ts
+++ b/src/shared/agent-session/options/structured-agent-session-permission-option.ts
@@ -55,6 +55,7 @@ export function structuredAgentSessionPermissionDescriptor(state: {
record: StructuredAgentSessionOptionRecord
permissionMode: string | null
permissionOwnSupported?: boolean | null
+ launchPermissionMode?: string
reportedPermissionMode?: string | null
}): SessionOptionDescriptor | null {
const support = agentChatPermissionModes(state.record.agent)
@@ -73,8 +74,10 @@ export function structuredAgentSessionPermissionDescriptor(state: {
: current === 'read-only'
? 'Read only'
: (current ?? 'Permissions')
+ const deferred =
+ state.launchPermissionMode !== undefined && state.launchPermissionMode !== current
return {
- description: label,
+ description: deferred ? `${label} — Applies to your next message` : label,
id: AGENT_CHAT_PERMISSION_MODE_OPTION_ID,
label: 'Permissions',
category: 'mode',
@@ -87,7 +90,7 @@ export function structuredAgentSessionPermissionDescriptor(state: {
description: agentDescriptions(state.record.agent)[value] ?? MODE_COPY[value].description
}))
},
- valueSource: 'applied',
+ valueSource: deferred ? 'dispatched' : 'applied',
transport: 'agent-session',
settable: state.permissionOwnSupported !== null
}