@agentikos/omega-os 0.19.14 → 0.19.16

package/bootstrap/lib/common.sh

@@ -550,13 +550,19 @@ except Exception: print("unknown")' 2>/dev/null)" || readiness="unknown"
   printf '   %s   elapsed  %s\n'      "$bar" "$(printf '%02d:%02d' "$mm" "$ss")"
   printf '   %s\n' "$bar"
   printf '   %s   %snext steps%s\n'                       "$bar" "$C_BOLD" "$C_RST"
-  printf "   %s     1.  %stmux attach -t AISB-chat%s     %salways-on Hermès conversation%s\n" \
+  printf "   %s     1.  ${C_BOLD}source ~/.zshrc${C_RST}   ${C_DIM}or open a new shell${C_RST}\n"  "$bar"
+  printf '   %s     2.  %somega%s                    %stalk to AISB (master agent, Max OAuth)%s\n' \
+         "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
+  printf '   %s     3.  %somega hermes%s             %stalk to Hermès (meta-companion, Anthropic API)%s\n' \
+         "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
+  printf '   %s     4.  %somega account login%s     %swire your Claude Max OAuth%s\n' \
+         "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
+  printf '   %s     5.  %somega run "hello"%s        %sfirst verified mission%s\n' \
+         "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
+  printf '   %s     6.  %somega menu%s               %sinteractive whiptail picker%s\n' \
+         "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
+  printf '   %s     7.  %somega doctor%s             %sfull health check%s\n' \
          "$bar" "$C_BOLD" "$C_RST" "$C_DIM" "$C_RST"
-  printf "   %s     2.  open a new shell  ${C_DIM}(or \`source ~/.zshrc\`)${C_RST}\n"          "$bar"
-  printf '   %s     3.  %somega status%s         every task + derived state\n'   "$bar" "$C_BOLD" "$C_RST"
-  printf '   %s     4.  %somega account list%s   wire your Claude Max OAuth\n'   "$bar" "$C_BOLD" "$C_RST"
-  printf '   %s     5.  %somega run "hello"%s    first verified mission\n'       "$bar" "$C_BOLD" "$C_RST"
-  printf '   %s     6.  %somega%s                interactive menu (whiptail)\n'  "$bar" "$C_BOLD" "$C_RST"
   printf '   %s\n' "$bar"
   printf '   %s   %ssessions%s    all Omega/Claude/LLM sessions run inside tmux\n' \
          "$bar" "$C_BOLD" "$C_RST"

package/bootstrap/lib/steps.sh

@@ -448,10 +448,11 @@ PY
 step_mcp() {
   local catalog="$OMEGA_HOME/Agentik_SSOT/mcp/mcp-catalog.yaml"
   [ -f "$catalog" ] || { err "MCP catalog missing: $catalog"; return 1; }
-  # grep -c exits 1 when count is 0, which made the old `|| echo '?'`
-  # fire AND grep's "0" stayed printed → "0\n? entries" splatter.
+  # The catalog YAML uses ``catalog:`` then ``  - id: <name>`` (2-space
+  # indent). The old pattern ``^- id:`` matched at column 0 and counted
+  # zero. Allow leading whitespace.
   local _mcp_count
-  _mcp_count="$(grep -c '^- id:' "$catalog" 2>/dev/null || true)"
+  _mcp_count="$(grep -cE '^[[:space:]]*- id:' "$catalog" 2>/dev/null || true)"
   _mcp_count="$(printf '%s' "$_mcp_count" | tr -d '\n ' )"
   info "MCP catalog present (${_mcp_count:-?} entries)"
 

package/omega/Agentik_Engine/omega_engine/__init__.py

@@ -188,7 +188,7 @@ from omega_engine.genesis import (
 )
 from omega_engine import plan as plan_v7
 
-__version__ = "0.19.14"
+__version__ = "0.19.16"
 
 __all__ = [
     "__version__",

package/omega/Agentik_Engine/omega_engine/cli.py

@@ -2741,8 +2741,70 @@ def cmd_aisb(args: argparse.Namespace) -> int:
     return 2
 
 
+def _attach_or_spawn_chat(session_name: str, *,
+                           spawn_fn,
+                           label: str) -> int:
+    """Attach to ``session_name`` tmux session, spawning it first if absent.
+
+    - Outside tmux : `os.execvp("tmux", ["tmux", "attach", "-t", session])`
+    - Inside tmux  : prints the switch command (we can't switch from a
+                     subprocess; the user needs to do it in their shell).
+    Returns the exit code of execvp or 0 when we printed instructions.
+
+    This is the v0.19.15 UX: bare `omega` puts you in the master chat,
+    bare `omega hermes` puts you in the Hermès chat. No whiptail menu
+    by default — that's `omega menu` now.
+    """
+    import os
+    from omega_engine import tmux
+    home = _omega_home()
+    if not tmux.is_alive(session_name):
+        try:
+            spawn_fn(home)
+        except Exception as exc:  # noqa: BLE001
+            print(f"  could not spawn {label}: {exc}")
+            print(f"  try manually: tmux new -d -s {session_name}")
+            return 2
+    # Inside tmux already? Tell the user to switch (we can't from here).
+    if os.environ.get("TMUX"):
+        print(f"  already inside tmux — switch with:")
+        print(f"    tmux switch-client -t {session_name}")
+        print(f"  or detach (Ctrl-b d) then `omega` again.")
+        return 0
+    # Outside tmux — replace this process with `tmux attach`.
+    print(f"  attaching to {label} ({session_name})…")
+    print(f"  detach: Ctrl-b d  (session keeps running)")
+    try:
+        os.execvp("tmux", ["tmux", "attach", "-t", session_name])
+    except FileNotFoundError:
+        print("  tmux not on PATH — install with `brew install tmux` "
+              "or `apt-get install tmux`")
+        return 2
+    return 0  # unreachable (execvp replaced the process)
+
+
 def cmd_menu(_args: argparse.Namespace) -> int:
-    """`omega` with no args → interactive whiptail menu (the on-ramp)."""
+    """`omega` (no args) — open the AISB master chat session in tmux.
+
+    v0.19.15 changed the default: typing `omega` used to open the whiptail
+    menu, which Gareth correctly called bad UX ("type `omega`, talk to my
+    master agent"). Now bare `omega` attaches to the always-on `AISB-chat`
+    tmux session, spawning it on demand. The whiptail menu lives at
+    `omega menu`.
+    """
+    from omega_engine import tmux
+    return _attach_or_spawn_chat(
+        "AISB-chat",
+        spawn_fn=tmux.spawn_aisb_chat,
+        label="AISB master chat",
+    )
+
+
+def cmd_menu_whiptail(_args: argparse.Namespace) -> int:
+    """`omega menu` — the explicit whiptail picker.
+
+    The old bare-omega behaviour, moved behind an explicit subcommand
+    because the default is now the AISB chat (v0.19.15)."""
     from omega_engine.menu import run_menu
     return run_menu()
 
@@ -2825,6 +2887,53 @@ def cmd_hermes(args: argparse.Namespace) -> int:
     import json as _json
     sub = getattr(args, "hermes_cmd", None)
 
+    # v0.19.15 — `omega hermes` with no subcommand opens the Hermès chat
+    # tmux session. Same UX as bare `omega` → AISB chat, but for L2.
+    if sub is None or sub == "chat":
+        from omega_engine import tmux as _tx
+        return _attach_or_spawn_chat(
+            "Hermes-chat",
+            spawn_fn=_tx.spawn_hermes_chat,
+            label="Hermès meta-companion chat",
+        )
+    if sub == "chat-loop":
+        # REPL that runs inside the Hermes-chat tmux session.
+        # Uses Anthropic API directly (separate from AISB's Max OAuth).
+        from omega_engine.aisb_chat import chat_once
+        from omega_engine.vault import vault_read
+        import os, sys
+        home = _omega_home()
+        api_key = (vault_read(home, "ANTHROPIC_API_KEY_HERMES") or "").strip()
+        if not api_key:
+            api_key = (os.environ.get("ANTHROPIC_API_KEY") or "").strip()
+        if not api_key:
+            print("  Hermès has no Anthropic API key — set one with:")
+            print("    omega vault write ANTHROPIC_API_KEY_HERMES sk-ant-...")
+            print("  (Hermès uses its OWN paid Anthropic budget, separate")
+            print("  from OmegaOS's Claude Max OAuth — see LAYERS.md)")
+            return 2
+        os.environ["ANTHROPIC_API_KEY"] = api_key
+        print(f"  Hermès chat (Anthropic API) — /quit to exit")
+        # We re-use chat_once but namespace history to a Hermès topic so
+        # AISB's chat history doesn't bleed into Hermès's.
+        HERMES_TOPIC = -999999
+        while True:
+            try:
+                line = input("\nyou > ").strip()
+            except (EOFError, KeyboardInterrupt):
+                print("\n(exit)")
+                return 0
+            if not line:
+                continue
+            if line in ("/quit", "/exit"):
+                return 0
+            try:
+                reply = chat_once(home, line, topic_id=HERMES_TOPIC)
+            except Exception as exc:  # noqa: BLE001
+                print(f"hermes (error): {exc}")
+                continue
+            print(f"\nhermes > {reply}")
+
     if sub == "status":
         st = H.status()
         if getattr(args, "json", False):
@@ -3774,10 +3883,14 @@ def cmd_cleanup(args: argparse.Namespace) -> int:
 
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="omega", description="Omega OS control CLI")
-    # When no subcommand is given, drop into the interactive menu instead of
-    # erroring. The cmd_menu function reads the whiptail menus and dispatches.
+    # v0.19.15 — bare `omega` now drops into the AISB master chat tmux
+    # session (attach or spawn). `omega menu` keeps the legacy whiptail
+    # picker for power users.
     parser.set_defaults(fn=cmd_menu)
     sub = parser.add_subparsers(dest="cmd")
+    sub.add_parser("menu",
+        help="open the interactive whiptail menu (the old `omega` behaviour)"
+    ).set_defaults(fn=cmd_menu_whiptail)
     sub.add_parser("version", help="print the engine version").set_defaults(fn=cmd_version)
     p_doc = sub.add_parser("doctor", help="validate the deployment")
     p_doc.add_argument("--json", action="store_true",
@@ -4018,6 +4131,14 @@ def _build_parser() -> argparse.ArgumentParser:
                         help="(observe) project slug")
     p_hebr.add_argument("task_id", nargs="?", default=None,
                         help="(observe) task id whose .done.json to ingest")
+    # v0.19.15 — `omega hermes chat` and `omega hermes chat-loop`: the
+    # Hermès counterpart to `omega aisb chat`. `chat` spawns/attaches
+    # the persistent Hermes-chat tmux session; `chat-loop` is the REPL
+    # itself that runs inside that session (Anthropic API).
+    he_sub.add_parser("chat",
+        help="spawn (or attach to) the Hermes-chat tmux session")
+    he_sub.add_parser("chat-loop",
+        help="the Hermès REPL itself (called by the tmux session)")
 
     # `omega hermes-desktop` — Hermes Desktop remote backend
     p_hd = sub.add_parser(

package/omega/Agentik_Engine/omega_engine/sync.py

@@ -194,13 +194,32 @@ class ClaudeCodeAdapter:
             cat = catalog_by_id.get(sid, {})
             install = cat.get("install") or {}
 
-            # Prefer the locally installed binary; fall back to `npx <package>`.
-            if tool and tool.invoke:
+            # Resolve the launch command. Three shapes:
+            #   1. uvx:<package>            — Python MCP via Astral uvx (no
+            #      local binary; Claude calls `uvx <package>` at runtime)
+            #   2. tool.invoke = relative path → resolved binary on disk
+            #   3. catalog install method → `npx -y <package>` or
+            #      `uvx <package>` synthesized from the catalog alone
+            catalog_args = list(install.get("args") or [])
+            server_args = list(server.get("args") or [])
+            if tool and tool.invoke and tool.invoke.startswith("uvx:"):
+                # uvx-managed Python MCP server.
+                pkg = tool.invoke[len("uvx:"):]
+                entry["command"] = "uvx"
+                entry["args"] = [pkg, *catalog_args, *server_args]
+            elif tool and tool.invoke:
                 entry["command"] = str(omega_home / tool.invoke)
-                entry["args"] = list(server.get("args") or [])
+                entry["args"] = [*catalog_args, *server_args]
             elif install.get("method") == "npx" and install.get("package"):
                 entry["command"] = "npx"
-                entry["args"] = ["-y", str(install["package"]), *(server.get("args") or [])]
+                entry["args"] = ["-y", str(install["package"]),
+                                 *catalog_args, *server_args]
+            elif install.get("method") == "uvx" and install.get("package"):
+                # No local install (cold uvx call at runtime — slow first time
+                # but works without ever running `omega tool install`).
+                entry["command"] = "uvx"
+                entry["args"] = [str(install["package"]),
+                                 *catalog_args, *server_args]
             else:
                 # nothing to invoke — skip rather than write a half-broken entry
                 continue

package/omega/Agentik_Engine/omega_engine/tmux.py

@@ -232,11 +232,11 @@ def spawn_worker(project: str, task: str, *,
 
 
 def spawn_aisb_chat(omega_home: str | Path | None = None) -> str:
-    """Spawn an AISB chat session — the Telegram-conversation fallback.
+    """Spawn the AISB master chat tmux session.
 
-    Runs ``omega aisb chat-loop`` inside the session so the user can
-    attach and have a conversation with the AISB master agent without
-    needing Telegram connectivity.
+    Runs ``omega aisb chat-loop`` inside — REPL conversation with the
+    AISB master agent on Claude Max OAuth. This is what bare `omega`
+    attaches to (v0.19.15+).
     """
     name = "AISB-chat"
     home = Path(omega_home or os.environ.get("OMEGA_HOME")
@@ -246,6 +246,21 @@ def spawn_aisb_chat(omega_home: str | Path | None = None) -> str:
     return name
 
 
+def spawn_hermes_chat(omega_home: str | Path | None = None) -> str:
+    """Spawn the Hermès meta-companion chat tmux session.
+
+    Runs ``omega hermes chat-loop`` — REPL conversation with Hermès on
+    Anthropic API (separate budget from AISB's Max OAuth). This is what
+    `omega hermes` attaches to (v0.19.15+).
+    """
+    name = "Hermes-chat"
+    home = Path(omega_home or os.environ.get("OMEGA_HOME")
+                or Path.home() / "Omega")
+    omega_bin = home / "Agentik_Tools" / "bin" / "omega"
+    spawn(name, command=f"{omega_bin} hermes chat-loop")
+    return name
+
+
 # ---------------------------------------------------------------------------
 # Categorised view + health
 # ---------------------------------------------------------------------------

package/omega/Agentik_Engine/omega_engine/tools.py

@@ -215,6 +215,45 @@ def install_from_catalog(
         except (OSError, json.JSONDecodeError):
             version = ""
 
+    elif method == "uvx" and package:
+        # Python MCP servers (mcp-server-git, mcp-server-fetch, etc.) run
+        # via `uvx <package>` — Astral fetches + caches the package on
+        # first call. We don't install it locally; we just verify `uv`
+        # is on PATH and pre-warm the cache so the first `claude` call
+        # doesn't pay the cold-fetch latency.
+        uv = shutil.which("uv") or str(Path.home() / ".local" / "bin" / "uv")
+        if not Path(uv).exists():
+            raise RuntimeError(
+                "uv not found on PATH — install with "
+                "`curl -LsSf https://astral.sh/uv/install.sh | sh` to use uvx MCP servers"
+            )
+        # Pre-warm: `uv tool install` makes the package globally available
+        # as a uv tool (resolves once, ~5s) so subsequent `uvx <package>`
+        # invocations are instant. Failure here is non-fatal — `uvx` will
+        # still resolve at call time, just slower.
+        try:
+            res = subprocess.run(
+                [uv, "tool", "install", "--quiet", package],
+                check=False, capture_output=True, text=True, timeout=300,
+            )
+            # Best-effort version detect via `uv tool list`.
+            ls = subprocess.run(
+                [uv, "tool", "list"], capture_output=True, text=True, timeout=15,
+            )
+            for line in (ls.stdout or "").splitlines():
+                line = line.strip()
+                if line.startswith(package + " "):
+                    # Format: "<package> v<version>"
+                    parts = line.split()
+                    if len(parts) >= 2:
+                        version = parts[1].lstrip("v")
+                        break
+        except subprocess.SubprocessError:
+            pass
+        # invoke is `uvx <package>` — sync.py renders it directly to the
+        # Claude .mcp.json (no local binary needed).
+        invoke = f"uvx:{package}"
+
     tool = Tool(
         name=mcp_id,
         version=version,

package/omega/Agentik_Engine/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "omega-engine"
-version = "0.19.14"
+version = "0.19.16"
 description = "The Omega OS orchestration engine — event-sourced, verified-completion agent graphs."
 readme = "README.md"
 requires-python = ">=3.11"

package/omega/Agentik_Engine/tests/test_install_ux.py

@@ -140,7 +140,12 @@ class TestPostInstallCard(unittest.TestCase):
         self.assertIn("install complete", out)
         self.assertIn("status", out)
         self.assertIn("next steps", out)
-        self.assertIn("omega status", out)
+        # v0.19.15 — bare `omega` is the AISB master chat, `omega hermes`
+        # is the L2 companion. Old card pointed at `omega status` as the
+        # entry; new card points at `omega` itself.
+        self.assertIn("omega", out)
+        self.assertIn("AISB", out)
+        self.assertIn("Hermès", out)
         self.assertIn("omega run", out)
         # No literal $C_DIM / $C_RST tokens
         self.assertNotIn("${C_DIM}", out)

package/omega/Agentik_Engine/tests/test_installer_wiring.py

@@ -475,20 +475,25 @@ class TestBrandColourIsOrange(unittest.TestCase):
             f"banner should use C_ORANGE on each of 8 rows (got {n})")
 
 
-class TestPostInstallCardMentionsAISBChat(unittest.TestCase):
-    """The 'AISB-chat' tmux session is the conversational entry point when
-    Telegram isn't wired. The post-install card MUST tell the operator how
-    to attach to it; otherwise they finish the install with no UI."""
-
-    def test_card_shows_attach_command(self):
+class TestPostInstallCardSurfacesEntryPoints(unittest.TestCase):
+    """v0.19.15 — bare `omega` is now the AISB chat attach (no longer needs
+    the explicit `tmux attach -t AISB-chat` in the card). The card must
+    still surface BOTH master entry points: `omega` for AISB and
+    `omega hermes` for the L2 companion. Plus the "every session in tmux"
+    discipline."""
+
+    def test_card_surfaces_aisb_and_hermes_entries(self):
         if not COMMON_SH.is_file():
             self.skipTest("common.sh not in repo")
         text = COMMON_SH.read_text()
-        self.assertIn("tmux attach -t AISB-chat", text,
-            "post_install_card must include the AISB-chat attach line — "
-            "otherwise the operator has no way to discover their always-on "
-            "Hermès session")
-        # Also surface the "every session in tmux" expectation.
+        # Bare omega = AISB master.
+        self.assertIn("AISB", text,
+            "post_install_card must mention AISB as the master agent entry")
+        # `omega hermes` = L2.
+        self.assertIn("omega hermes", text,
+            "post_install_card must mention `omega hermes` as the L2 "
+            "companion entry — without it the user can't discover it")
+        # The "every session in tmux" expectation.
         self.assertIn("tmux", text)
 
 

package/omega/Agentik_SSOT/VERSION

@@ -1 +1 @@
-0.19.14
+0.19.16

package/omega/Agentik_SSOT/mcp/mcp-catalog.yaml

@@ -18,7 +18,10 @@ catalog:
     name: Git
     description: Read/inspect git repositories
     category: core
-    install: { method: npx, package: "@modelcontextprotocol/server-git" }
+    # Official MCP git server is Python — runs via uvx (Astral). The old
+    # npm package `@modelcontextprotocol/server-git` returns 404 — it was
+    # never published; only the Python `mcp-server-git` on PyPI exists.
+    install: { method: uvx, package: "mcp-server-git" }
     recommended: true
 
   - id: github
@@ -41,8 +44,10 @@ catalog:
     name: Higgsfield
     description: Image and video generation
     category: media
-    install: { method: npx, package: "@higgsfield/mcp" }
-    secrets: [HIGGSFIELD_API_KEY]
+    # Correct npm package name is `higgsfield-mcp` (no @ scope). The
+    # scoped `@higgsfield/mcp` returns 404 — was never published.
+    install: { method: npx, package: "higgsfield-mcp" }
+    secrets: [HF_API_KEY, HF_SECRET]
     recommended: false
 
   - id: playwright
@@ -63,7 +68,10 @@ catalog:
     name: Fetch
     description: Fetch and convert web content
     category: core
-    install: { method: npx, package: "@modelcontextprotocol/server-fetch" }
+    # Official MCP fetch server is Python — runs via uvx. The npm
+    # package `@modelcontextprotocol/server-fetch` returns 404 — was
+    # never published. PyPI ships `mcp-server-fetch`.
+    install: { method: uvx, package: "mcp-server-fetch" }
     recommended: true
 
   - id: memory
@@ -98,10 +106,12 @@ catalog:
 
   - id: linear
     name: Linear
-    description: Issues and project management
+    description: Issues and project management (Linear-hosted remote MCP)
     category: project
-    install: { method: npx, package: "@linear/mcp" }
-    secrets: [LINEAR_API_KEY]
+    # Linear ships an OFFICIAL remote MCP at https://mcp.linear.app/mcp,
+    # accessed via the `mcp-remote` npm proxy. No API key in env —
+    # OAuth happens in-browser the first time Claude connects.
+    install: { method: npx, package: "mcp-remote", args: ["https://mcp.linear.app/mcp"] }
     recommended: false
 
   - id: sentry

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentikos/omega-os",
-  "version": "0.19.14",
+  "version": "0.19.16",
   "description": "Omega OS — installable agentic operating system with verified-completion orchestration. Event-sourced engine, 8-block rack, autonomous agents, MCP.",
   "bin": {
     "omega-os": "bin/omega-os.js"