mirror of
https://github.com/stablyai/orca.git
synced 2026-10-12 16:03:03 +00:00
Brennan Benson
cd59678394
* refactor(agent-launch): assemble host startup-plan inputs in one resolver buildAgentStartupPlan was already one shared implementation, but every host re-derived its argument object by hand from the same four settings (agentCmdOverrides, agentDefaultArgs, agentDefaultEnv, terminalWindowsShell), and the copies had drifted. resolveAgentStartupPlanInputs owns that assembly. What genuinely varies per launch stays a parameter: the host (platform, isRemote), a requested shell, the per-launch agentArgs override, and the picked session options. Fixes a live divergence on the agent.launch path: orca-runtime-create-agent-session passed sessionOptions without sessionOptionsOverrideAgentArgs, so a configured `--model` in agentDefaultArgs reached argv alongside the picked model and won on argv order, while the same launch through worktree.create honored the pick. The plan also reported no applied sessionOptions, so the chat surface could not name the model the user chose. Migrates the four host sites; the eleven renderer sites are unmigrated and still assemble their own inputs. * fix(agent-launch): preserve picked options in draft launches * test(agent-launch): assert draft option precedence
74 lines
3.2 KiB
TypeScript
74 lines
3.2 KiB
TypeScript
import type { GlobalSettings } from './global-settings-types'
|
|
import type { SessionOptionValue } from './native-chat-session-options'
|
|
import type { TuiAgent } from './tui-agent'
|
|
import { resolveTuiAgentLaunchArgs, resolveTuiAgentLaunchEnv } from './tui-agent-launch-defaults'
|
|
import type { AgentStartupShell } from './tui-agent-startup-shell'
|
|
import { resolveLocalWindowsAgentStartupShell } from './windows-terminal-shell'
|
|
|
|
/** The settings slice a launch reads; hosts pass their whole `GlobalSettings` row. */
|
|
export type AgentStartupSettings = Partial<
|
|
Pick<
|
|
GlobalSettings,
|
|
'agentCmdOverrides' | 'agentDefaultArgs' | 'agentDefaultEnv' | 'terminalWindowsShell'
|
|
>
|
|
>
|
|
|
|
/** Exactly the `buildAgentStartupPlan` / `buildAgentDraftLaunchPlan` inputs that settings decide. */
|
|
export type AgentStartupPlanInputs = {
|
|
agent: TuiAgent
|
|
cmdOverrides: Partial<Record<TuiAgent, string>>
|
|
agentArgs: string | null
|
|
agentEnv: Record<string, string>
|
|
platform: NodeJS.Platform
|
|
shell: AgentStartupShell | undefined
|
|
isRemote: boolean
|
|
sessionOptions?: Record<string, SessionOptionValue>
|
|
sessionOptionsOverrideAgentArgs: boolean
|
|
}
|
|
|
|
/**
|
|
* Assembles the settings-derived half of a startup plan's inputs.
|
|
*
|
|
* `buildAgentStartupPlan` was already one shared implementation, but every host re-derived its
|
|
* argument object by hand from the same four settings, and the copies had drifted — one dropped
|
|
* `sessionOptionsOverrideAgentArgs` and so let configured `agentDefaultArgs` silently defeat an
|
|
* explicit model pick. What varies between launches is the host (`platform`, `isRemote`), the
|
|
* shell this PTY will actually be, and the per-launch overrides; those stay parameters. What does
|
|
* not vary is how settings become inputs, which is this function.
|
|
*/
|
|
export function resolveAgentStartupPlanInputs(args: {
|
|
agent: TuiAgent
|
|
settings: AgentStartupSettings
|
|
platform: NodeJS.Platform
|
|
isRemote: boolean
|
|
/** Replaces the configured default args for this launch; `null` is "no arguments". */
|
|
agentArgs?: string | null
|
|
/** A requested shell is the one this PTY will be, so it owns the quoting family. */
|
|
windowsShellOverride?: string | null
|
|
sessionOptions?: Record<string, SessionOptionValue> | undefined
|
|
}): AgentStartupPlanInputs {
|
|
const { agent, settings, platform, isRemote, sessionOptions } = args
|
|
return {
|
|
agent,
|
|
cmdOverrides: settings.agentCmdOverrides ?? {},
|
|
// A per-launch override wins over the Settings default; `null` is "no arguments", so this
|
|
// tests for absence rather than falsiness.
|
|
agentArgs:
|
|
args.agentArgs !== undefined
|
|
? args.agentArgs
|
|
: resolveTuiAgentLaunchArgs(agent, settings.agentDefaultArgs),
|
|
agentEnv: resolveTuiAgentLaunchEnv(agent, settings.agentDefaultEnv),
|
|
platform,
|
|
shell: resolveLocalWindowsAgentStartupShell({
|
|
platform,
|
|
isRemote,
|
|
terminalWindowsShell: args.windowsShellOverride ?? settings.terminalWindowsShell
|
|
}),
|
|
isRemote,
|
|
...(sessionOptions ? { sessionOptions } : {}),
|
|
// Why: session options are an explicit per-launch pick, so they outrank configured args —
|
|
// without this the two spellings of the same flag both reach argv and the last one wins.
|
|
sessionOptionsOverrideAgentArgs: Boolean(sessionOptions)
|
|
}
|
|
}
|