Files
orca/src/main/codex/codex-structured-launch-resolution.ts
T
Brennan Benson f06f737802 Unify Source Control action permissions and card layout (#30449)
* Source control actions start chats and terminals on their saved model

A "start an agent" action's model lived only in free-text CLI arguments, which a native chat
never reads, so AI Fix opened a chat on the default model. Each action now saves a structured
model and effort that both routes apply: chat create options, or the agent's own flags in a
terminal (winning over the same flag in CLI arguments). Desktop, dialog, fix-checks and mobile
launches carry it; Settings rows get Model/Effort selects and the CLI arguments field says it is
terminal-only.

Tracked in STA-11102.

* Name the model in the repository override note

* Type the dialog's model hand-off; keep Agent in English in Japanese copy

* fix: preserve action chat model choices through launch

* Preserve action selection ownership across chat launches

* Keep terminal host contract fixtures aligned with preflight

* fix: wait for action Settings agent inventory

* fix: consolidate direct agent routing imports

* fix: use standard action option labels

* fix: align action launch contracts with shared types

* fix: sync action option localization metadata

* test: provide action Settings inventory in mounted fixtures

* Keep action options row height stable while loading

* Let each Source Control action choose its chat permission mode

An action's saved chat choice may now carry a permission mode, with or without a model;
"Same as new chats" saves nothing. A model is replaced only when the action names one,
so a permission-only choice keeps the chat's remembered model and options.

* fix(native-chat): leave older hosts their own permission mode and keep action options readable

- An action's saved permission mode is sent only to hosts that advertise
  agentSession.create.options-mode.v1. Older hosts get no mode, in create
  options or a later setOption, so the chat starts on that host's new-chat
  default, as a phone launch to such a host already does. Hosts from
  1.4.225 to 1.4.227 refused a mode their tables lacked (OpenCode, Grok,
  OMP), leaving the action unable to start.
- Settings action rows give Model and Permissions full rows in the options
  column so saved values are readable; the loading placeholder reserves the
  same rows.
- Remove two unused locale keys; fix two stale comments.
- Tests: the older-host create carries no permission mode; a permission
  mode picked alone keeps the remembered model on an acquired create.

* fix(settings): reserve one options row while loading an action with nothing saved

Terminal and permissions-only rows no longer shrink when loading ends; a chat
agent with a model list may grow by its Model row once known.

* fix(native-chat): keep the create options mode a checked literal type

* fix(settings): share verified action option fields

* fix(settings): keep action selectors on standard typography

* Keep the launch files under their length limits after the main merge

The structured route imports its result types where they are defined, and the two older-host
action-launch tests share one setup helper.

* One action settings section for chat and terminal launches

A Source Control action's Model, model options and Permissions now apply whether it opens a
chat or a terminal; terminals receive them as the agent's own flags, and a repository's own
CLI arguments keep the flags it sets. Extra CLI arguments stay terminal-only.

* fix(source-control-ai): one terminal projection for saved action choices

Ask in a terminal now states its permission instead of leaving it to the
user's own config: Claude and Grok pass --permission-mode default, Codex
passes -a on-request -s read-only -c approvals_reviewer="user" (the
interactive CLI has no untrusted policy, so a read-only sandbox is what
asks before edits). Agents whose CLI has no flag for a mode show the
existing "Applies to chats only" hint.

The strict launch-preferences projection now requires the launch agent at
every caller, composes model ids through the resolver's own step, carries
a mode only where the agent's terminal has a flag for it, and the local
string wire keeps booleans as 'true'/'false', so Cursor Thinking/Fast reach
the terminal and an OpenCode permission-only choice is not refused.

The argument parser knows flag arity, so removing a boolean permission
flag keeps other options' values, following positionals and '--'.
Pre-admission and executor share one terminal admission check on the
options the terminal will receive. Customize with Save launches the recipe
as it will resolve once saved; legacy partial repository overrides are
edited as the complete recipe they resolve to. Empty Extra CLI arguments
start collapsed.

* fix(source-control-ai): an edited repository action saves complete

Every Settings edit of a repository action (agent, model, permission,
prompt or arguments) now starts from the complete recipe the action
resolves to, whether its stored override is owned or a legacy partial.
The resolved agent selection is kept (never an agent only detected to run
a default), an explicit null args clear stays null, and empty args stay
empty instead of being dropped. Clearing the last preference therefore
means the action agent's own defaults rather than re-inheriting Global.

The action text draft is lossless: unset or cleared prompt and args stay
so until the user types, and the inputs show them as empty, so saving a
prompt no longer writes empty args that suppress the agent's default
flags. Untouched sibling actions are not rewritten by the edit.

* fix(settings): style the Extra CLI arguments toggle through Button's own variant and size

CI's changed-code quality check refuses restyle classes on Button and
CollapsibleContent. Use the ghost variant at size xs with a margin, and
put the content spacing on a plain inner wrapper.

* fix: keep saved action and restart launch recipes consistent

* fix: describe inherited arguments and chat-only permissions accurately

* test: check repository action settings fixture type

* test: map saved action options into terminal compiler inputs

* fix: retain saved action controls during agent detection

* fix(i18n): retire obsolete Portuguese action labels

* test: align folder launch fallback mock with outcome export

* fix: carry resolved connector launch intent and mode together

* test: pin shared action launch branches to recorded agent output

* test: preserve saved source control choices through detection and migration

* test: align launch fixtures with integrated result contract

* test: retain recipe and restart contracts after main integration

* Unify Source Control action permission settings

* Keep native Ask copy with its owning change

* Preserve action drafts and old-host permission intent

* Consume rejected Source Control action saves

* Follow the moved Settings persistence fixture

* Keep permission integration contracts in the cross-version test project

* Include the action permission inheritance label in English catalogs

* Align launch contracts with shared permission recipes

* Keep Source Control action controls within their Settings columns

* Use primitive variants for compact action settings controls

* Show action arguments only for terminal defaults and widen recipe rows

* Apply terminal-only action arguments visibility to repository overrides

* Align action permission control with model controls

* Use shared settings label for action permissions

* Hide action model controls until argument migration ships
2026-10-26 16:01:56 -07:00

110 lines
4.7 KiB
TypeScript

import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session-account-home'
import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
import { resolveCodexCommand } from '../codex-cli/command'
import { resolveAgainAfterRefreshOnMissingProgram } from '../native-chat/structured-agent-command-resolution'
import type { StructuredAgentLaunchPartResolver } from '../runtime/structured-agent-launch-composition'
import type { CodexStructuredLaunch } from './codex-structured-session-adapter'
import { codexStructuredPermissionPolicy } from '../../shared/codex-permission-policy'
import { codexStructuredLaunchArgs } from './codex-structured-launch-args'
import {
LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV,
NATIVE_CHAT_SCRATCH_DIR_ENV,
withNativeChatVisualsEnv
} from '../native-chat/native-chat-visuals-delivery'
export type CodexStructuredLaunchPartDeps = {
resolveLaunchArgs: () => Promise<string[]> | string[]
resolveCommand?: (options?: { pathEnv?: string | null; homePath?: string }) => string
}
export type CodexStructuredInvocationDeps = Pick<
CodexStructuredLaunchPartDeps,
'resolveCommand'
> & {
/** Fresh spawn environment, never persisted in the session record. */
resolveEnvironment?: () => Promise<NodeJS.ProcessEnv>
/** Refresh after a missing binary; absence disables retry. */
refreshEnvironmentAfterMiss?: (askedAt: number) => Promise<void>
/** Resolve relative PATH entries from the spawn directory; defaults to Orca's cwd. */
resolveWorkingDirectory?: () => Promise<string> | string
}
export type CodexStructuredInvocation = {
command: string
environment: NodeJS.ProcessEnv | undefined
}
/** Keep session launches and catalog probes on the same binary/environment resolution path. */
export function resolveCodexStructuredInvocation(
deps: CodexStructuredInvocationDeps
): Promise<CodexStructuredInvocation> {
return resolveAgainAfterRefreshOnMissingProgram(
() => readCodexStructuredInvocation(deps),
deps.refreshEnvironmentAfterMiss,
{ env: ({ environment }) => environment, cwd: deps.resolveWorkingDirectory }
)
}
async function readCodexStructuredInvocation(
deps: CodexStructuredInvocationDeps
): Promise<CodexStructuredInvocation> {
const environment = await deps.resolveEnvironment?.()
const pathEnv = environment?.PATH ?? environment?.Path ?? null
const homePath = environment?.HOME ?? environment?.USERPROFILE
const command = (deps.resolveCommand ?? resolveCodexCommand)({
pathEnv,
...(homePath ? { homePath } : {})
})
return { command, environment }
}
/** Derive resume identity and account home from the durable record. */
export function codexStructuredLaunchPart(
deps: CodexStructuredLaunchPartDeps
): StructuredAgentLaunchPartResolver<CodexStructuredLaunch> {
return async (basis) => {
const { record } = basis
const accountHome = requireLegacyAgentSessionAccountHome(record.accountHome)
const { command } = await resolveCodexStructuredInvocation({
...(deps.resolveCommand ? { resolveCommand: deps.resolveCommand } : {}),
refreshEnvironmentAfterMiss: basis.refreshAfterMissingProgram,
resolveWorkingDirectory: basis.launchDirectory,
resolveEnvironment: basis.environment
})
const environment = await basis.environment()
const args = codexStructuredLaunchArgs(await deps.resolveLaunchArgs())
const head = agentSessionProviderHandleChainHead(record.providerHandleChain)
const resumeThreadId = head?.handle.nativeId ?? null
// Match the first turn's model to avoid duplicate prompt injection on a model switch.
const model = record.options?.model
const visuals = await basis.visuals()
await basis.launchDirectory()
return {
launch: {
command,
args: [...args, 'app-server'],
codexHome: accountHome.path,
resumeThreadId,
// Only created threads may be unsaved; resumed, forked and adopted threads were persisted.
...(resumeThreadId && head?.origin === 'created' ? { supersedeIfUnsaved: true } : {}),
// Own settings leaves a new thread to config and a resumed thread to its saved policy.
...(basis.permissionMode === 'own'
? {}
: { permissionPolicy: codexStructuredPermissionPolicy(basis.permissionMode ?? 'ask') }),
...(model ? { model } : {}),
...(visuals ? { visuals } : {})
},
env: withNativeChatVisualsEnv(
{ ...environment, ...(accountHome.path ? { CODEX_HOME: accountHome.path } : {}) },
visuals
),
// Clear inherited scratch paths that may belong to another chat.
inheritedEnvToDelete: [
...(visuals ? [] : [NATIVE_CHAT_SCRATCH_DIR_ENV]),
LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV
],
cliRuntimeCommand: command
}
}
}