Files
orca/src/shared/structured-agent-session-composer.ts
Brennan BensonandMerge Sim ecd7b19ad4 fix(native-chat): pass agent-implemented slash commands through to the agent (#19929)
* fix(native-chat): pass agent-implemented slash commands through to the agent

Claim what the host implements; pass through what the agent implements.
Claude's harness expands a slash command out of the message text, so the
host claimed catalog commands it had no way to run and answered "/init is
not available in chat sessions" for commands Claude does run. Codex's
app-server has no slash parser at all, so its catalog stays claimed —
except /goal, which the model carries out through its own goal tools.

* fix(native-chat): offer the agent-run commands in the structured picker

Codex reports no command catalog, so its structured `/` menu is the host
fallback -- which listed only the host's own commands and hid `/goal`, the
one command the model itself acts on. The picker now appends the profile's
text-driven commands, described from the curated catalog, so a command that
passes through is discoverable and not merely typable.

The menu invariant holds either way: a pick is answered by the host or run
by the agent, never refused with "not available in chat sessions".

* fix mobile structured command reconciliation

* fix(mobile): keep native chat controller within lint budget

* fix mobile controller lint budget

---------

Co-authored-by: Merge Sim <sim@local>
2026-09-10 20:50:40 -07:00

174 lines
6.2 KiB
TypeScript

import {
getHostClaimedNativeChatCommands,
getTextDrivenNativeChatCommands
} from './native-chat-agent-profiles'
import type { AgentType } from './agent-status-types'
import type { SessionOptionDescriptor, SessionOptionValue } from './native-chat-session-options'
import type { SlashCommandSuggestion } from './native-chat-slash-commands'
import type { AgentSessionConversationCommand } from './agent-session-conversation-command'
const MODEL_COMMAND: SlashCommandSuggestion = {
name: 'model',
description: 'Choose the model'
}
const EFFORT_COMMAND: SlashCommandSuggestion = {
name: 'effort',
description: 'Choose reasoning effort'
}
const CONVERSATION_COMMANDS: readonly SlashCommandSuggestion[] = [
{ name: 'clear', description: 'Start a fresh conversation' },
{ name: 'compact', description: 'Compact conversation context' }
]
/** Session options remain available on hosts predating conversation commands. */
export const STRUCTURED_AGENT_SESSION_SLASH_COMMANDS: readonly SlashCommandSuggestion[] = [
MODEL_COMMAND,
EFFORT_COMMAND
]
export type StructuredAgentSessionComposerOptions = {
agent?: AgentType
snapshot: readonly SessionOptionDescriptor[]
invokeAction: (id: string) => Promise<boolean>
setOption: (id: string, value: SessionOptionValue) => Promise<boolean>
conversationCommands?: readonly AgentSessionConversationCommand[]
runConversationCommand?: (
command: AgentSessionConversationCommand
) => Promise<{ accepted: boolean; error: string | null }>
}
export type StructuredAgentSessionCommandOutcome = {
handled: boolean
accepted: boolean
error: string | null
}
function commandParts(text: string): { name: string; argument: string } | null {
if (!text.startsWith('/')) {
return null
}
const match = /^\/([^\s]+)(?:\s+(.*))?$/.exec(text.trimEnd())
return match ? { name: match[1]!.toLowerCase(), argument: match[2]?.trim() ?? '' } : null
}
/** The commands the composer menu offers when the host reports no catalog of its
* own: the host's own commands, plus the ones this agent acts on from message
* text. Both are honored — the first here, the second by the agent — so a menu
* pick is never answered with "not available". */
export function structuredSlashCommands(
commands: readonly AgentSessionConversationCommand[] = [],
agent?: AgentType | null
): readonly SlashCommandSuggestion[] {
const hostOwned = [
...STRUCTURED_AGENT_SESSION_SLASH_COMMANDS,
...CONVERSATION_COMMANDS.filter((entry) =>
commands.includes(entry.name as AgentSessionConversationCommand)
)
]
// Why: a host with no catalog to report would otherwise hide the commands the
// agent itself implements, e.g. Codex's `/goal`.
return [
...hostOwned,
...getTextDrivenNativeChatCommands(agent).filter(
(entry) => !hostOwned.some((offered) => offered.name === entry.name)
)
]
}
/** Wider than the offered menu on purpose: a TUI-only command still has to be
* claimed here and answered, or a hand-typed `/clear` reaches the model as
* literal prompt text. Commands the agent itself implements are deliberately
* absent — the profile unclaims those so they pass through as text. */
function structuredRecognizedCommands(agent: AgentType): readonly SlashCommandSuggestion[] {
return [
...STRUCTURED_AGENT_SESSION_SLASH_COMMANDS,
...CONVERSATION_COMMANDS,
...getHostClaimedNativeChatCommands(agent)
]
}
/** Whether the chat host, rather than the agent, owns this command. Callers also
* use it to refuse attachments: a host command sends no message, so attachments
* would be silently dropped, whereas a pass-through command is a real send. */
export function isStructuredAgentSessionComposerCommand(
text: string,
agent: AgentType = 'codex'
): boolean {
const command = commandParts(text)
return Boolean(
command && structuredRecognizedCommands(agent).some((entry) => entry.name === command.name)
)
}
function unavailable(name: string): StructuredAgentSessionCommandOutcome {
return {
handled: true,
accepted: true,
error: `/${name} is not available in chat sessions. Use the slash menu to see available commands.`
}
}
export async function dispatchStructuredAgentSessionComposerCommand(
text: string,
controller: StructuredAgentSessionComposerOptions
): Promise<StructuredAgentSessionCommandOutcome> {
const command = commandParts(text)
if (!command || !isStructuredAgentSessionComposerCommand(text, controller.agent)) {
return { handled: false, accepted: false, error: null }
}
if (command.name === 'clear' || command.name === 'compact') {
if (command.argument) {
return { handled: true, accepted: false, error: `Use /${command.name} without arguments.` }
}
if (
!controller.conversationCommands?.includes(command.name) ||
!controller.runConversationCommand
) {
return {
handled: true,
accepted: false,
error: `/${command.name} is not supported by this chat host.`
}
}
return { handled: true, ...(await controller.runConversationCommand(command.name)) }
}
if (command.name !== 'model' && command.name !== 'effort') {
return unavailable(command.name)
}
const descriptor = controller.snapshot.find((entry) => entry.id === command.name)
if (!descriptor || descriptor.kind.type !== 'select') {
return {
handled: true,
accepted: true,
error: `${command.name === 'model' ? 'Models' : 'Reasoning effort'} are unavailable for this chat session.`
}
}
if (!command.argument) {
const opened = await controller.invokeAction(command.name)
return {
handled: true,
accepted: opened,
error: opened ? null : `Could not open the ${command.name} picker.`
}
}
const normalized = command.argument.toLowerCase()
const choice = descriptor.kind.choices.find(
(entry) => entry.value.toLowerCase() === normalized || entry.label.toLowerCase() === normalized
)
if (!choice) {
return {
handled: true,
accepted: false,
error: `${command.argument} is not an available ${command.name} for this chat session.`
}
}
const applied = await controller.setOption(command.name, choice.value)
return {
handled: true,
accepted: applied,
error: applied ? null : `Could not apply ${command.name} ${choice.label}.`
}
}