@inetafrica/open-claudia 1.16.0 → 1.16.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.16.1
+- `/model` is now a single unified picker — all Claude, Cursor, and Codex models in one keyboard, with section dividers per backend
+- Tapping any model auto-switches the active backend if needed (e.g. picking gpt-5 from Claude flips you to Codex). No more `/codex` + `/model` two-step
+- Only backends with a detected CLI binary appear in the picker (Cursor/Codex rows hidden if not installed)
+
 ## v1.16.0
 - OpenAI Codex backend support: `/codex` to switch, `/backend` picker now has 3 options
 - Auto-detects `codex` binary via `which codex` at startup; opt-in via `CODEX_PATH` in .env

package/bot.js

@@ -1750,30 +1750,43 @@ bot.onText(/\/sessions$/, (msg) => {
 
 bot.onText(/\/model$/, (msg) => {
   if (!isAuthorized(msg)) return;
-  let keyboard, label;
-  if (settings.backend === "cursor") {
-    keyboard = [
-      [{ text: "Composer 2", callback_data: "m:composer-2" }, { text: "Composer 2 Fast", callback_data: "m:composer-2-fast" }],
-      [{ text: "Opus 4.6 Thinking", callback_data: "m:claude-4.6-opus-high-thinking" }, { text: "Sonnet 4.6", callback_data: "m:claude-4.6-sonnet-medium" }],
-      [{ text: "GPT-5.4", callback_data: "m:gpt-5.4-medium" }, { text: "GPT-5.4 High", callback_data: "m:gpt-5.4-high" }],
-      [{ text: "Auto", callback_data: "m:auto" }, { text: "Default", callback_data: "m:default" }],
-    ];
-    label = "Cursor Agent";
-  } else if (settings.backend === "codex") {
-    keyboard = [
-      [{ text: "gpt-5", callback_data: "m:gpt-5" }, { text: "gpt-5-codex", callback_data: "m:gpt-5-codex" }],
-      [{ text: "o3", callback_data: "m:o3" }, { text: "o4-mini", callback_data: "m:o4-mini" }],
-      [{ text: "Default", callback_data: "m:default" }],
-    ];
-    label = "Codex";
-  } else {
-    keyboard = [
-      [{ text: "Opus 4.7", callback_data: "m:claude-opus-4-7" }, { text: "Opus 4.6", callback_data: "m:claude-opus-4-6" }, { text: "Sonnet 4.6", callback_data: "m:claude-sonnet-4-6" }, { text: "Haiku", callback_data: "m:claude-haiku-4-5-20251001" }],
-      [{ text: "Default", callback_data: "m:default" }],
-    ];
-    label = "Claude Code";
+  // Unified picker: every model from every available backend in one keyboard.
+  // Tapping a button switches backend (if needed) and sets the model.
+  // Callback format: `mb:<backend>:<model>` (model may itself contain `-`).
+  const rows = [];
+  rows.push([{ text: "── Claude ──", callback_data: "noop" }]);
+  rows.push([
+    { text: "Opus 4.7", callback_data: "mb:claude:claude-opus-4-7" },
+    { text: "Opus 4.6", callback_data: "mb:claude:claude-opus-4-6" },
+    { text: "Sonnet 4.6", callback_data: "mb:claude:claude-sonnet-4-6" },
+    { text: "Haiku", callback_data: "mb:claude:claude-haiku-4-5-20251001" },
+  ]);
+  if (resolvedCursorPath) {
+    rows.push([{ text: "── Cursor ──", callback_data: "noop" }]);
+    rows.push([
+      { text: "Composer 2", callback_data: "mb:cursor:composer-2" },
+      { text: "Composer 2 Fast", callback_data: "mb:cursor:composer-2-fast" },
+      { text: "Auto", callback_data: "mb:cursor:auto" },
+    ]);
+    rows.push([
+      { text: "Opus 4.6 Thinking", callback_data: "mb:cursor:claude-4.6-opus-high-thinking" },
+      { text: "GPT-5.4", callback_data: "mb:cursor:gpt-5.4-medium" },
+    ]);
+  }
+  if (resolvedCodexPath) {
+    rows.push([{ text: "── Codex ──", callback_data: "noop" }]);
+    rows.push([
+      { text: "gpt-5", callback_data: "mb:codex:gpt-5" },
+      { text: "gpt-5-codex", callback_data: "mb:codex:gpt-5-codex" },
+    ]);
+    rows.push([
+      { text: "o3", callback_data: "mb:codex:o3" },
+      { text: "o4-mini", callback_data: "mb:codex:o4-mini" },
+    ]);
   }
-  send(`${label} model: ${settings.model || "default"}\n\nOr type /model <name> for any model.`, { keyboard: { inline_keyboard: keyboard } });
+  rows.push([{ text: "Default (current backend)", callback_data: "m:default" }]);
+  const beLabel = settings.backend === "cursor" ? "Cursor" : settings.backend === "codex" ? "Codex" : "Claude";
+  send(`Current: ${beLabel} · ${settings.model || "default"}\n\nPick a model — backend switches automatically.\nOr type /model <name>.`, { keyboard: { inline_keyboard: rows } });
 });
 bot.onText(/\/model (.+)/, (msg, match) => { if (!isAuthorized(msg)) return; settings.model = match[1].trim().toLowerCase(); if (settings.model === "default") settings.model = null; send(`Model: ${settings.model || "default"}`); });
 
@@ -2143,6 +2156,25 @@ bot.on("callback_query", async (q) => {
   }
   if (d === "a:continue") { if (currentSession) await runClaude("continue", currentSession.dir); else send("No session."); return; }
   if (d === "a:end") { if (currentSession) { const n = currentSession.name; currentSession = null; lastSessionId = null; messageQueue = []; resetSettings(); resetSessionUsage(); saveState(); await send(`Ended: ${n}`, { keyboard: { inline_keyboard: [[{ text: "New", callback_data: "show:projects" }]] } }); } return; }
+  if (d === "noop") { return; }
+  if (d.startsWith("mb:")) {
+    // Unified picker: switch backend + set model in one tap.
+    // Format: mb:<backend>:<model>. Model may contain `:` itself (unlikely), so split on first two.
+    const rest = d.slice(3);
+    const colon = rest.indexOf(":");
+    if (colon < 0) return;
+    const be = rest.slice(0, colon);
+    const model = rest.slice(colon + 1);
+    if (be === "cursor" && !resolvedCursorPath) { await send("Cursor Agent CLI not found."); return; }
+    if (be === "codex" && !resolvedCodexPath) { await send("Codex CLI not found. Install: npm install -g @openai/codex"); return; }
+    const switched = settings.backend !== be;
+    settings.backend = be;
+    settings.model = model;
+    saveState();
+    const beLabel = be === "cursor" ? "Cursor Agent" : be === "codex" ? "Codex" : "Claude Code";
+    await send(switched ? `Switched to ${beLabel}.\nModel: ${model}` : `Model: ${model}`);
+    return;
+  }
   if (d.startsWith("m:")) { settings.model = d.slice(2) === "default" ? null : d.slice(2); await send(`Model: ${settings.model || "default"}`); return; }
   if (d.startsWith("e:")) { const e = d.slice(2); settings.effort = e === "default" ? null : e; await send(`Effort: ${settings.effort || "default"}`); return; }
   if (d.startsWith("b:")) { const b = d.slice(2); settings.budget = b === "none" ? null : parseFloat(b); await send(`Budget: ${settings.budget ? "$"+settings.budget : "none"}`); return; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inetafrica/open-claudia",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Your always-on AI coding assistant — Claude Code, Cursor Agent, and OpenAI Codex via Telegram",
   "main": "bot.js",
   "bin": {