refactor: family providers, fix compose cursor, update models (#32)

refactor: family providers, fix compose cursor, update models

Author: monatis

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "isanagent"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/altaidevorg/isanagent"

Cargo.toml

@@ -79,7 +79,7 @@ Invoke-WebRequest https://github.com/altaidevorg/isanagent/releases/download/mai
 
 If you use the **default workspace** (`~/.isanagent` on Unix, or the equivalent on Windows) and that folder does not exist yet, **the first run starts the interactive onboard wizard** (provider, API key env var, model, and workspace layout), then continues into the agent in the same session. For a custom workspace path, run `isanagent onboard` (add `--interactive` for the full wizard) or `isanagent --workspace /path/to/workspace` once the directory and `config.toml` exist.
 
-Set API credentials the wizard recommends (for example `GEMINI_API_KEY` or your provider’s variable). Turn on **`[api] enabled = true`** and **`serve_ui = true`** in `config.toml` when you want the browser UI on `http://127.0.0.1:<port>/`. For channels, memory, harness options, and sandbox rules, see [`AGENTS.md`](./AGENTS.md).
+Set API credentials the wizard recommends (for example `GEMINI_API_KEY` or your provider's variable). Turn on **`[api] enabled = true`** and **`serve_ui = true`** in `config.toml` when you want the browser UI on `http://127.0.0.1:<port>/`. For channels, memory, harness options, and sandbox rules, see [`AGENTS.md`](./AGENTS.md).
 
 ### Multi-provider setup
 

README.md

@@ -14,120 +14,35 @@ enabled = true
 # LLM providers. At startup, isanagent picks the first provider with a valid API key.
 # Use `/model` in the TUI to switch between them at runtime.
 #
-# `provider_name` selects a built-in registry entry (anthropic, gemini, openai, deepseek,
-# openrouter). API key resolution order:
-#   1. Environment variable ($<PROVIDER>_API_KEY, e.g. $OPENAI_API_KEY for "openai")
-#   2. Direct `api_key` value in config (fallback when env var is not set)
-# Override the env var name with `api_key_env` if needed.
-#
-# Set `provider_name = "openai_compatible"` + `base_url` for any other endpoint.
-#
-# ─── Anthropic (Claude) ─── $ANTHROPIC_API_KEY or api_key below ───────────────
-#
-# [providers.claude-opus-4-7]
-# provider_name = "anthropic"
-# model_name = "claude-opus-4-7"
-# api_key = "sk-ant-..."          # optional: omit to use $ANTHROPIC_API_KEY
-#
-# [providers.claude-opus-4-6]
-# provider_name = "anthropic"
-# model_name = "claude-opus-4-6"
-#
-# [providers.claude-sonnet-4-6]
-# provider_name = "anthropic"
-# model_name = "claude-sonnet-4-6"
-#
-# [providers.claude-haiku-4-5]
-# provider_name = "anthropic"
-# model_name = "claude-haiku-4-5-20251001"
-#
-# ─── OpenAI ─── $OPENAI_API_KEY or api_key below ─────────────────────────────
-#
-# [providers.gpt-5-5]
-# provider_name = "openai"
-# model_name = "gpt-5.5"
-# api_key = "sk-..."              # optional: omit to use $OPENAI_API_KEY
-#
-# [providers.gpt-5-4-mini]
-# provider_name = "openai"
-# model_name = "gpt-5.4-mini"
-#
-# [providers.gpt-5-4-nano]
-# provider_name = "openai"
-# model_name = "gpt-5.4-nano"
-#
-# [providers.gpt-4-1]
-# provider_name = "openai"
-# model_name = "gpt-4.1"
-#
-# [providers.gpt-4-1-mini]
-# provider_name = "openai"
-# model_name = "gpt-4.1-mini"
-#
-# [providers.gpt-4o]
-# provider_name = "openai"
-# model_name = "gpt-4o"
-#
-# [providers.o3]
-# provider_name = "openai"
-# model_name = "o3"
-#
-# [providers.o4-mini]
-# provider_name = "openai"
-# model_name = "o4-mini"
-#
-# ─── Google Gemini ─── $GEMINI_API_KEY or api_key below ───────────────────────
-#
-# [providers.gemini-3-1-pro]
-# provider_name = "gemini"
-# model_name = "gemini-3.1-pro-preview"
-# api_key = "AIza..."
-#
-# [providers.gemini-3-flash]
-# provider_name = "gemini"
-# model_name = "gemini-3-flash-preview"
-#
-# [providers.gemini-2-5-pro]
-# provider_name = "gemini"
-# model_name = "gemini-2.5-pro"
-#
-# [providers.gemini-2-5-flash]
-# provider_name = "gemini"
-# model_name = "gemini-2.5-flash"
-#
-# [providers.gemini-2-5-flash-lite]
-# provider_name = "gemini"
-# model_name = "gemini-2.5-flash-lite"
-#
-# ─── DeepSeek ─── $DEEPSEEK_API_KEY or api_key below ─────────────────────────
-#
-# [providers.deepseek-v4-pro]
-# provider_name = "deepseek"
-# model_name = "deepseek-v4-pro"
-# api_key = "sk-..."              # optional: omit to use $DEEPSEEK_API_KEY
-#
-# [providers.deepseek-v4-flash]
-# provider_name = "deepseek"
-# model_name = "deepseek-v4-flash"
-#
-# [providers.deepseek-reasoner]
-# provider_name = "deepseek"
-# model_name = "deepseek-reasoner"
-#
-# ─── OpenRouter (unified gateway) ─── $OPENROUTER_API_KEY or api_key below ───
-#
-# [providers.or-claude-opus]
-# provider_name = "openrouter"
-# model_name = "anthropic/claude-opus-4-7"
-# api_key = "sk-or-..."           # optional: omit to use $OPENROUTER_API_KEY
-#
-# [providers.or-gpt-5-5]
-# provider_name = "openrouter"
-# model_name = "openai/gpt-5.5"
-#
-# [providers.or-gemini-3-1-pro]
-# provider_name = "openrouter"
-# model_name = "google/gemini-3.1-pro-preview"
+# Family format: list all models under one provider block. The map key is used as provider_name.
+# API key resolution: $<PROVIDER>_API_KEY env var first, then inline `api_key` as fallback.
+#
+[providers.gemini]
+models = ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-3.1-pro", "gemini-3.1-flash-lite"]
+api_key = "<changethis>"
+
+[providers.openai]
+models = ["gpt-5.5", "gpt-5.5-instant", "gpt-5.4-mini", "gpt-5.4-nano", "o3", "o4-mini"]
+api_key = "<changethis>"
+
+[providers.anthropic]
+models = ["claude-opus-4-7", "claude-opus-4-6", "claude-sonnet-4-6", "claude-haiku-4-5-20251001"]
+api_key = "<changethis>"
+
+[providers.deepseek]
+models = ["deepseek-v4-pro", "deepseek-v4-flash"]
+api_key = "<changethis>"
+
+# [providers.openrouter]
+# models = ["anthropic/claude-opus-4-7", "openai/gpt-5.5", "google/gemini-3.1-pro"]
+# # Uses $OPENROUTER_API_KEY
+#
+# Custom endpoint (legacy per-model format):
+# [providers.my-proxy]
+# provider_name = "openai_compatible"
+# model_name = "my-model"
+# base_url = "https://my-proxy.example/v1/chat/completions"
+# api_key = "sk-..."
 
 [slack]
 enabled = false

assets/onboarding/config.toml

@@ -880,6 +880,75 @@ fn append_execution_stream_panel(app: &mut App, msg: &OutboundMessage) {
     }
 }
 
+/// Character-level wrapping for the compose input box.
+///
+/// Splits each logical line (delimited by `'\n'` in `input`) into visual rows
+/// that are at most `width` display-columns wide.  The first logical line gets
+/// the `"> "` prompt; continuations get `"  "`.  Each row is a complete
+/// [`Line`] so the caller can render the result **without** `Wrap`.
+///
+/// This keeps cursor-position arithmetic (`total_cols / width`) perfectly
+/// aligned with what is actually drawn on screen.
+fn char_wrap_compose(
+    input: &str,
+    width: usize,
+    prompt_style: Style,
+    text_style: Style,
+) -> Vec<Line<'static>> {
+    use unicode_width::UnicodeWidthChar;
+
+    let w = width.max(1);
+    let mut out: Vec<Line<'static>> = Vec::new();
+
+    for (li, logical) in input.split('\n').enumerate() {
+        let prefix: &str = if li == 0 { "> " } else { "  " };
+        let prefix_w: usize = 2; // both "> " and "  " are 2 display-columns
+        let text_budget = w.saturating_sub(prefix_w);
+
+        // First visual row: prefix + as much text as fits.
+        let mut chars = logical.chars().peekable();
+        let mut first_chunk = String::new();
+        let mut col: usize = 0;
+        while let Some(&ch) = chars.peek() {
+            let cw = UnicodeWidthChar::width(ch).unwrap_or(0).max(1);
+            if col + cw > text_budget {
+                break;
+            }
+            first_chunk.push(ch);
+            col += cw;
+            chars.next();
+        }
+        out.push(Line::from(vec![
+            Span::styled(prefix.to_string(), prompt_style),
+            Span::styled(first_chunk, text_style),
+        ]));
+
+        // Subsequent visual rows: up to `w` columns of text each (no prefix).
+        while chars.peek().is_some() {
+            let mut chunk = String::new();
+            let mut col: usize = 0;
+            while let Some(&ch) = chars.peek() {
+                let cw = UnicodeWidthChar::width(ch).unwrap_or(0).max(1);
+                if col + cw > w {
+                    break;
+                }
+                chunk.push(ch);
+                col += cw;
+                chars.next();
+            }
+            if chunk.is_empty() {
+                // Single character wider than the whole line — force it through.
+                if let Some(ch) = chars.next() {
+                    chunk.push(ch);
+                }
+            }
+            out.push(Line::from(Span::styled(chunk, text_style)));
+        }
+    }
+
+    out
+}
+
 fn rect_contains(r: Rect, col: u16, row: u16) -> bool {
     let x1 = r.x.saturating_add(r.width);
     let y1 = r.y.saturating_add(r.height);
@@ -1620,24 +1689,20 @@ pub(crate) fn run_ratatui_main(config: RatatuiMainConfig) -> io::Result<()> {
                 .title(Span::styled(" compose ", Theme::dim()))
                 .border_style(Theme::dim());
 
-            let mut text_lines = Vec::new();
-            for (i, line) in app.input.split('\n').enumerate() {
-                let prefix = if i == 0 { "> " } else { "  " };
-                text_lines.push(Line::from(vec![
-                    Span::styled(prefix, Theme::input_prompt()),
-                    Span::styled(line, Theme::text()),
-                ]));
-            }
-            if text_lines.is_empty() {
-                text_lines.push(Line::from(vec![
-                    Span::styled("> ", Theme::input_prompt()),
-                    Span::styled("", Theme::text()),
-                ]));
-            }
-
             let inner_area = ch[5].inner(Margin::new(1, 1));
             let inner_w = inner_area.width.max(1); // guard against zero-width after margin
 
+            // Build visual lines with character-level wrapping so that the cursor
+            // calculation (`total_cols / inner_w`) matches the rendered layout
+            // exactly.  Previously the code relied on ratatui's Wrap which uses
+            // word-level breaking, causing a mismatch.
+            let text_lines = char_wrap_compose(
+                &app.input,
+                inner_w as usize,
+                Theme::input_prompt(),
+                Theme::text(),
+            );
+
             // Calculate visual line of cursor for wrapping.
             // Uses display_width (Unicode column width) instead of char count so that
             // CJK characters and emoji that occupy two cells are measured correctly.
@@ -1647,7 +1712,7 @@ pub(crate) fn run_ratatui_main(config: RatatuiMainConfig) -> io::Result<()> {
             let lines_before_cursor: Vec<&str> = text_before_cursor.split('\n').collect();
             let total_lines = lines_before_cursor.len();
             for (i, line) in lines_before_cursor.into_iter().enumerate() {
-                let prefix_len: u16 = if i == 0 { 2 } else { 0 }; // "> "
+                let prefix_len: u16 = 2; // "> " on first line, "  " on continuations
                 let col_width = super::display_width(line) as u16;
                 let total_cols = prefix_len + col_width;
 
@@ -1672,7 +1737,6 @@ pub(crate) fn run_ratatui_main(config: RatatuiMainConfig) -> io::Result<()> {
 
             let input_para = Paragraph::new(Text::from(text_lines))
                 .block(input_block)
-                .wrap(ratatui::widgets::Wrap { trim: false })
                 .scroll((input_v_scroll, 0));
             f.render_widget(input_para, ch[5]);