@sma1lboy/kobe 0.5.18 → 0.5.19

package/dist/cli/index.js

@@ -15511,7 +15511,7 @@ var init_package = __esm(() => {
   package_default = {
     $schema: "https://json.schemastore.org/package.json",
     name: "@sma1lboy/kobe",
-    version: "0.5.18",
+    version: "0.5.19",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -30801,23 +30801,46 @@ var init_MessageList = __esm(() => {
 });
 
 // src/tui/panes/chat/composer/model-picker-row.ts
-function modelPickerRowParts(choice) {
-  const caps = getCapabilities(choice.vendor);
-  return {
-    level: choice.level ?? "level1",
-    vendor: choice.vendor,
-    engine: caps.label,
-    from: "catalog",
-    model: choice.label,
-    hint: choice.hint
-  };
+function modelPickerModelOptions(choices) {
+  const byKey = new Map;
+  for (const choice of choices) {
+    const key = `${choice.vendor}:${choice.id}`;
+    const bucket = byKey.get(key);
+    if (bucket)
+      bucket.push(choice);
+    else
+      byKey.set(key, [choice]);
+  }
+  return [...byKey.values()].map((bucket) => {
+    const base = bucket.find((choice) => choice.effort === undefined) ?? bucket[0];
+    if (!base) {
+      throw new Error("model picker option bucket unexpectedly empty");
+    }
+    return {
+      vendor: base.vendor,
+      id: base.id,
+      label: stripEffortSuffix(base.label, base.effort),
+      hint: base.hint,
+      choices: bucket
+    };
+  });
 }
-function modelPickerMetaLabel(parts) {
-  return `${parts.level} ${parts.vendor} ${parts.engine} from ${parts.from}`;
+function modelPickerEffortOptions(model) {
+  return model.choices.map((choice) => ({
+    id: choice.id,
+    effort: choice.effort,
+    label: choice.effort ?? "default",
+    hint: choice.effort ? choice.hint : choice.hint ?? "use the model default"
+  }));
+}
+function stripEffortSuffix(label, effort) {
+  if (!effort)
+    return label;
+  return label.replace(new RegExp(`\\s+\xB7\\s+${escapeRegExp3(effort)}$`), "");
+}
+function escapeRegExp3(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-var init_model_picker_row = __esm(() => {
-  init_registry2();
-});
 
 // src/tui/panes/chat/composer/ModelPicker.tsx
 import { TextAttributes as TextAttributes24 } from "@opentui/core";
@@ -30826,137 +30849,293 @@ function ModelPicker(props) {
   const {
     theme
   } = useTheme();
-  const choices = createMemo(() => allModels());
+  const models = createMemo(() => modelPickerModelOptions(allModels()));
+  const [selectedModel, setSelectedModel] = createSignal();
+  const effortChoices = createMemo(() => {
+    const model = selectedModel();
+    return model ? modelPickerEffortOptions(model) : [];
+  });
   const seed = props.current ?? defaultCapabilities.defaultModelId();
-  const initial = choices().findIndex((m2) => m2.id === seed && m2.effort === props.currentEffort);
+  const initial = models().findIndex((m2) => m2.id === seed);
   const [cursor, setCursor] = createSignal(initial >= 0 ? initial : 0);
+  const [effortCursor, setEffortCursor] = createSignal(0);
+  const inEffortStep = () => selectedModel() !== undefined;
+  function setInitialEffortCursor(model) {
+    const efforts = modelPickerEffortOptions(model);
+    const idx = efforts.findIndex((choice) => choice.effort === props.currentEffort);
+    setEffortCursor(idx >= 0 ? idx : 0);
+  }
   function commit() {
-    const choice = choices()[cursor()];
+    if (inEffortStep()) {
+      commitEffort();
+      return;
+    }
+    const model = models()[cursor()];
+    if (!model)
+      return;
+    const efforts = modelPickerEffortOptions(model);
+    if (efforts.length <= 1 && efforts[0]?.effort === undefined) {
+      props.onPick({
+        id: model.id,
+        effort: undefined
+      });
+      dialog.clear();
+      return;
+    }
+    setSelectedModel(model);
+    setInitialEffortCursor(model);
+  }
+  function commitEffort() {
+    const model = selectedModel();
+    if (!model)
+      return;
+    const choice = effortChoices()[effortCursor()];
     if (!choice)
       return;
     props.onPick({
-      id: choice.id,
+      id: model.id,
       effort: choice.effort
     });
     dialog.clear();
   }
+  function backToModels() {
+    setSelectedModel(undefined);
+  }
   useBindings(() => ({
     bindings: [{
       key: "up",
       cmd: () => {
-        const n2 = choices().length;
+        const n2 = inEffortStep() ? effortChoices().length : models().length;
         if (n2 === 0)
           return;
-        setCursor((c2) => (c2 - 1 + n2) % n2);
+        if (inEffortStep())
+          setEffortCursor((c2) => (c2 - 1 + n2) % n2);
+        else
+          setCursor((c2) => (c2 - 1 + n2) % n2);
       }
     }, {
       key: "down",
       cmd: () => {
-        const n2 = choices().length;
+        const n2 = inEffortStep() ? effortChoices().length : models().length;
         if (n2 === 0)
           return;
-        setCursor((c2) => (c2 + 1) % n2);
+        if (inEffortStep())
+          setEffortCursor((c2) => (c2 + 1) % n2);
+        else
+          setCursor((c2) => (c2 + 1) % n2);
       }
     }, {
       key: "k",
       cmd: () => {
-        const n2 = choices().length;
+        const n2 = inEffortStep() ? effortChoices().length : models().length;
         if (n2 === 0)
           return;
-        setCursor((c2) => (c2 - 1 + n2) % n2);
+        if (inEffortStep())
+          setEffortCursor((c2) => (c2 - 1 + n2) % n2);
+        else
+          setCursor((c2) => (c2 - 1 + n2) % n2);
       }
     }, {
       key: "j",
       cmd: () => {
-        const n2 = choices().length;
+        const n2 = inEffortStep() ? effortChoices().length : models().length;
         if (n2 === 0)
           return;
-        setCursor((c2) => (c2 + 1) % n2);
+        if (inEffortStep())
+          setEffortCursor((c2) => (c2 + 1) % n2);
+        else
+          setCursor((c2) => (c2 + 1) % n2);
       }
+    }, {
+      key: "left",
+      cmd: backToModels
+    }, {
+      key: "h",
+      cmd: backToModels
     }, {
       key: "return",
       cmd: commit
     }]
   }));
   return (() => {
-    var _el$ = createElement("box"), _el$2 = createElement("box"), _el$3 = createElement("text"), _el$5 = createElement("text"), _el$7 = createElement("box"), _el$8 = createElement("box"), _el$9 = createElement("text");
+    var _el$ = createElement("box"), _el$2 = createElement("box"), _el$3 = createElement("text"), _el$4 = createElement("text"), _el$6 = createElement("box"), _el$7 = createElement("text");
     insertNode(_el$, _el$2);
-    insertNode(_el$, _el$7);
-    insertNode(_el$, _el$8);
+    insertNode(_el$, _el$6);
     setProp(_el$, "paddingLeft", 2);
     setProp(_el$, "paddingRight", 2);
     setProp(_el$, "gap", 1);
     insertNode(_el$2, _el$3);
-    insertNode(_el$2, _el$5);
+    insertNode(_el$2, _el$4);
     setProp(_el$2, "flexDirection", "row");
     setProp(_el$2, "justifyContent", "space-between");
-    insertNode(_el$3, createTextNode(`Pick a model`));
-    insertNode(_el$5, createTextNode(`esc`));
-    setProp(_el$5, "onMouseUp", () => props.onCancel());
-    setProp(_el$7, "flexDirection", "column");
-    setProp(_el$7, "paddingBottom", 1);
-    insert(_el$7, createComponent2(For, {
-      get each() {
-        return choices();
-      },
-      children: (choice, i2) => {
-        const active = () => i2() === cursor();
-        const parts = () => modelPickerRowParts(choice);
-        return (() => {
-          var _el$1 = createElement("box"), _el$10 = createElement("text"), _el$11 = createElement("text");
-          insertNode(_el$1, _el$10);
-          insertNode(_el$1, _el$11);
-          setProp(_el$1, "flexDirection", "row");
-          setProp(_el$1, "gap", 2);
-          setProp(_el$1, "paddingLeft", 1);
-          setProp(_el$1, "paddingRight", 1);
-          setProp(_el$1, "onMouseUp", () => {
-            setCursor(i2());
-            commit();
-          });
-          setProp(_el$10, "wrapMode", "none");
-          insert(_el$10, () => active() ? "\u25B8 " : "  ", null);
-          insert(_el$10, () => modelPickerMetaLabel(parts()), null);
-          setProp(_el$11, "wrapMode", "none");
-          insert(_el$11, () => parts().model);
-          insert(_el$1, (() => {
-            var _c$ = memo2(() => !!parts().hint);
-            return () => _c$() ? (() => {
-              var _el$12 = createElement("text");
+    insert(_el$3, () => inEffortStep() ? "Pick effort" : "Pick a model");
+    insertNode(_el$4, createTextNode(`esc`));
+    setProp(_el$4, "onMouseUp", () => props.onCancel());
+    insert(_el$, (() => {
+      var _c$ = memo2(() => !!inEffortStep());
+      return () => _c$() ? (() => {
+        var _el$8 = createElement("box"), _el$9 = createElement("box"), _el$0 = createElement("text"), _el$10 = createElement("text");
+        insertNode(_el$8, _el$9);
+        setProp(_el$8, "flexDirection", "column");
+        setProp(_el$8, "paddingBottom", 1);
+        insertNode(_el$9, _el$0);
+        insertNode(_el$9, _el$10);
+        setProp(_el$9, "flexDirection", "row");
+        setProp(_el$9, "gap", 2);
+        setProp(_el$9, "paddingLeft", 1);
+        setProp(_el$9, "paddingRight", 1);
+        insertNode(_el$0, createTextNode(`model`));
+        setProp(_el$0, "wrapMode", "none");
+        setProp(_el$10, "wrapMode", "none");
+        insert(_el$10, () => selectedModel()?.label);
+        insert(_el$8, createComponent2(For, {
+          get each() {
+            return effortChoices();
+          },
+          children: (choice, i2) => {
+            const active = () => i2() === effortCursor();
+            return (() => {
+              var _el$11 = createElement("box"), _el$12 = createElement("text");
+              insertNode(_el$11, _el$12);
+              setProp(_el$11, "flexDirection", "row");
+              setProp(_el$11, "gap", 2);
+              setProp(_el$11, "paddingLeft", 1);
+              setProp(_el$11, "paddingRight", 1);
+              setProp(_el$11, "onMouseUp", () => {
+                setEffortCursor(i2());
+                props.onPick({
+                  id: choice.id,
+                  effort: choice.effort
+                });
+                dialog.clear();
+              });
               setProp(_el$12, "wrapMode", "none");
-              insert(_el$12, () => parts().hint);
-              effect((_$p) => setProp(_el$12, "fg", active() ? theme.selectedListItemText : theme.textMuted, _$p));
-              return _el$12;
-            })() : null;
-          })(), null);
-          effect((_p$) => {
-            var _v$5 = active() ? theme.primary : undefined, _v$6 = active() ? theme.selectedListItemText : theme.text, _v$7 = active() ? TextAttributes24.BOLD : undefined, _v$8 = active() ? theme.selectedListItemText : theme.text, _v$9 = active() ? TextAttributes24.BOLD : undefined;
-            _v$5 !== _p$.e && (_p$.e = setProp(_el$1, "backgroundColor", _v$5, _p$.e));
-            _v$6 !== _p$.t && (_p$.t = setProp(_el$10, "fg", _v$6, _p$.t));
-            _v$7 !== _p$.a && (_p$.a = setProp(_el$10, "attributes", _v$7, _p$.a));
-            _v$8 !== _p$.o && (_p$.o = setProp(_el$11, "fg", _v$8, _p$.o));
-            _v$9 !== _p$.i && (_p$.i = setProp(_el$11, "attributes", _v$9, _p$.i));
-            return _p$;
-          }, {
-            e: undefined,
-            t: undefined,
-            a: undefined,
-            o: undefined,
-            i: undefined
-          });
-          return _el$1;
-        })();
-      }
-    }));
-    insertNode(_el$8, _el$9);
-    setProp(_el$8, "paddingBottom", 1);
-    insertNode(_el$9, createTextNode(`\u2191\u2193 pick \xB7 enter select \xB7 esc cancel`));
+              insert(_el$12, () => active() ? "\u25B8 " : "  ", null);
+              insert(_el$12, () => choice.label, null);
+              insert(_el$11, (() => {
+                var _c$2 = memo2(() => !!choice.hint);
+                return () => _c$2() ? (() => {
+                  var _el$13 = createElement("text");
+                  setProp(_el$13, "wrapMode", "none");
+                  insert(_el$13, () => choice.hint);
+                  effect((_$p) => setProp(_el$13, "fg", active() ? theme.selectedListItemText : theme.textMuted, _$p));
+                  return _el$13;
+                })() : null;
+              })(), null);
+              effect((_p$) => {
+                var _v$8 = active() ? theme.primary : undefined, _v$9 = active() ? theme.selectedListItemText : theme.text, _v$0 = active() ? TextAttributes24.BOLD : undefined;
+                _v$8 !== _p$.e && (_p$.e = setProp(_el$11, "backgroundColor", _v$8, _p$.e));
+                _v$9 !== _p$.t && (_p$.t = setProp(_el$12, "fg", _v$9, _p$.t));
+                _v$0 !== _p$.a && (_p$.a = setProp(_el$12, "attributes", _v$0, _p$.a));
+                return _p$;
+              }, {
+                e: undefined,
+                t: undefined,
+                a: undefined
+              });
+              return _el$11;
+            })();
+          }
+        }), null);
+        effect((_p$) => {
+          var { textMuted: _v$5, text: _v$6 } = theme, _v$7 = TextAttributes24.BOLD;
+          _v$5 !== _p$.e && (_p$.e = setProp(_el$0, "fg", _v$5, _p$.e));
+          _v$6 !== _p$.t && (_p$.t = setProp(_el$10, "fg", _v$6, _p$.t));
+          _v$7 !== _p$.a && (_p$.a = setProp(_el$10, "attributes", _v$7, _p$.a));
+          return _p$;
+        }, {
+          e: undefined,
+          t: undefined,
+          a: undefined
+        });
+        return _el$8;
+      })() : (() => {
+        var _el$14 = createElement("box");
+        setProp(_el$14, "flexDirection", "column");
+        setProp(_el$14, "paddingBottom", 1);
+        insert(_el$14, createComponent2(For, {
+          get each() {
+            return models();
+          },
+          children: (model, i2) => {
+            const active = () => i2() === cursor();
+            const hasEfforts = () => modelPickerEffortOptions(model).some((choice) => choice.effort !== undefined);
+            return (() => {
+              var _el$15 = createElement("box"), _el$16 = createElement("text"), _el$17 = createElement("text");
+              insertNode(_el$15, _el$16);
+              insertNode(_el$15, _el$17);
+              setProp(_el$15, "flexDirection", "row");
+              setProp(_el$15, "gap", 2);
+              setProp(_el$15, "paddingLeft", 1);
+              setProp(_el$15, "paddingRight", 1);
+              setProp(_el$15, "onMouseUp", () => {
+                const efforts = modelPickerEffortOptions(model);
+                if (efforts.length <= 1 && efforts[0]?.effort === undefined) {
+                  props.onPick({
+                    id: model.id,
+                    effort: undefined
+                  });
+                  dialog.clear();
+                  return;
+                }
+                setCursor(i2());
+                setSelectedModel(model);
+                setInitialEffortCursor(model);
+              });
+              setProp(_el$16, "wrapMode", "none");
+              insert(_el$16, () => active() ? "\u25B8 " : "  ", null);
+              insert(_el$16, () => model.label, null);
+              setProp(_el$17, "wrapMode", "none");
+              insert(_el$17, () => model.vendor);
+              insert(_el$15, (() => {
+                var _c$3 = memo2(() => !!hasEfforts());
+                return () => _c$3() ? (() => {
+                  var _el$18 = createElement("text");
+                  insertNode(_el$18, createTextNode(`effort\u2026`));
+                  setProp(_el$18, "wrapMode", "none");
+                  effect((_$p) => setProp(_el$18, "fg", active() ? theme.selectedListItemText : theme.textMuted, _$p));
+                  return _el$18;
+                })() : null;
+              })(), null);
+              insert(_el$15, (() => {
+                var _c$4 = memo2(() => !!model.hint);
+                return () => _c$4() ? (() => {
+                  var _el$20 = createElement("text");
+                  setProp(_el$20, "wrapMode", "none");
+                  insert(_el$20, () => model.hint);
+                  effect((_$p) => setProp(_el$20, "fg", active() ? theme.selectedListItemText : theme.textMuted, _$p));
+                  return _el$20;
+                })() : null;
+              })(), null);
+              effect((_p$) => {
+                var _v$1 = active() ? theme.primary : undefined, _v$10 = active() ? theme.selectedListItemText : theme.text, _v$11 = active() ? TextAttributes24.BOLD : undefined, _v$12 = active() ? theme.selectedListItemText : theme.textMuted;
+                _v$1 !== _p$.e && (_p$.e = setProp(_el$15, "backgroundColor", _v$1, _p$.e));
+                _v$10 !== _p$.t && (_p$.t = setProp(_el$16, "fg", _v$10, _p$.t));
+                _v$11 !== _p$.a && (_p$.a = setProp(_el$16, "attributes", _v$11, _p$.a));
+                _v$12 !== _p$.o && (_p$.o = setProp(_el$17, "fg", _v$12, _p$.o));
+                return _p$;
+              }, {
+                e: undefined,
+                t: undefined,
+                a: undefined,
+                o: undefined
+              });
+              return _el$15;
+            })();
+          }
+        }));
+        return _el$14;
+      })();
+    })(), _el$6);
+    insertNode(_el$6, _el$7);
+    setProp(_el$6, "paddingBottom", 1);
+    insert(_el$7, () => inEffortStep() ? "\u2191\u2193 pick \xB7 enter select \xB7 h back \xB7 esc cancel" : "\u2191\u2193 pick \xB7 enter select \xB7 esc cancel");
     effect((_p$) => {
       var _v$ = TextAttributes24.BOLD, _v$2 = theme.text, _v$3 = theme.textMuted, _v$4 = theme.textMuted;
       _v$ !== _p$.e && (_p$.e = setProp(_el$3, "attributes", _v$, _p$.e));
       _v$2 !== _p$.t && (_p$.t = setProp(_el$3, "fg", _v$2, _p$.t));
-      _v$3 !== _p$.a && (_p$.a = setProp(_el$5, "fg", _v$3, _p$.a));
-      _v$4 !== _p$.o && (_p$.o = setProp(_el$9, "fg", _v$4, _p$.o));
+      _v$3 !== _p$.a && (_p$.a = setProp(_el$4, "fg", _v$3, _p$.a));
+      _v$4 !== _p$.o && (_p$.o = setProp(_el$7, "fg", _v$4, _p$.o));
       return _p$;
     }, {
       e: undefined,
@@ -30981,7 +31160,6 @@ var init_ModelPicker = __esm(() => {
   init_theme();
   init_keymap();
   init_dialog();
-  init_model_picker_row();
   ModelPicker.show = (dialog, current, currentEffort) => {
     return new Promise((resolve4) => {
       dialog.replace(() => createComponent2(ModelPicker, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@sma1lboy/kobe",
-  "version": "0.5.18",
+  "version": "0.5.19",
   "description": "TUI orchestrator for Claude Code (codename)",
   "type": "module",
   "packageManager": "bun@1.3.13",