feat: add Crush agent backend (crush server HTTP API) + mobile agent picker

packages/happy-app/sources/app/(app)/new/index.tsx

@@ -96,6 +96,8 @@ const agentIcons = {
     openclaw: require('@/assets/images/icon-openclaw.png'),
     gemini: require('@/assets/images/icon-gemini.png'),
     agy: require('@/assets/images/icon-agy.png'),
+    hermes: require('@/assets/images/icon-hermes.png'),
+    crush: require('@/assets/images/icon-crush.png'),
 };
 
 type AgentKey = NewSessionAgentType;
@@ -105,6 +107,8 @@ const ALL_AGENTS: { key: AgentKey; label: string }[] = [
     { key: 'codex', label: 'codex' },
     { key: 'openclaw', label: 'openclaw' },
     { key: 'agy', label: 'agy' },
+    { key: 'hermes', label: 'hermes' },
+    { key: 'crush', label: 'crush' },
 ];
 
 type PickerItem = { key: string; label: string; subtitle?: string; dimmed?: boolean };

packages/happy-app/sources/app/(app)/settings/agents.tsx

@@ -42,6 +42,8 @@ const agentLabels: Record<AgentKey, string> = {
     gemini: 'Gemini',
     openclaw: 'OpenClaw',
     agy: 'Agy',
+    hermes: 'Hermes',
+    crush: 'Crush',
 };
 
 function optionName(options: ModeOption[], key: string | null | undefined): string {

packages/happy-app/sources/components/HomeDock.tsx

@@ -72,6 +72,8 @@ const AGENTS: Array<{ key: NewSessionAgentType; name: string }> = [
     { key: 'openclaw', name: 'OpenClaw' },
     { key: 'gemini', name: 'Gemini' },
     { key: 'agy', name: 'Agy' },
+    { key: 'hermes', name: 'Hermes' },
+    { key: 'crush', name: 'Crush' },
 ];
 
 const MOBILE_ICON_MENU_GEOMETRY = resolveMobileComposerMenuGeometry('icon');

packages/happy-app/sources/components/modelModeOptions.ts

@@ -156,6 +156,12 @@ export function getHardcodedPermissionModes(flavor: AgentFlavor, translate: Tran
     if (flavor === 'agy') {
         return getAgyPermissionModes(translate);
     }
+    // Hermes and Crush report their real permission modes dynamically (ACP
+    // session config / server events); before a session starts only the
+    // generic default/bypass pair is offered.
+    if (flavor === 'hermes' || flavor === 'crush') {
+        return getOpenClawPermissionModes(translate);
+    }
     return getClaudePermissionModes(translate);
 }
 
@@ -195,6 +201,11 @@ export function getHardcodedModelModes(flavor: AgentFlavor, _translate: Translat
     if (flavor === 'agy') {
         return getAgyModelModes();
     }
+    // Hermes and Crush expose their model lists dynamically per session;
+    // no hardcoded model options are offered before a session starts.
+    if (flavor === 'hermes' || flavor === 'crush') {
+        return getOpenClawModelModes();
+    }
     return getClaudeModelModes();
 }
 

packages/happy-app/sources/sync/agentDefaults.ts

@@ -1,6 +1,6 @@
 import * as z from 'zod';
 
-export const agentKeys = ['claude', 'codex', 'gemini', 'openclaw', 'agy'] as const;
+export const agentKeys = ['claude', 'codex', 'gemini', 'openclaw', 'agy', 'hermes', 'crush'] as const;
 export type AgentKey = typeof agentKeys[number];
 
 export const AgentDefaultOverrideSchema = z.object({
@@ -15,6 +15,8 @@ export const AgentDefaultOverridesSchema = z.object({
     gemini: AgentDefaultOverrideSchema.optional(),
     openclaw: AgentDefaultOverrideSchema.optional(),
     agy: AgentDefaultOverrideSchema.optional(),
+    hermes: AgentDefaultOverrideSchema.optional(),
+    crush: AgentDefaultOverrideSchema.optional(),
 }).passthrough().default({});
 
 export type AgentDefaultOverride = z.infer<typeof AgentDefaultOverrideSchema>;
@@ -35,10 +37,15 @@ const codeAgentDefaults: Record<AgentKey, AgentDefaultConfig> = {
     gemini: { permissionMode: 'default', modelMode: 'gemini-2.5-pro', effortLevel: null },
     openclaw: { permissionMode: 'default', modelMode: 'default', effortLevel: null },
     agy: { permissionMode: 'default', modelMode: 'Gemini 3.1 Pro (High)', effortLevel: null },
+    // Hermes and Crush expose their model/permission options dynamically via
+    // ACP session config / server events; until those arrive there is no
+    // meaningful hardcoded default beyond "ask".
+    hermes: { permissionMode: 'default', modelMode: 'default', effortLevel: null },
+    crush: { permissionMode: 'default', modelMode: 'default', effortLevel: null },
 };
 
 export function normalizeAgentKey(flavor: string | null | undefined): AgentKey {
-    if (flavor === 'codex' || flavor === 'gemini' || flavor === 'openclaw' || flavor === 'agy') {
+    if (flavor === 'codex' || flavor === 'gemini' || flavor === 'openclaw' || flavor === 'agy' || flavor === 'hermes' || flavor === 'crush') {
         return flavor;
     }
     return 'claude';

packages/happy-app/sources/sync/ops.ts

@@ -171,7 +171,7 @@ export interface SpawnSessionOptions {
     directory: string;
     approvedNewDirectoryCreation?: boolean;
     token?: string;
-    agent?: 'codex' | 'claude' | 'gemini' | 'openclaw' | 'agy' | 'rig';
+    agent?: 'codex' | 'claude' | 'gemini' | 'openclaw' | 'agy' | 'hermes' | 'crush' | 'rig';
     permissionMode?: string;
     modelMode?: string;
     effortLevel?: string;
@@ -268,7 +268,7 @@ export async function machineSpawnNewSession(options: SpawnSessionOptions): Prom
             directory: string
             approvedNewDirectoryCreation?: boolean,
             token?: string,
-            agent?: 'codex' | 'claude' | 'gemini' | 'openclaw' | 'agy' | 'rig',
+            agent?: 'codex' | 'claude' | 'gemini' | 'openclaw' | 'agy' | 'hermes' | 'crush' | 'rig',
             permissionMode?: string,
             modelMode?: string,
             effortLevel?: string,

packages/happy-app/sources/sync/persistence.ts

@@ -12,7 +12,7 @@ const VOICE_SOFT_PAYWALL_SHOWN_KEY = 'voice-soft-paywall-shown';
 const VOICE_ONBOARDING_PROMPT_LOAD_COUNT_KEY = 'voice-onboarding-prompt-load-count';
 const VOICE_MESSAGE_COUNT_KEY = 'voice-message-count';
 
-export type NewSessionAgentType = 'claude' | 'codex' | 'gemini' | 'openclaw' | 'agy' | 'rig';
+export type NewSessionAgentType = 'claude' | 'codex' | 'gemini' | 'openclaw' | 'agy' | 'hermes' | 'crush' | 'rig';
 export type NewSessionSessionType = 'simple' | 'worktree';
 
 export interface NewSessionDraft {
@@ -146,7 +146,7 @@ export function loadNewSessionDraft(): NewSessionDraft | null {
         const input = typeof parsed.input === 'string' ? parsed.input : '';
         const selectedMachineId = typeof parsed.selectedMachineId === 'string' ? parsed.selectedMachineId : null;
         const selectedPath = typeof parsed.selectedPath === 'string' ? parsed.selectedPath : null;
-        const agentType: NewSessionAgentType = parsed.agentType === 'codex' || parsed.agentType === 'gemini' || parsed.agentType === 'openclaw' || parsed.agentType === 'agy' || parsed.agentType === 'rig'
+        const agentType: NewSessionAgentType = parsed.agentType === 'codex' || parsed.agentType === 'gemini' || parsed.agentType === 'openclaw' || parsed.agentType === 'agy' || parsed.agentType === 'hermes' || parsed.agentType === 'crush' || parsed.agentType === 'rig'
             ? parsed.agentType
             : 'claude';
         const permissionMode: PermissionModeKey | null = typeof parsed.permissionMode === 'string'

packages/happy-app/sources/sync/storageTypes.ts

@@ -428,6 +428,8 @@ export const MachineMetadataSchema = z.object({
         gemini: z.boolean(),
         openclaw: z.boolean(),
         agy: z.boolean().optional(), // optional: older CLIs don't report agy
+        hermes: z.boolean().optional(), // optional: older CLIs don't report hermes
+        crush: z.boolean().optional(), // optional: older CLIs don't report crush
         rig: z.boolean().optional(), // Rig runs its own Happy-connected daemon
         detectedAt: z.number(),
     }).optional(),

packages/happy-app/sources/utils/newSessionAgentSelection.ts

@@ -7,6 +7,8 @@ export const NEW_SESSION_AGENT_ORDER: readonly NewSessionAgentType[] = [
     'openclaw',
     'gemini',
     'agy',
+    'hermes',
+    'crush',
 ];
 
 type CliAvailability = Partial<Record<NewSessionAgentType, boolean>>;

packages/happy-cli/src/agent/acp/AcpSessionManager.test.ts

@@ -18,6 +18,21 @@ describe('AcpSessionManager turn lifecycle', () => {
     expect(isCuid(envelopes[0].turn!)).toBe(true);
   });
 
+  it('replaces accumulated output when a fullText model-output arrives', () => {
+    const mapper = new AcpSessionManager();
+    mapper.startTurn();
+    // Accumulate two deltas, then supersede them with an authoritative fullText
+    mapMany(mapper, [
+      { type: 'model-output', textDelta: 'wrong ' },
+      { type: 'model-output', textDelta: 'prefix' },
+    ]);
+    mapper.mapMessage({ type: 'model-output', fullText: 'authoritative answer' });
+    const ended = mapper.endTurn('completed');
+
+    const texts = [...ended,].filter((e) => e.ev.t === 'text').map((e) => (e.ev as { text: string }).text);
+    expect(texts.join(' ')).toBe('authoritative answer');
+  });
+
   it('emits completed turn-end from endTurn()', () => {
     const mapper = new AcpSessionManager();
     const started = mapper.startTurn();

packages/happy-cli/src/agent/acp/AcpSessionManager.ts

@@ -131,6 +131,14 @@ export class AcpSessionManager {
     }
 
     if (msg.type === 'model-output') {
+      // An authoritative fullText replaces any accumulated output buffer
+      // (e.g. a backend that rewrites a cumulative message)
+      if (msg.fullText !== undefined && msg.textDelta === undefined) {
+        const flushed = this.pendingType !== 'output' ? this.flush() : [];
+        this.pendingType = 'output';
+        this.pendingText = msg.fullText;
+        return flushed;
+      }
       const text = msg.textDelta ?? '';
       if (!text) {
         return [];

packages/happy-cli/src/agent/acp/acpAgentConfig.test.ts

@@ -2,10 +2,11 @@ import { describe, expect, it } from 'vitest';
 import { KNOWN_ACP_AGENTS, resolveAcpAgentConfig } from './acpAgentConfig';
 
 describe('KNOWN_ACP_AGENTS', () => {
-  it('defines built-in Gemini and OpenCode command mappings', () => {
+  it('defines built-in Gemini, OpenCode, and Hermes command mappings', () => {
     expect(KNOWN_ACP_AGENTS).toEqual({
       gemini: { command: 'gemini', args: ['--experimental-acp'] },
       opencode: { command: 'opencode', args: ['acp'] },
+      hermes: { command: 'hermes', args: ['acp'] },
     });
   });
 });
@@ -27,6 +28,14 @@ describe('resolveAcpAgentConfig', () => {
     });
   });
 
+  it('resolves hermes to the hermes CLI with acp mode', () => {
+    expect(resolveAcpAgentConfig(['hermes'])).toEqual({
+      agentName: 'hermes',
+      command: 'hermes',
+      args: ['acp'],
+    });
+  });
+
   it('strips legacy --acp for opencode compatibility', () => {
     expect(resolveAcpAgentConfig(['opencode', '--acp', '--foo'])).toEqual({
       agentName: 'opencode',

packages/happy-cli/src/agent/acp/acpAgentConfig.ts

@@ -6,6 +6,7 @@ export type AcpAgentConfig = {
 export const KNOWN_ACP_AGENTS: Record<string, AcpAgentConfig> = {
   gemini: { command: 'gemini', args: ['--experimental-acp'] },
   opencode: { command: 'opencode', args: ['acp'] },
+  hermes: { command: 'hermes', args: ['acp'] },
 };
 
 export type ResolvedAcpAgentConfig = {