@meistrari/remy-cli 1.22.0-rc.0 → 1.22.0-rc.2

package/README.md

@@ -62,7 +62,7 @@ In a session, `Esc` dismisses open command/path suggestions or help before it ca
 
 Every terminal follow-up is appended as an explicit **Steer**, so it targets the work currently in progress. Queuing a message for a later turn (**Next**) is Web-only for now. Remy can replay sessions containing queued-message dispatch, withdrawal, and failure events. Messages withdrawn or failed before reaching Remy show an activity notice; an active submission ends as cancelled or failed instead of waiting for a turn that never started.
 
-Use Up/Down to select a session in the dashboard, Left/Right to load the adjacent page, and `Enter` to open it. Remy loads the complete retained conversation before showing the session view, then streams new activity as it arrives. Press `s` to search the loaded page by session ID, title, or number; `Enter` keeps the search active and `Esc` clears it. Press `f` to filter sessions by lifecycle status or `a` to filter by author. Both pickers use checkboxes: Up/Down or `j`/`k` moves, `Space` toggles, Right/`l` checks, Left/`h` clears, `G` and `gg` jump to the last and first option, and `Enter` applies every checked value. An empty picker means all values. Press `s` inside either picker to fuzzy-search its options; `Enter` keeps the matching list and `Esc` cancels the search. Press `Esc` outside search to discard staged checkbox changes. Filters apply to the complete remote result set and reset pagination to its first page. After the dashboard list or repository-review list has focus, Vim keys work too: `j`/`k` move, `h`/`l` go to the previous/next dashboard page (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row. Press `Shift+L` in the dashboard to start a logout confirmation. In any message composer, plain `Enter` and `Shift+Enter` submit; `Option+Enter` on macOS (`Alt+Enter` elsewhere) inserts a newline. `Ctrl+J` also inserts a newline for terminals that do not report the Option/Alt modifier. The conversation header keeps the numbered session title on its first line and repository, pull request, work state, elapsed time, and connection state on its second line. The header also keeps the last provider-reported context observation across reconnects, such as `Context 50% left · 62,000 used`; when the provider does not report a context window, it shows only used tokens. This is an observation, not a live occupancy guarantee or billing total.
+Use Up/Down to select a session in the dashboard, Left/Right to load the adjacent page, and `Enter` to open it. Remy loads the complete retained conversation before showing the session view, then streams new activity as it arrives. Press `s` to search the loaded page by session ID, title, or number; `Enter` keeps the search active and `Esc` clears it. Press `f` to filter sessions by lifecycle status or `a` to filter by author. Both pickers use checkboxes: Up/Down or `j`/`k` moves, `Space` toggles, Right/`l` checks, Left/`h` clears, `G` and `gg` jump to the last and first option, and `Enter` applies every checked value. An empty picker means all values. Press `s` inside either picker to fuzzy-search its options; `Enter` keeps the matching list and `Esc` cancels the search. Press `Esc` outside search to discard staged checkbox changes. Filters apply to the complete remote result set and reset pagination to its first page. After the dashboard list or repository-review list has focus, Vim keys work too: `j`/`k` move, `h`/`l` go to the previous/next dashboard page (or clear/mark a repository), `G` goes to the last row, and `gg` goes to the first row. Press `Shift+L` in the dashboard to start a logout confirmation. In any message composer, plain `Enter` and `Shift+Enter` submit; `Option+Enter` on macOS (`Alt+Enter` elsewhere) inserts a newline. `Ctrl+J` also inserts a newline for terminals that do not report the Option/Alt modifier. The conversation header keeps the numbered session title on its first line and repository, pull request, work state, elapsed time, connection state, and the agent's current `Harness · Model · Effort` on its second line. The header also keeps the last provider-reported context observation across reconnects, such as `Context 50% left · 62,000 used`; when the provider does not report a context window, it shows only used tokens. This is an observation, not a live occupancy guarantee or billing total.
 
 If a connected session loses its activity stream, Remy retries for up to two minutes and resumes from the last received event. After the live stream stays connected for at least 30 seconds, the next disconnect starts a fresh retry window. Connections that drop sooner share the existing window and backoff. While a submitted message is still awaiting its outcome, retries continue beyond that window.
 
@@ -86,6 +86,8 @@ Terminal previews show up to 50 content blocks and 8,000 characters per block, w
 
 Command and attachment feedback share progress, success, failure, and attention indicators. Failed stop requests show the reason and `esc` retry; failed complete/cancel requests restore the message prompt and show the retry command. Logout shows a confirmation with `y` to confirm and `Esc` to cancel.
 
+**Change the model or effort:** enter `/model` or `/effort` to pick a new model or reasoning effort for your next message. The model list contains only the session's harness (a Claude session offers Claude models, a Codex session Codex models), in the same order and with the same labels as the new-session wizard. Arrows move, `Enter` stages the pick, and `Esc` closes the picker without changing what is already staged. Nothing is sent until you send a message: the change travels with it and stays the session's setting afterward. Because every terminal follow-up is a Steer, a change sent while Remy is working switches the running turn from its next model request; otherwise it applies from the turn your message starts. The header shows the staged change as `→ Sonnet 5 · High (next message)`, then `(switching…)` until the runtime applies it. The timeline then records `Switched to Sonnet 5 · High` right after your message, or `Switched to Sonnet 5 · High (from next turn)` when the running turn could not switch; its details (`Ctrl+O`) then show the provider's reason when one was given. Picking the current value removes it from the staged change.
+
 Enter `/compact` to admit a durable main-thread context compaction control without sending a human message. Remy reports request admission immediately and shows the eventual completed, no-op, failed, or unknown provider result in retained activity. Compaction waits for a safe point and does not interrupt active work or jump ahead of an earlier Next message. While admission is pending, you can keep editing or open other commands; repeated `/compact` invocations do not send another request.
 
 Drag to select visible text in any Remy view; Remy copies it to the local clipboard and emits OSC 52 for terminal or remote-session clipboard support, then clears the selection highlight. Published file artifacts show their filename and muted, full web preview URL; open the URL in a browser to select that artifact in its session. Tela Page rows retain their canonical Page URL. Downloads are explicit through `/files`; artifact bytes are never printed in the terminal. When the conversation has focus, press `Tab` to return to the composer.
@@ -96,6 +98,8 @@ Drag to select visible text in any Remy view; Remy copies it to the local clipbo
 | `/complete` | Complete an open session after its active turn stops. |
 | `/cancel` | Cancel the current session, including an active turn. |
 | `/compact` | Admit a main-thread context compaction request without sending a message; the provider result appears in retained activity. |
+| `/model` | Pick a model of the session's harness for your next message. |
+| `/effort` | Pick a reasoning effort for your next message. |
 | `/sessions` | Return to the dashboard. |
 | `/new` | Start another new-session flow. |
 | `/logout` | Sign out of Remy after confirmation. |
@@ -126,7 +130,7 @@ The interactive dashboard is the recommended path. Use these commands when a scr
 remy new --repository owner/repository "Add a health check endpoint"
 ```
 
-Repeat `--repository` to select more repositories from the same GitHub installation. If you do not select a repository, supply `--installation <github-installation-id>`. Repeat `--attach <path>` to upload files or directories; the 20 MiB per-attachment limit is measured directly for a file and across all regular files before compressing a directory. Remy sends each accepted directory as a gzip-compressed tar archive. Direct creation uses `medium` reasoning unless `--reasoning-effort` overrides it; omit `--model` to use the server's `gpt-6-astra` default. `remy new` creates the session from the prompt and flags, then opens it when the terminal is interactive.
+Repeat `--repository` to select more repositories from the same GitHub installation. If you do not select a repository, supply `--installation <github-installation-id>`. Repeat `--attach <path>` to upload files or directories; the 20 MiB per-attachment limit is measured directly for a file and across all regular files before compressing a directory. Remy sends each accepted directory as a gzip-compressed tar archive. Direct creation uses `medium` reasoning unless `--reasoning-effort` overrides it; omit `--model` to use the server's Codex `gpt-6-astra` default. `--model` accepts a Codex model (`gpt-6-astra`, `gpt-6-sol`, `gpt-6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-5.6-luna`, `gpt-5.5`) or a Claude model (`claude-opus-5-5`, `claude-sonnet-5`, `claude-fable-5-1`); the model chooses the session's harness, which stays fixed for the session. For example, `remy new --model claude-opus-5-5 --repository owner/repository "Add a health check endpoint"` starts a Claude session. In the interactive wizard, press `m` on the confirm step to cycle through every harness's models, shown as `Codex · GPT 6.0 Astra` or `Claude · Opus 5.5`. `remy new` creates the session from the prompt and flags, then opens it when the terminal is interactive.
 
 The branch-suggestion flow belongs to the interactive new-session wizard (`remy`, then `n`). Direct `remy new` creation does not analyze continuation references.
 
@@ -144,6 +148,14 @@ remy --session <session-id> "Add regression coverage for that fix"
 
 Remy sends the prompt as **Steer**, then opens the conversation. Omitting the prompt only attaches. An explicitly empty prompt is rejected. Use `--` before a prompt beginning with `--` to treat it as text.
 
+To change the model or reasoning effort, pass `--model <name>`, `--reasoning-effort <low|medium|high|xhigh>`, or both with the prompt:
+
+```bash
+remy --session <session-id> --model claude-sonnet-5 --reasoning-effort high "Finish the migration"
+```
+
+The change travels with that message and stays the session's setting for later messages. A running turn switches from its next model request; otherwise the change applies from the turn the prompt starts. Either flag without a prompt is rejected, because settings only change with a message. The session keeps its harness, so `--model` must name one of that harness's models; Remy checks this against the session before sending and names the harness's models when it does not match. Omit both flags to keep the current settings.
+
 ### Automate a session
 
 `remy new` and `remy --session` use JSON Lines output automatically when standard input or output is not a terminal. Pass `--no-tui` to choose that mode explicitly; `--json` also selects it.
@@ -201,7 +213,7 @@ remy update
 remy --version | -v
 remy dashboard
 remy new [--repository <owner/name> ... --installation <id> --model <name> --reasoning-effort <low|medium|high|xhigh> --attach <path> ... --no-tui --json] <prompt>
-remy --session <session-id> [--no-tui] [--json] [prompt]
+remy --session <session-id> [--model <name> --reasoning-effort <low|medium|high|xhigh> --no-tui --json] [prompt]
 ```
 
 Run `remy <command> --help` for flags and command-specific usage. `remy whoami` prints the saved signed-in identity and organization.

package/dist/remy.js

@@ -32161,6 +32161,51 @@ var agentPromptSchema = zod_default2.object({
   blocks: zod_default2.array(wireAgentInputBlockSchema).min(1)
 });
 
+// ../../packages/agents-protocol/src/agent-model.ts
+var codexModelIds = [
+  "gpt-6-astra",
+  "gpt-6-sol",
+  "gpt-6-luna",
+  "gpt-5.6-sol",
+  "gpt-5.6-terra",
+  "gpt-5.6-luna",
+  "gpt-5.5",
+  "gpt-5.4",
+  "gpt-5.4-mini",
+  "gpt-5.2"
+];
+var claudeModelIds = [
+  "claude-opus-5-5",
+  "claude-sonnet-5",
+  "claude-fable-5-1",
+  "claude-opus-5",
+  "claude-fable-5",
+  "sonnet",
+  "claude-opus-4-8",
+  "opus",
+  "haiku",
+  "claude-opus-4-7",
+  "claude-mythos-preview",
+  "claude-opus-4-6",
+  "claude-sonnet-4-6",
+  "claude-haiku-4-5",
+  "claude-haiku-4-5-20251001",
+  "claude-opus-4-5",
+  "claude-opus-4-5-20251101",
+  "claude-sonnet-4-5",
+  "claude-sonnet-4-5-20250929",
+  "claude-opus-4-1",
+  "claude-opus-4-1-20250805",
+  "claude-opus-4-0",
+  "claude-opus-4-20250514",
+  "claude-sonnet-4-0",
+  "claude-sonnet-4-20250514",
+  "claude-3-haiku-20240307"
+];
+var codexModelIdSchema = zod_default2.enum(codexModelIds);
+var claudeModelIdSchema = zod_default2.enum(claudeModelIds);
+var agentModelIdSchema = zod_default2.union([codexModelIdSchema, claudeModelIdSchema]);
+
 // ../../packages/agents-protocol/src/agent-provider.ts
 var agentProviderIdSchema = zod_default2.enum(["codex", "claude"]);
 
@@ -32346,6 +32391,12 @@ function objectRejectingKeys(shape, rejectedKeys) {
 // ../../packages/agents-protocol/src/agent-command.ts
 var agentReasoningEffortSchema = zod_default2.enum(["low", "medium", "high", "xhigh", "max"]);
 var agentPromptModeSchema = zod_default2.enum(["next", "steer"]);
+var agentSettingsChangeSchema = zod_default2.strictObject({
+  model: agentModelIdSchema.optional(),
+  reasoningEffort: agentReasoningEffortSchema.optional()
+}).refine((settings) => settings.model !== undefined || settings.reasoningEffort !== undefined, {
+  message: "A settings change needs a model or a reasoning effort."
+});
 var agentAuthorSchema = zod_default2.object({
   name: zod_default2.string().min(1),
   email: zod_default2.string().min(1).optional(),
@@ -32363,7 +32414,8 @@ var sendPromptCommandSchema = runningCommandBaseSchema.extend({
   origin: zod_default2.enum(["user", "supervisor"]).default("user"),
   prompt: agentPromptSchema,
   commandId: commandIdSchema,
-  author: agentAuthorSchema.optional()
+  author: agentAuthorSchema.optional(),
+  settings: agentSettingsChangeSchema.optional()
 });
 var agentNotifyCommandSchema = runningCommandBaseSchema.extend({
   type: zod_default2.literal("agent.notify"),
@@ -32412,44 +32464,180 @@ var agentCommandSchema = zod_default2.union([
   stopAgentCommandSchema,
   respondUserInputAgentCommandSchema
 ]);
-// ../../packages/agents-protocol/src/agent-model.ts
-var codexModelIds = [
+
+// ../../packages/agents-protocol/src/agent-presentation.ts
+var CODEX_CONTEXT_WINDOW = 272000;
+var codexModelPresentation = {
+  "gpt-6-astra": {
+    label: "GPT 6.0 Astra",
+    description: "Frontier intelligence for the most demanding work.",
+    relativeCost: 5,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-6-sol": {
+    label: "GPT 6.0 Sol",
+    description: "Workhorse model for coding and everyday work.",
+    relativeCost: 4,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-6-luna": {
+    label: "GPT 6.0 Luna",
+    description: "Fast and affordable model for easier tasks.",
+    relativeCost: 2,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-5.6-sol": {
+    label: "GPT 5.6 Sol",
+    description: "Older coding model for complex work.",
+    relativeCost: 5,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-5.6-terra": {
+    label: "GPT 5.6 Terra",
+    description: "Older balanced model for straightforward work.",
+    relativeCost: 3,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-5.6-luna": {
+    label: "GPT 5.6 Luna",
+    description: "Older fast and efficient model.",
+    relativeCost: 2,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  },
+  "gpt-5.5": {
+    label: "GPT 5.5",
+    description: "Legacy coding model.",
+    relativeCost: 4,
+    maxInputTokens: CODEX_CONTEXT_WINDOW,
+    isMultiModal: true
+  }
+};
+var CLAUDE_CONTEXT_WINDOW = 1e6;
+var claudeModelPresentation = {
+  "claude-opus-5-5": {
+    label: "Opus 5.5",
+    description: "Best for everyday, complex tasks.",
+    relativeCost: 4,
+    maxInputTokens: CLAUDE_CONTEXT_WINDOW,
+    maxOutputTokens: 128000,
+    isMultiModal: true
+  },
+  "claude-sonnet-5": {
+    label: "Sonnet 5",
+    description: "Efficient for routine coding tasks.",
+    relativeCost: 2,
+    maxInputTokens: CLAUDE_CONTEXT_WINDOW,
+    maxOutputTokens: 64000,
+    isMultiModal: true
+  },
+  "claude-fable-5-1": {
+    label: "Fable 5.1",
+    description: "Most intelligent generally available Claude model.",
+    relativeCost: 5,
+    maxInputTokens: CLAUDE_CONTEXT_WINDOW,
+    maxOutputTokens: 64000,
+    isMultiModal: true
+  }
+};
+var agentReasoningEffortPresentation = {
+  low: { label: "Low", description: "Fast responses with lighter reasoning" },
+  medium: { label: "Medium", description: "Balances speed and reasoning depth for everyday tasks" },
+  high: { label: "High", description: "Greater reasoning depth for complex problems" },
+  xhigh: { label: "Extra high", description: "Extra high reasoning depth for complex problems" },
+  max: { label: "Max", description: "Maximum reasoning depth for the hardest problems" }
+};
+var selectableAgentReasoningEfforts = ["low", "medium", "high", "xhigh"];
+
+// ../../packages/agents-protocol/src/agent-catalog.ts
+var selectableCodexModelIds = [
   "gpt-6-astra",
+  "gpt-6-sol",
+  "gpt-6-luna",
   "gpt-5.6-sol",
   "gpt-5.6-terra",
   "gpt-5.6-luna",
-  "gpt-5.5",
-  "gpt-5.4",
-  "gpt-5.4-mini",
-  "gpt-5.2"
+  "gpt-5.5"
 ];
-var claudeModelIds = [
-  "sonnet",
-  "claude-opus-4-8",
-  "opus",
-  "haiku",
-  "claude-opus-4-7",
-  "claude-mythos-preview",
-  "claude-opus-4-6",
-  "claude-sonnet-4-6",
-  "claude-haiku-4-5",
-  "claude-haiku-4-5-20251001",
-  "claude-opus-4-5",
-  "claude-opus-4-5-20251101",
-  "claude-sonnet-4-5",
-  "claude-sonnet-4-5-20250929",
-  "claude-opus-4-1",
-  "claude-opus-4-1-20250805",
-  "claude-opus-4-0",
-  "claude-opus-4-20250514",
-  "claude-sonnet-4-0",
-  "claude-sonnet-4-20250514",
-  "claude-3-haiku-20240307"
+var selectableClaudeModelIds = [
+  "claude-opus-5-5",
+  "claude-sonnet-5",
+  "claude-fable-5-1"
 ];
-var codexModelIdSchema = zod_default2.enum(codexModelIds);
-var claudeModelIdSchema = zod_default2.enum(claudeModelIds);
-var agentModelIdSchema = zod_default2.union([codexModelIdSchema, claudeModelIdSchema]);
-
+var agentHarnesses = {
+  codex: {
+    provider: "codex",
+    label: "Codex",
+    models: selectableCodexModelIds,
+    defaultModel: "gpt-6-astra",
+    modelPresentation: codexModelPresentation
+  },
+  claude: {
+    provider: "claude",
+    label: "Claude",
+    models: selectableClaudeModelIds,
+    defaultModel: "claude-opus-5-5",
+    modelPresentation: claudeModelPresentation
+  }
+};
+var agentHarnessOrder = ["codex", "claude"];
+var codexAgentSelectionSchema = zod_default2.strictObject({
+  provider: zod_default2.literal("codex"),
+  model: zod_default2.enum(selectableCodexModelIds),
+  reasoningEffort: agentReasoningEffortSchema
+});
+var claudeAgentSelectionSchema = zod_default2.strictObject({
+  provider: zod_default2.literal("claude"),
+  model: zod_default2.enum(selectableClaudeModelIds),
+  reasoningEffort: agentReasoningEffortSchema
+});
+var agentSelectionSchema = zod_default2.discriminatedUnion("provider", [
+  codexAgentSelectionSchema,
+  claudeAgentSelectionSchema
+]);
+var storedAgentSelectionSchema = zod_default2.discriminatedUnion("provider", [
+  zod_default2.strictObject({
+    provider: zod_default2.literal("codex"),
+    model: codexModelIdSchema,
+    reasoningEffort: agentReasoningEffortSchema
+  }),
+  zod_default2.strictObject({
+    provider: zod_default2.literal("claude"),
+    model: claudeModelIdSchema,
+    reasoningEffort: agentReasoningEffortSchema
+  })
+]);
+var wireModelIdsByProvider = {
+  codex: new Set(codexModelIds),
+  claude: new Set(claudeModelIds)
+};
+var defaultAgentSelection = {
+  provider: "codex",
+  model: "gpt-6-astra",
+  reasoningEffort: "medium"
+};
+var selectableModelIdsByProvider = {
+  codex: new Set(selectableCodexModelIds),
+  claude: new Set(selectableClaudeModelIds)
+};
+function agentHarnessForModel(model) {
+  return agentHarnessOrder.find((provider) => isSelectableAgentModel(provider, model));
+}
+function isSelectableAgentModel(provider, model) {
+  return selectableModelIdsByProvider[provider].has(model);
+}
+var selectableModelPresentationById = new Map([
+  ...selectableCodexModelIds.map((model) => [model, codexModelPresentation[model]]),
+  ...selectableClaudeModelIds.map((model) => [model, claudeModelPresentation[model]])
+]);
+function selectableAgentModelPresentation(model) {
+  return selectableModelPresentationById.get(model);
+}
 // ../../packages/agents-protocol/src/agent-metadata.ts
 var metadataShape = {
   sessionId: zod_default2.string().min(1),
@@ -32723,6 +32911,19 @@ var sessionConfiguredAgentEventSchema = agentSessionEventBaseSchema.extend({
     environment: zod_default2.record(zod_default2.string().min(1), zod_default2.literal("[REDACTED]"))
   })
 });
+var agentSettingsAppliesFromSchema = zod_default2.enum(["current_turn", "next_turn"]);
+var currentTurnUnavailableReasonMaxLength = 300;
+var sessionSettingsChangedAgentEventSchema = agentSessionEventBaseSchema.extend({
+  type: zod_default2.literal("session.settings.changed"),
+  payload: zod_default2.object({
+    model: zod_default2.string().min(1),
+    reasoningEffort: zod_default2.string().min(1).optional(),
+    commandId: zod_default2.string().min(1),
+    turnId: zod_default2.string().min(1).optional(),
+    appliesFrom: agentSettingsAppliesFromSchema,
+    currentTurnUnavailableReason: zod_default2.string().min(1).max(currentTurnUnavailableReasonMaxLength).optional()
+  })
+});
 var sessionSkillsUpdatedAgentEventSchema = agentSessionEventBaseSchema.extend({
   type: zod_default2.literal("session.skills.updated"),
   payload: zod_default2.object({
@@ -32971,6 +33172,7 @@ var errorAgentEventSchema = agentSessionEventBaseSchema.extend({
 var agentEventSchema = zod_default2.discriminatedUnion("type", [
   sessionStartedAgentEventSchema,
   sessionConfiguredAgentEventSchema,
+  sessionSettingsChangedAgentEventSchema,
   sessionSkillsUpdatedAgentEventSchema,
   sessionStateChangedAgentEventSchema,
   sessionEndedAgentEventSchema,
@@ -33000,74 +33202,6 @@ var agentEventSchema = zod_default2.discriminatedUnion("type", [
   errorAgentEventSchema
 ]);
 var agentEventTypes = agentEventSchema.options.map((schema) => schema.shape.type.value);
-// ../../packages/agents-protocol/src/agent-presentation.ts
-var CODEX_CONTEXT_WINDOW = 272000;
-var codexModelPresentation = {
-  "gpt-6-astra": {
-    label: "GPT 6.0 Astra",
-    description: "Our most capable model for complex, demanding work.",
-    relativeCost: 5,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.6-sol": {
-    label: "GPT 5.6 Sol",
-    description: "Reliable agentic workhorse for everyday tasks.",
-    relativeCost: 5,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.6-terra": {
-    label: "GPT 5.6 Terra",
-    description: "Balanced agentic coding model for everyday work.",
-    relativeCost: 3,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.6-luna": {
-    label: "GPT 5.6 Luna",
-    description: "Fast and affordable agentic coding model.",
-    relativeCost: 2,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.5": {
-    label: "GPT 5.5",
-    description: "Proven previous-generation model for coding and general work.",
-    relativeCost: 4,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.4": {
-    label: "GPT 5.4",
-    description: "Strong model for everyday coding.",
-    relativeCost: 3,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.4-mini": {
-    label: "GPT 5.4 Mini",
-    description: "Small, fast, and cost-efficient model for simpler coding tasks.",
-    relativeCost: 2,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  },
-  "gpt-5.2": {
-    label: "GPT-5.2",
-    description: "Optimized for professional work and long-running agents.",
-    relativeCost: 3,
-    maxInputTokens: CODEX_CONTEXT_WINDOW,
-    isMultiModal: true
-  }
-};
-var agentReasoningEffortPresentation = {
-  low: { label: "Low", description: "Fast responses with lighter reasoning" },
-  medium: { label: "Medium", description: "Balances speed and reasoning depth for everyday tasks" },
-  high: { label: "High", description: "Greater reasoning depth for complex problems" },
-  xhigh: { label: "Extra high", description: "Extra high reasoning depth for complex problems" },
-  max: { label: "Max", description: "Maximum reasoning depth for the hardest problems" }
-};
-var selectableAgentReasoningEfforts = ["low", "medium", "high", "xhigh"];
 // ../../packages/coding-agent-client/src/sessions.ts
 var reasoningEffortSchema = exports_external2.enum(selectableAgentReasoningEfforts);
 var sessionStatusSchema = exports_external2.enum(["open", "completed", "failed", "cancelled"]);
@@ -33145,7 +33279,12 @@ var sessionConnectionSchema = exports_external2.discriminatedUnion("status", [
     target: exports_external2.strictObject({ channel_id: exports_external2.string().min(1), thread_ts: exports_external2.string().min(1) })
   })
 ]);
-var createCodexSessionInputSchema = exports_external2.strictObject({
+var createSessionAgentInputSchema = exports_external2.strictObject({
+  provider: agentProviderIdSchema,
+  model: exports_external2.string().min(1).optional(),
+  reasoningEffort: reasoningEffortSchema.optional()
+}).refine((agent) => agent.model === undefined || isSelectableAgentModel(agent.provider, agent.model), { message: "model must be a selectable model of the selected provider", path: ["model"] });
+var createSessionInputSchema = exports_external2.strictObject({
   installationId: exports_external2.string().min(1),
   repositoryIds: exports_external2.array(exports_external2.string().min(1)),
   repositoryBranchOverrides: exports_external2.array(exports_external2.strictObject({
@@ -33154,8 +33293,7 @@ var createCodexSessionInputSchema = exports_external2.strictObject({
   })).optional(),
   prompt: exports_external2.string().refine((value) => value.trim().length > 0),
   fileIds: exports_external2.array(exports_external2.string().min(1)),
-  model: codexModelIdSchema.optional(),
-  reasoningEffort: reasoningEffortSchema.optional(),
+  agent: createSessionAgentInputSchema.optional(),
   mcps: exports_external2.array(exports_external2.string().min(1)).optional(),
   idempotencyKey: exports_external2.string().min(1).max(128)
 });
@@ -33168,12 +33306,17 @@ var createSessionResponseSchema = exports_external2.strictObject({
   messages: exports_external2.tuple([sessionMessageSchema]),
   connections: exports_external2.array(sessionConnectionSchema).max(1)
 });
+var appendSessionMessageAgentInputSchema = exports_external2.strictObject({
+  model: exports_external2.string().min(1).optional(),
+  reasoningEffort: agentReasoningEffortSchema.optional()
+}).refine((agent) => agent.model !== undefined || agent.reasoningEffort !== undefined, { message: "agent must change the model, the reasoning effort, or both" });
 var appendSessionMessageInputSchema = exports_external2.strictObject({
   sessionId: exports_external2.string().min(1),
   text: exports_external2.string().refine((value) => value.trim().length > 0),
   fileIds: exports_external2.array(exports_external2.string().min(1)),
   idempotencyKey: exports_external2.string().min(1).max(128),
-  mode: exports_external2.enum(["next", "steer"]).optional()
+  mode: exports_external2.enum(["next", "steer"]).optional(),
+  agent: appendSessionMessageAgentInputSchema.optional()
 });
 var appendSessionMessageResponseSchema = exports_external2.strictObject({
   message: sessionMessageSchema
@@ -33227,7 +33370,17 @@ var sessionDetailResponseSchema = exports_external2.object({
     full_name: exports_external2.string()
   })),
   connections: exports_external2.array(sessionConnectionSchema).max(1),
-  artifacts: exports_external2.array(sessionArtifactSchema)
+  artifacts: exports_external2.array(sessionArtifactSchema),
+  agent: exports_external2.object({
+    provider: exports_external2.string().min(1),
+    model: exports_external2.string(),
+    reasoning: exports_external2.string().nullable()
+  }).nullable().optional(),
+  agent_pending: exports_external2.object({
+    model: exports_external2.string(),
+    reasoning_effort: exports_external2.string().nullable(),
+    message_id: exports_external2.string()
+  }).nullable().optional()
 }).passthrough();
 var sessionSourceSchema = exports_external2.discriminatedUnion("provider", [
   exports_external2.object({
@@ -33280,11 +33433,11 @@ var sessionListResponseSchema = exports_external2.strictObject({
   next_cursor: exports_external2.string().nullable(),
   total: exports_external2.number().int().nonnegative()
 });
-async function createCodexSession({
+async function createSession({
   client,
   input
 }) {
-  const parsedInput = createCodexSessionInputSchema.parse(input);
+  const parsedInput = createSessionInputSchema.parse(input);
   const response = await client.request("/v1/sessions", {
     method: "POST",
     headers: {
@@ -33293,11 +33446,11 @@ async function createCodexSession({
     },
     body: JSON.stringify({
       github_installation_id: parsedInput.installationId,
-      ...parsedInput.model || parsedInput.reasoningEffort ? {
+      ...parsedInput.agent ? {
         agent: {
-          provider: "codex",
-          ...parsedInput.model ? { model: parsedInput.model } : {},
-          ...parsedInput.reasoningEffort ? { reasoning_effort: parsedInput.reasoningEffort } : {}
+          provider: parsedInput.agent.provider,
+          ...parsedInput.agent.model ? { model: parsedInput.agent.model } : {},
+          ...parsedInput.agent.reasoningEffort ? { reasoning_effort: parsedInput.agent.reasoningEffort } : {}
         }
       } : {},
       repositories: parsedInput.repositoryIds.map((repositoryId) => {
@@ -33330,7 +33483,13 @@ async function appendSessionMessage({
     body: JSON.stringify({
       text: parsedInput.text,
       file_ids: parsedInput.fileIds,
-      ...parsedInput.mode === undefined ? {} : { mode: parsedInput.mode }
+      ...parsedInput.mode === undefined ? {} : { mode: parsedInput.mode },
+      ...parsedInput.agent === undefined ? {} : {
+        agent: {
+          ...parsedInput.agent.model === undefined ? {} : { model: parsedInput.agent.model },
+          ...parsedInput.agent.reasoningEffort === undefined ? {} : { reasoning_effort: parsedInput.agent.reasoningEffort }
+        }
+      }
     })
   });
   return parseAppendSessionMessageResponse(await parseJson2(response, "Session message append response was not valid JSON."));
@@ -34237,7 +34396,7 @@ function formatSessionJson({
 `;
 }
 // src/version.ts
-var remyCliVersion = "1.22.0-rc.0";
+var remyCliVersion = "1.22.0-rc.2";
 
 // src/self-update.ts
 import { spawn } from "child_process";
@@ -34374,16 +34533,57 @@ async function confirmCliUpdate({ version: version5, signal, interrupt }) {
 
 // src/session-agent-options.ts
 function newSessionModelLabel(model) {
-  return codexModelPresentation[model].label;
+  const provider = newSessionModelHarness(model);
+  return `${agentHarnesses[provider].label} \xB7 ${agentModelLabel(model)}`;
 }
 function newSessionReasoningEffortLabel(effort) {
   return agentReasoningEffortPresentation[effort].label;
 }
-var newSessionModels = codexModelIds;
+function newSessionModelHarness(model) {
+  const provider = agentHarnessForModel(model);
+  if (!provider)
+    throw new Error(`Model ${model} is not offered by any harness.`);
+  return provider;
+}
+var newSessionModels = agentHarnessOrder.flatMap((provider) => agentHarnesses[provider].models);
 var newSessionReasoningEfforts = selectableAgentReasoningEfforts;
+function parseNewSessionModel(value) {
+  return newSessionModels.find((model) => model === value);
+}
+function parseNewSessionReasoningEffort(value) {
+  return newSessionReasoningEfforts.find((effort) => effort === value);
+}
+function sessionAgentChange({ model, reasoningEffort }) {
+  if (model !== undefined)
+    return { model, ...reasoningEffort === undefined ? {} : { reasoningEffort } };
+  if (reasoningEffort !== undefined)
+    return { reasoningEffort };
+  return;
+}
+function sessionHarnessModels(provider) {
+  const parsed = agentProviderIdSchema.safeParse(provider);
+  return parsed.success ? agentHarnesses[parsed.data].models : [];
+}
+function agentHarnessLabel(provider) {
+  const parsed = agentProviderIdSchema.safeParse(provider);
+  return parsed.success ? agentHarnesses[parsed.data].label : provider;
+}
+function agentModelLabel(model) {
+  return selectableAgentModelPresentation(model)?.label ?? model;
+}
+function agentModelDescription(model) {
+  return selectableAgentModelPresentation(model)?.description ?? "";
+}
+function agentReasoningEffortLabel(effort) {
+  const parsed = agentReasoningEffortSchema.safeParse(effort);
+  return parsed.success ? agentReasoningEffortPresentation[parsed.data].label : effort;
+}
+function agentReasoningEffortDescription(effort) {
+  return agentReasoningEffortPresentation[effort].description;
+}
 var defaultNewSessionAgent = {
-  model: "gpt-6-astra",
-  reasoningEffort: "medium"
+  model: defaultAgentSelection.model,
+  reasoningEffort: defaultAgentSelection.reasoningEffort
 };
 
 // src/sessions/session-controller.ts
@@ -34398,6 +34598,9 @@ var wrappedSessionStartedAgentEventSchema = sessionStartedAgentEventSchema.exten
 var wrappedSessionConfiguredAgentEventSchema = sessionConfiguredAgentEventSchema.extend({
   type: zod_default2.literal("agent.session.configured")
 });
+var wrappedSessionSettingsChangedAgentEventSchema = sessionSettingsChangedAgentEventSchema.extend({
+  type: zod_default2.literal("agent.session.settings.changed")
+});
 var wrappedSessionSkillsUpdatedAgentEventSchema = sessionSkillsUpdatedAgentEventSchema.extend({
   type: zod_default2.literal("agent.session.skills.updated")
 });
@@ -34482,6 +34685,7 @@ var wrappedErrorAgentEventSchema = errorAgentEventSchema.extend({
 var wrappedAgentEventSchema = zod_default2.discriminatedUnion("type", [
   wrappedSessionStartedAgentEventSchema,
   wrappedSessionConfiguredAgentEventSchema,
+  wrappedSessionSettingsChangedAgentEventSchema,
   wrappedSessionSkillsUpdatedAgentEventSchema,
   wrappedSessionStateChangedAgentEventSchema,
   wrappedSessionEndedAgentEventSchema,
@@ -34671,6 +34875,8 @@ function createSessionViewState({ detail, activeMessageId }) {
     ...detail.agentStatus === undefined ? {} : { agentStatus: detail.agentStatus },
     connectionStatus: "connected",
     pullRequest: toSessionPullRequest(detail),
+    agent: toSessionAgentSettings(detail.agent),
+    agentPending: toSessionAgentPendingSettings(detail.agent_pending),
     ...activeMessageId !== undefined ? { activeMessageId } : {},
     seenRetainedEventIds: {},
     transcript: [],
@@ -34678,6 +34884,7 @@ function createSessionViewState({ detail, activeMessageId }) {
     connectionPreviews: toConnectionPreviews(detail),
     previews: { assistantText: "", reasoningText: "" },
     commandAuthorLabels: {},
+    commandMessageIds: {},
     work: { items: [] },
     workTurnBaselines: {},
     messageTurns: {},
@@ -34707,6 +34914,8 @@ function updateSessionDetail({ state, detail }) {
     aggregateStatus: detail.status,
     ...detail.agentStatus === undefined ? {} : { agentStatus: detail.agentStatus },
     pullRequest: toSessionPullRequest(detail),
+    ...detail.agent === undefined ? {} : { agent: toSessionAgentSettings(detail.agent) },
+    ...detail.agent_pending === undefined ? {} : { agentPending: toSessionAgentPendingSettings(detail.agent_pending) },
     connectionPreviews: toConnectionPreviews(detail)
   };
 }
@@ -34911,6 +35120,7 @@ function projectSessionMessageCreated({ state, event, occurredAt }) {
   return {
     ...state,
     commandAuthorLabels: { ...state.commandAuthorLabels, [event.payload.commandId]: creatorLabel },
+    commandMessageIds: { ...state.commandMessageIds, [event.payload.commandId]: event.payload.messageId },
     transcript: [...state.transcript, {
       kind: "message",
       messageId: event.payload.messageId,
@@ -35024,6 +35234,12 @@ function projectDurableAgentEvent({ state, event, occurredAt, retainedEventId, e
     return projectAgentMessageEnded({ state, event: agentEvent, occurredAt, retainedEventId, eventUrl });
   if (agentEvent.type === "agent.context.updated")
     return state;
+  if (agentEvent.type === "agent.session.configured" || agentEvent.type === "agent.session.settings.changed") {
+    const agent = { provider: agentEvent.provider, model: agentEvent.payload.model, reasoningEffort: agentEvent.payload.reasoningEffort ?? null };
+    const stateWithAgent = { ...state, agent };
+    const card2 = toAgentActivityCard(agentEvent);
+    return agentEvent.type === "agent.session.settings.changed" ? placeActivityAfterCommandMessage({ state: stateWithAgent, commandId: agentEvent.payload.commandId, retainedEventId, occurredAt, card: card2, eventUrl }) : appendActivity({ state: stateWithAgent, retainedEventId, occurredAt, card: card2, eventUrl });
+  }
   if (agentEvent.type === "agent.work.observed" && agentEvent.actor.type === "main")
     return projectAgentWorkObserved({ state, event: agentEvent, occurredAt });
   const stateWithTurnStart = agentEvent.type === "agent.turn.started" && agentEvent.actor.type === "main" ? {
@@ -35150,8 +35366,21 @@ function projectAgentMessageEnded({ state, event, occurredAt, retainedEventId, e
     transcript: [...state.transcript, { kind: "message", messageId, occurredAt, author, text: displayedText, attachments: [] }]
   };
 }
-function appendActivity({ state, retainedEventId, occurredAt, card, eventUrl }) {
-  return { ...state, transcript: [...state.transcript, { kind: "activity", activityId: `activity:${retainedEventId}`, occurredAt, card, ...eventUrl === undefined ? {} : { eventUrl } }] };
+function activityItem({ retainedEventId, occurredAt, card, eventUrl }) {
+  return { kind: "activity", activityId: `activity:${retainedEventId}`, occurredAt, card, ...eventUrl === undefined ? {} : { eventUrl } };
+}
+function appendActivity({ state, ...activity }) {
+  return { ...state, transcript: [...state.transcript, activityItem(activity)] };
+}
+function placeActivityAfterCommandMessage({ state, commandId, ...activity }) {
+  const messageId = state.commandMessageIds[commandId];
+  const messageIndex = messageId === undefined ? -1 : state.transcript.findIndex((item) => item.kind === "message" && item.messageId === messageId);
+  if (messageIndex === -1)
+    return appendActivity({ state, ...activity });
+  return {
+    ...state,
+    transcript: [...state.transcript.slice(0, messageIndex + 1), activityItem(activity), ...state.transcript.slice(messageIndex + 1)]
+  };
 }
 function toAgentActivityCard(event) {
   const identity = childActivityIdentity(event);
@@ -35165,6 +35394,21 @@ function toMainAgentActivityCard(event) {
       return { kind: "lifecycle", weight: "noise", title: "Remy session started", summary: "Session is ready." };
     case "agent.session.configured":
       return { kind: "lifecycle", weight: "noise", title: "Remy session configured", summary: `Model ${event.payload.model}.` };
+    case "agent.session.settings.changed": {
+      const settings = [agentModelLabel(event.payload.model), ...event.payload.reasoningEffort === undefined ? [] : [agentReasoningEffortLabel(event.payload.reasoningEffort)]];
+      const switched = `Switched to ${terminalSafeSingleLine(settings.join(" \xB7 "))}`;
+      if (event.payload.appliesFrom === "current_turn")
+        return { kind: "lifecycle", weight: "signal", title: switched, summary: switched };
+      const title = `${switched} (from next turn)`;
+      const reason = event.payload.currentTurnUnavailableReason;
+      return {
+        kind: "lifecycle",
+        weight: "signal",
+        title,
+        summary: title,
+        ...reason === undefined ? {} : { detail: `The running turn kept its settings: ${terminalSafeSingleLine(reason)}` }
+      };
+    }
     case "agent.session.skills.updated":
       return { kind: "lifecycle", weight: "noise", title: "Remy skills updated", summary: "Available skills updated." };
     case "agent.session.state.changed":
@@ -35325,6 +35569,7 @@ Background outcome: ${event.payload.output.success ? "completed" : "failed"}`,
       return createChildActivityCard({ identity, activityTitle: "Needs input", card: { kind: "approval-question", weight: "signal", summary: providerText(event.payload.prompt, "Subagent needs input."), detail: jsonDetail(event.payload.questions) } });
     case "agent.session.started":
     case "agent.session.configured":
+    case "agent.session.settings.changed":
     case "agent.session.skills.updated":
     case "agent.session.state.changed":
     case "agent.session.ended":
@@ -35741,6 +35986,12 @@ function providerText(raw, fallback) {
   const cleaned = stripAnsi(raw ?? "").trim();
   return cleaned.length > 0 ? cleaned : fallback;
 }
+function toSessionAgentSettings(agent) {
+  return agent ? { provider: agent.provider, model: agent.model, reasoningEffort: agent.reasoning } : null;
+}
+function toSessionAgentPendingSettings(pending) {
+  return pending ? { model: pending.model, reasoningEffort: pending.reasoning_effort, messageId: pending.message_id } : null;
+}
 function toConnectionPreviews(detail) {
   return detail.connections.map((connection) => ({ provider: connection.provider, status: connection.status }));
 }
@@ -36112,7 +36363,7 @@ function createRemoteSessionController(dependencies) {
       await writeCache();
       cachedLastRetainedEventId = projectedState.lastRetainedEventId;
     }
-    if (frame.kind === "retained" && frame.data.event.type === "session.title.generated" && !previousState.seenRetainedEventIds[frame.id]) {
+    if (frame.kind === "retained" && !previousState.seenRetainedEventIds[frame.id] && (frame.data.event.type === "session.title.generated" || settlesAgentSettings({ previousState, projectedState, frame }))) {
       try {
         await refreshDetail();
       } catch {}
@@ -36232,9 +36483,16 @@ function createRemoteSessionController(dependencies) {
     waitUntilReady,
     waitForTurn,
     recordActiveMessage,
-    updateDetail
+    updateDetail,
+    refreshDetail
   };
 }
+function settlesAgentSettings({ previousState, projectedState, frame }) {
+  if (frame.data.event.type === "agent.session.settings.changed")
+    return true;
+  const pending = previousState.agentPending;
+  return pending !== null && sessionTurnOutcome({ state: previousState, sessionMessageId: pending.messageId }).status !== "ended" && sessionTurnOutcome({ state: projectedState, sessionMessageId: pending.messageId }).status === "ended";
+}
 function resolveSessionCachePath({
   environment,
   sessionId
@@ -37911,7 +38169,7 @@ async function createNewSessionWizard({
       const attachmentStatus = attachmentFeedback ? renderAttachmentFeedback(attachmentFeedback) : undefined;
       if (step === "prompt") {
         const parts = [
-          new StyledText7([stepHeader("New remote Codex session")]),
+          new StyledText7([stepHeader("New remote session")]),
           stringToStyledText3("Describe the work you want Remy to do. Press Enter to continue; Esc back.")
         ];
         if (attachmentText.chunks.length > 0)
@@ -39130,6 +39388,8 @@ var composerSlashCommands = [
   { value: "/complete", description: "Finish this session" },
   { value: "/cancel", description: "Cancel this session" },
   { value: "/compact", description: "Compact main-thread context" },
+  { value: "/model", description: "Change the model from your next message" },
+  { value: "/effort", description: "Change reasoning effort from your next message" },
   { value: "/new", description: "Start a new session" },
   { value: "/logout", description: "Sign out of Remy" },
   { value: "/files", description: "Download artifacts and user attachments" },
@@ -39192,6 +39452,45 @@ async function createSessionTui({
       const steps = currentTurnActivityCount();
       const stepText = steps === 0 ? "" : `${steps} step${steps === 1 ? "" : "s"} \xB7 `;
       return renderer.width < 76 ? `${stepText}ctrl+o \xB7 esc stop` : `${stepText}ctrl+o full detail \xB7 esc to stop`;
+    }, openAgentSettingsPicker = function(kind) {
+      const target = agentSettingsTarget({ state: latestState, staged: composerDraft.agent });
+      if (kind === "effort") {
+        agentSettingsPicker = { kind, index: Math.max(0, newSessionReasoningEfforts.findIndex((effort) => effort === target.reasoningEffort)) };
+      } else {
+        const provider = latestState.agent?.provider;
+        const models = provider === undefined ? [] : sessionHarnessModels(provider);
+        if (provider === undefined || models.length === 0) {
+          composerFeedback = {
+            kind: "failure",
+            message: provider === undefined ? "This session has not reported its harness yet, so its model cannot change." : `Remy does not offer model changes for the ${terminalSafeText(agentHarnessLabel(provider))} harness.`
+          };
+          render();
+          return;
+        }
+        agentSettingsPicker = { kind, provider, models, index: Math.max(0, models.findIndex((model) => model === target.model)) };
+      }
+      composerFeedback = undefined;
+      slashCompletions = [];
+      helpVisible = false;
+      pathCompletionMenuOpen = false;
+      render();
+    }, moveAgentSettingsPicker = function(step) {
+      if (!agentSettingsPicker)
+        return;
+      const length = agentSettingsPicker.kind === "model" ? agentSettingsPicker.models.length : newSessionReasoningEfforts.length;
+      agentSettingsPicker = { ...agentSettingsPicker, index: (agentSettingsPicker.index + step + length) % length };
+      render();
+    }, chooseAgentSetting = function() {
+      const picker = agentSettingsPicker;
+      if (!picker)
+        return;
+      agentSettingsPicker = undefined;
+      const pick3 = picker.kind === "model" ? { model: picker.models[picker.index] } : { reasoningEffort: newSessionReasoningEfforts[picker.index] };
+      const agent = stageAgentChange({ state: latestState, staged: composerDraft.agent, pick: pick3 });
+      composerDraft = { text: composerDraft.text, attachments: composerDraft.attachments, ...agent ? { agent } : {} };
+      const target = agentSettingsTarget({ state: latestState, staged: agent });
+      composerFeedback = agent ? { kind: "info", message: `${terminalSafeText(agentSettingsLabel(target))} applies from your next message.` } : { kind: "info", message: "No model or effort change is staged." };
+      render();
     }, composerAtVisualEdge = function(direction) {
       const cursor = composer.visualCursor;
       const visualRow = composer.scrollY + cursor.visualRow;
@@ -39239,7 +39538,7 @@ async function createSessionTui({
       const working = isRemyWorking(latestState);
       const startedAt = workingTurnStartedAt(latestState);
       const elapsedMs = startedAt === undefined ? 0 : Math.max(0, now3() - Date.parse(startedAt));
-      statusBand.content = renderStatusBand({ state: latestState, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel });
+      statusBand.content = renderStatusBand({ state: latestState, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel, stagedAgent: composerDraft.agent });
       const liveIndicator = lifecycleRequestState.kind === "pending" ? renderWorkingIndicator({ frame: SPINNER_FRAMES[spinnerFrameIndex], elapsedMs: 0, mode: lifecycleRequestState.operation }) : working ? renderWorkingIndicator({
         frame: SPINNER_FRAMES[spinnerFrameIndex],
         elapsedMs,
@@ -39257,6 +39556,7 @@ async function createSessionTui({
       const submissionStatus = renderComposerStatus({ admittedSubmissions, width: renderer.width - 2 });
       const completionMenu = pathCompletionMenuOpen ? renderPathCompletionMenu({ completions: pathCompletions, selectedIndex: completionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
       const commandMenu = renderSlashCommandMenu({ commands: slashCompletions, selectedIndex: slashCompletionIndex, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) });
+      const agentSettingsMenu = agentSettingsPicker && latestState.aggregateStatus === "open" ? renderAgentSettingsPicker({ picker: agentSettingsPicker, width: renderer.width - 2, maxRows: completionMenuRows(renderer.height) }) : undefined;
       const composerStatus = [
         attachmentFeedback ? renderAttachmentFeedback(attachmentFeedback) : undefined,
         composerFeedback ? renderFeedback(composerFeedback) : undefined,
@@ -39264,6 +39564,7 @@ async function createSessionTui({
         lifecycleRequestState.kind === "failed" ? renderFeedback({ kind: "failure", message: `Could not ${lifecycleRequestState.operation} the session: ${lifecycleRequestState.message}` }) : undefined,
         submissionStatus,
         commandMenu,
+        agentSettingsMenu,
         completionMenu
       ].filter((part) => part !== undefined && part.chunks.length > 0);
       status.content = logoutConfirmationOpen ? renderFeedback({ kind: "attention", message: "Log out of Remy?" }) : composerStatus.length > 0 ? joinStyled(composerStatus, `
@@ -39296,6 +39597,7 @@ async function createSessionTui({
       pathCompletionMenuOpen = false;
       slashCompletions = [];
       helpVisible = false;
+      agentSettingsPicker = undefined;
       composer.blur();
       root.visible = false;
       resourceRoot.visible = true;
@@ -39455,6 +39757,7 @@ async function createSessionTui({
     let pathCompletionMenuOpen = false;
     let slashCompletions = [];
     let slashCompletionIndex = 0;
+    let agentSettingsPicker;
     let composerFeedback = initialFeedback ? { kind: "info", message: initialFeedback } : undefined;
     let attachmentFeedback;
     const localPromptHistory = [];
@@ -39553,6 +39856,12 @@ async function createSessionTui({
         }
         return;
       }
+      if (agentSettingsPicker && key.name === "escape") {
+        key.preventDefault();
+        agentSettingsPicker = undefined;
+        render();
+        return;
+      }
       if (resourceMode) {
         key.preventDefault();
         const choices = resourceChoices();
@@ -39664,6 +39973,14 @@ async function createSessionTui({
         key.preventDefault();
         return;
       }
+      if (agentSettingsPicker) {
+        key.preventDefault();
+        if (key.name === "up" || key.name === "down")
+          moveAgentSettingsPicker(key.name === "up" ? -1 : 1);
+        else if (key.name === "return" || key.name === "enter")
+          chooseAgentSetting();
+        return;
+      }
       if (slashCompletions.length > 0 && (key.name === "up" || key.name === "down")) {
         key.preventDefault();
         slashCompletionIndex = (slashCompletionIndex + (key.name === "up" ? -1 : 1) + slashCompletions.length) % slashCompletions.length;
@@ -39883,6 +40200,7 @@ async function createSessionTui({
         idempotencyKey: crypto.randomUUID(),
         text: composerDraft.text,
         attachments: [...composerDraft.attachments],
+        ...composerDraft.agent ? { agent: composerDraft.agent } : {},
         status: "admitting"
       };
       admittedSubmissions = [...admittedSubmissions, submission];
@@ -39935,6 +40253,12 @@ async function createSessionTui({
         handleCompactionRequest();
         return true;
       }
+      if (command === "/model" || command === "/effort") {
+        composer.setText("");
+        composerDraft = { ...composerDraft, text: "" };
+        openAgentSettingsPicker(command === "/model" ? "model" : "effort");
+        return true;
+      }
       if (command === "/logout") {
         composer.setText("");
         composerDraft = { ...composerDraft, text: "" };
@@ -39961,18 +40285,19 @@ async function createSessionTui({
         await submitMessage({
           text: submission.text,
           attachments: submission.attachments,
-          idempotencyKey: submission.idempotencyKey
+          idempotencyKey: submission.idempotencyKey,
+          ...submission.agent ? { agent: submission.agent } : {}
         });
         if (!viewIsActive())
           return;
         localPromptHistory.push(submission.text);
         const messageId = latestState.activeMessageId;
-        admittedSubmissions = messageId ? admittedSubmissions.map((candidate) => candidate.id === submission.id ? { id: candidate.id, idempotencyKey: candidate.idempotencyKey, text: candidate.text, attachments: candidate.attachments, status: "submitted", messageId } : candidate) : admittedSubmissions.filter((candidate) => candidate.id !== submission.id);
+        admittedSubmissions = messageId ? admittedSubmissions.map((candidate) => candidate.id === submission.id ? { id: candidate.id, idempotencyKey: candidate.idempotencyKey, text: candidate.text, attachments: candidate.attachments, ...candidate.agent ? { agent: candidate.agent } : {}, status: "submitted", messageId } : candidate) : admittedSubmissions.filter((candidate) => candidate.id !== submission.id);
         composerFeedback = undefined;
       } catch (error93) {
         if (!viewIsActive())
           return;
-        admittedSubmissions = admittedSubmissions.map((candidate) => candidate.id === submission.id ? { id: candidate.id, idempotencyKey: candidate.idempotencyKey, text: candidate.text, attachments: candidate.attachments, status: "failed", error: error93 instanceof Error ? error93.message : String(error93) } : candidate);
+        admittedSubmissions = admittedSubmissions.map((candidate) => candidate.id === submission.id ? { id: candidate.id, idempotencyKey: candidate.idempotencyKey, text: candidate.text, attachments: candidate.attachments, ...candidate.agent ? { agent: candidate.agent } : {}, status: "failed", error: error93 instanceof Error ? error93.message : String(error93) } : candidate);
       }
       render();
     }
@@ -39987,6 +40312,7 @@ async function createSessionTui({
         idempotencyKey: failed.idempotencyKey,
         text: failed.text,
         attachments: failed.attachments,
+        ...failed.agent ? { agent: failed.agent } : {},
         status: "admitting"
       };
       admittedSubmissions = admittedSubmissions.map((submission) => submission.id === failed.id ? retrying : submission);
@@ -40097,6 +40423,8 @@ async function createSessionTui({
     }
     unsubscribe = controller.subscribe(({ state }) => {
       latestState = state;
+      if (latestState.aggregateStatus !== "open")
+        agentSettingsPicker = undefined;
       if (!isRemyWorking(latestState) && stopState.kind !== "idle") {
         stopState = { kind: "idle" };
         if (composerFeedback?.message === "Stop requested.")
@@ -40173,10 +40501,58 @@ function renderSlashCommandMenu({ commands, selectedIndex, width, maxRows }) {
     maxRows
   });
 }
+function renderAgentSettingsPicker({ picker, width, maxRows }) {
+  const heading = picker.kind === "model" ? `Model for your next message \xB7 ${terminalSafeText(agentHarnessLabel(picker.provider))} harness` : "Reasoning effort for your next message";
+  const items = picker.kind === "model" ? picker.models.map((model) => ({ label: agentModelLabel(model), description: agentModelDescription(model) })) : newSessionReasoningEfforts.map((effort) => ({ label: agentReasoningEffortLabel(effort), description: agentReasoningEffortDescription(effort) }));
+  const menu = renderCompletionMenu({
+    items,
+    selectedIndex: picker.index,
+    hints: [{ key: "\u2191\u2193", action: "select" }, { key: "Enter", action: "use for next message" }, { key: "Esc", action: "keep current" }],
+    width,
+    maxRows: Math.max(1, maxRows - 1)
+  });
+  return menu && joinStyled([new StyledText9([bold5(fg10(PALETTE.remyAccent)(heading))]), menu], `
+`);
+}
+function agentSettingsTarget({ state, staged }) {
+  const requested = state.agentPending ?? state.agent;
+  return {
+    model: staged?.model ?? requested?.model,
+    reasoningEffort: staged?.reasoningEffort ?? requested?.reasoningEffort
+  };
+}
+function stageAgentChange({ state, staged, pick: pick3 }) {
+  const current = agentSettingsTarget({ state, staged: undefined });
+  const model = pick3.model ?? staged?.model;
+  const reasoningEffort = pick3.reasoningEffort ?? staged?.reasoningEffort;
+  return sessionAgentChange({
+    model: model === current.model ? undefined : model,
+    reasoningEffort: reasoningEffort === current.reasoningEffort ? undefined : reasoningEffort
+  });
+}
+function agentSettingsLabel({ model, reasoningEffort }) {
+  return [
+    ...model === undefined ? [] : [agentModelLabel(model)],
+    ...reasoningEffort === undefined || reasoningEffort === null ? [] : [agentReasoningEffortLabel(reasoningEffort)]
+  ].join(" \xB7 ");
+}
+function renderAgentSettingsStatus({ state, stagedAgent }) {
+  const applied = state.agent;
+  if (!applied)
+    return;
+  const appliedLabel = terminalSafeText(`${agentHarnessLabel(applied.provider)} \xB7 ${agentSettingsLabel(applied)}`);
+  const target = agentSettingsTarget({ state, staged: stagedAgent });
+  const phase = stagedAgent ? "next message" : state.agentPending ? "switching\u2026" : undefined;
+  const changes = phase !== undefined && (target.model !== applied.model || (target.reasoningEffort ?? null) !== applied.reasoningEffort);
+  return new StyledText9([
+    fg10(PALETTE.bodyText)(appliedLabel),
+    ...changes ? [fg10(PALETTE.approvalQuestion)(` \u2192 ${terminalSafeText(agentSettingsLabel(target))} (${phase})`)] : []
+  ]);
+}
 function hasRunningTurn(state) {
   return state.aggregateStatus === "open" && Object.values(state.messageTurns).some((turn) => turn.outcome === undefined);
 }
-function renderStatusBand({ state, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel }) {
+function renderStatusBand({ state, working, elapsedMs, stopState, lifecycleRequestState, repositoryLabel, stagedAgent }) {
   const stopping = stopState?.kind === "stopping";
   const pendingOperation = lifecycleRequestState?.kind === "pending" ? lifecycleRequestState.operation : undefined;
   const presentation = pendingOperation ? { label: lifecycleOperationPresentParticiple(pendingOperation), color: PALETTE.approvalQuestion } : stopping ? { label: "Stopping", color: PALETTE.approvalQuestion } : sessionViewStatePresentation({ aggregateStatus: state.aggregateStatus, isWorking: working });
@@ -40185,11 +40561,13 @@ function renderStatusBand({ state, working, elapsedMs, stopState, lifecycleReque
   const sessionLabel = state.sessionNumber !== undefined ? `#${state.sessionNumber}` : state.sessionId;
   const pullRequest = state.pullRequest;
   const contextStatus = renderContextStatus(state.context.snapshot);
+  const agentSettings = renderAgentSettingsStatus({ state, stagedAgent: state.aggregateStatus === "open" ? stagedAgent : undefined });
   const headerContext = [
     ...repositoryLabel ? [[dim7(fg10(PALETTE.dimText)(repositoryLabel))]] : [],
     ...pullRequest ? [[bold5(fg10(statusColor(pullRequest.status))(`PR#${pullRequest.number}`))]] : [],
     [bold5(fg10(presentation.color)(`${presentation.label}${elapsed}`))],
     connection.chunks,
+    ...agentSettings ? [agentSettings.chunks] : [],
     ...contextStatus ? [[dim7(fg10(PALETTE.dimText)(contextStatus))]] : []
   ];
   return joinStyled([
@@ -41330,7 +41708,7 @@ async function dispatchCliCommandWithShutdown({
     });
   }
   if (command.name === "session")
-    return await attachSession({ dependencies, sessionId: command.sessionId, noTui: command.noTui, json: command.json, prompt: command.prompt });
+    return await attachSession({ dependencies, sessionId: command.sessionId, noTui: command.noTui, json: command.json, followUp: command.followUp });
   return await createNewSession({ dependencies, command });
 }
 async function installCliUpdate({ dependencies, version: version5 }) {
@@ -42114,15 +42492,18 @@ async function createNewSession({
     });
     fileIds.push(uploaded.fileId);
   }
-  const created = await operations.createCodexSession({
+  const created = await operations.createSession({
     client: operations.client,
     input: {
       installationId,
       repositoryIds: repositories.map((repository) => repository.id),
       prompt: command.prompt,
       fileIds,
-      ...command.model ? { model: command.model } : {},
-      reasoningEffort: command.reasoningEffort ?? defaultNewSessionAgent.reasoningEffort,
+      agent: {
+        provider: command.model ? newSessionModelHarness(command.model) : defaultAgentSelection.provider,
+        ...command.model ? { model: command.model } : {},
+        reasoningEffort: command.reasoningEffort ?? defaultNewSessionAgent.reasoningEffort
+      },
       idempotencyKey: randomUUID5()
     }
   });
@@ -42174,7 +42555,7 @@ async function createFromTuiDraft({
     throw new Error("A non-empty prompt is required before a session can be created.");
   if (draft.repositories.some((repository) => repository.githubInstallationId !== draft.githubInstallationId))
     throw new Error("All selected repositories must belong to the same GitHub installation.");
-  return await operations.createCodexSession({
+  return await operations.createSession({
     client: operations.client,
     input: {
       installationId: draft.githubInstallationId,
@@ -42182,8 +42563,11 @@ async function createFromTuiDraft({
       repositoryBranchOverrides: draft.repositoryBranchOverrides ?? [],
       prompt: draft.prompt,
       fileIds: draft.attachments.map((attachment) => attachment.fileId),
-      model: draft.model,
-      reasoningEffort: draft.reasoningEffort,
+      agent: {
+        provider: newSessionModelHarness(draft.model),
+        model: draft.model,
+        reasoningEffort: draft.reasoningEffort
+      },
       idempotencyKey: randomUUID5()
     }
   });
@@ -42238,26 +42622,35 @@ async function attachSession({
   sessionId,
   noTui,
   json: json3,
-  prompt
+  followUp
 }) {
   const operations = await createSessionOperations(dependencies);
   const detail = await operations.getSession({ client: operations.client, sessionId });
+  if (followUp?.agent?.model !== undefined && detail.agent)
+    assertModelInSessionHarness({ model: followUp.agent.model, provider: detail.agent.provider });
   const repositories = detail.repositories.map((repository) => ({ id: repository.id, fullName: repository.full_name }));
   const cache = await (dependencies.readSessionCache ?? readSessionCache)(resolveSessionCachePathForCommand({ dependencies, sessionId }));
   let activeMessageId = cache?.activeMessageId;
   let cacheWarningReported = false;
-  const onCacheError = prompt === undefined ? undefined : () => {
+  const onCacheError = followUp === undefined ? undefined : () => {
     if (cacheWarningReported)
       return;
     cacheWarningReported = true;
     dependencies.output.writeStderr(`Local session cache is unavailable; continuing to observe the accepted follow-up. Do not resubmit the prompt.
 `);
   };
-  if (prompt !== undefined) {
+  if (followUp !== undefined) {
     throwIfAborted2(dependencies.abortSignal);
     const appended = await operations.appendSessionMessage({
       client: operations.client,
-      input: { sessionId, text: prompt, fileIds: [], mode: "steer", idempotencyKey: randomUUID5() }
+      input: {
+        sessionId,
+        text: followUp.prompt,
+        fileIds: [],
+        mode: "steer",
+        idempotencyKey: randomUUID5(),
+        ...followUp.agent === undefined ? {} : { agent: followUp.agent }
+      }
     });
     activeMessageId = appended.message.id;
   }
@@ -42289,6 +42682,13 @@ async function attachSession({
     onCacheError
   });
 }
+function assertModelInSessionHarness({ model, provider }) {
+  const models = sessionHarnessModels(provider);
+  if (models.includes(model))
+    return;
+  const offered = models.length === 0 ? "Remy does not offer model changes for that harness." : `Choose one of: ${models.join(", ")}.`;
+  throw new Error(`--model ${model} is not available: this session runs on the ${agentHarnessLabel(provider)} harness, which cannot change mid-session. ${offered}`);
+}
 async function runAttachedSession({
   dependencies,
   operations,
@@ -42385,10 +42785,15 @@ async function runAttachedSession({
                   text: submission.text,
                   fileIds: submission.attachments.map((attachment) => attachment.fileId),
                   idempotencyKey: submission.idempotencyKey,
-                  mode: "steer"
+                  mode: "steer",
+                  ...submission.agent === undefined ? {} : { agent: submission.agent }
                 }
               });
               await controller.recordActiveMessage(result.message.id);
+              if (submission.agent !== undefined)
+                controller.refreshDetail().catch(() => {
+                  return;
+                });
               return { messageId: result.message.id };
             },
             requestInterrupt: async ({ idempotencyKey }) => {
@@ -42519,7 +42924,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
       suggestRepositories: dependencies.suggestRepositories ?? (async () => await Promise.reject(new Error("Missing remote repository suggestions operation."))),
       suggestBranches: dependencies.suggestBranches ?? (async () => await Promise.reject(new Error("Missing remote branch suggestions operation."))),
       reserveAndUploadFile: dependencies.reserveAndUploadFile ?? reserveAndUploadFile,
-      createCodexSession: dependencies.createCodexSession ?? createCodexSession,
+      createSession: dependencies.createSession ?? createSession,
       appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
       cancelSession: dependencies.cancelSession ?? cancelSession,
       completeSession: dependencies.completeSession ?? completeSession,
@@ -42540,7 +42945,7 @@ async function createSessionOperations(dependencies, { onAuthenticated } = {}) {
     suggestRepositories: dependencies.suggestRepositories ?? createRepositorySuggester({ client }),
     suggestBranches: dependencies.suggestBranches ?? createBranchSuggester({ client }),
     reserveAndUploadFile: dependencies.reserveAndUploadFile ?? reserveAndUploadFile,
-    createCodexSession: dependencies.createCodexSession ?? createCodexSession,
+    createSession: dependencies.createSession ?? createSession,
     appendSessionMessage: dependencies.appendSessionMessage ?? appendSessionMessage,
     cancelSession: dependencies.cancelSession ?? cancelSession,
     completeSession: dependencies.completeSession ?? completeSession,
@@ -42732,8 +43137,12 @@ Arguments:
   prompt                                  Submit a follow-up as Steer before attaching
 
 With a prompt, JSON output waits for that message's turn result. Use -- before a prompt beginning with --.
+--model and --reasoning-effort require a prompt: the change travels with it and stays the session's setting.
+A running turn switches from its next model request; otherwise the change applies from the turn the prompt starts.
 
 Options:
+  --model <name>                          Switch to another model of the session's harness
+  --reasoning-effort <low|medium|high|xhigh> Switch agent reasoning effort
   --no-tui                                Do not open the interactive terminal view
   --json                                  Write session updates as JSON
   --help, -h                              Show this help
@@ -42747,7 +43156,7 @@ Create a remote coding session from the prompt and flags. In an interactive term
 Options:
   --repository <owner/name>               Select a repository; repeat for more repositories
   --installation <id>                     Select a GitHub installation
-  --model <name>                          Select an agent model
+  --model <name>                          Select a Codex or Claude model; it sets the harness
   --reasoning-effort <low|medium|high|xhigh> Select agent reasoning effort
   --attach <path>                         Upload a file or directory (20 MiB max); repeat as needed
   --no-tui                                Do not open the interactive terminal view
@@ -42764,7 +43173,7 @@ Usage:
 Commands:
   remy                                      Open interactive dashboard
   remy dashboard                            Open interactive dashboard
-  remy --session <session-id> [--no-tui] [--json] [prompt]
+  remy --session <session-id> [--model <name> --reasoning-effort <low|medium|high|xhigh> --no-tui --json] [prompt]
                                             Attach to a session, optionally submitting a follow-up
   remy new [--repository <owner/name> ... --installation <id> --model <name> --reasoning-effort <low|medium|high|xhigh> --attach <path> ... --no-tui --json] <prompt>
                                             Create a session
@@ -42802,8 +43211,11 @@ function parseSessionAttach(argv) {
   let noTui = false;
   let json3 = false;
   let prompt;
+  let model;
+  let reasoningEffort;
   let positionalOnly = false;
-  for (const token of argv.slice(1)) {
+  for (let index = 1;index < argv.length; index += 1) {
+    const token = argv[index];
     if (!positionalOnly && token === "--") {
       positionalOnly = true;
       continue;
@@ -42816,6 +43228,17 @@ function parseSessionAttach(argv) {
       json3 = true;
       continue;
     }
+    if (!positionalOnly && (token === "--model" || token === "--reasoning-effort")) {
+      const value = argv[index + 1];
+      if (!value || value.startsWith("--"))
+        throw new Error(`${token} requires a value.`);
+      index += 1;
+      if (token === "--model")
+        model = parseModelFlag(value);
+      else
+        reasoningEffort = parseReasoningEffortFlag(value);
+      continue;
+    }
     if (!positionalOnly && token.startsWith("--"))
       throw new Error(`Unknown --session flag ${token}.`);
     if (prompt !== undefined)
@@ -42824,7 +43247,28 @@ function parseSessionAttach(argv) {
       throw new Error("A follow-up prompt must not be empty.");
     prompt = token;
   }
-  return { name: "session", sessionId, noTui, json: json3, ...prompt === undefined ? {} : { prompt } };
+  const agent = sessionAgentChange({ model, reasoningEffort });
+  if (agent && prompt === undefined)
+    throw new Error("--model and --reasoning-effort change the session with a follow-up message. Pass a prompt too.");
+  return {
+    name: "session",
+    sessionId,
+    noTui,
+    json: json3,
+    ...prompt === undefined ? {} : { followUp: { prompt, ...agent ? { agent } : {} } }
+  };
+}
+function parseModelFlag(value) {
+  const model = parseNewSessionModel(value);
+  if (!model)
+    throw new Error(`--model must name a supported model: ${newSessionModels.join(", ")}.`);
+  return model;
+}
+function parseReasoningEffortFlag(value) {
+  const reasoningEffort = parseNewSessionReasoningEffort(value);
+  if (!reasoningEffort)
+    throw new Error(`--reasoning-effort must be ${newSessionReasoningEfforts.slice(0, -1).join(", ")}, or ${newSessionReasoningEfforts.at(-1)}.`);
+  return reasoningEffort;
 }
 function parseNewCommand(argv) {
   const repositories = [];
@@ -42860,16 +43304,11 @@ function parseNewCommand(argv) {
     } else if (token === "--attach") {
       attachments.push(value);
     } else if (token === "--model") {
-      const parsedModel = codexModelIdSchema.safeParse(value);
-      if (!parsedModel.success)
-        throw new Error("--model must name a supported Codex model.");
-      model = parsedModel.data;
+      model = parseModelFlag(value);
     } else if (token === "--installation") {
       installationId = value;
     } else if (token === "--reasoning-effort") {
-      if (!selectableAgentReasoningEfforts.includes(value))
-        throw new Error("--reasoning-effort must be low, medium, high, or xhigh.");
-      reasoningEffort = value;
+      reasoningEffort = parseReasoningEffortFlag(value);
     } else {
       throw new Error(`Unknown new flag ${token}.`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meistrari/remy-cli",
-    "version": "1.22.0-rc.0",
+    "version": "1.22.0-rc.2",
     "description": "Remy, the Coding Agent terminal client.",
     "type": "module",
     "bin": {