@gajae-code/coding-agent 0.13.2 → 0.13.3

package/CHANGELOG.md

@@ -2,19 +2,44 @@
 
 ## [Unreleased]
 
+## [0.13.3] - 2026-08-15
+
+### Added
+- Added Grok 4.6 to the bundled Grok CLI model catalog with bounded reasoning-effort parsing.
+- Added built-in `grok-46-{eco,medium,pro}` role profiles using the existing xAI OAuth/subscription provider, with supported reasoning-effort selection for Grok 4.5/4.6.
+- Added three provider-agnostic Muse Spark 1.2 presets: Muse Spark across all roles, plus DeepSeek and Luna executor variants.
+- Added the bundled Ouroboros theme and pet, including transactional theme selection and RedGajae fallback (#4468).
+- Gajae Pet now renders in iTerm2 using inline PNG frames, with the same reserved composer-side layout and lifecycle cleanup used by Kitty and Sixel (#4499).
+
+### Fixed
+- Managed sessions recover from `content_too_large` by rewriting live in-memory entries, and proactively compact before the managed transcript limit (#4411).
+- Managed output publication no longer freezes the resident event loop when a no-replace rename stalls in the kernel; async publication uses blocking-pool native boundaries and per-session stores reap scrubbed protocol remnants (#4396).
+- Print mode now requests a governed process exit after successful session teardown, so completed one-shot runs cannot be pinned by residual runtime handles; both stdout and stderr are drained first and the recorded exit code is preserved.
+- `todo_write` no longer rejects a positional task handle without saying how to address a task. Callers reach for `id`/`index` because the tool result renders todos as a list, and raw validation rejects the unknown key before `execute` runs; positional-handle keys now explain that tasks are addressed by exact `task` content or by `phase`.
+- Escaped-non-ASCII tool-call turns in managed fallback are retried on the same model without charging the fallback chain or advancing it — the wire defect is a sampling accident, not provider evidence — bounded to two consecutive retries before the run terminates (#4515).
+- Image generation now redacts API keys, bearer tokens, JWTs, and other credential formats from provider error messages and surfaced metadata, bounds provider response bodies at 64 MiB before buffering, and cancels rejected bodies instead of retaining unbounded streams (#4302).
+- A transient Windows `invalid_request` during managed replacement-receipt reconciliation is now resolved by capturing both the pending and canonical receipt paths: success when another reconciler already moved the pending receipt, fail-closed `managed_replace_cleanup_receipt_invalid` for conflicting destinations, byte-identical copies, or missing receipts (#4373).
+- Status-line scratch roots are resolved at render time instead of process start, so path classification follows the active environment when `HOME`/`TMPDIR` are rewritten after module caching (#4452).
+
 ## [0.13.2] - 2026-08-13
 
 ### Added
-- `/theme <name>` now switches the theme immediately without opening the selector: the name is validated against built-in and custom themes, persisted to the detected `theme.dark`/`theme.light` slot, and applied to the running session in one step. Bare `/theme` keeps the existing live-preview selector, and an unknown name is rejected with the list of available themes.
+- Added a portable Stream Deck integration for cmux sessions, including a plugin manifest, reusable profile pages, action icons, installation scripts, and a guided setup document (#4308 by @Yeachan-Heo).
+- `/theme <name>` now switches the theme immediately without opening the selector. The name is validated against built-in and custom themes, persisted to the detected `theme.dark`/`theme.light` slot, and applied to the running session in one step (#4429 by @Yeachan-Heo).
 
 ### Fixed
-- The Telegram notification daemon now contains transient Windows state or ownership-lock read failures during steady heartbeat renewal instead of terminating its run loop. Staging files are cleaned in a `finally` block, and only a proven ownership mismatch stops the owner (#4200).
-- Coordinator MCP now answers the standard `ping` keepalive with an empty result instead of `method not found`, preventing liveness clients from reconnecting repeatedly.
-- Task-launched canonical subagents no longer receive an ACP exact-config `toolsOnly` MCP manager that they are forbidden to reuse. Planner, Architect, Critic, and Ralplan consensus lanes now start normally while reusable plugin MCP managers continue to inherit across sub-sessions.
-- Managed output publication no longer freezes the resident event loop when a no-replace rename stalls in the kernel (#4394). Async managed publication now uses async file operations and native blocking-pool rename/link boundaries, while per-session stores also reap scrubbed protocol remnants on a throttled, serialized schedule. Atomic no-replace semantics and the synchronous publication path are unchanged.
-- The SDK broker's Windows process-liveness probe no longer opens a console window on every poll. `runProcessIncarnationCommand` spawned `powershell.exe` without `windowsHide`, and on Windows 11 — where the default terminal delegation hands every new console to Windows Terminal — each probe therefore created a visible terminal window that stole focus. The PowerShell path runs whenever the native reader cannot bind the target pid, so one dead or inaccessible pid turned the broker's ~2s liveness polling into a continuous window flash for the life of the process. Every other internal spawn in the repo already passed `windowsHide: true`; this one did not.
-- Foreground Bash calls that finish before their auto-background deadline now cancel that deadline instead of leaving an uncancellable `Bun.sleep()` behind. In print mode the losing sleep kept the compiled CLI alive for the full command timeout after Bash and subagent work had already completed, which appeared as a shutdown hang with no active Node handles.
-- Prompt suggestions now remain visible after cancelling another interactive action and returning to the composer.
+
+- Anthropic thinking blocks emptied by `clear_thinking` now drop stale signatures before replay, preventing every subsequent request from failing with an invalid thinking-block signature (#4247, reported by @probepark).
+- Coalesced double-Esc and triple-Esc input now emits individual Escape presses under tmux and SSH, while split ambiguous Escape sequences stay buffered until a continuation or flush timeout resolves them (#4312 by @Yeachan-Heo).
+- Apple Terminal.app now retains its default keyboard mode when Kitty keyboard support is unavailable, preserving Korean/Hangul IME composition (#4297 by @Yeachan-Heo).
+- Managed output publication no longer freezes the resident event loop when a no-replace rename stalls in the kernel. Async publication now uses asynchronous file operations and native blocking-pool rename/link boundaries, while per-session stores reap scrubbed protocol remnants on a throttled, serialized schedule (#4396 by @Yeachan-Heo; fixes #4394).
+- The Telegram notification daemon now contains transient Windows state and ownership-lock read failures during steady heartbeat renewal instead of terminating its run loop; staging files are cleaned in a `finally` block, and only a proven ownership mismatch stops the owner (by @Yeachan-Heo; issue #4200).
+- Coordinator MCP now answers the standard `ping` keepalive with an empty result instead of `method not found`, preventing liveness clients from reconnecting repeatedly (#4412 by @developjik).
+- Task-launched canonical subagents no longer receive an ACP exact-config `toolsOnly` MCP manager that they are forbidden to reuse, restoring Planner, Architect, Critic, and Ralplan consensus launches (#4419 by @chlee1001).
+- The SDK broker's Windows process-liveness probe no longer opens a console window on every poll; its PowerShell fallback now passes `windowsHide` so a dead or inaccessible process cannot trigger a continuous focus-stealing terminal flash (#4346 by @Dayoooun).
+- Foreground Bash calls that finish before their auto-background deadline now cancel that deadline instead of leaving a sleep behind that keeps compiled print-mode processes alive (#4256 by @probepark).
+- Prompt suggestions now remain visible after cancelling another interactive action and returning to the composer (#4347 by @thegreatesthoneybee).
+
 ## [0.13.1] - 2026-08-11
 
 ### Added

package/dist/types/config/model-registry.d.ts

@@ -34,6 +34,7 @@ export interface GjcModelAssignmentTargetInfo extends ModelRoleInfo {
 }
 export { GJC_MODEL_ASSIGNMENT_TARGET_IDS };
 export declare const GJC_MODEL_ASSIGNMENT_TARGETS: Record<GjcModelAssignmentTargetId, GjcModelAssignmentTargetInfo>;
+export declare function requiresExplicitThinkingChoice(model: Model, role: GjcModelAssignmentTargetId | null): boolean;
 /** Alias for ModelRoleInfo - used for both built-in and custom roles */
 export type RoleInfo = ModelRoleInfo;
 /**

package/dist/types/config/settings-schema.d.ts

@@ -704,18 +704,18 @@ export declare const SETTINGS_SCHEMA: {
     };
     readonly "pet.mode": {
         readonly type: "enum";
-        readonly values: readonly ["off", "red", "blue"];
+        readonly values: readonly ["off", "red", "blue", "ouroboros"];
         readonly default: "off";
         readonly ui: {
             readonly tab: "appearance";
             readonly label: "Gajae Pet";
-            readonly description: "16x16 real-pixel gajae living beside the composer (sixel/kitty terminals)";
+            readonly description: "Real-pixel pet living beside the composer (sixel/kitty terminals)";
             readonly options: readonly [{
                 readonly value: "off";
                 readonly label: "Off";
                 readonly description: "No pet";
             }, ...{
-                value: "blue" | "red";
+                value: "blue" | "ouroboros" | "red";
                 label: string;
                 description: string;
             }[]];

package/dist/types/main.d.ts

@@ -132,6 +132,7 @@ export interface RunRootCommandDependencies {
     getChangelogForDisplay?: typeof getChangelogForDisplay;
     createInteractiveMode?: CreateInteractiveMode;
     runPrintMode?: RunPrintMode;
+    quit?: (code: number) => Promise<void>;
     isResumePickerTerminal?: ResumePickerTerminalCheck;
     listForResumePickerReadOnly?: ListForResumePickerReadOnly;
     listManagedForResumePickerReadOnly?: ListManagedForResumePickerReadOnly;

package/dist/types/modes/components/dynamic-theme-text.d.ts

@@ -0,0 +1,9 @@
+import { type Component } from "@gajae-code/tui";
+/** Text whose styling is resolved at render time so live theme previews recolor open overlays. */
+export declare class DynamicThemeText implements Component {
+    #private;
+    private readonly getText;
+    constructor(getText: () => string);
+    invalidate(): void;
+    render(width: number): string[];
+}

package/dist/types/modes/components/gajae-pet-widget.d.ts

@@ -16,8 +16,8 @@ export declare class PetFramedEditor implements Component {
     render(width: number): string[];
 }
 /**
- * The gajae pet: a 16x16 real-pixel sprite living in a reserved area beside
- * the composer. It is nearest-neighbor scaled to the two terminal rows occupied
+ * The gajae pet: a real-pixel sprite living in a reserved area beside the
+ * composer. It is nearest-neighbor scaled to the two terminal rows occupied
  * by an empty one-line composer and lifted one row so its feet meet the input
  * box's bottom edge.
  *
@@ -39,15 +39,15 @@ export declare class GajaePetWidget {
         isWorking: () => boolean;
         /** Rows rendered below the composer box (pet floor + hook widgets). */
         getComposerBottomOffset: () => number;
-        forcePixelProtocol?: "sixel" | "kitty";
+        forcePixelProtocol?: "sixel" | "kitty" | "iterm2";
         /** Random [min, max] ms between auto-flexes; null disables. */
         autoFlexGapMs?: [number, number] | null;
     });
     /** Protocol available for the real-pixel pet, if any. */
-    static pixelProtocol(): "sixel" | "kitty" | null;
+    static pixelProtocol(): "sixel" | "kitty" | "iterm2" | null;
     get mode(): PetMode;
     get isFlexing(): boolean;
-    setMode(mode: PetMode): void;
+    setMode(mode: string): void;
     /** Live preview during a selector: change the sprite without re-mounting the
      *  composer editor (that would tear down the open overlay). After a short idle
      *  eye-roll it fires the signature burst once (RedGajae flex, BlueGajae para-para

package/dist/types/modes/components/pet-capability.d.ts

@@ -1,10 +1,10 @@
 import { type SelectItem } from "@gajae-code/tui";
-export type PetPixelProtocol = "sixel" | "kitty";
-export declare const PET_UNAVAILABLE_DESCRIPTION = "Unavailable: requires compatible Kitty or Sixel overlay rendering";
-export declare const PET_SAVED_UNAVAILABLE_DESCRIPTION = "Saved, unavailable \u2014 requires compatible Kitty or Sixel overlay rendering";
-export declare const PET_UNAVAILABLE_WARNING = "\u26A0 Pets aren\u2019t available in this terminal. Its image support isn\u2019t compatible with Gajae Pet\u2019s overlay rendering yet. Try Kitty, Ghostty, WezTerm, or a terminal with compatible Sixel support.";
+export type PetPixelProtocol = "sixel" | "kitty" | "iterm2";
+export declare const PET_UNAVAILABLE_DESCRIPTION = "Unavailable: requires compatible Kitty, iTerm2, or Sixel overlay rendering";
+export declare const PET_SAVED_UNAVAILABLE_DESCRIPTION = "Saved, unavailable \u2014 requires compatible Kitty, iTerm2, or Sixel overlay rendering";
+export declare const PET_UNAVAILABLE_WARNING = "\u26A0 Pets aren\u2019t available in this terminal. Its image support isn\u2019t compatible with Gajae Pet\u2019s overlay rendering yet. Try Kitty, Ghostty, WezTerm, iTerm2, or a terminal with compatible Sixel support.";
 export declare function getPetUnavailableWarning(env?: NodeJS.ProcessEnv): string;
-export declare function getPetPixelProtocol(): PetPixelProtocol | null;
+export declare function getPetPixelProtocol(env?: NodeJS.ProcessEnv): PetPixelProtocol | null;
 export declare function isPetAvailable(): boolean;
 export declare function createPetSelectItems(options: ReadonlyArray<SelectItem>, currentValue: string, available: boolean): SelectItem[];
 /**

package/dist/types/modes/components/settings-selector.d.ts

@@ -52,6 +52,11 @@ export interface SettingsCallbacks {
     onThemePreview?: (theme: string) => void | Promise<void>;
     /** Called to restore the rendered theme when theme settings preview is cancelled */
     onThemePreviewCancel?: (theme: string) => void | Promise<void>;
+    /**
+     * Atomically apply and persist a theme selection. Returns false when the
+     * candidate could not be loaded, leaving the submenu open.
+     */
+    onThemeCommit?: (path: "theme.dark" | "theme.light", theme: string, previousTheme: string) => Promise<boolean>;
     /** Called to live-preview the gajae pet skin while browsing the pet setting. */
     onPetPreview?: (mode: string) => void;
     /**

package/dist/types/modes/theme/defaults/index.d.ts

@@ -526,6 +526,124 @@ export declare const defaultThemes: {
             preset: string;
         };
     };
+    ouroboros: {
+        $schema: string;
+        name: string;
+        vars: {
+            cyan: string;
+            blue: string;
+            green: string;
+            red: string;
+            yellow: string;
+            gray: string;
+            dimGray: string;
+            darkGray: string;
+            accent: string;
+            selectedBg: string;
+            userMsgBg: string;
+            toolPendingBg: string;
+            toolSuccessBg: string;
+            toolErrorBg: string;
+            customMsgBg: string;
+            abyss: string;
+            deepNavy: string;
+            mantle: string;
+            surface: string;
+            surfaceBright: string;
+            ouroTeal: string;
+            serpentGreen: string;
+            petLime: string;
+            ritualGold: string;
+            eyeGold: string;
+            coolScale: string;
+            foam: string;
+            mutedScale: string;
+            dimScale: string;
+            dangerRed: string;
+            diffRemovalRed: string;
+        };
+        colors: {
+            accent: string;
+            border: string;
+            borderAccent: string;
+            borderMuted: string;
+            success: string;
+            error: string;
+            warning: string;
+            muted: string;
+            dim: string;
+            text: string;
+            thinkingText: string;
+            selectedBg: string;
+            userMessageBg: string;
+            userMessageText: string;
+            customMessageBg: string;
+            customMessageText: string;
+            customMessageLabel: string;
+            toolPendingBg: string;
+            toolSuccessBg: string;
+            toolErrorBg: string;
+            toolTitle: string;
+            toolOutput: string;
+            mdHeading: string;
+            mdLink: string;
+            mdLinkUrl: string;
+            mdCode: string;
+            mdCodeBlock: string;
+            mdCodeBlockBorder: string;
+            mdQuote: string;
+            mdQuoteBorder: string;
+            mdHr: string;
+            mdListBullet: string;
+            toolDiffAdded: string;
+            toolDiffRemoved: string;
+            toolDiffContext: string;
+            syntaxComment: string;
+            syntaxKeyword: string;
+            syntaxFunction: string;
+            syntaxVariable: string;
+            syntaxString: string;
+            syntaxNumber: string;
+            syntaxType: string;
+            syntaxOperator: string;
+            syntaxPunctuation: string;
+            thinkingOff: string;
+            thinkingMinimal: string;
+            thinkingLow: string;
+            thinkingMedium: string;
+            thinkingHigh: string;
+            thinkingXhigh: string;
+            bashMode: string;
+            statusLineBg: string;
+            statusLineSep: string;
+            statusLineModel: string;
+            statusLinePath: string;
+            statusLineGitClean: string;
+            statusLineGitDirty: string;
+            statusLineContext: string;
+            statusLineSpend: string;
+            statusLineStaged: string;
+            statusLineDirty: string;
+            statusLineUntracked: string;
+            statusLineOutput: string;
+            statusLineCost: string;
+            statusLineSubagents: string;
+            pythonMode: string;
+        };
+        export: {
+            pageBg: string;
+            cardBg: string;
+            infoBg: string;
+        };
+        symbols: {
+            preset: string;
+            overrides: {
+                "icon.pi": string;
+                "status.running": string;
+                "md.bullet": string;
+            };
+        };
+    };
     "red-claw": {
         $schema: string;
         name: string;

package/dist/types/session/session-manager.d.ts

@@ -1130,6 +1130,13 @@ export declare class SessionManager {
     listForResumePickerReadOnly(): Promise<SessionInfo[]>;
     getSessionId(): string;
     getSessionFile(): string | undefined;
+    /**
+     * On-disk transcript file size in bytes. Returns 0 when the file is
+     * unavailable, unreadable, or no session file is set. The managed-storage
+     * path reads through the descriptor (no full-file scan); the plain-file
+     * path uses statSync.
+     */
+    getTranscriptFileBytes(): number;
     getSessionMemoryStats(): SessionMemoryStats;
     setSessionMemoryMode(mode: SessionMemoryMode): void;
     acquireMemoryGuardParticipantIngressLease(): MemoryGuardParticipantIngressLease;

package/dist/types/tools/image-gen.d.ts

@@ -3,6 +3,7 @@ import * as z from "zod/v4";
 import { type ModelRegistry } from "../config/model-registry";
 import type { Settings } from "../config/settings";
 import type { CustomTool } from "../extensibility/custom-tools/types";
+export declare function redactImageProviderText(value: unknown, activeApiKey?: string): string;
 type ImageProvider = "alibaba" | "antigravity" | "gemini" | "openai" | "openai-codex" | "openrouter" | (string & {});
 declare const responseModalitySchema: z.ZodEnum<{
     IMAGE: "IMAGE";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/coding-agent",
-	"version": "0.13.2",
+	"version": "0.13.3",
 	"description": "Gajae Code CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -54,13 +54,13 @@
 		"@agentclientprotocol/sdk": "1.3.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@gajae-code/stats": "0.13.2",
-		"@gajae-code/agent-core": "0.13.2",
-		"@gajae-code/ai": "0.13.2",
-		"@gajae-code/bridge-client": "0.13.2",
-		"@gajae-code/natives": "0.13.2",
-		"@gajae-code/tui": "0.13.2",
-		"@gajae-code/utils": "0.13.2",
+		"@gajae-code/stats": "0.13.3",
+		"@gajae-code/agent-core": "0.13.3",
+		"@gajae-code/ai": "0.13.3",
+		"@gajae-code/bridge-client": "0.13.3",
+		"@gajae-code/natives": "0.13.3",
+		"@gajae-code/tui": "0.13.3",
+		"@gajae-code/utils": "0.13.3",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/config/model-profile-activation.ts

@@ -572,7 +572,9 @@ function rewriteSelectorForProxy(
 	const proxyModels = allModels.filter(model => model.provider === proxyProvider);
 	if (slash < 0) {
 		if (proxyMode === "fallback") return selector;
-		const matches = proxyModels.filter(model => model.id === baseSelector);
+		const exactMatches = proxyModels.filter(model => model.id === baseSelector);
+		const finalSegmentMatches = proxyModels.filter(model => model.id.split("/").at(-1) === baseSelector);
+		const matches = exactMatches.length > 0 ? exactMatches : finalSegmentMatches;
 		if (matches.length !== 1) {
 			throw new Error(
 				`Configured proxy "${proxyProvider}" does not expose an unambiguous model for "${baseSelector}"`,

package/src/config/model-profiles.ts

@@ -134,6 +134,27 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "gpt-5.6-luna:xhigh",
 		architect: "gpt-5.6-luna:xhigh",
 	}),
+	profile("open-weights-spark", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "muse-spark-1.2:low",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
+	profile("open-weights-spark-deepseek", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "deepseek-v4-flash:high",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
+	profile("open-weights-spark-luna", [], {
+		default: "muse-spark-1.2:medium",
+		executor: "gpt-5.6-luna:high",
+		planner: "muse-spark-1.2:high",
+		critic: "muse-spark-1.2:high",
+		architect: "muse-spark-1.2:xhigh",
+	}),
 	profile("open-weights-glm-deepseek", [], {
 		default: "glm-5.2:medium",
 		executor: "deepseek-v4-flash:high",
@@ -279,7 +300,7 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	}),
 	profile("grok-45-eco", ["xai"], {
 		default: "xai/grok-4.5:low",
-		executor: "xai/grok-4.5:minimal",
+		executor: "xai/grok-4.5:low",
 		planner: "xai/grok-4.5:low",
 		critic: "xai/grok-4.5:medium",
 		architect: "xai/grok-4.5:high",
@@ -298,6 +319,27 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "xai/grok-4.5:high",
 		architect: "xai/grok-4.5:high",
 	}),
+	profile("grok-46-eco", ["xai"], {
+		default: "xai/grok-4.6:low",
+		executor: "xai/grok-4.6:low",
+		planner: "xai/grok-4.6:low",
+		critic: "xai/grok-4.6:medium",
+		architect: "xai/grok-4.6:high",
+	}),
+	profile("grok-46-medium", ["xai"], {
+		default: "xai/grok-4.6:medium",
+		executor: "xai/grok-4.6:low",
+		planner: "xai/grok-4.6:medium",
+		critic: "xai/grok-4.6:high",
+		architect: "xai/grok-4.6:high",
+	}),
+	profile("grok-46-pro", ["xai"], {
+		default: "xai/grok-4.6:xhigh",
+		executor: "xai/grok-4.6:medium",
+		planner: "xai/grok-4.6:high",
+		critic: "xai/grok-4.6:xhigh",
+		architect: "xai/grok-4.6:xhigh",
+	}),
 	profile("grok-build-pro", ["grok-build"], {
 		default: "grok-build/grok-composer-2.5-fast",
 		executor: "grok-build/grok-build",
@@ -444,6 +486,15 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 	},
 	"open-weights-kimi": { displayName: "Kimi", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
 	"open-weights-luna": { displayName: "Luna", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
+	"open-weights-spark": { displayName: "Muse Spark", providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)" },
+	"open-weights-spark-deepseek": {
+		displayName: "Muse Spark + DeepSeek",
+		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
+	},
+	"open-weights-spark-luna": {
+		displayName: "Muse Spark + Luna",
+		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
+	},
 	"open-weights-glm-deepseek": {
 		displayName: "GLM + DeepSeek",
 		providerGroup: "OPEN WEIGHT MODELS (PROVIDER AGNOSTIC)",
@@ -481,6 +532,9 @@ const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
 	"grok-45-eco": { displayName: "Grok 4.5 Eco", providerGroup: "GROK" },
 	"grok-45-medium": { displayName: "Grok 4.5 Medium", providerGroup: "GROK" },
 	"grok-45-pro": { displayName: "Grok 4.5 Pro", providerGroup: "GROK" },
+	"grok-46-eco": { displayName: "Grok 4.6 Eco", providerGroup: "GROK" },
+	"grok-46-medium": { displayName: "Grok 4.6 Medium", providerGroup: "GROK" },
+	"grok-46-pro": { displayName: "Grok 4.6 Pro", providerGroup: "GROK" },
 	"grok-build-pro": { displayName: "Grok Build Pro", providerGroup: "GROK" },
 	"cursor-eco": { displayName: "Cursor Eco", providerGroup: "CURSOR" },
 	"cursor-medium": { displayName: "Cursor Medium", providerGroup: "CURSOR" },
@@ -518,6 +572,9 @@ const OPEN_WEIGHT_PROFILE_ORDER = [
 	"open-weights-deepseek",
 	"open-weights-kimi",
 	"open-weights-luna",
+	"open-weights-spark",
+	"open-weights-spark-deepseek",
+	"open-weights-spark-luna",
 	"open-weights-glm-deepseek",
 	"open-weights-kimi-deepseek",
 	"open-weights-kimi-glm",
@@ -536,7 +593,7 @@ const PROFILE_RECOMMENDATIONS: Record<string, string> = {
 	"xiaomi-token-plan-sgp": "mimo-medium",
 	"xiaomi-token-plan-ams": "mimo-medium",
 	"xiaomi-token-plan-cn": "mimo-medium",
-	xai: "grok-medium",
+	xai: "grok-46-medium",
 	"grok-build": "grok-build-pro",
 	cursor: "cursor-medium",
 	"minimax-code": "minimax-medium",

package/src/config/model-registry.ts

@@ -5,6 +5,7 @@ import {
 	type AssistantMessageEventStream,
 	type AuthCredentialSelector,
 	applyFinalCodexGpt56ContextCap,
+	applyGeneratedModelPolicies,
 	type CacheRetention,
 	CODEX_GPT_5_6_CONTEXT_CAP,
 	type Context,
@@ -171,6 +172,17 @@ export const GJC_MODEL_ASSIGNMENT_TARGETS: Record<GjcModelAssignmentTargetId, Gj
 	image: { id: "image", tag: "IMAGE", name: "Image", color: "accent", settingsPath: "modelRoles" },
 };
 
+export function requiresExplicitThinkingChoice(model: Model, role: GjcModelAssignmentTargetId | null): boolean {
+	if (model.reasoning !== true) return false;
+	if (
+		model.provider === "openai" ||
+		model.provider === "openai-codex" ||
+		(model.provider === "xai" && (model.id === "grok-4.5" || model.id === "grok-4.6"))
+	)
+		return true;
+	return role !== null && GJC_MODEL_ASSIGNMENT_TARGETS[role].settingsPath === "task.agentModelOverrides";
+}
+
 /** Alias for ModelRoleInfo - used for both built-in and custom roles */
 export type RoleInfo = ModelRoleInfo;
 
@@ -1634,7 +1646,9 @@ export class ModelRegistry {
 			const withTransport = providerOverride
 				? models.map(model => this.#applyProviderTransportOverride(model, providerOverride))
 				: models;
-			cachedModels.push(...this.#applyProviderModelOverrides(descriptor.providerId, withTransport));
+			const normalized = this.#applyProviderModelOverrides(descriptor.providerId, withTransport);
+			applyGeneratedModelPolicies(normalized);
+			cachedModels.push(...normalized);
 		}
 		return cachedModels;
 	}
@@ -1650,6 +1664,7 @@ export class ModelRegistry {
 					this.#applyProviderCompat(providerConfig.compat, [...models]),
 				),
 			);
+			applyGeneratedModelPolicies(normalized);
 			cachedModels.push(...normalized);
 		}
 		return cachedModels;

package/src/config/settings-schema.ts

@@ -752,7 +752,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "appearance",
 			label: "Gajae Pet",
-			description: "16x16 real-pixel gajae living beside the composer (sixel/kitty terminals)",
+			description: "Real-pixel pet living beside the composer (sixel/kitty terminals)",
 			options: [
 				{ value: "off", label: "Off", description: "No pet" },
 				...PET_SKIN_IDS.map(id => ({

package/src/defaults/gjc/extensions/grok-cli-vendor/src/models/catalog.ts

@@ -9,6 +9,7 @@ const COST_BUILD = { input: 1, output: 2, cacheRead: 0.2, cacheWrite: 0.2 };
 const COST_COMPOSER_FAST = { input: 3, output: 15, cacheRead: 0.5, cacheWrite: 0 };
 const COST_43 = { input: 1.25, output: 2.5, cacheRead: 0.2, cacheWrite: 0 };
 const COST_45 = { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 };
+const COST_46 = { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 };
 const COST_420 = { input: 2, output: 6, cacheRead: 0.2, cacheWrite: 0 };
 
 // ─── Model type ───────────────────────────────────────────────────────────────
@@ -73,6 +74,18 @@ const FALLBACK_MODELS: GrokCliModelConfig[] = [
     contextWindow: 1_000_000,
     maxTokens: 30_000,
   },
+  {
+    // Official metadata and pricing: https://docs.x.ai/developers/models/grok-4.6
+    id: 'grok-4.6',
+    name: 'Grok 4.6',
+    reasoning: true,
+    input: ['text', 'image'],
+    cost: COST_46,
+    contextWindow: 500_000,
+    maxTokens: 30_000,
+    // https://docs.x.ai/developers/model-capabilities/text/reasoning: xhigh is 4.6 and later.
+    maxReasoningEffort: Effort.XHigh,
+  },
   {
     // Official metadata and pricing: https://docs.x.ai/developers/models/grok-4.5
     id: 'grok-4.5',
@@ -122,8 +135,9 @@ const FALLBACK_MODELS: GrokCliModelConfig[] = [
   },
 ];
 
-// Official aliases: https://docs.x.ai/developers/models/grok-4.5
+// Official aliases: https://docs.x.ai/developers/models/grok-4.6
 const MODEL_ALIASES: Readonly<Record<string, string>> = {
+  'grok-4.6-latest': 'grok-4.6',
   'grok-4.5-latest': 'grok-4.5',
   'grok-build-latest': 'grok-4.5',
 };
@@ -138,18 +152,29 @@ function getCanonicalModelName(modelId: string): string {
   return MODEL_ALIASES[name] ?? name;
 }
 
+function matchesModelFamily(name: string, modelId: string): boolean {
+  if (name === modelId) return true;
+  const suffix = name.slice(modelId.length + 1);
+  return name.startsWith(`${modelId}-`) && /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(suffix);
+}
+
 export function getMaxReasoningEffort(modelId: string): Effort | undefined {
   const name = getCanonicalModelName(modelId);
-  return FALLBACK_MODELS.find(
-    (model) => name === model.id.toLowerCase() || name.startsWith(`${model.id.toLowerCase()}-`),
-  )?.maxReasoningEffort;
+  return FALLBACK_MODELS.find((model) => matchesModelFamily(name, model.id.toLowerCase()))
+    ?.maxReasoningEffort;
 }
 
-const EFFORT_CAPABLE_PREFIXES = ['grok-3-mini', 'grok-4.20-multi-agent', 'grok-4.3', 'grok-4.5'];
+const EFFORT_CAPABLE_PREFIXES = [
+  'grok-3-mini',
+  'grok-4.20-multi-agent',
+  'grok-4.3',
+  'grok-4.5',
+  'grok-4.6',
+];
 
 export function supportsReasoningEffort(modelId: string): boolean {
   const name = getCanonicalModelName(modelId);
-  if (!EFFORT_CAPABLE_PREFIXES.some((prefix) => name.startsWith(prefix))) {
+  if (!EFFORT_CAPABLE_PREFIXES.some((prefix) => matchesModelFamily(name, prefix))) {
     return false;
   }
   const model = resolveModels().find((entry) => getCanonicalModelName(entry.id) === name);