From 86308b6de49f64b2468904a422ea34edcb10bf41 Mon Sep 17 00:00:00 2001
From: Brooklyn Nicholson <brooklyn.bb.nicholson@gmail.com>
Date: Mon, 6 Apr 2026 18:49:40 -0500
Subject: [PATCH] chore: better command support

---
 tui_gateway/server.py | 46 +++++++++++++++++++++++++++++++++++++++++++
 ui-tui/src/app.tsx    | 30 +++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/tui_gateway/server.py b/tui_gateway/server.py
index 7a589db2cf..a6e3907c33 100644
--- a/tui_gateway/server.py
+++ b/tui_gateway/server.py
@@ -397,6 +397,40 @@ def _(rid, params: dict) -> dict:
         return _err(rid, 5011, str(e))
 
 
+@method("session.branch")
+def _(rid, params: dict) -> dict:
+    session, err = _sess(params, rid)
+    if err:
+        return err
+    db = _get_db()
+    old_key = session["session_key"]
+    history = session.get("history", [])
+    if not history:
+        return _err(rid, 4008, "nothing to branch — send a message first")
+    new_key = f"tui-{uuid.uuid4().hex[:8]}"
+    branch_name = params.get("name", "")
+    try:
+        if branch_name:
+            title = branch_name
+        else:
+            current = db.get_session_title(old_key) or "branch"
+            title = db.get_next_title_in_lineage(current) if hasattr(db, "get_next_title_in_lineage") else f"{current} (branch)"
+        db.create_session(new_key, source="tui", model=_resolve_model(), parent_session_id=old_key)
+        for msg in history:
+            db.append_message(session_id=new_key, role=msg.get("role", "user"), content=msg.get("content"))
+        db.set_session_title(new_key, title)
+    except Exception as e:
+        return _err(rid, 5008, f"branch failed: {e}")
+    new_sid = uuid.uuid4().hex[:8]
+    os.environ["HERMES_SESSION_KEY"] = new_key
+    try:
+        agent = _make_agent(new_sid, new_key, session_id=new_key)
+        _init_session(new_sid, new_key, agent, list(history), cols=session.get("cols", 80))
+    except Exception as e:
+        return _err(rid, 5000, f"agent init failed on branch: {e}")
+    return _ok(rid, {"session_id": new_sid, "title": title, "parent": old_key})
+
+
 @method("session.interrupt")
 def _(rid, params: dict) -> dict:
     session, err = _sess(params, rid)
@@ -776,9 +810,21 @@ def _(rid, params: dict) -> dict:
         return _err(rid, 5012, str(e))
 
 
+def _resolve_name(name: str) -> str:
+    try:
+        from hermes_cli.commands import resolve_command
+        r = resolve_command(name)
+        return r.name if r else name
+    except Exception:
+        return name
+
+
 @method("command.dispatch")
 def _(rid, params: dict) -> dict:
     name, arg = params.get("name", "").lstrip("/"), params.get("arg", "")
+    resolved = _resolve_name(name)
+    if resolved != name:
+        name = resolved
     session = _sessions.get(params.get("session_id", ""))
 
     qcmds = _load_cfg().get("quick_commands", {})
diff --git a/ui-tui/src/app.tsx b/ui-tui/src/app.tsx
index ab0121cd64..ab41da1227 100644
--- a/ui-tui/src/app.tsx
+++ b/ui-tui/src/app.tsx
@@ -147,6 +147,7 @@ export function App({ gw }: { gw: GatewayClient }) {
     () => estimateQueuedRows(queuedDisplay.length, queueEditIdx),
     [queueEditIdx, queuedDisplay.length]
   )
+
   const thinkingRows = thinking ? Math.max(1, tools.length || 1) + (reasoning || thinkingText ? 1 : 0) : 0
   const paletteRows = paletteMatches.length ? paletteMatches.length + 1 : 0
   const footerRows = statusBar ? 1 : 0
@@ -750,6 +751,22 @@ export function App({ gw }: { gw: GatewayClient }) {
 
           return true
 
+        case 'branch': // falls through
+
+        case 'fork':
+          if (!sid) {
+            return true
+          }
+
+          rpc('session.branch', { session_id: sid, name: arg }).then((r: any) => {
+            setSid(r.session_id)
+            setUsage(ZERO)
+            sys(`branched → ${r.title}`)
+            setStatus('ready')
+          })
+
+          return true
+
         case 'undo':
           if (!sid) {
             return true
@@ -1109,7 +1126,9 @@ export function App({ gw }: { gw: GatewayClient }) {
 
           return true
 
-        case 'queue':
+        case 'queue': // falls through
+
+        case 'q':
           if (!arg) {
             sys(`${queueRef.current.length} queued message(s)`)
 
@@ -1409,11 +1428,12 @@ export function App({ gw }: { gw: GatewayClient }) {
             .catch(() => {
               gw.request('command.resolve', { name: name ?? '' })
                 .then((r: any) => {
-                  if (r.canonical && r.canonical !== name) {
-                    sys(`/${name} → /${r.canonical}`)
-                    slash(`/${r.canonical}${arg ? ' ' + arg : ''}`)
-                  } else {
+                  if (!r.canonical || r.canonical === name) {
                     sys(`unknown command: /${name}`)
+                  } else if (r.category === 'cli-only') {
+                    sys(`/${name} is CLI-only — run it in a terminal`)
+                  } else {
+                    send(`/${r.canonical}${arg ? ' ' + arg : ''}`)
                   }
                 })
                 .catch(() => sys(`unknown command: /${name}`))